libx11: Changes to 'upstream-experimental'
configure.ac | 20
man/XAddHost.man | 14
man/XAllocSizeHints.man | 32
man/XAllocStandardColormap.man | 4
man/XAllocWMHints.man | 29
man/XAnyEvent.man | 8
man/XButtonEvent.man | 78
man/XChangeKeyboardControl.man | 12
man/XChangeKeyboardMapping.man | 4
man/XCirculateEvent.man | 10
man/XCirculateRequestEvent.man | 10
man/XClientMessageEvent.man | 8
man/XColormapEvent.man | 12
man/XConfigureEvent.man | 8
man/XConfigureRequestEvent.man | 10
man/XConfigureWindow.man | 4
man/XCreateColormap.man | 6
man/XCreateGC.man | 44
man/XCreateWindow.man | 34
man/XCreateWindowEvent.man | 20
man/XCrossingEvent.man | 30
man/XDestroyWindowEvent.man | 8
man/XDrawArc.man | 25
man/XDrawText.man | 16
man/XErrorEvent.man | 12
man/XExposeEvent.man | 10
man/XFocusChangeEvent.man | 14
man/XFontSetExtents.man | 4
man/XGetVisualInfo.man | 4
man/XGetWindowAttributes.man | 42
man/XGraphicsExposeEvent.man | 26
man/XGravityEvent.man | 8
man/XIfEvent.man | 2
man/XKeymapEvent.man | 10
man/XLoadFont.man | 93
man/XMapEvent.man | 26
man/XMapRequestEvent.man | 8
man/XOpenIM.man | 2
man/XPropertyEvent.man | 10
man/XQueryColor.man | 10
man/XQueryExtension.man | 3
man/XReparentEvent.man | 8
man/XResizeRequestEvent.man | 8
man/XSelectionClearEvent.man | 8
man/XSelectionEvent.man | 10
man/XSelectionRequestEvent.man | 8
man/XSetScreenSaver.man | 2
man/XStringListToTextProperty.man | 8
man/XUnmapEvent.man | 8
man/XVisibilityEvent.man | 8
man/XcmsCIELabQueryMaxC.man | 2
man/XcmsCIELuvQueryMaxC.man | 2
man/XcmsColor.man | 132
man/XmbDrawText.man | 16
man/XmbTextListToTextProperty.man | 18
man/XrmGetFileDatabase.man | 17
man/XrmInitialize.man | 24
man/XrmUniqueQuark.man | 16
man/xkb/XkbGetKeyVirtualModMap.man | 2
modules/im/ximcp/imDefIc.c | 4
modules/im/ximcp/imDefLkup.c | 9
modules/im/ximcp/imTrX.c | 2
nls/Makefile.am | 1
nls/am_ET.UTF-8/.gitignore | 4
nls/am_ET.UTF-8/Compose.pre | 341 ++
nls/am_ET.UTF-8/Makefile.am | 3
nls/compose.dir.pre | 9
nls/el_GR.UTF-8/Compose.pre | 437 +++
nls/en_US.UTF-8/Compose.pre | 4938 ++++++++++++++++++++-----------------
nls/iso8859-15/Compose.pre | 4
nls/iso8859-3/Compose.pre | 4
nls/iso8859-9/Compose.pre | 4
nls/iso8859-9e/Compose.pre | 4
nls/locale.alias.pre | 30
nls/locale.dir.pre | 13
nls/pt_BR.UTF-8/Compose.pre | 400 +-
src/ConnDis.c | 12
src/CrCmap.c | 2
src/FreeCmap.c | 3
src/GetColor.c | 2
src/LookupCol.c | 2
src/Makefile.am | 13
src/ParseCol.c | 2
src/SetLocale.c | 4
src/SetStCmap.c | 3
src/StNColor.c | 2
src/WMProps.c | 1
src/XErrorDB | 26
src/XKeysymDB | 5
src/Xrm.c | 2
src/xcb_disp.c | 21
src/xcb_io.c | 8
src/xkb/XKBBind.c | 2
src/xlibi18n/XimintP.h | 8
src/xlibi18n/XlcPubI.h | 2
95 files changed, 4461 insertions(+), 2893 deletions(-)
New commits:
commit 5e98aed13e529638df744e45893c471d5f2014fb
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 6 16:10:33 2008 -0500
libX11 1.1.4
diff --git a/configure.ac b/configure.ac
index 7ab9b7f..1567a56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([libX11],
- 1.1.3,
+ 1.1.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libX11)
AC_CONFIG_SRCDIR([Makefile.am])
commit 8e085971dc661da9f80ff6b67747459c0fb15c08
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Feb 28 20:17:41 2008 -0800
Man page typo fixes
diff --git a/man/XOpenIM.man b/man/XOpenIM.man
index b89b0ff..56171bb 100644
--- a/man/XOpenIM.man
+++ b/man/XOpenIM.man
@@ -142,7 +142,7 @@
.ny0
.TH XOpenIM __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
-XOpenIM, XCloseIM, XSetIMValues, XGetIMValues, XDisplayOfIM, XLocaleOfIM, XRegisterIMInstantiateCallback, XUnregisterIMInstantiateCallback \- open, close, and otain input method information
+XOpenIM, XCloseIM, XSetIMValues, XGetIMValues, XDisplayOfIM, XLocaleOfIM, XRegisterIMInstantiateCallback, XUnregisterIMInstantiateCallback \- open, close, and obtain input method information
.SH SYNTAX
.HP
XIM XOpenIM\^(\^Display *\fIdisplay\fP\^, XrmDatabase \fIdb\fP\^, char
diff --git a/man/XcmsCIELabQueryMaxC.man b/man/XcmsCIELabQueryMaxC.man
index ef0c3ee..58484b4 100644
--- a/man/XcmsCIELabQueryMaxC.man
+++ b/man/XcmsCIELabQueryMaxC.man
@@ -164,7 +164,7 @@ are ignored.
.ds Ch maximum lightness (MaxL) or minimum lightness (MinL)
.IP \fIchroma\fP 1i
Specifies the chroma at which to find \*(Ch.
-.ds Lc maximum chroma (MaxC and MaxLC), maximum lightnes (MaxL), \
+.ds Lc maximum chroma (MaxC and MaxLC), maximum lightness (MaxL), \
or minimum lightness (MinL)
.ds lC hue angle and lightness (MaxC), hue angle and chroma (MaxL and MinL), \
or hue angle (MaxLC)
diff --git a/man/XcmsCIELuvQueryMaxC.man b/man/XcmsCIELuvQueryMaxC.man
index 01f9f49..af469c5 100644
--- a/man/XcmsCIELuvQueryMaxC.man
+++ b/man/XcmsCIELuvQueryMaxC.man
@@ -164,7 +164,7 @@ are ignored.
.ds Ch maximum lightness (MaxL) or minimum lightness (MinL)
.IP \fIchroma\fP 1i
Specifies the chroma at which to find \*(Ch.
-.ds Lc maximum chroma (MaxC and MaxLC), maximum lightnes (MaxL), \
+.ds Lc maximum chroma (MaxC and MaxLC), maximum lightness (MaxL), \
or minimum lightness (MinL)
.ds lC hue angle and lightness (MaxC), hue angle and chroma (MaxL and MinL), \
or hue angle (MaxLC)
diff --git a/man/XcmsColor.man b/man/XcmsColor.man
index fa845dd..c039cbf 100644
--- a/man/XcmsColor.man
+++ b/man/XcmsColor.man
@@ -152,7 +152,7 @@
..
.TH XcmsColor __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
-XcmsColor, XcmsRGB, XcmsRGBi, XcmsCIEXYZ, XcmsCIEuvY, XcmsCIExyY, XcmsCIELab, XcmsCIELuv, XcmsTekHVC, XcmsPad \- Xcms color struture
+XcmsColor, XcmsRGB, XcmsRGBi, XcmsCIEXYZ, XcmsCIEuvY, XcmsCIExyY, XcmsCIELab, XcmsCIELuv, XcmsTekHVC, XcmsPad \- Xcms color structure
.SH STRUCTURES
The structure for
.ZN XcmsColor
commit 1a1a42a3ca1dfaf42f1094936b71c140fc030fcb
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Sun Feb 24 20:03:35 2008 -0500
XIM: Fix a hand when switching input context.
Red Hat bug #201284.
diff --git a/modules/im/ximcp/imDefIc.c b/modules/im/ximcp/imDefIc.c
index cb30ac2..c04744b 100644
--- a/modules/im/ximcp/imDefIc.c
+++ b/modules/im/ximcp/imDefIc.c
@@ -949,6 +949,8 @@ _XimProtoSetFocus(
(void)_XimWrite(im, len, (XPointer)buf);
_XimFlush(im);
+ MARK_FOCUSED(ic);
+
_XimRegisterFilter(ic);
return;
}
@@ -994,6 +996,8 @@ _XimProtoUnsetFocus(
(void)_XimWrite(im, len, (XPointer)buf);
_XimFlush(im);
+ UNMARK_FOCUSED(ic);
+
_XimUnregisterFilter(ic);
return;
}
diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c
index 157b076..66e4add 100644
--- a/modules/im/ximcp/imDefLkup.c
+++ b/modules/im/ximcp/imDefLkup.c
@@ -216,8 +216,13 @@ _XimRespSyncReply(
Xic ic,
BITMASK16 mode)
{
- if (mode & XimSYNCHRONUS) /* SYNC Request */
- MARK_NEED_SYNC_REPLY(ic);
+ if (mode & XimSYNCHRONUS) /* SYNC Request */ {
+ if (IS_FOCUSED(ic))
+ MARK_NEED_SYNC_REPLY(ic);
+ else
+ _XimProcSyncReply(ic->core.im, ic);
+ }
+
return True;
}
diff --git a/src/xlibi18n/XimintP.h b/src/xlibi18n/XimintP.h
index f10d9ba..d36abdc 100644
--- a/src/xlibi18n/XimintP.h
+++ b/src/xlibi18n/XimintP.h
@@ -244,6 +244,7 @@ typedef struct _XicProtoPrivateRec {
#define IC_CONNECTED (1L)
#define FABLICATED (1L << 1)
#define NEED_SYNC_REPLY (1L << 2)
+#define FOCUSED (1L << 3)
/*
* macro for the flag of XICPrivateRec
@@ -269,6 +270,13 @@ typedef struct _XicProtoPrivateRec {
#define UNMARK_NEED_SYNC_REPLY(ic) \
(((Xic)ic)->private.proto.flag &= ~NEED_SYNC_REPLY)
+#define IS_FOCUSED(ic) \
+ (((Xic)ic)->private.proto.flag & FOCUSED)
+#define MARK_FOCUSED(ic) \
+ (((Xic)ic)->private.proto.flag |= FOCUSED)
+#define UNMARK_FOCUSED(ic) \
+ (((Xic)ic)->private.proto.flag &= ~FOCUSED)
+
/*
* macro for the filter_event_mask of XICPrivateRec
*/
commit e02e4ccafcaf3eb8993152dfcbfbee0240ea2db2
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Feb 24 20:00:43 2008 -0500
Bug #14029: Don't LockDisplay() recursively.
See also Red Hat bugzilla #326461.
diff --git a/src/xkb/XKBBind.c b/src/xkb/XKBBind.c
index e190d00..4dc9265 100644
--- a/src/xkb/XKBBind.c
+++ b/src/xkb/XKBBind.c
@@ -368,7 +368,6 @@ XkbRefreshKeyboardMapping(register XkbMapNotifyEvent *event)
changes= xkbi->changes;
else bzero(&changes,sizeof(changes));
XkbNoteMapChanges(&changes,event,XKB_XLIB_MAP_MASK);
- LockDisplay(dpy);
if ((rtrn=XkbGetMapChanges(dpy,xkbi->desc,&changes))!=Success) {
#ifdef DEBUG
fprintf(stderr,"Internal Error! XkbGetMapChanges failed:\n");
@@ -379,7 +378,6 @@ XkbRefreshKeyboardMapping(register XkbMapNotifyEvent *event)
xkbi->flags&= ~XkbMapPending;
bzero(&xkbi->changes,sizeof(XkbMapChangesRec));
}
- UnlockDisplay(dpy);
return rtrn;
}
return BadMatch;
commit e5892467ae3308c8651be76e06db322dcbc08522
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Feb 15 17:27:53 2008 -0800
Add support for building lint library with --enable-lint-library
diff --git a/configure.ac b/configure.ac
index 604d1bb..7ab9b7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,10 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER([src/config.h])
AC_CONFIG_HEADER([include/X11/XlibConf.h])
+# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.1)
+
# Checks for programs.
AC_PROG_LIBTOOL
AC_PROG_CC
@@ -331,6 +335,7 @@ fi
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
+XORG_LINT_LIBRARY([X11])
LINT_FLAGS="${LINT_FLAGS} ${X11_CFLAGS} ${XPROTO_CFLAGS}"
if test "x$GCC" = "xyes"; then
diff --git a/src/Makefile.am b/src/Makefile.am
index 7c44f5b..564e03f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -402,6 +402,19 @@ lint: $(BUILT_SOURCES)
done
endif LINT
+if MAKE_LINT_LIB
+lintlibdir = $(libdir)
+
+lintlib_DATA = $(LINTLIB)
+
+lintlib_src = $(libX11_la_SOURCES) xcms/*.c xkb/*.c
+
+CLEANFILES += $(lintlib_DATA)
+
+$(LINTLIB): $(libX11_la_SOURCES)
+ $(LINT) -y -oX11 -x $(ALL_LINT_FLAGS) $(lintlib_src)
+endif MAKE_LINT_LIB
+
#
# Building ks_tables.h requires the makekeys utility
#
commit e3eb83ec6a9bffa63cdffd94f077c12f85ad7240
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Feb 11 20:11:43 2008 -0800
Spell out number in XkbGetKeyVirtualModMap man page to avoid cpp errors from #
diff --git a/man/xkb/XkbGetKeyVirtualModMap.man b/man/xkb/XkbGetKeyVirtualModMap.man
index dcb7533..6b35a77 100644
--- a/man/xkb/XkbGetKeyVirtualModMap.man
+++ b/man/xkb/XkbGetKeyVirtualModMap.man
@@ -57,7 +57,7 @@ connection to server
keycode of first key to fetch
.TP
.I \- num
-# keys for which virtual mod maps are desired
+number of keys for which virtual mod maps are desired
.TP
.I \- xkb
Xkb description where results will be placed
commit d5ceed7a73a6b61758ddb6ff4e194955fbd5c185
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Feb 8 16:46:46 2008 -0800
Add WM_LOCALE_NAME to list of properties set in XSetWMProperties comment
diff --git a/src/WMProps.c b/src/WMProps.c
index 06c76a1..a581f33 100644
--- a/src/WMProps.c
+++ b/src/WMProps.c
@@ -71,6 +71,7 @@ SOFTWARE.
* WM_CLIENT_MACHINE type: TEXT format: varies?
* WM_NORMAL_HINTS type: WM_SIZE_HINTS format: 32
* WM_CLASS type: STRING/STRING format: 8
+ * WM_LOCALE_NAME type: STRING format: 8
*/
void XSetWMProperties (
commit 416a812200f24d19149dcc497e5c51a0608120f6
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Feb 8 15:31:31 2008 -0800
XErrorDB updates for Render 0.9 & XFixes 4.0
diff --git a/src/XErrorDB b/src/XErrorDB
index a0b9684..70715a5 100644
--- a/src/XErrorDB
+++ b/src/XErrorDB
@@ -634,7 +634,7 @@ XProtoError.XFree86-Misc.5: XF86MiscModInDevDisabled
XProtoError.XFree86-Misc.6: XF86MiscModInDevClientNotLocal
XProtoError.XFree86-Misc.7: XF86MiscNoModule
! XFree86-DGA -- not an X Consortium standard
-XRequest.XFree86-DGA.0: XDGAQueryVersion
+XRequest.XFree86-DGA.0: XF86DGAQueryVersion
XRequest.XFree86-DGA.1: XF86DGAGetVideoLL
XRequest.XFree86-DGA.2: XF86DGADirectVideo
XRequest.XFree86-DGA.3: XF86DGAGetViewPortSize
@@ -891,6 +891,12 @@ XRequest.RENDER.27: RenderCreateCursor
XRequest.RENDER.28: RenderSetPictureTransform
XRequest.RENDER.29: RenderQueryFilters
XRequest.RENDER.30: RenderSetPictureFilter
+XRequest.RENDER.31: RenderCreateAnimCursor
+XRequest.RENDER.32: RenderAddTraps
+XRequest.RENDER.33: RenderCreateSolidFill
+XRequest.RENDER.34: RenderCreateLinearGradient
+XRequest.RENDER.35: RenderCreateRadialGradient
+XRequest.RENDER.36: RenderCreateConicalGradient
XProtoError.RENDER.0: RenderBadFormat (invalid PictFormat parameter)
XlibMessage.RENDER.0: PictFormat id in failed request: 0x%lx
XProtoError.RENDER.1: RenderBadPicture (invalid Picture parameter)
@@ -931,6 +937,8 @@ XRequest.XFIXES.25: XFixesGetCursorImageAndName
XRequest.XFIXES.26: XFixesChangeCursor
XRequest.XFIXES.27: XFixesChangeCursorByName
XRequest.XFIXES.28: XFixesExpandRegion
+XRequest.XFIXES.29: XFixesHideCursor
+XRequest.XFIXES.30: XFixesShowCursor
XProtoError.XFIXES.0: BadRegion (invalid Region parameter)
XlibMessage.XFIXES.0: Region id in failed request: 0x%lx
! DAMAGE extension
commit 16a76091cd632e5a3708e235ff864b58f3e4613e
Author: Kim Woelders <kim@woelders.dk>
Date: Sat Dec 22 21:45:23 2007 +0100
Fix bs_BA entries in locale.dir.pre
X.Org bug#13786 <http://bugs.freedesktop.org/show_bug.cgi?id=13786>
diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre
index 28869f2..6489388 100644
--- a/nls/locale.dir.pre
+++ b/nls/locale.dir.pre
@@ -34,7 +34,7 @@ microsoft-cp1251/XLC_LOCALE: be_BY.CP1251
iso8859-5/XLC_LOCALE: bg_BG.ISO8859-5
microsoft-cp1251/XLC_LOCALE: bg_BG.CP1251
koi8-r/XLC_LOCALE: bg_BG.KOI8-R
-iso8859-2/XLC_LOCALE bs_BA.ISO8859-2
+iso8859-2/XLC_LOCALE: bs_BA.ISO8859-2
iso8859-1/XLC_LOCALE: br_FR.ISO8859-1
iso8859-14/XLC_LOCALE: br_FR.ISO8859-14
iso8859-15/XLC_LOCALE: br_FR.ISO8859-15
@@ -269,7 +269,7 @@ en_US.UTF-8/XLC_LOCALE: ar_LB.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_LY.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_MA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_OM.UTF-8
-en_US.UTF-8/XLC_LOCALE bs_BA.UTF-8
+en_US.UTF-8/XLC_LOCALE: bs_BA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_QA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_SA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_SD.UTF-8
commit 8f0bd3f445cbdcc67650f6e8e3baf2ed89cb3695
Author: James Cloos <cloos@jhcloos.com>
Date: Fri Dec 14 22:42:59 2007 -0500
add a comment to en_US.UTF-8/Compose
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 745dbd3..02561d4 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -453,6 +453,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <U11B7> <U11BB> : "ᇞ" U11de # HANGUL JONGSEONG MIEUM-SSANGSIOS
<Multi_key> <U11BC> <U11A9> : "ᇭ" U11ed # HANGUL JONGSEONG IEUNG-SSANGKIYEOK
+XCOMM Part 3
<Multi_key> <comma> <minus> : "¬" notsign # NOT SIGN
<Multi_key> <minus> <comma> : "¬" notsign # NOT SIGN
<dead_circumflex> <Multi_key> <underscore> <a> : "ª" ordfeminine # FEMININE ORDINAL INDICATOR
commit 4d6c45e60ed13d3b0fea10413873d6a74f9d6a3b
Author: James Cloos <cloos@jhcloos.com>
Date: Fri Dec 14 22:40:13 2007 -0500
Add <dead_stroke> compose sequences
The added sequences match the existing <Multi_key> <slash> sequences.
This is related to bug #12765¹.
1] https://bugs.freedesktop.org/show_bug.cgi?id=12765
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 28952f1..745dbd3 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -540,6 +540,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_diaeresis> <O> : "Ö" Odiaeresis # LATIN CAPITAL LETTER O WITH DIAERESIS
<Multi_key> <quotedbl> <O> : "Ö" Odiaeresis # LATIN CAPITAL LETTER O WITH DIAERESIS
<Multi_key> <x> <x> : "×" multiply # MULTIPLICATION SIGN
+<dead_stroke> <O> : "Ø" Oslash # LATIN CAPITAL LETTER O WITH STROKE
<Multi_key> <slash> <O> : "Ø" Oslash # LATIN CAPITAL LETTER O WITH STROKE
<Multi_key> <KP_Divide> <O> : "Ø" Oslash # LATIN CAPITAL LETTER O WITH STROKE
<dead_grave> <U> : "Ù" Ugrave # LATIN CAPITAL LETTER U WITH GRAVE
@@ -618,6 +619,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <quotedbl> <o> : "ö" odiaeresis # LATIN SMALL LETTER O WITH DIAERESIS
<Multi_key> <colon> <minus> : "÷" division # DIVISION SIGN
<Multi_key> <minus> <colon> : "÷" division # DIVISION SIGN
+<dead_stroke> <o> : "ø" oslash # LATIN SMALL LETTER O WITH STROKE
<Multi_key> <slash> <o> : "ø" oslash # LATIN SMALL LETTER O WITH STROKE
<Multi_key> <KP_Divide> <o> : "ø" oslash # LATIN SMALL LETTER O WITH STROKE
<dead_grave> <u> : "ù" ugrave # LATIN SMALL LETTER U WITH GRAVE
@@ -678,8 +680,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <c> <D> : "Ď" U010E # LATIN CAPITAL LETTER D WITH CARON
<dead_caron> <d> : "ď" U010F # LATIN SMALL LETTER D WITH CARON
<Multi_key> <c> <d> : "ď" U010F # LATIN SMALL LETTER D WITH CARON
+<dead_stroke> <D> : "Đ" U0110 # LATIN CAPITAL LETTER D WITH STROKE
<Multi_key> <slash> <D> : "Đ" U0110 # LATIN CAPITAL LETTER D WITH STROKE
<Multi_key> <KP_Divide> <D> : "Đ" U0110 # LATIN CAPITAL LETTER D WITH STROKE
+<dead_stroke> <d> : "đ" U0111 # LATIN SMALL LETTER D WITH STROKE
<Multi_key> <slash> <d> : "đ" U0111 # LATIN SMALL LETTER D WITH STROKE
<Multi_key> <KP_Divide> <d> : "đ" U0111 # LATIN SMALL LETTER D WITH STROKE
<dead_macron> <E> : "Ē" U0112 # LATIN CAPITAL LETTER E WITH MACRON
@@ -728,8 +732,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <asciicircum> <H> : "Ĥ" U0124 # LATIN CAPITAL LETTER H WITH CIRCUMFLEX
<dead_circumflex> <h> : "ĥ" U0125 # LATIN SMALL LETTER H WITH CIRCUMFLEX
<Multi_key> <asciicircum> <h> : "ĥ" U0125 # LATIN SMALL LETTER H WITH CIRCUMFLEX
+<dead_stroke> <H> : "Ħ" U0126 # LATIN CAPITAL LETTER H WITH STROKE
<Multi_key> <slash> <H> : "Ħ" U0126 # LATIN CAPITAL LETTER H WITH STROKE
<Multi_key> <KP_Divide> <H> : "Ħ" U0126 # LATIN CAPITAL LETTER H WITH STROKE
+<dead_stroke> <h> : "ħ" U0127 # LATIN SMALL LETTER H WITH STROKE
<Multi_key> <slash> <h> : "ħ" U0127 # LATIN SMALL LETTER H WITH STROKE
<Multi_key> <KP_Divide> <h> : "ħ" U0127 # LATIN SMALL LETTER H WITH STROKE
<dead_tilde> <I> : "Ĩ" U0128 # LATIN CAPITAL LETTER I WITH TILDE
@@ -783,8 +789,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <c> <L> : "Ľ" U013D # LATIN CAPITAL LETTER L WITH CARON
<dead_caron> <l> : "ľ" U013E # LATIN SMALL LETTER L WITH CARON
<Multi_key> <c> <l> : "ľ" U013E # LATIN SMALL LETTER L WITH CARON
+<dead_stroke> <L> : "Ł" U0141 # LATIN CAPITAL LETTER L WITH STROKE
<Multi_key> <slash> <L> : "Ł" U0141 # LATIN CAPITAL LETTER L WITH STROKE
<Multi_key> <KP_Divide> <L> : "Ł" U0141 # LATIN CAPITAL LETTER L WITH STROKE
+<dead_stroke> <l> : "ł" U0142 # LATIN SMALL LETTER L WITH STROKE
<Multi_key> <slash> <l> : "ł" U0142 # LATIN SMALL LETTER L WITH STROKE
<Multi_key> <KP_Divide> <l> : "ł" U0142 # LATIN SMALL LETTER L WITH STROKE
<dead_acute> <N> : "Ń" U0143 # LATIN CAPITAL LETTER N WITH ACUTE
@@ -865,8 +873,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <c> <T> : "Ť" U0164 # LATIN CAPITAL LETTER T WITH CARON
<dead_caron> <t> : "ť" U0165 # LATIN SMALL LETTER T WITH CARON
<Multi_key> <c> <t> : "ť" U0165 # LATIN SMALL LETTER T WITH CARON
+<dead_stroke> <T> : "Ŧ" U0166 # LATIN CAPITAL LETTER T WITH STROKE
<Multi_key> <slash> <T> : "Ŧ" U0166 # LATIN CAPITAL LETTER T WITH STROKE
<Multi_key> <KP_Divide> <T> : "Ŧ" U0166 # LATIN CAPITAL LETTER T WITH STROKE
+<dead_stroke> <t> : "ŧ" U0167 # LATIN SMALL LETTER T WITH STROKE
<Multi_key> <slash> <t> : "ŧ" U0167 # LATIN SMALL LETTER T WITH STROKE
<Multi_key> <KP_Divide> <t> : "ŧ" U0167 # LATIN SMALL LETTER T WITH STROKE
<dead_tilde> <U> : "Ũ" U0168 # LATIN CAPITAL LETTER U WITH TILDE
@@ -926,8 +936,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <c> <Z> : "Ž" U017D # LATIN CAPITAL LETTER Z WITH CARON
<dead_caron> <z> : "ž" U017E # LATIN SMALL LETTER Z WITH CARON
<Multi_key> <c> <z> : "ž" U017E # LATIN SMALL LETTER Z WITH CARON
+<dead_stroke> <b> : "ƀ" U0180 # LATIN SMALL LETTER B WITH STROKE
<Multi_key> <slash> <b> : "ƀ" U0180 # LATIN SMALL LETTER B WITH STROKE
<Multi_key> <KP_Divide> <b> : "ƀ" U0180 # LATIN SMALL LETTER B WITH STROKE
+<dead_stroke> <I> : "Ɨ" U0197 # LATIN CAPITAL LETTER I WITH STROKE
<Multi_key> <slash> <I> : "Ɨ" U0197 # LATIN CAPITAL LETTER I WITH STROKE
<Multi_key> <KP_Divide> <I> : "Ɨ" U0197 # LATIN CAPITAL LETTER I WITH STROKE
<dead_horn> <O> : "Ơ" U01A0 # LATIN CAPITAL LETTER O WITH HORN
@@ -938,8 +950,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <plus> <U> : "Ư" U01AF # LATIN CAPITAL LETTER U WITH HORN
<dead_horn> <u> : "ư" U01B0 # LATIN SMALL LETTER U WITH HORN
<Multi_key> <plus> <u> : "ư" U01B0 # LATIN SMALL LETTER U WITH HORN
+<dead_stroke> <Z> : "Ƶ" U01B5 # LATIN CAPITAL LETTER Z WITH STROKE
<Multi_key> <slash> <Z> : "Ƶ" U01B5 # LATIN CAPITAL LETTER Z WITH STROKE
<Multi_key> <KP_Divide> <Z> : "Ƶ" U01B5 # LATIN CAPITAL LETTER Z WITH STROKE
+<dead_stroke> <z> : "ƶ" U01B6 # LATIN SMALL LETTER Z WITH STROKE
<Multi_key> <slash> <z> : "ƶ" U01B6 # LATIN SMALL LETTER Z WITH STROKE
<Multi_key> <KP_Divide> <z> : "ƶ" U01B6 # LATIN SMALL LETTER Z WITH STROKE
<dead_caron> <A> : "Ǎ" U01CD # LATIN CAPITAL LETTER A WITH CARON
@@ -1072,8 +1086,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_macron> <ae> : "ǣ" U01E3 # LATIN SMALL LETTER AE WITH MACRON
<Multi_key> <macron> <ae> : "ǣ" U01E3 # LATIN SMALL LETTER AE WITH MACRON
<Multi_key> <underscore> <ae> : "ǣ" U01E3 # LATIN SMALL LETTER AE WITH MACRON
+<dead_stroke> <G> : "Ǥ" U01E4 # LATIN CAPITAL LETTER G WITH STROKE
<Multi_key> <slash> <G> : "Ǥ" U01E4 # LATIN CAPITAL LETTER G WITH STROKE
<Multi_key> <KP_Divide> <G> : "Ǥ" U01E4 # LATIN CAPITAL LETTER G WITH STROKE
+<dead_stroke> <g> : "ǥ" U01E5 # LATIN SMALL LETTER G WITH STROKE
<Multi_key> <slash> <g> : "ǥ" U01E5 # LATIN SMALL LETTER G WITH STROKE
<Multi_key> <KP_Divide> <g> : "ǥ" U01E5 # LATIN SMALL LETTER G WITH STROKE
<dead_caron> <G> : "Ǧ" U01E6 # LATIN CAPITAL LETTER G WITH CARON
@@ -1159,6 +1175,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_acute> <Ooblique> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
<Multi_key> <acute> <Ooblique> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
<Multi_key> <apostrophe> <Ooblique> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
+<dead_acute> <dead_stroke> <O> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
<dead_acute> <Multi_key> <slash> <O> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
<Multi_key> <acute> <slash> <O> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
<Multi_key> <apostrophe> <slash> <O> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
@@ -1168,9 +1185,11 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_acute> <Ooblique> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
<combining_acute> <Multi_key> <slash> <O> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
<combining_acute> <Multi_key> <KP_Divide> <O> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
+<dead_stroke> <dead_acute> <O> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
<dead_acute> <oslash> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
<Multi_key> <acute> <oslash> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
<Multi_key> <apostrophe> <oslash> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
+<dead_acute> <dead_stroke> <o> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
<dead_acute> <Multi_key> <slash> <o> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
<Multi_key> <acute> <slash> <o> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
<Multi_key> <apostrophe> <slash> <o> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
@@ -1180,6 +1199,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_acute> <oslash> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
<combining_acute> <Multi_key> <slash> <o> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
<combining_acute> <Multi_key> <KP_Divide> <o> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
+<dead_stroke> <dead_acute> <o> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
<U030F> <A> : "Ȁ" U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
<U030F> <a> : "ȁ" U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE
<U0311> <A> : "Ȃ" U0202 # LATIN CAPITAL LETTER A WITH INVERTED BREVE
@@ -1291,6 +1311,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <macron> <y> : "ȳ" U0233 # LATIN SMALL LETTER Y WITH MACRON
<Multi_key> <underscore> <y> : "ȳ" U0233 # LATIN SMALL LETTER Y WITH MACRON
<Multi_key> <e> <e> : "ə" U0259 # LATIN SMALL LETTER SCHWA
+<dead_stroke> <i> : "ɨ" U0268 # LATIN SMALL LETTER I WITH STROKE
<Multi_key> <slash> <i> : "ɨ" U0268 # LATIN SMALL LETTER I WITH STROKE
<Multi_key> <KP_Divide> <i> : "ɨ" U0268 # LATIN SMALL LETTER I WITH STROKE
<Multi_key> <slash> <U0294> : "ʡ" U02A1 # LATIN LETTER GLOTTAL STOP WITH STROKE
commit e8d4cefa0837afa149a10e981528b368485a9e38
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon Dec 10 23:00:44 2007 -0800
Added launchd support.
diff --git a/configure.ac b/configure.ac
index 1d47055..604d1bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,6 +144,17 @@ AC_SUBST(WCHAR32)
AM_CONDITIONAL(OS2, test x$os2 = xtrue)
+AC_ARG_WITH(launchd, AS_HELP_STRING([--with-launchd], [Build with support for Apple's launchd (default: auto)]), [LAUNCHD=$withval], [LAUNCHD=auto])
+if test "x$LAUNCHD" = xauto; then
+ unset LAUNCHD
+ AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no])
+fi
+
+if test "x$LAUNCHD" = xyes ; then
+ AC_DEFINE(HAVE_LAUNCHD, 1, [launchd support available])
+ AC_DEFINE(TRANS_REOPEN, 1, [launchd support available])
+fi
+
AC_ARG_ENABLE(xthreads,
AC_HELP_STRING([--disable-xthreads],
[Disable Xlib support for Multithreading]),
diff --git a/src/ConnDis.c b/src/ConnDis.c
index 2f0cd49..f4a4dc8 100644
--- a/src/ConnDis.c
+++ b/src/ConnDis.c
@@ -303,7 +303,11 @@ _X11TransConnectDisplay (
#if defined(TCPCONN) || defined(UNIXCONN) || defined(LOCALCONN) || defined(MNX_TCPCONN) || defined(OS2PIPECONN)
if (!pprotocol) {
+#ifdef HAVE_LAUNCHD
+ if (!phostname || phostname[0]=='/') {
+#else
if (!phostname) {
+#endif
#if defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN)
pprotocol = copystring ("local", 5);
#if defined(TCPCONN)
@@ -449,6 +453,14 @@ _X11TransConnectDisplay (
*fullnamep = (char *) Xmalloc (len);
if (!*fullnamep) goto bad;
+#ifdef HAVE_LAUNCHD
+ if (phostname && strlen(phostname) > 11 && !strncmp(phostname, "/tmp/launch", 11))
+ sprintf (*fullnamep, "%s%s%d",
+ (phostname ? phostname : ""),
+ (dnet ? "::" : ":"),
+ idisplay);
+ else
+#endif
sprintf (*fullnamep, "%s%s%d.%d",
(phostname ? phostname : ""),
(dnet ? "::" : ":"),
diff --git a/src/xcb_disp.c b/src/xcb_disp.c
index 1d8231a..079c87f 100644
--- a/src/xcb_disp.c
+++ b/src/xcb_disp.c
@@ -63,13 +63,22 @@ int _XConnectXCB(Display *dpy, _Xconst char *display, char **fullnamep, int *scr
if(!dpy->xcb)
return 0;
- if(!xcb_parse_display(display, &host, &n, screenp))
- return 0;
+#ifdef HAVE_LAUNCHD
+ if(!display || !*display) display = getenv("DISPLAY");
+
+ if(display && strlen(display)>11 && !strncmp(display, "/tmp/launch", 11)) {
+ /* do nothing -- the magic happens inside of xcb_connect */
+ } else
+#endif
+ {
+ if(!xcb_parse_display(display, &host, &n, screenp))
+ return 0;
- len = strlen(host) + (1 + 20 + 1 + 20 + 1);
- *fullnamep = Xmalloc(len);
- snprintf(*fullnamep, len, "%s:%d.%d", host, n, *screenp);
- free(host);
+ len = strlen(host) + (1 + 20 + 1 + 20 + 1);
+ *fullnamep = Xmalloc(len);
+ snprintf(*fullnamep, len, "%s:%d.%d", host, n, *screenp);
+ free(host);
+ }
_XLockMutex(_Xglobal_lock);
if(xauth.name && xauth.data)
commit 13ac80469f6958cabac596834e203bd9cb6d4c94
Author: James Cloos <cloos@jhcloos.com>
Date: Wed Dec 5 20:14:03 2007 -0500
Update the currency symbols block of en_US.UTF-8/Compose.pre
Add XCOMM lines a la the existing NEW SHEQEL SIGN entry for
the KIP, TUGRIK, DRACHMA. GERMAN PENNY, PESO, GUARANI,
AUSTRAL, HRYVNIA and CEDI SIGNs.
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index ef0ac00..28952f1 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -163,6 +163,15 @@ XCOMM "₪" U20aa NEW SHEQEL SIGN
<Multi_key> <equal> <Cyrillic_ES> : "€" EuroSign # EURO SIGN
<Multi_key> <Cyrillic_IE> <equal> : "€" EuroSign # EURO SIGN
<Multi_key> <equal> <Cyrillic_IE> : "€" EuroSign # EURO SIGN
+XCOMM "₭" U20ad KIP SIGN
+XCOMM "₮" U20ae TUGRIK SIGN
+XCOMM "₯" U20af DRACHMA SIGN
+XCOMM "₰" U20b0 GERMAN PENNY SIGN
+XCOMM "₱" U20b1 PESO SIGN
+XCOMM "₲" U20b2 GUARANI SIGN
+XCOMM "₳" U20b3 AUSTRAL SIGN
+XCOMM "₴" U20b4 HRYVNIA SIGN
+XCOMM "₵" U20b5 CEDI SIGN
<Multi_key> <bar> <c> : "¢" cent # CENT SIGN
commit b0a8f2ec4ba698841683f8ce389f9d72e6bce53e
Author: Anton Zinoviev <anton@lml.bas.bg>
Date: Wed Dec 5 19:56:03 2007 -0500
Additions to the Compose file for UTF-8
From bug #5371¹
Commit 5cf5bc76642bfece7cb5b76faf414bf445f14489 left out this change
from those in attachment #4122². The post³ on xorg resulted in only
a positive reply⁴ from Daniel, so this block is now also commited.
1] https://bugs.freedesktop.org/show_bug.cgi?id=5371
2] https://bugs.freedesktop.org/attachment.cgi?id=4122
3] http://article.gmane.org/gmane.comp.freedesktop.xorg/20628
4] http://article.gmane.org/gmane.comp.freedesktop.xorg/23966
Signed-off-by: James Cloos <cloos@jhcloos.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
diff --git a/nls/el_GR.UTF-8/Compose.pre b/nls/el_GR.UTF-8/Compose.pre
index 72b2b31..53ff433 100644
--- a/nls/el_GR.UTF-8/Compose.pre
+++ b/nls/el_GR.UTF-8/Compose.pre
@@ -167,7 +167,9 @@ XCOMM Special Character
<Multi_key> <exclam> <P> : "¶" paragraph
<Multi_key> <period> <asciicircum> : "·" periodcentered
<Multi_key> <asciicircum> <period> : "·" periodcentered
-<Multi_key> <period> <period> : "·" periodcentered
+<Multi_key> <period> <minus> : "·" periodcentered
+<Multi_key> <period> <equal> : "•" enfilledcircbullet
+<Multi_key> <period> <period> : "…" ellipsis
<Multi_key> <1> <4> : "¼" onequarter
<Multi_key> <1> <2> : "½" onehalf
<Multi_key> <3> <4> : "¾" threequarters
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index b8fa77a..ef0ac00 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -92,7 +92,9 @@ XCOMM Spaces
<Multi_key> <period> <greater> : "›" U203a # SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
<Multi_key> <period> <less> : "‹" U2039 # SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-<Multi_key> <period> <period> : "·" periodcentered # MIDDLE DOT
+<Multi_key> <period> <period> : "…" ellipsis # HORIZONTAL ELLIPSIS
+<Multi_key> <period> <minus> : "·" periodcentered # MIDDLE DOT
+<Multi_key> <period> <equal> : "•" enfilledcircbullet # BULLET
<Multi_key> <exclam> <asciicircum> : "¦" brokenbar # BROKEN BAR
<Multi_key> <exclam> <exclam> : "¡" exclamdown # INVERTED EXCLAMATION MARK
<Multi_key> <p> <exclam> : "¶" paragraph # PILCROW SIGN
diff --git a/nls/pt_BR.UTF-8/Compose.pre b/nls/pt_BR.UTF-8/Compose.pre
index c8083e2..4b06df1 100644
--- a/nls/pt_BR.UTF-8/Compose.pre
+++ b/nls/pt_BR.UTF-8/Compose.pre
@@ -89,7 +89,9 @@ XCOMM Spaces
<Multi_key> <period> <greater> : "›" U203a
<Multi_key> <period> <less> : "‹" U2039
-<Multi_key> <period> <period> : "·" periodcentered
+<Multi_key> <period> <period> : "…" ellipsis
+<Multi_key> <period> <minus> : "·" periodcentered
+<Multi_key> <period> <equal> : "•" enfilledcircbullet
<Multi_key> <exclam> <asciicircum> : "¦" brokenbar
<Multi_key> <exclam> <exclam> : "¡" exclamdown
<Multi_key> <p> <exclam> : "¶" paragraph
commit 438d02ebc08ee171cf1d3936f4c81050d428ab92
Author: James Cloos <cloos@jhcloos.com>
Date: Tue Dec 4 17:25:39 2007 -0500
Fix the <U\x+> keysyms in the en_US.UTF-8 Compose file
Based on src/KeysymStr.c and src/StrKeysym.c and comments in
bugs #11930¹ and #5129² it is clear that <U100XXXXX> is invalid;
those should be in the form U plus the hex of the UCS Code Point.
The 0x01000000 is ORed in by the code.
This update fixes all of those.
1] https://bugs.freedesktop.org/show_bug.cgi?id=11930
2] https://bugs.freedesktop.org/show_bug.cgi?id=5129
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index b164006..b8fa77a 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -211,236 +211,236 @@ XCOMM
XCOMM group 1: cluster jamos made of three basic jamos
## The follwing block gets overridden by later shorter compositions
-##<Multi_key> <U10001107> <U10001109> <U10001100> : "ᄢ" U1122 # HANGUL CHOSEONG PIEUP-SIOS-KIYEOK
-##<Multi_key> <U10001107> <U10001109> <U10001103> : "ᄣ" U1123 # HANGUL CHOSEONG PIEUP-SIOS-TIKEUT
-##<Multi_key> <U10001107> <U10001109> <U10001107> : "ᄤ" U1124 # HANGUL CHOSEONG PIEUP-SIOS-PIEUP
-##<Multi_key> <U10001107> <U10001109> <U10001109> : "ᄥ" U1125 # HANGUL CHOSEONG PIEUP-SSANGSIOS
-##<Multi_key> <U10001107> <U10001109> <U1000110C> : "ᄦ" U1126 # HANGUL CHOSEONG PIEUP-SIOS-CIEUC
-##<Multi_key> <U10001107> <U10001107> <U1000110B> : "ᄬ" U112c # HANGUL CHOSEONG KAPYEOUNSSANGPIEUP
-##<Multi_key> <U10001109> <U10001107> <U10001100> : "ᄳ" U1133 # HANGUL CHOSEONG SIOS-PIEUP-KIYEOK
-##<Multi_key> <U10001109> <U10001109> <U10001109> : "ᄴ" U1134 # HANGUL CHOSEONG SIOS-SSANGSIOS
-##<Multi_key> <U10001169> <U10001161> <U10001175> : "ᅫ" U116b # HANGUL JUNGSEONG WAE
-##<Multi_key> <U1000116E> <U10001165> <U10001175> : "ᅰ" U1170 # HANGUL JUNGSEONG WE
-##<Multi_key> <U1000116E> <U10001165> <U10001173> : "ᆋ" U118b # HANGUL JUNGSEONG U-EO-EU
-##<Multi_key> <U100011A8> <U100011BA> <U100011A8> : "ᇄ" U11c4 # HANGUL JONGSEONG KIYEOK-SIOS-KIYEOK
-##<Multi_key> <U100011AF> <U100011A8> <U100011BA> : "ᇌ" U11cc # HANGUL JONGSEONG RIEUL-KIYEOK-SIOS
-##<Multi_key> <U100011AF> <U100011AE> <U100011C2> : "ᇏ" U11cf # HANGUL JONGSEONG RIEUL-TIKEUT-HIEUH
-##<Multi_key> <U100011AF> <U100011B7> <U100011A8> : "ᇑ" U11d1 # HANGUL JONGSEONG RIEUL-MIEUM-KIYEOK
-##<Multi_key> <U100011AF> <U100011B7> <U100011BA> : "ᇒ" U11d2 # HANGUL JONGSEONG RIEUL-MIEUM-SIOS
-##<Multi_key> <U100011AF> <U100011B8> <U100011BA> : "ᇓ" U11d3 # HANGUL JONGSEONG RIEUL-PIEUP-SIOS
-##<Multi_key> <U100011AF> <U100011B8> <U100011C2> : "ᇔ" U11d4 # HANGUL JONGSEONG RIEUL-PIEUP-HIEUH
-##<Multi_key> <U100011AF> <U100011B8> <U100011BC> : "ᇕ" U11d5 # HANGUL JONGSEONG RIEUL-KAPYEOUNPIEUP
-##<Multi_key> <U100011AF> <U100011BA> <U100011BA> : "ᇖ" U11d6 # HANGUL JONGSEONG RIEUL-SSANGSIOS
-##<Multi_key> <U100011B7> <U100011BA> <U100011BA> : "ᇞ" U11de # HANGUL JONGSEONG MIEUM-SSANGSIOS
-##<Multi_key> <U100011BC> <U100011A8> <U100011A8> : "ᇭ" U11ed # HANGUL JONGSEONG IEUNG-SSANGKIYEOK
-<Multi_key> <U10001100> <U10001100> : "ᄁ" U1101 # HANGUL CHOSEONG SSANGKIYEOK
-<Multi_key> <U10001103> <U10001103> : "ᄄ" U1104 # HANGUL CHOSEONG SSANGTIKEUT
-<Multi_key> <U10001107> <U10001107> : "ᄈ" U1108 # HANGUL CHOSEONG SSANGPIEUP
-<Multi_key> <U10001109> <U10001109> : "ᄊ" U110a # HANGUL CHOSEONG SSANGSIOS
-<Multi_key> <U1000110C> <U1000110C> : "ᄍ" U110d # HANGUL CHOSEONG SSANGCIEUC
-<Multi_key> <U10001102> <U10001100> : "ᄓ" U1113 # HANGUL CHOSEONG NIEUN-KIYEOK
-<Multi_key> <U10001102> <U10001102> : "ᄔ" U1114 # HANGUL CHOSEONG SSANGNIEUN
-<Multi_key> <U10001102> <U10001103> : "ᄕ" U1115 # HANGUL CHOSEONG NIEUN-TIKEUT
-<Multi_key> <U10001102> <U10001107> : "ᄖ" U1116 # HANGUL CHOSEONG NIEUN-PIEUP
-<Multi_key> <U10001103> <U10001100> : "ᄗ" U1117 # HANGUL CHOSEONG TIKEUT-KIYEOK
-<Multi_key> <U10001105> <U10001102> : "ᄘ" U1118 # HANGUL CHOSEONG RIEUL-NIEUN
-<Multi_key> <U10001105> <U10001105> : "ᄙ" U1119 # HANGUL CHOSEONG SSANGRIEUL
-<Multi_key> <U10001105> <U10001112> : "ᄚ" U111a # HANGUL CHOSEONG RIEUL-HIEUH
-<Multi_key> <U10001105> <U1000110B> : "ᄛ" U111b # HANGUL CHOSEONG KAPYEOUNRIEUL
-<Multi_key> <U10001106> <U10001107> : "ᄜ" U111c # HANGUL CHOSEONG MIEUM-PIEUP
-<Multi_key> <U10001106> <U1000110B> : "ᄝ" U111d # HANGUL CHOSEONG KAPYEOUNMIEUM
-<Multi_key> <U10001107> <U10001100> : "ᄞ" U111e # HANGUL CHOSEONG PIEUP-KIYEOK
-<Multi_key> <U10001107> <U10001102> : "ᄟ" U111f # HANGUL CHOSEONG PIEUP-NIEUN
-<Multi_key> <U10001107> <U10001103> : "ᄠ" U1120 # HANGUL CHOSEONG PIEUP-TIKEUT
-<Multi_key> <U10001107> <U10001109> : "ᄡ" U1121 # HANGUL CHOSEONG PIEUP-SIOS
-<Multi_key> <U10001107> <U1000110C> : "ᄧ" U1127 # HANGUL CHOSEONG PIEUP-CIEUC
-<Multi_key> <U10001107> <U1000110E> : "ᄨ" U1128 # HANGUL CHOSEONG PIEUP-CHIEUCH
-<Multi_key> <U10001107> <U10001110> : "ᄩ" U1129 # HANGUL CHOSEONG PIEUP-THIEUTH
-<Multi_key> <U10001107> <U10001111> : "ᄪ" U112a # HANGUL CHOSEONG PIEUP-PHIEUPH
-<Multi_key> <U10001107> <U1000110B> : "ᄫ" U112b # HANGUL CHOSEONG KAPYEOUNPIEUP
-<Multi_key> <U10001109> <U10001100> : "ᄭ" U112d # HANGUL CHOSEONG SIOS-KIYEOK
-<Multi_key> <U10001109> <U10001102> : "ᄮ" U112e # HANGUL CHOSEONG SIOS-NIEUN
-<Multi_key> <U10001109> <U10001103> : "ᄯ" U112f # HANGUL CHOSEONG SIOS-TIKEUT
-<Multi_key> <U10001109> <U10001105> : "ᄰ" U1130 # HANGUL CHOSEONG SIOS-RIEUL
-<Multi_key> <U10001109> <U10001106> : "ᄱ" U1131 # HANGUL CHOSEONG SIOS-MIEUM
-<Multi_key> <U10001109> <U10001107> : "ᄲ" U1132 # HANGUL CHOSEONG SIOS-PIEUP
-<Multi_key> <U10001109> <U1000110B> : "ᄵ" U1135 # HANGUL CHOSEONG SIOS-IEUNG
-<Multi_key> <U10001109> <U1000110C> : "ᄶ" U1136 # HANGUL CHOSEONG SIOS-CIEUC
-<Multi_key> <U10001109> <U1000110E> : "ᄷ" U1137 # HANGUL CHOSEONG SIOS-CHIEUCH
-<Multi_key> <U10001109> <U1000110F> : "ᄸ" U1138 # HANGUL CHOSEONG SIOS-KHIEUKH
-<Multi_key> <U10001109> <U10001110> : "ᄹ" U1139 # HANGUL CHOSEONG SIOS-THIEUTH
-<Multi_key> <U10001109> <U10001111> : "ᄺ" U113a # HANGUL CHOSEONG SIOS-PHIEUPH
-<Multi_key> <U10001109> <U10001112> : "ᄻ" U113b # HANGUL CHOSEONG SIOS-HIEUH
-<Multi_key> <U1000113C> <U1000113C> : "ᄽ" U113d # HANGUL CHOSEONG CHITUEUMSSANGSIOS
-<Multi_key> <U1000113E> <U1000113E> : "ᄿ" U113f # HANGUL CHOSEONG CEONGCHIEUMSSANGSIOS
-<Multi_key> <U1000110B> <U10001100> : "ᅁ" U1141 # HANGUL CHOSEONG IEUNG-KIYEOK
-<Multi_key> <U1000110B> <U10001103> : "ᅂ" U1142 # HANGUL CHOSEONG IEUNG-TIKEUT
-<Multi_key> <U1000110B> <U10001106> : "ᅃ" U1143 # HANGUL CHOSEONG IEUNG-MIEUM
-<Multi_key> <U1000110B> <U10001107> : "ᅄ" U1144 # HANGUL CHOSEONG IEUNG-PIEUP
-<Multi_key> <U1000110B> <U10001109> : "ᅅ" U1145 # HANGUL CHOSEONG IEUNG-SIOS
-<Multi_key> <U1000110B> <U10001140> : "ᅆ" U1146 # HANGUL CHOSEONG IEUNG-PANSIOS
-<Multi_key> <U1000110B> <U1000110B> : "ᅇ" U1147 # HANGUL CHOSEONG SSANGIEUNG
-<Multi_key> <U1000110B> <U1000110C> : "ᅈ" U1148 # HANGUL CHOSEONG IEUNG-CIEUC
-<Multi_key> <U1000110B> <U1000110E> : "ᅉ" U1149 # HANGUL CHOSEONG IEUNG-CHIEUCH
-<Multi_key> <U1000110B> <U10001110> : "ᅊ" U114a # HANGUL CHOSEONG IEUNG-THIEUTH
-<Multi_key> <U1000110B> <U10001111> : "ᅋ" U114b # HANGUL CHOSEONG IEUNG-PHIEUPH
-<Multi_key> <U1000110C> <U1000110B> : "ᅍ" U114d # HANGUL CHOSEONG CIEUC-IEUNG
-<Multi_key> <U1000114E> <U1000114E> : "ᅏ" U114f # HANGUL CHOSEONG CHITUEUMSSANGCIEUC
-<Multi_key> <U10001150> <U10001150> : "ᅑ" U1151 # HANGUL CHOSEONG CEONGCHIEUMSSANGCIEUC
-<Multi_key> <U1000110E> <U1000110F> : "ᅒ" U1152 # HANGUL CHOSEONG CHIEUCH-KHIEUKH
-<Multi_key> <U1000110E> <U10001112> : "ᅓ" U1153 # HANGUL CHOSEONG CHIEUCH-HIEUH
-<Multi_key> <U10001111> <U10001107> : "ᅖ" U1156 # HANGUL CHOSEONG PHIEUPH-PIEUP
-<Multi_key> <U10001111> <U1000110B> : "ᅗ" U1157 # HANGUL CHOSEONG KAPYEOUNPHIEUPH
-<Multi_key> <U10001112> <U10001112> : "ᅘ" U1158 # HANGUL CHOSEONG SSANGHIEUH
-<Multi_key> <U10001161> <U10001175> : "ᅢ" U1162 # HANGUL JUNGSEONG AE
-<Multi_key> <U10001163> <U10001175> : "ᅤ" U1164 # HANGUL JUNGSEONG YAE
-<Multi_key> <U10001165> <U10001175> : "ᅦ" U1166 # HANGUL JUNGSEONG E
-<Multi_key> <U10001167> <U10001175> : "ᅨ" U1168 # HANGUL JUNGSEONG YE
-<Multi_key> <U10001169> <U10001161> : "ᅪ" U116a # HANGUL JUNGSEONG WA
-<Multi_key> <U10001169> <U10001175> : "ᅬ" U116c # HANGUL JUNGSEONG OE
-<Multi_key> <U1000116E> <U10001165> : "ᅯ" U116f # HANGUL JUNGSEONG WEO
-<Multi_key> <U1000116E> <U10001175> : "ᅱ" U1171 # HANGUL JUNGSEONG WI
-<Multi_key> <U10001173> <U10001175> : "ᅴ" U1174 # HANGUL JUNGSEONG YI
-<Multi_key> <U10001161> <U10001169> : "ᅶ" U1176 # HANGUL JUNGSEONG A-O
-<Multi_key> <U10001161> <U1000116E> : "ᅷ" U1177 # HANGUL JUNGSEONG A-U
-<Multi_key> <U10001163> <U10001169> : "ᅸ" U1178 # HANGUL JUNGSEONG YA-O
-<Multi_key> <U10001163> <U1000116D> : "ᅹ" U1179 # HANGUL JUNGSEONG YA-YO
-<Multi_key> <U10001165> <U10001169> : "ᅺ" U117a # HANGUL JUNGSEONG EO-O
-<Multi_key> <U10001165> <U1000116E> : "ᅻ" U117b # HANGUL JUNGSEONG EO-U
-<Multi_key> <U10001165> <U10001173> : "ᅼ" U117c # HANGUL JUNGSEONG EO-EU
-<Multi_key> <U10001167> <U10001169> : "ᅽ" U117d # HANGUL JUNGSEONG YEO-O
-<Multi_key> <U10001167> <U1000116E> : "ᅾ" U117e # HANGUL JUNGSEONG YEO-U
-<Multi_key> <U10001169> <U10001165> : "ᅿ" U117f # HANGUL JUNGSEONG O-EO
-<Multi_key> <U10001169> <U10001166> : "ᆀ" U1180 # HANGUL JUNGSEONG O-E
-<Multi_key> <U10001169> <U10001168> : "ᆁ" U1181 # HANGUL JUNGSEONG O-YE
-<Multi_key> <U10001169> <U10001169> : "ᆂ" U1182 # HANGUL JUNGSEONG O-O
-<Multi_key> <U10001169> <U1000116E> : "ᆃ" U1183 # HANGUL JUNGSEONG O-U
-<Multi_key> <U1000116D> <U10001163> : "ᆄ" U1184 # HANGUL JUNGSEONG YO-YA
-<Multi_key> <U1000116D> <U10001164> : "ᆅ" U1185 # HANGUL JUNGSEONG YO-YAE
-<Multi_key> <U1000116D> <U10001167> : "ᆆ" U1186 # HANGUL JUNGSEONG YO-YEO
-<Multi_key> <U1000116D> <U10001169> : "ᆇ" U1187 # HANGUL JUNGSEONG YO-O
-<Multi_key> <U1000116D> <U10001175> : "ᆈ" U1188 # HANGUL JUNGSEONG YO-I
-<Multi_key> <U1000116E> <U10001161> : "ᆉ" U1189 # HANGUL JUNGSEONG U-A
-<Multi_key> <U1000116E> <U10001162> : "ᆊ" U118a # HANGUL JUNGSEONG U-AE
-<Multi_key> <U1000116E> <U10001168> : "ᆌ" U118c # HANGUL JUNGSEONG U-YE
-<Multi_key> <U1000116E> <U1000116E> : "ᆍ" U118d # HANGUL JUNGSEONG U-U
-<Multi_key> <U10001172> <U10001161> : "ᆎ" U118e # HANGUL JUNGSEONG YU-A
-<Multi_key> <U10001172> <U10001165> : "ᆏ" U118f # HANGUL JUNGSEONG YU-EO
-<Multi_key> <U10001172> <U10001166> : "ᆐ" U1190 # HANGUL JUNGSEONG YU-E
-<Multi_key> <U10001172> <U10001167> : "ᆑ" U1191 # HANGUL JUNGSEONG YU-YEO
-<Multi_key> <U10001172> <U10001168> : "ᆒ" U1192 # HANGUL JUNGSEONG YU-YE
-<Multi_key> <U10001172> <U1000116E> : "ᆓ" U1193 # HANGUL JUNGSEONG YU-U
-<Multi_key> <U10001172> <U10001175> : "ᆔ" U1194 # HANGUL JUNGSEONG YU-I
-<Multi_key> <U10001173> <U1000116E> : "ᆕ" U1195 # HANGUL JUNGSEONG EU-U
-<Multi_key> <U10001173> <U10001173> : "ᆖ" U1196 # HANGUL JUNGSEONG EU-EU
-<Multi_key> <U10001174> <U1000116E> : "ᆗ" U1197 # HANGUL JUNGSEONG YI-U
-<Multi_key> <U10001175> <U10001161> : "ᆘ" U1198 # HANGUL JUNGSEONG I-A
-<Multi_key> <U10001175> <U10001163> : "ᆙ" U1199 # HANGUL JUNGSEONG I-YA
-<Multi_key> <U10001175> <U10001169> : "ᆚ" U119a # HANGUL JUNGSEONG I-O
-<Multi_key> <U10001175> <U1000116E> : "ᆛ" U119b # HANGUL JUNGSEONG I-U
-<Multi_key> <U10001175> <U10001173> : "ᆜ" U119c # HANGUL JUNGSEONG I-EU
-<Multi_key> <U10001175> <U1000119E> : "ᆝ" U119d # HANGUL JUNGSEONG I-ARAEA
-<Multi_key> <U1000119E> <U10001165> : "ᆟ" U119f # HANGUL JUNGSEONG ARAEA-EO
-<Multi_key> <U1000119E> <U1000116E> : "ᆠ" U11a0 # HANGUL JUNGSEONG ARAEA-U
-<Multi_key> <U1000119E> <U10001175> : "ᆡ" U11a1 # HANGUL JUNGSEONG ARAEA-I
-<Multi_key> <U1000119E> <U1000119E> : "ᆢ" U11a2 # HANGUL JUNGSEONG SSANGARAEA
-<Multi_key> <U100011A8> <U100011A8> : "ᆩ" U11a9 # HANGUL JONGSEONG SSANGKIYEOK
-<Multi_key> <U100011A8> <U100011BA> : "ᆪ" U11aa # HANGUL JONGSEONG KIYEOK-SIOS
-<Multi_key> <U100011AB> <U100011BD> : "ᆬ" U11ac # HANGUL JONGSEONG NIEUN-CIEUC
-<Multi_key> <U100011AB> <U100011C2> : "ᆭ" U11ad # HANGUL JONGSEONG NIEUN-HIEUH
-<Multi_key> <U100011AF> <U100011A8> : "ᆰ" U11b0 # HANGUL JONGSEONG RIEUL-KIYEOK
-<Multi_key> <U100011AF> <U100011B7> : "ᆱ" U11b1 # HANGUL JONGSEONG RIEUL-MIEUM
-<Multi_key> <U100011AF> <U100011B8> : "ᆲ" U11b2 # HANGUL JONGSEONG RIEUL-PIEUP
-<Multi_key> <U100011AF> <U100011BA> : "ᆳ" U11b3 # HANGUL JONGSEONG RIEUL-SIOS
-<Multi_key> <U100011AF> <U100011C0> : "ᆴ" U11b4 # HANGUL JONGSEONG RIEUL-THIEUTH
-<Multi_key> <U100011AF> <U100011C1> : "ᆵ" U11b5 # HANGUL JONGSEONG RIEUL-PHIEUPH
-<Multi_key> <U100011AF> <U100011C2> : "ᆶ" U11b6 # HANGUL JONGSEONG RIEUL-HIEUH
-<Multi_key> <U100011B8> <U100011BA> : "ᆹ" U11b9 # HANGUL JONGSEONG PIEUP-SIOS
-<Multi_key> <U100011BA> <U100011BA> : "ᆻ" U11bb # HANGUL JONGSEONG SSANGSIOS
-<Multi_key> <U100011A8> <U100011AF> : "ᇃ" U11c3 # HANGUL JONGSEONG KIYEOK-RIEUL
-<Multi_key> <U100011AB> <U100011A8> : "ᇅ" U11c5 # HANGUL JONGSEONG NIEUN-KIYEOK
-<Multi_key> <U100011AB> <U100011AE> : "ᇆ" U11c6 # HANGUL JONGSEONG NIEUN-TIKEUT
-<Multi_key> <U100011AB> <U100011BA> : "ᇇ" U11c7 # HANGUL JONGSEONG NIEUN-SIOS
-<Multi_key> <U100011AB> <U100011EB> : "ᇈ" U11c8 # HANGUL JONGSEONG NIEUN-PANSIOS
-<Multi_key> <U100011AB> <U100011C0> : "ᇉ" U11c9 # HANGUL JONGSEONG NIEUN-THIEUTH
-<Multi_key> <U100011AE> <U100011A8> : "ᇊ" U11ca # HANGUL JONGSEONG TIKEUT-KIYEOK
-<Multi_key> <U100011AE> <U100011AF> : "ᇋ" U11cb # HANGUL JONGSEONG TIKEUT-RIEUL
-<Multi_key> <U100011AF> <U100011AB> : "ᇍ" U11cd # HANGUL JONGSEONG RIEUL-NIEUN
-<Multi_key> <U100011AF> <U100011AE> : "ᇎ" U11ce # HANGUL JONGSEONG RIEUL-TIKEUT
-<Multi_key> <U100011AF> <U100011AF> : "ᇐ" U11d0 # HANGUL JONGSEONG SSANGRIEUL
-<Multi_key> <U100011AF> <U100011EB> : "ᇗ" U11d7 # HANGUL JONGSEONG RIEUL-PANSIOS
-<Multi_key> <U100011AF> <U100011BF> : "ᇘ" U11d8 # HANGUL JONGSEONG RIEUL-KHIEUKH
-<Multi_key> <U100011AF> <U100011F9> : "ᇙ" U11d9 # HANGUL JONGSEONG RIEUL-YEORINHIEUH
-<Multi_key> <U100011B7> <U100011A8> : "ᇚ" U11da # HANGUL JONGSEONG MIEUM-KIYEOK
-<Multi_key> <U100011B7> <U100011AF> : "ᇛ" U11db # HANGUL JONGSEONG MIEUM-RIEUL
-<Multi_key> <U100011B7> <U100011B8> : "ᇜ" U11dc # HANGUL JONGSEONG MIEUM-PIEUP
-<Multi_key> <U100011B7> <U100011BA> : "ᇝ" U11dd # HANGUL JONGSEONG MIEUM-SIOS
-<Multi_key> <U100011B7> <U100011EB> : "ᇟ" U11df # HANGUL JONGSEONG MIEUM-PANSIOS
-<Multi_key> <U100011B7> <U100011BE> : "ᇠ" U11e0 # HANGUL JONGSEONG MIEUM-CHIEUCH
-<Multi_key> <U100011B7> <U100011C2> : "ᇡ" U11e1 # HANGUL JONGSEONG MIEUM-HIEUH
-<Multi_key> <U100011B7> <U100011BC> : "ᇢ" U11e2 # HANGUL JONGSEONG KAPYEOUNMIEUM
-<Multi_key> <U100011B8> <U100011AF> : "ᇣ" U11e3 # HANGUL JONGSEONG PIEUP-RIEUL
-<Multi_key> <U100011B8> <U100011C1> : "ᇤ" U11e4 # HANGUL JONGSEONG PIEUP-PHIEUPH
-<Multi_key> <U100011B8> <U100011C2> : "ᇥ" U11e5 # HANGUL JONGSEONG PIEUP-HIEUH
-<Multi_key> <U100011B8> <U100011BC> : "ᇦ" U11e6 # HANGUL JONGSEONG KAPYEOUNPIEUP
-<Multi_key> <U100011BA> <U100011A8> : "ᇧ" U11e7 # HANGUL JONGSEONG SIOS-KIYEOK
Reply to: