_button_close.setText("X");
_button_iconify.setText("I");
_button_max.setText("M");
- _button_stick.setText("C");
+ _button_stick.setText("S");
_label.setText(_client->title());
_style = 0;
assert(style);
otk::OtkWidget::setStyle(style);
- // don't let grips change textures when they are pressed
- _grip_left.setPressedFocusTexture(_grip_left.getTexture());
- _grip_left.setPressedUnfocusTexture(_grip_left.getUnfocusTexture());
- _grip_right.setPressedFocusTexture(_grip_right.getTexture());
- _grip_right.setPressedUnfocusTexture(_grip_right.getUnfocusTexture());
-
+ // set the grips' textures
+ _grip_left.setTexture(style->getGripFocus());
+ _grip_left.setUnfocusTexture(style->getGripUnfocus());
+ _grip_left.setPressedFocusTexture(style->getGripFocus());
+ _grip_left.setPressedUnfocusTexture(style->getGripUnfocus());
+ _grip_right.setTexture(style->getGripFocus());
+ _grip_right.setUnfocusTexture(style->getGripUnfocus());
+ _grip_right.setPressedFocusTexture(style->getGripFocus());
+ _grip_right.setPressedUnfocusTexture(style->getGripUnfocus());
+
+ _titlebar.setTexture(style->getTitleFocus());
+ _titlebar.setUnfocusTexture(style->getTitleUnfocus());
+ _handle.setTexture(style->getHandleFocus());
+ _handle.setUnfocusTexture(style->getHandleUnfocus());
+
// if a style was previously set, then 'replace' is true, cause we're
// replacing a style
bool replace = (_style);
_decorations = _client->decorations();
_decorations = 0xffffffff;
- int width; // the width of the whole frame
+ int width; // the width of the client and its border
int bwidth; // width to make borders
int cbwidth; // width of the inner client border
cbwidth = _style->getFrameWidth();
} else
bwidth = cbwidth = 0;
- _size.left = _size.top = _size.bottom = _size.right = bwidth + cbwidth;
- width = _client->area().width() + (bwidth + cbwidth) * 2;
+ // inside this function _size is the size EXCLUDING the outer border
+ // at the end of this function it becomes the size INCLUDING the outer border
+ _size.left = _size.top = _size.bottom = _size.right = cbwidth;
+ width = _client->area().width() + cbwidth * 2;
XSetWindowBorderWidth(otk::OBDisplay::display, _plate.getWindow(), cbwidth);
// 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.setWidth(_label.width() -
- ((_button_iconify.width() + sep) *
- (layout.size() - 1) + sep * 2));
+ _label.setWidth(width - sep * 2 -
+ (_button_iconify.width() + sep) * (layout.size() - 1));
int x = sep;
for (int i = 0, len = layout.size(); i < len; ++i) {
if (_decorations & OBClient::Decor_Handle) {
_handle.setGeometry(-bwidth,
- _size.top + _client->area().height() +
- _style->getFrameWidth(),
+ _size.top + _client->area().height() + cbwidth,
width, _style->getHandleWidth());
_grip_left.setGeometry(-bwidth,
-bwidth,
else
_handle.hide(true);
+ // inside this function _size is the size EXCLUDING the outer border
+ // at the end of this function it becomes the size INCLUDING the outer border
+ _size.left += bwidth;
+ _size.right += bwidth;
+ _size.top += bwidth;
+ _size.bottom += bwidth;
+
// XXX: more is gunna have to happen here
adjustShape();
//XRaiseWindow(otk::OBDisplay::display, _client->window());
// map the client so it maps when the frame does
XMapWindow(otk::OBDisplay::display, _client->window());
-
+
adjust();
+ applyGravity();
}
}
-Window OBFrame::createChild(Window parent, Cursor cursor)
+void OBFrame::applyGravity()
{
- 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;
+ int x, y;
+ // apply horizontal window gravity
+ switch (_client->gravity()) {
+ default:
+ case NorthWestGravity:
+ case SouthWestGravity:
+ case WestGravity:
+ x = _client->area().x();
+ break;
+
+ case NorthGravity:
+ case SouthGravity:
+ case CenterGravity:
+ x = _client->area().x() - (_size.left + _size.right) / 2;
+ break;
+
+ case NorthEastGravity:
+ case SouthEastGravity:
+ case EastGravity:
+ x = _client->area().x() - _size.left - _size.right + 2;
+ break;
+
+ case ForgetGravity:
+ case StaticGravity:
+ x = _client->area().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);
- return w;
+ // apply vertical window gravity
+ switch (_client->gravity()) {
+ default:
+ case NorthWestGravity:
+ case NorthEastGravity:
+ case NorthGravity:
+ y = _client->area().y();
+ break;
+
+ case CenterGravity:
+ case EastGravity:
+ case WestGravity:
+ y = _client->area().y() - (_size.top + _size.bottom) / 2;
+ break;
+
+ case SouthWestGravity:
+ case SouthEastGravity:
+ case SouthGravity:
+ y = _client->area().y() - _size.top - _size.bottom + 2;
+ break;
+
+ case ForgetGravity:
+ case StaticGravity:
+ y = _client->area().y() - _size.top;
+ break;
+ }
+ move(x, y);
}
-Window OBFrame::createFrame()
-{
- 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);
-}
-
}
projects / chaz / openbox / blobdiff