comparison src/glyphs.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 4a27df428c73
children e22b0213b713
comparison
equal deleted inserted replaced
933:f6bc42928b34 934:c925bacdda60
1227 (XDEVICE (image_instance_device (obj)), 1227 (XDEVICE (image_instance_device (obj)),
1228 image_instance_hash, (i, depth), 1228 image_instance_hash, (i, depth),
1229 0)); 1229 0));
1230 } 1230 }
1231 1231
1232 #ifdef USE_KKCC
1233 DEFINE_LRECORD_IMPLEMENTATION ("image-instance", image_instance,
1234 0, /*dumpable-flag*/
1235 mark_image_instance, print_image_instance,
1236 finalize_image_instance, image_instance_equal,
1237 image_instance_hash, 0,
1238 Lisp_Image_Instance);
1239 #else /* not USE_KKCC */
1232 DEFINE_LRECORD_IMPLEMENTATION ("image-instance", image_instance, 1240 DEFINE_LRECORD_IMPLEMENTATION ("image-instance", image_instance,
1233 mark_image_instance, print_image_instance, 1241 mark_image_instance, print_image_instance,
1234 finalize_image_instance, image_instance_equal, 1242 finalize_image_instance, image_instance_equal,
1235 image_instance_hash, 0, 1243 image_instance_hash, 0,
1236 Lisp_Image_Instance); 1244 Lisp_Image_Instance);
1245 #endif /* not USE_KKCC */
1237 1246
1238 static Lisp_Object 1247 static Lisp_Object
1239 allocate_image_instance (Lisp_Object governing_domain, Lisp_Object parent, 1248 allocate_image_instance (Lisp_Object governing_domain, Lisp_Object parent,
1240 Lisp_Object instantiator) 1249 Lisp_Object instantiator)
1241 { 1250 {
3681 { XD_LISP_OBJECT, offsetof (Lisp_Glyph, face) }, 3690 { XD_LISP_OBJECT, offsetof (Lisp_Glyph, face) },
3682 { XD_LISP_OBJECT, offsetof (Lisp_Glyph, plist) }, 3691 { XD_LISP_OBJECT, offsetof (Lisp_Glyph, plist) },
3683 { XD_END } 3692 { XD_END }
3684 }; 3693 };
3685 3694
3695 #ifdef USE_KKCC
3696 DEFINE_LRECORD_IMPLEMENTATION_WITH_PROPS ("glyph", glyph,
3697 1, /*dumpable-flag*/
3698 mark_glyph, print_glyph, 0,
3699 glyph_equal, glyph_hash, glyph_description,
3700 glyph_getprop, glyph_putprop,
3701 glyph_remprop, glyph_plist,
3702 Lisp_Glyph);
3703 #else /* not USE_KKCC */
3686 DEFINE_LRECORD_IMPLEMENTATION_WITH_PROPS ("glyph", glyph, 3704 DEFINE_LRECORD_IMPLEMENTATION_WITH_PROPS ("glyph", glyph,
3687 mark_glyph, print_glyph, 0, 3705 mark_glyph, print_glyph, 0,
3688 glyph_equal, glyph_hash, glyph_description, 3706 glyph_equal, glyph_hash, glyph_description,
3689 glyph_getprop, glyph_putprop, 3707 glyph_getprop, glyph_putprop,
3690 glyph_remprop, glyph_plist, 3708 glyph_remprop, glyph_plist,
3691 Lisp_Glyph); 3709 Lisp_Glyph);
3710 #endif /* not USE_KKCC */
3692 3711
3693 Lisp_Object 3712 Lisp_Object
3694 allocate_glyph (enum glyph_type type, 3713 allocate_glyph (enum glyph_type type,
3695 void (*after_change) (Lisp_Object glyph, Lisp_Object property, 3714 void (*after_change) (Lisp_Object glyph, Lisp_Object property,
3696 Lisp_Object locale)) 3715 Lisp_Object locale))
4668 4687
4669 /* make sure we don't get expose events */ 4688 /* make sure we don't get expose events */
4670 register_ignored_expose (f, IMAGE_INSTANCE_DISPLAY_X (ii), 4689 register_ignored_expose (f, IMAGE_INSTANCE_DISPLAY_X (ii),
4671 IMAGE_INSTANCE_DISPLAY_Y (ii), 4690 IMAGE_INSTANCE_DISPLAY_Y (ii),
4672 IMAGE_INSTANCE_DISPLAY_WIDTH (ii), 4691 IMAGE_INSTANCE_DISPLAY_WIDTH (ii),
4673 IMAGE_INSTANCE_DISPLAY_HEIGHT (ii)); 4692 IMAGE_INSTANCE_DISPLAY_HEIGHT (ii));
4674 IMAGE_INSTANCE_SUBWINDOW_DISPLAYEDP (ii) = 0; 4693 IMAGE_INSTANCE_SUBWINDOW_DISPLAYEDP (ii) = 0;
4675 4694
4676 MAYBE_DEVMETH (XDEVICE (IMAGE_INSTANCE_DEVICE (ii)), 4695 MAYBE_DEVMETH (XDEVICE (IMAGE_INSTANCE_DEVICE (ii)),
4677 unmap_subwindow, (ii)); 4696 unmap_subwindow, (ii));
4678 } 4697 }
4942 && 4961 &&
4943 !disable_animated_pixmaps) 4962 !disable_animated_pixmaps)
4944 { 4963 {
4945 /* Increment the index of the image slice we are currently 4964 /* Increment the index of the image slice we are currently
4946 viewing. */ 4965 viewing. */
4947 IMAGE_INSTANCE_PIXMAP_SLICE (ii) = 4966 IMAGE_INSTANCE_PIXMAP_SLICE (ii) =
4948 (IMAGE_INSTANCE_PIXMAP_SLICE (ii) + 1) 4967 (IMAGE_INSTANCE_PIXMAP_SLICE (ii) + 1)
4949 % IMAGE_INSTANCE_PIXMAP_MAXSLICE (ii); 4968 % IMAGE_INSTANCE_PIXMAP_MAXSLICE (ii);
4950 /* We might need to kick redisplay at this point - but we 4969 /* We might need to kick redisplay at this point - but we
4951 also might not. */ 4970 also might not. */
4952 MARK_DEVICE_FRAMES_GLYPHS_CHANGED 4971 MARK_DEVICE_FRAMES_GLYPHS_CHANGED