summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-09-05 00:19:31 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-09-05 00:19:31 +0100
commitec1ee3ff4275e757e908156fe09eff60e0fb7702 (patch)
treeeea00771b94ec854a708530bf4bc7fcccf075957 /src/modules
parent48c4ea17f2d71486e0462eb0ec5547fe752b832c (diff)
winlist - use new geom key navigate action util
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/winlist/e_winlist.c28
1 files changed, 16 insertions, 12 deletions
diff --git a/src/modules/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c
index 0b38004..24e5ad5 100644
--- a/src/modules/winlist/e_winlist.c
+++ b/src/modules/winlist/e_winlist.c
@@ -971,22 +971,26 @@ static Eina_Bool
971_e_winlist_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) 971_e_winlist_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
972{ 972{
973 Ecore_Event_Key *ev = event; 973 Ecore_Event_Key *ev = event;
974 E_Util_Action act;
975 int x = 0, y = 0;
974 976
975 if (ev->window != _input_window) return ECORE_CALLBACK_PASS_ON; 977 if (ev->window != _input_window) return ECORE_CALLBACK_PASS_ON;
976 if (!strcmp(ev->key, "Up")) 978 act = e_util_key_geometry_action_get(ev->key, &x, &y, 1, 1);
977 e_winlist_direction_select(_winlist_zone, 0); 979 if (act == E_UTIL_ACTION_DONE)
978 else if (!strcmp(ev->key, "Down"))
979 e_winlist_direction_select(_winlist_zone, 1);
980 else if (!strcmp(ev->key, "Left"))
981 e_winlist_direction_select(_winlist_zone, 2);
982 else if (!strcmp(ev->key, "Right"))
983 e_winlist_direction_select(_winlist_zone, 3);
984 else if (!strcmp(ev->key, "Return"))
985 e_winlist_hide(); 980 e_winlist_hide();
986 else if (!strcmp(ev->key, "space")) 981 else if (act == E_UTIL_ACTION_ABORT)
987 e_winlist_hide();
988 else if (!strcmp(ev->key, "Escape"))
989 _e_winlist_restore_desktop(); 982 _e_winlist_restore_desktop();
983 else if (act == E_UTIL_ACTION_DO)
984 {
985 if (y < 0)
986 e_winlist_direction_select(_winlist_zone, 0);
987 else if (y > 0)
988 e_winlist_direction_select(_winlist_zone, 1);
989 else if (x < 0)
990 e_winlist_direction_select(_winlist_zone, 2);
991 else if (x > 0)
992 e_winlist_direction_select(_winlist_zone, 3);
993 }
990 else if (!strcmp(ev->key, "1")) 994 else if (!strcmp(ev->key, "1"))
991 _e_winlist_activate_nth(0); 995 _e_winlist_activate_nth(0);
992 else if (!strcmp(ev->key, "2")) 996 else if (!strcmp(ev->key, "2"))