Fixed compilation for NDK r12

Change urls in cgit.freedesktop.org from http to https fixes #66

.gitignore

@@ -79,3 +79,5 @@ core
 doltcompile
 doltlibtool
 xserver.ent
+
+test-driver

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "android/android-shmem"]
+	path = android/android-shmem
+	url = git@github.com:pelya/android-shmem.git

COPYING

@@ -1233,6 +1233,27 @@ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
 
+Copyright © 2004 PillowElephantBadgerBankPond
+
+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 PillowElephantBadgerBankPond not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  PillowElephantBadgerBankPond makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+PillowElephantBadgerBankPond DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL PillowElephantBadgerBankPond 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.
+
+
 Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
 
 Permission to use, copy, modify, and distribute this software for any

README

@@ -1,38 +1,10 @@
-					X Server
+X Server for Android
 
-The X server accepts requests from client applications to create windows,
-which are (normally rectangular) "virtual screens" that the client program
-can draw into.
+You need to compile this code using SDL downloaded from
 
-Windows are then composed on the actual screen by the X server
-(or by a separate composite manager) as directed by the window manager,
-which usually communicates with the user via graphical controls such as buttons
-and draggable titlebars and borders.
+https://github.com/pelya/commandergenius
 
-For a comprehensive overview of X Server and X Window System, consult the
-following article:
-http://en.wikipedia.org/wiki/X_server
+Compilation instructions:
 
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
-        http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
-        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
-        git://anongit.freedesktop.org/git/xorg/xserver
-
-        http://cgit.freedesktop.org/xorg/xserver
-
-For patch submission instructions, see:
-
-	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
-        http://wiki.x.org/wiki/GitPage
+https://github.com/pelya/commandergenius/tree/sdl_android/project/jni/application/xserver
 

Xext/saver.c

@@ -927,7 +927,7 @@ ScreenSaverSetAttributes (ClientPtr client)
 	goto bail;
     }
     /* over allocate for override redirect */
-    values = malloc((len + 1) * sizeof (unsigned long));
+    pAttr->values = values = malloc((len + 1) * sizeof (unsigned long));
     if (!values)
     {
 	ret = BadAlloc;
@@ -947,7 +947,6 @@ ScreenSaverSetAttributes (ClientPtr client)
     pAttr->pCursor = NullCursor;
     pAttr->pBackgroundPixmap = NullPixmap;
     pAttr->pBorderPixmap = NullPixmap;
-    pAttr->values = values;
     /*
      * go through the mask, checking the values,
      * looking up pixmaps and cursors and hold a reference

Xext/security.c

@@ -148,9 +148,7 @@ SecurityLabelInitial(void)
 static _X_INLINE const char *
 SecurityLookupRequestName(ClientPtr client)
 {
-    int major = ((xReq *)client->requestBuffer)->reqType;
-    int minor = MinorOpcodeOfRequest(client);
-    return LookupRequestName(major, minor);
+    return LookupRequestName(client->majorOp, client->minorOp);
 }
 
 

Xext/shm.c

@@ -153,14 +153,17 @@ static ShmFuncs fbFuncs = {fbShmCreatePixmap, NULL};
 	client->errorValue = offset; \
 	return BadValue; \
     } \
-    if (needwrite && !shmdesc->writable) \
+    if (needwrite && !shmdesc->writable) { \
+	LogWrite(0, "VERIFY_SHMPTR: BadAccess from %s:%d", __FILE__, __LINE__); \
 	return BadAccess; \
+	} \
 }
 
 #define VERIFY_SHMSIZE(shmdesc,offset,len,client) \
 { \
     if ((offset + len) > shmdesc->size) \
     { \
+	LogWrite(0, "VERIFY_SHMSIZE: BadAccess from %s:%d: offset + len %d shmdesc->size %d", __FILE__, __LINE__, (offset + len), shmdesc->size); \
 	return BadAccess; \
     } \
 }
@@ -337,6 +340,8 @@ shm_access(ClientPtr client, SHMPERM_TYPE *perm, int readonly)
 	    gidset = 1;
 	}
 
+	//LogWrite(0, "shm_access: readonly %d perm mode 0%o uidset %d uid %d gidset %d gid %d", readonly, SHMPERM_MODE(perm), uidset, uid, gidset, gid);
+
 #if defined(HAVE_GETZONEID) && defined(SHMPERM_ZONEID)
 	if ( ((lcc->fieldsSet & LCC_ZID_SET) == 0) || (lcc->zoneid == -1)
 	     || (lcc->zoneid != SHMPERM_ZONEID(perm))) {
@@ -357,6 +362,7 @@ shm_access(ClientPtr client, SHMPERM_TYPE *perm, int readonly)
 		if (!readonly) {
 		    mask |= S_IWUSR;
 		}
+		//LogWrite(0, "shm_access: S_IWUSR %d", (SHMPERM_MODE(perm) & mask) == mask ? 0 : -1);
 		return (SHMPERM_MODE(perm) & mask) == mask ? 0 : -1;
 	    }
 	}
@@ -368,6 +374,7 @@ shm_access(ClientPtr client, SHMPERM_TYPE *perm, int readonly)
 		if (!readonly) {
 		    mask |= S_IWGRP;
 		}
+		//LogWrite(0, "shm_access: S_IWGRP %d", (SHMPERM_MODE(perm) & mask) == mask ? 0 : -1);
 		return (SHMPERM_MODE(perm) & mask) == mask ? 0 : -1;
 	    }
 	}
@@ -377,6 +384,7 @@ shm_access(ClientPtr client, SHMPERM_TYPE *perm, int readonly)
     if (!readonly) {
 	mask |= S_IWOTH;
     }
+    //LogWrite(0, "shm_access: S_IWOTH %d", (SHMPERM_MODE(perm) & mask) == mask ? 0 : -1);
     return (SHMPERM_MODE(perm) & mask) == mask ? 0 : -1;
 }
 
@@ -400,8 +408,10 @@ ProcShmAttach(ClientPtr client)
 	;
     if (shmdesc)
     {
-	if (!stuff->readOnly && !shmdesc->writable)
+	if (!stuff->readOnly && !shmdesc->writable) {
+	    LogWrite(0, "ProcShmAttach: BadAccess from %s:%d", __FILE__, __LINE__); \
 	    return BadAccess;
+	}
 	shmdesc->refcnt++;
     }
     else
@@ -415,6 +425,7 @@ ProcShmAttach(ClientPtr client)
 	    SHMSTAT(stuff->shmid, &buf))
 	{
 	    free(shmdesc);
+	    LogWrite(0, "ProcShmAttach: BadAccess from %s:%d", __FILE__, __LINE__); \
 	    return BadAccess;
 	}
 
@@ -425,6 +436,7 @@ ProcShmAttach(ClientPtr client)
 	if (shm_access(client, &(SHM_PERM(buf)), stuff->readOnly) == -1) {
 	    shmdt(shmdesc->addr);
 	    free(shmdesc);
+	    LogWrite(0, "ProcShmAttach: BadAccess from %s:%d", __FILE__, __LINE__); \
 	    return BadAccess;
 	}
 
@@ -482,7 +494,7 @@ doShmPutImage(DrawablePtr dst, GCPtr pGC,
 {
     PixmapPtr pPixmap;
 
-    if (format == ZPixmap || depth == 1) {
+    if (format == ZPixmap || (format == XYPixmap && depth == 1)) {
 	pPixmap = GetScratchPixmapHeader(dst->pScreen, w, h, depth,
 					 BitsPerPixel(depth),
 					 PixmapBytePad(w, depth),
@@ -991,7 +1003,6 @@ CreatePmap:
 	    pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
 	    pMap->drawable.id = newPix->info[j].id;
 	    if (!AddResource(newPix->info[j].id, RT_PIXMAP, (pointer)pMap)) {
-		(*pScreen->DestroyPixmap)(pMap);
 		result = BadAlloc;
 		break;
 	    }
@@ -1002,10 +1013,8 @@ CreatePmap:
     }
 
     if(result == BadAlloc) {
-	while(j--) {
-	    (*pScreen->DestroyPixmap)(pMap);
+	while(j--)
 	    FreeResource(newPix->info[j].id, RT_NONE);
-	}
 	free(newPix);
     } else 
 	AddResource(stuff->pid, XRT_PIXMAP, newPix);
@@ -1110,7 +1119,6 @@ CreatePmap:
 	{
 	    return Success;
 	}
-	pDraw->pScreen->DestroyPixmap(pMap);
     }
     return BadAlloc;
 }

Xext/xace.c

@@ -101,6 +101,10 @@ int XaceHook(int hook, ...)
     } u;
     int *prv = NULL;	/* points to return value from callback */
     va_list ap;		/* argument list */
+
+    if (!XaceHooks[hook])
+	return Success;
+
     va_start(ap, hook);
 
     /* Marshal arguments for passing to callback.

Xext/xselinux_ext.c

@@ -528,12 +528,6 @@ ProcSELinuxDispatch(ClientPtr client)
 static int
 SProcSELinuxQueryVersion(ClientPtr client)
 {
-    REQUEST(SELinuxQueryVersionReq);
-    int n;
-
-    REQUEST_SIZE_MATCH(SELinuxQueryVersionReq);
-    swaps(&stuff->client_major, n);
-    swaps(&stuff->client_minor, n);
     return ProcSELinuxQueryVersion(client);
 }
 

Xext/xselinux_hooks.c

@@ -263,8 +263,8 @@ SELinuxAudit(void *auditdata,
     if (client) {
 	REQUEST(xReq);
 	if (stuff) {
-	    major = stuff->reqType;
-	    minor = MinorOpcodeOfRequest(client);
+	    major = client->majorOp;
+	    minor = client->minorOp;
 	}
     }
     if (audit->id)

Xext/xvdisp.c

@@ -1265,7 +1265,7 @@ ProcXvDispatch(ClientPtr client)
 
   UpdateCurrentTime();
 
-  if (stuff->data > xvNumRequests) {
+  if (stuff->data >= xvNumRequests) {
     SendErrorToClient(client, XvReqCode, stuff->data, 0, BadRequest);
     return BadRequest;
   }
@@ -1589,7 +1589,7 @@ SProcXvDispatch(ClientPtr client)
 
   UpdateCurrentTime();
 
-  if (stuff->data > xvNumRequests) {
+  if (stuff->data >= xvNumRequests) {
     SendErrorToClient(client, XvReqCode, stuff->data, 0, BadRequest);
     return BadRequest;
   }

Xi/exevents.c

@@ -927,7 +927,7 @@ ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr device)
 
     for (i = 0; mouse && mouse->button && i < mouse->button->numButtons; i++)
         if (BitIsOn(mouse->button->down, i))
-            SetBit(event->buttons, i);
+            SetBit(event->buttons, mouse->button->map[i]);
 
     if (kbd && kbd->key)
     {
@@ -1441,7 +1441,7 @@ GrabKey(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device,
     rc = CheckGrabValues(client, param);
     if (rc != Success)
         return rc;
-    if (k == NULL)
+    if ((dev->id != XIAllDevices && dev->id != XIAllMasterDevices) && k == NULL)
 	return BadMatch;
     if (grabtype == GRABTYPE_XI)
     {

Xi/extinit.c

@@ -409,7 +409,7 @@ static int
 ProcIDispatch(ClientPtr client)
 {
     REQUEST(xReq);
-    if (stuff->data > ARRAY_SIZE(ProcIVector) || !ProcIVector[stuff->data])
+    if (stuff->data >= ARRAY_SIZE(ProcIVector) || !ProcIVector[stuff->data])
         return BadRequest;
 
     return (*ProcIVector[stuff->data])(client);
@@ -428,7 +428,7 @@ static int
 SProcIDispatch(ClientPtr client)
 {
     REQUEST(xReq);
-    if (stuff->data > ARRAY_SIZE(SProcIVector) || !SProcIVector[stuff->data])
+    if (stuff->data >= ARRAY_SIZE(SProcIVector) || !SProcIVector[stuff->data])
         return BadRequest;
 
     return (*SProcIVector[stuff->data])(client);

Xi/xichangehierarchy.c

@@ -202,6 +202,19 @@ unwind:
     return rc;
 }
 
+static void
+disable_clientpointer(DeviceIntPtr dev)
+{
+    int i;
+
+    for (i = 0; i < currentMaxClients; i++)
+    {
+        ClientPtr client = clients[i];
+        if (client && client->clientPtr == dev)
+            client->clientPtr = NULL;
+    }
+}
+
 static int
 remove_master(ClientPtr client, xXIRemoveMasterInfo *r,
               int flags[MAXDEVICES])
@@ -252,6 +265,8 @@ remove_master(ClientPtr client, xXIRemoveMasterInfo *r,
     if (rc != Success)
         goto unwind;
 
+    disable_clientpointer(ptr);
+
     /* Disabling sends the devices floating, reattach them if
      * desired. */
     if (r->return_mode == XIAttachToMaster)

Xi/xipassivegrab.c

@@ -140,11 +140,17 @@ ProcXIPassiveGrabDevice(ClientPtr client)
     memset(&param, 0, sizeof(param));
     param.grabtype = GRABTYPE_XI2;
     param.ownerEvents = stuff->owner_events;
-    param.this_device_mode = stuff->grab_mode;
-    param.other_devices_mode = stuff->paired_device_mode;
     param.grabWindow = stuff->grab_window;
     param.cursor = stuff->cursor;
 
+    if (IsKeyboardDevice(dev)) {
+        param.this_device_mode = stuff->grab_mode;
+        param.other_devices_mode = stuff->paired_device_mode;
+    } else {
+        param.this_device_mode = stuff->paired_device_mode;
+        param.other_devices_mode = stuff->grab_mode;
+    }
+
     if (stuff->cursor != None)
     {
         status = dixLookupResourceByType(&tmp, stuff->cursor,
@@ -261,9 +267,16 @@ ProcXIPassiveUngrabDevice(ClientPtr client)
     REQUEST(xXIPassiveUngrabDeviceReq);
     REQUEST_AT_LEAST_SIZE(xXIPassiveUngrabDeviceReq);
 
-    rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess);
-    if (rc != Success)
-	return rc;
+    if (stuff->deviceid == XIAllDevices)
+        dev = inputInfo.all_devices;
+    else if (stuff->deviceid == XIAllMasterDevices)
+        dev = inputInfo.all_master_devices;
+    else
+    {
+        rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess);
+        if (rc != Success)
+	    return rc;
+    }
 
     if (stuff->grab_type != XIGrabtypeButton &&
         stuff->grab_type != XIGrabtypeKeycode &&

Xsdl

@@ -0,0 +1 @@
+hw/kdrive/sdl/Xsdl

android/.gitignore

@@ -0,0 +1,12 @@
+X11
+hw
+include
+xcb
+xhost
+xkbcomp
+xli
+xli-1.16
+xproto-7.0.24
+lib*
+doc
+xsel*

android/Xtrans.c.diff

@@ -0,0 +1,15 @@
+--- Xtrans.c	2012-03-23 05:04:16.000000000 +0200
++++ Xtrans.c	2015-06-25 21:55:11.338383377 +0300
+@@ -1071,9 +1071,9 @@
+ 	    continue;
+ 	}
+ #if defined(IPv6) && defined(AF_INET6)
+-		if ((Xtransports[i].transport_id == TRANS_SOCKET_INET_INDEX
+-		     && ipv6_succ))
+-		    flags |= ADDR_IN_USE_ALLOWED;
++	//	if ((Xtransports[i].transport_id == TRANS_SOCKET_INET_INDEX
++	//	     && ipv6_succ))
++	//	    flags |= ADDR_IN_USE_ALLOWED;
+ #endif
+ 
+ 	if ((status = TRANS(CreateListener (ciptr, port, flags))) < 0)

android/armeabi-v7a/.gitignore

@@ -0,0 +1 @@
+../.gitignore

android/armeabi-v7a/build.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -x
+
+export TARGET_ARCH=armeabi-v7a
+export TARGET_HOST=arm-linux-androideabi
+
+../build.sh

android/armeabi-v7a/setCrossEnvironment.sh

@@ -0,0 +1 @@
+../setCrossEnvironment-armeabi-v7a.sh

android/armeabi/.gitignore

@@ -0,0 +1 @@
+../.gitignore

android/armeabi/build.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -x
+
+export TARGET_ARCH=armeabi
+export TARGET_HOST=arm-linux-androideabi
+
+../build.sh

android/armeabi/setCrossEnvironment.sh

@@ -0,0 +1 @@
+../setCrossEnvironment-armeabi.sh

android/mips/.gitignore

@@ -0,0 +1 @@
+../.gitignore

android/mips/build.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -x
+
+export TARGET_ARCH=mips
+export TARGET_HOST=mipsel-linux-android
+
+../build.sh

android/mips/setCrossEnvironment.sh

@@ -0,0 +1 @@
+../setCrossEnvironment-mips.sh

android/setCrossEnvironment-armeabi-v7a.sh

@@ -0,0 +1,79 @@
+#!/bin/sh
+
+IFS='
+'
+
+MYARCH=linux-x86_64
+if uname -s | grep -i "linux" > /dev/null ; then
+	MYARCH=linux-x86_64
+fi
+if uname -s | grep -i "darwin" > /dev/null ; then
+	MYARCH=darwin-x86_64
+fi
+if uname -s | grep -i "windows" > /dev/null ; then
+	MYARCH=windows-x86_64
+fi
+
+NDK=`which ndk-build`
+NDK=`dirname $NDK`
+NDK=`readlink -f $NDK`
+
+[ -z "$NDK" ] && { echo "You need Andorid NDK r8 or newer installed to run this script" ; exit 1 ; }
+GCCPREFIX=arm-linux-androideabi
+GCCVER=${GCCVER:-4.9}
+PLATFORMVER=${PLATFORMVER:-android-14}
+LOCAL_PATH=`dirname $0`
+if which realpath > /dev/null ; then
+	LOCAL_PATH=`realpath $LOCAL_PATH`
+else
+	LOCAL_PATH=`cd $LOCAL_PATH && pwd`
+fi
+ARCH=armeabi-v7a
+
+CFLAGS="\
+-fpic -ffunction-sections -funwind-tables -fstack-protector \
+-no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb \
+-fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 -marm -fno-omit-frame-pointer \
+-DANDROID -DNDEBUG -O2 -g -finline-functions -Wa,--noexecstack -Wformat -Werror=format-security \
+-isystem$NDK/platforms/$PLATFORMVER/arch-arm/usr/include \
+-isystem$NDK/sources/cxx-stl/gnu-libstdc++/$GCCVER/include \
+-isystem$NDK/sources/cxx-stl/gnu-libstdc++/$GCCVER/libs/$ARCH/include \
+$CFLAGS"
+
+UNRESOLVED="-Wl,--no-undefined"
+SHARED="-Wl,--gc-sections -Wl,-z,nocopyreloc"
+if [ -n "$BUILD_LIBRARY" ]; then
+	[ -z "$SHARED_LIBRARY_NAME" ] && SHARED_LIBRARY_NAME=libapplication.so
+	SHARED="-shared -Wl,-soname,$SHARED_LIBRARY_NAME"
+fi
+if [ -n "$ALLOW_UNRESOLVED_SYMBOLS" ]; then
+	UNRESOLVED=
+fi
+
+LDFLAGS="\
+$SHARED \
+--sysroot=$NDK/platforms/$PLATFORMVER/arch-arm \
+-L$NDK/platforms/$PLATFORMVER/arch-arm/usr/lib \
+-lc -lm -ldl -lz \
+-L$NDK/sources/cxx-stl/gnu-libstdc++/$GCCVER/libs/$ARCH \
+-lgnustl_static \
+-march=armv7-a -Wl,--fix-cortex-a8 \
+-no-canonical-prefixes $UNRESOLVED -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now \
+-lsupc++ \
+$LDFLAGS"
+
+env PATH=$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin:$LOCAL_PATH:$PATH \
+CFLAGS="$CFLAGS" \
+CXXFLAGS="$CXXFLAGS $CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+CC="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-gcc" \
+CXX="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-g++" \
+RANLIB="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-ranlib" \
+LD="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-ld" \
+AR="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-ar" \
+CPP="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-cpp $CFLAGS" \
+CXXCPP="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-cpp -x c++ $CFLAGS" \
+NM="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-nm" \
+AS="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-as" \
+STRIP="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-strip" \
+"$@"

android/setCrossEnvironment-armeabi.sh

@@ -0,0 +1,79 @@
+#!/bin/sh
+
+IFS='
+'
+
+MYARCH=linux-x86_64
+if uname -s | grep -i "linux" > /dev/null ; then
+	MYARCH=linux-x86_64
+fi
+if uname -s | grep -i "darwin" > /dev/null ; then
+	MYARCH=darwin-x86_64
+fi
+if uname -s | grep -i "windows" > /dev/null ; then
+	MYARCH=windows-x86_64
+fi
+
+NDK=`which ndk-build`
+NDK=`dirname $NDK`
+NDK=`readlink -f $NDK`
+
+[ -z "$NDK" ] && { echo "You need Andorid NDK r8 or newer installed to run this script" ; exit 1 ; }
+GCCPREFIX=arm-linux-androideabi
+GCCVER=${GCCVER:-4.9}
+PLATFORMVER=${PLATFORMVER:-android-14}
+LOCAL_PATH=`dirname $0`
+if which realpath > /dev/null ; then
+	LOCAL_PATH=`realpath $LOCAL_PATH`
+else
+	LOCAL_PATH=`cd $LOCAL_PATH && pwd`
+fi
+ARCH=armeabi
+#ARCH=armeabi-v7a
+
+CFLAGS="\
+-fpic -ffunction-sections -funwind-tables -fstack-protector -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ \
+-no-canonical-prefixes -march=armv5te -mtune=xscale -msoft-float -mthumb \
+-fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 \
+-DANDROID -DNDEBUG -O2 -g -finline-functions -Wa,--noexecstack \
+-isystem$NDK/platforms/$PLATFORMVER/arch-arm/usr/include \
+-isystem$NDK/sources/cxx-stl/gnu-libstdc++/$GCCVER/include \
+-isystem$NDK/sources/cxx-stl/gnu-libstdc++/$GCCVER/libs/$ARCH/include \
+$CFLAGS"
+
+UNRESOLVED="-Wl,--no-undefined"
+SHARED="-Wl,--gc-sections -Wl,-z,nocopyreloc"
+if [ -n "$BUILD_LIBRARY" ]; then
+	[ -z "$SHARED_LIBRARY_NAME" ] && SHARED_LIBRARY_NAME=libapplication.so
+	SHARED="-shared -Wl,-soname,$SHARED_LIBRARY_NAME"
+fi
+if [ -n "$ALLOW_UNRESOLVED_SYMBOLS" ]; then
+	UNRESOLVED=
+fi
+
+LDFLAGS="\
+$SHARED \
+--sysroot=$NDK/platforms/$PLATFORMVER/arch-arm \
+-L$NDK/platforms/$PLATFORMVER/arch-arm/usr/lib \
+-lc -lm -ldl -lz \
+-L$NDK/sources/cxx-stl/gnu-libstdc++/$GCCVER/libs/$ARCH \
+-lgnustl_static \
+-no-canonical-prefixes $UNRESOLVED -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now \
+-lsupc++ \
+$LDFLAGS"
+
+env PATH=$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin:$LOCAL_PATH:$PATH \
+CFLAGS="$CFLAGS" \
+CXXFLAGS="$CXXFLAGS $CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+CC="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-gcc" \
+CXX="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-g++" \
+RANLIB="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-ranlib" \
+LD="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-ld" \
+AR="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-ar" \
+CPP="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-cpp $CFLAGS" \
+CXXCPP="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-cpp -x c++ $CFLAGS" \
+NM="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-nm" \
+AS="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-as" \
+STRIP="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-strip" \
+"$@"

android/setCrossEnvironment-mips.sh

@@ -0,0 +1,81 @@
+#!/bin/sh
+
+IFS='
+'
+
+MYARCH=linux-x86_64
+if uname -s | grep -i "linux" > /dev/null ; then
+	MYARCH=linux-x86_64
+fi
+if uname -s | grep -i "darwin" > /dev/null ; then
+	MYARCH=darwin-x86_64
+fi
+if uname -s | grep -i "windows" > /dev/null ; then
+	MYARCH=windows-x86_64
+fi
+
+NDK=`which ndk-build`
+NDK=`dirname $NDK`
+NDK=`readlink -f $NDK`
+
+[ -z "$NDK" ] && { echo "You need Andorid NDK r8 or newer installed to run this script" ; exit 1 ; }
+GCCPREFIX=mipsel-linux-android
+GCCVER=${GCCVER:-4.9}
+PLATFORMVER=${PLATFORMVER:-android-14}
+LOCAL_PATH=`dirname $0`
+if which realpath > /dev/null ; then
+	LOCAL_PATH=`realpath $LOCAL_PATH`
+else
+	LOCAL_PATH=`cd $LOCAL_PATH && pwd`
+fi
+ARCH=mips
+
+CFLAGS="\
+-fpic -fno-strict-aliasing -finline-functions -ffunction-sections \
+-funwind-tables -fmessage-length=0 -fno-inline-functions-called-once \
+-fgcse-after-reload -frerun-cse-after-loop -frename-registers \
+-no-canonical-prefixes -O2 -g -DNDEBUG -fomit-frame-pointer \
+-funswitch-loops -finline-limit=300 \
+-DANDROID -Wall -Wno-unused -Wa,--noexecstack -Wformat -Werror=format-security \
+-isystem$NDK/platforms/$PLATFORMVER/arch-mips/usr/include \
+-isystem$NDK/sources/cxx-stl/gnu-libstdc++/$GCCVER/include \
+-isystem$NDK/sources/cxx-stl/gnu-libstdc++/$GCCVER/libs/$ARCH/include \
+$CFLAGS"
+
+
+UNRESOLVED="-Wl,--no-undefined"
+SHARED="-Wl,--gc-sections -Wl,-z,nocopyreloc"
+if [ -n "$BUILD_LIBRARY" ]; then
+	[ -z "$SHARED_LIBRARY_NAME" ] && SHARED_LIBRARY_NAME=libapplication.so
+	SHARED="-shared -Wl,-soname,$SHARED_LIBRARY_NAME"
+fi
+if [ -n "$ALLOW_UNRESOLVED_SYMBOLS" ]; then
+	UNRESOLVED=
+fi
+
+LDFLAGS="\
+$SHARED \
+--sysroot=$NDK/platforms/$PLATFORMVER/arch-mips \
+-L$NDK/platforms/$PLATFORMVER/arch-mips/usr/lib \
+-lc -lm -ldl -lz \
+-L$NDK/sources/cxx-stl/gnu-libstdc++/$GCCVER/libs/$ARCH \
+-lgnustl_static \
+-no-canonical-prefixes $UNRESOLVED -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now \
+-lsupc++ \
+$LDFLAGS"
+
+env PATH=$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin:$LOCAL_PATH:$PATH \
+CFLAGS="$CFLAGS" \
+CXXFLAGS="$CXXFLAGS $CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+CC="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-gcc" \
+CXX="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-g++" \
+RANLIB="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-ranlib" \
+LD="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-ld" \
+AR="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-ar" \
+CPP="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-cpp $CFLAGS" \
+CXXCPP="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-cpp -x c++ $CFLAGS" \
+NM="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-nm" \
+AS="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-as" \
+STRIP="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-strip" \
+"$@"

android/setCrossEnvironment-x86.sh

@@ -0,0 +1,79 @@
+#!/bin/sh
+
+IFS='
+'
+
+MYARCH=linux-x86_64
+if uname -s | grep -i "linux" > /dev/null ; then
+	MYARCH=linux-x86_64
+fi
+if uname -s | grep -i "darwin" > /dev/null ; then
+	MYARCH=darwin-x86_64
+fi
+if uname -s | grep -i "windows" > /dev/null ; then
+	MYARCH=windows-x86_64
+fi
+
+NDK=`which ndk-build`
+NDK=`dirname $NDK`
+NDK=`readlink -f $NDK`
+
+[ -z "$NDK" ] && { echo "You need Andorid NDK r8 or newer installed to run this script" ; exit 1 ; }
+GCCPREFIX=i686-linux-android
+GCCVER=${GCCVER:-4.9}
+PLATFORMVER=${PLATFORMVER:-android-14}
+LOCAL_PATH=`dirname $0`
+if which realpath > /dev/null ; then
+	LOCAL_PATH=`realpath $LOCAL_PATH`
+else
+	LOCAL_PATH=`cd $LOCAL_PATH && pwd`
+fi
+ARCH=x86
+
+CFLAGS="\
+-fpic -ffunction-sections -funwind-tables -no-canonical-prefixes \
+-fstack-protector -O2 -g -DNDEBUG \
+-fomit-frame-pointer -fstrict-aliasing -funswitch-loops \
+-finline-limit=300 \
+-DANDROID -Wall -Wno-unused -Wa,--noexecstack -Wformat -Werror=format-security \
+-isystem$NDK/platforms/$PLATFORMVER/arch-x86/usr/include \
+-isystem$NDK/sources/cxx-stl/gnu-libstdc++/$GCCVER/include \
+-isystem$NDK/sources/cxx-stl/gnu-libstdc++/$GCCVER/libs/$ARCH/include \
+$CFLAGS"
+
+UNRESOLVED="-Wl,--no-undefined"
+SHARED="-Wl,--gc-sections -Wl,-z,nocopyreloc"
+if [ -n "$BUILD_LIBRARY" ]; then
+	[ -z "$SHARED_LIBRARY_NAME" ] && SHARED_LIBRARY_NAME=libapplication.so
+	SHARED="-shared -Wl,-soname,$SHARED_LIBRARY_NAME"
+fi
+if [ -n "$ALLOW_UNRESOLVED_SYMBOLS" ]; then
+	UNRESOLVED=
+fi
+
+LDFLAGS="\
+$SHARED \
+--sysroot=$NDK/platforms/$PLATFORMVER/arch-x86 \
+-L$NDK/platforms/$PLATFORMVER/arch-x86/usr/lib \
+-lc -lm -ldl -lz \
+-L$NDK/sources/cxx-stl/gnu-libstdc++/$GCCVER/libs/$ARCH \
+-lgnustl_static \
+-no-canonical-prefixes $UNRESOLVED -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now \
+-lsupc++ \
+$LDFLAGS"
+
+env PATH=$NDK/toolchains/$ARCH-$GCCVER/prebuilt/$MYARCH/bin:$LOCAL_PATH:$PATH \
+CFLAGS="$CFLAGS" \
+CXXFLAGS="$CXXFLAGS $CFLAGS" \
+LDFLAGS="$LDFLAGS" \
+CC="$NDK/toolchains/$ARCH-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-gcc" \
+CXX="$NDK/toolchains/$ARCH-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-g++" \
+RANLIB="$NDK/toolchains/$ARCH-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-ranlib" \
+LD="$NDK/toolchains/$ARCH-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-ld" \
+AR="$NDK/toolchains/$ARCH-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-ar" \
+CPP="$NDK/toolchains/$ARCH-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-cpp $CFLAGS" \
+CXXCPP="$NDK/toolchains/$ARCH-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-cpp -x c++ $CFLAGS" \
+NM="$NDK/toolchains/$ARCH-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-nm" \
+AS="$NDK/toolchains/$ARCH-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-as" \
+STRIP="$NDK/toolchains/$ARCH-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-strip" \
+"$@"

android/x86/.gitignore

@@ -0,0 +1 @@
+../.gitignore

android/x86/build.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -x
+
+export TARGET_ARCH=x86
+export TARGET_HOST=i686-linux-android
+
+../build.sh

android/x86/setCrossEnvironment.sh

@@ -0,0 +1 @@
+../setCrossEnvironment-x86.sh

android/xproto.diff

@@ -0,0 +1,42 @@
+--- Xos_r.h	2013-03-30 01:21:00.000000000 +0200
++++ Xos_r.h	2013-11-01 19:59:53.048246394 +0200
+@@ -232,7 +232,7 @@
+ # define _XGetpwuid(u,p)	getpwuid((u))
+ # define _XGetpwnam(u,p)	getpwnam((u))
+ 
+-#elif !defined(XOS_USE_MTSAFE_PWDAPI) || defined(XNO_MTSAFE_PWDAPI)
++#elif !defined(XOS_USE_MTSAFE_PWDAPI) || defined(XNO_MTSAFE_PWDAPI) || defined(__ANDROID__)
+ /* UnixWare 2.0, or other systems with thread support but no _r API. */
+ # define X_NEEDS_PWPARAMS
+ typedef struct {
+@@ -289,16 +289,7 @@
+     ((p).pws.pw_passwd = (p).pws.pw_name + (p).len + 1), \
+     ((p).len = strlen((p).pwp->pw_passwd)), \
+     strcpy((p).pws.pw_passwd,(p).pwp->pw_passwd), \
+-    ((p).pws.pw_age = (p).pws.pw_passwd + (p).len + 1), \
+-    ((p).len = strlen((p).pwp->pw_age)), \
+-    strcpy((p).pws.pw_age, (p).pwp->pw_age), \
+-    ((p).pws.pw_comment = (p).pws.pw_age + (p).len + 1), \
+-    ((p).len = strlen((p).pwp->pw_comment)), \
+-    strcpy((p).pws.pw_comment, (p).pwp->pw_comment), \
+-    ((p).pws.pw_gecos = (p).pws.pw_comment + (p).len + 1), \
+-    ((p).len = strlen((p).pwp->pw_gecos)), \
+-    strcpy((p).pws.pw_gecos, (p).pwp->pw_gecos), \
+-    ((p).pws.pw_dir = (p).pws.pw_comment + (p).len + 1), \
++    ((p).pws.pw_dir = (p).pws.pw_passwd + (p).len + 1), \
+     ((p).len = strlen((p).pwp->pw_dir)), \
+     strcpy((p).pws.pw_dir, (p).pwp->pw_dir), \
+     ((p).pws.pw_shell = (p).pws.pw_dir + (p).len + 1), \
+--- Xpoll.h.in	2013-03-30 01:21:00.000000000 +0200
++++ Xpoll.h.in	2013-11-01 21:19:40.877429614 +0200
+@@ -67,6 +67,10 @@
+ # endif
+ #endif
+ 
++#ifdef __ANDROID__
++typedef unsigned long fd_mask;
++#endif
++
+ #define XFD_SETSIZE	256
+ 
+ #ifndef FD_SETSIZE

composite/compalloc.c

@@ -196,11 +196,7 @@ compRedirectWindow (ClientPtr pClient, WindowPtr pWin, int update)
 
 	anyMarked = compMarkWindows (pWin, &pLayerWin);
 
-	/* Make sure our borderClip is correct for ValidateTree */
 	RegionNull(&cw->borderClip);
-	RegionCopy(&cw->borderClip, &pWin->borderClip);
-	cw->borderClipX = pWin->drawable.x;
-	cw->borderClipY = pWin->drawable.y;
 	cw->update = CompositeRedirectAutomatic;
 	cw->clients = 0;
 	cw->oldx = COMP_ORIGIN_INVALID;
@@ -658,6 +654,13 @@ compAllocPixmap (WindowPtr pWin)
 	DamageRegister (&pWin->drawable, cw->damage);
 	cw->damageRegistered = TRUE;
     }
+
+    /* Make sure our borderClip is up to date */
+    RegionUninit(&cw->borderClip);
+    RegionCopy(&cw->borderClip, &pWin->borderClip);
+    cw->borderClipX = pWin->drawable.x;
+    cw->borderClipY = pWin->drawable.y;
+
     return TRUE;
 }
 

