Merge branch 'master' into fix-crash-on-fullscreen

master
Ryan Dwyer 7 years ago committed by GitHub
commit 4717c71da5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,42 +1,61 @@
#ifndef _SWAY_CRITERIA_H #ifndef _SWAY_CRITERIA_H
#define _SWAY_CRITERIA_H #define _SWAY_CRITERIA_H
#include "tree/container.h" #include <pcre.h>
#include "list.h" #include "list.h"
#include "tree/view.h"
/** enum criteria_type {
* Maps criteria (as a list of criteria tokens) to a command list. CT_COMMAND = 1 << 0,
* CT_ASSIGN_OUTPUT = 1 << 1,
* A list of tokens together represent a single criteria string (e.g. CT_ASSIGN_WORKSPACE = 1 << 2,
* '[class="abc" title="xyz"]' becomes two criteria tokens). };
*
* for_window: Views matching all criteria will have the bound command list
* executed on them.
*
* Set via `for_window <criteria> <cmd list>`.
*/
struct criteria {
list_t *tokens; // struct crit_token, contains compiled regex.
char *crit_raw; // entire criteria string (for logging)
struct criteria {
enum criteria_type type;
char *raw; // entire criteria string (for logging)
char *cmdlist; char *cmdlist;
char *target; // workspace or output name for `assign` criteria
pcre *title;
pcre *app_id;
pcre *class;
pcre *instance;
pcre *con_mark;
uint32_t con_id; // internal ID
uint32_t id; // X11 window ID
pcre *window_role;
uint32_t window_type;
bool floating;
bool tiling;
char urgent; // 'l' for latest or 'o' for oldest
char *workspace;
}; };
int criteria_cmp(const void *item, const void *data); bool criteria_is_empty(struct criteria *criteria);
void free_criteria(struct criteria *crit);
// Pouplate list with crit_tokens extracted from criteria string, returns error void criteria_destroy(struct criteria *criteria);
// string or NULL if successful.
char *extract_crit_tokens(list_t *tokens, const char *criteria);
// Returns list of criteria that match given container. These criteria have /**
// been set with `for_window` commands and have an associated cmdlist. * Generate a criteria struct from a raw criteria string such as
list_t *criteria_for(struct sway_container *cont); * [class="foo" instance="bar"] (brackets inclusive).
*
* The error argument is expected to be an address of a null pointer. If an
* error is encountered, the function will return NULL and the pointer will be
* changed to point to the error string. This string should be freed afterwards.
*/
struct criteria *criteria_parse(char *raw, char **error);
// Returns a list of all containers that match the given list of tokens. /**
list_t *container_for_crit_tokens(list_t *tokens); * Compile a list of criterias matching the given view.
*
* Criteria types can be bitwise ORed.
*/
list_t *criteria_for_view(struct sway_view *view, enum criteria_type types);
// Returns true if any criteria in the given list matches this container /**
bool criteria_any(struct sway_container *cont, list_t *criteria); * Compile a list of views matching the given criteria.
*/
list_t *criteria_get_views(struct criteria *criteria);
#endif #endif

