1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
|
diff -r -U3 fvwm/doc/commands/MenuStyle.xml fvwm/doc/commands/MenuStyle.xml
--- fvwm/doc/commands/MenuStyle.xml 2008-04-18 23:24:45.000000000 +0200
+++ fvwm/doc/commands/MenuStyle.xml 2008-04-18 23:25:57.000000000 +0200
@@ -58,7 +58,7 @@
PopupOffset,
TitleWarp / !TitleWarp,
TitleUnderlines0 / TitleUnderlines1 / TitleUnderlines2,
-SeparatorsLong / SeparatorsShort,
+SeparatorsLong / SeparatorsShort / FlatSeparators,
TrianglesSolid / TrianglesRelief,
PopupImmediately / PopupDelayed,
PopdownImmediately / PopdownDelayed,
@@ -432,6 +432,11 @@
few pixels to the edges of the menu.</para>
<para>
+<fvwmopt cmd="MenuStyle" opt="FlatSeparators"/>
+changes the separators so that they are a single pixel thick and
+colored the same as the text.</para>
+
+<para>
<fvwmopt cmd="MenuStyle" opt="TrianglesSolid"/> and
<fvwmopt cmd="MenuStyle" opt="TrianglesRelief"/>
affect how the small triangles for sub menus is drawn. Solid
diff -r -U3 fvwm/fvwm/menuitem.c fvwm/fvwm/menuitem.c
--- fvwm/fvwm/menuitem.c 2008-04-18 23:24:45.000000000 +0200
+++ fvwm/fvwm/menuitem.c 2008-04-18 23:27:04.000000000 +0200
@@ -82,10 +82,14 @@
*
*/
static void draw_separator(
- Window w, GC TopGC, GC BottomGC, int x1, int y, int x2)
+ Window w, GC TopGC, GC BottomGC, GC ForeGC, int x1, int y, int x2,
+ Bool do_flat_separators)
{
XDrawLine(dpy, w, TopGC , x1, y, x2, y);
- XDrawLine(dpy, w, BottomGC, x1-1, y+1, x2+1, y+1);
+ if (!do_flat_separators)
+ {
+ XDrawLine(dpy, w, BottomGC, x1-1, y+1, x2+1, y+1);
+ }
return;
}
@@ -381,6 +385,7 @@
/*Pixel fg, fgsh;*/
int relief_thickness = ST_RELIEF_THICKNESS(ms);
Bool is_item_selected;
+ Bool do_flat_separators;
Bool item_cleared = False;
Bool xft_clear = False;
Bool empty_inter = False;
@@ -599,6 +604,8 @@
* Draw the item itself.
*/
+ do_flat_separators = ST_DO_FLAT_SEPARATOR(ms);
+
/* Calculate the separator offsets. */
if (ST_HAS_LONG_SEPARATORS(ms))
{
@@ -619,9 +626,9 @@
{
/* It's a separator. */
draw_separator(
- mpip->w, gcs.shadow_gc, gcs.hilight_gc, sx1,
- y_offset + y_height - MENU_SEPARATOR_HEIGHT,
- sx2);
+ mpip->w, gcs.shadow_gc, gcs.hilight_gc, gcs.fore_gc,
+ sx1, y_offset + y_height - MENU_SEPARATOR_HEIGHT,
+ sx2, do_flat_separators);
/* Nothing else to do. */
}
return;
@@ -661,8 +668,8 @@
if (sx1 < sx2)
{
draw_separator(
- mpip->w, gcs.shadow_gc, gcs.hilight_gc,
- sx1, y, sx2);
+ mpip->w, gcs.shadow_gc, gcs.hilight_gc, gcs.fore_gc,
+ sx1, y, sx2, do_flat_separators);
}
}
/* Underline the title. */
@@ -675,8 +682,8 @@
{
y = y_offset + y_height - MENU_SEPARATOR_HEIGHT;
draw_separator(
- mpip->w, gcs.shadow_gc, gcs.hilight_gc,
- sx1, y, sx2);
+ mpip->w, gcs.shadow_gc, gcs.hilight_gc, gcs.fore_gc,
+ sx1, y, sx2, do_flat_separators);
}
break;
default:
diff -r -U3 fvwm/fvwm/menus.c fvwm/fvwm/menus.c
--- fvwm/fvwm/menus.c 2008-04-18 23:25:00.000000000 +0200
+++ fvwm/fvwm/menus.c 2008-04-18 23:25:57.000000000 +0200
@@ -1634,6 +1634,10 @@
separator_height = (last_item_has_relief) ?
MENU_SEPARATOR_HEIGHT + relief_thickness :
MENU_SEPARATOR_TOTAL_HEIGHT;
+ if (MST_DO_FLAT_SEPARATOR(msp->menu))
+ {
+ separator_height += 1;
+ }
MI_Y_OFFSET(mi) = y;
if (MI_IS_TITLE(mi))
{
diff -r -U3 fvwm/fvwm/menustyle.c fvwm/fvwm/menustyle.c
--- fvwm/fvwm/menustyle.c 2008-04-18 23:25:00.000000000 +0200
+++ fvwm/fvwm/menustyle.c 2008-04-18 23:25:57.000000000 +0200
@@ -428,6 +428,7 @@
"TitleColorset", "HilightTitleBack",
"TitleFont",
"VerticalMargins", "VerticalSeparatorMargins",
+ "FlatSeparators",
NULL
};
@@ -902,6 +903,7 @@
ST_SCROLL_OFF_PAGE(tmpms) = 1;
ST_DO_HILIGHT_TITLE_BACK(tmpms) = 0;
ST_USING_DEFAULT_TITLEFONT(tmpms) = True;
+ ST_DO_FLAT_SEPARATOR(tmpms) = 0;
has_gc_changed = True;
option = "fvwm";
}
@@ -1605,6 +1607,9 @@
&ST_VERTICAL_SEPARATOR_MARGIN_BOTTOM(tmpms),
0, 0);
break;
+ case 64: /* FlatSeparators */
+ ST_DO_FLAT_SEPARATOR(tmpms) = on;
+ break;
#if 0
case 99: /* PositionHints */
@@ -1864,6 +1869,8 @@
ST_TRIANGLES_USE_FORE(destms) = ST_TRIANGLES_USE_FORE(origms);
/* Title */
ST_DO_HILIGHT_TITLE_BACK(destms) = ST_DO_HILIGHT_TITLE_BACK(origms);
+ /* FlatSeparators */
+ ST_DO_FLAT_SEPARATOR(destms) = ST_DO_FLAT_SEPARATOR(origms);
menustyle_update(destms);
diff -r -U3 fvwm/fvwm/menustyle.h fvwm/fvwm/menustyle.h
--- fvwm/fvwm/menustyle.h 2008-04-18 23:25:00.000000000 +0200
+++ fvwm/fvwm/menustyle.h 2008-04-18 23:25:57.000000000 +0200
@@ -23,6 +23,8 @@
#define MST_FACE(m) ((m)->s->ms->look.face)
#define ST_DO_HILIGHT_BACK(s) ((s)->look.flags.do_hilight_back)
#define MST_DO_HILIGHT_BACK(m) ((m)->s->ms->look.flags.do_hilight_back)
+#define ST_DO_FLAT_SEPARATOR(s) ((s)->look.flags.do_flat_separator)
+#define MST_DO_FLAT_SEPARATOR(m) ((m)->s->ms->look.flags.do_flat_separator)
#define ST_DO_HILIGHT_FORE(s) ((s)->look.flags.do_hilight_fore)
#define MST_DO_HILIGHT_FORE(m) ((m)->s->ms->look.flags.do_hilight_fore)
#define ST_DO_HILIGHT_TITLE_BACK(s) ((s)->look.flags.do_hilight_title_back)
@@ -283,6 +285,7 @@
unsigned has_title_cset : 1;
unsigned do_hilight_title_back : 1;
unsigned using_default_titlefont : 1;
+ unsigned do_flat_separator : 1;
} flags;
unsigned char ReliefThickness;
unsigned char TitleUnderlines;
diff -r -U3 fvwm/tests/menus/menus.read fvwm/tests/menus/menus.read
--- fvwm/tests/menus/menus.read 2008-04-18 23:24:46.000000000 +0200
+++ fvwm/tests/menus/menus.read 2008-04-18 23:25:57.000000000 +0200
@@ -8,7 +8,7 @@
#
# - SidePic
# - SideColor
-# - SeparatorsLong / SeparatorsShort
+# - SeparatorsLong / SeparatorsShort / FlatSeparators
# - TitleUnderlines0 / TitleUnderlines1 / TitleUnderlines2
# - VerticalItemSpacing
# - VerticalTitleSpacing
@@ -90,6 +90,9 @@
NewTest "%s%.1|%.5i%.5l%.5l%.5r%.5i%2.3>%1|" ", separatorsshort" "separatorsshort" "separatorsshort"
UseDefaultItems
DoTest
+NewTest "%s%.1|%.5i%.5l%.5l%.5r%.5i%2.3>%1|" ", flatseparators" "flatseparators" "flatseparators"
+UseDefaultItems
+DoTest
NewTest "%s%.1|%.5i%.5l%.5l%.5r%.5i%2.3>%1|" ", titleunderlines0" "titleunderlines0" "titleunderlines0"
UseDefaultItems
DoTest
diff -r -U3 fvwm/tests/menus/README fvwm/tests/menus/README
--- fvwm/tests/menus/README 2008-04-18 23:24:46.000000000 +0200
+++ fvwm/tests/menus/README 2008-04-18 23:25:57.000000000 +0200
@@ -19,7 +19,7 @@
- MenuStyle options:
SidePic
SideColor
- SeparatorsLong / SeparatorsShort
+ SeparatorsLong / SeparatorsShort / FlatSeparators
TitleUnderlines0 / TitleUnderlines1 / TitleUnderlines2
VerticalItemSpacing
VerticalTitleSpacing
diff -r -U3 fvwm/tests/purify/purify.fvwm2rc fvwm/tests/purify/purify.fvwm2rc
--- fvwm/tests/purify/purify.fvwm2rc 2008-04-18 23:24:46.000000000 +0200
+++ fvwm/tests/purify/purify.fvwm2rc 2008-04-18 23:25:57.000000000 +0200
@@ -359,8 +359,8 @@
+ I MenuStyle FvwmStyle VerticalMargins 1 -1
+ I MenuStyle FvwmStyle PopupImmediately, PopdownImmediately
+ I MenuStyle FvwmStyle VerticalMargins -1 -1
- + I MenuStyle FvwmStyle TitleUnderlines0, SeparatorsLong, TrianglesSolid
- + I MenuStyle FvwmStyle AutomaticHotkeys, PopupAsRootMenu, RemoveSubmenus
+ + I MenuStyle FvwmStyle TitleUnderlines0, SeparatorsLong, TrianglesSolid, FlatSeparators
+ + I MenuStyle FvwmStyle AutomaticHotkeys, PopupAsRootMenu, RemoveSubmenus, !FlatSeparators
+ I MenuStyle FvwmStyle SubmenusRight, SelectOnRelease Alt, VerticalItemSpacing -2
+ I MenuStyle MwmStyle Mwm, HilightBackOff, ActiveForeOff, Hilight3DThin
|
GitWeb