config/hal.c

@@ -355,6 +355,7 @@ device_added(LibHalContext *hal_ctx, const char *udi)
                         if (!strcasecmp(tmp, ".options") && (!xkb_opts.options))
                             xkb_opts.options = strdup(tmp_val);
                     }
+                    free(tmp_val);
                 }
             }
         }

config/udev.c

@@ -114,7 +114,7 @@ device_added(struct udev_device *udev_device)
                 == -1)
                 attrs.usb_id = NULL;
             else
-                LOG_PROPERTY(path, "PRODUCT", product);
+                LOG_PROPERTY(ppath, "PRODUCT", product);
         }
     }
     if (!name)

configure-xsdl.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+env SDL=yes CFLAGS="-O0 -g -DDEBUG" \
+./configure --prefix=`pwd`/data/usr \
+--enable-debug \
+--disable-xorg --disable-dmx --disable-xvfb --disable-xnest --disable-xquartz --disable-xwin \
+--disable-xephyr --disable-xfake --disable-xfbdev --disable-unit-tests \
+--disable-shm --disable-mitshm --disable-dri --disable-dri2 --disable-glx --disable-xf86vidmode \
+--enable-xsdl --enable-kdrive --enable-kdrive-kbd --enable-kdrive-mouse --enable-kdrive-evdev \
+
+nice -n19 make -j8

configure.ac

@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.11.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2011-08-26"
+AC_INIT([xorg-server], 1.11.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2012-01-27"
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
@@ -652,6 +652,7 @@ AC_ARG_ENABLE(xwin,    	      AS_HELP_STRING([--enable-xwin], [Build XWin server
 dnl kdrive and its subsystems
 AC_ARG_ENABLE(kdrive,         AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no])
 AC_ARG_ENABLE(xephyr,         AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto])
+AC_ARG_ENABLE(xsdl,           AS_HELP_STRING([--enable-xsdl], [Build the kdrive Xsdl server (default: auto)]), [XSDL=$enableval], [XSDL=auto])
 AC_ARG_ENABLE(xfake,          AS_HELP_STRING([--enable-xfake], [Build the kdrive 'fake' server (default: auto)]), [XFAKE=$enableval], [XFAKE=auto])
 AC_ARG_ENABLE(xfbdev,         AS_HELP_STRING([--enable-xfbdev], [Build the kdrive framebuffer device server (default: auto)]), [XFBDEV=$enableval], [XFBDEV=auto])
 dnl kdrive options
@@ -999,6 +1000,13 @@ if test "x$RES" = xyes && test "x$CLIENTIDS" = xyes; then
 else
 	CLIENTIDS=no
 fi
+if test "x$CLIENTIDS" = xyes; then
+	case $host_os in
+	openbsd*)
+		SYS_LIBS="$SYS_LIBS -lkvm"
+	;;
+	esac
+fi
 AC_MSG_RESULT([$CLIENTIDS])
 AM_CONDITIONAL(CLIENTIDS, [test "x$CLIENTIDS" = xyes])
 
@@ -1973,6 +1981,9 @@ dnl kdrive DDX
 
 XEPHYR_LIBS=
 XEPHYR_INCS=
+XSDL_LIBS=
+XSDL_INCS=
+XSDL_DIRS=
 
 AM_CONDITIONAL(KDRIVE, [test x$KDRIVE = xyes])
 
@@ -2021,6 +2032,18 @@ if test "$KDRIVE" = yes; then
        AC_DEFINE(KDRIVE_MOUSE, 1, [Enable KDrive mouse driver])
     fi
 
+    AC_CHECK_HEADERS([SDL/SDL.h])
+    if test x"$ac_cv_header_SDL_SDL_h" = xyes && test "x$XSDL" = xauto; then
+       XSDL=yes
+    fi
+
+    if test x"$XSDL" = xyes; then
+       # PKG_CHECK_MODULES(XSDL_EXTRA, Xfont xau $XDMCP_MODULES)
+       AC_DEFINE(XSDLSERVER,1,[Build Xsdl server])
+       XSDL_LIBS="`sdl-config --libs`"
+       XSDL_INCS="`sdl-config --cflags` $XSERVER_CFLAGS"
+    fi
+
     XEPHYR_REQUIRED_LIBS="x11 $LIBXEXT xau xdmcp"
     if test "x$XV" = xyes; then
         XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xv"
@@ -2029,12 +2052,10 @@ if test "$KDRIVE" = yes; then
         XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm"
     fi
 
-    PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])
     if test "x$XEPHYR" = xauto; then
-        XEPHYR=$xephyr
-    fi
-    if test "x$XEPHYR" = xyes && test "x$xephyr" = xno; then	
-        AC_MSG_ERROR([Xephyr dependencies missing])
+        PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [XEPHYR="yes"], [XEPHYR="no"])
+    elif test "x$XEPHYR" = xyes ; then
+        PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS)
     fi
 
     # Xephyr needs nanosleep() which is in librt on Solaris
@@ -2085,6 +2106,8 @@ if test "$KDRIVE" = yes; then
 
     AC_SUBST([XEPHYR_LIBS])
     AC_SUBST([XEPHYR_INCS])
+    AC_SUBST([XSDL_LIBS])
+    AC_SUBST([XSDL_INCS])
 fi
 AC_SUBST([KDRIVE_INCS])
 AC_SUBST([KDRIVE_PURE_INCS])
@@ -2098,6 +2121,7 @@ AM_CONDITIONAL(KDRIVE_KBD,   [test "x$KDRIVE_KBD" = xyes])
 AM_CONDITIONAL(KDRIVE_MOUSE, [test "x$KDRIVE_MOUSE" = xyes])
 AM_CONDITIONAL(TSLIB, [test "x$HAVE_TSLIB" = xyes])
 AM_CONDITIONAL(KDRIVEFBDEV, [test "x$XFBDEV" = xyes])
+AM_CONDITIONAL(XSDLSERVER, [test x"$XSDL" = xyes])
 AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes])
 AM_CONDITIONAL(BUILD_KDRIVEFBDEVLIB, [test "x$KDRIVE" = xyes && test "x$KDRIVEFBDEVLIB" = xyes])
 AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes && test "x$XFAKE" = xyes])
@@ -2227,6 +2251,7 @@ hw/xquartz/xpr/Makefile
 hw/kdrive/Makefile
 hw/kdrive/ephyr/Makefile
 hw/kdrive/ephyr/man/Makefile
+hw/kdrive/sdl/Makefile
 hw/kdrive/fake/Makefile
 hw/kdrive/fbdev/Makefile
 hw/kdrive/linux/Makefile

data/archive.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+mkdir -p tmp
+tar cvfz data-1.tgz usr tmp

data/usr/share/X11/locale/C/Compose

@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

data/usr/share/X11/locale/C/XI18N_OBJS

@@ -0,0 +1,8 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for euro locales
+#
+XLC	common/xlibi18n	_XlcGenericLoader	# XLC_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
+XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open
+

data/usr/share/X11/locale/C/XLC_LOCALE

@@ -0,0 +1,98 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  XLocale Database Sample for C.
+# 
+
+# 
+# 	XLC_FONTSET category
+# 
+XLC_FONTSET
+# 	fs0 class (7 bit ASCII)
+fs0	{
+	charset	{
+		name	ISO8859-1:GL
+	}
+	font	{
+		primary		ISO8859-1:GL
+		vertical_rotate	all
+	}
+}
+END XLC_FONTSET
+
+# 
+# 	XLC_XLOCALE category
+# 
+XLC_XLOCALE
+
+encoding_name		STRING
+mb_cur_max		1
+state_depend_encoding	False
+
+wc_encoding_mask	\x30000000
+wc_shift_bits		7
+
+
+
+
+
+
+use_stdc_env		True
+force_convert_to_mb	True
+
+
+# 	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	wc_encoding	\x00000000
+	ct_encoding	ISO8859-1:GL
+}
+
+# 	cs1 class
+cs1	{
+	side		GR:Default
+	length		1
+
+	wc_encoding	\x30000000
+
+
+
+	ct_encoding	ISO8859-1:GR
+}
+
+END XLC_XLOCALE

data/usr/share/X11/locale/am_ET.UTF-8/Compose

