summaryrefslogtreecommitdiff
path: root/modules/im/ximcp
diff options
context:
space:
mode:
Diffstat (limited to 'modules/im/ximcp')
-rw-r--r--modules/im/ximcp/imDefIc.c10
-rw-r--r--modules/im/ximcp/imDefIm.c8
-rw-r--r--modules/im/ximcp/imDefLkup.c4
-rw-r--r--modules/im/ximcp/imLcIc.c2
-rw-r--r--modules/im/ximcp/imLcIm.c6
-rw-r--r--modules/im/ximcp/imLcLkup.c4
-rw-r--r--modules/im/ximcp/imLcPrs.c4
-rw-r--r--modules/im/ximcp/imThaiFlt.c2
-rw-r--r--modules/im/ximcp/imThaiIc.c2
-rw-r--r--modules/im/ximcp/imThaiIm.c6
10 files changed, 24 insertions, 24 deletions
diff --git a/modules/im/ximcp/imDefIc.c b/modules/im/ximcp/imDefIc.c
index 63cd63e..8f3257e 100644
--- a/modules/im/ximcp/imDefIc.c
+++ b/modules/im/ximcp/imDefIc.c
@@ -1212,7 +1212,7 @@ _XimProtoWcReset(
}
Private char *
-_XFree86imCommitedUtf8String(
+_XimCommitedUtf8String(
Xim im,
Xic ic,
XPointer buf)
@@ -1262,10 +1262,10 @@ Error_On_Reset:
}
Private char *
-_XFree86imProtoUtf8Reset(
+_XimProtoUtf8Reset(
XIC xic)
{
- return _XimProtoReset(xic, _XFree86imCommitedUtf8String);
+ return _XimProtoReset(xic, _XimCommitedUtf8String);
}
Private XICMethodsRec ic_methods = {
@@ -1276,10 +1276,10 @@ Private XICMethodsRec ic_methods = {
_XimProtoGetICValues, /* get_values */
_XimProtoMbReset, /* mb_reset */
_XimProtoWcReset, /* wc_reset */
- _XFree86imProtoUtf8Reset, /* utf8_reset */
+ _XimProtoUtf8Reset, /* utf8_reset */
_XimProtoMbLookupString, /* mb_lookup_string */
_XimProtoWcLookupString, /* wc_lookup_string */
- _XFree86imProtoUtf8LookupString /* utf8_lookup_string */
+ _XimProtoUtf8LookupString /* utf8_lookup_string */
};
Private Bool
diff --git a/modules/im/ximcp/imDefIm.c b/modules/im/ximcp/imDefIm.c
index 30ab028..9e63102 100644
--- a/modules/im/ximcp/imDefIm.c
+++ b/modules/im/ximcp/imDefIm.c
@@ -1587,7 +1587,7 @@ _XimGetEncoding(
XlcNCompoundText, lcd, XlcNWideChar)))
return False;
if (!(ctoutf8_conv = _XlcOpenConverter(lcd,
- XlcNCompoundText, lcd, XFree86lcNUtf8String)))
+ XlcNCompoundText, lcd, XlcNUtf8String)))
return False;
}
@@ -1602,7 +1602,7 @@ _XimGetEncoding(
XlcNCompoundText, lcd, XlcNWideChar)))
return False;
if (!(ctoutf8_conv = _XlcOpenConverter(lcd,
- XlcNCompoundText, lcd, XFree86lcNUtf8String)))
+ XlcNCompoundText, lcd, XlcNUtf8String)))
return False;
break;
} else {
@@ -1634,7 +1634,7 @@ _XimGetEncoding(
return False;
private->cstowc_conv = conv;
- if (!(conv = _XlcOpenConverter(lcd, XlcNCharSet, lcd, XFree86lcNUtf8String)))
+ if (!(conv = _XlcOpenConverter(lcd, XlcNCharSet, lcd, XlcNUtf8String)))
return False;
private->cstoutf8_conv = conv;
@@ -1642,7 +1642,7 @@ _XimGetEncoding(
return False;
private->ucstoc_conv = conv;
- if (!(conv = _XlcOpenConverter(lcd, XlcNUcsChar, lcd, XFree86lcNUtf8String)))
+ if (!(conv = _XlcOpenConverter(lcd, XlcNUcsChar, lcd, XlcNUtf8String)))
return False;
private->ucstoutf8_conv = conv;
diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c
index 59cc383..21ddedf 100644
--- a/modules/im/ximcp/imDefLkup.c
+++ b/modules/im/ximcp/imDefLkup.c
@@ -1105,7 +1105,7 @@ _XimProtoWcLookupString(
}
Public int
-_XFree86imProtoUtf8LookupString(
+_XimProtoUtf8LookupString(
XIC xic,
XKeyEvent *ev,
char *buffer,
@@ -1145,7 +1145,7 @@ _XFree86imProtoUtf8LookupString(
_XimUnregCommitInfo(ic);
} else if (ev->type == KeyPress) {
- ret = _XFree86imLookupUtf8Text(ic, ev, buffer, bytes, keysym, NULL);
+ ret = _XimLookupUTF8Text(ic, ev, buffer, bytes, keysym, NULL);
if (ret > 0) {
if (ret > bytes)
*state = XBufferOverflow;
diff --git a/modules/im/ximcp/imLcIc.c b/modules/im/ximcp/imLcIc.c
index 00b4184..1fbb694 100644
--- a/modules/im/ximcp/imLcIc.c
+++ b/modules/im/ximcp/imLcIc.c
@@ -125,7 +125,7 @@ Private XICMethodsRec Local_ic_methods = {
_XimLocalMbReset, /* utf8_reset */
_XimLocalMbLookupString, /* mb_lookup_string */
_XimLocalWcLookupString, /* wc_lookup_string */
- _XFree86imLocalUtf8LookupString /* utf8_lookup_string */
+ _XimLocalUtf8LookupString /* utf8_lookup_string */
};
Public XIC
diff --git a/modules/im/ximcp/imLcIm.c b/modules/im/ximcp/imLcIm.c
index e1b6c75..e10ed91 100644
--- a/modules/im/ximcp/imLcIm.c
+++ b/modules/im/ximcp/imLcIm.c
@@ -300,7 +300,7 @@ _XimLocalOpenIM(
goto Open_Error;
private->ctow_conv = conv;
- if (!(conv = _XlcOpenConverter(lcd, XlcNCompoundText, lcd, XFree86lcNUtf8String)))
+ if (!(conv = _XlcOpenConverter(lcd, XlcNCompoundText, lcd, XlcNUtf8String)))
goto Open_Error;
private->ctoutf8_conv = conv;
@@ -312,7 +312,7 @@ _XimLocalOpenIM(
goto Open_Error;
private->cstowc_conv = conv;
- if (!(conv = _XlcOpenConverter(lcd, XlcNCharSet, lcd, XFree86lcNUtf8String)))
+ if (!(conv = _XlcOpenConverter(lcd, XlcNCharSet, lcd, XlcNUtf8String)))
goto Open_Error;
private->cstoutf8_conv = conv;
@@ -320,7 +320,7 @@ _XimLocalOpenIM(
goto Open_Error;
private->ucstoc_conv = conv;
- if (!(conv = _XlcOpenConverter(lcd, XlcNUcsChar, lcd, XFree86lcNUtf8String)))
+ if (!(conv = _XlcOpenConverter(lcd, XlcNUcsChar, lcd, XlcNUtf8String)))
goto Open_Error;
private->ucstoutf8_conv = conv;
diff --git a/modules/im/ximcp/imLcLkup.c b/modules/im/ximcp/imLcLkup.c
index b3d819b..f21e5c5 100644
--- a/modules/im/ximcp/imLcLkup.c
+++ b/modules/im/ximcp/imLcLkup.c
@@ -161,7 +161,7 @@ _XimLocalWcLookupString(xic, ev, buffer, wlen, keysym, status)
}
Public int
-_XFree86imLocalUtf8LookupString(xic, ev, buffer, bytes, keysym, status)
+_XimLocalUtf8LookupString(xic, ev, buffer, bytes, keysym, status)
XIC xic;
XKeyEvent *ev;
char *buffer;
@@ -199,7 +199,7 @@ _XFree86imLocalUtf8LookupString(xic, ev, buffer, bytes, keysym, status)
}
return (ret);
} else { /* Throughed Event */
- ret = _XFree86imLookupUtf8Text(ic, ev, buffer, bytes, keysym, NULL);
+ ret = _XimLookupUTF8Text(ic, ev, buffer, bytes, keysym, NULL);
if(ret > 0) {
if (ret > bytes) {
if (status) *status = XBufferOverflow;
diff --git a/modules/im/ximcp/imLcPrs.c b/modules/im/ximcp/imLcPrs.c
index 5122820..ee2c4b8 100644
--- a/modules/im/ximcp/imLcPrs.c
+++ b/modules/im/ximcp/imLcPrs.c
@@ -47,7 +47,7 @@ extern int _Xmbstowcs(
int len
);
-extern int _XFree86mbstoutf8(
+extern int _Xmbstoutf8(
char *ustr,
const char *str,
int len
@@ -584,7 +584,7 @@ parseline(
}
memcpy((char *)rhs_string_wc, (char *)local_wc_buf, (l + 1) * sizeof(wchar_t) );
- l = _XFree86mbstoutf8(local_utf8_buf, rhs_string_mb, LOCAL_UTF8_BUFSIZE - 1);
+ l = _Xmbstoutf8(local_utf8_buf, rhs_string_mb, LOCAL_UTF8_BUFSIZE - 1);
if (l == LOCAL_UTF8_BUFSIZE - 1) {
local_wc_buf[l] = '\0';
}
diff --git a/modules/im/ximcp/imThaiFlt.c b/modules/im/ximcp/imThaiFlt.c
index a42aa07..ae54617 100644
--- a/modules/im/ximcp/imThaiFlt.c
+++ b/modules/im/ximcp/imThaiFlt.c
@@ -1358,7 +1358,7 @@ XPointer client_data;
_Xlcwcstombs(ic->core.im->core.lcd, ic->private.local.composed->mb,
ic->private.local.composed->wc, 10);
- _XFree86lcmbstoutf8(ic->core.im->core.lcd, ic->private.local.composed->utf8,
+ _Xlcmbstoutf8(ic->core.im->core.lcd, ic->private.local.composed->utf8,
ic->private.local.composed->mb, 10);
/* Remember the last character inputted
diff --git a/modules/im/ximcp/imThaiIc.c b/modules/im/ximcp/imThaiIc.c
index c42ea57..997ee8b 100644
--- a/modules/im/ximcp/imThaiIc.c
+++ b/modules/im/ximcp/imThaiIc.c
@@ -138,7 +138,7 @@ Private XICMethodsRec Thai_ic_methods = {
_XimThaiMbReset, /* utf8_reset */
_XimLocalMbLookupString, /* mb_lookup_string */
_XimLocalWcLookupString, /* wc_lookup_string */
- _XFree86imLocalUtf8LookupString /* utf8_lookup_string */
+ _XimLocalUtf8LookupString /* utf8_lookup_string */
};
XIC
diff --git a/modules/im/ximcp/imThaiIm.c b/modules/im/ximcp/imThaiIm.c
index b8f29fa..5a3c0fa 100644
--- a/modules/im/ximcp/imThaiIm.c
+++ b/modules/im/ximcp/imThaiIm.c
@@ -106,7 +106,7 @@ _XimThaiOpenIM(im)
goto Open_Error;
private->ctow_conv = conv;
- if (!(conv = _XlcOpenConverter(lcd, XlcNCompoundText, lcd, XFree86lcNUtf8String)))
+ if (!(conv = _XlcOpenConverter(lcd, XlcNCompoundText, lcd, XlcNUtf8String)))
goto Open_Error;
private->ctoutf8_conv = conv;
@@ -118,7 +118,7 @@ _XimThaiOpenIM(im)
goto Open_Error;
private->cstowc_conv = conv;
- if (!(conv = _XlcOpenConverter(lcd, XlcNCharSet, lcd, XFree86lcNUtf8String)))
+ if (!(conv = _XlcOpenConverter(lcd, XlcNCharSet, lcd, XlcNUtf8String)))
goto Open_Error;
private->cstoutf8_conv = conv;
@@ -126,7 +126,7 @@ _XimThaiOpenIM(im)
goto Open_Error;
private->ucstoc_conv = conv;
- if (!(conv = _XlcOpenConverter(lcd, XlcNUcsChar, lcd, XFree86lcNUtf8String)))
+ if (!(conv = _XlcOpenConverter(lcd, XlcNUcsChar, lcd, XlcNUtf8String)))
goto Open_Error;
private->ucstoutf8_conv = conv;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 21:03:30 +0000