[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master c13cd74 2/2: (read_key_sewuence): Use POSN in secon
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] master c13cd74 2/2: (read_key_sewuence): Use POSN in second event when needed (bug#30955) |
Date: |
Tue, 27 Mar 2018 15:26:10 -0400 (EDT) |
branch: master
commit c13cd74322be25293e78412b8957fe639f560c54
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>
(read_key_sewuence): Use POSN in second event when needed (bug#30955)
* src/keyboard.c (active_maps): Add arg 'second_event'.
(read_key_sequence): Pass it.
* lisp/mouse.el (mouse--click-1-maybe-follows-link): Modify event in place.
---
lisp/mouse.el | 7 ++++++-
src/keyboard.c | 18 ++++++++++++++----
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 66b8a85..95aada9 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -131,7 +131,12 @@ Expects to be bound to `(double-)mouse-1' in
`key-translation-map'."
(unless (get newup 'event-kind)
(put newup 'event-kind
(get (car last-input-event) 'event-kind)))
- (vector (cons newup (cdr last-input-event)))))))))
+ ;; Modify the event in-place, otherwise we can get a prefix
+ ;; added again, so a click on the header-line turns
+ ;; into a [header-line header-line mouse-2] :-(.
+ ;; See fake_prefixed_keys in src/keyboard.c's.
+ (setf (car last-input-event) newup)
+ (vector last-input-event)))))))
(define-key key-translation-map [down-mouse-1]
#'mouse--down-1-maybe-follows-link)
diff --git a/src/keyboard.c b/src/keyboard.c
index 9b8d275..044e3fa 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -8701,10 +8701,19 @@ follow_key (Lisp_Object keymap, Lisp_Object key)
}
static Lisp_Object
-active_maps (Lisp_Object first_event)
+active_maps (Lisp_Object first_event, Lisp_Object second_event)
{
Lisp_Object position
- = CONSP (first_event) ? CAR_SAFE (XCDR (first_event)) : Qnil;
+ = EVENT_HAS_PARAMETERS (first_event) ? EVENT_START (first_event) : Qnil;
+ /* The position of a click can be in the second event if the first event
+ is a fake_prefixed_key like `header-line` or `mode-line`. */
+ if (SYMBOLP (first_event)
+ && EVENT_HAS_PARAMETERS (second_event)
+ && EQ (first_event, POSN_POSN (EVENT_START (second_event))))
+ {
+ eassert (NILP (position));
+ position = EVENT_START (second_event);
+ }
return Fcons (Qkeymap, Fcurrent_active_maps (Qt, position));
}
@@ -9016,13 +9025,14 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize,
Lisp_Object prompt,
starting_buffer = current_buffer;
first_unbound = bufsize + 1;
Lisp_Object first_event = mock_input > 0 ? keybuf[0] : Qnil;
+ Lisp_Object second_event = mock_input > 1 ? keybuf[1] : Qnil;
/* Build our list of keymaps.
If we recognize a function key and replace its escape sequence in
keybuf with its symbol, or if the sequence starts with a mouse
click and we need to switch buffers, we jump back here to rebuild
the initial keymaps from the current buffer. */
- current_binding = active_maps (first_event);
+ current_binding = active_maps (first_event, second_event);
/* Start from the beginning in keybuf. */
t = 0;
@@ -9282,7 +9292,7 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize,
Lisp_Object prompt,
&& (XBUFFER (XWINDOW (selected_window)->contents)
!= current_buffer))
Fset_buffer (XWINDOW (selected_window)->contents);
- current_binding = active_maps (first_event);
+ current_binding = active_maps (first_event, Qnil);
}
GROW_RAW_KEYBUF;