%{
+/*
+ * vim:ts=8:expandtab
+ *
+ */
#include <stdio.h>
#include <string.h>
#include <xcb/xcb.h>
#include "util.h"
#include "queue.h"
#include "table.h"
+#include "workspace.h"
+#include "xcb.h"
+#include "log.h"
-extern int yylex(void);
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+extern int yylex(struct context *context);
+extern int yyparse(void);
extern FILE *yyin;
-
-int yydebug = 1;
-
-void yyerror(const char *str) {
- fprintf(stderr,"error: %s\n",str);
+YY_BUFFER_STATE yy_scan_string(const char *);
+
+static struct bindings_head *current_bindings;
+static struct context *context;
+
+/* We don’t need yydebug for now, as we got decent error messages using
+ * yyerror(). Should you ever want to extend the parser, it might be handy
+ * to just comment it in again, so it stays here. */
+//int yydebug = 1;
+
+void yyerror(const char *error_message) {
+ ELOG("\n");
+ ELOG("CONFIG: %s\n", error_message);
+ ELOG("CONFIG: in file \"%s\", line %d:\n",
+ context->filename, context->line_number);
+ ELOG("CONFIG: %s\n", context->line_copy);
+ ELOG("CONFIG: ");
+ for (int c = 1; c <= context->last_column; c++)
+ if (c >= context->first_column)
+ printf("^");
+ else printf(" ");
+ printf("\n");
+ ELOG("\n");
}
int yywrap() {
new->key = sstrdup(v_key);
new->value = sstrdup(v_value);
SLIST_INSERT_HEAD(&variables, new, variables);
- LOG("Got new variable %s = %s\n", v_key, v_value);
+ DLOG("Got new variable %s = %s\n", v_key, v_value);
continue;
}
}
/* Then, allocate a new buffer and copy the file over to the new one,
* but replace occurences of our variables */
char *walk = buf, *destwalk;
- char *new = smalloc((stbuf.st_size + extra_bytes) * sizeof(char));
+ char *new = smalloc((stbuf.st_size + extra_bytes + 1) * sizeof(char));
destwalk = new;
while (walk < (buf + stbuf.st_size)) {
/* Find the next variable */
yy_scan_string(new);
+ context = scalloc(sizeof(struct context));
+ context->filename = f;
+
if (yyparse() != 0) {
fprintf(stderr, "Could not parse configfile\n");
exit(1);
}
+ FREE(context->line_copy);
+ free(context);
free(new);
free(buf);
}
%}
+%expect 1
+%error-verbose
+%lex-param { struct context *context }
+
%union {
int number;
char *string;
struct Colortriple *color;
- struct Assignment *assignment;
+ struct Assignment *assignment;
+ struct Binding *binding;
}
-%token <number>NUMBER
-%token <string>WORD
-%token <string>STR
-%token <string>STR_NG
-%token <string>HEX
+%token <number>NUMBER "<number>"
+%token <string>WORD "<word>"
+%token <string>STR "<string>"
+%token <string>STR_NG "<string (non-greedy)>"
+%token <string>HEX "<hex>"
+%token <string>OUTPUT "<RandR output>"
%token TOKBIND
%token TOKTERMINAL
-%token TOKCOMMENT
-%token TOKFONT
-%token TOKBINDSYM
-%token MODIFIER
-%token TOKCONTROL
-%token TOKSHIFT
-%token WHITESPACE
-%token TOKFLOATING_MODIFIER
-%token QUOTEDSTRING
-%token TOKWORKSPACE
-%token TOKSCREEN
-%token TOKASSIGN
+%token TOKCOMMENT "<comment>"
+%token TOKFONT "font"
+%token TOKBINDSYM "bindsym"
+%token MODIFIER "<modifier>"
+%token TOKCONTROL "control"
+%token TOKSHIFT "shift"
+%token WHITESPACE "<whitespace>"
+%token TOKFLOATING_MODIFIER "floating_modifier"
+%token QUOTEDSTRING "<quoted string>"
+%token TOKWORKSPACE "workspace"
+%token TOKOUTPUT "output"
+%token TOKASSIGN "assign"
%token TOKSET
-%token TOKIPCSOCKET
-%token TOKEXEC
+%token TOKIPCSOCKET "ipc_socket"
+%token TOKEXEC "exec"
%token TOKCOLOR
-%token TOKARROW
+%token TOKARROW "→"
+%token TOKMODE "mode"
+%token TOKNEWCONTAINER "new_container"
+%token TOKNEWWINDOW "new_window"
+%token TOKFOCUSFOLLOWSMOUSE "focus_follows_mouse"
+%token TOKWORKSPACEBAR "workspace_bar"
+%token TOKCONTAINERMODE "default/stacking/tabbed"
+%token TOKSTACKLIMIT "stack-limit"
%%
lines: /* empty */
| lines WHITESPACE line
+ | lines error
| lines line
;
line:
- bind
- | bindsym
+ bindline
+ | mode
| floating_modifier
+ | new_container
+ | new_window
+ | focus_follows_mouse
+ | workspace_bar
| workspace
| assign
| ipcsocket
STR
;
+bindline:
+ binding
+ {
+ TAILQ_INSERT_TAIL(bindings, $<binding>1, bindings);
+ }
+ ;
+
+binding:
+ TOKBIND WHITESPACE bind { $<binding>$ = $<binding>3; }
+ | TOKBINDSYM WHITESPACE bindsym { $<binding>$ = $<binding>3; }
+ ;
+
bind:
- TOKBIND WHITESPACE binding_modifiers NUMBER WHITESPACE command
+ binding_modifiers NUMBER WHITESPACE command
{
- printf("\tFound binding mod%d with key %d and command %s\n", $<number>3, $4, $<string>6);
+ printf("\tFound binding mod%d with key %d and command %s\n", $<number>1, $2, $<string>4);
Binding *new = scalloc(sizeof(Binding));
- new->keycode = $<number>4;
- new->mods = $<number>3;
- new->command = sstrdup($<string>6);
+ new->keycode = $<number>2;
+ new->mods = $<number>1;
+ new->command = sstrdup($<string>4);
- TAILQ_INSERT_TAIL(&bindings, new, bindings);
+ $<binding>$ = new;
}
;
bindsym:
- TOKBINDSYM WHITESPACE binding_modifiers WORD WHITESPACE command
+ binding_modifiers word_or_number WHITESPACE command
{
- printf("\tFound symbolic mod%d with key %s and command %s\n", $<number>3, $4, $<string>6);
+ printf("\tFound symbolic mod%d with key %s and command %s\n", $<number>1, $<string>2, $<string>4);
Binding *new = scalloc(sizeof(Binding));
- new->symbol = sstrdup($4);
- new->mods = $<number>3;
- new->command = sstrdup($<string>6);
+ new->symbol = sstrdup($<string>2);
+ new->mods = $<number>1;
+ new->command = sstrdup($<string>4);
- TAILQ_INSERT_TAIL(&bindings, new, bindings);
+ $<binding>$ = new;
+ }
+ ;
+
+word_or_number:
+ WORD
+ | NUMBER
+ {
+ asprintf(&$<string>$, "%d", $1);
+ }
+ ;
+
+mode:
+ TOKMODE WHITESPACE QUOTEDSTRING WHITESPACE '{' modelines '}'
+ {
+ if (strcasecmp($<string>3, "default") == 0) {
+ printf("You cannot use the name \"default\" for your mode\n");
+ exit(1);
+ }
+ printf("\t now in mode %s\n", $<string>3);
+ printf("\t current bindings = %p\n", current_bindings);
+ Binding *binding;
+ TAILQ_FOREACH(binding, current_bindings, bindings) {
+ printf("got binding on mods %d, keycode %d, symbol %s, command %s\n",
+ binding->mods, binding->keycode, binding->symbol, binding->command);
+ }
+
+ struct Mode *mode = scalloc(sizeof(struct Mode));
+ mode->name = strdup($<string>3);
+ mode->bindings = current_bindings;
+ current_bindings = NULL;
+ SLIST_INSERT_HEAD(&modes, mode, modes);
+ }
+ ;
+
+
+modelines:
+ /* empty */
+ | modelines modeline
+ ;
+
+modeline:
+ WHITESPACE
+ | comment
+ | binding
+ {
+ if (current_bindings == NULL) {
+ current_bindings = scalloc(sizeof(struct bindings_head));
+ TAILQ_INIT(current_bindings);
+ }
+
+ TAILQ_INSERT_TAIL(current_bindings, $<binding>1, bindings);
}
;
floating_modifier:
TOKFLOATING_MODIFIER WHITESPACE binding_modifiers
{
- LOG("floating modifier = %d\n", $<number>3);
+ DLOG("floating modifier = %d\n", $<number>3);
config.floating_modifier = $<number>3;
}
;
+new_container:
+ TOKNEWCONTAINER WHITESPACE TOKCONTAINERMODE
+ {
+ DLOG("new containers will be in mode %d\n", $<number>3);
+ config.container_mode = $<number>3;
+
+ /* We also need to change the layout of the already existing
+ * workspaces here. Workspaces may exist at this point because
+ * of the other directives which are modifying workspaces
+ * (setting the preferred screen or name). While the workspace
+ * objects are already created, they have never been used.
+ * Thus, the user very likely awaits the default container mode
+ * to trigger in this case, regardless of where it is inside
+ * his configuration file. */
+ Workspace *ws;
+ TAILQ_FOREACH(ws, workspaces, workspaces) {
+ if (ws->table == NULL)
+ continue;
+ switch_layout_mode(global_conn,
+ ws->table[0][0],
+ config.container_mode);
+ }
+ }
+ | TOKNEWCONTAINER WHITESPACE TOKSTACKLIMIT WHITESPACE TOKSTACKLIMIT WHITESPACE NUMBER
+ {
+ DLOG("stack-limit %d with val %d\n", $<number>5, $<number>7);
+ config.container_stack_limit = $<number>5;
+ config.container_stack_limit_value = $<number>7;
+
+ /* See the comment above */
+ Workspace *ws;
+ TAILQ_FOREACH(ws, workspaces, workspaces) {
+ if (ws->table == NULL)
+ continue;
+ Container *con = ws->table[0][0];
+ con->stack_limit = config.container_stack_limit;
+ con->stack_limit_value = config.container_stack_limit_value;
+ }
+ }
+ ;
+
+new_window:
+ TOKNEWWINDOW WHITESPACE WORD
+ {
+ DLOG("new windows should start in mode %s\n", $<string>3);
+ config.default_border = strdup($<string>3);
+ }
+ ;
+
+bool:
+ NUMBER
+ {
+ $<number>$ = ($<number>1 == 1);
+ }
+ | WORD
+ {
+ DLOG("checking word \"%s\"\n", $<string>1);
+ $<number>$ = (strcasecmp($<string>1, "yes") == 0 ||
+ strcasecmp($<string>1, "true") == 0 ||
+ strcasecmp($<string>1, "on") == 0 ||
+ strcasecmp($<string>1, "enable") == 0 ||
+ strcasecmp($<string>1, "active") == 0);
+ }
+ ;
+
+focus_follows_mouse:
+ TOKFOCUSFOLLOWSMOUSE WHITESPACE bool
+ {
+ DLOG("focus follows mouse = %d\n", $<number>3);
+ config.disable_focus_follows_mouse = !($<number>3);
+ }
+ ;
+
+workspace_bar:
+ TOKWORKSPACEBAR WHITESPACE bool
+ {
+ DLOG("workspace bar = %d\n", $<number>3);
+ config.disable_workspace_bar = !($<number>3);
+ }
+ ;
+
workspace:
- TOKWORKSPACE WHITESPACE NUMBER WHITESPACE TOKSCREEN WHITESPACE screen workspace_name
+ TOKWORKSPACE WHITESPACE NUMBER WHITESPACE TOKOUTPUT WHITESPACE OUTPUT optional_workspace_name
{
int ws_num = $<number>3;
- if (ws_num < 1 || ws_num > 10) {
- LOG("Invalid workspace assignment, workspace number %d out of range\n", ws_num);
+ if (ws_num < 1) {
+ DLOG("Invalid workspace assignment, workspace number %d out of range\n", ws_num);
} else {
- workspaces[ws_num - 1].preferred_screen = sstrdup($<string>7);
+ Workspace *ws = workspace_get(ws_num - 1);
+ ws->preferred_output = sstrdup($<string>7);
if ($<string>8 != NULL)
- workspace_set_name(&(workspaces[ws_num - 1]), $<string>8);
+ workspace_set_name(ws, $<string>8);
}
}
- | TOKWORKSPACE WHITESPACE NUMBER workspace_name
- {
+ | TOKWORKSPACE WHITESPACE NUMBER WHITESPACE workspace_name
+ {
int ws_num = $<number>3;
- if (ws_num < 1 || ws_num > 10) {
- LOG("Invalid workspace assignment, workspace number %d out of range\n", ws_num);
+ if (ws_num < 1) {
+ DLOG("Invalid workspace assignment, workspace number %d out of range\n", ws_num);
} else {
- if ($<string>4 != NULL)
- workspace_set_name(&(workspaces[ws_num - 1]), $<string>4);
- }
- }
+ DLOG("workspace name to: %s\n", $<string>5);
+ if ($<string>5 != NULL)
+ workspace_set_name(workspace_get(ws_num - 1), $<string>5);
+ }
+ }
;
-workspace_name:
- /* NULL */ { $<string>$ = NULL; }
- | WHITESPACE QUOTEDSTRING { $<string>$ = $<string>2; }
- | WHITESPACE STR { $<string>$ = $<string>2; }
+optional_workspace_name:
+ /* empty */ { $<string>$ = NULL; }
+ | WHITESPACE workspace_name { $<string>$ = $<string>2; }
;
-screen:
- NUMBER { asprintf(&$<string>$, "%d", $<number>1); }
- | NUMBER 'x' { asprintf(&$<string>$, "%d", $<number>1); }
- | NUMBER 'x' NUMBER { asprintf(&$<string>$, "%dx%d", $<number>1, $<number>3); }
- | 'x' NUMBER { asprintf(&$<string>$, "x%d", $<number>2); }
+workspace_name:
+ QUOTEDSTRING { $<string>$ = $<string>1; }
+ | STR { $<string>$ = $<string>1; }
+ | WORD { $<string>$ = $<string>1; }
;
assign:
TOKASSIGN WHITESPACE window_class WHITESPACE optional_arrow assign_target
{
- printf("assignment of %s to %d\n", $<string>3, $<number>6);
+ printf("assignment of %s\n", $<string>3);
- struct Assignment *new = $<assignment>6;
- new->windowclass_title = strdup($<string>3);
- TAILQ_INSERT_TAIL(&assignments, new, assignments);
+ struct Assignment *new = $<assignment>6;
+ printf(" to %d\n", new->workspace);
+ printf(" floating = %d\n", new->floating);
+ new->windowclass_title = strdup($<string>3);
+ TAILQ_INSERT_TAIL(&assignments, new, assignments);
}
;
assign_target:
- NUMBER
- {
- struct Assignment *new = scalloc(sizeof(struct Assignment));
- new->workspace = $<number>1;
- new->floating = ASSIGN_FLOATING_NO;
- $<assignment>$ = new;
- }
- | '~'
- {
- struct Assignment *new = scalloc(sizeof(struct Assignment));
- new->floating = ASSIGN_FLOATING_ONLY;
- $<assignment>$ = new;
- }
- | '~' NUMBER
- {
- struct Assignment *new = scalloc(sizeof(struct Assignment));
- new->workspace = $<number>2;
- new->floating = ASSIGN_FLOATING;
- $<assignment>$ = new;
- }
- ;
+ NUMBER
+ {
+ struct Assignment *new = scalloc(sizeof(struct Assignment));
+ new->workspace = $<number>1;
+ new->floating = ASSIGN_FLOATING_NO;
+ }
+ | '~'
+ {
+ struct Assignment *new = scalloc(sizeof(struct Assignment));
+ new->floating = ASSIGN_FLOATING_ONLY;
+ }
+ | '~' NUMBER
+ {
+ struct Assignment *new = scalloc(sizeof(struct Assignment));
+ new->workspace = $<number>2;
+ new->floating = ASSIGN_FLOATING;
+ }
+ ;
window_class:
QUOTEDSTRING
terminal:
TOKTERMINAL WHITESPACE STR
{
- config.terminal = sstrdup($<string>3);
- printf("terminal %s\n", config.terminal);
+ ELOG("The terminal option is DEPRECATED and has no effect. "
+ "Please remove it from your configuration file.\n");
}
;
;
colorpixel:
- '#' HEX { $<number>$ = get_colorpixel(global_conn, $<string>2); }
+ '#' HEX
+ {
+ char *hex;
+ if (asprintf(&hex, "#%s", $<string>2) == -1)
+ die("asprintf()");
+ $<number>$ = get_colorpixel(global_conn, hex);
+ free(hex);
+ }
;
projects / i3 / i3 / blobdiff