remove old cfgparse.{l,y}
This commit is contained in:
Michael Stapelberg
parent
5d4a934864
commit
b304e6ad34
301
src/cfgparse.l
301
src/cfgparse.l
|
|
@ -1,301 +0,0 @@
|
||||||
/*
|
|
||||||
* vim:ts=4:sw=4:expandtab
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
%option nounput
|
|
||||||
%option noinput
|
|
||||||
%option noyy_top_state
|
|
||||||
%option stack
|
|
||||||
|
|
||||||
%{
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <xcb/xcb.h>
|
|
||||||
|
|
||||||
#include "log.h"
|
|
||||||
#include "data.h"
|
|
||||||
#include "config.h"
|
|
||||||
#include "util.h"
|
|
||||||
#include "libi3.h"
|
|
||||||
|
|
||||||
#include "cfgparse.tab.h"
|
|
||||||
|
|
||||||
int yycolumn = 1;
|
|
||||||
|
|
||||||
#define YY_DECL int yylex (struct context *context)
|
|
||||||
|
|
||||||
#define YY_USER_ACTION { \
|
|
||||||
context->first_column = yycolumn; \
|
|
||||||
context->last_column = yycolumn+yyleng-1; \
|
|
||||||
yycolumn += yyleng; \
|
|
||||||
}
|
|
||||||
|
|
||||||
/* macro to first eat whitespace, then expect a string */
|
|
||||||
#define WS_STRING do { \
|
|
||||||
yy_push_state(WANT_STRING); \
|
|
||||||
yy_push_state(EAT_WHITESPACE); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
#define BAR_TRIPLE_COLOR do { \
|
|
||||||
yy_push_state(BAR_COLOR); \
|
|
||||||
yy_push_state(BAR_COLOR); \
|
|
||||||
yy_push_state(BAR_COLOR); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
%}
|
|
||||||
|
|
||||||
EOL (\r?\n)
|
|
||||||
|
|
||||||
%s WANT_STRING
|
|
||||||
%s WANT_QSTRING
|
|
||||||
%s BINDSYM_COND
|
|
||||||
%s ASSIGN_COND
|
|
||||||
%s ASSIGN_TARGET_COND
|
|
||||||
%s COLOR_COND
|
|
||||||
%s OUTPUT_COND
|
|
||||||
%s FOR_WINDOW_COND
|
|
||||||
%s EAT_WHITESPACE
|
|
||||||
%s BORDER_WIDTH
|
|
||||||
|
|
||||||
%x BUFFER_LINE
|
|
||||||
%x BAR
|
|
||||||
%x BAR_MODE
|
|
||||||
%x BAR_MODIFIER
|
|
||||||
%x BAR_POSITION
|
|
||||||
%x BAR_COLORS
|
|
||||||
%x BAR_COLOR
|
|
||||||
|
|
||||||
%x EXEC
|
|
||||||
%x OPTRELEASE
|
|
||||||
|
|
||||||
%%
|
|
||||||
|
|
||||||
{
|
|
||||||
/* This is called when a new line is lexed. We only want the
|
|
||||||
* first line to match to go into state BUFFER_LINE */
|
|
||||||
if (context->line_number == 0) {
|
|
||||||
context->line_number = 1;
|
|
||||||
BEGIN(INITIAL);
|
|
||||||
yy_push_state(BUFFER_LINE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
<BUFFER_LINE>^[^\r\n]*/{EOL}? {
|
|
||||||
/* save whole line */
|
|
||||||
context->line_copy = sstrdup(yytext);
|
|
||||||
|
|
||||||
yyless(0);
|
|
||||||
yy_pop_state();
|
|
||||||
yy_set_bol(true);
|
|
||||||
yycolumn = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* This part of the lexer handles the bar {} blocks */
|
|
||||||
<BAR,BAR_MODE,BAR_MODIFIER,BAR_POSITION,BAR_COLORS,BAR_COLOR>[ \t]+ { /* ignore whitespace */ ; }
|
|
||||||
<BAR>"{" { return '{'; }
|
|
||||||
<BAR>"}" { yy_pop_state(); return '}'; }
|
|
||||||
<BAR>^[ \t]*#[^\n]* { return TOKCOMMENT; }
|
|
||||||
<BAR>output { WS_STRING; return TOK_BAR_OUTPUT; }
|
|
||||||
<BAR>tray_output { WS_STRING; return TOK_BAR_TRAY_OUTPUT; }
|
|
||||||
<BAR>socket_path { WS_STRING; return TOK_BAR_SOCKET_PATH; }
|
|
||||||
<BAR>mode { yy_push_state(BAR_MODE); return TOK_BAR_MODE; }
|
|
||||||
<BAR_MODE>hide { yy_pop_state(); return TOK_BAR_HIDE; }
|
|
||||||
<BAR_MODE>dock { yy_pop_state(); return TOK_BAR_DOCK; }
|
|
||||||
<BAR>modifier { yy_push_state(BAR_MODIFIER); return TOK_BAR_MODIFIER; }
|
|
||||||
<BAR_MODIFIER>control { yy_pop_state(); return TOK_BAR_CONTROL; }
|
|
||||||
<BAR_MODIFIER>ctrl { yy_pop_state(); return TOK_BAR_CONTROL; }
|
|
||||||
<BAR_MODIFIER>shift { yy_pop_state(); return TOK_BAR_SHIFT; }
|
|
||||||
<BAR_MODIFIER>Mod1 { yy_pop_state(); return TOK_BAR_MOD1; }
|
|
||||||
<BAR_MODIFIER>Mod2 { yy_pop_state(); return TOK_BAR_MOD2; }
|
|
||||||
<BAR_MODIFIER>Mod3 { yy_pop_state(); return TOK_BAR_MOD3; }
|
|
||||||
<BAR_MODIFIER>Mod4 { yy_pop_state(); return TOK_BAR_MOD4; }
|
|
||||||
<BAR_MODIFIER>Mod5 { yy_pop_state(); return TOK_BAR_MOD5; }
|
|
||||||
<BAR>position { yy_push_state(BAR_POSITION); return TOK_BAR_POSITION; }
|
|
||||||
<BAR_POSITION>bottom { yy_pop_state(); return TOK_BAR_BOTTOM; }
|
|
||||||
<BAR_POSITION>top { yy_pop_state(); return TOK_BAR_TOP; }
|
|
||||||
<BAR>status_command { WS_STRING; return TOK_BAR_STATUS_COMMAND; }
|
|
||||||
<BAR>i3bar_command { WS_STRING; return TOK_BAR_I3BAR_COMMAND; }
|
|
||||||
<BAR>font { WS_STRING; return TOK_BAR_FONT; }
|
|
||||||
<BAR>workspace_buttons { return TOK_BAR_WORKSPACE_BUTTONS; }
|
|
||||||
<BAR>verbose { return TOK_BAR_VERBOSE; }
|
|
||||||
<BAR>colors { yy_push_state(BAR_COLORS); return TOK_BAR_COLORS; }
|
|
||||||
<BAR_COLORS>"{" { return '{'; }
|
|
||||||
<BAR_COLORS>"}" { yy_pop_state(); return '}'; }
|
|
||||||
<BAR_COLORS>^[ \t]*#[^\n]* { return TOKCOMMENT; }
|
|
||||||
<BAR_COLORS>background { yy_push_state(BAR_COLOR); return TOK_BAR_COLOR_BACKGROUND; }
|
|
||||||
<BAR_COLORS>statusline { yy_push_state(BAR_COLOR); return TOK_BAR_COLOR_STATUSLINE; }
|
|
||||||
<BAR_COLORS>focused_workspace { BAR_TRIPLE_COLOR; return TOK_BAR_COLOR_FOCUSED_WORKSPACE; }
|
|
||||||
<BAR_COLORS>active_workspace { BAR_TRIPLE_COLOR; return TOK_BAR_COLOR_ACTIVE_WORKSPACE; }
|
|
||||||
<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; }
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<FOR_WINDOW_COND>"]" { yy_pop_state(); return ']'; }
|
|
||||||
<ASSIGN_COND>"[" {
|
|
||||||
/* this is the case for the new assign syntax
|
|
||||||
* that uses criteria */
|
|
||||||
yy_pop_state();
|
|
||||||
yy_push_state(FOR_WINDOW_COND);
|
|
||||||
/* afterwards we will be in ASSIGN_TARGET_COND */
|
|
||||||
return '[';
|
|
||||||
}
|
|
||||||
<EAT_WHITESPACE>[ \t]* { yy_pop_state(); }
|
|
||||||
<EAT_WHITESPACE>{EOL} { yy_pop_state(); }
|
|
||||||
<BINDSYM_COND>{EOL} { yy_pop_state(); }
|
|
||||||
<WANT_QSTRING>\"[^\"]+\" {
|
|
||||||
yy_pop_state();
|
|
||||||
/* strip quotes */
|
|
||||||
char *copy = sstrdup(yytext+1);
|
|
||||||
copy[strlen(copy)-1] = '\0';
|
|
||||||
yylval.string = copy;
|
|
||||||
return STR;
|
|
||||||
}
|
|
||||||
<WANT_STRING>[^\n]+ { yy_pop_state(); yylval.string = sstrdup(yytext); return STR; }
|
|
||||||
<OUTPUT_COND>[a-zA-Z0-9\/_-]+ { yy_pop_state(); yylval.string = sstrdup(yytext); return OUTPUT; }
|
|
||||||
^[ \t]*#[^\n]* { return TOKCOMMENT; }
|
|
||||||
<COLOR_COND>#[0-9a-fA-F]+ { yy_pop_state(); yylval.string = sstrdup(yytext); return HEXCOLOR; }
|
|
||||||
<COLOR_COND>{EOL} {
|
|
||||||
yy_pop_state();
|
|
||||||
FREE(context->line_copy);
|
|
||||||
context->line_number++;
|
|
||||||
yy_push_state(BUFFER_LINE);
|
|
||||||
}
|
|
||||||
<ASSIGN_TARGET_COND>[ \t]*→[ \t]* { BEGIN(WANT_STRING); }
|
|
||||||
<ASSIGN_TARGET_COND>[ \t]+ { BEGIN(WANT_STRING); }
|
|
||||||
<BORDER_WIDTH>[^\n][0-9]+ { printf("Border width set to: %s\n", yytext); yylval.number = atoi(yytext); return NUMBER;}
|
|
||||||
<EXEC>--no-startup-id { printf("no startup id\n"); yy_pop_state(); return TOK_NO_STARTUP_ID; }
|
|
||||||
<EXEC>. { printf("anything else: *%s*\n", yytext); yyless(0); yy_pop_state(); yy_pop_state(); }
|
|
||||||
<OPTRELEASE>--release { printf("--release\n"); yy_pop_state(); return TOK_RELEASE; }
|
|
||||||
<OPTRELEASE>. { printf("anything else (optrelease): *%s*\n", yytext); yyless(0); yy_pop_state(); yy_pop_state(); }
|
|
||||||
[0-9-]+ { yylval.number = atoi(yytext); return NUMBER; }
|
|
||||||
bar { yy_push_state(BAR); return TOK_BAR; }
|
|
||||||
mode { return TOKMODE; }
|
|
||||||
bind { yy_push_state(WANT_STRING); yy_push_state(EAT_WHITESPACE); yy_push_state(EAT_WHITESPACE); return TOKBINDCODE; }
|
|
||||||
bindcode { yy_push_state(WANT_STRING); yy_push_state(EAT_WHITESPACE); yy_push_state(EAT_WHITESPACE); yy_push_state(OPTRELEASE); yy_push_state(EAT_WHITESPACE); return TOKBINDCODE; }
|
|
||||||
bindsym { yy_push_state(BINDSYM_COND); yy_push_state(EAT_WHITESPACE); yy_push_state(OPTRELEASE); yy_push_state(EAT_WHITESPACE); return TOKBINDSYM; }
|
|
||||||
floating_maximum_size { return TOKFLOATING_MAXIMUM_SIZE; }
|
|
||||||
floating_minimum_size { return TOKFLOATING_MINIMUM_SIZE; }
|
|
||||||
floating_modifier { return TOKFLOATING_MODIFIER; }
|
|
||||||
workspace { return TOKWORKSPACE; }
|
|
||||||
output { yy_push_state(OUTPUT_COND); yy_push_state(EAT_WHITESPACE); return TOKOUTPUT; }
|
|
||||||
terminal { WS_STRING; return TOKTERMINAL; }
|
|
||||||
font { WS_STRING; return TOKFONT; }
|
|
||||||
assign { yy_push_state(ASSIGN_TARGET_COND); yy_push_state(ASSIGN_COND); return TOKASSIGN; }
|
|
||||||
set[^\n]* { return TOKCOMMENT; }
|
|
||||||
ipc-socket { WS_STRING; return TOKIPCSOCKET; }
|
|
||||||
ipc_socket { WS_STRING; return TOKIPCSOCKET; }
|
|
||||||
restart_state { WS_STRING; return TOKRESTARTSTATE; }
|
|
||||||
default_orientation { return TOK_ORIENTATION; }
|
|
||||||
horizontal { return TOK_HORIZ; }
|
|
||||||
vertical { return TOK_VERT; }
|
|
||||||
auto { return TOK_AUTO; }
|
|
||||||
workspace_layout { return TOK_WORKSPACE_LAYOUT; }
|
|
||||||
new_window { return TOKNEWWINDOW; }
|
|
||||||
new_float { return TOKNEWFLOAT; }
|
|
||||||
normal { yy_push_state(BORDER_WIDTH); return TOK_NORMAL; }
|
|
||||||
none { return TOK_NONE; }
|
|
||||||
1pixel { return TOK_1PIXEL; }
|
|
||||||
pixel { yy_push_state(BORDER_WIDTH); return TOK_PIXEL; }
|
|
||||||
hide_edge_borders { return TOK_HIDE_EDGE_BORDERS; }
|
|
||||||
both { return TOK_BOTH; }
|
|
||||||
focus_follows_mouse { return TOKFOCUSFOLLOWSMOUSE; }
|
|
||||||
force_focus_wrapping { return TOK_FORCE_FOCUS_WRAPPING; }
|
|
||||||
force_xinerama { return TOK_FORCE_XINERAMA; }
|
|
||||||
force-xinerama { return TOK_FORCE_XINERAMA; }
|
|
||||||
fake_outputs { WS_STRING; return TOK_FAKE_OUTPUTS; }
|
|
||||||
fake-outputs { WS_STRING; return TOK_FAKE_OUTPUTS; }
|
|
||||||
workspace_auto_back_and_forth { return TOK_WORKSPACE_AUTO_BAF; }
|
|
||||||
force_display_urgency_hint { return TOK_WORKSPACE_URGENCY_TIMER; }
|
|
||||||
ms { return TOK_TIME_MS; }
|
|
||||||
workspace_bar { return TOKWORKSPACEBAR; }
|
|
||||||
popup_during_fullscreen { return TOK_POPUP_DURING_FULLSCREEN; }
|
|
||||||
ignore { return TOK_IGNORE; }
|
|
||||||
leave_fullscreen { return TOK_LEAVE_FULLSCREEN; }
|
|
||||||
for_window {
|
|
||||||
/* Example: for_window [class="urxvt"] border none
|
|
||||||
*
|
|
||||||
* First, we wait for the ']' that finishes a match (FOR_WINDOW_COND)
|
|
||||||
* Then, we require a whitespace (EAT_WHITESPACE)
|
|
||||||
* And the rest of the line is parsed as a string
|
|
||||||
*/
|
|
||||||
yy_push_state(WANT_STRING);
|
|
||||||
yy_push_state(EAT_WHITESPACE);
|
|
||||||
yy_push_state(FOR_WINDOW_COND);
|
|
||||||
return TOK_FOR_WINDOW;
|
|
||||||
}
|
|
||||||
default { /* yylval.number = MODE_DEFAULT; */return TOK_DEFAULT; }
|
|
||||||
stacking { /* yylval.number = MODE_STACK; */return TOK_STACKING; }
|
|
||||||
stacked { return TOK_STACKING; }
|
|
||||||
tabbed { /* yylval.number = MODE_TABBED; */return TOK_TABBED; }
|
|
||||||
stack-limit { return TOKSTACKLIMIT; }
|
|
||||||
cols { /* yylval.number = STACK_LIMIT_COLS; */return TOKSTACKLIMIT; }
|
|
||||||
rows { /* yylval.number = STACK_LIMIT_ROWS; */return TOKSTACKLIMIT; }
|
|
||||||
exec { WS_STRING; yy_push_state(EXEC); yy_push_state(EAT_WHITESPACE); return TOKEXEC; }
|
|
||||||
exec_always { WS_STRING; yy_push_state(EXEC); yy_push_state(EAT_WHITESPACE); return TOKEXEC_ALWAYS; }
|
|
||||||
client.background { yy_push_state(COLOR_COND); yylval.single_color = &config.client.background; return TOKSINGLECOLOR; }
|
|
||||||
client.focused { yy_push_state(COLOR_COND); yy_push_state(COLOR_COND); yy_push_state(COLOR_COND); yy_push_state(COLOR_COND); yylval.color = &config.client.focused; return TOKCOLOR; }
|
|
||||||
client.focused_inactive { yy_push_state(COLOR_COND); yy_push_state(COLOR_COND); yy_push_state(COLOR_COND); yy_push_state(COLOR_COND); yylval.color = &config.client.focused_inactive; return TOKCOLOR; }
|
|
||||||
client.unfocused { yy_push_state(COLOR_COND); yy_push_state(COLOR_COND); yy_push_state(COLOR_COND); yy_push_state(COLOR_COND); yylval.color = &config.client.unfocused; return TOKCOLOR; }
|
|
||||||
client.urgent { yy_push_state(COLOR_COND); yy_push_state(COLOR_COND); yy_push_state(COLOR_COND); yy_push_state(COLOR_COND); yylval.color = &config.client.urgent; return TOKCOLOR; }
|
|
||||||
bar.focused { yy_push_state(COLOR_COND); yylval.color = &config.bar.focused; return TOKCOLOR; }
|
|
||||||
bar.unfocused { yy_push_state(COLOR_COND); yylval.color = &config.bar.unfocused; return TOKCOLOR; }
|
|
||||||
bar.urgent { yy_push_state(COLOR_COND); yylval.color = &config.bar.urgent; return TOKCOLOR; }
|
|
||||||
Mod1 { yylval.number = BIND_MOD1; return MODIFIER; }
|
|
||||||
Mod2 { yylval.number = BIND_MOD2; return MODIFIER; }
|
|
||||||
Mod3 { yylval.number = BIND_MOD3; return MODIFIER; }
|
|
||||||
Mod4 { yylval.number = BIND_MOD4; return MODIFIER; }
|
|
||||||
Mod5 { yylval.number = BIND_MOD5; return MODIFIER; }
|
|
||||||
Mode_switch { yylval.number = BIND_MODE_SWITCH; return MODIFIER; }
|
|
||||||
control { return TOKCONTROL; }
|
|
||||||
ctrl { return TOKCONTROL; }
|
|
||||||
shift { return TOKSHIFT; }
|
|
||||||
|
|
||||||
class { yy_push_state(WANT_QSTRING); return TOK_CLASS; }
|
|
||||||
instance { yy_push_state(WANT_QSTRING); return TOK_INSTANCE; }
|
|
||||||
window_role { yy_push_state(WANT_QSTRING); return TOK_WINDOW_ROLE; }
|
|
||||||
id { yy_push_state(WANT_QSTRING); return TOK_ID; }
|
|
||||||
con_id { yy_push_state(WANT_QSTRING); return TOK_CON_ID; }
|
|
||||||
con_mark { yy_push_state(WANT_QSTRING); return TOK_MARK; }
|
|
||||||
title { yy_push_state(WANT_QSTRING); return TOK_TITLE; }
|
|
||||||
urgent { yy_push_state(WANT_QSTRING); return TOK_URGENT; }
|
|
||||||
|
|
||||||
<*>{EOL} {
|
|
||||||
FREE(context->line_copy);
|
|
||||||
context->line_number++;
|
|
||||||
yy_push_state(BUFFER_LINE);
|
|
||||||
}
|
|
||||||
<BINDSYM_COND>[ \t]+ { yy_pop_state(); yy_push_state(WANT_STRING); }
|
|
||||||
<OUTPUT_COND>[ \t]+ { yy_pop_state(); yy_push_state(WANT_STRING); }
|
|
||||||
[ \t]+ { /* ignore whitespace */ ; }
|
|
||||||
\"[^\"]+\" {
|
|
||||||
/* if ASSIGN_COND then */
|
|
||||||
if (yy_start_stack_ptr > 0)
|
|
||||||
yy_pop_state();
|
|
||||||
/* yylval will be the string, but without quotes */
|
|
||||||
char *copy = sstrdup(yytext+1);
|
|
||||||
copy[strlen(copy)-1] = '\0';
|
|
||||||
yylval.string = copy;
|
|
||||||
return QUOTEDSTRING;
|
|
||||||
}
|
|
||||||
<ASSIGN_COND>[^ \t\"\[]+ { BEGIN(ASSIGN_TARGET_COND); yylval.string = sstrdup(yytext); return STR_NG; }
|
|
||||||
<BINDSYM_COND>[a-zA-Z0-9_]+ { yylval.string = sstrdup(yytext); return WORD; }
|
|
||||||
[a-zA-Z]+ { yylval.string = sstrdup(yytext); return WORD; }
|
|
||||||
. { return (int)yytext[0]; }
|
|
||||||
|
|
||||||
<<EOF>> {
|
|
||||||
while (yy_start_stack_ptr > 0)
|
|
||||||
yy_pop_state();
|
|
||||||
yyterminate();
|
|
||||||
}
|
|
||||||
|
|
||||||
%%
|
|
||||||
1875
src/cfgparse.y
1875
src/cfgparse.y
File diff suppressed because it is too large
Load Diff
|
|
@ -31,6 +31,10 @@
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
|
||||||
#include "all.h"
|
#include "all.h"
|
||||||
|
|
||||||
|
|
@ -38,6 +42,14 @@
|
||||||
#define y(x, ...) yajl_gen_ ## x (command_output.json_gen, ##__VA_ARGS__)
|
#define y(x, ...) yajl_gen_ ## x (command_output.json_gen, ##__VA_ARGS__)
|
||||||
#define ystr(str) yajl_gen_string(command_output.json_gen, (unsigned char*)str, strlen(str))
|
#define ystr(str) yajl_gen_string(command_output.json_gen, (unsigned char*)str, strlen(str))
|
||||||
|
|
||||||
|
#ifndef TEST_PARSER
|
||||||
|
static pid_t configerror_pid = -1;
|
||||||
|
/* The path to the temporary script files used by i3-nagbar. We need to keep
|
||||||
|
* them around to delete the files in the i3-nagbar SIGCHLD handler. */
|
||||||
|
static char *edit_script_path, *pager_script_path;
|
||||||
|
static struct context *context;
|
||||||
|
#endif
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* The data structures used for parsing. Essentially the current state and a
|
* The data structures used for parsing. Essentially the current state and a
|
||||||
* list of tokens for that state.
|
* list of tokens for that state.
|
||||||
|
|
@ -649,4 +661,579 @@ int main(int argc, char *argv[]) {
|
||||||
context.filename = "<stdin>";
|
context.filename = "<stdin>";
|
||||||
parse_config(argv[1], &context);
|
parse_config(argv[1], &context);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Writes the given command as a shell script to path.
|
||||||
|
* Returns true unless something went wrong.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
static bool write_nagbar_script(const char *path, const char *command) {
|
||||||
|
int fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IXUSR);
|
||||||
|
if (fd == -1) {
|
||||||
|
warn("Could not create temporary script to store the nagbar command");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
write(fd, "#!/bin/sh\n", strlen("#!/bin/sh\n"));
|
||||||
|
write(fd, command, strlen(command));
|
||||||
|
close(fd);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Handler which will be called when we get a SIGCHLD for the nagbar, meaning
|
||||||
|
* it exited (or could not be started, depending on the exit code).
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
static void nagbar_exited(EV_P_ ev_child *watcher, int revents) {
|
||||||
|
ev_child_stop(EV_A_ watcher);
|
||||||
|
|
||||||
|
if (unlink(edit_script_path) != 0)
|
||||||
|
warn("Could not delete temporary i3-nagbar script %s", edit_script_path);
|
||||||
|
if (unlink(pager_script_path) != 0)
|
||||||
|
warn("Could not delete temporary i3-nagbar script %s", pager_script_path);
|
||||||
|
|
||||||
|
if (!WIFEXITED(watcher->rstatus)) {
|
||||||
|
fprintf(stderr, "ERROR: i3-nagbar did not exit normally.\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int exitcode = WEXITSTATUS(watcher->rstatus);
|
||||||
|
printf("i3-nagbar process exited with status %d\n", exitcode);
|
||||||
|
if (exitcode == 2) {
|
||||||
|
fprintf(stderr, "ERROR: i3-nagbar could not be found. Is it correctly installed on your system?\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
configerror_pid = -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* We need ev >= 4 for the following code. Since it is not *that* important (it
|
||||||
|
* only makes sure that there are no i3-nagbar instances left behind) we still
|
||||||
|
* support old systems with libev 3. */
|
||||||
|
#if EV_VERSION_MAJOR >= 4
|
||||||
|
/*
|
||||||
|
* Cleanup handler. Will be called when i3 exits. Kills i3-nagbar with signal
|
||||||
|
* SIGKILL (9) to make sure there are no left-over i3-nagbar processes.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
static void nagbar_cleanup(EV_P_ ev_cleanup *watcher, int revent) {
|
||||||
|
if (configerror_pid != -1) {
|
||||||
|
LOG("Sending SIGKILL (9) to i3-nagbar with PID %d\n", configerror_pid);
|
||||||
|
kill(configerror_pid, SIGKILL);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Kills the configerror i3-nagbar process, if any.
|
||||||
|
*
|
||||||
|
* Called when reloading/restarting.
|
||||||
|
*
|
||||||
|
* If wait_for_it is set (restarting), this function will waitpid(), otherwise,
|
||||||
|
* ev is assumed to handle it (reloading).
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
void kill_configerror_nagbar(bool wait_for_it) {
|
||||||
|
if (configerror_pid == -1)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (kill(configerror_pid, SIGTERM) == -1)
|
||||||
|
warn("kill(configerror_nagbar) failed");
|
||||||
|
|
||||||
|
if (!wait_for_it)
|
||||||
|
return;
|
||||||
|
|
||||||
|
/* When restarting, we don’t enter the ev main loop anymore and after the
|
||||||
|
* exec(), our old pid is no longer watched. So, ev won’t handle SIGCHLD
|
||||||
|
* for us and we would end up with a <defunct> process. Therefore we
|
||||||
|
* waitpid() here. */
|
||||||
|
waitpid(configerror_pid, NULL, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Goes through each line of buf (separated by \n) and checks for statements /
|
||||||
|
* commands which only occur in i3 v4 configuration files. If it finds any, it
|
||||||
|
* returns version 4, otherwise it returns version 3.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
static int detect_version(char *buf) {
|
||||||
|
char *walk = buf;
|
||||||
|
char *line = buf;
|
||||||
|
while (*walk != '\0') {
|
||||||
|
if (*walk != '\n') {
|
||||||
|
walk++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* check for some v4-only statements */
|
||||||
|
if (strncasecmp(line, "bindcode", strlen("bindcode")) == 0 ||
|
||||||
|
strncasecmp(line, "force_focus_wrapping", strlen("force_focus_wrapping")) == 0 ||
|
||||||
|
strncasecmp(line, "# i3 config file (v4)", strlen("# i3 config file (v4)")) == 0 ||
|
||||||
|
strncasecmp(line, "workspace_layout", strlen("workspace_layout")) == 0) {
|
||||||
|
printf("deciding for version 4 due to this line: %.*s\n", (int)(walk-line), line);
|
||||||
|
return 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* if this is a bind statement, we can check the command */
|
||||||
|
if (strncasecmp(line, "bind", strlen("bind")) == 0) {
|
||||||
|
char *bind = strchr(line, ' ');
|
||||||
|
if (bind == NULL)
|
||||||
|
goto next;
|
||||||
|
while ((*bind == ' ' || *bind == '\t') && *bind != '\0')
|
||||||
|
bind++;
|
||||||
|
if (*bind == '\0')
|
||||||
|
goto next;
|
||||||
|
if ((bind = strchr(bind, ' ')) == NULL)
|
||||||
|
goto next;
|
||||||
|
while ((*bind == ' ' || *bind == '\t') && *bind != '\0')
|
||||||
|
bind++;
|
||||||
|
if (*bind == '\0')
|
||||||
|
goto next;
|
||||||
|
if (strncasecmp(bind, "layout", strlen("layout")) == 0 ||
|
||||||
|
strncasecmp(bind, "floating", strlen("floating")) == 0 ||
|
||||||
|
strncasecmp(bind, "workspace", strlen("workspace")) == 0 ||
|
||||||
|
strncasecmp(bind, "focus left", strlen("focus left")) == 0 ||
|
||||||
|
strncasecmp(bind, "focus right", strlen("focus right")) == 0 ||
|
||||||
|
strncasecmp(bind, "focus up", strlen("focus up")) == 0 ||
|
||||||
|
strncasecmp(bind, "focus down", strlen("focus down")) == 0 ||
|
||||||
|
strncasecmp(bind, "border normal", strlen("border normal")) == 0 ||
|
||||||
|
strncasecmp(bind, "border 1pixel", strlen("border 1pixel")) == 0 ||
|
||||||
|
strncasecmp(bind, "border pixel", strlen("border pixel")) == 0 ||
|
||||||
|
strncasecmp(bind, "border borderless", strlen("border borderless")) == 0 ||
|
||||||
|
strncasecmp(bind, "--no-startup-id", strlen("--no-startup-id")) == 0 ||
|
||||||
|
strncasecmp(bind, "bar", strlen("bar")) == 0) {
|
||||||
|
printf("deciding for version 4 due to this line: %.*s\n", (int)(walk-line), line);
|
||||||
|
return 4;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
next:
|
||||||
|
/* advance to the next line */
|
||||||
|
walk++;
|
||||||
|
line = walk;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Calls i3-migrate-config-to-v4 to migrate a configuration file (input
|
||||||
|
* buffer).
|
||||||
|
*
|
||||||
|
* Returns the converted config file or NULL if there was an error (for
|
||||||
|
* example the script could not be found in $PATH or the i3 executable’s
|
||||||
|
* directory).
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
static char *migrate_config(char *input, off_t size) {
|
||||||
|
int writepipe[2];
|
||||||
|
int readpipe[2];
|
||||||
|
|
||||||
|
if (pipe(writepipe) != 0 ||
|
||||||
|
pipe(readpipe) != 0) {
|
||||||
|
warn("migrate_config: Could not create pipes");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
pid_t pid = fork();
|
||||||
|
if (pid == -1) {
|
||||||
|
warn("Could not fork()");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* child */
|
||||||
|
if (pid == 0) {
|
||||||
|
/* close writing end of writepipe, connect reading side to stdin */
|
||||||
|
close(writepipe[1]);
|
||||||
|
dup2(writepipe[0], 0);
|
||||||
|
|
||||||
|
/* close reading end of readpipe, connect writing side to stdout */
|
||||||
|
close(readpipe[0]);
|
||||||
|
dup2(readpipe[1], 1);
|
||||||
|
|
||||||
|
static char *argv[] = {
|
||||||
|
NULL, /* will be replaced by the executable path */
|
||||||
|
NULL
|
||||||
|
};
|
||||||
|
exec_i3_utility("i3-migrate-config-to-v4", argv);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* parent */
|
||||||
|
|
||||||
|
/* close reading end of the writepipe (connected to the script’s stdin) */
|
||||||
|
close(writepipe[0]);
|
||||||
|
|
||||||
|
/* write the whole config file to the pipe, the script will read everything
|
||||||
|
* immediately */
|
||||||
|
int written = 0;
|
||||||
|
int ret;
|
||||||
|
while (written < size) {
|
||||||
|
if ((ret = write(writepipe[1], input + written, size - written)) < 0) {
|
||||||
|
warn("Could not write to pipe");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
written += ret;
|
||||||
|
}
|
||||||
|
close(writepipe[1]);
|
||||||
|
|
||||||
|
/* close writing end of the readpipe (connected to the script’s stdout) */
|
||||||
|
close(readpipe[1]);
|
||||||
|
|
||||||
|
/* read the script’s output */
|
||||||
|
int conv_size = 65535;
|
||||||
|
char *converted = malloc(conv_size);
|
||||||
|
int read_bytes = 0;
|
||||||
|
do {
|
||||||
|
if (read_bytes == conv_size) {
|
||||||
|
conv_size += 65535;
|
||||||
|
converted = realloc(converted, conv_size);
|
||||||
|
}
|
||||||
|
ret = read(readpipe[0], converted + read_bytes, conv_size - read_bytes);
|
||||||
|
if (ret == -1) {
|
||||||
|
warn("Cannot read from pipe");
|
||||||
|
FREE(converted);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
read_bytes += ret;
|
||||||
|
} while (ret > 0);
|
||||||
|
|
||||||
|
/* get the returncode */
|
||||||
|
int status;
|
||||||
|
wait(&status);
|
||||||
|
if (!WIFEXITED(status)) {
|
||||||
|
fprintf(stderr, "Child did not terminate normally, using old config file (will lead to broken behaviour)\n");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
int returncode = WEXITSTATUS(status);
|
||||||
|
if (returncode != 0) {
|
||||||
|
fprintf(stderr, "Migration process exit code was != 0\n");
|
||||||
|
if (returncode == 2) {
|
||||||
|
fprintf(stderr, "could not start the migration script\n");
|
||||||
|
/* TODO: script was not found. tell the user to fix his system or create a v4 config */
|
||||||
|
} else if (returncode == 1) {
|
||||||
|
fprintf(stderr, "This already was a v4 config. Please add the following line to your config file:\n");
|
||||||
|
fprintf(stderr, "# i3 config file (v4)\n");
|
||||||
|
/* TODO: nag the user with a message to include a hint for i3 in his config file */
|
||||||
|
}
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
return converted;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Checks for duplicate key bindings (the same keycode or keysym is configured
|
||||||
|
* more than once). If a duplicate binding is found, a message is printed to
|
||||||
|
* stderr and the has_errors variable is set to true, which will start
|
||||||
|
* i3-nagbar.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
static void check_for_duplicate_bindings(struct context *context) {
|
||||||
|
Binding *bind, *current;
|
||||||
|
TAILQ_FOREACH(current, bindings, bindings) {
|
||||||
|
TAILQ_FOREACH(bind, bindings, bindings) {
|
||||||
|
/* Abort when we reach the current keybinding, only check the
|
||||||
|
* bindings before */
|
||||||
|
if (bind == current)
|
||||||
|
break;
|
||||||
|
|
||||||
|
/* Check if one is using keysym while the other is using bindsym.
|
||||||
|
* If so, skip. */
|
||||||
|
/* XXX: It should be checked at a later place (when translating the
|
||||||
|
* keysym to keycodes) if there are any duplicates */
|
||||||
|
if ((bind->symbol == NULL && current->symbol != NULL) ||
|
||||||
|
(bind->symbol != NULL && current->symbol == NULL))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
/* If bind is NULL, current has to be NULL, too (see above).
|
||||||
|
* If the keycodes differ, it can't be a duplicate. */
|
||||||
|
if (bind->symbol != NULL &&
|
||||||
|
strcasecmp(bind->symbol, current->symbol) != 0)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
/* Check if the keycodes or modifiers are different. If so, they
|
||||||
|
* can't be duplicate */
|
||||||
|
if (bind->keycode != current->keycode ||
|
||||||
|
bind->mods != current->mods ||
|
||||||
|
bind->release != current->release)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
context->has_errors = true;
|
||||||
|
if (current->keycode != 0) {
|
||||||
|
ELOG("Duplicate keybinding in config file:\n modmask %d with keycode %d, command \"%s\"\n",
|
||||||
|
current->mods, current->keycode, current->command);
|
||||||
|
} else {
|
||||||
|
ELOG("Duplicate keybinding in config file:\n modmask %d with keysym %s, command \"%s\"\n",
|
||||||
|
current->mods, current->symbol, current->command);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Starts an i3-nagbar process which alerts the user that his configuration
|
||||||
|
* file contains one or more errors. Also offers two buttons: One to launch an
|
||||||
|
* $EDITOR on the config file and another one to launch a $PAGER on the error
|
||||||
|
* logfile.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
static void start_configerror_nagbar(const char *config_path) {
|
||||||
|
if (only_check_config)
|
||||||
|
return;
|
||||||
|
|
||||||
|
fprintf(stderr, "Starting i3-nagbar due to configuration errors\n");
|
||||||
|
|
||||||
|
/* We need to create a custom script containing our actual command
|
||||||
|
* since not every terminal emulator which is contained in
|
||||||
|
* i3-sensible-terminal supports -e with multiple arguments (and not
|
||||||
|
* all of them support -e with one quoted argument either).
|
||||||
|
*
|
||||||
|
* NB: The paths need to be unique, that is, don’t assume users close
|
||||||
|
* their nagbars at any point in time (and they still need to work).
|
||||||
|
* */
|
||||||
|
edit_script_path = get_process_filename("nagbar-cfgerror-edit");
|
||||||
|
pager_script_path = get_process_filename("nagbar-cfgerror-pager");
|
||||||
|
|
||||||
|
configerror_pid = fork();
|
||||||
|
if (configerror_pid == -1) {
|
||||||
|
warn("Could not fork()");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* child */
|
||||||
|
if (configerror_pid == 0) {
|
||||||
|
char *edit_command, *pager_command;
|
||||||
|
sasprintf(&edit_command, "i3-sensible-editor \"%s\" && i3-msg reload\n", config_path);
|
||||||
|
sasprintf(&pager_command, "i3-sensible-pager \"%s\"\n", errorfilename);
|
||||||
|
if (!write_nagbar_script(edit_script_path, edit_command) ||
|
||||||
|
!write_nagbar_script(pager_script_path, pager_command))
|
||||||
|
return;
|
||||||
|
|
||||||
|
char *editaction,
|
||||||
|
*pageraction;
|
||||||
|
sasprintf(&editaction, "i3-sensible-terminal -e \"%s\"", edit_script_path);
|
||||||
|
sasprintf(&pageraction, "i3-sensible-terminal -e \"%s\"", pager_script_path);
|
||||||
|
char *argv[] = {
|
||||||
|
NULL, /* will be replaced by the executable path */
|
||||||
|
"-t",
|
||||||
|
(context->has_errors ? "error" : "warning"),
|
||||||
|
"-m",
|
||||||
|
(context->has_errors ?
|
||||||
|
"You have an error in your i3 config file!" :
|
||||||
|
"Your config is outdated. Please fix the warnings to make sure everything works."),
|
||||||
|
"-b",
|
||||||
|
"edit config",
|
||||||
|
editaction,
|
||||||
|
(errorfilename ? "-b" : NULL),
|
||||||
|
(context->has_errors ? "show errors" : "show warnings"),
|
||||||
|
pageraction,
|
||||||
|
NULL
|
||||||
|
};
|
||||||
|
exec_i3_utility("i3-nagbar", argv);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* parent */
|
||||||
|
/* install a child watcher */
|
||||||
|
ev_child *child = smalloc(sizeof(ev_child));
|
||||||
|
ev_child_init(child, &nagbar_exited, configerror_pid, 0);
|
||||||
|
ev_child_start(main_loop, child);
|
||||||
|
|
||||||
|
/* We need ev >= 4 for the following code. Since it is not *that* important (it
|
||||||
|
* only makes sure that there are no i3-nagbar instances left behind) we still
|
||||||
|
* support old systems with libev 3. */
|
||||||
|
#if EV_VERSION_MAJOR >= 4
|
||||||
|
/* install a cleanup watcher (will be called when i3 exits and i3-nagbar is
|
||||||
|
* still running) */
|
||||||
|
ev_cleanup *cleanup = smalloc(sizeof(ev_cleanup));
|
||||||
|
ev_cleanup_init(cleanup, nagbar_cleanup);
|
||||||
|
ev_cleanup_start(main_loop, cleanup);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
void parse_file(const char *f) {
|
||||||
|
SLIST_HEAD(variables_head, Variable) variables = SLIST_HEAD_INITIALIZER(&variables);
|
||||||
|
int fd, ret, read_bytes = 0;
|
||||||
|
struct stat stbuf;
|
||||||
|
char *buf;
|
||||||
|
FILE *fstr;
|
||||||
|
char buffer[1026], key[512], value[512];
|
||||||
|
|
||||||
|
if ((fd = open(f, O_RDONLY)) == -1)
|
||||||
|
die("Could not open configuration file: %s\n", strerror(errno));
|
||||||
|
|
||||||
|
if (fstat(fd, &stbuf) == -1)
|
||||||
|
die("Could not fstat file: %s\n", strerror(errno));
|
||||||
|
|
||||||
|
buf = scalloc((stbuf.st_size + 1) * sizeof(char));
|
||||||
|
while (read_bytes < stbuf.st_size) {
|
||||||
|
if ((ret = read(fd, buf + read_bytes, (stbuf.st_size - read_bytes))) < 0)
|
||||||
|
die("Could not read(): %s\n", strerror(errno));
|
||||||
|
read_bytes += ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (lseek(fd, 0, SEEK_SET) == (off_t)-1)
|
||||||
|
die("Could not lseek: %s\n", strerror(errno));
|
||||||
|
|
||||||
|
if ((fstr = fdopen(fd, "r")) == NULL)
|
||||||
|
die("Could not fdopen: %s\n", strerror(errno));
|
||||||
|
|
||||||
|
while (!feof(fstr)) {
|
||||||
|
if (fgets(buffer, 1024, fstr) == NULL) {
|
||||||
|
if (feof(fstr))
|
||||||
|
break;
|
||||||
|
die("Could not read configuration file\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
/* sscanf implicitly strips whitespace. Also, we skip comments and empty lines. */
|
||||||
|
if (sscanf(buffer, "%s %[^\n]", key, value) < 1 ||
|
||||||
|
key[0] == '#' || strlen(key) < 3)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (strcasecmp(key, "set") == 0) {
|
||||||
|
if (value[0] != '$') {
|
||||||
|
ELOG("Malformed variable assignment, name has to start with $\n");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* get key/value for this variable */
|
||||||
|
char *v_key = value, *v_value;
|
||||||
|
if (strstr(value, " ") == NULL && strstr(value, "\t") == NULL) {
|
||||||
|
ELOG("Malformed variable assignment, need a value\n");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!(v_value = strstr(value, " ")))
|
||||||
|
v_value = strstr(value, "\t");
|
||||||
|
|
||||||
|
*(v_value++) = '\0';
|
||||||
|
while (*v_value == '\t' || *v_value == ' ')
|
||||||
|
v_value++;
|
||||||
|
|
||||||
|
struct Variable *new = scalloc(sizeof(struct Variable));
|
||||||
|
new->key = sstrdup(v_key);
|
||||||
|
new->value = sstrdup(v_value);
|
||||||
|
SLIST_INSERT_HEAD(&variables, new, variables);
|
||||||
|
DLOG("Got new variable %s = %s\n", v_key, v_value);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fclose(fstr);
|
||||||
|
|
||||||
|
/* For every custom variable, see how often it occurs in the file and
|
||||||
|
* how much extra bytes it requires when replaced. */
|
||||||
|
struct Variable *current, *nearest;
|
||||||
|
int extra_bytes = 0;
|
||||||
|
/* We need to copy the buffer because we need to invalidate the
|
||||||
|
* variables (otherwise we will count them twice, which is bad when
|
||||||
|
* 'extra' is negative) */
|
||||||
|
char *bufcopy = sstrdup(buf);
|
||||||
|
SLIST_FOREACH(current, &variables, variables) {
|
||||||
|
int extra = (strlen(current->value) - strlen(current->key));
|
||||||
|
char *next;
|
||||||
|
for (next = bufcopy;
|
||||||
|
next < (bufcopy + stbuf.st_size) &&
|
||||||
|
(next = strcasestr(next, current->key)) != NULL;
|
||||||
|
next += strlen(current->key)) {
|
||||||
|
*next = '_';
|
||||||
|
extra_bytes += extra;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FREE(bufcopy);
|
||||||
|
|
||||||
|
/* 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 + 1) * sizeof(char));
|
||||||
|
destwalk = new;
|
||||||
|
while (walk < (buf + stbuf.st_size)) {
|
||||||
|
/* Find the next variable */
|
||||||
|
SLIST_FOREACH(current, &variables, variables)
|
||||||
|
current->next_match = strcasestr(walk, current->key);
|
||||||
|
nearest = NULL;
|
||||||
|
int distance = stbuf.st_size;
|
||||||
|
SLIST_FOREACH(current, &variables, variables) {
|
||||||
|
if (current->next_match == NULL)
|
||||||
|
continue;
|
||||||
|
if ((current->next_match - walk) < distance) {
|
||||||
|
distance = (current->next_match - walk);
|
||||||
|
nearest = current;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (nearest == NULL) {
|
||||||
|
/* If there are no more variables, we just copy the rest */
|
||||||
|
strncpy(destwalk, walk, (buf + stbuf.st_size) - walk);
|
||||||
|
destwalk += (buf + stbuf.st_size) - walk;
|
||||||
|
*destwalk = '\0';
|
||||||
|
break;
|
||||||
|
} else {
|
||||||
|
/* Copy until the next variable, then copy its value */
|
||||||
|
strncpy(destwalk, walk, distance);
|
||||||
|
strncpy(destwalk + distance, nearest->value, strlen(nearest->value));
|
||||||
|
walk += distance + strlen(nearest->key);
|
||||||
|
destwalk += distance + strlen(nearest->value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* analyze the string to find out whether this is an old config file (3.x)
|
||||||
|
* or a new config file (4.x). If it’s old, we run the converter script. */
|
||||||
|
int version = detect_version(buf);
|
||||||
|
if (version == 3) {
|
||||||
|
/* We need to convert this v3 configuration */
|
||||||
|
char *converted = migrate_config(new, stbuf.st_size);
|
||||||
|
if (converted != NULL) {
|
||||||
|
ELOG("\n");
|
||||||
|
ELOG("****************************************************************\n");
|
||||||
|
ELOG("NOTE: Automatically converted configuration file from v3 to v4.\n");
|
||||||
|
ELOG("\n");
|
||||||
|
ELOG("Please convert your config file to v4. You can use this command:\n");
|
||||||
|
ELOG(" mv %s %s.O\n", f, f);
|
||||||
|
ELOG(" i3-migrate-config-to-v4 %s.O > %s\n", f, f);
|
||||||
|
ELOG("****************************************************************\n");
|
||||||
|
ELOG("\n");
|
||||||
|
free(new);
|
||||||
|
new = converted;
|
||||||
|
} else {
|
||||||
|
printf("\n");
|
||||||
|
printf("**********************************************************************\n");
|
||||||
|
printf("ERROR: Could not convert config file. Maybe i3-migrate-config-to-v4\n");
|
||||||
|
printf("was not correctly installed on your system?\n");
|
||||||
|
printf("**********************************************************************\n");
|
||||||
|
printf("\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
context = scalloc(sizeof(struct context));
|
||||||
|
context->filename = f;
|
||||||
|
|
||||||
|
struct ConfigResult *config_output = parse_config(new, context);
|
||||||
|
yajl_gen_free(config_output->json_gen);
|
||||||
|
|
||||||
|
check_for_duplicate_bindings(context);
|
||||||
|
|
||||||
|
if (context->has_errors || context->has_warnings) {
|
||||||
|
ELOG("FYI: You are using i3 version " I3_VERSION "\n");
|
||||||
|
if (version == 3)
|
||||||
|
ELOG("Please convert your configfile first, then fix any remaining errors (see above).\n");
|
||||||
|
start_configerror_nagbar(f);
|
||||||
|
}
|
||||||
|
|
||||||
|
FREE(context->line_copy);
|
||||||
|
free(context);
|
||||||
|
free(new);
|
||||||
|
free(buf);
|
||||||
|
|
||||||
|
while (!SLIST_EMPTY(&variables)) {
|
||||||
|
current = SLIST_FIRST(&variables);
|
||||||
|
FREE(current->key);
|
||||||
|
FREE(current->value);
|
||||||
|
SLIST_REMOVE_HEAD(&variables, variables);
|
||||||
|
FREE(current);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
11
src/i3.mk
11
src/i3.mk
|
|
@ -2,7 +2,6 @@ ALL_TARGETS += i3
|
||||||
INSTALL_TARGETS += install-i3
|
INSTALL_TARGETS += install-i3
|
||||||
CLEAN_TARGETS += clean-i3
|
CLEAN_TARGETS += clean-i3
|
||||||
|
|
||||||
i3_SOURCES_GENERATED = src/cfgparse.tab.c src/cfgparse.yy.c
|
|
||||||
i3_SOURCES := $(filter-out $(i3_SOURCES_GENERATED),$(wildcard src/*.c))
|
i3_SOURCES := $(filter-out $(i3_SOURCES_GENERATED),$(wildcard src/*.c))
|
||||||
i3_HEADERS_CMDPARSER := $(wildcard include/GENERATED_*.h)
|
i3_HEADERS_CMDPARSER := $(wildcard include/GENERATED_*.h)
|
||||||
i3_HEADERS := $(filter-out $(i3_HEADERS_CMDPARSER),$(wildcard include/*.h))
|
i3_HEADERS := $(filter-out $(i3_HEADERS_CMDPARSER),$(wildcard include/*.h))
|
||||||
|
|
@ -37,14 +36,6 @@ src/%.o: src/%.c $(i3_HEADERS_DEP)
|
||||||
echo "[i3] CC $<"
|
echo "[i3] CC $<"
|
||||||
$(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) $(I3_CFLAGS) $(CFLAGS) $(PCH_FLAGS) -c -o $@ ${canonical_path}/$<
|
$(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) $(I3_CFLAGS) $(CFLAGS) $(PCH_FLAGS) -c -o $@ ${canonical_path}/$<
|
||||||
|
|
||||||
src/cfgparse.yy.c: src/cfgparse.l src/cfgparse.tab.o $(i3_HEADERS_DEP)
|
|
||||||
echo "[i3] LEX $<"
|
|
||||||
$(FLEX) -i -o $@ ${canonical_path}/$<
|
|
||||||
|
|
||||||
src/cfgparse.tab.c: src/cfgparse.y $(i3_HEADERS_DEP)
|
|
||||||
echo "[i3] YACC $<"
|
|
||||||
$(BISON) --debug --verbose -b $(basename $< .y) -d ${canonical_path}/$<
|
|
||||||
|
|
||||||
# This target compiles the command parser twice:
|
# This target compiles the command parser twice:
|
||||||
# Once with -DTEST_PARSER, creating a stand-alone executable used for tests,
|
# Once with -DTEST_PARSER, creating a stand-alone executable used for tests,
|
||||||
# and once as an object file for i3.
|
# and once as an object file for i3.
|
||||||
|
|
@ -96,4 +87,4 @@ install-i3: i3
|
||||||
|
|
||||||
clean-i3:
|
clean-i3:
|
||||||
echo "[i3] Clean"
|
echo "[i3] Clean"
|
||||||
rm -f $(i3_OBJECTS) $(i3_SOURCES_GENERATED) $(i3_HEADERS_CMDPARSER) include/loglevels.h loglevels.tmp include/all.h.pch i3-command-parser.stamp i3-config-parser.stamp i3 src/*.gcno src/cfgparse.{output,dot,tab.h,y.o} src/cmdparse.*
|
rm -f $(i3_OBJECTS) $(i3_SOURCES_GENERATED) $(i3_HEADERS_CMDPARSER) include/loglevels.h loglevels.tmp include/all.h.pch i3-command-parser.stamp i3-config-parser.stamp i3 src/*.gcno src/cfgparse.* src/cmdparse.*
|
||||||
|
|
|
||||||
|
|
@ -374,8 +374,7 @@ int main(int argc, char *argv[]) {
|
||||||
fake_outputs = sstrdup(optarg);
|
fake_outputs = sstrdup(optarg);
|
||||||
break;
|
break;
|
||||||
} else if (strcmp(long_options[option_index].name, "force-old-config-parser-v4.4-only") == 0) {
|
} else if (strcmp(long_options[option_index].name, "force-old-config-parser-v4.4-only") == 0) {
|
||||||
LOG("FORCING OLD CONFIG PARSER!\n");
|
ELOG("You are passing --force-old-config-parser-v4.4-only, but that flag was removed by now.\n");
|
||||||
force_old_config_parser = true;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
/* fall-through */
|
/* fall-through */
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue