koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle the old bar color config syntax in a backwards-compatible way

Browse Source
This commit is contained in:
Michael Stapelberg
2012-01-20 22:26:17 +00:00
parent b5c25761d5
commit 45b4d71a0b
3 changed files with 113 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cfgparse.l
View File

@ -128,6 +128,12 @@ EOL (\r?\n)
<BAR_COLORS>inactive_workspace { BAR_TRIPLE_COLOR; return TOK_BAR_COLOR_INACTIVE_WORKSPACE; }
<BAR_COLORS>urgent_workspace { BAR_TRIPLE_COLOR; return TOK_BAR_COLOR_URGENT_WORKSPACE; }
<BAR_COLOR>#[0-9a-fA-F]+ { yy_pop_state(); yylval.string = sstrdup(yytext); return HEXCOLOR; }
<BAR_COLOR>{EOL} {
yy_pop_state();
FREE(context->line_copy);
context->line_number++;
yy_push_state(BUFFER_LINE);
}
<BAR,BAR_COLORS,BAR_MODE,BAR_MODIFIER,BAR_POSITION>[a-zA-Z]+ { yylval.string = sstrdup(yytext); return WORD; }

38
src/cfgparse.y
View File

@ -1208,8 +1208,16 @@ bar_color_statusline:
;
bar_color_focused_workspace:
TOK_BAR_COLOR_FOCUSED_WORKSPACE HEXCOLOR HEXCOLOR HEXCOLOR
TOK_BAR_COLOR_FOCUSED_WORKSPACE HEXCOLOR HEXCOLOR
{
/* Old syntax: text / background */
DLOG("focused_ws = %s, %s (old)\n", $2, $3);
current_bar.colors.focused_workspace_bg = $3;
current_bar.colors.focused_workspace_text = $2;
}
| TOK_BAR_COLOR_FOCUSED_WORKSPACE HEXCOLOR HEXCOLOR HEXCOLOR
{
/* New syntax: border / background / text */
DLOG("focused_ws = %s, %s and %s\n", $2, $3, $4);
current_bar.colors.focused_workspace_border = $2;
current_bar.colors.focused_workspace_bg = $3;
@ -1218,8 +1226,16 @@ bar_color_focused_workspace:
;
bar_color_active_workspace:
TOK_BAR_COLOR_ACTIVE_WORKSPACE HEXCOLOR HEXCOLOR HEXCOLOR
TOK_BAR_COLOR_ACTIVE_WORKSPACE HEXCOLOR HEXCOLOR
{
/* Old syntax: text / background */
DLOG("active_ws = %s, %s (old)\n", $2, $3);
current_bar.colors.active_workspace_bg = $3;
current_bar.colors.active_workspace_text = $2;
}
| TOK_BAR_COLOR_ACTIVE_WORKSPACE HEXCOLOR HEXCOLOR HEXCOLOR
{
/* New syntax: border / background / text */
DLOG("active_ws = %s, %s and %s\n", $2, $3, $4);
current_bar.colors.active_workspace_border = $2;
current_bar.colors.active_workspace_bg = $3;
@ -1228,7 +1244,14 @@ bar_color_active_workspace:
;
bar_color_inactive_workspace:
TOK_BAR_COLOR_INACTIVE_WORKSPACE HEXCOLOR HEXCOLOR HEXCOLOR
TOK_BAR_COLOR_INACTIVE_WORKSPACE HEXCOLOR HEXCOLOR
{
/* Old syntax: text / background */
DLOG("inactive_ws = %s, %s (old)\n", $2, $3);
current_bar.colors.inactive_workspace_bg = $3;
current_bar.colors.inactive_workspace_text = $2;
}
| TOK_BAR_COLOR_INACTIVE_WORKSPACE HEXCOLOR HEXCOLOR HEXCOLOR
{
DLOG("inactive_ws = %s, %s and %s\n", $2, $3, $4);
current_bar.colors.inactive_workspace_border = $2;
@ -1238,7 +1261,14 @@ bar_color_inactive_workspace:
;
bar_color_urgent_workspace:
TOK_BAR_COLOR_URGENT_WORKSPACE HEXCOLOR HEXCOLOR HEXCOLOR
TOK_BAR_COLOR_URGENT_WORKSPACE HEXCOLOR HEXCOLOR
{
/* Old syntax: text / background */
DLOG("urgent_ws = %s, %s (old)\n", $2, $3);
current_bar.colors.urgent_workspace_bg = $3;
current_bar.colors.urgent_workspace_text = $2;
}
| TOK_BAR_COLOR_URGENT_WORKSPACE HEXCOLOR HEXCOLOR HEXCOLOR
{
DLOG("urgent_ws = %s, %s and %s\n", $2, $3, $4);
current_bar.colors.urgent_workspace_border = $2;