comparison src/event-Xt.c @ 189:489f57a838ef r20-3b21

Import from CVS: tag r20-3b21
author cvs
date Mon, 13 Aug 2007 09:57:07 +0200
parents b405438285a2
children acd284d43ca1
comparison
equal deleted inserted replaced
188:e29a8e7498d9 189:489f57a838ef
847 istr = XLSTREAM (instream); 847 istr = XLSTREAM (instream);
848 848
849 GCPRO2 (instream, fb_instream); 849 GCPRO2 (instream, fb_instream);
850 while ((ch = Lstream_get_emchar (istr)) != EOF) 850 while ((ch = Lstream_get_emchar (istr)) != EOF)
851 { 851 {
852 Lisp_Object emacs_event = Fmake_event (); 852 Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
853 struct Lisp_Event *ev = XEVENT (emacs_event); 853 struct Lisp_Event *ev = XEVENT (emacs_event);
854 ev->channel = DEVICE_CONSOLE (d); 854 ev->channel = DEVICE_CONSOLE (d);
855 ev->event_type = key_press_event; 855 ev->event_type = key_press_event;
856 ev->timestamp = event->time; 856 ev->timestamp = event->time;
857 ev->event.key.modifiers = 0; 857 ev->event.key.modifiers = 0;
2147 2147
2148 void 2148 void
2149 signal_special_Xt_user_event (Lisp_Object channel, Lisp_Object function, 2149 signal_special_Xt_user_event (Lisp_Object channel, Lisp_Object function,
2150 Lisp_Object object) 2150 Lisp_Object object)
2151 { 2151 {
2152 Lisp_Object event = Fmake_event (); 2152 Lisp_Object event = Fmake_event (Qnil, Qnil);
2153 2153
2154 XEVENT (event)->event_type = misc_user_event; 2154 XEVENT (event)->event_type = misc_user_event;
2155 XEVENT (event)->channel = channel; 2155 XEVENT (event)->channel = channel;
2156 XEVENT (event)->event.eval.function = function; 2156 XEVENT (event)->event.eval.function = function;
2157 XEVENT (event)->event.eval.object = object; 2157 XEVENT (event)->event.eval.object = object;
2240 emacs_Xt_event_handler (Widget wid /* unused */, 2240 emacs_Xt_event_handler (Widget wid /* unused */,
2241 XtPointer closure /* unused */, 2241 XtPointer closure /* unused */,
2242 XEvent *event, 2242 XEvent *event,
2243 Boolean *continue_to_dispatch /* unused */) 2243 Boolean *continue_to_dispatch /* unused */)
2244 { 2244 {
2245 Lisp_Object emacs_event = Fmake_event (); 2245 Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
2246 2246
2247 #ifdef DEBUG_XEMACS 2247 #ifdef DEBUG_XEMACS
2248 if (x_debug_events > 0) 2248 if (x_debug_events > 0)
2249 { 2249 {
2250 describe_event (event); 2250 describe_event (event);
2357 Emchar the_char; 2357 Emchar the_char;
2358 2358
2359 if (!poll_fds_for_input (temp_mask)) 2359 if (!poll_fds_for_input (temp_mask))
2360 return; 2360 return;
2361 2361
2362 event = Fmake_event (); 2362 event = Fmake_event (Qnil, Qnil);
2363 if (!read_event_from_tty_or_stream_desc (XEVENT (event), con, infd)) 2363 if (!read_event_from_tty_or_stream_desc (XEVENT (event), con, infd))
2364 /* EOF, or something ... */ 2364 /* EOF, or something ... */
2365 return; 2365 return;
2366 /* #### bogus. quit-char should be allowed to be any sort 2366 /* #### bogus. quit-char should be allowed to be any sort
2367 of event. */ 2367 of event. */