@ -20,11 +20,15 @@ enum sway_view_prop {
VIEW_PROP_APP_ID, VIEW_PROP_APP_ID,
VIEW_PROP_CLASS, VIEW_PROP_CLASS,
VIEW_PROP_INSTANCE, VIEW_PROP_INSTANCE,
VIEW_PROP_WINDOW_TYPE,
VIEW_PROP_WINDOW_ROLE,
VIEW_PROP_X11_WINDOW_ID,
}; };
struct sway_view_impl { struct sway_view_impl {
const char *(*get_prop)(struct sway_view *view, const char *(*get_string_prop)(struct sway_view *view,
enum sway_view_prop prop); enum sway_view_prop prop);
uint32_t (*get_int_prop)(struct sway_view *view, enum sway_view_prop prop);
void (*configure)(struct sway_view *view, double ox, double oy, int width, void (*configure)(struct sway_view *view, double ox, double oy, int width,
int height); int height);
void (*set_activated)(struct sway_view *view, bool activated); void (*set_activated)(struct sway_view *view, bool activated);
@ -52,6 +56,8 @@ struct sway_view {
enum sway_container_border border; enum sway_container_border border;
int border_thickness; int border_thickness;
list_t *executed_criteria;
union { union {
struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6; struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6;
struct wlr_xwayland_surface *wlr_xwayland_surface; struct wlr_xwayland_surface *wlr_xwayland_surface;
@ -91,6 +97,9 @@ struct sway_xwayland_view {
struct wl_listener request_maximize; struct wl_listener request_maximize;
struct wl_listener request_configure; struct wl_listener request_configure;
struct wl_listener request_fullscreen; struct wl_listener request_fullscreen;
struct wl_listener set_title;
struct wl_listener set_class;
struct wl_listener set_window_type;
struct wl_listener map; struct wl_listener map;
struct wl_listener unmap; struct wl_listener unmap;
struct wl_listener destroy; struct wl_listener destroy;
@ -165,6 +174,12 @@ const char *view_get_class(struct sway_view *view);
const char *view_get_instance(struct sway_view *view); const char *view_get_instance(struct sway_view *view);
uint32_t view_get_x11_window_id(struct sway_view *view);
const char *view_get_window_role(struct sway_view *view);
uint32_t view_get_window_type(struct sway_view *view);
const char *view_get_type(struct sway_view *view); const char *view_get_type(struct sway_view *view);
void view_configure(struct sway_view *view, double ox, double oy, int width, void view_configure(struct sway_view *view, double ox, double oy, int width,
@ -217,4 +232,10 @@ void view_child_destroy(struct sway_view_child *child);
*/ */
void view_update_title(struct sway_view *view, bool force); void view_update_title(struct sway_view *view, bool force);
/**
* Run any criteria that match the view and haven't been run on this view
* before.
*/
void view_execute_criteria(struct sway_view *view);
#endif #endif

@ -12,6 +12,7 @@
#include "sway/security.h" #include "sway/security.h"
#include "sway/input/input-manager.h" #include "sway/input/input-manager.h"
#include "sway/input/seat.h" #include "sway/input/seat.h"
#include "sway/tree/view.h"
#include "stringop.h" #include "stringop.h"
#include "log.h" #include "log.h"
@ -283,7 +284,7 @@ struct cmd_results *execute_command(char *_exec, struct sway_seat *seat) {
char *head = exec; char *head = exec;
char *cmdlist; char *cmdlist;
char *cmd; char *cmd;
list_t *containers = NULL; list_t *views = NULL;
if (seat == NULL) { if (seat == NULL) {
// passing a NULL seat means we just pick the default seat // passing a NULL seat means we just pick the default seat
@ -300,31 +301,18 @@ struct cmd_results *execute_command(char *_exec, struct sway_seat *seat) {
// Extract criteria (valid for this command list only). // Extract criteria (valid for this command list only).
bool has_criteria = false; bool has_criteria = false;
if (*head == '[') { if (*head == '[') {
has_criteria = true; char *error = NULL;
++head; struct criteria *criteria = criteria_parse(head, &error);
char *criteria_string = argsep(&head, "]"); if (!criteria) {
if (head) { results = cmd_results_new(CMD_INVALID, head,
++head; "%s", error);
list_t *tokens = create_list(); free(error);
char *error;
if ((error = extract_crit_tokens(tokens, criteria_string))) {
wlr_log(L_DEBUG, "criteria string parse error: %s", error);
results = cmd_results_new(CMD_INVALID, criteria_string,
"Can't parse criteria string: %s", error);
free(error);
free(tokens);
goto cleanup;
}
containers = container_for_crit_tokens(tokens);
free(tokens);
} else {
if (!results) {
results = cmd_results_new(CMD_INVALID, criteria_string, "Unmatched [");
}
goto cleanup; goto cleanup;
} }
views = criteria_get_views(criteria);
head += strlen(criteria->raw);
criteria_destroy(criteria);
has_criteria = true;
// Skip leading whitespace // Skip leading whitespace
head += strspn(head, whitespace); head += strspn(head, whitespace);
} }
@ -381,8 +369,9 @@ struct cmd_results *execute_command(char *_exec, struct sway_seat *seat) {
} }
free_cmd_results(res); free_cmd_results(res);
} else { } else {
for (int i = 0; i < containers->length; ++i) { for (int i = 0; i < views->length; ++i) {
config->handler_context.current_container = containers->items[i]; struct sway_view *view = views->items[i];
config->handler_context.current_container = view->swayc;
struct cmd_results *res = handler->handle(argc-1, argv+1); struct cmd_results *res = handler->handle(argc-1, argv+1);
if (res->status != CMD_SUCCESS) { if (res->status != CMD_SUCCESS) {
free_argv(argc, argv); free_argv(argc, argv);
@ -400,6 +389,7 @@ struct cmd_results *execute_command(char *_exec, struct sway_seat *seat) {
} while(head); } while(head);
cleanup: cleanup:
free(exec); free(exec);
free(views);
if (!results) { if (!results) {
results = cmd_results_new(CMD_SUCCESS, NULL, NULL); results = cmd_results_new(CMD_SUCCESS, NULL, NULL);
} }

@ -5,6 +5,7 @@
#include "sway/criteria.h" #include "sway/criteria.h"
#include "list.h" #include "list.h"
#include "log.h" #include "log.h"
#include "stringop.h"
struct cmd_results *cmd_assign(int argc, char **argv) { struct cmd_results *cmd_assign(int argc, char **argv) {
struct cmd_results *error = NULL; struct cmd_results *error = NULL;
@ -12,46 +13,39 @@ struct cmd_results *cmd_assign(int argc, char **argv) {
return error; return error;
} }
char *criteria = *argv++; // Create criteria
char *err_str = NULL;
struct criteria *criteria = criteria_parse(argv[0], &err_str);
if (!criteria) {
error = cmd_results_new(CMD_INVALID, "assign", err_str);
free(err_str);
return error;
}
++argv;
int target_len = argc - 1;
if (strncmp(*argv, "", strlen("")) == 0) { if (strncmp(*argv, "", strlen("")) == 0) {
if (argc < 3) { if (argc < 3) {
return cmd_results_new(CMD_INVALID, "assign", "Missing workspace"); return cmd_results_new(CMD_INVALID, "assign", "Missing workspace");
} }
argv++; ++argv;
--target_len;
} }
char *movecmd = "move container to workspace "; if (strcmp(*argv, "output") == 0) {
size_t arglen = strlen(movecmd) + strlen(*argv) + 1; criteria->type = CT_ASSIGN_OUTPUT;
char *cmdlist = calloc(1, arglen); ++argv;
if (!cmdlist) { --target_len;
return cmd_results_new(CMD_FAILURE, "assign", "Unable to allocate command list"); } else {
criteria->type = CT_ASSIGN_WORKSPACE;
} }
snprintf(cmdlist, arglen, "%s%s", movecmd, *argv);
struct criteria *crit = malloc(sizeof(struct criteria)); criteria->target = join_args(argv, target_len);
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) { list_add(config->criteria, criteria);
error = cmd_results_new(CMD_INVALID, "assign", err_str); wlr_log(L_DEBUG, "assign: '%s' -> '%s' added", criteria->raw,
free(err_str); criteria->target);
free_criteria(crit);
} else if (crit->tokens->length == 0) { return cmd_results_new(CMD_SUCCESS, NULL, NULL);
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);
} }

@ -15,12 +15,12 @@ struct cmd_results *cmd_default_border(int argc, char **argv) {
config->border = B_NORMAL; config->border = B_NORMAL;
} else if (strcmp(argv[0], "pixel") == 0) { } else if (strcmp(argv[0], "pixel") == 0) {
config->border = B_PIXEL; config->border = B_PIXEL;
if (argc == 2) {
config->border_thickness = atoi(argv[1]);
}
} else { } else {
return cmd_results_new(CMD_INVALID, "default_border", return cmd_results_new(CMD_INVALID, "default_border",
"Expected 'default_border <none|normal|pixel>' or 'default_border pixel <px>'"); "Expected 'default_border <none|normal|pixel>' or 'default_border <normal|pixel> <px>'");
}
if (argc == 2) {
config->border_thickness = atoi(argv[1]);
} }
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);

@ -11,31 +11,20 @@ struct cmd_results *cmd_for_window(int argc, char **argv) {
if ((error = checkarg(argc, "for_window", EXPECTED_AT_LEAST, 2))) { if ((error = checkarg(argc, "for_window", EXPECTED_AT_LEAST, 2))) {
return error; 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); char *err_str = NULL;
if (!crit) { struct criteria *criteria = criteria_parse(argv[0], &err_str);
return cmd_results_new(CMD_FAILURE, "for_window", "Unable to allocate criteria"); if (!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); error = cmd_results_new(CMD_INVALID, "for_window", err_str);
free(err_str); free(err_str);
free_criteria(crit); return error;
} 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);
criteria->type = CT_COMMAND;
criteria->cmdlist = join_args(argv + 1, argc - 1);
list_add(config->criteria, criteria);
wlr_log(L_DEBUG, "for_window: '%s' -> '%s' added", criteria->raw, criteria->cmdlist);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} }

@ -90,12 +90,14 @@ static struct cmd_results *cmd_move_container(struct sway_container *current,
} }
free(ws_name); free(ws_name);
struct sway_container *old_parent = current->parent; struct sway_container *old_parent = current->parent;
struct sway_container *focus = seat_get_focus_inactive( struct sway_container *destination = seat_get_focus_inactive(
config->handler_context.seat, ws); config->handler_context.seat, ws);
container_move_to(current, focus); container_move_to(current, destination);
seat_set_focus(config->handler_context.seat, old_parent); struct sway_container *focus = seat_get_focus_inactive(
config->handler_context.seat, old_parent);
seat_set_focus(config->handler_context.seat, focus);
container_reap_empty(old_parent); container_reap_empty(old_parent);
container_reap_empty(focus->parent); container_reap_empty(destination->parent);
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} else if (strcasecmp(argv[1], "to") == 0 } else if (strcasecmp(argv[1], "to") == 0
&& strcasecmp(argv[2], "output") == 0) { && strcasecmp(argv[2], "output") == 0) {

@ -11,435 +11,501 @@
#include "list.h" #include "list.h"
#include "log.h" #include "log.h"
enum criteria_type { // *must* keep in sync with criteria_strings[] bool criteria_is_empty(struct criteria *criteria) {
CRIT_APP_ID, return !criteria->title
CRIT_CLASS, && !criteria->app_id
CRIT_CON_ID, && !criteria->class
CRIT_CON_MARK, && !criteria->instance
CRIT_FLOATING, && !criteria->con_mark
CRIT_ID, && !criteria->con_id
CRIT_INSTANCE, && !criteria->id
CRIT_TILING, && !criteria->window_role
CRIT_TITLE, && !criteria->window_type
CRIT_URGENT, && !criteria->floating
CRIT_WINDOW_ROLE, && !criteria->tiling
CRIT_WINDOW_TYPE, && !criteria->urgent
CRIT_WORKSPACE, && !criteria->workspace;
CRIT_LAST }
};
static const char * const criteria_strings[CRIT_LAST] = {
[CRIT_APP_ID] = "app_id",
[CRIT_CLASS] = "class",
[CRIT_CON_ID] = "con_id",
[CRIT_CON_MARK] = "con_mark",
[CRIT_FLOATING] = "floating",
[CRIT_ID] = "id",
[CRIT_INSTANCE] = "instance",
[CRIT_TILING] = "tiling",
[CRIT_TITLE] = "title",
[CRIT_URGENT] = "urgent", // either "latest" or "oldest" ...
[CRIT_WINDOW_ROLE] = "window_role",
[CRIT_WINDOW_TYPE] = "window_type",
[CRIT_WORKSPACE] = "workspace"
};
/** void criteria_destroy(struct criteria *criteria) {
* A single criteria token (ie. value/regex pair), pcre_free(criteria->title);
* e.g. 'class="some class regex"'. pcre_free(criteria->app_id);
*/ pcre_free(criteria->class);
struct crit_token { pcre_free(criteria->instance);
enum criteria_type type; pcre_free(criteria->con_mark);
pcre *regex; pcre_free(criteria->window_role);
char *raw; free(criteria->workspace);
};
free(criteria->raw);
free(criteria);
}
static void free_crit_token(struct crit_token *crit) { static int regex_cmp(const char *item, const pcre *regex) {
pcre_free(crit->regex); return pcre_exec(regex, NULL, item, strlen(item), 0, 0, NULL, 0);
free(crit->raw);
free(crit);
} }
static void free_crit_tokens(list_t *crit_tokens) { static bool criteria_matches_view(struct criteria *criteria,
for (int i = 0; i < crit_tokens->length; i++) { struct sway_view *view) {
free_crit_token(crit_tokens->items[i]); if (criteria->title) {
const char *title = view_get_title(view);
if (!title || regex_cmp(title, criteria->title) != 0) {
return false;
}
} }
list_free(crit_tokens);
}
// Extracts criteria string from its brackets. Returns new (duplicate) if (criteria->app_id) {
// substring. const char *app_id = view_get_app_id(view);
static char *criteria_from(const char *arg) { if (!app_id || regex_cmp(app_id, criteria->app_id) != 0) {
char *criteria = NULL; return false;
if (*arg == '[') { }
criteria = strdup(arg + 1);
} else {
criteria = strdup(arg);
} }
int last = strlen(criteria) - 1; if (criteria->class) {
if (criteria[last] == ']') { const char *class = view_get_class(view);
criteria[last] = '\0'; if (!class || regex_cmp(class, criteria->class) != 0) {
return false;
}
} }
return criteria;
}
// Return instances of c found in str. if (criteria->instance) {
static int countchr(char *str, char c) { const char *instance = view_get_instance(view);
int found = 0; if (!instance || regex_cmp(instance, criteria->instance) != 0) {
for (int i = 0; str[i]; i++) { return false;
if (str[i] == c) {
++found;
} }
} }
return found;
}
// criteria_str is e.g. '[class="some class regex" instance="instance name"]'. if (criteria->con_mark) {
// // TODO
// Will create array of pointers in buf, where first is duplicate of given return false;
// string (must be freed) and the rest are pointers to names and values in the }
// base string (every other, naturally). argc will be populated with the length
// of buf. if (criteria->con_id) { // Internal ID
// if (!view->swayc || view->swayc->id != criteria->con_id) {
// Returns error string or NULL if successful. return false;
static char *crit_tokens(int *argc, char ***buf,
const char * const criteria_str) {
wlr_log(L_DEBUG, "Parsing criteria: '%s'", criteria_str);
char *base = criteria_from(criteria_str);
char *head = base;
char *namep = head; // start of criteria name
char *valp = NULL; // start of value
// We're going to place EOS markers where we need to and fill up an array
// of pointers to the start of each token (either name or value).
int pairs = countchr(base, '=');
int max_tokens = pairs * 2 + 1; // this gives us at least enough slots
char **argv = *buf = calloc(max_tokens, sizeof(char*));
argv[0] = base; // this needs to be freed by caller
bool quoted = true;
*argc = 1; // uneven = name, even = value
while (*head && *argc < max_tokens) {
if (namep != head && *(head - 1) == '\\') {
// escaped character: don't try to parse this
} else if (*head == '=' && namep != head) {
if (*argc % 2 != 1) {
// we're not expecting a name
return strdup("Unable to parse criteria: "
"Found out of place equal sign");
} else {
// name ends here
char *end = head; // don't want to rewind the head
while (*(end - 1) == ' ') {
--end;
}
*end = '\0';
if (*(namep) == ' ') {
namep = strrchr(namep, ' ') + 1;
}
argv[*argc] = namep;
*argc += 1;
}
} else if (*head == '"') {
if (*argc % 2 != 0) {
// we're not expecting a value
return strdup("Unable to parse criteria: "
"Found quoted value where it was not expected");
} else if (!valp) { // value starts here
valp = head + 1;
quoted = true;
} else {
// value ends here
argv[*argc] = valp;
*argc += 1;
*head = '\0';
valp = NULL;
namep = head + 1;
}
} else if (*argc % 2 == 0 && *head != ' ') {
// parse unquoted values
if (!valp) {
quoted = false;
valp = head; // value starts here
}
} else if (valp && !quoted && *head == ' ') {
// value ends here
argv[*argc] = valp;
*argc += 1;
*head = '\0';
valp = NULL;
namep = head + 1;
} }
head++;
} }
// catch last unquoted value if needed if (criteria->id) { // X11 window ID
if (valp && !quoted && !*head) { uint32_t x11_window_id = view_get_x11_window_id(view);
argv[*argc] = valp; if (!x11_window_id || x11_window_id != criteria->id) {
*argc += 1; return false;
}
} }
return NULL; if (criteria->window_role) {
// TODO
}
if (criteria->window_type) {
uint32_t type = view_get_window_type(view);
if (!type || type != criteria->window_type) {
return false;
}
}
if (criteria->floating) {
// TODO
return false;
}
if (criteria->tiling) {
// TODO
}
if (criteria->urgent) {
// TODO
return false;
}
if (criteria->workspace) {
if (!view->swayc) {
return false;
}
struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE);
if (!ws || strcmp(ws->name, criteria->workspace) != 0) {
return false;
}
}
return true;
} }
// Returns error string on failure or NULL otherwise. list_t *criteria_for_view(struct sway_view *view, enum criteria_type types) {
static char *parse_criteria_name(enum criteria_type *type, char *name) { list_t *criterias = config->criteria;
*type = CRIT_LAST; list_t *matches = create_list();
for (int i = 0; i < CRIT_LAST; i++) { for (int i = 0; i < criterias->length; ++i) {
if (strcmp(criteria_strings[i], name) == 0) { struct criteria *criteria = criterias->items[i];
*type = (enum criteria_type) i; if ((criteria->type & types) && criteria_matches_view(criteria, view)) {
break; list_add(matches, criteria);
} }
} }
if (*type == CRIT_LAST) { return matches;
const char *fmt = "Criteria type '%s' is invalid or unsupported."; }
int len = strlen(name) + strlen(fmt) - 1;
char *error = malloc(len); struct match_data {
snprintf(error, len, fmt, name); struct criteria *criteria;
return error; list_t *matches;
} else if (*type == CRIT_URGENT || *type == CRIT_WINDOW_ROLE || };
*type == CRIT_WINDOW_TYPE) {
// (we're just being helpful here) static void criteria_get_views_iterator(struct sway_container *container,
const char *fmt = "\"%s\" criteria currently unsupported, " void *data) {
"no window will match this"; struct match_data *match_data = data;
int len = strlen(fmt) + strlen(name) - 1; if (container->type == C_VIEW) {
char *error = malloc(len); if (criteria_matches_view(match_data->criteria, container->sway_view)) {
snprintf(error, len, fmt, name); list_add(match_data->matches, container->sway_view);
return error; }
} }
return NULL;
} }
list_t *criteria_get_views(struct criteria *criteria) {
list_t *matches = create_list();
struct match_data data = {
.criteria = criteria,
.matches = matches,
};
container_for_each_descendant_dfs(&root_container,
criteria_get_views_iterator, &data);
return matches;
}
// The error pointer is used for parsing functions, and saves having to pass it
// as an argument in several places.
char *error = NULL;
// Returns error string on failure or NULL otherwise. // Returns error string on failure or NULL otherwise.
static char *generate_regex(pcre **regex, char *value) { static bool generate_regex(pcre **regex, char *value) {
const char *reg_err; const char *reg_err;
int offset; int offset;
*regex = pcre_compile(value, PCRE_UTF8 | PCRE_UCP, &reg_err, &offset, NULL); *regex = pcre_compile(value, PCRE_UTF8 | PCRE_UCP, &reg_err, &offset, NULL);
if (!*regex) { if (!*regex) {
const char *fmt = "Regex compilation (for '%s') failed: %s"; const char *fmt = "Regex compilation for '%s' failed: %s";
int len = strlen(fmt) + strlen(value) + strlen(reg_err) - 3; int len = strlen(fmt) + strlen(value) + strlen(reg_err) - 3;
char *error = malloc(len); error = malloc(len);
snprintf(error, len, fmt, value, reg_err); snprintf(error, len, fmt, value, reg_err);
return error; return false;
} }
return NULL;
}
// Test whether the criterion corresponds to the currently focused window return true;
static bool crit_is_focused(const char *value) {
return !strcmp(value, "focused") || !strcmp(value, "__focused__");
} }
// Populate list with crit_tokens extracted from criteria string, returns error enum criteria_token {
// string or NULL if successful. T_APP_ID,
char *extract_crit_tokens(list_t *tokens, const char * const criteria) { T_CLASS,
int argc; T_CON_ID,
char **argv = NULL, *error = NULL; T_CON_MARK,
if ((error = crit_tokens(&argc, &argv, criteria))) { T_FLOATING,
goto ect_cleanup; T_ID,
} T_INSTANCE,
for (int i = 1; i + 1 < argc; i += 2) { T_TILING,
char* name = argv[i], *value = argv[i + 1]; T_TITLE,
struct crit_token *token = calloc(1, sizeof(struct crit_token)); T_URGENT,
token->raw = strdup(value); T_WINDOW_ROLE,
T_WINDOW_TYPE,
if ((error = parse_criteria_name(&token->type, name))) { T_WORKSPACE,
free_crit_token(token);
goto ect_cleanup; T_INVALID,
} else if (token->type == CRIT_URGENT || crit_is_focused(value)) { };
wlr_log(L_DEBUG, "%s -> \"%s\"", name, value);
list_add(tokens, token); static enum criteria_token token_from_name(char *name) {
} else if((error = generate_regex(&token->regex, value))) { if (strcmp(name, "app_id") == 0) {
free_crit_token(token); return T_APP_ID;
goto ect_cleanup; } else if (strcmp(name, "class") == 0) {
} else { return T_CLASS;
wlr_log(L_DEBUG, "%s -> /%s/", name, value); } else if (strcmp(name, "con_id") == 0) {
list_add(tokens, token); return T_CON_ID;
} } else if (strcmp(name, "con_mark") == 0) {
return T_CON_MARK;
} else if (strcmp(name, "id") == 0) {
return T_ID;
} else if (strcmp(name, "instance") == 0) {
return T_INSTANCE;
} else if (strcmp(name, "title") == 0) {
return T_TITLE;
} else if (strcmp(name, "urgent") == 0) {
return T_URGENT;
} else if (strcmp(name, "window_role") == 0) {
return T_WINDOW_ROLE;
} else if (strcmp(name, "window_type") == 0) {
return T_WINDOW_TYPE;
} else if (strcmp(name, "workspace") == 0) {
return T_WORKSPACE;
} }
ect_cleanup: return T_INVALID;
free(argv[0]); // base string
free(argv);
return error;
} }
static int regex_cmp(const char *item, const pcre *regex) { /**
return pcre_exec(regex, NULL, item, strlen(item), 0, 0, NULL, 0); * Get a property of the focused view.
} *
* Note that we are taking the focused view at the time of criteria parsing, not
* at the time of execution. This is because __focused__ only makes sense when
* using criteria via IPC. Using __focused__ in config is not useful because
* criteria is only executed once per view.
*/
static char *get_focused_prop(enum criteria_token token) {
struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *focus = seat_get_focus(seat);
// test a single view if it matches list of criteria tokens (all of them). if (!focus || focus->type != C_VIEW) {
static bool criteria_test(struct sway_container *cont, list_t *tokens) { return NULL;
if (cont->type != C_CONTAINER && cont->type != C_VIEW) {
return false;
} }
int matches = 0; struct sway_view *view = focus->sway_view;
for (int i = 0; i < tokens->length; i++) { const char *value = NULL;
struct crit_token *crit = tokens->items[i];
switch (crit->type) { switch (token) {
case CRIT_CLASS: case T_APP_ID:
{ value = view_get_app_id(view);
const char *class = view_get_class(cont->sway_view); break;
if (!class) { case T_CLASS:
break; value = view_get_class(view);
} break;
if (crit->regex && regex_cmp(class, crit->regex) == 0) { case T_INSTANCE:
matches++; value = view_get_instance(view);
} break;
break; case T_TITLE:
} value = view_get_class(view);
case CRIT_CON_ID: break;
{ case T_WINDOW_ROLE:
char *endptr; value = view_get_class(view);
size_t crit_id = strtoul(crit->raw, &endptr, 10); break;
case T_WORKSPACE:
if (*endptr == 0 && cont->id == crit_id) { {
++matches; struct sway_container *ws = container_parent(focus, C_WORKSPACE);
} if (ws) {
break; value = ws->name;
}
case CRIT_CON_MARK:
// TODO
break;
case CRIT_FLOATING:
// TODO
break;
case CRIT_ID:
// TODO
break;
case CRIT_APP_ID:
{
const char *app_id = view_get_app_id(cont->sway_view);
if (!app_id) {
break;
}
if (crit->regex && regex_cmp(app_id, crit->regex) == 0) {
matches++;
}
break;
} }
case CRIT_INSTANCE:
{
const char *instance = view_get_instance(cont->sway_view);
if (!instance) {
break;
}
if (crit->regex && regex_cmp(instance, crit->regex) == 0) {
matches++;
}
break;
}
case CRIT_TILING:
// TODO
break;
case CRIT_TITLE:
{
const char *title = view_get_title(cont->sway_view);
if (!title) {
break;
}
if (crit->regex && regex_cmp(title, crit->regex) == 0) {
matches++;
}
break;
}
case CRIT_URGENT:
// TODO "latest" or "oldest"
break;
case CRIT_WINDOW_ROLE:
// TODO
break;
case CRIT_WINDOW_TYPE:
// TODO
break;
case CRIT_WORKSPACE:
// TODO
break;
default:
sway_abort("Invalid criteria type (%i)", crit->type);
break;
} }
break;
case T_CON_ID: // These do not support __focused__
case T_CON_MARK:
case T_FLOATING:
case T_ID:
case T_TILING:
case T_URGENT:
case T_WINDOW_TYPE:
case T_INVALID:
break;
}
if (value) {
return strdup(value);
} }
return matches == tokens->length; return NULL;
} }
int criteria_cmp(const void *a, const void *b) { static bool parse_token(struct criteria *criteria, char *name, char *value) {
if (a == b) { enum criteria_token token = token_from_name(name);
return 0; if (token == T_INVALID) {
} else if (!a) { const char *fmt = "Token '%s' is not recognized";
return -1; int len = strlen(fmt) + strlen(name) - 1;
} else if (!b) { error = malloc(len);
return 1; snprintf(error, len, fmt, name);
return false;
} }
const struct criteria *crit_a = a, *crit_b = b;
int cmp = lenient_strcmp(crit_a->cmdlist, crit_b->cmdlist); char *effective_value = NULL;
if (cmp != 0) { if (value && strcmp(value, "__focused__") == 0) {
return cmp; effective_value = get_focused_prop(token);
} else if (value) {
effective_value = strdup(value);
} }
return lenient_strcmp(crit_a->crit_raw, crit_b->crit_raw);
}
void free_criteria(struct criteria *crit) { // Require value, unless token is floating or tiled
if (crit->tokens) { if (!effective_value && token != T_FLOATING && token != T_TILING) {
free_crit_tokens(crit->tokens); const char *fmt = "Token '%s' requires a value";
int len = strlen(fmt) + strlen(name) - 1;
error = malloc(len);
snprintf(error, len, fmt, name);
return false;
} }
if (crit->cmdlist) {
free(crit->cmdlist); char *endptr = NULL;
switch (token) {
case T_TITLE:
generate_regex(&criteria->title, effective_value);
break;
case T_APP_ID:
generate_regex(&criteria->app_id, effective_value);
break;
case T_CLASS:
generate_regex(&criteria->class, effective_value);
break;
case T_INSTANCE:
generate_regex(&criteria->instance, effective_value);
break;
case T_CON_ID:
criteria->con_id = strtoul(effective_value, &endptr, 10);
if (*endptr != 0) {
error = strdup("The value for 'con_id' should be numeric");
}
break;
case T_CON_MARK:
generate_regex(&criteria->con_mark, effective_value);
break;
case T_WINDOW_ROLE:
generate_regex(&criteria->window_role, effective_value);
break;
case T_WINDOW_TYPE:
// TODO: This is a string but will be stored as an enum or integer
break;
case T_ID:
criteria->id = strtoul(effective_value, &endptr, 10);
if (*endptr != 0) {
error = strdup("The value for 'id' should be numeric");
}
break;
case T_FLOATING:
criteria->floating = true;
break;
case T_TILING:
criteria->tiling = true;
break;
case T_URGENT:
if (strcmp(effective_value, "latest") == 0) {
criteria->urgent = 'l';
} else if (strcmp(effective_value, "oldest") == 0) {
criteria->urgent = 'o';
} else {
error =
strdup("The value for 'urgent' must be 'latest' or 'oldest'");
}
break;
case T_WORKSPACE:
criteria->workspace = strdup(effective_value);
break;
case T_INVALID:
break;
} }
if (crit->crit_raw) { free(effective_value);
free(crit->crit_raw);
if (error) {
return false;
} }
free(crit);
return true;
} }
bool criteria_any(struct sway_container *cont, list_t *criteria) { static void skip_spaces(char **head) {
for (int i = 0; i < criteria->length; i++) { while (**head == ' ') {
struct criteria *bc = criteria->items[i]; ++*head;
if (criteria_test(cont, bc->tokens)) {
return true;
}
} }
return false;
} }
list_t *criteria_for(struct sway_container *cont) { // Remove escaping slashes from value
list_t *criteria = config->criteria, *matches = create_list(); static void unescape(char *value) {
for (int i = 0; i < criteria->length; i++) { if (!strchr(value, '\\')) {
struct criteria *bc = criteria->items[i]; return;
if (criteria_test(cont, bc->tokens)) { }
list_add(matches, bc); char *copy = calloc(strlen(value) + 1, 1);
char *readhead = value;
char *writehead = copy;
while (*readhead) {
if (*readhead == '\\' && *(readhead + 1) == '"') {
// skip the slash
++readhead;
} }
*writehead = *readhead;
++writehead;
++readhead;
} }
return matches; strcpy(value, copy);
free(copy);
} }
struct list_tokens { /**
list_t *list; * Parse a raw criteria string such as [class="foo" instance="bar"] into a
list_t *tokens; * criteria struct.
}; *
* If errors are found, NULL will be returned and the error argument will be
static void container_match_add(struct sway_container *container, * populated with an error string.
struct list_tokens *list_tokens) { */
if (criteria_test(container, list_tokens->tokens)) { struct criteria *criteria_parse(char *raw, char **error_arg) {
list_add(list_tokens->list, container); free(error);
error = NULL;
char *head = raw;
skip_spaces(&head);
if (*head != '[') {
*error_arg = strdup("No criteria");
return NULL;
}
++head;
struct criteria *criteria = calloc(sizeof(struct criteria), 1);
char *name = NULL, *value = NULL;
bool in_quotes = false;
while (*head && *head != ']') {
skip_spaces(&head);
// Parse token name
char *namestart = head;
while ((*head >= 'a' && *head <= 'z') || *head == '_') {
++head;
}
name = calloc(head - namestart + 1, 1);
strncpy(name, namestart, head - namestart);
// Parse token value
skip_spaces(&head);
value = NULL;
if (*head == '=') {
++head;
skip_spaces(&head);
if (*head == '"') {
in_quotes = true;
++head;
}
char *valuestart = head;
if (in_quotes) {
while (*head && (*head != '"' || *(head - 1) == '\\')) {
++head;
}
if (!*head) {
*error_arg = strdup("Quote mismatch in criteria");
goto cleanup;
}
} else {
while (*head && *head != ' ' && *head != ']') {
++head;
}
}
value = calloc(head - valuestart + 1, 1);
strncpy(value, valuestart, head - valuestart);
if (in_quotes) {
++head;
in_quotes = false;
}
unescape(value);
}
wlr_log(L_DEBUG, "Found pair: %s=%s", name, value);
if (!parse_token(criteria, name, value)) {
*error_arg = error;
goto cleanup;
}
skip_spaces(&head);
free(name);
free(value);
name = NULL;
value = NULL;
}
if (*head != ']') {
*error_arg = strdup("No closing brace found in criteria");
goto cleanup;
} }
}
list_t *container_for_crit_tokens(list_t *tokens) { if (criteria_is_empty(criteria)) {
struct list_tokens list_tokens = *error_arg = strdup("Criteria is empty");
(struct list_tokens){create_list(), tokens}; goto cleanup;
}
container_for_each_descendant_dfs(&root_container, ++head;
(void (*)(struct sway_container *, void *))container_match_add, int len = head - raw;
&list_tokens); criteria->raw = calloc(len + 1, 1);
strncpy(criteria->raw, raw, len);
return criteria;
// TODO look in the scratchpad cleanup:
free(name);
return list_tokens.list; free(value);
criteria_destroy(criteria);
return NULL;
} }

