emacs: src/keyboard.c comparison

comparison src/keyboard.c @ 90580:7f3f771c85fa

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 382-398) - Update from CVS - Update from erc--emacs--22 - Fix ERC bug introduced in last patch - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 123-125) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-101

author	Miles Bader <miles@gnu.org>
date	Wed, 16 Aug 2006 14:08:49 +0000
parents	858cb33ae39d 949ddf473439
children	6823a91487f2

comparison

equal deleted inserted replaced

-:c78f05b8f09e
+:7f3f771c85fa
 int interrupt_input_pending;
 /* File descriptor to use for input.  */
 extern int input_fd;
+/* Nonzero if we are executing from the SIGIO signal handler. */
+int in_sighandler;
 #ifdef HAVE_WINDOW_SYSTEM
 /* Make all keyboard buffers much bigger when using X windows.  */
 #ifdef MAC_OS8
 /* But not too big (local data > 32K error) if on Mac OS Classic.  */
 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))
 {
 /* 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
 int was_locked = single_kboard;
 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)
 #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)
 interrupt_input_pending = 1;
 #else
 SIGNAL_THREAD_CHECK (signo);
 #endif
+in_sighandler = 1;
 if (input_available_clear_time)
 EMACS_SET_SECS_USECS (*input_available_clear_time, 0, 0);
 #ifndef SYNC_INPUT
 handle_async_input ();
 #ifdef BSD4_1
 sigfree ();
 #endif
 errno = old_errno;
+in_sighandler = 0;
 }
 #endif /* SIGIO */
 /* Send ourselves a SIGIO.
 /* 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)
 last_nonmenu_event = Qnil;
 delayed_switch_frame = Qnil;
 fkey.map = fkey.parent = Vfunction_key_map;
 keytran.map = keytran.parent = Vkey_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;
 if (INTERACTIVE)
 {
 if (!NILP (prompt))
 	echo_prompt (prompt);
 	      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;
 	    }
 	}
 }
 kbd_store_ptr = kbd_buffer;
 #ifdef HAVE_MOUSE
 do_mouse_tracking = Qnil;
 #endif
 input_pending = 0;
+in_sighandler = 0;
 /* This means that command_loop_1 won't try to select anything the first
 time through.  */
 internal_last_event_frame = Qnil;
 Vlast_event_frame = internal_last_event_frame;

Mercurial > emacs

comparison src/keyboard.c @ 90580:7f3f771c85fa