From 32a572cecfd0f6072a78ce0a381a2f8365f9010a Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sat, 12 May 2018 08:52:54 -0400 Subject: Revert "Merge pull request #1943 from RyanDwyer/criteria-improvements" This reverts commit 3e1bf721c69cb6df70c3dc3d3d4933e987339676, reversing changes made to 2217518bd554d0f11dafa7ec4e8f35f2e4762fbd. --- include/sway/criteria.h | 73 ++++++++++++++++++------------------------------ include/sway/tree/view.h | 21 +------------- 2 files changed, 28 insertions(+), 66 deletions(-) (limited to 'include') diff --git a/include/sway/criteria.h b/include/sway/criteria.h index 74da132c..ec256ddb 100644 --- a/include/sway/criteria.h +++ b/include/sway/criteria.h @@ -1,61 +1,42 @@ #ifndef _SWAY_CRITERIA_H #define _SWAY_CRITERIA_H -#include +#include "tree/container.h" #include "list.h" -#include "tree/view.h" - -enum criteria_type { - CT_COMMAND = 1 << 0, - CT_ASSIGN_OUTPUT = 1 << 1, - CT_ASSIGN_WORKSPACE = 1 << 2, -}; +/** + * 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 `. + */ struct criteria { - enum criteria_type type; - char *raw; // entire criteria string (for logging) + list_t *tokens; // struct crit_token, contains compiled regex. + char *crit_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; }; -bool criteria_is_empty(struct criteria *criteria); +int criteria_cmp(const void *item, const void *data); +void free_criteria(struct criteria *crit); -void criteria_destroy(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); -/** - * 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 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); -/** - * 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 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 views matching the given criteria. - */ -list_t *criteria_get_views(struct criteria *criteria); +// Returns true if any criteria in the given list matches this container +bool criteria_any(struct sway_container *cont, list_t *criteria); #endif diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 144ad038..4ecd8c44 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h @@ -20,15 +20,11 @@ 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_string_prop)(struct sway_view *view, + const char *(*get_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); @@ -56,8 +52,6 @@ struct sway_view { enum sway_container_border border; int border_thickness; - list_t *executed_criteria; - union { struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6; struct wlr_xwayland_surface *wlr_xwayland_surface; @@ -97,9 +91,6 @@ 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; @@ -174,10 +165,6 @@ 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); - -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, @@ -230,10 +217,4 @@ 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 -- cgit v1.2.3-70-g09d2