emacs: src/keyboard.c comparison

comparison src/keyboard.c @ 83541:694bbb62a75d

Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-371 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-372 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-373 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-374 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-375 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-376 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-377 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-378 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-379 Merge from erc--emacs--21 * emacs@sv.gnu.org/emacs--devo--0--patch-380 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-381 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-382 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-383 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-384 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-385 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-386 Update from erc--emacs--22 * emacs@sv.gnu.org/emacs--devo--0--patch-387 Fix ERC bug introduced in last patch * emacs@sv.gnu.org/emacs--devo--0--patch-388 Update from erc--emacs--22 * emacs@sv.gnu.org/emacs--devo--0--patch-389 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-390 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-391 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-392 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-393 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-394 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-395 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-396 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-397 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-398 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-399 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-400 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-401 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-402 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-403 Rcirc update from Ryan Yeske * emacs@sv.gnu.org/emacs--devo--0--patch-404 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-405 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-406 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-407 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-408 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-409 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-410 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-411 Miscellaneous tq-related fixes. * emacs@sv.gnu.org/emacs--devo--0--patch-412 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-121 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-122 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-123 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-124 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-125 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-126 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-127 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-581

author	Karoly Lorentey <lorentey@elte.hu>
date	Sat, 14 Oct 2006 16:56:21 +0000
parents	4a2f192917db 0798c7030130
children	2d56e13fd23d

comparison

equal deleted inserted replaced

-:0c89a85addc3
+:694bbb62a75d
 Fthrow (Qexit, Qt);
 error ("No recursive edit is in progress");
 return Qnil;
 }
+#ifdef HAVE_MOUSE
+/* Restore mouse tracking enablement.  See Ftrack_mouse for the only use
+of this function.  */
+static Lisp_Object
+tracking_off (old_value)
+Lisp_Object old_value;
+{
+do_mouse_tracking = old_value;
+if (NILP (old_value))
+{
+/* Redisplay may have been preempted because there was input
+	 available, and it assumes it will be called again after the
+	 input has been processed.  If the only input available was
+	 the sort that we have just disabled, then we need to call
+	 redisplay.  */
+if (!readable_events (READABLE_EVENTS_DO_TIMERS_NOW))
+	{
+	  redisplay_preserve_echo_area (6);
+	  get_input_pending (&input_pending,
+			     READABLE_EVENTS_DO_TIMERS_NOW);
+	}
+}
+return Qnil;
+}
+DEFUN ("track-mouse", Ftrack_mouse, Strack_mouse, 0, UNEVALLED, 0,
+doc: /* Evaluate BODY with mouse movement events enabled.
+Within a `track-mouse' form, mouse motion generates input events that
+you can read with `read-event'.
+Normally, mouse motion is ignored.
+usage: (track-mouse BODY ...)  */)
+(args)
+Lisp_Object args;
+{
+int count = SPECPDL_INDEX ();
+Lisp_Object val;
+record_unwind_protect (tracking_off, do_mouse_tracking);
+do_mouse_tracking = Qt;
+val = Fprogn (args);
+return unbind_to (count, val);
+}
+/* If mouse has moved on some frame, return one of those frames.
+Return 0 otherwise.  */
+static FRAME_PTR
+some_mouse_moved ()
+{
+Lisp_Object tail, frame;
+FOR_EACH_FRAME (tail, frame)
+{
+if (XFRAME (frame)->mouse_moved)
+	return XFRAME (frame);
+}
+return 0;
+}
+#endif	/* HAVE_MOUSE */
 /* This is the actual command reading loop,
 sans error-handling encapsulation.  */
 static int read_key_sequence P_ ((Lisp_Object *, int, Lisp_Object,
 static Lisp_Object
 safe_run_hooks_1 (hook)
 Lisp_Object hook;
 {
+if (NILP (Vrun_hooks))
+return Qnil;
 return call1 (Vrun_hooks, Vinhibit_quit);
 }
 /* Subroutine for safe_run_hooks: handle an error by clearing out the hook.  */
 	return;
 }
 #ifdef HAVE_MOUSE
 if (!noninteractive && STRINGP (help))
-help = call1 (Qmouse_fixup_help_message, help);
+{
+/* The mouse-fixup-help-message Lisp function can call
+	 mouse_position_hook, which resets the mouse_moved flags.
+	 This causes trouble if we are trying to read a mouse motion
+	 event (i.e., if we are inside a `track-mouse' form), so we
+	 restore the mouse_moved flag.  */
+FRAME_PTR f = NILP (do_mouse_tracking) ? NULL : some_mouse_moved ();
+help = call1 (Qmouse_fixup_help_message, help);
+if (f)
+	f->mouse_moved = 1;
+}
 #endif
 if (STRINGP (help) || NILP (help))
 {
 if (!NILP (Vshow_help_function))
 Lisp_Object prev_event;
 int *used_mouse_menu;
 EMACS_TIME *end_time;
 {
 volatile Lisp_Object c;
-int count;
+int count, jmpcount;
 jmp_buf local_getcjmp;
 jmp_buf save_jump;
 volatile int key_already_recorded = 0;
 Lisp_Object tem, save;
 volatile Lisp_Object previous_echo_area_message;
 We will do that below, temporarily for short sections of code,
 when appropriate.  local_getcjmp must be in effect
 around any call to sit_for or kbd_buffer_get_event;
 it *must not* be in effect when we call redisplay.  */
+jmpcount = SPECPDL_INDEX ();
 if (_setjmp (local_getcjmp))
 {
 /* Handle quits while reading the keyboard.  */
 /* We must have saved the outer value of getcjmp here,
 	 so restore it now.  */
 restore_getcjmp (save_jump);
+unbind_to (jmpcount, Qnil);
 XSETINT (c, quit_char);
 internal_last_event_frame = selected_frame;
 Vlast_event_frame = internal_last_event_frame;
 /* If we report the quit char as an event,
 	 don't do so more than once.  */
 }
 #endif
 goto non_reread;
 }
-timer_start_idle ();
+/* Start idle timers if no time limit is supplied.  We don't do it
+if a time limit is supplied to avoid an infinite recursion in the
+situation where an idle timer calls `sit-for'.  */
+if (!end_time)
+timer_start_idle ();
 /* If in middle of key sequence and minibuffer not active,
 start echoing if enough time elapses.  */
 if (minibuf_level == 0
 && unread_command_char < 0)
 {
 c = read_char_x_menu_prompt (nmaps, maps, prev_event, used_mouse_menu);
 /* Now that we have read an event, Emacs is not idle.  */
-timer_stop_idle ();
+if (!end_time)
+	timer_stop_idle ();
 goto exit;
 }
 /* Maybe autosave and/or garbage collect due to idleness.  */
 	}
 /* Actually read a character, waiting if necessary.  */
 save_getcjmp (save_jump);
 restore_getcjmp (local_getcjmp);
-timer_start_idle ();
+if (!end_time)
+	timer_start_idle ();
 c = kbd_buffer_get_event (&kb, used_mouse_menu, end_time);
 restore_getcjmp (save_jump);
 #ifdef MULTI_KBOARD
 if (! NILP (c) && (kb != current_kboard))
 XSETINT (c, XINT (c) | (extra_keyboard_modifiers & ~0xff7f & ~CHAR_CTL));
 }
 non_reread:
