diff options
author | Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-05-14 09:06:23 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-14 09:06:23 -0400 |
commit | 9ba0dca7bacb0e79aeac4ea8c605713c69446d9b (patch) | |
tree | 3573981aaa61ac5c86be6ce1e8ecf5e2112b8d5b /include | |
parent | Always render top border for border normal (diff) | |
parent | Merge pull request #1871 from emersion/kill-wl-shell (diff) | |
download | sway-9ba0dca7bacb0e79aeac4ea8c605713c69446d9b.tar.gz sway-9ba0dca7bacb0e79aeac4ea8c605713c69446d9b.tar.zst sway-9ba0dca7bacb0e79aeac4ea8c605713c69446d9b.zip |
Merge branch 'master' into fix-1975
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/criteria.h | 73 | ||||
-rw-r--r-- | include/sway/server.h | 1 | ||||
-rw-r--r-- | include/sway/tree/view.h | 38 |
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 @@ | |||
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/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); | |||
58 | void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data); | 58 | void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data); |
59 | void handle_xdg_shell_surface(struct wl_listener *listener, void *data); | 59 | void handle_xdg_shell_surface(struct wl_listener *listener, void *data); |
60 | void handle_xwayland_surface(struct wl_listener *listener, void *data); | 60 | void handle_xwayland_surface(struct wl_listener *listener, void *data); |
61 | void handle_wl_shell_surface(struct wl_listener *listener, void *data); | ||
62 | 61 | ||
63 | #endif | 62 | #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 @@ | |||
10 | struct sway_container; | 10 | struct sway_container; |
11 | 11 | ||
12 | enum sway_view_type { | 12 | enum sway_view_type { |
13 | SWAY_VIEW_WL_SHELL, | ||
14 | SWAY_VIEW_XDG_SHELL_V6, | 13 | SWAY_VIEW_XDG_SHELL_V6, |
15 | SWAY_VIEW_XDG_SHELL, | 14 | SWAY_VIEW_XDG_SHELL, |
16 | SWAY_VIEW_XWAYLAND, | 15 | SWAY_VIEW_XWAYLAND, |
@@ -21,11 +20,15 @@ enum sway_view_prop { | |||
21 | VIEW_PROP_APP_ID, | 20 | VIEW_PROP_APP_ID, |
22 | VIEW_PROP_CLASS, | 21 | VIEW_PROP_CLASS, |
23 | VIEW_PROP_INSTANCE, | 22 | VIEW_PROP_INSTANCE, |
23 | VIEW_PROP_WINDOW_TYPE, | ||
24 | VIEW_PROP_WINDOW_ROLE, | ||
25 | VIEW_PROP_X11_WINDOW_ID, | ||
24 | }; | 26 | }; |
25 | 27 | ||
26 | struct sway_view_impl { | 28 | struct sway_view_impl { |
27 | const char *(*get_prop)(struct sway_view *view, | 29 | const char *(*get_string_prop)(struct sway_view *view, |
28 | enum sway_view_prop prop); | 30 | enum sway_view_prop prop); |
31 | 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, | 32 | void (*configure)(struct sway_view *view, double ox, double oy, int width, |
30 | int height); | 33 | int height); |
31 | void (*set_activated)(struct sway_view *view, bool activated); | 34 | void (*set_activated)(struct sway_view *view, bool activated); |
@@ -57,6 +60,8 @@ struct sway_view { | |||
57 | bool border_left; | 60 | bool border_left; |
58 | bool border_right; | 61 | bool border_right; |
59 | 62 | ||
63 | list_t *executed_criteria; | ||
64 | |||
60 | union { | 65 | union { |
61 | struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6; | 66 | struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6; |
62 | struct wlr_xdg_surface *wlr_xdg_surface; | 67 | struct wlr_xdg_surface *wlr_xdg_surface; |
@@ -113,6 +118,9 @@ struct sway_xwayland_view { | |||
113 | struct wl_listener request_maximize; | 118 | struct wl_listener request_maximize; |
114 | struct wl_listener request_configure; | 119 | struct wl_listener request_configure; |
115 | struct wl_listener request_fullscreen; | 120 | struct wl_listener request_fullscreen; |
121 | struct wl_listener set_title; | ||
122 | struct wl_listener set_class; | ||
123 | struct wl_listener set_window_type; | ||
116 | struct wl_listener map; | 124 | struct wl_listener map; |
117 | struct wl_listener unmap; | 125 | struct wl_listener unmap; |
118 | struct wl_listener destroy; | 126 | struct wl_listener destroy; |
@@ -134,20 +142,6 @@ struct sway_xwayland_unmanaged { | |||
134 | struct wl_listener destroy; | 142 | struct wl_listener destroy; |
135 | }; | 143 | }; |
136 | 144 | ||
137 | struct sway_wl_shell_view { | ||
138 | struct sway_view view; | ||
139 | |||
140 | struct wl_listener commit; | ||
141 | struct wl_listener request_move; | ||
142 | struct wl_listener request_resize; | ||
143 | struct wl_listener request_maximize; | ||
144 | struct wl_listener request_fullscreen; | ||
145 | struct wl_listener set_state; | ||
146 | struct wl_listener destroy; | ||
147 | |||
148 | int pending_width, pending_height; | ||
149 | }; | ||
150 | |||
151 | struct sway_view_child; | 145 | struct sway_view_child; |
152 | 146 | ||
153 | struct sway_view_child_impl { | 147 | struct sway_view_child_impl { |
@@ -195,6 +189,12 @@ const char *view_get_class(struct sway_view *view); | |||
195 | 189 | ||
196 | const char *view_get_instance(struct sway_view *view); | 190 | const char *view_get_instance(struct sway_view *view); |
197 | 191 | ||
192 | uint32_t view_get_x11_window_id(struct sway_view *view); | ||
193 | |||
194 | const char *view_get_window_role(struct sway_view *view); | ||
195 | |||
196 | uint32_t view_get_window_type(struct sway_view *view); | ||
197 | |||
198 | const char *view_get_type(struct sway_view *view); | 198 | const char *view_get_type(struct sway_view *view); |
199 | 199 | ||
200 | void view_configure(struct sway_view *view, double ox, double oy, int width, | 200 | 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); | |||
247 | */ | 247 | */ |
248 | void view_update_title(struct sway_view *view, bool force); | 248 | void view_update_title(struct sway_view *view, bool force); |
249 | 249 | ||
250 | /** | ||
251 | * Run any criteria that match the view and haven't been run on this view | ||
252 | * before. | ||
253 | */ | ||
254 | void view_execute_criteria(struct sway_view *view); | ||
255 | |||
250 | #endif | 256 | #endif |