Mercurial > hg > xemacs-beta
changeset 943:345b7d75cab4
[xemacs-hg @ 2002-08-01 08:28:18 by michaels]
2002-08-01 Mike Sperber <mike@xemacs.org>
* event-stream.c:
* event-Xt.c:
* events.h:
* events.c:
* alloc.c: Fix various kkcc-related nits that show up in MULE and
union-type builds.
| author | michaels |
|---|---|
| date | Thu, 01 Aug 2002 08:28:38 +0000 |
| parents | d90decf21e71 |
| children | d7603d225813 |
| files | src/ChangeLog src/alloc.c src/event-Xt.c src/event-stream.c src/events.c src/events.h |
| diffstat | 6 files changed, 29 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Jul 31 20:26:41 2002 +0000 +++ b/src/ChangeLog Thu Aug 01 08:28:38 2002 +0000 @@ -1,3 +1,12 @@ +2002-08-01 Mike Sperber <mike@xemacs.org> + + * event-stream.c: + * event-Xt.c: + * events.h: + * events.c: + * alloc.c: Fix various kkcc-related nits that show up in MULE and + union-type builds. + 2002-07-31 David Bush <David.Bush@intel.com> * events.c (event_equal): Correct comparison in MS Windows
--- a/src/alloc.c Wed Jul 31 20:26:41 2002 +0000 +++ b/src/alloc.c Thu Aug 01 08:28:38 2002 +0000 @@ -2910,9 +2910,9 @@ case XD_LISP_OBJECT: { const Lisp_Object *stored_obj = (const Lisp_Object *)rdata; - if (!(*stored_obj)){ + + if (EQ (*stored_obj, Qnull_pointer)) break; - } if (desc[pos+1].type == XD_END) { @@ -2938,10 +2938,9 @@ for (i = 0; i < count; i++) { const Lisp_Object *stored_obj = ((const Lisp_Object *)rdata) + i; - if (!(*stored_obj)) - { - break; - } + + if (EQ (*stored_obj, Qnull_pointer)) + break; mark_object (*stored_obj); }
--- a/src/event-Xt.c Wed Jul 31 20:26:41 2002 +0000 +++ b/src/event-Xt.c Thu Aug 01 08:28:38 2002 +0000 @@ -1072,8 +1072,13 @@ ev->channel = DEVICE_CONSOLE (d); 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)); +#else ev->event.key.modifiers = 0; ev->event.key.keysym = make_char (ch); +#endif enqueue_Xt_dispatch_event (emacs_event); } Lstream_close (istr);
--- a/src/event-stream.c Wed Jul 31 20:26:41 2002 +0000 +++ b/src/event-stream.c Thu Aug 01 08:28:38 2002 +0000 @@ -3631,7 +3631,7 @@ { #ifdef USE_KKCC Lisp_Object keysym = - XKEY_DATA_KEYSYM(XEVENT (builder->most_current_event)); + XKEY_DATA_KEYSYM(XEVENT_DATA (builder->most_current_event)); #else /* not USE_KKCC */ Lisp_Object keysym = XEVENT (builder->most_current_event)->event.key.keysym;
--- a/src/events.c Wed Jul 31 20:26:41 2002 +0000 +++ b/src/events.c Thu Aug 01 08:28:38 2002 +0000 @@ -311,14 +311,13 @@ print_motion_data (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { char buf[64]; - Lisp_Object Vx, Vy; if (print_readably) printing_unreadable_object ("#<motion_data>"); - Vx = XMOTION_DATA_X (obj); - Vy = XMOTION_DATA_Y (obj); - sprintf (buf, "#<motion-data %ld, %ld>", (long) XINT (Vx), (long) XINT (Vy)); + sprintf (buf, "#<motion-data %ld, %ld>", + (long) XMOTION_DATA_X (obj), + (long) XMOTION_DATA_Y (obj)); write_c_string (printcharfun, buf); } @@ -329,7 +328,7 @@ if (print_readably) printing_unreadable_object ("#<process_data>"); - write_c_string (print_readably, "#<process-data "); + write_c_string (printcharfun, "#<process-data "); print_internal (XPROCESS_DATA_PROCESS (obj), printcharfun, 1); write_c_string (printcharfun, ">"); } @@ -1545,7 +1544,7 @@ XSET_MISC_USER_DATA_FUNCTION (data, Qnil); XSET_MISC_USER_DATA_OBJECT (data, Qnil); - XSET_MISC_USER_DATA_BUTTON (data, Qnil); + XSET_MISC_USER_DATA_BUTTON (data, 0); XSET_MISC_USER_DATA_MODIFIERS (data, 0); XSET_MISC_USER_DATA_X (data, 0); XSET_MISC_USER_DATA_Y (data, 0);
--- a/src/events.h Wed Jul 31 20:26:41 2002 +0000 +++ b/src/events.h Thu Aug 01 08:28:38 2002 +0000 @@ -816,22 +816,17 @@ #define XEVENT_TYPE(a) (XEVENT (a)->event_type) #define EVENT_NEXT(a) ((a)->next) #define XEVENT_NEXT(e) (XEVENT (e)->next) -#ifdef USE_KKCC -#else /* not USE_KKCC */ -#define XSET_EVENT_NEXT(e, n) do { (XEVENT (e)->next = (n)); } while (0) -#endif /* not USE_KKCC */ #ifdef USE_KKCC #define XEVENT_DATA(ev) (XEVENT (ev)->event_data) #define EVENT_DATA(ev) ((ev)->event_data) #define XEVENT_CHANNEL(ev) (XEVENT (ev)->channel) -#define EVENT_CHANNEL(ev) ((ev)->channel) #define EVENT_TIMESTAMP(ev) \ ((ev)->timestamp) #define XEVENT_TIMESTAMP(ev) EVENT_TIMESTAMP (XEVENT (ev)) #define SET_EVENT_TIMESTAMP_ZERO(ev) \ - ((ev)->timestamp = Qzero) + ((ev)->timestamp = 0) #define SET_EVENT_TIMESTAMP(ev, t) \ (ev)->timestamp = (t) #define XSET_EVENT_TIMESTAMP(ev, t) SET_EVENT_TIMESTAMP (XEVENT (ev), t) @@ -901,8 +896,9 @@ } while (0) #define XSET_EVENT_NEXT(ev, n) SET_EVENT_NEXT (XEVENT (ev), n) -#endif /* USE_KKCC */ - +#else /* NOT USE_KKCC */ +#define XSET_EVENT_NEXT(e, n) do { (XEVENT (e)->next = (n)); } while (0) +#endif #define EVENT_CHAIN_LOOP(event, chain) \ for (event = chain; !NILP (event); event = XEVENT_NEXT (event))