X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclient.cc;h=a427a21e6f63f759da1ffdd69dc3b2d0abcaf507;hb=bc88d310fea71823fb2c61d071ff499579bffaba;hp=34edff3e6e99444e9049006b4e4a3a41a0bbf451;hpb=34cd50ec5173e350b1d8b350fade2948c50113ee;p=chaz%2Fopenbox diff --git a/src/client.cc b/src/client.cc index 34edff3e..a427a21e 100644 --- a/src/client.cc +++ b/src/client.cc @@ -72,6 +72,10 @@ OBClient::~OBClient() { const otk::OBProperty *property = Openbox::instance->property(); + // clean up parents reference to this + if (_transient_for) + _transient_for->_transients.remove(this); // remove from old parent + if (Openbox::instance->state() != Openbox::State_Exiting) { // these values should not be persisted across a window unmapping/mapping property->erase(_window, otk::OBProperty::net_wm_desktop); @@ -85,11 +89,17 @@ void OBClient::getDesktop() 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, - &_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); + } } @@ -134,6 +144,8 @@ void OBClient::getType() // property->atom(otk::OBProperty::kde_net_wm_window_type_override)) // mwm_decorations = 0; // prevent this window from getting any decor // XXX: make this work again + if (_type != (WindowType) -1) + break; // grab the first known type } delete val; } @@ -643,12 +655,25 @@ void OBClient::setWMState(long state) 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(); } @@ -871,15 +896,29 @@ void OBClient::clientMessageHandler(const XClientMessageEvent &e) 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 { } } @@ -888,9 +927,11 @@ void OBClient::clientMessageHandler(const XClientMessageEvent &e) 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 @@ -962,7 +1003,26 @@ void OBClient::move(int x, int y) _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 (we don't need to if we aren't mapped + // yet) + 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); + } } @@ -989,7 +1049,7 @@ void OBClient::close() 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); } @@ -1035,21 +1095,6 @@ void OBClient::changeState() } -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 @@ -1061,12 +1106,17 @@ void OBClient::shade(bool shade) } -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; @@ -1089,7 +1139,7 @@ bool OBClient::focus() } -void OBClient::unfocus() +void OBClient::unfocus() const { if (!_focused) return; @@ -1101,7 +1151,7 @@ void OBClient::unfocus() void OBClient::focusHandler(const XFocusChangeEvent &e) { #ifdef DEBUG - printf("FocusIn for 0x%lx\n", e.window); +// printf("FocusIn for 0x%lx\n", e.window); #endif // DEBUG OtkEventHandler::focusHandler(e); @@ -1116,7 +1166,7 @@ void OBClient::focusHandler(const XFocusChangeEvent &e) void OBClient::unfocusHandler(const XFocusChangeEvent &e) { #ifdef DEBUG - printf("FocusOut for 0x%lx\n", e.window); +// printf("FocusOut for 0x%lx\n", e.window); #endif // DEBUG OtkEventHandler::unfocusHandler(e); @@ -1124,10 +1174,8 @@ void OBClient::unfocusHandler(const XFocusChangeEvent &e) 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); } @@ -1198,15 +1246,18 @@ void OBClient::configureRequestHandler(const XConfigureRequestEvent &e) 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 @@ -1245,21 +1296,14 @@ void OBClient::reparentHandler(const XReparentEvent &e) 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); } - -void OBClient::mapRequestHandler(const XMapRequestEvent &e) -{ - printf("\nMAP REQUEST\n\n"); - - otk::OtkEventHandler::mapRequestHandler(e); - - if (_shaded) - shade(false); - // XXX: uniconify the window - focus(); -} - }