diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-05-12 08:52:54 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2018-05-12 08:52:54 -0400 |
commit | 32a572cecfd0f6072a78ce0a381a2f8365f9010a (patch) | |
tree | ff3860acec8478bd3962145bafaa2bac19717bad /include/sway/tree | |
parent | Revert "Merge pull request #1953 from RyanDwyer/criteria-focused" (diff) | |
download | sway-32a572cecfd0f6072a78ce0a381a2f8365f9010a.tar.gz sway-32a572cecfd0f6072a78ce0a381a2f8365f9010a.tar.zst sway-32a572cecfd0f6072a78ce0a381a2f8365f9010a.zip |
Revert "Merge pull request #1943 from RyanDwyer/criteria-improvements"
This reverts commit 3e1bf721c69cb6df70c3dc3d3d4933e987339676, reversing
changes made to 2217518bd554d0f11dafa7ec4e8f35f2e4762fbd.
Diffstat (limited to 'include/sway/tree')
-rw-r--r-- | include/sway/tree/view.h | 21 |
1 files changed, 1 insertions, 20 deletions
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 { | |||
20 | VIEW_PROP_APP_ID, | 20 | VIEW_PROP_APP_ID, |
21 | VIEW_PROP_CLASS, | 21 | VIEW_PROP_CLASS, |
22 | VIEW_PROP_INSTANCE, | 22 | VIEW_PROP_INSTANCE, |
23 | VIEW_PROP_WINDOW_TYPE, | ||
24 | VIEW_PROP_WINDOW_ROLE, | ||
25 | VIEW_PROP_X11_WINDOW_ID, | ||
26 | }; | 23 | }; |
27 | 24 | ||
28 | struct sway_view_impl { | 25 | struct sway_view_impl { |
29 | const char *(*get_string_prop)(struct sway_view *view, | 26 | const char *(*get_prop)(struct sway_view *view, |
30 | enum sway_view_prop prop); | 27 | enum sway_view_prop prop); |
31 | uint32_t (*get_int_prop)(struct sway_view *view, enum sway_view_prop prop); | ||
32 | void (*configure)(struct sway_view *view, double ox, double oy, int width, | 28 | void (*configure)(struct sway_view *view, double ox, double oy, int width, |
33 | int height); | 29 | int height); |
34 | void (*set_activated)(struct sway_view *view, bool activated); | 30 | void (*set_activated)(struct sway_view *view, bool activated); |
@@ -56,8 +52,6 @@ struct sway_view { | |||
56 | enum sway_container_border border; | 52 | enum sway_container_border border; |
57 | int border_thickness; | 53 | int border_thickness; |
58 | 54 | ||
59 | list_t *executed_criteria; | ||
60 | |||
61 | union { | 55 | union { |
62 | struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6; | 56 | struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6; |
63 | struct wlr_xwayland_surface *wlr_xwayland_surface; | 57 | struct wlr_xwayland_surface *wlr_xwayland_surface; |
@@ -97,9 +91,6 @@ struct sway_xwayland_view { | |||
97 | struct wl_listener request_maximize; | 91 | struct wl_listener request_maximize; |
98 | struct wl_listener request_configure; | 92 | struct wl_listener request_configure; |
99 | struct wl_listener request_fullscreen; | 93 | struct wl_listener request_fullscreen; |
100 | struct wl_listener set_title; | ||
101 | struct wl_listener set_class; | ||
102 | struct wl_listener set_window_type; | ||
103 | struct wl_listener map; | 94 | struct wl_listener map; |
104 | struct wl_listener unmap; | 95 | struct wl_listener unmap; |
105 | struct wl_listener destroy; | 96 | struct wl_listener destroy; |
@@ -174,10 +165,6 @@ const char *view_get_class(struct sway_view *view); | |||
174 | 165 | ||
175 | const char *view_get_instance(struct sway_view *view); | 166 | const char *view_get_instance(struct sway_view *view); |
176 | 167 | ||
177 | uint32_t view_get_x11_window_id(struct sway_view *view); | ||
178 | |||
179 | uint32_t view_get_window_type(struct sway_view *view); | ||
180 | |||
181 | const char *view_get_type(struct sway_view *view); | 168 | const char *view_get_type(struct sway_view *view); |
182 | 169 | ||
183 | void view_configure(struct sway_view *view, double ox, double oy, int width, | 170 | 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); | |||
230 | */ | 217 | */ |
231 | void view_update_title(struct sway_view *view, bool force); | 218 | void view_update_title(struct sway_view *view, bool force); |
232 | 219 | ||
233 | /** | ||
234 | * Run any criteria that match the view and haven't been run on this view | ||
235 | * before. | ||
236 | */ | ||
237 | void view_execute_criteria(struct sway_view *view); | ||
238 | |||
239 | #endif | 220 | #endif |