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

comparison src/event-stream.c @ 272:c5d627a313b1 r21-0b34

Import from CVS: tag r21-0b34

author	cvs
date	Mon, 13 Aug 2007 10:28:48 +0200
parents	966663fcf606
children	6330739388db

comparison

equal deleted inserted replaced

-:c7b7086b0a39
+:c5d627a313b1
 #include "../lwlib/lwlib.h"
 #else
 #define lw_menu_active	0
 #endif
+#include "blocktype.h"
 #include "buffer.h"
 #include "commands.h"
 #include "device.h"
 #include "elhash.h"
 #include "events.h"
 #endif /* DEFERRED_ACTION_CRAP */
 /* Non-nil disable property on a command means
 do not execute it; call disabled-command-hook's value instead. */
 Lisp_Object Qdisabled, Vdisabled_command_hook;
+EXFUN (Fnext_command_event, 2);
 static void pre_command_hook (void);
 static void post_command_hook (void);
 /* Last keyboard or mouse input event read as a command. */
 #define XSETCOMMAND_BUILDER(x, p) XSETRECORD (x, p, command_builder)
 #define COMMAND_BUILDERP(x) RECORDP (x, command_builder)
 #define GC_COMMAND_BUILDERP(x) GC_RECORDP (x, command_builder)
 #define CHECK_COMMAND_BUILDER(x) CHECK_RECORD (x, command_builder)
-static Lisp_Object mark_command_builder (Lisp_Object obj,
-					  void (*markobj) (Lisp_Object));
-static void finalize_command_builder (void *header, int for_disksave);
-DEFINE_LRECORD_IMPLEMENTATION ("command-builder", command_builder,
-mark_command_builder, internal_object_printer,
-			       finalize_command_builder, 0, 0,
-			       struct command_builder);
 static Lisp_Object
 mark_command_builder (Lisp_Object obj, void (*markobj) (Lisp_Object))
 {
 struct command_builder *builder = XCOMMAND_BUILDER (obj);
 (markobj) (builder->prefix_events);
 xfree (((struct command_builder *) header)->echo_buf);
 ((struct command_builder *) header)->echo_buf = 0;
 }
 }
+DEFINE_LRECORD_IMPLEMENTATION ("command-builder", command_builder,
+mark_command_builder, internal_object_printer,
+			       finalize_command_builder, 0, 0,
+			       struct command_builder);
 static void
 reset_command_builder_event_chain (struct command_builder *builder)
 {
 builder->prefix_events = Qnil;
 builder->current_events = Qnil;
 }
 Lisp_Object
 allocate_command_builder (Lisp_Object console)
 {
-Lisp_Object builder_obj = Qnil;
+Lisp_Object builder_obj;
 struct command_builder *builder =
 alloc_lcrecord_type (struct command_builder, lrecord_command_builder);
 builder->console = console;
 reset_command_builder_event_chain (builder);
 {
 error ("event-stream callbacks not initialized (internal error?)");
 }
 }
