comparison src/event-tty.c @ 934:c925bacdda60

[xemacs-hg @ 2002-07-29 09:21:12 by michaels] 2002-07-17 Marcus Crestani <crestani@informatik.uni-tuebingen.de> Markus Kaltenbach <makalten@informatik.uni-tuebingen.de> Mike Sperber <mike@xemacs.org> configure flag to turn these changes on: --use-kkcc First we added a dumpable flag to lrecord_implementation. It shows, if the object is dumpable and should be processed by the dumper. * lrecord.h (struct lrecord_implementation): added dumpable flag (MAKE_LRECORD_IMPLEMENTATION): fitted the different makro definitions to the new lrecord_implementation and their calls. Then we changed mark_object, that it no longer needs a mark method for those types that have pdump descritions. * alloc.c: (mark_object): If the object has a description, the new mark algorithm is called, and the object is marked according to its description. Otherwise it uses the mark method like before. These procedures mark objects according to their descriptions. They are modeled on the corresponding pdumper procedures. (mark_with_description): (get_indirect_count): (structure_size): (mark_struct_contents): These procedures still call mark_object, this is needed while there are Lisp_Objects without descriptions left. We added pdump descriptions for many Lisp_Objects: * extents.c: extent_auxiliary_description * database.c: database_description * gui.c: gui_item_description * scrollbar.c: scrollbar_instance_description * toolbar.c: toolbar_button_description * event-stream.c: command_builder_description * mule-charset.c: charset_description * device-msw.c: devmode_description * dialog-msw.c: mswindows_dialog_id_description * eldap.c: ldap_description * postgresql.c: pgconn_description pgresult_description * tooltalk.c: tooltalk_message_description tooltalk_pattern_description * ui-gtk.c: emacs_ffi_description emacs_gtk_object_description * events.c: * events.h: * event-stream.c: * event-Xt.c: * event-gtk.c: * event-tty.c: To write a pdump description for Lisp_Event, we converted every struct in the union event to a Lisp_Object. So we created nine new Lisp_Objects: Lisp_Key_Data, Lisp_Button_Data, Lisp_Motion_Data, Lisp_Process_Data, Lisp_Timeout_Data, Lisp_Eval_Data, Lisp_Misc_User_Data, Lisp_Magic_Data, Lisp_Magic_Eval_Data. We also wrote makro selectors and mutators for the fields of the new designed Lisp_Event and added everywhere these new abstractions. We implemented XD_UNION support in (mark_with_description), so we can describe exspecially console/device specific data with XD_UNION. To describe with XD_UNION, we added a field to these objects, which holds the variant type of the object. This field is initialized in the appendant constructor. The variant is an integer, it has also to be described in an description, if XD_UNION is used. XD_UNION is used in following descriptions: * console.c: console_description (get_console_variant): returns the variant (create_console): added variant initialization * console.h (console_variant): the different console types * console-impl.h (struct console): added enum console_variant contype * device.c: device_description (Fmake_device): added variant initialization * device-impl.h (struct device): added enum console_variant devtype * objects.c: image_instance_description font_instance_description (Fmake_color_instance): added variant initialization (Fmake_font_instance): added variant initialization * objects-impl.h (struct Lisp_Color_Instance): added color_instance_type * objects-impl.h (struct Lisp_Font_Instance): added font_instance_type * process.c: process_description (make_process_internal): added variant initialization * process.h (process_variant): the different process types
author michaels
date Mon, 29 Jul 2002 09:21:25 +0000
parents 79c6ff3eef26
children e22b0213b713
comparison
equal deleted inserted replaced
933:f6bc42928b34 934:c925bacdda60
64 } 64 }
65 65
66 static void 66 static void
67 tty_timeout_to_emacs_event (Lisp_Event *emacs_event) 67 tty_timeout_to_emacs_event (Lisp_Event *emacs_event)
68 { 68 {
69 /* timeout events have nil as channel */
70 #ifdef USE_KKCC
71 SET_EVENT_TYPE (emacs_event, timeout_event);
72 SET_EVENT_TIMESTAMP_ZERO (emacs_event); /* #### */
73 XSET_TIMEOUT_DATA_INTERVAL_ID (EVENT_DATA (emacs_event), pop_low_level_timeout (&tty_timer_queue, 0));
74 XSET_TIMEOUT_DATA_FUNCTION (EVENT_DATA (emacs_event), Qnil);
75 XSET_TIMEOUT_DATA_OBJECT (EVENT_DATA (emacs_event), Qnil);
76 #else /* not USE_KKCC */
69 emacs_event->event_type = timeout_event; 77 emacs_event->event_type = timeout_event;
70 /* timeout events have nil as channel */
71 emacs_event->timestamp = 0; /* #### */ 78 emacs_event->timestamp = 0; /* #### */
72 emacs_event->event.timeout.interval_id = 79 emacs_event->event.timeout.interval_id =
73 pop_low_level_timeout (&tty_timer_queue, 0); 80 pop_low_level_timeout (&tty_timer_queue, 0);
74 emacs_event->event.timeout.function = Qnil; 81 emacs_event->event.timeout.function = Qnil;
75 emacs_event->event.timeout.object = Qnil; 82 emacs_event->event.timeout.object = Qnil;
83 #endif /* not USE_KKCC */
76 } 84 }
77 85
78 86
79 87
80 static int 88 static int
158 Lisp_Object process; 166 Lisp_Object process;
159 Lisp_Process *p = get_process_from_usid (FD_TO_USID(i)); 167 Lisp_Process *p = get_process_from_usid (FD_TO_USID(i));
160 168
161 assert (p); 169 assert (p);
162 process = wrap_process (p); 170 process = wrap_process (p);
171 #ifdef USE_KKCC
172 set_event_type (emacs_event, process_event);
173 /* process events have nil as channel */
174 SET_EVENT_TIMESTAMP_ZERO (emacs_event); /* #### */
175 XSET_PROCESS_DATA_PROCESS (EVENT_DATA (emacs_event), process);
176 #else /* not USE_KKCC */
163 emacs_event->event_type = process_event; 177 emacs_event->event_type = process_event;
164 /* process events have nil as channel */ 178 /* process events have nil as channel */
165 emacs_event->timestamp = 0; /* #### */ 179 emacs_event->timestamp = 0; /* #### */
166 emacs_event->event.process.process = process; 180 emacs_event->event.process.process = process;
181 #endif /* not USE_KKCC */
167 return; 182 return;
168 } 183 }
169 } 184 }
170 185
171 /* We might get here when a fake event came through a signal. */ 186 /* We might get here when a fake event came through a signal. */
172 /* Return a dummy event, so that a cycle of the command loop will 187 /* Return a dummy event, so that a cycle of the command loop will
173 occur. */ 188 occur. */
174 drain_signal_event_pipe (); 189 drain_signal_event_pipe ();
190 #ifdef USE_KKCC
191 set_event_type (emacs_event, eval_event);
192 /* eval events have nil as channel */
193 XSET_EVAL_DATA_FUNCTION (EVENT_DATA (emacs_event), Qidentity);
194 XSET_EVAL_DATA_OBJECT (EVENT_DATA (emacs_event), Qnil);
195 #else /* not USE_KKCC */
175 emacs_event->event_type = eval_event; 196 emacs_event->event_type = eval_event;
176 /* eval events have nil as channel */ 197 /* eval events have nil as channel */
177 emacs_event->event.eval.function = Qidentity; 198 emacs_event->event.eval.function = Qidentity;
178 emacs_event->event.eval.object = Qnil; 199 emacs_event->event.eval.object = Qnil;
200 #endif /* not USE_KKCC */
179 return; 201 return;
180 } 202 }
181 else if (ndesc == 0) /* timeout fired */ 203 else if (ndesc == 0) /* timeout fired */
182 { 204 {
183 tty_timeout_to_emacs_event (emacs_event); 205 tty_timeout_to_emacs_event (emacs_event);