aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/sway/criteria.h2
-rw-r--r--include/sway/xwayland.h1
-rw-r--r--sway/commands.c2
-rw-r--r--sway/commands/border.c6
-rw-r--r--sway/criteria.c45
-rw-r--r--sway/desktop/xwayland.c1
6 files changed, 47 insertions, 10 deletions
diff --git a/include/sway/criteria.h b/include/sway/criteria.h
index 7a1e547b..af12ffd7 100644
--- a/include/sway/criteria.h
+++ b/include/sway/criteria.h
@@ -31,7 +31,7 @@ struct criteria {
uint32_t id; // X11 window ID
#endif
pcre *window_role;
- uint32_t window_type;
+ enum atom_name window_type;
bool floating;
bool tiling;
char urgent; // 'l' for latest or 'o' for oldest
diff --git a/include/sway/xwayland.h b/include/sway/xwayland.h
index 78d1053b..121edad3 100644
--- a/include/sway/xwayland.h
+++ b/include/sway/xwayland.h
@@ -5,6 +5,7 @@
#include <xcb/xproto.h>
enum atom_name {
+ NET_WM_WINDOW_TYPE_NORMAL,
NET_WM_WINDOW_TYPE_DIALOG,
NET_WM_WINDOW_TYPE_UTILITY,
NET_WM_WINDOW_TYPE_TOOLBAR,
diff --git a/sway/commands.c b/sway/commands.c
index d9c54adc..13f5983e 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -118,6 +118,8 @@ static struct cmd_handler handlers[] = {
{ "input", cmd_input },
{ "mode", cmd_mode },
{ "mouse_warping", cmd_mouse_warping },
+ { "new_float", cmd_default_floating_border },
+ { "new_window", cmd_default_border },
{ "no_focus", cmd_no_focus },
{ "output", cmd_output },
{ "seat", cmd_seat },
diff --git a/sway/commands/border.c b/sway/commands/border.c
index 9c19e20a..9502c877 100644
--- a/sway/commands/border.c
+++ b/sway/commands/border.c
@@ -27,9 +27,6 @@ struct cmd_results *cmd_border(int argc, char **argv) {
view->border = B_NORMAL;
} else if (strcmp(argv[0], "pixel") == 0) {
view->border = B_PIXEL;
- if (argc == 2) {
- view->border_thickness = atoi(argv[1]);
- }
} else if (strcmp(argv[0], "toggle") == 0) {
view->border = (view->border + 1) % 3;
} else {
@@ -37,6 +34,9 @@ struct cmd_results *cmd_border(int argc, char **argv) {
"Expected 'border <none|normal|pixel|toggle>' "
"or 'border pixel <px>'");
}
+ if (argc == 2) {
+ view->border_thickness = atoi(argv[1]);
+ }
if (container_is_floating(view->swayc)) {
container_set_geometry_from_floating_view(view->swayc);
diff --git a/sway/criteria.c b/sway/criteria.c
index 5452c4ee..13176fa1 100644
--- a/sway/criteria.c
+++ b/sway/criteria.c
@@ -2,6 +2,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <stdbool.h>
+#include <strings.h>
#include <pcre.h>
#include "sway/criteria.h"
#include "sway/tree/container.h"
@@ -25,7 +26,7 @@ bool criteria_is_empty(struct criteria *criteria) {
&& !criteria->id
#endif
&& !criteria->window_role
- && !criteria->window_type
+ && criteria->window_type == ATOM_LAST
&& !criteria->floating
&& !criteria->tiling
&& !criteria->urgent
@@ -50,6 +51,23 @@ static int regex_cmp(const char *item, const pcre *regex) {
return pcre_exec(regex, NULL, item, strlen(item), 0, 0, NULL, 0);
}
+static bool view_has_window_type(struct sway_view *view, enum atom_name name) {
+#ifdef HAVE_XWAYLAND
+ if (view->type != SWAY_VIEW_XWAYLAND) {
+ return false;
+ }
+ struct wlr_xwayland_surface *surface = view->wlr_xwayland_surface;
+ struct sway_xwayland *xwayland = &server.xwayland;
+ xcb_atom_t desired_atom = xwayland->atoms[name];
+ for (size_t i = 0; i < surface->window_type_len; ++i) {
+ if (surface->window_type[i] == desired_atom) {
+ return true;
+ }
+ }
+#endif
+ return false;
+}
+
static int cmp_urgent(const void *_a, const void *_b) {
struct sway_view *a = *(void **)_a;
struct sway_view *b = *(void **)_b;
@@ -144,9 +162,8 @@ static bool criteria_matches_view(struct criteria *criteria,
// TODO
}
- if (criteria->window_type) {
- uint32_t type = view_get_window_type(view);
- if (!type || type != criteria->window_type) {
+ if (criteria->window_type != ATOM_LAST) {
+ if (!view_has_window_type(view, criteria->window_type)) {
return false;
}
}
@@ -254,6 +271,21 @@ static bool generate_regex(pcre **regex, char *value) {
return true;
}
+static enum atom_name parse_window_type(const char *type) {
+ if (strcasecmp(type, "normal") == 0) {
+ return NET_WM_WINDOW_TYPE_NORMAL;
+ } else if (strcasecmp(type, "dialog") == 0) {
+ return NET_WM_WINDOW_TYPE_DIALOG;
+ } else if (strcasecmp(type, "utility") == 0) {
+ return NET_WM_WINDOW_TYPE_UTILITY;
+ } else if (strcasecmp(type, "toolbar") == 0) {
+ return NET_WM_WINDOW_TYPE_TOOLBAR;
+ } else if (strcasecmp(type, "splash") == 0) {
+ return NET_WM_WINDOW_TYPE_SPLASH;
+ }
+ return ATOM_LAST; // ie. invalid
+}
+
enum criteria_token {
T_APP_ID,
T_CLASS,
@@ -434,7 +466,7 @@ static bool parse_token(struct criteria *criteria, char *name, char *value) {
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
+ criteria->window_type = parse_window_type(effective_value);
break;
#ifdef HAVE_XWAYLAND
case T_ID:
@@ -526,7 +558,8 @@ struct criteria *criteria_parse(char *raw, char **error_arg) {
}
++head;
- struct criteria *criteria = calloc(sizeof(struct criteria), 1);
+ struct criteria *criteria = calloc(1, sizeof(struct criteria));
+ criteria->window_type = ATOM_LAST; // default value
char *name = NULL, *value = NULL;
bool in_quotes = false;
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 4e401008..2adc28c5 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -17,6 +17,7 @@
#include "sway/tree/view.h"
static const char *atom_map[ATOM_LAST] = {
+ "_NET_WM_WINDOW_TYPE_NORMAL",
"_NET_WM_WINDOW_TYPE_DIALOG",
"_NET_WM_WINDOW_TYPE_UTILITY",
"_NET_WM_WINDOW_TYPE_TOOLBAR",
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 17:15:45 +0000