From: <enl...@li...> - 2004-04-17 22:00:36
|
Enlightenment CVS committal Author : xcomputerman Project : misc Module : engage Dir : misc/engage/src Modified Files: config.c engage.h window.c Log Message: GL engine support. Bah, how come CPU usage has jumped 5x? =================================================================== RCS file: /cvsroot/enlightenment/misc/engage/src/config.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- config.c 14 Apr 2004 22:59:15 -0000 1.5 +++ config.c 17 Apr 2004 22:00:28 -0000 1.6 @@ -12,6 +12,7 @@ ecore_config_default_int("engage.options.width", 1024); ecore_config_default_int("engage.options.height", 100); ecore_config_default_string("engage.options.theme", "gentoo"); + ecore_config_default_string("engage.options.engine", "software"); options.icon_path = PACKAGE_DATA_DIR "/icons/"; ecore_config_default_int_bound("engage.options.mode", OM_ONTOP, 0, 1, 1); ecore_config_default_int_bound("engage.options.grab_min_icons", 1, 0, 1, 1); @@ -34,6 +35,7 @@ ecore_config_load(); options.width = ecore_config_get_int("engage.options.width"); options.height = ecore_config_get_int("engage.options.height"); + options.engine = ecore_config_get_string("engage.options.engine"); options.theme = ecore_config_get_string("engage.options.theme"); options.mode = ecore_config_get_int("engage.options.mode"); options.grab_min_icons = =================================================================== RCS file: /cvsroot/enlightenment/misc/engage/src/engage.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- engage.h 14 Apr 2004 23:40:31 -0000 1.8 +++ engage.h 17 Apr 2004 22:00:29 -0000 1.9 @@ -69,7 +69,7 @@ struct _OD_Options { int width, height; - char *icon_path, *theme; + char *icon_path, *theme, *engine; OD_Mode mode; int grab_min_icons, grab_app_icons; =================================================================== RCS file: /cvsroot/enlightenment/misc/engage/src/window.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- window.c 17 Apr 2004 15:51:58 -0000 1.8 +++ window.c 17 Apr 2004 22:00:29 -0000 1.9 @@ -71,10 +71,24 @@ res_x = scr->width; res_y = scr->height; - ee = ecore_evas_software_x11_new(NULL, 0, - (int) ((res_x - options.width) / 2.0), - (int) (res_y - options.height), - options.width, options.height); + if (!(strcmp(options.engine, "gl"))) + ee = ecore_evas_gl_x11_new(NULL, 0, + (int) ((res_x - options.width) / 2.0), + (int) (res_y - options.height), + options.width, options.height); + else + { + if (strcmp(options.engine, "software")) + { + fprintf(stderr, "Warning: Invalid engine type \"%s\" specified in config.\n"); + fprintf(stderr, " Defaulting to software engine.\n"); + } + ee = ecore_evas_software_x11_new(NULL, 0, + (int) ((res_x - options.width) / 2.0), + (int) (res_y - options.height), + options.width, options.height); + } + ecore_evas_title_set(ee, "Engage"); ecore_evas_name_class_set(ee, "engage", "engage"); ecore_evas_borderless_set(ee, 1); |
From: <enl...@li...> - 2004-05-05 06:54:45
|
Enlightenment CVS committal Author : xcomputerman Project : misc Module : engage Dir : misc/engage/src Modified Files: Makefile.am window.c Log Message: New Esmart =================================================================== RCS file: /cvsroot/enlightenment/misc/engage/src/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- Makefile.am 18 Apr 2004 17:47:40 -0000 1.5 +++ Makefile.am 5 May 2004 06:54:36 -0000 1.6 @@ -22,5 +22,6 @@ userconfig.c -engage_LDADD = @evas_libs@ @edje_libs@ @ecore_libs@ @esmart_libs@ @imlib2_libs@ +engage_LDADD = @evas_libs@ @edje_libs@ @ecore_libs@ @imlib2_libs@ \ + @esmart_libs@ -lesmart_trans_x11 =================================================================== RCS file: /cvsroot/enlightenment/misc/engage/src/window.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- window.c 27 Apr 2004 08:29:33 -0000 1.12 +++ window.c 5 May 2004 06:54:36 -0000 1.13 @@ -1,7 +1,7 @@ #include "engage.h" #include "config.h" #include <Ecore_X.h> -#include <Esmart/Esmart_Trans.h> +#include <Esmart/Esmart_Trans_X11.h> #include <X11/Xatom.h> #include <X11/Xutil.h> |
From: <enl...@li...> - 2004-05-05 06:54:45
|
Enlightenment CVS committal Author : xcomputerman Project : misc Module : engage Dir : misc/engage Modified Files: configure.in Log Message: New Esmart =================================================================== RCS file: /cvsroot/enlightenment/misc/engage/configure.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- configure.in 18 Apr 2004 17:54:58 -0000 1.8 +++ configure.in 5 May 2004 06:54:36 -0000 1.9 @@ -133,7 +133,7 @@ have_esmart_trans="no" dnl Make sure the esmart header/lib is available -AC_CHECK_HEADER( Esmart/Esmart_Trans.h, +AC_CHECK_HEADER( Esmart/Esmart_Trans_X11.h, [ AC_DEFINE(HAVE_TRANS_BG, [], [Esmart Pseudo-transparency support]) have_esmart_trans="yes" ]) |
From: <enl...@li...> - 2004-05-08 15:55:43
|
Enlightenment CVS committal Author : xcomputerman Project : misc Module : engage Dir : misc/engage/src Modified Files: config.c window.c Log Message: - Update to new ecore_config api - Use a white outline instead =================================================================== RCS file: /cvsroot/enlightenment/misc/engage/src/config.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- config.c 6 May 2004 18:06:25 -0000 1.13 +++ config.c 8 May 2004 15:55:33 -0000 1.14 @@ -11,76 +11,76 @@ { int ret; - ecore_config_create_int("engage.options.width", 1024, 'W', "width", + ecore_config_int_create("engage.options.width", 1024, 'W', "width", "The overall width of the application area"); - ecore_config_create_int("engage.options.height", 100, 'H', "height", + ecore_config_int_create("engage.options.height", 100, 'H', "height", "The overall height of the application area"); - ecore_config_create_theme("engage.options.theme", "gentoo", 't', "theme", + ecore_config_theme_create("engage.options.theme", "gentoo", 't', "theme", "The theme name to use (minus path and extension)"); /* not technically correct - iconsets should do this, but it looks better for * everything bar 'gentoo' - and we all have the others installed ;) */ - ecore_config_set_theme_preview_group("engage.options.theme", "Terminal"); - ecore_config_create_string("engage.options.engine", "software", 'e', "engine", + ecore_config_theme_preview_group_set("engage.options.theme", "Terminal"); + ecore_config_string_create("engage.options.engine", "software", 'e', "engine", "The X11 engine to use - either software or gl"); options.icon_path = PACKAGE_DATA_DIR "/icons/"; - ecore_config_create_int_bound("engage.options.mode", OM_BELOW, 0, 1, 1, 'm', + ecore_config_int_create_bound("engage.options.mode", OM_BELOW, 0, 1, 1, 'm', "mode", "The display mode, 0 = ontop + shaped, 1 = below + transp"); - ecore_config_create_int_bound("engage.options.grab_min_icons", 1, 0, 1, 1, + ecore_config_int_create_bound("engage.options.grab_min_icons", 1, 0, 1, 1, 'g', "grab-min", "Capture the icons of minimised applications"); - ecore_config_create_int_bound("engage.options.grab_app_icons", 1, 0, 1, 1, + ecore_config_int_create_bound("engage.options.grab_app_icons", 1, 0, 1, 1, 'G', "grab-app", "Capture the icons of all running applications"); - ecore_config_create_int("engage.options.size", 32, 's', "size", + ecore_config_int_create("engage.options.size", 32, 's', "size", "Size of icons in default state"); - ecore_config_create_int("engage.options.spacing", 4, 'S', "spacing", + ecore_config_int_create("engage.options.spacing", 4, 'S', "spacing", "Space in pixels between each icon"); - ecore_config_create_float("engage.options.zoom_factor", 2.0, 'z', "zoom", + ecore_config_float_create("engage.options.zoom_factor", 2.0, 'z', "zoom", "Zoom factor of the icons - 1.0 == 100% == nozoom"); - ecore_config_create_int("engage.options.arrow_size", 6, 'a', "arrow-size", + ecore_config_int_create("engage.options.arrow_size", 6, 'a', "arrow-size", "Size (in pixels) of the status arrows"); - ecore_config_create_float("engage.options.zoom_duration", 0.1, 'd', + ecore_config_float_create("engage.options.zoom_duration", 0.1, 'd', "zoom-time", "Time taken (in seconds) for icons to zoom"); - options.tt_txt_color = 0x00000000; - options.tt_shd_color = 0x7f000000; - options.bg_fore = 0x7f000000; - options.bg_back = 0x7fffffff; - ecore_config_create_string("engage.options.tt_fa", "Vera", 'f', "font", + options.tt_txt_color = 0xffffffff; + options.tt_shd_color = 0xbf000000; + options.bg_fore = 0xffffffff; + options.bg_back = 0x3fffffff; + ecore_config_string_create("engage.options.tt_fa", "Vera", 'f', "font", "The font to use for application titles etc."); - ecore_config_create_int("engage.options.tt_fs", 8, 'F', "font-size", + ecore_config_int_create("engage.options.tt_fs", 8, 'F', "font-size", "The font size (in points)"); - ecore_config_create_float("engage.options.icon_appear_duration", 0.1, 'D', + ecore_config_float_create("engage.options.icon_appear_duration", 0.1, 'D', "appear-time", "Time taken (in seconds) for new icons to appear"); ecore_config_load(); ret = ecore_config_args_parse(argc, argv); - options.width = ecore_config_get_int("engage.options.width"); - options.height = ecore_config_get_int("engage.options.height"); - options.engine = ecore_config_get_string("engage.options.engine"); - options.theme = ecore_config_get_theme("engage.options.theme"); - options.mode = ecore_config_get_int("engage.options.mode"); + options.width = ecore_config_int_get("engage.options.width"); + options.height = ecore_config_int_get("engage.options.height"); + options.engine = ecore_config_string_get("engage.options.engine"); + options.theme = ecore_config_theme_get("engage.options.theme"); + options.mode = ecore_config_int_get("engage.options.mode"); options.grab_min_icons = - ecore_config_get_int("engage.options.grab_min_icons"); + ecore_config_int_get("engage.options.grab_min_icons"); options.grab_app_icons = - ecore_config_get_int("engage.options.grab_app_icons"); + ecore_config_int_get("engage.options.grab_app_icons"); - options.size = ecore_config_get_int("engage.options.size"); - options.spacing = ecore_config_get_int("engage.options.spacing"); - options.zoomfactor = ecore_config_get_float("engage.options.zoom_factor"); - options.arrow_size = ecore_config_get_int("engage.options.arrow_size"); + options.size = ecore_config_int_get("engage.options.size"); + options.spacing = ecore_config_int_get("engage.options.spacing"); + options.zoomfactor = ecore_config_float_get("engage.options.zoom_factor"); + options.arrow_size = ecore_config_int_get("engage.options.arrow_size"); options.dock_zoom_duration = - ecore_config_get_float("engage.options.zoom_duration"); + ecore_config_float_get("engage.options.zoom_duration"); - options.tt_fa = ecore_config_get_string("engage.options.tt_fa"); - options.tt_fs = ecore_config_get_int("engage.options.tt_fs"); + options.tt_fa = ecore_config_string_get("engage.options.tt_fa"); + options.tt_fs = ecore_config_int_get("engage.options.tt_fs"); options.icon_appear_duration = - ecore_config_get_float("engage.options.icon_appear_duration"); + ecore_config_float_get("engage.options.icon_appear_duration"); return ret; } =================================================================== RCS file: /cvsroot/enlightenment/misc/engage/src/window.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- window.c 6 May 2004 12:47:20 -0000 1.14 +++ window.c 8 May 2004 15:55:33 -0000 1.15 @@ -114,8 +114,8 @@ #endif options.width = w; options.height = h; - ecore_config_set_int("engage.options.width", w); - ecore_config_set_int("engage.options.height", h); + ecore_config_int_set("engage.options.width", w); + ecore_config_int_set("engage.options.height", h); } void |
From: <enl...@li...> - 2004-10-29 05:06:27
|
Enlightenment CVS committal Author : xcomputerman Project : misc Module : engage Dir : misc/engage Modified Files: digital.tar.gz Log Message: A much better digital clock. =================================================================== RCS file: /cvsroot/enlightenment/misc/engage/digital.tar.gz,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsqXYaHm and /tmp/cvs5dgdls differ |
From: <enl...@li...> - 2004-10-29 05:07:08
|
Enlightenment CVS committal Author : xcomputerman Project : misc Module : engage Dir : misc/engage Modified Files: digital.eet Log Message: Updating the eet itself might be a good idea. =================================================================== RCS file: /cvsroot/enlightenment/misc/engage/digital.eet,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 Binary files /tmp/cvsOimrJN and /tmp/cvsL8T4gy differ |
From: <enl...@li...> - 2004-10-29 05:14:12
|
Enlightenment CVS committal Author : xcomputerman Project : misc Module : engage Dir : misc/engage Modified Files: digital.eet digital.tar.gz Log Message: AM/PM seems to indicate this should be in 12-hour format, not 24 :) =================================================================== RCS file: /cvsroot/enlightenment/misc/engage/digital.eet,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 Binary files /tmp/cvs022arH and /tmp/cvs5BSmDB differ =================================================================== RCS file: /cvsroot/enlightenment/misc/engage/digital.tar.gz,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 Binary files /tmp/cvsujKg3J and /tmp/cvsubmDhE differ |
From: <enl...@li...> - 2004-10-30 05:12:21
|
Enlightenment CVS committal Author : xcomputerman Project : misc Module : engage Dir : misc/engage/data/themes/none/fonts Log Message: Directory /cvsroot/enlightenment/misc/engage/data/themes/none/fonts added to the repository |
From: <enl...@li...> - 2004-10-30 05:12:21
|
Enlightenment CVS committal Author : xcomputerman Project : misc Module : engage Dir : misc/engage/data/themes/gentoo/fonts Log Message: Directory /cvsroot/enlightenment/misc/engage/data/themes/gentoo/fonts added to the repository |
From: <enl...@li...> - 2004-10-30 05:13:51
|
Enlightenment CVS committal Author : xcomputerman Project : misc Module : engage Dir : misc/engage/data/themes Modified Files: Makefile.am gentoo.edc none.edc Log Message: It would be nice to actually provide the fonts for the text too, you know. :) =================================================================== RCS file: /cvsroot/enlightenment/misc/engage/data/themes/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 5 Oct 2004 21:51:25 -0000 1.2 +++ Makefile.am 30 Oct 2004 05:13:35 -0000 1.3 @@ -12,6 +12,6 @@ all: $(EDCS) .edc.eet: - edje_cc -v -id $(<:%.edc=%)/images $< $@ + edje_cc -v -id $(<:%.edc=%)/images -fd $(<:%.edc=%)/fonts $< $@ =================================================================== RCS file: /cvsroot/enlightenment/misc/engage/data/themes/gentoo.edc,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- gentoo.edc 7 Oct 2004 10:39:44 -0000 1.13 +++ gentoo.edc 30 Oct 2004 05:13:35 -0000 1.14 @@ -5,6 +5,10 @@ image, "term.png" LOSSY 95; } +fonts { + font, "VeraBd.ttf" "Edje.VeraBold"; +} + collections { group { name, "Terminal"; @@ -167,11 +171,11 @@ to, "name_clip"; } color, 255 255 255 255; - color3, 0 0 0 20; + color3, 0 0 0 32; text { text, ""; - font, "VeraBd"; - size, 7; + font, "Edje.VeraBold"; + size, 12; fit, 0 0; align, 0.5 1.0; } =================================================================== RCS file: /cvsroot/enlightenment/misc/engage/data/themes/none.edc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- none.edc 7 Oct 2004 10:39:44 -0000 1.3 +++ none.edc 30 Oct 2004 05:13:35 -0000 1.4 @@ -3,6 +3,10 @@ image, "eterm.png" LOSSY 95; } +fonts { + font, "VeraBd.ttf" "Edje.VeraBold"; +} + collections { group { name, "Terminal"; @@ -107,7 +111,7 @@ name, "EngageName"; type, TEXT; mouse_events, 0; - effect, SOFT_SHADOW; + effect, OUTLINE_SOFT_SHADOW; clip_to, "name_clip"; description { state, "default" 0.0; @@ -121,11 +125,12 @@ to, "name_clip"; } color, 255 255 255 255; - color3, 0 0 0 20; + color2, 0 0 0 255; + color3, 0 0 0 64; text { text, ""; - font, "VeraBd"; - size, 7; + font, "Edje.VeraBold"; + size, 12; fit, 0 0; align, 0.5 1.0; } |
From: <enl...@li...> - 2004-10-30 05:13:52
|
Enlightenment CVS committal Author : xcomputerman Project : misc Module : engage Dir : misc/engage/data/themes/gentoo/fonts Added Files: VeraBd.ttf Log Message: It would be nice to actually provide the fonts for the text too, you know. :) |
From: <enl...@li...> - 2004-10-30 05:13:52
|
Enlightenment CVS committal Author : xcomputerman Project : misc Module : engage Dir : misc/engage/data/themes/none/fonts Added Files: VeraBd.ttf Log Message: It would be nice to actually provide the fonts for the text too, you know. :) |
From: <enl...@li...> - 2004-11-01 19:33:41
|
Enlightenment CVS committal Author : xcomputerman Project : misc Module : engage Dir : misc/engage/src Modified Files: main.c Log Message: Init config first before attempting to connect to X server. =================================================================== RCS file: /cvsroot/enlightenment/misc/engage/src/main.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- main.c 13 Oct 2004 13:45:56 -0000 1.12 +++ main.c 1 Nov 2004 19:33:33 -0000 1.13 @@ -21,11 +21,6 @@ exit(0); } - if((ecore_x_init(NULL)) == 0) { - ecore_shutdown(); - exit(0); - } - if((ecore_config_init("engage")) == ECORE_CONFIG_ERR_FAIL) { ecore_x_shutdown(); ecore_shutdown(); @@ -39,6 +34,12 @@ ecore_shutdown(); exit(0); } + + if((ecore_x_init(NULL)) == 0) { + ecore_shutdown(); + exit(0); + } + e_app_init(); ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, exit_cb, NULL); |