#endif
#include "client.hh"
-#include "screen.hh"
+#include "bbscreen.hh"
#include "openbox.hh"
#include "otk/display.hh"
#include "otk/property.hh"
{
assert(window);
+ ignore_unmaps = 0;
+
// update EVERYTHING the first time!!
// the state is kinda assumed to be normal. is this right? XXX
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;
if (otk::OBDisplay::shape()) {
int foo;
unsigned int ufoo;
+ int s;
- XShapeQueryExtents(otk::OBDisplay::display, client.window, &_shaped, &foo,
+ XShapeSelectInput(otk::OBDisplay::display, _window, ShapeNotifyMask);
+
+ XShapeQueryExtents(otk::OBDisplay::display, _window, &s, &foo,
&foo, &ufoo, &ufoo, &foo, &foo, &foo, &ufoo, &ufoo);
+ _shaped = (s != 0);
}
#endif // SHAPE
}
}
+#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;