From: Mikael Magnusson <mikachu@gmail.com>
Date: Sun, 2 Apr 2017 17:20:23 +0000 (+0200)
Subject: Apply combined shape mask correctly
X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=a504e872172b6c6bbb8101f4c2222d64862214d0

Apply combined shape mask correctly

This only broke windows that use ShapeInput and don't hide
their window decorations, which is a fairly small set.
---

diff --git a/openbox/frame.c b/openbox/frame.c
index 22249a5..5b695f7 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -319,7 +319,7 @@ void frame_adjust_shape_kind(ObFrame *self, int kind)
         }
 
         XShapeCombineRectangles(obt_display, self->window,
-                                ShapeBounding, 0, 0, xrect, num,
+                                kind, 0, 0, xrect, num,
                                 ShapeUnion, Unsorted);
     }
 }