#endif // SHAPE
}
+#include "openbox.hh"
#include "frame.hh"
#include "client.hh"
#include "otk/display.hh"
namespace ob {
-OBFrame::OBFrame(const OBClient *client, const otk::Style *style)
- : _client(client),
- _screen(otk::OBDisplay::screenInfo(client->screen()))
+const long OBFrame::event_mask;
+
+OBFrame::OBFrame(OBClient *client, otk::Style *style)
+ : otk::OtkWidget(Openbox::instance, style),
+ OBWidget(Type_Frame),
+ _client(client),
+ _screen(otk::OBDisplay::screenInfo(client->screen())),
+ _plate(this, OBWidget::Type_Plate),
+ _titlebar(this, OBWidget::Type_Titlebar),
+ _button_close(&_titlebar, OBWidget::Type_CloseButton),
+ _button_iconify(&_titlebar, OBWidget::Type_IconifyButton),
+ _button_max(&_titlebar, OBWidget::Type_MaximizeButton),
+ _button_stick(&_titlebar, OBWidget::Type_StickyButton),
+ _label(&_titlebar, OBWidget::Type_Label),
+ _handle(this, OBWidget::Type_Handle),
+ _grip_left(&_handle, OBWidget::Type_LeftGrip),
+ _grip_right(&_handle, OBWidget::Type_RightGrip),
+ _decorations(client->decorations())
{
assert(client);
assert(style);
-
- _decorations = client->decorations();
-
- // create the base frame parent window
- _window = createFrame();
- assert(_window);
-
- // create all of the style element child windows
- _titlebar = createChild(_window, 0);
- assert(_titlebar);
- _button_iconify = createChild(_titlebar, 0);
- assert(_button_iconify);
- _button_max = createChild(_titlebar, 0);
- assert(_button_max);
- _button_stick = createChild(_titlebar, 0);
- assert(_button_stick);
- _button_close = createChild(_titlebar, 0);
- assert(_button_close);
- _label = createChild(_titlebar, 0);
- assert(_label);
- XMapSubwindows(otk::OBDisplay::display, _titlebar);
-
- _handle = createChild(_window, 0);
- assert(_handle);
- _grip_left = createChild(_handle, 0);
- assert(_grip_left);
- _grip_right = createChild(_handle, 0);
- assert(_grip_right);
- XMapSubwindows(otk::OBDisplay::display, _handle);
+
+ XSelectInput(otk::OBDisplay::display, window(), OBFrame::event_mask);
+
+ _grip_left.setCursor(Openbox::instance->cursors().ll_angle);
+ _grip_right.setCursor(Openbox::instance->cursors().lr_angle);
+ _label.setText(_client->title());
+
_style = 0;
- loadStyle(style);
+ setStyle(style);
+ otk::OtkWidget::unfocus(); // stuff starts out appearing focused in otk
+
+ _plate.show(); // the other stuff is shown based on decor settings
+
grabClient();
}
OBFrame::~OBFrame()
{
- XDestroyWindow(otk::OBDisplay::display, _button_iconify);
- XDestroyWindow(otk::OBDisplay::display, _button_max);
- XDestroyWindow(otk::OBDisplay::display, _button_stick);
- XDestroyWindow(otk::OBDisplay::display, _button_close);
- XDestroyWindow(otk::OBDisplay::display, _label);
- XDestroyWindow(otk::OBDisplay::display, _titlebar);
- XDestroyWindow(otk::OBDisplay::display, _grip_left);
- XDestroyWindow(otk::OBDisplay::display, _grip_right);
- XDestroyWindow(otk::OBDisplay::display, _handle);
-
releaseClient(false);
+}
- XDestroyWindow(otk::OBDisplay::display, _window);
+
+void OBFrame::setTitle(const std::string &text)
+{
+ _label.setText(text);
+ _label.update();
}
-void OBFrame::loadStyle(const otk::Style *style)
+void OBFrame::setStyle(otk::Style *style)
{
assert(style);
+ otk::OtkWidget::setStyle(style);
+
// if a style was previously set, then 'replace' is true, cause we're
// replacing a style
bool replace = (_style);
_style = style;
- XSetWindowBorderWidth(otk::OBDisplay::display, _window,
- _style->getBorderWidth());
- XSetWindowBorder(otk::OBDisplay::display, _window,
- _style->getBorderColor().pixel());
- XSetWindowBorderWidth(otk::OBDisplay::display, _titlebar,
- _style->getBorderWidth());
- XSetWindowBorder(otk::OBDisplay::display, _titlebar,
- _style->getBorderColor().pixel());
- XSetWindowBorderWidth(otk::OBDisplay::display, _grip_left,
- _style->getBorderWidth());
- XSetWindowBorder(otk::OBDisplay::display, _grip_left,
- _style->getBorderColor().pixel());
- XSetWindowBorderWidth(otk::OBDisplay::display, _grip_right,
- _style->getBorderWidth());
- XSetWindowBorder(otk::OBDisplay::display, _grip_right,
- _style->getBorderColor().pixel());
- XSetWindowBorderWidth(otk::OBDisplay::display, _handle,
- _style->getBorderWidth());
- XSetWindowBorder(otk::OBDisplay::display, _handle,
- _style->getBorderColor().pixel());
-
- // XXX: if (focused)
- XSetWindowBackground(otk::OBDisplay::display, _window,
- _style->getFrameFocus().color().pixel());
- // XXX: else
- // XXX: XSetWindowBackground(otk::OBDisplay::display, _window,
- // XXX: _style->getFrameUnfocus().color().pixel());
-
- // if !replace, then update() will get called after the client is grabbed!
+ setBorderColor(_style->getBorderColor());
+
+ // if !replace, then adjust() will get called after the client is grabbed!
if (replace) {
- update();
-
- // XXX: make everything redraw
+ // size/position everything
+ adjustSize();
+ adjustPosition();
}
}
-void OBFrame::update()
+void OBFrame::focus()
+{
+ otk::OtkWidget::focus();
+ update();
+ _handle.update();
+}
+
+
+void OBFrame::unfocus()
+{
+ otk::OtkWidget::unfocus();
+ update();
+}
+
+
+void OBFrame::adjust()
+{
+ // the party all happens in adjustSize
+}
+
+
+void OBFrame::adjustSize()
{
// XXX: only if not overridden or something!!! MORE LOGIC HERE!!
_decorations = _client->decorations();
-
- int width; // the width of the client window and the border around it
+ _decorations = 0xffffffff;
+
+ int width; // the width of the client and its border
+ int bwidth; // width to make borders
+ int cbwidth; // width of the inner client border
+ const int bevel = _style->getBevelWidth();
if (_decorations & OBClient::Decor_Border) {
- _size.left = _size.top = _size.bottom = _size.right =
- _style->getFrameWidth();
- width = _client->area().width() + _style->getFrameWidth() * 2;
- } else {
- _size.left = _size.top = _size.bottom = _size.right = 0;
- width = _client->area().width();
- }
-
+ bwidth = _style->getBorderWidth();
+ cbwidth = _style->getFrameWidth();
+ } else
+ bwidth = cbwidth = 0;
+ _innersize.left = _innersize.top = _innersize.bottom = _innersize.right =
+ cbwidth;
+ width = _client->area().width() + cbwidth * 2;
+
+ _plate.setBorderWidth(cbwidth);
+
+ setBorderWidth(bwidth);
+ _titlebar.setBorderWidth(bwidth);
+ _grip_left.setBorderWidth(bwidth);
+ _grip_right.setBorderWidth(bwidth);
+ _handle.setBorderWidth(bwidth);
+
if (_decorations & OBClient::Decor_Titlebar) {
// set the titlebar size
- _titlebar_area.setRect(-_style->getBorderWidth(),
- -_style->getBorderWidth(),
- width,
- (_style->getFont().height() +
- _style->getBevelWidth() * 2));
- _size.top += _titlebar_area.height() + _style->getBorderWidth();
+ _titlebar.setGeometry(-bwidth,
+ -bwidth,
+ width,
+ _style->getFont()->height() + bevel * 2);
+ _innersize.top += _titlebar.height() + bwidth;
// set the label size
- _label_area.setRect(0, _style->getBevelWidth(),
- width, _style->getFont().height());
+ _label.setGeometry(0, bevel, width, _style->getFont()->height());
// set the buttons sizes
if (_decorations & OBClient::Decor_Iconify)
- _button_iconify_area.setRect(0, _style->getBevelWidth() + 1,
- _label_area.height() - 2,
- _label_area.height() - 2);
+ _button_iconify.setGeometry(0, bevel + 1,
+ _label.height() - 2,
+ _label.height() - 2);
if (_decorations & OBClient::Decor_Maximize)
- _button_max_area.setRect(0, _style->getBevelWidth() + 1,
- _label_area.height() - 2,
- _label_area.height() - 2);
+ _button_max.setGeometry(0, bevel + 1,
+ _label.height() - 2,
+ _label.height() - 2);
if (_decorations & OBClient::Decor_Sticky)
- _button_stick_area.setRect(0, _style->getBevelWidth() + 1,
- _label_area.height() - 2,
- _label_area.height() - 2);
+ _button_stick.setGeometry(0, bevel + 1,
+ _label.height() - 2,
+ _label.height() - 2);
if (_decorations & OBClient::Decor_Close)
- _button_close_area.setRect(0, _style->getBevelWidth() + 1,
- _label_area.height() - 2,
- _label_area.height() - 2);
+ _button_close.setGeometry(0, bevel + 1,
+ _label.height() - 2,
+ _label.height() - 2);
// separation between titlebar elements
- const int sep = _style->getBevelWidth() + 1;
+ const int sep = bevel + 1;
- std::string layout = "ILMC"; // XXX: get this from somewhere
+ std::string layout = "SLIMC"; // XXX: get this from somewhere
// XXX: it is REQUIRED that by this point, the string only has one of each
// possible letter, all of the letters are valid, and L exists somewhere in
// the string!
// that the ONE LABEL!!
// adds an extra sep so that there's a space on either side of the
// titlebar.. note: x = sep, below.
- _label_area.setWidth(_label_area.width() -
- ((_button_iconify_area.width() + sep) *
- (layout.size() - 1) + sep));
+ int lwidth = width - sep * 2 -
+ (_button_iconify.width() + sep) * (layout.size() - 1);
+ // quick sanity check for really small windows. if this is needed, its
+ // obviously not going to be displayed right...
+ // XXX: maybe we should make this look better somehow? constraints?
+ if (lwidth <= 0) lwidth = 1;
+ _label.setWidth(lwidth);
int x = sep;
for (int i = 0, len = layout.size(); i < len; ++i) {
- otk::Rect *area;
switch (layout[i]) {
case 'I':
- if (!(_decorations & OBClient::Decor_Iconify))
- continue; // skip it
- area = &_button_iconify_area;
+ _button_iconify.move(x, _button_iconify.rect().y());
+ x += _button_iconify.width();
break;
case 'L':
- area = &_label_area;
+ _label.move(x, _label.rect().y());
+ x += _label.width();
break;
case 'M':
- if (!(_decorations & OBClient::Decor_Maximize))
- continue; // skip it
- area = &_button_max_area;
+ _button_max.move(x, _button_max.rect().y());
+ x += _button_max.width();
break;
case 'S':
- if (!(_decorations & OBClient::Decor_Sticky))
- continue; // skip it
- area = &_button_stick_area;
+ _button_stick.move(x, _button_stick.rect().y());
+ x += _button_stick.width();
break;
case 'C':
- if (!(_decorations & OBClient::Decor_Close))
- continue; // skip it
- area = &_button_close_area;
+ _button_close.move(x, _button_close.rect().y());
+ x += _button_close.width();
break;
default:
assert(false); // the layout string is invalid!
- continue; // just to fuck with g++
}
- area->setX(x);
- x += sep + area->width();
+ x += sep;
}
}
if (_decorations & OBClient::Decor_Handle) {
- _handle_area.setRect(-_style->getBorderWidth(),
- _size.top + _client->area().height() +
- _style->getFrameWidth(),
- width, _style->getHandleWidth());
- _grip_left_area.setRect(-_style->getBorderWidth(),
- -_style->getBorderWidth(),
+ _handle.setGeometry(-bwidth,
+ _innersize.top + _client->area().height() + cbwidth,
+ width, _style->getHandleWidth());
+ _grip_left.setGeometry(-bwidth,
+ -bwidth,
+ // XXX: get a Point class in otk and use that for
+ // the 'buttons size' since theyre all the same
+ _button_iconify.width() * 2,
+ _handle.height());
+ _grip_right.setGeometry(((_handle.rect().right() + 1) -
+ _button_iconify.width() * 2),
+ -bwidth,
// XXX: get a Point class in otk and use that for
// the 'buttons size' since theyre all the same
- _button_iconify_area.width() * 2,
- _handle_area.height());
- _grip_right_area.setRect(((_handle_area.right() + 1) -
- _button_iconify_area.width() * 2),
- -_style->getBorderWidth(),
- // XXX: get a Point class in otk and use that for
- // the 'buttons size' since theyre all the same
- _button_iconify_area.width() * 2,
- _handle_area.height());
- _size.bottom += _handle_area.height() + _style->getBorderWidth();
+ _button_iconify.width() * 2,
+ _handle.height());
+ _innersize.bottom += _handle.height() + bwidth;
}
// position/size all the windows
- XResizeWindow(otk::OBDisplay::display, _window,
- _size.left + _size.right + _client->area().width(),
- _size.top + _size.bottom + _client->area().height());
+ resize(_innersize.left + _innersize.right + _client->area().width(),
+ _innersize.top + _innersize.bottom + _client->area().height());
- XMoveWindow(otk::OBDisplay::display, _client->window(),
- _size.left, _size.top);
-
- if (_decorations & OBClient::Decor_Titlebar) {
- XMoveResizeWindow(otk::OBDisplay::display, _titlebar,
- _titlebar_area.x(), _titlebar_area.y(),
- _titlebar_area.width(), _titlebar_area.height());
- XMoveResizeWindow(otk::OBDisplay::display, _label,
- _label_area.x(), _label_area.y(),
- _label_area.width(), _label_area.height());
- if (_decorations & OBClient::Decor_Iconify)
- XMoveResizeWindow(otk::OBDisplay::display, _button_iconify,
- _button_iconify_area.x(), _button_iconify_area.y(),
- _button_iconify_area.width(),
- _button_iconify_area.height());
- if (_decorations & OBClient::Decor_Maximize)
- XMoveResizeWindow(otk::OBDisplay::display, _button_max,
- _button_max_area.x(), _button_max_area.y(),
- _button_max_area.width(),
- _button_max_area.height());
- if (_decorations & OBClient::Decor_Sticky)
- XMoveResizeWindow(otk::OBDisplay::display, _button_stick,
- _button_stick_area.x(), _button_stick_area.y(),
- _button_stick_area.width(),
- _button_stick_area.height());
- if (_decorations & OBClient::Decor_Close)
- XMoveResizeWindow(otk::OBDisplay::display, _button_close,
- _button_close_area.x(), _button_close_area.y(),
- _button_close_area.width(),
- _button_close_area.height());
- }
-
- if (_decorations & OBClient::Decor_Handle) {
- XMoveResizeWindow(otk::OBDisplay::display, _handle,
- _handle_area.x(), _handle_area.y(),
- _handle_area.width(), _handle_area.height());
- XMoveResizeWindow(otk::OBDisplay::display, _grip_left,
- _grip_left_area.x(), _grip_left_area.y(),
- _grip_left_area.width(), _grip_left_area.height());
- XMoveResizeWindow(otk::OBDisplay::display, _grip_right,
- _grip_right_area.x(), _grip_right_area.y(),
- _grip_right_area.width(), _grip_right_area.height());
- }
+ _plate.setGeometry(_innersize.left - cbwidth, _innersize.top - cbwidth,
+ _client->area().width(), _client->area().height());
// map/unmap all the windows
if (_decorations & OBClient::Decor_Titlebar) {
- XMapWindow(otk::OBDisplay::display, _label);
+ _label.show();
if (_decorations & OBClient::Decor_Iconify)
- XMapWindow(otk::OBDisplay::display, _button_iconify);
+ _button_iconify.show();
else
- XUnmapWindow(otk::OBDisplay::display, _button_iconify);
+ _button_iconify.hide();
if (_decorations & OBClient::Decor_Maximize)
- XMapWindow(otk::OBDisplay::display, _button_max);
+ _button_max.show();
else
- XUnmapWindow(otk::OBDisplay::display, _button_max);
+ _button_max.hide();
if (_decorations & OBClient::Decor_Sticky)
- XMapWindow(otk::OBDisplay::display, _button_stick);
+ _button_stick.show();
else
- XUnmapWindow(otk::OBDisplay::display, _button_stick);
+ _button_stick.hide();
if (_decorations & OBClient::Decor_Close)
- XMapWindow(otk::OBDisplay::display, _button_close);
+ _button_close.show();
else
- XUnmapWindow(otk::OBDisplay::display, _button_close);
- XMapWindow(otk::OBDisplay::display, _titlebar);
+ _button_close.hide();
+ _titlebar.show();
} else {
- XUnmapWindow(otk::OBDisplay::display, _titlebar);
- XUnmapWindow(otk::OBDisplay::display, _label);
- XUnmapWindow(otk::OBDisplay::display, _button_iconify);
- XUnmapWindow(otk::OBDisplay::display, _button_max);
- XUnmapWindow(otk::OBDisplay::display, _button_stick);
- XUnmapWindow(otk::OBDisplay::display, _button_close);
+ _titlebar.hide(true);
}
- if (_decorations & OBClient::Decor_Handle) {
- XMapWindow(otk::OBDisplay::display, _grip_left);
- XMapWindow(otk::OBDisplay::display, _grip_right);
- XMapWindow(otk::OBDisplay::display, _handle);
- } else {
- XUnmapWindow(otk::OBDisplay::display, _handle);
- XUnmapWindow(otk::OBDisplay::display, _grip_left);
- XUnmapWindow(otk::OBDisplay::display, _grip_right);
- }
+ if (_decorations & OBClient::Decor_Handle)
+ _handle.show(true);
+ else
+ _handle.hide(true);
- // XXX: more is gunna have to happen here
+ _size.left = _innersize.left + bwidth;
+ _size.right = _innersize.right + bwidth;
+ _size.top = _innersize.top + bwidth;
+ _size.bottom = _innersize.bottom + bwidth;
+
+ adjustShape();
+
+ update();
+}
- updateShape();
+
+void OBFrame::adjustPosition()
+{
+ int x, y;
+ clientGravity(x, y);
+ move(x, y);
}
-void OBFrame::updateShape()
+void OBFrame::adjustShape()
{
#ifdef SHAPE
+ int bwidth = (_decorations & OBClient::Decor_Border) ?
+ _style->getBorderWidth() : 0;
+
if (!_client->shaped()) {
// clear the shape on the frame window
- XShapeCombineMask(otk::OBDisplay::display, _window, ShapeBounding,
- _size.left,
- _size.top,
+ XShapeCombineMask(otk::OBDisplay::display, window(), ShapeBounding,
+ _innersize.left,
+ _innersize.top,
None, ShapeSet);
} else {
// make the frame's shape match the clients
- XShapeCombineShape(otk::OBDisplay::display, _window, ShapeBounding,
- _size.left,
- _size.top,
+ XShapeCombineShape(otk::OBDisplay::display, window(), ShapeBounding,
+ _innersize.left,
+ _innersize.top,
_client->window(), ShapeBounding, ShapeSet);
- int num = 0;
+ int num = 0;
XRectangle xrect[2];
- /*
- if (decorations & Decor_Titlebar) {
- xrect[0].x = xrect[0].y = -frame.border_w;
- xrect[0].width = frame.rect.width();
- xrect[0].height = frame.title_h + (frame.border_w * 2);
- ++num;
+ if (_decorations & OBClient::Decor_Titlebar) {
+ xrect[0].x = _titlebar.rect().x();
+ xrect[0].y = _titlebar.rect().y();
+ xrect[0].width = _titlebar.width() + bwidth * 2; // XXX: this is useless once the widget handles borders!
+ xrect[0].height = _titlebar.height() + bwidth * 2;
+ ++num;
}
- if (decorations & Decor_Handle) {
- xrect[1].x = -frame.border_w;
- xrect[1].y = frame.rect.height() - frame.margin.bottom +
- frame.mwm_border_w - frame.border_w;
- xrect[1].width = frame.rect.width();
- xrect[1].height = frame.handle_h + (frame.border_w * 2);
- ++num;
- }*/
+ if (_decorations & OBClient::Decor_Handle) {
+ xrect[1].x = _handle.rect().x();
+ xrect[1].y = _handle.rect().y();
+ xrect[1].width = _handle.width() + bwidth * 2; // XXX: this is useless once the widget handles borders!
+ xrect[1].height = _handle.height() + bwidth * 2;
+ ++num;
+ }
- XShapeCombineRectangles(otk::OBDisplay::display, _window,
+ XShapeCombineRectangles(otk::OBDisplay::display, window(),
ShapeBounding, 0, 0, xrect, num,
ShapeUnion, Unsorted);
}
void OBFrame::grabClient()
{
- XGrabServer(otk::OBDisplay::display);
+ // reparent the client to the frame
+ XReparentWindow(otk::OBDisplay::display, _client->window(),
+ _plate.window(), 0, 0);
+ _client->ignore_unmaps++;
- // select the event mask on the frame
- XSelectInput(otk::OBDisplay::display, _window, SubstructureRedirectMask);
+ // select the event mask on the client's parent (to receive config req's)
+ XSelectInput(otk::OBDisplay::display, _plate.window(),
+ SubstructureRedirectMask);
- // reparent the client to the frame
- XSelectInput(otk::OBDisplay::display, _client->window(),
- OBClient::event_mask & ~StructureNotifyMask);
- XReparentWindow(otk::OBDisplay::display, _client->window(), _window, 0, 0);
- XSelectInput(otk::OBDisplay::display, _client->window(),
- OBClient::event_mask);
-
- // raise the client above the frame
- XRaiseWindow(otk::OBDisplay::display, _client->window());
// map the client so it maps when the frame does
XMapWindow(otk::OBDisplay::display, _client->window());
-
- XUngrabServer(otk::OBDisplay::display);
- update();
+ adjustSize();
+ adjustPosition();
}
// according to the ICCCM - if the client doesn't reparent to
// root, then we have to do it for them
XReparentWindow(otk::OBDisplay::display, _client->window(),
- _screen->getRootWindow(),
+ _screen->rootWindow(),
_client->area().x(), _client->area().y());
}
}
-Window OBFrame::createChild(Window parent, Cursor cursor)
+void OBFrame::clientGravity(int &x, int &y)
{
- XSetWindowAttributes attrib_create;
- unsigned long create_mask = CWBackPixmap | CWBorderPixel | CWEventMask;
-
- attrib_create.background_pixmap = None;
- attrib_create.event_mask = ButtonPressMask | ButtonReleaseMask |
- ButtonMotionMask | ExposureMask;
-
- if (cursor) {
- create_mask |= CWCursor;
- attrib_create.cursor = cursor;
+ x = _client->area().x();
+ y = _client->area().y();
+
+ // horizontal
+ switch (_client->gravity()) {
+ default:
+ case NorthWestGravity:
+ case SouthWestGravity:
+ case WestGravity:
+ break;
+
+ case NorthGravity:
+ case SouthGravity:
+ case CenterGravity:
+ x -= (_size.left + _size.right) / 2;
+ break;
+
+ case NorthEastGravity:
+ case SouthEastGravity:
+ case EastGravity:
+ x -= _size.left + _size.right;
+ break;
+
+ case ForgetGravity:
+ case StaticGravity:
+ x -= _size.left;
+ break;
}
- Window w = XCreateWindow(otk::OBDisplay::display, parent, 0, 0, 1, 1, 0,
- _screen->getDepth(), InputOutput,
- _screen->getVisual(), create_mask, &attrib_create);
- XRaiseWindow(otk::OBDisplay::display, w); // raise above the parent
- return w;
+ // vertical
+ switch (_client->gravity()) {
+ default:
+ case NorthWestGravity:
+ case NorthEastGravity:
+ case NorthGravity:
+ break;
+
+ case CenterGravity:
+ case EastGravity:
+ case WestGravity:
+ y -= (_size.top + _size.bottom) / 2;
+ break;
+
+ case SouthWestGravity:
+ case SouthEastGravity:
+ case SouthGravity:
+ y -= _size.top + _size.bottom;
+ break;
+
+ case ForgetGravity:
+ case StaticGravity:
+ y -= _size.top;
+ break;
+ }
}
-Window OBFrame::createFrame()
+void OBFrame::frameGravity(int &x, int &y)
{
- XSetWindowAttributes attrib_create;
- unsigned long create_mask = CWBackPixmap | CWBorderPixel | CWColormap |
- CWOverrideRedirect | CWEventMask;
-
- attrib_create.background_pixmap = None;
- attrib_create.colormap = _screen->getColormap();
- attrib_create.override_redirect = True;
- attrib_create.event_mask = EnterWindowMask | LeaveWindowMask | ButtonPress;
- /*
- We catch button presses because other wise they get passed down to the
- root window, which will then cause root menus to show when you click the
- window's frame.
- */
-
- return XCreateWindow(otk::OBDisplay::display, _screen->getRootWindow(),
- 0, 0, 1, 1, 0,
- _screen->getDepth(), InputOutput, _screen->getVisual(),
- create_mask, &attrib_create);
+ x = rect().x();
+ y = rect().y();
+
+ // horizontal
+ switch (_client->gravity()) {
+ default:
+ case NorthWestGravity:
+ case WestGravity:
+ case SouthWestGravity:
+ break;
+ case NorthGravity:
+ case CenterGravity:
+ case SouthGravity:
+ x += (_size.left + _size.right) / 2;
+ break;
+ case NorthEastGravity:
+ case EastGravity:
+ case SouthEastGravity:
+ x += _size.left + _size.right;
+ break;
+ case StaticGravity:
+ case ForgetGravity:
+ x += _size.left;
+ break;
+ }
+
+ // vertical
+ switch (_client->gravity()) {
+ default:
+ case NorthWestGravity:
+ case WestGravity:
+ case SouthWestGravity:
+ break;
+ case NorthGravity:
+ case CenterGravity:
+ case SouthGravity:
+ y += (_size.top + _size.bottom) / 2;
+ break;
+ case NorthEastGravity:
+ case EastGravity:
+ case SouthEastGravity:
+ y += _size.top + _size.bottom;
+ break;
+ case StaticGravity:
+ case ForgetGravity:
+ y += _size.top;
+ break;
+ }
}
+
}
projects / chaz / openbox / blobdiff