comparison src/glyphs.h @ 647:b39c14581166

[xemacs-hg @ 2001-08-13 04:45:47 by ben] removal of unsigned, size_t, etc.
author ben
date Mon, 13 Aug 2001 04:46:48 +0000
parents 4b7d425dd3c2
children fdefd0186b75
comparison
equal deleted inserted replaced
646:00c54252fe4f 647:b39c14581166
298 298
299 #define DEFINE_DEVICE_IIFORMAT(type, format) \ 299 #define DEFINE_DEVICE_IIFORMAT(type, format) \
300 DECLARE_IMAGE_INSTANTIATOR_FORMAT(format); \ 300 DECLARE_IMAGE_INSTANTIATOR_FORMAT(format); \
301 struct image_instantiator_methods *type##_##format##_image_instantiator_methods 301 struct image_instantiator_methods *type##_##format##_image_instantiator_methods
302 302
303 #define INITIALIZE_DEVICE_IIFORMAT(type, format) \ 303 #define INITIALIZE_DEVICE_IIFORMAT(type, format) \
304 do { \ 304 do { \
305 type##_##format##_image_instantiator_methods = \ 305 type##_##format##_image_instantiator_methods = \
306 xnew_and_zero (struct image_instantiator_methods); \ 306 xnew_and_zero (struct image_instantiator_methods); \
307 type##_##format##_image_instantiator_methods->symbol = Q##format; \ 307 type##_##format##_image_instantiator_methods->symbol = Q##format; \
308 type##_##format##_image_instantiator_methods->device = Q##type; \ 308 type##_##format##_image_instantiator_methods->device = Q##type; \
309 type##_##format##_image_instantiator_methods->keywords = \ 309 type##_##format##_image_instantiator_methods->keywords = \
310 Dynarr_new (ii_keyword_entry); \ 310 Dynarr_new (ii_keyword_entry); \
311 add_entry_to_device_ii_format_list \ 311 add_entry_to_device_ii_format_list \
312 (Q##type, Q##format, type##_##format##_image_instantiator_methods); \ 312 (Q##type, Q##format, type##_##format##_image_instantiator_methods); \
313 IIFORMAT_VALID_CONSOLE(type,format); \ 313 IIFORMAT_VALID_CONSOLE(type,format); \
314 dump_add_root_struct_ptr (&type##_##format##_image_instantiator_methods, \ 314 dump_add_root_struct_ptr (&type##_##format##_image_instantiator_methods, \
315 &iim_description); \ 315 &iim_description); \
316 } while (0) 316 } while (0)
317 317
318 /* Declare that image-instantiator format FORMAT has method M; used in 318 /* Declare that image-instantiator format FORMAT has method M; used in
319 initialization routines */ 319 initialization routines */
320 #define IIFORMAT_HAS_DEVMETHOD(type, format, m) \ 320 #define IIFORMAT_HAS_DEVMETHOD(type, format, m) \
546 reference. */ 546 reference. */
547 Lisp_Object parent; 547 Lisp_Object parent;
548 /* The instantiator from which we were instantiated. */ 548 /* The instantiator from which we were instantiated. */
549 Lisp_Object instantiator; 549 Lisp_Object instantiator;
550 enum image_instance_type type; 550 enum image_instance_type type;
551 unsigned int x_offset, y_offset; /* for layout purposes */ 551 int x_offset, y_offset; /* for layout purposes */
552 int width, height, margin_width; 552 int width, height, margin_width;
553 unsigned long display_hash; /* Hash value representing the structure 553 Hash_Code display_hash; /* Hash value representing the structure
554 of the image_instance when it was 554 of the image_instance when it was
555 last displayed. */ 555 last displayed. */
556 unsigned int dirty : 1; 556 unsigned int dirty : 1;
557 unsigned int size_changed : 1; 557 unsigned int size_changed : 1;
558 unsigned int text_changed : 1; 558 unsigned int text_changed : 1;
559 unsigned int layout_changed : 1; 559 unsigned int layout_changed : 1;
560 unsigned int optimize_output : 1; /* For outputting layouts. */ 560 unsigned int optimize_output : 1; /* For outputting layouts. */
563 563
564 union 564 union
565 { 565 {
566 struct 566 struct
567 { 567 {
568 unsigned int descent; 568 int descent;
569 Lisp_Object string; 569 Lisp_Object string;
570 } text; 570 } text;
571 struct 571 struct
572 { 572 {
573 unsigned int depth; 573 int depth;
574 unsigned int slice, maxslice, timeout; 574 int slice, maxslice, timeout;
575 Lisp_Object hotspot_x, hotspot_y; /* integer or Qnil */ 575 Lisp_Object hotspot_x, hotspot_y; /* integer or Qnil */
576 Lisp_Object filename; /* string or Qnil */ 576 Lisp_Object filename; /* string or Qnil */
577 Lisp_Object mask_filename; /* string or Qnil */ 577 Lisp_Object mask_filename; /* string or Qnil */
578 Lisp_Object fg, bg; /* foreground and background colors, 578 Lisp_Object fg, bg; /* foreground and background colors,
579 if this is a colorized mono-pixmap 579 if this is a colorized mono-pixmap
586 { 586 {
587 void* subwindow; /* specific devices can use this as necessary */ 587 void* subwindow; /* specific devices can use this as necessary */
588 struct 588 struct
589 { /* We need these so we can do without 589 { /* We need these so we can do without
590 subwindow_cachel */ 590 subwindow_cachel */
591 unsigned int x, y; 591 int x, y;
592 unsigned int width, height; 592 int width, height;
593 } display_data; 593 } display_data;
594 unsigned int being_displayed : 1; /* used to detect when needs 594 unsigned int being_displayed : 1; /* used to detect when needs
595 to be unmapped */ 595 to be unmapped */
596 unsigned int v_resize : 1; /* Whether the vsize is allowed to change. */ 596 unsigned int v_resize : 1; /* Whether the vsize is allowed to change. */
597 unsigned int h_resize : 1; /* Whether the hsize is allowed to change. */ 597 unsigned int h_resize : 1; /* Whether the hsize is allowed to change. */
892 Lisp_Object pixmap_to_lisp_data (Lisp_Object name, int ok_if_data_invalid); 892 Lisp_Object pixmap_to_lisp_data (Lisp_Object name, int ok_if_data_invalid);
893 #endif /* HAVE_XPM */ 893 #endif /* HAVE_XPM */
894 #ifdef HAVE_WINDOW_SYSTEM 894 #ifdef HAVE_WINDOW_SYSTEM
895 Lisp_Object bitmap_to_lisp_data (Lisp_Object name, int *xhot, int *yhot, 895 Lisp_Object bitmap_to_lisp_data (Lisp_Object name, int *xhot, int *yhot,
896 int ok_if_data_invalid); 896 int ok_if_data_invalid);
897 int read_bitmap_data_from_file (const char *filename, unsigned int *width, 897 int read_bitmap_data_from_file (const char *filename, int *width,
898 unsigned int *height, unsigned char **datap, 898 int *height, unsigned char **datap,
899 int *x_hot, int *y_hot); 899 int *x_hot, int *y_hot);
900 Lisp_Object xbm_mask_file_munging (Lisp_Object alist, Lisp_Object file, 900 Lisp_Object xbm_mask_file_munging (Lisp_Object alist, Lisp_Object file,
901 Lisp_Object mask_file, 901 Lisp_Object mask_file,
902 Lisp_Object console_type); 902 Lisp_Object console_type);
903 #endif 903 #endif
1135 ****************************************************************************/ 1135 ****************************************************************************/
1136 1136
1137 void unmap_subwindow (Lisp_Object subwindow); 1137 void unmap_subwindow (Lisp_Object subwindow);
1138 void map_subwindow (Lisp_Object subwindow, int x, int y, 1138 void map_subwindow (Lisp_Object subwindow, int x, int y,
1139 struct display_glyph_area *dga); 1139 struct display_glyph_area *dga);
1140 int find_matching_subwindow (struct frame* f, 1140 int find_matching_subwindow (struct frame* f, int x, int y, int width,
1141 unsigned int x, unsigned int y, 1141 int height);
1142 unsigned int width, unsigned int height);
1143 void redisplay_widget (Lisp_Object widget); 1142 void redisplay_widget (Lisp_Object widget);
1144 void update_widget_instances (Lisp_Object frame); 1143 void update_widget_instances (Lisp_Object frame);
1145 void redisplay_subwindow (Lisp_Object subwindow); 1144 void redisplay_subwindow (Lisp_Object subwindow);
1146 Lisp_Object image_instance_parent_glyph (struct Lisp_Image_Instance*); 1145 Lisp_Object image_instance_parent_glyph (struct Lisp_Image_Instance*);
1147 int image_instance_changed (Lisp_Object image); 1146 int image_instance_changed (Lisp_Object image);
1150 int unmap_subwindow_instance_cache_mapper (Lisp_Object key, 1149 int unmap_subwindow_instance_cache_mapper (Lisp_Object key,
1151 Lisp_Object value, void* finalize); 1150 Lisp_Object value, void* finalize);
1152 1151
1153 struct expose_ignore 1152 struct expose_ignore
1154 { 1153 {
1155 unsigned int x, y; 1154 int x, y;
1156 unsigned int width, height; 1155 int width, height;
1157 struct expose_ignore *next; 1156 struct expose_ignore *next;
1158 }; 1157 };
1159 1158
1160 int check_for_ignored_expose (struct frame* f, unsigned int x, 1159 int check_for_ignored_expose (struct frame* f, int x, int y, int width,
1161 unsigned int y, unsigned int width, 1160 int height);
1162 unsigned int height);
1163 extern int hold_ignored_expose_registration; 1161 extern int hold_ignored_expose_registration;
1164 1162
1165 #endif /* INCLUDED_glyphs_h_ */ 1163 #endif /* INCLUDED_glyphs_h_ */