X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.c;h=3aa3ab7f310da4662beaf8b0556d46973c7a4350;hb=dc6d1d75b40e3d138786d7a2e969d7225f11fb7b;hp=8a9a5a6462800b7aad364ab6a39a05b1163279f2;hpb=624ffe397bb52757f486208b754489cdb77fd923;p=chaz%2Fopenbox

diff --git a/openbox/frame.c b/openbox/frame.c
index 8a9a5a64..3aa3ab7f 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -276,9 +276,14 @@ void frame_adjust_shape_kind(ObFrame *self, int kind)
 {
     gint num;
     XRectangle xrect[2];
+    gboolean shaped;
 
-    if (!((kind == ShapeBounding && self->client->shaped) ||
-          (kind == ShapeInput && self->client->shaped_input))) {
+    shaped = (kind == ShapeBounding && self->client->shaped);
+#ifdef ShapeInput
+    shaped |= (kind == ShapeInput && self->client->shaped_input);
+#endif
+
+    if (!shaped) {
         /* clear the shape on the frame window */
         XShapeCombineMask(obt_display, self->window, kind,
                           self->size.left,
@@ -323,8 +328,10 @@ void frame_adjust_shape(ObFrame *self)
 {
 #ifdef SHAPE
   frame_adjust_shape_kind(self, ShapeBounding);
+#ifdef ShapeInput
   frame_adjust_shape_kind(self, ShapeInput);
 #endif
+#endif
 }
 
 void frame_adjust_area(ObFrame *self, gboolean moved,
@@ -953,7 +960,7 @@ void frame_adjust_state(ObFrame *self)
 void frame_adjust_focus(ObFrame *self, gboolean hilite)
 {
     ob_debug_type(OB_DEBUG_FOCUS,
-                  "Frame for 0x%x has focus: %d\n",
+                  "Frame for 0x%x has focus: %d",
                   self->client->window, hilite);
     self->focused = hilite;
     self->need_render = TRUE;