(x_set_mouse_pixel_position): Adjust coords by frame position.

(x_set_mouse_position): Call x_set_mouse_pixel_position.

diff --git a/src/w32term.c b/src/w32term.c
index e0f840999a0f07d39deaff922999f387a0f7ab3c..d169be20d388dfcb41c34c53cffd6282a3b5868b 100644 (file)
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -3316,6 +3316,21 @@ x_set_window_size (f, change_gravity, cols, rows)
 \f
 /* Mouse warping.  */
 
+void
+x_set_mouse_pixel_position (f, pix_x, pix_y)
+     struct frame *f;
+     int pix_x, pix_y;
+{
+  BLOCK_INPUT;
+
+  pix_x += f->output_data.win32->left_pos;
+  pix_y += f->output_data.win32->top_pos;
+
+  SetCursorPos (pix_x, pix_y);
+
+  UNBLOCK_INPUT;
+}
+
 void
 x_set_mouse_position (f, x, y)
      struct frame *f;
@@ -3332,25 +3347,7 @@ x_set_mouse_position (f, x, y)
   if (pix_y < 0) pix_y = 0;
   if (pix_y > PIXEL_HEIGHT (f)) pix_y = PIXEL_HEIGHT (f);
 
-  BLOCK_INPUT;
-
-  SetCursorPos (pix_x, pix_y);
-
-  UNBLOCK_INPUT;
-}
-
-/* Move the mouse to position pixel PIX_X, PIX_Y relative to frame F.  */
-
-void
-x_set_mouse_pixel_position (f, pix_x, pix_y)
-     struct frame *f;
-     int pix_x, pix_y;
-{
-  BLOCK_INPUT;
-
-  SetCursorPos (pix_x, pix_y);
-
-  UNBLOCK_INPUT;
+  x_set_mouse_pixel_position (f, pix_x, pix_y);
 }
 \f
 /* focus shifting, raising and lowering.  */