- lib/lbxutil/lbxutil.pc.in: link to lbxutil, not XfixesXORG-6_8_99_15

- symlink.sh: add xedit.h, add xedit/lis/mp directory, add xfs
- xc/programs/xedit: include "lisp/../xedit.h" instead of xedit/xedit.h
- Change include of "foo.h" to <X11/.../foo.h> in various places in
    xc/programs/lbxproxy and xc/programs/xfs
- add build system for xfs
- add forgotten lbxproxytrans.c file

35 files changed, 219 insertions, 38 deletions

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/AUTHORS
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/COPYING
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ChangeLog
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/INSTALL
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..ed3e0ee
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,61 @@
+# 
+#  Copyright 2005  Red Hat, Inc.
+# 
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  the above copyright notice appear in all copies and that both that
+#  copyright notice and this permission notice appear in supporting
+#  documentation, and that the name of Red Hat not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Red Hat makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+# 
+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+#  PERFORMANCE OF THIS SOFTWARE.
+
+bin_PROGRAMS = xfs
+
+xfs_CFLAGS = $(DEP_CFLAGS) -I$(top_srcdir)/include -DXFSPIDDIR=\"/var/run\"
+xfs_LDADD = $(DEP_LIBS)
+
+xfs_SOURCES = \
+	difs/atom.c \
+	difs/cache.c \
+	difs/charinfo.c \
+	difs/difsutils.c \
+	difs/dispatch.c \
+	difs/events.c \
+	difs/extensions.c \
+	difs/fontinfo.c \
+	difs/fonts.c \
+	difs/globals.c \
+	difs/initfonts.c \
+	difs/main.c \
+	difs/resource.c \
+	difs/swaprep.c \
+	difs/swapreq.c \
+	difs/tables.c \
+	os/access.c \
+	os/config.c \
+	os/config.h \
+	os/configstr.h \
+	os/connection.c \
+	os/daemon.c \
+	os/error.c \
+	os/io.c \
+	os/osdep.h \
+	os/osglue.c \
+	os/osinit.c \
+	os/utils.c \
+	os/waitfor.c \
+	os/xfstrans.c
+
+dist_man_MANS = \
+        xfs.man
+
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/NEWS
diff --git a/README b/README
new file mode 100644
index 0000000..a0490dc
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+/* $Xorg: README,v 1.3 2000/08/17 19:54:19 cpqbld Exp $ */
+Installation instructions for fontserver
+
+1 - set DefaultFSConfigFile to point to the correct place, if the default
+    is not what you want.
+
+    an example config file is in ./config
+
+2 - modify the file named by DefaultFsConfigFile so the 'catalogue'
+	parameter points to a set of valid font directories.
+
+At this point the test programs should work.  Start the font server
+	(xfs &) and try some tests.  Most of the clients take
+	a command line switch of where to find the server, and
+	FSlib understands the environment variable FONTSERVER.
+	The format is the same as Xlib, (ie, hostname:server_number).
+
+See mit/doc/fontserver:
+
+./doc
+	various pieces of documentation on the font server and associated
+	software:
+
+	FSlib.doc	- short summary of the FSlib functions and their args
+	test_progs	- description of the clients & test programs
+	design.ms	- troff source of fontserver design overview
+
+Tested font formats.
+
+The fontserver has been tested with PCF, Speedo, SNF and BDF formats.
+
+Tested environments:
+
+the fontserver and clients have been built & tested on SPARC running
+4.x and a DECstation 3100 running V4.0.  it should work ok on any 32
+bit UNIX w/ BSD sockets.
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..e81f989
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
+
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..cda8399
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,39 @@
+
+dnl  Copyright 2005 Red Hat, Inc.
+dnl 
+dnl  Permission to use, copy, modify, distribute, and sell this software and its
+dnl  documentation for any purpose is hereby granted without fee, provided that
+dnl  the above copyright notice appear in all copies and that both that
+dnl  copyright notice and this permission notice appear in supporting
+dnl  documentation, and that the name of Red Hat not be used in
+dnl  advertising or publicity pertaining to distribution of the software without
+dnl  specific, written prior permission.  Red Hat makes no
+dnl  representations about the suitability of this software for any purpose.  It
+dnl  is provided "as is" without express or implied warranty.
+dnl 
+dnl  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+dnl  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+dnl  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+dnl  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+dnl  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+dnl  PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl Process this file with autoconf to create configure.
+
+AC_PREREQ([2.57])
+AC_INIT(xfs,[7.0], [xorg@freedesktop.org],xfs)
+AM_INIT_AUTOMAKE([dist-bzip2])
+AM_MAINTAINER_MODE
+
+AM_CONFIG_HEADER(config.h)
+
+AC_PROG_CC
+AC_PROG_INSTALL
+
+# Checks for pkg-config packages
+PKG_CHECK_MODULES(DEP, libfs fontsproto xfont)
+AC_SUBST(DEP_CFLAGS)
+AC_SUBST(DEP_LIBS)
+
+AC_OUTPUT([Makefile])
diff --git a/difs/charinfo.c b/difs/charinfo.c
index f6a9942..f47665f 100644
--- a/difs/charinfo.c
+++ b/difs/charinfo.c
@@ -53,11 +53,11 @@ in this Software without prior written authorization from The Open Group.
 
 #include <X11/Xos.h>
 #include "misc.h"
