Commit 79bf36b0 authored by Kaleb Keithley Keithley's avatar Kaleb Keithley Keithley
Browse files

Xutf8->XFree86utf8

parent 45fea38d
......@@ -3649,7 +3649,7 @@ extern int XwcTextEscapement(
int /* num_wchars */
);
extern int Xutf8TextEscapement(
extern int XFree86utf8TextEscapement(
XFontSet /* font_set */,
_Xconst char* /* text */,
int /* bytes_text */
......@@ -3671,7 +3671,7 @@ extern int XwcTextExtents(
XRectangle* /* overall_logical_return */
);
extern int Xutf8TextExtents(
extern int XFree86utf8TextExtents(
XFontSet /* font_set */,
_Xconst char* /* text */,
int /* bytes_text */,
......@@ -3703,7 +3703,7 @@ extern Status XwcTextPerCharExtents(
XRectangle* /* overall_logical_return */
);
extern Status Xutf8TextPerCharExtents(
extern Status XFree86utf8TextPerCharExtents(
XFontSet /* font_set */,
_Xconst char* /* text */,
int /* bytes_text */,
......@@ -3735,7 +3735,7 @@ extern void XwcDrawText(
int /* nitems */
);
extern void Xutf8DrawText(
extern void XFree86utf8DrawText(
Display* /* display */,
Drawable /* d */,
GC /* gc */,
......@@ -3767,7 +3767,7 @@ extern void XwcDrawString(
int /* num_wchars */
);
extern void Xutf8DrawString(
extern void XFree86utf8DrawString(
Display* /* display */,
Drawable /* d */,
XFontSet /* font_set */,
......@@ -3800,7 +3800,7 @@ extern void XwcDrawImageString(
int /* num_wchars */
);
extern void Xutf8DrawImageString(
extern void XFree86utf8DrawImageString(
Display* /* display */,
Drawable /* d */,
XFontSet /* font_set */,
......@@ -3862,7 +3862,7 @@ extern char *XmbResetIC(
XIC /* ic */
);
extern char *Xutf8ResetIC(
extern char *XFree86utf8ResetIC(
XIC /* ic */
);
......@@ -3901,7 +3901,7 @@ extern int XwcLookupString(
Status* /* status_return */
);
extern int Xutf8LookupString(
extern int XFree86utf8LookupString(
XIC /* ic */,
XKeyPressedEvent* /* event */,
char* /* buffer_return */,
......
......@@ -170,7 +170,7 @@ typedef enum {
XTextStyle, /* text in owner's encoding (current locale)*/
XStdICCTextStyle, /* STRING, else COMPOUND_TEXT */
/* The following is an XFree86 extension, introduced in November 2000 */
XUTF8StringStyle /* UTF8_STRING */
XFree86Utf8StringStyle /* UTF8_STRING */
} XICCEncodingStyle;
typedef struct {
......@@ -672,7 +672,7 @@ extern void XmbSetWMProperties(
XClassHint* /* class_hints */
);
extern void Xutf8SetWMProperties(
extern void XFree86utf8SetWMProperties(
Display* /* display */,
Window /* w */,
_Xconst char* /* window_name */,
......@@ -744,7 +744,7 @@ extern int XwcTextListToTextProperty(
XTextProperty* text_prop_return
);
extern int Xutf8TextListToTextProperty(
extern int XFree86utf8TextListToTextProperty(
Display* display,
char** list,
int count,
......@@ -776,7 +776,7 @@ extern int XwcTextPropertyToTextList(
int* count_return
);
extern int Xutf8TextPropertyToTextList(
extern int XFree86utf8TextPropertyToTextList(
Display* display,
const XTextProperty* text_prop,
char*** list_return,
......
......@@ -1212,7 +1212,7 @@ _XimProtoWcReset(
}
Private char *
_XimCommitedUtf8String(
_XFree86imCommitedUtf8String(
Xim im,
Xic ic,
XPointer buf)
......@@ -1262,10 +1262,10 @@ Error_On_Reset:
}
Private char *
_XimProtoUtf8Reset(
_XFree86imProtoUtf8Reset(
XIC xic)
{
return _XimProtoReset(xic, _XimCommitedUtf8String);
return _XimProtoReset(xic, _XFree86imCommitedUtf8String);
}
Private XICMethodsRec ic_methods = {
......@@ -1276,10 +1276,10 @@ Private XICMethodsRec ic_methods = {
_XimProtoGetICValues, /* get_values */
_XimProtoMbReset, /* mb_reset */
_XimProtoWcReset, /* wc_reset */
_XimProtoUtf8Reset, /* utf8_reset */
_XFree86imProtoUtf8Reset, /* utf8_reset */
_XimProtoMbLookupString, /* mb_lookup_string */
_XimProtoWcLookupString, /* wc_lookup_string */
_XimProtoUtf8LookupString /* utf8_lookup_string */
_XFree86imProtoUtf8LookupString /* utf8_lookup_string */
};
Private Bool
......
......@@ -1587,7 +1587,7 @@ _XimGetEncoding(
XlcNCompoundText, lcd, XlcNWideChar)))
return False;
if (!(ctoutf8_conv = _XlcOpenConverter(lcd,
XlcNCompoundText, lcd, XlcNUtf8String)))
XlcNCompoundText, lcd, XFree86lcNUtf8String)))
return False;
}
......@@ -1602,7 +1602,7 @@ _XimGetEncoding(
XlcNCompoundText, lcd, XlcNWideChar)))
return False;
if (!(ctoutf8_conv = _XlcOpenConverter(lcd,
XlcNCompoundText, lcd, XlcNUtf8String)))
XlcNCompoundText, lcd, XFree86lcNUtf8String)))
return False;
break;
} else {
......@@ -1634,7 +1634,7 @@ _XimGetEncoding(
return False;
private->cstowc_conv = conv;
if (!(conv = _XlcOpenConverter(lcd, XlcNCharSet, lcd, XlcNUtf8String)))
if (!(conv = _XlcOpenConverter(lcd, XlcNCharSet, lcd, XFree86lcNUtf8String)))
return False;
private->cstoutf8_conv = conv;
......@@ -1642,7 +1642,7 @@ _XimGetEncoding(
return False;
private->ucstoc_conv = conv;
if (!(conv = _XlcOpenConverter(lcd, XlcNUcsChar, lcd, XlcNUtf8String)))
if (!(conv = _XlcOpenConverter(lcd, XlcNUcsChar, lcd, XFree86lcNUtf8String)))
return False;
private->ucstoutf8_conv = conv;
......
......@@ -1105,7 +1105,7 @@ _XimProtoWcLookupString(
}
Public int
_XimProtoUtf8LookupString(
_XFree86imProtoUtf8LookupString(
XIC xic,
XKeyEvent *ev,
char *buffer,
......@@ -1145,7 +1145,7 @@ _XimProtoUtf8LookupString(
_XimUnregCommitInfo(ic);
} else if (ev->type == KeyPress) {
ret = _XimLookupUTF8Text(ic, ev, buffer, bytes, keysym, NULL);
ret = _XFree86imLookupUtf8Text(ic, ev, buffer, bytes, keysym, NULL);
if (ret > 0) {
if (ret > bytes)
*state = XBufferOverflow;
......
......@@ -125,7 +125,7 @@ Private XICMethodsRec Local_ic_methods = {
_XimLocalMbReset, /* utf8_reset */
_XimLocalMbLookupString, /* mb_lookup_string */
_XimLocalWcLookupString, /* wc_lookup_string */
_XimLocalUtf8LookupString /* utf8_lookup_string */
_XFree86imLocalUtf8LookupString /* utf8_lookup_string */
};
Public XIC
......
......@@ -298,7 +298,7 @@ _XimLocalOpenIM(
goto Open_Error;
private->ctow_conv = conv;
if (!(conv = _XlcOpenConverter(lcd, XlcNCompoundText, lcd, XlcNUtf8String)))
if (!(conv = _XlcOpenConverter(lcd, XlcNCompoundText, lcd, XFree86lcNUtf8String)))
goto Open_Error;
private->ctoutf8_conv = conv;
......@@ -310,7 +310,7 @@ _XimLocalOpenIM(
goto Open_Error;
private->cstowc_conv = conv;
if (!(conv = _XlcOpenConverter(lcd, XlcNCharSet, lcd, XlcNUtf8String)))
if (!(conv = _XlcOpenConverter(lcd, XlcNCharSet, lcd, XFree86lcNUtf8String)))
goto Open_Error;
private->cstoutf8_conv = conv;
......@@ -318,7 +318,7 @@ _XimLocalOpenIM(
goto Open_Error;
private->ucstoc_conv = conv;
if (!(conv = _XlcOpenConverter(lcd, XlcNUcsChar, lcd, XlcNUtf8String)))
if (!(conv = _XlcOpenConverter(lcd, XlcNUcsChar, lcd, XFree86lcNUtf8String)))
goto Open_Error;
private->ucstoutf8_conv = conv;
......
......@@ -161,7 +161,7 @@ _XimLocalWcLookupString(xic, ev, buffer, wlen, keysym, status)
}
Public int
_XimLocalUtf8LookupString(xic, ev, buffer, bytes, keysym, status)
_XFree86imLocalUtf8LookupString(xic, ev, buffer, bytes, keysym, status)
XIC xic;
XKeyEvent *ev;
char *buffer;
......@@ -199,7 +199,7 @@ _XimLocalUtf8LookupString(xic, ev, buffer, bytes, keysym, status)
}
return (ret);
} else { /* Throughed Event */
ret = _XimLookupUTF8Text(ic, ev, buffer, bytes, keysym, NULL);
ret = _XFree86imLookupUtf8Text(ic, ev, buffer, bytes, keysym, NULL);
if(ret > 0) {
if (ret > bytes) {
if (status) *status = XBufferOverflow;
......
......@@ -47,7 +47,7 @@ extern int _Xmbstowcs(
int len
);
extern int _Xmbstoutf8(
extern int _XFree86mbstoUtf8(
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 = _Xmbstoutf8(local_utf8_buf, rhs_string_mb, LOCAL_UTF8_BUFSIZE - 1);
l = _XFree86mbstoUtf8(local_utf8_buf, rhs_string_mb, LOCAL_UTF8_BUFSIZE - 1);
if (l == LOCAL_UTF8_BUFSIZE - 1) {
local_wc_buf[l] = '\0';
}
......
......@@ -138,7 +138,7 @@ Private XICMethodsRec Thai_ic_methods = {
_XimThaiMbReset, /* utf8_reset */
_XimLocalMbLookupString, /* mb_lookup_string */
_XimLocalWcLookupString, /* wc_lookup_string */
_XimLocalUtf8LookupString /* utf8_lookup_string */
_XFree86imLocalUtf8LookupString /* utf8_lookup_string */
};
XIC
......
......@@ -106,7 +106,7 @@ _XimThaiOpenIM(im)
goto Open_Error;
private->ctow_conv = conv;
if (!(conv = _XlcOpenConverter(lcd, XlcNCompoundText, lcd, XlcNUtf8String)))
if (!(conv = _XlcOpenConverter(lcd, XlcNCompoundText, lcd, XFree86lcNUtf8String)))
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, XlcNUtf8String)))
if (!(conv = _XlcOpenConverter(lcd, XlcNCharSet, lcd, XFree86lcNUtf8String)))
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, XlcNUtf8String)))
if (!(conv = _XlcOpenConverter(lcd, XlcNUcsChar, lcd, XFree86lcNUtf8String)))
goto Open_Error;
private->ucstoutf8_conv = conv;
......
......@@ -38,7 +38,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "XlcGeneric.h"
XLCd
_XlcUtf8Loader(
_XFree86lcUtf8Loader(
const char *name)
{
XLCd lcd;
......@@ -54,8 +54,8 @@ _XlcUtf8Loader(
return (XLCd) NULL;
}
_XlcAddUtf8LocaleConverters(lcd);
_XlcAddUtf8Converters(lcd);
_XFree86lcAddUtf8LocaleConverters(lcd);
_XFree86lcAddUtf8Converters(lcd);
return lcd;
}
......@@ -784,7 +784,7 @@ _XlcDefaultLoader(
_XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNMultiByte, open_cstombs);
_XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNWideChar, open_cstowcs);
_XlcAddUtf8Converters(lcd);
_XFree86lcAddUtf8Converters(lcd);
return lcd;
}
......@@ -3142,7 +3142,7 @@ _XlcGenericLoader(
}
#endif
_XlcAddUtf8Converters(lcd);
_XFree86lcAddUtf8Converters(lcd);
return lcd;
}
......@@ -1488,7 +1488,7 @@ _XlcEucLoader(
_XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNMultiByte, open_wcstombs);
#endif
_XlcAddUtf8Converters(lcd);
_XFree86lcAddUtf8Converters(lcd);
return lcd;
}
......
......@@ -934,7 +934,7 @@ _XlcJisLoader(
}
#endif
_XlcAddUtf8Converters(lcd);
_XFree86lcAddUtf8Converters(lcd);
return lcd;
}
......
......@@ -1556,7 +1556,7 @@ _XlcSjisLoader(
_XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNMultiByte, open_wcstombs);
#endif
_XlcAddUtf8Converters(lcd);
_XFree86lcAddUtf8Converters(lcd);
return lcd;
}
......
......@@ -73,7 +73,7 @@ utf8_to_mbs(
XlcConv conv;
int to_left, ret;
conv = _XomInitConverter(oc, XOMUtf8String);
conv = _XomInitConverter(oc, XFree86OMUtf8String);
if (conv == NULL)
return False;
......@@ -116,7 +116,7 @@ err:
}
int
_Xutf8DefaultTextEscapement(XOC oc, _Xconst char *text, int length)
_XFree86utf8DefaultTextEscapement(XOC oc, _Xconst char *text, int length)
{
DefineLocalBuf;
char *buf = AllocLocalBuf(length);
......@@ -190,8 +190,9 @@ err:
}
int
_Xutf8DefaultTextExtents(XOC oc, _Xconst char *text, int length,
XRectangle *overall_ink, XRectangle *overall_logical)
_XFree86utf8DefaultTextExtents(XOC oc, _Xconst char *text, int length,
XRectangle *overall_ink,
XRectangle *overall_logical)
{
DefineLocalBuf;
char *buf = AllocLocalBuf(length);
......@@ -313,11 +314,12 @@ err:
}
Status
_Xutf8DefaultTextPerCharExtents(XOC oc, _Xconst char *text, int length,
XRectangle *ink_buf, XRectangle *logical_buf,
int buf_size, int *num_chars,
XRectangle *overall_ink,
XRectangle *overall_logical)
_XFree86utf8DefaultTextPerCharExtents(XOC oc, _Xconst char *text, int length,
XRectangle *ink_buf,
XRectangle *logical_buf,
int buf_size, int *num_chars,
XRectangle *overall_ink,
XRectangle *overall_logical)
{
DefineLocalBuf;
char *buf = AllocLocalBuf(length);
......@@ -378,8 +380,8 @@ err:
}
int
_Xutf8DefaultDrawString(Display *dpy, Drawable d, XOC oc, GC gc, int x, int y,
_Xconst char *text, int length)
_XFree86utf8DefaultDrawString(Display *dpy, Drawable d, XOC oc, GC gc,
int x, int y, _Xconst char *text, int length)
{
DefineLocalBuf;
char *buf = AllocLocalBuf(length);
......@@ -429,8 +431,8 @@ err:
}
void
_Xutf8DefaultDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
int y, _Xconst char *text, int length)
_XFree86utf8DefaultDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc,
int x, int y, _Xconst char *text, int length)
{
DefineLocalBuf;
char *buf = AllocLocalBuf(length);
......
......@@ -66,26 +66,26 @@
#if 0
extern int _XmbDefaultTextEscapement(), _XwcDefaultTextEscapement(),
_Xutf8DefaultTextEscapement();
_XFree86utf8DefaultTextEscapement();
extern int _XmbDefaultTextExtents(), _XwcDefaultTextExtents(),
_Xutf8DefaultTextExtents();
_XFree86utf8DefaultTextExtents();
extern Status _XmbDefaultTextPerCharExtents(), _XwcDefaultTextPerCharExtents(),
_Xutf8DefaultTextPerCharExtents();
_XFree86utf8DefaultTextPerCharExtents();
extern int _XmbDefaultDrawString(), _XwcDefaultDrawString(),
_Xutf8DefaultDrawString();
_XFree86utf8DefaultDrawString();
extern void _XmbDefaultDrawImageString(), _XwcDefaultDrawImageString(),
_Xutf8DefaultDrawImageString();
_XFree86utf8DefaultDrawImageString();
extern int _XmbGenericTextEscapement(), _XwcGenericTextEscapement(),
_Xutf8GenericTextEscapement();
_XFree86utf8GenericTextEscapement();
extern int _XmbGenericTextExtents(), _XwcGenericTextExtents(),
_Xutf8GenericTextExtents();
_XFree86utf8GenericTextExtents();
extern Status _XmbGenericTextPerCharExtents(), _XwcGenericTextPerCharExtents(),
_Xutf8GenericTextPerCharExtents();
_XFree86utf8GenericTextPerCharExtents();
extern int _XmbGenericDrawString(), _XwcGenericDrawString(),
_Xutf8GenericDrawString();
_XFree86utf8GenericDrawString();
extern void _XmbGenericDrawImageString(), _XwcGenericDrawImageString(),
_Xutf8GenericDrawImageString();
_XFree86utf8GenericDrawImageString();
extern void _XlcDbg_printValue (const char *str, char **value, int num);
#endif
......@@ -1583,11 +1583,11 @@ static XOCMethodsRec oc_default_methods = {
_XwcDefaultTextPerCharExtents,
_XwcDefaultDrawString,
_XwcDefaultDrawImageString,
_Xutf8DefaultTextEscapement,
_Xutf8DefaultTextExtents,
_Xutf8DefaultTextPerCharExtents,
_Xutf8DefaultDrawString,
_Xutf8DefaultDrawImageString
_XFree86utf8DefaultTextEscapement,
_XFree86utf8DefaultTextExtents,
_XFree86utf8DefaultTextPerCharExtents,
_XFree86utf8DefaultDrawString,
_XFree86utf8DefaultDrawImageString
};
static XOCMethodsRec oc_generic_methods = {
......@@ -1604,11 +1604,11 @@ static XOCMethodsRec oc_generic_methods = {
_XwcGenericTextPerCharExtents,
_XwcGenericDrawString,
_XwcGenericDrawImageString,
_Xutf8GenericTextEscapement,
_Xutf8GenericTextExtents,
_Xutf8GenericTextPerCharExtents,
_Xutf8GenericDrawString,
_Xutf8GenericDrawImageString
_XFree86utf8GenericTextEscapement,
_XFree86utf8GenericTextExtents,
_XFree86utf8GenericTextPerCharExtents,
_XFree86utf8GenericDrawString,
_XFree86utf8GenericDrawImageString
};
typedef struct _XOCMethodsListRec {
......
......@@ -81,9 +81,9 @@ _XwcGenericDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
}
void
_Xutf8GenericDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc, int x,
int y, _Xconst char *text, int length)
_XFree86utf8GenericDrawImageString(Display *dpy, Drawable d, XOC oc, GC gc,
int x, int y, _Xconst char *text, int length)
{
_XomGenericDrawImageString(dpy, d, oc, gc, x, y, XOMUtf8String,
_XomGenericDrawImageString(dpy, d, oc, gc, x, y, XFree86OMUtf8String,
(XPointer) text, length);
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment