use the timer queue manager

[chaz/openbox] / src / client.cc

diff --git a/src/client.cc b/src/client.cc
index 4a99b0bc58eecbb27ca21870ae57c743c0a79f80..57bf5161cf75614765292d8400f17e7d18ef5eae 100644 (file)
--- a/src/client.cc
+++ b/src/client.cc
@@ -1,7 +1,11 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
 #include "client.hh"
-#include "screen.hh"
+#include "bbscreen.hh"
 #include "openbox.hh"
 #include "otk/display.hh"
 #include "otk/property.hh"
@@ -18,11 +22,13 @@ extern "C" {
 
 namespace ob {
 
-OBClient::OBClient(Window window)
-  : _window(window)
+OBClient::OBClient(int screen, Window window)
+  : _screen(screen), _window(window)
 {
   assert(window);
 
+  ignore_unmaps = 0;
+  
   // update EVERYTHING the first time!!
 
   // the state is kinda assumed to be normal. is this right? XXX
@@ -78,6 +84,7 @@ OBClient::OBClient(Window window)
   updateIconTitle();
   updateClass();
 
+/*
 #ifdef DEBUG
   printf("Mapped window: 0x%lx\n"
          "  title:         \t%s\t  icon title:    \t%s\n"
@@ -123,6 +130,7 @@ OBClient::OBClient(Window window)
          _floating ? "yes" : "no",
          _positioned ? "yes" : "no");
 #endif
+*/
 }
 
 
@@ -266,7 +274,10 @@ void OBClient::getMwmHints()
 void OBClient::getArea()
 {
   XWindowAttributes wattrib;
-  assert(XGetWindowAttributes(otk::OBDisplay::display, _window, &wattrib));
+  Status ret;
+  
+  ret = XGetWindowAttributes(otk::OBDisplay::display, _window, &wattrib);
+  assert(ret != BadWindow);
 
   _area.setRect(wattrib.x, wattrib.y, wattrib.width, wattrib.height);
   _border_width = wattrib.border_width;
@@ -313,9 +324,13 @@ void OBClient::getShaped()
   if (otk::OBDisplay::shape()) {
     int foo;
     unsigned int ufoo;
+    int s;
+
+    XShapeSelectInput(otk::OBDisplay::display, _window, ShapeNotifyMask);
 
-    XShapeQueryExtents(otk::OBDisplay::display, client.window, &_shaped, &foo,
+    XShapeQueryExtents(otk::OBDisplay::display, _window, &s, &foo,
                        &foo, &ufoo, &ufoo, &foo, &foo, &foo, &ufoo, &ufoo);
+    _shaped = (s != 0);
   }
 #endif // SHAPE
 }
@@ -643,6 +658,14 @@ void OBClient::update(const XClientMessageEvent &e)
 }
 
 
+#if defined(SHAPE) || defined(DOXYGEN_IGNORE)
+void OBClient::update(const XShapeEvent &e)
+{
+  _shaped = e.shaped;
+}
+#endif
+
+
 void OBClient::setArea(const otk::Rect &area)
 {
   _area = area;