Set x_root and y_root in button and motion events from the tablet.

2004-07-28  Robert Ögren  <gtk@roboros.com>

	* gdk/win32/gdkinput-win32.c (_gdk_input_other_event): Set x_root
	and y_root in button and motion events from the tablet. (#148715)

diff --git a/ChangeLog b/ChangeLog
index 66fa6abd34026016f4a71fa60c301a5af0e91687..fc8fcd02d558016523a50c8a7cd542db69c2bd9a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-28  Robert Ögren  <gtk@roboros.com>
+
+       * gdk/win32/gdkinput-win32.c (_gdk_input_other_event): Set x_root
+       and y_root in button and motion events from the tablet. (#148715)
+
 Thu Aug  5 19:58:08 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkplug.c (gtk_plug_realize): Call

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 66fa6abd34026016f4a71fa60c301a5af0e91687..fc8fcd02d558016523a50c8a7cd542db69c2bd9a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-07-28  Robert Ögren  <gtk@roboros.com>
+
+       * gdk/win32/gdkinput-win32.c (_gdk_input_other_event): Set x_root
+       and y_root in button and motion events from the tablet. (#148715)
+
 Thu Aug  5 19:58:08 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkplug.c (gtk_plug_realize): Call

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 66fa6abd34026016f4a71fa60c301a5af0e91687..fc8fcd02d558016523a50c8a7cd542db69c2bd9a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-07-28  Robert Ögren  <gtk@roboros.com>
+
+       * gdk/win32/gdkinput-win32.c (_gdk_input_other_event): Set x_root
+       and y_root in button and motion events from the tablet. (#148715)
+
 Thu Aug  5 19:58:08 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkplug.c (gtk_plug_realize): Call

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 66fa6abd34026016f4a71fa60c301a5af0e91687..fc8fcd02d558016523a50c8a7cd542db69c2bd9a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-07-28  Robert Ögren  <gtk@roboros.com>
+
+       * gdk/win32/gdkinput-win32.c (_gdk_input_other_event): Set x_root
+       and y_root in button and motion events from the tablet. (#148715)
+
 Thu Aug  5 19:58:08 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkplug.c (gtk_plug_realize): Call

diff --git a/gdk/win32/gdkinput-win32.c b/gdk/win32/gdkinput-win32.c
index 6ffa64f79910a4af60475904670d2f5cbc053dbc..cd20fc3625b2a341d15e12378462a9a74608aaa7 100644 (file)
--- a/gdk/win32/gdkinput-win32.c
+++ b/gdk/win32/gdkinput-win32.c
@@ -926,6 +926,13 @@ _gdk_input_other_event (GdkEvent  *event,
                                           &event->button.x, 
                                           &event->button.y);
 
+         /* Also calculate root coordinates. Note that input_window->root_x
+            is in Win32 screen coordinates. */
+         event->button.x_root = event->button.x + input_window->root_x
+                                + _gdk_offset_x;
+         event->button.y_root = event->button.y + input_window->root_y
+                                + _gdk_offset_y;
+
          event->button.state = ((gdkdev->button_state << 8)
                                 & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK
                                    | GDK_BUTTON3_MASK | GDK_BUTTON4_MASK
@@ -952,6 +959,13 @@ _gdk_input_other_event (GdkEvent  *event,
                                           &event->motion.x, 
                                           &event->motion.y);
 
+         /* Also calculate root coordinates. Note that input_window->root_x
+            is in Win32 screen coordinates. */
+         event->motion.x_root = event->motion.x + input_window->root_x
+                                + _gdk_offset_x;
+         event->motion.y_root = event->motion.y + input_window->root_y
+                                + _gdk_offset_y;
+
          event->motion.state = ((gdkdev->button_state << 8)
                                 & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK
                                    | GDK_BUTTON3_MASK | GDK_BUTTON4_MASK