X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fframe.cc;h=4e30a1f528e93dfe15ffc1354684045ace8836e2;hb=3c61812e588fb3c34d0713d7f82ccbf21091f032;hp=fc85d6d15e20c19529b8504952c62ec09b171f78;hpb=70eb03ad50e1a71fd64c8cb1ebabbff311850553;p=chaz%2Fopenbox diff --git a/src/frame.cc b/src/frame.cc index fc85d6d1..4e30a1f5 100644 --- a/src/frame.cc +++ b/src/frame.cc @@ -23,24 +23,25 @@ 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), - _button_iconify(&_titlebar), - _button_max(&_titlebar), - _button_stick(&_titlebar), - _label(&_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), - _grip_right(&_handle), + _grip_left(&_handle, OBWidget::Type_LeftGrip), + _grip_right(&_handle, OBWidget::Type_RightGrip), _decorations(client->decorations()) { assert(client); assert(style); - XSelectInput(otk::OBDisplay::display, getWindow(), OBFrame::event_mask); + XSelectInput(otk::OBDisplay::display, window(), OBFrame::event_mask); unmanaged(); _titlebar.unmanaged(); @@ -85,15 +86,6 @@ void OBFrame::setStyle(otk::Style *style) assert(style); otk::OtkWidget::setStyle(style); - // 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()); // if a style was previously set, then 'replace' is true, cause we're // replacing a style @@ -106,11 +98,7 @@ void OBFrame::setStyle(otk::Style *style) _style = style; // XXX: change when focus changes! - XSetWindowBorder(otk::OBDisplay::display, getWindow(), - _style->getBorderColor()->pixel()); - XSetWindowBorder(otk::OBDisplay::display, _grip_left.getWindow(), - _style->getBorderColor()->pixel()); - XSetWindowBorder(otk::OBDisplay::display, _grip_right.getWindow(), + XSetWindowBorder(otk::OBDisplay::display, window(), _style->getBorderColor()->pixel()); // if !replace, then adjust() will get called after the client is grabbed! @@ -203,23 +191,23 @@ void OBFrame::adjustSize() for (int i = 0, len = layout.size(); i < len; ++i) { switch (layout[i]) { case 'I': - _button_iconify.move(x, _button_iconify.getRect().y()); + _button_iconify.move(x, _button_iconify.rect().y()); x += _button_iconify.width(); break; case 'L': - _label.move(x, _label.getRect().y()); + _label.move(x, _label.rect().y()); x += _label.width(); break; case 'M': - _button_max.move(x, _button_max.getRect().y()); + _button_max.move(x, _button_max.rect().y()); x += _button_max.width(); break; case 'S': - _button_stick.move(x, _button_stick.getRect().y()); + _button_stick.move(x, _button_stick.rect().y()); x += _button_stick.width(); break; case 'C': - _button_close.move(x, _button_close.getRect().y()); + _button_close.move(x, _button_close.rect().y()); x += _button_close.width(); break; default: @@ -239,7 +227,7 @@ void OBFrame::adjustSize() // the 'buttons size' since theyre all the same _button_iconify.width() * 2, _handle.height()); - _grip_right.setGeometry(((_handle.getRect().right() + 1) - + _grip_right.setGeometry(((_handle.rect().right() + 1) - _button_iconify.width() * 2), -bwidth, // XXX: get a Point class in otk and use that for @@ -316,13 +304,13 @@ void OBFrame::adjustShape() if (!_client->shaped()) { // clear the shape on the frame window - XShapeCombineMask(otk::OBDisplay::display, getWindow(), ShapeBounding, + 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, getWindow(), ShapeBounding, + XShapeCombineShape(otk::OBDisplay::display, window(), ShapeBounding, _innersize.left, _innersize.top, _client->window(), ShapeBounding, ShapeSet); @@ -331,22 +319,22 @@ void OBFrame::adjustShape() XRectangle xrect[2]; if (_decorations & OBClient::Decor_Titlebar) { - xrect[0].x = _titlebar.getRect().x(); - xrect[0].y = _titlebar.getRect().y(); + 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 & OBClient::Decor_Handle) { - xrect[1].x = _handle.getRect().x(); - xrect[1].y = _handle.getRect().y(); + 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, getWindow(), + XShapeCombineRectangles(otk::OBDisplay::display, window(), ShapeBounding, 0, 0, xrect, num, ShapeUnion, Unsorted); } @@ -359,11 +347,11 @@ void OBFrame::grabClient() // reparent the client to the frame XReparentWindow(otk::OBDisplay::display, _client->window(), - _plate.getWindow(), 0, 0); + _plate.window(), 0, 0); _client->ignore_unmaps++; // select the event mask on the client's parent (to receive config req's) - XSelectInput(otk::OBDisplay::display, _plate.getWindow(), + XSelectInput(otk::OBDisplay::display, _plate.window(), SubstructureRedirectMask); // map the client so it maps when the frame does @@ -386,7 +374,7 @@ void OBFrame::releaseClient(bool remap) // 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()); } @@ -457,8 +445,8 @@ void OBFrame::clientGravity(int &x, int &y) void OBFrame::frameGravity(int &x, int &y) { - x = getRect().x(); - y = getRect().y(); + x = rect().x(); + y = rect().y(); // horizontal switch (_client->gravity()) {