@@ -0,0 +1,397 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 
+# UTF-8 (Unicode) compose sequence
+# for Ethiopean layout.
+# Designed as a part of OLPC project
+#
+# 2007 Sergey Udaltsov <svu@gnome.org>
+#
+
+
+#
+# Group I
+#
+
+# Modifier: /u/
+<u> <U1200> : "ሁ" U1201 # key h (base character ሀ)
+<u> <U1208> : "ሉ" U1209 # key l (base character ለ)
+<u> <U1218> : "ሙ" U1219 # key m (base character መ)
+<u> <U1228> : "ሩ" U1229 # key r (base character ረ)
+<u> <U1230> : "ሱ" U1231 # key s (base character ሰ)
+<u> <U1240> : "ቁ" U1241 # key q (base character ቀ)
+<u> <U1260> : "ቡ" U1261 # key b (base character በ)
+<u> <U1270> : "ቱ" U1271 # key t (base character ተ)
+<u> <U1290> : "ኑ" U1291 # key n (base character ነ)
+<u> <U12A0> : "ኡ" U12A1 # key x (base character አ)
+<u> <U12A8> : "ኩ" U12A9 # key k (base character ከ)
+<u> <U12C8> : "ዉ" U12C9 # key w (base character ወ)
+<u> <U12D8> : "ዙ" U12D9 # key z (base character ዘ)
+<u> <U12E8> : "ዩ" U12E9 # key y (base character የ)
+<u> <U12F0> : "ዱ" U12F1 # key d (base character ደ)
+<u> <U1300> : "ጁ" U1301 # key j (base character ጀ)
+<u> <U1308> : "ጉ" U1309 # key g (base character ገ)
+<u> <U1340> : "ፁ" U1341 # key [ (base character ፀ)
+<u> <U1348> : "ፉ" U1349 # key f (base character ፈ)
+<u> <U1350> : "ፑ" U1351 # key p (base character ፐ)
+<u> <U1238> : "ሹ" U1239 # key v (base character ሸ)
+<u> <U1328> : "ጩ" U1329 # key ] (base character ጨ)
+
+# Modifier: /i/
+<i> <U1200> : "ሂ" U1202 # key h (base character ሀ)
+<i> <U1208> : "ሊ" U120A # key l (base character ለ)
+<i> <U1218> : "ሚ" U121A # key m (base character መ)
+<i> <U1228> : "ሪ" U122A # key r (base character ረ)
+<i> <U1230> : "ሲ" U1232 # key s (base character ሰ)
+<i> <U1240> : "ቂ" U1242 # key q (base character ቀ)
+<i> <U1260> : "ቢ" U1262 # key b (base character በ)
+<i> <U1270> : "ቲ" U1272 # key t (base character ተ)
+<i> <U1290> : "ኒ" U1292 # key n (base character ነ)
+<i> <U12A0> : "ኢ" U12A2 # key x (base character አ)
+<i> <U12A8> : "ኪ" U12AA # key k (base character ከ)
+<i> <U12C8> : "ዊ" U12CA # key w (base character ወ)
+<i> <U12D8> : "ዚ" U12DA # key z (base character ዘ)
+<i> <U12E8> : "ዪ" U12EA # key y (base character የ)
+<i> <U12F0> : "ዲ" U12F2 # key d (base character ደ)
+<i> <U1300> : "ጂ" U1302 # key j (base character ጀ)
+<i> <U1308> : "ጊ" U130A # key g (base character ገ)
+<i> <U1340> : "ፂ" U1342 # key [ (base character ፀ)
+<i> <U1348> : "ፊ" U134A # key f (base character ፈ)
+<i> <U1350> : "ፒ" U1352 # key p (base character ፐ)
+<i> <U1238> : "ሺ" U123A # key v (base character ሸ)
+<i> <U1328> : "ጪ" U132A # key ] (base character ጨ)
+
+# Modifier: /a/
+<a> <U1200> : "ሃ" U1203 # key h (base character ሀ)
+<a> <U1208> : "ላ" U120B # key l (base character ለ)
+<a> <U1218> : "ማ" U121B # key m (base character መ)
+<a> <U1228> : "ራ" U122B # key r (base character ረ)
+<a> <U1230> : "ሳ" U1233 # key s (base character ሰ)
+<a> <U1240> : "ቃ" U1243 # key q (base character ቀ)
+<a> <U1260> : "ባ" U1263 # key b (base character በ)
+<a> <U1270> : "ታ" U1273 # key t (base character ተ)
+<a> <U1290> : "ና" U1293 # key n (base character ነ)
+<a> <U12A0> : "ኣ" U12A3 # key x (base character አ)
+<a> <U12A8> : "ካ" U12AB # key k (base character ከ)
+<a> <U12C8> : "ዋ" U12CB # key w (base character ወ)
+<a> <U12D8> : "ዛ" U12DB # key z (base character ዘ)
+<a> <U12E8> : "ያ" U12EB # key y (base character የ)
+<a> <U12F0> : "ዳ" U12F3 # key d (base character ደ)
+<a> <U1300> : "ጃ" U1303 # key j (base character ጀ)
+<a> <U1308> : "ጋ" U130B # key g (base character ገ)
+<a> <U1340> : "ፃ" U1343 # key [ (base character ፀ)
+<a> <U1348> : "ፋ" U134B # key f (base character ፈ)
+<a> <U1350> : "ፓ" U1353 # key p (base character ፐ)
+<a> <U1238> : "ሻ" U123B # key v (base character ሸ)
+<a> <U1328> : "ጫ" U132B # key ] (base character ጨ)
+
+# Modifier: /e/
+<e> <U1200> : "ሄ" U1204 # key h (base character ሀ)
+<e> <U1208> : "ሌ" U120C # key l (base character ለ)
+<e> <U1218> : "ሜ" U121C # key m (base character መ)
+<e> <U1228> : "ሬ" U122C # key r (base character ረ)
+<e> <U1230> : "ሴ" U1234 # key s (base character ሰ)
+<e> <U1240> : "ቄ" U1244 # key q (base character ቀ)
+<e> <U1260> : "ቤ" U1264 # key b (base character በ)
+<e> <U1270> : "ቴ" U1274 # key t (base character ተ)
+<e> <U1290> : "ኔ" U1294 # key n (base character ነ)
+<e> <U12A0> : "ኤ" U12A4 # key x (base character አ)
+<e> <U12A8> : "ኬ" U12AC # key k (base character ከ)
+<e> <U12C8> : "ዌ" U12CC # key w (base character ወ)
+<e> <U12D8> : "ዜ" U12DC # key z (base character ዘ)
+<e> <U12E8> : "ዬ" U12EC # key y (base character የ)
+<e> <U12F0> : "ዴ" U12F4 # key d (base character ደ)
+<e> <U1300> : "ጄ" U1304 # key j (base character ጀ)
+<e> <U1308> : "ጌ" U130C # key g (base character ገ)
+<e> <U1340> : "ፄ" U1344 # key [ (base character ፀ)
+<e> <U1348> : "ፌ" U134C # key f (base character ፈ)
+<e> <U1350> : "ፔ" U1354 # key p (base character ፐ)
+<e> <U1238> : "ሼ" U123C # key v (base character ሸ)
+<e> <U1328> : "ጬ" U132C # key ] (base character ጨ)
+
+# Modifier: /c/
+<c> <U1200> : "ህ" U1205 # key h (base character ሀ)
+<c> <U1208> : "ል" U120D # key l (base character ለ)
+<c> <U1218> : "ም" U121D # key m (base character መ)
+<c> <U1228> : "ር" U122D # key r (base character ረ)
+<c> <U1230> : "ስ" U1235 # key s (base character ሰ)
+<c> <U1240> : "ቅ" U1245 # key q (base character ቀ)
+<c> <U1260> : "ብ" U1265 # key b (base character በ)
+<c> <U1270> : "ት" U1275 # key t (base character ተ)
+<c> <U1290> : "ን" U1295 # key n (base character ነ)
+<c> <U12A0> : "እ" U12A5 # key x (base character አ)
+<c> <U12A8> : "ክ" U12AD # key k (base character ከ)
+<c> <U12C8> : "ው" U12CD # key w (base character ወ)
+<c> <U12D8> : "ዝ" U12DD # key z (base character ዘ)
+<c> <U12E8> : "ይ" U12ED # key y (base character የ)
+<c> <U12F0> : "ድ" U12F5 # key d (base character ደ)
+<c> <U1300> : "ጅ" U1305 # key j (base character ጀ)
+<c> <U1308> : "ግ" U130D # key g (base character ገ)
+<c> <U1340> : "ፅ" U1345 # key [ (base character ፀ)
+<c> <U1348> : "ፍ" U134D # key f (base character ፈ)
+<c> <U1350> : "ፕ" U1355 # key p (base character ፐ)
+<c> <U1238> : "ሽ" U123D # key v (base character ሸ)
+<c> <U1328> : "ጭ" U132D # key ] (base character ጨ)
+
+# Modifier: /o/
+<o> <U1200> : "ሆ" U1206 # key h (base character ሀ)
+<o> <U1208> : "ሎ" U120E # key l (base character ለ)
+<o> <U1218> : "ሞ" U121E # key m (base character መ)
+<o> <U1228> : "ሮ" U122E # key r (base character ረ)
+<o> <U1230> : "ሶ" U1236 # key s (base character ሰ)
+<o> <U1240> : "ቆ" U1246 # key q (base character ቀ)
+<o> <U1260> : "ቦ" U1266 # key b (base character በ)
+<o> <U1270> : "ቶ" U1276 # key t (base character ተ)
+<o> <U1290> : "ኖ" U1296 # key n (base character ነ)
+<o> <U12A0> : "ኦ" U12A6 # key x (base character አ)
+<o> <U12A8> : "ኮ" U12AE # key k (base character ከ)
+<o> <U12C8> : "ዎ" U12CE # key w (base character ወ)
+<o> <U12D8> : "ዞ" U12DE # key z (base character ዘ)
+<o> <U12E8> : "ዮ" U12EE # key y (base character የ)
+<o> <U12F0> : "ዶ" U12F6 # key d (base character ደ)
+<o> <U1300> : "ጆ" U1306 # key j (base character ጀ)
+<o> <U1308> : "ጎ" U130E # key g (base character ገ)
+<o> <U1340> : "ፆ" U1346 # key [ (base character ፀ)
+<o> <U1348> : "ፎ" U134E # key f (base character ፈ)
+<o> <U1350> : "ፖ" U1356 # key p (base character ፐ)
+<o> <U1238> : "ሾ" U123E # key v (base character ሸ)
+<o> <U1328> : "ጮ" U132E # key ] (base character ጨ)
+
+# Modifier: /A/
+<A> <U1208> : "ሏ" U120F # key l (base character ለ)
+<A> <U1218> : "ሟ" U121F # key m (base character መ)
+<A> <U1228> : "ሯ" U122F # key r (base character ረ)
+<A> <U1230> : "ሷ" U1237 # key s (base character ሰ)
+<A> <U1240> : "ቋ" U124B # key q (base character ቀ)
+<A> <U1260> : "ቧ" U1267 # key b (base character በ)
+<A> <U1270> : "ቷ" U1277 # key t (base character ተ)
+<A> <U1290> : "ኗ" U1297 # key n (base character ነ)
+<A> <U12A0> : "ኧ" U12A7 # key x (base character አ)
+<A> <U12A8> : "ኳ" U12B3 # key k (base character ከ)
+<A> <U12D8> : "ዟ" U12DF # key z (base character ዘ)
+<A> <U12F0> : "ዷ" U12F7 # key d (base character ደ)
+<A> <U1300> : "ጇ" U1307 # key j (base character ጀ)
+<A> <U1308> : "ጓ" U1313 # key g (base character ገ)
+<A> <U1348> : "ፏ" U134F # key f (base character ፈ)
+<A> <U1350> : "ፗ" U1357 # key p (base character ፐ)
+<A> <U1238> : "ሿ" U123F # key v (base character ሸ)
+<A> <U1328> : "ጯ" U132F # key ] (base character ጨ)
+
+# Modifier: /U/
+<U> <U1240> : "ቍ" U124D # key q (base character ቀ)
+<U> <U12A8> : "ኵ" U12B5 # key k (base character ከ)
+<U> <U1308> : "ጕ" U1315 # key g (base character ገ)
+
+# Modifier: /I/
+<I> <U1240> : "ቊ" U124A # key q (base character ቀ)
+<I> <U12A8> : "ኲ" U12B2 # key k (base character ከ)
+<I> <U1308> : "ጒ" U1312 # key g (base character ገ)
+
+# Modifier: /E/
+<E> <U1240> : "ቌ" U124C # key q (base character ቀ)
+<E> <U12A8> : "ኴ" U12B4 # key k (base character ከ)
+<E> <U1308> : "ጔ" U1314 # key g (base character ገ)
+
+# Modifier: /O/
+<O> <U1240> : "ቈ" U1248 # key q (base character ቀ)
+<O> <U12A8> : "ኰ" U12B0 # key k (base character ከ)
+<O> <U1308> : "ጐ" U1310 # key g (base character ገ)
+
+#
+# Group II
+#
+# Modifier: /u/
+<u> <U1210> : "ሑ" U1211 # key h (base character ሐ)
+<u> <U1220> : "ሡ" U1221 # key s (base character ሠ)
+<u> <U1250> : "ቑ" U1251 # key q (base character ቐ)
+<u> <U1278> : "ቹ" U1279 # key c (base character ቸ)
+<u> <U1320> : "ጡ" U1321 # key t (base character ጠ)
+<u> <U1298> : "ኙ" U1299 # key n (base character ኘ)
+<u> <U12D0> : "ዑ" U12D1 # key x (base character ዐ)
+<u> <U12B8> : "ኹ" U12B9 # key k (base character ኸ)
+<u> <U12E0> : "ዡ" U12E1 # key z (base character ዠ)
+<u> <U12F8> : "ዹ" U12F9 # key d (base character ዸ)
+<u> <U1318> : "ጙ" U1319 # key g (base character ጘ)
+<u> <U1338> : "ጹ" U1339 # key [ (base character ጸ)
+<u> <U1330> : "ጱ" U1331 # key p (base character ጰ)
+<u> <U1280> : "ኁ" U1281 # key ] (base character ኀ)
+<u> <U1268> : "ቩ" U1269 # key v (base character ቨ)
+
+# Modifier: /i/
+<i> <U1210> : "ሒ" U1212 # key h (base character ሐ)
+<i> <U1220> : "ሢ" U1222 # key s (base character ሠ)
+<i> <U1250> : "ቒ" U1252 # key q (base character ቐ)
+<i> <U1278> : "ቺ" U127A # key c (base character ቸ)
+<i> <U1320> : "ጢ" U1322 # key t (base character ጠ)
+<i> <U1298> : "ኚ" U129A # key n (base character ኘ)
+<i> <U12D0> : "ዒ" U12D2 # key x (base character ዐ)
+<i> <U12B8> : "ኺ" U12BA # key k (base character ኸ)
+<i> <U12E0> : "ዢ" U12E2 # key z (base character ዠ)
+<i> <U12F8> : "ዺ" U12FA # key d (base character ዸ)
+<i> <U1318> : "ጚ" U131A # key g (base character ጘ)
+<i> <U1338> : "ጺ" U133A # key [ (base character ጸ)
+<i> <U1330> : "ጲ" U1332 # key p (base character ጰ)
+<i> <U1280> : "ኂ" U1282 # key ] (base character ኀ)
+<i> <U1268> : "ቪ" U126A # key v (base character ቨ)
+
+# Modifier: /a/
+<a> <U1210> : "ሓ" U1213 # key h (base character ሐ)
+<a> <U1220> : "ሣ" U1223 # key s (base character ሠ)
+<a> <U1250> : "ቓ" U1253 # key q (base character ቐ)
+<a> <U1278> : "ቻ" U127B # key c (base character ቸ)
+<a> <U1320> : "ጣ" U1323 # key t (base character ጠ)
+<a> <U1298> : "ኛ" U129B # key n (base character ኘ)
+<a> <U12D0> : "ዓ" U12D3 # key x (base character ዐ)
+<a> <U12B8> : "ኻ" U12BB # key k (base character ኸ)
+<a> <U12E0> : "ዣ" U12E3 # key z (base character ዠ)
+<a> <U12F8> : "ዻ" U12FB # key d (base character ዸ)
+<a> <U1318> : "ጛ" U131B # key g (base character ጘ)
+<a> <U1338> : "ጻ" U133B # key [ (base character ጸ)
+<a> <U1330> : "ጳ" U1333 # key p (base character ጰ)
+<a> <U1280> : "ኃ" U1283 # key ] (base character ኀ)
+<a> <U1268> : "ቫ" U126B # key v (base character ቨ)
+
+# Modifier: /e/
+<e> <U1210> : "ሔ" U1214 # key h (base character ሐ)
+<e> <U1220> : "ሤ" U1224 # key s (base character ሠ)
+<e> <U1250> : "ቔ" U1254 # key q (base character ቐ)
+<e> <U1278> : "ቼ" U127C # key c (base character ቸ)
+<e> <U1320> : "ጤ" U1324 # key t (base character ጠ)
+<e> <U1298> : "ኜ" U129C # key n (base character ኘ)
+<e> <U12D0> : "ዔ" U12D4 # key x (base character ዐ)
+<e> <U12B8> : "ኼ" U12BC # key k (base character ኸ)
+<e> <U12E0> : "ዤ" U12E4 # key z (base character ዠ)
+<e> <U12F8> : "ዼ" U12FC # key d (base character ዸ)
+<e> <U1318> : "ጜ" U131C # key g (base character ጘ)
+<e> <U1338> : "ጼ" U133C # key [ (base character ጸ)
+<e> <U1330> : "ጴ" U1334 # key p (base character ጰ)
+<e> <U1280> : "ኄ" U1284 # key ] (base character ኀ)
+<e> <U1268> : "ቬ" U126C # key v (base character ቨ)
+
+# Modifier: /c/
+<c> <U1210> : "ሕ" U1215 # key h (base character ሐ)
+<c> <U1220> : "ሥ" U1225 # key s (base character ሠ)
+<c> <U1250> : "ቕ" U1255 # key q (base character ቐ)
+<c> <U1278> : "ች" U127D # key c (base character ቸ)
+<c> <U1320> : "ጥ" U1325 # key t (base character ጠ)
+<c> <U1298> : "ኝ" U129D # key n (base character ኘ)
+<c> <U12D0> : "ዕ" U12D5 # key x (base character ዐ)
+<c> <U12B8> : "ኽ" U12BD # key k (base character ኸ)
+<c> <U12E0> : "ዥ" U12E5 # key z (base character ዠ)
+<c> <U12F8> : "ዽ" U12FD # key d (base character ዸ)
+<c> <U1318> : "ጝ" U131D # key g (base character ጘ)
+<c> <U1338> : "ጽ" U133D # key [ (base character ጸ)
+<c> <U1330> : "ጵ" U1335 # key p (base character ጰ)
+<c> <U1280> : "ኅ" U1285 # key ] (base character ኀ)
+<c> <U1268> : "ቭ" U126D # key v (base character ቨ)
+
+# Modifier: /o/
+<o> <U1210> : "ሖ" U1216 # key h (base character ሐ)
+<o> <U1220> : "ሦ" U1226 # key s (base character ሠ)
+<o> <U1250> : "ቖ" U1256 # key q (base character ቐ)
+<o> <U1278> : "ቾ" U127E # key c (base character ቸ)
+<o> <U1320> : "ጦ" U1326 # key t (base character ጠ)
+<o> <U1298> : "ኞ" U129E # key n (base character ኘ)
+<o> <U12D0> : "ዖ" U12D6 # key x (base character ዐ)
+<o> <U12B8> : "ኾ" U12BE # key k (base character ኸ)
+<o> <U12E0> : "ዦ" U12E6 # key z (base character ዠ)
+<o> <U12F8> : "ዾ" U12FE # key d (base character ዸ)
+<o> <U1318> : "ጞ" U131E # key g (base character ጘ)
+<o> <U1338> : "ጾ" U133E # key [ (base character ጸ)
+<o> <U1330> : "ጶ" U1336 # key p (base character ጰ)
+<o> <U1280> : "ኆ" U1286 # key ] (base character ኀ)
+<o> <U1268> : "ቮ" U126E # key v (base character ቨ)
+
+# Modifier: /A/
+<A> <U1210> : "ሗ" U1217 # key h (base character ሐ)
+<A> <U1220> : "ሧ" U1227 # key s (base character ሠ)
+<A> <U1250> : "ቛ" U125B # key q (base character ቐ)
+<A> <U1278> : "ቿ" U127F # key c (base character ቸ)
+<A> <U1320> : "ጧ" U1327 # key t (base character ጠ)
+<A> <U1298> : "ኟ" U129F # key n (base character ኘ)
+<A> <U12B8> : "ዃ" U12C3 # key k (base character ኸ)
+<A> <U12E0> : "ዧ" U12E7 # key z (base character ዠ)
+<A> <U12F8> : "ዿ" U12FF # key d (base character ዸ)
+<A> <U1338> : "ጿ" U133F # key [ (base character ጸ)
+<A> <U1330> : "ጷ" U1337 # key p (base character ጰ)
+<A> <U1280> : "ኋ" U128B # key ] (base character ኀ)
+<A> <U1268> : "ቯ" U126F # key v (base character ቨ)
+
+# Modifier: /U/
+<U> <U1250> : "ቝ" U125D # key q (base character ቐ)
+<U> <U12B8> : "ዅ" U12C5 # key k (base character ኸ)
+
+# Modifier: /I/
+<I> <U1250> : "ቚ" U125A # key q (base character ቐ)
+<I> <U12B8> : "ዂ" U12C2 # key k (base character ኸ)
+
+# Modifier: /E/
+<E> <U1250> : "ቜ" U125C # key q (base character ቐ)
+<E> <U12B8> : "ዄ" U12C4 # key k (base character ኸ)
+
+# Modifier: /O/
+<O> <U1250> : "ቘ" U1258 # key q (base character ቐ)
+<O> <U12B8> : "ዀ" U12C0 # key k (base character ኸ)
+
+#
+# Group III
+# 
+<backslash> <quotedbl> : "፥" U1365 # key "
+<backslash> <apostrophe> : "፦" U1366 # key "
+<backslash> <minus> : "|" U007C # key -
+<backslash> <underscore> : "¥" U00A5 # key _
+<backslash> <question> : "፧" U1367 # key ?
+
+# 
+# Khmer digraphs
+# 
+
+<U17ff> :   "ាំ"
+<U17fe> :   "ោះ"
+<U17fd> :   "េះ"
+<U17fc> :   "ុំ"
+<U17fb> :   "ុះ"
+
+#
+# Arabic Lam-Alef ligatures
+#
+
+<UFEFB>	:   "لا" # ARABIC LIGATURE LAM WITH ALEF
+<UFEF7>	:   "لأ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE
+<UFEF9>	:   "لإ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW
+<UFEF5>	:   "لآ" # ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE

data/usr/share/X11/locale/am_ET.UTF-8/XLC_LOCALE

@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

data/usr/share/X11/locale/armscii-8/Compose

@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# ARMSCII-8 Compose Sequence
+#
+# Sequence Definition
+#
+#
+# This file currently has no entries.  It appears that a compose file (even
+# just an empty one) is required for the appropriate keysyms to work for
+# this encoding.
+#
+# <Multi_key> Means <Compose>
+# Special Character
+
+# End of Sequence Definition

data/usr/share/X11/locale/armscii-8/XI18N_OBJS

@@ -0,0 +1,7 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for armscii-8 locale
+#
+XLC	common/xlcDef	_XlcDefaultLoader	# XLC_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
+XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open

data/usr/share/X11/locale/armscii-8/XLC_LOCALE

@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  XLocale Database Sample for armscii-8.
+# 
+
+# 
+# 	XLC_FONTSET category
+# 
+XLC_FONTSET
+# 	fs0 class (7 bit ASCII)
+fs0	{
+	charset	{
+		name		ISO8859-1:GL
+	}
+	font	{
+		primary		ARMSCII-8:GL
+		substitute	ISO8859-1:GL
+	}
+}
+# 	fs1 class 
+fs1	{
+	charset         ARMSCII-8:GR
+	font            ARMSCII-8:GR
+}
+END XLC_FONTSET
+
+#
+#	XLC_CHARSET_DEFINE category
+#
+XLC_CHARSET_DEFINE
+csd0	{
+	charset_name	ARMSCII-8
+	side		GR
+	length		1
+	string_encoding	False
+	sequence	\x1b%/1
+}
+END XLC_CHARSET_DEFINE
+
+# 
+# 	XLC_XLOCALE category
+# 
+XLC_XLOCALE
+
+encoding_name           ARMSCII-8
+mb_cur_max		1
+state_depend_encoding	False
+
+wc_encoding_mask	\x30000000
+wc_shift_bits		7
+
+
+
+
+
+
+use_stdc_env		True
+
+
+# 	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	wc_encoding	\x00000000
+	ct_encoding     ARMSCII-8:GL; ISO8859-1:GL
+}
+
+
+# 	cs1 class
+cs1	{
+	side		GR:Default
+	length		1
+
+	wc_encoding	\x30000000
+
+
+
+	ct_encoding     ARMSCII-8:GR
+}
+
+END XLC_XLOCALE

data/usr/share/X11/locale/el_GR.UTF-8/XLC_LOCALE

@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

data/usr/share/X11/locale/en_US.UTF-8/XI18N_OBJS

@@ -0,0 +1,7 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for euro locales
+#
+XLC	common/xlcUTF8Load	_XlcUtf8Loader	        # XLC_open
+XOM	common/xomGeneric	_XomGenericOpenOM	# XOM_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister

data/usr/share/X11/locale/en_US.UTF-8/XLC_LOCALE

