// -*- 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"
#define _(str) gettext(str)
}
+#include <cstring> // for memcpy
#include <climits>
#include <cassert>
#include <algorithm>
_urgent = false;
_positioned = false;
_disabled_decorations = 0;
- _modal_child = 0;
_group = None;
_desktop = 0;
+ _nicons = 0;
getArea();
getDesktop();
updateIconTitle();
updateClass();
updateStrut();
-
+ updateIcons();
+ updateKwmIcon();
+
// this makes sure that these windows appear on all desktops
if (/*_type == Type_Dock ||*/ _type == Type_Desktop)
_desktop = 0xffffffff;
// 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;
{
// 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
_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
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;
_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)) {
}
}
-
void Client::getShaped()
{
_shaped = false;
#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;
}
}
-
void Client::updateProtocols()
{
Atom *proto;
}
}
-
void Client::updateNormalHints()
{
XSizeHints size;
}
}
-
void Client::updateWMHints(bool initstate)
{
XWMHints *hints;
} 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
}
}
-
void Client::updateTitle()
{
_title = "";
frame->adjustTitle();
}
-
void Client::updateIconTitle()
{
_icon_title = "";
_icon_title = _("Unnamed Window");
}
-
void Client::updateClass()
{
// set the defaults
}
}
-
void Client::updateStrut()
{
unsigned long num = 4;
// 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();
+ openbox->screen(_screen)->updateStruts();
}
delete [] data;
}
-
void Client::updateTransientFor()
{
Window t = 0;
// 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::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)
{
}
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();
}
-
-Client *Client::findModalChild(Client *skip) const
+void Client::showhide()
{
- 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;
-}
+ bool show;
+ Screen *s = openbox->screen(_screen);
+ if (_iconic) show = false;
+ else if (!(_desktop == s->desktop() ||
+ _desktop == 0xffffffff)) show = false;
+ else if (normal() && s->showingDesktop()) show = false;
+ else show = true;
-void Client::setModal(bool modal)
-{
- if (modal == _modal) return;
-
- if (modal) {
- Client *c = this;
- while (c->_transient_for) {
- c = c->_transient_for;
- if (c == this) break; // circular?
- 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
- assert(replacement != this);
-
- c = this;
- while (c->_transient_for) {
- c = c->_transient_for;
- if (c == this) break; // circular?
- if (c->_modal_child != this) break; // has a different modal child
- if (c == replacement) break; // found the replacement itself
- c->_modal_child = replacement;
- }
- }
- _modal = modal;
+ if (show) frame->show();
+ 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;
- bool modal = _modal;
- 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) {
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;
+ _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) {
_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;
+ _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) {
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)
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
XSetWindowBorderWidth(**otk::display, _window, 0);
}
-
void Client::clientMessageHandler(const XClientMessageEvent &e)
{
otk::EventHandler::clientMessageHandler(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);
#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);
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)
- 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 (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)
{
}
#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)
{
// and aspect ratios
// smaller than min size or bigger than max size?
+ if (w > _max_size.width()) w = _max_size.width();
if (w < _min_size.width()) w = _min_size.width();
- else if (w > _max_size.width()) w = _max_size.width();
+ if (h > _max_size.height()) h = _max_size.height();
if (h < _min_size.height()) h = _min_size.height();
- else if (h > _max_size.height()) h = _max_size.height();
// adjust the height ot match the width for the aspect ratios
if (_min_ratio)
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());
// 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;
XSendEvent(**otk::display, _window, false, NoEventMask, &ce);
}
-
void Client::changeState()
{
unsigned long state[2];
frame->adjustState();
}
-
void Client::changeAllowedActions(void)
{
Atom actions[9];
else _max_vert = _max_horz = false;
}
-
void Client::remaximize()
{
int dir;
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);
+ iconify(true);
}
if (_fullscreen) {
_fullscreen = false;
if (_below); // nothing to do for this
}
-
void Client::fireUrgent()
{
// call the python UrgentWindow callbacks
openbox->bindings()->fireEvent(&data);
}
-
void Client::shade(bool shade)
{
if (!(_functions & Func_Shade) || // can't
frame->adjustSize();
}
-
void Client::maximize(bool max, int dir, bool savearea)
{
assert(dir == 0 || dir == 1 || dir == 2);
if (dir == 2 && !_max_vert) return;
}
- const otk::Rect &a = openbox->screen(_screen)->area();
+ 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 (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];
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];
internal_resize(TopLeft, w, h, true, x, y);
}
-
void Client::fullscreen(bool fs, bool savearea)
{
static FunctionFlags saved_func;
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];
delete dimensions;
} else {
// pick some fallbacks...
- const otk::Rect &a = openbox->screen(_screen)->area();
+ 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;
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)
{
setupDecorAndFunctions();
}
-
void Client::installColormap(bool install) const
{
XWindowAttributes wa;
}
}
+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
- if (_modal_child)
- return _modal_child->focus();
+ 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->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)
void Client::unfocus() const
{
- if (!_focused) return;
-
assert(openbox->focusedClient() == this);
openbox->setFocusedClient(0);
}
_focused = true;
frame->adjustFocus();
+ calcLayer(); // focus state can affect the stacking layer
+
openbox->setFocusedClient(this);
}
_focused = false;
frame->adjustFocus();
+ calcLayer(); // focus state can affect the stacking layer
+
if (openbox->focusedClient() == this)
openbox->setFocusedClient(0);
}
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)
}
projects / chaz / openbox / blobdiff