Mercurial > hg > xemacs-beta
comparison src/events.c @ 5125:b5df3737028a ben-lisp-object
merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 24 Feb 2010 01:58:04 -0600 |
parents | 623d57b7fbe8 e813cf16c015 |
children | 2a462149bd6a |
comparison
equal
deleted
inserted
replaced
5124:623d57b7fbe8 | 5125:b5df3737028a |
---|---|
309 mark_object (event->channel); | 309 mark_object (event->channel); |
310 return event->next; | 310 return event->next; |
311 } | 311 } |
312 | 312 |
313 static void | 313 static void |
314 print_event_1 (const char *str, Lisp_Object obj, Lisp_Object printcharfun) | 314 print_event_1 (const Ascbyte *str, Lisp_Object obj, Lisp_Object printcharfun) |
315 { | 315 { |
316 DECLARE_EISTRING_MALLOC (ei); | 316 DECLARE_EISTRING_MALLOC (ei); |
317 write_c_string (printcharfun, str); | 317 write_ascstring (printcharfun, str); |
318 format_event_object (ei, obj, 0); | 318 format_event_object (ei, obj, 0); |
319 write_eistring (printcharfun, ei); | 319 write_eistring (printcharfun, ei); |
320 eifree (ei); | 320 eifree (ei); |
321 } | 321 } |
322 | 322 |
360 case timeout_event: | 360 case timeout_event: |
361 write_fmt_string_lisp (printcharfun, "#<timeout-event %S", 1, | 361 write_fmt_string_lisp (printcharfun, "#<timeout-event %S", 1, |
362 XEVENT_TIMEOUT_OBJECT (obj)); | 362 XEVENT_TIMEOUT_OBJECT (obj)); |
363 break; | 363 break; |
364 case empty_event: | 364 case empty_event: |
365 write_c_string (printcharfun, "#<empty-event"); | 365 write_ascstring (printcharfun, "#<empty-event"); |
366 break; | 366 break; |
367 case misc_user_event: | 367 case misc_user_event: |
368 write_fmt_string_lisp (printcharfun, "#<misc-user-event (%S", 1, | 368 write_fmt_string_lisp (printcharfun, "#<misc-user-event (%S", 1, |
369 XEVENT_MISC_USER_FUNCTION (obj)); | 369 XEVENT_MISC_USER_FUNCTION (obj)); |
370 write_fmt_string_lisp (printcharfun, " %S)", 1, | 370 write_fmt_string_lisp (printcharfun, " %S)", 1, |
375 XEVENT_EVAL_FUNCTION (obj)); | 375 XEVENT_EVAL_FUNCTION (obj)); |
376 write_fmt_string_lisp (printcharfun, " %S)", 1, | 376 write_fmt_string_lisp (printcharfun, " %S)", 1, |
377 XEVENT_EVAL_OBJECT (obj)); | 377 XEVENT_EVAL_OBJECT (obj)); |
378 break; | 378 break; |
379 case dead_event: | 379 case dead_event: |
380 write_c_string (printcharfun, "#<DEALLOCATED-EVENT"); | 380 write_ascstring (printcharfun, "#<DEALLOCATED-EVENT"); |
381 break; | 381 break; |
382 default: | 382 default: |
383 write_c_string (printcharfun, "#<UNKNOWN-EVENT-TYPE"); | 383 write_ascstring (printcharfun, "#<UNKNOWN-EVENT-TYPE"); |
384 break; | 384 break; |
385 } | 385 } |
386 write_c_string (printcharfun, ">"); | 386 write_ascstring (printcharfun, ">"); |
387 } | 387 } |
388 | 388 |
389 static int | 389 static int |
390 event_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth)) | 390 event_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth), |
391 int UNUSED (foldcase)) | |
391 { | 392 { |
392 Lisp_Event *e1 = XEVENT (obj1); | 393 Lisp_Event *e1 = XEVENT (obj1); |
393 Lisp_Event *e2 = XEVENT (obj2); | 394 Lisp_Event *e2 = XEVENT (obj2); |
394 | 395 |
395 if (e1->event_type != e2->event_type) return 0; | 396 if (e1->event_type != e2->event_type) return 0; |