forked from enlightenment/efl
Ecore_x: Revert "don't filter out non-master pointers in xi2.2 support."
This actually breaks genlist selection.
This reverts commit 5adb2f1ae6
.
This commit is contained in:
parent
8be4940bb3
commit
a2d710b0b6
|
@ -6,8 +6,6 @@
|
||||||
|
|
||||||
* Fix edje edje_color_class_list() and edje_text_class_list() to
|
* Fix edje edje_color_class_list() and edje_text_class_list() to
|
||||||
look at the correct hashes when returning.
|
look at the correct hashes when returning.
|
||||||
* UIpdate ecore_x XI2.2 code to not filter out non-master
|
|
||||||
pointers.
|
|
||||||
|
|
||||||
2013-02-17 Mike Blumenkrantz
|
2013-02-17 Mike Blumenkrantz
|
||||||
|
|
||||||
|
|
1
NEWS
1
NEWS
|
@ -111,7 +111,6 @@ Improvements:
|
||||||
* eina: Eina_Tiler now take tile size into account.
|
* eina: Eina_Tiler now take tile size into account.
|
||||||
* edje: reduce memory consumption of Edje program handler.
|
* edje: reduce memory consumption of Edje program handler.
|
||||||
* eina, evas: improved support for 64bits system.
|
* eina, evas: improved support for 64bits system.
|
||||||
* don't filter out non-master pointers in XI2.2 support.
|
|
||||||
|
|
||||||
Fixes:
|
Fixes:
|
||||||
* Fix a memory leak in ecore_con_dns when using ecore_con_server_connect
|
* Fix a memory leak in ecore_con_dns when using ecore_con_server_connect
|
||||||
|
|
|
@ -438,9 +438,6 @@ ecore_x_input_multi_select(Ecore_X_Window win)
|
||||||
}
|
}
|
||||||
else if (dev->use == XISlavePointer)
|
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;
|
XIDeviceInfo *atdev = NULL;
|
||||||
int j;
|
int j;
|
||||||
|
|
||||||
|
@ -451,7 +448,6 @@ ecore_x_input_multi_select(Ecore_X_Window win)
|
||||||
}
|
}
|
||||||
if (((atdev) && (atdev->use != XIMasterPointer)) ||
|
if (((atdev) && (atdev->use != XIMasterPointer)) ||
|
||||||
(!atdev))
|
(!atdev))
|
||||||
*/
|
|
||||||
{
|
{
|
||||||
XIEventMask eventmask;
|
XIEventMask eventmask;
|
||||||
unsigned char mask[4] = { 0 };
|
unsigned char mask[4] = { 0 };
|
||||||
|
@ -486,11 +482,11 @@ ecore_x_input_multi_select(Ecore_X_Window win)
|
||||||
# ifdef XI_TouchEnd
|
# ifdef XI_TouchEnd
|
||||||
XISetMask(mask, XI_TouchEnd);
|
XISetMask(mask, XI_TouchEnd);
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif /* #ifdef ECORE_XI2_2 */
|
||||||
|
|
||||||
XISelectEvents(_ecore_x_disp, win, &eventmask, 1);
|
XISelectEvents(_ecore_x_disp, win, &eventmask, 1);
|
||||||
find = EINA_TRUE;
|
find = EINA_TRUE;
|
||||||
}
|
}
|
||||||
/* part of the above commented int - never tested/needed the if...
|
|
||||||
#ifdef ECORE_XI2_2
|
#ifdef ECORE_XI2_2
|
||||||
else if ((atdev) && (atdev->use == XIMasterPointer))
|
else if ((atdev) && (atdev->use == XIMasterPointer))
|
||||||
{
|
{
|
||||||
|
@ -518,8 +514,7 @@ ecore_x_input_multi_select(Ecore_X_Window win)
|
||||||
find = EINA_TRUE;
|
find = EINA_TRUE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif /* #ifdef ECORE_XI2_2 */
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue