Mercurial > hg > xemacs-beta
comparison src/glyphs.h @ 863:42375619fa45
[xemacs-hg @ 2002-06-04 06:03:59 by andyp]
merge 21.4 windows changes, minimally tested
author | andyp |
---|---|
date | Tue, 04 Jun 2002 06:05:53 +0000 |
parents | 6728e641994e |
children | 804517e16990 |
comparison
equal
deleted
inserted
replaced
862:278c743f1578 | 863:42375619fa45 |
---|---|
95 }; | 95 }; |
96 | 96 |
97 #define IMAGE_UNSPECIFIED_GEOMETRY -1 | 97 #define IMAGE_UNSPECIFIED_GEOMETRY -1 |
98 #define IMAGE_UNCHANGED_GEOMETRY -2 | 98 #define IMAGE_UNCHANGED_GEOMETRY -2 |
99 | 99 |
100 #define WIDGET_BORDER_HEIGHT 4 | 100 #define DEFAULT_WIDGET_BORDER_WIDTH 2 |
101 #define WIDGET_BORDER_WIDTH 4 | 101 #define DEFAULT_WIDGET_SPACING 3 |
102 #define DEFAULT_WIDGET_SHADOW_WIDTH 2 | |
102 | 103 |
103 enum governing_domain | 104 enum governing_domain |
104 { | 105 { |
105 GOVERNING_DOMAIN_WINDOW, | 106 GOVERNING_DOMAIN_WINDOW, |
106 GOVERNING_DOMAIN_FRAME, | 107 GOVERNING_DOMAIN_FRAME, |
596 unsigned int being_displayed : 1; /* used to detect when needs | 597 unsigned int being_displayed : 1; /* used to detect when needs |
597 to be unmapped */ | 598 to be unmapped */ |
598 unsigned int v_resize : 1; /* Whether the vsize is allowed to change. */ | 599 unsigned int v_resize : 1; /* Whether the vsize is allowed to change. */ |
599 unsigned int h_resize : 1; /* Whether the hsize is allowed to change. */ | 600 unsigned int h_resize : 1; /* Whether the hsize is allowed to change. */ |
600 unsigned int orientation : 1; /* Vertical or horizontal. */ | 601 unsigned int orientation : 1; /* Vertical or horizontal. */ |
601 unsigned int justification : 2; /* Left, right or center. */ | 602 unsigned int h_justification : 2; /* left, right or center. */ |
603 unsigned int v_justification : 2; /* top, bottom or center. */ | |
602 /* Face for colors and font. We specify this here because we | 604 /* Face for colors and font. We specify this here because we |
603 want people to be able to put :face in the instantiator | 605 want people to be able to put :face in the instantiator |
604 spec. Using glyph-face is more inconvenient, although more | 606 spec. Using glyph-face is more inconvenient, although more |
605 general. */ | 607 general. */ |
606 Lisp_Object face; | 608 Lisp_Object face; |
625 /* Layout bit-fields. */ | 627 /* Layout bit-fields. */ |
626 #define LAYOUT_HORIZONTAL 0 | 628 #define LAYOUT_HORIZONTAL 0 |
627 #define LAYOUT_VERTICAL 1 | 629 #define LAYOUT_VERTICAL 1 |
628 | 630 |
629 #define LAYOUT_JUSTIFY_LEFT 0 | 631 #define LAYOUT_JUSTIFY_LEFT 0 |
632 #define LAYOUT_JUSTIFY_TOP 0 | |
630 #define LAYOUT_JUSTIFY_RIGHT 1 | 633 #define LAYOUT_JUSTIFY_RIGHT 1 |
634 #define LAYOUT_JUSTIFY_BOTTOM 1 | |
631 #define LAYOUT_JUSTIFY_CENTER 2 | 635 #define LAYOUT_JUSTIFY_CENTER 2 |
632 | 636 |
633 #define IMAGE_INSTANCE_HASH_DEPTH 0 | 637 #define IMAGE_INSTANCE_HASH_DEPTH 0 |
634 | 638 |
635 /* Accessor macros. */ | 639 /* Accessor macros. */ |
717 ((i)->u.subwindow.v_resize) | 721 ((i)->u.subwindow.v_resize) |
718 #define IMAGE_INSTANCE_SUBWINDOW_H_RESIZEP(i) \ | 722 #define IMAGE_INSTANCE_SUBWINDOW_H_RESIZEP(i) \ |
719 ((i)->u.subwindow.h_resize) | 723 ((i)->u.subwindow.h_resize) |
720 #define IMAGE_INSTANCE_SUBWINDOW_ORIENT(i) \ | 724 #define IMAGE_INSTANCE_SUBWINDOW_ORIENT(i) \ |
721 ((i)->u.subwindow.orientation) | 725 ((i)->u.subwindow.orientation) |
722 #define IMAGE_INSTANCE_SUBWINDOW_JUSTIFY(i) \ | 726 #define IMAGE_INSTANCE_SUBWINDOW_H_JUSTIFY(i) \ |
723 ((i)->u.subwindow.justification) | 727 ((i)->u.subwindow.h_justification) |
728 #define IMAGE_INSTANCE_SUBWINDOW_V_JUSTIFY(i) \ | |
729 ((i)->u.subwindow.v_justification) | |
730 #define IMAGE_INSTANCE_SUBWINDOW_RIGHT_JUSTIFIED(i) \ | |
731 (IMAGE_INSTANCE_SUBWINDOW_H_JUSTIFY(i) == LAYOUT_JUSTIFY_RIGHT) | |
732 #define IMAGE_INSTANCE_SUBWINDOW_LEFT_JUSTIFIED(i) \ | |
733 (IMAGE_INSTANCE_SUBWINDOW_H_JUSTIFY(i) == LAYOUT_JUSTIFY_LEFT) | |
734 #define IMAGE_INSTANCE_SUBWINDOW_TOP_JUSTIFIED(i) \ | |
735 (IMAGE_INSTANCE_SUBWINDOW_V_JUSTIFY(i) == LAYOUT_JUSTIFY_TOP) | |
736 #define IMAGE_INSTANCE_SUBWINDOW_BOTTOM_JUSTIFIED(i) \ | |
737 (IMAGE_INSTANCE_SUBWINDOW_V_JUSTIFY(i) == LAYOUT_JUSTIFY_BOTTOM) | |
738 #define IMAGE_INSTANCE_SUBWINDOW_H_CENTERED(i) \ | |
739 (IMAGE_INSTANCE_SUBWINDOW_H_JUSTIFY(i) == LAYOUT_JUSTIFY_CENTER) | |
740 #define IMAGE_INSTANCE_SUBWINDOW_V_CENTERED(i) \ | |
741 (IMAGE_INSTANCE_SUBWINDOW_V_JUSTIFY(i) == LAYOUT_JUSTIFY_CENTER) | |
742 #define IMAGE_INSTANCE_SUBWINDOW_LOGICAL_LAYOUT(i) \ | |
743 (IMAGE_INSTANCE_SUBWINDOW_ORIENT (i) \ | |
744 == LAYOUT_VERTICAL && !IMAGE_INSTANCE_SUBWINDOW_V_CENTERED (i)) | |
745 | |
724 #define IMAGE_INSTANCE_SUBWINDOW_FACE(i) \ | 746 #define IMAGE_INSTANCE_SUBWINDOW_FACE(i) \ |
725 ((i)->u.subwindow.face) | 747 ((i)->u.subwindow.face) |
726 | 748 |
727 /* Widget properties */ | 749 /* Widget properties */ |
728 #define IMAGE_INSTANCE_WIDGET_WIDTH(i) \ | 750 #define IMAGE_INSTANCE_WIDGET_WIDTH(i) \ |
1159 | 1181 |
1160 int check_for_ignored_expose (struct frame* f, int x, int y, int width, | 1182 int check_for_ignored_expose (struct frame* f, int x, int y, int width, |
1161 int height); | 1183 int height); |
1162 extern int hold_ignored_expose_registration; | 1184 extern int hold_ignored_expose_registration; |
1163 | 1185 |
1186 #define ROUND_UP(arg, unit) (((int)((arg) + (unit) - 1) / (int)(unit)) * (int)(unit)) | |
1187 | |
1164 #endif /* INCLUDED_glyphs_h_ */ | 1188 #endif /* INCLUDED_glyphs_h_ */ |