aboutsummaryrefslogtreecommitdiff
path: root/libX11
diff options
context:
space:
mode:
Diffstat (limited to 'libX11')
-rw-r--r--libX11/man/xkb/XkbGetMap.man2
-rw-r--r--libX11/nls/km_KH.UTF-8/Compose.pre2
-rw-r--r--libX11/nls/sr_CS.UTF-8/Compose.pre32
-rw-r--r--libX11/src/KeyBind.c72
-rw-r--r--libX11/src/Xrm.c4
-rw-r--r--libX11/src/xkb/XKBBind.c102
6 files changed, 20 insertions, 194 deletions
diff --git a/libX11/man/xkb/XkbGetMap.man b/libX11/man/xkb/XkbGetMap.man
index b51704c74..c78d4545d 100644
--- a/libX11/man/xkb/XkbGetMap.man
+++ b/libX11/man/xkb/XkbGetMap.man
@@ -106,7 +106,7 @@ in
are undefined), or BadImplementation (a compatible version of the Xkb extension
is not
available in the server). To free the returned data, use
-.I XkbFreeClientMap.
+.I XkbFreeKeyboard.
Xkb also provides convenience functions to get partial component definitions
from the
diff --git a/libX11/nls/km_KH.UTF-8/Compose.pre b/libX11/nls/km_KH.UTF-8/Compose.pre
index 77651d085..dc89119ae 100644
--- a/libX11/nls/km_KH.UTF-8/Compose.pre
+++ b/libX11/nls/km_KH.UTF-8/Compose.pre
@@ -1,6 +1,6 @@
include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
-# Khmer digraphs
+XCOMM Khmer digraphs
<U17ff> : "ាំ"
<U17fe> : "ោះ"
<U17fd> : "េះ"
diff --git a/libX11/nls/sr_CS.UTF-8/Compose.pre b/libX11/nls/sr_CS.UTF-8/Compose.pre
index 119e23ec4..b2397f7b3 100644
--- a/libX11/nls/sr_CS.UTF-8/Compose.pre
+++ b/libX11/nls/sr_CS.UTF-8/Compose.pre
@@ -1,17 +1,17 @@
include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
-# Serbian accented Cyrillic
-# а А - U+0430, U+0410 Cyrillic_a, Cyrillic_A
-# е Е - U+0435, U+0415 Cyrillic_e, Cyrillic_E
-# о О - U+043E, U+041E Cyrillic_o, Cyrillic_O
-# у У - U+0443, U+0423 Cyrillic_u, Cyrillic_U
-# и И - U+0438, U+0418 Cyrillic_i, Cyrillic_I
-#
-# ̀ - U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave>
-# ́ - U+0301 <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute>
-# ̂ - U+0302 <dead_circumflex>, <Multi_key> <asciicircum>
-# ̏ - U+030F <dead_diaeresis>, <dead_doubleacute>
-# ̀ - kratkouzlazni, U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave>
+XCOMM Serbian accented Cyrillic
+XCOMM а А - U+0430, U+0410 Cyrillic_a, Cyrillic_A
+XCOMM е Е - U+0435, U+0415 Cyrillic_e, Cyrillic_E
+XCOMM о О - U+043E, U+041E Cyrillic_o, Cyrillic_O
+XCOMM у У - U+0443, U+0423 Cyrillic_u, Cyrillic_U
+XCOMM и И - U+0438, U+0418 Cyrillic_i, Cyrillic_I
+XCOMM
+XCOMM ̀ - U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave>
+XCOMM ́ - U+0301 <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute>
+XCOMM ̂ - U+0302 <dead_circumflex>, <Multi_key> <asciicircum>
+XCOMM ̏ - U+030F <dead_diaeresis>, <dead_doubleacute>
+XCOMM ̀ - kratkouzlazni, U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave>
<dead_grave> <Cyrillic_a> : "а̀"
<combining_grave> <Cyrillic_a> : "а̀"
<Multi_key> <grave> <Cyrillic_a> : "а̀"
@@ -42,7 +42,7 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
<dead_grave> <Cyrillic_U> : "У̀"
<combining_grave> <Cyrillic_U> : "У̀"
<Multi_key> <grave> <Cyrillic_U> : "У̀"
-# ́ - dugouzlazni, U+0301 <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute>
+XCOMM ́ - dugouzlazni, U+0301 <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute>
<dead_acute> <Cyrillic_a> : "а́"
<combining_acute> <Cyrillic_a> : "а́"
<Multi_key> <acute> <Cyrillic_a> : "а́"
@@ -83,7 +83,7 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
<combining_acute> <Cyrillic_U> : "У́"
<Multi_key> <acute> <Cyrillic_U> : "У́"
<Multi_key> <apostrophe> <Cyrillic_U> : "У́"
-# ̂ - dugosilazni, U+0302 <dead_circumflex>, <Multi_key> <asciicircum>
+XCOMM ̂ - dugosilazni, U+0302 <dead_circumflex>, <Multi_key> <asciicircum>
<dead_circumflex> <Cyrillic_a> : "а̂"
<Multi_key> <asciicircum> <Cyrillic_a> : "а̂"
<dead_circumflex> <Cyrillic_A> : "А̂"
@@ -104,8 +104,8 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
<Multi_key> <asciicircum> <Cyrillic_u> : "у̂"
<dead_circumflex> <Cyrillic_U> : "У̂"
<Multi_key> <asciicircum> <Cyrillic_U> : "У̂"
-# ̏ - kratkosilazni, U+030F <dead_diaeresis>, <dead_doubleacute>
-# there's no appropriate dead_doublegrave, so we use these two dead keys
+XCOMM ̏ - kratkosilazni, U+030F <dead_diaeresis>, <dead_doubleacute>
+XCOMM there's no appropriate dead_doublegrave, so we use these two dead keys
<dead_diaeresis> <Cyrillic_a> : "а̏"
<dead_doubleacute> <Cyrillic_a> : "а̏"
<dead_diaeresis> <Cyrillic_A> : "А̏"
diff --git a/libX11/src/KeyBind.c b/libX11/src/KeyBind.c
index a49de3d78..f64f116b8 100644
--- a/libX11/src/KeyBind.c
+++ b/libX11/src/KeyBind.c
@@ -48,11 +48,6 @@ in this Software without prior written authorization from The Open Group.
#include <X11/keysymdef.h>
#include <stdio.h>
-#ifdef USE_OWN_COMPOSE
-#include "imComp.h"
-
-#endif
-
#include "Xresource.h"
#include "Key.h"
@@ -891,73 +886,6 @@ XLookupString (
&modifiers, &symbol))
return 0;
-#ifdef USE_OWN_COMPOSE
- if ( status ) {
- static int been_here= 0;
- if ( !been_here ) {
- XimCompInitTables();
- been_here = 1;
- }
- if ( !XimCompLegalStatus(status) ) {
- status->compose_ptr = NULL;
- status->chars_matched = 0;
- }
- if ( ((status->chars_matched>0)&&(status->compose_ptr!=NULL)) ||
- XimCompIsComposeKey(symbol,event->keycode,status) ) {
- XimCompRtrn rtrn;
- switch (XimCompProcessSym(status,symbol,&rtrn)) {
- case XIM_COMP_IGNORE:
- break;
- case XIM_COMP_IN_PROGRESS:
- if ( keysym!=NULL )
- *keysym = NoSymbol;
- return 0;
- case XIM_COMP_FAIL:
- {
- int n = 0, len= 0;
- for (n=len=0;rtrn.sym[n]!=XK_VoidSymbol;n++) {
- if ( nbytes-len > 0 ) {
- len+= _XTranslateKeySym(event->display,rtrn.sym[n],
- event->state,
- buffer+len,nbytes-len);
- }
- }
- if ( keysym!=NULL ) {
- if ( n==1 ) *keysym = rtrn.sym[0];
- else *keysym = NoSymbol;
- }
- return len;
- }
- case XIM_COMP_SUCCEED:
- {
- int len,n = 0;
-
- symbol = rtrn.matchSym;
- if ( keysym!=NULL ) *keysym = symbol;
- if ( rtrn.str[0]!='\0' ) {
- strncpy(buffer,rtrn.str,nbytes-1);
- buffer[nbytes-1]= '\0';
- len = strlen(buffer);
- }
- else {
- len = _XTranslateKeySym(event->display,symbol,
- event->state,
- buffer,nbytes);
- }
- for (n=0;rtrn.sym[n]!=XK_VoidSymbol;n++) {
- if ( nbytes-len > 0 ) {
- len+= _XTranslateKeySym(event->display,rtrn.sym[n],
- event->state,
- buffer+len,nbytes-len);
- }
- }
- return len;
- }
- }
- }
- }
-#endif
-
if (keysym)
*keysym = symbol;
/* arguable whether to use (event->state & ~modifiers) here */
diff --git a/libX11/src/Xrm.c b/libX11/src/Xrm.c
index 36b71d699..74495f25f 100644
--- a/libX11/src/Xrm.c
+++ b/libX11/src/Xrm.c
@@ -349,7 +349,7 @@ void XrmSetDatabase(
XrmDatabase database)
{
LockDisplay(display);
- /* destroy database if set up imlicitely by XGetDefault() */
+ /* destroy database if set up implicitly by XGetDefault() */
if (display->db && (display->flags & XlibDisplayDfltRMDB)) {
XrmDestroyDatabase(display->db);
display->flags &= ~XlibDisplayDfltRMDB;
@@ -508,7 +508,7 @@ static XrmDatabase NewDatabase(void)
}
/* move all values from ftable to ttable, and free ftable's buckets.
- * ttable is quaranteed empty to start with.
+ * ttable is guaranteed empty to start with.
*/
static void MoveValues(
LTable ftable,
diff --git a/libX11/src/xkb/XKBBind.c b/libX11/src/xkb/XKBBind.c
index b08e9d3ba..071e02f70 100644
--- a/libX11/src/xkb/XKBBind.c
+++ b/libX11/src/xkb/XKBBind.c
@@ -69,11 +69,6 @@ from The Open Group.
#include <X11/extensions/XKBproto.h>
#include "XKBlibint.h"
-#ifdef USE_OWN_COMPOSE
-#define COMPOSE_NO_CONST_MEMBERS
-#include "imComp.h"
-#endif
-
#define AllMods (ShiftMask|LockMask|ControlMask| \
Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask)
@@ -753,103 +748,6 @@ XLookupString(register XKeyEvent *event,
}
}
-#ifdef USE_OWN_COMPOSE
- if (status) {
- static int been_here = 0;
-
- if (!been_here) {
- XimCompInitTables();
- been_here = 1;
- }
- if (!XimCompLegalStatus(status)) {
- status->compose_ptr = NULL;
- status->chars_matched = 0;
- }
- if (((status->chars_matched > 0) && (status->compose_ptr != NULL)) ||
- XimCompIsComposeKey(*keysym, event->keycode, status)) {
- XimCompRtrn rtrn;
-
- switch (XimCompProcessSym(status, *keysym, &rtrn)) {
- case XIM_COMP_IGNORE:
- break;
- case XIM_COMP_IN_PROGRESS:
- if (keysym != NULL)
- *keysym = NoSymbol;
-#ifndef NO_COMPOSE_LED
- if (dpy->xkb_info->xlib_ctrls & XkbLC_ComposeLED) {
- XkbSetNamedIndicator(dpy, dpy->xkb_info->composeLED,
- True, True, False, NULL);
- }
-#endif
- return 0;
- case XIM_COMP_FAIL:
- {
- static Atom _ComposeFail = None;
- int n = 0, len = 0;
-
-#ifndef NO_COMPOSE_LED
- if (dpy->xkb_info->xlib_ctrls & XkbLC_ComposeLED) {
- XkbSetNamedIndicator(dpy, dpy->xkb_info->composeLED,
- True, False, False, NULL);
- }
-#endif
-#ifndef NO_BELL_ON_COMPOSE_FAIL
- if (dpy->xkb_info->xlib_ctrls & XkbLC_BeepOnComposeFail) {
- if (_ComposeFail == None)
- _ComposeFail = XInternAtom(dpy, "ComposeFail", 0);
- XkbBell(dpy, event->window, 0, _ComposeFail);
- }
-#endif
- for (n = len = 0; rtrn.sym[n] != XK_VoidSymbol; n++) {
- if (nbytes - len > 0) {
- len += XkbTranslateKeySym(dpy, &rtrn.sym[n], new_mods,
- buffer + len, nbytes - len,
- NULL);
- }
- }
- if (keysym != NULL) {
- if (n == 1)
- *keysym = rtrn.sym[0];
- else
- *keysym = NoSymbol;
- }
- return len;
- }
- case XIM_COMP_SUCCEED:
- {
- int len, n = 0;
-
-#ifndef NO_COMPOSE_LED
- if (dpy->xkb_info->xlib_ctrls & XkbLC_ComposeLED) {
- XkbSetNamedIndicator(dpy, dpy->xkb_info->composeLED,
- True, False, False, NULL);
- }
-#endif
- *keysym = rtrn.matchSym;
- if (rtrn.str[0] != '\0') {
- strncpy(buffer, rtrn.str, nbytes - 1);
- buffer[nbytes - 1] = '\0';
- len = (int) strlen(buffer);
- }
- else {
- len = XkbTranslateKeySym(dpy, keysym, new_mods,
- buffer, nbytes, NULL);
- }
- for (n = 0; rtrn.sym[n] != XK_VoidSymbol; n++) {
- if (nbytes - len > 0) {
- len += XkbTranslateKeySym(dpy, &rtrn.sym[n],
- event->state,
- buffer + len, nbytes - len,
- NULL);
- }
- }
- return len;
- }
- }
- }
- }
-#endif
-
/* We *should* use the new_mods (which does not contain any modifiers */
/* that were used to compute the symbol here, but pre-XKB XLookupString */
/* did not and we have to remain compatible. Sigh. */