X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcmdparse.l;h=ebd466afa795061a7fe80ddcb93f0d6bb476e3e4;hb=c3b4006f6b11578020238b1aa3d51eeab80d29e3;hp=55b1d28f65d0e9bb29056ab9b69154cbbc954d3d;hpb=c75a6732bf2a20823670a637e0108ae97bb9cfc3;p=i3%2Fi3 diff --git a/src/cmdparse.l b/src/cmdparse.l index 55b1d28f..ebd466af 100644 --- a/src/cmdparse.l +++ b/src/cmdparse.l @@ -88,13 +88,16 @@ global { return TOK_GLOBAL; } layout { return TOK_LAYOUT; } default { return TOK_DEFAULT; } stacked { return TOK_STACKED; } +stacking { return TOK_STACKED; } tabbed { return TOK_TABBED; } border { return TOK_BORDER; } +normal { return TOK_NORMAL; } none { return TOK_NONE; } 1pixel { return TOK_1PIXEL; } mode { return TOK_MODE; } tiling { return TOK_TILING; } floating { return TOK_FLOATING; } +toggle { return TOK_TOGGLE; } workspace { BEGIN(WANT_WS_STRING); return TOK_WORKSPACE; } focus { return TOK_FOCUS; } move { return TOK_MOVE; } @@ -107,13 +110,24 @@ vertical { return TOK_VERTICAL; } level { return TOK_LEVEL; } up { return TOK_UP; } down { return TOK_DOWN; } -before { return TOK_BEFORE; } -after { return TOK_AFTER; } +left { return TOK_LEFT; } +right { return TOK_RIGHT; } +resize { return TOK_RESIZE; } +shrink { return TOK_SHRINK; } +grow { return TOK_GROW; } +px { return TOK_PX; } +or { return TOK_OR; } +ppt { return TOK_PPT; } +nop { BEGIN(WANT_WS_STRING); return TOK_NOP; } restore { BEGIN(WANT_WS_STRING); return TOK_RESTORE; } +mark { BEGIN(WANT_WS_STRING); return TOK_MARK; } class { BEGIN(WANT_QSTRING); return TOK_CLASS; } id { BEGIN(WANT_QSTRING); return TOK_ID; } con_id { BEGIN(WANT_QSTRING); return TOK_CON_ID; } +con_mark { BEGIN(WANT_QSTRING); return TOK_MARK; } + +[0-9]+ { cmdyylval.number = atoi(yytext); return NUMBER; } . { return (int)yytext[0]; }