@@ -0,0 +1,337 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  XLocale Database Sample for en_US.UTF-8
+# 
+
+# 
+# 	XLC_FONTSET category
+# 
+XLC_FONTSET
+
+on_demand_loading	True
+
+object_name		generic
+
+# 	fs0 class (7 bit ASCII)
+fs0	{
+	charset	{
+		name	ISO8859-1:GL
+	}
+	font	{
+		primary		ISO8859-1:GL
+		vertical_rotate	all
+	}
+}
+#	fs1 class (ISO8859 families)
+fs1	{
+	charset	{
+		name	ISO8859-1:GR
+	}
+	font	{
+		primary	ISO8859-1:GR
+	}
+}
+#	fs2 class (ISO8859 families)
+fs2	{
+	charset	{
+		name	ISO8859-2:GR
+	}
+	font	{
+		primary	ISO8859-2:GR
+	}
+}
+#	fs3 class (ISO8859 families)
+fs3	{
+	charset	{
+		name	ISO8859-3:GR
+	}
+	font	{
+		primary	ISO8859-3:GR
+	}
+}
+#	fs4 class (ISO8859 families)
+fs4	{
+	charset	{
+		name	ISO8859-4:GR
+	}
+	font	{
+		primary	ISO8859-4:GR
+	}
+}
+#	fs5 class (ISO8859 families)
+fs5	{
+	charset	{
+		name	ISO8859-5:GR
+	}
+	font	{
+		primary	ISO8859-5:GR
+	}
+}
+#	fs6 class (koi8-r)
+fs6	{
+	charset	{
+		name	KOI8-R:GR
+	}
+	font	{
+		primary	KOI8-R:GR
+	}
+}
+#	fs7 class (ISO8859 families)
+fs7	{
+	charset	{
+		name	ISO8859-7:GR
+	}
+	font	{
+		primary	ISO8859-7:GR
+	}
+}
+#	fs9 class (ISO8859 families)
+fs8	{
+	charset	{
+		name	ISO8859-9:GR
+	}
+	font	{
+		primary	ISO8859-9:GR
+	}
+}
+#	fs13 class (ISO8859 families)
+fs9	{
+	charset	{
+		name	ISO8859-13:GR
+	}
+	font	{
+		primary	ISO8859-13:GR
+	}
+}
+#	fs14 class (ISO8859 families)
+fs10	{
+	charset	{
+		name	ISO8859-14:GR
+	}
+	font	{
+		primary	ISO8859-14:GR
+	}
+}
+#	fs15 class (ISO8859 families)
+fs11	{
+	charset	{
+		name	ISO8859-15:GR
+	}
+	font	{
+		primary	ISO8859-15:GR
+	}
+}
+# 	fs16 class (Kanji)
+fs12	{
+	charset	{
+		name	JISX0208.1983-0:GL
+	}
+	font	{
+		primary	JISX0208.1983-0:GL
+	}
+}
+#   fs17 class (Korean Character)
+fs13	{
+	charset	{
+		name	KSC5601.1987-0:GL
+	}
+	font	{
+		primary	KSC5601.1987-0:GL
+	}
+}
+#   fs18 class (Chinese Han Character)
+fs14	{
+	charset	{
+		name	GB2312.1980-0:GL
+	}
+	font	{
+		primary	GB2312.1980-0:GL
+	}
+}
+#	fs20 class (Half Kana)
+fs15	{
+	charset	{
+		name	JISX0201.1976-0:GR
+	}
+	font	{
+		primary		JISX0201.1976-0:GR
+		vertical_rotate	all
+	}
+}
+#	ISO10646 should come last so the fonts above will actually be used
+#	fs24 class
+fs16	{
+	charset	{
+		name	ISO10646-1
+	}
+	font	{
+		primary	ISO10646-1
+	}
+}
+END XLC_FONTSET
+
+# 
+# 	XLC_XLOCALE category
+# 
+XLC_XLOCALE
+
+encoding_name		UTF-8
+mb_cur_max		6
+state_depend_encoding	False
+
+#	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	ct_encoding	ISO8859-1:GL
+}
+
+#	cs1 class
+cs1     {
+        side            GR:Default
+        length          1
+        ct_encoding     ISO8859-1:GR
+}
+ 
+#	cs2 class
+cs2     {
+        side            GR
+        length          1
+        ct_encoding     ISO8859-2:GR
+}
+ 
+#	cs3 class
+cs3     {
+        side            GR
+        length          1
+        ct_encoding     ISO8859-3:GR
+}
+ 
+#	cs4 class
+cs4     {
+        side            GR
+        length          1
+        ct_encoding     ISO8859-4:GR
+}
+ 
+#	cs5 class
+cs5     {
+        side            GR
+        length          1
+        ct_encoding     ISO8859-5:GR
+}
+ 
+#	cs6 class
+cs6     {
+        side            GR
+        length          1
+        ct_encoding     KOI8-R:GR
+}
+ 
+#	cs7 class
+cs7     {
+        side            GR
+        length          1
+        ct_encoding     ISO8859-7:GR
+}
+ 
+#	cs9 class
+cs8     {
+        side            GR
+        length          1
+        ct_encoding     ISO8859-9:GR
+}
+ 
+#	cs13 class
+cs9     {
+        side            GR
+        length          1
+        ct_encoding     ISO8859-13:GR
+}
+ 
+#	cs14 class
+cs10     {
+        side            GR
+        length          1
+        ct_encoding     ISO8859-14:GR
+}
+ 
+#	cs15 class
+cs11     {
+        side            GR
+        length          1
+        ct_encoding     ISO8859-15:GR
+}
+ 
+#	cs16 class
+cs12	{
+	side		GR
+	length		2
+	ct_encoding	JISX0208.1983-0:GL; JISX0208.1983-0:GR;			JISX0208.1983-1:GL; JISX0208.1983-1:GR
+
+}
+
+#	cs17 class
+cs13     {
+        side            GL
+        length          2
+        ct_encoding     KSC5601.1987-0:GL; KSC5601.1987-0:GR;                        KSC5601.1987-1:GL; KSC5601.1987-1:GR
+
+}
+ 
+#	cs18 class
+cs14     {
+        side            GR
+        length          2
+        ct_encoding     GB2312.1980-0:GL; GB2312.1980-0:GR
+}
+ 
+#	cs20 class
+cs15	{
+	side		GR
+	length		1
+	ct_encoding	JISX0201.1976-0:GR
+}
+ 
+#	cs24 class
+cs16	{
+	side		none
+	ct_encoding	ISO10646-1
+}
+
+END XLC_XLOCALE

data/usr/share/X11/locale/fi_FI.UTF-8/Compose

@@ -0,0 +1,464 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# Official compose sequences for Finland based on SFS 5966 standard
+#
+# This compose sequence map implements all the functionality of Annex 3
+# and Annex 4 of the standard and additionally defines the sequences
+# provided in en_US.UTF-8/Compose. SFS 5966 sequences override any
+# conflicting rules from en_US.UTF-8/Compose.
+#
+# Annex 1 of the standard is implemented in the keymap symbols/fi
+#
+# Complete rewrite by Marko Myllynen
+# Original version by Troy Korjuslommi
+#
+
+# Use en_US.UTF-8/Compose as the base compose sequence definition set
+include "/usr/share/X11/locale/en_US.UTF-8/Compose"
+
+# Define all the sequences of the standard overriding any sequence
+# from en_US.UTF-8/Compose if such a sequence was provided already
+
+# Sequences from Annex 3
+
+# Sequences with COMBINING ACUTE ACCENT / <dead_acute>
+<dead_acute> <space>                    : "´"   # ACUTE ACCENT
+<dead_acute> <a>                        : "á"   # LATIN CAPITAL LETTER A WITH ACUTE
+<dead_acute> <A>                        : "Á"   # LATIN CAPITAL LETTER A WITH ACUTE
+<dead_acute> <c>                        : "ć"   # LATIN SMALL LETTER C WITH ACUTE
+<dead_acute> <C>                        : "Ć"   # LATIN CAPITAL LETTER C WITH ACUTE
+<dead_acute> <e>                        : "é"   # LATIN SMALL LETTER E WITH ACUTE
+<dead_acute> <E>                        : "É"   # LATIN CAPITAL LETTER E WITH ACUTE
+<dead_acute> <i>                        : "í"   # LATIN SMALL LETTER I WITH ACUTE
+<dead_acute> <I>                        : "Í"   # LATIN CAPITAL LETTER I WITH ACUTE
+<dead_acute> <l>                        : "ĺ"   # LATIN SMALL LETTER L WITH ACUTE
+<dead_acute> <L>                        : "Ĺ"   # LATIN CAPITAL LETTER L WITH ACUTE
+<dead_acute> <n>                        : "ń"   # LATIN SMALL LETTER N WITH ACUTE
+<dead_acute> <N>                        : "Ń"   # LATIN CAPITAL LETTER N WITH ACUTE
+<dead_acute> <o>                        : "ó"   # LATIN SMALL LETTER O WITH ACUTE
+<dead_acute> <O>                        : "Ó"   # LATIN CAPITAL LETTER O WITH ACUTE
+<dead_acute> <r>                        : "ŕ"   # LATIN SMALL LETTER R WITH ACUTE
+<dead_acute> <R>                        : "Ŕ"   # LATIN CAPITAL LETTER R WITH ACUTE
+<dead_acute> <s>                        : "ś"   # LATIN SMALL LETTER S WITH ACUTE
+<dead_acute> <S>                        : "Ś"   # LATIN CAPITAL LETTER S WITH ACUTE
+<dead_acute> <u>                        : "ú"   # LATIN SMALL LETTER U WITH ACUTE
+<dead_acute> <U>                        : "Ú"   # LATIN CAPITAL LETTER U WITH ACUTE
+<dead_acute> <w>                        : "ẃ"   # LATIN SMALL LETTER W WITH ACUTE
+<dead_acute> <W>                        : "Ẃ"   # LATIN CAPITAL LETTER W WITH ACUTE
+<dead_acute> <y>                        : "ý"   # LATIN SMALL LETTER Y WITH ACUTE
+<dead_acute> <Y>                        : "Ý"   # LATIN CAPITAL LETTER Y WITH ACUTE
+<dead_acute> <z>                        : "ź"   # LATIN SMALL LETTER Z WITH ACUTE
+<dead_acute> <Z>                        : "Ź"   # LATIN CAPITAL LETTER Z WITH ACUTE
+<dead_acute> <ae>                       : "ǽ"   # LATIN SMALL LETTER AE WITH ACUTE
+<dead_acute> <AE>                       : "Ǽ"   # LATIN CAPITAL LETTER AE WITH ACUTE
+<dead_acute> <oslash>                   : "ǿ"   # LATIN SMALL LETTER O WITH STROKE AND ACUTE
+<dead_acute> <Oslash>                   : "Ǿ"   # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
+<dead_acute> <aring>                    : "ǻ"   # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
+<dead_acute> <Aring>                    : "Ǻ"   # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
+
+# Sequences with COMBINING BREVE / <dead_breve>
+<dead_breve> <space>                    : "˘"   # BREVE
+<dead_breve> <a>                        : "ă"   # LATIN SMALL LETTER A WITH BREVE
+<dead_breve> <A>                        : "Ă"   # LATIN CAPITAL LETTER A WITH BREVE
+<dead_breve> <e>                        : "ĕ"   # LATIN SMALL LETTER E WITH BREVE
+<dead_breve> <E>                        : "Ĕ"   # LATIN CAPITAL LETTER E WITH BREVE
+<dead_breve> <g>                        : "ğ"   # LATIN SMALL LETTER G WITH BREVE
+<dead_breve> <G>                        : "Ğ"   # LATIN CAPITAL LETTER G WITH BREVE
+<dead_breve> <i>                        : "ĭ"   # LATIN SMALL LETTER I WITH BREVE
+<dead_breve> <I>                        : "Ĭ"   # LATIN CAPITAL LETTER I WITH BREVE
+<dead_breve> <o>                        : "ŏ"   # LATIN SMALL LETTER O WITH BREVE
+<dead_breve> <O>                        : "Ŏ"   # LATIN CAPITAL LETTER O WITH BREVE
+<dead_breve> <u>                        : "ŭ"   # LATIN SMALL LETTER U WITH BREVE
+<dead_breve> <U>                        : "Ŭ"   # LATIN CAPITAL LETTER U WITH BREVE
+
+# Sequences with COMBINING CARON / <dead_caron>
+<dead_caron> <space>                    : "ˇ"   # CARON
+<dead_caron> <a>                        : "ǎ"   # LATIN SMALL LETTER A WITH CARON
+<dead_caron> <A>                        : "Ǎ"   # LATIN CAPITAL LETTER A WITH CARON
+<dead_caron> <c>                        : "č"   # LATIN SMALL LETTER C WITH CARON
+<dead_caron> <C>                        : "Č"   # LATIN CAPITAL LETTER C WITH CARON
+<dead_caron> <d>                        : "ď"   # LATIN SMALL LETTER D WITH CARON
+<dead_caron> <D>                        : "Ď"   # LATIN CAPITAL LETTER D WITH CARON
+<dead_caron> <e>                        : "ě"   # LATIN SMALL LETTER E WITH CARON
+<dead_caron> <E>                        : "Ě"   # LATIN CAPITAL LETTER E WITH CARON
+<dead_caron> <g>                        : "ǧ"   # LATIN SMALL LETTER G WITH CARON
+<dead_caron> <G>                        : "Ǧ"   # LATIN CAPITAL LETTER G WITH CARON
+<dead_caron> <h>                        : "ȟ"   # LATIN SMALL LETTER H WITH CARON
+<dead_caron> <H>                        : "Ȟ"   # LATIN CAPITAL LETTER H WITH CARON
+<dead_caron> <i>                        : "ǐ"   # LATIN SMALL LETTER I WITH CARON
+<dead_caron> <I>                        : "Ǐ"   # LATIN CAPITAL LETTER I WITH CARON
+<dead_caron> <k>                        : "ǩ"   # LATIN SMALL LETTER K WITH CARON
+<dead_caron> <K>                        : "Ǩ"   # LATIN CAPITAL LETTER K WITH CARON
+<dead_caron> <l>                        : "ľ"   # LATIN SMALL LETTER L WITH CARON
+<dead_caron> <L>                        : "Ľ"   # LATIN CAPITAL LETTER L WITH CARON
+<dead_caron> <n>                        : "ň"   # LATIN SMALL LETTER N WITH CARON
+<dead_caron> <N>                        : "Ň"   # LATIN CAPITAL LETTER N WITH CARON
+<dead_caron> <o>                        : "ǒ"   # LATIN SMALL LETTER O WITH CARON
+<dead_caron> <O>                        : "Ǒ"   # LATIN CAPITAL LETTER O WITH CARON
+<dead_caron> <r>                        : "ř"   # LATIN SMALL LETTER R WITH CARON
+<dead_caron> <R>                        : "Ř"   # LATIN CAPITAL LETTER R WITH CARON
+<dead_caron> <s>                        : "š"   # LATIN SMALL LETTER S WITH CARON
+<dead_caron> <S>                        : "Š"   # LATIN CAPITAL LETTER S WITH CARON
+<dead_caron> <t>                        : "ť"   # LATIN SMALL LETTER T WITH CARON
+<dead_caron> <T>                        : "Ť"   # LATIN CAPITAL LETTER T WITH CARON
+<dead_caron> <u>                        : "ǔ"   # LATIN SMALL LETTER U WITH CARON
+<dead_caron> <U>                        : "Ǔ"   # LATIN CAPITAL LETTER U WITH CARON
+<dead_caron> <z>                        : "ž"   # LATIN SMALL LETTER Z WITH CARON
+<dead_caron> <Z>                        : "Ž"   # LATIN CAPITAL LETTER Z WITH CARON
+<dead_caron> <ezh>                      : "ǯ"   # LATIN SMALL LETTER EZH WITH CARON
+<dead_caron> <EZH>                      : "Ǯ"   # LATIN CAPITAL LETTER EZH WITH CARON
+
+# Sequences with COMBINING CEDILLA / <dead_cedilla>
+<dead_cedilla> <space>                  : "¸"   # CEDILLA
+<dead_cedilla> <c>                      : "ç"   # LATIN SMALL LETTER C WITH CEDILLA
+<dead_cedilla> <C>                      : "Ç"   # LATIN CAPITAL LETTER C WITH CEDILLA
+<dead_cedilla> <g>                      : "ģ"   # LATIN SMALL LETTER G WITH CEDILLA
+<dead_cedilla> <G>                      : "Ģ"   # LATIN CAPITAL LETTER G WITH CEDILLA
+<dead_cedilla> <k>                      : "ķ"   # LATIN SMALL LETTER K WITH CEDILLA
+<dead_cedilla> <K>                      : "Ķ"   # LATIN CAPITAL LETTER K WITH CEDILLA
+<dead_cedilla> <l>                      : "ļ"   # LATIN SMALL LETTER L WITH CEDILLA
+<dead_cedilla> <L>                      : "Ļ"   # LATIN CAPITAL LETTER L WITH CEDILLA
+<dead_cedilla> <n>                      : "ņ"   # LATIN SMALL LETTER N WITH CEDILLA
+<dead_cedilla> <N>                      : "Ņ"   # LATIN CAPITAL LETTER N WITH CEDILLA
+<dead_cedilla> <r>                      : "ŗ"   # LATIN SMALL LETTER R WITH CEDILLA
+<dead_cedilla> <R>                      : "Ŗ"   # LATIN CAPITAL LETTER R WITH CEDILLA
+<dead_cedilla> <s>                      : "ş"   # LATIN SMALL LETTER S WITH CEDILLA
+<dead_cedilla> <S>                      : "Ş"   # LATIN CAPITAL LETTER S WITH CEDILLA
+<dead_cedilla> <t>                      : "ţ"   # LATIN SMALL LETTER T WITH CEDILLA
+<dead_cedilla> <T>                      : "Ţ"   # LATIN CAPITAL LETTER T WITH CEDILLA
+
+# Sequences with COMBINING CIRCUMFLEX ACCENT / <dead_circumflex>
+<dead_circumflex> <space>               : "^"   # CIRCUMFLEX
+<dead_circumflex> <a>                   : "â"   # LATIN SMALL LETTER A WITH CIRCUMFLEX
+<dead_circumflex> <A>                   : "Â"   # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+<dead_circumflex> <c>                   : "ĉ"   # LATIN SMALL LETTER C WITH CIRCUMFLEX
+<dead_circumflex> <C>                   : "Ĉ"   # LATIN CAPITAL LETTER C WITH CIRCUMFLEX
+<dead_circumflex> <e>                   : "ê"   # LATIN SMALL LETTER E WITH CIRCUMFLEX
+<dead_circumflex> <E>                   : "Ê"   # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+<dead_circumflex> <g>                   : "ĝ"   # LATIN SMALL LETTER G WITH CIRCUMFLEX
+<dead_circumflex> <G>                   : "Ĝ"   # LATIN CAPITAL LETTER G WITH CIRCUMFLEX
+<dead_circumflex> <h>                   : "ĥ"   # LATIN SMALL LETTER H WITH CIRCUMFLEX
+<dead_circumflex> <H>                   : "Ĥ"   # LATIN CAPITAL LETTER H WITH CIRCUMFLEX
+<dead_circumflex> <i>                   : "î"   # LATIN SMALL LETTER I WITH CIRCUMFLEX
+<dead_circumflex> <I>                   : "Î"   # LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+<dead_circumflex> <j>                   : "ĵ"   # LATIN SMALL LETTER J WITH CIRCUMFLEX
+<dead_circumflex> <J>                   : "Ĵ"   # LATIN CAPITAL LETTER J WITH CIRCUMFLEX
+<dead_circumflex> <o>                   : "ô"   # LATIN SMALL LETTER O WITH CIRCUMFLEX
+<dead_circumflex> <O>                   : "Ô"   # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+<dead_circumflex> <s>                   : "ŝ"   # LATIN SMALL LETTER S WITH CIRCUMFLEX
+<dead_circumflex> <S>                   : "Ŝ"   # LATIN CAPITAL LETTER S WITH CIRCUMFLEX
+<dead_circumflex> <u>                   : "û"   # LATIN SMALL LETTER U WITH CIRCUMFLEX
+<dead_circumflex> <U>                   : "Û"   # LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+<dead_circumflex> <w>                   : "ŵ"   # LATIN SMALL LETTER W WITH CIRCUMFLEX
+<dead_circumflex> <W>                   : "Ŵ"   # LATIN CAPITAL LETTER W WITH CIRCUMFLEX
+<dead_circumflex> <y>                   : "ŷ"   # LATIN SMALL LETTER Y WITH CIRCUMFLEX
+<dead_circumflex> <Y>                   : "Ŷ"   # LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
+
+# Sequences with COMBINING DIAERESIS / <dead_diaeresis>
+<dead_diaeresis> <space>                : "¨"   # DIAERESIS
+<dead_diaeresis> <a>                    : "ä"   # LATIN SMALL LETTER A WITH DIAERESIS
+<dead_diaeresis> <A>                    : "Ä"   # LATIN CAPITAL LETTER A WITH DIAERESIS
+<dead_diaeresis> <e>                    : "ë"   # LATIN SMALL LETTER E WITH DIAERESIS
+<dead_diaeresis> <E>                    : "Ë"   # LATIN CAPITAL LETTER E WITH DIAERESIS
+<dead_diaeresis> <i>                    : "ï"   # LATIN SMALL LETTER I WITH DIAERESIS
+<dead_diaeresis> <I>                    : "Ï"   # LATIN CAPITAL LETTER I WITH DIAERESIS
+<dead_diaeresis> <o>                    : "ö"   # LATIN SMALL LETTER O WITH DIAERESIS
+<dead_diaeresis> <O>                    : "Ö"   # LATIN CAPITAL LETTER O WITH DIAERESIS
+<dead_diaeresis> <u>                    : "ü"   # LATIN SMALL LETTER U WITH DIAERESIS
+<dead_diaeresis> <U>                    : "Ü"   # LATIN CAPITAL LETTER U WITH DIAERESIS
+<dead_diaeresis> <w>                    : "ẅ"   # LATIN SMALL LETTER W WITH DIAERESIS
+<dead_diaeresis> <W>                    : "Ẅ"   # LATIN CAPITAL LETTER W WITH DIAERESIS
+<dead_diaeresis> <y>                    : "ÿ"   # LATIN SMALL LETTER Y WITH DIAERESIS
+<dead_diaeresis> <Y>                    : "Ÿ"   # LATIN CAPITAL LETTER Y WITH DIAERESIS
+
+# Sequences with COMBINING DOT ABOVE / <dead_abovedot>
+<dead_abovedot> <space>                 : "˙"   # DOT ABOVE
+<dead_abovedot> <b>                     : "ḃ"   # LATIN SMALL LETTER B WITH DOT ABOVE
+<dead_abovedot> <B>                     : "Ḃ"   # LATIN CAPITAL LETTER B WITH DOT ABOVE
+<dead_abovedot> <c>                     : "ċ"   # LATIN SMALL LETTER C WITH DOT ABOVE
+<dead_abovedot> <C>                     : "Ċ"   # LATIN CAPITAL LETTER C WITH DOT ABOVE
+<dead_abovedot> <d>                     : "ḋ"   # LATIN SMALL LETTER D WITH DOT ABOVE
+<dead_abovedot> <D>                     : "Ḋ"   # LATIN CAPITAL LETTER D WITH DOT ABOVE
+<dead_abovedot> <e>                     : "ė"   # LATIN SMALL LETTER E WITH DOT ABOVE
+<dead_abovedot> <E>                     : "Ė"   # LATIN CAPITAL LETTER E WITH DOT ABOVE
+<dead_abovedot> <f>                     : "ḟ"   # LATIN SMALL LETTER F WITH DOT ABOVE
+<dead_abovedot> <F>                     : "Ḟ"   # LATIN CAPITAL LETTER F WITH DOT ABOVE
+<dead_abovedot> <g>                     : "ġ"   # LATIN SMALL LETTER G WITH DOT ABOVE
+<dead_abovedot> <G>                     : "Ġ"   # LATIN CAPITAL LETTER G WITH DOT ABOVE
+<dead_abovedot> <I>                     : "İ"   # LATIN CAPITAL LETTER I WITH DOT ABOVE
+<dead_abovedot> <m>                     : "ṁ"   # LATIN SMALL LETTER M WITH DOT ABOVE
+<dead_abovedot> <M>                     : "Ṁ"   # LATIN CAPITAL LETTER M WITH DOT ABOVE
+<dead_abovedot> <p>                     : "ṗ"   # LATIN SMALL LETTER P WITH DOT ABOVE
+<dead_abovedot> <P>                     : "Ṗ"   # LATIN CAPITAL LETTER P WITH DOT ABOVE
+<dead_abovedot> <s>                     : "ṡ"   # LATIN SMALL LETTER S WITH DOT ABOVE
+<dead_abovedot> <S>                     : "Ṡ"   # LATIN CAPITAL LETTER S WITH DOT ABOVE
+<dead_abovedot> <t>                     : "ṫ"   # LATIN SMALL LETTER T WITH DOT ABOVE
+<dead_abovedot> <T>                     : "Ṫ"   # LATIN CAPITAL LETTER T WITH DOT ABOVE
+<dead_abovedot> <z>                     : "ż"   # LATIN SMALL LETTER Z WITH DOT ABOVE
+<dead_abovedot> <Z>                     : "Ż"   # LATIN CAPITAL LETTER Z WITH DOT ABOVE
+
+# Sequences with COMBINING DOT BELOW / <dead_belowdot>
+# <dead_belowdot> <space>              : " "   # DOT BELOW
+<dead_belowdot> <a>                     : "ạ"   # LATIN SMALL LETTER A WITH DOT BELOW
+<dead_belowdot> <A>                     : "Ạ"   # LATIN CAPITAL LETTER A WITH DOT BELOW
+<dead_belowdot> <e>                     : "ẹ"   # LATIN SMALL LETTER E WITH DOT BELOW
+<dead_belowdot> <E>                     : "Ẹ"   # LATIN CAPITAL LETTER E WITH DOT BELOW
+<dead_belowdot> <i>                     : "ị"   # LATIN SMALL LETTER I WITH DOT BELOW
+<dead_belowdot> <I>                     : "Ị"   # LATIN CAPITAL LETTER I WITH DOT BELOW
+<dead_belowdot> <o>                     : "ọ"   # LATIN SMALL LETTER O WITH DOT BELOW
+<dead_belowdot> <O>                     : "Ọ"   # LATIN CAPITAL LETTER O WITH DOT BELOW
+<dead_belowdot> <u>                     : "ụ"   # LATIN SMALL LETTER U WITH DOT BELOW
+<dead_belowdot> <U>                     : "Ụ"   # LATIN CAPITAL LETTER U WITH DOT BELOW
+<dead_belowdot> <y>                     : "ỵ"   # LATIN SMALL LETTER Y WITH DOT BELOW
+<dead_belowdot> <Y>                     : "Ỵ"   # LATIN CAPITAL LETTER Y WITH DOT BELOW
+
+# Sequences with COMBINING DOUBLE ACUTE ACCENT / <dead_doubleacute>
+<dead_doubleacute> <space>              : "˝"   # DOUBLE ACUTE ACCENT
+<dead_doubleacute> <o>                  : "ő"   # LATIN SMALL LETTER O WITH DOUBLE ACUTE
+<dead_doubleacute> <O>                  : "Ő"   # LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+<dead_doubleacute> <u>                  : "ű"   # LATIN SMALL LETTER U WITH DOUBLE ACUTE
+<dead_doubleacute> <U>                  : "Ű"   # LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+
+# Sequences with COMBINING GRAVE ACCENT / <dead_grave>
+<dead_grave> <space>                    : "`"   # GRAVE ACCENT
+<dead_grave> <a>                        : "à"   # LATIN SMALL LETTER A WITH GRAVE
+<dead_grave> <A>                        : "À"   # LATIN CAPITAL LETTER A WITH GRAVE
+<dead_grave> <e>                        : "è"   # LATIN SMALL LETTER E WITH GRAVE
+<dead_grave> <E>                        : "È"   # LATIN CAPITAL LETTER E WITH GRAVE
+<dead_grave> <i>                        : "ì"   # LATIN SMALL LETTER I WITH GRAVE
+<dead_grave> <I>                        : "Ì"   # LATIN CAPITAL LETTER I WITH GRAVE
+<dead_grave> <o>                        : "ò"   # LATIN SMALL LETTER O WITH GRAVE
+<dead_grave> <O>                        : "Ò"   # LATIN CAPITAL LETTER O WITH GRAVE
+<dead_grave> <u>                        : "ù"   # LATIN SMALL LETTER U WITH GRAVE
+<dead_grave> <U>                        : "Ù"   # LATIN CAPITAL LETTER U WITH GRAVE
+<dead_grave> <w>                        : "ẁ"   # LATIN SMALL LETTER W WITH GRAVE
+<dead_grave> <W>                        : "Ẁ"   # LATIN CAPITAL LETTER W WITH GRAVE
+<dead_grave> <y>                        : "ỳ"   # LATIN SMALL LETTER Y WITH GRAVE
+<dead_grave> <Y>                        : "Ỳ"   # LATIN CAPITAL LETTER Y WITH GRAVE
+
+# Sequences with COMBINING MACRON / <dead_macron>
+<dead_macron> <space>                   : "¯"   # MACRON
+<dead_macron> <a>                       : "ā"   # LATIN SMALL LETTER A WITH MACRON
+<dead_macron> <A>                       : "Ā"   # LATIN CAPITAL LETTER A WITH MACRON
+<dead_macron> <e>                       : "ē"   # LATIN SMALL LETTER E WITH MACRON
+<dead_macron> <E>                       : "Ē"   # LATIN CAPITAL LETTER E WITH MACRON
+<dead_macron> <i>                       : "ī"   # LATIN SMALL LETTER I WITH MACRON
+<dead_macron> <I>                       : "Ī"   # LATIN CAPITAL LETTER I WITH MACRON
+<dead_macron> <o>                       : "ō"   # LATIN SMALL LETTER O WITH MACRON
+<dead_macron> <O>                       : "Ō"   # LATIN CAPITAL LETTER O WITH MACRON
+<dead_macron> <u>                       : "ū"   # LATIN SMALL LETTER U WITH MACRON
+<dead_macron> <U>                       : "Ū"   # LATIN CAPITAL LETTER U WITH MACRON
+<dead_macron> <ae>                      : "ǣ"   # LATIN SMALL LETTER AE WITH MACRON
+<dead_macron> <AE>                      : "Ǣ"   # LATIN CAPITAL LETTER AE WITH MACRON
+<dead_macron> <adiaeresis>              : "ǟ"   # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
+<dead_macron> <Adiaeresis>              : "Ǟ"   # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
+
+# Sequences with COMBINING OGONEK / <dead_ogonek>
+<dead_ogonek> <space>                   : "˛"   # OGONEK
+<dead_ogonek> <a>                       : "ą"   # LATIN SMALL LETTER A WITH OGONEK
+<dead_ogonek> <A>                       : "Ą"   # LATIN CAPITAL LETTER A WITH OGONEK
+<dead_ogonek> <e>                       : "ę"   # LATIN SMALL LETTER E WITH OGONEK
+<dead_ogonek> <E>                       : "Ę"   # LATIN CAPITAL LETTER E WITH OGONEK
+<dead_ogonek> <i>                       : "į"   # LATIN SMALL LETTER I WITH OGONEK
+<dead_ogonek> <I>                       : "Į"   # LATIN CAPITAL LETTER I WITH OGONEK
+<dead_ogonek> <o>                       : "ǫ"   # LATIN SMALL LETTER O WITH OGONEK
+<dead_ogonek> <O>                       : "Ǫ"   # LATIN CAPITAL LETTER O WITH OGONEK
+<dead_ogonek> <u>                       : "ų"   # LATIN SMALL LETTER U WITH OGONEK
+<dead_ogonek> <U>                       : "Ų"   # LATIN CAPITAL LETTER U WITH OGONEK
+
+# Sequences with COMBINING RING ABOVE / <dead_abovering>
+<dead_abovering> <space>                : "°"   # RING ABOVE
+<dead_abovering> <a>                    : "å"   # LATIN SMALL LETTER A WITH RING ABOVE
+<dead_abovering> <A>                    : "Å"   # LATIN CAPITAL LETTER A WITH RING ABOVE
+<dead_abovering> <u>                    : "ů"   # LATIN SMALL LETTER U WITH RING ABOVE
+<dead_abovering> <U>                    : "Ů"   # LATIN CAPITAL LETTER U WITH RING ABOVE
+
+# Sequences with COMBINING TILDE / <dead_tilde>
+<dead_tilde> <space>                    : "~"   # TILDE
+<dead_tilde> <a>                        : "ã"   # LATIN SMALL LETTER A WITH TILDE
+<dead_tilde> <A>                        : "Ã"   # LATIN CAPITAL LETTER A WITH TILDE
+<dead_tilde> <e>                        : "ẽ"   # LATIN SMALL LETTER E WITH TILDE
+<dead_tilde> <E>                        : "Ẽ"   # LATIN CAPITAL LETTER E WITH TILDE
+<dead_tilde> <i>                        : "ĩ"   # LATIN SMALL LETTER I WITH TILDE
+<dead_tilde> <I>                        : "Ĩ"   # LATIN CAPITAL LETTER I WITH TILDE
+<dead_tilde> <n>                        : "ñ"   # LATIN SMALL LETTER N WITH TILDE
+<dead_tilde> <N>                        : "Ñ"   # LATIN CAPITAL LETTER N WITH TILDE
+<dead_tilde> <o>                        : "õ"   # LATIN SMALL LETTER O WITH TILDE
+<dead_tilde> <O>                        : "Õ"   # LATIN CAPITAL LETTER O WITH TILDE
+<dead_tilde> <u>                        : "ũ"   # LATIN SMALL LETTER U WITH TILDE
+<dead_tilde> <U>                        : "Ũ"   # LATIN CAPITAL LETTER U WITH TILDE
+<dead_tilde> <y>                        : "ỹ"   # LATIN SMALL LETTER Y WITH TILDE
+<dead_tilde> <Y>                        : "Ỹ"   # LATIN CAPITAL LETTER Y WITH TILDE
+
+# Sequences with AUXILIARY STROKE / <dead_stroke>
+<dead_stroke> <d>                       : "đ"   # LATIN SMALL LETTER D WITH STROKE
+<dead_stroke> <D>                       : "Đ"   # LATIN CAPITAL LETTER D WITH STROKE
+<dead_stroke> <g>                       : "ǥ"   # LATIN SMALL LETTER G WITH STROKE
+<dead_stroke> <G>                       : "Ǥ"   # LATIN CAPITAL LETTER G WITH STROKE
+<dead_stroke> <h>                       : "ħ"   # LATIN SMALL LETTER H WITH STROKE
+<dead_stroke> <H>                       : "Ħ"   # LATIN CAPITAL LETTER H WITH STROKE
+<dead_stroke> <l>                       : "ł"   # LATIN SMALL LETTER L WITH STROKE
+<dead_stroke> <L>                       : "Ł"   # LATIN CAPITAL LETTER L WITH STROKE
+<dead_stroke> <o>                       : "ø"   # LATIN SMALL LETTER O WITH STROKE
+<dead_stroke> <O>                       : "Ø"   # LATIN CAPITAL LETTER O WITH STROKE
+<dead_stroke> <t>                       : "ŧ"   # LATIN SMALL LETTER T WITH STROKE
+<dead_stroke> <T>                       : "Ŧ"   # LATIN CAPITAL LETTER T WITH STROKE
+
+# Sequences from Annex 4
+
+# Sequences with COMBINING BREVE / <dead_breve>
+<dead_acute>    <dead_breve> <a>        : "ắ"   # LATIN SMALL LETTER A WITH BREVE AND ACUTE
+<dead_belowdot> <dead_breve> <a>        : "ặ"   # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
+<dead_grave>    <dead_breve> <a>        : "ằ"   # LATIN SMALL LETTER A WITH BREVE AND GRAVE
+<dead_hook>     <dead_breve> <a>        : "ẳ"   # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
+<dead_tilde>    <dead_breve> <a>        : "ẵ"   # LATIN SMALL LETTER A WITH BREVE AND TILDE
+<dead_acute>    <dead_breve> <A>        : "Ắ"   # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
+<dead_belowdot> <dead_breve> <A>        : "Ặ"   # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
+<dead_grave>    <dead_breve> <A>        : "Ằ"   # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
+<dead_hook>     <dead_breve> <A>        : "Ẳ"   # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
+<dead_tilde>    <dead_breve> <A>        : "Ẵ"   # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
+
+# Sequences with COMBINING CIRCUMFLEX ACCENT / <dead_circumflex>
+<dead_acute>    <dead_circumflex> <a>   : "ấ"   # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
+<dead_belowdot> <dead_circumflex> <a>   : "ậ"   # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
+<dead_grave>    <dead_circumflex> <a>   : "ầ"   # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
+<dead_hook>     <dead_circumflex> <a>   : "ẩ"   # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
+<dead_tilde>    <dead_circumflex> <a>   : "ẫ"   # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
+<dead_acute>    <dead_circumflex> <A>   : "Ấ"   # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
+<dead_belowdot> <dead_circumflex> <A>   : "Ậ"   # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
+<dead_grave>    <dead_circumflex> <A>   : "Ầ"   # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
+<dead_hook>     <dead_circumflex> <A>   : "Ẩ"   # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
+<dead_tilde>    <dead_circumflex> <A>   : "Ẫ"   # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
+<dead_acute>    <dead_circumflex> <e>   : "ế"   # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
+<dead_belowdot> <dead_circumflex> <e>   : "ệ"   # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
+<dead_grave>    <dead_circumflex> <e>   : "ề"   # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
+<dead_hook>     <dead_circumflex> <e>   : "ể"   # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
+<dead_tilde>    <dead_circumflex> <e>   : "ễ"   # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
+<dead_acute>    <dead_circumflex> <E>   : "Ệ"   # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
+<dead_belowdot> <dead_circumflex> <E>   : "Ệ"   # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
+<dead_grave>    <dead_circumflex> <E>   : "Ề"   # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
+<dead_hook>     <dead_circumflex> <E>   : "Ể"   # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
+<dead_tilde>    <dead_circumflex> <E>   : "Ễ"   # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
+<dead_acute>    <dead_circumflex> <o>   : "ố"   # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
+<dead_belowdot> <dead_circumflex> <o>   : "ộ"   # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
+<dead_grave>    <dead_circumflex> <o>   : "ồ"   # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
+<dead_hook>     <dead_circumflex> <o>   : "ổ"   # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
+<dead_tilde>    <dead_circumflex> <o>   : "ỗ"   # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
+<dead_acute>    <dead_circumflex> <O>   : "Ố"   # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
+<dead_belowdot> <dead_circumflex> <O>   : "Ộ"   # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
+<dead_grave>    <dead_circumflex> <O>   : "Ồ"   # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
+<dead_hook>     <dead_circumflex> <O>   : "Ổ"   # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
+<dead_tilde>    <dead_circumflex> <O>   : "Ỗ"   # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
+
+# Sequences with COMBINING DIAERESIS / <dead_diaeresis>
+<dead_macron>   <dead_diaeresis> <a>    : "ǟ"   # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
+<dead_macron>   <dead_diaeresis> <A>    : "Ǟ"   # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
+
+# Sequences with COMBINING DOT ABOVE / <dead_abovedot>
+                <dead_abovedot> <a>     : "ȧ"   # LATIN SMALL LETTER A WITH DOT ABOVE
+<dead_macron>   <dead_abovedot> <a>     : "ǡ"   # LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
+                <dead_abovedot> <A>     : "Ȧ"   # LATIN CAPITAL LETTER A WITH DOT ABOVE
+<dead_macron>   <dead_abovedot> <A>     : "Ǡ"   # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
+
+# Sequences with COMBINING HOOK ABOVE / <dead_hook>
+<dead_hook> <a>                         : "ả"   # LATIN SMALL LETTER A WITH HOOK ABOVE
+<dead_hook> <A>                         : "Ả"   # LATIN CAPITAL LETTER A WITH HOOK ABOVE
+<dead_hook> <e>                         : "ẻ"   # LATIN SMALL LETTER E WITH HOOK ABOVE
+<dead_hook> <E>                         : "Ẻ"   # LATIN CAPITAL LETTER E WITH HOOK ABOVE
+<dead_hook> <i>                         : "ỉ"   # LATIN SMALL LETTER I WITH HOOK ABOVE
+<dead_hook> <I>                         : "Ỉ"   # LATIN CAPITAL LETTER I WITH HOOK ABOVE
+<dead_hook> <o>                         : "ỏ"   # LATIN SMALL LETTER O WITH HOOK ABOVE
+<dead_hook> <O>                         : "Ỏ"   # LATIN CAPITAL LETTER O WITH HOOK ABOVE
+<dead_hook> <u>                         : "ủ"   # LATIN SMALL LETTER U WITH HOOK ABOVE
+<dead_hook> <U>                         : "Ủ"   # LATIN CAPITAL LETTER U WITH HOOK ABOVE
+<dead_hook> <y>                         : "ỷ"   # LATIN SMALL LETTER Y WITH HOOK ABOVE
+<dead_hook> <Y>                         : "Ỷ"   # LATIN CAPITAL LETTER Y WITH HOOK ABOVE
+
+# Sequences with COMBINING HORN / <dead_horn>
+                <dead_horn> <o>         : "ơ"   # LATIN SMALL LETTER O WITH HORN
+<dead_acute>    <dead_horn> <o>         : "ớ"   # LATIN SMALL LETTER O WITH HORN AND ACUTE
+<dead_belowdot> <dead_horn> <o>         : "ợ"   # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
+<dead_grave>    <dead_horn> <o>         : "ờ"   # LATIN SMALL LETTER O WITH HORN AND GRAVE
+<dead_hook>     <dead_horn> <o>         : "ờ"   # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
+<dead_tilde>    <dead_horn> <o>         : "ỡ"   # LATIN SMALL LETTER O WITH HORN AND TILDE
+                <dead_horn> <O>         : "Ơ"   # LATIN CAPITAL LETTER O WITH HORN
+<dead_acute>    <dead_horn> <O>         : "Ớ"   # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
+<dead_belowdot> <dead_horn> <O>         : "Ợ"   # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
+<dead_grave>    <dead_horn> <O>         : "Ờ"   # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
+<dead_hook>     <dead_horn> <O>         : "Ở"   # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
+<dead_tilde>    <dead_horn> <O>         : "Ỡ"   # LATIN CAPITAL LETTER O WITH HORN AND TILDE
+                <dead_horn> <u>         : "ư"   # LATIN SMALL LETTER U WITH HORN
+<dead_acute>    <dead_horn> <u>         : "ứ"   # LATIN SMALL LETTER U WITH HORN AND ACUTE
+<dead_belowdot> <dead_horn> <u>         : "ự"   # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
+<dead_grave>    <dead_horn> <u>         : "ừ"   # LATIN SMALL LETTER U WITH HORN AND GRAVE
+<dead_hook>     <dead_horn> <u>         : "ử"   # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
+<dead_tilde>    <dead_horn> <u>         : "ữ"   # LATIN SMALL LETTER U WITH HORN AND TILDE
+                <dead_horn> <U>         : "Ư"   # LATIN CAPITAL LETTER U WITH HORN
+<dead_acute>    <dead_horn> <U>         : "Ứ"   # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
+<dead_belowdot> <dead_horn> <U>         : "Ự"   # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
+<dead_grave>    <dead_horn> <U>         : "Ừ"   # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
+<dead_hook>     <dead_horn> <U>         : "Ử"   # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
+<dead_tilde>    <dead_horn> <U>         : "Ữ"   # LATIN CAPITAL LETTER U WITH HORN AND TILDE
+
+# Sequences with COMBINING OGONEK / <dead_ogonek>
+<dead_macron>   <dead_ogonek> <o>       : "ǭ"   # LATIN SMALL LETTER O WITH OGONEK AND MACRON
+<dead_macron>   <dead_ogonek> <O>       : "Ǭ"   # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
+
+# Sequences with COMBINING RING ABOVE / <dead_abovering>
+<dead_acute>    <dead_abovering> <a>    : "ǻ"   # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
+<dead_acute>    <dead_abovering> <A>    : "Ǻ"   # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
+
+# Additional sequences from Annex 5 for the reportoire of the MES-2
+# (Multilingual European Subset No. 2 in ISO/IEC 10646, Collection 282)
+<dead_hook> <f>                         : "ƒ"   # LATIN SMALL LETTER F WITH HOOK
+<Multi_key> <f> <i>                     : "fi"   # LATIN SMALL LIGATURE FI
+<Multi_key> <f> <l>                     : "fl"   # LATIN SMALL LIGATURE FL
+<Multi_key> <i> <j>                     : "ij"   # LATIN SMALL LIGATURE IJ
+<Multi_key> <I> <J>                     : "IJ"   # LATIN CAPITAL LIGATURE IJ
+<dead_abovedot> <l>                     : "ŀ"   # LATIN SMALL LETTER L WITH MIDDLE DOT
+<dead_abovedot> <L>                     : "Ŀ"   # LATIN CAPITAL LETTER L WITH MIDDLE DOT
+<Multi_key> <apostrophe> <space> <n>    : "ʼn"   # LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
+<dead_hook> <r>                         : "ɼ"   # LATIN SMALL LETTER R WITH LONG LEG
+<Multi_key> <f> <s>                     : "ſ"   # LATIN SMALL LETTER LONG S
+<dead_abovedot> <Multi_key> <f> <s>     : "ẛ"   # LATIN SMALL LETTER LONG S WITH DOT ABOVE
+<Multi_key> <dead_abovedot> <f> <s>     : "ẛ"   # LATIN SMALL LETTER LONG S WITH DOT ABOVE
+<dead_belowcomma> <s>                   : "ș"   # LATIN SMALL LETTER S WITH COMMA BELOW
+<dead_belowcomma> <S>                   : "Ș"   # LATIN CAPITAL LETTER S WITH COMMA BELOW
+<dead_belowcomma> <t>                   : "ț"   # LATIN SMALL LETTER T WITH COMMA BELOW
+<dead_belowcomma> <T>                   : "Ț"   # LATIN CAPITAL LETTER T WITH COMMA BELOW

