diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-04-24 14:59:49 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-04-24 20:08:32 +1000 |
commit | 72767e1cc302e7aee9645c1eae3f51abe53fb378 (patch) | |
tree | 5220706816f7e4601f4213812ef1eb3e4cc7fa4b /sway/tree | |
parent | 38c44f2f27f218ed7e61c9910491eef78551d8ea (diff) |
Implement criteria commands
Implements the following commands:
* for_window [...] <cmdlist>
* assign [...] <workspace>
Diffstat (limited to 'sway/tree')
-rw-r--r-- | sway/tree/view.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c index 92767188..7c3b4049 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -2,8 +2,11 @@ #include <wayland-server.h> #include <wlr/types/wlr_output_layout.h> #include "log.h" +#include "sway/criteria.h" +#include "sway/commands.h" #include "sway/ipc-server.h" #include "sway/output.h" +#include "sway/input/seat.h" #include "sway/tree/container.h" #include "sway/tree/layout.h" #include "sway/tree/view.h" @@ -208,6 +211,28 @@ static void view_handle_container_reparent(struct wl_listener *listener, } } +static void view_execute_criteria(struct sway_view *view) { + struct sway_seat *seat = input_manager_current_seat(input_manager); + struct sway_container *prior_workspace = + container_parent(view->swayc, C_WORKSPACE); + list_t *criteria = criteria_for(view->swayc); + for (int i = 0; i < criteria->length; i++) { + struct criteria *crit = criteria->items[i]; + wlr_log(L_DEBUG, "for_window '%s' matches new view %p, cmd: '%s'", + crit->crit_raw, view, crit->cmdlist); + struct cmd_results *res = execute_command(crit->cmdlist, NULL); + if (res->status != CMD_SUCCESS) { + wlr_log(L_ERROR, "Command '%s' failed: %s", res->input, res->error); + } + free_cmd_results(res); + // view must be focused for commands to affect it, + // so always refocus in-between command lists + seat_set_focus(seat, view->swayc); + } + list_free(criteria); + seat_set_focus(seat, seat_get_focus_inactive(seat, prior_workspace)); +} + void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) { if (!sway_assert(view->surface == NULL, "cannot map mapped view")) { return; @@ -234,6 +259,8 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) { view_damage(view, true); view_handle_container_reparent(&view->container_reparent, NULL); + + view_execute_criteria(view); } void view_unmap(struct sway_view *view) { |