comparison src/glyphs.h @ 406:b8cc9ab3f761 r21-2-33

Import from CVS: tag r21-2-33
author cvs
date Mon, 13 Aug 2007 11:17:09 +0200
parents 2f8bb876ab1d
children 501cfd01ee6d
comparison
equal deleted inserted replaced
405:0e08f63c74d2 406:b8cc9ab3f761
548 Lisp_Object width; /* dynamic width spec. */ 548 Lisp_Object width; /* dynamic width spec. */
549 Lisp_Object height; /* dynamic height spec. */ 549 Lisp_Object height; /* dynamic height spec. */
550 /* Change flags to augment dirty. */ 550 /* Change flags to augment dirty. */
551 unsigned int face_changed : 1; 551 unsigned int face_changed : 1;
552 unsigned int items_changed : 1; 552 unsigned int items_changed : 1;
553 unsigned int percent_changed : 1;
554 } subwindow; 553 } subwindow;
555 } u; 554 } u;
556 555
557 /* console-type- and image-type-specific data */ 556 /* console-type- and image-type-specific data */
558 void *data; 557 void *data;
564 563
565 #define LAYOUT_JUSTIFY_LEFT 0 564 #define LAYOUT_JUSTIFY_LEFT 0
566 #define LAYOUT_JUSTIFY_RIGHT 1 565 #define LAYOUT_JUSTIFY_RIGHT 1
567 #define LAYOUT_JUSTIFY_CENTER 2 566 #define LAYOUT_JUSTIFY_CENTER 2
568 567
569 #define IMAGE_INSTANCE_HASH_DEPTH -2 568 #define IMAGE_INSTANCE_HASH_DEPTH 0
570 569
571 /* Accessor macros. */ 570 /* Accessor macros. */
572 #define IMAGE_INSTANCE_DEVICE(i) ((i)->device) 571 #define IMAGE_INSTANCE_DEVICE(i) ((i)->device)
573 #define IMAGE_INSTANCE_NAME(i) ((i)->name) 572 #define IMAGE_INSTANCE_NAME(i) ((i)->name)
574 #define IMAGE_INSTANCE_PARENT(i) ((i)->parent) 573 #define IMAGE_INSTANCE_PARENT(i) ((i)->parent)
594 #define IMAGE_INSTANCE_SIZE_CHANGED(i) ((i)->size_changed) 593 #define IMAGE_INSTANCE_SIZE_CHANGED(i) ((i)->size_changed)
595 #define IMAGE_INSTANCE_WIDGET_FACE_CHANGED(i) \ 594 #define IMAGE_INSTANCE_WIDGET_FACE_CHANGED(i) \
596 ((i)->u.subwindow.face_changed) 595 ((i)->u.subwindow.face_changed)
597 #define IMAGE_INSTANCE_WIDGET_ITEMS_CHANGED(i) \ 596 #define IMAGE_INSTANCE_WIDGET_ITEMS_CHANGED(i) \
598 ((i)->u.subwindow.items_changed) 597 ((i)->u.subwindow.items_changed)
599 #define IMAGE_INSTANCE_WIDGET_PERCENT_CHANGED(i) \
600 ((i)->u.subwindow.percent_changed)
601 #define IMAGE_INSTANCE_LAYOUT_CHANGED(i) ((i)->layout_changed) 598 #define IMAGE_INSTANCE_LAYOUT_CHANGED(i) ((i)->layout_changed)
602 #define IMAGE_INSTANCE_OPTIMIZE_OUTPUT(i) ((i)->optimize_output) 599 #define IMAGE_INSTANCE_OPTIMIZE_OUTPUT(i) ((i)->optimize_output)
603 600
604 /* Text properties */ 601 /* Text properties */
605 #define IMAGE_INSTANCE_TEXT_STRING(i) ((i)->u.text.string) 602 #define IMAGE_INSTANCE_TEXT_STRING(i) ((i)->u.text.string)
883 extern Lisp_Object Qxbm, Qedit_field, Qgroup, Qlabel, Qcombo_box, Qscrollbar; 880 extern Lisp_Object Qxbm, Qedit_field, Qgroup, Qlabel, Qcombo_box, Qscrollbar;
884 extern Lisp_Object Qtree_view, Qtab_control, Qprogress_gauge, Q_border; 881 extern Lisp_Object Qtree_view, Qtab_control, Qprogress_gauge, Q_border;
885 extern Lisp_Object Q_mask_file, Q_mask_data, Q_hotspot_x, Q_hotspot_y; 882 extern Lisp_Object Q_mask_file, Q_mask_data, Q_hotspot_x, Q_hotspot_y;
886 extern Lisp_Object Q_foreground, Q_background, Q_face, Q_descriptor, Q_group; 883 extern Lisp_Object Q_foreground, Q_background, Q_face, Q_descriptor, Q_group;
887 extern Lisp_Object Q_width, Q_height, Q_pixel_width, Q_pixel_height, Q_text; 884 extern Lisp_Object Q_width, Q_height, Q_pixel_width, Q_pixel_height, Q_text;
888 extern Lisp_Object Q_items, Q_properties, Q_image, Q_percent, Qimage_conversion_error; 885 extern Lisp_Object Q_items, Q_properties, Q_image, Qimage_conversion_error;
889 extern Lisp_Object Q_orientation, Qupdate_widget_instances; 886 extern Lisp_Object Q_orientation, Qupdate_widget_instances;
887 extern Lisp_Object Qwidget_callback_current_channel;
890 extern Lisp_Object Vcontinuation_glyph, Vcontrol_arrow_glyph, Vhscroll_glyph; 888 extern Lisp_Object Vcontinuation_glyph, Vcontrol_arrow_glyph, Vhscroll_glyph;
891 extern Lisp_Object Vinvisible_text_glyph, Voctal_escape_glyph, Vtruncation_glyph; 889 extern Lisp_Object Vinvisible_text_glyph, Voctal_escape_glyph, Vtruncation_glyph;
892 extern Lisp_Object Vxemacs_logo; 890 extern Lisp_Object Vxemacs_logo;
891
893 892
894 unsigned short glyph_width (Lisp_Object glyph, Lisp_Object domain); 893 unsigned short glyph_width (Lisp_Object glyph, Lisp_Object domain);
895 unsigned short glyph_ascent (Lisp_Object glyph, Lisp_Object domain); 894 unsigned short glyph_ascent (Lisp_Object glyph, Lisp_Object domain);
896 unsigned short glyph_descent (Lisp_Object glyph, Lisp_Object domain); 895 unsigned short glyph_descent (Lisp_Object glyph, Lisp_Object domain);
897 unsigned short glyph_height (Lisp_Object glyph, Lisp_Object domain); 896 unsigned short glyph_height (Lisp_Object glyph, Lisp_Object domain);
1011 struct display_glyph_area *dga); 1010 struct display_glyph_area *dga);
1012 int find_matching_subwindow (struct frame* f, int x, int y, int width, int height); 1011 int find_matching_subwindow (struct frame* f, int x, int y, int width, int height);
1013 void update_widget (Lisp_Object widget); 1012 void update_widget (Lisp_Object widget);
1014 void update_subwindow (Lisp_Object subwindow); 1013 void update_subwindow (Lisp_Object subwindow);
1015 Lisp_Object image_instance_parent_glyph (struct Lisp_Image_Instance*); 1014 Lisp_Object image_instance_parent_glyph (struct Lisp_Image_Instance*);
1015 int image_instance_changed (Lisp_Object image);
1016 1016
1017 struct expose_ignore 1017 struct expose_ignore
1018 { 1018 {
1019 unsigned int x, y; 1019 unsigned int x, y;
1020 unsigned int width, height; 1020 unsigned int width, height;