Index: /trunk/Ohana/src/libkapa/include/kapa.h
===================================================================
--- /trunk/Ohana/src/libkapa/include/kapa.h	(revision 10336)
+++ /trunk/Ohana/src/libkapa/include/kapa.h	(revision 10337)
@@ -4,4 +4,5 @@
 # include <X11/Xlib.h>
 # include <png.h>
+# include <dvo.h>
 
 typedef struct {
@@ -135,4 +136,57 @@
 int KapaGetSection (int fd, char *name);
 
+/* KapaColors */
+int KapaColorByName (char *name);
+int KapaColormapSize ();
+char *KapaColorRGBString (int N);
+char *KapaColorName (int N);
+png_color *KapaPNGPalette (int *Npalette);
+unsigned long *KapaX11colors (Display *display, Colormap colormap, unsigned long default_color, int *Ncolors);
+
+/* RotFont.c */
+void InitRotFonts PROTO(());
+int SetRotFont PROTO((char *name, int size));
+char *GetRotFont PROTO((int *size));
+RotFont *GetRotFontData (double *scale);
+int RotStrlen PROTO((char *c));
+
+/* DrawRotString.c */
+int DrawRotText PROTO((int x, int y, char *string, int pos, double angle));
+int DrawRotBitmap PROTO((int x, int y, int dx, int dy, unsigned char *bitmap, int mode, double angle, double scale));
+int DrawRotTextInit (Display *display, Window window, GC gc, unsigned long fore, unsigned long back);
+
+
+/* PSRotFont.c */
+void PSRotText PROTO((FILE *f, int x, int y, char *string, int pos, double angle));
+void PSDumpRotSegment PROTO((FILE *f, char *segment, int *Nseg));
+void PSSetFont PROTO((FILE *f, char *name, int size));
+
+/* bDrawFuncs.c */
+bDrawBuffer *bDrawBufferCreate (int Nx, int Ny);
+void bDrawBufferFree (bDrawBuffer *buffer);
+void bDrawSetBuffer (bDrawBuffer *buffer);
+void bDrawSetStyle (bDrawColor color, int lw, int lt);
+void bDrawPoint (int x, int y);
+void bDrawPointf (float x, float y);
+
+void bDrawArc (double Xc, double Yc, double Xr, double Yr, double Ts, double Te);
+void bDrawCircle (double Xc, double Yc, double radius);
+void bDrawCircleFill (double xc, double yc, double radius);
+
+void bDrawLine (double x1, double y1, double x2, double y2);
+void bDrawLineWeight (int X1, int Y1, int X2, int Y2, int swapcoords);
+void bDrawLineBresen (int X1, int Y1, int X2, int Y2, int swapcoords);
+void bDrawLineHorizontal (int X1, int X2, int Y);
+void bDrawLineVertical (int X, int Y1, int Y2);
+
+void bDrawRectOpen (double x1, double y1, double x2, double y2);
+void bDrawRectFill (double x1, double y1, double x2, double y2);
+void bDrawTriOpen (double x1, double y1, double x2, double y2, double x3, double y3);
+void bDrawTriFill (double x1, double y1, double x2, double y2, double x3, double y3);
+
+/* bDrawRotFont.c */
+int bDrawRotText (int x, int y, char *string, int pos, double angle);
+int bDrawRotBitmap (int x, int y, int dx, int dy, unsigned char *bitmap, int mode, double angle, double scale);
+
 /* define Kapa names for shared functions */
 # define KapaOpen(p,n) KiiOpen(p,n)
@@ -144,56 +198,14 @@
 # define KapaPS(fd,s,r,f) KiiPS(fd,s,r,f)
 
-/* KapaColors */
-int KapaColorByName (char *name);
-int KapaColormapSize ();
-char *KapaColorRGBString (int N);
-char *KapaColorName (int N);
-png_color *KapaPNGPalette (int *Npalette);
-unsigned long *KapaX11colors (Display *display, Colormap colormap, unsigned long default_color, int *Ncolors);
-
-/* RotFont.c */
-void InitRotFonts PROTO(());
-int SetRotFont PROTO((char *name, int size));
-char *GetRotFont PROTO((int *size));
-RotFont *GetRotFontData (double *scale);
-int RotStrlen PROTO((char *c));
-
-/* DrawRotString.c */
-int DrawRotText PROTO((int x, int y, char *string, int pos, double angle));
-int DrawRotBitmap PROTO((int x, int y, int dx, int dy, unsigned char *bitmap, int mode, double angle, double scale));
-int DrawRotTextInit (Display *display, Window window, GC gc, unsigned long fore, unsigned long back);
-
-
-/* PSRotFont.c */
-void PSRotText PROTO((FILE *f, int x, int y, char *string, int pos, double angle));
-void PSDumpRotSegment PROTO((FILE *f, char *segment, int *Nseg));
-void PSSetFont PROTO((FILE *f, char *name, int size));
-
-/* bDrawFuncs.c */
-bDrawBuffer *bDrawBufferCreate (int Nx, int Ny);
-void bDrawBufferFree (bDrawBuffer *buffer);
-void bDrawSetBuffer (bDrawBuffer *buffer);
-void bDrawSetStyle (bDrawColor color, int lw, int lt);
-void bDrawPoint (int x, int y);
-void bDrawPointf (float x, float y);
-
-void bDrawArc (double Xc, double Yc, double Xr, double Yr, double Ts, double Te);
-void bDrawCircle (double Xc, double Yc, double radius);
-void bDrawCircleFill (double xc, double yc, double radius);
-
-void bDrawLine (double x1, double y1, double x2, double y2);
-void bDrawLineWeight (int X1, int Y1, int X2, int Y2, int swapcoords);
-void bDrawLineBresen (int X1, int Y1, int X2, int Y2, int swapcoords);
-void bDrawLineHorizontal (int X1, int X2, int Y);
-void bDrawLineVertical (int X, int Y1, int Y2);
-
-void bDrawRectOpen (double x1, double y1, double x2, double y2);
-void bDrawRectFill (double x1, double y1, double x2, double y2);
-void bDrawTriOpen (double x1, double y1, double x2, double y2, double x3, double y3);
-void bDrawTriFill (double x1, double y1, double x2, double y2, double x3, double y3);
-
-/* bDrawRotFont.c */
-int bDrawRotText (int x, int y, char *string, int pos, double angle);
-int bDrawRotBitmap (int x, int y, int dx, int dy, unsigned char *bitmap, int mode, double angle, double scale);
+# define KapaClose(socket) KiiClose(socket)
+# define KapaWait(sockpath) KiiWait(sockpath)
+# define KapaSendCommandV(device, length, format, argp) KiiSendCommandV(device, length, format, argp)
+# define KapaSendData(device, data, Nbytes) KiiSendData(device, data, Nbytes)
+# define KapaRecvData(device) KiiRecvData(device)
+
+/* these use varargs: is this safe, or should we make a stub function? */
+# define KapaSendMessage KiiSendMessage
+# define KapaSendCommand KiiSendCommand
+# define KapaScanMessage KiiScanMessage
 
 # endif