aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/winprefsyacc.y
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-03-05 09:33:39 +0100
committermarha <marha@users.sourceforge.net>2014-03-05 09:33:39 +0100
commit8badbdef38ce843dc443ddee219eda4040ef2cd5 (patch)
treee44061aeab2425b199c89ec54b5caa909228492c /xorg-server/hw/xwin/winprefsyacc.y
parent45392e4a0642880b569ea5d4a350cdc395a2c7db (diff)
downloadvcxsrv-8badbdef38ce843dc443ddee219eda4040ef2cd5.tar.gz
vcxsrv-8badbdef38ce843dc443ddee219eda4040ef2cd5.tar.bz2
vcxsrv-8badbdef38ce843dc443ddee219eda4040ef2cd5.zip
Now taskbar with notab can be specified in system.XWinrc
Diffstat (limited to 'xorg-server/hw/xwin/winprefsyacc.y')
-rw-r--r--xorg-server/hw/xwin/winprefsyacc.y22
1 files changed, 22 insertions, 0 deletions
diff --git a/xorg-server/hw/xwin/winprefsyacc.y b/xorg-server/hw/xwin/winprefsyacc.y
index 73fb5d56e..38bb510a8 100644
--- a/xorg-server/hw/xwin/winprefsyacc.y
+++ b/xorg-server/hw/xwin/winprefsyacc.y
@@ -76,6 +76,8 @@ static void OpenStyles(void);
static void AddStyleLine(char *matchstr, unsigned long style);
static void CloseStyles(void);
+static void SetNoTrayIcon(void);
+
static void OpenSysMenu(void);
static void AddSysMenuLine(char *matchstr, char *menuname, int pos);
static void CloseSysMenu(void);
@@ -104,6 +106,8 @@ extern int yylex(void);
%token DEFAULTICON
%token ICONS
%token STYLES
+%token TASKBAR
+%token NOTAB
%token TOPMOST
%token MAXIMIZE
%token MINIMIZE
@@ -151,6 +155,7 @@ command: defaulticon
| menu
| icons
| styles
+ | taskbar
| sysmenu
| rootmenu
| defaultsysmenu
@@ -226,6 +231,16 @@ stylelist: styleline
styles: STYLES LB {OpenStyles();} newline_or_nada stylelist RB {CloseStyles();}
;
+taskbarline: STRING NOTAB NEWLINE newline_or_nada { SetNoTrayIcon(); free($1); }
+ ;
+
+taskbarlist: taskbarline
+ | taskbarline taskbarlist
+ ;
+
+taskbar: TASKBAR LB newline_or_nada taskbarlist RB
+ ;
+
atspot: { $$=AT_END; }
| ATSTART { $$=AT_START; }
| ATEND { $$=AT_END; }
@@ -420,6 +435,13 @@ CloseStyles (void)
}
static void
+SetNoTrayIcon (void)
+{
+ pref.fNoTrayIcon=TRUE;
+}
+
+
+static void
OpenSysMenu (void)
{
if (pref.sysMenu != NULL) {