X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Flabel.cc;h=4a61efd078fca007c669a6c8b010b43da167c7a1;hb=2b2f81b93c89c2a2d6abc3b12dee66b8e2a0452d;hp=5f2b22ee0c38a86eb44cefee0ce8a0a04bf9f938;hpb=3ce8b540aae127c773c57fcf7094e11319d3c6a3;p=chaz%2Fopenbox

diff --git a/otk/label.cc b/otk/label.cc
index 5f2b22ee..4a61efd0 100644
--- a/otk/label.cc
+++ b/otk/label.cc
@@ -1,28 +1,45 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
 #include "label.hh"
 
 namespace otk {
 
 OtkLabel::OtkLabel(OtkWidget *parent)
-  : OtkWidget(parent), _text(""), _dirty(false)
+  : OtkWidget(parent), _text("")
 {
-  setTexture(getStyle()->getLabelUnfocus());
+  const ScreenInfo *info = OBDisplay::screenInfo(screen());
+  _xftdraw = XftDrawCreate(OBDisplay::display, window(), info->visual(),
+                           info->colormap());
 }
 
 OtkLabel::~OtkLabel()
 {
+  XftDrawDestroy(_xftdraw);
 }
 
+void OtkLabel::setStyle(Style *style)
+{
+  OtkWidget::setStyle(style);
+
+  setTexture(style->getLabelUnfocus());
+}
+
+
 void OtkLabel::update(void)
 {
   if (_dirty) {
-    const BFont &ft = getStyle()->getFont();
-    unsigned int bevel = getStyle()->getBevelWidth();
+    const BFont *ft = style()->getFont();
+    unsigned int sidemargin = style()->getBevelWidth() * 2;
 
     std::string t = _text; // the actual text to draw
-    int x = bevel;         // x coord for the text
+    int x = sidemargin;    // x coord for the text
 
     // find a string that will fit inside the area for text
-    int max_length = width() - getBevelWidth() * 2;
+    int max_length = width() - sidemargin * 2;
     if (max_length <= 0) {
       t = ""; // can't fit anything
     } else {
@@ -31,11 +48,11 @@ void OtkLabel::update(void)
       
       do {
         t.resize(text_len);
-        length = ft.measureString(t);
+        length = ft->measureString(t);
       } while (length > max_length && text_len-- > 0);
 
       // justify the text
-      switch (getStyle()->textJustify()) {
+      switch (style()->textJustify()) {
       case Style::RightJustify:
         x += max_length - length;
         break;
@@ -49,24 +66,9 @@ void OtkLabel::update(void)
 
     OtkWidget::update();
 
-    ft.drawString(getWindow(), x, bevel, *getStyle()->getTextUnfocus(), t);
+    ft->drawString(_xftdraw, x, 0, *style()->getTextUnfocus(), t);
   } else
     OtkWidget::update();
-
-  _dirty = false;
-}
-
-int OtkLabel::exposeHandler(const XExposeEvent &e)
-{
-  _dirty = true;
-  return OtkWidget::exposeHandler(e);
-}
-
-int OtkLabel::configureHandler(const XConfigureEvent &e)
-{
-  if (!(e.width == width() && e.height == height()))
-    _dirty = true;
-  return OtkWidget::configureHandler(e);
 }
 
 }