(file_name_completion): Install case-preserving changes from Emacs 18

[gnu-emacs] / src / keyboard.h

diff --git a/src/keyboard.h b/src/keyboard.h
index c7048fd6c0c951dbbc060bc3fdaf5b55361b8ff9..9095f244571821bf9d492c84d58ca15d442f2e99 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.
 
@@ -23,7 +23,7 @@ extern int num_input_chars;
 /* Total number of times read_char has returned, outside of macros.  */
 extern int num_nonmacro_input_chars;
 
-/* Nonzero means polling for input is temporarily suppresed.  */
+/* Nonzero means polling for input is temporarily suppressed.  */
 extern int poll_suppress_count;
 
 /* Keymap mapping ASCII function key sequences onto their preferred forms.
@@ -37,6 +37,15 @@ extern Lisp_Object Vfunction_key_map;
 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.  */
 
@@ -53,12 +62,16 @@ extern int this_command_key_count;
 #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 Qswitch_frame;
@@ -72,7 +85,7 @@ extern Lisp_Object Qevent_kind, Qevent_symbol_elements;
 
 /* The values of Qevent_kind properties.  */
 extern Lisp_Object Qfunction_key, Qmouse_click, Qmouse_movement;
-extern Lisp_Object Qscrollbar_movement;
+extern Lisp_Object Qscroll_bar_movement;
 
 /* Getting the kind of an event head.  */
 #define EVENT_HEAD_KIND(event_head) \
@@ -84,7 +97,6 @@ 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 Fmouse_click_p ();
 extern Lisp_Object read_char ();
 /* User-supplied string to translate input characters through.  */
 extern Lisp_Object Vkeyboard_translate_table;