From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: pre-command-hook with input methods Date: Mon, 25 May 2015 18:52:10 -0400 Message-ID: References: <878ugcmqr6.fsf@newcastle.ac.uk> <87fvajb0vs.fsf@newcastle.ac.uk> <87siej9h8c.fsf@newcastle.ac.uk> <87iofb2wfk.fsf@newcastle.ac.uk> <87egpz14re.fsf@newcastle.ac.uk> <878ug53ljk.fsf@newcastle.ac.uk> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1432594353 30057 80.91.229.3 (25 May 2015 22:52:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 May 2015 22:52:33 +0000 (UTC) Cc: emacs-devel@gnu.org To: phillip.lord@newcastle.ac.uk (Phillip Lord) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue May 26 00:52:22 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Yx1EL-0003Oh-P5 for ged-emacs-devel@m.gmane.org; Tue, 26 May 2015 00:52:22 +0200 Original-Received: from localhost ([::1]:45214 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yx1EL-0001XT-6q for ged-emacs-devel@m.gmane.org; Mon, 25 May 2015 18:52:21 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59995) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yx1EH-0001XM-KN for emacs-devel@gnu.org; Mon, 25 May 2015 18:52:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yx1ED-0000wN-Iz for emacs-devel@gnu.org; Mon, 25 May 2015 18:52:17 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:64350) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yx1ED-0000wD-FC for emacs-devel@gnu.org; Mon, 25 May 2015 18:52:13 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0A3FgA731xV/9N+3mhcDoMChAKFVbtAhH6CTQQCAoE8OhMBAQEBAQEBgQpBBYNdAQEDAScvIwULCzQSFBgNUYgKCM8jAQEBAQEFAgEfizqFBQeELQWfF4ZpjwQjggocgRRaIoJ4AQEB X-IPAS-Result: A0A3FgA731xV/9N+3mhcDoMChAKFVbtAhH6CTQQCAoE8OhMBAQEBAQEBgQpBBYNdAQEDAScvIwULCzQSFBgNUYgKCM8jAQEBAQEFAgEfizqFBQeELQWfF4ZpjwQjggocgRRaIoJ4AQEB X-IronPort-AV: E=Sophos;i="5.13,465,1427774400"; d="scan'208";a="122193138" Original-Received: from 104-222-126-211.cpe.teksavvy.com (HELO ceviche.home) ([104.222.126.211]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 25 May 2015 18:52:12 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id EA820660EF; Mon, 25 May 2015 18:52:10 -0400 (EDT) In-Reply-To: <878ug53ljk.fsf@newcastle.ac.uk> (Phillip Lord's message of "Tue, 10 Feb 2015 14:09:51 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:186814 Archived-At: > I think so yes -- so long as input-event means "user input-event" or I > have some way of telling. Something coming in from a process, or > file-watch notifications need to be ignored. Could you try the patch below to see if it provides the feature you need? Stefan diff --git a/etc/NEWS b/etc/NEWS index 1cccc31..f1b7119 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -811,6 +811,8 @@ behavior, set `diff-switches' to `-c'. * Lisp Changes in Emacs 25.1 +** New hook `input-event-functions' run whenever a user-input event is read. + ** The default value of `load-read-function' is now `read'. ** New hook `pre-redisplay-functions', a bit easier to use than pre-redisplay-function. diff --git a/lisp/subr.el b/lisp/subr.el index b9a847d..df0ed42 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1110,6 +1110,12 @@ See `event-start' for a description of the value returned." "Return the multi-click count of EVENT, a click or drag event. The return value is a positive integer." (if (and (consp event) (integerp (nth 2 event))) (nth 2 event) 1)) + +(defvar input-event-functions nil + ;; BEWARE: If it looks like this is not run anywhere, it's normal: + ;; this is run in keyboard.c. + "Special hook run each time a user-input event is read. +Each function is called with one argument: the event.") ;;;; Extracting fields of the positions in an event. diff --git a/src/keyboard.c b/src/keyboard.c index eb66c44..5c64199 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -2454,7 +2454,7 @@ read_char (int commandflag, Lisp_Object map, /* Also check was_disabled so last-nonmenu-event won't return a bad value when submenus are involved. (Bug#447) */ && (EQ (c, Qtool_bar) || EQ (c, Qmenu_bar) || was_disabled)) - *used_mouse_menu = 1; + *used_mouse_menu = true; goto reread_for_input_method; } @@ -2995,6 +2995,8 @@ read_char (int commandflag, Lisp_Object map, if (! NILP (also_record)) record_char (also_record); + Frun_hook_with_args (2, ((Lisp_Object []) {Qinput_event_functions, c})); + /* Wipe the echo area. But first, if we are about to use an input method, save the echo area contents for it to refer to. */ @@ -3986,7 +3988,7 @@ kbd_buffer_get_event (KBOARD **kbp, obj = list1 (intern ("ns-unput-working-text")); kbd_fetch_ptr = event + 1; if (used_mouse_menu) - *used_mouse_menu = 1; + *used_mouse_menu = true; } #endif @@ -4181,13 +4183,13 @@ kbd_buffer_get_event (KBOARD **kbp, && !EQ (event->frame_or_window, event->arg) && (event->kind == MENU_BAR_EVENT || event->kind == TOOL_BAR_EVENT)) - *used_mouse_menu = 1; + *used_mouse_menu = true; #endif #ifdef HAVE_NS /* Certain system events are non-key events. */ if (used_mouse_menu && event->kind == NS_NONKEY_EVENT) - *used_mouse_menu = 1; + *used_mouse_menu = true; #endif /* Wipe out this event, to catch bugs. */ @@ -8445,7 +8447,7 @@ read_char_x_menu_prompt (Lisp_Object map, Lisp_Object prev_event, bool *used_mouse_menu) { if (used_mouse_menu) - *used_mouse_menu = 0; + *used_mouse_menu = false; /* Use local over global Menu maps. */ @@ -8494,7 +8496,7 @@ read_char_x_menu_prompt (Lisp_Object map, else if (NILP (value)) value = Qt; if (used_mouse_menu) - *used_mouse_menu = 1; + *used_mouse_menu = true; return value; } return Qnil ; @@ -9067,7 +9069,7 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt, : (/* indec.start < t || fkey.start < t || */ keytran.start < t)) { Lisp_Object key; - bool used_mouse_menu = 0; + bool used_mouse_menu = false; /* Where the last real key started. If we need to throw away a key that has expanded into more than one element of keybuf @@ -11078,6 +11080,7 @@ syms_of_keyboard (void) DEFSYM (Qself_insert_command, "self-insert-command"); DEFSYM (Qforward_char, "forward-char"); DEFSYM (Qbackward_char, "backward-char"); + DEFSYM (Qinput_event_functions, "input-event-functions"); /* Non-nil disable property on a command means do not execute it; call disabled-command-function's value instead. */