(XIValuatorClassInfo *) class_info);
break;
-#ifdef XINPUT_2_2
+#ifdef HAVE_XINPUT_2_2
case XIScrollClass:
{
XIScrollClassInfo *scroll_info = (XIScrollClassInfo *) class_info;
scroll_info->increment);
}
break;
-#endif /* XINPUT_2_2 */
+#endif /* HAVE_XINPUT_2_2 */
default:
break;
ClutterInputDeviceType *device_type,
guint *n_touch_points)
{
-#ifdef XINPUT_2_2
+#ifdef HAVE_XINPUT_2_2
guint i;
for (i = 0; i < n_classes; i++)
case XI_ButtonPress:
case XI_ButtonRelease:
case XI_Motion:
-#ifdef XINPUT_2_2
+#ifdef HAVE_XINPUT_2_2
case XI_TouchBegin:
case XI_TouchUpdate:
case XI_TouchEnd:
-#endif /* XINPUT_2_2 */
+#endif /* HAVE_XINPUT_2_2 */
{
XIDeviceEvent *xev = (XIDeviceEvent *) xi_event;
stage_x11,
&xev->valuators);
-#ifdef XINPUT_2_2
+#ifdef HAVE_XINPUT_2_2
if (xev->flags & XIPointerEmulated)
_clutter_event_set_pointer_emulated (event, TRUE);
-#endif /* XINPUT_2_2 */
+#endif /* HAVE_XINPUT_2_2 */
break;
default:
event->button.y,
event->button.axes != NULL ? "yes" : "no");
-#ifdef XINPUT_2_2
+#ifdef HAVE_XINPUT_2_2
if (xev->flags & XIPointerEmulated)
_clutter_event_set_pointer_emulated (event, TRUE);
-#endif /* XINPUT_2_2 */
+#endif /* HAVE_XINPUT_2_2 */
if (xi_event->evtype == XI_ButtonPress)
_clutter_stage_x11_set_user_time (stage_x11, event->button.time);
if (source_device != NULL && device->stage != NULL)
_clutter_input_device_set_stage (source_device, device->stage);
-#ifdef XINPUT_2_2
+#ifdef HAVE_XINPUT_2_2
if (xev->flags & XIPointerEmulated)
_clutter_event_set_pointer_emulated (event, TRUE);
-#endif /* XINPUT_2_2 */
+#endif /* HAVE_XINPUT_2_2 */
CLUTTER_NOTE (EVENT, "motion: win:0x%x device:%s (x:%.2f, y:%.2f, axes:%s)",
(unsigned int) stage_x11->xwin,
}
break;
-#ifdef XINPUT_2_2
+#ifdef HAVE_XINPUT_2_2
case XI_TouchBegin:
case XI_TouchEnd:
{
retval = CLUTTER_TRANSLATE_QUEUE;
}
break;
-#endif /* XINPUT_2_2 */
+#endif /* HAVE_XINPUT_2_2 */
case XI_Enter:
case XI_Leave:
if (event_mask & LeaveWindowMask)
XISetMask (mask, XI_Leave);
-#ifdef XINPUT_2_2
+#ifdef HAVE_XINPUT_2_2
/* enable touch event support if we're running on XInput 2.2 */
if (backend_x11->xi_minor >= 2)
{
XISetMask (mask, XI_TouchUpdate);
XISetMask (mask, XI_TouchEnd);
}
-#endif /* XINPUT_2_2 */
+#endif /* HAVE_XINPUT_2_2 */
xi_event_mask.deviceid = device_xi2->device_id;
xi_event_mask.mask = mask;
AC_CHECK_MEMBER([XIScrollClassInfo.number],
[
have_xinput_2_2=yes
- AC_DEFINE([XINPUT_2_2], [1], [Define to 1 if XInput 2.2 is available])
+ AC_DEFINE([HAVE_XINPUT_2_2], [1], [Define to 1 if XInput 2.2 is available])
],
[have_xinput_2_2=no],
[[#include <X11/extensions/XInput2.h>]])])