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)

diff --git a/ChangeLog b/ChangeLog
index 4a1ac716c32eef1a53e1ba2a6befaa0296cd7aeb..522a7a26f1fe76ba011d24e1b4715385baf20cdb 100644 (file)
--- 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 4a1ac716c32eef1a53e1ba2a6befaa0296cd7aeb..522a7a26f1fe76ba011d24e1b4715385baf20cdb 100644 (file)
--- 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 4a1ac716c32eef1a53e1ba2a6befaa0296cd7aeb..522a7a26f1fe76ba011d24e1b4715385baf20cdb 100644 (file)
--- 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 4a1ac716c32eef1a53e1ba2a6befaa0296cd7aeb..522a7a26f1fe76ba011d24e1b4715385baf20cdb 100644 (file)
--- 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 441c89a3af2ee833c26aadc2f40a2df7948f001a..219e31dd3b6f8cd84ed9b127f2e8e9d407e759bf 100644 (file)
--- 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;