From fa75d181d46e97eeb14e0afdfe8f8e33a354b74d Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 6 Aug 2015 18:43:56 -0400 Subject: [PATCH] block internal usage of x11 input grabs under wayland these shouldn't be necessary since we control the input --- src/bin/e_grabinput.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/bin/e_grabinput.c b/src/bin/e_grabinput.c index 7fc156181..effe19b35 100644 --- a/src/bin/e_grabinput.c +++ b/src/bin/e_grabinput.c @@ -33,7 +33,7 @@ e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, Ecore_Window key_win) if (grab_mouse_win) { #ifndef HAVE_WAYLAND_ONLY - if (e_comp_util_has_x()) + if (e_comp->comp_type == E_PIXMAP_TYPE_X) ecore_x_pointer_ungrab(); #else if (e_comp->comp_type == E_PIXMAP_TYPE_WL) @@ -44,7 +44,7 @@ e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, Ecore_Window key_win) if (grab_key_win) { #ifndef HAVE_WAYLAND_ONLY - if (e_comp_util_has_x()) + if (e_comp->comp_type == E_PIXMAP_TYPE_X) ecore_x_keyboard_ungrab(); #else if (e_comp->comp_type == E_PIXMAP_TYPE_WL) @@ -57,7 +57,7 @@ e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, Ecore_Window key_win) if (mouse_win) { #ifndef HAVE_WAYLAND_ONLY - if (e_comp_util_has_x()) + if (e_comp->comp_type == E_PIXMAP_TYPE_X) { int ret = 0; if (confine_mouse) @@ -80,7 +80,7 @@ e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, Ecore_Window key_win) if (key_win) { #ifndef HAVE_WAYLAND_ONLY - if (e_comp_util_has_x()) + if (e_comp->comp_type == E_PIXMAP_TYPE_X) { int ret = 0; @@ -118,7 +118,7 @@ e_grabinput_release(Ecore_Window mouse_win, Ecore_Window key_win) if (mouse_win == grab_mouse_win) { #ifndef HAVE_WAYLAND_ONLY - if (e_comp_util_has_x()) + if (e_comp->comp_type == E_PIXMAP_TYPE_X) ecore_x_pointer_ungrab(); #else if (e_comp->comp_type == E_PIXMAP_TYPE_WL) @@ -130,7 +130,7 @@ e_grabinput_release(Ecore_Window mouse_win, Ecore_Window key_win) if (key_win == grab_key_win) { #ifndef HAVE_WAYLAND_ONLY - if (e_comp_util_has_x()) + if (e_comp->comp_type == E_PIXMAP_TYPE_X) ecore_x_keyboard_ungrab(); #else if (e_comp->comp_type == E_PIXMAP_TYPE_WL)