X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclient.cc;h=ac196f933acfa9428eb9f4142afc98120f29ed2b;hb=d9e7a7b8cd667cc6e11add9062d3c12ef21b6fda;hp=2dec38555ca778a9c081e878c35a2d2bc2a40530;hpb=13f2930de727539fce8bd759450706b6094d5a98;p=chaz%2Fopenbox diff --git a/src/client.cc b/src/client.cc index 2dec3855..ac196f93 100644 --- a/src/client.cc +++ b/src/client.cc @@ -7,7 +7,6 @@ #include "client.hh" #include "frame.hh" #include "screen.hh" -#include "bbscreen.hh" #include "openbox.hh" #include "otk/display.hh" #include "otk/property.hh" @@ -99,9 +98,11 @@ OBClient::~OBClient() { const otk::OBProperty *property = Openbox::instance->property(); - // these values should not be persisted across a window unmapping/mapping - property->erase(_window, otk::OBProperty::net_wm_desktop); - property->erase(_window, otk::OBProperty::net_wm_state); + 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); + property->erase(_window, otk::OBProperty::net_wm_state); + } } @@ -250,7 +251,7 @@ void OBClient::getState() const otk::OBProperty *property = Openbox::instance->property(); _modal = _shaded = _max_horz = _max_vert = _fullscreen = _above = _below = - false; + _skip_taskbar = _skip_pager = false; unsigned long *state; unsigned long num = (unsigned) -1; @@ -263,6 +264,12 @@ void OBClient::getState() else if (state[i] == property->atom(otk::OBProperty::net_wm_state_shaded)) _shaded = true; + else if (state[i] == + property->atom(otk::OBProperty::net_wm_state_skip_taskbar)) + _skip_taskbar = true; + else if (state[i] == + property->atom(otk::OBProperty::net_wm_state_skip_pager)) + _skip_pager = true; else if (state[i] == property->atom(otk::OBProperty::net_wm_state_fullscreen)) _fullscreen = true; @@ -532,10 +539,11 @@ void OBClient::setWMState(long state) void OBClient::setDesktop(long target) { - assert(target >= 0); + 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 + + // XXX: move the window to the new desktop (and set root property) _desktop = target; } @@ -543,6 +551,7 @@ void OBClient::setDesktop(long target) void OBClient::setState(StateAction action, long data1, long data2) { const otk::OBProperty *property = Openbox::instance->property(); + bool restack = false, shadestate = _shaded; if (!(action == State_Add || action == State_Remove || action == State_Toggle)) @@ -565,6 +574,12 @@ void OBClient::setState(StateAction action, long data1, long data2) action = _max_horz ? State_Remove : State_Add; else if (state == property->atom(otk::OBProperty::net_wm_state_shaded)) action = _shaded ? State_Remove : State_Add; + else if (state == + property->atom(otk::OBProperty::net_wm_state_skip_taskbar)) + action = _skip_taskbar ? State_Remove : State_Add; + else if (state == + property->atom(otk::OBProperty::net_wm_state_skip_pager)) + action = _skip_pager ? State_Remove : State_Add; else if (state == property->atom(otk::OBProperty::net_wm_state_fullscreen)) action = _fullscreen ? State_Remove : State_Add; @@ -592,23 +607,29 @@ void OBClient::setState(StateAction action, long data1, long data2) } else if (state == property->atom(otk::OBProperty::net_wm_state_shaded)) { if (_shaded) continue; - _shaded = true; - // XXX: hide the client window + // shade when we're all thru here + shadestate = true; + } else if (state == + property->atom(otk::OBProperty::net_wm_state_skip_taskbar)) { + _skip_taskbar = true; + } else if (state == + property->atom(otk::OBProperty::net_wm_state_skip_pager)) { + _skip_pager = true; } else if (state == property->atom(otk::OBProperty::net_wm_state_fullscreen)) { if (_fullscreen) continue; _fullscreen = true; - // XXX: raise the window n shit + restack = false; } else if (state == property->atom(otk::OBProperty::net_wm_state_above)) { if (_above) continue; _above = true; - // XXX: raise the window n shit + restack = true; } else if (state == property->atom(otk::OBProperty::net_wm_state_below)) { if (_below) continue; _below = true; - // XXX: lower the window n shit + restack = true; } } else { // action == State_Remove @@ -628,28 +649,38 @@ void OBClient::setState(StateAction action, long data1, long data2) } else if (state == property->atom(otk::OBProperty::net_wm_state_shaded)) { if (!_shaded) continue; - _shaded = false; - // XXX: show the client window + // unshade when we're all thru here + shadestate = false; + } else if (state == + property->atom(otk::OBProperty::net_wm_state_skip_taskbar)) { + _skip_taskbar = false; + } else if (state == + property->atom(otk::OBProperty::net_wm_state_skip_pager)) { + _skip_pager = false; } else if (state == property->atom(otk::OBProperty::net_wm_state_fullscreen)) { if (!_fullscreen) continue; _fullscreen = false; - // XXX: lower the window to its proper layer + restack = true; } else if (state == property->atom(otk::OBProperty::net_wm_state_above)) { if (!_above) continue; _above = false; - // XXX: lower the window to its proper layer + restack = true; } else if (state == property->atom(otk::OBProperty::net_wm_state_below)) { if (!_below) continue; _below = false; - // XXX: raise the window to its proper layer + restack = true; } } } - calcLayer(); - Openbox::instance->screen(_screen)->restack(true, this); // raise + if (shadestate != _shaded) + shade(shadestate); + if (restack) { + calcLayer(); + Openbox::instance->screen(_screen)->restack(true, this); // raise + } } @@ -743,10 +774,16 @@ void OBClient::clientMessageHandler(const XClientMessageEvent &e) setDesktop(e.data.l[0]); // use the found event else setDesktop(e.data.l[0]); // use the original event - } - else if (e.message_type == property->atom(otk::OBProperty::net_wm_state)) + } else if (e.message_type == property->atom(otk::OBProperty::net_wm_state)) { // can't compress these 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)) { + close(); + } else if (e.message_type == + property->atom(otk::OBProperty::net_active_window)) { + focus(); + } } @@ -850,11 +887,81 @@ void OBClient::close() } +void OBClient::changeState() +{ + const otk::OBProperty *property = Openbox::instance->property(); + + unsigned long state[2]; + state[0] = _wmstate; + state[1] = None; + property->set(_window, otk::OBProperty::wm_state, otk::OBProperty::wm_state, + state, 2); + + Atom netstate[10]; + int num = 0; + if (_modal) + netstate[num++] = property->atom(otk::OBProperty::net_wm_state_modal); + if (_shaded) + netstate[num++] = property->atom(otk::OBProperty::net_wm_state_shaded); + if (_iconic) + netstate[num++] = property->atom(otk::OBProperty::net_wm_state_hidden); + if (_skip_taskbar) + netstate[num++] = + property->atom(otk::OBProperty::net_wm_state_skip_taskbar); + if (_skip_pager) + netstate[num++] = property->atom(otk::OBProperty::net_wm_state_skip_pager); + if (_fullscreen) + netstate[num++] = property->atom(otk::OBProperty::net_wm_state_fullscreen); + if (_max_vert) + netstate[num++] = + property->atom(otk::OBProperty::net_wm_state_maximized_vert); + if (_max_horz) + netstate[num++] = + property->atom(otk::OBProperty::net_wm_state_maximized_horz); + if (_above) + netstate[num++] = property->atom(otk::OBProperty::net_wm_state_above); + if (_below) + netstate[num++] = property->atom(otk::OBProperty::net_wm_state_below); + property->set(_window, otk::OBProperty::net_wm_state, + otk::OBProperty::Atom_Atom, netstate, num); + +} + +void OBClient::shade(bool shade) +{ + if (shade == _shaded) return; // already done + + _wmstate = shade ? IconicState : NormalState; + _shaded = shade; + changeState(); + frame->adjustSize(); +} + + bool OBClient::focus() { - if (!_can_focus || _focused) return false; + if (!(_can_focus || _focus_notify) || _focused) return false; + + if (_can_focus) + XSetInputFocus(otk::OBDisplay::display, _window, RevertToNone, CurrentTime); + + if (_focus_notify) { + XEvent ce; + const otk::OBProperty *property = Openbox::instance->property(); + + ce.xclient.type = ClientMessage; + ce.xclient.message_type = property->atom(otk::OBProperty::wm_protocols); + ce.xclient.display = otk::OBDisplay::display; + ce.xclient.window = _window; + ce.xclient.format = 32; + ce.xclient.data.l[0] = property->atom(otk::OBProperty::wm_take_focus); + ce.xclient.data.l[1] = Openbox::instance->lastTime(); + 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); + } - XSetInputFocus(otk::OBDisplay::display, _window, RevertToNone, CurrentTime); return true; }