X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclient.cc;h=51c987d3a83633edb7cb39224281a66bc0b6545b;hb=1cd253f4684ee126340fae38094b637f1b0010ea;hp=a6990a8db5d792d5bafc62b5c6977d808222d569;hpb=fdb4e652f7b196eacc4f942d403910400087ce2a;p=chaz%2Fopenbox diff --git a/src/client.cc b/src/client.cc index a6990a8d..51c987d3 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 @@ -21,11 +23,13 @@ extern "C" { #define _(str) gettext(str) } +#include + 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); @@ -35,133 +39,165 @@ 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; _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; + // not positioned unless specified + _positioned = false; + // nothing is disabled unless specified + _disabled_decorations = 0; + // no modal children until they set themselves + _modal_child = 0; getArea(); getDesktop(); - // XXX: updateTransientFor(); - getType(); - - // set the decorations and functions - _decorations = Decor_Titlebar | Decor_Handle | Decor_Border | - Decor_Iconify | Decor_Maximize; - _functions = Func_Resize | Func_Move | Func_Iconify | Func_Maximize; - switch (_type) { - case Type_Normal: - // normal windows retain all of the possible decorations and - // functionality - - case Type_Dialog: - // dialogs cannot be maximized - _decorations &= ~Decor_Maximize; - _functions &= ~Func_Maximize; - break; - case Type_Menu: - case Type_Toolbar: - case Type_Utility: - // these windows get less functionality - _decorations &= ~(Decor_Iconify | Decor_Handle); - _functions &= ~(Func_Iconify | Func_Resize); - break; + updateTransientFor(); + getMwmHints(); + getType(); // this can change the mwmhints for special cases - case Type_Desktop: - case Type_Dock: - case Type_Splash: - // none of these windows are manipulated by the window manager - _decorations = 0; - _functions = 0; - break; - } - - getMwmHints(); // this fucks (in good ways) with the decors and functions getState(); getShaped(); updateProtocols(); - updateNormalHints(); - updateWMHints(); + + getGravity(); // get the attribute gravity + updateNormalHints(); // this may override the attribute gravity + + // got the type, the mwmhints, the protocols, and the normal hints (min/max + // sizes), so we're ready to set up + // the decorations/functions + setupDecorAndFunctions(); + + // 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(); - calcLayer(); + // 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(); } -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(); + } - if (Openbox::instance->state() != Openbox::State_Exiting) { + // clean up parents reference to this + if (_transient_for) + _transient_for->_transients.remove(this); // remove from old parent + + 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); + } 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 OBClient::getDesktop() +bool Client::validate() const { - const otk::OBProperty *property = Openbox::instance->property(); + XSync(**otk::display, false); // get all events on the server - // defaults to the current desktop - _desktop = 0; // XXX: change this to the current desktop! + XEvent e; + if (XCheckTypedWindowEvent(**otk::display, _window, DestroyNotify, &e) || + XCheckTypedWindowEvent(**otk::display, _window, UnmapNotify, &e)) { + XPutBackEvent(**otk::display, &e); + return false; + } - property->get(_window, otk::OBProperty::net_wm_desktop, - otk::OBProperty::Atom_Cardinal, - &_desktop); + return true; +} + + +void Client::getGravity() +{ + XWindowAttributes wattrib; + Status ret; + + ret = XGetWindowAttributes(**otk::display, _window, &wattrib); + assert(ret != BadWindow); + _gravity = wattrib.win_gravity; } -void OBClient::getType() +void Client::getDesktop() { - const otk::OBProperty *property = Openbox::instance->property(); + // defaults to the current 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() +{ _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 + else if (val[i] == otk::Property::atoms.kde_net_wm_window_type_override){ + // prevent this window from getting any decor or functionality + _mwmhints.flags &= MwmFlag_Functions | MwmFlag_Decorations; + _mwmhints.decorations = 0; + _mwmhints.functions = 0; + } + if (_type != (WindowType) -1) + break; // grab the first known type } delete val; } @@ -171,76 +207,161 @@ void OBClient::getType() * the window type hint was not set, which means we either classify ourself * as a normal window or a dialog, depending on if we are a transient. */ - // XXX: make this code work! - //if (isTransient()) - // _type = Type_Dialog; - //else + if (_transient_for) + _type = Type_Dialog; + else _type = Type_Normal; } } -void OBClient::getMwmHints() +void Client::setupDecorAndFunctions() { - const otk::OBProperty *property = Openbox::instance->property(); - - unsigned long num; - MwmHints *hints; + // start with everything (cept fullscreen) + _decorations = Decor_Titlebar | Decor_Handle | Decor_Border | + 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; + } - num = MwmHints::elements; - if (!property->get(_window, otk::OBProperty::motif_wm_hints, - otk::OBProperty::motif_wm_hints, &num, - (unsigned long **)&hints)) - return; + if (!(_min_size.x() < _max_size.x() || _min_size.y() < _max_size.y())) { + _decorations &= ~(Decor_Maximize | Decor_Handle); + _functions &= ~(Func_Resize | Func_Maximize); + } - if (num < MwmHints::elements) { - delete [] hints; - return; + switch (_type) { + case Type_Normal: + // normal windows retain all of the possible decorations and + // functionality, and are the only windows that you can fullscreen + _functions |= Func_Fullscreen; + break; + + case Type_Dialog: + // dialogs cannot be maximized + _decorations &= ~Decor_Maximize; + _functions &= ~Func_Maximize; + break; + + case Type_Menu: + case Type_Toolbar: + case Type_Utility: + // these windows get less functionality + _decorations &= ~(Decor_Iconify | Decor_Handle); + _functions &= ~(Func_Iconify | Func_Resize); + break; + + case Type_Desktop: + case Type_Dock: + case Type_Splash: + // none of these windows are manipulated by the window manager + _decorations = 0; + _functions = 0; + break; } - // retrieved the hints // Mwm Hints are applied subtractively to what has already been chosen for // decor and functionality - - if (hints->flags & MwmFlag_Decorations) { - if (! (hints->decorations & MwmDecor_All)) { - if (! (hints->decorations & MwmDecor_Border)) + if (_mwmhints.flags & MwmFlag_Decorations) { + if (! (_mwmhints.decorations & MwmDecor_All)) { + if (! (_mwmhints.decorations & MwmDecor_Border)) _decorations &= ~Decor_Border; - if (! (hints->decorations & MwmDecor_Handle)) + if (! (_mwmhints.decorations & MwmDecor_Handle)) _decorations &= ~Decor_Handle; - if (! (hints->decorations & MwmDecor_Title)) + if (! (_mwmhints.decorations & MwmDecor_Title)) { _decorations &= ~Decor_Titlebar; - if (! (hints->decorations & MwmDecor_Iconify)) + // if we don't have a titlebar, then we cannot shade! + _functions &= ~Func_Shade; + } + if (! (_mwmhints.decorations & MwmDecor_Iconify)) _decorations &= ~Decor_Iconify; - if (! (hints->decorations & MwmDecor_Maximize)) + if (! (_mwmhints.decorations & MwmDecor_Maximize)) _decorations &= ~Decor_Maximize; } } - if (hints->flags & MwmFlag_Functions) { - if (! (hints->functions & MwmFunc_All)) { - if (! (hints->functions & MwmFunc_Resize)) + if (_mwmhints.flags & MwmFlag_Functions) { + if (! (_mwmhints.functions & MwmFunc_All)) { + if (! (_mwmhints.functions & MwmFunc_Resize)) _functions &= ~Func_Resize; - if (! (hints->functions & MwmFunc_Move)) + if (! (_mwmhints.functions & MwmFunc_Move)) _functions &= ~Func_Move; - if (! (hints->functions & MwmFunc_Iconify)) + if (! (_mwmhints.functions & MwmFunc_Iconify)) _functions &= ~Func_Iconify; - if (! (hints->functions & MwmFunc_Maximize)) + if (! (_mwmhints.functions & MwmFunc_Maximize)) _functions &= ~Func_Maximize; - //if (! (hints->functions & MwmFunc_Close)) + // dont let mwm hints kill the close button + //if (! (_mwmhints.functions & MwmFunc_Close)) // _functions &= ~Func_Close; } } + + // can't maximize without moving/resizing + if (!((_functions & Func_Move) && (_functions & Func_Resize))) + _functions &= ~Func_Maximize; + + // finally, user specified disabled decorations are applied to subtract + // decorations + if (_disabled_decorations & Decor_Titlebar) + _decorations &= ~Decor_Titlebar; + if (_disabled_decorations & Decor_Handle) + _decorations &= ~Decor_Handle; + if (_disabled_decorations & Decor_Border) + _decorations &= ~Decor_Border; + if (_disabled_decorations & Decor_Iconify) + _decorations &= ~Decor_Iconify; + if (_disabled_decorations & Decor_Maximize) + _decorations &= ~Decor_Maximize; + if (_disabled_decorations & Decor_AllDesktops) + _decorations &= ~Decor_AllDesktops; + if (_disabled_decorations & Decor_Close) + _decorations &= ~Decor_Close; + + // You can't shade without a titlebar + if (!(_decorations & Decor_Titlebar)) + _functions &= ~Func_Shade; + + changeAllowedActions(); + + if (frame) { + frame->adjustSize(); // change the decors on the frame + frame->adjustPosition(); // with more/less decorations, we may need to be + // moved + } +} + + +void Client::getMwmHints() +{ + unsigned long num = MwmHints::elements; + unsigned long *hints; + + _mwmhints.flags = 0; // default to none + + 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) { + // retrieved the hints + _mwmhints.flags = hints[0]; + _mwmhints.functions = hints[1]; + _mwmhints.decorations = hints[2]; + } + delete [] hints; } -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); @@ -248,45 +369,36 @@ 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; + _iconic = _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_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::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; } @@ -295,18 +407,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); } @@ -314,39 +426,47 @@ void OBClient::getShaped() } -void OBClient::calcLayer() { - if (_iconic) _layer = OBScreen::Layer_Icon; - else if (_fullscreen) _layer = OBScreen::Layer_Fullscreen; - else if (_type == Type_Desktop) _layer = OBScreen::Layer_Desktop; +void Client::calcLayer() { + StackLayer l; + + if (_iconic) l = Layer_Icon; + else if (_fullscreen) l = Layer_Fullscreen; + else if (_type == Type_Desktop) l = Layer_Desktop; else if (_type == Type_Dock) { - if (!_below) _layer = OBScreen::Layer_Top; - else _layer = OBScreen::Layer_Normal; + if (!_below) l = Layer_Top; + else l = Layer_Normal; + } + else if (_above) l = Layer_Above; + else if (_below) l = Layer_Below; + else l = Layer_Normal; + + if (l != _layer) { + _layer = l; + if (frame) { + /* + if we don't have a frame, then we aren't mapped yet (and this would + SIGSEGV :) + */ + openbox->screen(_screen)->raiseWindow(this); + } } - else if (_above) _layer = OBScreen::Layer_Above; - else if (_below) _layer = OBScreen::Layer_Below; - else _layer = OBScreen::Layer_Normal; } -void OBClient::updateProtocols() +void Client::updateProtocols() { - const otk::OBProperty *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::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)) { - _decorations |= Decor_Close; - _functions |= Func_Close; - if (frame) - frame->adjustSize(); // update the decorations - } else if (proto[i] == property->atom(otk::OBProperty::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; @@ -356,28 +476,41 @@ void OBClient::updateProtocols() } -void OBClient::updateNormalHints() +void Client::updateNormalHints() { XSizeHints size; long ret; int oldgravity = _gravity; // defaults - _gravity = NorthWestGravity; + _min_ratio = 0.0; + _max_ratio = 0.0; _size_inc.setPoint(1, 1); _base_size.setPoint(0, 0); _min_size.setPoint(0, 0); _max_size.setPoint(INT_MAX, INT_MAX); - // XXX: might want to cancel any interactive resizing of the window at this - // 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 (frame && _gravity != oldgravity) { + // move our idea of the client's position based on its new gravity + int x = frame->rect().x(), y = frame->rect().y(); + frame->frameGravity(x, y); + _area.setPos(x, y); + } + } + + if (size.flags & PAspect) { + if (size.min_aspect.y) _min_ratio = size.min_aspect.x/size.min_aspect.y; + if (size.max_aspect.y) _max_ratio = size.max_aspect.x/size.max_aspect.y; + } if (size.flags & PMinSize) _min_size.setPoint(size.min_width, size.min_height); @@ -391,32 +524,27 @@ 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(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::OBDisplay::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) { @@ -429,21 +557,31 @@ void OBClient::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 (frame) + fireUrgent(); + } } -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()) @@ -454,18 +592,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()) @@ -473,117 +609,256 @@ void OBClient::updateIconTitle() } -void OBClient::updateClass() +void Client::updateClass() { - const otk::OBProperty *property = Openbox::instance->property(); - // set the defaults - _app_name = _app_class = ""; + _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)) - return; + 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(); + } - if (num > 0) _app_name = v[0]; - if (num > 1) _app_class = v[1]; + v.clear(); + num = 1; + 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) { _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]; + + // updating here is pointless while we're being mapped cuz we're not in + // the screen's client list yet + if (frame) + openbox->screen(_screen)->updateStrut(); } delete [] data; } -void OBClient::propertyHandler(const XPropertyEvent &e) +void Client::updateTransientFor() { - otk::OtkEventHandler::propertyHandler(e); - - const otk::OBProperty *property = Openbox::instance->property(); + Window t = 0; + Client *c = 0; + + if (XGetTransientForHint(**otk::display, _window, &t) && + t != _window) { // cant be transient to itself! + 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()) { + // window is a transient for its group! + // XXX: for now this is treated as non-transient. + // this needs to be fixed! + } + } + } + // if anything has changed... + if (c != _transient_for) { + bool m = _modal; + if (_modal) + setModal(false); + + if (_transient_for) + _transient_for->_transients.remove(this); // remove from old parent + _transient_for = c; + if (_transient_for) + _transient_for->_transients.push_back(this); // add to new parent + + if (m) + setModal(true); + } +} + + +void Client::propertyHandler(const XPropertyEvent &e) +{ + otk::EventHandler::propertyHandler(e); + + // validate cuz we query stuff off the client here + if (!validate()) return; + // 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; } } - if (e.atom == XA_WM_NORMAL_HINTS) + if (e.atom == XA_WM_NORMAL_HINTS) { updateNormalHints(); - else if (e.atom == XA_WM_HINTS) + setupDecorAndFunctions(); // normal hints can make a window non-resizable + } else if (e.atom == XA_WM_HINTS) updateWMHints(); - else if (e.atom == property->atom(otk::OBProperty::net_wm_name) || - e.atom == property->atom(otk::OBProperty::wm_name)) + else if (e.atom == XA_WM_TRANSIENT_FOR) { + updateTransientFor(); + getType(); + calcLayer(); // type may have changed, so update the layer + setupDecorAndFunctions(); + } + 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(); - // XXX: transient for hint - else if (e.atom == property->atom(otk::OBProperty::net_wm_strut)) + setupDecorAndFunctions(); + } + else if (e.atom == otk::Property::atoms.net_wm_strut) updateStrut(); - // XXX: strut hint } -void OBClient::setWMState(long state) +void Client::setWMState(long state) { if (state == _wmstate) return; // no change 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; } - _wmstate = state; } -void OBClient::setDesktop(long target) +void Client::setDesktop(long target) { + if (target == _desktop) return; + printf("Setting desktop %ld\n", target); - assert(target >= 0 || target == (signed)0xffffffff); - //assert(target == 0xffffffff || target < MAX); - // XXX: move the window to the new desktop (and set root property) + if (!(target >= 0 || target == (signed)0xffffffff || + target == ICONIC_DESKTOP)) + return; + _desktop = target; + + // 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->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(); +} + + +Client *Client::findModalChild(Client *skip) const +{ + Client *ret = 0; + + // find a modal child recursively and try focus it + List::const_iterator it, end = _transients.end(); + for (it = _transients.begin(); it != end; ++it) + if ((*it)->_modal && *it != skip) + return *it; // got one + // none of our direct children are modal, let them try check + for (it = _transients.begin(); it != end; ++it) + if ((ret = (*it)->findModalChild())) + return ret; // got one + return ret; +} + + +void Client::setModal(bool modal) +{ + if (modal == _modal) return; + + if (modal) { + Client *c = this; + while (c->_transient_for) { + c = c->_transient_for; + if (c->_modal_child) break; // already has a modal child + c->_modal_child = this; + } + } else { + // try find a replacement modal dialog + Client *replacement = 0; + + Client *c = this; + while (c->_transient_for) // go up the tree + c = c->_transient_for; + replacement = c->findModalChild(this); // find a modal child, skipping this + + c = this; + while (c->_transient_for) { + c = c->_transient_for; + if (c->_modal_child != this) break; // has a different modal child + c->_modal_child = replacement; + } + } + _modal = modal; } -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 restack = false, shadestate = _shaded; + bool shadestate = _shaded; + bool fsstate = _fullscreen; + bool maxh = _max_horz; + bool maxv = _max_vert; + bool modal = _modal; if (!(action == State_Add || action == State_Remove || action == State_Toggle)) @@ -596,135 +871,115 @@ 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)){ - if (_max_vert) continue; - _max_vert = true; - // XXX: resize the window etc - } else if (state == - property->atom(otk::OBProperty::net_wm_state_maximized_horz)){ + modal = true; + } else if (state == otk::Property::atoms.net_wm_state_maximized_vert) { + maxv = true; + } 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)) { - if (_shaded) continue; - // shade when we're all thru here + maxh = true; + } else if (state == otk::Property::atoms.net_wm_state_shaded) { 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)) { - if (_fullscreen) continue; - _fullscreen = true; - restack = false; - } else if (state == - property->atom(otk::OBProperty::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; - restack = 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; - restack = 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)){ - if (!_max_vert) continue; - _max_vert = false; - // XXX: resize the window etc - } else if (state == - property->atom(otk::OBProperty::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)) { - if (!_shaded) continue; - // unshade when we're all thru here + modal = false; + } else if (state == otk::Property::atoms.net_wm_state_maximized_vert) { + maxv = false; + } else if (state == otk::Property::atoms.net_wm_state_maximized_horz) { + maxh = false; + } else if (state == otk::Property::atoms.net_wm_state_shaded) { 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)) { - if (!_fullscreen) continue; - _fullscreen = false; - restack = true; - } else if (state == - property->atom(otk::OBProperty::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; - restack = 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 = false; - restack = true; } } } + if (maxh != _max_horz || maxv != _max_vert) { + if (maxh != _max_horz && maxv != _max_vert) { // toggling both + if (maxh == maxv) { // both going the same way + maximize(maxh, 0, true); + } else { + maximize(maxh, 1, true); + maximize(maxv, 2, true); + } + } else { // toggling one + if (maxh != _max_horz) + maximize(maxh, 1, true); + else + maximize(maxv, 2, true); + } + } + if (modal != _modal) + setModal(modal); + // change fullscreen state before shading, as it will affect if the window + // can shade or not + if (fsstate != _fullscreen) + fullscreen(fsstate, true); if (shadestate != _shaded) shade(shadestate); - if (restack) { - calcLayer(); - Openbox::instance->screen(_screen)->restack(true, this); // raise - } + calcLayer(); + changeState(); // change the hint to relect these changes } -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 // different position. // when re-adding the border to the client, the same operation needs to be // reversed. - int x = _area.x(), y = _area.y(); + int oldx = _area.x(), oldy = _area.y(); + int x = oldx, y = oldy; switch(_gravity) { + default: case NorthWestGravity: case WestGravity: case SouthWestGravity: @@ -735,8 +990,17 @@ void OBClient::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: @@ -747,39 +1011,46 @@ void OBClient::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::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); + if (x != oldx || y != oldy) + 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); + + // validate cuz we query stuff off the client here + if (!validate()) return; 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; @@ -788,16 +1059,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; @@ -806,56 +1076,98 @@ 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 %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 (_iconic) + setDesktop(openbox->screen(_screen)->desktop()); + if (_shaded) + shade(false); + // XXX: deiconify focus(); - Openbox::instance->screen(_screen)->restack(true, this); // raise - } else { + 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) +{ + if (!(_functions & Func_Resize)) return; + internal_resize(anchor, w, h); +} + + +void Client::internal_resize(Corner anchor, int w, int h, bool user, + int x, int y) { 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; + if (user) { + // for interactive resizing. have to move half an increment in each + // direction. + int mw = w % _size_inc.x(); // how far we are towards the next size inc + int mh = h % _size_inc.y(); + int aw = _size_inc.x() / 2; // amount to add + int ah = _size_inc.y() / 2; + // don't let us move into a new size increment + if (mw + aw >= _size_inc.x()) aw = _size_inc.x() - mw - 1; + if (mh + ah >= _size_inc.y()) ah = _size_inc.y() - mh - 1; + w += aw; + h += ah; + + // if this is a user-requested resize, then check against min/max sizes + // and aspect ratios - // 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()) { // smaller than min size or bigger than max size? if (w < _min_size.x()) w = _min_size.x(); else if (w > _max_size.x()) w = _max_size.x(); if (h < _min_size.y()) h = _min_size.y(); else if (h > _max_size.y()) h = _max_size.y(); + + // adjust the height ot match the width for the aspect ratios + if (_min_ratio) + if (h * _min_ratio > w) h = static_cast(w / _min_ratio); + if (_max_ratio) + if (h * _max_ratio < w) h = static_cast(w / _max_ratio); } // keep to the increments 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); @@ -886,27 +1198,62 @@ 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(); - move(x, y); + internal_move(x, y); +} + + +void Client::move(int x, int y) +{ + if (!(_functions & Func_Move)) return; + frame->frameGravity(x, y); // get the client's position based on x,y for the + // frame + internal_move(x, y); } -void OBClient::move(int x, int y) +void Client::internal_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; + + // root window coords with border in mind + event.xconfigure.x = x - _border_width + frame->size().left; + event.xconfigure.y = y - _border_width + frame->size().top; + + event.xconfigure.width = _area.width(); + event.xconfigure.height = _area.height(); + event.xconfigure.border_width = _border_width; + event.xconfigure.above = frame->plate(); + event.xconfigure.override_redirect = False; + XSendEvent(event.xconfigure.display, event.xconfigure.window, False, + StructureNotifyMask, &event); +#if 0//def DEBUG + printf("Sent synthetic ConfigureNotify %d,%d %d,%d to 0x%lx\n", + event.xconfigure.x, event.xconfigure.y, event.xconfigure.width, + event.xconfigure.height, event.xconfigure.window); +#endif + } } -void OBClient::close() +void Client::close() { XEvent ce; - const otk::OBProperty *property = Openbox::instance->property(); if (!(_functions & Func_Close)) return; @@ -917,167 +1264,474 @@ 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(); + + if (frame) + frame->adjustState(); } -void OBClient::setStackLayer(int l) +void Client::changeAllowedActions(void) { - if (l == 0) - _above = _below = false; // normal - else if (l > 0) { - _above = true; - _below = false; // above - } else { - _above = false; - _below = true; // below + 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; } - changeState(); - calcLayer(); - Openbox::instance->screen(_screen)->restack(true, this); // raise + + otk::Property::set(_window, otk::Property::atoms.net_wm_allowed_actions, + otk::Property::atoms.atom, actions, num); +} + + +void Client::remaximize() +{ + int dir; + if (_max_horz && _max_vert) + dir = 0; + else if (_max_horz) + dir = 1; + else if (_max_vert) + dir = 2; + else + return; // not maximized + _max_horz = _max_vert = false; + maximize(true, dir, false); +} + + +void Client::applyStartupState() +{ + // these are in a carefully crafted order.. + + if (_modal) { + _modal = false; + setModal(true); + } + + if (_iconic) { + _iconic = false; + setDesktop(ICONIC_DESKTOP); + } + if (_fullscreen) { + _fullscreen = false; + fullscreen(true, false); + } + if (_shaded) { + _shaded = false; + shade(true); + } + if (_urgent) + fireUrgent(); + + if (_max_vert && _max_horz) { + _max_vert = _max_horz = false; + maximize(true, 0, false); + } else if (_max_vert) { + _max_vert = false; + maximize(true, 2, false); + } else if (_max_horz) { + _max_horz = false; + maximize(true, 1, false); + } + + 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 OBClient::shade(bool shade) +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 OBClient::focus() +void Client::maximize(bool max, int dir, bool savearea) +{ + assert(dir == 0 || dir == 1 || dir == 2); + if (!(_functions & Func_Maximize)) return; // can't + + // check if already done + if (max) { + if (dir == 0 && _max_horz && _max_vert) return; + if (dir == 1 && _max_horz) return; + if (dir == 2 && _max_vert) return; + } else { + if (dir == 0 && !_max_horz && !_max_vert) return; + if (dir == 1 && !_max_horz) return; + if (dir == 2 && !_max_vert) return; + } + + const otk::Rect &a = openbox->screen(_screen)->area(); + int x = frame->rect().x(), y = frame->rect().y(), + w = _area.width(), h = _area.height(); + + if (max) { + if (savearea) { + long dimensions[4]; + long *readdim; + unsigned long n = 4; + + dimensions[0] = x; + dimensions[1] = y; + dimensions[2] = w; + dimensions[3] = h; + + // get the property off the window and use it for the dimentions we are + // already maxed on + if (otk::Property::get(_window, otk::Property::atoms.openbox_premax, + otk::Property::atoms.cardinal, &n, + (long unsigned**) &readdim)) { + if (n >= 4) { + if (_max_horz) { + dimensions[0] = readdim[0]; + dimensions[2] = readdim[2]; + } + if (_max_vert) { + dimensions[1] = readdim[1]; + dimensions[3] = readdim[3]; + } + } + delete readdim; + } + + otk::Property::set(_window, otk::Property::atoms.openbox_premax, + otk::Property::atoms.cardinal, + (long unsigned*)dimensions, 4); + } + if (dir == 0 || dir == 1) { // horz + x = a.x(); + w = a.width(); + } + if (dir == 0 || dir == 2) { // vert + y = a.y(); + h = a.height() - frame->size().top - frame->size().bottom; + } + } else { + long *dimensions; + long unsigned n = 4; + + if (otk::Property::get(_window, otk::Property::atoms.openbox_premax, + otk::Property::atoms.cardinal, &n, + (long unsigned**) &dimensions)) { + if (n >= 4) { + if (dir == 0 || dir == 1) { // horz + x = (signed int)dimensions[0]; + w = (signed int)dimensions[2]; + } + if (dir == 0 || dir == 2) { // vert + y = (signed int)dimensions[1]; + h = (signed int)dimensions[3]; + } + } + delete dimensions; + } else { + // pick some fallbacks... + if (dir == 0 || dir == 1) { // horz + x = a.x() + a.width() / 4; + w = a.width() / 2; + } + if (dir == 0 || dir == 2) { // vert + y = a.y() + a.height() / 4; + h = a.height() / 2; + } + } + } + + if (dir == 0 || dir == 1) // horz + _max_horz = max; + if (dir == 0 || dir == 2) // vert + _max_vert = max; + + if (!_max_horz && !_max_vert) + otk::Property::erase(_window, otk::Property::atoms.openbox_premax); + + changeState(); // change the state hints on the client + + frame->frameGravity(x, y); // figure out where the client should be going + internal_resize(TopLeft, w, h, true, x, y); +} + + +void Client::fullscreen(bool fs, bool savearea) { - if (!(_can_focus || _focus_notify) || _focused) return false; + static FunctionFlags saved_func; + static DecorationFlags saved_decor; + + if (!(_functions & Func_Fullscreen) || // can't + _fullscreen == fs) return; // already done + + _fullscreen = fs; + changeState(); // change the state hints on the client + + int x = _area.x(), y = _area.y(), w = _area.width(), h = _area.height(); + + 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; + if (savearea) { + long dimensions[4]; + dimensions[0] = _area.x(); + dimensions[1] = _area.y(); + dimensions[2] = _area.width(); + dimensions[3] = _area.height(); + otk::Property::set(_window, otk::Property::atoms.openbox_premax, + otk::Property::atoms.cardinal, + (long unsigned*)dimensions, 4); + } + const otk::ScreenInfo *info = otk::display->screenInfo(_screen); + x = 0; + y = 0; + w = info->width(); + h = info->height(); + } else { + _functions = saved_func; + _decorations = saved_decor; + + long *dimensions; + long unsigned n = 4; + + if (otk::Property::get(_window, otk::Property::atoms.openbox_premax, + otk::Property::atoms.cardinal, &n, + (long unsigned**) &dimensions)) { + if (n >= 4) { + x = dimensions[0]; + y = dimensions[1]; + w = dimensions[2]; + h = dimensions[3]; + } + delete dimensions; + } else { + // pick some fallbacks... + const otk::Rect &a = openbox->screen(_screen)->area(); + x = a.x() + a.width() / 4; + y = a.y() + a.height() / 4; + w = a.width() / 2; + h = a.height() / 2; + } + } + + changeAllowedActions(); // based on the new _functions + + // when fullscreening, don't obey things like increments, fill the screen + internal_resize(TopLeft, w, h, !fs, x, y); + + // raise (back) into our stacking layer + openbox->screen(_screen)->raiseWindow(this); + + // try focus us when we go into fullscreen mode + if (fs) focus(); +} + + +void Client::disableDecorations(DecorationFlags flags) +{ + _disabled_decorations = flags; + setupDecorAndFunctions(); +} + + +void Client::installColormap(bool install) const +{ + XWindowAttributes wa; + if (XGetWindowAttributes(**otk::display, _window, &wa)) { + printf("%snstalling Window Colormap 0x%lx!\n", install ? "I" : "Uni", _window); + if (install) + XInstallColormap(**otk::display, wa.colormap); + else + XUninstallColormap(**otk::display, wa.colormap); + } +} + + +bool Client::focus() +{ + // if we have a modal child, then focus it, not us + if (_modal_child) + return _modal_child->focus(); + + // 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; + + // 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::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); } + XSync(**otk::display, False); 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); +// 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); +// 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) { - printf("UNFOCUSED!\n"); - Openbox::instance->setFocusedClient(this); - } + 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 + // 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; @@ -1108,64 +1762,67 @@ void OBClient::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, false, x, y); } else // if JUST resizing... - resize(corner, w, h); + internal_resize(corner, w, h, false); } 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; } } } -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; @@ -1174,7 +1831,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. @@ -1183,21 +1840,27 @@ 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); } - -void OBClient::mapRequestHandler(const XMapRequestEvent &e) +void Client::mapRequestHandler(const XMapRequestEvent &e) { - printf("\nMAP REQUEST\n\n"); - - otk::OtkEventHandler::mapRequestHandler(e); +#ifdef DEBUG + printf("MapRequest for already managed 0x%lx\n", e.window); +#endif // DEBUG - if (_shaded) - shade(false); - // XXX: uniconify the window - focus(); + 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) } }