X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbbwindow.cc;h=e96160997469659ad7a223b5758123b15d7bf599;hb=bf49e7642027f576716e5742544c282f4396f9ef;hp=54acb37b142ec79a18ee11e0d061eb2553b23fb6;hpb=746e55f74b1c960ba9a7fb3ca6194b8d171e38de;p=chaz%2Fopenbox

diff --git a/src/bbwindow.cc b/src/bbwindow.cc
index 54acb37b..e9616099 100644
--- 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);
 
@@ -1583,7 +1583,7 @@ BlackboxWindow *BlackboxWindow::getTransientFor(void) const {
  * move.
  */
 void BlackboxWindow::configure(int dx, int dy,
-                               unsigned int dw, unsigned int dh) {
+                               int dw, int dh) {
   bool send_event = ((frame.rect.x() != dx || frame.rect.y() != dy) &&
                      ! flags.moving);
 
@@ -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;