X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/d64d97e537301a9787a569982d67eed8ecdabe8b..3bf234fa520ff90db31fae85f306befdadb24532:/src/keyboard.h diff --git a/src/keyboard.h b/src/keyboard.h index c6ade35dd5..c03ffff1bc 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -1,5 +1,5 @@ /* Declarations useful when processing input. - Copyright (C) 1985-1987, 1993, 2001-2013 Free Software Foundation, + Copyright (C) 1985-1987, 1993, 2001-2014 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -17,13 +17,11 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ -#include "systime.h" /* for EMACS_TIME, Time */ +#include "systime.h" /* for struct timespec, Time */ #include "coding.h" /* for ENCODE_UTF_8 and ENCODE_SYSTEM */ +#include "termhooks.h" INLINE_HEADER_BEGIN -#ifndef KEYBOARD_INLINE -# define KEYBOARD_INLINE INLINE -#endif /* Most code should use this macro to access Lisp fields in struct kboard. */ @@ -171,49 +169,49 @@ struct kboard char kbd_queue_has_data; /* True means echo each character as typed. */ - unsigned immediate_echo : 1; + bool_bf immediate_echo : 1; /* If we have echoed a prompt string specified by the user, this is its length in characters. Otherwise this is -1. */ ptrdiff_t echo_after_prompt; }; -KEYBOARD_INLINE void +INLINE void kset_default_minibuffer_frame (struct kboard *kb, Lisp_Object val) { kb->INTERNAL_FIELD (Vdefault_minibuffer_frame) = val; } -KEYBOARD_INLINE void +INLINE void kset_defining_kbd_macro (struct kboard *kb, Lisp_Object val) { kb->INTERNAL_FIELD (defining_kbd_macro) = val; } -KEYBOARD_INLINE void +INLINE void kset_input_decode_map (struct kboard *kb, Lisp_Object val) { kb->INTERNAL_FIELD (Vinput_decode_map) = val; } -KEYBOARD_INLINE void +INLINE void kset_last_command (struct kboard *kb, Lisp_Object val) { kb->INTERNAL_FIELD (Vlast_command) = val; } -KEYBOARD_INLINE void +INLINE void kset_last_kbd_macro (struct kboard *kb, Lisp_Object val) { kb->INTERNAL_FIELD (Vlast_kbd_macro) = val; } -KEYBOARD_INLINE void +INLINE void kset_prefix_arg (struct kboard *kb, Lisp_Object val) { kb->INTERNAL_FIELD (Vprefix_arg) = val; } -KEYBOARD_INLINE void +INLINE void kset_system_key_alist (struct kboard *kb, Lisp_Object val) { kb->INTERNAL_FIELD (Vsystem_key_alist) = val; } -KEYBOARD_INLINE void +INLINE void kset_window_system (struct kboard *kb, Lisp_Object val) { kb->INTERNAL_FIELD (Vwindow_system) = val; @@ -229,16 +227,10 @@ extern KBOARD *initial_kboard; right now considering input. We can consider input from another kboard, but doing so requires throwing to wrong_kboard_jmpbuf. */ extern KBOARD *current_kboard; - -/* A list of all kboard objects, linked through next_kboard. */ -extern KBOARD *all_kboards; /* Total number of times read_char has returned, modulo UINTMAX_MAX + 1. */ extern uintmax_t num_input_events; -/* Nonzero means polling for input is temporarily suppressed. */ -extern int poll_suppress_count; - /* 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 @@ -310,9 +302,7 @@ extern Lisp_Object menu_items; /* If non-nil, means that the global vars defined here are already in use. Used to detect cases where we try to re-enter this non-reentrant code. */ -#if defined USE_GTK || defined USE_MOTIF extern Lisp_Object menu_items_inuse; -#endif /* Number of slots currently allocated in menu_items. */ extern int menu_items_allocated; @@ -341,7 +331,7 @@ enum menu_item_idx MENU_ITEMS_ITEM_LENGTH }; -extern Lisp_Object unuse_menu_items (Lisp_Object dummy); +extern void unuse_menu_items (void); /* This is how to deal with multibyte text if HAVE_MULTILINGUAL_MENU isn't defined. The use of HAVE_MULTILINGUAL_MENU could probably be @@ -359,57 +349,6 @@ extern Lisp_Object unuse_menu_items (Lisp_Object dummy); #define ENCODE_MENU_STRING(str) (str) #endif -#if defined (HAVE_NS) || defined (HAVE_NTGUI) || defined (USE_GTK) - -/* Definitions copied from lwlib.h */ - -enum button_type -{ - BUTTON_TYPE_NONE, - BUTTON_TYPE_TOGGLE, - BUTTON_TYPE_RADIO -}; - -/* This structure is based on the one in ../lwlib/lwlib.h, with unused portions - removed. No term uses these. */ -typedef struct _widget_value -{ - /* name of widget */ - Lisp_Object lname; - const char* name; - /* value (meaning depend on widget type) */ - const char* value; - /* keyboard equivalent. no implications for XtTranslations */ - Lisp_Object lkey; - const char* key; - /* Help string or nil if none. - GC finds this string through the frame's menu_bar_vector - or through menu_items. */ - Lisp_Object help; - /* true if enabled */ - unsigned char enabled; - /* true if selected */ - unsigned char selected; - /* The type of a button. */ - enum button_type button_type; -#if defined (HAVE_NTGUI) - /* true if menu title */ - unsigned char title; -#endif - /* Contents of the sub-widgets, also selected slot for checkbox */ - struct _widget_value* contents; - /* data passed to callback */ - void *call_data; - /* next one in the list */ - struct _widget_value* next; -#ifdef USE_GTK - struct _widget_value *free_list; -#endif -} widget_value; - -#endif /* HAVE_NS || HAVE_NTGUI */ - - /* Macros for dealing with lispy events. */ /* True if EVENT has data fields describing it (i.e. a mouse click). */ @@ -421,18 +360,18 @@ typedef struct _widget_value (EVENT_HAS_PARAMETERS (event) ? XCAR (event) : (event)) /* Extract the starting and ending positions from a composite event. */ -#define EVENT_START(event) (XCAR (XCDR (event))) -#define EVENT_END(event) (XCAR (XCDR (XCDR (event)))) +#define EVENT_START(event) (CAR_SAFE (CDR_SAFE (event))) +#define EVENT_END(event) (CAR_SAFE (CDR_SAFE (CDR_SAFE (event)))) /* Extract the click count from a multi-click event. */ #define EVENT_CLICK_COUNT(event) (Fnth (make_number (2), (event))) /* Extract the fields of a position. */ -#define POSN_WINDOW(posn) (XCAR (posn)) -#define POSN_POSN(posn) (XCAR (XCDR (posn))) +#define POSN_WINDOW(posn) (CAR_SAFE (posn)) +#define POSN_POSN(posn) (CAR_SAFE (CDR_SAFE (posn))) #define POSN_SET_POSN(posn,x) (XSETCAR (XCDR (posn), (x))) -#define POSN_WINDOW_POSN(posn) (XCAR (XCDR (XCDR (posn)))) -#define POSN_TIMESTAMP(posn) (XCAR (XCDR (XCDR (XCDR (posn))))) +#define POSN_WINDOW_POSN(posn) (CAR_SAFE (CDR_SAFE (CDR_SAFE (posn)))) +#define POSN_TIMESTAMP(posn) (CAR_SAFE (CDR_SAFE (CDR_SAFE (CDR_SAFE (posn))))) #define POSN_SCROLLBAR_PART(posn) (Fnth (make_number (4), (posn))) /* A cons (STRING . STRING-CHARPOS), or nil in mouse-click events. @@ -462,28 +401,24 @@ extern Lisp_Object Qhelp_echo; /* Symbols to use for non-text mouse positions. */ extern Lisp_Object Qmode_line, Qvertical_line, Qheader_line; +extern Lisp_Object Qright_divider, Qbottom_divider; /* True while doing kbd input. */ extern bool waiting_for_input; -/* Address (if not 0) of EMACS_TIME to zero out if a SIGIO interrupt +/* Address (if not 0) of struct timespec to zero out if a SIGIO interrupt happens. */ -extern EMACS_TIME *input_available_clear_time; +extern struct timespec *input_available_clear_time; -#if defined HAVE_WINDOW_SYSTEM && !defined USE_GTK && !defined HAVE_NS extern bool ignore_mouse_drag_p; -#endif /* The primary selection. */ extern Lisp_Object QPRIMARY; -/* Forward declaration for prototypes. */ -struct input_event; - extern Lisp_Object parse_modifiers (Lisp_Object); extern Lisp_Object reorder_modifiers (Lisp_Object); extern Lisp_Object read_char (int, Lisp_Object, Lisp_Object, - bool *, EMACS_TIME *); + bool *, struct timespec *); extern int parse_solitary_modifier (Lisp_Object symbol); @@ -501,10 +436,6 @@ extern Lisp_Object QCtoggle, QCradio; speed up parse_modifiers. */ extern Lisp_Object Qevent_symbol_element_mask; -/* The timestamp of the last input event we received from the X server. - X Windows wants this for selection ownership. */ -extern Time last_event_timestamp; - extern int quit_char; extern unsigned int timers_run; @@ -512,7 +443,7 @@ extern unsigned int timers_run; extern bool menu_separator_name_p (const char *); extern bool parse_menu_item (Lisp_Object, int); -extern void init_kboard (KBOARD *); +extern KBOARD *allocate_kboard (Lisp_Object); extern void delete_kboard (KBOARD *); extern void not_single_kboard_state (KBOARD *); extern void push_kboard (struct kboard *); @@ -522,8 +453,6 @@ extern void temporarily_switch_to_single_kboard (struct frame *); extern void record_asynch_buffer_change (void); extern void input_poll_signal (int); extern void start_polling (void); -extern void stop_polling (void); -extern void set_poll_suppress_count (int); extern int gobble_input (void); extern bool input_polling_used (void); extern void clear_input_pending (void); @@ -549,7 +478,7 @@ extern bool kbd_buffer_events_waiting (void); extern void add_user_signal (int, const char *); extern int tty_read_avail_input (struct terminal *, struct input_event *); -extern EMACS_TIME timer_check (void); +extern struct timespec timer_check (void); extern void mark_kboards (void); #ifdef HAVE_NTGUI