diff options
| author | Tom Hacohen <tom@stosb.com> | 2013-02-19 15:09:32 +0000 |
|---|---|---|
| committer | Tom Hacohen <tom@stosb.com> | 2013-02-19 15:09:32 +0000 |
| commit | a2d710b0b68e21f14ef758b510409d0e56461406 (patch) | |
| tree | 87a8186cee97f0582509e8e89ee814c63545820f /src | |
| parent | 8be4940bb356838c28b72553c277762d581206c6 (diff) | |
| download | efl-a2d710b0b68e21f14ef758b510409d0e56461406.tar.gz efl-a2d710b0b68e21f14ef758b510409d0e56461406.tar.xz efl-a2d710b0b68e21f14ef758b510409d0e56461406.zip | |
Ecore_x: Revert "don't filter out non-master pointers in xi2.2 support."
This actually breaks genlist selection.
This reverts commit 5adb2f1ae6766fb0880aba5a92fff4fa52d1402f.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/ecore_x/xlib/ecore_x_xi2.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/lib/ecore_x/xlib/ecore_x_xi2.c b/src/lib/ecore_x/xlib/ecore_x_xi2.c index db81f4b50..8289688f6 100644 --- a/src/lib/ecore_x/xlib/ecore_x_xi2.c +++ b/src/lib/ecore_x/xlib/ecore_x_xi2.c @@ -438,9 +438,6 @@ ecore_x_input_multi_select(Ecore_X_Window win) } else if (dev->use == XISlavePointer) { -/* disabled as this seems nto to be needed and never was successfully - * tested anyway. leave this here commented out for a while to let people - * whickly re-enable and see. should go away one day though. XIDeviceInfo *atdev = NULL; int j; @@ -451,7 +448,6 @@ ecore_x_input_multi_select(Ecore_X_Window win) } if (((atdev) && (atdev->use != XIMasterPointer)) || (!atdev)) - */ { XIEventMask eventmask; unsigned char mask[4] = { 0 }; @@ -486,11 +482,11 @@ ecore_x_input_multi_select(Ecore_X_Window win) # ifdef XI_TouchEnd XISetMask(mask, XI_TouchEnd); # endif -#endif +#endif /* #ifdef ECORE_XI2_2 */ + XISelectEvents(_ecore_x_disp, win, &eventmask, 1); find = EINA_TRUE; } -/* part of the above commented int - never tested/needed the if... #ifdef ECORE_XI2_2 else if ((atdev) && (atdev->use == XIMasterPointer)) { @@ -518,8 +514,7 @@ ecore_x_input_multi_select(Ecore_X_Window win) find = EINA_TRUE; } } -#endif - */ +#endif /* #ifdef ECORE_XI2_2 */ } } |