summaryrefslogtreecommitdiff
path: root/src/parse.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:29:03 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:29:03 +0000
commite51f25fbe75b222b24f4628b2408e899fa4748d7 (patch)
treef99bc828d623da962d7857db2c5edbce6ced3de8 /src/parse.c
parent4b339f0a4311b4db171584bc6671292a9052665a (diff)
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_903_specialxf86-4_3_99_902xf86-4_3_99_901xf86-4_3_99_16xf86-012804-2330
Diffstat (limited to 'src/parse.c')
-rw-r--r--src/parse.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/parse.c b/src/parse.c
index c3ebc6e..500c38f 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/twm/parse.c,v 1.16 2002/12/10 22:29:55 tsi Exp $ */
+/* $XFree86: xc/programs/twm/parse.c,v 1.17 2003/08/04 10:32:30 eich Exp $ */
/*****************************************************************************/
/*
@@ -389,6 +389,7 @@ typedef struct _TwmKeyword {
#define kwn_IconBorderWidth 8
#define kwn_TitleButtonBorderWidth 9
#define kwn_Priority 10
+#define kwn_MenuBorderWidth 11
#define kwcl_BorderColor 1
#define kwcl_IconManagerHighlight 2
@@ -411,6 +412,7 @@ typedef struct _TwmKeyword {
#define kwc_MenuShadowColor 7
#define kwc_PointerForeground 8
#define kwc_PointerBackground 9
+#define kwc_MenuBorderColor 10
/*
@@ -547,6 +549,8 @@ static TwmKeyword keytable[] = {
{ "maxwindowsize", SKEYWORD, kws_MaxWindowSize },
{ "menu", MENU, 0 },
{ "menubackground", CKEYWORD, kwc_MenuBackground },
+ { "menubordercolor", CKEYWORD, kwc_MenuBorderColor },
+ { "menuborderwidth", NKEYWORD, kwn_MenuBorderWidth },
{ "menufont", SKEYWORD, kws_MenuFont },
{ "menuforeground", CKEYWORD, kwc_MenuForeground },
{ "menushadowcolor", CKEYWORD, kwc_MenuShadowColor },
@@ -865,6 +869,10 @@ int do_number_keyword (keyword, num)
if (Scr->FirstTime) Scr->IconBorderWidth = num;
return 1;
+ case kwn_MenuBorderWidth:
+ if (Scr->FirstTime) Scr->MenuBorderWidth = num;
+ return 1;
+
case kwn_TitleButtonBorderWidth:
if (Scr->FirstTime) Scr->TBInfo.border = num;
return 1;
@@ -952,6 +960,10 @@ int do_color_keyword (keyword, colormode, s)
GetColor (colormode, &Scr->MenuC.back, s);
return 1;
+ case kwc_MenuBorderColor:
+ GetColor (colormode, &Scr->MenuBorderColor, s);
+ return 1;
+
case kwc_MenuTitleForeground:
GetColor (colormode, &Scr->MenuTitleC.fore, s);
return 1;