X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbuttonwidget.cc;h=ceca8d38a830735c1be3132fc8b442b768449913;hb=bc88d310fea71823fb2c61d071ff499579bffaba;hp=867cc5be1c797d9fc2b8780c88f1ce415d224eff;hpb=83727b8e6404f7e00e7369c39da8779dfb85ae09;p=chaz%2Fopenbox

diff --git a/src/buttonwidget.cc b/src/buttonwidget.cc
index 867cc5be..ceca8d38 100644
--- a/src/buttonwidget.cc
+++ b/src/buttonwidget.cc
@@ -5,13 +5,16 @@
 #endif
 
 #include "buttonwidget.hh"
+#include "otk/gccache.hh" // otk::BPen
 
 namespace ob {
 
 OBButtonWidget::OBButtonWidget(otk::OtkWidget *parent,
                                OBWidget::WidgetType type)
-  : otk::OtkButton(parent),
-    OBWidget(type)
+  : otk::OtkWidget(parent),
+    OBWidget(type),
+    _pressed(false),
+    _button(0)
 {
 }
 
@@ -21,36 +24,151 @@ OBButtonWidget::~OBButtonWidget()
 }
 
 
+void OBButtonWidget::setTextures()
+{
+  switch (type()) {
+  case Type_LeftGrip:
+  case Type_RightGrip:
+    if (_focused)
+      setTexture(_style->getGripFocus());
+    else
+      setTexture(_style->getGripUnfocus());
+    break;
+  case Type_StickyButton:
+  case Type_CloseButton:
+  case Type_MaximizeButton:
+  case Type_IconifyButton:
+    if (_pressed) {
+      if (_focused)
+        setTexture(_style->getButtonPressedFocus());
+      else
+        setTexture(_style->getButtonPressedUnfocus());
+    } else {
+      if (_focused)
+        setTexture(_style->getButtonFocus());
+      else
+        setTexture(_style->getButtonUnfocus());
+    }
+    break;
+  default:
+    assert(false); // there's no other button widgets!
+  }
+}
+
+
 void OBButtonWidget::setStyle(otk::Style *style)
 {
-  otk::OtkButton::setStyle(style);
+  otk::OtkWidget::setStyle(style);
+  setTextures();
 
   switch (type()) {
   case Type_LeftGrip:
   case Type_RightGrip:
-    setTexture(style->getGripFocus());
-    setUnfocusTexture(style->getGripUnfocus());
-    setPressedFocusTexture(style->getGripFocus());
-    setPressedUnfocusTexture(style->getGripUnfocus());
-    setTexture(style->getGripFocus());
-    setUnfocusTexture(style->getGripUnfocus());
-    setPressedFocusTexture(style->getGripFocus());
-    setPressedUnfocusTexture(style->getGripUnfocus());
     setBorderColor(_style->getBorderColor());
-    setUnfocusBorderColor(style->getBorderColor());
     break;
-  default:
+  case Type_StickyButton:
+  case Type_CloseButton:
+  case Type_MaximizeButton:
+  case Type_IconifyButton:
     break;
+  default:
+    assert(false); // there's no other button widgets!
+  }
+}
+
+
+void OBButtonWidget::update()
+{
+  otk::PixmapMask *pm;
+  int width;
+  bool draw = _dirty;
+
+  otk::OtkWidget::update();
+
+  if (draw) {
+    switch (type()) {
+    case Type_StickyButton:
+      pm = _style->getStickyButtonMask();
+      break;
+    case Type_CloseButton:
+      pm = _style->getCloseButtonMask();
+      break;
+    case Type_MaximizeButton:
+      pm = _style->getMaximizeButtonMask();
+      break;
+    case Type_IconifyButton:
+      pm = _style->getIconifyButtonMask();
+      break;
+    case Type_LeftGrip:
+    case Type_RightGrip:
+      return; // no drawing
+    default:
+      assert(false); // there's no other button widgets!
+    }
+
+    if (pm->mask == None) return; // no mask for the button, leave it empty
+
+    width = _rect.width();
+  
+    otk::BPen pen(_focused ? *_style->getButtonPicFocus() :
+                  *_style->getButtonPicUnfocus());
+
+    // set the clip region
+    XSetClipMask(otk::OBDisplay::display, pen.gc(), pm->mask);
+    XSetClipOrigin(otk::OBDisplay::display, pen.gc(),
+                   (width - pm->w)/2, (width - pm->h)/2);
+
+    // fill in the clipped region
+    XFillRectangle(otk::OBDisplay::display, _window, pen.gc(),
+                   (width - pm->w)/2, (width - pm->h)/2,
+                   (width + pm->w)/2, (width + pm->h)/2);
+
+    // unset the clip region
+    XSetClipMask(otk::OBDisplay::display, pen.gc(), None);
+    XSetClipOrigin(otk::OBDisplay::display, pen.gc(), 0, 0);
   }
 }
 
 
 void OBButtonWidget::adjust()
 {
-  otk::OtkButton::adjust();
+  // nothing to adjust. no children.
+}
+
 
-  // XXX: adjust shit
+void OBButtonWidget::focus()
+{
+  otk::OtkWidget::focus();
+  setTextures();
 }
 
 
+void OBButtonWidget::unfocus()
+{
+  otk::OtkWidget::unfocus();
+  setTextures();
+}
+
+
+void OBButtonWidget::buttonPressHandler(const XButtonEvent &e)
+{
+  OtkWidget::buttonPressHandler(e);
+  if (_button) return;
+  _button = e.button;
+  _pressed = true;
+  setTextures();
+  update();
+}
+
+
+void OBButtonWidget::buttonReleaseHandler(const XButtonEvent &e)
+{
+  OtkWidget::buttonPressHandler(e);
+  if (e.button != _button) return;
+  _button = 0;
+  _pressed = false;
+  setTextures();
+  update();
+}
+
 }