(enum event_kind) <HORIZ_WHEEL_EVENT>: New event.

2 files changed, 27 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4c72b1d6c7e..94fdc7a2e4d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,27 @@
+2007-09-04  Jason Rumney  <jasonr@gnu.org>
+
+        * termhooks.h (enum event_kind) <HORIZ_WHEEL_EVENT>: New event.
+
+        * keyboard.c (discard_mouse_events): Discard it.
+        (make_lispy_event): Translate it to a lisp event.
+        (lispy_wheel_names): Add wheel-left and right events.
+        (syms_of_keyboard): Enlarge wheel_syms.
+
+        * w32fns.c (w32_wnd_proc) <WM_DROPFILES>: Merge with WM_MOUSEWHEEL.
+        <WM_MOUSEHWHEEL>: Pass new system message to lisp.
+
+        * w32term.h (WM_MOUSEHWHEEL): Define if system headers don't.
+
+        * w32term.c (construct_mouse_wheel): Make HORIZ_WHEEL_EVENT
+        from WM_MOUSEHWHEEL.
+        (w32_read_socket) <WM_MOUSEHWHEEL>: Treat as WM_MOUSEWHEEL.
+
+        * w32fns.c (x_create_tip_frame) [MULTI_KBOARD]: Get keyboard from
+        terminal.
+
+        * w32term.c (w32_create_terminal) [MULTI_KBOARD]: Create a new
+        keyboard for the terminal.
+
 2007-09-04  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * term.c (Vsuspend_tty_hook): Rename from Vsuspend_tty_functions.
diff --git a/src/termhooks.h b/src/termhooks.h
index 4124e37586b..96ea5d79514 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -109,6 +109,9 @@ enum event_kind
                                    the wheel event occurred in.
                                    .timestamp gives a timestamp (in
                                    milliseconds) for the event.  */
+  HORIZ_WHEEL_EVENT,            /* A wheel event generated by a second
+                                   horizontal wheel that is present on some
+                                   mice. See WHEEL_EVENT.  */
 #if defined (WINDOWSNT) || defined (MAC_OS)
   LANGUAGE_CHANGE_EVENT,        /* A LANGUAGE_CHANGE_EVENT is
                                    generated on WINDOWSNT or Mac OS