(set_properties, add_properties, remove_properties):

[gnu-emacs] / src / termhooks.h

diff --git a/src/termhooks.h b/src/termhooks.h
index 4d8c6ff772ec76fab4a077894f7ea0bbef0d6d0d..4787e245493f4436be55f87e18fb50ebbda53944 100644 (file)
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -59,7 +59,9 @@ extern int (*set_terminal_window_hook) ();
 enum scroll_bar_part {
   scroll_bar_above_handle,
   scroll_bar_handle,
-  scroll_bar_below_handle
+  scroll_bar_below_handle,
+  scroll_bar_up_arrow,
+  scroll_bar_down_arrow
 };
 
 /* Return the current position of the mouse.
@@ -220,6 +222,7 @@ enum event_kind
                                   which the key was typed.
                                   .timestamp gives a timestamp (in
                                   milliseconds) for the keystroke.  */
+  timer_event,                  /* A timer fired.  */
   mouse_click,                 /* The button number is in .code; it must
                                   be >= 0 and < NUM_MOUSE_BUTTONS, defined
                                   below.
@@ -244,6 +247,10 @@ enum event_kind
                                   whose scroll bar was clicked in.
                                   .timestamp gives a timestamp (in
                                   milliseconds) for the click.  */
+#ifdef WINDOWSNT
+  win32_scroll_bar_click,      /* as for scroll_bar_click, but only generated
+                                  by MS-Windows scroll bar controls. */
+#endif
   selection_request_event,     /* Another X client wants a selection from us.
                                   See `struct selection_event'.  */
   selection_clear_event,       /* Another X client cleared our selection.  */
@@ -268,10 +275,11 @@ enum event_kind
    a window system event.  These get turned into their lispy forms when
    they are removed from the event queue.  */
 
-struct input_event {
+struct input_event
+{
 
   /* What kind of event was this?  */
-  enum event_kind kind;
+  int kind;
   
   /* For an ascii_keystroke, this is the character.
      For a non_ascii_keystroke, this is the keysym code.
@@ -284,6 +292,10 @@ struct input_event {
   Lisp_Object x, y;
   unsigned long timestamp;
 
+  /* This is padding just to put the frame_or_window field
+     past the size of struct selection_event.  */
+  int *padding[2];
+
   /* This field is copied into a vector while the event is in the queue,
      so that garbage collections won't kill it.  */
   /* In a menu_bar_event, this is a cons cell whose car is the frame