From: Enlightenment S. <no-...@en...> - 2010-11-22 15:21:15
|
Log: desklock_init() should be called only once, poller does the job. Author: barbieri Date: 2010-11-22 07:21:06 -0800 (Mon, 22 Nov 2010) New Revision: 54792 Modified: trunk/e/src/bin/e_desklock.c Modified: trunk/e/src/bin/e_desklock.c =================================================================== --- trunk/e/src/bin/e_desklock.c 2010-11-22 14:27:43 UTC (rev 54791) +++ trunk/e/src/bin/e_desklock.c 2010-11-22 15:21:06 UTC (rev 54792) @@ -1101,7 +1101,6 @@ E_Event_Border_Fullscreen *ev = event; _e_desklock_fullscreen_count = ev->border->desk->fullscreen_borders; - e_desklock_init(); return ECORE_CALLBACK_PASS_ON; } @@ -1114,7 +1113,6 @@ _e_desklock_fullscreen_count = ev->border->desk->fullscreen_borders; else if (ev->desk->visible) _e_desklock_fullscreen_count = ev->desk->fullscreen_borders; - e_desklock_init(); return ECORE_CALLBACK_PASS_ON; } @@ -1124,6 +1122,5 @@ E_Event_Desk_Show *ev = event; _e_desklock_fullscreen_count = ev->desk->fullscreen_borders; - e_desklock_init(); return ECORE_CALLBACK_PASS_ON; } |
From: Enlightenment S. <no-...@en...> - 2010-11-22 15:21:25
|
Log: utility to query for fullscreen in current/all zones. keeping local count of borders is too error prone, instead query it. Right now the count is being done for the current zone only, I guess this is the best policy. Author: barbieri Date: 2010-11-22 07:21:17 -0800 (Mon, 22 Nov 2010) New Revision: 54793 Modified: trunk/e/src/bin/e_desklock.c trunk/e/src/bin/e_dpms.c trunk/e/src/bin/e_screensaver.c trunk/e/src/bin/e_utils.c trunk/e/src/bin/e_utils.h Modified: trunk/e/src/bin/e_desklock.c =================================================================== --- trunk/e/src/bin/e_desklock.c 2010-11-22 15:21:06 UTC (rev 54792) +++ trunk/e/src/bin/e_desklock.c 2010-11-22 15:21:17 UTC (rev 54793) @@ -62,14 +62,6 @@ static double _e_desklock_autolock_time = 0.0; static E_Dialog *_e_desklock_ask_presentation_dia = NULL; static int _e_desklock_ask_presentation_count = 0; -static Ecore_Event_Handler *_e_desklock_handler_border_fullscreen = NULL; -static Ecore_Event_Handler *_e_desklock_handler_border_unfullscreen = NULL; -static Ecore_Event_Handler *_e_desklock_handler_border_remove = NULL; -static Ecore_Event_Handler *_e_desklock_handler_border_iconify = NULL; -static Ecore_Event_Handler *_e_desklock_handler_border_uniconify = NULL; -static Ecore_Event_Handler *_e_desklock_handler_border_desk_set = NULL; -static Ecore_Event_Handler *_e_desklock_handler_desk_show = NULL; -static int _e_desklock_fullscreen_count = 0; /***********************************************************************/ @@ -96,9 +88,6 @@ #endif static void _e_desklock_ask_presentation_mode(void); -static Eina_Bool _e_desklock_handler_border_fullscreen_check_cb(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_desklock_handler_border_desk_set_cb(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_desklock_handler_desk_show_cb(void *data __UNUSED__, int type __UNUSED__, void *event); EAPI int E_EVENT_DESKLOCK = 0; @@ -109,34 +98,6 @@ _e_desklock_idle_poller = ecore_poller_add(ECORE_POLLER_CORE, 256, _e_desklock_cb_idle_poller, NULL); - if (!_e_desklock_handler_border_fullscreen) - _e_desklock_handler_border_fullscreen = ecore_event_handler_add - (E_EVENT_BORDER_FULLSCREEN, _e_desklock_handler_border_fullscreen_check_cb, NULL); - - if (!_e_desklock_handler_border_unfullscreen) - _e_desklock_handler_border_unfullscreen = ecore_event_handler_add - (E_EVENT_BORDER_UNFULLSCREEN, _e_desklock_handler_border_fullscreen_check_cb, NULL); - - if (!_e_desklock_handler_border_remove) - _e_desklock_handler_border_remove = ecore_event_handler_add - (E_EVENT_BORDER_REMOVE, _e_desklock_handler_border_fullscreen_check_cb, NULL); - - if (!_e_desklock_handler_border_iconify) - _e_desklock_handler_border_iconify = ecore_event_handler_add - (E_EVENT_BORDER_ICONIFY, _e_desklock_handler_border_fullscreen_check_cb, NULL); - - if (!_e_desklock_handler_border_uniconify) - _e_desklock_handler_border_uniconify = ecore_event_handler_add - (E_EVENT_BORDER_UNICONIFY, _e_desklock_handler_border_fullscreen_check_cb, NULL); - - if (!_e_desklock_handler_border_desk_set) - _e_desklock_handler_border_desk_set = ecore_event_handler_add - (E_EVENT_BORDER_DESK_SET, _e_desklock_handler_border_desk_set_cb, NULL); - - if (!_e_desklock_handler_desk_show) - _e_desklock_handler_desk_show = ecore_event_handler_add - (E_EVENT_DESK_SHOW, _e_desklock_handler_desk_show_cb, NULL); - if (e_config->desklock_background) e_filereg_register(e_config->desklock_background); @@ -148,48 +109,6 @@ EAPI int e_desklock_shutdown(void) { - if (_e_desklock_handler_border_fullscreen) - { - ecore_event_handler_del(_e_desklock_handler_border_fullscreen); - _e_desklock_handler_border_fullscreen = NULL; - } - - if (_e_desklock_handler_border_unfullscreen) - { - ecore_event_handler_del(_e_desklock_handler_border_unfullscreen); - _e_desklock_handler_border_unfullscreen = NULL; - } - - if (_e_desklock_handler_border_remove) - { - ecore_event_handler_del(_e_desklock_handler_border_remove); - _e_desklock_handler_border_remove = NULL; - } - - if (_e_desklock_handler_border_iconify) - { - ecore_event_handler_del(_e_desklock_handler_border_iconify); - _e_desklock_handler_border_iconify = NULL; - } - - if (_e_desklock_handler_border_uniconify) - { - ecore_event_handler_del(_e_desklock_handler_border_uniconify); - _e_desklock_handler_border_uniconify = NULL; - } - - if (_e_desklock_handler_border_desk_set) - { - ecore_event_handler_del(_e_desklock_handler_border_desk_set); - _e_desklock_handler_border_desk_set = NULL; - } - - if (_e_desklock_handler_desk_show) - { - ecore_event_handler_del(_e_desklock_handler_desk_show); - _e_desklock_handler_desk_show = NULL; - } - e_desklock_hide(); if (e_config->desklock_background) e_filereg_deregister(e_config->desklock_background); @@ -215,7 +134,7 @@ EAPI int e_desklock_show_autolocked(void) { - if (_e_desklock_fullscreen_count > 0) return 0; + if (e_util_fullscreen_curreny_any()) return 0; if (_e_desklock_autolock_time < 1.0) _e_desklock_autolock_time = ecore_loop_time_get(); return e_desklock_show(); @@ -955,7 +874,7 @@ _e_desklock_cb_idle_poller(void *data __UNUSED__) { if ((e_config->desklock_autolock_idle) && (!e_config->mode.presentation) && - (_e_desklock_fullscreen_count <= 0)) + (!e_util_fullscreen_curreny_any())) { double idle, max; @@ -1094,33 +1013,3 @@ _e_desklock_ask_presentation_dia = dia; } - -static Eina_Bool -_e_desklock_handler_border_fullscreen_check_cb(void *data __UNUSED__, int type __UNUSED__, void *event) -{ - E_Event_Border_Fullscreen *ev = event; - - _e_desklock_fullscreen_count = ev->border->desk->fullscreen_borders; - return ECORE_CALLBACK_PASS_ON; -} - -static Eina_Bool -_e_desklock_handler_border_desk_set_cb(void *data __UNUSED__, int type __UNUSED__, void *event) -{ - E_Event_Border_Desk_Set *ev = event; - - if (ev->border->desk->visible) - _e_desklock_fullscreen_count = ev->border->desk->fullscreen_borders; - else if (ev->desk->visible) - _e_desklock_fullscreen_count = ev->desk->fullscreen_borders; - return ECORE_CALLBACK_PASS_ON; -} - -static Eina_Bool -_e_desklock_handler_desk_show_cb(void *data __UNUSED__, int type __UNUSED__, void *event) -{ - E_Event_Desk_Show *ev = event; - - _e_desklock_fullscreen_count = ev->desk->fullscreen_borders; - return ECORE_CALLBACK_PASS_ON; -} Modified: trunk/e/src/bin/e_dpms.c =================================================================== --- trunk/e/src/bin/e_dpms.c 2010-11-22 15:21:06 UTC (rev 54792) +++ trunk/e/src/bin/e_dpms.c 2010-11-22 15:21:17 UTC (rev 54793) @@ -8,7 +8,6 @@ static Ecore_Event_Handler *_e_dpms_handler_border_uniconify = NULL; static Ecore_Event_Handler *_e_dpms_handler_border_desk_set = NULL; static Ecore_Event_Handler *_e_dpms_handler_desk_show = NULL; -static int _e_dpms_fullscreen_count = 0; static Eina_Bool _e_dpms_handler_config_mode_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) @@ -18,34 +17,22 @@ } static Eina_Bool -_e_dpms_handler_border_fullscreen_check_cb(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_dpms_handler_border_fullscreen_check_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) { - E_Event_Border_Fullscreen *ev = event; - - _e_dpms_fullscreen_count = ev->border->desk->fullscreen_borders; e_dpms_init(); return ECORE_CALLBACK_PASS_ON; } static Eina_Bool -_e_dpms_handler_border_desk_set_cb(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_dpms_handler_border_desk_set_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) { - E_Event_Border_Desk_Set *ev = event; - - if (ev->border->desk->visible) - _e_dpms_fullscreen_count = ev->border->desk->fullscreen_borders; - else if (ev->desk->visible) - _e_dpms_fullscreen_count = ev->desk->fullscreen_borders; e_dpms_init(); return ECORE_CALLBACK_PASS_ON; } static Eina_Bool -_e_dpms_handler_desk_show_cb(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_dpms_handler_desk_show_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) { - E_Event_Desk_Show *ev = event; - - _e_dpms_fullscreen_count = ev->desk->fullscreen_borders; e_dpms_init(); return ECORE_CALLBACK_PASS_ON; } @@ -57,7 +44,7 @@ int enabled; enabled = ((e_config->dpms_enable) && (!e_config->mode.presentation) && - (_e_dpms_fullscreen_count <= 0)); + (!e_util_fullscreen_curreny_any())); if (!_e_dpms_handler_config_mode) _e_dpms_handler_config_mode = ecore_event_handler_add Modified: trunk/e/src/bin/e_screensaver.c =================================================================== --- trunk/e/src/bin/e_screensaver.c 2010-11-22 15:21:06 UTC (rev 54792) +++ trunk/e/src/bin/e_screensaver.c 2010-11-22 15:21:17 UTC (rev 54793) @@ -11,7 +11,6 @@ static Ecore_Event_Handler *_e_screensaver_handler_desk_show = NULL; static E_Dialog *_e_screensaver_ask_presentation_dia = NULL; static int _e_screensaver_ask_presentation_count = 0; -static int _e_screensaver_fullscreen_count = 0; static Eina_Bool _e_screensaver_handler_config_mode_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) @@ -148,34 +147,22 @@ } static Eina_Bool -_e_screensaver_handler_border_fullscreen_check_cb(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_screensaver_handler_border_fullscreen_check_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) { - E_Event_Border_Fullscreen *ev = event; - - _e_screensaver_fullscreen_count = ev->border->desk->fullscreen_borders; e_screensaver_init(); return ECORE_CALLBACK_PASS_ON; } static Eina_Bool -_e_screensaver_handler_border_desk_set_cb(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_screensaver_handler_border_desk_set_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) { - E_Event_Border_Desk_Set *ev = event; - - if (ev->border->desk->visible) - _e_screensaver_fullscreen_count = ev->border->desk->fullscreen_borders; - else if (ev->desk->visible) - _e_screensaver_fullscreen_count = ev->desk->fullscreen_borders; e_screensaver_init(); return ECORE_CALLBACK_PASS_ON; } static Eina_Bool -_e_screensaver_handler_desk_show_cb(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_screensaver_handler_desk_show_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) { - E_Event_Desk_Show *ev = event; - - _e_screensaver_fullscreen_count = ev->desk->fullscreen_borders; e_screensaver_init(); return ECORE_CALLBACK_PASS_ON; } @@ -222,7 +209,7 @@ (E_EVENT_DESK_SHOW, _e_screensaver_handler_desk_show_cb, NULL); if ((e_config->screensaver_enable) && (!e_config->mode.presentation) && - (_e_screensaver_fullscreen_count <= 0)) + (!e_util_fullscreen_curreny_any())) timeout = e_config->screensaver_timeout; interval = e_config->screensaver_interval; Modified: trunk/e/src/bin/e_utils.c =================================================================== --- trunk/e/src/bin/e_utils.c 2010-11-22 15:21:06 UTC (rev 54792) +++ trunk/e/src/bin/e_utils.c 2010-11-22 15:21:17 UTC (rev 54793) @@ -26,7 +26,7 @@ struct _E_Util_Image_Import_Settings { E_Dialog *dia; - struct + struct { void (*func)(void *data, const char *path, Eina_Bool ok, Eina_Bool external, int quality, E_Image_Import_Mode mode); void *data; @@ -42,12 +42,12 @@ { Ecore_Exe *exe; Ecore_Event_Handler *handler; - struct + struct { void (*func)(void *data, Eina_Bool ok, const char *image_path, const char *edje_path); void *data; } cb; - struct + struct { const char *image, *edje, *temp; } path; @@ -492,7 +492,7 @@ EAPI unsigned int e_util_icon_size_normalize(unsigned int desired) { - const unsigned int *itr, known_sizes[] = + const unsigned int *itr, known_sizes[] = { 16, 22, 24, 32, 36, 48, 64, 72, 96, 128, 192, 256, -1 }; @@ -555,7 +555,7 @@ } EAPI E_Zone * -e_util_zone_window_find(Ecore_X_Window win) +e_util_zone_window_find(Ecore_X_Window win) { Eina_List *l, *ll, *lll; E_Manager *man; @@ -564,7 +564,7 @@ EINA_LIST_FOREACH(e_manager_list(), l, man) EINA_LIST_FOREACH(man->containers, ll, con) - EINA_LIST_FOREACH(con->zones, lll, zone) + EINA_LIST_FOREACH(con->zones, lll, zone) if (zone->black_win == win) return zone; return NULL; @@ -1403,8 +1403,8 @@ ecore_exe_kill(handle->exe); } -EAPI int -e_util_container_desk_count_get(E_Container *con) +EAPI int +e_util_container_desk_count_get(E_Container *con) { Eina_List *zl; E_Zone *zone; @@ -1412,13 +1412,13 @@ E_OBJECT_CHECK_RETURN(con, 0); E_OBJECT_TYPE_CHECK_RETURN(con, E_CONTAINER_TYPE, 0); - EINA_LIST_FOREACH(con->zones, zl, zone) + EINA_LIST_FOREACH(con->zones, zl, zone) { int x, y; int cx = 0, cy = 0; e_zone_desk_count_get(zone, &cx, &cy); - for (x = 0; x < cx; x++) + for (x = 0; x < cx; x++) { for (y = 0; y < cy; y++) count += 1; @@ -1560,3 +1560,54 @@ return EINA_TRUE; } + +/** + * Checks whenever the current manager/container/zone have fullscreen windows. + */ +EAPI Eina_Bool +e_util_fullscreen_curreny_any(void) +{ + E_Manager *man = e_manager_current_get(); + E_Container *con = e_container_current_get(man); + E_Zone *zone = e_zone_current_get(con); + E_Desk *desk; + + if ((zone) && (zone->fullscreen > 0)) return EINA_TRUE; + desk = e_desk_current_get(zone); + if ((desk) && (desk->fullscreen_borders > 0)) return EINA_TRUE; + return EINA_FALSE; +} + +/** + * Checks whenever any manager/container/zone have fullscreen windows. + */ +EAPI Eina_Bool +e_util_fullscreen_any(void) +{ + E_Zone *zone; + Eina_List *lm, *lc, *lz; + E_Container *con; + E_Manager *man; + E_Desk *desk; + int x, y; + + EINA_LIST_FOREACH(e_manager_list(), lm, man) + { + EINA_LIST_FOREACH(man->containers, lc, con) + { + EINA_LIST_FOREACH(con->zones, lz, zone) + { + if (zone->fullscreen > 0) return EINA_TRUE; + + for (x = 0; x < zone->desk_x_count; x++) + for (y = 0; y < zone->desk_y_count; y++) + { + desk = e_desk_at_xy_get(zone, x, y); + if ((desk) && (desk->fullscreen_borders > 0)) + return EINA_TRUE; + } + } + } + } + return EINA_FALSE; +} Modified: trunk/e/src/bin/e_utils.h =================================================================== --- trunk/e/src/bin/e_utils.h 2010-11-22 15:21:06 UTC (rev 54792) +++ trunk/e/src/bin/e_utils.h 2010-11-22 15:21:17 UTC (rev 54793) @@ -76,5 +76,8 @@ EAPI int e_util_container_desk_count_get(E_Container *con); +EAPI Eina_Bool e_util_fullscreen_curreny_any(void); +EAPI Eina_Bool e_util_fullscreen_any(void); + #endif #endif |
From: Enlightenment S. <no-...@en...> - 2010-11-22 15:21:31
|
Log: do not abuse _init(), provide _update() method instead. Author: barbieri Date: 2010-11-22 07:21:24 -0800 (Mon, 22 Nov 2010) New Revision: 54794 Modified: trunk/e/src/bin/e_dpms.c trunk/e/src/bin/e_dpms.h trunk/e/src/bin/e_main.c trunk/e/src/bin/e_screensaver.c trunk/e/src/bin/e_screensaver.h Modified: trunk/e/src/bin/e_dpms.c =================================================================== --- trunk/e/src/bin/e_dpms.c 2010-11-22 15:21:17 UTC (rev 54793) +++ trunk/e/src/bin/e_dpms.c 2010-11-22 15:21:24 UTC (rev 54794) @@ -9,88 +9,176 @@ static Ecore_Event_Handler *_e_dpms_handler_border_desk_set = NULL; static Ecore_Event_Handler *_e_dpms_handler_desk_show = NULL; +static unsigned int _e_dpms_timeout_standby = 0; +static unsigned int _e_dpms_timeout_suspend = 0; +static unsigned int _e_dpms_timeout_off = 0; +static int _e_dpms_enabled = EINA_FALSE; + + +EAPI void +e_dpms_update(void) +{ + unsigned int standby = 0, suspend = 0, off = 0; + int enabled; + Eina_Bool changed = EINA_FALSE; + + enabled = ((e_config->dpms_enable) && (!e_config->mode.presentation) && + (!e_util_fullscreen_curreny_any())); + + if (_e_dpms_enabled != enabled) + { + _e_dpms_enabled = enabled; + ecore_x_dpms_enabled_set(enabled); + } + if (!enabled) return; + + if (e_config->dpms_standby_enable) + { + standby = e_config->dpms_standby_timeout; + if (_e_dpms_timeout_standby != standby) + { + _e_dpms_timeout_standby = standby; + changed = EINA_TRUE; + } + } + + if (e_config->dpms_suspend_enable) + { + suspend = e_config->dpms_suspend_timeout; + if (_e_dpms_timeout_suspend != suspend) + { + _e_dpms_timeout_suspend = suspend; + changed = EINA_TRUE; + } + } + + if (e_config->dpms_off_enable) + { + off = e_config->dpms_off_timeout; + if (_e_dpms_timeout_off != off) + { + _e_dpms_timeout_off = off; + changed = EINA_TRUE; + } + } + + if (changed) ecore_x_dpms_timeouts_set(standby, suspend, off); +} + static Eina_Bool _e_dpms_handler_config_mode_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) { - e_dpms_init(); + e_dpms_update(); return ECORE_CALLBACK_PASS_ON; } static Eina_Bool _e_dpms_handler_border_fullscreen_check_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) { - e_dpms_init(); + e_dpms_update(); return ECORE_CALLBACK_PASS_ON; } static Eina_Bool _e_dpms_handler_border_desk_set_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) { - e_dpms_init(); + e_dpms_update(); return ECORE_CALLBACK_PASS_ON; } static Eina_Bool _e_dpms_handler_desk_show_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) { - e_dpms_init(); + e_dpms_update(); return ECORE_CALLBACK_PASS_ON; } EAPI int e_dpms_init(void) { - int standby = 0, suspend = 0, off = 0; - int enabled; + _e_dpms_handler_config_mode = ecore_event_handler_add + (E_EVENT_CONFIG_MODE_CHANGED, _e_dpms_handler_config_mode_cb, NULL); - enabled = ((e_config->dpms_enable) && (!e_config->mode.presentation) && - (!e_util_fullscreen_curreny_any())); + _e_dpms_handler_border_fullscreen = ecore_event_handler_add + (E_EVENT_BORDER_FULLSCREEN, _e_dpms_handler_border_fullscreen_check_cb, NULL); - if (!_e_dpms_handler_config_mode) - _e_dpms_handler_config_mode = ecore_event_handler_add - (E_EVENT_CONFIG_MODE_CHANGED, _e_dpms_handler_config_mode_cb, NULL); + _e_dpms_handler_border_unfullscreen = ecore_event_handler_add + (E_EVENT_BORDER_UNFULLSCREEN, _e_dpms_handler_border_fullscreen_check_cb, NULL); - if (!_e_dpms_handler_border_fullscreen) - _e_dpms_handler_border_fullscreen = ecore_event_handler_add - (E_EVENT_BORDER_FULLSCREEN, _e_dpms_handler_border_fullscreen_check_cb, NULL); + _e_dpms_handler_border_remove = ecore_event_handler_add + (E_EVENT_BORDER_REMOVE, _e_dpms_handler_border_fullscreen_check_cb, NULL); - if (!_e_dpms_handler_border_unfullscreen) - _e_dpms_handler_border_unfullscreen = ecore_event_handler_add - (E_EVENT_BORDER_UNFULLSCREEN, _e_dpms_handler_border_fullscreen_check_cb, NULL); + _e_dpms_handler_border_iconify = ecore_event_handler_add + (E_EVENT_BORDER_ICONIFY, _e_dpms_handler_border_fullscreen_check_cb, NULL); - if (!_e_dpms_handler_border_remove) - _e_dpms_handler_border_remove = ecore_event_handler_add - (E_EVENT_BORDER_REMOVE, _e_dpms_handler_border_fullscreen_check_cb, NULL); + _e_dpms_handler_border_uniconify = ecore_event_handler_add + (E_EVENT_BORDER_UNICONIFY, _e_dpms_handler_border_fullscreen_check_cb, NULL); - if (!_e_dpms_handler_border_iconify) - _e_dpms_handler_border_iconify = ecore_event_handler_add - (E_EVENT_BORDER_ICONIFY, _e_dpms_handler_border_fullscreen_check_cb, NULL); + _e_dpms_handler_border_desk_set = ecore_event_handler_add + (E_EVENT_BORDER_DESK_SET, _e_dpms_handler_border_desk_set_cb, NULL); - if (!_e_dpms_handler_border_uniconify) - _e_dpms_handler_border_uniconify = ecore_event_handler_add - (E_EVENT_BORDER_UNICONIFY, _e_dpms_handler_border_fullscreen_check_cb, NULL); + _e_dpms_handler_desk_show = ecore_event_handler_add + (E_EVENT_DESK_SHOW, _e_dpms_handler_desk_show_cb, NULL); - if (!_e_dpms_handler_border_desk_set) - _e_dpms_handler_border_desk_set = ecore_event_handler_add - (E_EVENT_BORDER_DESK_SET, _e_dpms_handler_border_desk_set_cb, NULL); + _e_dpms_enabled = ecore_x_dpms_enabled_get(); + ecore_x_dpms_timeouts_get + (&_e_dpms_timeout_standby, &_e_dpms_timeout_suspend, &_e_dpms_timeout_off); - if (!_e_dpms_handler_desk_show) - _e_dpms_handler_desk_show = ecore_event_handler_add - (E_EVENT_DESK_SHOW, _e_dpms_handler_desk_show_cb, NULL); + e_dpms_update(); - ecore_x_dpms_enabled_set(enabled); - if (!enabled) return 1; + return 1; +} - if (e_config->dpms_standby_enable) - standby = e_config->dpms_standby_timeout; +EAPI int +e_dpms_shutdown(void) +{ + if (_e_dpms_handler_config_mode) + { + ecore_event_handler_del(_e_dpms_handler_config_mode); + _e_dpms_handler_config_mode = NULL; + } - if (e_config->dpms_suspend_enable) - suspend = e_config->dpms_suspend_timeout; + if (_e_dpms_handler_border_fullscreen) + { + ecore_event_handler_del(_e_dpms_handler_border_fullscreen); + _e_dpms_handler_border_fullscreen = NULL; + } - if (e_config->dpms_off_enable) - off = e_config->dpms_off_timeout; + if (_e_dpms_handler_border_unfullscreen) + { + ecore_event_handler_del(_e_dpms_handler_border_unfullscreen); + _e_dpms_handler_border_unfullscreen = NULL; + } - ecore_x_dpms_timeouts_set(standby, suspend, off); + if (_e_dpms_handler_border_remove) + { + ecore_event_handler_del(_e_dpms_handler_border_remove); + _e_dpms_handler_border_remove = NULL; + } + if (_e_dpms_handler_border_iconify) + { + ecore_event_handler_del(_e_dpms_handler_border_iconify); + _e_dpms_handler_border_iconify = NULL; + } + + if (_e_dpms_handler_border_uniconify) + { + ecore_event_handler_del(_e_dpms_handler_border_uniconify); + _e_dpms_handler_border_uniconify = NULL; + } + + if (_e_dpms_handler_border_desk_set) + { + ecore_event_handler_del(_e_dpms_handler_border_desk_set); + _e_dpms_handler_border_desk_set = NULL; + } + + if (_e_dpms_handler_desk_show) + { + ecore_event_handler_del(_e_dpms_handler_desk_show); + _e_dpms_handler_desk_show = NULL; + } + return 1; } Modified: trunk/e/src/bin/e_dpms.h =================================================================== --- trunk/e/src/bin/e_dpms.h 2010-11-22 15:21:17 UTC (rev 54793) +++ trunk/e/src/bin/e_dpms.h 2010-11-22 15:21:24 UTC (rev 54794) @@ -4,6 +4,9 @@ #define E_DPMS_H EAPI int e_dpms_init(void); +EAPI int e_dpms_shutdown(void); +EAPI void e_dpms_update(void); + #endif #endif Modified: trunk/e/src/bin/e_main.c =================================================================== --- trunk/e/src/bin/e_main.c 2010-11-22 15:21:17 UTC (rev 54793) +++ trunk/e/src/bin/e_main.c 2010-11-22 15:21:24 UTC (rev 54794) @@ -800,6 +800,7 @@ e_error_message_show(_("Enlightenment cannot configure the X screensaver.")); _e_main_shutdown(-1); } + _e_main_shutdown_push(e_screensaver_shutdown); e_init_status_set(_("Setup Desklock")); TS("desklock"); @@ -983,6 +984,7 @@ e_error_message_show(_("Enlightenment cannot configure the DPMS settings.")); _e_main_shutdown(-1); } + _e_main_shutdown_push(e_dpms_shutdown); e_init_status_set(_("Setup Powersave modes")); TS("powersave"); Modified: trunk/e/src/bin/e_screensaver.c =================================================================== --- trunk/e/src/bin/e_screensaver.c 2010-11-22 15:21:17 UTC (rev 54793) +++ trunk/e/src/bin/e_screensaver.c 2010-11-22 15:21:24 UTC (rev 54794) @@ -12,10 +12,54 @@ static E_Dialog *_e_screensaver_ask_presentation_dia = NULL; static int _e_screensaver_ask_presentation_count = 0; +static int _e_screensaver_timeout = 0; +static int _e_screensaver_interval = 0; +static int _e_screensaver_blanking = 0; +static int _e_screensaver_expose = 0; + +EAPI void +e_screensaver_update(void) +{ + int timeout = 0, interval = 0, blanking = 0, expose = 0; + int count = (1 + _e_screensaver_ask_presentation_count); + Eina_Bool changed = EINA_FALSE; + + if ((e_config->screensaver_enable) && (!e_config->mode.presentation) && + (!e_util_fullscreen_curreny_any())) + timeout = e_config->screensaver_timeout * count; + + interval = e_config->screensaver_interval; + blanking = e_config->screensaver_blanking; + expose = e_config->screensaver_expose; + + if (_e_screensaver_timeout != timeout) + { + _e_screensaver_timeout = timeout; + changed = EINA_TRUE; + } + if (_e_screensaver_interval != interval) + { + _e_screensaver_interval = interval; + changed = EINA_TRUE; + } + if (_e_screensaver_blanking != blanking) + { + _e_screensaver_blanking = blanking; + changed = EINA_TRUE; + } + if (_e_screensaver_expose != expose) + { + _e_screensaver_expose = expose; + changed = EINA_TRUE; + } + + if (changed) ecore_x_screensaver_set(timeout, interval, blanking, expose); +} + static Eina_Bool _e_screensaver_handler_config_mode_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) { - e_screensaver_init(); + e_screensaver_update(); return ECORE_CALLBACK_PASS_ON; } @@ -46,15 +90,8 @@ static void _e_screensaver_ask_presentation_no_increase(void *data __UNUSED__, E_Dialog *dia) { - int timeout, interval, blanking, expose; - _e_screensaver_ask_presentation_count++; - timeout = e_config->screensaver_timeout * (1 + _e_screensaver_ask_presentation_count); - interval = e_config->screensaver_interval; - blanking = e_config->screensaver_blanking; - expose = e_config->screensaver_expose; - - ecore_x_screensaver_set(timeout, interval, blanking, expose); + e_screensaver_update(); e_object_del(E_OBJECT(dia)); } @@ -149,73 +186,120 @@ static Eina_Bool _e_screensaver_handler_border_fullscreen_check_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) { - e_screensaver_init(); + e_screensaver_update(); return ECORE_CALLBACK_PASS_ON; } static Eina_Bool _e_screensaver_handler_border_desk_set_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) { - e_screensaver_init(); + e_screensaver_update(); return ECORE_CALLBACK_PASS_ON; } static Eina_Bool _e_screensaver_handler_desk_show_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) { - e_screensaver_init(); + e_screensaver_update(); return ECORE_CALLBACK_PASS_ON; } EAPI int e_screensaver_init(void) { - int timeout=0, interval=0, blanking=0, expose=0; + _e_screensaver_handler_config_mode = ecore_event_handler_add + (E_EVENT_CONFIG_MODE_CHANGED, _e_screensaver_handler_config_mode_cb, NULL); - if (!_e_screensaver_handler_config_mode) - _e_screensaver_handler_config_mode = ecore_event_handler_add - (E_EVENT_CONFIG_MODE_CHANGED, _e_screensaver_handler_config_mode_cb, NULL); + _e_screensaver_handler_screensaver_notify = ecore_event_handler_add + (ECORE_X_EVENT_SCREENSAVER_NOTIFY, _e_screensaver_handler_screensaver_notify_cb, NULL); - if (!_e_screensaver_handler_screensaver_notify) - _e_screensaver_handler_screensaver_notify = ecore_event_handler_add - (ECORE_X_EVENT_SCREENSAVER_NOTIFY, _e_screensaver_handler_screensaver_notify_cb, NULL); + _e_screensaver_handler_border_fullscreen = ecore_event_handler_add + (E_EVENT_BORDER_FULLSCREEN, _e_screensaver_handler_border_fullscreen_check_cb, NULL); - if (!_e_screensaver_handler_border_fullscreen) - _e_screensaver_handler_border_fullscreen = ecore_event_handler_add - (E_EVENT_BORDER_FULLSCREEN, _e_screensaver_handler_border_fullscreen_check_cb, NULL); + _e_screensaver_handler_border_unfullscreen = ecore_event_handler_add + (E_EVENT_BORDER_UNFULLSCREEN, _e_screensaver_handler_border_fullscreen_check_cb, NULL); - if (!_e_screensaver_handler_border_unfullscreen) - _e_screensaver_handler_border_unfullscreen = ecore_event_handler_add - (E_EVENT_BORDER_UNFULLSCREEN, _e_screensaver_handler_border_fullscreen_check_cb, NULL); + _e_screensaver_handler_border_remove = ecore_event_handler_add + (E_EVENT_BORDER_REMOVE, _e_screensaver_handler_border_fullscreen_check_cb, NULL); - if (!_e_screensaver_handler_border_remove) - _e_screensaver_handler_border_remove = ecore_event_handler_add - (E_EVENT_BORDER_REMOVE, _e_screensaver_handler_border_fullscreen_check_cb, NULL); + _e_screensaver_handler_border_iconify = ecore_event_handler_add + (E_EVENT_BORDER_ICONIFY, _e_screensaver_handler_border_fullscreen_check_cb, NULL); - if (!_e_screensaver_handler_border_iconify) - _e_screensaver_handler_border_iconify = ecore_event_handler_add - (E_EVENT_BORDER_ICONIFY, _e_screensaver_handler_border_fullscreen_check_cb, NULL); + _e_screensaver_handler_border_uniconify = ecore_event_handler_add + (E_EVENT_BORDER_UNICONIFY, _e_screensaver_handler_border_fullscreen_check_cb, NULL); - if (!_e_screensaver_handler_border_uniconify) - _e_screensaver_handler_border_uniconify = ecore_event_handler_add - (E_EVENT_BORDER_UNICONIFY, _e_screensaver_handler_border_fullscreen_check_cb, NULL); + _e_screensaver_handler_border_desk_set = ecore_event_handler_add + (E_EVENT_BORDER_DESK_SET, _e_screensaver_handler_border_desk_set_cb, NULL); - if (!_e_screensaver_handler_border_desk_set) - _e_screensaver_handler_border_desk_set = ecore_event_handler_add - (E_EVENT_BORDER_DESK_SET, _e_screensaver_handler_border_desk_set_cb, NULL); + _e_screensaver_handler_desk_show = ecore_event_handler_add + (E_EVENT_DESK_SHOW, _e_screensaver_handler_desk_show_cb, NULL); - if (!_e_screensaver_handler_desk_show) - _e_screensaver_handler_desk_show = ecore_event_handler_add - (E_EVENT_DESK_SHOW, _e_screensaver_handler_desk_show_cb, NULL); + _e_screensaver_timeout = ecore_x_screensaver_timeout_get(); + _e_screensaver_interval = ecore_x_screensaver_interval_get(); + _e_screensaver_blanking = ecore_x_screensaver_blank_get(); + _e_screensaver_expose = ecore_x_screensaver_expose_get(); - if ((e_config->screensaver_enable) && (!e_config->mode.presentation) && - (!e_util_fullscreen_curreny_any())) - timeout = e_config->screensaver_timeout; - - interval = e_config->screensaver_interval; - blanking = e_config->screensaver_blanking; - expose = e_config->screensaver_expose; - - ecore_x_screensaver_set(timeout, interval, blanking, expose); + e_screensaver_update(); + return 1; } + +EAPI int +e_screensaver_shutdown(void) +{ + if (_e_screensaver_handler_config_mode) + { + ecore_event_handler_del(_e_screensaver_handler_config_mode); + _e_screensaver_handler_config_mode = NULL; + } + + if (_e_screensaver_handler_screensaver_notify) + { + ecore_event_handler_del(_e_screensaver_handler_screensaver_notify); + _e_screensaver_handler_screensaver_notify = NULL; + } + + if (_e_screensaver_handler_border_fullscreen) + { + ecore_event_handler_del(_e_screensaver_handler_border_fullscreen); + _e_screensaver_handler_border_fullscreen = NULL; + } + + if (_e_screensaver_handler_border_unfullscreen) + { + ecore_event_handler_del(_e_screensaver_handler_border_fullscreen); + _e_screensaver_handler_border_fullscreen = NULL; + } + + if (_e_screensaver_handler_border_remove) + { + ecore_event_handler_del(_e_screensaver_handler_border_fullscreen); + _e_screensaver_handler_border_fullscreen = NULL; + } + + if (_e_screensaver_handler_border_iconify) + { + ecore_event_handler_del(_e_screensaver_handler_border_fullscreen); + _e_screensaver_handler_border_fullscreen = NULL; + } + + if (_e_screensaver_handler_border_uniconify) + { + ecore_event_handler_del(_e_screensaver_handler_border_fullscreen); + _e_screensaver_handler_border_fullscreen = NULL; + } + + if (_e_screensaver_handler_border_desk_set) + { + ecore_event_handler_del(_e_screensaver_handler_border_fullscreen); + _e_screensaver_handler_border_fullscreen = NULL; + } + + if (_e_screensaver_handler_desk_show) + { + ecore_event_handler_del(_e_screensaver_handler_border_fullscreen); + _e_screensaver_handler_border_fullscreen = NULL; + } + + return 1; +} Modified: trunk/e/src/bin/e_screensaver.h =================================================================== --- trunk/e/src/bin/e_screensaver.h 2010-11-22 15:21:17 UTC (rev 54793) +++ trunk/e/src/bin/e_screensaver.h 2010-11-22 15:21:24 UTC (rev 54794) @@ -4,6 +4,9 @@ #define E_SCREENSAVER_H EAPI int e_screensaver_init(void); +EAPI int e_screensaver_shutdown(void); +EAPI void e_screensaver_update(void); + #endif #endif |
From: Enlightenment S. <no-...@en...> - 2010-11-22 15:21:41
|
Log: convert init/shutdown to EINTERN, move some to _update(). Do not abuse the concept of e_*_init(), make them call-once and those that needed multiple call are renamed to e_*_update(). To make sure convert them to EINTERN so the symbols are not exported. Actually I guess too much is exported as EAPI while they should be EINTERN, but that would require manual investigation, while this patch was basically created with sed + grep. Author: barbieri Date: 2010-11-22 07:21:32 -0800 (Mon, 22 Nov 2010) New Revision: 54795 Modified: trunk/e/src/bin/e_acpi.c trunk/e/src/bin/e_acpi.h trunk/e/src/bin/e_actions.c trunk/e/src/bin/e_actions.h trunk/e/src/bin/e_alert.c trunk/e/src/bin/e_alert.h trunk/e/src/bin/e_atoms.c trunk/e/src/bin/e_atoms.h trunk/e/src/bin/e_bg.c trunk/e/src/bin/e_bg.h trunk/e/src/bin/e_bindings.c trunk/e/src/bin/e_bindings.h trunk/e/src/bin/e_border.c trunk/e/src/bin/e_border.h trunk/e/src/bin/e_color_class.c trunk/e/src/bin/e_color_class.h trunk/e/src/bin/e_config.c trunk/e/src/bin/e_config.h trunk/e/src/bin/e_configure.c trunk/e/src/bin/e_configure.h trunk/e/src/bin/e_container.c trunk/e/src/bin/e_container.h trunk/e/src/bin/e_desk.c trunk/e/src/bin/e_desk.h trunk/e/src/bin/e_desklock.c trunk/e/src/bin/e_desklock.h trunk/e/src/bin/e_dnd.c trunk/e/src/bin/e_dnd.h trunk/e/src/bin/e_dpms.c trunk/e/src/bin/e_dpms.h trunk/e/src/bin/e_exec.c trunk/e/src/bin/e_exec.h trunk/e/src/bin/e_exehist.c trunk/e/src/bin/e_exehist.h trunk/e/src/bin/e_filereg.c trunk/e/src/bin/e_filereg.h trunk/e/src/bin/e_fm.c trunk/e/src/bin/e_fm.h trunk/e/src/bin/e_fm_custom.c trunk/e/src/bin/e_fm_custom.h trunk/e/src/bin/e_fm_op_registry.c trunk/e/src/bin/e_fm_op_registry.h trunk/e/src/bin/e_focus.c trunk/e/src/bin/e_focus.h trunk/e/src/bin/e_font.c trunk/e/src/bin/e_font.h trunk/e/src/bin/e_gadcon.c trunk/e/src/bin/e_gadcon.h trunk/e/src/bin/e_grabinput.c trunk/e/src/bin/e_grabinput.h trunk/e/src/bin/e_hints.c trunk/e/src/bin/e_hints.h trunk/e/src/bin/e_init.c trunk/e/src/bin/e_init.h trunk/e/src/bin/e_init_main.c trunk/e/src/bin/e_int_menus.c trunk/e/src/bin/e_intl.c trunk/e/src/bin/e_intl.h trunk/e/src/bin/e_intl_data.c trunk/e/src/bin/e_intl_data.h trunk/e/src/bin/e_ipc.c trunk/e/src/bin/e_ipc.h trunk/e/src/bin/e_ipc_codec.c trunk/e/src/bin/e_ipc_codec.h trunk/e/src/bin/e_main.c trunk/e/src/bin/e_manager.c trunk/e/src/bin/e_manager.h trunk/e/src/bin/e_menu.c trunk/e/src/bin/e_menu.h trunk/e/src/bin/e_module.c trunk/e/src/bin/e_module.h trunk/e/src/bin/e_mouse.c trunk/e/src/bin/e_mouse.h trunk/e/src/bin/e_moveresize.c trunk/e/src/bin/e_moveresize.h trunk/e/src/bin/e_msg.c trunk/e/src/bin/e_msg.h trunk/e/src/bin/e_msgbus.c trunk/e/src/bin/e_msgbus.h trunk/e/src/bin/e_order.c trunk/e/src/bin/e_order.h trunk/e/src/bin/e_pointer.c trunk/e/src/bin/e_pointer.h trunk/e/src/bin/e_popup.c trunk/e/src/bin/e_popup.h trunk/e/src/bin/e_powersave.c trunk/e/src/bin/e_powersave.h trunk/e/src/bin/e_prefix.c trunk/e/src/bin/e_prefix.h trunk/e/src/bin/e_randr.c trunk/e/src/bin/e_randr.h trunk/e/src/bin/e_remember.c trunk/e/src/bin/e_remember.h trunk/e/src/bin/e_scale.c trunk/e/src/bin/e_scale.h trunk/e/src/bin/e_screensaver.c trunk/e/src/bin/e_screensaver.h trunk/e/src/bin/e_shelf.c trunk/e/src/bin/e_shelf.h trunk/e/src/bin/e_sys.c trunk/e/src/bin/e_sys.h trunk/e/src/bin/e_theme.c trunk/e/src/bin/e_theme.h trunk/e/src/bin/e_thumb.c trunk/e/src/bin/e_thumb.h trunk/e/src/bin/e_toolbar.c trunk/e/src/bin/e_toolbar.h trunk/e/src/bin/e_win.c trunk/e/src/bin/e_win.h trunk/e/src/bin/e_xinerama.c trunk/e/src/bin/e_xinerama.h trunk/e/src/bin/e_zone.c trunk/e/src/bin/e_zone.h Modified: trunk/e/src/bin/e_acpi.c =================================================================== --- trunk/e/src/bin/e_acpi.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_acpi.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -60,7 +60,7 @@ EAPI int E_EVENT_ACPI_WIFI = 0; /* public functions */ -EAPI int +EINTERN int e_acpi_init(void) { const ACPIDevice *dev; @@ -120,7 +120,7 @@ return 1; } -EAPI int +EINTERN int e_acpi_shutdown(void) { Ecore_Event_Handler *hdl; Modified: trunk/e/src/bin/e_acpi.h =================================================================== --- trunk/e/src/bin/e_acpi.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_acpi.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -48,8 +48,8 @@ int type, signal, status; }; -EAPI int e_acpi_init(void); -EAPI int e_acpi_shutdown(void); +EINTERN int e_acpi_init(void); +EINTERN int e_acpi_shutdown(void); EAPI void e_acpi_events_freeze(void); EAPI void e_acpi_events_thaw(void); Modified: trunk/e/src/bin/e_actions.c =================================================================== --- trunk/e/src/bin/e_actions.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_actions.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -2568,7 +2568,7 @@ /* externally accessible functions */ -EAPI int +EINTERN int e_actions_init(void) { E_Action *act; @@ -2989,7 +2989,7 @@ return 1; } -EAPI int +EINTERN int e_actions_shutdown(void) { e_action_predef_name_all_del(); Modified: trunk/e/src/bin/e_actions.h =================================================================== --- trunk/e/src/bin/e_actions.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_actions.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -45,8 +45,8 @@ Eina_List *acts; }; -EAPI int e_actions_init(void); -EAPI int e_actions_shutdown(void); +EINTERN int e_actions_init(void); +EINTERN int e_actions_shutdown(void); EAPI Eina_List *e_action_name_list(void); EAPI E_Action *e_action_add(const char *name); Modified: trunk/e/src/bin/e_alert.c =================================================================== --- trunk/e/src/bin/e_alert.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_alert.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -1,3 +1,4 @@ +#include "e.h" #include "e_alert.h" #include <stdio.h> @@ -25,7 +26,7 @@ EAPI unsigned long e_alert_composite_win = 0; /* externally accessible functions */ -EAPI int +EINTERN int e_alert_init(const char *disp) { XGCValues gcv; @@ -72,7 +73,7 @@ return 1; } -EAPI int +EINTERN int e_alert_shutdown(void) { XDestroyWindow(dd, win); Modified: trunk/e/src/bin/e_alert.h =================================================================== --- trunk/e/src/bin/e_alert.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_alert.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -4,8 +4,8 @@ #ifndef E_ALERT_H #define E_ALERT_H -int e_alert_init(const char *disp); -int e_alert_shutdown(void); +EINTERN int e_alert_init(const char *disp); +EINTERN int e_alert_shutdown(void); void e_alert_show(const char *text); Modified: trunk/e/src/bin/e_atoms.c =================================================================== --- trunk/e/src/bin/e_atoms.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_atoms.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -14,7 +14,7 @@ EAPI Ecore_X_Atom E_ATOM_DESKTOP_FILE = 0; /* externally accessible functions */ -EAPI int +EINTERN int e_atoms_init(void) { const char *atom_names[] = { @@ -47,7 +47,7 @@ return 1; } -EAPI int +EINTERN int e_atoms_shutdown(void) { /* Nothing really to do here yet, just present for consistency right now */ Modified: trunk/e/src/bin/e_atoms.h =================================================================== --- trunk/e/src/bin/e_atoms.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_atoms.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -25,8 +25,8 @@ extern EAPI Ecore_X_Atom E_ATOM_WINDOW_STATE; extern EAPI Ecore_X_Atom E_ATOM_WINDOW_STATE_CENTERED; -EAPI int e_atoms_init(void); -EAPI int e_atoms_shutdown(void); +EINTERN int e_atoms_init(void); +EINTERN int e_atoms_shutdown(void); #endif #endif Modified: trunk/e/src/bin/e_bg.c =================================================================== --- trunk/e/src/bin/e_bg.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_bg.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -40,7 +40,7 @@ }; /* externally accessible functions */ -EAPI int +EINTERN int e_bg_init(void) { Eina_List *l = NULL; @@ -72,7 +72,7 @@ return 1; } -EAPI int +EINTERN int e_bg_shutdown(void) { Eina_List *l = NULL; Modified: trunk/e/src/bin/e_bg.h =================================================================== --- trunk/e/src/bin/e_bg.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_bg.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -25,8 +25,8 @@ int desk_y; }; -EAPI int e_bg_init(void); -EAPI int e_bg_shutdown(void); +EINTERN int e_bg_init(void); +EINTERN int e_bg_shutdown(void); EAPI const E_Config_Desktop_Background *e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y); EAPI const char *e_bg_file_get(int container_num, int zone_num, int desk_x, int desk_y); Modified: trunk/e/src/bin/e_bindings.c =================================================================== --- trunk/e/src/bin/e_bindings.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_bindings.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -37,7 +37,7 @@ /* externally accessible functions */ -EAPI int +EINTERN int e_bindings_init(void) { E_Config_Binding_Signal *ebs; @@ -95,7 +95,7 @@ return 1; } -EAPI int +EINTERN int e_bindings_shutdown(void) { E_FREE_LIST(mouse_bindings, _e_bindings_mouse_free); Modified: trunk/e/src/bin/e_bindings.h =================================================================== --- trunk/e/src/bin/e_bindings.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_bindings.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -100,8 +100,8 @@ const char *action, *params; }; -EAPI int e_bindings_init(void); -EAPI int e_bindings_shutdown(void); +EINTERN int e_bindings_init(void); +EINTERN int e_bindings_shutdown(void); EAPI void e_bindings_mouse_add(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, const char *action, const char *params); EAPI void e_bindings_mouse_del(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, const char *action, const char *params); Modified: trunk/e/src/bin/e_border.c =================================================================== --- trunk/e/src/bin/e_border.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_border.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -169,7 +169,7 @@ ecore_x_window_gravity_set(bd->client.win, grav); /* externally accessible functions */ -EAPI int +EINTERN int e_border_init(void) { handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHOW_REQUEST, _e_border_cb_window_show_request, NULL)); @@ -225,7 +225,7 @@ return 1; } -EAPI int +EINTERN int e_border_shutdown(void) { E_FREE_LIST(handlers, ecore_event_handler_del); Modified: trunk/e/src/bin/e_border.h =================================================================== --- trunk/e/src/bin/e_border.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_border.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -605,8 +605,8 @@ E_Stacking type; }; -EAPI int e_border_init(void); -EAPI int e_border_shutdown(void); +EINTERN int e_border_init(void); +EINTERN int e_border_shutdown(void); EAPI E_Border *e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal); EAPI void e_border_free(E_Border *bd); Modified: trunk/e/src/bin/e_color_class.c =================================================================== --- trunk/e/src/bin/e_color_class.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_color_class.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -1,6 +1,6 @@ #include "e.h" -EAPI int +EINTERN int e_color_class_init(void) { const Eina_List *l; @@ -20,7 +20,7 @@ return 1; } -EAPI int +EINTERN int e_color_class_shutdown(void) { return 1; Modified: trunk/e/src/bin/e_color_class.h =================================================================== --- trunk/e/src/bin/e_color_class.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_color_class.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -14,8 +14,8 @@ int r3, g3, b3, a3; }; -EAPI int e_color_class_init(void); -EAPI int e_color_class_shutdown(void); +EINTERN int e_color_class_init(void); +EINTERN int e_color_class_shutdown(void); EAPI void e_color_class_instance_set(E_Color_Class *cc, int r, int g, int b, int a, Modified: trunk/e/src/bin/e_config.c =================================================================== --- trunk/e/src/bin/e_config.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_config.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -117,7 +117,7 @@ } /* externally accessible functions */ -EAPI int +EINTERN int e_config_init(void) { E_EVENT_CONFIG_ICON_THEME = ecore_event_type_new(); @@ -883,7 +883,7 @@ return 1; } -EAPI int +EINTERN int e_config_shutdown(void) { E_FREE(_e_config_profile); Modified: trunk/e/src/bin/e_config.h =================================================================== --- trunk/e/src/bin/e_config.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_config.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -501,8 +501,8 @@ const char *icon_theme; }; -EAPI int e_config_init(void); -EAPI int e_config_shutdown(void); +EINTERN int e_config_init(void); +EINTERN int e_config_shutdown(void); EAPI void e_config_load(void); Modified: trunk/e/src/bin/e_configure.c =================================================================== --- trunk/e/src/bin/e_configure.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_configure.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -22,7 +22,7 @@ const char *data; } custom_desktop_exec = { NULL, NULL }; -EAPI void +EINTERN void e_configure_init(void) { e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, "preferences-extensions"); Modified: trunk/e/src/bin/e_configure.h =================================================================== --- trunk/e/src/bin/e_configure.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_configure.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -37,7 +37,7 @@ EAPI void e_configure_registry_call(const char *path, E_Container *con, const char *params); EAPI int e_configure_registry_exists(const char *path); EAPI void e_configure_registry_custom_desktop_exec_callback_set(void (*func) (const void *data, E_Container *con, const char *params, Efreet_Desktop *desktop), const void *data); -EAPI void e_configure_init(void); +EINTERN void e_configure_init(void); extern EAPI Eina_List *e_configure_registry; Modified: trunk/e/src/bin/e_container.c =================================================================== --- trunk/e/src/bin/e_container.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_container.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -30,7 +30,7 @@ static Eina_List *handlers = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_container_init(void) { E_EVENT_CONTAINER_RESIZE = ecore_event_type_new(); @@ -45,7 +45,7 @@ return 1; } -EAPI int +EINTERN int e_container_shutdown(void) { E_FREE_LIST(handlers, ecore_event_handler_del); Modified: trunk/e/src/bin/e_container.h =================================================================== --- trunk/e/src/bin/e_container.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_container.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -84,8 +84,8 @@ E_Container *container; }; -EAPI int e_container_init(void); -EAPI int e_container_shutdown(void); +EINTERN int e_container_init(void); +EINTERN int e_container_shutdown(void); EAPI E_Container *e_container_new(E_Manager *man); EAPI void e_container_show(E_Container *con); Modified: trunk/e/src/bin/e_desk.c =================================================================== --- trunk/e/src/bin/e_desk.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_desk.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -24,7 +24,7 @@ EAPI int E_EVENT_DESK_DESKSHOW = 0; EAPI int E_EVENT_DESK_NAME_CHANGE = 0; -EAPI int +EINTERN int e_desk_init(void) { E_EVENT_DESK_SHOW = ecore_event_type_new(); @@ -35,7 +35,7 @@ return 1; } -EAPI int +EINTERN int e_desk_shutdown(void) { return 1; Modified: trunk/e/src/bin/e_desk.h =================================================================== --- trunk/e/src/bin/e_desk.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_desk.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -49,8 +49,8 @@ E_Desk *desk; }; -EAPI int e_desk_init(void); -EAPI int e_desk_shutdown(void); +EINTERN int e_desk_init(void); +EINTERN int e_desk_shutdown(void); EAPI E_Desk *e_desk_new(E_Zone *zone, int x, int y); EAPI void e_desk_name_set(E_Desk *desk, const char *name); EAPI void e_desk_name_add(int container, int zone, int desk_x, int desk_y, const char *name); Modified: trunk/e/src/bin/e_desklock.c =================================================================== --- trunk/e/src/bin/e_desklock.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_desklock.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -91,7 +91,7 @@ EAPI int E_EVENT_DESKLOCK = 0; -EAPI int +EINTERN int e_desklock_init(void) { /* A poller to tick every 256 ticks, watching for an idle user */ @@ -106,7 +106,7 @@ return 1; } -EAPI int +EINTERN int e_desklock_shutdown(void) { e_desklock_hide(); Modified: trunk/e/src/bin/e_desklock.h =================================================================== --- trunk/e/src/bin/e_desklock.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_desklock.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -11,8 +11,8 @@ int on; }; -EAPI int e_desklock_init(void); -EAPI int e_desklock_shutdown(void); +EINTERN int e_desklock_init(void); +EINTERN int e_desklock_shutdown(void); EAPI int e_desklock_show(void); EAPI int e_desklock_show_autolocked(void); Modified: trunk/e/src/bin/e_dnd.c =================================================================== --- trunk/e/src/bin/e_dnd.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_dnd.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -71,7 +71,7 @@ /* externally accessible functions */ -EAPI int +EINTERN int e_dnd_init(void) { _type_text_uri_list = eina_stringshare_add("text/uri-list"); @@ -123,7 +123,7 @@ return 1; } -EAPI int +EINTERN int e_dnd_shutdown(void) { E_FREE_LIST(_drag_list, e_object_del); Modified: trunk/e/src/bin/e_dnd.h =================================================================== --- trunk/e/src/bin/e_dnd.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_dnd.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -104,8 +104,8 @@ int x, y; }; -EAPI int e_dnd_init(void); -EAPI int e_dnd_shutdown(void); +EINTERN int e_dnd_init(void); +EINTERN int e_dnd_shutdown(void); EAPI int e_dnd_active(void); Modified: trunk/e/src/bin/e_dpms.c =================================================================== --- trunk/e/src/bin/e_dpms.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_dpms.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -93,7 +93,7 @@ return ECORE_CALLBACK_PASS_ON; } -EAPI int +EINTERN int e_dpms_init(void) { _e_dpms_handler_config_mode = ecore_event_handler_add @@ -129,7 +129,7 @@ return 1; } -EAPI int +EINTERN int e_dpms_shutdown(void) { if (_e_dpms_handler_config_mode) Modified: trunk/e/src/bin/e_dpms.h =================================================================== --- trunk/e/src/bin/e_dpms.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_dpms.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -3,8 +3,8 @@ #ifndef E_DPMS_H #define E_DPMS_H -EAPI int e_dpms_init(void); -EAPI int e_dpms_shutdown(void); +EINTERN int e_dpms_init(void); +EINTERN int e_dpms_shutdown(void); EAPI void e_dpms_update(void); Modified: trunk/e/src/bin/e_exec.c =================================================================== --- trunk/e/src/bin/e_exec.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_exec.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -63,7 +63,7 @@ static Ecore_Event_Handler *_e_exec_border_add_handler = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_exec_init(void) { e_exec_instances = eina_hash_string_superfast_new(NULL); @@ -77,7 +77,7 @@ return 1; } -EAPI int +EINTERN int e_exec_shutdown(void) { char buf[256]; Modified: trunk/e/src/bin/e_exec.h =================================================================== --- trunk/e/src/bin/e_exec.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_exec.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -16,8 +16,8 @@ Ecore_Timer *expire_timer; }; -EAPI int e_exec_init(void); -EAPI int e_exec_shutdown(void); +EINTERN int e_exec_init(void); +EINTERN int e_exec_shutdown(void); EAPI E_Exec_Instance *e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec, Eina_List *files, const char *launch_method); EAPI Efreet_Desktop *e_exec_startup_id_pid_find(int startup_id, pid_t pid); Modified: trunk/e/src/bin/e_exehist.c =================================================================== --- trunk/e/src/bin/e_exehist.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_exehist.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -40,7 +40,7 @@ static int _e_exehist_changes = 0; /* externally accessible functions */ -EAPI int +EINTERN int e_exehist_init(void) { _e_exehist_config_item_edd = E_CONFIG_DD_NEW("E_Exehist_Item", E_Exehist_Item); @@ -66,7 +66,7 @@ return 1; } -EAPI int +EINTERN int e_exehist_shutdown(void) { if (_e_exehist_unload_defer) Modified: trunk/e/src/bin/e_exehist.h =================================================================== --- trunk/e/src/bin/e_exehist.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_exehist.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -11,8 +11,8 @@ E_EXEHIST_SORT_BY_POPULARITY } E_Exehist_Sort; -EAPI int e_exehist_init(void); -EAPI int e_exehist_shutdown(void); +EINTERN int e_exehist_init(void); +EINTERN int e_exehist_shutdown(void); EAPI void e_exehist_add(const char *launch_method, const char *exe); EAPI void e_exehist_del(const char *exe); Modified: trunk/e/src/bin/e_filereg.c =================================================================== --- trunk/e/src/bin/e_filereg.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_filereg.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -19,7 +19,7 @@ void *data, void *fdata __UNUSED__); /* Externally accessible functions */ -EAPI int +EINTERN int e_filereg_init(void) { _e_filereg = eina_hash_string_superfast_new(NULL); @@ -27,7 +27,7 @@ return 1; } -EAPI int +EINTERN int e_filereg_shutdown(void) { eina_hash_foreach(_e_filereg, _filereg_hash_cb_free, NULL); Modified: trunk/e/src/bin/e_filereg.h =================================================================== --- trunk/e/src/bin/e_filereg.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_filereg.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -4,8 +4,8 @@ #ifndef E_FILEREG_H #define E_FILEREG_H -EAPI int e_filereg_init(void); -EAPI int e_filereg_shutdown(void); +EINTERN int e_filereg_init(void); +EINTERN int e_filereg_shutdown(void); EAPI int e_filereg_register(const char * path); EAPI void e_filereg_deregister(const char * path); Modified: trunk/e/src/bin/e_fm.c =================================================================== --- trunk/e/src/bin/e_fm.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_fm.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -692,7 +692,7 @@ /***/ -EAPI int +EINTERN int e_fm2_init(void) { char path[PATH_MAX]; @@ -762,7 +762,7 @@ return 1; } -EAPI int +EINTERN int e_fm2_shutdown(void) { eina_stringshare_replace(&_e_fm2_icon_desktop_str, NULL); Modified: trunk/e/src/bin/e_fm.h =================================================================== --- trunk/e/src/bin/e_fm.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_fm.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -129,8 +129,8 @@ typedef void (*E_Fm_Cb) (void *data, Evas_Object *obj, E_Menu *m, E_Fm2_Icon_Info *info); -EAPI int e_fm2_init(void); -EAPI int e_fm2_shutdown(void); +EINTERN int e_fm2_init(void); +EINTERN int e_fm2_shutdown(void); EAPI Evas_Object *e_fm2_add(Evas *evas); EAPI void e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path); EAPI void e_fm2_custom_theme_set(Evas_Object *obj, const char *path); Modified: trunk/e/src/bin/e_fm_custom.c =================================================================== --- trunk/e/src/bin/e_fm_custom.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_fm_custom.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -26,7 +26,7 @@ */ /* externally accessible functions */ -EAPI int +EINTERN int e_fm2_custom_file_init(void) { Eet_Data_Descriptor_Class eddc; @@ -81,7 +81,7 @@ return 1; } -EAPI void +EINTERN void e_fm2_custom_file_shutdown(void) { _e_fm2_custom_init--; Modified: trunk/e/src/bin/e_fm_custom.h =================================================================== --- trunk/e/src/bin/e_fm_custom.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_fm_custom.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -39,8 +39,8 @@ /* FIXME: this will have more added */ }; -EAPI int e_fm2_custom_file_init(void); -EAPI void e_fm2_custom_file_shutdown(void); +EINTERN int e_fm2_custom_file_init(void); +EINTERN void e_fm2_custom_file_shutdown(void); EAPI E_Fm2_Custom_File *e_fm2_custom_file_get(const char *path); EAPI void e_fm2_custom_file_set(const char *path, const E_Fm2_Custom_File *cf); EAPI void e_fm2_custom_file_del(const char *path); Modified: trunk/e/src/bin/e_fm_op_registry.c =================================================================== --- trunk/e/src/bin/e_fm_op_registry.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_fm_op_registry.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -465,7 +465,7 @@ } -EAPI unsigned int +EINTERN unsigned int e_fm2_op_registry_init(void) { _e_fm2_init_count++; @@ -488,7 +488,7 @@ return 1; } -EAPI unsigned int +EINTERN unsigned int e_fm2_op_registry_shutdown(void) { if (_e_fm2_init_count == 0) return 0; Modified: trunk/e/src/bin/e_fm_op_registry.h =================================================================== --- trunk/e/src/bin/e_fm_op_registry.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_fm_op_registry.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -63,8 +63,8 @@ EAPI void e_fm2_op_registry_entry_abort(E_Fm2_Op_Registry_Entry *entry); -EAPI unsigned int e_fm2_op_registry_init(void); -EAPI unsigned int e_fm2_op_registry_shutdown(void); +EINTERN unsigned int e_fm2_op_registry_init(void); +EINTERN unsigned int e_fm2_op_registry_shutdown(void); /* E internal/private functions, symbols not exported outside e binary (e_fm.c mainly) */ Eina_Bool e_fm2_op_registry_entry_add(int id, Evas_Object *e_fm, E_Fm_Op_Type op, E_Fm2_Op_Registry_Abort_Func abort); Modified: trunk/e/src/bin/e_focus.c =================================================================== --- trunk/e/src/bin/e_focus.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_focus.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -6,13 +6,13 @@ /* local subsystem globals */ /* externally accessible functions */ -EAPI int +EINTERN int e_focus_init(void) { return 1; } -EAPI int +EINTERN int e_focus_shutdown(void) { return 1; Modified: trunk/e/src/bin/e_focus.h =================================================================== --- trunk/e/src/bin/e_focus.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_focus.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -3,8 +3,8 @@ #ifndef E_FOCUS_H #define E_FOCUS_H -EAPI int e_focus_init(void); -EAPI int e_focus_shutdown(void); +EINTERN int e_focus_init(void); +EINTERN int e_focus_shutdown(void); EAPI void e_focus_idler_before(void); EAPI void e_focus_event_mouse_in(E_Border* bd); Modified: trunk/e/src/bin/e_font.c =================================================================== --- trunk/e/src/bin/e_font.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_font.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -7,14 +7,14 @@ static E_Font_Properties *_e_font_fontconfig_name_parse(Eina_Hash **font_hash, E_Font_Properties *efp, const char *font); static char _fn_buf[1024]; -EAPI int +EINTERN int e_font_init(void) { /* all init stuff is in e_config */ return 1; } -EAPI int +EINTERN int e_font_shutdown(void) { /* e_config will do this */ Modified: trunk/e/src/bin/e_font.h =================================================================== --- trunk/e/src/bin/e_font.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_font.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -32,8 +32,8 @@ Eina_List *styles; }; -EAPI int e_font_init(void); -EAPI int e_font_shutdown(void); +EINTERN int e_font_init(void); +EINTERN int e_font_shutdown(void); EAPI void e_font_apply(void); EAPI Eina_List *e_font_available_list(void); EAPI void e_font_available_list_free(Eina_List *available); Modified: trunk/e/src/bin/e_gadcon.c =================================================================== --- trunk/e/src/bin/e_gadcon.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_gadcon.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -193,13 +193,13 @@ static E_Gadcon_Client *new_gcc = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_gadcon_init(void) { return 1; } -EAPI int +EINTERN int e_gadcon_shutdown(void) { eina_list_free(populate_requests); Modified: trunk/e/src/bin/e_gadcon.h =================================================================== --- trunk/e/src/bin/e_gadcon.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_gadcon.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -233,8 +233,8 @@ } gadget_remove; }; -EAPI int e_gadcon_init(void); -EAPI int e_gadcon_shutdown(void); +EINTERN int e_gadcon_init(void); +EINTERN int e_gadcon_shutdown(void); EAPI void e_gadcon_provider_register(const E_Gadcon_Client_Class *cc); EAPI void e_gadcon_provider_unregister(const E_Gadcon_Client_Class *cc); EAPI Eina_List *e_gadcon_provider_list(void); Modified: trunk/e/src/bin/e_grabinput.c =================================================================== --- trunk/e/src/bin/e_grabinput.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_grabinput.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -11,13 +11,13 @@ static double last_focus_time = 0.0; /* externally accessible functions */ -EAPI int +EINTERN int e_grabinput_init(void) { return 1; } -EAPI int +EINTERN int e_grabinput_shutdown(void) { return 1; Modified: trunk/e/src/bin/e_grabinput.h =================================================================== --- trunk/e/src/bin/e_grabinput.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_grabinput.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -12,8 +12,8 @@ #ifndef E_GRABINPUT_H #define E_GRABINPUT_H -EAPI int e_grabinput_init(void); -EAPI int e_grabinput_shutdown(void); +EINTERN int e_grabinput_init(void); +EINTERN int e_grabinput_shutdown(void); EAPI int e_grabinput_get(Ecore_X_Window mouse_win, int confine_mouse, Ecore_X_Window key_win); EAPI void e_grabinput_release(Ecore_X_Window mouse_win, Ecore_X_Window key_win); EAPI void e_grabinput_focus(Ecore_X_Window win, E_Focus_Method method); Modified: trunk/e/src/bin/e_hints.c =================================================================== --- trunk/e/src/bin/e_hints.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_hints.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -7,7 +7,7 @@ EAPI Ecore_X_Atom ATM_ENLIGHTENMENT_VERSION = 0; EAPI Ecore_X_Atom ATM_ENLIGHTENMENT_SCALE = 0; -EAPI void +EINTERN void e_hints_init(void) { Ecore_X_Window *roots = NULL; @@ -212,7 +212,7 @@ ecore_x_window_prop_property_set(man->root, ATM_ENLIGHTENMENT_COMMS, ECORE_X_ATOM_STRING, 8, buf, 14); } -EAPI void +EINTERN void e_hints_manager_init(E_Manager *man) { /* Set desktop count, desktop names and workarea */ @@ -407,7 +407,7 @@ ecore_x_netwm_client_active_set(man->root, 0); } -EAPI void +EINTERN void e_hints_window_init(E_Border *bd) { E_Remember *rem = NULL; Modified: trunk/e/src/bin/e_hints.h =================================================================== --- trunk/e/src/bin/e_hints.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_hints.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -3,15 +3,15 @@ #ifndef E_HINTS_H #define E_HINTS_H -EAPI void e_hints_init(void); +EINTERN void e_hints_init(void); EAPI void e_hints_e16_comms_pretend(E_Manager *man); -EAPI void e_hints_manager_init(E_Manager *man); +EINTERN void e_hints_manager_init(E_Manager *man); EAPI void e_hints_client_list_set(void); EAPI void e_hints_client_stacking_set(void); EAPI void e_hints_active_window_set(E_Manager *man, E_Border *bd); -EAPI void e_hints_window_init(E_Border *bd); +EINTERN void e_hints_window_init(E_Border *bd); EAPI void e_hints_window_state_set(E_Border *bd); EAPI void e_hints_window_state_get(E_Border *bd); EAPI void e_hints_window_type_set(E_Border *bd); Modified: trunk/e/src/bin/e_init.c =================================================================== --- trunk/e/src/bin/e_init.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_init.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -16,7 +16,7 @@ static Eina_List *stats = NULL; /* public functions */ -EAPI int +EINTERN int e_init_init(void) { E_EVENT_INIT_DONE = ecore_event_type_new(); @@ -28,7 +28,7 @@ return 1; } -EAPI int +EINTERN int e_init_shutdown(void) { /* if not killed, kill init */ Modified: trunk/e/src/bin/e_init.h =================================================================== --- trunk/e/src/bin/e_init.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_init.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -3,8 +3,8 @@ #ifndef E_INIT_H #define E_INIT_H -EAPI int e_init_init(void); -EAPI int e_init_shutdown(void); +EINTERN int e_init_init(void); +EINTERN int e_init_shutdown(void); EAPI void e_init_show(void); EAPI void e_init_hide(void); EAPI void e_init_title_set(const char *str); Modified: trunk/e/src/bin/e_init_main.c =================================================================== --- trunk/e/src/bin/e_init_main.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_init_main.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -10,13 +10,51 @@ #include <Evas.h> #include <Edje.h> +#ifdef EAPI +#undef EAPI +#endif +#ifdef WIN32 +# ifdef BUILDING_DLL +# define EAPI __declspec(dllexport) +# else +# define EAPI __declspec(dllimport) +# endif +#else +# ifdef __GNUC__ +# if __GNUC__ >= 4 +/* BROKEN in gcc 4 on amd64 */ +#if 0 +# pragma GCC visibility push(hidden) +#endif +# define EAPI __attribute__ ((visibility("default"))) +# else +# define EAPI +# endif +# else +# define EAPI +# endif +#endif + +#ifdef EINTERN +#undef EINTERN +#endif +#ifdef __GNUC__ +# if __GNUC__ >= 4 +# define EINTERN __attribute__ ((visibility("hidden"))) +# else +# define EINTERN +# endif +#else +# define EINTERN +#endif + #define E_TYPEDEFS 1 #include "e_xinerama.h" #undef E_TYPEDEFS #include "e_xinerama.h" -EAPI int e_init_init(void); -EAPI int e_init_shutdown(void); +EINTERN int e_init_init(void); +EINTERN int e_init_shutdown(void); EAPI void e_init_show(void); EAPI void e_init_hide(void); EAPI void e_init_title_set(const char *str); @@ -205,7 +243,7 @@ static Ecore_Timer *_e_init_timeout_timer = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_init_init(void) { Ecore_X_Window root, *roots; @@ -298,7 +336,7 @@ return 1; } -EAPI int +EINTERN int e_init_shutdown(void) { if (_e_init_configure_handler) Modified: trunk/e/src/bin/e_int_menus.c =================================================================== --- trunk/e/src/bin/e_int_menus.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_int_menus.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -1524,7 +1524,7 @@ e_config->shelves = eina_list_append(e_config->shelves, cs); e_config_save_queue(); - e_shelf_config_init(); + e_shelf_config_update(); } static void Modified: trunk/e/src/bin/e_intl.c =================================================================== --- trunk/e/src/bin/e_intl.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_intl.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -50,7 +50,7 @@ static Eina_Bool _e_intl_cb_exit(void *data, int type, void *event); static Eina_List *_e_intl_imc_dir_scan(const char *dir); -EAPI int +EINTERN int e_intl_init(void) { char *s; @@ -69,7 +69,7 @@ return 1; } -EAPI int +EINTERN int e_intl_shutdown(void) { E_FREE(_e_intl_language); @@ -93,7 +93,7 @@ } /* Setup configuration settings and start services */ -EAPI int +EINTERN int e_intl_post_init(void) { if ((e_config->language) && (e_config->language[0] != 0)) @@ -109,7 +109,7 @@ return 1; } -EAPI int +EINTERN int e_intl_post_shutdown(void) { if (_e_intl_exit_handler) Modified: trunk/e/src/bin/e_intl.h =================================================================== --- trunk/e/src/bin/e_intl.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_intl.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -35,10 +35,10 @@ const char *modifier; }; -EAPI int e_intl_init(void); -EAPI int e_intl_shutdown(void); -EAPI int e_intl_post_init(void); -EAPI int e_intl_post_shutdown(void); +EINTERN int e_intl_init(void); +EINTERN int e_intl_shutdown(void); +EINTERN int e_intl_post_init(void); +EINTERN int e_intl_post_shutdown(void); /* Setting & Getting Language */ EAPI void e_intl_language_set(const char *lang); EAPI const char *e_intl_language_get(void); Modified: trunk/e/src/bin/e_intl_data.c =================================================================== --- trunk/e/src/bin/e_intl_data.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_intl_data.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -6,7 +6,7 @@ */ static Eet_Data_Descriptor *_e_intl_input_method_config_edd = NULL; -EAPI int +EINTERN int e_intl_data_init(void) { _e_intl_input_method_config_edd = E_CONFIG_DD_NEW("input_method_config", E_Input_Method_Config); @@ -21,7 +21,7 @@ return 1; } -EAPI int +EINTERN int e_intl_data_shutdown(void) { E_CONFIG_DD_FREE(_e_intl_input_method_config_edd); Modified: trunk/e/src/bin/e_intl_data.h =================================================================== --- trunk/e/src/bin/e_intl_data.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_intl_data.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -19,8 +19,8 @@ const char *e_im_setup_exec; }; -EAPI int e_intl_data_init(void); -EAPI int e_intl_data_shutdown(void); +EINTERN int e_intl_data_init(void); +EINTERN int e_intl_data_shutdown(void); EAPI E_Input_Method_Config *e_intl_input_method_config_read (Eet_File *imc_file); EAPI int e_intl_input_method_config_write (Eet_File *imc_file, E_Input_Method_Config *imc); EAPI void e_intl_input_method_config_free (E_Input_Method_Config *imc); Modified: trunk/e/src/bin/e_ipc.c =================================================================== --- trunk/e/src/bin/e_ipc.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_ipc.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -11,7 +11,7 @@ #endif /* externally accessible functions */ -EAPI int +EINTERN int e_ipc_init(void) { #ifdef USE_IPC @@ -77,7 +77,7 @@ return 1; } -EAPI int +EINTERN int e_ipc_shutdown(void) { #ifdef USE_IPC Modified: trunk/e/src/bin/e_ipc.h =================================================================== --- trunk/e/src/bin/e_ipc.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_ipc.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -25,8 +25,8 @@ #ifndef E_IPC_H #define E_IPC_H -EAPI int e_ipc_init(void); -EAPI int e_ipc_shutdown(void); +EINTERN int e_ipc_init(void); +EINTERN int e_ipc_shutdown(void); #endif #endif Modified: trunk/e/src/bin/e_ipc_codec.c =================================================================== --- trunk/e/src/bin/e_ipc_codec.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_ipc_codec.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -34,7 +34,7 @@ Edd = eet_data_descriptor_stream_new(&Eddc); /* externally accessible functions */ -EAPI int +EINTERN int e_ipc_codec_init(void) { Eet_Data_Descriptor_Class eddc; @@ -138,7 +138,7 @@ return 1; } -EAPI void +EINTERN void e_ipc_codec_shutdown(void) { E_CONFIG_DD_FREE(_e_ipc_int_edd); Modified: trunk/e/src/bin/e_ipc_codec.h =================================================================== --- trunk/e/src/bin/e_ipc_codec.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_ipc_codec.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -95,8 +95,8 @@ int val1, val2, val3, val4; }; -EAPI int e_ipc_codec_init(void); -EAPI void e_ipc_codec_shutdown(void); +EINTERN int e_ipc_codec_init(void); +EINTERN void e_ipc_codec_shutdown(void); EAPI int e_ipc_codec_int_dec(char *data, int bytes, int *dest); EAPI void *e_ipc_codec_int_enc(int val, int *size_ret); Modified: trunk/e/src/bin/e_main.c =================================================================== --- trunk/e/src/bin/e_main.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_main.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -1008,7 +1008,7 @@ e_init_status_set(_("Setup Mouse")); TS("mouse"); /* setup mouse accel */ - if (!e_mouse_init()) + if (!e_mouse_update()) { e_error_message_show(_("Enlightenment cannot configure the mouse settings.")); _e_main_shutdown(-1); @@ -1134,8 +1134,8 @@ e_test(); e_init_status_set(_("Configure Shelves")); - TS("shelf config init"); - e_shelf_config_init(); + TS("shelf config update"); + e_shelf_config_update(); TS("manage all windows"); _e_main_manage_all(); Modified: trunk/e/src/bin/e_manager.c =================================================================== --- trunk/e/src/bin/e_manager.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_manager.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -45,7 +45,7 @@ static Ecore_Timer *timer_post_screensaver_lock = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_manager_init(void) { ecore_x_screensaver_event_listen_set(1); @@ -53,7 +53,7 @@ return 1; } -EAPI int +EINTERN int e_manager_shutdown(void) { E_FREE_LIST(managers, e_object_del); Modified: trunk/e/src/bin/e_manager.h =================================================================== --- trunk/e/src/bin/e_manager.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_manager.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -44,8 +44,8 @@ E_Manager_Comp *comp; }; -EAPI int e_manager_init(void); -EAPI int e_manager_shutdown(void); +EINTERN int e_manager_init(void); +EINTERN int e_manager_shutdown(void); EAPI Eina_List *e_manager_list(void); EAPI E_Manager *e_manager_new(Ecore_X_Window root, int num); Modified: trunk/e/src/bin/e_menu.c =================================================================== --- trunk/e/src/bin/e_menu.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_menu.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -135,7 +135,7 @@ } /* externally accessible functions */ -EAPI int +EINTERN int e_menu_init(void) { _e_menu_key_down_handler = @@ -163,7 +163,7 @@ return 1; } -EAPI int +EINTERN int e_menu_shutdown(void) { E_Menu *m; Modified: trunk/e/src/bin/e_menu.h =================================================================== --- trunk/e/src/bin/e_menu.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_menu.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -155,8 +155,8 @@ }; -EAPI int e_menu_init(void); -EAPI int e_menu_shutdown(void); +EINTERN int e_menu_init(void); +EINTERN int e_menu_shutdown(void); EAPI E_Menu *e_menu_new(void); EAPI void e_menu_activate_key(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir); Modified: trunk/e/src/bin/e_module.c =================================================================== --- trunk/e/src/bin/e_module.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_module.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -24,7 +24,7 @@ EAPI int E_EVENT_MODULE_INIT_END = 0; /* externally accessible functions */ -EAPI int +EINTERN int e_module_init(void) { E_EVENT_MODULE_UPDATE = ecore_event_type_new(); @@ -32,7 +32,7 @@ return 1; } -EAPI int +EINTERN int e_module_shutdown(void) { E_Module *m; Modified: trunk/e/src/bin/e_module.h =================================================================== --- trunk/e/src/bin/e_module.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_module.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -51,8 +51,8 @@ const char *name; }; -EAPI int e_module_init(void); -EAPI int e_module_shutdown(void); +EINTERN int e_module_init(void); +EINTERN int e_module_shutdown(void); EAPI void e_module_all_load(void); EAPI E_Module *e_module_new(const char *name); Modified: trunk/e/src/bin/e_mouse.c =================================================================== --- trunk/e/src/bin/e_mouse.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_mouse.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -1,7 +1,7 @@ #include "e.h" EAPI int -e_mouse_init(void) +e_mouse_update(void) { unsigned char map[256]; int n; Modified: trunk/e/src/bin/e_mouse.h =================================================================== --- trunk/e/src/bin/e_mouse.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_mouse.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -10,7 +10,7 @@ #ifndef E_MOUSE_H #define E_MOUSE_H -EAPI int e_mouse_init(void); +EAPI int e_mouse_update(void); #endif #endif Modified: trunk/e/src/bin/e_moveresize.c =================================================================== --- trunk/e/src/bin/e_moveresize.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_moveresize.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -18,7 +18,7 @@ static int obj_w = 0; static int obj_h = 0; -EAPI int +EINTERN int e_moveresize_init(void) { E_Border_Hook *h; @@ -39,7 +39,7 @@ return 1; } -EAPI int +EINTERN int e_moveresize_shutdown(void) { E_Border_Hook *h; Modified: trunk/e/src/bin/e_moveresize.h =================================================================== --- trunk/e/src/bin/e_moveresize.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_moveresize.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -4,8 +4,8 @@ #ifndef E_MOVERESIZE_H #define E_MOVERESIZE_H -EAPI int e_moveresize_init(void); -EAPI int e_moveresize_shutdown(void); +EINTERN int e_moveresize_init(void); +EINTERN int e_moveresize_shutdown(void); #endif #endif Modified: trunk/e/src/bin/e_msg.c =================================================================== --- trunk/e/src/bin/e_msg.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_msg.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -32,7 +32,7 @@ static Ecore_Event_Handler *hand = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_msg_init(void) { E_EVENT_MSG = ecore_event_type_new(); @@ -40,7 +40,7 @@ return 1; } -EAPI int +EINTERN int e_msg_shutdown(void) { while (handlers) e_msg_handler_del(eina_list_data_get(handlers)); Modified: trunk/e/src/bin/e_msg.h =================================================================== --- trunk/e/src/bin/e_msg.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_msg.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -6,8 +6,8 @@ #ifndef E_MSG_H #define E_MSG_H -EAPI int e_msg_init(void); -EAPI int e_msg_shutdown(void); +EINTERN int e_msg_init(void); +EINTERN int e_msg_shutdown(void); EAPI void e_msg_send(const char *name, const char *info, int val, E_Object *obj, void *msgdata, void (*afterfunc) (void *data, E_Object *obj, void *msgdata), void *afterdata); EAPI E_Msg_Handler *e_msg_handler_add(void (*func) (void *data, const char *name, const char *info, int val, E_Object *obj, void *msgdata), void *data); Modified: trunk/e/src/bin/e_msgbus.c =================================================================== --- trunk/e/src/bin/e_msgbus.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_msgbus.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -22,7 +22,7 @@ static E_Msgbus_Data *_e_msgbus_data = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_msgbus_init(void) { E_DBus_Interface *iface; @@ -93,7 +93,7 @@ return 1; } -EAPI int +EINTERN int e_msgbus_shutdown(void) { if (_e_msgbus_data->obj) Modified: trunk/e/src/bin/e_msgbus.h =================================================================== --- trunk/e/src/bin/e_msgbus.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_msgbus.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -14,8 +14,8 @@ E_DBus_Object *obj; }; -EAPI int e_msgbus_init(void); -EAPI int e_msgbus_shutdown(void); +EINTERN int e_msgbus_init(void); +EINTERN int e_msgbus_shutdown(void); EAPI void e_msgbus_interface_attach(E_DBus_Interface *iface); EAPI void e_msgbus_interface_detach(E_DBus_Interface *iface); Modified: trunk/e/src/bin/e_order.c =================================================================== --- trunk/e/src/bin/e_order.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_order.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -11,7 +11,7 @@ static Eina_List *handlers = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_order_init(void) { handlers = @@ -23,7 +23,7 @@ return 1; } -EAPI int +EINTERN int e_order_shutdown(void) { orders = eina_list_free(orders); Modified: trunk/e/src/bin/e_order.h =================================================================== --- trunk/e/src/bin/e_order.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_order.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -23,8 +23,8 @@ } cb; }; -EAPI int e_order_init(void); -EAPI int e_order_shutdown(void); +EINTERN int e_order_init(void); +EINTERN int e_order_shutdown(void); EAPI E_Order *e_order_new(const char *path); EAPI void e_order_update_callback_set(E_Order *eo, void (*cb)(void *data, E_Order *eo), void *data); Modified: trunk/e/src/bin/e_pointer.c =================================================================== --- trunk/e/src/bin/e_pointer.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_pointer.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -34,7 +34,7 @@ static Eina_Bool _e_pointer_cb_idle_poller(void *data); /* externally accessible functions */ -EAPI int +EINTERN int e_pointer_init(void) { handlers = @@ -56,7 +56,7 @@ return 1; } -EAPI int +EINTERN int e_pointer_shutdown(void) { E_FREE_LIST(handlers, ecore_event_handler_del); Modified: trunk/e/src/bin/e_pointer.h =================================================================== --- trunk/e/src/bin/e_pointer.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_pointer.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -36,8 +36,8 @@ } hot; }; -EAPI int e_pointer_init(void); -EAPI int e_pointer_shutdown(void); +EINTERN int e_pointer_init(void); +EINTERN int e_pointer_shutdown(void); EAPI E_Pointer *e_pointer_window_new(Ecore_X_Window win, int filled); EAPI void e_pointer_hide(E_Pointer *p); EAPI void e_pointer_type_push(E_Pointer *p, void *obj, const char *type); Modified: trunk/e/src/bin/e_popup.c =================================================================== --- trunk/e/src/bin/e_popup.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_popup.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -12,7 +12,7 @@ /* externally accessible functions */ -EAPI int +EINTERN int e_popup_init(void) { _e_popup_window_shape_handler = @@ -22,7 +22,7 @@ return 1; } -EAPI int +EINTERN int e_popup_shutdown(void) { if (_e_popup_hash) Modified: trunk/e/src/bin/e_popup.h =================================================================== --- trunk/e/src/bin/e_popup.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_popup.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -29,8 +29,8 @@ Ecore_Idle_Enterer *idle_enterer; }; -EAPI int e_popup_init(void); -EAPI int e_popup_shutdown(void); +EINTERN int e_popup_init(void); +EINTERN int e_popup_shutdown(void); EAPI E_Popup *e_popup_new(E_Zone *zone, int x, int y, int w, int h); EAPI void e_popup_name_set(E_Popup *pop, const char *name); Modified: trunk/e/src/bin/e_powersave.c =================================================================== --- trunk/e/src/bin/e_powersave.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_powersave.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -23,7 +23,7 @@ static double defer_time = 5.0; /* externally accessible functions */ -EAPI int +EINTERN int e_powersave_init(void) { _e_powersave_mode_eval(); @@ -31,7 +31,7 @@ return 1; } -EAPI int +EINTERN int e_powersave_shutdown(void) { return 1; Modified: trunk/e/src/bin/e_powersave.h =================================================================== --- trunk/e/src/bin/e_powersave.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_powersave.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -23,8 +23,8 @@ E_Powersave_Mode mode; }; -EAPI int e_powersave_init(void); -EAPI int e_powersave_shutdown(void); +EINTERN int e_powersave_init(void); +EINTERN int e_powersave_shutdown(void); EAPI E_Powersave_Deferred_Action *e_powersave_deferred_action_add(void (*func) (void *data), const void *data); EAPI void e_powersave_deferred_action_del(E_Powersave_Deferred_Action *pa); Modified: trunk/e/src/bin/e_prefix.c =================================================================== --- trunk/e/src/bin/e_prefix.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_prefix.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -173,7 +173,7 @@ return 0; } -EAPI void +EINTERN void e_prefix_shutdown(void) { E_FREE(_exe_path); Modified: trunk/e/src/bin/e_prefix.h =================================================================== --- trunk/e/src/bin/e_prefix.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_prefix.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -5,7 +5,7 @@ #define E_PREFIX_H EAPI int e_prefix_determine(char *argv0); -EAPI void e_prefix_shutdown(void); +EINTERN void e_prefix_shutdown(void); EAPI void e_prefix_fallback(void); EAPI const char *e_prefix_get(void); EAPI const char *e_prefix_locale_get(void); Modified: trunk/e/src/bin/e_randr.c =================================================================== --- trunk/e/src/bin/e_randr.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_randr.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -94,13 +94,13 @@ E_Randr_Screen_Info *e_randr_screen_info = NULL; static Eina_List *_e_randr_event_handlers = NULL; -EAPI Eina_Bool +EINTERN Eina_Bool e_randr_init(void) { return _e_randr_init(); } -EAPI int +EINTERN int e_randr_shutdown(void) { _e_randr_shutdown(); Modified: trunk/e/src/bin/e_randr.h =================================================================== --- trunk/e/src/bin/e_randr.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_randr.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -148,8 +148,8 @@ E_Randr_Screen_Restore_Info_Union rrvd_restore_info; }; -EAPI Eina_Bool e_randr_init(void); -EAPI int e_randr_shutdown(void); +EINTERN Eina_Bool e_randr_init(void); +EINTERN int e_randr_shutdown(void); extern E_Randr_Screen_Info *e_randr_screen_info; Modified: trunk/e/src/bin/e_remember.c =================================================================== --- trunk/e/src/bin/e_remember.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_remember.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -30,7 +30,7 @@ /* externally accessible functions */ -EAPI int +EINTERN int e_remember_init(E_Startup_Mode mode) { Eina_List *l = NULL; @@ -66,7 +66,7 @@ return 1; } -EAPI int +EINTERN int e_remember_shutdown(void) { E_Border_Hook *h; Modified: trunk/e/src/bin/e_remember.h =================================================================== --- trunk/e/src/bin/e_remember.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_remember.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -97,8 +97,8 @@ } prop; }; -EAPI int e_remember_init(E_Startup_Mode mode); -EAPI int e_remember_shutdown(void); +EINTERN int e_remember_init(E_Startup_Mode mode); +EINTERN int e_remember_shutdown(void); EAPI E_Remember *e_remember_new(void); EAPI int e_remember_usable_get(E_Remember *rem); EAPI void e_remember_use(E_Remember *rem); Modified: trunk/e/src/bin/e_scale.c =================================================================== --- trunk/e/src/bin/e_scale.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_scale.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -2,14 +2,14 @@ EAPI double e_scale = 1.0; -EAPI int +EINTERN int e_scale_init(void) { e_scale_update(); return 1; } -EAPI int +EINTERN int e_scale_shutdown(void) { return 1; Modified: trunk/e/src/bin/e_scale.h =================================================================== --- trunk/e/src/bin/e_scale.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_scale.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -3,8 +3,8 @@ #ifndef E_SCALE_H #define E_SCALE_H -EAPI int e_scale_init(void); -EAPI int e_scale_shutdown(void); +EINTERN int e_scale_init(void); +EINTERN int e_scale_shutdown(void); EAPI void e_scale_update(void); extern EAPI double e_scale; Modified: trunk/e/src/bin/e_screensaver.c =================================================================== --- trunk/e/src/bin/e_screensaver.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_screensaver.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -204,7 +204,7 @@ return ECORE_CALLBACK_PASS_ON; } -EAPI int +EINTERN int e_screensaver_init(void) { _e_screensaver_handler_config_mode = ecore_event_handler_add @@ -244,7 +244,7 @@ return 1; } -EAPI int +EINTERN int e_screensaver_shutdown(void) { if (_e_screensaver_handler_config_mode) Modified: trunk/e/src/bin/e_screensaver.h =================================================================== --- trunk/e/src/bin/e_screensaver.h 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_screensaver.h 2010-11-22 15:21:32 UTC (rev 54795) @@ -3,8 +3,8 @@ #ifndef E_SCREENSAVER_H #define E_SCREENSAVER_H -EAPI int e_screensaver_init(void); -EAPI int e_screensaver_shutdown(void); +EINTERN int e_screensaver_init(void); +EINTERN int e_screensaver_shutdown(void); EAPI void e_screensaver_update(void); Modified: trunk/e/src/bin/e_shelf.c =================================================================== --- trunk/e/src/bin/e_shelf.c 2010-11-22 15:21:24 UTC (rev 54794) +++ trunk/e/src/bin/e_shelf.c 2010-11-22 15:21:32 UTC (rev 54795) @@ -33,13 +33,13 @@ static Eina_Hash *winid_shelves = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_shelf_init(void) { return 1; } -EAPI int +EINTERN int e_shelf_shutdown(void) { while (shelves) @@ -54,7 +54,7 @@ } ... [truncated message content] |
From: Enlightenment S. <no-...@en...> - 2011-06-12 23:59:02
|
Log: properly wrap hal stuff inside HAVE_HAL. SPANK SPANK SPANK raster... he also left lots of trailing whitespace there :-/ Author: barbieri Date: 2011-06-12 15:41:09 -0700 (Sun, 12 Jun 2011) New Revision: 60248 Trac: http://trac.enlightenment.org/e/changeset/60248 Modified: trunk/e/src/bin/e_backlight.c Modified: trunk/e/src/bin/e_backlight.c =================================================================== --- trunk/e/src/bin/e_backlight.c 2011-06-12 21:39:10 UTC (rev 60247) +++ trunk/e/src/bin/e_backlight.c 2011-06-12 22:41:09 UTC (rev 60248) @@ -1,6 +1,8 @@ #include "e.h" #include <E_DBus.h> +#ifdef HAVE_HAL #include <E_Hal.h> +#endif // FIXME: backlight should be tied per zone but this implementation is just // a signleton right now as thats 99% of use cases. but api supports @@ -51,7 +53,9 @@ { e_dbus_connection_close(_hal_conn); _hal_conn = NULL; +#ifdef HAVE_HAL e_hal_shutdown(); +#endif e_dbus_shutdown(); if (_hal_bl_dev) { @@ -158,6 +162,7 @@ /* local subsystem functions */ #ifdef HAL_BL +#ifdef HAVE_HAL void _e_backlight_hal_val_reply(void *data __UNUSED__, DBusMessage *reply, @@ -288,6 +293,7 @@ } } #endif +#endif static void _e_backlight_update(E_Zone *zone) @@ -311,6 +317,7 @@ else { #ifdef HAL_BL +#ifdef HAVE_HAL sysmode = MODE_HAL; if (!_hal_conn) { @@ -325,6 +332,7 @@ (_hal_conn, "laptop_panel", _e_backlight_panel_found, NULL); } +#endif #endif } } @@ -349,7 +357,9 @@ else if (sysmode == MODE_HAL) { #ifdef HAL_BL +#ifdef HAVE_HAL _e_backlight_hal_val_set(val); +#endif #endif } } |
From: Enlightenment S. <no-...@en...> - 2012-07-04 18:45:29
|
Log: actually we should not realpath() the input. directories may show with incorrect names if they were links. Author: barbieri Date: 2012-07-04 11:45:23 -0700 (Wed, 04 Jul 2012) New Revision: 73297 Trac: http://trac.enlightenment.org/e/changeset/73297 Modified: trunk/e/src/bin/e_fm_cmdline.c Modified: trunk/e/src/bin/e_fm_cmdline.c =================================================================== --- trunk/e/src/bin/e_fm_cmdline.c 2012-07-04 18:38:46 UTC (rev 73296) +++ trunk/e/src/bin/e_fm_cmdline.c 2012-07-04 18:45:23 UTC (rev 73297) @@ -6,6 +6,7 @@ #include <Ecore_File.h> #include <Ecore_Getopt.h> #include <E_DBus.h> +#include <unistd.h> static E_DBus_Connection *conn = NULL; static int retval = EXIT_SUCCESS; @@ -36,12 +37,35 @@ { DBusMessage *msg; Eina_Bool sent; - char *p = ecore_file_realpath(path); + char *p; + if (path[0] == '/') + p = strdup(path); + else + { + char buf[PATH_MAX]; + if (!getcwd(buf, sizeof(buf))) + { + fprintf(stderr, + "ERROR: Could not get current working directory: %s\n", + strerror(errno)); + ecore_idler_add(fm_error_quit_last, NULL); + return; + } + if (strcmp(path, ".") == 0) + p = strdup(buf); + else + { + char tmp[PATH_MAX]; + snprintf(tmp, sizeof(tmp), "%s/%s", buf, path); + p = strdup(tmp); + } + } + EINA_LOG_DBG("'%s' -> '%s'", path, p); if ((!p) || (p[0] == '\0')) { - fprintf(stderr, "ERROR: Could not get real path '%s'\n", path); + fprintf(stderr, "ERROR: Could not get path '%s'\n", path); ecore_idler_add(fm_error_quit_last, NULL); free(p); return; |
From: Enlightenment S. <no-...@en...> - 2012-07-04 19:11:30
|
Log: enlightenment_filemanager now opens files as well. unfortunately the e_fm code requires a window and icon, we have none so there is some duplication of code. Author: barbieri Date: 2012-07-04 12:11:23 -0700 (Wed, 04 Jul 2012) New Revision: 73301 Trac: http://trac.enlightenment.org/e/changeset/73301 Modified: trunk/e/src/bin/e_fm_cmdline.c Modified: trunk/e/src/bin/e_fm_cmdline.c =================================================================== --- trunk/e/src/bin/e_fm_cmdline.c 2012-07-04 19:10:17 UTC (rev 73300) +++ trunk/e/src/bin/e_fm_cmdline.c 2012-07-04 19:11:23 UTC (rev 73301) @@ -37,6 +37,7 @@ { DBusMessage *msg; Eina_Bool sent; + const char *method; char *p; if (path[0] == '/') @@ -71,10 +72,15 @@ return; } + if (ecore_file_is_dir(p)) + method = "OpenDirectory"; + else + method = "OpenFile"; + msg = dbus_message_new_method_call ("org.enlightenment.FileManager", "/org/enlightenment/FileManager", - "org.enlightenment.FileManager", "OpenDirectory"); + "org.enlightenment.FileManager", method); if (!msg) { fputs("ERROR: Could not create DBus Message\n", stderr); @@ -101,7 +107,7 @@ static const Ecore_Getopt options = { "enlightenment_filemanager", - "%prog [options] [folder1] ... [folderN]", + "%prog [options] [file-or-folder1] ... [file-or-folderN]", PACKAGE_VERSION, "(C) 2012 Gustavo Sverzut Barbieri and others", "BSD 2-Clause", |
From: Enlightenment S. <no-...@en...> - 2012-07-05 15:06:20
|
Log: return the command's exit code. Author: barbieri Date: 2012-07-05 08:06:06 -0700 (Thu, 05 Jul 2012) New Revision: 73366 Trac: http://trac.enlightenment.org/e/changeset/73366 Modified: trunk/e/src/bin/e_open.c Modified: trunk/e/src/bin/e_open.c =================================================================== --- trunk/e/src/bin/e_open.c 2012-07-05 15:01:58 UTC (rev 73365) +++ trunk/e/src/bin/e_open.c 2012-07-05 15:06:06 UTC (rev 73366) @@ -483,14 +483,21 @@ else { char **itr; + int ret = EXIT_SUCCESS; for (itr = cmds; *itr != NULL; itr++) { - system(*itr); + /* Question: should we execute them in parallel? */ + int r = system(*itr); + if (r < 0) + fprintf(stderr, "ERROR: %s executing %s\n", strerror(errno), + *itr); free(*itr); + if (r > 0) /* Question: should we stop the loop on first faiure? */ + ret = r; } free(cmds); + + return ret; } - - return EXIT_SUCCESS; } |
From: Enlightenment S. <no-...@en...> - 2012-09-11 23:06:31
|
Log: fsel: if file name starts with "/" then it's an absolute path. not handling "../" and "./" cases here, maybe worth? This allows screenshots to be saved typing "/tmp/bla.png" (see previous commit, to shot module) Author: barbieri Date: 2012-09-11 16:06:25 -0700 (Tue, 11 Sep 2012) New Revision: 76481 Trac: http://trac.enlightenment.org/e/changeset/76481 Modified: trunk/e/src/bin/e_widget_fsel.c Modified: trunk/e/src/bin/e_widget_fsel.c =================================================================== --- trunk/e/src/bin/e_widget_fsel.c 2012-09-11 23:01:32 UTC (rev 76480) +++ trunk/e/src/bin/e_widget_fsel.c 2012-09-11 23:06:25 UTC (rev 76481) @@ -512,8 +512,12 @@ wd = e_widget_data_get(obj); s = e_widget_entry_text_get(wd->o_entry); dir = e_fm2_real_path_get(wd->o_files_fm); - if (s) + if ((dir) && (s) && (s[0] == '/')) { + eina_stringshare_replace(&wd->path, s); + } + else if (s) + { snprintf(buf, sizeof(buf), "%s/%s", dir, s); eina_stringshare_replace(&wd->path, buf); } |
From: Enlightenment S. <no-...@en...> - 2012-09-21 20:53:55
|
Log: efm preview: better expand policy for properties table fields. the label shouldn't try to expand, just fill the space. Also align labels to right so they are closer to the contents. Author: barbieri Date: 2012-09-21 13:53:49 -0700 (Fri, 21 Sep 2012) New Revision: 76999 Trac: http://trac.enlightenment.org/e/changeset/76999 Modified: trunk/e/src/bin/e_widget_filepreview.c Modified: trunk/e/src/bin/e_widget_filepreview.c =================================================================== --- trunk/e/src/bin/e_widget_filepreview.c 2012-09-21 20:26:39 UTC (rev 76998) +++ trunk/e/src/bin/e_widget_filepreview.c 2012-09-21 20:53:49 UTC (rev 76999) @@ -165,17 +165,17 @@ o = e_widget_label_add(evas, lab); \ e_widget_disabled_set(o, 1); \ wd->labob = o; \ - e_widget_table_object_append(wd->o_preview_properties_table, \ - wd->labob, \ - 0, y, 1, 1, 1, 1, 1, 1); \ + e_widget_table_object_align_append(wd->o_preview_properties_table, \ + wd->labob, \ + 0, y, 1, 1, 0, 1, 0, 0, 1.0, 0.0); \ o = e_widget_entry_add(evas, &(wd->preview_extra_text), NULL, NULL, NULL); \ e_widget_entry_readonly_set(o, 1); \ e_widget_disabled_set(o, 1); \ wd->entob = o; \ e_widget_size_min_set(o, entw, -1); \ - e_widget_table_object_append(wd->o_preview_properties_table, \ - wd->entob, \ - 1, y, 1, 1, 1, 1, 1, 1); \ + e_widget_table_object_align_append(wd->o_preview_properties_table, \ + wd->entob, \ + 1, y, 1, 1, 1, 1, 1, 0, 0.0, 0.0); \ y++; \ } while (0) @@ -232,17 +232,17 @@ o = e_widget_label_add(evas, lab); \ e_widget_disabled_set(o, 1); \ wd->labob = o; \ - e_widget_table_object_append(wd->o_preview_properties_table, \ - wd->labob, \ - 0, y, 1, 1, 1, 1, 1, 1); \ + e_widget_table_object_align_append(wd->o_preview_properties_table, \ + wd->labob, \ + 0, y, 1, 1, 0, 1, 0, 0, 1.0, 0.0); \ o = e_widget_entry_add(evas, &(wd->preview_extra_text), NULL, NULL, NULL); \ e_widget_entry_readonly_set(o, 1); \ e_widget_disabled_set(o, 1); \ wd->entob = o; \ e_widget_size_min_set(o, entw, -1); \ - e_widget_table_object_append(wd->o_preview_properties_table, \ - wd->entob, \ - 1, y, 1, 1, 1, 1, 1, 1); \ + e_widget_table_object_align_append(wd->o_preview_properties_table, \ + wd->entob, \ + 1, y, 1, 1, 1, 1, 1, 0, 0.0, 0.0); \ y++; \ } while (0) |
From: Enlightenment S. <no-...@en...> - 2012-09-21 21:35:24
|
Log: efm: have a sane click-to-rename behavior. Delaying rename entry by 0.75s makes absolutely no sense. As well there is no sense in always rename if you click the label and the icon was unselected (quite common in list views). The proper behavior is to just rename the icon if it was selected, but ignore the initial click used to select the icon, even if on label. This is done by remembering the time it was selected, no need for timer. Author: barbieri Date: 2012-09-21 14:35:17 -0700 (Fri, 21 Sep 2012) New Revision: 77002 Trac: http://trac.enlightenment.org/e/changeset/77002 Modified: trunk/e/src/bin/e_fm.c Modified: trunk/e/src/bin/e_fm.c =================================================================== --- trunk/e/src/bin/e_fm.c 2012-09-21 21:10:17 UTC (rev 77001) +++ trunk/e/src/bin/e_fm.c 2012-09-21 21:35:17 UTC (rev 77002) @@ -185,7 +185,6 @@ Ecore_X_Window keygrab; E_Config_Dialog *prop_dialog; E_Dialog *dialog; - Ecore_Timer *rename_click; E_Fm2_Icon_Info info; @@ -197,6 +196,8 @@ Eina_Bool src : 1; } drag; + double selected_time; + Eina_Bool realized : 1; Eina_Bool selected : 1; Eina_Bool last_selected : 1; @@ -4594,11 +4595,6 @@ e_object_del(E_OBJECT(ic->dialog)); ic->dialog = NULL; } - if (ic->rename_click) - { - ecore_timer_del(ic->rename_click); - ic->rename_click = NULL; - } if (ic->entry_dialog) { e_object_del(E_OBJECT(ic->entry_dialog)); @@ -4625,32 +4621,21 @@ free(ic); } -static Eina_Bool -_e_fm2_icon_label_click_cb(void *data) +static void +_e_fm2_icon_label_click(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) { E_Fm2_Icon *ic = data; + if (ic->entry_widget || ic->entry_dialog) return; + if (!ic->selected) return; + if (ecore_loop_time_get() - ic->selected_time < 0.1) return; - if (ic->rename_click) - { - ecore_timer_del(ic->rename_click); - ic->rename_click = NULL; - } - if (ic->sd->config->view.no_click_rename) return EINA_FALSE; - if (eina_list_count(ic->sd->selected_icons) != 1) return EINA_FALSE; - if (eina_list_data_get(ic->sd->selected_icons) != ic) return EINA_FALSE; + if (ic->sd->config->view.no_click_rename) return; + if (eina_list_count(ic->sd->selected_icons) != 1) return; + if (eina_list_data_get(ic->sd->selected_icons) != ic) return; _e_fm2_file_rename(data, NULL, NULL); - return EINA_FALSE; } static void -_e_fm2_icon_label_click(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) -{ - E_Fm2_Icon *ic = data; - if (ic->rename_click || ic->entry_widget || ic->entry_dialog) return; - ic->rename_click = ecore_timer_add(0.75, _e_fm2_icon_label_click_cb, ic); -} - -static void _e_fm2_icon_realize(E_Fm2_Icon *ic) { if (ic->realized) return; @@ -4866,6 +4851,7 @@ ic->sd->last_selected = ic; ic->sd->selected_icons = eina_list_append(ic->sd->selected_icons, ic); ic->last_selected = EINA_TRUE; + ic->selected_time = ecore_loop_time_get(); if (ic->realized) { const char *selectraise; @@ -4890,6 +4876,7 @@ ic->last_selected = EINA_FALSE; if (ic->sd->last_selected == ic) ic->sd->last_selected = NULL; ic->sd->selected_icons = eina_list_remove(ic->sd->selected_icons, ic); + ic->selected_time = 0.0; if (ic->realized) { const char *stacking, *selectraise; @@ -7213,14 +7200,10 @@ ici->ic->drag.dnd = EINA_TRUE; if (ici->ic->obj) evas_object_hide(ici->ic->obj); if (ici->ic->obj_icon) evas_object_hide(ici->ic->obj_icon); - if (ici->ic->rename_click) ecore_timer_del(ici->ic->rename_click); - ici->ic->rename_click = NULL; } if (!sel) return; sel[sel_length] = '\0'; - if (ic->rename_click) ecore_timer_del(ic->rename_click); - ic->rename_click = NULL; d = e_drag_new(con, x, y, drag_types, 1, sel, sel_length, NULL, _e_fm2_cb_drag_finished); o = edje_object_add(e_drag_evas_get(d)); @@ -9778,11 +9761,6 @@ char text[PATH_MAX + 256]; ic = data; - if (ic->rename_click) - { - ecore_timer_del(ic->rename_click); - ic->rename_click = NULL; - } if ((ic->entry_dialog) || (ic->entry_widget)) return; if (ic->sd->icon_menu.flags & E_FM2_MENU_NO_RENAME) return; |
From: Enlightenment S. <no-...@en...> - 2012-10-03 18:41:06
|
Log: fm preview: fix alignment and formatting string. Author: barbieri Date: 2012-10-03 11:40:59 -0700 (Wed, 03 Oct 2012) New Revision: 77383 Trac: http://trac.enlightenment.org/e/changeset/77383 Modified: trunk/e/src/bin/e_widget_filepreview.c Modified: trunk/e/src/bin/e_widget_filepreview.c =================================================================== --- trunk/e/src/bin/e_widget_filepreview.c 2012-10-03 17:48:43 UTC (rev 77382) +++ trunk/e/src/bin/e_widget_filepreview.c 2012-10-03 18:40:59 UTC (rev 77383) @@ -209,7 +209,7 @@ wd->labob = o; \ e_widget_table_object_align_append(wd->o_preview_properties_table, \ wd->labob, \ - 0, y, 1, 1, 0, 1, 0, 0, 0.0, 0.0); \ + 0, y, 1, 1, 0, 1, 0, 0, 1.0, 0.0); \ o = e_widget_entry_add(evas, &(wd->preview_extra_text), NULL, NULL, NULL); \ e_widget_entry_readonly_set(o, 1); \ e_widget_disabled_set(o, 1); \ @@ -234,7 +234,7 @@ evas_object_smart_callback_add(o, "length_change", (Evas_Smart_Cb)_e_wid_fprev_preview_video_opened, wd); evas_object_smart_callback_add(o, "frame_decode", (Evas_Smart_Cb)_e_wid_fprev_preview_video_position, wd); - o = e_widget_slider_add(evas, 1, 0, _("%3.1"), 0, 100, 0.5, 0, &wd->vid_pct, NULL, wd->w); + o = e_widget_slider_add(evas, 1, 0, _("%3.1f%%"), 0, 100, 0.5, 0, &wd->vid_pct, NULL, wd->w); wd->o_preview_time = o; e_widget_table_object_align_append(wd->o_preview_properties_table, wd->o_preview_time, |