xemacs-beta: src/event-stream.c comparison

comparison src/event-stream.c @ 380:8626e4521993 r21-2-5

Import from CVS: tag r21-2-5

author	cvs
date	Mon, 13 Aug 2007 11:07:10 +0200
parents	cc15677e0335
children	aabb7f5b1c81

comparison

equal deleted inserted replaced

-:76b7d63099ad
+:8626e4521993
 The command builder should deal only with key and button events.
 Other command events should be able to come in the MIDDLE of a key
 sequence, without disturbing the key sequence composition, or the
 command builder structure representing it.
-Someone should rethink univeral-argument and figure out how an
+Someone should rethink universal-argument and figure out how an
 arbitrary command can influence the next command (universal-argument
-or univeral-coding-system-argument) or the next key (hyperify).
+or universal-coding-system-argument) or the next key (hyperify).
 Both C-h and Help in the middle of a key sequence should trigger
 prefix-help-command.  help-char is stupid.  Maybe we need
 keymap-of-last-resort?
 Lisp_Object Vmenu_accelerator_modifiers;
 /* whether menu accelerators are enabled */
 Lisp_Object Vmenu_accelerator_enabled;
-/* keymap for auxillary menu accelerator functions */
+/* keymap for auxiliary menu accelerator functions */
 Lisp_Object Vmenu_accelerator_map;
 Lisp_Object Qmenu_force;
 Lisp_Object Qmenu_fallback;
 Lisp_Object Qmenu_quit;
 static Lisp_Object
 mark_command_builder (Lisp_Object obj, void (*markobj) (Lisp_Object))
 {
 struct command_builder *builder = XCOMMAND_BUILDER (obj);
-(markobj) (builder->prefix_events);
+markobj (builder->prefix_events);
-(markobj) (builder->current_events);
+markobj (builder->current_events);
-(markobj) (builder->most_current_event);
+markobj (builder->most_current_event);
-(markobj) (builder->last_non_munged_event);
+markobj (builder->last_non_munged_event);
-(markobj) (builder->munge_me[0].first_mungeable_event);
+markobj (builder->munge_me[0].first_mungeable_event);
-(markobj) (builder->munge_me[1].first_mungeable_event);
+markobj (builder->munge_me[1].first_mungeable_event);
 return builder->console;
 }
 static void
 finalize_command_builder (void *header, int for_disksave)
 Emchar c;
 int did_translate = 0;
 if (XEVENT_TYPE (event) != key_press_event)
 return;
-if (!HASHTABLEP (Vkeyboard_translate_table))
+if (!HASH_TABLEP (Vkeyboard_translate_table))
 return;
-if (EQ (Fhashtable_fullness (Vkeyboard_translate_table), Qzero))
+if (EQ (Fhash_table_count (Vkeyboard_translate_table), Qzero))
 return;
 c = event_to_character (XEVENT (event), 0, 0, 0);
 if (c != -1)
 {
 			 Fcurrent_window_configuration (Qnil));
 reset_key_echo (command_builder, 1);
 help = Feval (Vhelp_form);
 if (STRINGP (help))
