// -*- 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"
#include "screen.hh"
#include "openbox.hh"
+#include "bindings.hh"
#include "otk/display.hh"
#include "otk/property.hh"
extern "C" {
#include <X11/Xlib.h>
#include <X11/Xutil.h>
-
-#include <assert.h>
+#include <X11/Xatom.h>
#include "gettext.h"
#define _(str) gettext(str)
}
+#include <cstring> // for memcpy
+#include <climits>
+#include <cassert>
+#include <algorithm>
+
namespace ob {
-OBClient::OBClient(int screen, Window window)
- : otk::OtkEventHandler(),
- OBWidget(OBWidget::Type_Client),
+Client::Client(int screen, Window window)
+ : otk::EventHandler(),
frame(0), _screen(screen), _window(window)
{
assert(screen >= 0);
// update EVERYTHING the first time!!
- // the state is kinda assumed to be normal. is this right? XXX
- _wmstate = NormalState; _iconic = false;
- // no default decors or functions, each has to be enabled
- _decorations = _functions = 0;
- // start unfocused
+ // defaults
+ _wmstate = NormalState;
_focused = false;
- // not a transient by default of course
_transient_for = 0;
- // pick a layer to start from
_layer = Layer_Normal;
+ _urgent = false;
+ _positioned = false;
+ _disabled_decorations = 0;
+ _group = None;
+ _desktop = 0;
+ _nicons = 0;
getArea();
getDesktop();
+ getState(); // do this before updateTransientFor! (for _modal)
+ getShaped();
updateTransientFor();
- getType();
getMwmHints();
+ getType(); // this can change the mwmhints for special cases
+
+ updateProtocols();
+
+ 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();
- getState();
- getShaped();
-
- updateProtocols();
- updateNormalHints();
- updateWMHints();
+ // 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
+ updateWMHints(openbox->state() != Openbox::State_Starting);
updateTitle();
updateIconTitle();
updateClass();
updateStrut();
-
+ updateIcons();
+ updateKwmIcon();
+
+ // this makes sure that these windows appear on all desktops
+ if (/*_type == Type_Dock ||*/ _type == Type_Desktop)
+ _desktop = 0xffffffff;
+
+ // set the desktop hint, to make sure that it always exists, and to reflect
+ // any changes we've made here
+ otk::Property::set(_window, otk::Property::atoms.net_wm_desktop,
+ otk::Property::atoms.cardinal, (unsigned)_desktop);
changeState();
}
-OBClient::~OBClient()
+Client::~Client()
{
- const otk::OBProperty *property = Openbox::instance->property();
+ 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;
+ _transients.pop_front();
+ }
// clean up parents reference to this
if (_transient_for)
_transient_for->_transients.remove(this); // remove from old parent
- if (Openbox::instance->state() != Openbox::State_Exiting) {
+ if (openbox->state() != Openbox::State_Exiting) {
// these values should not be persisted across a window unmapping/mapping
- property->erase(_window, otk::OBProperty::net_wm_desktop);
- property->erase(_window, otk::OBProperty::net_wm_state);
+ otk::Property::erase(_window, otk::Property::atoms.net_wm_desktop);
+ otk::Property::erase(_window, otk::Property::atoms.net_wm_state);
+ } else {
+ // if we're left in an iconic state, the client wont be mapped. this is
+ // bad, since we will no longer be managing the window on restart
+ if (_iconic)
+ XMapWindow(**otk::display, _window);
}
}
-void OBClient::getDesktop()
+bool Client::validate() const
{
- const otk::OBProperty *property = Openbox::instance->property();
+ XSync(**otk::display, false); // get all events on the server
- // defaults to the current desktop
- _desktop = Openbox::instance->screen(_screen)->desktop();
-
- if (!property->get(_window, otk::OBProperty::net_wm_desktop,
- otk::OBProperty::Atom_Cardinal,
- (long unsigned*)&_desktop)) {
- // make sure the hint exists
- Openbox::instance->property()->set(_window,
- otk::OBProperty::net_wm_desktop,
- otk::OBProperty::Atom_Cardinal,
- (unsigned)_desktop);
+ XEvent e;
+ if (XCheckTypedWindowEvent(**otk::display, _window, DestroyNotify, &e) ||
+ XCheckTypedWindowEvent(**otk::display, _window, UnmapNotify, &e)) {
+ XPutBackEvent(**otk::display, &e);
+ return false;
}
+
+ return true;
}
-void OBClient::getType()
+void Client::getGravity()
{
- const otk::OBProperty *property = Openbox::instance->property();
+ XWindowAttributes wattrib;
+ Status ret;
+
+ ret = XGetWindowAttributes(**otk::display, _window, &wattrib);
+ assert(ret != BadWindow);
+ _gravity = wattrib.win_gravity;
+}
+
+
+void Client::getDesktop()
+{
+ // 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*)&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
+ }
+}
+
+void Client::getType()
+{
_type = (WindowType) -1;
unsigned long *val;
- unsigned long num = (unsigned) -1;
- if (property->get(_window, otk::OBProperty::net_wm_window_type,
- otk::OBProperty::Atom_Atom,
- &num, &val)) {
+ 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
for (unsigned long i = 0; i < num; ++i) {
- if (val[i] ==
- property->atom(otk::OBProperty::net_wm_window_type_desktop))
+ if (val[i] == otk::Property::atoms.net_wm_window_type_desktop)
_type = Type_Desktop;
- else if (val[i] ==
- property->atom(otk::OBProperty::net_wm_window_type_dock))
+ else if (val[i] == otk::Property::atoms.net_wm_window_type_dock)
_type = Type_Dock;
- else if (val[i] ==
- property->atom(otk::OBProperty::net_wm_window_type_toolbar))
+ else if (val[i] == otk::Property::atoms.net_wm_window_type_toolbar)
_type = Type_Toolbar;
- else if (val[i] ==
- property->atom(otk::OBProperty::net_wm_window_type_menu))
+ else if (val[i] == otk::Property::atoms.net_wm_window_type_menu)
_type = Type_Menu;
- else if (val[i] ==
- property->atom(otk::OBProperty::net_wm_window_type_utility))
+ else if (val[i] == otk::Property::atoms.net_wm_window_type_utility)
_type = Type_Utility;
- else if (val[i] ==
- property->atom(otk::OBProperty::net_wm_window_type_splash))
+ else if (val[i] == otk::Property::atoms.net_wm_window_type_splash)
_type = Type_Splash;
- else if (val[i] ==
- property->atom(otk::OBProperty::net_wm_window_type_dialog))
+ else if (val[i] == otk::Property::atoms.net_wm_window_type_dialog)
_type = Type_Dialog;
- else if (val[i] ==
- property->atom(otk::OBProperty::net_wm_window_type_normal))
+ else if (val[i] == otk::Property::atoms.net_wm_window_type_normal)
_type = Type_Normal;
-// else if (val[i] ==
-// property->atom(otk::OBProperty::kde_net_wm_window_type_override))
-// mwm_decorations = 0; // prevent this window from getting any decor
- // XXX: make this work again
+ 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
}
}
-void OBClient::setupDecorAndFunctions()
+void Client::setupDecorAndFunctions()
{
- // start with everything
- _decorations = Decor_Titlebar | Decor_Handle | Decor_Border |
- Decor_Iconify | Decor_Maximize;
- _functions = Func_Resize | Func_Move | Func_Iconify | Func_Maximize;
+ // start with everything (cept fullscreen)
+ _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;
+ if (_delete_window) {
+ _decorations |= Decor_Close;
+ _functions |= Func_Close;
+ }
+
+ if (!(_min_size.width() < _max_size.width() ||
+ _min_size.height() < _max_size.height())) {
+ _decorations &= ~(Decor_Maximize | Decor_Handle);
+ _functions &= ~(Func_Resize | Func_Maximize);
+ }
switch (_type) {
case Type_Normal:
// normal windows retain all of the possible decorations and
- // functionality
+ // functionality, and are the only windows that you can fullscreen
+ _functions |= Func_Fullscreen;
+ break;
case Type_Dialog:
// dialogs cannot be maximized
}
}
- // XXX: changeAllowedActions();
+ // 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)
+ _decorations &= ~Decor_Titlebar;
+ if (_disabled_decorations & Decor_Handle)
+ _decorations &= ~Decor_Handle;
+ if (_disabled_decorations & Decor_Border)
+ _decorations &= ~Decor_Border;
+ if (_disabled_decorations & Decor_Iconify)
+ _decorations &= ~Decor_Iconify;
+ if (_disabled_decorations & Decor_Maximize)
+ _decorations &= ~Decor_Maximize;
+ if (_disabled_decorations & Decor_AllDesktops)
+ _decorations &= ~Decor_AllDesktops;
+ if (_disabled_decorations & Decor_Close)
+ _decorations &= ~Decor_Close;
+
+ // if we don't have a titlebar, then we cannot shade!
+ if (!(_decorations & Decor_Titlebar))
+ _functions &= ~Func_Shade;
+
+ changeAllowedActions();
+
+ if (frame) {
+ frame->adjustSize(); // change the decors on the frame
+ frame->adjustPosition(); // with more/less decorations, we may need to be
+ // moved
+ remaximize(); // with new decor, the window's maximized size may change
+ }
}
-void OBClient::getMwmHints()
+void Client::getMwmHints()
{
- const otk::OBProperty *property = Openbox::instance->property();
-
unsigned long num = MwmHints::elements;
unsigned long *hints;
_mwmhints.flags = 0; // default to none
- if (!property->get(_window, otk::OBProperty::motif_wm_hints,
- otk::OBProperty::motif_wm_hints, &num,
- (unsigned long **)&hints))
+ if (!otk::Property::get(_window, otk::Property::atoms.motif_wm_hints,
+ otk::Property::atoms.motif_wm_hints, &num,
+ (unsigned long **)&hints))
return;
if (num >= MwmHints::elements) {
}
-void OBClient::getArea()
+void Client::getArea()
{
XWindowAttributes wattrib;
Status ret;
- ret = XGetWindowAttributes(otk::OBDisplay::display, _window, &wattrib);
+ ret = XGetWindowAttributes(**otk::display, _window, &wattrib);
assert(ret != BadWindow);
- _area.setRect(wattrib.x, wattrib.y, wattrib.width, wattrib.height);
+ _area = otk::Rect(wattrib.x, wattrib.y, wattrib.width, wattrib.height);
_border_width = wattrib.border_width;
}
-void OBClient::getState()
+void Client::getState()
{
- const otk::OBProperty *property = Openbox::instance->property();
-
_modal = _shaded = _max_horz = _max_vert = _fullscreen = _above = _below =
- _skip_taskbar = _skip_pager = false;
+ _iconic = _skip_taskbar = _skip_pager = false;
unsigned long *state;
- unsigned long num = (unsigned) -1;
+ unsigned long num;
- if (property->get(_window, otk::OBProperty::net_wm_state,
- otk::OBProperty::Atom_Atom, &num, &state)) {
+ if (otk::Property::get(_window, otk::Property::atoms.net_wm_state,
+ otk::Property::atoms.atom, &num, &state)) {
for (unsigned long i = 0; i < num; ++i) {
- if (state[i] == property->atom(otk::OBProperty::net_wm_state_modal))
+ if (state[i] == otk::Property::atoms.net_wm_state_modal)
_modal = true;
- else if (state[i] ==
- property->atom(otk::OBProperty::net_wm_state_shaded)) {
+ else if (state[i] == otk::Property::atoms.net_wm_state_shaded)
_shaded = true;
- _wmstate = IconicState;
- } else if (state[i] ==
- property->atom(otk::OBProperty::net_wm_state_skip_taskbar))
+ else if (state[i] == otk::Property::atoms.net_wm_state_hidden)
+ _iconic = true;
+ else if (state[i] == otk::Property::atoms.net_wm_state_skip_taskbar)
_skip_taskbar = true;
- else if (state[i] ==
- property->atom(otk::OBProperty::net_wm_state_skip_pager))
+ else if (state[i] == otk::Property::atoms.net_wm_state_skip_pager)
_skip_pager = true;
- else if (state[i] ==
- property->atom(otk::OBProperty::net_wm_state_fullscreen))
+ else if (state[i] == otk::Property::atoms.net_wm_state_fullscreen)
_fullscreen = true;
- else if (state[i] ==
- property->atom(otk::OBProperty::net_wm_state_maximized_vert))
+ else if (state[i] == otk::Property::atoms.net_wm_state_maximized_vert)
_max_vert = true;
- else if (state[i] ==
- property->atom(otk::OBProperty::net_wm_state_maximized_horz))
+ else if (state[i] == otk::Property::atoms.net_wm_state_maximized_horz)
_max_horz = true;
- else if (state[i] ==
- property->atom(otk::OBProperty::net_wm_state_above))
+ else if (state[i] == otk::Property::atoms.net_wm_state_above)
_above = true;
- else if (state[i] ==
- property->atom(otk::OBProperty::net_wm_state_below))
+ else if (state[i] == otk::Property::atoms.net_wm_state_below)
_below = true;
}
}
}
-
-void OBClient::getShaped()
+void Client::getShaped()
{
_shaped = false;
#ifdef SHAPE
- if (otk::OBDisplay::shape()) {
+ if (otk::display->shape()) {
int foo;
unsigned int ufoo;
int s;
- XShapeSelectInput(otk::OBDisplay::display, _window, ShapeNotifyMask);
+ XShapeSelectInput(**otk::display, _window, ShapeNotifyMask);
- XShapeQueryExtents(otk::OBDisplay::display, _window, &s, &foo,
+ XShapeQueryExtents(**otk::display, _window, &s, &foo,
&foo, &ufoo, &ufoo, &foo, &foo, &foo, &ufoo, &ufoo);
_shaped = (s != 0);
}
#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 OBClient::calcLayer() {
+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;
if we don't have a frame, then we aren't mapped yet (and this would
SIGSEGV :)
*/
- Openbox::instance->screen(_screen)->restack(true, this); // raise
+ openbox->screen(_screen)->raiseWindow(this);
}
}
}
-
-void OBClient::updateProtocols()
+void Client::updateProtocols()
{
- const otk::OBProperty *property = Openbox::instance->property();
-
Atom *proto;
int num_return = 0;
_focus_notify = false;
- _decorations &= ~Decor_Close;
- _functions &= ~Func_Close;
+ _delete_window = false;
- if (XGetWMProtocols(otk::OBDisplay::display, _window, &proto, &num_return)) {
+ if (XGetWMProtocols(**otk::display, _window, &proto, &num_return)) {
for (int i = 0; i < num_return; ++i) {
- if (proto[i] == property->atom(otk::OBProperty::wm_delete_window)) {
- _decorations |= Decor_Close;
- _functions |= Func_Close;
- if (frame)
- frame->adjustSize(); // update the decorations
- } else if (proto[i] == property->atom(otk::OBProperty::wm_take_focus))
+ if (proto[i] == otk::Property::atoms.wm_delete_window) {
+ // this means we can request the window to close
+ _delete_window = true;
+ } else if (proto[i] == otk::Property::atoms.wm_take_focus)
// if this protocol is requested, then the window will be notified
// by the window manager whenever it receives focus
_focus_notify = true;
}
}
-
-void OBClient::updateNormalHints()
+void Client::updateNormalHints()
{
XSizeHints size;
long ret;
int oldgravity = _gravity;
// defaults
- _gravity = NorthWestGravity;
- _size_inc.setPoint(1, 1);
- _base_size.setPoint(0, 0);
- _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..
+ _min_ratio = 0.0;
+ _max_ratio = 0.0;
+ _size_inc = otk::Size(1, 1);
+ _base_size = otk::Size(0, 0);
+ _min_size = otk::Size(0, 0);
+ _max_size = otk::Size(INT_MAX, INT_MAX);
// get the hints from the window
- if (XGetWMNormalHints(otk::OBDisplay::display, _window, &size, &ret)) {
+ if (XGetWMNormalHints(**otk::display, _window, &size, &ret)) {
_positioned = (size.flags & (PPosition|USPosition));
- if (size.flags & PWinGravity)
+ if (size.flags & PWinGravity) {
_gravity = size.win_gravity;
+
+ // if the client has a frame, i.e. has already been mapped and is
+ // changing its gravity
+ if (frame && _gravity != oldgravity) {
+ // move our idea of the client's position based on its new gravity
+ int x = frame->area().x(), y = frame->area().y();
+ frame->frameGravity(x, y);
+ _area = otk::Rect(otk::Point(x, y), _area.size());
+ }
+ }
+
+ if (size.flags & PAspect) {
+ if (size.min_aspect.y) _min_ratio = size.min_aspect.x/size.min_aspect.y;
+ if (size.max_aspect.y) _max_ratio = size.max_aspect.x/size.max_aspect.y;
+ }
if (size.flags & PMinSize)
- _min_size.setPoint(size.min_width, size.min_height);
+ _min_size = otk::Size(size.min_width, size.min_height);
if (size.flags & PMaxSize)
- _max_size.setPoint(size.max_width, size.max_height);
+ _max_size = otk::Size(size.max_width, size.max_height);
if (size.flags & PBaseSize)
- _base_size.setPoint(size.base_width, size.base_height);
+ _base_size = otk::Size(size.base_width, size.base_height);
if (size.flags & PResizeInc)
- _size_inc.setPoint(size.width_inc, size.height_inc);
- }
-
- // if the client has a frame, i.e. has already been mapped and is
- // changing its gravity
- if (frame && _gravity != oldgravity) {
- // move our idea of the client's position based on its new gravity
- int x, y;
- frame->frameGravity(x, y);
- _area.setPos(x, y);
+ _size_inc = otk::Size(size.width_inc, size.height_inc);
}
}
-
-void OBClient::updateWMHints()
+void Client::updateWMHints(bool initstate)
{
XWMHints *hints;
// assume a window takes input if it doesnt specify
_can_focus = true;
- _urgent = false;
+ bool ur = false;
- if ((hints = XGetWMHints(otk::OBDisplay::display, _window)) != NULL) {
+ if ((hints = XGetWMHints(**otk::display, _window)) != NULL) {
if (hints->flags & InputHint)
_can_focus = hints->input;
+ // only do this when initstate is true!
+ if (initstate && (hints->flags & StateHint))
+ _iconic = hints->initial_state == IconicState;
+
if (hints->flags & XUrgencyHint)
- _urgent = true;
+ ur = true;
if (hints->flags & WindowGroupHint) {
if (hints->window_group != _group) {
} 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("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
+ // we're mapped
+ if (frame)
+ fireUrgent();
+ }
+}
-void OBClient::updateTitle()
+void Client::updateTitle()
{
- const otk::OBProperty *property = Openbox::instance->property();
-
_title = "";
// try netwm
- if (! property->get(_window, otk::OBProperty::net_wm_name,
- otk::OBProperty::utf8, &_title)) {
+ if (!otk::Property::get(_window, otk::Property::atoms.net_wm_name,
+ otk::Property::utf8, &_title)) {
// try old x stuff
- property->get(_window, otk::OBProperty::wm_name,
- otk::OBProperty::ascii, &_title);
+ otk::Property::get(_window, otk::Property::atoms.wm_name,
+ otk::Property::ascii, &_title);
}
if (_title.empty())
_title = _("Unnamed Window");
if (frame)
- frame->setTitle(_title);
+ frame->adjustTitle();
}
-
-void OBClient::updateIconTitle()
+void Client::updateIconTitle()
{
- const otk::OBProperty *property = Openbox::instance->property();
-
_icon_title = "";
// try netwm
- if (! property->get(_window, otk::OBProperty::net_wm_icon_name,
- otk::OBProperty::utf8, &_icon_title)) {
+ if (!otk::Property::get(_window, otk::Property::atoms.net_wm_icon_name,
+ otk::Property::utf8, &_icon_title)) {
// try old x stuff
- property->get(_window, otk::OBProperty::wm_icon_name,
- otk::OBProperty::ascii, &_icon_title);
+ otk::Property::get(_window, otk::Property::atoms.wm_icon_name,
+ otk::Property::ascii, &_icon_title);
}
if (_title.empty())
_icon_title = _("Unnamed Window");
}
-
-void OBClient::updateClass()
+void Client::updateClass()
{
- const otk::OBProperty *property = Openbox::instance->property();
-
// set the defaults
_app_name = _app_class = _role = "";
- otk::OBProperty::StringVect v;
+ otk::Property::StringVect v;
unsigned long num = 2;
- 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];
+ if (otk::Property::get(_window, otk::Property::atoms.wm_class,
+ otk::Property::ascii, &num, &v)) {
+ if (num > 0) _app_name = v[0].c_str();
+ if (num > 1) _app_class = v[1].c_str();
}
v.clear();
num = 1;
- if (property->get(_window, otk::OBProperty::wm_window_role,
- otk::OBProperty::ascii, &num, &v)) {
- if (num > 0) _role = v[0];
+ if (otk::Property::get(_window, otk::Property::atoms.wm_window_role,
+ otk::Property::ascii, &num, &v)) {
+ if (num > 0) _role = v[0].c_str();
}
}
-
-void OBClient::updateStrut()
+void Client::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))
+ if (!otk::Property::get(_window, otk::Property::atoms.net_wm_strut,
+ otk::Property::atoms.cardinal, &num, &data))
return;
if (num == 4) {
_strut.left = data[0];
_strut.right = data[1];
_strut.top = data[2];
- _strut.bottom = data[3];
-
- Openbox::instance->screen(_screen)->updateStrut();
+ _strut.bottom = data[3];
+
+ // 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)->updateStruts();
}
delete [] data;
}
-
-void OBClient::updateTransientFor()
+void Client::updateTransientFor()
{
Window t = 0;
- OBClient *c = 0;
+ Client *c = 0;
- if (XGetTransientForHint(otk::OBDisplay::display, _window, &t) &&
+ if (XGetTransientForHint(**otk::display, _window, &t) &&
t != _window) { // cant be transient to itself!
- c = Openbox::instance->findClient(t);
+ c = openbox->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()) {
+ t == otk::display->screenInfo(_screen)->rootWindow()) {
// window is a transient for its group!
// XXX: for now this is treated as non-transient.
// this needs to be fixed!
_transient_for = c;
if (_transient_for)
_transient_for->_transients.push_back(this); // add to new parent
+ }
+}
- // XXX: change decor status?
+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 OBClient::propertyHandler(const XPropertyEvent &e)
+void Client::propertyHandler(const XPropertyEvent &e)
{
- otk::OtkEventHandler::propertyHandler(e);
-
- const otk::OBProperty *property = Openbox::instance->property();
+ otk::EventHandler::propertyHandler(e);
+ // validate cuz we query stuff off the client here
+ if (!validate()) return;
+
// compress changes to a single property into a single change
XEvent ce;
- while (XCheckTypedEvent(otk::OBDisplay::display, e.type, &ce)) {
+ while (XCheckTypedEvent(**otk::display, e.type, &ce)) {
// XXX: it would be nice to compress ALL changes to a property, not just
// changes in a row without other props between.
if (ce.xproperty.atom != e.atom) {
- XPutBackEvent(otk::OBDisplay::display, &ce);
+ XPutBackEvent(**otk::display, &ce);
break;
}
}
- if (e.atom == XA_WM_NORMAL_HINTS)
+ if (e.atom == XA_WM_NORMAL_HINTS) {
updateNormalHints();
- else if (e.atom == XA_WM_HINTS)
+ setupDecorAndFunctions(); // normal hints can make a window non-resizable
+ } else if (e.atom == XA_WM_HINTS)
updateWMHints();
else if (e.atom == XA_WM_TRANSIENT_FOR) {
updateTransientFor();
getType();
calcLayer(); // type may have changed, so update the layer
setupDecorAndFunctions();
- frame->adjustSize(); // this updates the frame for any new decor settings
}
- else if (e.atom == property->atom(otk::OBProperty::net_wm_name) ||
- e.atom == property->atom(otk::OBProperty::wm_name))
+ else if (e.atom == otk::Property::atoms.net_wm_name ||
+ e.atom == otk::Property::atoms.wm_name)
updateTitle();
- else if (e.atom == property->atom(otk::OBProperty::net_wm_icon_name) ||
- e.atom == property->atom(otk::OBProperty::wm_icon_name))
+ else if (e.atom == otk::Property::atoms.net_wm_icon_name ||
+ e.atom == otk::Property::atoms.wm_icon_name)
updateIconTitle();
- else if (e.atom == property->atom(otk::OBProperty::wm_class))
+ else if (e.atom == otk::Property::atoms.wm_class)
updateClass();
- else if (e.atom == property->atom(otk::OBProperty::wm_protocols))
+ else if (e.atom == otk::Property::atoms.wm_protocols) {
updateProtocols();
- else if (e.atom == property->atom(otk::OBProperty::net_wm_strut))
+ setupDecorAndFunctions();
+ }
+ 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 OBClient::setWMState(long state)
+void Client::setWMState(long state)
{
if (state == _wmstate) return; // no change
- _wmstate = state;
- switch (_wmstate) {
+ switch (state) {
case IconicState:
- // XXX: cause it to iconify
+ iconify(true);
break;
case NormalState:
- // XXX: cause it to uniconify
+ iconify(false);
break;
}
}
-
-void OBClient::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)) return;
-
- _desktop = target;
+ if (!(target < openbox->screen(_screen)->numDesktops() ||
+ target == 0xffffffff))
+ return;
- Openbox::instance->property()->set(_window,
- otk::OBProperty::net_wm_desktop,
- otk::OBProperty::Atom_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::instance->screen(_screen)->desktop() ||
- _desktop == (signed)0xffffffff)
- frame->show();
- else
- frame->hide();
+ showhide();
+ openbox->screen(_screen)->updateStruts();
}
+void Client::showhide()
+{
+ 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 OBClient::setState(StateAction action, long data1, long data2)
+ if (show) frame->show();
+ else frame->hide();
+}
+
+void Client::setState(Atom action, long data1, long data2)
{
- const otk::OBProperty *property = Openbox::instance->property();
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) {
if (! state) continue;
// if toggling, then pick whether we're adding or removing
- if (action == State_Toggle) {
- if (state == property->atom(otk::OBProperty::net_wm_state_modal))
- action = _modal ? State_Remove : State_Add;
- else if (state ==
- property->atom(otk::OBProperty::net_wm_state_maximized_vert))
- action = _max_vert ? State_Remove : State_Add;
- else if (state ==
- property->atom(otk::OBProperty::net_wm_state_maximized_horz))
- action = _max_horz ? State_Remove : State_Add;
- else if (state == property->atom(otk::OBProperty::net_wm_state_shaded))
- action = _shaded ? State_Remove : State_Add;
- else if (state ==
- property->atom(otk::OBProperty::net_wm_state_skip_taskbar))
- action = _skip_taskbar ? State_Remove : State_Add;
- else if (state ==
- property->atom(otk::OBProperty::net_wm_state_skip_pager))
- action = _skip_pager ? State_Remove : State_Add;
- else if (state ==
- property->atom(otk::OBProperty::net_wm_state_fullscreen))
- action = _fullscreen ? State_Remove : State_Add;
- else if (state == property->atom(otk::OBProperty::net_wm_state_above))
- action = _above ? State_Remove : State_Add;
- else if (state == property->atom(otk::OBProperty::net_wm_state_below))
- action = _below ? State_Remove : State_Add;
+ if (action == otk::Property::atoms.net_wm_state_toggle) {
+ if (state == otk::Property::atoms.net_wm_state_modal)
+ 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 ? 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 ? 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 ? 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 ? 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 ? 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 ? 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 ? 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 ? otk::Property::atoms.net_wm_state_remove :
+ otk::Property::atoms.net_wm_state_add;
}
- if (action == State_Add) {
- if (state == property->atom(otk::OBProperty::net_wm_state_modal)) {
+ if (action == otk::Property::atoms.net_wm_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
- } else if (state ==
- property->atom(otk::OBProperty::net_wm_state_maximized_vert)){
- if (_max_vert) continue;
- _max_vert = true;
- // XXX: resize the window etc
- } else if (state ==
- property->atom(otk::OBProperty::net_wm_state_maximized_horz)){
+ } 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;
- _max_horz = true;
- // XXX: resize the window etc
- } else if (state ==
- property->atom(otk::OBProperty::net_wm_state_shaded)) {
- if (_shaded) continue;
- // shade when we're all thru here
+ maxh = true;
+ } else if (state == otk::Property::atoms.net_wm_state_shaded) {
shadestate = true;
- } else if (state ==
- property->atom(otk::OBProperty::net_wm_state_skip_taskbar)) {
+ } else if (state == otk::Property::atoms.net_wm_state_skip_taskbar) {
_skip_taskbar = true;
- } else if (state ==
- property->atom(otk::OBProperty::net_wm_state_skip_pager)) {
+ } else if (state == otk::Property::atoms.net_wm_state_skip_pager) {
_skip_pager = true;
- } else if (state ==
- property->atom(otk::OBProperty::net_wm_state_fullscreen)) {
- if (_fullscreen) continue;
- _fullscreen = true;
- } else if (state ==
- property->atom(otk::OBProperty::net_wm_state_above)) {
+ } else if (state == otk::Property::atoms.net_wm_state_fullscreen) {
+ fsstate = true;
+ } else if (state == otk::Property::atoms.net_wm_state_above) {
if (_above) continue;
_above = true;
- } else if (state ==
- property->atom(otk::OBProperty::net_wm_state_below)) {
+ } else if (state == otk::Property::atoms.net_wm_state_below) {
if (_below) continue;
_below = true;
}
- } else { // action == State_Remove
- if (state == property->atom(otk::OBProperty::net_wm_state_modal)) {
+ } else { // action == otk::Property::atoms.net_wm_state_remove
+ if (state == otk::Property::atoms.net_wm_state_modal) {
if (!_modal) continue;
_modal = false;
- } else if (state ==
- property->atom(otk::OBProperty::net_wm_state_maximized_vert)){
- if (!_max_vert) continue;
- _max_vert = false;
- // XXX: resize the window etc
- } else if (state ==
- property->atom(otk::OBProperty::net_wm_state_maximized_horz)){
- if (!_max_horz) continue;
- _max_horz = false;
- // XXX: resize the window etc
- } else if (state ==
- property->atom(otk::OBProperty::net_wm_state_shaded)) {
- if (!_shaded) continue;
- // unshade when we're all thru here
+ } else if (state == otk::Property::atoms.net_wm_state_maximized_vert) {
+ maxv = false;
+ } else if (state == otk::Property::atoms.net_wm_state_maximized_horz) {
+ maxh = false;
+ } else if (state == otk::Property::atoms.net_wm_state_shaded) {
shadestate = false;
- } else if (state ==
- property->atom(otk::OBProperty::net_wm_state_skip_taskbar)) {
+ } else if (state == otk::Property::atoms.net_wm_state_skip_taskbar) {
_skip_taskbar = false;
- } else if (state ==
- property->atom(otk::OBProperty::net_wm_state_skip_pager)) {
+ } else if (state == otk::Property::atoms.net_wm_state_skip_pager) {
_skip_pager = false;
- } else if (state ==
- property->atom(otk::OBProperty::net_wm_state_fullscreen)) {
- if (!_fullscreen) continue;
- _fullscreen = false;
- } else if (state ==
- property->atom(otk::OBProperty::net_wm_state_above)) {
+ } else if (state == otk::Property::atoms.net_wm_state_fullscreen) {
+ fsstate = false;
+ } else if (state == otk::Property::atoms.net_wm_state_above) {
if (!_above) continue;
_above = false;
- } else if (state ==
- property->atom(otk::OBProperty::net_wm_state_below)) {
+ } else if (state == otk::Property::atoms.net_wm_state_below) {
if (!_below) continue;
_below = false;
}
}
}
+ 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);
+ }
+ }
+ // change fullscreen state before shading, as it will affect if the window
+ // can shade or not
+ if (fsstate != _fullscreen)
+ fullscreen(fsstate, true);
if (shadestate != _shaded)
shade(shadestate);
calcLayer();
+ changeState(); // change the hint to relect these changes
}
-
-void OBClient::toggleClientBorder(bool addborder)
+void Client::toggleClientBorder(bool addborder)
{
// adjust our idea of where the client is, based on its border. When the
// border is removed, the client should now be considered to be in a
// 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:
case WestGravity:
case SouthWestGravity:
if (addborder) x -= _border_width * 2;
else x += _border_width * 2;
break;
+ case NorthGravity:
+ case SouthGravity:
+ case CenterGravity:
+ case ForgetGravity:
+ case StaticGravity:
+ if (addborder) x -= _border_width;
+ else x += _border_width;
+ break;
}
switch(_gravity) {
+ default:
case NorthWestGravity:
case NorthGravity:
case NorthEastGravity:
if (addborder) y -= _border_width * 2;
else y += _border_width * 2;
break;
- default:
- // no change for StaticGravity etc.
+ case WestGravity:
+ case EastGravity:
+ case CenterGravity:
+ case ForgetGravity:
+ case StaticGravity:
+ if (addborder) y -= _border_width;
+ else y += _border_width;
break;
}
- _area.setPos(x, y);
+ _area = otk::Rect(otk::Point(x, y), _area.size());
if (addborder) {
- XSetWindowBorderWidth(otk::OBDisplay::display, _window, _border_width);
+ XSetWindowBorderWidth(**otk::display, _window, _border_width);
// move the client so it is back it the right spot _with_ its border!
- XMoveWindow(otk::OBDisplay::display, _window, x, y);
+ if (x != oldx || y != oldy)
+ XMoveWindow(**otk::display, _window, x, y);
} else
- XSetWindowBorderWidth(otk::OBDisplay::display, _window, 0);
+ XSetWindowBorderWidth(**otk::display, _window, 0);
}
-
-void OBClient::clientMessageHandler(const XClientMessageEvent &e)
+void Client::clientMessageHandler(const XClientMessageEvent &e)
{
- otk::OtkEventHandler::clientMessageHandler(e);
+ otk::EventHandler::clientMessageHandler(e);
+
+ // validate cuz we query stuff off the client here
+ if (!validate()) return;
if (e.format != 32) return;
- const otk::OBProperty *property = Openbox::instance->property();
-
- if (e.message_type == property->atom(otk::OBProperty::wm_change_state)) {
+ if (e.message_type == otk::Property::atoms.wm_change_state) {
// compress changes into a single change
bool compress = false;
XEvent ce;
- while (XCheckTypedEvent(otk::OBDisplay::display, e.type, &ce)) {
+ while (XCheckTypedEvent(**otk::display, e.type, &ce)) {
// XXX: it would be nice to compress ALL messages of a type, not just
// messages in a row without other message types between.
if (ce.xclient.message_type != e.message_type) {
- XPutBackEvent(otk::OBDisplay::display, &ce);
+ XPutBackEvent(**otk::display, &ce);
break;
}
compress = true;
setWMState(ce.xclient.data.l[0]); // use the found event
else
setWMState(e.data.l[0]); // use the original event
- } else if (e.message_type ==
- property->atom(otk::OBProperty::net_wm_desktop)) {
+ } else if (e.message_type == otk::Property::atoms.net_wm_desktop) {
// compress changes into a single change
bool compress = false;
XEvent ce;
- while (XCheckTypedEvent(otk::OBDisplay::display, e.type, &ce)) {
+ while (XCheckTypedEvent(**otk::display, e.type, &ce)) {
// XXX: it would be nice to compress ALL messages of a type, not just
// messages in a row without other message types between.
if (ce.xclient.message_type != e.message_type) {
- XPutBackEvent(otk::OBDisplay::display, &ce);
+ XPutBackEvent(**otk::display, &ce);
break;
}
compress = true;
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 == otk::Property::atoms.net_wm_state) {
// can't compress these
#ifdef DEBUG
printf("net_wm_state %s %ld %ld for 0x%lx\n",
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]);
- } else if (e.message_type ==
- property->atom(otk::OBProperty::net_close_window)) {
+ 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);
#endif
close();
- } else if (e.message_type ==
- property->atom(otk::OBProperty::net_active_window)) {
+ } else if (e.message_type == otk::Property::atoms.net_active_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)
+ iconify(false);
+ else if (!frame->visible()) // if its not visible for other reasons, then
+ return; // don't mess with it
if (_shaded)
shade(false);
- // XXX: deiconify
focus();
- Openbox::instance->screen(_screen)->restack(true, this); // raise
+ 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)
+ 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 OBClient::shapeHandler(const XShapeEvent &e)
+void Client::shapeHandler(const XShapeEvent &e)
{
- otk::OtkEventHandler::shapeHandler(e);
+ otk::EventHandler::shapeHandler(e);
if (e.kind == ShapeBounding) {
_shaped = e.shaped;
}
#endif
-
-void OBClient::resize(Corner anchor, int w, int h, int x, int y)
+void Client::resize(Corner anchor, int w, int h)
{
- w -= _base_size.x();
- h -= _base_size.y();
+ if (!(_functions & Func_Resize)) return;
+ internal_resize(anchor, w, h);
+}
- // for interactive resizing. have to move half an increment in each
- // direction.
- w += _size_inc.x() / 2;
- h += _size_inc.y() / 2;
+void Client::internal_resize(Corner anchor, int w, int h,
+ bool user, int x, int y)
+{
+ w -= _base_size.width();
+ h -= _base_size.height();
+
+ if (user) {
+ // for interactive resizing. have to move half an increment in each
+ // direction.
+ int mw = w % _size_inc.width(); // how far we are towards the next size inc
+ int mh = h % _size_inc.height();
+ int aw = _size_inc.width() / 2; // amount to add
+ int ah = _size_inc.height() / 2;
+ // don't let us move into a new size increment
+ if (mw + aw >= _size_inc.width()) aw = _size_inc.width() - mw - 1;
+ if (mh + ah >= _size_inc.height()) ah = _size_inc.height() - mh - 1;
+ w += aw;
+ h += ah;
+
+ // if this is a user-requested resize, then check against min/max sizes
+ // and aspect ratios
- // is the window resizable? if it is not, then don't check its sizes, the
- // client can do what it wants and the user can't change it anyhow
- if (_min_size.x() <= _max_size.x() && _min_size.y() <= _max_size.y()) {
// smaller than min size or bigger than max size?
- if (w < _min_size.x()) w = _min_size.x();
- else if (w > _max_size.x()) w = _max_size.x();
- if (h < _min_size.y()) h = _min_size.y();
- else if (h > _max_size.y()) h = _max_size.y();
+ if (w > _max_size.width()) w = _max_size.width();
+ if (w < _min_size.width()) w = _min_size.width();
+ if (h > _max_size.height()) h = _max_size.height();
+ if (h < _min_size.height()) h = _min_size.height();
+
+ // adjust the height ot match the width for the aspect ratios
+ if (_min_ratio)
+ if (h * _min_ratio > w) h = static_cast<int>(w / _min_ratio);
+ if (_max_ratio)
+ if (h * _max_ratio < w) h = static_cast<int>(w / _max_ratio);
}
// keep to the increments
- w /= _size_inc.x();
- h /= _size_inc.y();
+ w /= _size_inc.width();
+ h /= _size_inc.height();
+ // you cannot resize to nothing
+ if (w < 1) w = 1;
+ if (h < 1) h = 1;
+
// store the logical size
- _logical_size.setPoint(w, h);
+ _logical_size = otk::Size(w, h);
- w *= _size_inc.x();
- h *= _size_inc.y();
+ w *= _size_inc.width();
+ h *= _size_inc.height();
- w += _base_size.x();
- h += _base_size.y();
+ w += _base_size.width();
+ h += _base_size.height();
if (x == INT_MIN || y == INT_MIN) {
x = _area.x();
}
}
- _area.setSize(w, h);
+ _area = otk::Rect(_area.position(), otk::Size(w, h));
- XResizeWindow(otk::OBDisplay::display, _window, w, h);
+ XResizeWindow(**otk::display, _window, w, h);
// resize the frame to match the request
frame->adjustSize();
- move(x, y);
+ 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, 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, final);
+}
-void OBClient::move(int x, int y)
+void Client::internal_move(int x, int y, bool final)
{
- _area.setPos(x, y);
+ _area = otk::Rect(otk::Point(x, y), _area.size());
// move the frame to be in the requested position
if (frame) { // this can be called while mapping, before frame exists
// send synthetic configure notify (we don't need to if we aren't mapped
// yet)
- XEvent event;
- event.type = ConfigureNotify;
- event.xconfigure.display = otk::OBDisplay::display;
- event.xconfigure.event = _window;
- event.xconfigure.window = _window;
- event.xconfigure.x = x;
- event.xconfigure.y = y;
- event.xconfigure.width = _area.width();
- event.xconfigure.height = _area.height();
- event.xconfigure.border_width = _border_width;
- event.xconfigure.above = frame->window();
- event.xconfigure.override_redirect = False;
- XSendEvent(event.xconfigure.display, event.xconfigure.window, False,
- StructureNotifyMask, &event);
+ 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;
+
+ 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);
+#endif
+ }
}
}
-
-void OBClient::close()
+void Client::close()
{
XEvent ce;
- const otk::OBProperty *property = Openbox::instance->property();
if (!(_functions & Func_Close)) return;
// explicitly killed.
ce.xclient.type = ClientMessage;
- ce.xclient.message_type = property->atom(otk::OBProperty::wm_protocols);
- ce.xclient.display = otk::OBDisplay::display;
+ ce.xclient.message_type = otk::Property::atoms.wm_protocols;
+ ce.xclient.display = **otk::display;
ce.xclient.window = _window;
ce.xclient.format = 32;
- ce.xclient.data.l[0] = property->atom(otk::OBProperty::wm_delete_window);
+ ce.xclient.data.l[0] = otk::Property::atoms.wm_delete_window;
ce.xclient.data.l[1] = CurrentTime;
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);
+ XSendEvent(**otk::display, _window, false, NoEventMask, &ce);
}
-
-void OBClient::changeState()
+void Client::changeState()
{
- const otk::OBProperty *property = Openbox::instance->property();
-
unsigned long state[2];
state[0] = _wmstate;
state[1] = None;
- property->set(_window, otk::OBProperty::wm_state, otk::OBProperty::wm_state,
- state, 2);
-
+ otk::Property::set(_window, otk::Property::atoms.wm_state,
+ otk::Property::atoms.wm_state, state, 2);
+
Atom netstate[10];
int num = 0;
if (_modal)
- netstate[num++] = property->atom(otk::OBProperty::net_wm_state_modal);
+ netstate[num++] = otk::Property::atoms.net_wm_state_modal;
if (_shaded)
- netstate[num++] = property->atom(otk::OBProperty::net_wm_state_shaded);
+ netstate[num++] = otk::Property::atoms.net_wm_state_shaded;
if (_iconic)
- netstate[num++] = property->atom(otk::OBProperty::net_wm_state_hidden);
+ netstate[num++] = otk::Property::atoms.net_wm_state_hidden;
if (_skip_taskbar)
- netstate[num++] =
- property->atom(otk::OBProperty::net_wm_state_skip_taskbar);
+ netstate[num++] = otk::Property::atoms.net_wm_state_skip_taskbar;
if (_skip_pager)
- netstate[num++] = property->atom(otk::OBProperty::net_wm_state_skip_pager);
+ netstate[num++] = otk::Property::atoms.net_wm_state_skip_pager;
if (_fullscreen)
- netstate[num++] = property->atom(otk::OBProperty::net_wm_state_fullscreen);
+ netstate[num++] = otk::Property::atoms.net_wm_state_fullscreen;
if (_max_vert)
- netstate[num++] =
- property->atom(otk::OBProperty::net_wm_state_maximized_vert);
+ netstate[num++] = otk::Property::atoms.net_wm_state_maximized_vert;
if (_max_horz)
- netstate[num++] =
- property->atom(otk::OBProperty::net_wm_state_maximized_horz);
+ netstate[num++] = otk::Property::atoms.net_wm_state_maximized_horz;
if (_above)
- netstate[num++] = property->atom(otk::OBProperty::net_wm_state_above);
+ netstate[num++] = otk::Property::atoms.net_wm_state_above;
if (_below)
- netstate[num++] = property->atom(otk::OBProperty::net_wm_state_below);
- property->set(_window, otk::OBProperty::net_wm_state,
- otk::OBProperty::Atom_Atom, netstate, num);
+ netstate[num++] = otk::Property::atoms.net_wm_state_below;
+ otk::Property::set(_window, otk::Property::atoms.net_wm_state,
+ otk::Property::atoms.atom, netstate, num);
calcLayer();
+
+ if (frame)
+ frame->adjustState();
+}
+
+void Client::changeAllowedActions(void)
+{
+ Atom actions[9];
+ int num = 0;
+
+ actions[num++] = otk::Property::atoms.net_wm_action_change_desktop;
+
+ if (_functions & Func_Shade)
+ actions[num++] = otk::Property::atoms.net_wm_action_shade;
+ if (_functions & Func_Close)
+ actions[num++] = otk::Property::atoms.net_wm_action_close;
+ if (_functions & Func_Move)
+ actions[num++] = otk::Property::atoms.net_wm_action_move;
+ if (_functions & Func_Iconify)
+ actions[num++] = otk::Property::atoms.net_wm_action_minimize;
+ if (_functions & Func_Resize)
+ actions[num++] = otk::Property::atoms.net_wm_action_resize;
+ if (_functions & Func_Fullscreen)
+ actions[num++] = otk::Property::atoms.net_wm_action_fullscreen;
+ if (_functions & Func_Maximize) {
+ actions[num++] = otk::Property::atoms.net_wm_action_maximize_horz;
+ actions[num++] = otk::Property::atoms.net_wm_action_maximize_vert;
+ }
+
+ otk::Property::set(_window, otk::Property::atoms.net_wm_allowed_actions,
+ otk::Property::atoms.atom, actions, num);
+
+ // make sure the window isn't breaking any rules now
+
+ if (!(_functions & Func_Shade) && _shaded)
+ if (frame) shade(false);
+ else _shaded = false;
+ if (!(_functions & Func_Iconify) && _iconic)
+ if (frame) setDesktop(openbox->screen(_screen)->desktop());
+ else _iconic = false;
+ if (!(_functions & Func_Fullscreen) && _fullscreen)
+ if (frame) fullscreen(false);
+ else _fullscreen = false;
+ if (!(_functions & Func_Maximize) && (_max_horz || _max_vert))
+ if (frame) maximize(false, 0);
+ else _max_vert = _max_horz = false;
+}
+
+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 (_iconic) {
+ _iconic = false;
+ iconify(true);
+ }
+ if (_fullscreen) {
+ _fullscreen = false;
+ fullscreen(true, false);
+ }
+ if (_shaded) {
+ _shaded = false;
+ shade(true);
+ }
+ if (_urgent)
+ fireUrgent();
+
+ 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
+ if (_modal); // nothing to do for this
+ if (_above); // nothing to do for this
+ if (_below); // nothing to do for this
}
+void Client::fireUrgent()
+{
+ // call the python UrgentWindow callbacks
+ EventData data(_screen, this, EventAction::UrgentWindow, 0);
+ openbox->bindings()->fireEvent(&data);
+}
-void OBClient::shade(bool shade)
+void Client::shade(bool shade)
{
- if (shade == _shaded) return; // already done
+ if (!(_functions & Func_Shade) || // can't
+ _shaded == shade) return; // already done
- _wmstate = shade ? IconicState : NormalState;
+ // when we're iconic, don't change the wmstate
+ if (!_iconic)
+ _wmstate = shade ? IconicState : NormalState;
_shaded = shade;
changeState();
frame->adjustSize();
}
+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(_desktop);
+ int x = frame->area().x(), y = frame->area().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;
+
+ 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;
+ _functions = _functions & (Func_Close | Func_Fullscreen | Func_Iconify);
+ // save the decorations and remove them
+ saved_decor = _decorations;
+ _decorations = 0;
+ 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);
+ x = 0;
+ y = 0;
+ w = info->size().width();
+ h = info->size().height();
+ } else {
+ _functions = saved_func;
+ _decorations = saved_decor;
+
+ 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(_desktop);
+ 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
+
+ // 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);
+
+ // try focus us when we go into fullscreen mode
+ 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)
+{
+ _disabled_decorations = flags;
+ setupDecorAndFunctions();
+}
+
+void Client::installColormap(bool install) const
+{
+ XWindowAttributes wa;
+ if (XGetWindowAttributes(**otk::display, _window, &wa)) {
+ if (install)
+ XInstallColormap(**otk::display, wa.colormap);
+ else
+ XUninstallColormap(**otk::display, wa.colormap);
+ }
+}
-bool OBClient::focus() const
+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
+ 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->isVisible() && (_can_focus || _focus_notify))) return false;
+ 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)
+ XEvent ev;
+ if (XCheckTypedWindowEvent(**otk::display, _window, DestroyNotify, &ev)) {
+ XPutBackEvent(**otk::display, &ev);
+ return false;
+ }
+ while (XCheckTypedWindowEvent(**otk::display, _window, UnmapNotify, &ev)) {
+ if (ignore_unmaps) {
+ unmapHandler(ev.xunmap);
+ } else {
+ XPutBackEvent(**otk::display, &ev);
+ return false;
+ }
+ }
if (_can_focus)
- XSetInputFocus(otk::OBDisplay::display, _window,
+ XSetInputFocus(**otk::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.message_type = otk::Property::atoms.wm_protocols;
+ ce.xclient.display = **otk::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[0] = otk::Property::atoms.wm_take_focus;
+ ce.xclient.data.l[1] = openbox->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);
+ XSendEvent(**otk::display, _window, False, NoEventMask, &ce);
}
+ XSync(**otk::display, False);
return true;
}
-void OBClient::unfocus() const
+void Client::unfocus() const
{
- if (!_focused) return;
-
- assert(Openbox::instance->focusedClient() == this);
- Openbox::instance->setFocusedClient(0);
+ assert(openbox->focusedClient() == this);
+ openbox->setFocusedClient(0);
}
-void OBClient::focusHandler(const XFocusChangeEvent &e)
+void Client::focusHandler(const XFocusChangeEvent &e)
{
#ifdef DEBUG
// printf("FocusIn for 0x%lx\n", e.window);
#endif // DEBUG
- OtkEventHandler::focusHandler(e);
+ otk::EventHandler::focusHandler(e);
- frame->focus();
_focused = true;
+ frame->adjustFocus();
- Openbox::instance->setFocusedClient(this);
+ calcLayer(); // focus state can affect the stacking layer
+
+ openbox->setFocusedClient(this);
}
-void OBClient::unfocusHandler(const XFocusChangeEvent &e)
+void Client::unfocusHandler(const XFocusChangeEvent &e)
{
#ifdef DEBUG
// printf("FocusOut for 0x%lx\n", e.window);
#endif // DEBUG
- OtkEventHandler::unfocusHandler(e);
+ otk::EventHandler::unfocusHandler(e);
- frame->unfocus();
_focused = false;
+ frame->adjustFocus();
+
+ calcLayer(); // focus state can affect the stacking layer
- if (Openbox::instance->focusedClient() == this)
- Openbox::instance->setFocusedClient(0);
+ if (openbox->focusedClient() == this)
+ openbox->setFocusedClient(0);
}
-void OBClient::configureRequestHandler(const XConfigureRequestEvent &e)
+void Client::configureRequestHandler(const XConfigureRequestEvent &ec)
{
#ifdef DEBUG
- printf("ConfigureRequest for 0x%lx\n", e.window);
+ printf("ConfigureRequest for 0x%lx\n", ec.window);
#endif // DEBUG
- OtkEventHandler::configureRequestHandler(e);
+ otk::EventHandler::configureRequestHandler(ec);
- // XXX: if we are iconic (or shaded? (fvwm does that)) ignore the event
+ // compress these
+ XConfigureRequestEvent e = ec;
+ XEvent ev;
+ while (XCheckTypedWindowEvent(**otk::display, window(), ConfigureRequest,
+ &ev)) {
+ // XXX if this causes bad things.. we can compress config req's with the
+ // same mask.
+ e.value_mask |= ev.xconfigurerequest.value_mask;
+ if (ev.xconfigurerequest.value_mask & CWX)
+ e.x = ev.xconfigurerequest.x;
+ if (ev.xconfigurerequest.value_mask & CWY)
+ e.y = ev.xconfigurerequest.y;
+ if (ev.xconfigurerequest.value_mask & CWWidth)
+ e.width = ev.xconfigurerequest.width;
+ if (ev.xconfigurerequest.value_mask & CWHeight)
+ e.height = ev.xconfigurerequest.height;
+ if (ev.xconfigurerequest.value_mask & CWBorderWidth)
+ e.border_width = ev.xconfigurerequest.border_width;
+ if (ev.xconfigurerequest.value_mask & CWStackMode)
+ e.detail = ev.xconfigurerequest.detail;
+ }
+
+ // if we are iconic (or shaded (fvwm does this)) ignore the event
+ if (_iconic || _shaded) return;
if (e.value_mask & CWBorderWidth)
_border_width = e.border_width;
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);
+ internal_resize(corner, w, h, false, x, y);
} else // if JUST resizing...
- resize(corner, w, h);
+ internal_resize(corner, w, h, false);
} 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);
+ internal_move(x, y);
}
if (e.value_mask & CWStackMode) {
switch (e.detail) {
case Below:
case BottomIf:
- Openbox::instance->screen(_screen)->restack(false, this); // lower
+ openbox->screen(_screen)->lowerWindow(this);
break;
case Above:
case TopIf:
default:
- Openbox::instance->screen(_screen)->restack(true, this); // raise
+ openbox->screen(_screen)->raiseWindow(this);
break;
}
}
}
-void OBClient::unmapHandler(const XUnmapEvent &e)
+void Client::unmapHandler(const XUnmapEvent &e)
{
if (ignore_unmaps) {
#ifdef DEBUG
- printf("Ignored UnmapNotify for 0x%lx (event 0x%lx)\n", e.window, e.event);
+// printf("Ignored UnmapNotify for 0x%lx (event 0x%lx)\n", e.window, e.event);
#endif // DEBUG
ignore_unmaps--;
return;
printf("UnmapNotify for 0x%lx\n", e.window);
#endif // DEBUG
- OtkEventHandler::unmapHandler(e);
+ otk::EventHandler::unmapHandler(e);
// this deletes us etc
- Openbox::instance->screen(_screen)->unmanageWindow(this);
+ openbox->screen(_screen)->unmanageWindow(this);
}
-void OBClient::destroyHandler(const XDestroyWindowEvent &e)
+void Client::destroyHandler(const XDestroyWindowEvent &e)
{
#ifdef DEBUG
printf("DestroyNotify for 0x%lx\n", e.window);
#endif // DEBUG
- OtkEventHandler::destroyHandler(e);
+ otk::EventHandler::destroyHandler(e);
// this deletes us etc
- Openbox::instance->screen(_screen)->unmanageWindow(this);
+ openbox->screen(_screen)->unmanageWindow(this);
}
-void OBClient::reparentHandler(const XReparentEvent &e)
+void Client::reparentHandler(const XReparentEvent &e)
{
// this is when the client is first taken captive in the frame
if (e.parent == frame->plate()) return;
printf("ReparentNotify for 0x%lx\n", e.window);
#endif // DEBUG
- OtkEventHandler::reparentHandler(e);
+ otk::EventHandler::reparentHandler(e);
/*
This event is quite rare and is usually handled in unmapHandler.
// server to deal with after we unmanage the window
XEvent ev;
ev.xreparent = e;
- XPutBackEvent(otk::OBDisplay::display, &ev);
+ XPutBackEvent(**otk::display, &ev);
// this deletes us etc
- Openbox::instance->screen(_screen)->unmanageWindow(this);
+ openbox->screen(_screen)->unmanageWindow(this);
+}
+
+void Client::mapRequestHandler(const XMapRequestEvent &e)
+{
+#ifdef DEBUG
+ printf("MapRequest for already managed 0x%lx\n", e.window);
+#endif // DEBUG
+
+ assert(_iconic); // we shouldn't be able to get this unless we're iconic
+
+ // move to the current desktop (uniconify)
+ iconify(false);
+ // XXX: should we focus/raise the window? (basically a net_wm_active_window)
}
}
projects / chaz / openbox / blobdiff