comparison src/frame.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 37bdd24225ef
comparison
equal deleted inserted replaced
933:f6bc42928b34 934:c925bacdda60
164 FRAME_TYPE_NAME (frm)); 164 FRAME_TYPE_NAME (frm));
165 print_internal (frm->name, printcharfun, 1); 165 print_internal (frm->name, printcharfun, 1);
166 write_fmt_string (printcharfun, " 0x%x>", frm->header.uid); 166 write_fmt_string (printcharfun, " 0x%x>", frm->header.uid);
167 } 167 }
168 168
169 #ifdef USE_KKCC
170 DEFINE_LRECORD_IMPLEMENTATION ("frame", frame,
171 0, /*dumpable-flag*/
172 mark_frame, print_frame, 0, 0, 0, 0,
173 struct frame);
174 #else /* not USE_KKCC */
169 DEFINE_LRECORD_IMPLEMENTATION ("frame", frame, 175 DEFINE_LRECORD_IMPLEMENTATION ("frame", frame,
170 mark_frame, print_frame, 0, 0, 0, 0, 176 mark_frame, print_frame, 0, 0, 0, 0,
171 struct frame); 177 struct frame);
178 #endif /* not USE_KKCC */
172 179
173 static void 180 static void
174 nuke_all_frame_slots (struct frame *f) 181 nuke_all_frame_slots (struct frame *f)
175 { 182 {
176 zero_lcrecord (f); 183 zero_lcrecord (f);
1894 int intx, inty; 1901 int intx, inty;
1895 1902
1896 if (mouse_pixel_position_1 (d, &frame, &intx, &inty)) 1903 if (mouse_pixel_position_1 (d, &frame, &intx, &inty))
1897 { 1904 {
1898 Lisp_Object event = Fmake_event (Qnil, Qnil); 1905 Lisp_Object event = Fmake_event (Qnil, Qnil);
1906 #ifdef USE_KKCC
1907 XSET_EVENT_TYPE (event, pointer_motion_event);
1908 XSET_EVENT_CHANNEL (event, frame);
1909 XSET_MOTION_DATA_X (XEVENT_DATA (event), intx);
1910 XSET_MOTION_DATA_Y (XEVENT_DATA (event), inty);
1911 #else /* not USE_KKCC */
1899 XEVENT (event)->event_type = pointer_motion_event; 1912 XEVENT (event)->event_type = pointer_motion_event;
1900 XEVENT (event)->channel = frame; 1913 XEVENT (event)->channel = frame;
1901 XEVENT (event)->event.motion.x = intx; 1914 XEVENT (event)->event.motion.x = intx;
1902 XEVENT (event)->event.motion.y = inty; 1915 XEVENT (event)->event.motion.y = inty;
1916 #endif /* not USE_KKCC */
1903 return event; 1917 return event;
1904 } 1918 }
1905 else 1919 else
1906 return Qnil; 1920 return Qnil;
1907 } 1921 }