_decorations = _functions = 0;
// start unfocused
_focused = false;
+ // not a transient by default of course
+ _transient_for = 0;
getArea();
getDesktop();
+ updateTransientFor();
getType();
+ // XXX: changeAllowedActions();
+
// set the decorations and functions
+ _decorations = Decor_Titlebar | Decor_Handle | Decor_Border |
+ Decor_Iconify | Decor_Maximize;
+ _functions = Func_Resize | Func_Move | Func_Iconify | Func_Maximize;
switch (_type) {
case Type_Normal:
// normal windows retain all of the possible decorations and
// functionality
- _decorations = Decor_Titlebar | Decor_Handle | Decor_Border |
- Decor_Iconify | Decor_Maximize;
- _functions = Func_Resize | Func_Move | Func_Iconify | Func_Maximize;
case Type_Dialog:
// dialogs cannot be maximized
updateProtocols();
updateNormalHints();
updateWMHints();
- // XXX: updateTransientFor();
updateTitle();
updateIconTitle();
updateClass();
+ updateStrut();
calcLayer();
+ changeState();
}
* the window type hint was not set, which means we either classify ourself
* as a normal window or a dialog, depending on if we are a transient.
*/
- // XXX: make this code work!
- //if (isTransient())
- // _type = Type_Dialog;
- //else
+ if (_transient_for)
+ _type = Type_Dialog;
+ else
_type = Type_Normal;
}
}
if (state[i] == property->atom(otk::OBProperty::net_wm_state_modal))
_modal = true;
else if (state[i] ==
- property->atom(otk::OBProperty::net_wm_state_shaded))
+ property->atom(otk::OBProperty::net_wm_state_shaded)) {
_shaded = true;
- else if (state[i] ==
+ _wmstate = IconicState;
+ } else if (state[i] ==
property->atom(otk::OBProperty::net_wm_state_skip_taskbar))
_skip_taskbar = true;
else if (state[i] ==
void OBClient::calcLayer() {
- if (_iconic) _layer = OBScreen::Layer_Icon;
- else if (_type == Type_Desktop) _layer = OBScreen::Layer_Desktop;
- else if (_type == Type_Dock) _layer = OBScreen::Layer_Top;
- else if (_fullscreen) _layer = OBScreen::Layer_Fullscreen;
- else if (_above) _layer = OBScreen::Layer_Above;
- else if (_below) _layer = OBScreen::Layer_Below;
- else _layer = OBScreen::Layer_Normal;
+ if (_iconic) _layer = Layer_Icon;
+ else if (_fullscreen) _layer = Layer_Fullscreen;
+ else if (_type == Type_Desktop) _layer = Layer_Desktop;
+ else if (_type == Type_Dock) {
+ if (!_below) _layer = Layer_Top;
+ else _layer = Layer_Normal;
+ }
+ else if (_above) _layer = Layer_Above;
+ else if (_below) _layer = Layer_Below;
+ else _layer = Layer_Normal;
}
if (proto[i] == property->atom(otk::OBProperty::wm_delete_window)) {
_decorations |= Decor_Close;
_functions |= Func_Close;
- // XXX: update the decor?
+ if (frame)
+ frame->adjustSize(); // update the decorations
} else if (proto[i] == property->atom(otk::OBProperty::wm_take_focus))
// if this protocol is requested, then the window will be notified
// by the window manager whenever it receives focus
const otk::OBProperty *property = Openbox::instance->property();
// set the defaults
- _app_name = _app_class = "";
+ _app_name = _app_class = _role = "";
otk::OBProperty::StringVect v;
unsigned long num = 2;
- if (! property->get(_window, otk::OBProperty::wm_class,
- otk::OBProperty::ascii, &num, &v))
+ if (property->get(_window, otk::OBProperty::wm_class,
+ otk::OBProperty::ascii, &num, &v)) {
+ if (num > 0) _app_name = v[0];
+ if (num > 1) _app_class = v[1];
+ }
+
+ v.clear();
+ num = 1;
+ if (property->get(_window, otk::OBProperty::wm_window_role,
+ otk::OBProperty::ascii, &num, &v)) {
+ if (num > 0) _role = v[0];
+ }
+}
+
+
+void OBClient::updateStrut()
+{
+ unsigned long num = 4;
+ unsigned long *data;
+ if (!Openbox::instance->property()->get(_window,
+ otk::OBProperty::net_wm_strut,
+ otk::OBProperty::Atom_Cardinal,
+ &num, &data))
return;
- if (num > 0) _app_name = v[0];
- if (num > 1) _app_class = v[1];
+ if (num == 4) {
+ _strut.left = data[0];
+ _strut.right = data[1];
+ _strut.top = data[2];
+ _strut.bottom = data[3];
+
+ Openbox::instance->screen(_screen)->updateStrut();
+ }
+
+ delete [] data;
+}
+
+
+void OBClient::updateTransientFor()
+{
+ Window t = 0;
+ OBClient *c = 0;
+
+ if (XGetTransientForHint(otk::OBDisplay::display, _window, &t) &&
+ t != _window) { // cant be transient to itself!
+ c = Openbox::instance->findClient(t);
+ assert(c != this); // if this happens then we need to check for it
+
+ if (!c /*XXX: && _group*/) {
+ // not transient to a client, see if it is transient for a group
+ if (//t == _group->leader() ||
+ t == None ||
+ t == otk::OBDisplay::screenInfo(_screen)->rootWindow()) {
+ // window is a transient for its group!
+ // XXX: for now this is treated as non-transient.
+ // this needs to be fixed!
+ }
+ }
+ }
+
+ // if anything has changed...
+ if (c != _transient_for) {
+ 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?
+ }
}
updateNormalHints();
else if (e.atom == XA_WM_HINTS)
updateWMHints();
+ else if (e.atom == XA_WM_TRANSIENT_FOR)
+ updateTransientFor();
else if (e.atom == property->atom(otk::OBProperty::net_wm_name) ||
e.atom == property->atom(otk::OBProperty::wm_name))
updateTitle();
updateClass();
else if (e.atom == property->atom(otk::OBProperty::wm_protocols))
updateProtocols();
- // XXX: transient for hint
- // XXX: strut hint
+ else if (e.atom == property->atom(otk::OBProperty::net_wm_strut))
+ updateStrut();
}
{
if (state == _wmstate) return; // no change
- switch (state) {
+ _wmstate = state;
+ switch (_wmstate) {
case IconicState:
// XXX: cause it to iconify
break;
// XXX: cause it to uniconify
break;
}
- _wmstate = state;
}
void OBClient::setDesktop(long target)
{
- assert(target >= 0);
+ printf("Setting desktop %ld\n", target);
+ assert(target >= 0 || target == (signed)0xffffffff);
//assert(target == 0xffffffff || target < MAX);
-
- // XXX: move the window to the new desktop
+
+ // XXX: move the window to the new desktop (and set root property)
_desktop = target;
}
void OBClient::setState(StateAction action, long data1, long data2)
{
const otk::OBProperty *property = Openbox::instance->property();
+ bool restack = false, shadestate = _shaded;
if (!(action == State_Add || action == State_Remove ||
action == State_Toggle))
} else if (state ==
property->atom(otk::OBProperty::net_wm_state_shaded)) {
if (_shaded) continue;
- _shaded = true;
- // XXX: hide the client window
+ // shade when we're all thru here
+ shadestate = true;
} else if (state ==
property->atom(otk::OBProperty::net_wm_state_skip_taskbar)) {
_skip_taskbar = true;
property->atom(otk::OBProperty::net_wm_state_fullscreen)) {
if (_fullscreen) continue;
_fullscreen = true;
- // XXX: raise the window n shit
+ restack = false;
} else if (state ==
property->atom(otk::OBProperty::net_wm_state_above)) {
if (_above) continue;
_above = true;
- // XXX: raise the window n shit
+ restack = true;
} else if (state ==
property->atom(otk::OBProperty::net_wm_state_below)) {
if (_below) continue;
_below = true;
- // XXX: lower the window n shit
+ restack = true;
}
} else { // action == State_Remove
} else if (state ==
property->atom(otk::OBProperty::net_wm_state_shaded)) {
if (!_shaded) continue;
- _shaded = false;
- // XXX: show the client window
+ // unshade when we're all thru here
+ shadestate = false;
} else if (state ==
property->atom(otk::OBProperty::net_wm_state_skip_taskbar)) {
_skip_taskbar = false;
property->atom(otk::OBProperty::net_wm_state_fullscreen)) {
if (!_fullscreen) continue;
_fullscreen = false;
- // XXX: lower the window to its proper layer
+ restack = true;
} else if (state ==
property->atom(otk::OBProperty::net_wm_state_above)) {
if (!_above) continue;
_above = false;
- // XXX: lower the window to its proper layer
+ restack = true;
} else if (state ==
property->atom(otk::OBProperty::net_wm_state_below)) {
if (!_below) continue;
_below = false;
- // XXX: raise the window to its proper layer
+ restack = true;
}
}
}
- calcLayer();
- Openbox::instance->screen(_screen)->restack(true, this); // raise
+ if (shadestate != _shaded)
+ shade(shadestate);
+ if (restack) {
+ calcLayer();
+ Openbox::instance->screen(_screen)->restack(true, this); // raise
+ }
}
setDesktop(e.data.l[0]); // use the found event
else
setDesktop(e.data.l[0]); // use the original event
- }
- else if (e.message_type == property->atom(otk::OBProperty::net_wm_state))
+ } else if (e.message_type == property->atom(otk::OBProperty::net_wm_state)) {
// can't compress these
setState((StateAction)e.data.l[0], e.data.l[1], e.data.l[2]);
+ } else if (e.message_type ==
+ property->atom(otk::OBProperty::net_close_window)) {
+ close();
+ } else if (e.message_type ==
+ property->atom(otk::OBProperty::net_active_window)) {
+ focus();
+ Openbox::instance->screen(_screen)->restack(true, this); // raise
+ } else {
+ }
}
-#if defined(SHAPE) || defined(DOXYGEN_IGNORE)
+#if defined(SHAPE)
void OBClient::shapeHandler(const XShapeEvent &e)
{
otk::OtkEventHandler::shapeHandler(e);
_shaped = e.shaped;
+ frame->adjustShape();
}
#endif
-void OBClient::resize(Corner anchor, int w, int h)
+void OBClient::resize(Corner anchor, int w, int h, int x, int y)
{
w -= _base_size.x();
h -= _base_size.y();
w += _base_size.x();
h += _base_size.y();
- int x = _area.x(), y = _area.y();
- switch (anchor) {
- case TopLeft:
- break;
- case TopRight:
- x -= w - _area.width();
- break;
- case BottomLeft:
- y -= h - _area.height();
- break;
- case BottomRight:
- x -= w - _area.width();
- y -= h - _area.height();
- break;
+ if (x == INT_MIN || y == INT_MIN) {
+ x = _area.x();
+ y = _area.y();
+ switch (anchor) {
+ case TopLeft:
+ break;
+ case TopRight:
+ x -= w - _area.width();
+ break;
+ case BottomLeft:
+ y -= h - _area.height();
+ break;
+ case BottomRight:
+ x -= w - _area.width();
+ y -= h - _area.height();
+ break;
+ }
}
_area.setSize(w, h);
+
XResizeWindow(otk::OBDisplay::display, _window, w, h);
// resize the frame to match the request
void OBClient::move(int x, int y)
{
_area.setPos(x, y);
+
// move the frame to be in the requested position
frame->adjustPosition();
}
// XXX: itd be cool to do timeouts and shit here for killing the client's
// process off
+ // like... if the window is around after 5 seconds, then the close button
+ // turns a nice red, and if this function is called again, the client is
+ // explicitly killed.
ce.xclient.type = ClientMessage;
ce.xclient.message_type = property->atom(otk::OBProperty::wm_protocols);
}
+
+void OBClient::setStackLayer(int l)
+{
+ if (l == 0)
+ _above = _below = false; // normal
+ else if (l > 0) {
+ _above = true;
+ _below = false; // above
+ } else {
+ _above = false;
+ _below = true; // below
+ }
+ changeState();
+ calcLayer();
+ Openbox::instance->screen(_screen)->restack(true, this); // raise
+}
+
+
void OBClient::shade(bool shade)
{
if (shade == _shaded) return; // already done
bool OBClient::focus()
{
- if (!_can_focus || _focused) return false;
+ if (!(_can_focus || _focus_notify) || _focused) return false;
+
+ if (_can_focus)
+ XSetInputFocus(otk::OBDisplay::display, _window, RevertToNone, CurrentTime);
+
+ if (_focus_notify) {
+ XEvent ce;
+ const otk::OBProperty *property = Openbox::instance->property();
+
+ ce.xclient.type = ClientMessage;
+ ce.xclient.message_type = property->atom(otk::OBProperty::wm_protocols);
+ ce.xclient.display = otk::OBDisplay::display;
+ ce.xclient.window = _window;
+ ce.xclient.format = 32;
+ ce.xclient.data.l[0] = property->atom(otk::OBProperty::wm_take_focus);
+ ce.xclient.data.l[1] = Openbox::instance->lastTime();
+ ce.xclient.data.l[2] = 0l;
+ ce.xclient.data.l[3] = 0l;
+ ce.xclient.data.l[4] = 0l;
+ XSendEvent(otk::OBDisplay::display, _window, False, NoEventMask, &ce);
+ }
- XSetInputFocus(otk::OBDisplay::display, _window, RevertToNone, CurrentTime);
return true;
}
corner = TopLeft;
}
- resize(corner, w, h);
- }
-
- if (e.value_mask & (CWX | CWY)) {
+ // if moving AND resizing ...
+ if (e.value_mask & (CWX | CWY)) {
+ int x = (e.value_mask & CWX) ? e.x : _area.x();
+ int y = (e.value_mask & CWY) ? e.y : _area.y();
+ resize(corner, w, h, x, y);
+ } else // if JUST resizing...
+ resize(corner, w, h);
+ } else if (e.value_mask & (CWX | CWY)) { // if JUST moving...
int x = (e.value_mask & CWX) ? e.x : _area.x();
int y = (e.value_mask & CWY) ? e.y : _area.y();
move(x, y);
switch (e.detail) {
case Below:
case BottomIf:
- // XXX: lower the window
+ Openbox::instance->screen(_screen)->restack(false, this); // lower
break;
case Above:
case TopIf:
default:
- // XXX: raise the window
+ Openbox::instance->screen(_screen)->restack(true, this); // raise
break;
}
}
Openbox::instance->screen(_screen)->unmanageWindow(this);
}
+
+void OBClient::mapRequestHandler(const XMapRequestEvent &e)
+{
+ printf("\nMAP REQUEST\n\n");
+
+ otk::OtkEventHandler::mapRequestHandler(e);
+
+ if (_shaded)
+ shade(false);
+ // XXX: uniconify the window
+ focus();
+}
+
}
projects / chaz / openbox / blobdiff