#include "config.h"
#include "util.h"
+#include "libi3.h"
int cmdyycolumn = 1;
/* handle a quoted string or everything up to the next whitespace */
%s WANT_QSTRING
+%x MOVE
+%x MOVE_WS
+
+%x EXEC
+
%x BUFFER_LINE
%%
cmdyycolumn = 1;
}
- /* the next/prev tokens are here to recognize them *before* handling
- * strings ('workspace' command) */
-next { return TOK_NEXT; }
-prev { return TOK_PREV; }
+ /* The next/prev/back_and_forth tokens are here to recognize them *before*
+ * handling strings ('workspace' command). While flex uses the longest
+ * match, in case of a tie the order of rules becomes relevant. Since the
+ * input is fully consumed (these are the last tokens), it comes to a tie.
+ * */
+next { BEGIN(INITIAL); return TOK_NEXT; }
+prev { BEGIN(INITIAL); return TOK_PREV; }
+next_on_output { BEGIN(INITIAL); return TOK_NEXT_ON_OUTPUT; }
+prev_on_output { BEGIN(INITIAL); return TOK_PREV_ON_OUTPUT; }
+back_and_forth { BEGIN(INITIAL); return TOK_BACK_AND_FORTH; }
+
+ /* MOVE is the state after a 'move' token was processed. We need this state
+ * to skip some tokens (for making the commands clearer) and to properly
+ * move to the MOVE_WS state. */
+<MOVE>to { /* eat this token */ }
+<MOVE>window { /* eat this token */ }
+<MOVE>container { /* eat this token */ }
+<MOVE>workspace { yy_pop_state(); yy_push_state(MOVE_WS); yy_push_state(EAT_WHITESPACE); return TOK_WORKSPACE; }
+<MOVE>scratchpad { yy_pop_state(); return TOK_SCRATCHPAD; }
+<MOVE>output { yy_pop_state(); return TOK_OUTPUT; }
+<MOVE>up { yy_pop_state(); return TOK_UP; }
+<MOVE>down { yy_pop_state(); return TOK_DOWN; }
+<MOVE>left { yy_pop_state(); return TOK_LEFT; }
+<MOVE>right { yy_pop_state(); return TOK_RIGHT; }
+
+ /* MOVE_WS is the state after a 'workspace' token was processed in the MOVE
+ * state. We need a separate state to deal with the fact that the old
+ * 'move workspace <ws>' command needs to be supported (the new command is
+ * 'move to workspace') while we also need to support
+ * 'move workspace to output <output>'. */
+<MOVE_WS>to { yy_pop_state(); return TOK_TO; }
+<MOVE_WS>[^t] { yy_pop_state(); yy_push_state(WANT_STRING); yyless(0); }
<WANT_STRING>\"[^\"]+\" {
BEGIN(INITIAL);
<EAT_WHITESPACE>[ \t]* { yy_pop_state(); }
[ \t]* { /* ignore whitespace */ ; }
-exec { WS_STRING; return TOK_EXEC; }
+<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(); }
+exec { WS_STRING; yy_push_state(EXEC); yy_push_state(EAT_WHITESPACE); return TOK_EXEC; }
exit { return TOK_EXIT; }
reload { return TOK_RELOAD; }
restart { return TOK_RESTART; }
kill { return TOK_KILL; }
window { return TOK_WINDOW; }
+container { return TOK_CONTAINER; }
client { return TOK_CLIENT; }
fullscreen { return TOK_FULLSCREEN; }
global { return TOK_GLOBAL; }
workspace { WS_STRING; return TOK_WORKSPACE; }
output { WS_STRING; return TOK_OUTPUT; }
focus { return TOK_FOCUS; }
-move { return TOK_MOVE; }
+move { yy_push_state(MOVE); return TOK_MOVE; }
open { return TOK_OPEN; }
+scratchpad { return TOK_SCRATCHPAD; }
+show { return TOK_SHOW; }
split { return TOK_SPLIT; }
horizontal { return TOK_HORIZONTAL; }
vertical { return TOK_VERTICAL; }
px { return TOK_PX; }
or { return TOK_OR; }
ppt { return TOK_PPT; }
+to { return TOK_TO; }
nop { WS_STRING; return TOK_NOP; }
append_layout { WS_STRING; return TOK_APPEND_LAYOUT; }
mark { WS_STRING; return TOK_MARK; }
class { BEGIN(WANT_QSTRING); return TOK_CLASS; }
instance { BEGIN(WANT_QSTRING); return TOK_INSTANCE; }
+window_role { BEGIN(WANT_QSTRING); return TOK_WINDOW_ROLE; }
id { BEGIN(WANT_QSTRING); return TOK_ID; }
con_id { BEGIN(WANT_QSTRING); return TOK_CON_ID; }
con_mark { BEGIN(WANT_QSTRING); return TOK_MARK; }