aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/xkb
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-03-04 12:18:13 +0100
committermarha <marha@users.sourceforge.net>2014-03-04 12:23:48 +0100
commit45392e4a0642880b569ea5d4a350cdc395a2c7db (patch)
treec3c2a49de903a18c3f8e1bf79684c29337ebcf7c /libX11/src/xkb
parent5ec0616d4e3c4c6095f4975abbe9c21e5b6af967 (diff)
parent321c01267ae1c446f1bd22b642567fcafa016c02 (diff)
downloadvcxsrv-45392e4a0642880b569ea5d4a350cdc395a2c7db.tar.gz
vcxsrv-45392e4a0642880b569ea5d4a350cdc395a2c7db.tar.bz2
vcxsrv-45392e4a0642880b569ea5d4a350cdc395a2c7db.zip
Merge remote-tracking branch 'origin/released'
* origin/released: libX11 libxcb mesa xserver xcb-proto xkeyboard-config git update 4 Mar 2014 Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mapi/glapi/glthread.c mesalib/src/mesa/drivers/dri/common/dri_util.c mesalib/src/mesa/main/bufferobj.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/glx/gen_gl_wrappers.py xorg-server/hw/xwin/winmultiwindowwm.c
Diffstat (limited to 'libX11/src/xkb')
-rw-r--r--libX11/src/xkb/XKBBind.c102
1 files changed, 0 insertions, 102 deletions
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. */