From: Enlightenment S. <no-...@en...> - 2010-08-27 13:55:28
|
Log: Move unused variable(s) to the unused code section(s). Author: devilhorns Date: 2010-08-27 06:55:22 -0700 (Fri, 27 Aug 2010) New Revision: 51679 Modified: trunk/e/src/modules/illume2/e_illume.c Modified: trunk/e/src/modules/illume2/e_illume.c =================================================================== --- trunk/e/src/modules/illume2/e_illume.c 2010-08-27 13:48:48 UTC (rev 51678) +++ trunk/e/src/modules/illume2/e_illume.c 2010-08-27 13:55:22 UTC (rev 51679) @@ -567,8 +567,6 @@ EAPI void e_illume_border_show(E_Border *bd) { - unsigned int visible = 1; - /* make sure we have a border */ if (!bd) return; @@ -576,7 +574,10 @@ e_border_raise(bd); e_border_show(bd); return; + #if 0 + unsigned int visible = 1; + /* NB: We handle shows this way so we don't get extra layout events from * the e_border calls */ e_container_border_lower(bd); @@ -602,14 +603,15 @@ EAPI void e_illume_border_hide(E_Border *bd) { - unsigned int visible = 0; - /* make sure we have a border */ if (!bd) return; e_border_iconify(bd); return; + #if 0 + unsigned int visible = 0; + /* NB: We handle hides this way so we don't get extra layout events from * the e_border calls */ e_container_shape_hide(bd->shape); |
From: Enlightenment S. <no-...@en...> - 2010-08-28 14:28:01
|
Log: Fix issue where hiding quickpanel would not hide the 'clickwindow'. Author: devilhorns Date: 2010-08-28 07:27:54 -0700 (Sat, 28 Aug 2010) New Revision: 51697 Modified: trunk/e/src/modules/illume2/e_mod_quickpanel.c Modified: trunk/e/src/modules/illume2/e_mod_quickpanel.c =================================================================== --- trunk/e/src/modules/illume2/e_mod_quickpanel.c 2010-08-28 13:15:38 UTC (rev 51696) +++ trunk/e/src/modules/illume2/e_mod_quickpanel.c 2010-08-28 14:27:54 UTC (rev 51697) @@ -426,7 +426,7 @@ qp->timer = NULL; /* if it's not visible, we can't hide it */ - if ((!qp->visible) || (!qp->borders)) return; + if (!qp->visible) return; duration = _e_illume_cfg->animation.quickpanel.duration; |
From: Enlightenment S. <no-...@en...> - 2010-12-29 22:07:18
|
Log: Patch from Peter van de Werken to fix uniconify of quickpanel windows. Author: devilhorns Date: 2010-12-29 14:07:11 -0800 (Wed, 29 Dec 2010) New Revision: 55776 Trac: http://trac.enlightenment.org/e/changeset/55776 Modified: trunk/e/src/modules/illume2/e_mod_quickpanel.c Modified: trunk/e/src/modules/illume2/e_mod_quickpanel.c =================================================================== --- trunk/e/src/modules/illume2/e_mod_quickpanel.c 2010-12-29 19:49:05 UTC (rev 55775) +++ trunk/e/src/modules/illume2/e_mod_quickpanel.c 2010-12-29 22:07:11 UTC (rev 55776) @@ -7,6 +7,7 @@ static Eina_Bool _e_mod_quickpanel_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void *event); static Eina_Bool _e_mod_quickpanel_cb_border_remove(void *data __UNUSED__, int type __UNUSED__, void *event); static Eina_Bool _e_mod_quickpanel_cb_border_resize(void *data __UNUSED__, int type __UNUSED__, void *event); +static Eina_Bool _e_mod_quickpanel_cb_border_uniconify(void *data __UNUSED__, int type __UNUSED__, void *event); static void _e_mod_quickpanel_cb_post_fetch(void *data __UNUSED__, void *data2); static void _e_mod_quickpanel_cb_free(E_Illume_Quickpanel *qp); static Eina_Bool _e_mod_quickpanel_cb_delay_hide(void *data); @@ -42,12 +43,16 @@ ecore_event_handler_add(E_EVENT_BORDER_REMOVE, _e_mod_quickpanel_cb_border_remove, NULL)); - _qp_hdls = eina_list_append(_qp_hdls, ecore_event_handler_add(E_EVENT_BORDER_RESIZE, _e_mod_quickpanel_cb_border_resize, NULL)); + _qp_hdls = + eina_list_append(_qp_hdls, + ecore_event_handler_add(E_EVENT_BORDER_UNICONIFY, + _e_mod_quickpanel_cb_border_uniconify, + NULL)); /* add hook for new borders so we can test for qp borders */ _qp_hook = e_border_hook_add(E_BORDER_HOOK_EVAL_PRE_POST_FETCH, @@ -340,6 +345,21 @@ return ECORE_CALLBACK_PASS_ON; } +static Eina_Bool +_e_mod_quickpanel_cb_border_uniconify(void *data __UNUSED__, int type __UNUSED__, void *event) +{ + E_Event_Border_Uniconify *ev; + E_Illume_Quickpanel *qp; + + ev = event; + if (!ev->border->client.illume.quickpanel.quickpanel) + return ECORE_CALLBACK_PASS_ON; + if (!(qp = e_illume_quickpanel_by_zone_get(ev->border->zone))) + return ECORE_CALLBACK_PASS_ON; + e_mod_quickpanel_show(qp); + return ECORE_CALLBACK_PASS_ON; +} + static void _e_mod_quickpanel_cb_post_fetch(void *data __UNUSED__, void *data2) { |
From: Enlightenment S. <no-...@en...> - 2011-01-16 02:05:39
|
Log: Remove goto's. Don't like em, don't need em, don't want em ;) E_FREE already sets pointer to NULL. Fix shutdown order in certain places. Author: devilhorns Date: 2011-01-15 18:05:33 -0800 (Sat, 15 Jan 2011) New Revision: 56158 Trac: http://trac.enlightenment.org/e/changeset/56158 Modified: trunk/e/src/modules/illume2/e_mod_main.c Modified: trunk/e/src/modules/illume2/e_mod_main.c =================================================================== --- trunk/e/src/modules/illume2/e_mod_main.c 2011-01-16 02:01:28 UTC (rev 56157) +++ trunk/e/src/modules/illume2/e_mod_main.c 2011-01-16 02:05:33 UTC (rev 56158) @@ -37,11 +37,28 @@ _e_illume_mod_dir = eina_stringshare_add(m->dir); /* try to initialize the config subsystem */ - if (!e_mod_illume_config_init()) goto err1; + if (!e_mod_illume_config_init()) + { + /* clear module directory variable */ + if (_e_illume_mod_dir) eina_stringshare_del(_e_illume_mod_dir); + _e_illume_mod_dir = NULL; + return NULL; + } + /* try to initialize the policy subsystem */ - if (!e_mod_policy_init()) goto err2; + if (!e_mod_policy_init()) + { + /* shutdown the config subsystem */ + e_mod_illume_config_shutdown(); + /* clear module directory variable */ + if (_e_illume_mod_dir) eina_stringshare_del(_e_illume_mod_dir); + _e_illume_mod_dir = NULL; + + return NULL; + } + /* initialize the keyboard subsystem */ e_mod_kbd_init(); @@ -60,7 +77,25 @@ /* allocate enough zones */ zones = calloc(zcount, sizeof(Ecore_X_Window)); - EINA_SAFETY_ON_NULL_GOTO(zones, err3); + if (!zones) + { + /* free the keyboard */ + E_FREE(_e_illume_kbd); + + /* shutdown quickpanel & kbd sub-systems */ + e_mod_quickpanel_shutdown(); + e_mod_kbd_shutdown(); + + /* shutdown the config subsystem */ + e_mod_illume_config_shutdown(); + + /* clear module directory variable */ + if (_e_illume_mod_dir) eina_stringshare_del(_e_illume_mod_dir); + _e_illume_mod_dir = NULL; + + return NULL; + } + zcount = 0; /* loop the zones and create quickpanels for each one */ @@ -95,20 +130,6 @@ free(zones); return m; -err3: - E_FREE(_e_illume_kbd); - _e_illume_kbd = NULL; - e_mod_quickpanel_shutdown(); - e_mod_kbd_shutdown(); -err2: - /* shutdown the config subsystem */ - e_mod_illume_config_shutdown(); -err1: - /* clear module directory variable */ - if (_e_illume_mod_dir) eina_stringshare_del(_e_illume_mod_dir); - _e_illume_mod_dir = NULL; - - return NULL; } EAPI int |
From: Enlightenment S. <no-...@en...> - 2011-06-28 23:45:25
|
Log: E: Illume2: Quiet down some printfs wrt extra border types. Author: devilhorns Date: 2011-06-28 16:45:19 -0700 (Tue, 28 Jun 2011) New Revision: 60786 Trac: http://trac.enlightenment.org/e/changeset/60786 Modified: trunk/e/src/modules/illume2/e_illume.c Modified: trunk/e/src/modules/illume2/e_illume.c =================================================================== --- trunk/e/src/modules/illume2/e_illume.c 2011-06-28 23:44:29 UTC (rev 60785) +++ trunk/e/src/modules/illume2/e_illume.c 2011-06-28 23:45:19 UTC (rev 60786) @@ -299,9 +299,10 @@ /* check for transient flag */ // if (bd->client.icccm.transient_for != 0) return EINA_TRUE; - /* NB: may or may not need to handle these. Needs Testing */ + /* NB: may or may not need to handle these. Needs Testing if (bd->client.netwm.extra_types) printf("\t\tBorder has extra types: %s\n", bd->client.icccm.class); + */ /* return a fallback */ return EINA_FALSE; @@ -334,9 +335,10 @@ * not a dialog. */ // if (bd->client.icccm.client_leader) return EINA_TRUE; - /* NB: may or may not need to handle these. Needs Testing */ + /* NB: may or may not need to handle these. Needs Testing if (bd->client.netwm.extra_types) printf("\t\tBorder has extra types: %s\n", bd->client.icccm.class); + */ /* return a fallback */ return EINA_FALSE; |
From: Enlightenment S. <no-...@en...> - 2011-08-30 15:00:22
|
Log: E/Illume: Let's keep with the existing formatting shall we ? ;) Author: devilhorns Date: 2011-08-30 08:00:14 -0700 (Tue, 30 Aug 2011) New Revision: 62992 Trac: http://trac.enlightenment.org/e/changeset/62992 Modified: trunk/e/src/modules/illume2/e_illume.c Modified: trunk/e/src/modules/illume2/e_illume.c =================================================================== --- trunk/e/src/modules/illume2/e_illume.c 2011-08-30 14:59:19 UTC (rev 62991) +++ trunk/e/src/modules/illume2/e_illume.c 2011-08-30 15:00:14 UTC (rev 62992) @@ -442,8 +442,8 @@ * * @ingroup E_Illume_Main_Group */ - -EAPI Eina_Bool e_illume_border_is_fixed_size(E_Border *bd) +EAPI Eina_Bool +e_illume_border_is_fixed_size(E_Border *bd) { /* make sure we have a border */ if (!bd) return EINA_FALSE; |