-int
+static int
 event_stream_event_pending_p (int user)
 {
-if (!event_stream)
+return event_stream && event_stream->event_pending_p (user);
-return 0;
-return event_stream->event_pending_p (user);
 }
 static int
 maybe_read_quit_event (struct Lisp_Event *event)
 {
 }
 void
 event_stream_next_event (struct Lisp_Event *event)
 {
-Lisp_Object event_obj = Qnil;
+Lisp_Object event_obj;
 check_event_stream_ok (EVENT_STREAM_READ);
 XSETEVENT (event_obj, event);
 zero_event (event);
 new redisplay is fully in place. */
 {
 Lisp_Object frmcons, devcons, concons;
 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
 {
-	MARK_FRAME_WINDOWS_STRUCTURE_CHANGED (XFRAME (XCAR (frmcons)));
+struct frame *f = XFRAME (XCAR (frmcons));
+	MARK_FRAME_WINDOWS_STRUCTURE_CHANGED (f);
 }
 }
 redisplay ();
 if (event_matches_key_specifier_p (XEVENT (event), make_char (' ')))
 }
 return 0;
 }
 DEFUN ("input-pending-p", Finput_pending_p, 0, 0, 0, /*
-T if command input is currently available with no waiting.
+Return t if command input is currently available with no waiting.
 Actually, the value is nil only if we can be sure that no input is available.
 */
 ())
 {
 return detect_input_pending () ? Qt : Qnil;
 void
 event_stream_disable_wakeup (int id, int async_p)
 {
 struct timeout *timeout = 0;
-Lisp_Object rest = Qnil;
+Lisp_Object rest;
 Lisp_Object *timeout_list;
 if (async_p)
 timeout_list = &pending_async_timeout_list;
 else
 static int
 event_stream_wakeup_pending_p (int id, int async_p)
 {
 struct timeout *timeout;
-Lisp_Object rest = Qnil;
+Lisp_Object rest;
 Lisp_Object timeout_list;
 int found = 0;
 if (async_p)
 /**** Lisp-level timeout functions. ****/
 static unsigned long
 lisp_number_to_milliseconds (Lisp_Object secs, int allow_0)
 {
-unsigned long msecs;
 #ifdef LISP_FLOAT_TYPE
 double fsecs;
 CHECK_INT_OR_FLOAT (secs);
 fsecs = XFLOATINT (secs);
 #else
 long fsecs;
-CHECK_INT_OR_FLOAT (secs);
+CHECK_INT (secs);
 fsecs = XINT (secs);
 #endif
-msecs = 1000 * fsecs;
 if (fsecs < 0)
 signal_simple_error ("timeout is negative", secs);
 if (!allow_0 && fsecs == 0)
 signal_simple_error ("timeout is non-positive", secs);
 if (fsecs >= (((unsigned int) 0xFFFFFFFF) / 1000))
 signal_simple_error
 ("timeout would exceed 32 bits when represented in milliseconds", secs);
-return msecs;
+return (unsigned long) (1000 * fsecs);
 }
 DEFUN ("add-timeout", Fadd_timeout, 3, 4, 0, /*
 Add a timeout, to be signaled after the timeout period has elapsed.
 SECS is a number of seconds, expressed as an integer or a float.
 /* Add an event to the back of the command-event queue: it will be the next
 event read after all pending events.   This only works on keyboard,
 mouse-click, misc-user, and eval events.
 */
-void
+static void
 enqueue_command_event (Lisp_Object event)
 {
 enqueue_event (event, &command_event_queue, &command_event_queue_tail);
 }
-Lisp_Object
+static Lisp_Object
 dequeue_command_event (void)
 {
 return dequeue_event (&command_event_queue, &command_event_queue_tail);
 }
 else
 	focus_frame = DEVICE_FRAME_WITH_FOCUS_REAL (d);
 /* Mark the minibuffer as changed to make sure it gets updated
 properly if the echo area is active. */
-MARK_WINDOWS_CHANGED (XWINDOW (FRAME_MINIBUF_WINDOW (XFRAME (frame))));
+{
+struct window *w = XWINDOW (FRAME_MINIBUF_WINDOW (XFRAME (frame)));
+	MARK_WINDOWS_CHANGED (w);
+}
 if (FRAMEP (focus_frame) && !EQ (frame, focus_frame))
 	{
 	  /* Oops, we missed a focus-out event. */
 	  DEVICE_FRAME_WITH_FOCUS_REAL (d) = Qnil;
 LWLIB_ID id;
 widget_value *val;
 if (NILP (f->menubar_data))
 error ("Frame has no menubar.");
 id = XPOPUP_DATA (f->menubar_data)->id;
 val = lw_get_all_values (id);
 val = val->contents;
 lw_set_menu (FRAME_X_MENUBAR_WIDGET (f), val);
 lw_map_menu (CurrentTime);
 you should *bind* this, not set it.
 */ );
 Vretry_undefined_key_binding_unshifted = Qt;
 #ifdef HAVE_XIM
-DEFVAR_LISP ("Vcomposed_character_default_binding",
+DEFVAR_LISP ("composed-character-default-binding",
-&Vretry_undefined_key_binding_unshifted /*
+&Vcomposed_character_default_binding /*
 The default keybinding to use for key events from composed input.
 Window systems frequently have ways to allow the user to compose
 single characters in a language using multiple keystrokes.
 XEmacs sees these as single character keypress events.
 */ );

Mercurial > hg > xemacs-beta

comparison src/event-stream.c @ 272:c5d627a313b1 r21-0b34