diff options
Diffstat (limited to 'src/keyboard.h')
| -rw-r--r-- | src/keyboard.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/keyboard.h b/src/keyboard.h index 05245f366f5..2ce003fd444 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -396,7 +396,7 @@ extern void unuse_menu_items (void); /* Macros for dealing with lispy events. */ /* True if EVENT has data fields describing it (i.e. a mouse click). */ -#define EVENT_HAS_PARAMETERS(event) (CONSP (event)) +#define EVENT_HAS_PARAMETERS(event) CONSP (event) /* Extract the head from an event. This works on composite and simple events. */ @@ -414,32 +414,32 @@ extern void unuse_menu_items (void); : CAR_SAFE (CDR_SAFE (event))) /* This does not handle touchscreen events. */ -#define EVENT_END(event) (CAR_SAFE (CDR_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_fixnum (2), (event))) +#define EVENT_CLICK_COUNT(event) Fnth (make_fixnum (2), event) /* Extract the fields of a position. */ -#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) (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_fixnum (4), (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) 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_fixnum (4), posn) /* A cons (STRING . STRING-CHARPOS), or nil in mouse-click events. It's a cons if the click is over a string in the mode line. */ -#define POSN_STRING(posn) (Fnth (make_fixnum (4), (posn))) +#define POSN_STRING(posn) Fnth (make_fixnum (4), posn) /* If POSN_STRING is nil, event refers to buffer location. */ -#define POSN_INBUFFER_P(posn) (NILP (POSN_STRING (posn))) -#define POSN_BUFFER_POSN(posn) (Fnth (make_fixnum (5), (posn))) +#define POSN_INBUFFER_P(posn) NILP (POSN_STRING (posn)) +#define POSN_BUFFER_POSN(posn) Fnth (make_fixnum (5), posn) /* Getting the kind of an event head. */ #define EVENT_HEAD_KIND(event_head) \ - (Fget ((event_head), Qevent_kind)) + Fget (event_head, Qevent_kind) /* Address (if not 0) of struct timespec to zero out if a SIGIO interrupt happens. */ @@ -483,6 +483,7 @@ extern void set_poll_suppress_count (int); extern int gobble_input (void); extern bool input_polling_used (void); extern void clear_input_pending (void); +extern bool requeued_command_events_pending_p (void); extern bool requeued_events_pending_p (void); extern void bind_polling_period (int); extern int make_ctrl_char (int) ATTRIBUTE_CONST; |