summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2013-02-19 15:09:32 +0000
committerTom Hacohen <tom@stosb.com>2013-02-19 15:09:32 +0000
commita2d710b0b68e21f14ef758b510409d0e56461406 (patch)
tree87a8186cee97f0582509e8e89ee814c63545820f
parent8be4940bb356838c28b72553c277762d581206c6 (diff)
Ecore_x: Revert "don't filter out non-master pointers in xi2.2 support."
This actually breaks genlist selection. This reverts commit 5adb2f1ae6766fb0880aba5a92fff4fa52d1402f.
-rw-r--r--ChangeLog2
-rw-r--r--NEWS1
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_xi2.c11
3 files changed, 3 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 53213c6b45..1aad83f212 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,8 +6,6 @@
6 6
7 * Fix edje edje_color_class_list() and edje_text_class_list() to 7 * Fix edje edje_color_class_list() and edje_text_class_list() to
8 look at the correct hashes when returning. 8 look at the correct hashes when returning.
9 * UIpdate ecore_x XI2.2 code to not filter out non-master
10 pointers.
11 9
122013-02-17 Mike Blumenkrantz 102013-02-17 Mike Blumenkrantz
13 11
diff --git a/NEWS b/NEWS
index e381784d8f..dc576ff4f9 100644
--- a/NEWS
+++ b/NEWS
@@ -111,7 +111,6 @@ Improvements:
111 * eina: Eina_Tiler now take tile size into account. 111 * eina: Eina_Tiler now take tile size into account.
112 * edje: reduce memory consumption of Edje program handler. 112 * edje: reduce memory consumption of Edje program handler.
113 * eina, evas: improved support for 64bits system. 113 * eina, evas: improved support for 64bits system.
114 * don't filter out non-master pointers in XI2.2 support.
115 114
116Fixes: 115Fixes:
117 * Fix a memory leak in ecore_con_dns when using ecore_con_server_connect 116 * Fix a memory leak in ecore_con_dns when using ecore_con_server_connect
diff --git a/src/lib/ecore_x/xlib/ecore_x_xi2.c b/src/lib/ecore_x/xlib/ecore_x_xi2.c
index db81f4b504..8289688f6f 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)
438 } 438 }
439 else if (dev->use == XISlavePointer) 439 else if (dev->use == XISlavePointer)
440 { 440 {
441/* disabled as this seems nto to be needed and never was successfully
442 * tested anyway. leave this here commented out for a while to let people
443 * whickly re-enable and see. should go away one day though.
444 XIDeviceInfo *atdev = NULL; 441 XIDeviceInfo *atdev = NULL;
445 int j; 442 int j;
446 443
@@ -451,7 +448,6 @@ ecore_x_input_multi_select(Ecore_X_Window win)
451 } 448 }
452 if (((atdev) && (atdev->use != XIMasterPointer)) || 449 if (((atdev) && (atdev->use != XIMasterPointer)) ||
453 (!atdev)) 450 (!atdev))
454 */
455 { 451 {
456 XIEventMask eventmask; 452 XIEventMask eventmask;
457 unsigned char mask[4] = { 0 }; 453 unsigned char mask[4] = { 0 };
@@ -486,11 +482,11 @@ ecore_x_input_multi_select(Ecore_X_Window win)
486# ifdef XI_TouchEnd 482# ifdef XI_TouchEnd
487 XISetMask(mask, XI_TouchEnd); 483 XISetMask(mask, XI_TouchEnd);
488# endif 484# endif
489#endif 485#endif /* #ifdef ECORE_XI2_2 */
486
490 XISelectEvents(_ecore_x_disp, win, &eventmask, 1); 487 XISelectEvents(_ecore_x_disp, win, &eventmask, 1);
491 find = EINA_TRUE; 488 find = EINA_TRUE;
492 } 489 }
493/* part of the above commented int - never tested/needed the if...
494#ifdef ECORE_XI2_2 490#ifdef ECORE_XI2_2
495 else if ((atdev) && (atdev->use == XIMasterPointer)) 491 else if ((atdev) && (atdev->use == XIMasterPointer))
496 { 492 {
@@ -518,8 +514,7 @@ ecore_x_input_multi_select(Ecore_X_Window win)
518 find = EINA_TRUE; 514 find = EINA_TRUE;
519 } 515 }
520 } 516 }
521#endif 517#endif /* #ifdef ECORE_XI2_2 */
522 */
523 } 518 }
524 } 519 }
525 520