-timer_stop_idle ();
+if (!end_time)
+timer_stop_idle ();
 RESUME_POLLING;
 if (NILP (c))
 {
 if (commandflag >= 0
 #endif
 last_input_char = c;
 Fcommand_execute (tem, Qnil, Fvector (1, &last_input_char), Qt);
-if (CONSP (c) && EQ (XCAR (c), Qselect_window))
+if (CONSP (c) && EQ (XCAR (c), Qselect_window) && !end_time)
 	/* We stopped being idle for this event; undo that.  This
 	   prevents automatic window selection (under
 	   mouse_autoselect_window from acting as a real input event, for
 	   example banishing the mouse under mouse-avoidance-mode.  */
 	timer_resume_idle ();
 position = Fcar (tem);
 show_help_echo (help, window, object, position, 0);
 /* We stopped being idle for this event; undo that.  */
-timer_resume_idle ();
+if (!end_time)
+	timer_resume_idle ();
 goto retry;
 }
 if (! reread || this_command_key_count == 0
 || this_command_key_count_reset)
 jmp_buf temp;
 {
 bcopy (temp, getcjmp, sizeof getcjmp);
 }
-#ifdef HAVE_MOUSE
-/* Restore mouse tracking enablement.  See Ftrack_mouse for the only use
-of this function.  */
-static Lisp_Object
-tracking_off (old_value)
-Lisp_Object old_value;
-{
-do_mouse_tracking = old_value;
-if (NILP (old_value))
-{
-/* Redisplay may have been preempted because there was input
-	 available, and it assumes it will be called again after the
-	 input has been processed.  If the only input available was
-	 the sort that we have just disabled, then we need to call
-	 redisplay.  */
-if (!readable_events (READABLE_EVENTS_DO_TIMERS_NOW))
-	{
-	  redisplay_preserve_echo_area (6);
-	  get_input_pending (&input_pending,
-			     READABLE_EVENTS_DO_TIMERS_NOW);
-	}
-}
-return Qnil;
-}
-DEFUN ("track-mouse", Ftrack_mouse, Strack_mouse, 0, UNEVALLED, 0,
-doc: /* Evaluate BODY with mouse movement events enabled.
-Within a `track-mouse' form, mouse motion generates input events that
-you can read with `read-event'.
-Normally, mouse motion is ignored.
-usage: (track-mouse BODY ...)  */)
-(args)
-Lisp_Object args;
-{
-int count = SPECPDL_INDEX ();
-Lisp_Object val;
-record_unwind_protect (tracking_off, do_mouse_tracking);
-do_mouse_tracking = Qt;
-val = Fprogn (args);
-return unbind_to (count, val);
-}
-/* If mouse has moved on some frame, return one of those frames.
-Return 0 otherwise.  */
-static FRAME_PTR
-some_mouse_moved ()
-{
-Lisp_Object tail, frame;
-FOR_EACH_FRAME (tail, frame)
-{
-if (XFRAME (frame)->mouse_moved)
-	return XFRAME (frame);
-}
-return 0;
-}
-#endif	/* HAVE_MOUSE */
 /* Low level keyboard/mouse input.
 kbd_buffer_store_event places events in kbd_buffer, and
 kbd_buffer_get_event retrieves them.  */
 /* Return true iff there are any events in the queue that read-char
 #endif
 if (end_time)
 	{
 	  EMACS_TIME duration;
 	  EMACS_GET_TIME (duration);
-	  EMACS_SUB_TIME (duration, *end_time, duration);
+	  if (EMACS_TIME_GE (duration, *end_time))
-	  if (EMACS_TIME_NEG_P (duration))
+	    return Qnil;	/* finished waiting */
-	    return Qnil;
 	  else
-	    wait_reading_process_output (EMACS_SECS (duration),
+	    {
-					 EMACS_USECS (duration),
+	      EMACS_SUB_TIME (duration, *end_time, duration);
-					 -1, 1, Qnil, NULL, 0);
+	      wait_reading_process_output (EMACS_SECS (duration),
+					   EMACS_USECS (duration),
+					   -1, 1, Qnil, NULL, 0);
+	    }
 	}
 else
 	wait_reading_process_output (0, 0, -1, 1, Qnil, NULL, 0);
 if (!interrupt_input && kbd_fetch_ptr == kbd_store_ptr)
 /* No timers are pending in the future.  */
 /* Return 0 if we generated an event, and -1 if not.  */
 UNGCPRO;
 return nexttime;
