From: Enlightenment C. <no...@cv...> - 2007-12-24 18:49:33
|
Enlightenment CVS committal Author : davemds Project : e_modules Module : bling Dir : e_modules/bling Modified Files: e_mod_config.c e_mod_config.h e_mod_main.c e_mod_main.h Log Message: First work to make bling up-to-date Update config to 'new' e API =================================================================== RCS file: /cvs/e/e_modules/bling/e_mod_config.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- e_mod_config.c 12 Nov 2007 05:10:42 -0000 1.9 +++ e_mod_config.c 24 Dec 2007 18:49:29 -0000 1.10 @@ -27,15 +27,22 @@ static void _fill_data(Bling *b, E_Config_Dialog_Data *cfdata); -void -_config_bling_module(E_Container *con, Bling *b) +//void +//_config_bling_module(E_Container *con, Bling *b) + +EAPI E_Config_Dialog * +e_int_config_bling_module(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; + Bling *b; char buf[4096]; + b = bling_mod->data; + if (e_config_dialog_find("E", "_e_modules_bling_config_dialog")) return NULL; v = E_NEW(E_Config_Dialog_View, 1); + v->create_cfdata = _create_data; v->free_cfdata = _free_data; v->basic.apply_cfdata = _basic_apply_data; @@ -44,9 +51,11 @@ v->advanced.create_widgets = _advanced_create_widgets; snprintf(buf, sizeof(buf), "%s/module.edj", e_module_dir_get(b->module)); - cfd = e_config_dialog_new(con, "BlingConfiguration", "Bling", "_e_modules_bling_config_dialog", buf, 0, v, b); + cfd = e_config_dialog_new(con, "BlingConfiguration", + "Bling", "_e_modules_bling_config_dialog", buf, 0, v, b); b->config_dialog = cfd; + return cfd; } static void * =================================================================== RCS file: /cvs/e/e_modules/bling/e_mod_config.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -3 -r1.1.1.1 -r1.2 --- e_mod_config.h 5 Jun 2006 04:42:18 -0000 1.1.1.1 +++ e_mod_config.h 24 Dec 2007 18:49:29 -0000 1.2 @@ -3,6 +3,6 @@ #ifndef E_MOD_CONFIG_H #define E_MOD_CONFIG_H #include "e_mod_main.h" -void _config_bling_module(E_Container *con, Bling *b); +EAPI E_Config_Dialog * e_int_config_bling_module(E_Container *con, const char *params __UNUSED__); #endif #endif =================================================================== RCS file: /cvs/e/e_modules/bling/e_mod_main.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_mod_main.c 12 Nov 2007 05:09:50 -0000 1.11 +++ e_mod_main.c 24 Dec 2007 18:49:29 -0000 1.12 @@ -16,16 +16,23 @@ E_MODULE_API_VERSION, "Composite" }; +EAPI E_Module *bling_mod = NULL; EAPI void * e_modapi_init(E_Module *m) { Bling *b = NULL; + char buf[4096]; b = _bling_init(m); if (!b) return NULL; + snprintf(buf, sizeof(buf), "%s/e-module-bling.edj", e_module_dir_get(m)); + e_configure_registry_category_add("appearance", 10, "Appearance", NULL, "enlightenment/appearance"); + e_configure_registry_item_add("appearance/bling", 150, "Bling", NULL, buf, e_int_config_bling_module); + b->module = m; + bling_mod = m; return b; } =================================================================== RCS file: /cvs/e/e_modules/bling/e_mod_main.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_main.h 12 Nov 2007 04:38:05 -0000 1.6 +++ e_mod_main.h 24 Dec 2007 18:49:29 -0000 1.7 @@ -44,6 +44,8 @@ E_Config_Dialog *config_dialog; }; +extern E_Module *bling_mod; + EAPI extern E_Module_Api e_modapi; EAPI void *e_modapi_init(E_Module *m); |
From: Enlightenment C. <no...@cv...> - 2007-12-24 18:59:38
|
Enlightenment CVS committal Author : davemds Project : e_modules Module : bling Dir : e_modules/bling Modified Files: module.desktop.in Log Message: fix .desktop file & put bling in the Appearance category =================================================================== RCS file: /cvs/e/e_modules/bling/module.desktop.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- module.desktop.in 18 Nov 2007 19:47:04 -0000 1.7 +++ module.desktop.in 24 Dec 2007 18:59:36 -0000 1.8 @@ -5,6 +5,7 @@ StartupNotify=false X-Enlightenment-WaitExit=false X-Enlightenment-IconClass=bling,gadget -Icon=e-module-bling.edj +X-Enlightenment-ModuleType=appearance +Icon=e-module-bling Comment=<hilight>Bling Module</hilight><br>An xcompmgr derived, EFLized<br>composite manager for E17. Comment[it]=<hilight>Modulo Bling</hilight><br>Un composite manager per E17<br>derivato da xcompmgr e<br>adattato alle EFL. |
From: Enlightenment C. <no...@cv...> - 2007-12-24 19:26:33
|
Enlightenment CVS committal Author : davemds Project : e_modules Module : bling Dir : e_modules/bling Modified Files: e-module-bling.edj Log Message: Transparent icon background =================================================================== RCS file: /cvs/e/e_modules/bling/e-module-bling.edj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsjSU756 and /tmp/cvsWglSj0 differ |
From: Enlightenment C. <no...@cv...> - 2007-12-24 20:09:15
|
Enlightenment CVS committal Author : davemds Project : e_modules Module : bling Dir : e_modules/bling Modified Files: e_mod_main.c Log Message: Delayed start. Look down for info =================================================================== RCS file: /cvs/e/e_modules/bling/e_mod_main.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e_mod_main.c 24 Dec 2007 18:49:29 -0000 1.12 +++ e_mod_main.c 24 Dec 2007 20:09:11 -0000 1.13 @@ -33,6 +33,10 @@ b->module = m; bling_mod = m; + + /* Delayed start fix the 'trasparent-window-on-start' bug */ + /* This is a hack. We need to find the bug and solve it!! */ + e_module_delayed_set(m, 1); return b; } |
From: Enlightenment C. <no...@cv...> - 2007-12-24 21:43:12
|
Enlightenment CVS committal Author : davemds Project : e_modules Module : bling Dir : e_modules/bling Modified Files: e_mod_config.c e_mod_main.c Log Message: * save config value * remove configuration panel entry on exit =================================================================== RCS file: /cvs/e/e_modules/bling/e_mod_config.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_mod_config.c 24 Dec 2007 18:49:29 -0000 1.10 +++ e_mod_config.c 24 Dec 2007 21:43:07 -0000 1.11 @@ -51,7 +51,7 @@ v->advanced.create_widgets = _advanced_create_widgets; snprintf(buf, sizeof(buf), "%s/module.edj", e_module_dir_get(b->module)); - cfd = e_config_dialog_new(con, "BlingConfiguration", + cfd = e_config_dialog_new(con, "Bling Configuration", "Bling", "_e_modules_bling_config_dialog", buf, 0, v, b); b->config_dialog = cfd; @@ -125,6 +125,7 @@ b->config->fx_fade_enable = cfdata->fade_enable; b->config->fx_fade_opacity_enable = cfdata->fade_opacity; + e_config_save_queue(); /* Reload composite manager! */ return 1; } @@ -209,7 +210,9 @@ b->config->fx_fade_opacity_enable = cfdata->fade_opacity; b->config->fx_fade_in_step = cfdata->fade_in_step/100.0; b->config->fx_fade_out_step = cfdata->fade_out_step/100.0; - + + e_config_save_queue(); + /* reload comp manager! */ return 1; } =================================================================== RCS file: /cvs/e/e_modules/bling/e_mod_main.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e_mod_main.c 24 Dec 2007 20:09:11 -0000 1.13 +++ e_mod_main.c 24 Dec 2007 21:43:07 -0000 1.14 @@ -46,6 +46,9 @@ { Bling *b; + e_configure_registry_item_del("appearance/bling"); + e_configure_registry_category_del("appearance"); + b = m->data; if (b) { @@ -156,6 +159,7 @@ E_CONFIG_VAL(D, T, fx_fade_out_step, DOUBLE); b->config = e_config_domain_load("module.bling", b->conf_edd); + if (!b->config) { b->config = E_NEW(Config, 1); |
From: Enlightenment C. <no...@cv...> - 2007-12-25 00:09:54
|
Enlightenment CVS committal Author : davemds Project : e_modules Module : bling Dir : e_modules/bling Modified Files: compmgr.c e_mod_config.c e_mod_main.c e_mod_main.h Log Message: * Fix shadow_enable functionality * Reload composite on config apply * Fix shadow_opacity slider Now bling work great on my machine :) Please let me know if you have any issue. =================================================================== RCS file: /cvs/e/e_modules/bling/compmgr.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- compmgr.c 12 Nov 2007 05:03:36 -0000 1.12 +++ compmgr.c 25 Dec 2007 00:09:51 -0000 1.13 @@ -954,7 +954,7 @@ if (w->windowType == ECORE_X_WINDOW_TYPE_DESKTOP) continue; - if (w->shadowSize > 0) + if (w->shadowSize > 0 && config->shadow_enable) { switch (compMode) { =================================================================== RCS file: /cvs/e/e_modules/bling/e_mod_config.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_mod_config.c 24 Dec 2007 21:43:07 -0000 1.11 +++ e_mod_config.c 25 Dec 2007 00:09:51 -0000 1.12 @@ -126,7 +126,8 @@ b->config->fx_fade_opacity_enable = cfdata->fade_opacity; e_config_save_queue(); - /* Reload composite manager! */ + bling_composite_restart(b); + return 1; } @@ -152,7 +153,7 @@ ob = e_widget_label_add(evas, "Shadow Opacity"); e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 0, 0); - ob = e_widget_slider_add(evas, 1, 0, "%1.00f\%", 0, 1, 0.05, 0, &(cfdata->shadow_opacity), NULL, 150); + ob = e_widget_slider_add(evas, 1, 0, "%1.2f\%", 0, 1, 0.05, 0, &(cfdata->shadow_opacity), NULL, 150); e_widget_table_object_append(ot, ob, 1, i, 1, 1, 0, 0, 1, 0); i++; @@ -212,8 +213,8 @@ b->config->fx_fade_out_step = cfdata->fade_out_step/100.0; e_config_save_queue(); + bling_composite_restart(b); - /* reload comp manager! */ return 1; } =================================================================== RCS file: /cvs/e/e_modules/bling/e_mod_main.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- e_mod_main.c 24 Dec 2007 21:43:07 -0000 1.14 +++ e_mod_main.c 25 Dec 2007 00:09:51 -0000 1.15 @@ -112,8 +112,8 @@ _config_bling_module(con, b); } -static int -_bling_composite_restart(void *data) +int +bling_composite_restart(void *data) { Bling *b = data; @@ -221,7 +221,7 @@ _bling_config_menu_new(b); #endif if (getenv("RESTART")) - ecore_idle_enterer_add(_bling_composite_restart, b); + ecore_idle_enterer_add(bling_composite_restart, b); else if (!composite_init(b)) { E_CONFIG_DD_FREE(b->conf_edd); =================================================================== RCS file: /cvs/e/e_modules/bling/e_mod_main.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_mod_main.h 24 Dec 2007 18:49:29 -0000 1.7 +++ e_mod_main.h 25 Dec 2007 00:09:51 -0000 1.8 @@ -55,5 +55,5 @@ /* Composite functions */ int composite_init(Bling *b); void composite_shutdown(void); - +int bling_composite_restart(void *data); #endif /* E_MOD_MAIN_H */ |
From: Enlightenment C. <no...@cv...> - 2007-12-25 00:19:12
|
Enlightenment CVS committal Author : davemds Project : e_modules Module : bling Dir : e_modules/bling Modified Files: TODO Log Message: resolved =================================================================== RCS file: /cvs/e/e_modules/bling/TODO,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- TODO 26 Jun 2006 00:16:28 -0000 1.3 +++ TODO 25 Dec 2007 00:19:10 -0000 1.4 @@ -1,6 +1,5 @@ BUGS ============================================== -* Config doesn't save. * E17 crash dialog doesn't show (need to unredirect windows in the event of a SEGV). * Focus in/out fades may not always work especially if window is |
From: Enlightenment C. <no...@cv...> - 2007-12-25 01:03:50
|
Enlightenment CVS committal Author : davemds Project : e_modules Module : bling Dir : e_modules/bling Modified Files: e_mod_main.c Log Message: remove (#if 0 it) old config functions =================================================================== RCS file: /cvs/e/e_modules/bling/e_mod_main.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- e_mod_main.c 25 Dec 2007 00:09:51 -0000 1.15 +++ e_mod_main.c 25 Dec 2007 01:03:49 -0000 1.16 @@ -8,8 +8,8 @@ static void _bling_shutdown(Bling *b); #if 0 static void _bling_config_menu_new(Bling *b); -#endif static void _bling_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi); +#endif /* public module routines. all modules must have these */ EAPI E_Module_Api e_modapi = { @@ -97,7 +97,6 @@ e_menu_item_callback_set(mi, _bling_menu_cb_configure, b); b->config_menu = menu; } -#endif static void _bling_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi) @@ -111,6 +110,7 @@ con = e_container_current_get(e_manager_current_get()); _config_bling_module(con, b); } +#endif int bling_composite_restart(void *data) |
From: Enlightenment C. <no...@cv...> - 2008-03-21 17:22:37
|
Enlightenment CVS committal Author : davemds Project : e_modules Module : bling Dir : e_modules/bling Modified Files: e_mod_config.c Log Message: *Simple: Add an option to enable/disable unfocused window to be opaque. *Advanced: Add a slider to choose the unfocused window opacity =================================================================== RCS file: /cvs/e/e_modules/bling/e_mod_config.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e_mod_config.c 25 Dec 2007 00:09:51 -0000 1.12 +++ e_mod_config.c 21 Mar 2008 17:22:35 -0000 1.13 @@ -15,6 +15,9 @@ int fade_opacity; double fade_in_step; double fade_out_step; + + int inactive_transparent; + double inactive_opacity; }; /* Protos */ @@ -27,9 +30,6 @@ static void _fill_data(Bling *b, E_Config_Dialog_Data *cfdata); -//void -//_config_bling_module(E_Container *con, Bling *b) - EAPI E_Config_Dialog * e_int_config_bling_module(E_Container *con, const char *params __UNUSED__) { @@ -84,6 +84,9 @@ cfdata->fade_opacity = b->config->fx_fade_opacity_enable; cfdata->fade_in_step = b->config->fx_fade_in_step * 100.0; cfdata->fade_out_step = b->config->fx_fade_out_step * 100.0; + + cfdata->inactive_opacity = b->config->trans_inactive_value; + cfdata->inactive_transparent = (cfdata->inactive_opacity == 100) ? 0 : 1; } static void @@ -107,6 +110,8 @@ e_widget_framelist_object_append(of, ob); ob = e_widget_check_add(evas, "Enable Windows In/Out", (&(cfdata->fade_enable))); e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, "Inactive Window Opaque", (&(cfdata->inactive_transparent))); + e_widget_framelist_object_append(of, ob); ob = e_widget_check_add(evas, "Fade On Opacity Changes", (&(cfdata->fade_opacity))); e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o, of, 1, 1, 0.5); @@ -124,6 +129,7 @@ b->config->shadow_enable = cfdata->shadow_enable; b->config->fx_fade_enable = cfdata->fade_enable; b->config->fx_fade_opacity_enable = cfdata->fade_opacity; + b->config->trans_inactive_value = cfdata->inactive_transparent ? 75 : 100; e_config_save_queue(); bling_composite_restart(b); @@ -188,6 +194,12 @@ e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 0, 0); ob = e_widget_slider_add(evas, 1, 0, "%.0f", 1.0, 100.0, 1, 0, &(cfdata->fade_out_step), NULL, 150); e_widget_table_object_append(ot, ob, 1, i, 1, 1, 0, 0, 1, 0); + i++; + + ob = e_widget_label_add(evas, "Window Opacity"); + e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 0, 0); + ob = e_widget_slider_add(evas, 1, 0, "%.0f", 0.0, 100.0, 1, 0, &(cfdata->inactive_opacity), NULL, 150); + e_widget_table_object_append(ot, ob, 1, i, 1, 1, 0, 0, 1, 0); e_widget_framelist_object_append(of, ot); e_widget_list_object_append(o, of, 1, 1, 0.5); @@ -211,6 +223,8 @@ b->config->fx_fade_opacity_enable = cfdata->fade_opacity; b->config->fx_fade_in_step = cfdata->fade_in_step/100.0; b->config->fx_fade_out_step = cfdata->fade_out_step/100.0; + + b->config->trans_inactive_value = cfdata->inactive_opacity; e_config_save_queue(); bling_composite_restart(b); |
From: Enlightenment C. <no...@cv...> - 2008-03-22 03:06:52
|
Enlightenment CVS committal Author : davemds Project : e_modules Module : bling Dir : e_modules/bling Modified Files: e_mod_main.c Log Message: * This seems solved here... if someone can test it... E startup much better now with bling enable :) =================================================================== RCS file: /cvs/e/e_modules/bling/e_mod_main.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- e_mod_main.c 25 Dec 2007 01:03:49 -0000 1.16 +++ e_mod_main.c 22 Mar 2008 03:06:50 -0000 1.17 @@ -33,10 +33,6 @@ b->module = m; bling_mod = m; - - /* Delayed start fix the 'trasparent-window-on-start' bug */ - /* This is a hack. We need to find the bug and solve it!! */ - e_module_delayed_set(m, 1); return b; } |
From: Enlightenment C. <no...@cv...> - 2008-03-22 03:11:56
|
Enlightenment CVS committal Author : davemds Project : e_modules Module : bling Dir : e_modules/bling Modified Files: e_mod_main.c Log Message: * revert previous change :( doesn't work =================================================================== RCS file: /cvs/e/e_modules/bling/e_mod_main.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- e_mod_main.c 22 Mar 2008 03:06:50 -0000 1.17 +++ e_mod_main.c 22 Mar 2008 03:11:52 -0000 1.18 @@ -33,6 +33,10 @@ b->module = m; bling_mod = m; + + /* Delayed start fix the 'trasparent-window-on-start' bug */ + /* This is a hack. We need to find the bug and solve it!! */ + e_module_delayed_set(m, 1); return b; } |
From: Enlightenment C. <no...@cv...> - 2008-04-08 22:00:02
|
Enlightenment CVS committal Author : davemds Project : e_modules Module : bling Dir : e_modules/bling Modified Files: e_mod_main.c Log Message: * auto-enable 'e composite' configuration =================================================================== RCS file: /cvs/e/e_modules/bling/e_mod_main.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- e_mod_main.c 22 Mar 2008 03:11:52 -0000 1.18 +++ e_mod_main.c 8 Apr 2008 22:00:00 -0000 1.19 @@ -24,6 +24,12 @@ Bling *b = NULL; char buf[4096]; + if (!e_config->use_composite) + { + e_config->use_composite = 1; + e_config_save_queue(); + } + b = _bling_init(m); if (!b) return NULL; |