diff options
| author | Drew DeVault <[email protected]> | 2018-05-14 21:44:05 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-05-14 21:44:05 -0400 |
| commit | 95f6d0deba26436445b45d4d056c1f6dd2ee82da (patch) | |
| tree | df558830f4c0f5bc9e8943cfbf60532f2293aeda /sway/commands.c | |
| parent | f1f54bbc882775d431d14f99355d339ef9dab5a8 (diff) | |
| parent | 4d1edfcba90854bd7f37ecb1b36fe4f05c37dda3 (diff) | |
Merge pull request #1954 from RyanDwyer/marks
Implement marks
Diffstat (limited to 'sway/commands.c')
| -rw-r--r-- | sway/commands.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sway/commands.c b/sway/commands.c index 60c64776..9b6d6459 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -175,6 +175,7 @@ static struct cmd_handler command_handlers[] = { { "focus", cmd_focus }, { "kill", cmd_kill }, { "layout", cmd_layout }, + { "mark", cmd_mark }, { "move", cmd_move }, { "opacity", cmd_opacity }, { "reload", cmd_reload }, @@ -185,6 +186,7 @@ static struct cmd_handler command_handlers[] = { { "splitt", cmd_splitt }, { "splitv", cmd_splitv }, { "title_format", cmd_title_format }, + { "unmark", cmd_unmark }, }; static int handler_compare(const void *_a, const void *_b) { @@ -300,7 +302,7 @@ struct cmd_results *execute_command(char *_exec, struct sway_seat *seat) { head = exec; do { // Extract criteria (valid for this command list only). - bool has_criteria = false; + config->handler_context.using_criteria = false; if (*head == '[') { char *error = NULL; struct criteria *criteria = criteria_parse(head, &error); @@ -313,7 +315,7 @@ struct cmd_results *execute_command(char *_exec, struct sway_seat *seat) { views = criteria_get_views(criteria); head += strlen(criteria->raw); criteria_destroy(criteria); - has_criteria = true; + config->handler_context.using_criteria = true; // Skip leading whitespace head += strspn(head, whitespace); } @@ -350,7 +352,7 @@ struct cmd_results *execute_command(char *_exec, struct sway_seat *seat) { goto cleanup; } - if (!has_criteria) { + if (!config->handler_context.using_criteria) { // without criteria, the command acts upon the focused // container config->handler_context.current_container = |