-internal_with_output_to_temp_buffer ("*Help*",
+internal_with_output_to_temp_buffer (build_string ("*Help*"),
 					 print_help, help, Qnil);
 Fnext_command_event (event, Qnil);
 /* Remove the help from the frame */
 unbind_to (speccount, Qnil);
 /* Hmmmm.  Tricky.  The unbind restores an old window configuration,
 static Lisp_Object
 mark_timeout (Lisp_Object obj, void (*markobj) (Lisp_Object))
 {
 struct timeout *tm = (struct timeout *) XOPAQUE_DATA (obj);
-(markobj) (tm->function);
+markobj (tm->function);
 return tm->object;
 }
 /* Generate a timeout and return its ID. */
 /* #### Do we really want to check OUGHT ??
 * It seems to make sense, though I have never seen us
 * get here and have it be non-nil.
 */
 if (FRAMEP (DEVICE_FRAME_THAT_OUGHT_TO_HAVE_FOCUS (d)))
 old_frame = DEVICE_FRAME_THAT_OUGHT_TO_HAVE_FOCUS (d);
 else if (FRAMEP (DEVICE_FRAME_WITH_FOCUS_FOR_HOOKS (d)))
 old_frame = DEVICE_FRAME_WITH_FOCUS_FOR_HOOKS (d);
 /* #### Can old_frame ever be NIL?  play it safe.. */
 if (!NILP (old_frame))
 XCAR (XCDR (Vlast_command_event_time)) =
 make_int ((EMACS_SECS (t) >> 0)  & 0xffff);
 XCAR (XCDR (XCDR (Vlast_command_event_time)))
 = make_int (EMACS_USECS (t));
 }
 /* If this key came from the keyboard or from a keyboard macro, then
 it goes into the recent-keys and this-command-keys vectors.
 If this key came from the keyboard, and we're defining a keyboard
 macro, then it goes into the macro.
 */
 echo area while this function is waiting for an event.
 The event returned will be a keyboard, mouse press, or mouse release event.
 If there are non-command events available (mouse motion, sub-process output,
 etc) then these will be executed (with `dispatch-event') and discarded.  This
-function is provided as a convenience; it is rougly equivalent to the lisp code
+function is provided as a convenience; it is roughly equivalent to the lisp code
 	(while (progn
 		 (next-event event prompt)
 	         (not (or (key-press-event-p event)
 	                  (button-press-event-p event)
 cause it to return immediately.
 All of these routines install timeouts, so we clear the installed
 timeout as well.
-Note: It's very easy to break the desired behaviours of these
+Note: It's very easy to break the desired behaviors of these
 3 routines.  If you make any changes to anything in this area, run
 the regression tests at the bottom of the file.  -- dmoore */
 static Lisp_Object
 /* If we're in a macro, or noninteractive, or early in temacs, then
 don't wait. */
 if (noninteractive || !NILP (Vexecuting_macro))
 return Qnil;
-/* Recusive call from a filter function or timeout handler. */
+/* Recursive call from a filter function or timeout handler. */
 if (!NILP(recursive_sit_for))
 {
 if (!event_stream_event_pending_p (1) && NILP (nodisplay))
 	{
 	  run_pre_idle_hook ();
 }
 /* Vthis_command_keys having value Qnil means that the next time
 push_this_command_keys is called, it should start over.
 The times at which the command-keys are reset
-(instead of merely being augmented) are pretty conterintuitive.
+(instead of merely being augmented) are pretty counterintuitive.
 (More specifically:
 -- We do not reset this-command-keys when we finish reading a
 command.  This is because some commands (e.g. C-u) act
 like command prefixes; they signal this by setting prefix-arg
 #if 0 /* #### here was an attempted fix that didn't work */
 if (XEVENT (event)->event_type == misc_user_event)
 ;
 else
 #endif
 if (!NILP (con->prefix_arg))
 {
 	/* Commands that set the prefix arg don't update last-command, don't
 	   reset the echoing state, and don't go into keyboard macros unless
 	   followed by another command. */
 	maybe_echo_keys (command_builder, 0);
 }
 void
 vars_of_event_stream (void)
 {
-#ifdef HAVE_X_WINDOWS
-vars_of_event_Xt ();
-#endif
-#if defined(HAVE_TTY) && (defined (DEBUG_TTY_EVENT_STREAM) || !defined (HAVE_X_WINDOWS))
-vars_of_event_tty ();
-#endif
-#ifdef HAVE_MS_WINDOWS
-vars_of_event_mswindows ();
-#endif
 recent_keys_ring_index = 0;
 recent_keys_ring_size = 100;
 Vrecent_keys_ring = Qnil;
 staticpro (&Vrecent_keys_ring);
 }
 void
 complex_vars_of_event_stream (void)
 {
-Vkeyboard_translate_table = Fmake_hashtable (make_int (100), Qnil);
+Vkeyboard_translate_table =
+make_lisp_hash_table (100, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
 DEFVAR_LISP ("menu-accelerator-map", &Vmenu_accelerator_map /*
 Keymap for use when the menubar is active.
 The actions menu-quit, menu-up, menu-down, menu-left, menu-right,
 menu-select and menu-escape can be mapped to keys in this map.
 (tst)^Ja^G    ==>  ((quit) 97) with no signal
 (tst)^J^Ga    ==>  ((quit) 97) with no signal
 (tst)^Jabc^G  ==>  ((quit) 97) with no signal, and "bc" inserted in buffer
 ; with sit-for only do the 2nd test.
-; Do all 3 tests with (accept-proccess-output nil 20)
+; Do all 3 tests with (accept-process-output nil 20)
 Do this:
 (setq enable-recursive-minibuffers t
 minibuffer-max-depth nil)
 ESC ESC ESC ESC	- there are now two minibuffers active

Mercurial > hg > xemacs-beta

comparison src/event-stream.c @ 380:8626e4521993 r21-2-5