summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2015-07-01 17:12:16 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2015-07-02 12:35:21 -0400
commit62da0f32bf768df771b2b8e4aa5ba1d75300a25f (patch)
tree44adefd200df0795f55a8647919a838885470ffc
parent632bdd84a7d602f86103aee93361ccaa5a7c7be5 (diff)
do not apply x11 focus grabs to internal clients if efl version > 1.14
due to recent changes in ecore-input-evas, mouse events are propagated differently; specifically, there are now "more" events than there previously were. as a result, grabs on internal wins are no longer necessary, though they probably never were necessary after the elm conversion see 5cb6cdbc5e1a13ea0262e155983b494e6519abde in efl
-rw-r--r--src/bin/e_comp_x.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index db5d6a742..06fedc624 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -119,6 +119,9 @@ _e_comp_x_print_win(Ecore_X_Window win)
119static void 119static void
120_e_comp_x_focus_grab(E_Client *ec) 120_e_comp_x_focus_grab(E_Client *ec)
121{ 121{
122#if EFL_VERSION_MAJOR > 1 || EFL_VERSION_MINOR > 14
123 if (ec->internal_ecore_evas) return;
124#endif
122 ecore_x_window_button_grab(e_client_util_win_get(ec), 1, 125 ecore_x_window_button_grab(e_client_util_win_get(ec), 1,
123 ECORE_X_EVENT_MASK_MOUSE_DOWN | 126 ECORE_X_EVENT_MASK_MOUSE_DOWN |
124 ECORE_X_EVENT_MASK_MOUSE_UP | 127 ECORE_X_EVENT_MASK_MOUSE_UP |