X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclient.cc;h=ac196f933acfa9428eb9f4142afc98120f29ed2b;hb=d9e7a7b8cd667cc6e11add9062d3c12ef21b6fda;hp=914672503178a16763503c5b1985dc6668fb3a89;hpb=77a8e11660edd66279f2d3def6de3768874ba780;p=chaz%2Fopenbox diff --git a/src/client.cc b/src/client.cc index 91467250..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" @@ -37,9 +36,11 @@ OBClient::OBClient(int screen, Window window) // update EVERYTHING the first time!! // the state is kinda assumed to be normal. is this right? XXX - _wmstate = NormalState; + _wmstate = NormalState; _iconic = false; // no default decors or functions, each has to be enabled _decorations = _functions = 0; + // start unfocused + _focused = false; getArea(); getDesktop(); @@ -89,53 +90,7 @@ OBClient::OBClient(int screen, Window window) updateIconTitle(); updateClass(); -/* -#ifdef DEBUG - printf("Mapped window: 0x%lx\n" - " title: \t%s\t icon title: \t%s\n" - " app name: \t%s\t\t class: \t%s\n" - " position: \t%d, %d\t\t size: \t%d, %d\n" - " desktop: \t%lu\t\t group: \t0x%lx\n" - " type: \t%d\t\t min size \t%d, %d\n" - " base size \t%d, %d\t\t max size \t%d, %d\n" - " size incr \t%d, %d\t\t gravity \t%d\n" - " wm state \t%ld\t\t can be focused:\t%s\n" - " notify focus: \t%s\t\t urgent: \t%s\n" - " shaped: \t%s\t\t modal: \t%s\n" - " shaded: \t%s\t\t iconic: \t%s\n" - " vert maximized:\t%s\t\t horz maximized:\t%s\n" - " fullscreen: \t%s\t\t floating: \t%s\n" - " requested pos: \t%s\n", - _window, - _title.c_str(), - _icon_title.c_str(), - _app_name.c_str(), - _app_class.c_str(), - _area.x(), _area.y(), - _area.width(), _area.height(), - _desktop, - _group, - _type, - _min_x, _min_y, - _base_x, _base_y, - _max_x, _max_y, - _inc_x, _inc_y, - _gravity, - _wmstate, - _can_focus ? "yes" : "no", - _focus_notify ? "yes" : "no", - _urgent ? "yes" : "no", - _shaped ? "yes" : "no", - _modal ? "yes" : "no", - _shaded ? "yes" : "no", - _iconic ? "yes" : "no", - _max_vert ? "yes" : "no", - _max_horz ? "yes" : "no", - _fullscreen ? "yes" : "no", - _floating ? "yes" : "no", - _positioned ? "yes" : "no"); -#endif -*/ + calcLayer(); } @@ -143,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); + } } @@ -293,7 +250,8 @@ void OBClient::getState() { const otk::OBProperty *property = Openbox::instance->property(); - _modal = _shaded = _max_horz = _max_vert = _fullscreen = _floating = false; + _modal = _shaded = _max_horz = _max_vert = _fullscreen = _above = _below = + _skip_taskbar = _skip_pager = false; unsigned long *state; unsigned long num = (unsigned) -1; @@ -306,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; @@ -315,6 +279,12 @@ void OBClient::getState() else if (state[i] == property->atom(otk::OBProperty::net_wm_state_maximized_horz)) _max_horz = true; + else if (state[i] == + property->atom(otk::OBProperty::net_wm_state_above)) + _above = true; + else if (state[i] == + property->atom(otk::OBProperty::net_wm_state_below)) + _below = true; } delete [] state; @@ -341,6 +311,17 @@ void OBClient::getShaped() } +void OBClient::calcLayer() { + if (_iconic) _layer = OBScreen::Layer_Icon; + else if (_type == Type_Desktop) _layer = OBScreen::Layer_Desktop; + else if (_type == Type_Dock) _layer = OBScreen::Layer_Top; + else if (_fullscreen) _layer = OBScreen::Layer_Fullscreen; + else if (_above) _layer = OBScreen::Layer_Above; + else if (_below) _layer = OBScreen::Layer_Below; + else _layer = OBScreen::Layer_Normal; +} + + void OBClient::updateProtocols() { const otk::OBProperty *property = Openbox::instance->property(); @@ -460,6 +441,9 @@ void OBClient::updateTitle() if (_title.empty()) _title = _("Unnamed Window"); + + if (frame) + frame->setTitle(_title); } @@ -555,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; } @@ -566,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)) @@ -588,11 +574,19 @@ 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; - else if (state == property->atom(otk::OBProperty::net_wm_state_floating)) - action = _floating ? State_Remove : State_Add; + else if (state == property->atom(otk::OBProperty::net_wm_state_above)) + action = _above ? State_Remove : State_Add; + else if (state == property->atom(otk::OBProperty::net_wm_state_below)) + action = _below ? State_Remove : State_Add; } if (action == State_Add) { @@ -613,18 +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; + restack = true; } else if (state == - property->atom(otk::OBProperty::net_wm_state_floating)) { - if (_floating) continue; - _floating = true; - // XXX: raise the window n shit + property->atom(otk::OBProperty::net_wm_state_below)) { + if (_below) continue; + _below = true; + restack = true; } } else { // action == State_Remove @@ -644,21 +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; + restack = true; } else if (state == - property->atom(otk::OBProperty::net_wm_state_floating)) { - if (!_floating) continue; - _floating = false; - // XXX: lower the window to its proper layer + property->atom(otk::OBProperty::net_wm_state_below)) { + if (!_below) continue; + _below = false; + restack = true; } } } + if (shadestate != _shaded) + shade(shadestate); + if (restack) { + calcLayer(); + Openbox::instance->screen(_screen)->restack(true, this); // raise + } } @@ -674,8 +696,6 @@ void OBClient::toggleClientBorder(bool addborder) case NorthWestGravity: case WestGravity: case SouthWestGravity: - if (addborder) x += _border_width; - else x -= _border_width; break; case NorthEastGravity: case EastGravity: @@ -688,8 +708,6 @@ void OBClient::toggleClientBorder(bool addborder) case NorthWestGravity: case NorthGravity: case NorthEastGravity: - if (addborder) y += _border_width; - else y -= _border_width; break; case SouthWestGravity: case SouthGravity: @@ -756,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(); + } } @@ -778,6 +802,11 @@ void OBClient::resize(Corner anchor, int w, int h) w -= _base_size.x(); h -= _base_size.y(); + // for interactive resizing. have to move half an increment in each + // direction. + w += _size_inc.x() / 2; + h += _size_inc.y() / 2; + // is the window resizable? if it is not, then don't check its sizes, the // client can do what it wants and the user can't change it anyhow if (_min_size.x() <= _max_size.x() && _min_size.y() <= _max_size.y()) { @@ -834,8 +863,157 @@ void OBClient::move(int x, int y) } +void OBClient::close() +{ + XEvent ce; + const otk::OBProperty *property = Openbox::instance->property(); + + if (!(_functions & Func_Close)) return; + + // XXX: itd be cool to do timeouts and shit here for killing the client's + // process off + + 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_delete_window); + ce.xclient.data.l[1] = CurrentTime; + 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); +} + + +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 || _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); + } + + return true; +} + + +void OBClient::unfocus() +{ + if (!_focused) return; + + assert(Openbox::instance->focusedClient() == this); + Openbox::instance->setFocusedClient(0); +} + + +void OBClient::focusHandler(const XFocusChangeEvent &e) +{ +#ifdef DEBUG + printf("FocusIn for 0x%lx\n", e.window); +#endif // DEBUG + + OtkEventHandler::focusHandler(e); + + frame->focus(); + _focused = true; + + Openbox::instance->setFocusedClient(this); +} + + +void OBClient::unfocusHandler(const XFocusChangeEvent &e) +{ +#ifdef DEBUG + printf("FocusOut for 0x%lx\n", e.window); +#endif // DEBUG + + OtkEventHandler::unfocusHandler(e); + + frame->unfocus(); + _focused = false; + + if (Openbox::instance->focusedClient() == this) { + printf("UNFOCUSED!\n"); + Openbox::instance->setFocusedClient(this); + } +} + + void OBClient::configureRequestHandler(const XConfigureRequestEvent &e) { +#ifdef DEBUG + printf("ConfigureRequest for 0x%lx\n", e.window); +#endif // DEBUG + OtkEventHandler::configureRequestHandler(e); // XXX: if we are iconic (or shaded? (fvwm does that)) ignore the event @@ -843,7 +1021,7 @@ void OBClient::configureRequestHandler(const XConfigureRequestEvent &e) if (e.value_mask & CWBorderWidth) _border_width = e.border_width; - // resize, then move, as specified in the EWMH section 7.7 + // resize, then move, as specified in the EWMH section 7.7 if (e.value_mask & (CWWidth | CWHeight)) { int w = (e.value_mask & CWWidth) ? e.width : _area.width(); int h = (e.value_mask & CWHeight) ? e.height : _area.height(); @@ -922,4 +1100,26 @@ void OBClient::destroyHandler(const XDestroyWindowEvent &e) } +void OBClient::reparentHandler(const XReparentEvent &e) +{ + // this is when the client is first taken captive in the frame + if (e.parent == frame->plate()) return; + +#ifdef DEBUG + printf("ReparentNotify for 0x%lx\n", e.window); +#endif // DEBUG + + OtkEventHandler::reparentHandler(e); + + /* + This event is quite rare and is usually handled in unmapHandler. + However, if the window is unmapped when the reparent event occurs, + the window manager never sees it because an unmap event is not sent + to an already unmapped window. + */ + + // this deletes us etc + Openbox::instance->screen(_screen)->unmanageWindow(this); +} + }