+}
+DEFUN ("current-idle-time", Fcurrent_idle_time, Scurrent_idle_time, 0, 0, 0,
+doc: /* Return the current length of Emacs idleness.
+The value is returned as a list of three integers.  The first has the
+most significant 16 bits of the seconds, while the second has the
+least significant 16 bits.  The third integer gives the microsecond
+count.
+The microsecond count is zero on systems that do not provide
+resolution finer than a second.  */)
+()
+{
+if (! EMACS_TIME_NEG_P (timer_idleness_start_time))
+{
+EMACS_TIME now, idleness_now;
+EMACS_GET_TIME (now);
+EMACS_SUB_TIME (idleness_now, now, timer_idleness_start_time);
+return list3 (make_number ((EMACS_SECS (idleness_now) >> 16) & 0xffff),
+		    make_number ((EMACS_SECS (idleness_now) >> 0)  & 0xffff),
+		    make_number (EMACS_USECS (idleness_now)));
+}
+return Qnil;
 }
 /* Caches for modify_event_symbol.  */
 static Lisp_Object accent_key_syms;
 static Lisp_Object func_key_syms;
 /* Structure used to keep track of partial application of key remapping
 such as Vfunction_key_map and Vkey_translation_map.  */
 typedef struct keyremap
 {
-Lisp_Object map, parent;
+/* This is the map originally specified for this use.  */
+Lisp_Object parent;
+/* This is a submap reached by looking up, in PARENT,
+the events from START to END.  */
+Lisp_Object map;
+/* Positions [START, END) in the key sequence buffer
+are the key that we have scanned so far.
+Those events are the ones that we will replace
+if PAREHT maps them into a key sequence.  */
 int start, end;
 } keyremap;
 /* Lookup KEY in MAP.
 MAP is a keymap mapping keys to key vectors or functions.
 int input, doit, *diff, bufsize;
 {
 Lisp_Object next, key;
 key = keybuf[fkey->end++];
-next = access_keymap_keyremap (fkey->map, key, prompt, doit);
+if (KEYMAPP (fkey->parent))
+next = access_keymap_keyremap (fkey->map, key, prompt, doit);
+else
+next = Qnil;
 /* If keybuf[fkey->start..fkey->end] is bound in the
 map and we're in a position to do the key remapping, replace it with
 the binding and restart with fkey->start at the end. */
 if ((VECTORP (next) || STRINGP (next)) && doit)
 /* We may switch keyboards between rescans, so we need to
 reinitialize fkey and keytran before each replay.  */
 fkey.map = fkey.parent = current_kboard->Vlocal_function_key_map;
 keytran.map = keytran.parent = current_kboard->Vlocal_key_translation_map;
-/* If there is no translation map, turn off scanning.  */
+fkey.start = fkey.end = 0;
-fkey.start = fkey.end = KEYMAPP (fkey.map) ? 0 : bufsize + 1;
+keytran.start = keytran.end = 0;
-keytran.start = keytran.end = KEYMAPP (keytran.map) ? 0 : bufsize + 1;
 starting_buffer = current_buffer;
 first_unbound = bufsize + 1;
 /* Build our list of keymaps.
 	      new_key = apply_modifiers (modifiers,
 					 XCAR (breakdown));
 	      keybuf[t - 1] = new_key;
 	      mock_input = max (t, mock_input);
-	      fkey.start = fkey.end = KEYMAPP (fkey.map) ? 0 : bufsize + 1;
+	      fkey.start = fkey.end = 0;
-	      keytran.start = keytran.end = KEYMAPP (keytran.map) ? 0 : bufsize + 1;
+	      keytran.start = keytran.end = 0;
 	      goto replay_sequence;
 	    }
 	}
 }
 staticpro (&menu_bar_one_keymap_changed_items);
 menu_bar_items_vector = Qnil;
 staticpro (&menu_bar_items_vector);
+defsubr (&Scurrent_idle_time);
 defsubr (&Sevent_convert_list);
 defsubr (&Sread_key_sequence);
 defsubr (&Sread_key_sequence_vector);
 defsubr (&Srecursive_edit);
 #ifdef HAVE_MOUSE
 DEFVAR_INT ("unread-command-char", &unread_command_char,
 	      doc: /* If not -1, an object to be read as next command input event.  */);
 DEFVAR_LISP ("unread-post-input-method-events", &Vunread_post_input_method_events,
 	       doc: /* List of events to be processed as input by input methods.
-These events are processed after `unread-command-events', but
+These events are processed before `unread-command-events'
-before actual keyboard input.  */);
+and actual keyboard input without given to `input-method-function'.  */);
 Vunread_post_input_method_events = Qnil;
 DEFVAR_LISP ("unread-input-method-events", &Vunread_input_method_events,
 	       doc: /* List of events to be processed as input by input methods.
 These events are processed after `unread-command-events', but
-before actual keyboard input.  */);
+before actual keyboard input.
+If there's an active input method, the events are given to
+`input-method-function'.  */);
 Vunread_input_method_events = Qnil;
 DEFVAR_LISP ("meta-prefix-char", &meta_prefix_char,
 	       doc: /* Meta-prefix character code.
 Meta-foo as command input turns into this character followed by foo.  */);

Mercurial > emacs

comparison src/keyboard.c @ 83541:694bbb62a75d