_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();
}
// clean up parents reference to this
+ if (_modal)
+ setModal(false);
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
}
_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) {
+ 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) {
maxv = true;
} else if (state == otk::Property::atoms.net_wm_state_maximized_horz) {
if (_max_horz) continue;
maxh = true;
- // XXX: resize the window etc
} 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) {
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)
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);
}
}
+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 (dir == 2 && !_max_vert) return;
}
- int g = _gravity;
-
const otk::Rect &a = openbox->screen(_screen)->area();
- int x = _area.x(), y = _area.y(), w = _area.width(), h = _area.height();
+ int x = frame->rect().x(), y = frame->rect().y(),
+ w = _area.width(), h = _area.height();
if (max) {
- // when maximizing, put the client where we want, NOT the frame!
- _gravity = StaticGravity;
- // adjust our idea of position based on StaticGravity, so we stay put
- // unless asked
- frame->frameGravity(x, y);
-
if (savearea) {
long dimensions[4];
long *readdim;
w = a.width();
}
if (dir == 0 || dir == 2) { // vert
- y = a.y() + frame->size().top;
+ y = a.y();
h = a.height() - frame->size().top - frame->size().bottom;
}
-
- printf("dir %d x %d y %d w %d h %d\n", dir, x, y, w, h);
} else {
long *dimensions;
long unsigned n = 4;
h = a.height() / 2;
}
}
- otk::Property::erase(_window, otk::Property::atoms.openbox_premax);
}
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);
- _gravity = g;
- if (max) {
- // because of my little gravity trick in here, we have to set the position
- // of the client to what it really is
- int x, y;
- frame->frameGravity(x, y);
- _area.setPos(x, y);
- }
}
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;