X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclient.cc;h=9e3cdae195cb2dac77f9476b5c2dbd7303226813;hb=1e47e17d08d72d181edc2bde598ad246055655ad;hp=3175b3ba75658ebdfab932ff42cc5e66556fac34;hpb=939e7887ceaee9ec97428ad79d8424bde6e479dd;p=chaz%2Fopenbox diff --git a/src/client.cc b/src/client.cc index 3175b3ba..9e3cdae1 100644 --- a/src/client.cc +++ b/src/client.cc @@ -19,6 +19,7 @@ extern "C" { #define _(str) gettext(str) } +#include // for memcpy #include #include #include @@ -46,6 +47,7 @@ Client::Client(int screen, Window window) _disabled_decorations = 0; _group = None; _desktop = 0; + _nicons = 0; getArea(); getDesktop(); @@ -74,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; @@ -89,6 +93,11 @@ Client::Client(int screen, Window window) 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; @@ -158,7 +167,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 @@ -207,7 +216,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; @@ -363,7 +372,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)) { @@ -394,7 +403,6 @@ void Client::getState() } } - void Client::getShaped() { _shaped = false; @@ -413,12 +421,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; @@ -440,7 +476,6 @@ void Client::calcLayer() { } } - void Client::updateProtocols() { Atom *proto; @@ -463,7 +498,6 @@ void Client::updateProtocols() } } - void Client::updateNormalHints() { XSizeHints size; @@ -514,7 +548,6 @@ void Client::updateNormalHints() } } - void Client::updateWMHints(bool initstate) { XWMHints *hints; @@ -543,13 +576,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 @@ -559,7 +603,6 @@ void Client::updateWMHints(bool initstate) } } - void Client::updateTitle() { _title = ""; @@ -579,7 +622,6 @@ void Client::updateTitle() frame->adjustTitle(); } - void Client::updateIconTitle() { _icon_title = ""; @@ -596,7 +638,6 @@ void Client::updateIconTitle() _icon_title = _("Unnamed Window"); } - void Client::updateClass() { // set the defaults @@ -619,7 +660,6 @@ void Client::updateClass() } } - void Client::updateStrut() { unsigned long num = 4; @@ -643,7 +683,6 @@ void Client::updateStrut() delete [] data; } - void Client::updateTransientFor() { Window t = 0; @@ -676,6 +715,73 @@ void Client::updateTransientFor() } } +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) { @@ -720,9 +826,12 @@ void Client::propertyHandler(const XPropertyEvent &e) } 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 @@ -737,7 +846,6 @@ void Client::setWMState(long state) } } - void Client::setDesktop(unsigned int target) { if (target == _desktop) return; @@ -758,7 +866,6 @@ void Client::setDesktop(unsigned int target) openbox->screen(_screen)->updateStruts(); } - void Client::showhide() { bool show; @@ -774,16 +881,16 @@ void Client::showhide() else frame->hide(); } - -void Client::setState(StateAction action, long data1, long data2) +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) { @@ -792,28 +899,37 @@ 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; @@ -838,7 +954,7 @@ 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; @@ -888,7 +1004,6 @@ void Client::setState(StateAction action, long data1, long data2) 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 @@ -952,7 +1067,6 @@ void Client::toggleClientBorder(bool addborder) XSetWindowBorderWidth(**otk::display, _window, 0); } - void Client::clientMessageHandler(const XClientMessageEvent &e) { otk::EventHandler::clientMessageHandler(e); @@ -1004,7 +1118,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); @@ -1036,10 +1150,17 @@ void Client::clientMessageHandler(const XClientMessageEvent &e) 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) { @@ -1052,14 +1173,12 @@ 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) { @@ -1140,17 +1259,39 @@ void Client::internal_resize(Corner anchor, int w, int h, 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; frame->frameGravity(x, y); // get the client's position based on x,y for the // frame - internal_move(x, y); + internal_move(x, y, final); } - -void Client::internal_move(int x, int y) +void Client::internal_move(int x, int y, bool final) { _area = otk::Rect(otk::Point(x, y), _area.size()); @@ -1160,32 +1301,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; + 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; + // 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); + 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); + 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; @@ -1211,7 +1353,6 @@ void Client::close() XSendEvent(**otk::display, _window, false, NoEventMask, &ce); } - void Client::changeState() { unsigned long state[2]; @@ -1251,7 +1392,6 @@ void Client::changeState() frame->adjustState(); } - void Client::changeAllowedActions(void) { Atom actions[9]; @@ -1295,7 +1435,6 @@ void Client::changeAllowedActions(void) else _max_vert = _max_horz = false; } - void Client::remaximize() { int dir; @@ -1311,7 +1450,6 @@ void Client::remaximize() maximize(true, dir, false); } - void Client::applyStartupState() { // these are in a carefully crafted order.. @@ -1349,7 +1487,6 @@ void Client::applyStartupState() if (_below); // nothing to do for this } - void Client::fireUrgent() { // call the python UrgentWindow callbacks @@ -1357,7 +1494,6 @@ void Client::fireUrgent() openbox->bindings()->fireEvent(&data); } - void Client::shade(bool shade) { if (!(_functions & Func_Shade) || // can't @@ -1371,7 +1507,6 @@ void Client::shade(bool shade) frame->adjustSize(); } - void Client::maximize(bool max, int dir, bool savearea) { assert(dir == 0 || dir == 1 || dir == 2); @@ -1408,7 +1543,7 @@ void Client::maximize(bool max, int dir, bool savearea) if (otk::Property::get(_window, otk::Property::atoms.openbox_premax, otk::Property::atoms.cardinal, &n, (long unsigned**) &readdim)) { - if (n >= 4) { + if (n == 4) { if (_max_horz) { dimensions[0] = readdim[0]; dimensions[2] = readdim[2]; @@ -1440,7 +1575,7 @@ void Client::maximize(bool max, int dir, bool savearea) if (otk::Property::get(_window, otk::Property::atoms.openbox_premax, otk::Property::atoms.cardinal, &n, (long unsigned**) &dimensions)) { - if (n >= 4) { + if (n == 4) { if (dir == 0 || dir == 1) { // horz x = (signed int)dimensions[0]; w = (signed int)dimensions[2]; @@ -1478,7 +1613,6 @@ void Client::maximize(bool max, int dir, bool savearea) internal_resize(TopLeft, w, h, true, x, y); } - void Client::fullscreen(bool fs, bool savearea) { static FunctionFlags saved_func; @@ -1524,7 +1658,7 @@ void Client::fullscreen(bool fs, bool savearea) if (otk::Property::get(_window, otk::Property::atoms.openbox_premax, otk::Property::atoms.cardinal, &n, (long unsigned**) &dimensions)) { - if (n >= 4) { + if (n == 4) { x = dimensions[0]; y = dimensions[1]; w = dimensions[2]; @@ -1553,7 +1687,6 @@ void Client::fullscreen(bool fs, bool savearea) if (fs) focus(); } - void Client::iconify(bool iconic, bool curdesk) { if (_iconic == iconic) return; // nothing to do @@ -1581,14 +1714,12 @@ void Client::iconify(bool iconic, bool curdesk) openbox->screen(_screen)->updateStruts(); } - void Client::disableDecorations(DecorationFlags flags) { _disabled_decorations = flags; setupDecorAndFunctions(); } - void Client::installColormap(bool install) const { XWindowAttributes wa; @@ -1600,9 +1731,6 @@ void Client::installColormap(bool install) const } } - -// recursively searches the client 'tree' for a modal client, always skips the -// topmost node (the window you're starting with) Client *Client::searchModalTree(Client *node, Client *skip) { List::const_iterator it, end = node->_transients.end(); @@ -1632,8 +1760,6 @@ bool Client::focus() // visible on the screen if (!(frame->visible() && (_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) @@ -1677,8 +1803,6 @@ bool Client::focus() void Client::unfocus() const { - if (!_focused) return; - assert(openbox->focusedClient() == this); openbox->setFocusedClient(0); } @@ -1695,6 +1819,8 @@ void Client::focusHandler(const XFocusChangeEvent &e) _focused = true; frame->adjustFocus(); + calcLayer(); // focus state can affect the stacking layer + openbox->setFocusedClient(this); } @@ -1710,6 +1836,8 @@ void Client::unfocusHandler(const XFocusChangeEvent &e) _focused = false; frame->adjustFocus(); + calcLayer(); // focus state can affect the stacking layer + if (openbox->focusedClient() == this) openbox->setFocusedClient(0); }