Mercurial > hg > xemacs-beta
diff src/event-Xt.c @ 960:5b372a329b97
[xemacs-hg @ 2002-08-12 08:00:01 by michaels]
2002-08-02 Marcus Crestani <crestani@informatik.uni-tuebingen.de>
Additions for USE_KKCC:
* tooltalk.c: Add dumpable-flag to tooltalk_message and
tooltalk_pattern.
* ui-gtk.c: Add dumpable-flag to emacs_ffi and emacs_gtk_object.
Add description for emacs_gtk_boxed.
2002-08-12 Mike Sperber <mike@xemacs.org>
* event-Xt.c (x_to_emacs_keysym):
(enqueue_focus_event): Properly initialize event type for USE_KKCC
(due to suggestions from David Bush <David.Bush@intel.com>).
| author | michaels |
|---|---|
| date | Mon, 12 Aug 2002 08:00:07 +0000 |
| parents | 345b7d75cab4 |
| children | 8401dcd2d43a |
line wrap: on
line diff
--- a/src/event-Xt.c Mon Aug 12 07:45:38 2002 +0000 +++ b/src/event-Xt.c Mon Aug 12 08:00:07 2002 +0000 @@ -1070,11 +1070,12 @@ Lisp_Object emacs_event = Fmake_event (Qnil, Qnil); Lisp_Event *ev = XEVENT (emacs_event); ev->channel = DEVICE_CONSOLE (d); + ev->timestamp = event->time; ev->event_type = key_press_event; - ev->timestamp = event->time; #ifdef USE_KKCC - SET_KEY_DATA_MODIFIERS (XKEY_DATA (emacs_event), 0); - SET_KEY_DATA_KEYSYM (XKEY_DATA (emacs_event), make_char (ch)); + XSET_EVENT_TYPE (emacs_event, key_press_event); + XSET_KEY_DATA_MODIFIERS (XEVENT_DATA (emacs_event), 0); + XSET_KEY_DATA_KEYSYM (XEVENT_DATA (emacs_event), make_char (ch)); #else ev->event.key.modifiers = 0; ev->event.key.keysym = make_char (ch); @@ -1684,21 +1685,24 @@ { Lisp_Object emacs_event = Fmake_event (Qnil, Qnil); Lisp_Event *ev = XEVENT (emacs_event); + XEvent *x_event; + + ev->event_type = magic_event; + #ifdef USE_KKCC - XEvent *x_event = &XMAGIC_DATA_X_EVENT(EVENT_DATA(ev)); + XSET_EVENT_TYPE (emacs_event, magic_event); + x_event = &XMAGIC_DATA_X_EVENT (EVENT_DATA (ev)); #else /* not USE_KKCC */ - XEvent *x_event = &ev->event.magic.underlying_x_event; + x_event = &ev->event.magic.underlying_x_event; #endif /* not USE_KKCC */ x_event->type = in_p ? FocusIn : FocusOut; x_event->xfocus.window = XtWindow (wants_it); #ifdef USE_KKCC - SET_EVENT_CHANNEL(ev, frame); - /* SET_EVENT_TYPE(ev, magic_event); */ + SET_EVENT_CHANNEL (ev, frame); #else /* not USE_KKCC */ - ev->channel = frame; - ev->event_type = magic_event; + ev->channel = frame; #endif /* not USE_KKCC */ enqueue_Xt_dispatch_event (emacs_event);