better msgs

[chaz/openbox] / otk / button.cc

diff --git a/otk/button.cc b/otk/button.cc
index c88fc707c3fa631657ba8e4cd71d792d004ca42f..f080c7699d24d5de5a90f0d113a72cc84de5b85e 100644 (file)
--- a/otk/button.cc
+++ b/otk/button.cc
@@ -3,29 +3,66 @@
 namespace otk {
 
 OtkButton::OtkButton(OtkWidget *parent)
-  : OtkWidget(parent), _text(""), _pressed(false),
-    _unfocus_tx(OtkWidget::getStyle()->getButtonUnfocus())
+  : OtkFocusLabel(parent), _pressed(false), _pressed_focus_tx(0),
+    _pressed_unfocus_tx(0), _unpr_focus_tx(0), _unpr_unfocus_tx(0)
 {
+  setTexture(getStyle()->getButtonFocus());
+  setUnfocusTexture(getStyle()->getButtonUnfocus());
+  _pressed_focus_tx = getStyle()->getButtonPressedFocus();
+  _pressed_unfocus_tx = getStyle()->getButtonPressedUnfocus();
 }
 
 OtkButton::~OtkButton()
 {
+  if (_pressed_focus_tx) delete _pressed_focus_tx;
+  if (_pressed_unfocus_tx) delete _pressed_unfocus_tx;
+}
+
+void OtkButton::press(unsigned int mouse_button)
+{
+  if (_pressed) return;
 
+  if (_pressed_focus_tx)
+    OtkFocusWidget::setTexture(_pressed_focus_tx);
+  if (_pressed_unfocus_tx)
+    OtkFocusWidget::setUnfocusTexture(_pressed_unfocus_tx);
+  _pressed = true;
+  _mouse_button = mouse_button;
 }
 
-void OtkButton::setText(const std::string &text)
+void OtkButton::release(unsigned int mouse_button)
 {
-  std::string a = text;
+  if (_mouse_button != mouse_button) return; // wrong button
+
+  OtkFocusWidget::setTexture(_unpr_focus_tx);
+  OtkFocusWidget::setUnfocusTexture(_unpr_unfocus_tx);
+  _pressed = false;
 }
 
-void OtkButton::press(void)
+void OtkButton::setTexture(BTexture *texture)
 {
+  OtkFocusWidget::setTexture(texture);
+  _unpr_focus_tx = texture;
+}
 
+void OtkButton::setUnfocusTexture(BTexture *texture)
+{
+  OtkFocusWidget::setUnfocusTexture(texture);
+  _unpr_unfocus_tx = texture;
 }
 
-void OtkButton::release(void)
+int OtkButton::buttonPressHandler(const XButtonEvent &e)
 {
+  press(e.button);
+  update();
+  return OtkFocusWidget::buttonPressHandler(e);
+}
 
+int OtkButton::buttonReleaseHandler(const XButtonEvent &e)
+{
+  release(e.button);
+  update();
+  return OtkFocusWidget::buttonReleaseHandler(e);
 }
 
 }