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

diff --git a/otk/label.cc b/otk/label.cc
index 5f2b22ee..da9edfd1 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)
+Label::Label(Widget *parent)
+  : Widget(parent), _text("")
 {
-  setTexture(getStyle()->getLabelUnfocus());
+  const ScreenInfo *info = display->screenInfo(screen());
+  _xftdraw = XftDrawCreate(**display, window(), info->visual(),
+                           info->colormap());
 }
 
-OtkLabel::~OtkLabel()
+Label::~Label()
 {
+  XftDrawDestroy(_xftdraw);
 }
 
-void OtkLabel::update(void)
+void Label::setStyle(Style *style)
+{
+  Widget::setStyle(style);
+
+  setTexture(style->getLabelUnfocus());
+}
+
+
+void Label::update(void)
 {
   if (_dirty) {
-    const BFont &ft = getStyle()->getFont();
-    unsigned int bevel = getStyle()->getBevelWidth();
+    const Font *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
+    ustring t = _text; // the actual text to draw
+    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;
@@ -47,26 +64,11 @@ void OtkLabel::update(void)
       }
     }
 
-    OtkWidget::update();
+    Widget::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);
+    Widget::update();
 }
 
 }