-#include "fontstruct.h"
-#include "fontutil.h"
+#include <X11/fonts/fontstruct.h>
+#include <X11/fonts/fontutil.h>
 #include "clientstr.h"
 #define FSMD_H
-#include "FSproto.h"
+#include <X11/fonts/FSproto.h>
 #include "difs.h"
 
 extern void TwoByteSwap(unsigned char *, int);
diff --git a/difs/difsutils.c b/difs/difsutils.c
index a17dd81..48f7d52 100644
--- a/difs/difsutils.c
+++ b/difs/difsutils.c
@@ -58,7 +58,7 @@ in this Software without prior written authorization from The Open Group.
 #include	"globals.h"
 #include	"clientstr.h"
 #include	"accstr.h"
-#include	"fontstruct.h"
+#include	<X11/fonts/fontstruct.h>
 #include	<X11/keysymdef.h>
 
 #include	"authstr.h"
diff --git a/difs/dispatch.c b/difs/dispatch.c
index c358314..cc4b5b7 100644
--- a/difs/dispatch.c
+++ b/difs/dispatch.c
@@ -53,8 +53,8 @@ in this Software without prior written authorization from The Open Group.
 #include	"swapreq.h"
 #include	"swaprep.h"
 
-#include	"FS.h"
-#include	"FSproto.h"
+#include	<X11/fonts/FS.h>
+#include	<X11/fonts/FSproto.h>
 #include	"clientstr.h"
 #include	"authstr.h"
 #include	"osstruct.h"
@@ -62,7 +62,7 @@ in this Software without prior written authorization from The Open Group.
 #include	"globals.h"
 #include	"fsresource.h"
 #include	"difsfnst.h"
-#include	"fontstruct.h"
+#include	<X11/fonts/fontstruct.h>
 #include	"site.h"
 #include	"fsevents.h"
 #include	"cache.h"
diff --git a/difs/events.c b/difs/events.c
index 802a2c7..91ae7b9 100644
--- a/difs/events.c
+++ b/difs/events.c
@@ -51,7 +51,7 @@ in this Software without prior written authorization from The Open Group.
 #include	<swaprep.h>
 
 #include	"clientstr.h"
-#include	"FSproto.h"
+#include	<X11/fonts/FSproto.h>
 #include	"globals.h"
 #include	"fsevents.h"
 #include	"dispatch.h"
