styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make pager kbd/mouse grabs more effective in wayland compositors 

use the same codepaths as x11 compositors, but explicitly grab the
compositor canvas
This commit is contained in:
Mike Blumenkrantz 2015-08-17 14:23:02 -04:00
parent 86d5d318fa
commit 2edd687800
2 changed files with 68 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/modules/pager/e_mod_main.c
View File

@ -1285,7 +1285,10 @@ _pager_window_cb_drag_finished(E_Drag *drag, int dropped)
e_comp_object_effect_unclip(pw->client->frame);
if (act_popup)
{
e_grabinput_get(input_window, 0, input_window);
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
e_grabinput_get(input_window, 0, input_window);
else
e_comp_grab_input(1, 1);
if (!hold_count) _pager_popup_hide(1);
}
}
@ -1642,7 +1645,10 @@ _pager_desk_cb_drag_finished(E_Drag *drag, int dropped)
if (act_popup)
{
e_grabinput_get(input_window, 0, input_window);
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
e_grabinput_get(input_window, 0, input_window);
else
e_comp_grab_input(1, 1);
if (!hold_count) _pager_popup_hide(1);
}
}
@ -1672,13 +1678,21 @@ _pager_popup_cb_timeout(void *data)
_pager_popup_free(pp);
#ifndef HAVE_WAYLAND_ONLY
if (input_window)
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
{
ecore_x_window_free(input_window);
e_grabinput_release(input_window, input_window);
input_window = 0;
if (input_window)
{
e_grabinput_release(input_window, input_window);
ecore_x_window_free(input_window);
input_window = 0;
}
}
#endif
if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
{
e_comp_ungrab_input(1, 1);
input_window = 0;
}
return ECORE_CALLBACK_CANCEL;
}
@ -1705,15 +1719,23 @@ _pager_popup_show(void)
if (pp) _pager_popup_free(pp);
#ifndef HAVE_WAYLAND_ONLY
input_window = ecore_x_window_input_new(e_comp->win, 0, 0, 1, 1);
ecore_x_window_show(input_window);
if (!e_grabinput_get(input_window, 0, input_window))
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
{
ecore_x_window_free(input_window);
input_window = 0;
return 0;
input_window = ecore_x_window_input_new(e_comp->win, 0, 0, 1, 1);
ecore_x_window_show(input_window);
if (!e_grabinput_get(input_window, 0, input_window))
{
ecore_x_window_free(input_window);
input_window = 0;
return 0;
}
}
#endif
if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
{
input_window = e_comp->ee_win;
e_comp_grab_input(1, 1);
}
handlers = eina_list_append
(handlers, ecore_event_handler_add

46
src/modules/pager_plain/e_mod_main.c
View File

@ -2028,7 +2028,10 @@ _pager_window_cb_drag_finished(E_Drag *drag, int dropped)
e_comp_object_effect_unclip(pw->client->frame);
if (act_popup)
{
e_grabinput_get(input_window, 0, input_window);
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
e_grabinput_get(input_window, 0, input_window);
else
e_comp_grab_input(1, 1);
if (!hold_count) _pager_popup_hide(1);
}
}
@ -2389,7 +2392,10 @@ _pager_desk_cb_drag_finished(E_Drag *drag, int dropped)
if (act_popup)
{
e_grabinput_get(input_window, 0, input_window);
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
e_grabinput_get(input_window, 0, input_window);
else
e_comp_grab_input(1, 1);
if (!hold_count) _pager_popup_hide(1);
}
}
@ -2419,13 +2425,21 @@ _pager_popup_cb_timeout(void *data)
_pager_popup_free(pp);
#ifndef HAVE_WAYLAND_ONLY
if (input_window)
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
{
ecore_x_window_free(input_window);
e_grabinput_release(input_window, input_window);
input_window = 0;
if (input_window)
{
e_grabinput_release(input_window, input_window);
ecore_x_window_free(input_window);
input_window = 0;
}
}
#endif
if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
{
e_comp_ungrab_input(1, 1);
input_window = 0;
}
return ECORE_CALLBACK_CANCEL;
}
@ -2452,15 +2466,23 @@ _pager_popup_show(void)
if (pp) _pager_popup_free(pp);
#ifndef HAVE_WAYLAND_ONLY
input_window = ecore_x_window_input_new(e_comp->win, 0, 0, 1, 1);
ecore_x_window_show(input_window);
if (!e_grabinput_get(input_window, 0, input_window))
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
{
ecore_x_window_free(input_window);
input_window = 0;
return 0;
input_window = ecore_x_window_input_new(e_comp->win, 0, 0, 1, 1);
ecore_x_window_show(input_window);
if (!e_grabinput_get(input_window, 0, input_window))
{
ecore_x_window_free(input_window);
input_window = 0;
return 0;
}
}
#endif
if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
{
input_window = e_comp->ee_win;
e_comp_grab_input(1, 1);
}
handlers = eina_list_append
(handlers, ecore_event_handler_add