Mercurial > hg > xemacs-beta

comparison src/gui-x.c @ 934:c925bacdda60

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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
93 lw_map_widget_values (data->id, mark_widget_value_mapper, 0); 93 lw_map_widget_values (data->id, mark_widget_value_mapper, 0);
94 94
95 return data->last_menubar_buffer; 95 return data->last_menubar_buffer;
96 } 96 }
97 97
98 #ifdef USE_KKCC
99 DEFINE_LRECORD_IMPLEMENTATION ("popup-data", popup_data,
100 0, /*dumpable-flag*/
101 mark_popup_data, internal_object_printer,
102 0, 0, 0, 0, struct popup_data);
103 #else /* not USE_KKCC */
98 DEFINE_LRECORD_IMPLEMENTATION ("popup-data", popup_data, 104 DEFINE_LRECORD_IMPLEMENTATION ("popup-data", popup_data,
99 mark_popup_data, internal_object_printer, 105 mark_popup_data, internal_object_printer,
100 0, 0, 0, 0, struct popup_data); 106 0, 0, 0, 0, struct popup_data);
107 #endif /* not USE_KKCC */
101 108
102 /* This is like FRAME_MENUBAR_DATA (f), but contains an alist of 109 /* This is like FRAME_MENUBAR_DATA (f), but contains an alist of
103 (id . popup-data) for GCPRO'ing the callbacks of the popup menus 110 (id . popup-data) for GCPRO'ing the callbacks of the popup menus
104 and dialog boxes. */ 111 and dialog boxes. */
105 static Lisp_Object Vpopup_callbacks; 112 static Lisp_Object Vpopup_callbacks;
248 255
249 if (((EMACS_INT) client_data) == -1) 256 if (((EMACS_INT) client_data) == -1)
250 { 257 {
251 event = Fmake_event (Qnil, Qnil); 258 event = Fmake_event (Qnil, Qnil);
252 259
260 #ifdef USE_KKCC
261 XSET_EVENT_TYPE (event, misc_user_event);
262 XSET_EVENT_CHANNEL (event, frame);
263 XSET_MISC_USER_DATA_FUNCTION (XEVENT_DATA (event), Qrun_hooks);
264 XSET_MISC_USER_DATA_OBJECT (XEVENT_DATA (event), Qmenu_no_selection_hook);
265 #else /* not USE_KKCC */
253 XEVENT (event)->event_type = misc_user_event; 266 XEVENT (event)->event_type = misc_user_event;
254 XEVENT (event)->channel = frame; 267 XEVENT (event)->channel = frame;
255 XEVENT (event)->event.eval.function = Qrun_hooks; 268 XEVENT (event)->event.eval.function = Qrun_hooks;
256 XEVENT (event)->event.eval.object = Qmenu_no_selection_hook; 269 XEVENT (event)->event.eval.object = Qmenu_no_selection_hook;
270 #endif /* not USE_KKCC */
257 } 271 }
258 else 272 else
259 { 273 {
260 image_instance = XCAR (data); 274 image_instance = XCAR (data);
261 callback = XCAR (XCDR (data)); 275 callback = XCAR (XCDR (data));
269 283
270 if (!NILP (callback_ex) && !UNBOUNDP (callback_ex)) 284 if (!NILP (callback_ex) && !UNBOUNDP (callback_ex))
271 { 285 {
272 event = Fmake_event (Qnil, Qnil); 286 event = Fmake_event (Qnil, Qnil);
273 287
288 #ifdef USE_KKCC
289 XSET_EVENT_TYPE (event, misc_user_event);
290 XSET_EVENT_CHANNEL (event, frame);
291 XSET_MISC_USER_DATA_FUNCTION (XEVENT_DATA (event), Qeval);
292 XSET_MISC_USER_DATA_OBJECT (XEVENT_DATA (event), list4 (Qfuncall, callback_ex, image_instance, event));
293 #else /* not USE_KKCC */
274 XEVENT (event)->event_type = misc_user_event; 294 XEVENT (event)->event_type = misc_user_event;
275 XEVENT (event)->channel = frame; 295 XEVENT (event)->channel = frame;
276 XEVENT (event)->event.eval.function = Qeval; 296 XEVENT (event)->event.eval.function = Qeval;
277 XEVENT (event)->event.eval.object = 297 XEVENT (event)->event.eval.object =
278 list4 (Qfuncall, callback_ex, image_instance, event); 298 list4 (Qfuncall, callback_ex, image_instance, event);
299 #endif /* not USE_KKCC */
279 } 300 }
280 else if (NILP (callback) || UNBOUNDP (callback)) 301 else if (NILP (callback) || UNBOUNDP (callback))
281 event = Qnil; 302 event = Qnil;
282 else 303 else
283 { 304 {
284 Lisp_Object fn, arg; 305 Lisp_Object fn, arg;
285 306
286 event = Fmake_event (Qnil, Qnil); 307 event = Fmake_event (Qnil, Qnil);
287 308
288 get_gui_callback (callback, &fn, &arg); 309 get_gui_callback (callback, &fn, &arg);
310 #ifdef USE_KKCC
311 XSET_EVENT_TYPE (event, misc_user_event);
312 XSET_EVENT_CHANNEL (event, frame);
313 XSET_MISC_USER_DATA_FUNCTION (XEVENT_DATA (event), fn);
314 XSET_MISC_USER_DATA_OBJECT (XEVENT_DATA (event), arg);
315 #else /* not USE_KKCC */
289 XEVENT (event)->event_type = misc_user_event; 316 XEVENT (event)->event_type = misc_user_event;
290 XEVENT (event)->channel = frame; 317 XEVENT (event)->channel = frame;
291 XEVENT (event)->event.eval.function = fn; 318 XEVENT (event)->event.eval.function = fn;
292 XEVENT (event)->event.eval.object = arg; 319 XEVENT (event)->event.eval.object = arg;
320 #endif /* not USE_KKCC */
293 } 321 }
294 } 322 }
295 323
296 /* This is the timestamp used for asserting focus so we need to get an 324 /* This is the timestamp used for asserting focus so we need to get an
297 up-to-date value event if no events have been dispatched to emacs 325 up-to-date value event if no events have been dispatched to emacs