diff --git a/difs/extensions.c b/difs/extensions.c
index 0f76a82..fb1d227 100644
--- a/difs/extensions.c
+++ b/difs/extensions.c
@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
  */
 /* $XFree86: xc/programs/xfs/difs/extensions.c,v 1.6 2001/08/01 00:45:04 tsi Exp $ */
 
-#include	"FSproto.h"
+#include	<X11/fonts/FSproto.h>
 #include	"misc.h"
 #include	"clientstr.h"
 #include	"extentst.h"
diff --git a/difs/fontinfo.c b/difs/fontinfo.c
index b0beef4..23893e0 100644
--- a/difs/fontinfo.c
+++ b/difs/fontinfo.c
@@ -48,13 +48,13 @@ in this Software without prior written authorization from The Open Group.
  */
 /* $XFree86: xc/programs/xfs/difs/fontinfo.c,v 1.10 2001/12/14 20:01:34 dawes Exp $ */
 
-#include        "FS.h"
-#include        "FSproto.h"
+#include        <X11/fonts/FS.h>
+#include        <X11/fonts/FSproto.h>
 #include        <stdio.h>
 #include        <X11/Xos.h>
 #include        "clientstr.h"
 #include        "difsfnst.h"
-#include        "fontstruct.h"
+#include        <X11/fonts/fontstruct.h>
 #include        "closestr.h"
 #include        "globals.h"
 #include	"difs.h"
diff --git a/difs/fonts.c b/difs/fonts.c
index bbe8964..61b13c1 100644
--- a/difs/fonts.c
+++ b/difs/fonts.c
@@ -47,15 +47,15 @@ in this Software without prior written authorization from The Open Group.
  * THIS SOFTWARE.
  */
 /*#define DEBUG*/
-#include        "FS.h"
-#include        "FSproto.h"
+#include        <X11/fonts/FS.h>
+#include        <X11/fonts/FSproto.h>
 #include	<stdio.h>
 #include	<stdlib.h>
 #include	<X11/Xos.h>
 #include	"clientstr.h"
 #include	"fsresource.h"
 #include	"difsfnst.h"
-#include	"fontstruct.h"
+#include	<X11/fonts/fontstruct.h>
 #include	"closestr.h"
 #include	"globals.h"
 #include	"difs.h"
