X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fclient.cc;h=829bec3649bfa38e087b1130ff43765e26694176;hb=b8ae2f393f0baa17c2e5882504a938029d2933ff;hp=8386ef592cc5bed38d04f5a06ef466cd979ef9b1;hpb=4c768d5d63154e416e1282396dc48492d0585d42;p=chaz%2Fopenbox diff --git a/src/client.cc b/src/client.cc index 8386ef59..829bec36 100644 --- a/src/client.cc +++ b/src/client.cc @@ -14,6 +14,7 @@ extern "C" { #include #include +#include #include @@ -23,9 +24,9 @@ extern "C" { namespace ob { -OBClient::OBClient(int screen, Window window) - : otk::OtkEventHandler(), - OBWidget(OBWidget::Type_Client), +Client::Client(int screen, Window window) + : otk::EventHandler(), + WidgetBase(WidgetBase::Type_Client), frame(0), _screen(screen), _window(window) { assert(screen >= 0); @@ -43,7 +44,10 @@ OBClient::OBClient(int screen, Window window) _focused = false; // not a transient by default of course _transient_for = 0; + // pick a layer to start from + _layer = Layer_Normal; + getGravity(); getArea(); getDesktop(); @@ -57,7 +61,6 @@ OBClient::OBClient(int screen, Window window) getShaped(); updateProtocols(); - updateNormalHints(); updateWMHints(); updateTitle(); updateIconTitle(); @@ -68,82 +71,89 @@ OBClient::OBClient(int screen, Window window) } -OBClient::~OBClient() +Client::~Client() { - const otk::OBProperty *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::OBProperty::net_wm_desktop); - property->erase(_window, otk::OBProperty::net_wm_state); + otk::Property::erase(_window, otk::Property::atoms.net_wm_desktop); + otk::Property::erase(_window, otk::Property::atoms.net_wm_state); } } -void OBClient::getDesktop() +void Client::getGravity() { - const otk::OBProperty *property = Openbox::instance->property(); + XSizeHints size; + XWindowAttributes wattrib; + Status ret; + long junk; + + if (XGetWMNormalHints(**otk::display, _window, &size, &junk) && + size.flags & PWinGravity) + // first try the normal hints + _gravity = size.win_gravity; + else { + // then fall back to the attribute + 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(); + _desktop = openbox->screen(_screen)->desktop(); - if (!property->get(_window, otk::OBProperty::net_wm_desktop, - otk::OBProperty::Atom_Cardinal, - (long unsigned*)&_desktop)) { + if (!otk::Property::get(_window, otk::Property::atoms.net_wm_desktop, + otk::Property::atoms.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); + otk::Property::set(_window, otk::Property::atoms.net_wm_desktop, + otk::Property::atoms.cardinal, (unsigned)_desktop); } } -void OBClient::getType() +void Client::getType() { - const otk::OBProperty *property = Openbox::instance->property(); - _type = (WindowType) -1; unsigned long *val; unsigned long num = (unsigned) -1; - if (property->get(_window, otk::OBProperty::net_wm_window_type, - otk::OBProperty::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::OBProperty::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::OBProperty::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::OBProperty::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::OBProperty::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::OBProperty::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::OBProperty::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::OBProperty::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::OBProperty::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::OBProperty::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 } @@ -163,7 +173,7 @@ void OBClient::getType() } -void OBClient::setupDecorAndFunctions() +void Client::setupDecorAndFunctions() { // start with everything _decorations = Decor_Titlebar | Decor_Handle | Decor_Border | @@ -235,18 +245,16 @@ void OBClient::setupDecorAndFunctions() } -void OBClient::getMwmHints() +void Client::getMwmHints() { - const otk::OBProperty *property = Openbox::instance->property(); - unsigned long num = MwmHints::elements; unsigned long *hints; _mwmhints.flags = 0; // default to none - if (!property->get(_window, otk::OBProperty::motif_wm_hints, - otk::OBProperty::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) { @@ -260,12 +268,12 @@ void OBClient::getMwmHints() } -void OBClient::getArea() +void Client::getArea() { XWindowAttributes wattrib; Status ret; - ret = XGetWindowAttributes(otk::OBDisplay::display, _window, &wattrib); + ret = XGetWindowAttributes(**otk::display, _window, &wattrib); assert(ret != BadWindow); _area.setRect(wattrib.x, wattrib.y, wattrib.width, wattrib.height); @@ -273,45 +281,35 @@ void OBClient::getArea() } -void OBClient::getState() +void Client::getState() { - const otk::OBProperty *property = Openbox::instance->property(); - _modal = _shaded = _max_horz = _max_vert = _fullscreen = _above = _below = _skip_taskbar = _skip_pager = false; unsigned long *state; unsigned long num = (unsigned) -1; - if (property->get(_window, otk::OBProperty::net_wm_state, - otk::OBProperty::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::OBProperty::net_wm_state_modal)) + if (state[i] == otk::Property::atoms.net_wm_state_modal) _modal = true; - else if (state[i] == - property->atom(otk::OBProperty::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::OBProperty::net_wm_state_skip_taskbar)) + } else if (state[i] == otk::Property::atoms.net_wm_state_skip_taskbar) _skip_taskbar = true; - else if (state[i] == - property->atom(otk::OBProperty::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::OBProperty::net_wm_state_fullscreen)) + else if (state[i] == otk::Property::atoms.net_wm_state_fullscreen) _fullscreen = true; - else if (state[i] == - property->atom(otk::OBProperty::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::OBProperty::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::OBProperty::net_wm_state_above)) + else if (state[i] == otk::Property::atoms.net_wm_state_above) _above = true; - else if (state[i] == - property->atom(otk::OBProperty::net_wm_state_below)) + else if (state[i] == otk::Property::atoms.net_wm_state_below) _below = true; } @@ -320,18 +318,18 @@ void OBClient::getState() } -void OBClient::getShaped() +void Client::getShaped() { _shaped = false; #ifdef SHAPE - if (otk::OBDisplay::shape()) { + if (otk::display->shape()) { int foo; unsigned int ufoo; int s; - XShapeSelectInput(otk::OBDisplay::display, _window, ShapeNotifyMask); + XShapeSelectInput(**otk::display, _window, ShapeNotifyMask); - XShapeQueryExtents(otk::OBDisplay::display, _window, &s, &foo, + XShapeQueryExtents(**otk::display, _window, &s, &foo, &foo, &ufoo, &ufoo, &foo, &foo, &foo, &ufoo, &ufoo); _shaped = (s != 0); } @@ -339,7 +337,7 @@ void OBClient::getShaped() } -void OBClient::calcLayer() { +void Client::calcLayer() { StackLayer l; if (_iconic) l = Layer_Icon; @@ -360,16 +358,14 @@ void OBClient::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); } } } -void OBClient::updateProtocols() +void Client::updateProtocols() { - const otk::OBProperty *property = Openbox::instance->property(); - Atom *proto; int num_return = 0; @@ -377,14 +373,14 @@ void OBClient::updateProtocols() _decorations &= ~Decor_Close; _functions &= ~Func_Close; - if (XGetWMProtocols(otk::OBDisplay::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::OBProperty::wm_delete_window)) { + if (proto[i] == otk::Property::atoms.wm_delete_window) { _decorations |= Decor_Close; _functions |= Func_Close; if (frame) frame->adjustSize(); // update the decorations - } else if (proto[i] == property->atom(otk::OBProperty::wm_take_focus)) + } 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; @@ -394,14 +390,13 @@ void OBClient::updateProtocols() } -void OBClient::updateNormalHints() +void Client::updateNormalHints() { XSizeHints size; long ret; int oldgravity = _gravity; // defaults - _gravity = NorthWestGravity; _size_inc.setPoint(1, 1); _base_size.setPoint(0, 0); _min_size.setPoint(0, 0); @@ -411,11 +406,21 @@ void OBClient::updateNormalHints() // point.. // get the hints from the window - if (XGetWMNormalHints(otk::OBDisplay::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 (_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); @@ -429,19 +434,10 @@ void OBClient::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 OBClient::updateWMHints() +void Client::updateWMHints() { XWMHints *hints; @@ -449,7 +445,7 @@ void OBClient::updateWMHints() _can_focus = true; _urgent = false; - if ((hints = XGetWMHints(otk::OBDisplay::display, _window)) != NULL) { + if ((hints = XGetWMHints(**otk::display, _window)) != NULL) { if (hints->flags & InputHint) _can_focus = hints->input; @@ -470,18 +466,16 @@ void OBClient::updateWMHints() } -void OBClient::updateTitle() +void Client::updateTitle() { - const otk::OBProperty *property = Openbox::instance->property(); - _title = ""; // try netwm - if (! property->get(_window, otk::OBProperty::net_wm_name, - otk::OBProperty::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::OBProperty::wm_name, - otk::OBProperty::ascii, &_title); + otk::Property::get(_window, otk::Property::atoms.wm_name, + otk::Property::ascii, &_title); } if (_title.empty()) @@ -492,18 +486,16 @@ void OBClient::updateTitle() } -void OBClient::updateIconTitle() +void Client::updateIconTitle() { - const otk::OBProperty *property = Openbox::instance->property(); - _icon_title = ""; // try netwm - if (! property->get(_window, otk::OBProperty::net_wm_icon_name, - otk::OBProperty::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::OBProperty::wm_icon_name, - otk::OBProperty::ascii, &_icon_title); + otk::Property::get(_window, otk::Property::atoms.wm_icon_name, + otk::Property::ascii, &_icon_title); } if (_title.empty()) @@ -511,39 +503,35 @@ void OBClient::updateIconTitle() } -void OBClient::updateClass() +void Client::updateClass() { - const otk::OBProperty *property = Openbox::instance->property(); - // set the defaults _app_name = _app_class = _role = ""; - otk::OBProperty::StringVect v; + otk::Property::StringVect v; unsigned long num = 2; - if (property->get(_window, otk::OBProperty::wm_class, - otk::OBProperty::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::OBProperty::wm_window_role, - otk::OBProperty::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(); } } -void OBClient::updateStrut() +void Client::updateStrut() { unsigned long num = 4; unsigned long *data; - if (!Openbox::instance->property()->get(_window, - otk::OBProperty::net_wm_strut, - otk::OBProperty::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) { @@ -552,28 +540,28 @@ void OBClient::updateStrut() _strut.top = data[2]; _strut.bottom = data[3]; - Openbox::instance->screen(_screen)->updateStrut(); + openbox->screen(_screen)->updateStrut(); } delete [] data; } -void OBClient::updateTransientFor() +void Client::updateTransientFor() { Window t = 0; - OBClient *c = 0; + Client *c = 0; - if (XGetTransientForHint(otk::OBDisplay::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::OBDisplay::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! @@ -594,19 +582,17 @@ void OBClient::updateTransientFor() } -void OBClient::propertyHandler(const XPropertyEvent &e) +void Client::propertyHandler(const XPropertyEvent &e) { - otk::OtkEventHandler::propertyHandler(e); + otk::EventHandler::propertyHandler(e); - const otk::OBProperty *property = Openbox::instance->property(); - // compress changes to a single property into a single change XEvent ce; - while (XCheckTypedEvent(otk::OBDisplay::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::OBDisplay::display, &ce); + XPutBackEvent(**otk::display, &ce); break; } } @@ -622,22 +608,22 @@ void OBClient::propertyHandler(const XPropertyEvent &e) setupDecorAndFunctions(); frame->adjustSize(); // this updates the frame for any new decor settings } - else if (e.atom == property->atom(otk::OBProperty::net_wm_name) || - e.atom == property->atom(otk::OBProperty::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::OBProperty::net_wm_icon_name) || - e.atom == property->atom(otk::OBProperty::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::OBProperty::wm_class)) + else if (e.atom == otk::Property::atoms.wm_class) updateClass(); - else if (e.atom == property->atom(otk::OBProperty::wm_protocols)) + else if (e.atom == otk::Property::atoms.wm_protocols) updateProtocols(); - else if (e.atom == property->atom(otk::OBProperty::net_wm_strut)) + else if (e.atom == otk::Property::atoms.net_wm_strut) updateStrut(); } -void OBClient::setWMState(long state) +void Client::setWMState(long state) { if (state == _wmstate) return; // no change @@ -653,7 +639,7 @@ void OBClient::setWMState(long state) } -void OBClient::setDesktop(long target) +void Client::setDesktop(long target) { if (target == _desktop) return; @@ -663,13 +649,11 @@ void OBClient::setDesktop(long target) _desktop = target; - Openbox::instance->property()->set(_window, - otk::OBProperty::net_wm_desktop, - otk::OBProperty::Atom_Cardinal, - (unsigned)_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 @@ -677,9 +661,8 @@ void OBClient::setDesktop(long target) } -void OBClient::setState(StateAction action, long data1, long data2) +void Client::setState(StateAction action, long data1, long data2) { - const otk::OBProperty *property = Openbox::instance->property(); bool shadestate = _shaded; if (!(action == State_Add || action == State_Remove || @@ -693,106 +676,85 @@ void OBClient::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::OBProperty::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::OBProperty::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::OBProperty::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::OBProperty::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::OBProperty::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::OBProperty::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::OBProperty::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::OBProperty::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::OBProperty::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::OBProperty::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::OBProperty::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::OBProperty::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::OBProperty::net_wm_state_shaded)) { + } else if (state == otk::Property::atoms.net_wm_state_shaded) { if (_shaded) continue; // shade when we're all thru here shadestate = true; - } else if (state == - property->atom(otk::OBProperty::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::OBProperty::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::OBProperty::net_wm_state_fullscreen)) { + } else if (state == otk::Property::atoms.net_wm_state_fullscreen) { if (_fullscreen) continue; _fullscreen = true; - } else if (state == - property->atom(otk::OBProperty::net_wm_state_above)) { + } else if (state == otk::Property::atoms.net_wm_state_above) { if (_above) continue; _above = true; - } else if (state == - property->atom(otk::OBProperty::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::OBProperty::net_wm_state_modal)) { + if (state == otk::Property::atoms.net_wm_state_modal) { if (!_modal) continue; _modal = false; - } else if (state == - property->atom(otk::OBProperty::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::OBProperty::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::OBProperty::net_wm_state_shaded)) { + } else if (state == otk::Property::atoms.net_wm_state_shaded) { if (!_shaded) continue; // unshade when we're all thru here shadestate = false; - } else if (state == - property->atom(otk::OBProperty::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::OBProperty::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::OBProperty::net_wm_state_fullscreen)) { + } else if (state == otk::Property::atoms.net_wm_state_fullscreen) { if (!_fullscreen) continue; _fullscreen = false; - } else if (state == - property->atom(otk::OBProperty::net_wm_state_above)) { + } else if (state == otk::Property::atoms.net_wm_state_above) { if (!_above) continue; _above = false; - } else if (state == - property->atom(otk::OBProperty::net_wm_state_below)) { + } else if (state == otk::Property::atoms.net_wm_state_below) { if (!_below) continue; _below = false; } @@ -804,7 +766,7 @@ void OBClient::setState(StateAction action, long data1, long data2) } -void OBClient::toggleClientBorder(bool addborder) +void Client::toggleClientBorder(bool addborder) { // adjust our idea of where the client is, based on its border. When the // border is removed, the client should now be considered to be in a @@ -813,9 +775,13 @@ void OBClient::toggleClientBorder(bool addborder) // reversed. int x = _area.x(), y = _area.y(); switch(_gravity) { + default: case NorthWestGravity: case WestGravity: case SouthWestGravity: + case NorthGravity: + case CenterGravity: + case SouthGravity: break; case NorthEastGravity: case EastGravity: @@ -823,11 +789,20 @@ void OBClient::toggleClientBorder(bool addborder) if (addborder) x -= _border_width * 2; else x += _border_width * 2; break; + case ForgetGravity: + case StaticGravity: + if (addborder) x -= _border_width; + else x += _border_width; + break; } switch(_gravity) { + default: case NorthWestGravity: + case WestGravity: case NorthGravity: + case CenterGravity: case NorthEastGravity: + case EastGravity: break; case SouthWestGravity: case SouthGravity: @@ -835,39 +810,39 @@ void OBClient::toggleClientBorder(bool addborder) if (addborder) y -= _border_width * 2; else y += _border_width * 2; break; - default: - // no change for StaticGravity etc. + case ForgetGravity: + case StaticGravity: + if (addborder) y -= _border_width; + else y += _border_width; break; } _area.setPos(x, y); if (addborder) { - XSetWindowBorderWidth(otk::OBDisplay::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::OBDisplay::display, _window, x, y); + XMoveWindow(**otk::display, _window, x, y); } else - XSetWindowBorderWidth(otk::OBDisplay::display, _window, 0); + XSetWindowBorderWidth(**otk::display, _window, 0); } -void OBClient::clientMessageHandler(const XClientMessageEvent &e) +void Client::clientMessageHandler(const XClientMessageEvent &e) { - otk::OtkEventHandler::clientMessageHandler(e); + otk::EventHandler::clientMessageHandler(e); if (e.format != 32) return; - const otk::OBProperty *property = Openbox::instance->property(); - - if (e.message_type == property->atom(otk::OBProperty::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::OBDisplay::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::OBDisplay::display, &ce); + XPutBackEvent(**otk::display, &ce); break; } compress = true; @@ -876,16 +851,15 @@ void OBClient::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::OBProperty::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::OBDisplay::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::OBDisplay::display, &ce); + XPutBackEvent(**otk::display, &ce); break; } compress = true; @@ -894,41 +868,47 @@ 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 == otk::Property::atoms.net_wm_state) { // can't compress these #ifdef DEBUG - printf("net_wm_state for 0x%lx\n", _window); + 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)) { + } 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::OBProperty::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 (_shaded) + shade(false); + // XXX: deiconify focus(); - Openbox::instance->screen(_screen)->restack(true, this); // raise + openbox->screen(_screen)->raiseWindow(this); } } #if defined(SHAPE) -void OBClient::shapeHandler(const XShapeEvent &e) +void Client::shapeHandler(const XShapeEvent &e) { - otk::OtkEventHandler::shapeHandler(e); - - _shaped = e.shaped; - frame->adjustShape(); + otk::EventHandler::shapeHandler(e); + + if (e.kind == ShapeBounding) { + _shaped = e.shaped; + frame->adjustShape(); + } } #endif -void OBClient::resize(Corner anchor, int w, int h, int x, int y) +void Client::resize(Corner anchor, int w, int h, int x, int y) { w -= _base_size.x(); h -= _base_size.y(); @@ -952,6 +932,10 @@ void OBClient::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); @@ -982,7 +966,7 @@ void OBClient::resize(Corner anchor, int w, int h, int x, int y) _area.setSize(w, h); - XResizeWindow(otk::OBDisplay::display, _window, w, h); + XResizeWindow(**otk::display, _window, w, h); // resize the frame to match the request frame->adjustSize(); @@ -990,19 +974,37 @@ void OBClient::resize(Corner anchor, int w, int h, int x, int y) } -void OBClient::move(int x, int y) +void Client::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::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); + } } -void OBClient::close() +void Client::close() { XEvent ce; - const otk::OBProperty *property = Openbox::instance->property(); if (!(_functions & Func_Close)) return; @@ -1013,62 +1015,57 @@ void OBClient::close() // explicitly killed. ce.xclient.type = ClientMessage; - ce.xclient.message_type = property->atom(otk::OBProperty::wm_protocols); - ce.xclient.display = otk::OBDisplay::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::OBProperty::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::OBDisplay::display, _window, False, NoEventMask, &ce); + XSendEvent(**otk::display, _window, false, NoEventMask, &ce); } -void OBClient::changeState() +void Client::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); + 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::OBProperty::net_wm_state_modal); + netstate[num++] = otk::Property::atoms.net_wm_state_modal; if (_shaded) - netstate[num++] = property->atom(otk::OBProperty::net_wm_state_shaded); + netstate[num++] = otk::Property::atoms.net_wm_state_shaded; if (_iconic) - netstate[num++] = property->atom(otk::OBProperty::net_wm_state_hidden); + netstate[num++] = otk::Property::atoms.net_wm_state_hidden; if (_skip_taskbar) - netstate[num++] = - property->atom(otk::OBProperty::net_wm_state_skip_taskbar); + netstate[num++] = otk::Property::atoms.net_wm_state_skip_taskbar; if (_skip_pager) - netstate[num++] = property->atom(otk::OBProperty::net_wm_state_skip_pager); + netstate[num++] = otk::Property::atoms.net_wm_state_skip_pager; if (_fullscreen) - netstate[num++] = property->atom(otk::OBProperty::net_wm_state_fullscreen); + netstate[num++] = otk::Property::atoms.net_wm_state_fullscreen; if (_max_vert) - netstate[num++] = - property->atom(otk::OBProperty::net_wm_state_maximized_vert); + netstate[num++] = otk::Property::atoms.net_wm_state_maximized_vert; if (_max_horz) - netstate[num++] = - property->atom(otk::OBProperty::net_wm_state_maximized_horz); + netstate[num++] = otk::Property::atoms.net_wm_state_maximized_horz; if (_above) - netstate[num++] = property->atom(otk::OBProperty::net_wm_state_above); + netstate[num++] = otk::Property::atoms.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); + 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(); } -void OBClient::shade(bool shade) +void Client::shade(bool shade) { if (shade == _shaded) return; // already done @@ -1079,81 +1076,84 @@ void OBClient::shade(bool shade) } -bool OBClient::focus() +bool Client::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::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.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::OBProperty::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::OBDisplay::display, _window, False, NoEventMask, &ce); + XSendEvent(**otk::display, _window, False, NoEventMask, &ce); } return true; } -void OBClient::unfocus() +void Client::unfocus() const { if (!_focused) return; - assert(Openbox::instance->focusedClient() == this); - Openbox::instance->setFocusedClient(0); + assert(openbox->focusedClient() == this); + openbox->setFocusedClient(0); } -void OBClient::focusHandler(const XFocusChangeEvent &e) +void Client::focusHandler(const XFocusChangeEvent &e) { #ifdef DEBUG // printf("FocusIn for 0x%lx\n", e.window); #endif // DEBUG - OtkEventHandler::focusHandler(e); + otk::EventHandler::focusHandler(e); frame->focus(); _focused = true; - Openbox::instance->setFocusedClient(this); + openbox->setFocusedClient(this); } -void OBClient::unfocusHandler(const XFocusChangeEvent &e) +void Client::unfocusHandler(const XFocusChangeEvent &e) { #ifdef DEBUG // printf("FocusOut for 0x%lx\n", e.window); #endif // DEBUG - OtkEventHandler::unfocusHandler(e); + otk::EventHandler::unfocusHandler(e); frame->unfocus(); _focused = false; - if (Openbox::instance->focusedClient() == this) - Openbox::instance->setFocusedClient(0); + if (openbox->focusedClient() == this) + openbox->setFocusedClient(0); } -void OBClient::configureRequestHandler(const XConfigureRequestEvent &e) +void Client::configureRequestHandler(const XConfigureRequestEvent &e) { #ifdef DEBUG printf("ConfigureRequest for 0x%lx\n", e.window); #endif // DEBUG - OtkEventHandler::configureRequestHandler(e); + otk::EventHandler::configureRequestHandler(e); // XXX: if we are iconic (or shaded? (fvwm does that)) ignore the event @@ -1199,51 +1199,54 @@ void OBClient::configureRequestHandler(const XConfigureRequestEvent &e) 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; } } } -void OBClient::unmapHandler(const XUnmapEvent &e) +void Client::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; } - OtkEventHandler::unmapHandler(e); +#ifdef DEBUG + printf("UnmapNotify for 0x%lx\n", e.window); +#endif // DEBUG + + otk::EventHandler::unmapHandler(e); // this deletes us etc - Openbox::instance->screen(_screen)->unmanageWindow(this); + openbox->screen(_screen)->unmanageWindow(this); } -void OBClient::destroyHandler(const XDestroyWindowEvent &e) +void Client::destroyHandler(const XDestroyWindowEvent &e) { #ifdef DEBUG printf("DestroyNotify for 0x%lx\n", e.window); #endif // DEBUG - OtkEventHandler::destroyHandler(e); + otk::EventHandler::destroyHandler(e); // this deletes us etc - Openbox::instance->screen(_screen)->unmanageWindow(this); + openbox->screen(_screen)->unmanageWindow(this); } -void OBClient::reparentHandler(const XReparentEvent &e) +void Client::reparentHandler(const XReparentEvent &e) { // this is when the client is first taken captive in the frame if (e.parent == frame->plate()) return; @@ -1252,7 +1255,7 @@ void OBClient::reparentHandler(const XReparentEvent &e) printf("ReparentNotify for 0x%lx\n", e.window); #endif // DEBUG - OtkEventHandler::reparentHandler(e); + otk::EventHandler::reparentHandler(e); /* This event is quite rare and is usually handled in unmapHandler. @@ -1261,8 +1264,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::display, &ev); + // this deletes us etc - Openbox::instance->screen(_screen)->unmanageWindow(this); + openbox->screen(_screen)->unmanageWindow(this); } }