Merge branch 'master' into fix-1975

3 files changed, 68 insertions, 44 deletions

diff --git a/include/sway/criteria.h b/include/sway/criteria.h
index ec256ddb..74da132c 100644
--- a/include/sway/criteria.h
+++ b/include/sway/criteria.h
@@ -1,42 +1,61 @@
 #ifndef _SWAY_CRITERIA_H
 #define _SWAY_CRITERIA_H
 
-#include "tree/container.h"
+#include <pcre.h>
 #include "list.h"
+#include "tree/view.h"
 
-/**
- * Maps criteria (as a list of criteria tokens) to a command list.
- *
- * A list of tokens together represent a single criteria string (e.g.
- * '[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)
+enum criteria_type {
+        CT_COMMAND = 1 << 0,
+        CT_ASSIGN_OUTPUT = 1 << 1,
+        CT_ASSIGN_WORKSPACE = 1 << 2,
+};
 
+struct criteria {
+        enum criteria_type type;
+        char *raw; // entire criteria string (for logging)
         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);
-void free_criteria(struct criteria *crit);
+bool criteria_is_empty(struct criteria *criteria);
 
-// Pouplate list with crit_tokens extracted from criteria string, returns error
-// string or NULL if successful.
-char *extract_crit_tokens(list_t *tokens, const char *criteria);
+void criteria_destroy(struct criteria *criteria);
 
-// Returns list of criteria that match given container. These criteria have
-// been set with `for_window` commands and have an associated cmdlist.
-list_t *criteria_for(struct sway_container *cont);
+/**
+ * Generate a criteria struct from a raw criteria string such as
+ * [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
diff --git a/include/sway/server.h b/include/sway/server.h
index d04ea896..c95ee0f3 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -58,6 +58,5 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data);
 void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data);
 void handle_xdg_shell_surface(struct wl_listener *listener, void *data);
 void handle_xwayland_surface(struct wl_listener *listener, void *data);
-void handle_wl_shell_surface(struct wl_listener *listener, void *data);
 
 #endif
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index e163e3fe..f12386dc 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -10,7 +10,6 @@
 struct sway_container;
 
 enum sway_view_type {
-        SWAY_VIEW_WL_SHELL,
         SWAY_VIEW_XDG_SHELL_V6,
         SWAY_VIEW_XDG_SHELL,
         SWAY_VIEW_XWAYLAND,
@@ -21,11 +20,15 @@ enum sway_view_prop {
         VIEW_PROP_APP_ID,
         VIEW_PROP_CLASS,
         VIEW_PROP_INSTANCE,
+        VIEW_PROP_WINDOW_TYPE,
+        VIEW_PROP_WINDOW_ROLE,
+        VIEW_PROP_X11_WINDOW_ID,
 };
 
 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);
+        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,
                 int height);
         void (*set_activated)(struct sway_view *view, bool activated);
@@ -57,6 +60,8 @@ struct sway_view {
         bool border_left;
         bool border_right;
 
+        list_t *executed_criteria;
+
         union {
                 struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6;
                 struct wlr_xdg_surface *wlr_xdg_surface;
@@ -113,6 +118,9 @@ struct sway_xwayland_view {
         struct wl_listener request_maximize;
         struct wl_listener request_configure;
         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 unmap;
         struct wl_listener destroy;
@@ -134,20 +142,6 @@ struct sway_xwayland_unmanaged {
         struct wl_listener destroy;
 };
 
-struct sway_wl_shell_view {
-        struct sway_view view;
-
-        struct wl_listener commit;
-        struct wl_listener request_move;
-        struct wl_listener request_resize;
-        struct wl_listener request_maximize;
-        struct wl_listener request_fullscreen;
-        struct wl_listener set_state;
-        struct wl_listener destroy;
-
-        int pending_width, pending_height;
-};
-
 struct sway_view_child;
 
 struct sway_view_child_impl {
@@ -195,6 +189,12 @@ const char *view_get_class(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);
 
 void view_configure(struct sway_view *view, double ox, double oy, int width,
@@ -247,4 +247,10 @@ void view_child_destroy(struct sway_view_child *child);
  */
 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