#include "table.h"
#include "workspace.h"
#include "xcb.h"
+#include "log.h"
typedef struct yy_buffer_state *YY_BUFFER_STATE;
-extern int yylex(void);
+extern int yylex(struct context *context);
extern int yyparse(void);
extern FILE *yyin;
YY_BUFFER_STATE yy_scan_string(const char *);
static struct bindings_head *current_bindings;
-
-int yydebug = 1;
-
-void yyerror(const char *str) {
- fprintf(stderr,"error: %s\n",str);
+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;
}
}
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;
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 TOKMODE
-%token TOKNEWCONTAINER
-%token TOKNEWWINDOW
-%token TOKCONTAINERMODE
-%token TOKSTACKLIMIT
+%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
;
| floating_modifier
| new_container
| new_window
+ | focus_follows_mouse
+ | workspace_bar
| workspace
| assign
| ipcsocket
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
{
- LOG("new containers will be in mode %d\n", $<number>3);
+ 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
}
| TOKNEWCONTAINER WHITESPACE TOKSTACKLIMIT WHITESPACE TOKSTACKLIMIT WHITESPACE NUMBER
{
- LOG("stack-limit %d with val %d\n", $<number>5, $<number>7);
+ 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;
new_window:
TOKNEWWINDOW WHITESPACE WORD
{
- LOG("new windows should start in mode %s\n", $<string>3);
+ 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 optional_workspace_name
+ TOKWORKSPACE WHITESPACE NUMBER WHITESPACE TOKOUTPUT WHITESPACE OUTPUT optional_workspace_name
{
int ws_num = $<number>3;
if (ws_num < 1) {
- LOG("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 {
Workspace *ws = workspace_get(ws_num - 1);
- ws->preferred_screen = sstrdup($<string>7);
+ ws->preferred_output = sstrdup($<string>7);
if ($<string>8 != NULL)
workspace_set_name(ws, $<string>8);
}
{
int ws_num = $<number>3;
if (ws_num < 1) {
- LOG("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 {
+ DLOG("workspace name to: %s\n", $<string>5);
if ($<string>5 != NULL)
workspace_set_name(workspace_get(ws_num - 1), $<string>5);
}
| WORD { $<string>$ = $<string>1; }
;
-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); }
- ;
-
assign:
TOKASSIGN WHITESPACE window_class WHITESPACE optional_arrow assign_target
{
terminal:
TOKTERMINAL WHITESPACE STR
{
- LOG("The terminal option is DEPRECATED and has no effect. "
- "Please remove it from your configuration file.");
+ ELOG("The terminal option is DEPRECATED and has no effect. "
+ "Please remove it from your configuration file.\n");
}
;
projects / i3 / i3 / blobdiff