(construct_mouse_wheel): Handle negative coordinates.

diff --git a/src/ChangeLog b/src/ChangeLog
index c47d5970fad491038e772bf46d4fa6b8ba625e4a..45b9958442707c4cdc3b9f87e6fa6ad523407d0d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2006-04-26  Jason Rumney  <jasonr@gnu.org>
 
+       * w32term.c (construct_mouse_wheel): Handle negative coordinates.
+
        * w32fns.c (w32_wnd_proc) <WM_LBUTTONDOWN, WM_RBUTTONDOWN>:
        <WM_LBUTTONUP, WM_RBUTTONUP>: Call signal_user_input in the cases
        where we preempt mouse_button_timer.

diff --git a/src/w32term.c b/src/w32term.c
index f0ef42f798b85915e3e074dbcd3d92c2bd65d632..2b5c9da39b607c178611220354b425b5e705662d 100644 (file)
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -3131,8 +3131,10 @@ construct_mouse_wheel (result, msg, f)
   result->modifiers = (msg->dwModifiers
                        | ((delta < 0 ) ? down_modifier : up_modifier));
 
-  p.x = LOWORD (msg->msg.lParam);
-  p.y = HIWORD (msg->msg.lParam);
+  /* With multiple monitors, we can legitimately get negative
+     coordinates, so cast to short to interpret them correctly.  */
+  p.x = (short) LOWORD (msg->msg.lParam);
+  p.y = (short) HIWORD (msg->msg.lParam);
   ScreenToClient (msg->msg.hwnd, &p);
   XSETINT (result->x, p.x);
   XSETINT (result->y, p.y);