@ -20,7 +20,7 @@ static struct sway_wl_shell_view *wl_shell_view_from_view(
return (struct sway_wl_shell_view *)view; return (struct sway_wl_shell_view *)view;
} }
static const char *get_prop(struct sway_view *view, enum sway_view_prop prop) { static const char *get_string_prop(struct sway_view *view, enum sway_view_prop prop) {
if (wl_shell_view_from_view(view) == NULL) { if (wl_shell_view_from_view(view) == NULL) {
return NULL; return NULL;
} }
@ -70,7 +70,7 @@ static void set_fullscreen(struct sway_view *view, bool fullscreen) {
} }
static const struct sway_view_impl view_impl = { static const struct sway_view_impl view_impl = {
.get_prop = get_prop, .get_string_prop = get_string_prop,
.configure = configure, .configure = configure,
.close = _close, .close = _close,
.destroy = destroy, .destroy = destroy,

@ -80,7 +80,7 @@ static struct sway_xdg_shell_v6_view *xdg_shell_v6_view_from_view(
return (struct sway_xdg_shell_v6_view *)view; return (struct sway_xdg_shell_v6_view *)view;
} }
static const char *get_prop(struct sway_view *view, enum sway_view_prop prop) { static const char *get_string_prop(struct sway_view *view, enum sway_view_prop prop) {
if (xdg_shell_v6_view_from_view(view) == NULL) { if (xdg_shell_v6_view_from_view(view) == NULL) {
return NULL; return NULL;
} }
@ -158,7 +158,7 @@ static void destroy(struct sway_view *view) {
} }
static const struct sway_view_impl view_impl = { static const struct sway_view_impl view_impl = {
.get_prop = get_prop, .get_string_prop = get_string_prop,
.configure = configure, .configure = configure,
.set_activated = set_activated, .set_activated = set_activated,
.set_fullscreen = set_fullscreen, .set_fullscreen = set_fullscreen,

@ -126,7 +126,7 @@ static struct sway_xwayland_view *xwayland_view_from_view(
return (struct sway_xwayland_view *)view; return (struct sway_xwayland_view *)view;
} }
static const char *get_prop(struct sway_view *view, enum sway_view_prop prop) { static const char *get_string_prop(struct sway_view *view, enum sway_view_prop prop) {
if (xwayland_view_from_view(view) == NULL) { if (xwayland_view_from_view(view) == NULL) {
return NULL; return NULL;
} }
@ -135,11 +135,27 @@ static const char *get_prop(struct sway_view *view, enum sway_view_prop prop) {
return view->wlr_xwayland_surface->title; return view->wlr_xwayland_surface->title;
case VIEW_PROP_CLASS: case VIEW_PROP_CLASS:
return view->wlr_xwayland_surface->class; return view->wlr_xwayland_surface->class;
case VIEW_PROP_INSTANCE:
return view->wlr_xwayland_surface->instance;
default: default:
return NULL; return NULL;
} }
} }
static uint32_t get_int_prop(struct sway_view *view, enum sway_view_prop prop) {
if (xwayland_view_from_view(view) == NULL) {
return 0;
}
switch (prop) {
case VIEW_PROP_X11_WINDOW_ID:
return view->wlr_xwayland_surface->window_id;
case VIEW_PROP_WINDOW_TYPE:
return *view->wlr_xwayland_surface->window_type;
default:
return 0;
}
}
static void configure(struct sway_view *view, double ox, double oy, int width, static void configure(struct sway_view *view, double ox, double oy, int width,
int height) { int height) {
struct sway_xwayland_view *xwayland_view = xwayland_view_from_view(view); struct sway_xwayland_view *xwayland_view = xwayland_view_from_view(view);
@ -200,13 +216,17 @@ static void destroy(struct sway_view *view) {
wl_list_remove(&xwayland_view->destroy.link); wl_list_remove(&xwayland_view->destroy.link);
wl_list_remove(&xwayland_view->request_configure.link); wl_list_remove(&xwayland_view->request_configure.link);
wl_list_remove(&xwayland_view->request_fullscreen.link); wl_list_remove(&xwayland_view->request_fullscreen.link);
wl_list_remove(&xwayland_view->set_title.link);
wl_list_remove(&xwayland_view->set_class.link);
wl_list_remove(&xwayland_view->set_window_type.link);
wl_list_remove(&xwayland_view->map.link); wl_list_remove(&xwayland_view->map.link);
wl_list_remove(&xwayland_view->unmap.link); wl_list_remove(&xwayland_view->unmap.link);
free(xwayland_view); free(xwayland_view);
} }
static const struct sway_view_impl view_impl = { static const struct sway_view_impl view_impl = {
.get_prop = get_prop, .get_string_prop = get_string_prop,
.get_int_prop = get_int_prop,
.configure = configure, .configure = configure,
.set_activated = set_activated, .set_activated = set_activated,
.set_fullscreen = set_fullscreen, .set_fullscreen = set_fullscreen,
@ -223,7 +243,6 @@ static void handle_commit(struct wl_listener *listener, void *data) {
view_update_size(view, xwayland_view->pending_width, view_update_size(view, xwayland_view->pending_width,
xwayland_view->pending_height); xwayland_view->pending_height);
view_damage_from(view); view_damage_from(view);
view_update_title(view, false);
} }
static void handle_unmap(struct wl_listener *listener, void *data) { static void handle_unmap(struct wl_listener *listener, void *data) {
@ -285,6 +304,40 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data)
view_set_fullscreen(view, xsurface->fullscreen); view_set_fullscreen(view, xsurface->fullscreen);
} }
static void handle_set_title(struct wl_listener *listener, void *data) {
struct sway_xwayland_view *xwayland_view =
wl_container_of(listener, xwayland_view, set_title);
struct sway_view *view = &xwayland_view->view;
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
if (!xsurface->mapped) {
return;
}
view_update_title(view, false);
view_execute_criteria(view);
}
static void handle_set_class(struct wl_listener *listener, void *data) {
struct sway_xwayland_view *xwayland_view =
wl_container_of(listener, xwayland_view, set_class);
struct sway_view *view = &xwayland_view->view;
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
if (!xsurface->mapped) {
return;
}
view_execute_criteria(view);
}
static void handle_set_window_type(struct wl_listener *listener, void *data) {
struct sway_xwayland_view *xwayland_view =
wl_container_of(listener, xwayland_view, set_window_type);
struct sway_view *view = &xwayland_view->view;
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
if (!xsurface->mapped) {
return;
}
view_execute_criteria(view);
}
void handle_xwayland_surface(struct wl_listener *listener, void *data) { void handle_xwayland_surface(struct wl_listener *listener, void *data) {
struct sway_server *server = wl_container_of(listener, server, struct sway_server *server = wl_container_of(listener, server,
xwayland_surface); xwayland_surface);
@ -323,6 +376,16 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
&xwayland_view->request_fullscreen); &xwayland_view->request_fullscreen);
xwayland_view->request_fullscreen.notify = handle_request_fullscreen; xwayland_view->request_fullscreen.notify = handle_request_fullscreen;
wl_signal_add(&xsurface->events.set_title, &xwayland_view->set_title);
xwayland_view->set_title.notify = handle_set_title;
wl_signal_add(&xsurface->events.set_class, &xwayland_view->set_class);
xwayland_view->set_class.notify = handle_set_class;
wl_signal_add(&xsurface->events.set_window_type,
&xwayland_view->set_window_type);
xwayland_view->set_window_type.notify = handle_set_window_type;
wl_signal_add(&xsurface->events.unmap, &xwayland_view->unmap); wl_signal_add(&xsurface->events.unmap, &xwayland_view->unmap);
xwayland_view->unmap.notify = handle_unmap; xwayland_view->unmap.notify = handle_unmap;

@ -485,11 +485,16 @@ Mark all Firefox windows with "Browser":
Currently supported attributes: Currently supported attributes:
**class**:: **app_id**::
Compare value against the window class. Can be a regular expression. If value Compare value against the app id. Can be a regular expression. If value is
is _focused_, then the window class must be the same as that of the currently __focused__, then the app id must be the same as that of the currently
focused window. focused window.
**class**::
Compare value against the window class. Can be a regular expression. If
value is __focused__, then the window class must be the same as that of the
currently focused window.
**con_id**:: **con_id**::
Compare against the internal container ID, which you can find via IPC. Compare against the internal container ID, which you can find via IPC.
@ -500,20 +505,38 @@ Currently supported attributes:
Matches against floating windows. Matches against floating windows.
**id**:: **id**::
Compare value against the app id. Can be a regular expression. Compare value against the X11 window id. Must be numeric.
**instance**::
Compare value against the window instance. Can be a regular expression. If
value is __focused__, then the window instance must be the same as that of
the currently focused window.
**tiling**::
Matches against tiling windows.
**title**:: **title**::
Compare against the window title. Can be a regular expression. If value is Compare against the window title. Can be a regular expression. If value is
_focused_ then the window title must be the same as that of the currently __focused__, then the window title must be the same as that of the currently
focused window. focused window.
**tiling**:: **urgent**::
Matches against tiling windows. Compares the urgent state of the window. Can be "latest" or "oldest".
**window_role**::
Compare against the window role (WM_WINDOW_ROLE). Can be a regular
expression. If value is __focused__, then the window role must be the same
as that of the currently focused window.
**window_type**::
Compare against the window type (_NET_WM_WINDOW_TYPE). Possible values are
normal, dialog, utility, toolbar, splash, menu, dropdown_menu, popup_menu,
tooltip and notification.
**workspace**:: **workspace**::
Compare against the workspace name for this view. Can be a regular expression. Compare against the workspace name for this view. Can be a regular
If the value is _focused_, then all the views on the currently focused workspace expression. If the value is __focused__, then all the views on the currently
matches. focused workspace matches.
See Also See Also
-------- --------

@ -3,6 +3,7 @@
#include <wayland-server.h> #include <wayland-server.h>
#include <wlr/render/wlr_renderer.h> #include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_output_layout.h>
#include "list.h"
#include "log.h" #include "log.h"
#include "sway/criteria.h" #include "sway/criteria.h"
#include "sway/commands.h" #include "sway/commands.h"
@ -19,6 +20,7 @@ void view_init(struct sway_view *view, enum sway_view_type type,
const struct sway_view_impl *impl) { const struct sway_view_impl *impl) {
view->type = type; view->type = type;
view->impl = impl; view->impl = impl;
view->executed_criteria = create_list();
wl_signal_init(&view->events.unmap); wl_signal_init(&view->events.unmap);
} }
@ -31,6 +33,8 @@ void view_destroy(struct sway_view *view) {
view_unmap(view); view_unmap(view);
} }
list_free(view->executed_criteria);
container_destroy(view->swayc); container_destroy(view->swayc);
if (view->impl->destroy) { if (view->impl->destroy) {
@ -41,33 +45,54 @@ void view_destroy(struct sway_view *view) {
} }
const char *view_get_title(struct sway_view *view) { const char *view_get_title(struct sway_view *view) {
if (view->impl->get_prop) { if (view->impl->get_string_prop) {
return view->impl->get_prop(view, VIEW_PROP_TITLE); return view->impl->get_string_prop(view, VIEW_PROP_TITLE);
} }
return NULL; return NULL;
} }
const char *view_get_app_id(struct sway_view *view) { const char *view_get_app_id(struct sway_view *view) {
if (view->impl->get_prop) { if (view->impl->get_string_prop) {
return view->impl->get_prop(view, VIEW_PROP_APP_ID); return view->impl->get_string_prop(view, VIEW_PROP_APP_ID);
} }
return NULL; return NULL;
} }
const char *view_get_class(struct sway_view *view) { const char *view_get_class(struct sway_view *view) {
if (view->impl->get_prop) { if (view->impl->get_string_prop) {
return view->impl->get_prop(view, VIEW_PROP_CLASS); return view->impl->get_string_prop(view, VIEW_PROP_CLASS);
} }
return NULL; return NULL;
} }
const char *view_get_instance(struct sway_view *view) { const char *view_get_instance(struct sway_view *view) {
if (view->impl->get_prop) { if (view->impl->get_string_prop) {
return view->impl->get_prop(view, VIEW_PROP_INSTANCE); return view->impl->get_string_prop(view, VIEW_PROP_INSTANCE);
} }
return NULL; return NULL;
} }
uint32_t view_get_x11_window_id(struct sway_view *view) {
if (view->impl->get_int_prop) {
return view->impl->get_int_prop(view, VIEW_PROP_X11_WINDOW_ID);
}
return 0;
}
const char *view_get_window_role(struct sway_view *view) {
if (view->impl->get_string_prop) {
return view->impl->get_string_prop(view, VIEW_PROP_WINDOW_ROLE);
}
return NULL;
}
uint32_t view_get_window_type(struct sway_view *view) {
if (view->impl->get_int_prop) {
return view->impl->get_int_prop(view, VIEW_PROP_WINDOW_TYPE);
}
return 0;
}
const char *view_get_type(struct sway_view *view) { const char *view_get_type(struct sway_view *view) {
switch(view->type) { switch(view->type) {
case SWAY_VIEW_WL_SHELL: case SWAY_VIEW_WL_SHELL:
@ -284,19 +309,36 @@ static void view_handle_container_reparent(struct wl_listener *listener,
} }
} }
static void view_execute_criteria(struct sway_view *view) { static bool view_has_executed_criteria(struct sway_view *view,
if (!sway_assert(view->swayc, "cannot run criteria for unmapped view")) { struct criteria *criteria) {
for (int i = 0; i < view->executed_criteria->length; ++i) {
struct criteria *item = view->executed_criteria->items[i];
if (item == criteria) {
return true;
}
}
return false;
}
void view_execute_criteria(struct sway_view *view) {
if (!view->swayc) {
return; return;
} }
struct sway_seat *seat = input_manager_current_seat(input_manager); struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *prior_workspace = struct sway_container *prior_workspace =
container_parent(view->swayc, C_WORKSPACE); container_parent(view->swayc, C_WORKSPACE);
list_t *criteria = criteria_for(view->swayc); list_t *criterias = criteria_for_view(view, CT_COMMAND);
for (int i = 0; i < criteria->length; i++) { for (int i = 0; i < criterias->length; i++) {
struct criteria *crit = criteria->items[i]; struct criteria *criteria = criterias->items[i];
wlr_log(L_DEBUG, "for_window '%s' matches new view %p, cmd: '%s'", wlr_log(L_DEBUG, "Checking criteria %s", criteria->raw);
crit->crit_raw, view, crit->cmdlist); if (view_has_executed_criteria(view, criteria)) {
struct cmd_results *res = execute_command(crit->cmdlist, NULL); wlr_log(L_DEBUG, "Criteria already executed");
continue;
}
wlr_log(L_DEBUG, "for_window '%s' matches view %p, cmd: '%s'",
criteria->raw, view, criteria->cmdlist);
list_add(view->executed_criteria, criteria);
struct cmd_results *res = execute_command(criteria->cmdlist, NULL);
if (res->status != CMD_SUCCESS) { if (res->status != CMD_SUCCESS) {
wlr_log(L_ERROR, "Command '%s' failed: %s", res->input, res->error); wlr_log(L_ERROR, "Command '%s' failed: %s", res->input, res->error);
} }
@ -305,7 +347,7 @@ static void view_execute_criteria(struct sway_view *view) {
// so always refocus in-between command lists // so always refocus in-between command lists
seat_set_focus(seat, view->swayc); seat_set_focus(seat, view->swayc);
} }
list_free(criteria); list_free(criterias);
seat_set_focus(seat, seat_get_focus_inactive(seat, prior_workspace)); seat_set_focus(seat, seat_get_focus_inactive(seat, prior_workspace));
} }
@ -315,9 +357,26 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
} }
struct sway_seat *seat = input_manager_current_seat(input_manager); struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *focus = seat_get_focus_inactive(seat, struct sway_container *focus = seat_get_focus(seat);
&root_container); struct sway_container *cont = NULL;
struct sway_container *cont = container_view_create(focus, view);
// Check if there's any `assign` criteria for the view
list_t *criterias = criteria_for_view(view,
CT_ASSIGN_WORKSPACE | CT_ASSIGN_OUTPUT);
if (criterias->length) {
struct criteria *criteria = criterias->items[0];
if (criteria->type == CT_ASSIGN_WORKSPACE) {
struct sway_container *workspace = workspace_by_name(criteria->target);
if (!workspace) {
workspace = workspace_create(NULL, criteria->target);
}
focus = seat_get_focus_inactive(seat, workspace);
} else {
// TODO: CT_ASSIGN_OUTPUT
}
}
free(criterias);
cont = container_view_create(focus, view);
view->surface = wlr_surface; view->surface = wlr_surface;
view->swayc = cont; view->swayc = cont;
@ -335,10 +394,11 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
arrange_children_of(cont->parent); arrange_children_of(cont->parent);
input_manager_set_focus(input_manager, cont); input_manager_set_focus(input_manager, cont);
view_update_title(view, false);
view_execute_criteria(view);
container_damage_whole(cont); container_damage_whole(cont);
view_handle_container_reparent(&view->container_reparent, NULL); view_handle_container_reparent(&view->container_reparent, NULL);
view_execute_criteria(view);
} }
void view_unmap(struct sway_view *view) { void view_unmap(struct sway_view *view) {

Loading…
Cancel
Save