diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:10 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:10 +0000 |
| commit | 743f4680b547e4d9f4addb9b6525bc9a7fb33a0c (patch) | |
| tree | ed924da0c789e5c28a6a517b169d18216362b832 /src/parse.c | |
| parent | 22e912f7338ee41bd0f84f4330f4e8bc0c7501d9 (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'src/parse.c')
| -rw-r--r-- | src/parse.c | 14 |
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; |