comparison src/gpmevent.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 890f3cafe600
children e22b0213b713
comparison
equal deleted inserted replaced
933:f6bc42928b34 934:c925bacdda60
156 156
157 switch (GPM_BARE_EVENTS (ev.type)) 157 switch (GPM_BARE_EVENTS (ev.type))
158 { 158 {
159 case GPM_DOWN: 159 case GPM_DOWN:
160 case GPM_UP: 160 case GPM_UP:
161 #ifdef USE_KKCC
162 SET_EVENT_TYPE (event,
163 (ev.type & GPM_DOWN) ? button_press_event : button_release_event);
164 XSET_BUTTON_DATA_X (EVENT_DATA (event), ev.x);
165 XSET_BUTTON_DATA_Y (EVENT_DATA (event), ev.y);
166 XSET_BUTTON_DATA_BUTTON (EVENT_DATA (event), button);
167 XSET_BUTTON_DATA_MODIFIERS (EVENT_DATA (event), modifiers);
168 #else /* not USE_KKCC */
161 event->event_type = 169 event->event_type =
162 (ev.type & GPM_DOWN) ? button_press_event : button_release_event; 170 (ev.type & GPM_DOWN) ? button_press_event : button_release_event;
163 event->event.button.x = ev.x; 171 event->event.button.x = ev.x;
164 event->event.button.y = ev.y; 172 event->event.button.y = ev.y;
165 event->event.button.button = button; 173 event->event.button.button = button;
166 event->event.button.modifiers = modifiers; 174 event->event.button.modifiers = modifiers;
175 #endif /* not USE_KKCC */
167 break; 176 break;
168 case GPM_MOVE: 177 case GPM_MOVE:
169 case GPM_DRAG: 178 case GPM_DRAG:
179 #ifdef USE_KKCC
180 SET_EVENT_TYPE (event, pointer_motion_event);
181 XSET_MOTION_DATA_X (EVENT_DATA (event), ev.x);
182 XSET_MOTION_DATA_Y (EVENT_DATA (event), ev.y);
183 XSET_MOTION_DATA_MODIFIERS (EVENT_DATA (event), modifiers);
184 #else /* not USE_KKCC */
170 event->event_type = pointer_motion_event; 185 event->event_type = pointer_motion_event;
171 event->event.motion.x = ev.x; 186 event->event.motion.x = ev.x;
172 event->event.motion.y = ev.y; 187 event->event.motion.y = ev.y;
173 event->event.motion.modifiers = modifiers; 188 event->event.motion.modifiers = modifiers;
189 #endif /* not USE_KKCC */
174 default: 190 default:
175 /* This will never happen */ 191 /* This will never happen */
176 break; 192 break;
177 } 193 }
178 194
433 ** with it as you wish, but maybe that is just me). 449 ** with it as you wish, but maybe that is just me).
434 ** 450 **
435 ** William M. Perry - Nov 9, 1999 451 ** William M. Perry - Nov 9, 1999
436 */ 452 */
437 453
454 #ifdef USE_KKCC
455 Gpm_DrawPointer (XMOTION_DATA_X (EVENT_DATA (event)),XMOTION_DATA_Y (EVENT_DATA (event)), fd);
456 #else /* not USE_KKCC */
438 Gpm_DrawPointer (event->event.motion.x,event->event.motion.y, fd); 457 Gpm_DrawPointer (event->event.motion.x,event->event.motion.y, fd);
458 #endif /* not USE_KKCC */
439 } 459 }
440 460
441 return; 461 return;
442 } 462 }
443 463