aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2003-05-27 22:34:58 +0000
committerJuanma Barranquero2003-05-27 22:34:58 +0000
commite471b24112a51d3fd4c768af6db324e763cb0a5d (patch)
tree6fce0a05c054d079a3ad3287aa79597b08598a30 /src
parentaf3a05edaf68db4661105964c3c583e80a80ff1c (diff)
downloademacs-e471b24112a51d3fd4c768af6db324e763cb0a5d.tar.gz
emacs-e471b24112a51d3fd4c768af6db324e763cb0a5d.zip
Add missing code from previous patch by David Ponce.
Diffstat (limited to 'src')
-rw-r--r--src/w32term.c25
1 files changed, 5 insertions, 20 deletions
diff --git a/src/w32term.c b/src/w32term.c
index 1c4e6803906..0087a00b56d 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4451,7 +4451,7 @@ w32_read_socket (sd, bufp, numchars, expected)
4451 } 4451 }
4452 } 4452 }
4453 4453
4454 button = ( GET_WHEEL_DELTA_WPARAM (msg.msg.wParam) < 0 )? 4 : 3; 4454 button = (GET_WHEEL_DELTA_WPARAM (msg.msg.wParam) < 0)? 4 : 3;
4455 4455
4456 if (up) 4456 if (up)
4457 { 4457 {
@@ -4816,27 +4816,12 @@ w32_read_socket (sd, bufp, numchars, expected)
4816 break; 4816 break;
4817 4817
4818 default: 4818 default:
4819 /* Check for messages registered at runtime. */ 4819 /* Check for messages registered at runtime. */
4820 if (msg.msg.message == msh_mousewheel) 4820 if (msg.msg.message == msh_mousewheel)
4821 { 4821 {
4822 if (dpyinfo->grabbed && last_mouse_frame 4822 /* Forward MSH_MOUSEWHEEL as WM_MOUSEWHEEL. */
4823 && FRAME_LIVE_P (last_mouse_frame)) 4823 msg.msg.message == WM_MOUSEWHEEL;
4824 f = last_mouse_frame; 4824 prepend_msg (&msg);
4825 else
4826 f = x_window_to_frame (dpyinfo, msg.msg.hwnd);
4827
4828 if (f)
4829 {
4830 if ((!dpyinfo->w32_focus_frame
4831 || f == dpyinfo->w32_focus_frame)
4832 && (numchars >= 1))
4833 {
4834 construct_mouse_wheel (bufp, &msg, f);
4835 bufp++;
4836 count++;
4837 numchars--;
4838 }
4839 }
4840 } 4825 }
4841 break; 4826 break;
4842 } 4827 }