X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclient.cc;h=eeb09a374981a4fe5cfe9dc30d3f6386c6faa980;hb=5face4c6f35172761367f63ac0b6eaf62d84e532;hp=44e4d9eb550f691548532ac194a19dd9a96f492b;hpb=77ab46d1e35d48e73c201e6de88b26f48bb06425;p=chaz%2Fopenbox diff --git a/src/client.cc b/src/client.cc index 44e4d9eb..eeb09a37 100644 --- a/src/client.cc +++ b/src/client.cc @@ -8,12 +8,14 @@ #include "frame.hh" #include "screen.hh" #include "openbox.hh" +#include "bindings.hh" #include "otk/display.hh" #include "otk/property.hh" extern "C" { #include #include +#include #include @@ -35,16 +37,16 @@ Client::Client(int screen, Window window) // update EVERYTHING the first time!! - // the state is kinda assumed to be normal. is this right? XXX - _wmstate = NormalState; _iconic = false; - // no default decors or functions, each has to be enabled - _decorations = _functions = 0; + // we default to NormalState, visible + _wmstate = NormalState; // start unfocused _focused = false; // not a transient by default of course _transient_for = 0; // pick a layer to start from _layer = Layer_Normal; + // default to not urgent + _urgent = false; getArea(); getDesktop(); @@ -53,99 +55,119 @@ Client::Client(int screen, Window window) getType(); getMwmHints(); - setupDecorAndFunctions(); - getState(); getShaped(); updateProtocols(); - updateNormalHints(); - updateWMHints(); + + // got the type, the mwmhints, and the protocols, so we're ready to set up + // the decorations/functions + setupDecorAndFunctions(); + + getGravity(); // get the attribute gravity + updateNormalHints(); // this may override the attribute gravity + // also get the initial_state and set _iconic if we aren't "starting" + // when we're "starting" that means we should use whatever state was already + // on the window over the initial map state, because it was already mapped + updateWMHints(openbox->state() != Openbox::State_Starting); updateTitle(); updateIconTitle(); updateClass(); updateStrut(); + // this makes sure that these windows appear on all desktops + if (/*_type == Type_Dock ||*/ _type == Type_Desktop) + _desktop = 0xffffffff; + + // set the desktop hint, to make sure that it always exists, and to reflect + // any changes we've made here + otk::Property::set(_window, otk::Property::atoms.net_wm_desktop, + otk::Property::atoms.cardinal, (unsigned)_desktop); + changeState(); } Client::~Client() { - const otk::Property *property = Openbox::instance->property(); - + // clean up childrens' references + while (!_transients.empty()) { + _transients.front()->_transient_for = 0; + _transients.pop_front(); + } + // 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) { + if (openbox->state() != Openbox::State_Exiting) { // these values should not be persisted across a window unmapping/mapping - property->erase(_window, otk::Property::net_wm_desktop); - property->erase(_window, otk::Property::net_wm_state); + otk::Property::erase(_window, otk::Property::atoms.net_wm_desktop); + otk::Property::erase(_window, otk::Property::atoms.net_wm_state); + } else { + // if we're left in an iconic state, the client wont be mapped. this is + // bad, since we will no longer be managing the window on restart + if (_iconic) + XMapWindow(**otk::display, _window); } } -void Client::getDesktop() +void Client::getGravity() { - const otk::Property *property = Openbox::instance->property(); + XWindowAttributes wattrib; + Status ret; + + ret = XGetWindowAttributes(**otk::display, _window, &wattrib); + assert(ret != BadWindow); + _gravity = wattrib.win_gravity; +} + +void Client::getDesktop() +{ // defaults to the current desktop - _desktop = Openbox::instance->screen(_screen)->desktop(); - - if (!property->get(_window, otk::Property::net_wm_desktop, - otk::Property::Atom_Cardinal, - (long unsigned*)&_desktop)) { - // make sure the hint exists - Openbox::instance->property()->set(_window, - otk::Property::net_wm_desktop, - otk::Property::Atom_Cardinal, - (unsigned)_desktop); + _desktop = openbox->screen(_screen)->desktop(); + + if (otk::Property::get(_window, otk::Property::atoms.net_wm_desktop, + otk::Property::atoms.cardinal, + (long unsigned*)&_desktop)) { +#ifdef DEBUG +// printf("Window requested desktop: %ld\n", _desktop); +#endif } } void Client::getType() { - const otk::Property *property = Openbox::instance->property(); - _type = (WindowType) -1; unsigned long *val; unsigned long num = (unsigned) -1; - if (property->get(_window, otk::Property::net_wm_window_type, - otk::Property::Atom_Atom, - &num, &val)) { + if (otk::Property::get(_window, otk::Property::atoms.net_wm_window_type, + otk::Property::atoms.atom, &num, &val)) { // use the first value that we know about in the array for (unsigned long i = 0; i < num; ++i) { - if (val[i] == - property->atom(otk::Property::net_wm_window_type_desktop)) + if (val[i] == otk::Property::atoms.net_wm_window_type_desktop) _type = Type_Desktop; - else if (val[i] == - property->atom(otk::Property::net_wm_window_type_dock)) + else if (val[i] == otk::Property::atoms.net_wm_window_type_dock) _type = Type_Dock; - else if (val[i] == - property->atom(otk::Property::net_wm_window_type_toolbar)) + else if (val[i] == otk::Property::atoms.net_wm_window_type_toolbar) _type = Type_Toolbar; - else if (val[i] == - property->atom(otk::Property::net_wm_window_type_menu)) + else if (val[i] == otk::Property::atoms.net_wm_window_type_menu) _type = Type_Menu; - else if (val[i] == - property->atom(otk::Property::net_wm_window_type_utility)) + else if (val[i] == otk::Property::atoms.net_wm_window_type_utility) _type = Type_Utility; - else if (val[i] == - property->atom(otk::Property::net_wm_window_type_splash)) + else if (val[i] == otk::Property::atoms.net_wm_window_type_splash) _type = Type_Splash; - else if (val[i] == - property->atom(otk::Property::net_wm_window_type_dialog)) + else if (val[i] == otk::Property::atoms.net_wm_window_type_dialog) _type = Type_Dialog; - else if (val[i] == - property->atom(otk::Property::net_wm_window_type_normal)) + else if (val[i] == otk::Property::atoms.net_wm_window_type_normal) _type = Type_Normal; -// else if (val[i] == -// property->atom(otk::Property::kde_net_wm_window_type_override)) -// mwm_decorations = 0; // prevent this window from getting any decor - // XXX: make this work again +// XXX: make this work again +// else if (val[i] == otk::Property::atoms.kde_net_wm_window_type_override) +// mwm_decorations = 0; // prevent this window from getting any decor if (_type != (WindowType) -1) break; // grab the first known type } @@ -167,15 +189,21 @@ void Client::getType() void Client::setupDecorAndFunctions() { - // start with everything + // start with everything (cept fullscreen) _decorations = Decor_Titlebar | Decor_Handle | Decor_Border | - Decor_Iconify | Decor_Maximize; - _functions = Func_Resize | Func_Move | Func_Iconify | Func_Maximize; + Decor_AllDesktops | Decor_Iconify | Decor_Maximize; + _functions = Func_Resize | Func_Move | Func_Iconify | Func_Maximize | + Func_Shade; + if (_delete_window) { + _decorations |= Decor_Close; + _functions |= Func_Close; + } switch (_type) { case Type_Normal: // normal windows retain all of the possible decorations and - // functionality + // functionality, and are the only windows that you can fullscreen + _functions |= Func_Fullscreen; case Type_Dialog: // dialogs cannot be maximized @@ -208,8 +236,11 @@ void Client::setupDecorAndFunctions() _decorations &= ~Decor_Border; if (! (_mwmhints.decorations & MwmDecor_Handle)) _decorations &= ~Decor_Handle; - if (! (_mwmhints.decorations & MwmDecor_Title)) + if (! (_mwmhints.decorations & MwmDecor_Title)) { _decorations &= ~Decor_Titlebar; + // if we don't have a titlebar, then we cannot shade! + _functions &= ~Func_Shade; + } if (! (_mwmhints.decorations & MwmDecor_Iconify)) _decorations &= ~Decor_Iconify; if (! (_mwmhints.decorations & MwmDecor_Maximize)) @@ -233,22 +264,20 @@ void Client::setupDecorAndFunctions() } } - // XXX: changeAllowedActions(); + changeAllowedActions(); } void Client::getMwmHints() { - const otk::Property *property = Openbox::instance->property(); - unsigned long num = MwmHints::elements; unsigned long *hints; _mwmhints.flags = 0; // default to none - if (!property->get(_window, otk::Property::motif_wm_hints, - otk::Property::motif_wm_hints, &num, - (unsigned long **)&hints)) + if (!otk::Property::get(_window, otk::Property::atoms.motif_wm_hints, + otk::Property::atoms.motif_wm_hints, &num, + (unsigned long **)&hints)) return; if (num >= MwmHints::elements) { @@ -267,7 +296,7 @@ void Client::getArea() XWindowAttributes wattrib; Status ret; - ret = XGetWindowAttributes(otk::Display::display, _window, &wattrib); + ret = XGetWindowAttributes(**otk::display, _window, &wattrib); assert(ret != BadWindow); _area.setRect(wattrib.x, wattrib.y, wattrib.width, wattrib.height); @@ -277,43 +306,34 @@ void Client::getArea() void Client::getState() { - const otk::Property *property = Openbox::instance->property(); - _modal = _shaded = _max_horz = _max_vert = _fullscreen = _above = _below = - _skip_taskbar = _skip_pager = false; + _iconic = _skip_taskbar = _skip_pager = false; unsigned long *state; unsigned long num = (unsigned) -1; - if (property->get(_window, otk::Property::net_wm_state, - otk::Property::Atom_Atom, &num, &state)) { + if (otk::Property::get(_window, otk::Property::atoms.net_wm_state, + otk::Property::atoms.atom, &num, &state)) { for (unsigned long i = 0; i < num; ++i) { - if (state[i] == property->atom(otk::Property::net_wm_state_modal)) + if (state[i] == otk::Property::atoms.net_wm_state_modal) _modal = true; - else if (state[i] == - property->atom(otk::Property::net_wm_state_shaded)) { + else if (state[i] == otk::Property::atoms.net_wm_state_shaded) _shaded = true; - _wmstate = IconicState; - } else if (state[i] == - property->atom(otk::Property::net_wm_state_skip_taskbar)) + else if (state[i] == otk::Property::atoms.net_wm_state_hidden) + _iconic = true; + else if (state[i] == otk::Property::atoms.net_wm_state_skip_taskbar) _skip_taskbar = true; - else if (state[i] == - property->atom(otk::Property::net_wm_state_skip_pager)) + else if (state[i] == otk::Property::atoms.net_wm_state_skip_pager) _skip_pager = true; - else if (state[i] == - property->atom(otk::Property::net_wm_state_fullscreen)) + else if (state[i] == otk::Property::atoms.net_wm_state_fullscreen) _fullscreen = true; - else if (state[i] == - property->atom(otk::Property::net_wm_state_maximized_vert)) + else if (state[i] == otk::Property::atoms.net_wm_state_maximized_vert) _max_vert = true; - else if (state[i] == - property->atom(otk::Property::net_wm_state_maximized_horz)) + else if (state[i] == otk::Property::atoms.net_wm_state_maximized_horz) _max_horz = true; - else if (state[i] == - property->atom(otk::Property::net_wm_state_above)) + else if (state[i] == otk::Property::atoms.net_wm_state_above) _above = true; - else if (state[i] == - property->atom(otk::Property::net_wm_state_below)) + else if (state[i] == otk::Property::atoms.net_wm_state_below) _below = true; } @@ -326,14 +346,14 @@ void Client::getShaped() { _shaped = false; #ifdef SHAPE - if (otk::Display::shape()) { + if (otk::display->shape()) { int foo; unsigned int ufoo; int s; - XShapeSelectInput(otk::Display::display, _window, ShapeNotifyMask); + XShapeSelectInput(**otk::display, _window, ShapeNotifyMask); - XShapeQueryExtents(otk::Display::display, _window, &s, &foo, + XShapeQueryExtents(**otk::display, _window, &s, &foo, &foo, &ufoo, &ufoo, &foo, &foo, &foo, &ufoo, &ufoo); _shaped = (s != 0); } @@ -362,7 +382,7 @@ void Client::calcLayer() { if we don't have a frame, then we aren't mapped yet (and this would SIGSEGV :) */ - Openbox::instance->screen(_screen)->restack(true, this); // raise + openbox->screen(_screen)->raiseWindow(this); } } } @@ -370,23 +390,18 @@ void Client::calcLayer() { void Client::updateProtocols() { - const otk::Property *property = Openbox::instance->property(); - Atom *proto; int num_return = 0; _focus_notify = false; - _decorations &= ~Decor_Close; - _functions &= ~Func_Close; + _delete_window = false; - if (XGetWMProtocols(otk::Display::display, _window, &proto, &num_return)) { + if (XGetWMProtocols(**otk::display, _window, &proto, &num_return)) { for (int i = 0; i < num_return; ++i) { - if (proto[i] == property->atom(otk::Property::wm_delete_window)) { - _decorations |= Decor_Close; - _functions |= Func_Close; - if (frame) - frame->adjustSize(); // update the decorations - } else if (proto[i] == property->atom(otk::Property::wm_take_focus)) + if (proto[i] == otk::Property::atoms.wm_delete_window) { + // this means we can request the window to close + _delete_window = true; + } else if (proto[i] == otk::Property::atoms.wm_take_focus) // if this protocol is requested, then the window will be notified // by the window manager whenever it receives focus _focus_notify = true; @@ -403,7 +418,6 @@ void Client::updateNormalHints() int oldgravity = _gravity; // defaults - _gravity = NorthWestGravity; _size_inc.setPoint(1, 1); _base_size.setPoint(0, 0); _min_size.setPoint(0, 0); @@ -413,11 +427,21 @@ void Client::updateNormalHints() // point.. // get the hints from the window - if (XGetWMNormalHints(otk::Display::display, _window, &size, &ret)) { + if (XGetWMNormalHints(**otk::display, _window, &size, &ret)) { _positioned = (size.flags & (PPosition|USPosition)); - if (size.flags & PWinGravity) + if (size.flags & PWinGravity) { _gravity = size.win_gravity; + + // if the client has a frame, i.e. has already been mapped and is + // changing its gravity + if (frame && _gravity != oldgravity) { + // move our idea of the client's position based on its new gravity + int x, y; + frame->frameGravity(x, y); + _area.setPos(x, y); + } + } if (size.flags & PMinSize) _min_size.setPoint(size.min_width, size.min_height); @@ -431,32 +455,27 @@ void Client::updateNormalHints() if (size.flags & PResizeInc) _size_inc.setPoint(size.width_inc, size.height_inc); } - - // if the client has a frame, i.e. has already been mapped and is - // changing its gravity - if (frame && _gravity != oldgravity) { - // move our idea of the client's position based on its new gravity - int x, y; - frame->frameGravity(x, y); - _area.setPos(x, y); - } } -void Client::updateWMHints() +void Client::updateWMHints(bool initstate) { XWMHints *hints; // assume a window takes input if it doesnt specify _can_focus = true; - _urgent = false; + bool ur = false; - if ((hints = XGetWMHints(otk::Display::display, _window)) != NULL) { + if ((hints = XGetWMHints(**otk::display, _window)) != NULL) { if (hints->flags & InputHint) _can_focus = hints->input; + // only do this when initstate is true! + if (initstate && (hints->flags & StateHint)) + _iconic = hints->initial_state == IconicState; + if (hints->flags & XUrgencyHint) - _urgent = true; + ur = true; if (hints->flags & WindowGroupHint) { if (hints->window_group != _group) { @@ -469,21 +488,31 @@ void Client::updateWMHints() XFree(hints); } + + if (ur != _urgent) { + _urgent = ur; +#ifdef DEBUG + printf("DEBUG: Urgent Hint for 0x%lx: %s\n", + (long)_window, _urgent ? "ON" : "OFF"); +#endif + // fire the urgent callback if we're mapped, otherwise, wait until after + // we're mapped + if (_urgent && frame) + fireUrgent(); + } } void Client::updateTitle() { - const otk::Property *property = Openbox::instance->property(); - _title = ""; // try netwm - if (! property->get(_window, otk::Property::net_wm_name, - otk::Property::utf8, &_title)) { + if (!otk::Property::get(_window, otk::Property::atoms.net_wm_name, + otk::Property::utf8, &_title)) { // try old x stuff - property->get(_window, otk::Property::wm_name, - otk::Property::ascii, &_title); + otk::Property::get(_window, otk::Property::atoms.wm_name, + otk::Property::ascii, &_title); } if (_title.empty()) @@ -496,16 +525,14 @@ void Client::updateTitle() void Client::updateIconTitle() { - const otk::Property *property = Openbox::instance->property(); - _icon_title = ""; // try netwm - if (! property->get(_window, otk::Property::net_wm_icon_name, - otk::Property::utf8, &_icon_title)) { + if (!otk::Property::get(_window, otk::Property::atoms.net_wm_icon_name, + otk::Property::utf8, &_icon_title)) { // try old x stuff - property->get(_window, otk::Property::wm_icon_name, - otk::Property::ascii, &_icon_title); + otk::Property::get(_window, otk::Property::atoms.wm_icon_name, + otk::Property::ascii, &_icon_title); } if (_title.empty()) @@ -515,25 +542,23 @@ void Client::updateIconTitle() void Client::updateClass() { - const otk::Property *property = Openbox::instance->property(); - // set the defaults _app_name = _app_class = _role = ""; otk::Property::StringVect v; unsigned long num = 2; - if (property->get(_window, otk::Property::wm_class, - otk::Property::ascii, &num, &v)) { - if (num > 0) _app_name = v[0]; - if (num > 1) _app_class = v[1]; + if (otk::Property::get(_window, otk::Property::atoms.wm_class, + otk::Property::ascii, &num, &v)) { + if (num > 0) _app_name = v[0].c_str(); + if (num > 1) _app_class = v[1].c_str(); } v.clear(); num = 1; - if (property->get(_window, otk::Property::wm_window_role, - otk::Property::ascii, &num, &v)) { - if (num > 0) _role = v[0]; + if (otk::Property::get(_window, otk::Property::atoms.wm_window_role, + otk::Property::ascii, &num, &v)) { + if (num > 0) _role = v[0].c_str(); } } @@ -542,19 +567,17 @@ void Client::updateStrut() { unsigned long num = 4; unsigned long *data; - if (!Openbox::instance->property()->get(_window, - otk::Property::net_wm_strut, - otk::Property::Atom_Cardinal, - &num, &data)) + if (!otk::Property::get(_window, otk::Property::atoms.net_wm_strut, + otk::Property::atoms.cardinal, &num, &data)) return; if (num == 4) { _strut.left = data[0]; _strut.right = data[1]; _strut.top = data[2]; - _strut.bottom = data[3]; - - Openbox::instance->screen(_screen)->updateStrut(); + _strut.bottom = data[3]; + + openbox->screen(_screen)->updateStrut(); } delete [] data; @@ -566,16 +589,16 @@ void Client::updateTransientFor() Window t = 0; Client *c = 0; - if (XGetTransientForHint(otk::Display::display, _window, &t) && + if (XGetTransientForHint(**otk::display, _window, &t) && t != _window) { // cant be transient to itself! - c = Openbox::instance->findClient(t); + c = openbox->findClient(t); assert(c != this); // if this happens then we need to check for it if (!c /*XXX: && _group*/) { // not transient to a client, see if it is transient for a group if (//t == _group->leader() || t == None || - t == otk::Display::screenInfo(_screen)->rootWindow()) { + t == otk::display->screenInfo(_screen)->rootWindow()) { // window is a transient for its group! // XXX: for now this is treated as non-transient. // this needs to be fixed! @@ -600,15 +623,13 @@ void Client::propertyHandler(const XPropertyEvent &e) { otk::EventHandler::propertyHandler(e); - const otk::Property *property = Openbox::instance->property(); - // compress changes to a single property into a single change XEvent ce; - while (XCheckTypedEvent(otk::Display::display, e.type, &ce)) { + while (XCheckTypedEvent(**otk::display, e.type, &ce)) { // XXX: it would be nice to compress ALL changes to a property, not just // changes in a row without other props between. if (ce.xproperty.atom != e.atom) { - XPutBackEvent(otk::Display::display, &ce); + XPutBackEvent(**otk::display, &ce); break; } } @@ -624,17 +645,20 @@ void Client::propertyHandler(const XPropertyEvent &e) setupDecorAndFunctions(); frame->adjustSize(); // this updates the frame for any new decor settings } - else if (e.atom == property->atom(otk::Property::net_wm_name) || - e.atom == property->atom(otk::Property::wm_name)) + else if (e.atom == otk::Property::atoms.net_wm_name || + e.atom == otk::Property::atoms.wm_name) updateTitle(); - else if (e.atom == property->atom(otk::Property::net_wm_icon_name) || - e.atom == property->atom(otk::Property::wm_icon_name)) + else if (e.atom == otk::Property::atoms.net_wm_icon_name || + e.atom == otk::Property::atoms.wm_icon_name) updateIconTitle(); - else if (e.atom == property->atom(otk::Property::wm_class)) + else if (e.atom == otk::Property::atoms.wm_class) updateClass(); - else if (e.atom == property->atom(otk::Property::wm_protocols)) + else if (e.atom == otk::Property::atoms.wm_protocols) { updateProtocols(); - else if (e.atom == property->atom(otk::Property::net_wm_strut)) + setupDecorAndFunctions(); + frame->adjustSize(); // update the decorations + } + else if (e.atom == otk::Property::atoms.net_wm_strut) updateStrut(); } @@ -643,13 +667,12 @@ void Client::setWMState(long state) { if (state == _wmstate) return; // no change - _wmstate = state; - switch (_wmstate) { + switch (state) { case IconicState: - // XXX: cause it to iconify + setDesktop(ICONIC_DESKTOP); break; case NormalState: - // XXX: cause it to uniconify + setDesktop(openbox->screen(_screen)->desktop()); break; } } @@ -661,28 +684,51 @@ void Client::setDesktop(long target) printf("Setting desktop %ld\n", target); - if (!(target >= 0 || target == (signed)0xffffffff)) return; + if (!(target >= 0 || target == (signed)0xffffffff || + target == ICONIC_DESKTOP)) + return; _desktop = target; - Openbox::instance->property()->set(_window, - otk::Property::net_wm_desktop, - otk::Property::Atom_Cardinal, - (unsigned)_desktop); + // set the desktop hint, but not if we're iconifying + if (_desktop != ICONIC_DESKTOP) + otk::Property::set(_window, otk::Property::atoms.net_wm_desktop, + otk::Property::atoms.cardinal, (unsigned)_desktop); // 'move' the window to the new desktop - if (_desktop == Openbox::instance->screen(_screen)->desktop() || + if (_desktop == openbox->screen(_screen)->desktop() || _desktop == (signed)0xffffffff) frame->show(); else frame->hide(); + + // Handle Iconic state. Iconic state is maintained by the client being a + // member of the ICONIC_DESKTOP, so this is where we make iconifying and + // uniconifying happen. + bool i = _desktop == ICONIC_DESKTOP; + if (i != _iconic) { // has the state changed? + _iconic = i; + if (_iconic) { + _wmstate = IconicState; + ignore_unmaps++; + // we unmap the client itself so that we can get MapRequest events, and + // because the ICCCM tells us to! + XUnmapWindow(**otk::display, _window); + } else { + _wmstate = NormalState; + XMapWindow(**otk::display, _window); + } + changeState(); + } + + frame->adjustState(); } void Client::setState(StateAction action, long data1, long data2) { - const otk::Property *property = Openbox::instance->property(); bool shadestate = _shaded; + bool fsstate = _fullscreen; if (!(action == State_Add || action == State_Remove || action == State_Toggle)) @@ -695,111 +741,88 @@ void Client::setState(StateAction action, long data1, long data2) // if toggling, then pick whether we're adding or removing if (action == State_Toggle) { - if (state == property->atom(otk::Property::net_wm_state_modal)) + if (state == otk::Property::atoms.net_wm_state_modal) action = _modal ? State_Remove : State_Add; - else if (state == - property->atom(otk::Property::net_wm_state_maximized_vert)) + else if (state == otk::Property::atoms.net_wm_state_maximized_vert) action = _max_vert ? State_Remove : State_Add; - else if (state == - property->atom(otk::Property::net_wm_state_maximized_horz)) + else if (state == otk::Property::atoms.net_wm_state_maximized_horz) action = _max_horz ? State_Remove : State_Add; - else if (state == property->atom(otk::Property::net_wm_state_shaded)) + else if (state == otk::Property::atoms.net_wm_state_shaded) action = _shaded ? State_Remove : State_Add; - else if (state == - property->atom(otk::Property::net_wm_state_skip_taskbar)) + else if (state == otk::Property::atoms.net_wm_state_skip_taskbar) action = _skip_taskbar ? State_Remove : State_Add; - else if (state == - property->atom(otk::Property::net_wm_state_skip_pager)) + else if (state == otk::Property::atoms.net_wm_state_skip_pager) action = _skip_pager ? State_Remove : State_Add; - else if (state == - property->atom(otk::Property::net_wm_state_fullscreen)) + else if (state == otk::Property::atoms.net_wm_state_fullscreen) action = _fullscreen ? State_Remove : State_Add; - else if (state == property->atom(otk::Property::net_wm_state_above)) + else if (state == otk::Property::atoms.net_wm_state_above) action = _above ? State_Remove : State_Add; - else if (state == property->atom(otk::Property::net_wm_state_below)) + else if (state == otk::Property::atoms.net_wm_state_below) action = _below ? State_Remove : State_Add; } if (action == State_Add) { - if (state == property->atom(otk::Property::net_wm_state_modal)) { + if (state == otk::Property::atoms.net_wm_state_modal) { if (_modal) continue; _modal = true; // XXX: give it focus if another window has focus that shouldnt now - } else if (state == - property->atom(otk::Property::net_wm_state_maximized_vert)){ + } else if (state == otk::Property::atoms.net_wm_state_maximized_vert) { if (_max_vert) continue; _max_vert = true; // XXX: resize the window etc - } else if (state == - property->atom(otk::Property::net_wm_state_maximized_horz)){ + } else if (state == otk::Property::atoms.net_wm_state_maximized_horz) { if (_max_horz) continue; _max_horz = true; // XXX: resize the window etc - } else if (state == - property->atom(otk::Property::net_wm_state_shaded)) { - if (_shaded) continue; - // shade when we're all thru here + } else if (state == otk::Property::atoms.net_wm_state_shaded) { shadestate = true; - } else if (state == - property->atom(otk::Property::net_wm_state_skip_taskbar)) { + } else if (state == otk::Property::atoms.net_wm_state_skip_taskbar) { _skip_taskbar = true; - } else if (state == - property->atom(otk::Property::net_wm_state_skip_pager)) { + } else if (state == otk::Property::atoms.net_wm_state_skip_pager) { _skip_pager = true; - } else if (state == - property->atom(otk::Property::net_wm_state_fullscreen)) { - if (_fullscreen) continue; - _fullscreen = true; - } else if (state == - property->atom(otk::Property::net_wm_state_above)) { + } else if (state == otk::Property::atoms.net_wm_state_fullscreen) { + fsstate = true; + } else if (state == otk::Property::atoms.net_wm_state_above) { if (_above) continue; _above = true; - } else if (state == - property->atom(otk::Property::net_wm_state_below)) { + } else if (state == otk::Property::atoms.net_wm_state_below) { if (_below) continue; _below = true; } } else { // action == State_Remove - if (state == property->atom(otk::Property::net_wm_state_modal)) { + if (state == otk::Property::atoms.net_wm_state_modal) { if (!_modal) continue; _modal = false; - } else if (state == - property->atom(otk::Property::net_wm_state_maximized_vert)){ + } else if (state == otk::Property::atoms.net_wm_state_maximized_vert) { if (!_max_vert) continue; _max_vert = false; // XXX: resize the window etc - } else if (state == - property->atom(otk::Property::net_wm_state_maximized_horz)){ + } else if (state == otk::Property::atoms.net_wm_state_maximized_horz) { if (!_max_horz) continue; _max_horz = false; // XXX: resize the window etc - } else if (state == - property->atom(otk::Property::net_wm_state_shaded)) { - if (!_shaded) continue; - // unshade when we're all thru here + } else if (state == otk::Property::atoms.net_wm_state_shaded) { shadestate = false; - } else if (state == - property->atom(otk::Property::net_wm_state_skip_taskbar)) { + } else if (state == otk::Property::atoms.net_wm_state_skip_taskbar) { _skip_taskbar = false; - } else if (state == - property->atom(otk::Property::net_wm_state_skip_pager)) { + } else if (state == otk::Property::atoms.net_wm_state_skip_pager) { _skip_pager = false; - } else if (state == - property->atom(otk::Property::net_wm_state_fullscreen)) { - if (!_fullscreen) continue; - _fullscreen = false; - } else if (state == - property->atom(otk::Property::net_wm_state_above)) { + } else if (state == otk::Property::atoms.net_wm_state_fullscreen) { + fsstate = false; + } else if (state == otk::Property::atoms.net_wm_state_above) { if (!_above) continue; _above = false; - } else if (state == - property->atom(otk::Property::net_wm_state_below)) { + } else if (state == otk::Property::atoms.net_wm_state_below) { if (!_below) continue; _below = false; } } } + // change fullscreen state before shading, as it will affect if the window + // can shade or not + if (fsstate != _fullscreen) + fullscreen(fsstate); if (shadestate != _shaded) shade(shadestate); calcLayer(); @@ -815,6 +838,7 @@ void Client::toggleClientBorder(bool addborder) // reversed. int x = _area.x(), y = _area.y(); switch(_gravity) { + default: case NorthWestGravity: case WestGravity: case SouthWestGravity: @@ -825,8 +849,17 @@ void Client::toggleClientBorder(bool addborder) if (addborder) x -= _border_width * 2; else x += _border_width * 2; break; + case NorthGravity: + case SouthGravity: + case CenterGravity: + case ForgetGravity: + case StaticGravity: + if (addborder) x -= _border_width; + else x += _border_width; + break; } switch(_gravity) { + default: case NorthWestGravity: case NorthGravity: case NorthEastGravity: @@ -837,19 +870,24 @@ void Client::toggleClientBorder(bool addborder) if (addborder) y -= _border_width * 2; else y += _border_width * 2; break; - default: - // no change for StaticGravity etc. + case WestGravity: + case EastGravity: + case CenterGravity: + case ForgetGravity: + case StaticGravity: + if (addborder) y -= _border_width; + else y += _border_width; break; } _area.setPos(x, y); if (addborder) { - XSetWindowBorderWidth(otk::Display::display, _window, _border_width); + XSetWindowBorderWidth(**otk::display, _window, _border_width); // move the client so it is back it the right spot _with_ its border! - XMoveWindow(otk::Display::display, _window, x, y); + XMoveWindow(**otk::display, _window, x, y); } else - XSetWindowBorderWidth(otk::Display::display, _window, 0); + XSetWindowBorderWidth(**otk::display, _window, 0); } @@ -859,17 +897,15 @@ void Client::clientMessageHandler(const XClientMessageEvent &e) if (e.format != 32) return; - const otk::Property *property = Openbox::instance->property(); - - if (e.message_type == property->atom(otk::Property::wm_change_state)) { + if (e.message_type == otk::Property::atoms.wm_change_state) { // compress changes into a single change bool compress = false; XEvent ce; - while (XCheckTypedEvent(otk::Display::display, e.type, &ce)) { + while (XCheckTypedEvent(**otk::display, e.type, &ce)) { // XXX: it would be nice to compress ALL messages of a type, not just // messages in a row without other message types between. if (ce.xclient.message_type != e.message_type) { - XPutBackEvent(otk::Display::display, &ce); + XPutBackEvent(**otk::display, &ce); break; } compress = true; @@ -878,16 +914,15 @@ void Client::clientMessageHandler(const XClientMessageEvent &e) setWMState(ce.xclient.data.l[0]); // use the found event else setWMState(e.data.l[0]); // use the original event - } else if (e.message_type == - property->atom(otk::Property::net_wm_desktop)) { + } else if (e.message_type == otk::Property::atoms.net_wm_desktop) { // compress changes into a single change bool compress = false; XEvent ce; - while (XCheckTypedEvent(otk::Display::display, e.type, &ce)) { + while (XCheckTypedEvent(**otk::display, e.type, &ce)) { // XXX: it would be nice to compress ALL messages of a type, not just // messages in a row without other message types between. if (ce.xclient.message_type != e.message_type) { - XPutBackEvent(otk::Display::display, &ce); + XPutBackEvent(**otk::display, &ce); break; } compress = true; @@ -896,7 +931,7 @@ void Client::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::Property::net_wm_state)) { + } else if (e.message_type == otk::Property::atoms.net_wm_state) { // can't compress these #ifdef DEBUG printf("net_wm_state %s %ld %ld for 0x%lx\n", @@ -905,22 +940,22 @@ void Client::clientMessageHandler(const XClientMessageEvent &e) 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::Property::net_close_window)) { + } else if (e.message_type == otk::Property::atoms.net_close_window) { #ifdef DEBUG printf("net_close_window for 0x%lx\n", _window); #endif close(); - } else if (e.message_type == - property->atom(otk::Property::net_active_window)) { + } else if (e.message_type == otk::Property::atoms.net_active_window) { #ifdef DEBUG printf("net_active_window for 0x%lx\n", _window); #endif + if (_iconic) + setDesktop(openbox->screen(_screen)->desktop()); if (_shaded) shade(false); // XXX: deiconify focus(); - Openbox::instance->screen(_screen)->restack(true, this); // raise + openbox->screen(_screen)->raiseWindow(this); } } @@ -938,7 +973,14 @@ void Client::shapeHandler(const XShapeEvent &e) #endif -void Client::resize(Corner anchor, int w, int h, int x, int y) +void Client::resize(Corner anchor, int w, int h) +{ + if (!(_functions & Func_Resize)) return; + internal_resize(anchor, w, h); +} + + +void Client::internal_resize(Corner anchor, int w, int h, int x, int y) { w -= _base_size.x(); h -= _base_size.y(); @@ -962,6 +1004,10 @@ void Client::resize(Corner anchor, int w, int h, int x, int y) w /= _size_inc.x(); h /= _size_inc.y(); + // you cannot resize to nothing + if (w < 1) w = 1; + if (h < 1) h = 1; + // store the logical size _logical_size.setPoint(w, h); @@ -992,15 +1038,22 @@ void Client::resize(Corner anchor, int w, int h, int x, int y) _area.setSize(w, h); - XResizeWindow(otk::Display::display, _window, w, h); + XResizeWindow(**otk::display, _window, w, h); // resize the frame to match the request frame->adjustSize(); - move(x, y); + internal_move(x, y); } void Client::move(int x, int y) +{ + if (!(_functions & Func_Move)) return; + internal_move(x, y); +} + + +void Client::internal_move(int x, int y) { _area.setPos(x, y); @@ -1012,7 +1065,7 @@ void Client::move(int x, int y) // yet) XEvent event; event.type = ConfigureNotify; - event.xconfigure.display = otk::Display::display; + event.xconfigure.display = **otk::display; event.xconfigure.event = _window; event.xconfigure.window = _window; event.xconfigure.x = x; @@ -1031,7 +1084,6 @@ void Client::move(int x, int y) void Client::close() { XEvent ce; - const otk::Property *property = Openbox::instance->property(); if (!(_functions & Func_Close)) return; @@ -1042,73 +1094,189 @@ void Client::close() // explicitly killed. ce.xclient.type = ClientMessage; - ce.xclient.message_type = property->atom(otk::Property::wm_protocols); - ce.xclient.display = otk::Display::display; + ce.xclient.message_type = otk::Property::atoms.wm_protocols; + ce.xclient.display = **otk::display; ce.xclient.window = _window; ce.xclient.format = 32; - ce.xclient.data.l[0] = property->atom(otk::Property::wm_delete_window); + ce.xclient.data.l[0] = otk::Property::atoms.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::Display::display, _window, false, NoEventMask, &ce); + XSendEvent(**otk::display, _window, false, NoEventMask, &ce); } void Client::changeState() { - const otk::Property *property = Openbox::instance->property(); - unsigned long state[2]; state[0] = _wmstate; state[1] = None; - property->set(_window, otk::Property::wm_state, otk::Property::wm_state, - state, 2); + otk::Property::set(_window, otk::Property::atoms.wm_state, + otk::Property::atoms.wm_state, state, 2); Atom netstate[10]; int num = 0; if (_modal) - netstate[num++] = property->atom(otk::Property::net_wm_state_modal); + netstate[num++] = otk::Property::atoms.net_wm_state_modal; if (_shaded) - netstate[num++] = property->atom(otk::Property::net_wm_state_shaded); + netstate[num++] = otk::Property::atoms.net_wm_state_shaded; if (_iconic) - netstate[num++] = property->atom(otk::Property::net_wm_state_hidden); + netstate[num++] = otk::Property::atoms.net_wm_state_hidden; if (_skip_taskbar) - netstate[num++] = - property->atom(otk::Property::net_wm_state_skip_taskbar); + netstate[num++] = otk::Property::atoms.net_wm_state_skip_taskbar; if (_skip_pager) - netstate[num++] = property->atom(otk::Property::net_wm_state_skip_pager); + netstate[num++] = otk::Property::atoms.net_wm_state_skip_pager; if (_fullscreen) - netstate[num++] = property->atom(otk::Property::net_wm_state_fullscreen); + netstate[num++] = otk::Property::atoms.net_wm_state_fullscreen; if (_max_vert) - netstate[num++] = - property->atom(otk::Property::net_wm_state_maximized_vert); + netstate[num++] = otk::Property::atoms.net_wm_state_maximized_vert; if (_max_horz) - netstate[num++] = - property->atom(otk::Property::net_wm_state_maximized_horz); + netstate[num++] = otk::Property::atoms.net_wm_state_maximized_horz; if (_above) - netstate[num++] = property->atom(otk::Property::net_wm_state_above); + netstate[num++] = otk::Property::atoms.net_wm_state_above; if (_below) - netstate[num++] = property->atom(otk::Property::net_wm_state_below); - property->set(_window, otk::Property::net_wm_state, - otk::Property::Atom_Atom, netstate, num); + netstate[num++] = otk::Property::atoms.net_wm_state_below; + otk::Property::set(_window, otk::Property::atoms.net_wm_state, + otk::Property::atoms.atom, netstate, num); calcLayer(); + + if (frame) + frame->adjustState(); +} + + +void Client::changeAllowedActions(void) +{ + Atom actions[9]; + int num = 0; + + actions[num++] = otk::Property::atoms.net_wm_action_change_desktop; + + if (_functions & Func_Shade) + actions[num++] = otk::Property::atoms.net_wm_action_shade; + if (_functions & Func_Close) + actions[num++] = otk::Property::atoms.net_wm_action_close; + if (_functions & Func_Move) + actions[num++] = otk::Property::atoms.net_wm_action_move; + if (_functions & Func_Iconify) + actions[num++] = otk::Property::atoms.net_wm_action_minimize; + if (_functions & Func_Resize) + actions[num++] = otk::Property::atoms.net_wm_action_resize; + if (_functions & Func_Fullscreen) + actions[num++] = otk::Property::atoms.net_wm_action_fullscreen; + if (_functions & Func_Maximize) { + actions[num++] = otk::Property::atoms.net_wm_action_maximize_horz; + actions[num++] = otk::Property::atoms.net_wm_action_maximize_vert; + } + + otk::Property::set(_window, otk::Property::atoms.net_wm_allowed_actions, + otk::Property::atoms.atom, actions, num); +} + + +void Client::applyStartupState() +{ + // these are in a carefully crafted order.. + + if (_iconic) { + _iconic = false; + setDesktop(ICONIC_DESKTOP); + } + if (_fullscreen) { + _fullscreen = false; + fullscreen(true); + } + if (_shaded) { + _shaded = false; + shade(true); + } + if (_urgent) + fireUrgent(); + + if (_max_vert); // XXX: incomplete + if (_max_horz); // XXX: incomplete + + if (_skip_taskbar); // nothing to do for this + if (_skip_pager); // nothing to do for this + if (_modal); // nothing to do for this + if (_above); // nothing to do for this + if (_below); // nothing to do for this +} + + +void Client::fireUrgent() +{ + // call the python UrgentWindow callbacks + EventData data(_screen, this, EventAction::UrgentWindow, 0); + openbox->bindings()->fireEvent(&data); } void Client::shade(bool shade) { - if (shade == _shaded) return; // already done + if (!(_functions & Func_Shade) || // can't + _shaded == shade) return; // already done - _wmstate = shade ? IconicState : NormalState; + // when we're iconic, don't change the wmstate + if (!_iconic) + _wmstate = shade ? IconicState : NormalState; _shaded = shade; changeState(); frame->adjustSize(); } -bool Client::focus() const +void Client::fullscreen(bool fs) +{ + static FunctionFlags saved_func; + static DecorationFlags saved_decor; + static otk::Rect saved_area; + static otk::Point saved_logical_size; + + if (!(_functions & Func_Fullscreen) || // can't + _fullscreen == fs) return; // already done + + _fullscreen = fs; + changeState(); // change the state hints on the client + + if (fs) { + // save the functions and remove them + saved_func = _functions; + _functions = _functions & (Func_Close | Func_Fullscreen | Func_Iconify); + // save the decorations and remove them + saved_decor = _decorations; + _decorations = 0; + // save the area and adjust it (we don't call internal resize here for + // constraints on the size, etc, we just make it fullscreen). + saved_area = _area; + const otk::ScreenInfo *info = otk::display->screenInfo(_screen); + _area.setRect(0, 0, info->width(), info->height()); + saved_logical_size = _logical_size; + _logical_size.setPoint((info->width() - _base_size.x()) / _size_inc.x(), + (info->height() - _base_size.y()) / _size_inc.y()); + } else { + _functions = saved_func; + _decorations = saved_decor; + _area = saved_area; + _logical_size = saved_logical_size; + } + + changeAllowedActions(); // based on the new _functions + + frame->adjustSize(); // drop/replace the decor's and resize + frame->adjustPosition(); // get (back) in position! + + // raise (back) into our stacking layer + openbox->screen(_screen)->raiseWindow(this); + + // try focus us when we go into fullscreen mode + if (fs) focus(); +} + + +bool Client::focus() { // won't try focus if the client doesn't want it, or if the window isn't // visible on the screen @@ -1116,25 +1284,40 @@ bool Client::focus() const if (_focused) return true; + // do a check to see if the window has already been unmapped or destroyed + // do this intelligently while watching out for unmaps we've generated + // (ignore_unmaps > 0) + XEvent ev; + if (XCheckTypedWindowEvent(**otk::display, _window, DestroyNotify, &ev)) { + XPutBackEvent(**otk::display, &ev); + return false; + } + while (XCheckTypedWindowEvent(**otk::display, _window, UnmapNotify, &ev)) { + if (ignore_unmaps) { + unmapHandler(ev.xunmap); + } else { + XPutBackEvent(**otk::display, &ev); + return false; + } + } + if (_can_focus) - XSetInputFocus(otk::Display::display, _window, + XSetInputFocus(**otk::display, _window, RevertToNone, CurrentTime); if (_focus_notify) { XEvent ce; - const otk::Property *property = Openbox::instance->property(); - ce.xclient.type = ClientMessage; - ce.xclient.message_type = property->atom(otk::Property::wm_protocols); - ce.xclient.display = otk::Display::display; + ce.xclient.message_type = otk::Property::atoms.wm_protocols; + ce.xclient.display = **otk::display; ce.xclient.window = _window; ce.xclient.format = 32; - ce.xclient.data.l[0] = property->atom(otk::Property::wm_take_focus); - ce.xclient.data.l[1] = Openbox::instance->lastTime(); + ce.xclient.data.l[0] = otk::Property::atoms.wm_take_focus; + ce.xclient.data.l[1] = openbox->lastTime(); ce.xclient.data.l[2] = 0l; ce.xclient.data.l[3] = 0l; ce.xclient.data.l[4] = 0l; - XSendEvent(otk::Display::display, _window, False, NoEventMask, &ce); + XSendEvent(**otk::display, _window, False, NoEventMask, &ce); } return true; @@ -1145,8 +1328,8 @@ void Client::unfocus() const { if (!_focused) return; - assert(Openbox::instance->focusedClient() == this); - Openbox::instance->setFocusedClient(0); + assert(openbox->focusedClient() == this); + openbox->setFocusedClient(0); } @@ -1161,7 +1344,7 @@ void Client::focusHandler(const XFocusChangeEvent &e) frame->focus(); _focused = true; - Openbox::instance->setFocusedClient(this); + openbox->setFocusedClient(this); } @@ -1176,8 +1359,8 @@ void Client::unfocusHandler(const XFocusChangeEvent &e) frame->unfocus(); _focused = false; - if (Openbox::instance->focusedClient() == this) - Openbox::instance->setFocusedClient(0); + if (openbox->focusedClient() == this) + openbox->setFocusedClient(0); } @@ -1189,7 +1372,8 @@ void Client::configureRequestHandler(const XConfigureRequestEvent &e) otk::EventHandler::configureRequestHandler(e); - // XXX: if we are iconic (or shaded? (fvwm does that)) ignore the event + // if we are iconic (or shaded (fvwm does this)) ignore the event + if (_iconic || _shaded) return; if (e.value_mask & CWBorderWidth) _border_width = e.border_width; @@ -1220,26 +1404,26 @@ void Client::configureRequestHandler(const XConfigureRequestEvent &e) if (e.value_mask & (CWX | CWY)) { int x = (e.value_mask & CWX) ? e.x : _area.x(); int y = (e.value_mask & CWY) ? e.y : _area.y(); - resize(corner, w, h, x, y); + internal_resize(corner, w, h, x, y); } else // if JUST resizing... - resize(corner, w, h); + internal_resize(corner, w, h); } else if (e.value_mask & (CWX | CWY)) { // if JUST moving... int x = (e.value_mask & CWX) ? e.x : _area.x(); int y = (e.value_mask & CWY) ? e.y : _area.y(); - move(x, y); + internal_move(x, y); } if (e.value_mask & CWStackMode) { switch (e.detail) { case Below: case BottomIf: - Openbox::instance->screen(_screen)->restack(false, this); // lower + openbox->screen(_screen)->lowerWindow(this); break; case Above: case TopIf: default: - Openbox::instance->screen(_screen)->restack(true, this); // raise + openbox->screen(_screen)->raiseWindow(this); break; } } @@ -1250,7 +1434,7 @@ void Client::unmapHandler(const XUnmapEvent &e) { if (ignore_unmaps) { #ifdef DEBUG - printf("Ignored UnmapNotify for 0x%lx (event 0x%lx)\n", e.window, e.event); +// printf("Ignored UnmapNotify for 0x%lx (event 0x%lx)\n", e.window, e.event); #endif // DEBUG ignore_unmaps--; return; @@ -1263,7 +1447,7 @@ void Client::unmapHandler(const XUnmapEvent &e) otk::EventHandler::unmapHandler(e); // this deletes us etc - Openbox::instance->screen(_screen)->unmanageWindow(this); + openbox->screen(_screen)->unmanageWindow(this); } @@ -1276,7 +1460,7 @@ void Client::destroyHandler(const XDestroyWindowEvent &e) otk::EventHandler::destroyHandler(e); // this deletes us etc - Openbox::instance->screen(_screen)->unmanageWindow(this); + openbox->screen(_screen)->unmanageWindow(this); } @@ -1302,10 +1486,23 @@ void Client::reparentHandler(const XReparentEvent &e) // server to deal with after we unmanage the window XEvent ev; ev.xreparent = e; - XPutBackEvent(otk::Display::display, &ev); + XPutBackEvent(**otk::display, &ev); // this deletes us etc - Openbox::instance->screen(_screen)->unmanageWindow(this); + openbox->screen(_screen)->unmanageWindow(this); +} + +void Client::mapRequestHandler(const XMapRequestEvent &e) +{ +#ifdef DEBUG + printf("MapRequest for already managed 0x%lx\n", e.window); +#endif // DEBUG + + assert(_iconic); // we shouldn't be able to get this unless we're iconic + + // move to the current desktop (uniconify) + setDesktop(openbox->screen(_screen)->desktop()); + // XXX: should we focus/raise the window? (basically a net_wm_active_window) } }