Module Name: xsrc
Committed By: martin
Date: Mon Dec 19 14:15:10 UTC 2022
Modified Files:
xsrc/external/mit/libX11/dist/modules/im/ximcp: imLcLkup.c
xsrc/external/mit/libX11/dist/src: CrGlCur.c
Log Message:
Fix broken revert commit part #2
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/src/CrGlCur.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c
diff -u xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c:1.4 xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c:1.5
--- xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c:1.4 Mon Dec 19 13:20:17 2022
+++ xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c Mon Dec 19 14:15:09 2022
@@ -219,9 +219,9 @@ _XimLocalUtf8LookupString(XIC xic, XKeyE
if(status) *status = XBufferOverflow;
return (ret);
}
- buffer[0] = 0xe0 | ((BRL_UC_ROW >> 12) & 0x0f);
- buffer[1] = 0x80 | ((BRL_UC_ROW >> 8) & 0x30) | (pattern >> 6);
- buffer[2] = 0x80 | (pattern & 0x3f);
+ buffer[0] = (char)(0xe0 | ((BRL_UC_ROW >> 12) & 0x0f));
+ buffer[1] = (char)(0x80 | ((BRL_UC_ROW >> 8) & 0x30) | (pattern >> 6));
+ buffer[2] = (char)(0x80 | (pattern & 0x3f));
if(keysym) {
*keysym = XK_braille_blank | pattern;
if(status) *status = XLookupBoth;
Index: xsrc/external/mit/libX11/dist/src/CrGlCur.c
diff -u xsrc/external/mit/libX11/dist/src/CrGlCur.c:1.3 xsrc/external/mit/libX11/dist/src/CrGlCur.c:1.4
--- xsrc/external/mit/libX11/dist/src/CrGlCur.c:1.3 Mon Dec 19 13:20:17 2022
+++ xsrc/external/mit/libX11/dist/src/CrGlCur.c Mon Dec 19 14:15:10 2022
@@ -55,7 +55,7 @@ typedef void *XModuleType;
#endif
#ifndef LIBXCURSOR
-#define LIBXCURSOR "libXcursor.so.1"
+#define LIBXCURSOR "libXcursor.so"
#endif
static char libraryName[] = LIBXCURSOR;
