[gtk+/xi2: 1144/1239] Put back some old gdkinput funcs into the X11 backend.
- From: Carlos Garnacho <carlosg src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtk+/xi2: 1144/1239] Put back some old gdkinput funcs into the X11 backend.
- Date: Tue, 29 Sep 2009 10:56:33 +0000 (UTC)
commit 76ac0169404c5cb2c46a072f34de2f9a022ee364
Author: Carlos Garnacho <carlos gnome org>
Date: Tue Sep 15 12:35:49 2009 +0200
Put back some old gdkinput funcs into the X11 backend.
They have to be deprecated anyway, so gdk_devices_list() and
gdk_window_set_extension_events() are now implemented in x11/gdkinput.c.
This file has been added back into build and now lots of code are commented
out since they're implemented elsewhere.
gdk/Makefile.am | 1 -
gdk/gdkinput.c | 40 ----------------------------------------
gdk/gdkwindow.c | 2 ++
gdk/x11/Makefile.am | 1 +
gdk/x11/gdkinput.c | 19 +++++++++++++++----
5 files changed, 18 insertions(+), 45 deletions(-)
---
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index b6ad452..cebd514 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -121,7 +121,6 @@ gdk_c_sources = \
gdkgc.c \
gdkglobals.c \
gdkimage.c \
- gdkinput.c \
gdkinternals.h \
gdkintl.h \
gdkkeys.c \
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 1124ce0..5434e71 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -9083,9 +9083,11 @@ send_crossing_event (GdkDisplay *display,
if (block_event)
return;
+#if 0
if (window->extension_events != 0)
GDK_WINDOW_IMPL_GET_IFACE (window->impl)->input_window_crossing ((GdkWindow *)window,
type == GDK_ENTER_NOTIFY);
+#endif
if (window->event_mask & event_mask)
{
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index abef848..fd117ae 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -42,6 +42,7 @@ libgdk_x11_la_SOURCES = \
gdkglobals-x11.c \
gdkim-x11.c \
gdkimage-x11.c \
+ gdkinput.c \
gdkkeys-x11.c \
gdkmain-x11.c \
gdkpixmap-x11.c \
diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c
index c33f09c..a3910f7 100644
--- a/gdk/x11/gdkinput.c
+++ b/gdk/x11/gdkinput.c
@@ -38,6 +38,8 @@
#include "gdkdisplay-x11.h"
#include "gdkalias.h"
+#if 0
+
static GdkDeviceAxis gdk_input_core_axes[] = {
{ GDK_AXIS_X, 0, 0 },
{ GDK_AXIS_Y, 0, 0 }
@@ -135,6 +137,8 @@ gdk_device_dispose (GObject *object)
G_OBJECT_CLASS (gdk_device_parent_class)->dispose (object);
}
+#endif
+
/**
* gdk_devices_list:
*
@@ -149,6 +153,8 @@ gdk_devices_list (void)
return gdk_display_list_devices (gdk_display_get_default ());
}
+#if 0
+
/**
* gdk_display_list_devices:
* @display: a #GdkDisplay
@@ -343,6 +349,8 @@ gdk_device_free_history (GdkTimeCoord **events,
g_free (events);
}
+#endif
+
static void
unset_extension_events (GdkWindow *window)
{
@@ -415,11 +423,13 @@ gdk_input_set_extension_events (GdkWindow *window, gint mask,
display_x11->input_windows = g_list_append (display_x11->input_windows, iw);
+#if 0
#ifndef XINPUT_NONE
/* we might not receive ConfigureNotify so get the root_relative_geometry
* now, just in case */
_gdk_input_get_root_relative_geometry (window, &iw->root_x, &iw->root_y);
#endif /* !XINPUT_NONE */
+#endif
impl_window->input_window = iw;
}
@@ -434,10 +444,8 @@ gdk_input_set_extension_events (GdkWindow *window, gint mask,
for (tmp_list = display_x11->input_devices; tmp_list; tmp_list = tmp_list->next)
{
- GdkDevicePrivate *gdkdev = tmp_list->data;
-
- if (!GDK_IS_CORE (gdkdev))
- _gdk_input_select_events ((GdkWindow *)impl_window, gdkdev);
+ GdkDevice *dev = tmp_list->data;
+ gdk_window_set_device_events (window, dev, mask);
}
}
@@ -447,6 +455,7 @@ _gdk_input_window_destroy (GdkWindow *window)
unset_extension_events (window);
}
+#if 0
/**
* gdk_device_get_axis:
* @device: a #GdkDevice
@@ -483,5 +492,7 @@ gdk_device_get_axis (GdkDevice *device,
return FALSE;
}
+#endif
+
#define __GDK_INPUT_C__
#include "gdkaliasdef.c"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]