X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ffocuslabel.cc;h=136eb742c08c9498edf5c46d75e8907f1025b719;hb=5a139f7263e33b499836f5df9ac37400e02c32f9;hp=98fe541718338764dac073a797920df9ad9624d4;hpb=bd06e8961d43dfbfac0472409e55513f1fd86bf8;p=chaz%2Fopenbox

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index 98fe5417..136eb742 100644
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -1,32 +1,51 @@
-#include <iostream>
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
 #include "focuslabel.hh"
+#include "display.hh"
+#include "screeninfo.hh"
 
 namespace otk {
 
 OtkFocusLabel::OtkFocusLabel(OtkWidget *parent)
-  : OtkFocusWidget(parent), _text(""), _dirty(false)
+  : OtkFocusWidget(parent), _text("")
 {
-  setTexture(getStyle()->getLabelFocus());
-  setUnfocusTexture(getStyle()->getLabelUnfocus());
+  const ScreenInfo *info = OBDisplay::screenInfo(screen());
+  _xftdraw = XftDrawCreate(OBDisplay::display, window(), info->visual(),
+                           info->colormap());
 }
 
 OtkFocusLabel::~OtkFocusLabel()
 {
+  XftDrawDestroy(_xftdraw);
 }
 
+
+void OtkFocusLabel::setStyle(Style *style)
+{
+  OtkFocusWidget::setStyle(style);
+  
+  setTexture(style->getLabelFocus());
+  setUnfocusTexture(style->getLabelUnfocus());
+}
+
+
 void OtkFocusLabel::update(void)
 {
   if (_dirty) {
-    const BFont &ft = getStyle()->getFont();
-    BColor *text_color = (isFocused() ? getStyle()->getTextFocus()
-                          : getStyle()->getTextUnfocus());
-    unsigned int bevel = getStyle()->getBevelWidth();
+    const BFont &ft = style()->getFont();
+    BColor *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 {
@@ -39,7 +58,7 @@ void OtkFocusLabel::update(void)
       } while (length > max_length && text_len-- > 0);
 
       // justify the text
-      switch (getStyle()->textJustify()) {
+      switch (style()->textJustify()) {
       case Style::RightJustify:
         x += max_length - length;
         break;
@@ -53,24 +72,9 @@ void OtkFocusLabel::update(void)
 
     OtkFocusWidget::update();
 
-    ft.drawString(getWindow(), x, bevel, *text_color, t);
+    ft.drawString(_xftdraw, x, 0, *text_color, t);
   } else
     OtkFocusWidget::update();
-
-  _dirty = false;
-}
-
-int OtkFocusLabel::exposeHandler(const XExposeEvent &e)
-{
-  _dirty = true;
-  return OtkFocusWidget::exposeHandler(e);
-}
-
-int OtkFocusLabel::configureHandler(const XConfigureEvent &e)
-{
-  if (!(e.width == width() && e.height == height()))
-    _dirty = true;
-  return OtkFocusWidget::configureHandler(e);
 }
 
 }