_positioned = false;
// nothing is disabled unless specified
_disabled_decorations = 0;
+ // no modal children until they set themselves
+ _modal_child = 0;
getArea();
getDesktop();
updateTransientFor();
- getType();
getMwmHints();
+ getType(); // this can change the mwmhints for special cases
getState();
getShaped();
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
_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
_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
}
// 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
}
}
+ // 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)
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) {
_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::display, _window, &size, &ret)) {
_positioned = (size.flags & (PPosition|USPosition));
// 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->rect().x(), y = frame->rect().y();
frame->frameGravity(x, y);
_area.setPos(x, y);
}
// 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
- // XXX: change decor status?
+ if (m)
+ setModal(true);
}
}
}
+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 Client::setState(StateAction 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 == 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
+ modal = true;
} 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) {
} else { // action == 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) {
- 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) {
}
}
}
+ 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);
+ fullscreen(fsstate, true);
if (shadestate != _shaded)
shade(shadestate);
calcLayer();
+ changeState(); // change the hint to relect these changes
}
// 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:
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);
}
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
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);
}
event.xconfigure.display = **otk::display;
event.xconfigure.event = _window;
event.xconfigure.window = _window;
- event.xconfigure.x = x;
- event.xconfigure.y = y;
+
+ // 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->window();
+ 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
}
}
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)
}
+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);
+ fullscreen(true, false);
}
if (_shaded) {
_shaded = false;
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
}
-void Client::fullscreen(bool fs)
+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)
{
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
_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;
// 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->width();
+ h = info->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();
+ 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);
}
+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;
projects / chaz / openbox / blobdiff