Font::drawText takes reference to FbDrawable instead of X Drawable + some code cleaning

1 files changed, 21 insertions, 16 deletions

diff --git a/src/FbTk/XftFontImp.cc b/src/FbTk/XftFontImp.cc
index bf0aaa1..3d79dcc 100644
--- a/src/FbTk/XftFontImp.cc
+++ b/src/FbTk/XftFontImp.cc
@@ -1,5 +1,5 @@
 // XftFontImp.cc  Xft font implementation for FbTk
-// Copyright (c) 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
+// Copyright (c) 2002-2004 Henrik Kinnunen (fluxgen@linuxmail.org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
@@ -19,10 +19,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-//$Id: XftFontImp.cc,v 1.5 2004/09/10 16:12:49 akir Exp $
+//$Id: XftFontImp.cc,v 1.6 2004/09/11 22:58:20 fluxgen Exp $
 
 #include "XftFontImp.hh"
 #include "App.hh"
+#include "FbDrawable.hh"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -32,6 +33,7 @@ namespace FbTk {
 
 XftFontImp::XftFontImp(const char *name, bool utf8):m_xftfont(0),
                                                     m_utf8mode(utf8) {
+
     if (name != 0)
         load(name);
 }
@@ -61,25 +63,24 @@ bool XftFontImp::load(const std::string &name) {
     return true;
 }
 
-void XftFontImp::drawText(Drawable w, int screen, GC gc, const char *text, size_t len, int x, int y) const {
+void XftFontImp::drawText(const FbDrawable &w, int screen, GC gc, const char *text, size_t len, int x, int y) const {
     if (m_xftfont == 0)
         return;
-    Display *disp = App::instance()->display();
-    XftDraw *draw = XftDrawCreate(disp,
-                                  w,
-                                  DefaultVisual(disp, screen),
-                                  DefaultColormap(disp, screen));
+    XftDraw *draw = XftDrawCreate(w.display(),
+                                  w.drawable(),
+                                  DefaultVisual(w.display(), screen),
+                                  DefaultColormap(w.display(), screen));
 
     XGCValues gc_val;
 
     // get foreground pixel value and convert it to XRenderColor value
     // TODO: we should probably check return status
-    XGetGCValues(disp, gc, GCForeground, &gc_val);
+    XGetGCValues(w.display(), gc, GCForeground, &gc_val);
 
     // get red, green, blue values
     XColor xcol;
     xcol.pixel = gc_val.foreground;
-    XQueryColor(disp, DefaultColormap(disp, screen), &xcol);
+    XQueryColor(w.display(), DefaultColormap(w.display(), screen), &xcol);
 
     // convert xcolor to XftColor
     XRenderColor rendcol;
@@ -88,7 +89,9 @@ void XftFontImp::drawText(Drawable w, int screen, GC gc, const char *text, size_
     rendcol.blue = xcol.blue;
     rendcol.alpha = 0xFFFF;
     XftColor xftcolor;
-    XftColorAllocValue(disp, DefaultVisual(disp, screen), DefaultColormap(disp, screen),
+    XftColorAllocValue(w.display(), 
+                       DefaultVisual(w.display(), screen), 
+                       DefaultColormap(w.display(), screen),
                        &rendcol, &xftcolor);
 
     // draw string
@@ -97,7 +100,7 @@ void XftFontImp::drawText(Drawable w, int screen, GC gc, const char *text, size_
         // check the string size,
         // if the size is zero we use the XftDrawString8 function instead.
         XGlyphInfo ginfo;
-        XftTextExtentsUtf8(App::instance()->display(),
+        XftTextExtentsUtf8(w.display(),
                            m_xftfont,
                            (XftChar8 *)text, len,
                            &ginfo);
@@ -107,8 +110,9 @@ void XftFontImp::drawText(Drawable w, int screen, GC gc, const char *text, size_
                               m_xftfont,
                               x, y,
                               (XftChar8 *)(text), len);
-            XftColorFree(disp, DefaultVisual(disp, screen),
-                         DefaultColormap(disp, screen), &xftcolor);
+            XftColorFree(w.display(), 
+                         DefaultVisual(w.display(), screen),
+                         DefaultColormap(w.display(), screen), &xftcolor);
             XftDrawDestroy(draw);
             return;
         }
@@ -122,8 +126,9 @@ void XftFontImp::drawText(Drawable w, int screen, GC gc, const char *text, size_
                    (XftChar8 *)(text), len);
 
 
-    XftColorFree(disp, DefaultVisual(disp, screen),
-                 DefaultColormap(disp, screen), &xftcolor);
+    XftColorFree(w.display(), 
+                 DefaultVisual(w.display(), screen),
+                 DefaultColormap(w.display(), screen), &xftcolor);
     XftDrawDestroy(draw);
 }