applications/i3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cfgparse.y: define types (Thanks Merovius)

Browse Source
This commit is contained in:
Michael Stapelberg 2011-05-05 21:58:28 +02:00
parent bd73275771
commit 1fe5c58764
1 changed files with 153 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

205
src/cfgparse.y
View File

@ -207,12 +207,12 @@ void parse_file(const char *f) {
%token TOKCOMMENT "<comment>" %token TOKCOMMENT "<comment>"
%token TOKFONT "font" %token TOKFONT "font"
%token TOKBINDSYM "bindsym" %token TOKBINDSYM "bindsym"
%token MODIFIER "<modifier>" %token <number> MODIFIER "<modifier>"
%token TOKCONTROL "control" %token TOKCONTROL "control"
%token TOKSHIFT "shift" %token TOKSHIFT "shift"
%token WHITESPACE "<whitespace>" %token WHITESPACE "<whitespace>"
%token TOKFLOATING_MODIFIER "floating_modifier" %token TOKFLOATING_MODIFIER "floating_modifier"
%token QUOTEDSTRING "<quoted string>" %token <string> QUOTEDSTRING "<quoted string>"
%token TOKWORKSPACE "workspace" %token TOKWORKSPACE "workspace"
%token TOKOUTPUT "output" %token TOKOUTPUT "output"
%token TOKASSIGN "assign" %token TOKASSIGN "assign"
@ -220,8 +220,8 @@ void parse_file(const char *f) {
%token TOKIPCSOCKET "ipc_socket" %token TOKIPCSOCKET "ipc_socket"
%token TOKRESTARTSTATE "restart_state" %token TOKRESTARTSTATE "restart_state"
%token TOKEXEC "exec" %token TOKEXEC "exec"
%token TOKSINGLECOLOR %token <single_color> TOKSINGLECOLOR
%token TOKCOLOR %token <color> TOKCOLOR
%token TOKARROW "→" %token TOKARROW "→"
%token TOKMODE "mode" %token TOKMODE "mode"
%token TOK_ORIENTATION "default_orientation" %token TOK_ORIENTATION "default_orientation"
@ -238,11 +238,30 @@ void parse_file(const char *f) {
%token TOK_DEFAULT "default" %token TOK_DEFAULT "default"
%token TOK_STACKING "stacking" %token TOK_STACKING "stacking"
%token TOK_TABBED "tabbed" %token TOK_TABBED "tabbed"
%token TOKSTACKLIMIT "stack-limit" %token <number> TOKSTACKLIMIT "stack-limit"
%token TOK_POPUP_DURING_FULLSCREEN "popup_during_fullscreen" %token TOK_POPUP_DURING_FULLSCREEN "popup_during_fullscreen"
%token TOK_IGNORE "ignore" %token TOK_IGNORE "ignore"
%token TOK_LEAVE_FULLSCREEN "leave_fullscreen" %token TOK_LEAVE_FULLSCREEN "leave_fullscreen"
%type <binding> binding
%type <binding> bindcode
%type <binding> bindsym
%type <number> binding_modifiers
%type <number> binding_modifier
%type <number> direction
%type <number> layout_mode
%type <number> border_style
%type <number> new_window
%type <number> colorpixel
%type <number> bool
%type <number> popup_setting
%type <string> command
%type <string> word_or_number
%type <string> optional_workspace_name
%type <string> workspace_name
%type <string> window_class
%type <match> assign_target
%% %%
lines: /* empty */ lines: /* empty */
@ -284,40 +303,40 @@ command:
bindline: bindline:
binding binding
{ {
TAILQ_INSERT_TAIL(bindings, $<binding>1, bindings); TAILQ_INSERT_TAIL(bindings, $1, bindings);
} }
; ;
binding: binding:
TOKBINDCODE WHITESPACE bindcode { $<binding>$ = $<binding>3; } TOKBINDCODE WHITESPACE bindcode { $$ = $3; }
| TOKBINDSYM WHITESPACE bindsym { $<binding>$ = $<binding>3; } | TOKBINDSYM WHITESPACE bindsym { $$ = $3; }
; ;
bindcode: bindcode:
binding_modifiers NUMBER WHITESPACE command binding_modifiers NUMBER WHITESPACE command
{ {
printf("\tFound keycode binding mod%d with key %d and command %s\n", $<number>1, $2, $<string>4); printf("\tFound keycode binding mod%d with key %d and command %s\n", $1, $2, $4);
Binding *new = scalloc(sizeof(Binding)); Binding *new = scalloc(sizeof(Binding));
new->keycode = $<number>2; new->keycode = $2;
new->mods = $<number>1; new->mods = $1;
new->command = $<string>4; new->command = $4;
$<binding>$ = new; $$ = new;
} }
; ;
bindsym: bindsym:
binding_modifiers word_or_number WHITESPACE command binding_modifiers word_or_number WHITESPACE command
{ {
printf("\tFound keysym binding mod%d with key %s and command %s\n", $<number>1, $<string>2, $<string>4); printf("\tFound keysym binding mod%d with key %s and command %s\n", $1, $2, $4);
Binding *new = scalloc(sizeof(Binding)); Binding *new = scalloc(sizeof(Binding));
new->symbol = $<string>2; new->symbol = $2;
new->mods = $<number>1; new->mods = $1;
new->command = $<string>4; new->command = $4;
$<binding>$ = new; $$ = new;
} }
; ;
@ -325,18 +344,18 @@ word_or_number:
WORD WORD
| NUMBER | NUMBER
{ {
asprintf(&$<string>$, "%d", $1); asprintf(&$$, "%d", $1);
} }
; ;
mode: mode:
TOKMODE WHITESPACE QUOTEDSTRING WHITESPACE '{' modelines '}' TOKMODE WHITESPACE QUOTEDSTRING WHITESPACE '{' modelines '}'
{ {
if (strcasecmp($<string>3, "default") == 0) { if (strcasecmp($3, "default") == 0) {
printf("You cannot use the name \"default\" for your mode\n"); printf("You cannot use the name \"default\" for your mode\n");
exit(1); exit(1);
} }
printf("\t now in mode %s\n", $<string>3); printf("\t now in mode %s\n", $3);
printf("\t current bindings = %p\n", current_bindings); printf("\t current bindings = %p\n", current_bindings);
Binding *binding; Binding *binding;
TAILQ_FOREACH(binding, current_bindings, bindings) { TAILQ_FOREACH(binding, current_bindings, bindings) {
@ -345,7 +364,7 @@ mode:
} }
struct Mode *mode = scalloc(sizeof(struct Mode)); struct Mode *mode = scalloc(sizeof(struct Mode));
mode->name = $<string>3; mode->name = $3;
mode->bindings = current_bindings; mode->bindings = current_bindings;
current_bindings = NULL; current_bindings = NULL;
SLIST_INSERT_HEAD(&modes, mode, modes); SLIST_INSERT_HEAD(&modes, mode, modes);
@ -368,37 +387,37 @@ modeline:
TAILQ_INIT(current_bindings); TAILQ_INIT(current_bindings);
} }
TAILQ_INSERT_TAIL(current_bindings, $<binding>1, bindings); TAILQ_INSERT_TAIL(current_bindings, $1, bindings);
} }
; ;
floating_modifier: floating_modifier:
TOKFLOATING_MODIFIER WHITESPACE binding_modifiers TOKFLOATING_MODIFIER WHITESPACE binding_modifiers
{ {
DLOG("floating modifier = %d\n", $<number>3); DLOG("floating modifier = %d\n", $3);
config.floating_modifier = $<number>3; config.floating_modifier = $3;
} }
; ;
orientation: orientation:
TOK_ORIENTATION WHITESPACE direction TOK_ORIENTATION WHITESPACE direction
{ {
DLOG("New containers should start with split direction %d\n", $<number>3); DLOG("New containers should start with split direction %d\n", $3);
config.default_orientation = $<number>3; config.default_orientation = $3;
} }
; ;
direction: direction:
TOK_HORIZ { $<number>$ = HORIZ; } TOK_HORIZ { $$ = HORIZ; }
| TOK_VERT { $<number>$ = VERT; } | TOK_VERT { $$ = VERT; }
| TOK_AUTO { $<number>$ = NO_ORIENTATION; } | TOK_AUTO { $$ = NO_ORIENTATION; }
; ;
workspace_layout: workspace_layout:
TOK_WORKSPACE_LAYOUT WHITESPACE layout_mode TOK_WORKSPACE_LAYOUT WHITESPACE layout_mode
{ {
DLOG("new containers will be in mode %d\n", $<number>3); DLOG("new containers will be in mode %d\n", $3);
config.default_layout = $<number>3; config.default_layout = $3;
#if 0 #if 0
/* We also need to change the layout of the already existing /* We also need to change the layout of the already existing
@ -421,9 +440,9 @@ workspace_layout:
} }
| TOK_WORKSPACE_LAYOUT WHITESPACE TOKSTACKLIMIT WHITESPACE TOKSTACKLIMIT WHITESPACE NUMBER | TOK_WORKSPACE_LAYOUT WHITESPACE TOKSTACKLIMIT WHITESPACE TOKSTACKLIMIT WHITESPACE NUMBER
{ {
DLOG("stack-limit %d with val %d\n", $<number>5, $<number>7); DLOG("stack-limit %d with val %d\n", $5, $7);
config.container_stack_limit = $<number>5; config.container_stack_limit = $5;
config.container_stack_limit_value = $<number>7; config.container_stack_limit_value = $7;
#if 0 #if 0
/* See the comment above */ /* See the comment above */
@ -440,61 +459,61 @@ workspace_layout:
; ;
layout_mode: layout_mode:
TOK_DEFAULT { $<number>$ = L_DEFAULT; } TOK_DEFAULT { $$ = L_DEFAULT; }
| TOK_STACKING { $<number>$ = L_STACKED; } | TOK_STACKING { $$ = L_STACKED; }
| TOK_TABBED { $<number>$ = L_TABBED; } | TOK_TABBED { $$ = L_TABBED; }
; ;
new_window: new_window:
TOKNEWWINDOW WHITESPACE border_style TOKNEWWINDOW WHITESPACE border_style
{ {
DLOG("new windows should start with border style %d\n", $<number>3); DLOG("new windows should start with border style %d\n", $3);
config.default_border = $<number>3; config.default_border = $3;
} }
; ;
border_style: border_style:
TOK_NORMAL { $<number>$ = BS_NORMAL; } TOK_NORMAL { $$ = BS_NORMAL; }
| TOK_NONE { $<number>$ = BS_NONE; } | TOK_NONE { $$ = BS_NONE; }
| TOK_1PIXEL { $<number>$ = BS_1PIXEL; } | TOK_1PIXEL { $$ = BS_1PIXEL; }
; ;
bool: bool:
NUMBER NUMBER
{ {
$<number>$ = ($<number>1 == 1); $$ = ($1 == 1);
} }
| WORD | WORD
{ {
DLOG("checking word \"%s\"\n", $<string>1); DLOG("checking word \"%s\"\n", $1);
$<number>$ = (strcasecmp($<string>1, "yes") == 0 || $$ = (strcasecmp($1, "yes") == 0 ||
strcasecmp($<string>1, "true") == 0 || strcasecmp($1, "true") == 0 ||
strcasecmp($<string>1, "on") == 0 || strcasecmp($1, "on") == 0 ||
strcasecmp($<string>1, "enable") == 0 || strcasecmp($1, "enable") == 0 ||
strcasecmp($<string>1, "active") == 0); strcasecmp($1, "active") == 0);
} }
; ;
focus_follows_mouse: focus_follows_mouse:
TOKFOCUSFOLLOWSMOUSE WHITESPACE bool TOKFOCUSFOLLOWSMOUSE WHITESPACE bool
{ {
DLOG("focus follows mouse = %d\n", $<number>3); DLOG("focus follows mouse = %d\n", $3);
config.disable_focus_follows_mouse = !($<number>3); config.disable_focus_follows_mouse = !($3);
} }
; ;
workspace_bar: workspace_bar:
TOKWORKSPACEBAR WHITESPACE bool TOKWORKSPACEBAR WHITESPACE bool
{ {
DLOG("workspace bar = %d\n", $<number>3); DLOG("workspace bar = %d\n", $3);
config.disable_workspace_bar = !($<number>3); config.disable_workspace_bar = !($3);
} }
; ;
workspace: workspace:
TOKWORKSPACE WHITESPACE NUMBER WHITESPACE TOKOUTPUT WHITESPACE OUTPUT optional_workspace_name TOKWORKSPACE WHITESPACE NUMBER WHITESPACE TOKOUTPUT WHITESPACE OUTPUT optional_workspace_name
{ {
int ws_num = $<number>3; int ws_num = $3;
if (ws_num < 1) { if (ws_num < 1) {
DLOG("Invalid workspace assignment, workspace number %d out of range\n", ws_num); DLOG("Invalid workspace assignment, workspace number %d out of range\n", ws_num);
} else { } else {
@ -510,11 +529,11 @@ workspace:
} }
| TOKWORKSPACE WHITESPACE NUMBER WHITESPACE workspace_name | TOKWORKSPACE WHITESPACE NUMBER WHITESPACE workspace_name
{ {
int ws_num = $<number>3; int ws_num = $3;
if (ws_num < 1) { if (ws_num < 1) {
DLOG("Invalid workspace assignment, workspace number %d out of range\n", ws_num); DLOG("Invalid workspace assignment, workspace number %d out of range\n", ws_num);
} else { } else {
DLOG("workspace name to: %s\n", $<string>5); DLOG("workspace name to: %s\n", $5);
#if 0 #if 0
if ($<string>5 != NULL) { if ($<string>5 != NULL) {
workspace_set_name(workspace_get(ws_num - 1), $<string>5); workspace_set_name(workspace_get(ws_num - 1), $<string>5);
@ -526,31 +545,31 @@ workspace:
; ;
optional_workspace_name: optional_workspace_name:
/* empty */ { $<string>$ = NULL; } /* empty */ { $$ = NULL; }
| WHITESPACE workspace_name { $<string>$ = $<string>2; } | WHITESPACE workspace_name { $$ = $2; }
; ;
workspace_name: workspace_name:
QUOTEDSTRING { $<string>$ = $<string>1; } QUOTEDSTRING { $$ = $1; }
| STR { $<string>$ = $<string>1; } | STR { $$ = $1; }
| WORD { $<string>$ = $<string>1; } | WORD { $$ = $1; }
; ;
assign: assign:
TOKASSIGN WHITESPACE window_class WHITESPACE optional_arrow assign_target TOKASSIGN WHITESPACE window_class WHITESPACE optional_arrow assign_target
{ {
printf("assignment of %s\n", $<string>3); printf("assignment of %s\n", $3);
struct Match *match = $<match>6; struct Match *match = $6;
char *separator = NULL; char *separator = NULL;
if ((separator = strchr($<string>3, '/')) != NULL) { if ((separator = strchr($3, '/')) != NULL) {
*(separator++) = '\0'; *(separator++) = '\0';
match->title = sstrdup(separator); match->title = sstrdup(separator);
} }
if (*$<string>3 != '\0') if (*$3 != '\0')
match->class = sstrdup($<string>3); match->class = sstrdup($3);
free($<string>3); free($3);
printf(" class = %s\n", match->class); printf(" class = %s\n", match->class);
printf(" title = %s\n", match->title); printf(" title = %s\n", match->title);
@ -567,8 +586,8 @@ assign_target:
Match *match = smalloc(sizeof(Match)); Match *match = smalloc(sizeof(Match));
match_init(match); match_init(match);
match->insert_where = M_ASSIGN_WS; match->insert_where = M_ASSIGN_WS;
asprintf(&(match->target_ws), "%d", $<number>1); asprintf(&(match->target_ws), "%d", $1);
$<match>$ = match; $$ = match;
} }
| '~' | '~'
{ {
@ -604,14 +623,14 @@ optional_arrow:
ipcsocket: ipcsocket:
TOKIPCSOCKET WHITESPACE STR TOKIPCSOCKET WHITESPACE STR
{ {
config.ipc_socket_path = $<string>3; config.ipc_socket_path = $3;
} }
; ;
restart_state: restart_state:
TOKRESTARTSTATE WHITESPACE STR TOKRESTARTSTATE WHITESPACE STR
{ {
config.restart_state_path = $<string>3; config.restart_state_path = $3;
} }
; ;
@ -619,7 +638,7 @@ exec:
TOKEXEC WHITESPACE STR TOKEXEC WHITESPACE STR
{ {
struct Autostart *new = smalloc(sizeof(struct Autostart)); struct Autostart *new = smalloc(sizeof(struct Autostart));
new->command = $<string>3; new->command = $3;
TAILQ_INSERT_TAIL(&autostarts, new, autostarts); TAILQ_INSERT_TAIL(&autostarts, new, autostarts);
} }
; ;
@ -635,27 +654,27 @@ terminal:
font: font:
TOKFONT WHITESPACE STR TOKFONT WHITESPACE STR
{ {
config.font = load_font($<string>3, true); config.font = load_font($3, true);
printf("font %s\n", $<string>3); printf("font %s\n", $3);
} }
; ;
single_color: single_color:
TOKSINGLECOLOR WHITESPACE colorpixel TOKSINGLECOLOR WHITESPACE colorpixel
{ {
uint32_t *dest = $<single_color>1; uint32_t *dest = $1;
*dest = $<number>3; *dest = $3;
} }
; ;
color: color:
TOKCOLOR WHITESPACE colorpixel WHITESPACE colorpixel WHITESPACE colorpixel TOKCOLOR WHITESPACE colorpixel WHITESPACE colorpixel WHITESPACE colorpixel
{ {
struct Colortriple *dest = $<color>1; struct Colortriple *dest = $1;
dest->border = $<number>3; dest->border = $3;
dest->background = $<number>5; dest->background = $5;
dest->text = $<number>7; dest->text = $7;
} }
; ;
@ -663,36 +682,36 @@ colorpixel:
'#' HEX '#' HEX
{ {
char *hex; char *hex;
if (asprintf(&hex, "#%s", $<string>2) == -1) if (asprintf(&hex, "#%s", $2) == -1)
die("asprintf()"); die("asprintf()");
$<number>$ = get_colorpixel(hex); $$ = get_colorpixel(hex);
free(hex); free(hex);
} }
; ;
binding_modifiers: binding_modifiers:
/* NULL */ { $<number>$ = 0; } /* NULL */ { $$ = 0; }
| binding_modifier | binding_modifier
| binding_modifiers '+' binding_modifier { $<number>$ = $<number>1 | $<number>3; } | binding_modifiers '+' binding_modifier { $$ = $1 | $3; }
| binding_modifiers '+' { $<number>$ = $<number>1; } | binding_modifiers '+' { $$ = $1; }
; ;
binding_modifier: binding_modifier:
MODIFIER { $<number>$ = $<number>1; } MODIFIER { $$ = $1; }
| TOKCONTROL { $<number>$ = BIND_CONTROL; } | TOKCONTROL { $$ = BIND_CONTROL; }
| TOKSHIFT { $<number>$ = BIND_SHIFT; } | TOKSHIFT { $$ = BIND_SHIFT; }
; ;
popup_during_fullscreen: popup_during_fullscreen:
TOK_POPUP_DURING_FULLSCREEN WHITESPACE popup_setting TOK_POPUP_DURING_FULLSCREEN WHITESPACE popup_setting
{ {
DLOG("popup_during_fullscreen setting: %d\n", $<number>3); DLOG("popup_during_fullscreen setting: %d\n", $3);
config.popup_during_fullscreen = $<number>3; config.popup_during_fullscreen = $3;
} }
; ;
popup_setting: popup_setting:
TOK_IGNORE { $<number>$ = PDF_IGNORE; } TOK_IGNORE { $$ = PDF_IGNORE; }
| TOK_LEAVE_FULLSCREEN { $<number>$ = PDF_LEAVE_FULLSCREEN; } | TOK_LEAVE_FULLSCREEN { $$ = PDF_LEAVE_FULLSCREEN; }
; ;