xfs: port to libXfont2

This appears to work, in the sense that xfsinfo and fslsfonts print the
same thing before and after.

Signed-off-by: Adam Jackson <ajax@redhat.com>

5 files changed, 21 insertions, 13 deletions

diff --git a/include/difs.h b/include/difs.h
index d92f74b..66c7f98 100644
--- a/include/difs.h
+++ b/include/difs.h
@@ -29,7 +29,6 @@
 #include "difsfn.h"
 #include "globals.h"
 #include <X11/fonts/fontstruct.h>
-#include <X11/fonts/fontmisc.h>
 
 typedef int (*InitialFunc)(ClientPtr);
 typedef int (*ProcFunc)(ClientPtr);
@@ -65,6 +64,13 @@ extern int StartListFontsWithInfo ( ClientPtr client, int length, unsigned char
 extern int LoadGlyphRanges ( ClientPtr client, FontPtr pfont, Bool range_flag, int num_ranges, int item_size, fsChar2b *data );
 extern FontPtr find_old_font ( FSID id );
 extern void DeleteClientFontStuff ( ClientPtr client );
+extern int xfs_init_fs_handlers(FontPathElementPtr fpe,
+                                FontBlockHandlerProcPtr block_handler);
+
+extern void xfs_remove_fs_handlers(FontPathElementPtr fpe,
+                                   FontBlockHandlerProcPtr block_handler,
+                                   Bool all);
+extern int register_fpe_funcs(const xfont2_fpe_funcs_rec *funcs);
 
 /* difs/fontinfo.c */
 extern int convert_props ( FontInfoPtr pinfo, fsPropInfo **props );
diff --git a/include/difsutils.h b/include/difsutils.h
index 68e6f0e..fa922d8 100644
--- a/include/difsutils.h
+++ b/include/difsutils.h
@@ -30,7 +30,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <auth.h>
 #include <X11/fonts/font.h>
 #include <X11/fonts/fontstruct.h>
-#include <X11/fonts/fontmisc.h>
+#include <X11/fonts/libxfont2.h>
 
 typedef void (*DifsWakeupFunc)(pointer data, int result, unsigned long * pReadmask);
 typedef Bool (*DifsWorkFunc) (ClientPtr, pointer);
@@ -39,7 +39,7 @@ extern AuthContextPtr GetClientAuthorization (void);
 extern Bool ClientIsAsleep (ClientPtr client);
 extern Bool ClientSleep (ClientPtr client, Bool (*function) (ClientPtr, pointer), pointer data);
 extern Bool QueueWorkProc (DifsWorkFunc function, ClientPtr client, pointer data);
-extern Bool RegisterBlockAndWakeupHandlers (BlockHandlerProcPtr blockHandler, DifsWakeupFunc wakeupHandler, pointer blockData);
+extern Bool RegisterBlockAndWakeupHandlers (FontBlockHandlerProcPtr blockHandler, DifsWakeupFunc wakeupHandler, pointer blockData);
 #if 0
 extern FontResolutionPtr GetClientResolutions (int *num);
 #endif
@@ -50,7 +50,7 @@ extern int SetDefaultResolutions (char *str);
 #if 0
 extern int client_auth_generation (ClientPtr client);
 #endif
-extern int set_font_authorizations (char **authorizations, int *authlen, ClientPtr client);
+extern int set_font_authorizations (char **authorizations, int *authlen, void *_client);
 extern int strncmpnocase (const char *first, const char *second, int n);
 extern pointer Xalloc (unsigned long m);
 extern pointer Xrealloc (pointer n, unsigned long m);
@@ -59,7 +59,7 @@ extern void ClientWakeup (ClientPtr client);
 extern void InitBlockAndWakeupHandlers (void);
 extern void NoopDDA (void);
 extern void ProcessWorkQueue (void);
-extern void RemoveBlockAndWakeupHandlers (BlockHandlerProcPtr blockHandler, DifsWakeupFunc wakeupHandler, pointer blockData);
+extern void RemoveBlockAndWakeupHandlers (FontBlockHandlerProcPtr blockHandler, DifsWakeupFunc wakeupHandler, pointer blockData);
 extern void SetDefaultPointSize (int ps);
 extern void WakeupHandler (int result, unsigned long * pReadmask);
 extern void Xfree (unsigned long *n);
diff --git a/include/globals.h b/include/globals.h
index 1bcf017..82a795f 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -50,7 +50,7 @@ in this Software without prior written authorization from The Open Group.
 
 #include	<X11/fonts/FSproto.h>	/* for fsResolution */
 #include	<X11/Xtrans/Xtrans.h>	/* XtransConnInfo */
-#include        <X11/fonts/font.h>	/* FontPatternCachePtr */
+#include        <X11/fonts/libxfont2.h>	/* xfont2_pattern_cache_ptr */
 #include	<X11/Xpoll.h>		/* select & fd_set */
 #include	"client.h"		/* WorkQueuePtr */
 #include	"misc.h"		/* OldListenRec */
@@ -84,7 +84,7 @@ extern Bool NewOutputPending;
 
 extern int ConnectionTranslation[];
 
-extern FontPatternCachePtr fontPatternCache;
+extern xfont2_pattern_cache_ptr fontPatternCache;
 
 extern long LastReapTime;
 extern Bool drone_server;
diff --git a/include/misc.h b/include/misc.h
index f0da949..e04d41c 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -111,11 +111,9 @@ in this Software without prior written authorization from The Open Group.
 		 ((char *) &(dst))[1] = ((char *) &(src))[0];
 
 
-#if 0
-extern void NoopDDA(void);
-extern char *NameForAtom(Atom atom);
-#endif
-
+extern int ValidAtom(Atom atom);
+extern const char *NameForAtom(Atom atom);
+extern Atom MakeAtom(const char *string, unsigned int len, Bool makeit);
 
 #define fsCat(x,y) x##_##y
 
@@ -175,4 +173,8 @@ extern	void	CreateSockets(int old_listen_count, OldListenRec *old_listen);
 /* os/xfstrans.c */
 extern OldListenRec *_FontTransGetInetdListenInfo (int fd);
 
+extern void BitOrderInvert(unsigned char *buf, int nbytes);
+extern void TwoByteSwap(unsigned char *buf, int nbytes);
+extern void FourByteSwap(unsigned char *buf, int nbytes);
+
 #endif				/* _MISC_H_ */
diff --git a/include/os.h b/include/os.h
index e07d4e0..92ad5f5 100644
--- a/include/os.h
+++ b/include/os.h
@@ -130,7 +130,7 @@ extern	void	CleanupChild (int n);
 extern	void	GiveUp (int n);
 extern	void	ServerCacheFlush (int n);
 extern	void	ServerReconfig (int n);
-extern	long	GetTimeInMillis (void);
+extern	unsigned int GetTimeInMillis (void);
 extern	pointer	FSalloc(unsigned long);
 extern	pointer	FScalloc (unsigned long amount);
 extern	pointer	FSrealloc(pointer, unsigned long);