diff --git a/difs/globals.c b/difs/globals.c
index aac2517..2ad924d 100644
--- a/difs/globals.c
+++ b/difs/globals.c
@@ -50,7 +50,7 @@ in this Software without prior written authorization from The Open Group.
  * @(#)globals.c	4.3	5/3/91
  *
  */
-#include	"FSproto.h"
+#include	<X11/fonts/FSproto.h>
 #include	"clientstr.h"
 #include	"misc.h"
 #include	"site.h"
diff --git a/difs/initfonts.c b/difs/initfonts.c
index f52c242..54dca72 100644
--- a/difs/initfonts.c
+++ b/difs/initfonts.c
@@ -49,7 +49,7 @@ in this Software without prior written authorization from The Open Group.
  */
 /* $XFree86: xc/programs/xfs/difs/initfonts.c,v 1.6 2001/08/01 00:45:04 tsi Exp $ */
 
-#include        "font.h"
+#include        <X11/fonts/font.h>
 #include	"difs.h"
 #ifdef FONTCACHE
 #include        "misc.h"
diff --git a/difs/main.c b/difs/main.c
index 370005e..4e6272c 100644
--- a/difs/main.c
+++ b/difs/main.c
@@ -51,8 +51,8 @@ in this Software without prior written authorization from The Open Group.
 #include	<stdlib.h>
 #include	<sys/types.h>
 #include	<sys/stat.h>
-#include	"FS.h"
-#include	"FSproto.h"
+#include	<X11/fonts/FS.h>
+#include	<X11/fonts/FSproto.h>
 #include	"clientstr.h"
 #include	"fsresource.h"
 #include	"misc.h"
diff --git a/difs/resource.c b/difs/resource.c
index 9b6943c..42227fe 100644
--- a/difs/resource.c
+++ b/difs/resource.c
@@ -65,7 +65,7 @@ in this Software without prior written authorization from The Open Group.
  *      1 - allocated color to be freed when the client dies
  */
 
-#include "FS.h"
+#include <X11/fonts/FS.h>
 #include "misc.h"
 #include "os.h"
 #include "fsresource.h"
diff --git a/difs/swaprep.c b/difs/swaprep.c
index 74d0ca7..b7cb2b2 100644
--- a/difs/swaprep.c
+++ b/difs/swaprep.c
@@ -51,7 +51,7 @@ in this Software without prior written authorization from The Open Group.
 #include	<swaprep.h>
 #include	<swapreq.h>
 
-#include	"FSproto.h"
+#include	<X11/fonts/FSproto.h>
 #include	"clientstr.h"
 
 static void SwapConnSetupAccept(fsConnSetupAccept *pConnSetup, fsConnSetupAccept *pConnSetupT);
diff --git a/difs/swapreq.c b/difs/swapreq.c
index 1c26252..f474158 100644
--- a/difs/swapreq.c
+++ b/difs/swapreq.c
@@ -50,7 +50,7 @@ in this Software without prior written authorization from The Open Group.
 
 #include	<swapreq.h>
 
-#include	"FSproto.h"
+#include	<X11/fonts/FSproto.h>
 #include	"clientstr.h"
 #include	"globals.h"
 #include	"dispatch.h"
diff --git a/include/clientstr.h b/include/clientstr.h
index 4f977ce..ceaba91 100644
--- a/include/clientstr.h
+++ b/include/clientstr.h
@@ -49,7 +49,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _CLIENTSTR_H_
 #define	_CLIENTSTR_H_
 
-#include	"FS.h"
+#include	<X11/fonts/FS.h>
 #include	"client.h"
 #include	"auth.h"
 #include	"misc.h"
diff --git a/include/closestr.h b/include/closestr.h
index 9d38ff2..1e3e412 100644
--- a/include/closestr.h
+++ b/include/closestr.h
@@ -51,10 +51,10 @@ in this Software without prior written authorization from The Open Group.
 #ifndef CLOSESTR_H
 #define CLOSESTR_H
 
-#include	"FSproto.h"
+#include	<X11/fonts/FSproto.h>
 #include	"closure.h"
 #include	"misc.h"
-#include	"font.h"
+#include	<X11/fonts/font.h>
 
 /* closure structures */
 
diff --git a/include/difs.h b/include/difs.h
index c2de977..2299f25 100644
--- a/include/difs.h
+++ b/include/difs.h
@@ -29,7 +29,7 @@
 
 #include "difsfn.h"
 #include "globals.h"
-#include "fontstruct.h"
+#include <X11/fonts/fontstruct.h>
 
 typedef int (*InitialFunc)(ClientPtr);
 typedef int (*ProcFunc)(ClientPtr);
diff --git a/include/difsfn.h b/include/difsfn.h
index a55a9f8..0922810 100644
--- a/include/difsfn.h
+++ b/include/difsfn.h
@@ -49,7 +49,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _DIFSFONT_H_
 #define _DIFSFONT_H_
 #include	"misc.h"
-#include	"font.h"
+#include	<X11/fonts/font.h>
 
 typedef struct _ClientFont *ClientFontPtr;
 typedef struct _FontIDList *FontIDListPtr;
diff --git a/include/difsfnst.h b/include/difsfnst.h
index 4353155..3d7080e 100644
--- a/include/difsfnst.h
+++ b/include/difsfnst.h
@@ -50,7 +50,7 @@ in this Software without prior written authorization from The Open Group.
 #define _DIFSFONTST_H_
 
 #include	"difsfn.h"
-#include	"font.h"
+#include	<X11/fonts/font.h>
 #include	"misc.h"
 
 /* has per-client info about the font */
diff --git a/include/difsutils.h b/include/difsutils.h
index d8a1ef4..d25a270 100644
--- a/include/difsutils.h
+++ b/include/difsutils.h
@@ -32,9 +32,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <misc.h>
 #include <auth.h>
-#include <font.h>
+#include <X11/fonts/font.h>
 #include <accstr.h>
-#include <fontstruct.h>
+#include <X11/fonts/fontstruct.h>
 
 typedef void (*DifsWakeupFunc)(pointer data, int result, unsigned long * pReadmask);
 typedef Bool (*DifsWorkFunc) (ClientPtr, pointer);
diff --git a/include/fsevents.h b/include/fsevents.h
index 7ed50fb..9ff03a5 100644
--- a/include/fsevents.h
+++ b/include/fsevents.h
@@ -54,7 +54,7 @@ in this Software without prior written authorization from the X Consortium.
 #define _EVENTS_H_
 
 #include	<misc.h>
-#include	"FS.h"
+#include	<X11/fonts/FS.h>
 
 extern int ProcGetEventMask(ClientPtr client);
 extern int ProcSetEventMask(ClientPtr client);
diff --git a/include/globals.h b/include/globals.h
index 9b4d083..650bb55 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -51,7 +51,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _GLOBALS_H_
 #define _GLOBALS_H_
 
-#include	"FSproto.h"	/* for fsResolution */
+#include	<X11/fonts/FSproto.h>	/* for fsResolution */
 
 extern long TimeOutValue;
 extern long ReapClientTime;
diff --git a/include/os.h b/include/os.h
index bfc1074..2448552 100644
--- a/include/os.h
+++ b/include/os.h
@@ -56,7 +56,7 @@ typedef struct _FontPathRec *FontPathPtr;
 typedef struct _alt_server *AlternateServerPtr;
 typedef struct _auth *AuthPtr;
 
-#include "FSproto.h"
+#include <X11/fonts/FSproto.h>
 #include "client.h"
 #include "misc.h"
 
diff --git a/os/config.c b/os/config.c
index 2e02e18..e5dbc48 100644
--- a/os/config.c
+++ b/os/config.c
@@ -63,9 +63,8 @@ in this Software without prior written authorization from The Open Group.
 #ifdef FONTCACHE
 #include	<X11/extensions/fontcacheP.h>
 #endif
-#include	"fontutil.h"
+#include	<X11/fonts/fontutil.h>
 #include	"difs.h"
-#include	"snfstr.h"
 
 extern int portFromCmdline;
 
diff --git a/os/connection.c b/os/connection.c
index b184e2d..2035312 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -88,8 +88,8 @@ in this Software without prior written authorization from The Open Group.
 #endif
 #include	<signal.h>
 
-#include	"FS.h"
-#include	"FSproto.h"
+#include	<X11/fonts/FS.h>
+#include	<X11/fonts/FSproto.h>
 #include	"clientstr.h"
 #include	"X11/Xpoll.h"
 #include	"osdep.h"
diff --git a/os/io.c b/os/io.c
index 2973d9f..a5603e2 100644
--- a/os/io.c
+++ b/os/io.c
@@ -61,7 +61,7 @@ in this Software without prior written authorization from The Open Group.
 #include	<uio.h>
 #endif
 
-#include	"FSproto.h"
+#include	<X11/fonts/FSproto.h>
 #include	"clientstr.h"
 #include	"X11/Xpoll.h"
 #include	"osdep.h"
diff --git a/os/xfstrans.c b/os/xfstrans.c
new file mode 100644
index 0000000..573e6a9
--- /dev/null
+++ b/os/xfstrans.c
@@ -0,0 +1,33 @@
+/*
+ * $Id$
+ *
+ * Copyright © 2003 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define FONT_t
+#define TRANS_REOPEN
+#define TRANS_SERVER
+
+#include <X11/Xtrans/transport.c>