aboutsummaryrefslogtreecommitdiff
path: root/libX11/modules
diff options
context:
space:
mode:
Diffstat (limited to 'libX11/modules')
-rw-r--r--libX11/modules/im/ximcp/imLcLkup.c4
-rw-r--r--libX11/modules/im/ximcp/imTrans.c1
-rw-r--r--libX11/modules/im/ximcp/makefile35
-rw-r--r--libX11/modules/lc/Utf8/makefile6
-rw-r--r--libX11/modules/lc/def/makefile5
-rw-r--r--libX11/modules/lc/gen/makefile6
-rw-r--r--libX11/modules/lc/xlocale/makefile8
-rw-r--r--libX11/modules/om/generic/makefile16
8 files changed, 80 insertions, 1 deletions
diff --git a/libX11/modules/im/ximcp/imLcLkup.c b/libX11/modules/im/ximcp/imLcLkup.c
index b6a6ff604..4e1dd9f69 100644
--- a/libX11/modules/im/ximcp/imLcLkup.c
+++ b/libX11/modules/im/ximcp/imLcLkup.c
@@ -68,10 +68,11 @@ _XimLocalMbLookupString(xic, ev, buffer, bytes, keysym, status)
||(ic->private.local.brl_committed != 0))) {
if (ic->private.local.brl_committed != 0) { /* Braille Event */
unsigned char pattern = ic->private.local.brl_committed;
- char mb[XLC_PUBLIC(ic->core.im->core.lcd, mb_cur_max)];
+ char *mb=malloc(XLC_PUBLIC(ic->core.im->core.lcd, mb_cur_max));
ret = _Xlcwctomb(ic->core.im->core.lcd, mb, BRL_UC_ROW | pattern);
if(ret > bytes) {
if(status) *status = XBufferOverflow;
+ free(mb);
return(ret);
}
if(keysym) {
@@ -80,6 +81,7 @@ _XimLocalMbLookupString(xic, ev, buffer, bytes, keysym, status)
} else
if(status) *status = XLookupChars;
memcpy(buffer, mb, ret);
+ free(mb);
} else { /* Composed Event */
ret = strlen(&mb[b[ic->private.local.composed].mb]);
if(ret > bytes) {
diff --git a/libX11/modules/im/ximcp/imTrans.c b/libX11/modules/im/ximcp/imTrans.c
index cb17ca066..b7114d5ad 100644
--- a/libX11/modules/im/ximcp/imTrans.c
+++ b/libX11/modules/im/ximcp/imTrans.c
@@ -38,6 +38,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/Xmd.h>
#define NEED_EVENTS
#include "Xlibint.h"
+#include <X11/Xwindows.h>
#include <X11/Xtrans/Xtrans.h>
#include "Xlcint.h"
#include "Ximint.h"
diff --git a/libX11/modules/im/ximcp/makefile b/libX11/modules/im/ximcp/makefile
new file mode 100644
index 000000000..c1c40a1c7
--- /dev/null
+++ b/libX11/modules/im/ximcp/makefile
@@ -0,0 +1,35 @@
+DEFINES += XIM_t TRANS_CLIENT
+
+LIBRARY=libximcp
+
+CSRCS = \
+ imCallbk.c \
+ imDefFlt.c \
+ imDefIc.c \
+ imDefIm.c \
+ imDefLkup.c \
+ imDispch.c \
+ imEvToWire.c \
+ imExten.c \
+ imImSw.c \
+ imInsClbk.c \
+ imInt.c \
+ imLcFlt.c \
+ imLcGIc.c \
+ imLcIc.c \
+ imLcIm.c \
+ imLcLkup.c \
+ imLcPrs.c \
+ imLcSIc.c \
+ imRmAttr.c \
+ imRm.c \
+ imThaiFlt.c \
+ imThaiIc.c \
+ imThaiIm.c \
+ imTrans.c \
+ imTransR.c \
+ imTrX.c
+
+DEFINES += XKB_IN_SERVER
+INCLUDES += ..\..\..\include\X11 ..\..\..\src\xlibi18n
+
diff --git a/libX11/modules/lc/Utf8/makefile b/libX11/modules/lc/Utf8/makefile
new file mode 100644
index 000000000..6f814c760
--- /dev/null
+++ b/libX11/modules/lc/Utf8/makefile
@@ -0,0 +1,6 @@
+LIBRARY = libxlcUTF8Load
+
+CSRCS=lcUTF8Load.c
+
+INCLUDES += ..\..\..\include\X11 ..\..\..\src\xlibi18n ..\..\..\src
+
diff --git a/libX11/modules/lc/def/makefile b/libX11/modules/lc/def/makefile
new file mode 100644
index 000000000..b89ce455d
--- /dev/null
+++ b/libX11/modules/lc/def/makefile
@@ -0,0 +1,5 @@
+LIBRARY = libxlcDef
+CSRCS = lcDefConv.c
+
+INCLUDES += ..\..\..\include\X11 ..\..\..\src\xlibi18n ..\..\..\src
+
diff --git a/libX11/modules/lc/gen/makefile b/libX11/modules/lc/gen/makefile
new file mode 100644
index 000000000..8fe90a5e6
--- /dev/null
+++ b/libX11/modules/lc/gen/makefile
@@ -0,0 +1,6 @@
+LIBRARY = liblcGenConvLoad
+
+CSRCS=lcGenConv.c
+
+INCLUDES += ..\..\..\include\X11 ..\..\..\src\xlibi18n ..\..\..\src
+
diff --git a/libX11/modules/lc/xlocale/makefile b/libX11/modules/lc/xlocale/makefile
new file mode 100644
index 000000000..9649982bd
--- /dev/null
+++ b/libX11/modules/lc/xlocale/makefile
@@ -0,0 +1,8 @@
+LIBRARY = libxlocale
+
+CSRCS = \
+ lcEuc.c \
+ lcJis.c \
+ lcSjis.c
+
+INCLUDES += ..\..\..\include ..\..\..\include\X11 ..\..\..\src\xlibi18n ..\..\..\src\xkb ..\..\..\src\xcms ..\..\..\src
diff --git a/libX11/modules/om/generic/makefile b/libX11/modules/om/generic/makefile
new file mode 100644
index 000000000..88c68a68b
--- /dev/null
+++ b/libX11/modules/om/generic/makefile
@@ -0,0 +1,16 @@
+LIBRARY = libxomGeneric
+
+CSRCS = \
+ omDefault.c \
+ omGeneric.c \
+ omImText.c \
+ omText.c \
+ omTextEsc.c \
+ omTextExt.c \
+ omTextPer.c \
+ omXChar.c
+
+DEFINES += XKB_IN_SERVER
+INCLUDES += ..\..\..\include\X11 ..\..\..\src\xlibi18n ..\..\..\src ..\..\..\src\xlibi18n
+
+