(construct_menu_click, construct_mouse_click):

[bpt/emacs.git] / src / keyboard.h

diff --git a/src/keyboard.h b/src/keyboard.h
index d1cb78d..9095f24 100644 (file)
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -1,5 +1,5 @@
 /* Declarations useful when processing input.
-   Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1993 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -20,44 +20,72 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Total number of times read_char has returned.  */
 extern int num_input_chars;
 
-/* Nonzero means polling for input is temporarily suppresed.  */
+/* Total number of times read_char has returned, outside of macros.  */
+extern int num_nonmacro_input_chars;
+
+/* Nonzero means polling for input is temporarily suppressed.  */
 extern int poll_suppress_count;
 
 /* Keymap mapping ASCII function key sequences onto their preferred forms.
    Initialized by the terminal-specific lisp files.  */
 extern Lisp_Object Vfunction_key_map;
 
+/* Vector holding the key sequence that invoked the current command.
+   It is reused for each command, and it may be longer than the current
+   sequence; this_command_key_count indicates how many elements
+   actually mean something.  */
+extern Lisp_Object this_command_keys;
+extern int this_command_key_count;
+
+#ifdef MULTI_FRAME
+/* The frame in which the last input event occurred, or Qmacro if the
+   last event came from a macro.  We use this to determine when to
+   generate switch-frame events.  This may be cleared by functions
+   like Fselect_frame, to make sure that a switch-frame event is
+   generated by the next character.  */
+extern Lisp_Object internal_last_event_frame;
+#endif
+
 \f
 /* Macros for dealing with lispy events.  */
 
 /* True iff EVENT has data fields describing it (i.e. a mouse click).  */
 #define EVENT_HAS_PARAMETERS(event) \
-  (XTYPE (event) == Lisp_Cons && Flength (event) == 5)
+  (XTYPE (event) == Lisp_Cons)
+
+/* Extract the head from an event.
+   This works on composite and simple events.  */
+#define EVENT_HEAD(event) \
+  (EVENT_HAS_PARAMETERS (event) ? XCONS (event)->car : (event))
 
-/* Access the components of composite events.  */
-#define EVENT_HEAD(event)              (Fnth (0, (event)))
-#define EVENT_WINDOW(event)            (Fnth (1, (event)))
-#define EVENT_BUFFER_POSN(event)       (Fnth (2, (event)))
-#define EVENT_SCROLLBAR_BUTTON EVENT_BUFFER_POSN
-#define EVENT_WINDOW_POSN(event)       (Fnth (3, (event)))
-#define EVENT_TIMESTAMP(event)         (Fnth (4, (event)))
+/* Extract the starting and ending positions from a composite event.  */
+#define EVENT_START(event) (XCONS (XCONS (event)->cdr)->car)
+#define EVENT_END(event) (XCONS (XCONS (XCONS (event)->cdr)->cdr)->car)
+
+/* Extract the click count from a multi-click event.  */
+#define EVENT_CLICK_COUNT(event) (Fnth ((event), make_number (2)))
+
+/* Extract the fields of a position.  */
+#define POSN_WINDOW(posn) (XCONS (posn)->car)
+#define POSN_BUFFER_POSN(posn) (XCONS (XCONS (posn)->cdr)->car)
+#define POSN_WINDOW_POSN(posn) (XCONS (XCONS (XCONS (posn)->cdr)->cdr)->car)
+#define POSN_TIMESTAMP(posn) \
+  (XCONS (XCONS (XCONS (XCONS (posn)->cdr)->cdr)->cdr)->car)
+#define POSN_SCROLLBAR_PART(posn)      (Fnth ((posn), make_number (4)))
 
 /* Some of the event heads.  */
-extern Lisp_Object Qvscrollbar_part, Qvslider_part;
-extern Lisp_Object Qvthumbup_part, Qvthumbdown_part;
-extern Lisp_Object Qhscrollbar_part, Qhslider_part;
-extern Lisp_Object Qhthumbleft_part, Qhthumbright_part;
+extern Lisp_Object Qswitch_frame;
 
 /* Properties on event heads.  */
-extern Lisp_Object Qevent_kind, Qevent_unmodified;
+extern Lisp_Object Qevent_kind, Qevent_symbol_elements;
 
 /* Getting an unmodified version of an event head.  */
 #define EVENT_HEAD_UNMODIFIED(event_head) \
-  (Fget ((event_head), Qevent_unmodified))
+  (Fcar (Fget ((event_head), Qevent_symbol_elements)))
 
 /* The values of Qevent_kind properties.  */
 extern Lisp_Object Qfunction_key, Qmouse_click, Qmouse_movement;
-extern Lisp_Object Qscrollbar_click;
+extern Lisp_Object Qscroll_bar_movement;
 
 /* Getting the kind of an event head.  */
 #define EVENT_HEAD_KIND(event_head) \
@@ -66,3 +94,10 @@ extern Lisp_Object Qscrollbar_click;
 /* Symbols to use for non-text mouse positions.  */
 extern Lisp_Object Qmode_line, Qvertical_line;
 
+extern Lisp_Object get_keymap_1 ();
+extern Lisp_Object Fkeymapp ();
+extern Lisp_Object reorder_modifiers ();
+extern Lisp_Object read_char ();
+/* User-supplied string to translate input characters through.  */
+extern Lisp_Object Vkeyboard_translate_table;
+