begin conversion to ustring. add some more members.

[chaz/openbox] / otk / focuslabel.cc

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index e75a1d33aa6d3fa5cede0c974cd12a208e03f5c8..397a2cac8928b0e113b37fb2b159c8a47980e644 100644 (file)
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -5,33 +5,47 @@
 #endif
 
 #include "focuslabel.hh"
+#include "display.hh"
+#include "screeninfo.hh"
 
 namespace otk {
 
-OtkFocusLabel::OtkFocusLabel(OtkWidget *parent)
-  : OtkFocusWidget(parent), _text("")
+FocusLabel::FocusLabel(Widget *parent)
+  : FocusWidget(parent), _text("")
 {
-  setTexture(getStyle()->getLabelFocus());
-  setUnfocusTexture(getStyle()->getLabelUnfocus());
+  const ScreenInfo *info = Display::screenInfo(screen());
+  _xftdraw = XftDrawCreate(Display::display, window(), info->visual(),
+                           info->colormap());
 }
 
-OtkFocusLabel::~OtkFocusLabel()
+FocusLabel::~FocusLabel()
 {
+  XftDrawDestroy(_xftdraw);
 }
 
-void OtkFocusLabel::update(void)
+
+void FocusLabel::setStyle(Style *style)
+{
+  FocusWidget::setStyle(style);
+  
+  setTexture(style->getLabelFocus());
+  setUnfocusTexture(style->getLabelUnfocus());
+}
+
+
+void FocusLabel::update(void)
 {
   if (_dirty) {
-    const BFont &ft = getStyle()->getFont();
-    BColor *text_color = (isFocused() ? getStyle()->getTextFocus()
-                          : getStyle()->getTextUnfocus());
-    unsigned int bevel = getStyle()->getBevelWidth();
+    const Font *ft = style()->getFont();
+    Color *text_color = (isFocused() ? style()->getTextFocus()
+                          : style()->getTextUnfocus());
+    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 {
@@ -40,11 +54,11 @@ void OtkFocusLabel::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;
@@ -56,11 +70,11 @@ void OtkFocusLabel::update(void)
       }
     }
 
-    OtkFocusWidget::update();
+    FocusWidget::update();
 
-    ft.drawString(getWindow(), x, bevel, *text_color, t);
+    ft->drawString(_xftdraw, x, 0, *text_color, t);
   } else
-    OtkFocusWidget::update();
+    FocusWidget::update();
 }
 
 }