#include "openbox.hh"
#include "frame.hh"
#include "client.hh"
+#include "python.hh"
+#include "bindings.hh"
#include "otk/display.hh"
#include <string>
XSelectInput(otk::OBDisplay::display, window(), OBFrame::event_mask);
- unmanaged();
- _titlebar.unmanaged();
- _button_close.unmanaged();
- _button_iconify.unmanaged();
- _button_max.unmanaged();
- _button_stick.unmanaged();
- _label.unmanaged();
- _handle.unmanaged();
- _grip_left.unmanaged();
- _grip_right.unmanaged();
- _plate.unmanaged();
-
_grip_left.setCursor(Openbox::instance->cursors().ll_angle);
_grip_right.setCursor(Openbox::instance->cursors().lr_angle);
- _button_close.setText("X");
- _button_iconify.setText("I");
- _button_max.setText("M");
- _button_stick.setText("S");
_label.setText(_client->title());
_style = 0;
setStyle(style);
- //XXX: uncomment me unfocus(); // stuff starts out focused in otk
+ otk::OtkWidget::unfocus(); // stuff starts out appearing focused in otk
_plate.show(); // the other stuff is shown based on decor settings
}
+void OBFrame::setTitle(const std::string &text)
+{
+ _label.setText(text);
+ _label.update();
+}
+
+
void OBFrame::setStyle(otk::Style *style)
{
assert(style);
_style = style;
- // XXX: change when focus changes!
- XSetWindowBorder(otk::OBDisplay::display, window(),
- _style->getBorderColor()->pixel());
+ setBorderColor(_style->getBorderColor());
// if !replace, then adjust() will get called after the client is grabbed!
if (replace) {
}
+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!!
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) {
bwidth = _style->getBorderWidth();
_titlebar.setGeometry(-bwidth,
-bwidth,
width,
- (_style->getFont().height() +
- _style->getBevelWidth() * 2));
+ _style->getFont()->height() + bevel * 2);
_innersize.top += _titlebar.height() + bwidth;
// set the label size
- _label.setGeometry(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.setGeometry(0, _style->getBevelWidth() + 1,
+ _button_iconify.setGeometry(0, bevel + 1,
_label.height() - 2,
_label.height() - 2);
if (_decorations & OBClient::Decor_Maximize)
- _button_max.setGeometry(0, _style->getBevelWidth() + 1,
+ _button_max.setGeometry(0, bevel + 1,
_label.height() - 2,
_label.height() - 2);
if (_decorations & OBClient::Decor_Sticky)
- _button_stick.setGeometry(0, _style->getBevelWidth() + 1,
+ _button_stick.setGeometry(0, bevel + 1,
_label.height() - 2,
_label.height() - 2);
if (_decorations & OBClient::Decor_Close)
- _button_close.setGeometry(0, _style->getBevelWidth() + 1,
+ _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 = "SLIMC"; // XXX: get this from somewhere
// XXX: it is REQUIRED that by this point, the string only has one of each
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;