summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2004-12-28 01:09:45 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2004-12-28 01:09:45 +0000
commit34982b41d200b79faca6f97317fa43853cc435d5 (patch)
tree892a72a597253e446e31d43b59184b749ba627e7
parentc0e9374d9ce4b49918564d305dc606ad6c3bf12b (diff)
downloadgtk+-34982b41d200b79faca6f97317fa43853cc435d5.tar.gz
Set x_root and y_root in button and motion events from extended input
2004-12-27 Matthias Clasen <mclasen@redhat.com> * gdk/x11/gdkinput-x11.c (_gdk_input_common_other_event): Set x_root and y_root in button and motion events from extended input devices. (#148715, Robert Ögren)
-rw-r--r--ChangeLog4
-rw-r--r--ChangeLog.pre-2-104
-rw-r--r--ChangeLog.pre-2-64
-rw-r--r--ChangeLog.pre-2-84
-rw-r--r--gdk/x11/gdkinput-x11.c4
5 files changed, 20 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a1ac716c3..522a7a26f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2004-12-27 Matthias Clasen <mclasen@redhat.com>
+ * gdk/x11/gdkinput-x11.c (_gdk_input_common_other_event):
+ Set x_root and y_root in button and motion events from
+ extended input devices. (#148715, Robert Ögren)
+
* gtk/gtktreeview.c (gtk_tree_view_class_init): Fix a
typo. (#162339, Alessio Dessi)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4a1ac716c3..522a7a26f1 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
2004-12-27 Matthias Clasen <mclasen@redhat.com>
+ * gdk/x11/gdkinput-x11.c (_gdk_input_common_other_event):
+ Set x_root and y_root in button and motion events from
+ extended input devices. (#148715, Robert Ögren)
+
* gtk/gtktreeview.c (gtk_tree_view_class_init): Fix a
typo. (#162339, Alessio Dessi)
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4a1ac716c3..522a7a26f1 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,9 @@
2004-12-27 Matthias Clasen <mclasen@redhat.com>
+ * gdk/x11/gdkinput-x11.c (_gdk_input_common_other_event):
+ Set x_root and y_root in button and motion events from
+ extended input devices. (#148715, Robert Ögren)
+
* gtk/gtktreeview.c (gtk_tree_view_class_init): Fix a
typo. (#162339, Alessio Dessi)
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4a1ac716c3..522a7a26f1 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
2004-12-27 Matthias Clasen <mclasen@redhat.com>
+ * gdk/x11/gdkinput-x11.c (_gdk_input_common_other_event):
+ Set x_root and y_root in button and motion events from
+ extended input devices. (#148715, Robert Ögren)
+
* gtk/gtktreeview.c (gtk_tree_view_class_init): Fix a
typo. (#162339, Alessio Dessi)
diff --git a/gdk/x11/gdkinput-x11.c b/gdk/x11/gdkinput-x11.c
index 441c89a3af..219e31dd3b 100644
--- a/gdk/x11/gdkinput-x11.c
+++ b/gdk/x11/gdkinput-x11.c
@@ -572,6 +572,8 @@ _gdk_input_common_other_event (GdkEvent *event,
gdk_input_translate_coordinates (gdkdev,input_window, xdbe->axis_data,
event->button.axes,
&event->button.x,&event->button.y);
+ event->button.x_root = event->button.x + input_window->root_x;
+ event->button.y_root = event->button.y + input_window->root_y;
event->button.state = gdk_input_translate_state(xdbe->state,xdbe->device_state);
event->button.button = xdbe->button;
@@ -668,6 +670,8 @@ _gdk_input_common_other_event (GdkEvent *event,
gdk_input_translate_coordinates(gdkdev,input_window,xdme->axis_data,
event->motion.axes,
&event->motion.x,&event->motion.y);
+ event->motion.x_root = event->motion.x + input_window->root_x;
+ event->motion.y_root = event->motion.y + input_window->root_y;
event->motion.type = GDK_MOTION_NOTIFY;
event->motion.window = input_window->window;