From 1752587a4ab00950a658df5bcf92bb94739ba8f0 Mon Sep 17 00:00:00 2001
From: id <id>
Date: Thu, 30 Nov 2000 15:32:19 +0000
Subject: [PATCH] Make draw string plugin more extendable in future.

---
 src/defaults.c | 2 +-
 src/framewin.c | 8 ++++----
 src/plugin.c   | 4 +---
 src/plugin.h   | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/defaults.c b/src/defaults.c
index 2aecf0d3..85f04190 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -2211,7 +2211,7 @@ getTextRenderer(WScreen *scr, WDefaultEntry *entry, proplist_t value,
             func = PLGetString(elem);
             scr->drawstring_func[changed] = wPluginCreateFunction (W_FUNCTION_DRAWSTRING,
                     lib, "initDrawString", func, "destroyDrawString", value,
-                    wPluginPackInitData(3, dpy, scr->w_colormap,"-DATA-"));
+                    wPluginPackData(3, dpy, scr->w_colormap,"-DATA-"));
         }
 
         return getColor(scr, entry, PLGetArrayElement(value,3), addr, ret);
diff --git a/src/framewin.c b/src/framewin.c
index 1601c7f3..3542ea30 100644
--- a/src/framewin.c
+++ b/src/framewin.c
@@ -1085,10 +1085,10 @@ wFrameWindowPaint(WFrameWindow *fwin)
     if (scr->drawstring_func[fwin->flags.state + fwin->drawstring_proc_offset]) {
         scr->drawstring_func[fwin->flags.state + fwin->drawstring_proc_offset]->
             proc.drawString(scr->drawstring_func[fwin->flags.state 
-                    + fwin->drawstring_proc_offset]->arg,
-                    fwin->titlebar->window, *fwin->title_gc,
-                    *fwin->font, x, *fwin->title_clearance + TITLEBAR_EXTEND_SPACE,
-                    fwin->titlebar->width, fwin->top_width, fwin->title, titlelen);
+                    + fwin->drawstring_proc_offset]->arg, fwin->titlebar->window,
+                    x, *fwin->title_clearance + TITLEBAR_EXTEND_SPACE,
+                    fwin->titlebar->width, fwin->top_width,
+                    fwin->title, wPluginPackData(2, *fwin->title_gc, *fwin->font));
     } else {
         WMDrawString(scr->wmscreen, fwin->titlebar->window, 
                 *fwin->title_gc, *fwin->font, x, *fwin->title_clearance + TITLEBAR_EXTEND_SPACE, 
diff --git a/src/plugin.c b/src/plugin.c
index 0a3d7051..db8bf7ce 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -46,7 +46,7 @@
 
 
 void** 
-wPluginPackInitData(int members, ...) 
+wPluginPackData(int members, ...) 
 {
     void **p;
     va_list vp;
@@ -56,9 +56,7 @@ wPluginPackInitData(int members, ...)
     va_start(vp, members);
     for(i=0;i<members;i++) {
         p[i] = va_arg(vp, void *);
-        printf(" %d > %d\n",i,(int)p[i]);
     }
-    printf(" s> %s\n",(char*)p[2]);
     va_end(vp);
     return p;
 }
diff --git a/src/plugin.h b/src/plugin.h
index 8fa758ab..87ec113f 100644
--- a/src/plugin.h
+++ b/src/plugin.h
@@ -95,6 +95,6 @@ WFunction* wPluginCreateFunction(int type, char *library_name,
 
 void wPluginDestroyFunction(WFunction *function);
 
-void** wPluginPackInitData(int members, ...);
+void** wPluginPackData(int members, ...);
 
 #endif