aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/sway/tree/view.h2
-rw-r--r--sway/commands.c2
-rw-r--r--sway/commands/assign.c57
-rw-r--r--sway/commands/for_window.c41
-rw-r--r--sway/meson.build2
-rw-r--r--sway/tree/view.c30
6 files changed, 133 insertions, 1 deletions
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 648a74c4..7237ea2a 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -39,7 +39,7 @@ struct sway_view {
enum sway_view_type type;
const struct sway_view_impl *impl;
- struct sway_container *swayc; // NULL for unmanaged views
+ struct sway_container *swayc; // NULL for unmapped views
struct wlr_surface *surface; // NULL for unmapped views
int width, height;
bool is_fullscreen;
diff --git a/sway/commands.c b/sway/commands.c
index 6af3c5d0..5827fc13 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -93,12 +93,14 @@ void apply_seat_config(struct seat_config *seat_config) {
/* Keep alphabetized */
static struct cmd_handler handlers[] = {
+ { "assign", cmd_assign },
{ "bar", cmd_bar },
{ "bindcode", cmd_bindcode },
{ "bindsym", cmd_bindsym },
{ "exec", cmd_exec },
{ "exec_always", cmd_exec_always },
{ "focus_follows_mouse", cmd_focus_follows_mouse },
+ { "for_window", cmd_for_window },
{ "fullscreen", cmd_fullscreen },
{ "include", cmd_include },
{ "input", cmd_input },
diff --git a/sway/commands/assign.c b/sway/commands/assign.c
new file mode 100644
index 00000000..eb7329aa
--- /dev/null
+++ b/sway/commands/assign.c
@@ -0,0 +1,57 @@
+#define _XOPEN_SOURCE 700
+#include <stdio.h>
+#include <string.h>
+#include "sway/commands.h"
+#include "sway/criteria.h"
+#include "list.h"
+#include "log.h"
+
+struct cmd_results *cmd_assign(int argc, char **argv) {
+ struct cmd_results *error = NULL;
+ if ((error = checkarg(argc, "assign", EXPECTED_AT_LEAST, 2))) {
+ return error;
+ }
+
+ char *criteria = *argv++;
+
+ if (strncmp(*argv, "→", strlen("→")) == 0) {
+ if (argc < 3) {
+ return cmd_results_new(CMD_INVALID, "assign", "Missing workspace");
+ }
+ argv++;
+ }
+
+ char *movecmd = "move container to workspace ";
+ size_t arglen = strlen(movecmd) + strlen(*argv) + 1;
+ char *cmdlist = calloc(1, arglen);
+ if (!cmdlist) {
+ return cmd_results_new(CMD_FAILURE, "assign", "Unable to allocate command list");
+ }
+ snprintf(cmdlist, arglen, "%s%s", movecmd, *argv);
+
+ struct criteria *crit = malloc(sizeof(struct criteria));
+ if (!crit) {
+ free(cmdlist);
+ return cmd_results_new(CMD_FAILURE, "assign", "Unable to allocate criteria");
+ }
+ crit->crit_raw = strdup(criteria);
+ crit->cmdlist = cmdlist;
+ crit->tokens = create_list();
+ char *err_str = extract_crit_tokens(crit->tokens, crit->crit_raw);
+
+ if (err_str) {
+ error = cmd_results_new(CMD_INVALID, "assign", err_str);
+ free(err_str);
+ free_criteria(crit);
+ } else if (crit->tokens->length == 0) {
+ error = cmd_results_new(CMD_INVALID, "assign", "Found no name/value pairs in criteria");
+ free_criteria(crit);
+ } else if (list_seq_find(config->criteria, criteria_cmp, crit) != -1) {
+ wlr_log(L_DEBUG, "assign: Duplicate, skipping.");
+ free_criteria(crit);
+ } else {
+ wlr_log(L_DEBUG, "assign: '%s' -> '%s' added", crit->crit_raw, crit->cmdlist);
+ list_add(config->criteria, crit);
+ }
+ return error ? error : cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/for_window.c b/sway/commands/for_window.c
new file mode 100644
index 00000000..dd5461f0
--- /dev/null
+++ b/sway/commands/for_window.c
@@ -0,0 +1,41 @@
+#define _XOPEN_SOURCE 500
+#include <string.h>
+#include "sway/commands.h"
+#include "sway/criteria.h"
+#include "list.h"
+#include "log.h"
+#include "stringop.h"
+
+struct cmd_results *cmd_for_window(int argc, char **argv) {
+ struct cmd_results *error = NULL;
+ if ((error = checkarg(argc, "for_window", EXPECTED_AT_LEAST, 2))) {
+ return error;
+ }
+ // add command to a criteria/command pair that is run against views when they appear.
+ char *criteria = argv[0], *cmdlist = join_args(argv + 1, argc - 1);
+
+ struct criteria *crit = calloc(sizeof(struct criteria), 1);
+ if (!crit) {
+ return cmd_results_new(CMD_FAILURE, "for_window", "Unable to allocate criteria");
+ }
+ crit->crit_raw = strdup(criteria);
+ crit->cmdlist = cmdlist;
+ crit->tokens = create_list();
+ char *err_str = extract_crit_tokens(crit->tokens, crit->crit_raw);
+
+ if (err_str) {
+ error = cmd_results_new(CMD_INVALID, "for_window", err_str);
+ free(err_str);
+ free_criteria(crit);
+ } else if (crit->tokens->length == 0) {
+ error = cmd_results_new(CMD_INVALID, "for_window", "Found no name/value pairs in criteria");
+ free_criteria(crit);
+ } else if (list_seq_find(config->criteria, criteria_cmp, crit) != -1) {
+ wlr_log(L_DEBUG, "for_window: Duplicate, skipping.");
+ free_criteria(crit);
+ } else {
+ wlr_log(L_DEBUG, "for_window: '%s' -> '%s' added", crit->crit_raw, crit->cmdlist);
+ list_add(config->criteria, crit);
+ }
+ return error ? error : cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/meson.build b/sway/meson.build
index f3c319ed..a8107e4e 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -26,6 +26,7 @@ sway_sources = files(
'config/seat.c',
'config/input.c',
+ 'commands/assign.c',
'commands/bar.c',
'commands/bind.c',
'commands/default_orientation.c',
@@ -34,6 +35,7 @@ sway_sources = files(
'commands/exec_always.c',
'commands/focus.c',
'commands/focus_follows_mouse.c',
+ 'commands/for_window.c',
'commands/fullscreen.c',
'commands/kill.c',
'commands/opacity.c',
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 92767188..3eeb1d97 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,31 @@ static void view_handle_container_reparent(struct wl_listener *listener,
}
}
+static void view_execute_criteria(struct sway_view *view) {
+ if (!sway_assert(view->swayc, "cannot run criteria for unmapped view")) {
+ return;
+ }
+ 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 +262,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) {
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 17:30:09 +0000