const otk::OBProperty *property = Openbox::instance->property();
// defaults to the current desktop
- _desktop = 0; // XXX: change this to the current desktop!
-
- property->get(_window, otk::OBProperty::net_wm_desktop,
- otk::OBProperty::Atom_Cardinal,
- (long unsigned*)&_desktop);
+ _desktop = Openbox::instance->screen(_screen)->desktop();
+
+ if (!property->get(_window, otk::OBProperty::net_wm_desktop,
+ otk::OBProperty::Atom_Cardinal,
+ (long unsigned*)&_desktop)) {
+ // make sure the hint exists
+ Openbox::instance->property()->set(_window,
+ otk::OBProperty::net_wm_desktop,
+ otk::OBProperty::Atom_Cardinal,
+ (unsigned)_desktop);
+ }
}
void OBClient::setDesktop(long target)
{
+ if (target == _desktop) return;
+
printf("Setting desktop %ld\n", target);
- assert(target >= 0 || target == (signed)0xffffffff);
- //assert(target == 0xffffffff || target < MAX);
- // XXX: move the window to the new desktop (and set root property)
+ if (!(target >= 0 || target == (signed)0xffffffff)) return;
+
_desktop = target;
+
+ Openbox::instance->property()->set(_window,
+ otk::OBProperty::net_wm_desktop,
+ otk::OBProperty::Atom_Cardinal,
+ (unsigned)_desktop);
+
+ // 'move' the window to the new desktop
+ if (_desktop == Openbox::instance->screen(_screen)->desktop() ||
+ _desktop == (signed)0xffffffff)
+ frame->show();
+ else
+ frame->hide();
}
setDesktop(e.data.l[0]); // use the original event
} else if (e.message_type == property->atom(otk::OBProperty::net_wm_state)) {
// can't compress these
+#ifdef DEBUG
+ printf("net_wm_state %s %ld %ld for 0x%lx\n",
+ (e.data.l[0] == 0 ? "Remove" : e.data.l[0] == 1 ? "Add" :
+ e.data.l[0] == 2 ? "Toggle" : "INVALID"),
+ e.data.l[1], e.data.l[2], _window);
+#endif
setState((StateAction)e.data.l[0], e.data.l[1], e.data.l[2]);
} else if (e.message_type ==
property->atom(otk::OBProperty::net_close_window)) {
+#ifdef DEBUG
+ printf("net_close_window for 0x%lx\n", _window);
+#endif
close();
} else if (e.message_type ==
property->atom(otk::OBProperty::net_active_window)) {
+#ifdef DEBUG
+ printf("net_active_window for 0x%lx\n", _window);
+#endif
+ if (_shaded)
+ shade(false);
+ // XXX: deiconify
focus();
Openbox::instance->screen(_screen)->restack(true, this); // raise
- } else {
}
}
void OBClient::shapeHandler(const XShapeEvent &e)
{
otk::OtkEventHandler::shapeHandler(e);
-
- _shaped = e.shaped;
- frame->adjustShape();
+
+ if (e.kind == ShapeBounding) {
+ _shaped = e.shaped;
+ frame->adjustShape();
+ }
}
#endif
_area.setPos(x, y);
// move the frame to be in the requested position
- frame->adjustPosition();
+ if (frame) // this can be called while mapping, before frame exists
+ frame->adjustPosition();
+
+ // send synthetic configure notify
+ XEvent event;
+ event.type = ConfigureNotify;
+ event.xconfigure.display = otk::OBDisplay::display;
+ event.xconfigure.event = _window;
+ event.xconfigure.window = _window;
+ event.xconfigure.x = x;
+ event.xconfigure.y = y;
+ event.xconfigure.width = _area.width();
+ event.xconfigure.height = _area.height();
+ event.xconfigure.border_width = _border_width;
+ event.xconfigure.above = frame->window();
+ event.xconfigure.override_redirect = False;
+ XSendEvent(event.xconfigure.display, event.xconfigure.window, False,
+ StructureNotifyMask, &event);
}
ce.xclient.data.l[2] = 0l;
ce.xclient.data.l[3] = 0l;
ce.xclient.data.l[4] = 0l;
- XSendEvent(otk::OBDisplay::display, _window, False, NoEventMask, &ce);
+ XSendEvent(otk::OBDisplay::display, _window, false, NoEventMask, &ce);
}
}
-void OBClient::setStackLayer(int l)
-{
- if (l == 0)
- _above = _below = false; // normal
- else if (l > 0) {
- _above = true;
- _below = false; // above
- } else {
- _above = false;
- _below = true; // below
- }
- changeState();
-}
-
-
void OBClient::shade(bool shade)
{
if (shade == _shaded) return; // already done
}
-bool OBClient::focus()
+bool OBClient::focus() const
{
- if (!(_can_focus || _focus_notify) || _focused) return false;
+ // won't try focus if the client doesn't want it, or if the window isn't
+ // visible on the screen
+ if (!(frame->isVisible() && (_can_focus || _focus_notify))) return false;
+
+ if (_focused) return true;
if (_can_focus)
- XSetInputFocus(otk::OBDisplay::display, _window, RevertToNone, CurrentTime);
+ XSetInputFocus(otk::OBDisplay::display, _window,
+ RevertToNone, CurrentTime);
if (_focus_notify) {
XEvent ce;
}
-void OBClient::unfocus()
+void OBClient::unfocus() const
{
if (!_focused) return;
frame->unfocus();
_focused = false;
- if (Openbox::instance->focusedClient() == this) {
- printf("UNFOCUSED!\n");
- Openbox::instance->setFocusedClient(this);
- }
+ if (Openbox::instance->focusedClient() == this)
+ Openbox::instance->setFocusedClient(0);
}
void OBClient::unmapHandler(const XUnmapEvent &e)
{
+ if (ignore_unmaps) {
#ifdef DEBUG
- printf("UnmapNotify for 0x%lx\n", e.window);
+ printf("Ignored UnmapNotify for 0x%lx (event 0x%lx)\n", e.window, e.event);
#endif // DEBUG
-
- if (ignore_unmaps) {
ignore_unmaps--;
return;
}
+#ifdef DEBUG
+ printf("UnmapNotify for 0x%lx\n", e.window);
+#endif // DEBUG
+
OtkEventHandler::unmapHandler(e);
// this deletes us etc
to an already unmapped window.
*/
+ // we don't want the reparent event, put it back on the stack for the X
+ // server to deal with after we unmanage the window
+ XEvent ev;
+ ev.xreparent = e;
+ XPutBackEvent(otk::OBDisplay::display, &ev);
+
// this deletes us etc
Openbox::instance->screen(_screen)->unmanageWindow(this);
}
projects / chaz / openbox / blobdiff