X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclient.cc;h=2e78cb7672ff439db78dce1eb6f0f3a219b332dd;hb=598c5d6c07118517b47d7c416a79dc9743271aa8;hp=3939b0c61ada1b63278e7d0691ccf392da3cf722;hpb=39c6969de2714904dec901c9d3f4e8b0ff01f062;p=chaz%2Fopenbox diff --git a/src/client.cc b/src/client.cc index 3939b0c6..2e78cb76 100644 --- a/src/client.cc +++ b/src/client.cc @@ -1,8 +1,6 @@ // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif +#include "config.h" #include "client.hh" #include "frame.hh" @@ -17,19 +15,19 @@ extern "C" { #include #include -#include - #include "gettext.h" #define _(str) gettext(str) } +#include // for memcpy +#include +#include #include namespace ob { Client::Client(int screen, Window window) : otk::EventHandler(), - WidgetBase(WidgetBase::Type_Client), frame(0), _screen(screen), _window(window) { assert(screen >= 0); @@ -39,37 +37,37 @@ Client::Client(int screen, Window window) // update EVERYTHING the first time!! - // we default to NormalState, visible + // defaults _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; + _disabled_decorations = 0; + _group = None; + _desktop = 0; + _nicons = 0; getArea(); getDesktop(); + getState(); // do this before updateTransientFor! (for _modal) + getShaped(); updateTransientFor(); - getType(); getMwmHints(); - - getState(); - getShaped(); + getType(); // this can change the mwmhints for special cases updateProtocols(); - // got the type, the mwmhints, and the protocols, so we're ready to set up + 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(); - getGravity(); // get the attribute gravity - updateNormalHints(); // this may override the attribute gravity // also get the initial_state and set _iconic if we aren't "starting" // when we're "starting" that means we should use whatever state was already // on the window over the initial map state, because it was already mapped @@ -78,7 +76,9 @@ Client::Client(int screen, Window window) updateIconTitle(); updateClass(); updateStrut(); - + updateIcons(); + updateKwmIcon(); + // this makes sure that these windows appear on all desktops if (/*_type == Type_Dock ||*/ _type == Type_Desktop) _desktop = 0xffffffff; @@ -87,19 +87,23 @@ Client::Client(int screen, Window window) // any changes we've made here otk::Property::set(_window, otk::Property::atoms.net_wm_desktop, otk::Property::atoms.cardinal, (unsigned)_desktop); - changeState(); } Client::~Client() { + assert(_nicons > 0); // there should always be a default.. + for (int j = 0; j < _nicons; ++j) + delete [] _icons[j].data; + delete [] _icons; + // 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 @@ -147,10 +151,15 @@ void Client::getDesktop() { // defaults to the current desktop _desktop = openbox->screen(_screen)->desktop(); + unsigned int d; if (otk::Property::get(_window, otk::Property::atoms.net_wm_desktop, otk::Property::atoms.cardinal, - (long unsigned*)&_desktop)) { + (long unsigned*)&d)) { + if (d >= openbox->screen(_screen)->numDesktops() && + d != 0xffffffff) + d = openbox->screen(_screen)->numDesktops() - 1; + _desktop = d; #ifdef DEBUG // printf("Window requested desktop: %ld\n", _desktop); #endif @@ -163,7 +172,7 @@ void Client::getType() _type = (WindowType) -1; unsigned long *val; - unsigned long num = (unsigned) -1; + unsigned long num; 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 @@ -184,9 +193,12 @@ void Client::getType() _type = Type_Dialog; else if (val[i] == otk::Property::atoms.net_wm_window_type_normal) _type = Type_Normal; -// 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 + 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 } @@ -209,7 +221,7 @@ void Client::getType() void Client::setupDecorAndFunctions() { // start with everything (cept fullscreen) - _decorations = Decor_Titlebar | Decor_Handle | Decor_Border | + _decorations = Decor_Titlebar | Decor_Handle | Decor_Border | Decor_Icon | Decor_AllDesktops | Decor_Iconify | Decor_Maximize; _functions = Func_Resize | Func_Move | Func_Iconify | Func_Maximize | Func_Shade; @@ -218,8 +230,9 @@ void Client::setupDecorAndFunctions() _functions |= Func_Close; } - if (_min_size.x() > _max_size.x() || _min_size.y() > _max_size.y()) { - _decorations &= ~Decor_Maximize; + if (!(_min_size.width() < _max_size.width() || + _min_size.height() < _max_size.height())) { + _decorations &= ~(Decor_Maximize | Decor_Handle); _functions &= ~(Func_Resize | Func_Maximize); } @@ -228,6 +241,7 @@ void Client::setupDecorAndFunctions() // 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 @@ -260,11 +274,8 @@ void Client::setupDecorAndFunctions() _decorations &= ~Decor_Border; if (! (_mwmhints.decorations & MwmDecor_Handle)) _decorations &= ~Decor_Handle; - if (! (_mwmhints.decorations & MwmDecor_Title)) { + if (! (_mwmhints.decorations & MwmDecor_Title)) _decorations &= ~Decor_Titlebar; - // if we don't have a titlebar, then we cannot shade! - _functions &= ~Func_Shade; - } if (! (_mwmhints.decorations & MwmDecor_Iconify)) _decorations &= ~Decor_Iconify; if (! (_mwmhints.decorations & MwmDecor_Maximize)) @@ -288,7 +299,39 @@ void Client::setupDecorAndFunctions() } } + // 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; + + // if we don't have a titlebar, then we cannot shade! + 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 + remaximize(); // with new decor, the window's maximized size may change + } } @@ -323,7 +366,7 @@ void Client::getArea() ret = XGetWindowAttributes(**otk::display, _window, &wattrib); assert(ret != BadWindow); - _area.setRect(wattrib.x, wattrib.y, wattrib.width, wattrib.height); + _area = otk::Rect(wattrib.x, wattrib.y, wattrib.width, wattrib.height); _border_width = wattrib.border_width; } @@ -334,7 +377,7 @@ void Client::getState() _iconic = _skip_taskbar = _skip_pager = false; unsigned long *state; - unsigned long num = (unsigned) -1; + unsigned long num; if (otk::Property::get(_window, otk::Property::atoms.net_wm_state, otk::Property::atoms.atom, &num, &state)) { @@ -365,7 +408,6 @@ void Client::getState() } } - void Client::getShaped() { _shaped = false; @@ -384,12 +426,40 @@ void Client::getShaped() #endif // SHAPE } +Client *Client::searchFocusTree(Client *node, Client *skip) +{ + List::const_iterator it, end = node->_transients.end(); + Client *ret; + + for (it = node->_transients.begin(); it != end; ++it) { + if (*it == skip) continue; // circular? + if ((ret = searchModalTree(*it, skip))) return ret; // got one + if ((*it)->_focused) return *it; // got one + } + return 0; +} void Client::calcLayer() { StackLayer l; + bool fs = false; + // are we fullscreen, or do we have a fullscreen transient parent? + Client *c = this; + while (c) { + if (c->_fullscreen) { + fs =true; + break; + } + c = c->_transient_for; + } + if (!fs && _fullscreen) { + // is one of our transients focused? + c = searchFocusTree(this, this); + if (c) fs = true; + } + if (_iconic) l = Layer_Icon; - else if (_fullscreen) l = Layer_Fullscreen; + else if (fs) l = Layer_Fullscreen; else if (_type == Type_Desktop) l = Layer_Desktop; else if (_type == Type_Dock) { if (!_below) l = Layer_Top; @@ -411,7 +481,6 @@ void Client::calcLayer() { } } - void Client::updateProtocols() { Atom *proto; @@ -434,7 +503,6 @@ void Client::updateProtocols() } } - void Client::updateNormalHints() { XSizeHints size; @@ -444,13 +512,10 @@ void Client::updateNormalHints() // defaults _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.. + _size_inc = otk::Size(1, 1); + _base_size = otk::Size(0, 0); + _min_size = otk::Size(0, 0); + _max_size = otk::Size(INT_MAX, INT_MAX); // get the hints from the window if (XGetWMNormalHints(**otk::display, _window, &size, &ret)) { @@ -463,9 +528,9 @@ void Client::updateNormalHints() // changing its gravity if (frame && _gravity != oldgravity) { // move our idea of the client's position based on its new gravity - int x, y; + int x = frame->area().x(), y = frame->area().y(); frame->frameGravity(x, y); - _area.setPos(x, y); + _area = otk::Rect(otk::Point(x, y), _area.size()); } } @@ -475,20 +540,19 @@ void Client::updateNormalHints() } if (size.flags & PMinSize) - _min_size.setPoint(size.min_width, size.min_height); + _min_size = otk::Size(size.min_width, size.min_height); if (size.flags & PMaxSize) - _max_size.setPoint(size.max_width, size.max_height); + _max_size = otk::Size(size.max_width, size.max_height); if (size.flags & PBaseSize) - _base_size.setPoint(size.base_width, size.base_height); + _base_size = otk::Size(size.base_width, size.base_height); if (size.flags & PResizeInc) - _size_inc.setPoint(size.width_inc, size.height_inc); + _size_inc = otk::Size(size.width_inc, size.height_inc); } } - void Client::updateWMHints(bool initstate) { XWMHints *hints; @@ -517,13 +581,24 @@ void Client::updateWMHints(bool initstate) } else // no group! _group = None; + if (hints->flags & IconPixmapHint) { + updateKwmIcon(); // try get the kwm icon first, this is a fallback only + if (_pixmap_icon == None) { + _pixmap_icon = hints->icon_pixmap; + if (hints->flags & IconMaskHint) + _pixmap_icon_mask = hints->icon_mask; + else + _pixmap_icon_mask = None; + } + } + XFree(hints); } if (ur != _urgent) { _urgent = ur; #ifdef DEBUG - printf("DEBUG: Urgent Hint for 0x%lx: %s\n", + printf("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 @@ -533,7 +608,6 @@ void Client::updateWMHints(bool initstate) } } - void Client::updateTitle() { _title = ""; @@ -550,10 +624,9 @@ void Client::updateTitle() _title = _("Unnamed Window"); if (frame) - frame->setTitle(_title); + frame->adjustTitle(); } - void Client::updateIconTitle() { _icon_title = ""; @@ -570,7 +643,6 @@ void Client::updateIconTitle() _icon_title = _("Unnamed Window"); } - void Client::updateClass() { // set the defaults @@ -593,7 +665,6 @@ void Client::updateClass() } } - void Client::updateStrut() { unsigned long num = 4; @@ -607,14 +678,16 @@ void Client::updateStrut() _strut.right = data[1]; _strut.top = data[2]; _strut.bottom = data[3]; - - openbox->screen(_screen)->updateStrut(); + + // 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)->updateStruts(); } delete [] data; } - void Client::updateTransientFor() { Window t = 0; @@ -644,11 +717,76 @@ void Client::updateTransientFor() _transient_for = c; if (_transient_for) _transient_for->_transients.push_back(this); // add to new parent + } +} - // XXX: change decor status? +void Client::updateIcons() +{ + unsigned long num; + unsigned long *data; + unsigned long w, h, i = 0; + + for (int j = 0; j < _nicons; ++j) + delete [] _icons[j].data; + if (_nicons > 0) + delete [] _icons; + _nicons = 0; + + if (otk::Property::get(_window, otk::Property::atoms.net_wm_icon, + otk::Property::atoms.cardinal, &num, &data)) { + // figure out how man valid icons are in here + while (num - i > 2) { + w = data[i++]; + h = data[i++]; + i += w * h; + if (i > num) break; + ++_nicons; + } + + _icons = new Icon[_nicons]; + + // store the icons + i = 0; + for (int j = 0; j < _nicons; ++j) { + w = _icons[j].w = data[i++]; + h = _icons[j].h = data[i++]; + _icons[j].data = new unsigned long[w * h]; + ::memcpy(_icons[j].data, &data[i], w * h * sizeof(unsigned long)); + i += w * h; + assert(i <= num); + } + + delete [] data; + } + + if (_nicons <= 0) { + _nicons = 1; + _icons = new Icon[1]; + _icons[i].w = 0; + _icons[i].h = 0; + _icons[i].data = 0; } + + assert(_nicons > 0); // there should always be a default.. + + if (frame) frame->adjustIcon(); } +void Client::updateKwmIcon() +{ + _pixmap_icon = _pixmap_icon_mask = None; + + unsigned long num = 2; + Pixmap *data; + if (otk::Property::get(_window, otk::Property::atoms.kwm_win_icon, + otk::Property::atoms.kwm_win_icon, &num, &data)) { + if (num == 2) { + _pixmap_icon = data[0]; + _pixmap_icon_mask = data[1]; + } + delete [] data; + } +} void Client::propertyHandler(const XPropertyEvent &e) { @@ -678,7 +816,6 @@ void Client::propertyHandler(const XPropertyEvent &e) getType(); calcLayer(); // type may have changed, so update the layer setupDecorAndFunctions(); - frame->adjustSize(); // this updates the frame for any new decor settings } else if (e.atom == otk::Property::atoms.net_wm_name || e.atom == otk::Property::atoms.wm_name) @@ -691,82 +828,74 @@ void Client::propertyHandler(const XPropertyEvent &e) else if (e.atom == otk::Property::atoms.wm_protocols) { updateProtocols(); setupDecorAndFunctions(); - frame->adjustSize(); // update the decorations } else if (e.atom == otk::Property::atoms.net_wm_strut) updateStrut(); + else if (e.atom == otk::Property::atoms.net_wm_icon) + updateIcons(); + else if (e.atom == otk::Property::atoms.kwm_win_icon) + updateKwmIcon(); } - void Client::setWMState(long state) { if (state == _wmstate) return; // no change switch (state) { case IconicState: - setDesktop(ICONIC_DESKTOP); + iconify(true); break; case NormalState: - setDesktop(openbox->screen(_screen)->desktop()); + iconify(false); break; } } - -void Client::setDesktop(long target) +void Client::setDesktop(unsigned int target) { if (target == _desktop) return; - printf("Setting desktop %ld\n", target); + printf("Setting desktop %u\n", target); - if (!(target >= 0 || target == (signed)0xffffffff || - target == ICONIC_DESKTOP)) + if (!(target < openbox->screen(_screen)->numDesktops() || + target == 0xffffffff)) 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); - + _desktop = target; + // set the desktop hint + otk::Property::set(_window, otk::Property::atoms.net_wm_desktop, + otk::Property::atoms.cardinal, _desktop); + frame->adjustState(); // the frame can display the current desktop state // '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(); + showhide(); + openbox->screen(_screen)->updateStruts(); } +void Client::showhide() +{ + bool show; + Screen *s = openbox->screen(_screen); -void Client::setState(StateAction action, long data1, long data2) + if (_iconic) show = false; + else if (!(_desktop == s->desktop() || + _desktop == 0xffffffff)) show = false; + else if (normal() && s->showingDesktop()) show = false; + else show = true; + + if (show) frame->show(); + else frame->hide(); +} + +void Client::setState(Atom action, long data1, long data2) { bool shadestate = _shaded; bool fsstate = _fullscreen; + bool maxh = _max_horz; + bool maxv = _max_vert; - if (!(action == State_Add || action == State_Remove || - action == State_Toggle)) + if (!(action == otk::Property::atoms.net_wm_state_add || + action == otk::Property::atoms.net_wm_state_remove || + action == otk::Property::atoms.net_wm_state_toggle)) return; // an invalid action was passed to the client message, ignore it for (int i = 0; i < 2; ++i) { @@ -775,40 +904,45 @@ void Client::setState(StateAction action, long data1, long data2) if (! state) continue; // if toggling, then pick whether we're adding or removing - if (action == State_Toggle) { + if (action == otk::Property::atoms.net_wm_state_toggle) { if (state == otk::Property::atoms.net_wm_state_modal) - action = _modal ? State_Remove : State_Add; + action = _modal ? otk::Property::atoms.net_wm_state_remove : + otk::Property::atoms.net_wm_state_add; else if (state == otk::Property::atoms.net_wm_state_maximized_vert) - action = _max_vert ? State_Remove : State_Add; + action = _max_vert ? otk::Property::atoms.net_wm_state_remove : + otk::Property::atoms.net_wm_state_add; else if (state == otk::Property::atoms.net_wm_state_maximized_horz) - action = _max_horz ? State_Remove : State_Add; + action = _max_horz ? otk::Property::atoms.net_wm_state_remove : + otk::Property::atoms.net_wm_state_add; else if (state == otk::Property::atoms.net_wm_state_shaded) - action = _shaded ? State_Remove : State_Add; + action = _shaded ? otk::Property::atoms.net_wm_state_remove : + otk::Property::atoms.net_wm_state_add; else if (state == otk::Property::atoms.net_wm_state_skip_taskbar) - action = _skip_taskbar ? State_Remove : State_Add; + action = _skip_taskbar ? otk::Property::atoms.net_wm_state_remove : + otk::Property::atoms.net_wm_state_add; else if (state == otk::Property::atoms.net_wm_state_skip_pager) - action = _skip_pager ? State_Remove : State_Add; + action = _skip_pager ? otk::Property::atoms.net_wm_state_remove : + otk::Property::atoms.net_wm_state_add; else if (state == otk::Property::atoms.net_wm_state_fullscreen) - action = _fullscreen ? State_Remove : State_Add; + action = _fullscreen ? otk::Property::atoms.net_wm_state_remove : + otk::Property::atoms.net_wm_state_add; else if (state == otk::Property::atoms.net_wm_state_above) - action = _above ? State_Remove : State_Add; + action = _above ? otk::Property::atoms.net_wm_state_remove : + otk::Property::atoms.net_wm_state_add; else if (state == otk::Property::atoms.net_wm_state_below) - action = _below ? State_Remove : State_Add; + action = _below ? otk::Property::atoms.net_wm_state_remove : + otk::Property::atoms.net_wm_state_add; } - if (action == State_Add) { + if (action == otk::Property::atoms.net_wm_state_add) { 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 == otk::Property::atoms.net_wm_state_maximized_vert) { - if (_max_vert) continue; - _max_vert = true; - // XXX: resize the window etc + 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 + maxh = true; } else if (state == otk::Property::atoms.net_wm_state_shaded) { shadestate = true; } else if (state == otk::Property::atoms.net_wm_state_skip_taskbar) { @@ -825,18 +959,14 @@ void Client::setState(StateAction action, long data1, long data2) _below = true; } - } else { // action == State_Remove + } else { // action == otk::Property::atoms.net_wm_state_remove if (state == otk::Property::atoms.net_wm_state_modal) { if (!_modal) continue; _modal = false; } else if (state == otk::Property::atoms.net_wm_state_maximized_vert) { - if (!_max_vert) continue; - _max_vert = false; - // XXX: resize the window etc + maxv = false; } else if (state == otk::Property::atoms.net_wm_state_maximized_horz) { - if (!_max_horz) continue; - _max_horz = false; - // XXX: resize the window etc + maxh = false; } else if (state == otk::Property::atoms.net_wm_state_shaded) { shadestate = false; } else if (state == otk::Property::atoms.net_wm_state_skip_taskbar) { @@ -854,16 +984,31 @@ void Client::setState(StateAction action, long data1, long data2) } } } + 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); + } + } // change fullscreen state before shading, as it will affect if the window // can shade or not if (fsstate != _fullscreen) - fullscreen(fsstate); + fullscreen(fsstate, true); if (shadestate != _shaded) shade(shadestate); calcLayer(); + changeState(); // change the hint to relect these changes } - void Client::toggleClientBorder(bool addborder) { // adjust our idea of where the client is, based on its border. When the @@ -871,7 +1016,8 @@ void Client::toggleClientBorder(bool addborder) // 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: @@ -914,18 +1060,18 @@ void Client::toggleClientBorder(bool addborder) else y += _border_width; break; } - _area.setPos(x, y); + _area = otk::Rect(otk::Point(x, y), _area.size()); if (addborder) { XSetWindowBorderWidth(**otk::display, _window, _border_width); // move the client so it is back it the right spot _with_ its border! - XMoveWindow(**otk::display, _window, x, y); + if (x != oldx || y != oldy) + XMoveWindow(**otk::display, _window, x, y); } else XSetWindowBorderWidth(**otk::display, _window, 0); } - void Client::clientMessageHandler(const XClientMessageEvent &e) { otk::EventHandler::clientMessageHandler(e); @@ -977,7 +1123,7 @@ void Client::clientMessageHandler(const XClientMessageEvent &e) 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]); + setState(e.data.l[0], e.data.l[1], e.data.l[2]); } else if (e.message_type == otk::Property::atoms.net_close_window) { #ifdef DEBUG printf("net_close_window for 0x%lx\n", _window); @@ -987,17 +1133,39 @@ void Client::clientMessageHandler(const XClientMessageEvent &e) #ifdef DEBUG printf("net_active_window for 0x%lx\n", _window); #endif + if (openbox->screen(_screen)->showingDesktop()) + openbox->screen(_screen)->showDesktop(false); if (_iconic) - setDesktop(openbox->screen(_screen)->desktop()); + iconify(false); + else if (!frame->visible()) // if its not visible for other reasons, then + return; // don't mess with it if (_shaded) shade(false); - // XXX: deiconify focus(); openbox->screen(_screen)->raiseWindow(this); + } else if (e.message_type == otk::Property::atoms.openbox_active_window) { + if (openbox->screen(_screen)->showingDesktop()) + openbox->screen(_screen)->showDesktop(false); + if (_iconic) + iconify(false); + else if (!frame->visible()) // if its not visible for other reasons, then + return; // don't mess with it + if (e.data.l[0] && _shaded) + shade(false); + focus(); + if (e.data.l[1]) + openbox->screen(_screen)->raiseWindow(this); + } else if (e.message_type == otk::Property::atoms.openbox_restack_window) { +#ifdef DEBUG + printf("openbox_restack_window for 0x%lx\n", _window); +#endif + if (e.data.l[0] == 0) + openbox->screen(_screen)->raiseWindow(this); + else if (e.data.l[0] == 1) + openbox->screen(_screen)->lowerWindow(this); } } - #if defined(SHAPE) void Client::shapeHandler(const XShapeEvent &e) { @@ -1010,34 +1178,39 @@ void Client::shapeHandler(const XShapeEvent &e) } #endif - 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) +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; + w -= _base_size.width(); + h -= _base_size.height(); if (user) { + // for interactive resizing. have to move half an increment in each + // direction. + int mw = w % _size_inc.width(); // how far we are towards the next size inc + int mh = h % _size_inc.height(); + int aw = _size_inc.width() / 2; // amount to add + int ah = _size_inc.height() / 2; + // don't let us move into a new size increment + if (mw + aw >= _size_inc.width()) aw = _size_inc.width() - mw - 1; + if (mh + ah >= _size_inc.height()) ah = _size_inc.height() - mh - 1; + w += aw; + h += ah; + // if this is a user-requested resize, then check against min/max sizes // and aspect ratios // 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(); + if (w > _max_size.width()) w = _max_size.width(); + if (w < _min_size.width()) w = _min_size.width(); + if (h > _max_size.height()) h = _max_size.height(); + if (h < _min_size.height()) h = _min_size.height(); // adjust the height ot match the width for the aspect ratios if (_min_ratio) @@ -1047,21 +1220,21 @@ void Client::internal_resize(Corner anchor, int w, int h, bool user, } // keep to the increments - w /= _size_inc.x(); - h /= _size_inc.y(); + w /= _size_inc.width(); + h /= _size_inc.height(); // you cannot resize to nothing if (w < 1) w = 1; if (h < 1) h = 1; // store the logical size - _logical_size.setPoint(w, h); + _logical_size = otk::Size(w, h); - w *= _size_inc.x(); - h *= _size_inc.y(); + w *= _size_inc.width(); + h *= _size_inc.height(); - w += _base_size.x(); - h += _base_size.y(); + w += _base_size.width(); + h += _base_size.height(); if (x == INT_MIN || y == INT_MIN) { x = _area.x(); @@ -1082,7 +1255,7 @@ void Client::internal_resize(Corner anchor, int w, int h, bool user, } } - _area.setSize(w, h); + _area = otk::Rect(_area.position(), otk::Size(w, h)); XResizeWindow(**otk::display, _window, w, h); @@ -1091,17 +1264,41 @@ void Client::internal_resize(Corner anchor, int w, int h, bool user, internal_move(x, y); } +const Icon *Client::icon(const otk::Size &s) const +{ + unsigned long req = s.width() * s.height(); + // si is the smallest image >= req + // li is the largest image < req + unsigned long smallest = 0xffffffff, largest = 0, si = 0, li = 0; + + assert(_nicons > 0); // there should always be a default.. + for (int i = 0; i < _nicons; ++i) { + unsigned long size = _icons[i].w * _icons[i].h; + if (size < smallest && size >= req) { + smallest = size; + si = i; + } + if (size > largest && size <= req) { + largest = size; + li = i; + } + } + if (largest == 0) // didnt find one smaller than the requested size + return &_icons[si]; + return &_icons[li]; +} -void Client::move(int x, int y) +void Client::move(int x, int y, bool final) { if (!(_functions & Func_Move)) return; - internal_move(x, y); + frame->frameGravity(x, y); // get the client's position based on x,y for the + // frame + internal_move(x, y, final); } - -void Client::internal_move(int x, int y) +void Client::internal_move(int x, int y, bool final) { - _area.setPos(x, y); + _area = otk::Rect(otk::Point(x, y), _area.size()); // move the frame to be in the requested position if (frame) { // this can be called while mapping, before frame exists @@ -1109,24 +1306,33 @@ void Client::internal_move(int x, int y) // 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); + if (final) { + 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 Client::close() { XEvent ce; @@ -1152,7 +1358,6 @@ void Client::close() XSendEvent(**otk::display, _window, false, NoEventMask, &ce); } - void Client::changeState() { unsigned long state[2]; @@ -1160,7 +1365,7 @@ void Client::changeState() state[1] = None; otk::Property::set(_window, otk::Property::atoms.wm_state, otk::Property::atoms.wm_state, state, 2); - + Atom netstate[10]; int num = 0; if (_modal) @@ -1192,7 +1397,6 @@ void Client::changeState() frame->adjustState(); } - void Client::changeAllowedActions(void) { Atom actions[9]; @@ -1219,8 +1423,37 @@ void Client::changeAllowedActions(void) otk::Property::set(_window, otk::Property::atoms.net_wm_allowed_actions, otk::Property::atoms.atom, actions, num); + + // make sure the window isn't breaking any rules now + + if (!(_functions & Func_Shade) && _shaded) + if (frame) shade(false); + else _shaded = false; + if (!(_functions & Func_Iconify) && _iconic) + if (frame) setDesktop(openbox->screen(_screen)->desktop()); + else _iconic = false; + if (!(_functions & Func_Fullscreen) && _fullscreen) + if (frame) fullscreen(false); + else _fullscreen = false; + if (!(_functions & Func_Maximize) && (_max_horz || _max_vert)) + if (frame) maximize(false, 0); + else _max_vert = _max_horz = false; } +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() { @@ -1228,11 +1461,11 @@ void Client::applyStartupState() if (_iconic) { _iconic = false; - setDesktop(ICONIC_DESKTOP); + iconify(true); } if (_fullscreen) { _fullscreen = false; - fullscreen(true); + fullscreen(true, false); } if (_shaded) { _shaded = false; @@ -1241,8 +1474,16 @@ void Client::applyStartupState() if (_urgent) fireUrgent(); - if (_max_vert); // XXX: incomplete - if (_max_horz); // XXX: incomplete + 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 @@ -1251,7 +1492,6 @@ void Client::applyStartupState() if (_below); // nothing to do for this } - void Client::fireUrgent() { // call the python UrgentWindow callbacks @@ -1259,7 +1499,6 @@ void Client::fireUrgent() openbox->bindings()->fireEvent(&data); } - void Client::shade(bool shade) { if (!(_functions & Func_Shade) || // can't @@ -1273,13 +1512,116 @@ void Client::shade(bool shade) frame->adjustSize(); } +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(_desktop); + int x = frame->area().x(), y = frame->area().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); -void Client::fullscreen(bool fs) + 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) { static FunctionFlags saved_func; static DecorationFlags saved_decor; - static otk::Rect saved_area; - static otk::Point saved_logical_size; if (!(_functions & Func_Fullscreen) || // can't _fullscreen == fs) return; // already done @@ -1287,6 +1629,8 @@ void Client::fullscreen(bool fs) _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; @@ -1294,25 +1638,52 @@ void Client::fullscreen(bool fs) // save the decorations and remove them saved_decor = _decorations; _decorations = 0; - // save the area and adjust it (we don't call internal resize here for - // constraints on the size, etc, we just make it fullscreen). - saved_area = _area; + 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); - _area.setRect(0, 0, info->width(), info->height()); - saved_logical_size = _logical_size; - _logical_size.setPoint((info->width() - _base_size.x()) / _size_inc.x(), - (info->height() - _base_size.y()) / _size_inc.y()); + x = 0; + y = 0; + w = info->size().width(); + h = info->size().height(); } else { _functions = saved_func; _decorations = saved_decor; - _area = saved_area; - _logical_size = saved_logical_size; + + 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(_desktop); + 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 - - frame->adjustSize(); // drop/replace the decor's and resize - frame->adjustPosition(); // get (back) in position! + + // 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); @@ -1321,14 +1692,78 @@ void Client::fullscreen(bool fs) if (fs) focus(); } +void Client::iconify(bool iconic, bool curdesk) +{ + if (_iconic == iconic) return; // nothing to do + +#ifdef DEBUG + printf("%sconifying window: 0x%lx\n", (iconic ? "I" : "Uni"), _window); +#endif + + _iconic = iconic; + + 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 { + if (curdesk) + setDesktop(openbox->screen(_screen)->desktop()); + _wmstate = NormalState; + XMapWindow(**otk::display, _window); + } + changeState(); + showhide(); + openbox->screen(_screen)->updateStruts(); +} + +void Client::disableDecorations(DecorationFlags flags) +{ + _disabled_decorations = flags; + setupDecorAndFunctions(); +} + +void Client::installColormap(bool install) const +{ + XWindowAttributes wa; + if (XGetWindowAttributes(**otk::display, _window, &wa)) { + if (install) + XInstallColormap(**otk::display, wa.colormap); + else + XUninstallColormap(**otk::display, wa.colormap); + } +} + +Client *Client::searchModalTree(Client *node, Client *skip) +{ + List::const_iterator it, end = node->_transients.end(); + Client *ret; + + for (it = node->_transients.begin(); it != end; ++it) { + if (*it == skip) continue; // circular? + if ((ret = searchModalTree(*it, skip))) return ret; // got one + if ((*it)->_modal) return *it; // got one + } + return 0; +} + +Client *Client::findModalChild() +{ + return searchModalTree(this, this); +} + bool Client::focus() { + // if we have a modal child, then focus it, not us + Client *c = findModalChild(); + if (c) return c->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; + if (!(frame->visible() && (_can_focus || _focus_notify))) return false; // 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 @@ -1373,8 +1808,6 @@ bool Client::focus() void Client::unfocus() const { - if (!_focused) return; - assert(openbox->focusedClient() == this); openbox->setFocusedClient(0); } @@ -1388,8 +1821,10 @@ void Client::focusHandler(const XFocusChangeEvent &e) otk::EventHandler::focusHandler(e); - frame->focus(); _focused = true; + frame->adjustFocus(); + + calcLayer(); // focus state can affect the stacking layer openbox->setFocusedClient(this); } @@ -1403,21 +1838,45 @@ void Client::unfocusHandler(const XFocusChangeEvent &e) otk::EventHandler::unfocusHandler(e); - frame->unfocus(); _focused = false; + frame->adjustFocus(); + + calcLayer(); // focus state can affect the stacking layer if (openbox->focusedClient() == this) openbox->setFocusedClient(0); } -void Client::configureRequestHandler(const XConfigureRequestEvent &e) +void Client::configureRequestHandler(const XConfigureRequestEvent &ec) { #ifdef DEBUG - printf("ConfigureRequest for 0x%lx\n", e.window); + printf("ConfigureRequest for 0x%lx\n", ec.window); #endif // DEBUG - otk::EventHandler::configureRequestHandler(e); + otk::EventHandler::configureRequestHandler(ec); + + // compress these + XConfigureRequestEvent e = ec; + XEvent ev; + while (XCheckTypedWindowEvent(**otk::display, window(), ConfigureRequest, + &ev)) { + // XXX if this causes bad things.. we can compress config req's with the + // same mask. + e.value_mask |= ev.xconfigurerequest.value_mask; + if (ev.xconfigurerequest.value_mask & CWX) + e.x = ev.xconfigurerequest.x; + if (ev.xconfigurerequest.value_mask & CWY) + e.y = ev.xconfigurerequest.y; + if (ev.xconfigurerequest.value_mask & CWWidth) + e.width = ev.xconfigurerequest.width; + if (ev.xconfigurerequest.value_mask & CWHeight) + e.height = ev.xconfigurerequest.height; + if (ev.xconfigurerequest.value_mask & CWBorderWidth) + e.border_width = ev.xconfigurerequest.border_width; + if (ev.xconfigurerequest.value_mask & CWStackMode) + e.detail = ev.xconfigurerequest.detail; + } // if we are iconic (or shaded (fvwm does this)) ignore the event if (_iconic || _shaded) return; @@ -1548,7 +2007,7 @@ void Client::mapRequestHandler(const XMapRequestEvent &e) 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()); + iconify(false); // XXX: should we focus/raise the window? (basically a net_wm_active_window) }