Enlightenment CVS committal Author : raster Project : e17 Module : apps/e
Dir : e17/apps/e/src/bin Modified Files: Makefile.am e_actions.c e_border.c e_border.h e_config.c e_includes.h e_main.c Removed Files: e_winlist.c e_winlist.h Log Message: winlist -> module! =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v retrieving revision 1.198 retrieving revision 1.199 diff -u -3 -r1.198 -r1.199 --- Makefile.am 1 Aug 2007 12:37:00 -0000 1.198 +++ Makefile.am 5 Aug 2007 04:41:55 -0000 1.199 @@ -72,7 +72,6 @@ e_prefix.h \ e_datastore.h \ e_msg.h \ -e_winlist.h \ e_alert.h \ e_maximize.h \ e_grabinput.h \ @@ -199,7 +198,6 @@ e_prefix.c \ e_datastore.c \ e_msg.c \ -e_winlist.c \ e_alert.c \ e_maximize.c \ e_grabinput.c \ =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v retrieving revision 1.104 retrieving revision 1.105 diff -u -3 -r1.104 -r1.105 --- e_actions.c 1 Aug 2007 12:37:00 -0000 1.104 +++ e_actions.c 5 Aug 2007 04:41:55 -0000 1.105 @@ -1441,100 +1441,6 @@ } /***************************************************************************/ -ACT_FN_GO(winlist) -{ - E_Zone *zone; - - zone = _e_actions_zone_get(obj); - if (zone) - { - if (params) - { - if (!strcmp(params, "next")) - { - if (!e_winlist_show(zone)) - e_winlist_next(); - } - else if (!strcmp(params, "prev")) - { - if (!e_winlist_show(zone)) - e_winlist_prev(); - } - } - else - { - if (!e_winlist_show(zone)) - e_winlist_next(); - } - } -} -ACT_FN_GO_MOUSE(winlist) -{ - E_Zone *zone; - - zone = _e_actions_zone_get(obj); - if (zone) - { - if (params) - { - if (!strcmp(params, "next")) - { - if (e_winlist_show(zone)) - e_winlist_modifiers_set(ev->modifiers); - else - e_winlist_next(); - } - else if (!strcmp(params, "prev")) - { - if (e_winlist_show(zone)) - e_winlist_modifiers_set(ev->modifiers); - else - e_winlist_prev(); - } - } - else - { - if (e_winlist_show(zone)) - e_winlist_modifiers_set(ev->modifiers); - else - e_winlist_next(); - } - } -} -ACT_FN_GO_KEY(winlist) -{ - E_Zone *zone; - - zone = _e_actions_zone_get(obj); - if (zone) - { - if (params) - { - if (!strcmp(params, "next")) - { - if (e_winlist_show(zone)) - e_winlist_modifiers_set(ev->modifiers); - else - e_winlist_next(); - } - else if (!strcmp(params, "prev")) - { - if (e_winlist_show(zone)) - e_winlist_modifiers_set(ev->modifiers); - else - e_winlist_prev(); - } - } - else - { - if (e_winlist_show(zone)) - e_winlist_modifiers_set(ev->modifiers); - else - e_winlist_next(); - } - } -} - ACT_FN_GO(desk_deskshow_toggle) { E_Zone *zone; @@ -2248,15 +2154,6 @@ ACT_GO(app); e_action_predef_name_set(_("Launch"), _("Application"), "app", NULL, "syntax: , example:", 1); - - /* winlist */ - ACT_GO(winlist); - e_action_predef_name_set(_("Window : List"), _("Next Window"), "winlist", - "next", NULL, 0); - e_action_predef_name_set(_("Window : List"), _("Previous Window"), - "winlist", "prev", NULL, 0); - ACT_GO_MOUSE(winlist); - ACT_GO_KEY(winlist); ACT_GO(restart); e_action_predef_name_set(_("Enlightenment"), _("Restart"), "restart", =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.599 retrieving revision 1.600 diff -u -3 -r1.599 -r1.600 --- e_border.c 26 Jul 2007 12:38:18 -0000 1.599 +++ e_border.c 5 Aug 2007 04:41:55 -0000 1.600 @@ -118,6 +118,8 @@ static Ecore_X_Screen_Size screen_size = { -1, -1 }; +static int focus_track_frozen = 0; + EAPI int E_EVENT_BORDER_ADD = 0; EAPI int E_EVENT_BORDER_REMOVE = 0; EAPI int E_EVENT_BORDER_ZONE_SET = 0; @@ -1324,7 +1326,7 @@ } if (bd->visible) { - if (!e_winlist_active_get()) + if (focus_track_frozen > 0) e_border_focus_latest_set(bd); } // printf("EMIT 0x%x activeve\n", bd->client.win); @@ -7439,4 +7441,16 @@ } else _e_border_hooks_delete++; +} + +EAPI void +e_border_focus_track_freeze(void) +{ + focus_track_frozen++; +} + +EAPI void +e_border_focus_track_thaw(void) +{ + focus_track_frozen--; } =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_border.h,v retrieving revision 1.163 retrieving revision 1.164 diff -u -3 -r1.163 -r1.164 --- e_border.h 15 Jul 2007 13:25:56 -0000 1.163 +++ e_border.h 5 Aug 2007 04:41:55 -0000 1.164 @@ -668,6 +668,8 @@ EAPI E_Border_Hook *e_border_hook_add(E_Border_Hook_Point hookpoint, void (*func) (void *data, E_Border *bd), void *data); EAPI void e_border_hook_del(E_Border_Hook *bh); +EAPI void e_border_focus_track_freeze(void); +EAPI void e_border_focus_track_thaw(void); extern EAPI int E_EVENT_BORDER_RESIZE; extern EAPI int E_EVENT_BORDER_MOVE; =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v retrieving revision 1.262 retrieving revision 1.263 diff -u -3 -r1.262 -r1.263 --- e_config.c 3 Aug 2007 10:20:34 -0000 1.262 +++ e_config.c 5 Aug 2007 04:41:55 -0000 1.263 @@ -759,6 +759,7 @@ CFG_MODULE("temperature", 1, 0); CFG_MODULE("pager", 1, 0); CFG_MODULE("exebuf", 1, 1); + CFG_MODULE("winlist", 1, 1); CFG_MODULE("conf_applications", 1, 1); CFG_MODULE("conf_borders", 1, 1); CFG_MODULE("conf_clientlist", 1, 1); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v retrieving revision 1.168 retrieving revision 1.169 diff -u -3 -r1.168 -r1.169 --- e_includes.h 1 Aug 2007 12:37:01 -0000 1.168 +++ e_includes.h 5 Aug 2007 04:41:55 -0000 1.169 @@ -48,7 +48,6 @@ #include "e_prefix.h" #include "e_datastore.h" #include "e_msg.h" -#include "e_winlist.h" #include "e_alert.h" #include "e_maximize.h" #include "e_grabinput.h" =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v retrieving revision 1.227 retrieving revision 1.228 diff -u -3 -r1.227 -r1.228 --- e_main.c 1 Aug 2007 12:37:01 -0000 1.227 +++ e_main.c 5 Aug 2007 04:41:55 -0000 1.228 @@ -740,14 +740,6 @@ _e_main_shutdown(-1); } _e_main_shutdown_push(e_module_shutdown); - TS("winlist"); - /* setup winlist */ - if (!e_winlist_init()) - { - e_error_message_show(_("Enlightenment cannot set up its window list system.")); - _e_main_shutdown(-1); - } - _e_main_shutdown_push(e_winlist_shutdown); TS("colorclasses"); /* setup color_class */ if (!e_color_class_init()) ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs