diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-05-13 08:16:36 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-05-14 11:38:09 +1000 |
commit | 1e9aaa54a85e98d6b46ca594b4f50770f71047ea (patch) | |
tree | cb6a2748d1c53dfc80f9faa5da7052790e668400 /include | |
parent | Actually fix swayidle (diff) | |
download | sway-1e9aaa54a85e98d6b46ca594b4f50770f71047ea.tar.gz sway-1e9aaa54a85e98d6b46ca594b4f50770f71047ea.tar.zst sway-1e9aaa54a85e98d6b46ca594b4f50770f71047ea.zip |
Revert "Revert "Merge pull request #1943 from RyanDwyer/criteria-improvements""
This reverts commit 32a572cecfd0f6072a78ce0a381a2f8365f9010a.
This reimplements the criteria overhaul in preparation for fixing a
known bug.
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/criteria.h | 73 | ||||
-rw-r--r-- | include/sway/tree/view.h | 21 |
2 files changed, 66 insertions, 28 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 @@ | |||
1 | #ifndef _SWAY_CRITERIA_H | 1 | #ifndef _SWAY_CRITERIA_H |
2 | #define _SWAY_CRITERIA_H | 2 | #define _SWAY_CRITERIA_H |
3 | 3 | ||
4 | #include "tree/container.h" | 4 | #include <pcre.h> |
5 | #include "list.h" | 5 | #include "list.h" |
6 | #include "tree/view.h" | ||
6 | 7 | ||
7 | /** | 8 | enum criteria_type { |
8 | * Maps criteria (as a list of criteria tokens) to a command list. | 9 | CT_COMMAND = 1 << 0, |
9 | * | 10 | CT_ASSIGN_OUTPUT = 1 << 1, |
10 | * A list of tokens together represent a single criteria string (e.g. | 11 | CT_ASSIGN_WORKSPACE = 1 << 2, |
11 | * '[class="abc" title="xyz"]' becomes two criteria tokens). | 12 | }; |
12 | * | ||
13 | * for_window: Views matching all criteria will have the bound command list | ||
14 | * executed on them. | ||
15 | * | ||
16 | * Set via `for_window <criteria> <cmd list>`. | ||
17 | */ | ||
18 | struct criteria { | ||
19 | list_t *tokens; // struct crit_token, contains compiled regex. | ||
20 | char *crit_raw; // entire criteria string (for logging) | ||
21 | 13 | ||
14 | struct criteria { | ||
15 | enum criteria_type type; | ||
16 | char *raw; // entire criteria string (for logging) | ||
22 | char *cmdlist; | 17 | char *cmdlist; |
18 | char *target; // workspace or output name for `assign` criteria | ||
19 | |||
20 | pcre *title; | ||
21 | pcre *app_id; | ||
22 | pcre *class; | ||
23 | pcre *instance; | ||
24 | pcre *con_mark; | ||
25 | uint32_t con_id; // internal ID | ||
26 | uint32_t id; // X11 window ID | ||
27 | pcre *window_role; | ||
28 | uint32_t window_type; | ||
29 | bool floating; | ||
30 | bool tiling; | ||
31 | char urgent; // 'l' for latest or 'o' for oldest | ||
32 | char *workspace; | ||
23 | }; | 33 | }; |
24 | 34 | ||
25 | int criteria_cmp(const void *item, const void *data); | 35 | bool criteria_is_empty(struct criteria *criteria); |
26 | void free_criteria(struct criteria *crit); | ||
27 | 36 | ||
28 | // Pouplate list with crit_tokens extracted from criteria string, returns error | 37 | void criteria_destroy(struct criteria *criteria); |
29 | // string or NULL if successful. | ||
30 | char *extract_crit_tokens(list_t *tokens, const char *criteria); | ||
31 | 38 | ||
32 | // Returns list of criteria that match given container. These criteria have | 39 | /** |
33 | // been set with `for_window` commands and have an associated cmdlist. | 40 | * Generate a criteria struct from a raw criteria string such as |
34 | list_t *criteria_for(struct sway_container *cont); | 41 | * [class="foo" instance="bar"] (brackets inclusive). |
42 | * | ||
43 | * The error argument is expected to be an address of a null pointer. If an | ||
44 | * error is encountered, the function will return NULL and the pointer will be | ||
45 | * changed to point to the error string. This string should be freed afterwards. | ||
46 | */ | ||
47 | struct criteria *criteria_parse(char *raw, char **error); | ||
35 | 48 | ||
36 | // Returns a list of all containers that match the given list of tokens. | 49 | /** |
37 | list_t *container_for_crit_tokens(list_t *tokens); | 50 | * Compile a list of criterias matching the given view. |
51 | * | ||
52 | * Criteria types can be bitwise ORed. | ||
53 | */ | ||
54 | list_t *criteria_for_view(struct sway_view *view, enum criteria_type types); | ||
38 | 55 | ||
39 | // Returns true if any criteria in the given list matches this container | 56 | /** |
40 | bool criteria_any(struct sway_container *cont, list_t *criteria); | 57 | * Compile a list of views matching the given criteria. |
58 | */ | ||
59 | list_t *criteria_get_views(struct criteria *criteria); | ||
41 | 60 | ||
42 | #endif | 61 | #endif |
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 17e579c8..bf86ca8c 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h | |||
@@ -21,11 +21,15 @@ enum sway_view_prop { | |||
21 | VIEW_PROP_APP_ID, | 21 | VIEW_PROP_APP_ID, |
22 | VIEW_PROP_CLASS, | 22 | VIEW_PROP_CLASS, |
23 | VIEW_PROP_INSTANCE, | 23 | VIEW_PROP_INSTANCE, |
24 | VIEW_PROP_WINDOW_TYPE, | ||
25 | VIEW_PROP_WINDOW_ROLE, | ||
26 | VIEW_PROP_X11_WINDOW_ID, | ||
24 | }; | 27 | }; |
25 | 28 | ||
26 | struct sway_view_impl { | 29 | struct sway_view_impl { |
27 | const char *(*get_prop)(struct sway_view *view, | 30 | const char *(*get_string_prop)(struct sway_view *view, |
28 | enum sway_view_prop prop); | 31 | enum sway_view_prop prop); |
32 | uint32_t (*get_int_prop)(struct sway_view *view, enum sway_view_prop prop); | ||
29 | void (*configure)(struct sway_view *view, double ox, double oy, int width, | 33 | void (*configure)(struct sway_view *view, double ox, double oy, int width, |
30 | int height); | 34 | int height); |
31 | void (*set_activated)(struct sway_view *view, bool activated); | 35 | void (*set_activated)(struct sway_view *view, bool activated); |
@@ -53,6 +57,8 @@ struct sway_view { | |||
53 | enum sway_container_border border; | 57 | enum sway_container_border border; |
54 | int border_thickness; | 58 | int border_thickness; |
55 | 59 | ||
60 | list_t *executed_criteria; | ||
61 | |||
56 | union { | 62 | union { |
57 | struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6; | 63 | struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6; |
58 | struct wlr_xdg_surface *wlr_xdg_surface; | 64 | struct wlr_xdg_surface *wlr_xdg_surface; |
@@ -109,6 +115,9 @@ struct sway_xwayland_view { | |||
109 | struct wl_listener request_maximize; | 115 | struct wl_listener request_maximize; |
110 | struct wl_listener request_configure; | 116 | struct wl_listener request_configure; |
111 | struct wl_listener request_fullscreen; | 117 | struct wl_listener request_fullscreen; |
118 | struct wl_listener set_title; | ||
119 | struct wl_listener set_class; | ||
120 | struct wl_listener set_window_type; | ||
112 | struct wl_listener map; | 121 | struct wl_listener map; |
113 | struct wl_listener unmap; | 122 | struct wl_listener unmap; |
114 | struct wl_listener destroy; | 123 | struct wl_listener destroy; |
@@ -191,6 +200,10 @@ const char *view_get_class(struct sway_view *view); | |||
191 | 200 | ||
192 | const char *view_get_instance(struct sway_view *view); | 201 | const char *view_get_instance(struct sway_view *view); |
193 | 202 | ||
203 | uint32_t view_get_x11_window_id(struct sway_view *view); | ||
204 | |||
205 | uint32_t view_get_window_type(struct sway_view *view); | ||
206 | |||
194 | const char *view_get_type(struct sway_view *view); | 207 | const char *view_get_type(struct sway_view *view); |
195 | 208 | ||
196 | void view_configure(struct sway_view *view, double ox, double oy, int width, | 209 | void view_configure(struct sway_view *view, double ox, double oy, int width, |
@@ -243,4 +256,10 @@ void view_child_destroy(struct sway_view_child *child); | |||
243 | */ | 256 | */ |
244 | void view_update_title(struct sway_view *view, bool force); | 257 | void view_update_title(struct sway_view *view, bool force); |
245 | 258 | ||
259 | /** | ||
260 | * Run any criteria that match the view and haven't been run on this view | ||
261 | * before. | ||
262 | */ | ||
263 | void view_execute_criteria(struct sway_view *view); | ||
264 | |||
246 | #endif | 265 | #endif |