Commit 48e9a236 authored by Egbert Eich's avatar Egbert Eich
Browse files

5. Reversed Xinerama changes (Egbert Eich). 4. Reversed Xutf8* to XFree86utf8*...

5. Reversed Xinerama changes (Egbert Eich). 4. Reversed Xutf8* to XFree86utf8* function name changes for the release (Egbert Eich). 3. Removed sources for patch which were included when patch had a bad bug (Egbert Eich). 2. Removed unnecessary fonts (Egbert Eich). 1. Removed XIE and PEX extension files from release tree. The build environment has been gone already (Egbert Eich).
parent 1f42e6ce
/* $XdotOrg: lib/X11/include/X11/Xlib.h,v 1.1.4.7 2004-02-24 20:26:32 kaleb Exp $ */
/* $XdotOrg: lib/X11/include/X11/Xlib.h,v 1.1.4.7.2.1 2004-02-27 21:30:50 eich Exp $ */
/* $Xorg: Xlib.h,v 1.6 2001/02/09 02:03:38 xorgcvs Exp $ */
/*
......@@ -3654,14 +3654,11 @@ extern int XwcTextEscapement(
int /* num_wchars */
);
extern int XFree86utf8TextEscapement(
extern int Xutf8TextEscapement(
XFontSet /* font_set */,
_Xconst char* /* text */,
int /* bytes_text */
);
#ifndef NOXFREE86COMPAT
#define Xutf8TextEscapement XFree86utf8TextEscapement
#endif
extern int XmbTextExtents(
XFontSet /* font_set */,
......@@ -3679,16 +3676,13 @@ extern int XwcTextExtents(
XRectangle* /* overall_logical_return */
);
extern int XFree86utf8TextExtents(
extern int Xutf8TextExtents(
XFontSet /* font_set */,
_Xconst char* /* text */,
int /* bytes_text */,
XRectangle* /* overall_ink_return */,
XRectangle* /* overall_logical_return */
);
#ifndef NOXFREE86COMPAT
#define Xutf8TextExtents XFree86utf8TextExtents
#endif
extern Status XmbTextPerCharExtents(
XFontSet /* font_set */,
......@@ -3714,7 +3708,7 @@ extern Status XwcTextPerCharExtents(
XRectangle* /* overall_logical_return */
);
extern Status XFree86utf8TextPerCharExtents(
extern Status Xutf8TextPerCharExtents(
XFontSet /* font_set */,
_Xconst char* /* text */,
int /* bytes_text */,
......@@ -3725,9 +3719,6 @@ extern Status XFree86utf8TextPerCharExtents(
XRectangle* /* overall_ink_return */,
XRectangle* /* overall_logical_return */
);
#ifndef NOXFREE86COMPAT
#define Xutf8TextPerCharExtents XFree86utf8TextPerCharExtents
#endif
extern void XmbDrawText(
Display* /* display */,
......@@ -3749,7 +3740,7 @@ extern void XwcDrawText(
int /* nitems */
);
extern void XFree86utf8DrawText(
extern void Xutf8DrawText(
Display* /* display */,
Drawable /* d */,
GC /* gc */,
......@@ -3758,9 +3749,6 @@ extern void XFree86utf8DrawText(
XmbTextItem* /* text_items */,
int /* nitems */
);
#ifndef NOXFREE86COMPAT
#define Xutf8DrawText XFree86utf8DrawText
#endif
extern void XmbDrawString(
Display* /* display */,
......@@ -3784,7 +3772,7 @@ extern void XwcDrawString(
int /* num_wchars */
);
extern void XFree86utf8DrawString(
extern void Xutf8DrawString(
Display* /* display */,
Drawable /* d */,
XFontSet /* font_set */,
......@@ -3794,9 +3782,6 @@ extern void XFree86utf8DrawString(
_Xconst char* /* text */,
int /* bytes_text */
);
#ifndef NOXFREE86COMPAT
#define Xutf8DrawString XFree86utf8DrawString
#endif
extern void XmbDrawImageString(
Display* /* display */,
......@@ -3820,7 +3805,7 @@ extern void XwcDrawImageString(
int /* num_wchars */
);
extern void XFree86utf8DrawImageString(
extern void Xutf8DrawImageString(
Display* /* display */,
Drawable /* d */,
XFontSet /* font_set */,
......@@ -3830,9 +3815,6 @@ extern void XFree86utf8DrawImageString(
_Xconst char* /* text */,
int /* bytes_text */
);
#ifndef NOXFREE86COMPAT
#define Xutf8DrawImageString XFree86utf8DrawImageString
#endif
extern XIM XOpenIM(
Display* /* dpy */,
......@@ -3885,12 +3867,9 @@ extern char *XmbResetIC(
XIC /* ic */
);
extern char *XFree86utf8ResetIC(
extern char *Xutf8ResetIC(
XIC /* ic */
);
#ifndef NOXFREE86COMPAT
#define Xutf8ResetIC XFree86utf8ResetIC
#endif
extern char *XSetICValues(
XIC /* ic */, ...
......@@ -3927,7 +3906,7 @@ extern int XwcLookupString(
Status* /* status_return */
);
extern int XFree86utf8LookupString(
extern int Xutf8LookupString(
XIC /* ic */,
XKeyPressedEvent* /* event */,
char* /* buffer_return */,
......@@ -3935,9 +3914,6 @@ extern int XFree86utf8LookupString(
KeySym* /* keysym_return */,
Status* /* status_return */
);
#ifndef NOXFREE86COMPAT
#define Xutf8LookupString XFree86utf8LookupString
#endif
extern XVaNestedList XVaCreateNestedList(
int /*unused*/, ...
......
......@@ -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 */
XFree86Utf8StringStyle /* UTF8_STRING */
XUTF8StringStyle /* UTF8_STRING */
} XICCEncodingStyle;
typedef struct {
......@@ -672,7 +672,7 @@ extern void XmbSetWMProperties(
XClassHint* /* class_hints */
);
extern void XFree86utf8SetWMProperties(
extern void Xutf8SetWMProperties(
Display* /* display */,
Window /* w */,
_Xconst char* /* window_name */,
......@@ -683,9 +683,6 @@ extern void XFree86utf8SetWMProperties(
XWMHints* /* wm_hints */,
XClassHint* /* class_hints */
);
#ifndef NOXFREE86COMPAT
#define Xutf8SetWMProperties XFree86utf8SetWMProperties
#endif
extern void XSetWMSizeHints(
Display* /* display */,
......@@ -747,16 +744,13 @@ extern int XwcTextListToTextProperty(
XTextProperty* text_prop_return
);
extern int XFree86utf8TextListToTextProperty(
extern int Xutf8TextListToTextProperty(
Display* display,
char** list,
int count,
XICCEncodingStyle style,
XTextProperty* text_prop_return
);
#ifndef NOXFREE86COMPAT
#define Xutf8TextListToTextProperty XFree86utf8TextListToTextProperty
#endif
extern void XwcFreeStringList(
wchar_t** list
......@@ -782,15 +776,12 @@ extern int XwcTextPropertyToTextList(
int* count_return
);
extern int XFree86utf8TextPropertyToTextList(
extern int Xutf8TextPropertyToTextList(
Display* display,
const XTextProperty* text_prop,
char*** list_return,
int* count_return
);
#ifndef NOXFREE86COMPAT
#define Xutf8TextPropertyToTextList XFree86utf8TextPropertyToTextList
#endif
extern int XUnionRectWithRegion(
XRectangle* /* rectangle */,
......
......@@ -143,7 +143,7 @@
.ny0
.TH XSetWMProperties 3X11 __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
XSetWMProperties, XmbSetWMProperties, XFree86utf8SetWMProperties \- set standard window properties
XSetWMProperties, XmbSetWMProperties, Xutf8SetWMProperties \- set standard window properties
.SH SYNTAX
.HP
void XSetWMProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
......@@ -156,7 +156,7 @@ void XmbSetWMProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
\fIargc\fP\^, XSizeHints *\fInormal_hints\fP\^, XWMHints *\fIwm_hints\fP\^,
XClassHint *\fIclass_hints\fP\^);
.HP
void XFree86utf8SetWMProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
void Xutf8SetWMProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
*\fIwindow_name\fP\^, char *\fIicon_name\fP\^, char *\fIargv\fP\^[], int
\fIargc\fP\^, XSizeHints *\fInormal_hints\fP\^, XWMHints *\fIwm_hints\fP\^,
XClassHint *\fIclass_hints\fP\^);
......@@ -243,7 +243,7 @@ any directory prefixes, is substituted for res_name.
The
.ZN XmbSetWMProperties
and
.ZN XFree86utf8SetWMProperties
.ZN Xutf8SetWMProperties
convenience functions provide a simple programming interface
for setting those essential window properties that are used
for communicating with other clients
......@@ -256,7 +256,7 @@ they set the WM_ICON_NAME property.
The window_name and icon_name arguments are null-terminated strings, for
.ZN XmbSetWMProperties
in the encoding of the current locale, for
.ZN XFree86utf8SetWMProperties
.ZN Xutf8SetWMProperties
in UTF-8 encoding.
If the arguments can be fully converted to the STRING encoding,
the properties are created with type ``STRING'';
......@@ -266,14 +266,14 @@ and the properties are created with type ``COMPOUND_TEXT''.
If the normal_hints argument is non-NULL,
.ZN XmbSetWMProperties
and
.ZN XFree86utf8SetWMProperties
.ZN Xutf8SetWMProperties
call
.ZN XSetWMNormalHints ,
which sets the WM_NORMAL_HINTS property (see section 14.1.7).
If the wm_hints argument is non-NULL,
.ZN XmbSetWMProperties
and
.ZN XFree86utf8SetWMProperties
.ZN Xutf8SetWMProperties
call
.ZN XSetWMHints ,
which sets the WM_HINTS property (see section 14.1.6).
......@@ -281,7 +281,7 @@ which sets the WM_HINTS property (see section 14.1.6).
If the argv argument is non-NULL,
.ZN XmbSetWMProperties
and
.ZN XFree86utf8SetWMProperties
.ZN Xutf8SetWMProperties
set the WM_COMMAND property from argv and argc.
An argc of zero indicates a zero-length command.
.LP
......@@ -292,7 +292,7 @@ The hostname of the machine is stored using
If the class_hints argument is non-NULL,
.ZN XmbSetWMProperties
and
.ZN XFree86utf8SetWMProperties
.ZN Xutf8SetWMProperties
set the WM_CLASS property.
If the res_name member in the
.ZN XClassHint
......@@ -315,7 +315,7 @@ in the properties.
For clients that need to process the property text in a locale,
.ZN XmbSetWMProperties
and
.ZN XFree86utf8SetWMProperties
.ZN Xutf8SetWMProperties
set the WM_LOCALE_NAME property to be the name of the current locale.
The name is assumed to be in the Host Portable Character Encoding
and is converted to STRING for storage in the property.
......@@ -323,7 +323,7 @@ and is converted to STRING for storage in the property.
.ZN XSetWMProperties ,
.ZN XmbSetWMProperties
and
.ZN XFree86utf8SetWMProperties
.ZN Xutf8SetWMProperties
can generate
.ZN BadAlloc
and
......@@ -331,7 +331,7 @@ and
errors.
.LP
The function
.ZN XFree86utf8SetWMProperties
.ZN Xutf8SetWMProperties
is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
indicated by the macro
.ZN X_HAVE_UTF8_STRING .
......
......@@ -42,7 +42,7 @@
.\" It is provided ``as is'' without express or implied warranty.
.\"
.\" $XFree86: xc/doc/man/X11/XSLTTProp.man,v 1.6 2003/11/23 05:40:33 dawes Exp $
.\" $XdotOrg: lib/X11/man/XStringListToTextProperty.man,v 1.1.4.4 2003-12-08 21:35:37 kaleb Exp $
.\" $XdotOrg: lib/X11/man/XStringListToTextProperty.man,v 1.1.4.4.4.1 2004-02-27 21:30:43 eich Exp $
.\"
.ds xT X Toolkit Intrinsics \- C Language Interface
.ds xW Athena X Widgets \- C Language X Toolkit Interface
......@@ -216,7 +216,7 @@ The
.ZN XFreeStringList
function releases memory allocated by
.ZN XmbTextPropertyToTextList ,
.ZN XFree86utf8TextPropertyToTextList
.ZN Xutf8TextPropertyToTextList
and
.ZN XTextPropertyToStringList
and the missing charset list allocated by
......
......@@ -143,7 +143,7 @@
.ny0
.TH XmbDrawImageString 3X11 __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
XmbDrawImageString, XwcDrawImageString, XFree86utf8DrawImageString \- draw image text using a single font set
XmbDrawImageString, XwcDrawImageString, Xutf8DrawImageString \- draw image text using a single font set
.SH SYNTAX
.HP
void XmbDrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
......@@ -154,7 +154,7 @@ void XwcDrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^,
wchar_t *\fIstring\fP\^, int \fInum_wchars\fP\^);
.HP
void XFree86utf8DrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
void Xutf8DrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char
*\fIstring\fP\^, int \fInum_bytes\fP\^);
.SH ARGUMENTS
......@@ -183,14 +183,14 @@ The
.ZN XmbDrawImageString ,
.ZN XwcDrawImageString
and
.ZN XFree86utf8DrawImageString
.ZN Xutf8DrawImageString
functions fill a destination rectangle with the background pixel defined
in the GC and then paint the text with the foreground pixel.
The filled rectangle is the rectangle returned to overall_logical_return by
.ZN XmbTextExtents ,
.ZN XwcTextExtents
or
.ZN XFree86utf8TextExtents
.ZN Xutf8TextExtents
for the same text and
.ZN XFontSet .
.LP
......@@ -202,7 +202,7 @@ with the default string returned by
The behavior for an invalid codepoint is undefined.
.LP
The function
.ZN XFree86utf8TextExtents
.ZN Xutf8TextExtents
is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
indicated by the macro
.ZN X_HAVE_UTF8_STRING .
......
......@@ -143,7 +143,7 @@
.ny0
.TH XmbDrawString 3X11 __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
XmbDrawString, XwcDrawString, XFree86utf8DrawString \- draw text using a single font set
XmbDrawString, XwcDrawString, Xutf8DrawString \- draw text using a single font set
.SH SYNTAX
.HP
void XmbDrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, XFontSet
......@@ -154,7 +154,7 @@ void XwcDrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, XFontSet
\fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, wchar_t
*\fIstring\fP\^, int \fInum_wchars\fP\^);
.HP
void XFree86utf8DrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
void Xutf8DrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char
*\fIstring\fP\^, int \fInum_bytes\fP\^);
.SH ARGUMENTS
......@@ -183,7 +183,7 @@ The
.ZN XmbDrawString ,
.ZN XwcDrawString
and
.ZN XFree86utf8DrawString
.ZN Xutf8DrawString
functions draw the specified text with the foreground pixel.
When the
.ZN XFontSet
......@@ -193,7 +193,7 @@ with the default string returned by
The behavior for an invalid codepoint is undefined.
.LP
The function
.ZN XFree86utf8DrawString
.ZN Xutf8DrawString
is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
indicated by the macro
.ZN X_HAVE_UTF8_STRING .
......
......@@ -42,7 +42,7 @@
.\" It is provided ``as is'' without express or implied warranty.
.\"
.\" $XFree86: xc/doc/man/X11/XmbDTxt.man,v 1.5 2003/11/23 05:40:33 dawes Exp $
.\" $XdotOrg: lib/X11/man/XmbDrawText.man,v 1.1.4.4 2003-12-08 21:35:37 kaleb Exp $
.\" $XdotOrg: lib/X11/man/XmbDrawText.man,v 1.1.4.4.4.1 2004-02-27 21:30:43 eich Exp $
.\"
.ds xT X Toolkit Intrinsics \- C Language Interface
.ds xW Athena X Widgets \- C Language X Toolkit Interface
......@@ -144,7 +144,7 @@
.ny0
.TH XmbDrawText 3X11 __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
XmbDrawText, XwcDrawText, XFree86utf8DrawText \- draw text using multiple font sets
XmbDrawText, XwcDrawText, Xutf8DrawText \- draw text using multiple font sets
.SH SYNTAX
.HP
void XmbDrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
......@@ -155,7 +155,7 @@ void XwcDrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XwcTextItem *\fIitems\fP\^, int
\fInitems\fP\^);
.HP
void XFree86utf8DrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
void Xutf8DrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XmbTextItem *\fIitems\fP\^, int \fInitems\fP\^);
.SH ARGUMENTS
.IP \fId\fP 1i
......@@ -179,7 +179,7 @@ The
.ZN XmbDrawText ,
.ZN XwcDrawText
and
.ZN XFree86utf8DrawText
.ZN Xutf8DrawText
functions allow complex spacing and font set shifts between text strings.
Each text item is processed in turn, with the origin of a text
element advanced in the primary draw direction by the escapement of the
......@@ -197,16 +197,16 @@ will not be drawn.
.ZN XmbDrawText ,
.ZN XwcDrawText
and
.ZN XFree86utf8DrawText
.ZN Xutf8DrawText
do not perform any context-dependent rendering between text segments.
Clients may compute the drawing metrics by passing each text segment to
.ZN XmbTextExtents ,
.ZN XwcTextExtents ,
.ZN XFree86utf8TextExtents
.ZN Xutf8TextExtents
or
.ZN XmbTextPerCharExtents ,
.ZN XwcTextPerCharExtents .
.ZN XFree86utf8TextPerCharExtents .
.ZN Xutf8TextPerCharExtents .
When the
.ZN XFontSet
has missing charsets, each unavailable character is drawn
......@@ -215,7 +215,7 @@ with the default string returned by
The behavior for an invalid codepoint is undefined.
.LP
The function
.ZN XFree86utf8DrawText
.ZN Xutf8DrawText
is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
indicated by the macro
.ZN X_HAVE_UTF8_STRING .
......
......@@ -145,7 +145,7 @@
'\" t
.TH XmbLookupString 3X11 __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
XmbLookupString, XwcLookupString, XFree86utf8LookupString \- obtain composed input from an input method
XmbLookupString, XwcLookupString, Xutf8LookupString \- obtain composed input from an input method
.SH SYNTAX
.HP
int XmbLookupString\^(\^XIC \fIic\fP\^, XKeyPressedEvent *\fIevent\fP, char
......@@ -156,7 +156,7 @@ int XwcLookupString\^(\^XIC \fIic\fP\^, XKeyPressedEvent *\fIevent\fP\^,
wchar_t *\fIbuffer_return\fP\^, int \fIwchars_buffer\fP\^, KeySym
*\fIkeysym_return\fP\^, Status *\fIstatus_return\fP\^);
.HP
int XFree86utf8LookupString\^(\^XIC \fIic\fP\^, XKeyPressedEvent *\fIevent\fP, char
int Xutf8LookupString\^(\^XIC \fIic\fP\^, XKeyPressedEvent *\fIevent\fP, char
*\fIbuffer_return\fP\^, int \fIbytes_buffer\fP\^, KeySym
*\fIkeysym_return\fP\^, Status *\fIstatus_return\fP\^);
.SH ARGUMENTS
......@@ -182,7 +182,7 @@ The
.ZN XmbLookupString ,
.ZN XwcLookupString
and
.ZN XFree86utf8LookupString
.ZN Xutf8LookupString
functions return the string from the input method specified
in the buffer_return argument.
If no string is returned,
......@@ -196,7 +196,7 @@ the KeySym value does not necessarily correspond to the string returned.
.LP
.ZN XmbLookupString
and
.ZN XFree86utf8LookupString
.ZN Xutf8LookupString
return the length of the string in bytes, and
.ZN XwcLookupString
returns the length of the string in characters.
......@@ -206,7 +206,7 @@ and
.ZN XwcLookupString
return text in the encoding of the locale bound to the input method
of the specified input context, and
.ZN XFree86utf8LookupString
.ZN Xutf8LookupString
returns text in UTF-8 encoding.
.LP
Each string returned by
......@@ -223,7 +223,7 @@ events to
.ZN XmbLookupString ,
.ZN XwcLookupString
and
.ZN XFree86utf8LookupString .
.ZN Xutf8LookupString .
Their behavior when a client passes a
.ZN KeyRelease
event is undefined.
......@@ -242,7 +242,7 @@ T} T{
The input string to be returned is too large for the supplied buffer_return.
The required size (for
.ZN XmbLookupString ,
.ZN XFree86utf8LookupString
.ZN Xutf8LookupString
in bytes; for
.ZN XwcLookupString
in characters) is returned as the value of the function,
......@@ -289,18 +289,18 @@ It does not make any difference if the input context passed as an argument to
.ZN XmbLookupString ,
.ZN XwcLookupString
and
.ZN XFree86utf8LookupString
.ZN Xutf8LookupString
is the one currently in possession of the focus or not.
Input may have been composed within an input context before it lost the focus,
and that input may be returned on subsequent calls to
.ZN XmbLookupString ,
.ZN XwcLookupString
or
.ZN XFree86utf8LookupString
.ZN Xutf8LookupString
even though it does not have any more keyboard focus.
.LP
The function
.ZN XFree86utf8LookupString
.ZN Xutf8LookupString
is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
indicated by the macro
.ZN X_HAVE_UTF8_STRING .
......
......@@ -143,14 +143,14 @@
.ny0
.TH XmbResetIC 3X11 __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
XmbResetIC, XwcResetIC, XFree86utf8ResetIC \- reset the state of an input context
XmbResetIC, XwcResetIC, Xutf8ResetIC \- reset the state of an input context
.SH SYNTAX
.HP
char *XmbResetIC\^(\^XIC \fIic\fP\^);
.HP
wchar_t *XwcResetIC\^(\^XIC \fIic\fP\^);
.HP
char *XFree86utf8ResetIC\^(\^XIC \fIic\fP\^);
char *Xutf8ResetIC\^(\^XIC \fIic\fP\^);
.SH ARGUMENTS
.IP \fIic\fP 1i
Specifies the input context.
......@@ -162,7 +162,7 @@ is set to
.ZN XmbResetIC ,
.ZN XwcResetIC
and
.ZN XFree86utf8ResetIC
.ZN Xutf8ResetIC
reset an input context to its initial state;
when
.ZN XNResetState
......@@ -176,7 +176,7 @@ Calling
.ZN XmbResetIC ,
.ZN XwcResetIC
or
.ZN XFree86utf8ResetIC
.ZN Xutf8ResetIC
does not change the focus.
.LP
The return value of
......@@ -186,7 +186,7 @@ The return value of
.ZN XwcResetIC
is its current preedit string as a wide character string.
The return value of
.ZN XFree86utf8ResetIC
.ZN Xutf8ResetIC
is its current preedit string as an UTF-8 string.
If there is any preedit text drawn or visible to the user,
then these procedures must return a non-NULL string.
......@@ -198,7 +198,7 @@ The client should free the returned string by calling
.ZN XFree .
.LP
The function
.ZN XFree86utf8ResetIC
.ZN Xutf8ResetIC
is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
indicated by the macro
.ZN X_HAVE_UTF8_STRING .
......
......@@ -143,7 +143,7 @@
.ny0
.TH XmbTextEscapement 3X11 __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
XmbTextEscapement, XwcTextEscapement, XFree86utf8TextEscapement \- obtain the escapement of text
XmbTextEscapement, XwcTextEscapement, Xutf8TextEscapement \- obtain the escapement of text
.SH SYNTAX
.HP
int XmbTextEscapement\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int
......@@ -152,7 +152,7 @@ int XmbTextEscapement\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int
int XwcTextEscapement\^(\^XFontSet \fIfont_set\fP\^, wchar_t *\fIstring\fP\^,
int \fInum_wchars\fP\^);
.HP
int XFree86utf8TextEscapement\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^,
int Xutf8TextEscapement\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^,
int \fInum_bytes\fP\^);
.SH ARGUMENTS
.IP \fIfont_set\fP 1i
......@@ -168,7 +168,7 @@ The
.ZN XmbTextEscapement ,
.ZN XwcTextEscapement
and
.ZN XFree86utf8TextEscapement
.ZN Xutf8TextEscapement
functions return the escapement in pixels of the specified string as a value,
using the fonts loaded for the specified font set.
The escapement is the distance in pixels in the primary draw
......@@ -180,7 +180,7 @@ Regardless of the character rendering order,
the escapement is always positive.
.LP
The function
.ZN XFree86utf8TextEscapement
.ZN Xutf8TextEscapement
is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
indicated by the macro
.ZN X_HAVE_UTF8_STRING .
......
......@@ -143,7 +143,7 @@
.ny0
.TH XmbTextExtents 3X11 __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
XmbTextExtents, XwcTextExtents, XFree86utf8TextExtents \- compute text extents
XmbTextExtents, XwcTextExtents, Xutf8TextExtents \- compute text extents
.SH SYNTAX
.HP
int XmbTextExtents\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int
......@@ -154,7 +154,7 @@ int XwcTextExtents\^(\^XFontSet \fIfont_set\fP\^, wchar_t *\fIstring\fP\^, int
\fInum_wchars\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle
*\fIoverall_logical_return\fP\^);
.HP
int XFree86utf8TextExtents\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int
int Xutf8TextExtents\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int
\fInum_bytes\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle
*\fIoverall_logical_return\fP\^);
.SH ARGUMENTS
......@@ -176,7 +176,7 @@ The
.ZN XmbTextExtents ,
.ZN XwcTextExtents
and
.ZN XFree86utf8TextExtents
.ZN Xutf8TextExtents
functions set the components of the specified overall_ink_return and
overall_logical_return
arguments to the overall bounding box of the string's image
......@@ -185,7 +185,7 @@ They return the value returned by
.ZN XmbTextEscapement ,
.ZN XwcTextEscapement
or
.ZN XFree86utf8TextEscapement .
.ZN Xutf8TextEscapement .
These metrics are relative to the drawing origin of the string,
using the fonts loaded for the specified font set.
.LP
......@@ -216,7 +216,7 @@ so that the metrics represent the text as it will actually be drawn.