Commit 728a45fc authored by Matthias Clasen's avatar Matthias Clasen

Remove confusion over XI2 defines

Some places were using XINPUT_2, others XINPUT_XI2. Since configure
defines XINPUT_2, use that throughout.
parent de9a082d
......@@ -749,7 +749,7 @@ _gdk_x11_device_xi2_translate_state (XIModifierState *mods_state,
return state;
}
#else /* XINPUT_XI2 */
#else /* XINPUT_2 */
static void
gdk_x11_device_xi2_class_init (GdkX11DeviceXI2Class *klass)
......@@ -761,4 +761,4 @@ gdk_x11_device_xi2_init (GdkX11DeviceXI2 *device)
{
}
#endif /* XINPUT_XI2 */
#endif /* XINPUT_2 */
......@@ -30,7 +30,7 @@
#include "gdkintl.h"
#include "gdkkeysyms.h"
#ifdef XINPUT_XI2
#ifdef XINPUT_2
#include <X11/Xlib.h>
#include <X11/Xutil.h>
......@@ -38,7 +38,7 @@
#include <string.h>
#endif /* XINPUT_XI2 */
#endif /* XINPUT_2 */
struct _GdkX11DeviceManagerXI2
{
......@@ -63,7 +63,7 @@ G_DEFINE_TYPE_WITH_CODE (GdkX11DeviceManagerXI2, gdk_x11_device_manager_xi2, GDK
gdk_x11_device_manager_xi2_event_translator_init))
#ifdef XINPUT_XI2
#ifdef XINPUT_2
#define HAS_FOCUS(toplevel) ((toplevel)->has_focus || (toplevel)->has_pointer_focus)
......@@ -1308,7 +1308,7 @@ gdk_x11_device_manager_xi2_select_window_events (GdkEventTranslator *translator,
g_free (event_mask.mask);
}
#else /* XINPUT_XI2 */
#else /* XINPUT_2 */
static void
gdk_x11_device_manager_xi2_class_init (GdkX11DeviceManagerXI2Class *klass)
......@@ -1325,4 +1325,4 @@ gdk_x11_device_manager_xi2_event_translator_init (GdkEventTranslatorIface *iface
{
}
#endif /* XINPUT_XI2 */
#endif /* XINPUT_2 */
......@@ -44,7 +44,7 @@
#ifdef XINPUT_XFREE
#include <X11/extensions/XInput.h>
#endif
#ifdef XINPUT_XI2
#ifdef XINPUT_2
#include <X11/extensions/XInput2.h>
#endif
......@@ -244,7 +244,7 @@ void _gdk_x11_device_xi_translate_axes (GdkDevice *device,
gdouble *y);
#endif
#ifdef XINPUT_XI2
#ifdef XINPUT_2
guchar * _gdk_x11_device_xi2_translate_event_mask (GdkEventMask event_mask,
gint *len);
guint _gdk_x11_device_xi2_translate_state (XIModifierState *mods_state,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment