X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fbutton.cc;h=9f3930873e20453bc50969c26ed474a28039de7b;hb=2b2f81b93c89c2a2d6abc3b12dee66b8e2a0452d;hp=c88fc707c3fa631657ba8e4cd71d792d004ca42f;hpb=cbf9dd0c4c8669392d9c7c8461d1af411f0ab0a4;p=chaz%2Fopenbox

diff --git a/otk/button.cc b/otk/button.cc
index c88fc707..9f393087 100644
--- a/otk/button.cc
+++ b/otk/button.cc
@@ -1,31 +1,80 @@
+// -*- 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)
-  : 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)
 {
 }
 
 OtkButton::~OtkButton()
 {
+}
+
 
+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::setText(const std::string &text)
+
+void OtkButton::press(unsigned int mouse_button)
 {
-  std::string a = text;
+  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::press(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;
 }
 
-void OtkButton::release(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::buttonPressHandler(const XButtonEvent &e)
+{
+  press(e.button);
+  update();
+  OtkFocusWidget::buttonPressHandler(e);
+}
+
+void OtkButton::buttonReleaseHandler(const XButtonEvent &e)
+{
+  release(e.button);
+  update();
+  OtkFocusWidget::buttonReleaseHandler(e);
 }
 
 }