data/usr/share/X11/locale/fi_FI.UTF-8/XLC_LOCALE

@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

data/usr/share/X11/locale/georgian-academy/Compose

@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# georgian-academy Compose Sequence
+#
+# Sequence Definition
+#
+#
+# This file currently has no entries.  It appears that a compose file (even
+# just an empty one) is required for the appropriate keysyms to work for
+# this encoding.
+#
+# <Multi_key> Means <Compose>
+# Special Character
+
+# End of Sequence Definition

data/usr/share/X11/locale/georgian-academy/XI18N_OBJS

@@ -0,0 +1,7 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for georgian-academy locale
+#
+XLC	common/xlcDef	_XlcDefaultLoader	# XLC_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
+XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open

data/usr/share/X11/locale/georgian-academy/XLC_LOCALE

@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  XLocale Database Sample for georgian-academy
+# 
+
+# 
+# 	XLC_FONTSET category
+# 
+XLC_FONTSET
+# 	fs0 class (7 bit ASCII)
+fs0	{
+	charset	{
+		name		ISO8859-1:GL
+	}
+	font	{
+		primary		GEORGIAN-ACADEMY:GL
+		substitute	ISO8859-1:GL
+	}
+}
+# 	fs1 class 
+fs1	{
+	charset         GEORGIAN-ACADEMY:GR
+	font            GEORGIAN-ACADEMY:GR
+}
+END XLC_FONTSET
+
+#
+#	XLC_CHARSET_DEFINE category
+#
+XLC_CHARSET_DEFINE
+csd0	{
+	charset_name	GEORGIAN-ACADEMY
+	side		GR
+	length		1
+	string_encoding	False
+	sequence	\x1b%/1
+}
+END XLC_CHARSET_DEFINE
+
+# 
+# 	XLC_XLOCALE category
+# 
+XLC_XLOCALE
+
+encoding_name           GEORGIAN-ACADEMY
+mb_cur_max		1
+state_depend_encoding	False
+
+wc_encoding_mask	\x30000000
+wc_shift_bits		7
+
+
+
+
+
+
+use_stdc_env		True
+
+
+# 	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	wc_encoding	\x00000000
+	ct_encoding     GEORGIAN-ACADEMY:GL; ISO8859-1:GL
+}
+
+
+# 	cs1 class
+cs1	{
+	side		GR:Default
+	length		1
+
+	wc_encoding	\x30000000
+
+
+
+	ct_encoding     GEORGIAN-ACADEMY:GR
+}
+
+END XLC_XLOCALE

data/usr/share/X11/locale/georgian-ps/Compose

@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# georgian-ps Compose Sequence
+#
+# Sequence Definition
+#
+#
+# This file currently has no entries.  It appears that a compose file (even
+# just an empty one) is required for the appropriate keysyms to work for
+# this encoding.
+#
+# <Multi_key> Means <Compose>
+# Special Character
+
+# End of Sequence Definition

data/usr/share/X11/locale/georgian-ps/XI18N_OBJS

@@ -0,0 +1,7 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for georgian-ps locale
+#
+XLC	common/xlcDef	_XlcDefaultLoader	# XLC_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
+XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open

data/usr/share/X11/locale/georgian-ps/XLC_LOCALE

@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  XLocale Database Sample for georgian-ps
+# 
+
+# 
+# 	XLC_FONTSET category
+# 
+XLC_FONTSET
+# 	fs0 class (7 bit ASCII)
+fs0	{
+	charset	{
+		name		ISO8859-1:GL
+	}
+	font	{
+		primary		GEORGIAN-PS:GL 
+		substitute	ISO8859-1:GL
+	}
+}
+# 	fs1 class 
+fs1	{
+	charset         GEORGIAN-PS:GR
+	font            GEORGIAN-PS:GR
+}
+END XLC_FONTSET
+
+#
+#	XLC_CHARSET_DEFINE category
+#
+XLC_CHARSET_DEFINE
+csd0	{
+	charset_name	GEORGIAN-PS
+	side		GR
+	length		1
+	string_encoding	False
+	sequence	\x1b%/1
+}
+END XLC_CHARSET_DEFINE
+
+# 
+# 	XLC_XLOCALE category
+# 
+XLC_XLOCALE
+
+encoding_name           GEORGIAN-PS
+mb_cur_max		1
+state_depend_encoding	False
+
+wc_encoding_mask	\x30000000
+wc_shift_bits		7
+
+
+
+
+
+
+use_stdc_env		True
+
+
+# 	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	wc_encoding	\x00000000
+	ct_encoding     GEORGIAN-PS:GL; ISO8859-1:GL
+}
+
+
+# 	cs1 class
+cs1	{
+	side		GR:Default
+	length		1
+
+	wc_encoding	\x30000000
+
+
+
+	ct_encoding     GEORGIAN-PS:GR
+}
+
+END XLC_XLOCALE

data/usr/share/X11/locale/ibm-cp1133/Compose

