break out mouse/keyboard grab dialogs into e_grab_dialog to be reused more easily in other places, replace original instances with this dialog
also change key grab dialog to close if the mouse is clicked SVN revision: 75456
This commit is contained in:
parent
2b43d66f9b
commit
a76c1f2b84
|
@ -91,6 +91,7 @@ e_font.h \
|
|||
e_gadcon.h \
|
||||
e_gadcon_popup.h \
|
||||
e_grabinput.h \
|
||||
e_grab_dialog.h \
|
||||
e.h \
|
||||
e_hints.h \
|
||||
e_icon.h \
|
||||
|
@ -246,6 +247,7 @@ e_font.c \
|
|||
e_gadcon.c \
|
||||
e_gadcon_popup.c \
|
||||
e_grabinput.c \
|
||||
e_grab_dialog.c \
|
||||
e_hints.c \
|
||||
e_icon.c \
|
||||
e_ilist.c \
|
||||
|
|
|
@ -0,0 +1,166 @@
|
|||
#include "e.h"
|
||||
|
||||
#define TEXT_PRESS_KEY_SEQUENCE _("Please press key sequence,<br><br>" \
|
||||
"or <hilight>Escape</hilight> to abort.")
|
||||
#define TEXT_PRESS_MOUSE_BINIDING_SEQUENCE _("Please hold any modifier you want<br>" \
|
||||
"and press any button on your mouse,<br> or roll a" \
|
||||
" wheel, to assign mouse binding." \
|
||||
"<br>Press <hilight>Escape</highlight> to abort.")
|
||||
|
||||
static Eina_Bool
|
||||
_e_grab_dialog_key_handler(void *data, int type __UNUSED__, Ecore_Event_Key *ev)
|
||||
{
|
||||
E_Grab_Dialog *eg = data;
|
||||
|
||||
if (ev->window != eg->grab_win) return ECORE_CALLBACK_RENEW;
|
||||
if (!strcmp(ev->keyname, "Escape") &&
|
||||
!(ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT) &&
|
||||
!(ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) &&
|
||||
!(ev->modifiers & ECORE_EVENT_MODIFIER_ALT) &&
|
||||
!(ev->modifiers & ECORE_EVENT_MODIFIER_WIN))
|
||||
{
|
||||
e_object_del(data);
|
||||
return ECORE_CALLBACK_RENEW;
|
||||
}
|
||||
|
||||
if (eg->key)
|
||||
{
|
||||
e_object_ref(data);
|
||||
eg->key(eg->data ?: eg, type, ev);
|
||||
e_object_unref(data);
|
||||
}
|
||||
return ECORE_CALLBACK_RENEW;
|
||||
}
|
||||
|
||||
static Eina_Bool
|
||||
_e_grab_dialog_wheel_handler(void *data, int type __UNUSED__, Ecore_Event_Mouse_Wheel *ev)
|
||||
{
|
||||
E_Grab_Dialog *eg = data;
|
||||
|
||||
if (ev->window != eg->grab_win) return ECORE_CALLBACK_RENEW;
|
||||
|
||||
if (eg->wheel)
|
||||
{
|
||||
e_object_ref(data);
|
||||
eg->wheel(eg->data ?: eg, type, ev);
|
||||
e_object_unref(data);
|
||||
}
|
||||
return ECORE_CALLBACK_RENEW;
|
||||
}
|
||||
|
||||
static Eina_Bool
|
||||
_e_grab_dialog_mouse_handler(void *data, int type __UNUSED__, Ecore_Event_Mouse_Button *ev)
|
||||
{
|
||||
E_Grab_Dialog *eg = data;
|
||||
|
||||
if (ev->window != eg->grab_win) return ECORE_CALLBACK_RENEW;
|
||||
|
||||
if (eg->mouse)
|
||||
{
|
||||
e_object_ref(data);
|
||||
eg->mouse(eg->data ?: eg, type, ev);
|
||||
e_object_unref(data);
|
||||
}
|
||||
else
|
||||
e_object_del(data);
|
||||
return ECORE_CALLBACK_RENEW;
|
||||
}
|
||||
|
||||
static void
|
||||
_e_grab_dialog_free(E_Grab_Dialog *eg)
|
||||
{
|
||||
if (eg->grab_win)
|
||||
{
|
||||
e_grabinput_release(eg->grab_win, eg->grab_win);
|
||||
ecore_x_window_free(eg->grab_win);
|
||||
}
|
||||
E_FREE_LIST(eg->handlers, ecore_event_handler_del);
|
||||
|
||||
e_object_del(E_OBJECT(eg->dia));
|
||||
free(eg);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_grab_dialog_delete(E_Win *win)
|
||||
{
|
||||
E_Dialog *dia;
|
||||
E_Grab_Dialog *eg;
|
||||
|
||||
dia = win->data;
|
||||
eg = dia->data;
|
||||
e_object_del(E_OBJECT(eg));
|
||||
}
|
||||
|
||||
static void
|
||||
_e_grab_dialog_dia_del(void *data)
|
||||
{
|
||||
E_Dialog *dia = data;
|
||||
|
||||
e_object_del(dia->data);
|
||||
}
|
||||
|
||||
EAPI E_Grab_Dialog *
|
||||
e_grab_dialog_show(E_Win *parent, Eina_Bool is_mouse, Ecore_Event_Handler_Cb key, Ecore_Event_Handler_Cb mouse, Ecore_Event_Handler_Cb wheel, const void *data)
|
||||
{
|
||||
E_Manager *man;
|
||||
E_Container *con;
|
||||
E_Grab_Dialog *eg;
|
||||
Ecore_Event_Handler *eh;
|
||||
|
||||
if (parent)
|
||||
{
|
||||
con = parent->container;
|
||||
man = con->manager;
|
||||
}
|
||||
else
|
||||
{
|
||||
man = e_manager_current_get();
|
||||
e_container_current_get(man);
|
||||
}
|
||||
|
||||
eg = E_OBJECT_ALLOC(E_Grab_Dialog, E_GRAB_DIALOG_TYPE, _e_grab_dialog_free);
|
||||
if (!eg) return NULL;
|
||||
|
||||
if (is_mouse)
|
||||
{
|
||||
eg->dia = e_dialog_new(con, "E", "_mousebind_getmouse_dialog");
|
||||
e_dialog_title_set(eg->dia, _("Mouse Binding Sequence"));
|
||||
e_dialog_icon_set(eg->dia, "preferences-desktop-mouse", 48);
|
||||
e_dialog_text_set(eg->dia, TEXT_PRESS_MOUSE_BINIDING_SEQUENCE);
|
||||
}
|
||||
else
|
||||
{
|
||||
eg->dia = e_dialog_new(con, "E", "_keybind_getkey_dialog");
|
||||
e_dialog_title_set(eg->dia, _("Key Binding Sequence"));
|
||||
e_dialog_icon_set(eg->dia, "preferences-desktop-keyboard-shortcuts", 48);
|
||||
e_dialog_text_set(eg->dia, TEXT_PRESS_KEY_SEQUENCE);
|
||||
}
|
||||
eg->dia->data = eg;
|
||||
e_win_centered_set(eg->dia->win, 1);
|
||||
e_win_borderless_set(eg->dia->win, 1);
|
||||
e_object_del_attach_func_set(E_OBJECT(eg->dia), _e_grab_dialog_dia_del);
|
||||
e_win_delete_callback_set(eg->dia->win, _e_grab_dialog_delete);
|
||||
|
||||
eg->grab_win = ecore_x_window_input_new(man->root, 0, 0, 1, 1);
|
||||
ecore_x_window_show(eg->grab_win);
|
||||
e_grabinput_get(eg->grab_win, 0, eg->grab_win);
|
||||
|
||||
eg->key = key;
|
||||
eg->mouse = mouse;
|
||||
eg->wheel = wheel;
|
||||
eg->data = (void*)data;
|
||||
|
||||
eh = ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, (Ecore_Event_Handler_Cb)_e_grab_dialog_key_handler, eg);
|
||||
eg->handlers = eina_list_append(eg->handlers, eh);
|
||||
eh = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, (Ecore_Event_Handler_Cb)_e_grab_dialog_mouse_handler, eg);
|
||||
eg->handlers = eina_list_append(eg->handlers, eh);
|
||||
if (wheel)
|
||||
{
|
||||
eh = ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL, (Ecore_Event_Handler_Cb)_e_grab_dialog_wheel_handler, eg);
|
||||
eg->handlers = eina_list_append(eg->handlers, eh);
|
||||
}
|
||||
e_dialog_show(eg->dia);
|
||||
if (parent)
|
||||
e_dialog_parent_set(eg->dia, parent);
|
||||
return eg;
|
||||
}
|
|
@ -0,0 +1,27 @@
|
|||
#ifdef E_TYPEDEFS
|
||||
|
||||
typedef struct _E_Grab_Dialog E_Grab_Dialog;
|
||||
|
||||
#else
|
||||
#ifndef E_GRAB_DIALOG_H
|
||||
#define E_GRAB_DIALOG_H
|
||||
|
||||
#define E_GRAB_DIALOG_TYPE 0xE0b0104A
|
||||
|
||||
struct _E_Grab_Dialog
|
||||
{
|
||||
E_Object e_obj_inherit;
|
||||
|
||||
E_Dialog *dia;
|
||||
Ecore_X_Window grab_win;
|
||||
Ecore_Event_Handler_Cb key;
|
||||
Ecore_Event_Handler_Cb mouse;
|
||||
Ecore_Event_Handler_Cb wheel;
|
||||
Eina_List *handlers;
|
||||
void *data;
|
||||
};
|
||||
|
||||
EAPI E_Grab_Dialog *e_grab_dialog_show(E_Win *parent, Eina_Bool is_mouse, Ecore_Event_Handler_Cb key, Ecore_Event_Handler_Cb mouse, Ecore_Event_Handler_Cb wheel, const void *data);
|
||||
|
||||
#endif
|
||||
#endif
|
|
@ -146,3 +146,4 @@
|
|||
#include "e_log.h"
|
||||
#include "e_import_dialog.h"
|
||||
#include "e_import_config_dialog.h"
|
||||
#include "e_grab_dialog.h"
|
||||
|
|
|
@ -73,9 +73,7 @@ struct _E_Config_Dialog_Data
|
|||
char *params;
|
||||
int cur_act, add;
|
||||
|
||||
E_Dialog *dia;
|
||||
Ecore_X_Window bind_win;
|
||||
Eina_List *handlers;
|
||||
E_Grab_Dialog *eg;
|
||||
} locals;
|
||||
struct
|
||||
{
|
||||
|
@ -127,9 +125,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
|
|||
cfdata->locals.params = strdup("");
|
||||
cfdata->locals.cur = NULL;
|
||||
cfdata->binding.key = NULL;
|
||||
cfdata->locals.bind_win = 0;
|
||||
cfdata->locals.handlers = NULL;
|
||||
cfdata->locals.dia = NULL;
|
||||
cfdata->locals.eg = NULL;
|
||||
|
||||
EINA_LIST_FOREACH(e_config->key_bindings, l, bi)
|
||||
{
|
||||
|
@ -960,49 +956,23 @@ _key_binding_sort_cb(const void *d1,
|
|||
}
|
||||
|
||||
/**************** grab window *******/
|
||||
|
||||
static void
|
||||
_grab_wnd_show(E_Config_Dialog_Data *cfdata)
|
||||
_grab_wnd_hide(void *data)
|
||||
{
|
||||
E_Manager *man;
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
if (cfdata->locals.bind_win != 0) return;
|
||||
|
||||
man = e_manager_current_get();
|
||||
|
||||
cfdata->locals.dia = e_dialog_new(e_container_current_get(man),
|
||||
"E", "_keybind_getkey_dialog");
|
||||
if (!cfdata->locals.dia) return;
|
||||
e_dialog_title_set(cfdata->locals.dia, _("Key Binding Sequence"));
|
||||
e_dialog_icon_set(cfdata->locals.dia, "preferences-desktop-keyboard-shortcuts", 48);
|
||||
e_dialog_text_set(cfdata->locals.dia, TEXT_PRESS_KEY_SEQUENCE);
|
||||
e_win_centered_set(cfdata->locals.dia->win, 1);
|
||||
e_win_borderless_set(cfdata->locals.dia->win, 1);
|
||||
|
||||
cfdata->locals.bind_win = ecore_x_window_input_new(man->root, 0, 0, 1, 1);
|
||||
ecore_x_window_show(cfdata->locals.bind_win);
|
||||
e_grabinput_get(0, 0, cfdata->locals.bind_win);
|
||||
|
||||
cfdata->locals.handlers = eina_list_append(cfdata->locals.handlers,
|
||||
ecore_event_handler_add(ECORE_EVENT_KEY_DOWN,
|
||||
_grab_key_down_cb, cfdata));
|
||||
e_dialog_show(cfdata->locals.dia);
|
||||
e_dialog_parent_set(cfdata->locals.dia, cfdata->cfd->dia->win);
|
||||
cfdata = e_object_data_get(data);
|
||||
cfdata->locals.eg = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
_grab_wnd_hide(E_Config_Dialog_Data *cfdata)
|
||||
_grab_wnd_show(E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
Ecore_Event_Handler *eh;
|
||||
|
||||
EINA_LIST_FREE(cfdata->locals.handlers, eh)
|
||||
ecore_event_handler_del(eh);
|
||||
|
||||
e_object_del(E_OBJECT(cfdata->locals.dia));
|
||||
cfdata->locals.dia = NULL;
|
||||
|
||||
e_grabinput_release(0, cfdata->locals.bind_win);
|
||||
ecore_x_window_free(cfdata->locals.bind_win);
|
||||
cfdata->locals.bind_win = 0;
|
||||
if (cfdata->locals.eg) return;
|
||||
cfdata->locals.eg = e_grab_dialog_show(cfdata->cfd->dia->win, EINA_FALSE, _grab_key_down_cb, NULL, NULL, cfdata);
|
||||
e_object_data_set(E_OBJECT(cfdata->locals.eg), cfdata);
|
||||
e_object_del_attach_func_set(E_OBJECT(cfdata->locals.eg), _grab_wnd_hide);
|
||||
}
|
||||
|
||||
static Eina_Bool
|
||||
|
@ -1016,18 +986,6 @@ _grab_key_down_cb(void *data,
|
|||
ev = event;
|
||||
cfdata = data;
|
||||
|
||||
if (ev->window != cfdata->locals.bind_win) return ECORE_CALLBACK_PASS_ON;
|
||||
|
||||
if (!strcmp(ev->keyname, "Escape") &&
|
||||
!(ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT) &&
|
||||
!(ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) &&
|
||||
!(ev->modifiers & ECORE_EVENT_MODIFIER_ALT) &&
|
||||
!(ev->modifiers & ECORE_EVENT_MODIFIER_WIN))
|
||||
{
|
||||
_grab_wnd_hide(cfdata);
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((ev->keyname) && (ev->key) && (ev->compose))
|
||||
printf("'%s' '%s' '%s'\n", ev->keyname, ev->key, ev->compose);
|
||||
else if ((ev->keyname) && (ev->key))
|
||||
|
@ -1191,8 +1149,7 @@ _grab_key_down_cb(void *data,
|
|||
e_widget_ilist_nth_show(cfdata->gui.o_binding_list, n - 1, 1);
|
||||
e_widget_ilist_selected_set(cfdata->gui.o_binding_list, n - 1);
|
||||
}
|
||||
_grab_wnd_hide(cfdata);
|
||||
}
|
||||
e_object_del(E_OBJECT(cfdata->locals.eg));
|
||||
}
|
||||
return ECORE_CALLBACK_PASS_ON;
|
||||
}
|
||||
|
|
|
@ -46,10 +46,8 @@ static int _wheel_binding_sort_cb(const void *d1, const void *d2);
|
|||
|
||||
/********* grab window **********/
|
||||
static void _grab_wnd_show(E_Config_Dialog_Data *cfdata);
|
||||
static void _grab_wnd_hide(E_Config_Dialog_Data *cfdata);
|
||||
static Eina_Bool _grab_mouse_down_cb(void *data, int type, void *event);
|
||||
static Eina_Bool _grab_mouse_wheel_cb(void *data, int type, void *event);
|
||||
static Eina_Bool _grab_key_down_cb(void *data, int type, void *event);
|
||||
|
||||
struct _E_Config_Dialog_Data
|
||||
{
|
||||
|
@ -73,9 +71,7 @@ struct _E_Config_Dialog_Data
|
|||
const char *cur;
|
||||
int add; /*just to distinguesh among two buttons add/modify */
|
||||
|
||||
E_Dialog *dia;
|
||||
Ecore_X_Window bind_win;
|
||||
Eina_List *handlers;
|
||||
E_Grab_Dialog *eg;
|
||||
} locals;
|
||||
|
||||
struct
|
||||
|
@ -129,9 +125,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
|
|||
cfdata->locals.context = E_BINDING_CONTEXT_ANY;
|
||||
cfdata->binding.mouse = NULL;
|
||||
cfdata->binding.wheel = NULL;
|
||||
cfdata->locals.bind_win = 0;
|
||||
cfdata->locals.handlers = NULL;
|
||||
cfdata->locals.dia = NULL;
|
||||
cfdata->locals.eg = NULL;
|
||||
|
||||
EINA_LIST_FOREACH(e_config->mouse_bindings, l, eb)
|
||||
{
|
||||
|
@ -1287,59 +1281,23 @@ _wheel_binding_sort_cb(const void *d1, const void *d2)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
_grab_wnd_show(E_Config_Dialog_Data *cfdata)
|
||||
_grab_wnd_hide(void *data)
|
||||
{
|
||||
E_Manager *man;
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
if (cfdata->locals.bind_win != 0) return;
|
||||
|
||||
man = e_manager_current_get();
|
||||
|
||||
cfdata->locals.dia = e_dialog_new(e_container_current_get(man),
|
||||
"E", "_mousebind_getmouse_dialog");
|
||||
if (!cfdata->locals.dia) return;
|
||||
e_dialog_title_set(cfdata->locals.dia, _("Mouse Binding Sequence"));
|
||||
e_dialog_icon_set(cfdata->locals.dia, "preferences-desktop-mouse", 48);
|
||||
e_dialog_text_set(cfdata->locals.dia, TEXT_PRESS_MOUSE_BINIDING_SEQUENCE);
|
||||
e_win_centered_set(cfdata->locals.dia->win, 1);
|
||||
e_win_borderless_set(cfdata->locals.dia->win, 1);
|
||||
|
||||
cfdata->locals.bind_win = ecore_x_window_input_new(man->root, 0, 0, 1, 1);
|
||||
/* man->w, man->h); */
|
||||
ecore_x_window_show(cfdata->locals.bind_win);
|
||||
e_grabinput_get(cfdata->locals.bind_win, 0, cfdata->locals.bind_win);
|
||||
|
||||
cfdata->locals.handlers = eina_list_append(cfdata->locals.handlers,
|
||||
ecore_event_handler_add(ECORE_EVENT_KEY_DOWN,
|
||||
_grab_key_down_cb, cfdata));
|
||||
|
||||
cfdata->locals.handlers = eina_list_append(cfdata->locals.handlers,
|
||||
ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN,
|
||||
_grab_mouse_down_cb, cfdata));
|
||||
|
||||
cfdata->locals.handlers = eina_list_append(cfdata->locals.handlers,
|
||||
ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL,
|
||||
_grab_mouse_wheel_cb, cfdata));
|
||||
|
||||
e_dialog_show(cfdata->locals.dia);
|
||||
e_dialog_parent_set(cfdata->locals.dia, cfdata->cfd->dia->win);
|
||||
cfdata = e_object_data_get(data);
|
||||
cfdata->locals.eg = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
_grab_wnd_hide(E_Config_Dialog_Data *cfdata)
|
||||
_grab_wnd_show(E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
Ecore_Event_Handler *eh;
|
||||
|
||||
EINA_LIST_FREE(cfdata->locals.handlers, eh)
|
||||
ecore_event_handler_del(eh);
|
||||
|
||||
e_object_del(E_OBJECT(cfdata->locals.dia));
|
||||
cfdata->locals.dia = NULL;
|
||||
|
||||
e_grabinput_release(cfdata->locals.bind_win, cfdata->locals.bind_win);
|
||||
ecore_x_window_free(cfdata->locals.bind_win);
|
||||
cfdata->locals.bind_win = 0;
|
||||
if (cfdata->locals.eg) return;
|
||||
cfdata->locals.eg = e_grab_dialog_show(cfdata->cfd->dia->win, EINA_TRUE, NULL, _grab_mouse_down_cb, _grab_mouse_wheel_cb, cfdata);
|
||||
e_object_data_set(E_OBJECT(cfdata->locals.eg), cfdata);
|
||||
e_object_del_attach_func_set(E_OBJECT(cfdata->locals.eg), _grab_wnd_hide);
|
||||
}
|
||||
|
||||
static Eina_Bool
|
||||
|
@ -1355,9 +1313,6 @@ _grab_mouse_down_cb(void *data, __UNUSED__ int type, void *event)
|
|||
ev = event;
|
||||
cfdata = data;
|
||||
|
||||
if (!cfdata->locals.bind_win) return ECORE_CALLBACK_PASS_ON;
|
||||
if (ev->window != cfdata->locals.bind_win) return ECORE_CALLBACK_PASS_ON;
|
||||
|
||||
if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
|
||||
mod |= E_BINDING_MODIFIER_SHIFT;
|
||||
if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)
|
||||
|
@ -1439,7 +1394,7 @@ _grab_mouse_down_cb(void *data, __UNUSED__ int type, void *event)
|
|||
e_widget_ilist_selected_set(cfdata->gui.o_binding_list, n + 1);
|
||||
}
|
||||
_update_buttons(cfdata);
|
||||
_grab_wnd_hide(cfdata);
|
||||
e_object_del(E_OBJECT(cfdata->locals.eg));
|
||||
|
||||
return ECORE_CALLBACK_PASS_ON;
|
||||
}
|
||||
|
@ -1457,9 +1412,6 @@ _grab_mouse_wheel_cb(void *data, int type __UNUSED__, void *event)
|
|||
ev = event;
|
||||
cfdata = data;
|
||||
|
||||
if (!cfdata->locals.bind_win) return ECORE_CALLBACK_PASS_ON;
|
||||
if (ev->window != cfdata->locals.bind_win) return ECORE_CALLBACK_PASS_ON;
|
||||
|
||||
if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
|
||||
mod |= E_BINDING_MODIFIER_SHIFT;
|
||||
if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)
|
||||
|
@ -1555,29 +1507,6 @@ _grab_mouse_wheel_cb(void *data, int type __UNUSED__, void *event)
|
|||
}
|
||||
_update_buttons(cfdata);
|
||||
|
||||
_grab_wnd_hide(cfdata);
|
||||
return ECORE_CALLBACK_PASS_ON;
|
||||
}
|
||||
|
||||
static Eina_Bool
|
||||
_grab_key_down_cb(void *data, int type __UNUSED__, void *event)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
Ecore_Event_Key *ev = event;
|
||||
|
||||
cfdata = data;
|
||||
|
||||
if (!cfdata->locals.bind_win) return ECORE_CALLBACK_PASS_ON;
|
||||
if (ev->window != cfdata->locals.bind_win) return ECORE_CALLBACK_PASS_ON;
|
||||
|
||||
if (!strcmp(ev->keyname, "Escape") &&
|
||||
!(ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT) &&
|
||||
!(ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) &&
|
||||
!(ev->modifiers & ECORE_EVENT_MODIFIER_ALT) &&
|
||||
!(ev->modifiers & ECORE_EVENT_MODIFIER_WIN))
|
||||
{
|
||||
_grab_wnd_hide(cfdata);
|
||||
}
|
||||
|
||||
e_object_del(E_OBJECT(cfdata->locals.eg));
|
||||
return ECORE_CALLBACK_PASS_ON;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue