support the button pressed resources better

[chaz/openbox] / otk / button.cc

diff --git a/otk/button.cc b/otk/button.cc
index fd40f7d57485ce87799a7abc6e06f35019798c4f..9f3930873e20453bc50969c26ed474a28039de7b 100644 (file)
--- a/otk/button.cc
+++ b/otk/button.cc
@@ -1,35 +1,51 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
 #include "button.hh"
 
 namespace otk {
 
 OtkButton::OtkButton(OtkWidget *parent)
-  : OtkFocusWidget(parent), _text(""), _pressed(false), _dirty(false),
-    _pressed_focus_tx(0), _pressed_unfocus_tx(0), _unpr_focus_tx(0),
-    _unpr_unfocus_tx(0)
+  : 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(void)
+
+void OtkButton::setStyle(Style *style)
+{
+  OtkFocusLabel::setStyle(style);
+  
+  setTexture(style->getButtonFocus());
+  setUnfocusTexture(style->getButtonUnfocus());
+  _pressed_focus_tx = style->getButtonPressedFocus();
+  _pressed_unfocus_tx = style->getButtonPressedUnfocus();
+}
+
+
+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::release(void)
+void OtkButton::release(unsigned int mouse_button)
 {
+  if (_mouse_button != mouse_button) return; // wrong button
+
   OtkFocusWidget::setTexture(_unpr_focus_tx);
   OtkFocusWidget::setUnfocusTexture(_unpr_unfocus_tx);
   _pressed = false;
@@ -47,36 +63,18 @@ void OtkButton::setUnfocusTexture(BTexture *texture)
   _unpr_unfocus_tx = texture;
 }
 
-void OtkButton::update(void)
-{
-  if (_dirty) {
-    const BFont ft = getStyle()->getFont();
-    BColor *text_color = (isFocused() ? getStyle()->getTextFocus()
-                          : getStyle()->getTextUnfocus());
-    unsigned int bevel = getStyle()->getBevelWidth();
-
-    OtkFocusWidget::resize(ft.measureString(_text) + bevel * 2,
-                           ft.height() + bevel * 2);
-    OtkFocusWidget::update();
-
-    ft.drawString(getWindow(), bevel, bevel, *text_color, _text);
-  } else
-    OtkFocusWidget::update();
-
-  _dirty = false;
-}
-
-int OtkButton::exposeHandler(const XExposeEvent &e)
+void OtkButton::buttonPressHandler(const XButtonEvent &e)
 {
-  _dirty = true;
-  return OtkFocusWidget::exposeHandler(e);
+  press(e.button);
+  update();
+  OtkFocusWidget::buttonPressHandler(e);
 }
 
-int OtkButton::configureHandler(const XConfigureEvent &e)
+void OtkButton::buttonReleaseHandler(const XButtonEvent &e)
 {
-  if (!(e.width == width() && e.height == height()))
-    _dirty = true;
-  return OtkFocusWidget::configureHandler(e);
+  release(e.button);
+  update();
+  OtkFocusWidget::buttonReleaseHandler(e);
 }
 
 }