aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Ashworth <bosrsf04@gmail.com>2019-03-11 22:21:38 -0400
committerDrew DeVault <sir@cmpwn.com>2019-03-11 21:31:47 -0600
commit1bab5a95531826fa54097bed48f8cc05d4233a9f (patch)
tree54b6492e55a28ccacfc45fa2be53145234e7ba3a
parent79369681ab3d6785aabf39bd8080cd4f30507524 (diff)
downloadsway-master.zip
sway-master.tar.gz
sway-master.tar.bz2
get_deco_rect: fix floaters on tabbed/stacked wsHEADmaster
This fixes the decoration rects for floating containers on a workspace that is either tabbed or stacked. Without this, the floater would incorrectly try to calculate where it's tab or stack decorations were on the workspace. This would cause a SIGFPE (due to a divide-by-zero) when the floater was on a tabbed workspace without any tiling children. Furthermore, the floater does not care what the workspace's layout is and should just use the location relative to the workspace. This should have no effect on children of a floating container.
-rw-r--r--sway/ipc-json.c27
1 files changed, 15 insertions, 12 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index bebe6dd..f61e1a8 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -352,8 +352,9 @@ static void ipc_json_describe_workspace(struct sway_workspace *workspace,
static void get_deco_rect(struct sway_container *c, struct wlr_box *deco_rect) {
enum sway_container_layout parent_layout = container_parent_layout(c);
- if ((parent_layout != L_TABBED && parent_layout != L_STACKED &&
- c->current.border != B_NORMAL) ||
+ bool tab_or_stack = parent_layout == L_TABBED || parent_layout == L_STACKED;
+ if (((!tab_or_stack || container_is_floating(c)) &&
+ c->current.border != B_NORMAL) ||
c->fullscreen_mode != FULLSCREEN_NONE ||
c->workspace == NULL) {
deco_rect->x = deco_rect->y = deco_rect->width = deco_rect->height = 0;
@@ -370,17 +371,19 @@ static void get_deco_rect(struct sway_container *c, struct wlr_box *deco_rect) {
deco_rect->width = c->width;
deco_rect->height = container_titlebar_height();
- if (parent_layout == L_TABBED) {
- deco_rect->width = c->parent
- ? c->parent->width / c->parent->children->length
- : c->workspace->width / c->workspace->tiling->length;
- deco_rect->x += deco_rect->width * container_sibling_index(c);
- } else if (container_parent_layout(c) == L_STACKED) {
- if (!c->view) {
- size_t siblings = container_get_siblings(c)->length;
- deco_rect->y -= deco_rect->height * siblings;
+ if (!container_is_floating(c)) {
+ if (parent_layout == L_TABBED) {
+ deco_rect->width = c->parent
+ ? c->parent->width / c->parent->children->length
+ : c->workspace->width / c->workspace->tiling->length;
+ deco_rect->x += deco_rect->width * container_sibling_index(c);
+ } else if (parent_layout == L_STACKED) {
+ if (!c->view) {
+ size_t siblings = container_get_siblings(c)->length;
+ deco_rect->y -= deco_rect->height * siblings;
+ }
+ deco_rect->y += deco_rect->height * container_sibling_index(c);
}
- deco_rect->y += deco_rect->height * container_sibling_index(c);
}
}