forked from enlightenment/enlightenment
remove comp canvas key handler shortcuts for passing keys to wayland clients
now handled normally by disabling bindings
This commit is contained in:
parent
fc6458bccd
commit
c86aa21e90
|
@ -101,13 +101,6 @@ static Eina_Bool
|
||||||
_key_down(int ctx, Ecore_Event_Key *ev)
|
_key_down(int ctx, Ecore_Event_Key *ev)
|
||||||
{
|
{
|
||||||
e_screensaver_notidle();
|
e_screensaver_notidle();
|
||||||
if (e_menu_grab_window_get())
|
|
||||||
{
|
|
||||||
#ifdef HAVE_WAYLAND
|
|
||||||
e_comp_wl_key_down(ev);
|
|
||||||
#endif
|
|
||||||
return ECORE_CALLBACK_RENEW;
|
|
||||||
}
|
|
||||||
if ((e_comp->comp_type == E_PIXMAP_TYPE_X) && (ev->event_window != e_comp->root))
|
if ((e_comp->comp_type == E_PIXMAP_TYPE_X) && (ev->event_window != e_comp->root))
|
||||||
{
|
{
|
||||||
E_Client *ec;
|
E_Client *ec;
|
||||||
|
@ -143,13 +136,6 @@ static Eina_Bool
|
||||||
_key_up(int ctx, Ecore_Event_Key *ev)
|
_key_up(int ctx, Ecore_Event_Key *ev)
|
||||||
{
|
{
|
||||||
e_screensaver_notidle();
|
e_screensaver_notidle();
|
||||||
if (e_menu_grab_window_get())
|
|
||||||
{
|
|
||||||
#ifdef HAVE_WAYLAND
|
|
||||||
e_comp_wl_key_up(ev);
|
|
||||||
#endif
|
|
||||||
return ECORE_CALLBACK_RENEW;
|
|
||||||
}
|
|
||||||
if ((e_comp->comp_type == E_PIXMAP_TYPE_X) && (ev->event_window != e_comp->root)) return ECORE_CALLBACK_PASS_ON;
|
if ((e_comp->comp_type == E_PIXMAP_TYPE_X) && (ev->event_window != e_comp->root)) return ECORE_CALLBACK_PASS_ON;
|
||||||
return !e_bindings_key_up_event_handle(ctx, E_OBJECT(e_comp), ev)
|
return !e_bindings_key_up_event_handle(ctx, E_OBJECT(e_comp), ev)
|
||||||
#ifdef HAVE_WAYLAND
|
#ifdef HAVE_WAYLAND
|
||||||
|
|
Loading…
Reference in New Issue