@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# ibm-cp1133 Compose Sequence
+#
+# Sequence Definition
+#
+#
+# This file currently has no entries.  It appears that a compose file (even
+# just an empty one) is required for the appropriate keysyms to work for
+# this encoding.
+#
+# <Multi_key> Means <Compose>
+# Special Character
+
+# End of Sequence Definition

data/usr/share/X11/locale/ibm-cp1133/XI18N_OBJS

@@ -0,0 +1,7 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for ibm-cp1133 locale
+#
+XLC	common/xlcDef	_XlcDefaultLoader	# XLC_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
+XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open

data/usr/share/X11/locale/ibm-cp1133/XLC_LOCALE

@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  XLocale Database Sample for ibm-cp1133.
+# 
+
+# 
+# 	XLC_FONTSET category
+# 
+XLC_FONTSET
+# 	fs0 class (7 bit ASCII)
+fs0	{
+	charset	{
+		name		ISO8859-1:GL
+	}
+	font	{
+		primary		IBM-CP1133:GL
+		substitute	ISO8859-1:GL
+	}
+}
+# 	fs1 class 
+fs1	{
+	charset         IBM-CP1133:GR
+	font            IBM-CP1133:GR
+}
+END XLC_FONTSET
+
+#
+#	XLC_CHARSET_DEFINE category
+#
+XLC_CHARSET_DEFINE
+csd0	{
+	charset_name	IBM-CP1133
+	side		GR
+	length		1
+	string_encoding	False
+	sequence	\x1b%/1
+}
+END XLC_CHARSET_DEFINE
+
+# 
+# 	XLC_XLOCALE category
+# 
+XLC_XLOCALE
+
+encoding_name           IBM-CP1133
+mb_cur_max		1
+state_depend_encoding	False
+
+wc_encoding_mask	\x30000000
+wc_shift_bits		7
+
+
+
+
+
+
+use_stdc_env		True
+
+
+# 	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	wc_encoding	\x00000000
+	ct_encoding     IBM-CP1133:GL; ISO8859-1:GL
+}
+
+
+# 	cs1 class
+cs1	{
+	side		GR:Default
+	length		1
+
+	wc_encoding	\x30000000
+
+
+
+	ct_encoding     IBM-CP1133:GR
+}
+
+END XLC_XLOCALE

data/usr/share/X11/locale/iscii-dev/Compose

@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

data/usr/share/X11/locale/iscii-dev/XI18N_OBJS

@@ -0,0 +1,7 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for iscii-dev locale
+#
+XLC	common/xlcDef	_XlcDefaultLoader	# XLC_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
+XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open

data/usr/share/X11/locale/iscii-dev/XLC_LOCALE

@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  XLocale Database Sample for mulelao-1.
+# 
+
+# 
+# 	XLC_FONTSET category
+# 
+XLC_FONTSET
+# 	fs0 class (7 bit ASCII)
+fs0	{
+	charset	{
+		name		ISO8859-1:GL
+	}
+	font	{
+		primary		ISCII-DEV:GL
+		substitute	ISO8859-1:GL
+	}
+}
+# 	fs1 class 
+fs1	{
+	charset         ISCII-DEV:GR
+	font            ISCII-DEV:GR
+}
+END XLC_FONTSET
+
+#
+#	XLC_CHARSET_DEFINE category
+#
+XLC_CHARSET_DEFINE
+csd0	{
+	charset_name	ISCII-DEV
+	side		GR
+	length		1
+	string_encoding	False
+	sequence	\x1b%/1
+}
+END XLC_CHARSET_DEFINE
+
+# 
+# 	XLC_XLOCALE category
+# 
+XLC_XLOCALE
+
+encoding_name           ISCII-DEV
+mb_cur_max		1
+state_depend_encoding	False
+
+wc_encoding_mask	\x30000000
+wc_shift_bits		7
+
+
+
+
+
+
+use_stdc_env		True
+
+
+# 	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	wc_encoding	\x00000000
+	ct_encoding     ISCII-DEV:GL; ISO8859-1:GL
+}
+
+
+# 	cs1 class
+cs1	{
+	side		GR:Default
+	length		1
+
+	wc_encoding	\x30000000
+
+
+
+	ct_encoding     ISCII-DEV:GR
+}
+
+END XLC_XLOCALE

data/usr/share/X11/locale/isiri-3342/Compose

@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

data/usr/share/X11/locale/isiri-3342/XI18N_OBJS

@@ -0,0 +1,7 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for isiri-3342 locale
+#
+XLC	common/xlcDef	_XlcDefaultLoader	# XLC_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
+XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open

data/usr/share/X11/locale/isiri-3342/XLC_LOCALE

@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  XLocale Database Sample for mulelao-1.
+# 
+
+# 
+# 	XLC_FONTSET category
+# 
+XLC_FONTSET
+# 	fs0 class (7 bit ASCII)
+fs0	{
+	charset	{
+		name		ISO8859-1:GL
+	}
+	font	{
+		primary		ISIRI-3342:GL 
+		substitute	ISO8859-1:GL
+	}
+}
+# 	fs1 class 
+fs1	{
+	charset         ISIRI-3342:GR
+	font            ISIRI-3342:GR
+}
+END XLC_FONTSET
+
+#
+#	XLC_CHARSET_DEFINE category
+#
+XLC_CHARSET_DEFINE
+csd0	{
+	charset_name	ISIRI-3342
+	side		GR
+	length		1
+	string_encoding	False
+	sequence	\x1b%/1
+}
+END XLC_CHARSET_DEFINE
+
+# 
+# 	XLC_XLOCALE category
+# 
+XLC_XLOCALE
+
+encoding_name           ISIRI-3342
+mb_cur_max		1
+state_depend_encoding	False
+
+wc_encoding_mask	\x30000000
+wc_shift_bits		7
+
+
+
+
+
+
+use_stdc_env		True
+
+
+# 	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	wc_encoding	\x00000000
+	ct_encoding     ISIRI-3342:GL; ISO8859-1:GL
+}
+
+
+# 	cs1 class
+cs1	{
+	side		GR:Default
+	length		1
+
+	wc_encoding	\x30000000
+
+
+
+	ct_encoding     ISIRI-3342:GR
+}
+
+END XLC_XLOCALE

data/usr/share/X11/locale/iso8859-1/Compose

@@ -0,0 +1,511 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# ISO 8859-1 (Latin1) Compose Sequence
+#
+#
+#
+# Sequence Definition
+#
+# <Multi_key> Means <Compose>
+# Special Character
+<Multi_key> <plus> <plus>		: "#"	numbersign
+<Multi_key> <apostrophe> <space>	: "'"	apostrophe
+<Multi_key> <space> <apostrophe>	: "'"	apostrophe
+<Multi_key> <A> <T>			: "@"	at
+<Multi_key> <parenleft> <parenleft>	: "["	bracketleft
+<Multi_key> <slash> <slash>		: "\\"	backslash
+<Multi_key> <slash> <less>		: "\\"	backslash
+<Multi_key> <less> <slash>		: "\\"	backslash
+<Multi_key> <parenright> <parenright>	: "]"	bracketright
+<Multi_key> <asciicircum> <space>	: "^"	asciicircum
+<Multi_key> <space> <asciicircum>	: "^"	asciicircum
+<Multi_key> <greater> <space>		: "^"	asciicircum
+<Multi_key> <space> <greater>		: "^"	asciicircum
+<Multi_key> <grave> <space>		: "`"	grave
+<Multi_key> <space> <grave>		: "`"	grave
+<Multi_key> <parenleft> <minus>		: "{"	braceleft
+<Multi_key> <minus> <parenleft>		: "{"	braceleft
+<Multi_key> <slash> <asciicircum>	: "|"	bar
+<Multi_key> <asciicircum> <slash>	: "|"	bar
+<Multi_key> <V> <L>			: "|"	bar
+<Multi_key> <L> <V>			: "|"	bar
+<Multi_key> <v> <l>			: "|"	bar
+<Multi_key> <l> <v>			: "|"	bar
+<Multi_key> <parenright> <minus>	: "}"	braceright
+<Multi_key> <minus> <parenright>	: "}"	braceright
+<Multi_key> <asciitilde> <space>	: "~"	asciitilde
+<Multi_key> <space> <asciitilde>	: "~"	asciitilde
+<Multi_key> <minus> <space>		: "~"	asciitilde
+<Multi_key> <space> <minus>		: "~"	asciitilde
+<Multi_key> <exclam> <exclam>		: "\241"	exclamdown
+<Multi_key> <c> <slash>			: "\242"	cent
+<Multi_key> <slash> <c>			: "\242"	cent
+<Multi_key> <C> <slash>			: "\242"	cent
+<Multi_key> <slash> <C>			: "\242"	cent
+<Multi_key> <C> <bar>			: "\242"	cent
+<Multi_key> <bar> <C>			: "\242"	cent
+<Multi_key> <c> <bar>			: "\242"	cent
+<Multi_key> <bar> <c>			: "\242"	cent
+<Multi_key> <l> <minus>			: "\243"	sterling
+<Multi_key> <minus> <l>			: "\243"	sterling
+<Multi_key> <L> <minus>			: "\243"	sterling
+<Multi_key> <minus> <L>			: "\243"	sterling
+<Multi_key> <l> <equal>			: "\243"	sterling
+<Multi_key> <equal> <l>			: "\243"	sterling
+<Multi_key> <L> <equal>			: "\243"	sterling
+<Multi_key> <equal> <L>			: "\243"	sterling
+<Multi_key> <y> <minus>			: "\245"	yen
+<Multi_key> <minus> <y>			: "\245"	yen
+<Multi_key> <Y> <minus>			: "\245"	yen
+<Multi_key> <minus> <Y>			: "\245"	yen
+<Multi_key> <y> <equal>			: "\245"	yen
+<Multi_key> <equal> <y>			: "\245"	yen
+<Multi_key> <Y> <equal>			: "\245"	yen
+<Multi_key> <equal> <Y>			: "\245"	yen
+<Multi_key> <s> <o>			: "\247"	section
+<Multi_key> <o> <s>			: "\247"	section
+<Multi_key> <S> <O>			: "\247"	section
+<Multi_key> <O> <S>			: "\247"	section
+<Multi_key> <S> <exclam>		: "\247"	section
+<Multi_key> <exclam> <S>		: "\247"	section
+<Multi_key> <s> <exclam>		: "\247"	section
+<Multi_key> <exclam> <s>		: "\247"	section
+<Multi_key> <S> <0>			: "\247"	section
+<Multi_key> <0> <S>			: "\247"	section
+<Multi_key> <s> <0>			: "\247"	section
+<Multi_key> <0> <s>			: "\247"	section
+<Multi_key> <x> <o>			: "\244"	currency
+<Multi_key> <o> <x>			: "\244"	currency
+<Multi_key> <X> <O>			: "\244"	currency
+<Multi_key> <O> <X>			: "\244"	currency
+<Multi_key> <x> <O>			: "\244"	currency
+<Multi_key> <O> <x>			: "\244"	currency
+<Multi_key> <X> <o>			: "\244"	currency
+<Multi_key> <o> <X>			: "\244"	currency
+<Multi_key> <x> <0>			: "\244"	currency
+<Multi_key> <0> <x>			: "\244"	currency
+<Multi_key> <X> <0>			: "\244"	currency
+<Multi_key> <0> <X>			: "\244"	currency
+<Multi_key> <c> <o>			: "\251"	copyright
+<Multi_key> <o> <c>			: "\251"	copyright
+<Multi_key> <C> <O>			: "\251"	copyright
+<Multi_key> <O> <C>			: "\251"	copyright
+<Multi_key> <c> <O>			: "\251"	copyright
+<Multi_key> <O> <c>			: "\251"	copyright
+<Multi_key> <C> <o>			: "\251"	copyright
+<Multi_key> <o> <C>			: "\251"	copyright
+<Multi_key> <c> <0>			: "\251"	copyright
+<Multi_key> <0> <c>			: "\251"	copyright
+<Multi_key> <C> <0>			: "\251"	copyright
+<Multi_key> <0> <C>			: "\251"	copyright
+<Multi_key> <parenleft> <c>		: "\251"	copyright
+<Multi_key> <a> <underscore>		: "\252"	ordfeminine
+<Multi_key> <underscore> <a>		: "\252"	ordfeminine
+<Multi_key> <A> <underscore>		: "\252"	ordfeminine
+<Multi_key> <underscore> <A>		: "\252"	ordfeminine
+<Multi_key> <o> <underscore>		: "\272"	masculine
+<Multi_key> <underscore> <o>		: "\272"	masculine
+<Multi_key> <O> <underscore>		: "\272"	masculine
+<Multi_key> <underscore> <O>		: "\272"	masculine
+<Multi_key> <less> <less>		: "\253"	guillemotleft
+<Multi_key> <greater> <greater>		: "\273"	guillemotright
+<Multi_key> <0> <asciicircum>		: "\260"	degree
+<Multi_key> <asciicircum> <0>		: "\260"	degree
+<Multi_key> <0> <asterisk>		: "\260"	degree
+<Multi_key> <asterisk> <0>		: "\260"	degree
+<Multi_key> <plus> <minus>		: "\261"	plusminus
+<Multi_key> <minus> <plus>		: "\261"	plusminus
+<Multi_key> <slash> <u>			: "\265"	mu
+<Multi_key> <u> <slash>			: "\265"	mu
+<Multi_key> <slash> <U>			: "\265"	mu
+<Multi_key> <U> <slash>			: "\265"	mu
+<Multi_key> <1> <asciicircum>		: "\271"	onesuperior
+<Multi_key> <asciicircum> <1>		: "\271"	onesuperior
+<Multi_key> <S> <1>			: "\271"	onesuperior
+<Multi_key> <1> <S>			: "\271"	onesuperior
+<Multi_key> <s> <1>			: "\271"	onesuperior
+<Multi_key> <1> <s>			: "\271"	onesuperior
+<Multi_key> <2> <asciicircum>		: "\262"	twosuperior
+<Multi_key> <asciicircum> <2>		: "\262"	twosuperior
+<Multi_key> <S> <2>			: "\262"	twosuperior
+<Multi_key> <2> <S>			: "\262"	twosuperior
+<Multi_key> <s> <2>			: "\262"	twosuperior
+<Multi_key> <2> <s>			: "\262"	twosuperior
+<Multi_key> <3> <asciicircum>		: "\263"	threesuperior
+<Multi_key> <asciicircum> <3>		: "\263"	threesuperior
+<Multi_key> <S> <3>			: "\263"	threesuperior
+<Multi_key> <3> <S>			: "\263"	threesuperior
+<Multi_key> <s> <3>			: "\263"	threesuperior
+<Multi_key> <3> <s>			: "\263"	threesuperior
+<Multi_key> <p> <exclam>		: "\266"	paragraph
+<Multi_key> <exclam> <p>		: "\266"	paragraph
+<Multi_key> <P> <exclam>		: "\266"	paragraph
+<Multi_key> <exclam> <P>		: "\266"	paragraph
+<Multi_key> <period> <asciicircum>	: "\267"	periodcentered
+<Multi_key> <asciicircum> <period>	: "\267"	periodcentered
+<Multi_key> <period> <period>		: "\267"	periodcentered
+<Multi_key> <1> <4>			: "\274"	onequarter
+<Multi_key> <1> <2>			: "\275"	onehalf
+<Multi_key> <3> <4>			: "\276"	threequarters
+<Multi_key> <question> <question>	: "\277"	questiondown
+<Multi_key> <space> <space>		: "\240"	nobreakspace
+<Multi_key> <bar> <bar>			: "\246"	brokenbar
+<Multi_key> <exclam> <asciicircum>	: "\246"	brokenbar
+<Multi_key> <asciicircum> <exclam>	: "\246"	brokenbar
+<Multi_key> <V> <B>			: "\246"	brokenbar
+<Multi_key> <B> <V>			: "\246"	brokenbar
+<Multi_key> <v> <b>			: "\246"	brokenbar
+<Multi_key> <b> <v>			: "\246"	brokenbar
+<Multi_key> <minus> <comma>		: "\254"	notsign
+<Multi_key> <comma> <minus>		: "\254"	notsign
+<Multi_key> <minus> <minus>		: "\255"	hyphen
+<Multi_key> <R> <O>			: "\256"	registered
+<Multi_key> <O> <R>			: "\256"	registered
+<Multi_key> <parenleft> <r>		: "\256"	registered
+<Multi_key> <minus> <asciicircum>	: "\257"	macron
+<Multi_key> <asciicircum> <minus>	: "\257"	macron
+<Multi_key> <underscore> <asciicircum>	: "\257"	macron
+<Multi_key> <asciicircum> <underscore>	: "\257"	macron
+<Multi_key> <underscore> <underscore>	: "\257"	macron
+<Multi_key> <minus> <colon>		: "\367"	division
+<Multi_key> <colon> <minus>		: "\367"	division
+<Multi_key> <x> <x>			: "\327"	multiply
+<Multi_key> <apostrophe> <apostrophe>	: "\264"	acute
+<Multi_key> <comma> <comma>		: "\270"	cedilla
+<Multi_key> <quotedbl> <quotedbl>	: "\250"	diaeresis
+# Accented Alphabet
+<Multi_key> <A> <grave>			: "\300"	Agrave
+<Multi_key> <grave> <A>			: "\300"	Agrave
+<Multi_key> <A> <acute>			: "\301"	Aacute
+<Multi_key> <acute> <A>			: "\301"	Aacute
+<Multi_key> <A> <apostrophe>		: "\301"	Aacute
+<Multi_key> <apostrophe> <A>		: "\301"	Aacute
+<Multi_key> <A> <asciicircum>		: "\302"	Acircumflex
+<Multi_key> <asciicircum> <A>		: "\302"	Acircumflex
+<Multi_key> <A> <greater>		: "\302"	Acircumflex
+<Multi_key> <greater> <A>		: "\302"	Acircumflex
+<Multi_key> <A> <asciitilde>		: "\303"	Atilde
+<Multi_key> <asciitilde> <A>		: "\303"	Atilde
+<Multi_key> <A> <minus>			: "\303"	Atilde
+<Multi_key> <minus> <A>			: "\303"	Atilde
+<Multi_key> <A> <quotedbl>		: "\304"	Adiaeresis
+<Multi_key> <quotedbl> <A>		: "\304"	Adiaeresis
+<Multi_key> <A> <diaeresis>		: "\304"	Adiaeresis
+<Multi_key> <diaeresis> <A>		: "\304"	Adiaeresis
+<Multi_key> <A> <asterisk>		: "\305"	Aring
+<Multi_key> <asterisk> <A>		: "\305"	Aring
+<Multi_key> <A> <A>			: "\305"	Aring
+<Multi_key> <A> <O>			: "\305"	Aring
+<Multi_key> <A> <E>			: "\306"	AE
+<Multi_key> <a> <grave>			: "\340"	agrave
+<Multi_key> <grave> <a>			: "\340"	agrave
+<Multi_key> <a> <acute>			: "\341"	aacute
+<Multi_key> <acute> <a>			: "\341"	aacute
+<Multi_key> <a> <apostrophe>		: "\341"	aacute
+<Multi_key> <apostrophe> <a>		: "\341"	aacute
+<Multi_key> <a> <asciicircum>		: "\342"	acircumflex
+<Multi_key> <asciicircum> <a>		: "\342"	acircumflex
+<Multi_key> <a> <greater>		: "\342"	acircumflex
+<Multi_key> <greater> <a>		: "\342"	acircumflex
+<Multi_key> <a> <asciitilde>		: "\343"	atilde
+<Multi_key> <asciitilde> <a>		: "\343"	atilde
+<Multi_key> <a> <minus>			: "\343"	atilde
+<Multi_key> <minus> <a>			: "\343"	atilde
+<Multi_key> <a> <quotedbl>		: "\344"	adiaeresis
+<Multi_key> <quotedbl> <a>		: "\344"	adiaeresis
+<Multi_key> <a> <diaeresis>		: "\344"	adiaeresis
+<Multi_key> <diaeresis> <a>		: "\344"	adiaeresis
+<Multi_key> <a> <asterisk>		: "\345"	aring
+<Multi_key> <asterisk> <a>		: "\345"	aring
+<Multi_key> <a> <a>			: "\345"	aring
+<Multi_key> <a> <o>			: "\345"	aring
+<Multi_key> <a> <e>			: "\346"	ae
+<Multi_key> <acute> <C>			: "\307"	Ccedilla
+<Multi_key> <acute> <c>			: "\347"	ccedilla
+<Multi_key> <C> <comma>			: "\307"	Ccedilla
+<Multi_key> <C> <cedilla>		: "\307"	Ccedilla
+<Multi_key> <comma> <C>			: "\307"	Ccedilla
+<Multi_key> <cedilla> <C>		: "\307"	Ccedilla
+<Multi_key> <c> <comma>			: "\347"	ccedilla
+<Multi_key> <c> <cedilla>		: "\347"	ccedilla
+<Multi_key> <comma> <c>			: "\347"	ccedilla
+<Multi_key> <cedilla> <c>		: "\347"	ccedilla
+<Multi_key> <minus> <D>			: "\320"	ETH
+<Multi_key> <D> <minus>			: "\320"	ETH
+<Multi_key> <minus> <d>			: "\360"	eth
+<Multi_key> <d> <minus>			: "\360"	eth
+<Multi_key> <E> <grave>			: "\310"	Egrave
+<Multi_key> <grave> <E>			: "\310"	Egrave
+<Multi_key> <E> <acute>			: "\311"	Eacute
+<Multi_key> <acute> <E>			: "\311"	Eacute
+<Multi_key> <E> <apostrophe>		: "\311"	Eacute
+<Multi_key> <apostrophe> <E>		: "\311"	Eacute
+<Multi_key> <E> <asciicircum>		: "\312"	Ecircumflex
+<Multi_key> <asciicircum> <E>		: "\312"	Ecircumflex
+<Multi_key> <E> <greater>		: "\312"	Ecircumflex
+<Multi_key> <greater> <E>		: "\312"	Ecircumflex
+<Multi_key> <E> <quotedbl>		: "\313"	Ediaeresis
+<Multi_key> <quotedbl> <E>		: "\313"	Ediaeresis
+<Multi_key> <E> <diaeresis>		: "\313"	Ediaeresis
+<Multi_key> <diaeresis> <E>		: "\313"	Ediaeresis
+<Multi_key> <e> <grave>			: "\350"	egrave
+<Multi_key> <grave> <e>			: "\350"	egrave
+<Multi_key> <e> <acute>			: "\351"	eacute
+<Multi_key> <acute> <e>			: "\351"	eacute
+<Multi_key> <e> <apostrophe>		: "\351"	eacute
+<Multi_key> <apostrophe> <e>		: "\351"	eacute
+<Multi_key> <e> <asciicircum>		: "\352"	ecircumflex
+<Multi_key> <asciicircum> <e>		: "\352"	ecircumflex
+<Multi_key> <e> <greater>		: "\352"	ecircumflex
+<Multi_key> <greater> <e>		: "\352"	ecircumflex
+<Multi_key> <e> <quotedbl>		: "\353"	ediaeresis
+<Multi_key> <quotedbl> <e>		: "\353"	ediaeresis
+<Multi_key> <e> <diaeresis>		: "\353"	ediaeresis
+<Multi_key> <diaeresis> <e>		: "\353"	ediaeresis
+<Multi_key> <I> <grave>			: "\314"	Igrave
+<Multi_key> <grave> <I>			: "\314"	Igrave
+<Multi_key> <I> <acute>			: "\315"	Iacute
+<Multi_key> <acute> <I>			: "\315"	Iacute
+<Multi_key> <I> <apostrophe>		: "\315"	Iacute
+<Multi_key> <apostrophe> <I>		: "\315"	Iacute
+<Multi_key> <I> <asciicircum>		: "\316"	Icircumflex
+<Multi_key> <asciicircum> <I>		: "\316"	Icircumflex
+<Multi_key> <I> <greater>		: "\316"	Icircumflex
+<Multi_key> <greater> <I>		: "\316"	Icircumflex
+<Multi_key> <I> <quotedbl>		: "\317"	Idiaeresis
+<Multi_key> <quotedbl> <I>		: "\317"	Idiaeresis
+<Multi_key> <I> <diaeresis>		: "\317"	Idiaeresis
+<Multi_key> <diaeresis> <I>		: "\317"	Idiaeresis
+<Multi_key> <i> <grave>			: "\354"	igrave
+<Multi_key> <grave> <i>			: "\354"	igrave
+<Multi_key> <i> <acute>			: "\355"	iacute
+<Multi_key> <acute> <i>			: "\355"	iacute
+<Multi_key> <i> <apostrophe>		: "\355"	iacute
+<Multi_key> <apostrophe> <i>		: "\355"	iacute
+<Multi_key> <i> <asciicircum>		: "\356"	icircumflex
+<Multi_key> <asciicircum> <i>		: "\356"	icircumflex
+<Multi_key> <i> <greater>		: "\356"	icircumflex
+<Multi_key> <greater> <i>		: "\356"	icircumflex
+<Multi_key> <i> <quotedbl>		: "\357"	idiaeresis
+<Multi_key> <quotedbl> <i>		: "\357"	idiaeresis
+<Multi_key> <i> <diaeresis>		: "\357"	idiaeresis
+<Multi_key> <diaeresis> <i>		: "\357"	idiaeresis
+<Multi_key> <N> <asciitilde>		: "\321"	Ntilde
+<Multi_key> <asciitilde> <N>		: "\321"	Ntilde
+<Multi_key> <N> <minus>			: "\321"	Ntilde
+<Multi_key> <minus> <N>			: "\321"	Ntilde
+<Multi_key> <n> <asciitilde>		: "\361"	ntilde
+<Multi_key> <asciitilde> <n>		: "\361"	ntilde
+<Multi_key> <n> <minus>			: "\361"	ntilde
+<Multi_key> <minus> <n>			: "\361"	ntilde
+<Multi_key> <O> <grave>			: "\322"	Ograve
+<Multi_key> <grave> <O>			: "\322"	Ograve
+<Multi_key> <O> <acute>			: "\323"	Oacute
+<Multi_key> <acute> <O>			: "\323"	Oacute
+<Multi_key> <O> <apostrophe>		: "\323"	Oacute
+<Multi_key> <apostrophe> <O>		: "\323"	Oacute
+<Multi_key> <O> <asciicircum>		: "\324"	Ocircumflex
+<Multi_key> <asciicircum> <O>		: "\324"	Ocircumflex
+<Multi_key> <O> <greater>		: "\324"	Ocircumflex
+<Multi_key> <greater> <O>		: "\324"	Ocircumflex
+<Multi_key> <O> <asciitilde>		: "\325"	Otilde
+<Multi_key> <asciitilde> <O>		: "\325"	Otilde
+<Multi_key> <O> <minus>			: "\325"	Otilde
+<Multi_key> <minus> <O>			: "\325"	Otilde
+<Multi_key> <O> <quotedbl>		: "\326"	Odiaeresis
+<Multi_key> <quotedbl> <O>		: "\326"	Odiaeresis
+<Multi_key> <O> <diaeresis>		: "\326"	Odiaeresis
+<Multi_key> <diaeresis> <O>		: "\326"	Odiaeresis
+<Multi_key> <O> <slash>			: "\330"	Ooblique
+<Multi_key> <slash> <O>			: "\330"	Ooblique
+<Multi_key> <o> <grave>			: "\362"	ograve
+<Multi_key> <grave> <o>			: "\362"	ograve
+<Multi_key> <o> <acute>			: "\363"	oacute
+<Multi_key> <acute> <o>			: "\363"	oacute
+<Multi_key> <o> <apostrophe>		: "\363"	oacute
+<Multi_key> <apostrophe> <o>		: "\363"	oacute
+<Multi_key> <o> <asciicircum>		: "\364"	ocircumflex
+<Multi_key> <asciicircum> <o>		: "\364"	ocircumflex
+<Multi_key> <o> <greater>		: "\364"	ocircumflex
+<Multi_key> <greater> <o>		: "\364"	ocircumflex
+<Multi_key> <o> <asciitilde>		: "\365"	otilde
+<Multi_key> <asciitilde> <o>		: "\365"	otilde
+<Multi_key> <o> <minus>			: "\365"	otilde
+<Multi_key> <minus> <o>			: "\365"	otilde
+<Multi_key> <o> <quotedbl>		: "\366"	odiaeresis
+<Multi_key> <quotedbl> <o>		: "\366"	odiaeresis
+<Multi_key> <o> <diaeresis>		: "\366"	odiaeresis
+<Multi_key> <diaeresis> <o>		: "\366"	odiaeresis
+<Multi_key> <o> <slash>			: "\370"	oslash
+<Multi_key> <slash> <o>			: "\370"	oslash
+<Multi_key> <U> <grave>			: "\331"	Ugrave
+<Multi_key> <grave> <U>			: "\331"	Ugrave
+<Multi_key> <U> <acute>			: "\332"	Uacute
+<Multi_key> <acute> <U>			: "\332"	Uacute
+<Multi_key> <U> <apostrophe>		: "\332"	Uacute
+<Multi_key> <apostrophe> <U>		: "\332"	Uacute
+<Multi_key> <U> <asciicircum>		: "\333"	Ucircumflex
+<Multi_key> <asciicircum> <U>		: "\333"	Ucircumflex
+<Multi_key> <U> <greater>		: "\333"	Ucircumflex
+<Multi_key> <greater> <U>		: "\333"	Ucircumflex
+<Multi_key> <U> <quotedbl>		: "\334"	Udiaeresis
+<Multi_key> <quotedbl> <U>		: "\334"	Udiaeresis
+<Multi_key> <U> <diaeresis>		: "\334"	Udiaeresis
+<Multi_key> <diaeresis> <U>		: "\334"	Udiaeresis
+<Multi_key> <u> <grave>			: "\371"	ugrave
+<Multi_key> <grave> <u>			: "\371"	ugrave
+<Multi_key> <u> <acute>			: "\372"	uacute
+<Multi_key> <acute> <u>			: "\372"	uacute
+<Multi_key> <u> <apostrophe>		: "\372"	uacute
+<Multi_key> <apostrophe> <u>		: "\372"	uacute
+<Multi_key> <u> <asciicircum>		: "\373"	ucircumflex
+<Multi_key> <asciicircum> <u>		: "\373"	ucircumflex
+<Multi_key> <u> <greater>		: "\373"	ucircumflex
+<Multi_key> <greater> <u>		: "\373"	ucircumflex
+<Multi_key> <u> <quotedbl>		: "\374"	udiaeresis
+<Multi_key> <quotedbl> <u>		: "\374"	udiaeresis
+<Multi_key> <u> <diaeresis>		: "\374"	udiaeresis
+<Multi_key> <diaeresis> <u>		: "\374"	udiaeresis
+<Multi_key> <s> <s>			: "\337"	ssharp
+<Multi_key> <T> <H>			: "\336"	THORN
+<Multi_key> <t> <h>			: "\376"	thorn
+<Multi_key> <Y> <acute>			: "\335"	Yacute
+<Multi_key> <acute> <Y>			: "\335"	Yacute
+<Multi_key> <Y> <apostrophe>		: "\335"	Yacute
+<Multi_key> <apostrophe> <Y>		: "\335"	Yacute
+<Multi_key> <y> <acute>			: "\375"	yacute
+<Multi_key> <acute> <y>			: "\375"	yacute
+<Multi_key> <y> <apostrophe>		: "\375"	yacute
+<Multi_key> <apostrophe> <y>		: "\375"	yacute
+<Multi_key> <y> <quotedbl>		: "\377"	ydiaeresis
+<Multi_key> <quotedbl> <y>		: "\377"	ydiaeresis
+<Multi_key> <y> <diaeresis>		: "\377"	ydiaeresis
+<Multi_key> <diaeresis> <y>		: "\377"	ydiaeresis
+#
+#
+# dead key accent keysyms
+# Special Character
+<dead_circumflex> <slash>		: "|"	bar
+<dead_circumflex> <space>		: "^"	asciicircum
+<dead_circumflex> <dead_circumflex>	: "^"	asciicircum
+<dead_tilde> <space>			: "~"	asciitilde
+<dead_tilde> <dead_tilde>		: "~"	asciitilde
+<dead_grave> <space>			: "`"	grave
+<dead_grave> <dead_grave>		: "`"	grave
+# These are for us_intl, that does not have diaeresis, etc
+<dead_acute> <space>			: "'"	apostrophe
+<dead_acute> <dead_acute>		: "\264"	acute
+<dead_diaeresis> <space>		: "\""	quotedbl
+<dead_diaeresis> <dead_diaeresis>	: "\250"	diaeresis
+<dead_doubleacute> <space>		: "\""	quotedbl
+<dead_abovering> <space>		: "\260"	degree
+<dead_abovering> <dead_abovering>	: "\260"	degree
+<dead_circumflex> <0>			: "\260"	degree
+<dead_circumflex> <1>			: "\271"	onesuperior
+<dead_circumflex> <2>			: "\262"	twosuperior
+<dead_circumflex> <3>			: "\263"	threesuperior
+<dead_circumflex> <period>		: "\267"	periodcentered
+<dead_circumflex> <exclam>		: "\246"	brokenbar
+<dead_cedilla> <minus>			: "\254"	notsign
+<dead_circumflex> <minus>		: "\257"	macron
+<dead_circumflex> <underscore>		: "\257"	macron
+<dead_acute> <apostrophe>		: "\264"	acute
+<dead_cedilla> <comma>			: "\270"	cedilla
+<dead_diaeresis> <quotedbl>		: "\250"	diaeresis
+# Accented Alphabet
+<dead_abovering> <A>			: "\305"	Aring
+<dead_grave> <A>			: "\300"	Agrave
+<dead_acute> <A>			: "\301"	Aacute
+<dead_circumflex> <A>			: "\302"	Acircumflex
+<dead_tilde> <A>			: "\303"	Atilde
+<dead_diaeresis> <A>			: "\304"	Adiaeresis
+<dead_abovering> <a>			: "\345"	aring
+<dead_grave> <a>			: "\340"	agrave
+<dead_acute> <a>			: "\341"	aacute
+<dead_circumflex> <a>			: "\342"	acircumflex
+<dead_tilde> <a>			: "\343"	atilde
+<dead_diaeresis> <a>			: "\344"	adiaeresis
+<dead_cedilla> <C>			: "\307"	Ccedilla
+<dead_cedilla> <c>			: "\347"	ccedilla
+<dead_grave> <E>			: "\310"	Egrave
+<dead_acute> <E>			: "\311"	Eacute
+<dead_circumflex> <E>			: "\312"	Ecircumflex
+<dead_diaeresis> <E>			: "\313"	Ediaeresis
+<dead_grave> <e>			: "\350"	egrave
+<dead_acute> <e>			: "\351"	eacute
+<dead_circumflex> <e>			: "\352"	ecircumflex
+<dead_diaeresis> <e>			: "\353"	ediaeresis
+<dead_grave> <I>			: "\314"	Igrave
+<dead_acute> <I>			: "\315"	Iacute
+<dead_circumflex> <I>			: "\316"	Icircumflex
+<dead_diaeresis> <I>			: "\317"	Idiaeresis
+<dead_grave> <i>			: "\354"	igrave
+<dead_acute> <i>			: "\355"	iacute
+<dead_circumflex> <i>			: "\356"	icircumflex
+<dead_diaeresis> <i>			: "\357"	idiaeresis
+<dead_tilde> <N>			: "\321"	Ntilde
+<dead_tilde> <n>			: "\361"	ntilde
+<dead_grave> <O>			: "\322"	Ograve
+<dead_acute> <O>			: "\323"	Oacute
+<dead_circumflex> <O>			: "\324"	Ocircumflex
+<dead_tilde> <O>			: "\325"	Otilde
+<dead_diaeresis> <O>			: "\326"	Odiaeresis
+<dead_grave> <o>			: "\362"	ograve
+<dead_acute> <o>			: "\363"	oacute
+<dead_circumflex> <o>			: "\364"	ocircumflex
+<dead_tilde> <o>			: "\365"	otilde
+<dead_diaeresis> <o>			: "\366"	odiaeresis
+<dead_grave> <U>			: "\331"	Ugrave
+<dead_acute> <U>			: "\332"	Uacute
+<dead_circumflex> <U>			: "\333"	Ucircumflex
+<dead_doubleacute> <U>			: "\334"	Udiaeresis
+<dead_diaeresis> <U>			: "\334"	Udiaeresis
+<dead_grave> <u>			: "\371"	ugrave
+<dead_acute> <u>			: "\372"	uacute
+<dead_circumflex> <u>			: "\373"	ucircumflex
+<dead_doubleacute> <u>			: "\374"	udiaeresis
+<dead_diaeresis> <u>			: "\374"	udiaeresis
+<dead_acute> <Y>			: "\335"	Yacute
+<dead_acute> <y>			: "\375"	yacute
+<dead_diaeresis> <y>			: "\377"	ydiaeresis
+# Useful for portuguese language
+<dead_acute> <C>			: "\307"	Ccedilla
+<dead_acute> <c>			: "\347"	ccedilla
+#
+# End of Sequence Definition

data/usr/share/X11/locale/iso8859-1/XI18N_OBJS

@@ -0,0 +1,8 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for euro locales
+#
+XLC	common/xlibi18n	_XlcGenericLoader	# XLC_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
+XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open
+

data/usr/share/X11/locale/iso8859-1/XLC_LOCALE

@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  XLocale Database Sample for iso8859-1.
+# 
+
+# 
+# 	XLC_FONTSET category
+# 
+XLC_FONTSET
+# 	fs0 class 
+fs0	{
+	charset	{
+		name	ISO8859-1:GL
+	}
+	font	{
+		primary		ISO8859-1:GL
+		vertical_rotate	all
+	}
+}
+# 	fs1 class 
+fs1	{
+	charset	{
+		name	ISO8859-1:GR
+	}
+	font	{
+		primary	ISO8859-1:GR
+	}
+}
+END XLC_FONTSET
+
+# 
+# 	XLC_XLOCALE category
+# 
+XLC_XLOCALE
+
+encoding_name		ISO8859-1
+mb_cur_max		1
+state_depend_encoding	False
+
+wc_encoding_mask	\x30000000
+wc_shift_bits		7
+
+
+
+
+
+
+use_stdc_env		True
+force_convert_to_mb	True
+
+
+# 	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	wc_encoding	\x00000000
+	ct_encoding	ISO8859-1:GL
+}
+
+
+# 	cs1 class
+cs1	{
+	side		GR:Default
+	length		1
+
+	wc_encoding	\x30000000
+
+
+
+	ct_encoding	ISO8859-1:GR
+}
+
+END XLC_XLOCALE

data/usr/share/X11/locale/iso8859-10/Compose

@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# ISO 8859-10 Compose Sequence
+#
+# Sequence Definition
+#
+#
+# This file currently has no entries.  It appears that a compose file (even
+# just an empty one) is required for the appropriate keysyms to work for
+# this encoding.
+#
+# <Multi_key> Means <Compose>
+# Special Character
+
+# End of Sequence Definition

data/usr/share/X11/locale/iso8859-10/XI18N_OBJS

@@ -0,0 +1,7 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for iso8859-10 locale
+#
+XLC	common/xlcDef	_XlcDefaultLoader	# XLC_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
+XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open

data/usr/share/X11/locale/iso8859-10/XLC_LOCALE

@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  XLocale Database Sample for iso8859-4.
+# 
+
+# 
+# 	XLC_FONTSET category
+# 
+XLC_FONTSET
+# 	fs0 class 
+fs0	{
+	charset	{
+		name		ISO8859-1:GL
+	}
+	font	{
+		primary		ISO8859-10:GL
+		substitute	ISO8859-1:GL
+		vertical_rotate	all
+	}
+}
+# 	fs1 class 
+fs1	{
+	charset	{
+		name		ISO8859-10:GR
+	}
+	font	{
+		primary		ISO8859-10:GR
+	}
+}
+END XLC_FONTSET
+
+# 
+# 	XLC_XLOCALE category
+# 
+XLC_XLOCALE
+
+encoding_name		ISO8859-10
+mb_cur_max		1
+state_depend_encoding	False
+
+wc_encoding_mask	\x30000000
+wc_shift_bits		7
+
+
+
+
+
+
+use_stdc_env		True
+force_convert_to_mb	True
+
+
+# 	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	wc_encoding	\x00000000
+	ct_encoding	ISO8859-10:GL; ISO8859-1:GL
+}
+
+
+# 	cs1 class
+cs1	{
+	side		GR:Default
+	length		1
+
+	wc_encoding	\x30000000
+
+
+
+	ct_encoding	ISO8859-10:GR
+}
+
+END XLC_XLOCALE

data/usr/share/X11/locale/iso8859-11/Compose

@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

data/usr/share/X11/locale/iso8859-11/XI18N_OBJS

@@ -0,0 +1,8 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for iso8859-11 locale
+#
+#
+XLC	common/xlcDef	_XlcDefaultLoader	# XLC_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
+XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open

data/usr/share/X11/locale/iso8859-11/XLC_LOCALE

@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  XLocale Database Sample for iso8859-11.
+# 
+
+# 
+# 	XLC_FONTSET category
+# 
+XLC_FONTSET
+# 	fs0 class 
+fs0	{
+	charset	{
+		name		ISO8859-1:GL
+	}
+	font	{
+		primary		ISO8859-11:GL
+		substitute	ISO8859-1:GL
+		vertical_rotate	all
+	}
+}
+# 	fs1 class 
+fs1	{
+	charset	{
+		name		ISO8859-11:GR
+	}
+	font	{
+		primary		ISO8859-11:GR
+	}
+}
+END XLC_FONTSET
+
+# 
+# 	XLC_XLOCALE category
+# 
+XLC_XLOCALE
+
+encoding_name		ISO8859-11
+mb_cur_max		1
+state_depend_encoding	False
+
+wc_encoding_mask	\x30000000
+wc_shift_bits		7
+
+
+
+
+
+
+use_stdc_env		True
+force_convert_to_mb	True
+
+
+# 	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	wc_encoding	\x00000000
+	ct_encoding	ISO8859-11:GL; ISO8859-1:GL
+}
+
+
+# 	cs1 class
+cs1	{
+	side		GR:Default
+	length		1
+
+	wc_encoding	\x30000000
+
+
+
+	ct_encoding	ISO8859-11:GR
+}
+
+END XLC_XLOCALE

data/usr/share/X11/locale/iso8859-13/Compose

@@ -0,0 +1,469 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# ISO 8859-13 (Latin7) Compose Sequence
+#
+# Sequence Definition
+#
+# <Multi_key> Means <Compose>
+# Special Character
+# Right-hand side (Accented Alphabet)
+# These compose sequences are pure supposition on my part.
+# It would be nice to know what the real cultural conventions
+# are for compose sequences.
+<Multi_key> <plus> <plus>               : "#"   numbersign
+<Multi_key> <apostrophe> <space>        : "'"   apostrophe
+<Multi_key> <space> <apostrophe>        : "'"   apostrophe
+<Multi_key> <A> <T>                     : "@"   at
+<Multi_key> <parenleft> <parenleft>     : "["   bracketleft
+<Multi_key> <slash> <slash>             : "\\"  backslash
+<Multi_key> <slash> <less>              : "\\"  backslash
+<Multi_key> <less> <slash>              : "\\"  backslash
+<Multi_key> <parenright> <parenright>   : "]"   bracketright
+<Multi_key> <asciicircum> <space>       : "^"   asciicircum
+<Multi_key> <space> <asciicircum>       : "^"   asciicircum
+<Multi_key> <greater> <space>           : "^"   asciicircum
+<Multi_key> <space> <greater>           : "^"   asciicircum
+<Multi_key> <grave> <space>             : "`"   grave
+<Multi_key> <space> <grave>             : "`"   grave
+<Multi_key> <less> <apostrophe>         : "`"   grave
+<Multi_key> <apostrophe> <less>         : "`"   grave
+<Multi_key> <parenleft> <minus>         : "{"   braceleft
+<Multi_key> <minus> <parenleft>         : "{"   braceleft
+<Multi_key> <slash> <asciicircum>       : "|"   bar
+<Multi_key> <asciicircum> <slash>       : "|"   bar
+<Multi_key> <parenright> <minus>        : "}"   braceright
+<Multi_key> <minus> <parenright>        : "}"   braceright
+<Multi_key> <asciitilde> <space>        : "~"   asciitilde
+<Multi_key> <space> <asciitilde>        : "~"   asciitilde
+<Multi_key> <minus> <space>             : "~"   asciitilde
+<Multi_key> <space> <minus>             : "~"   asciitilde
+<Multi_key> <greater> <quotedbl>	: "\241"	rightdoublequotemark
+<Multi_key> <quotedbl> <greater>	: "\241"	rightdoublequotemark
+<Multi_key> <greater> <comma>		: "\245"	doublelowquotemark
+<Multi_key> <comma> <greater>		: "\245"	doublelowquotemark
+<Multi_key> <less> <quotedbl>		: "\264"	leftdoublequotemark
+<Multi_key> <quotedbl> <less>		: "\264"	leftdoublequotemark
+<Multi_key> <less> <less>               : "\253"        guillemotleft
+<Multi_key> <greater> <greater>         : "\273"        guillemotright
+<Multi_key> <apostrophe> <apostrophe>	: "\377"	rightsinglequotemark
+<Multi_key> <greater> <apostrophe> 	: "\377"	rightsinglequotemark
+<Multi_key> <apostrophe> <greater>	: "\377"	rightsinglequotemark
+<Multi_key> <c> <slash>                 : "\242"        cent
+<Multi_key> <slash> <c>                 : "\242"        cent
+<Multi_key> <C> <slash>                 : "\242"        cent
+<Multi_key> <slash> <C>                 : "\242"        cent
+<Multi_key> <C> <bar>                   : "\242"        cent
+<Multi_key> <bar> <C>                   : "\242"        cent
+<Multi_key> <c> <bar>                   : "\242"        cent
+<Multi_key> <bar> <c>                   : "\242"        cent
+<Multi_key> <l> <equal>                 : "\243"        sterling
+<Multi_key> <equal> <l>                 : "\243"        sterling
+<Multi_key> <L> <equal>                 : "\243"        sterling
+<Multi_key> <equal> <L>                 : "\243"        sterling
+<Multi_key> <c> <o>                     : "\251"        copyright
+<Multi_key> <o> <c>                     : "\251"        copyright
+<Multi_key> <C> <O>                     : "\251"        copyright
+<Multi_key> <O> <C>                     : "\251"        copyright
+<Multi_key> <c> <O>                     : "\251"        copyright
+<Multi_key> <O> <c>                     : "\251"        copyright
+<Multi_key> <C> <o>                     : "\251"        copyright
+<Multi_key> <o> <C>                     : "\251"        copyright
+<Multi_key> <c> <0>                     : "\251"        copyright
+<Multi_key> <0> <c>                     : "\251"        copyright
+<Multi_key> <C> <0>                     : "\251"        copyright
+<Multi_key> <0> <C>                     : "\251"        copyright
+<Multi_key> <parenleft> <c>             : "\251"        copyright
+<Multi_key> <s> <o>                     : "\247"        section
+<Multi_key> <o> <s>                     : "\247"        section
+<Multi_key> <S> <O>                     : "\247"        section
+<Multi_key> <O> <S>                     : "\247"        section
+<Multi_key> <S> <exclam>                : "\247"        section
+<Multi_key> <exclam> <S>                : "\247"        section
+<Multi_key> <s> <exclam>                : "\247"        section
+<Multi_key> <exclam> <s>                : "\247"        section
+<Multi_key> <S> <0>                     : "\247"        section
+<Multi_key> <0> <S>                     : "\247"        section
+<Multi_key> <s> <0>                     : "\247"        section
+<Multi_key> <0> <s>                     : "\247"        section
+<Multi_key> <x> <o>                     : "\244"        currency
+<Multi_key> <o> <x>                     : "\244"        currency
+<Multi_key> <X> <O>                     : "\244"        currency
+<Multi_key> <O> <X>                     : "\244"        currency
+<Multi_key> <x> <O>                     : "\244"        currency
+<Multi_key> <O> <x>                     : "\244"        currency
+<Multi_key> <X> <o>                     : "\244"        currency
+<Multi_key> <o> <X>                     : "\244"        currency
+<Multi_key> <x> <0>                     : "\244"        currency
+<Multi_key> <0> <x>                     : "\244"        currency
+<Multi_key> <X> <0>                     : "\244"        currency
+<Multi_key> <0> <X>                     : "\244"        currency
+<Multi_key> <0> <asciicircum>           : "\260"        degree
+<Multi_key> <asciicircum> <0>           : "\260"        degree
+<Multi_key> <0> <asterisk>              : "\260"        degree
+<Multi_key> <asterisk> <0>              : "\260"        degree
+<Multi_key> <plus> <minus>              : "\261"        plusminus
+<Multi_key> <minus> <plus>              : "\261"        plusminus
+<Multi_key> <m> <u> 	                : "\265"        mu
+<Multi_key> <slash> <u>                 : "\265"        mu
+<Multi_key> <u> <slash>                 : "\265"        mu
+<Multi_key> <slash> <U>                 : "\265"        mu
+<Multi_key> <U> <slash>                 : "\265"        mu
+<Multi_key> <1> <asciicircum>           : "\271"        onesuperior
+<Multi_key> <asciicircum> <1>           : "\271"        onesuperior
+<Multi_key> <S> <1>                     : "\271"        onesuperior
+<Multi_key> <1> <S>                     : "\271"        onesuperior
+<Multi_key> <s> <1>                     : "\271"        onesuperior
+<Multi_key> <1> <s>                     : "\271"        onesuperior
+<Multi_key> <2> <asciicircum>           : "\262"        twosuperior
+<Multi_key> <asciicircum> <2>           : "\262"        twosuperior
+<Multi_key> <S> <2>                     : "\262"        twosuperior
+<Multi_key> <2> <S>                     : "\262"        twosuperior
+<Multi_key> <s> <2>                     : "\262"        twosuperior
+<Multi_key> <2> <s>                     : "\262"        twosuperior
+<Multi_key> <3> <asciicircum>           : "\263"        threesuperior
+<Multi_key> <asciicircum> <3>           : "\263"        threesuperior
+<Multi_key> <S> <3>                     : "\263"        threesuperior
+<Multi_key> <3> <S>                     : "\263"        threesuperior
+<Multi_key> <s> <3>                     : "\263"        threesuperior
+<Multi_key> <3> <s>                     : "\263"        threesuperior
+<Multi_key> <p> <exclam>                : "\266"        paragraph
+<Multi_key> <exclam> <p>                : "\266"        paragraph
+<Multi_key> <P> <exclam>                : "\266"        paragraph
+<Multi_key> <exclam> <P>                : "\266"        paragraph
+<Multi_key> <period> <asciicircum>      : "\267"        periodcentered
+<Multi_key> <asciicircum> <period>      : "\267"        periodcentered
+<Multi_key> <period> <period>           : "\267"        periodcentered
+<Multi_key> <1> <4>                     : "\274"        onequarter
+<Multi_key> <1> <2>                     : "\275"        onehalf
+<Multi_key> <3> <4>                     : "\276"        threequarters
+<Multi_key> <question> <question>       : "\277"        questiondown
+<Multi_key> <space> <space>             : "\240"        nobreakspace
+<Multi_key> <bar> <bar>                 : "\246"        brokenbar
+<Multi_key> <exclam> <asciicircum>      : "\246"        brokenbar
+<Multi_key> <asciicircum> <exclam>      : "\246"        brokenbar
+<Multi_key> <V> <B>                     : "\246"        brokenbar
+<Multi_key> <B> <V>                     : "\246"        brokenbar
+<Multi_key> <v> <b>                     : "\246"        brokenbar
+<Multi_key> <b> <v>                     : "\246"        brokenbar
+<Multi_key> <minus> <comma>             : "\254"        notsign
+<Multi_key> <comma> <minus>             : "\254"        notsign
+<Multi_key> <minus> <minus>             : "\255"        hyphen
+<Multi_key> <R> <O>                     : "\256"        registered
+<Multi_key> <O> <R>                     : "\256"        registered
+<Multi_key> <parenleft> <r>             : "\256"        registered
+<Multi_key> <minus> <colon>             : "\367"        division
+<Multi_key> <colon> <minus>             : "\367"        division
+<Multi_key> <x> <x>                     : "\327"        multiply
+# Accented Alphabet
+<Multi_key> <A> <semicolon>		: "\300"	Aogonek
+<Multi_key> <semicolon> <A>		: "\300"	Aogonek
+<Multi_key> <A> <comma>			: "\300"	Aogonek
+<Multi_key> <comma> <A>			: "\300"	Aogonek
+<Multi_key> <R> <comma>			: "\252"	Rcedilla
+<Multi_key> <R> <cedilla>		: "\252"	Rcedilla
+<Multi_key> <comma> <R>			: "\252"	Rcedilla
+<Multi_key> <cedilla> <R>		: "\252"	Rcedilla
+<Multi_key> <L> <comma>			: "\317"	Lcedilla
+<Multi_key> <L> <cedilla>		: "\317"	Lcedilla
+<Multi_key> <comma> <L>			: "\317"	Lcedilla
+<Multi_key> <cedilla> <L>		: "\317"	Lcedilla
+<Multi_key> <S> <less>			: "\320"	Scaron
+<Multi_key> <less> <S>			: "\320"	Scaron
+<Multi_key> <E> <minus>			: "\307"	Emacron
+<Multi_key> <minus> <E>			: "\307"	Emacron
+<Multi_key> <E> <underscore>		: "\307"	Emacron
+<Multi_key> <underscore> <E>		: "\307"	Emacron
+<Multi_key> <G> <comma>			: "\314"	Gcedilla
+<Multi_key> <G> <cedilla>		: "\314"	Gcedilla
+<Multi_key> <comma> <G>			: "\314"	Gcedilla
+<Multi_key> <cedilla> <G>		: "\314"	Gcedilla
+<Multi_key> <Z> <less>			: "\336"	Zcaron
+<Multi_key> <less> <Z>			: "\336"	Zcaron
+<Multi_key> <a> <semicolon>		: "\340"	aogonek
+<Multi_key> <semicolon> <a>		: "\340"	aogonek
+<Multi_key> <a> <comma>			: "\340"	aogonek
+<Multi_key> <comma> <a>			: "\340"	aogonek
+<Multi_key> <r> <comma>			: "\272"	rcedilla
+<Multi_key> <r> <cedilla>		: "\272"	rcedilla
+<Multi_key> <comma> <r>			: "\272"	rcedilla
+<Multi_key> <cedilla> <r>		: "\272"	rcedilla
+<Multi_key> <l> <comma>			: "\357"	lcedilla
+<Multi_key> <l> <cedilla>		: "\357"	lcedilla
+<Multi_key> <comma> <l>			: "\357"	lcedilla
+<Multi_key> <cedilla> <l>		: "\357"	lcedilla
+<Multi_key> <s> <less>			: "\360"	scaron
+<Multi_key> <less> <s>			: "\360"	scaron
+<Multi_key> <e> <minus>			: "\347"	emacron
+<Multi_key> <minus> <e>			: "\347"	emacron
+<Multi_key> <e> <underscore>		: "\347"	emacron
+<Multi_key> <underscore> <e>		: "\347"	emacron
+<Multi_key> <g> <comma>			: "\354"	gcedilla
+<Multi_key> <g> <cedilla>		: "\354"	gcedilla
+<Multi_key> <comma> <g>			: "\354"	gcedilla
+<Multi_key> <cedilla> <g>		: "\354"	gcedilla
+<Multi_key> <z> <less>			: "\376"	zcaron
+<Multi_key> <less> <z>			: "\376"	zcaron
+<Multi_key> <A> <underscore>		: "\302"	Amacron
+<Multi_key> <underscore> <A>		: "\302"	Amacron
+<Multi_key> <A> <minus>			: "\302"	Amacron
+<Multi_key> <minus> <A>			: "\302"	Amacron
+<Multi_key> <A> <quotedbl>		: "\304"	Adiaeresis
+<Multi_key> <quotedbl> <A>		: "\304"	Adiaeresis
+<Multi_key> <A> <asterisk>		: "\305"	Aring
+<Multi_key> <asterisk> <A>		: "\305"	Aring
+<Multi_key> <A> <A>			: "\305"	Aring
+<Multi_key> <A> <O>			: "\305"	Aring
+<Multi_key> <A> <E>			: "\257"	AE
+<Multi_key> <I> <semicolon>		: "\301"	Iogonek
+<Multi_key> <semicolon> <I>		: "\301"	Iogonek
+<Multi_key> <I> <comma>			: "\301"	Iogonek
+<Multi_key> <comma> <I>			: "\301"	Iogonek
+<Multi_key> <C> <less>			: "\310"	Ccaron
+<Multi_key> <less> <C>			: "\310"	Ccaron
+<Multi_key> <E> <acute>			: "\311"	Eacute
+<Multi_key> <acute> <E>			: "\311"	Eacute
+<Multi_key> <E> <apostrophe>		: "\311"	Eacute
+<Multi_key> <apostrophe> <E>		: "\311"	Eacute
+<Multi_key> <E> <semicolon>		: "\306"	Eogonek
+<Multi_key> <semicolon> <E>		: "\306"	Eogonek
+<Multi_key> <E> <comma>			: "\306"	Eogonek
+<Multi_key> <comma> <E>			: "\306"	Eogonek
+<Multi_key> <E> <period>		: "\313"	Eabovedot
+<Multi_key> <period> <E>		: "\313"	Eabovedot
+<Multi_key> <I> <minus>			: "\316"	Imacron
+<Multi_key> <minus> <I>			: "\316"	Imacron
+<Multi_key> <I> <underscore>		: "\316"	Imacron
+<Multi_key> <underscore> <I>		: "\316"	Imacron
+<Multi_key> <N> <comma>			: "\322"	Ncedilla
+<Multi_key> <N> <cedilla>		: "\322"	Ncedilla
+<Multi_key> <comma> <N>			: "\322"	Ncedilla
+<Multi_key> <cedilla> <N>		: "\322"	Ncedilla
+<Multi_key> <O> <underscore>		: "\324"	Omacron
+<Multi_key> <underscore> <O>		: "\324"	Omacron
+<Multi_key> <O> <minus>			: "\324"	Omacron
+<Multi_key> <minus> <O>			: "\324"	Omacron
+<Multi_key> <K> <comma>			: "\315"	Kcedilla
+<Multi_key> <K> <cedilla>		: "\315"	Kcedilla
+<Multi_key> <comma> <K>			: "\315"	Kcedilla
+<Multi_key> <cedilla> <K>		: "\315"	Kcedilla
+<Multi_key> <O> <asciitilde>		: "\325"	Otilde
+<Multi_key> <asciitilde> <O>		: "\325"	Otilde
+<Multi_key> <O> <quotedbl>		: "\326"	Odiaeresis
+<Multi_key> <quotedbl> <O>		: "\326"	Odiaeresis
+<Multi_key> <O> <slash>			: "\250"	Ooblique
+<Multi_key> <slash> <O>			: "\250"	Ooblique
+<Multi_key> <U> <semicolon>		: "\330"	Uogonek
+<Multi_key> <semicolon> <U>		: "\330"	Uogonek
+<Multi_key> <U> <comma>			: "\330"	Uogonek
+<Multi_key> <comma> <U>			: "\330"	Uogonek
+<Multi_key> <U> <quotedbl>		: "\334"	Udiaeresis
+<Multi_key> <quotedbl> <U>		: "\334"	Udiaeresis
+<Multi_key> <U> <underscore>		: "\333"	Umacron
+<Multi_key> <underscore> <U>		: "\333"	Umacron
+<Multi_key> <U> <minus>			: "\333"	Umacron
+<Multi_key> <minus> <U>			: "\333"	Umacron
+<Multi_key> <s> <s>			: "\337"	ssharp
+<Multi_key> <a> <underscore>		: "\342"	amacron
+<Multi_key> <underscore> <a>		: "\342"	amacron
+<Multi_key> <a> <minus>			: "\342"	amacron
+<Multi_key> <minus> <a>			: "\342"	amacron
+<Multi_key> <a> <quotedbl>		: "\344"	adiaeresis
+<Multi_key> <quotedbl> <a>		: "\344"	adiaeresis
+<Multi_key> <a> <asterisk>		: "\345"	aring
+<Multi_key> <asterisk> <a>		: "\345"	aring
+<Multi_key> <a> <a>			: "\345"	aring
+<Multi_key> <a> <o>			: "\345"	aring
+<Multi_key> <a> <e>			: "\277"	ae
+<Multi_key> <i> <semicolon>		: "\341"	iogonek
+<Multi_key> <semicolon> <i>		: "\341"	iogonek
+<Multi_key> <i> <comma>			: "\341"	iogonek
+<Multi_key> <comma> <i>			: "\341"	iogonek
+<Multi_key> <c> <less>			: "\350"	ccaron
+<Multi_key> <less> <c>			: "\350"	ccaron
+<Multi_key> <e> <acute>			: "\351"	eacute
+<Multi_key> <acute> <e>			: "\351"	eacute
+<Multi_key> <e> <apostrophe>		: "\351"	eacute
+<Multi_key> <apostrophe> <e>		: "\351"	eacute
+<Multi_key> <e> <semicolon>		: "\346"	eogonek
+<Multi_key> <semicolon> <e>		: "\346"	eogonek
+<Multi_key> <e> <comma>			: "\346"	eogonek
+<Multi_key> <comma> <e>			: "\346"	eogonek
+<Multi_key> <e> <period>		: "\353"	eabovedot
+<Multi_key> <period> <e>		: "\353"	eabovedot
+<Multi_key> <i> <minus>			: "\356"	imacron
+<Multi_key> <minus> <i>			: "\356"	imacron
+<Multi_key> <i> <underscore>		: "\356"	imacron
+<Multi_key> <underscore> <i>		: "\356"	imacron
+<Multi_key> <n> <comma>			: "\362"	ncedilla
+<Multi_key> <n> <cedilla>		: "\362"	ncedilla
+<Multi_key> <comma> <n>			: "\362"	ncedilla
+<Multi_key> <cedilla> <n>		: "\362"	ncedilla
+<Multi_key> <o> <underscore>		: "\364"	omacron
+<Multi_key> <underscore> <o>		: "\364"	omacron
+<Multi_key> <o> <minus>			: "\364"	omacron
+<Multi_key> <minus> <o>			: "\364"	omacron
+<Multi_key> <k> <comma>			: "\355"	kcedilla
+<Multi_key> <k> <cedilla>		: "\355"	kcedilla
+<Multi_key> <comma> <k>			: "\355"	kcedilla
+<Multi_key> <cedilla> <k>		: "\355"	kcedilla
+<Multi_key> <o> <asciitilde>		: "\365"	otilde
+<Multi_key> <asciitilde> <o>		: "\365"	otilde
+<Multi_key> <o> <quotedbl>		: "\366"	odiaeresis
+<Multi_key> <quotedbl> <o>		: "\366"	odiaeresis
+<Multi_key> <o> <slash>			: "\270"	ooblique
+<Multi_key> <slash> <o>			: "\270"	ooblique
+<Multi_key> <u> <semicolon>		: "\370"	uogonek
+<Multi_key> <semicolon> <u>		: "\370"	uogonek
+<Multi_key> <u> <comma>			: "\370"	uogonek
+<Multi_key> <comma> <u>			: "\370"	uogonek
+<Multi_key> <u> <quotedbl>		: "\374"	udiaeresis
+<Multi_key> <quotedbl> <u>		: "\374"	udiaeresis
+<Multi_key> <u> <underscore>		: "\373"	umacron
+<Multi_key> <underscore> <u>		: "\373"	umacron
+<Multi_key> <u> <minus>			: "\373"	umacron
+<Multi_key> <minus> <u>			: "\373"	umacron
+<Multi_key> <C> <apostrophe>		: "\303"	Cacute
+<Multi_key> <apostrophe> <C>		: "\303"	Cacute
+<Multi_key> <c> <apostrophe>		: "\343"	cacute
+<Multi_key> <apostrophe> <c>		: "\343"	cacute
+<Multi_key> <O> <apostrophe>		: "\323"	Oacute
+<Multi_key> <apostrophe> <O>		: "\323"	Oacute
+<Multi_key> <o> <apostrophe>		: "\363"	oacute
+<Multi_key> <apostrophe> <o>		: "\363"	oacute
+<Multi_key> <Z> <apostrophe>		: "\312"	Zacute
+<Multi_key> <apostrophe> <Z>		: "\312"	Zacute
+<Multi_key> <z> <apostrophe>		: "\352"	zacute
+<Multi_key> <apostrophe> <z>		: "\352"	zacute
+<Multi_key> <N> <apostrophe>		: "\321"	Nacute
+<Multi_key> <apostrophe> <N>		: "\321"	Nacute
+<Multi_key> <n> <apostrophe>		: "\361"	nacute
+<Multi_key> <apostrophe> <n>		: "\361"	nacute
+<Multi_key> <L> <minus>			: "\331"	Lstroke
+<Multi_key> <minus> <L>			: "\331"	Lstroke
+<Multi_key> <L> <slash>			: "\331"	Lstroke
+<Multi_key> <slash> <L>			: "\331"	Lstroke
+<Multi_key> <l> <minus>			: "\371"	lstroke
+<Multi_key> <minus> <l>			: "\371"	lstroke
+<Multi_key> <l> <slash>			: "\371"	lstroke
+<Multi_key> <slash> <l>			: "\371"	lstroke
+<Multi_key> <S> <apostrophe>		: "\332"	Sacute
+<Multi_key> <apostrophe> <S>		: "\332"	Sacute
+<Multi_key> <s> <apostrophe>		: "\372"	sacute
+<Multi_key> <apostrophe> <s>		: "\372"	sacute
+<Multi_key> <Z> <period>		: "\335"	Zabovedot
+<Multi_key> <period> <Z>		: "\335"	Zabovedot
+<Multi_key> <z> <period>		: "\375"	zabovedot
+<Multi_key> <period> <z>		: "\375"	zabovedot
+
+<dead_abovedot> <A>			: "\305"	Aring
+<dead_abovedot> <a>			: "\345"	aring
+<dead_abovedot> <E> 			: "\313"	Eabovedot
+<dead_abovedot> <e>			: "\353"	eabovedot
+<dead_abovedot> <Z>			: "\335"	Zabovedot
+<dead_abovedot> <z>			: "\375"	zabovedot
+<dead_abovedot> <dead_abovedot>		: "\267"	abovedot
+<dead_abovering> <A>			: "\305"	Aring
+<dead_abovering> <a>			: "\345"	aring
+<dead_abovering> <E> 			: "\313"	Eabovedot
+<dead_abovering> <e>			: "\353"	eabovedot
+<dead_abovering> <Z>			: "\335"	Zabovedot
+<dead_abovering> <z>			: "\375"	zabovedot
+<dead_abovering> <ring>			: "\260"	ring
+<dead_abovering> <dead_abovering>	: "\260"	ring
+<dead_acute> <dead_acute>		: "\377"	rightsinglequotemark
+<dead_acute> <C>			: "\303"	Cacute
+<dead_acute> <E>			: "\311"	Eacute
+<dead_acute> <Z>			: "\312"	Zacute
+<dead_acute> <N>			: "\321"	Nacute
+<dead_acute> <O>			: "\323"	Oacute
+<dead_acute> <S>			: "\332"	Sacute
+<dead_acute> <c>			: "\343"	cacute
+<dead_acute> <e>			: "\351"	eacute
+<dead_acute> <z>			: "\352"	zacute
+<dead_acute> <n>			: "\361"	nacute
+<dead_acute> <o>			: "\363"	oacute
+<dead_acute> <s>			: "\372"	sacute
+<dead_caron> <C>			: "\310"	Ccaron
+<dead_caron> <S>			: "\320"	Scaron
+<dead_caron> <Z>			: "\336"	Zcaron
+<dead_caron> <c>			: "\350"	ccaron
+<dead_caron> <s>			: "\360"	scaron
+<dead_caron> <z>			: "\376"	zcaron
+<dead_cedilla> <R>			: "\252"	Rcedilla
+<dead_cedilla> <G>			: "\314"	Gcedilla
+<dead_cedilla> <K>			: "\315"	Kcedilla
+<dead_cedilla> <L>			: "\317"	Lcedilla
+<dead_cedilla> <N>			: "\322"	Ncedilla
+<dead_cedilla> <r>			: "\272"	rcedilla
+<dead_cedilla> <g>			: "\354"	gcedilla
+<dead_cedilla> <k>			: "\355"	kcedilla
+<dead_cedilla> <l>			: "\357"	lcedilla
+<dead_cedilla> <n>			: "\362"	ncedilla
+<dead_diaeresis> <A>			: "\304"	Adiaeresis
+<dead_diaeresis> <O>			: "\326"	Odiaeresis
+<dead_diaeresis> <U>			: "\334"	Udiaeresis
+<dead_diaeresis> <a>			: "\344"	adiaeresis
+<dead_diaeresis> <o>			: "\366"	odiaeresis
+<dead_diaeresis> <u>			: "\374"	udiaeresis
+<dead_macron> <A>			: "\302"	Amacron
+<dead_macron> <E>			: "\307"	Emacron
+<dead_macron> <I>			: "\316"	Imacron
+<dead_macron> <O>			: "\324"	Omacron
+<dead_macron> <U>			: "\333"	Umacron
+<dead_macron> <a>			: "\342"	amacron
+<dead_macron> <e>			: "\347"	emacron
+<dead_macron> <i>			: "\356"	imacron
+<dead_macron> <o>			: "\364"	omacron
+<dead_macron> <u>			: "\373"	umacron
+<dead_macron> <macron>			: "\255"	macron
+<dead_macron> <dead_macron>		: "\255"	macron
+<dead_ogonek> <A>			: "\300"	Aogonek
+<dead_ogonek> <I>			: "\301"	Iogonek
+<dead_ogonek> <E>			: "\306"	Eogonek
+<dead_ogonek> <U>			: "\330"	Uogonek
+<dead_ogonek> <a>			: "\340"	aogonek
+<dead_ogonek> <i>			: "\341"	iogonek
+<dead_ogonek> <e>			: "\346"	eogonek
+<dead_ogonek> <u>			: "\370"	uogonek
+<dead_tilde> <O>			: "\325"	Otilde
+<dead_tilde> <o>			: "\365"	otilde
+<dead_tilde> <asciitilde>		: "~"		asciitilde
+<dead_tilde> <dead_tilde>		: "~"		asciitilde
+
+# End of Sequence Definition

data/usr/share/X11/locale/iso8859-13/XI18N_OBJS

@@ -0,0 +1,8 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for euro locales
+#
+XLC	common/xlibi18n	_XlcGenericLoader	# XLC_open
+XIM	common/xiiimp	_XimpLocalOpenIM	# XIM_open
+XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open
+

data/usr/share/X11/locale/iso8859-13/XLC_LOCALE

@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  XLocale Database Sample for iso8859-13.
+# 
+
+# 
+# 	XLC_FONTSET category
+# 
+XLC_FONTSET
+# 	fs0 class 
+fs0	{
+	charset	{
+		name		ISO8859-1:GL
+	}
+	font	{
+		primary		ISO8859-13:GL
+		substitute	ISO8859-1:GL
+		vertical_rotate	all
+	}
+}
+# 	fs1 class 
+fs1	{
+	charset	{
+		name		ISO8859-13:GR
+	}
+	font	{
+		primary		ISO8859-13:GR
+	}
+}
+END XLC_FONTSET
+
+# 
+# 	XLC_XLOCALE category
+# 
+XLC_XLOCALE
+
+encoding_name		ISO8859-13
+mb_cur_max		1
+state_depend_encoding	False
+
+wc_encoding_mask	\x30000000
+wc_shift_bits		7
+
+
+
+
+
+
+use_stdc_env		True
+force_convert_to_mb	True
+
+
+# 	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	wc_encoding	\x00000000
+	ct_encoding	ISO8859-13:GL; ISO8859-1:GL
+}
+
+
+# 	cs1 class
+cs1	{
+	side		GR:Default
+	length		1
+
+	wc_encoding	\x30000000
+
+
+
+	ct_encoding	ISO8859-13:GR
+}
+
+END XLC_XLOCALE