aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-09-27 22:44:57 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-09-27 22:51:37 +1000
commit21ff87d72b44604d348cf71da3175b85ac5b2f75 (patch)
treede0ecfd66fd3a6957e0f8a2eb5038c785b3965c2 /include
parent6d0442c0c2cfcb75f855348b8133abcb2f3c2427 (diff)
Improve CSD logic
This does the following: * Removes the xdg-decoration surface_commit listener. I was under the impression the client could ignore the server's preference and set whatever decoration they like using this protocol, but I don't think that's right. * Adds a listener for the xdg-decoration request_mode signal. The protocol states that the server should respond to this with its preference. We'll always respond with SSD here. * Makes it so tiled views which use CSD will still have sway decorations rendered. To do this, using_csd had to be added back to the view struct, and the border is changed when floating or unfloating a view.
Diffstat (limited to 'include')
-rw-r--r--include/sway/tree/view.h11
-rw-r--r--include/sway/xdg_decoration.h2
2 files changed, 12 insertions, 1 deletions
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index e7aaffd7..2c7b4c2b 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -76,8 +76,19 @@ struct sway_view {
int natural_width, natural_height;
char *title_format;
+
+ // Our border types are B_NONE, B_PIXEL, B_NORMAL and B_CSD. We normally
+ // just assign this to the border property and ignore the other two.
+ // However, when a view using CSD is tiled, we want to render our own
+ // borders as well. So in this case the border property becomes one of the
+ // first three, and using_csd is true.
+ // Lastly, views can change their decoration mode at any time. When an SSD
+ // view becomes CSD without our approval, we save the SSD border type so it
+ // can be restored if/when the view returns from CSD to SSD.
enum sway_container_border border;
enum sway_container_border saved_border;
+ bool using_csd;
+
int border_thickness;
bool border_top;
bool border_bottom;
diff --git a/include/sway/xdg_decoration.h b/include/sway/xdg_decoration.h
index 46fb8d34..8bef4c6d 100644
--- a/include/sway/xdg_decoration.h
+++ b/include/sway/xdg_decoration.h
@@ -10,7 +10,7 @@ struct sway_xdg_decoration {
struct sway_view *view;
struct wl_listener destroy;
- struct wl_listener surface_commit;
+ struct wl_listener request_mode;
};
struct sway_xdg_decoration *xdg_decoration_from_surface(