comparison src/events.c @ 5143:186aebf7f6c6

merge
author Ben Wing <ben@xemacs.org>
date Sat, 13 Mar 2010 11:38:54 -0600
parents e5380fdaf8f1 f965e31a35f0
children 88bd4f3ef8e4
comparison
equal deleted inserted replaced
5140:e5380fdaf8f1 5143:186aebf7f6c6
60 60
61 /************************************************************************/ 61 /************************************************************************/
62 /* definition of event object */ 62 /* definition of event object */
63 /************************************************************************/ 63 /************************************************************************/
64 64
65 /* #### Ad-hoc hack. Should be part of define_lrecord_implementation */ 65 /* #### Ad-hoc hack. Should be part of DEFINE_*_GENERAL_LISP_OBJECT. */
66 void 66 void
67 clear_event_resource (void) 67 clear_event_resource (void)
68 { 68 {
69 Vevent_resource = Qnil; 69 Vevent_resource = Qnil;
70 } 70 }
89 89
90 /* Set everything to zero or nil so that it's predictable. */ 90 /* Set everything to zero or nil so that it's predictable. */
91 void 91 void
92 zero_event (Lisp_Event *e) 92 zero_event (Lisp_Event *e)
93 { 93 {
94 /* Preserve the old UID for this event, for tracking it */ 94 zero_nonsized_lisp_object (wrap_event (e));
95 unsigned int old_uid = e->lheader.uid;
96
97 xzero (*e);
98 set_lheader_implementation (&e->lheader, &lrecord_event);
99 e->lheader.uid = old_uid;
100 set_event_type (e, empty_event); 95 set_event_type (e, empty_event);
101 SET_EVENT_CHANNEL (e, Qnil); 96 SET_EVENT_CHANNEL (e, Qnil);
102 SET_EVENT_NEXT (e, Qnil); 97 SET_EVENT_NEXT (e, Qnil);
103 } 98 }
104 99
311 static void 306 static void
312 print_event (Lisp_Object obj, Lisp_Object printcharfun, 307 print_event (Lisp_Object obj, Lisp_Object printcharfun,
313 int UNUSED (escapeflag)) 308 int UNUSED (escapeflag))
314 { 309 {
315 if (print_readably) 310 if (print_readably)
316 printing_unreadable_object ("#<event>"); 311 printing_unreadable_object_fmt ("#<event>");
317 312
318 switch (XEVENT (obj)->event_type) 313 switch (XEVENT (obj)->event_type)
319 { 314 {
320 case key_press_event: 315 case key_press_event:
321 print_event_1 ("#<keypress-event ", obj, printcharfun); 316 print_event_1 ("#<keypress-event ", obj, printcharfun);