more minor cleanup

diff --git a/lib/x11.ml b/lib/x11.ml
index e5a780e4d9d3d396b22c072fc7bf40ca1dcb57f3..ed7ed4a2e02ae91254f27dc8c15c24555141b84f 100644 (file)
--- a/lib/x11.ml
+++ b/lib/x11.ml
@@ -100,7 +100,7 @@ external sel_fetch : xatom -> unit
 external font_load : string -> font
                    = "x11_font_load"
 
-external font_glyph : string -> glyph
+external font_glyph : font -> int -> glyph
                     = "x11_font_glyph"
 
 (* Automatically connect and disconnect to the display server *)

diff --git a/lib/x11_prims.c b/lib/x11_prims.c
index 3ddb44e896d5e4214b835daf3eb20ef6f90f1cf6..00f3ca68d97396b4598d476314fe928e17c16dda 100644 (file)
--- a/lib/x11_prims.c
+++ b/lib/x11_prims.c
@@ -11,7 +11,6 @@ static char* strmcat(char* first, ...);
 
 static void xftcolor(XftColor* xc, int c);
 static void xftdrawrect(int x, int y, int w, int h, int c);
-static void draw_text(void);
 
 static value ev_focus(XEvent*);
 static value ev_keypress(XEvent*);
@@ -457,10 +456,6 @@ static void xftdrawrect(int x, int y, int w, int h, int c) {
     XftColorFree(X.display, X.visual, X.colormap, &clr);
 }
 
-static void draw_text(void) {
-
-}
-
 /* Miscellaneous Utilities
  ******************************************************************************/
 static value mkvariant(int tag, int nargs, ...) {