aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Voelker1998-04-30 17:19:55 +0000
committerGeoff Voelker1998-04-30 17:19:55 +0000
commit93fbe8b7460f48734cb8703bae543fdedf992f23 (patch)
tree3fb483f051726d32201a681d8ced210ad59ea2ca
parentf5136913a18bd7415c59dbf7bcaf3c316593c41d (diff)
downloademacs-93fbe8b7460f48734cb8703bae543fdedf992f23.tar.gz
emacs-93fbe8b7460f48734cb8703bae543fdedf992f23.zip
(msh_mousewheel): New variable.
(w32_msg_pump): Register that Emacs accepts mousewheel events. (w32_wnd_proc): Check for mousewheel events.
-rw-r--r--src/w32fns.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/w32fns.c b/src/w32fns.c
index d4a75d009d0..07b7f7ef383 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -176,6 +176,9 @@ static unsigned mouse_button_timer; /* non-zero when timer is active */
176static W32Msg saved_mouse_move_msg; 176static W32Msg saved_mouse_move_msg;
177static unsigned mouse_move_timer; 177static unsigned mouse_move_timer;
178 178
179/* W95 mousewheel handler */
180unsigned int msh_mousewheel = 0;
181
179#define MOUSE_BUTTON_ID 1 182#define MOUSE_BUTTON_ID 1
180#define MOUSE_MOVE_ID 2 183#define MOUSE_MOVE_ID 2
181 184
@@ -3123,6 +3126,8 @@ static void
3123w32_msg_pump (deferred_msg * msg_buf) 3126w32_msg_pump (deferred_msg * msg_buf)
3124{ 3127{
3125 MSG msg; 3128 MSG msg;
3129
3130 msh_mousewheel = RegisterWindowMessage (MSH_MOUSEWHEEL);
3126 3131
3127 while (GetMessage (&msg, NULL, 0, 0)) 3132 while (GetMessage (&msg, NULL, 0, 0))
3128 { 3133 {
@@ -3908,6 +3913,14 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
3908 } 3913 }
3909 3914
3910 default: 3915 default:
3916 /* Check for messages registered at runtime. */
3917 if (msg == msh_mousewheel)
3918 {
3919 wmsg.dwModifiers = w32_get_modifiers ();
3920 my_post_msg (&wmsg, hwnd, msg, wParam, lParam);
3921 return 0;
3922 }
3923
3911 dflt: 3924 dflt:
3912 return DefWindowProc (hwnd, msg, wParam, lParam); 3925 return DefWindowProc (hwnd, msg, wParam, lParam);
3913 } 3926 }