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

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index 98fe5417..9eeaed17 100644
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -1,17 +1,29 @@
-#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("")
 {
+  const ScreenInfo *info = OBDisplay::screenInfo(getScreen());
+  _xftdraw = XftDrawCreate(OBDisplay::display, getWindow(), info->getVisual(),
+                           info->getColormap());
+  
   setTexture(getStyle()->getLabelFocus());
   setUnfocusTexture(getStyle()->getLabelUnfocus());
 }
 
 OtkFocusLabel::~OtkFocusLabel()
 {
+  XftDrawDestroy(_xftdraw);
 }
 
 void OtkFocusLabel::update(void)
@@ -53,24 +65,9 @@ void OtkFocusLabel::update(void)
 
     OtkFocusWidget::update();
 
-    ft.drawString(getWindow(), x, bevel, *text_color, t);
+    ft.drawString(_xftdraw, x, bevel, *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);
 }
 
 }