fixups

[chaz/openbox] / src / bbwindow.cc

diff --git a/src/bbwindow.cc b/src/bbwindow.cc
index 88d62b0b55b407cc64592bfecfe8343c210c65b0..ea0bb55c7cdece4bc97d5ff459cc16dcbfac0331 100644 (file)
--- a/src/bbwindow.cc
+++ b/src/bbwindow.cc
@@ -27,7 +27,7 @@ extern "C" {
 #include "font.hh"
 #include "gccache.hh"
 #include "image.hh"
-#include "screen.hh"
+#include "bbscreen.hh"
 #include "bbwindow.hh"
 #include "workspace.hh"
 
@@ -264,7 +264,7 @@ BlackboxWindow::BlackboxWindow(Blackbox *b, Window w, BScreen *s) {
   XUngrabServer(otk::OBDisplay::display);
 
 #ifdef    SHAPE
-  if (blackbox->hasShapeExtensions() && flags.shaped)
+  if (otk::OBDisplay::shape() && flags.shaped)
     configureShape();
 #endif // SHAPE
 
@@ -511,7 +511,7 @@ void BlackboxWindow::associateClientWindow(void) {
   XMapSubwindows(otk::OBDisplay::display, frame.plate);
 
 #ifdef    SHAPE
-  if (blackbox->hasShapeExtensions()) {
+  if (otk::OBDisplay::shape()) {
     XShapeSelectInput(otk::OBDisplay::display, client.window,
                       ShapeNotifyMask);
 
@@ -1601,7 +1601,7 @@ void BlackboxWindow::configure(int dx, int dy,
                           frame.rect.bottom() - frame.margin.bottom);
 
 #ifdef    SHAPE
-    if (blackbox->hasShapeExtensions() && flags.shaped) {
+    if (otk::OBDisplay::shape() && flags.shaped) {
       configureShape();
     }
 #endif // SHAPE
@@ -3848,7 +3848,7 @@ void BlackboxWindow::leaveNotifyEvent(const XCrossingEvent*) {
 
 #ifdef    SHAPE
 void BlackboxWindow::shapeEvent(XShapeEvent *e) {
-  if (blackbox->hasShapeExtensions()) {
+  if (otk::OBDisplay::shape()) {
     if (! e->shaped && flags.shaped) {
       clearShape();
       flags.shaped = False;
@@ -3995,7 +3995,7 @@ void BlackboxWindow::upsize(void) {
   if (decorations & Decor_Border) {
     frame.border_w = screen->getWindowStyle()->getBorderWidth();
     if (! isTransient())
-      frame.mwm_border_w = screen->getWindowSty2le()->getFrameWidth();
+      frame.mwm_border_w = screen->getWindowStyle()->getFrameWidth();
     else
       frame.mwm_border_w = 0;
   } else {