mirror of
https://gitlab.freedesktop.org/xorg/lib/libx11.git
synced 2026-05-09 04:58:06 +02:00
fix bad merge
This commit is contained in:
Kaleb Keithley
parent
c568351b30
commit
12e9abcfd0
5 changed files with 0 additions and 208 deletions
|
|
@ -1146,14 +1146,6 @@ extern void XkbUpdateKeyTypeVirtualMods(
|
|||
XkbChangesPtr /* changes */
|
||||
);
|
||||
|
||||
extern Bool XkbApplyVirtualModChanges(
|
||||
#if NeedFunctionPrototypes
|
||||
XkbDescPtr /* xkb */,
|
||||
unsigned int /* changed */,
|
||||
XkbChangesPtr /* changes */
|
||||
#endif
|
||||
);
|
||||
|
||||
_XFUNCPROTOEND
|
||||
|
||||
#endif /* _XKBLIB_H_ */
|
||||
|
|
|
|||
|
|
@ -3655,14 +3655,6 @@ extern int Xutf8TextEscapement(
|
|||
int /* bytes_text */
|
||||
);
|
||||
|
||||
extern int Xutf8TextEscapement(
|
||||
#if NeedFunctionPrototypes
|
||||
XFontSet /* font_set */,
|
||||
_Xconst char* /* text */,
|
||||
int /* bytes_text */
|
||||
#endif
|
||||
);
|
||||
|
||||
extern int XmbTextExtents(
|
||||
XFontSet /* font_set */,
|
||||
_Xconst char* /* text */,
|
||||
|
|
@ -3687,16 +3679,6 @@ extern int Xutf8TextExtents(
|
|||
XRectangle* /* overall_logical_return */
|
||||
);
|
||||
|
||||
extern int Xutf8TextExtents(
|
||||
#if NeedFunctionPrototypes
|
||||
XFontSet /* font_set */,
|
||||
_Xconst char* /* text */,
|
||||
int /* bytes_text */,
|
||||
XRectangle* /* overall_ink_return */,
|
||||
XRectangle* /* overall_logical_return */
|
||||
#endif
|
||||
);
|
||||
|
||||
extern Status XmbTextPerCharExtents(
|
||||
XFontSet /* font_set */,
|
||||
_Xconst char* /* text */,
|
||||
|
|
@ -3733,20 +3715,6 @@ extern Status Xutf8TextPerCharExtents(
|
|||
XRectangle* /* overall_logical_return */
|
||||
);
|
||||
|
||||
extern Status Xutf8TextPerCharExtents(
|
||||
#if NeedFunctionPrototypes
|
||||
XFontSet /* font_set */,
|
||||
_Xconst char* /* text */,
|
||||
int /* bytes_text */,
|
||||
XRectangle* /* ink_extents_buffer */,
|
||||
XRectangle* /* logical_extents_buffer */,
|
||||
int /* buffer_size */,
|
||||
int* /* num_chars */,
|
||||
XRectangle* /* overall_ink_return */,
|
||||
XRectangle* /* overall_logical_return */
|
||||
#endif
|
||||
);
|
||||
|
||||
extern void XmbDrawText(
|
||||
Display* /* display */,
|
||||
Drawable /* d */,
|
||||
|
|
@ -3777,18 +3745,6 @@ extern void Xutf8DrawText(
|
|||
int /* nitems */
|
||||
);
|
||||
|
||||
extern void Xutf8DrawText(
|
||||
#if NeedFunctionPrototypes
|
||||
Display* /* display */,
|
||||
Drawable /* d */,
|
||||
GC /* gc */,
|
||||
int /* x */,
|
||||
int /* y */,
|
||||
XmbTextItem* /* text_items */,
|
||||
int /* nitems */
|
||||
#endif
|
||||
);
|
||||
|
||||
extern void XmbDrawString(
|
||||
Display* /* display */,
|
||||
Drawable /* d */,
|
||||
|
|
@ -3822,19 +3778,6 @@ extern void Xutf8DrawString(
|
|||
int /* bytes_text */
|
||||
);
|
||||
|
||||
extern void Xutf8DrawString(
|
||||
#if NeedFunctionPrototypes
|
||||
Display* /* display */,
|
||||
Drawable /* d */,
|
||||
XFontSet /* font_set */,
|
||||
GC /* gc */,
|
||||
int /* x */,
|
||||
int /* y */,
|
||||
_Xconst char* /* text */,
|
||||
int /* bytes_text */
|
||||
#endif
|
||||
);
|
||||
|
||||
extern void XmbDrawImageString(
|
||||
Display* /* display */,
|
||||
Drawable /* d */,
|
||||
|
|
@ -3868,19 +3811,6 @@ extern void Xutf8DrawImageString(
|
|||
int /* bytes_text */
|
||||
);
|
||||
|
||||
extern void Xutf8DrawImageString(
|
||||
#if NeedFunctionPrototypes
|
||||
Display* /* display */,
|
||||
Drawable /* d */,
|
||||
XFontSet /* font_set */,
|
||||
GC /* gc */,
|
||||
int /* x */,
|
||||
int /* y */,
|
||||
_Xconst char* /* text */,
|
||||
int /* bytes_text */
|
||||
#endif
|
||||
);
|
||||
|
||||
extern XIM XOpenIM(
|
||||
Display* /* dpy */,
|
||||
struct _XrmHashBucketRec* /* rdb */,
|
||||
|
|
@ -3942,12 +3872,6 @@ extern char *Xutf8ResetIC(
|
|||
XIC /* ic */
|
||||
);
|
||||
|
||||
extern char *Xutf8ResetIC(
|
||||
#if NeedFunctionPrototypes
|
||||
XIC /* ic */
|
||||
#endif
|
||||
);
|
||||
|
||||
extern char *XSetICValues(
|
||||
XIC /* ic */, ...
|
||||
);
|
||||
|
|
@ -3992,17 +3916,6 @@ extern int Xutf8LookupString(
|
|||
Status* /* status_return */
|
||||
);
|
||||
|
||||
extern int Xutf8LookupString(
|
||||
#if NeedFunctionPrototypes
|
||||
XIC /* ic */,
|
||||
XKeyPressedEvent* /* event */,
|
||||
char* /* buffer_return */,
|
||||
int /* bytes_buffer */,
|
||||
KeySym* /* keysym_return */,
|
||||
Status* /* status_return */
|
||||
#endif
|
||||
);
|
||||
|
||||
extern XVaNestedList XVaCreateNestedList(
|
||||
int /*unused*/, ...
|
||||
);
|
||||
|
|
|
|||
|
|
@ -956,17 +956,6 @@ extern void _XGetAsyncData(
|
|||
int /* datalen */,
|
||||
int /* discardtotal */
|
||||
);
|
||||
extern void _XGetAsyncData(
|
||||
#if NeedFunctionPrototypes
|
||||
Display* /* dpy */,
|
||||
char * /* data */,
|
||||
char * /* buf */,
|
||||
int /* len */,
|
||||
int /* skip */,
|
||||
int /* datalen */,
|
||||
int /* discardtotal */
|
||||
#endif
|
||||
);
|
||||
extern void _XFlush(
|
||||
Display* /* dpy */
|
||||
);
|
||||
|
|
@ -1031,33 +1020,12 @@ extern int _XFreeExtData(
|
|||
XExtData* /* extension */
|
||||
);
|
||||
|
||||
extern Bool _XUnknownWireEvent(
|
||||
#if NeedFunctionPrototypes
|
||||
Display* /* dpy */,
|
||||
XEvent* /* re */,
|
||||
xEvent* /* event */
|
||||
#endif
|
||||
);
|
||||
extern Status _XUnknownNativeEvent(
|
||||
#if NeedFunctionPrototypes
|
||||
Display* /* dpy */,
|
||||
XEvent* /* re */,
|
||||
xEvent* /* event */
|
||||
#endif
|
||||
);
|
||||
|
||||
extern Bool _XWireToEvent(Display *dpy, XEvent *re, xEvent *event);
|
||||
extern Bool _XDefaultWireError(Display *display, XErrorEvent *he, xError *we);
|
||||
extern Bool _XPollfdCacheInit(Display *dpy);
|
||||
extern XID _XAllocID(Display *dpy);
|
||||
extern void _XAllocIDs(Display *dpy, XID *ids, int count);
|
||||
|
||||
extern int _XFreeExtData(
|
||||
#if NeedFunctionPrototypes
|
||||
XExtData* /* extension */
|
||||
#endif
|
||||
);
|
||||
|
||||
extern int (*XESetCreateGC(
|
||||
Display* /* display */,
|
||||
int /* extension */,
|
||||
|
|
|
|||
|
|
@ -496,17 +496,6 @@ extern Bool _XimError(
|
|||
char *detail
|
||||
);
|
||||
|
||||
extern Bool _XimError(
|
||||
#if NeedFunctionPrototypes
|
||||
Xim im,
|
||||
Xic ic,
|
||||
CARD16 error_code,
|
||||
INT16 detail_length,
|
||||
CARD16 type,
|
||||
char *detail
|
||||
#endif
|
||||
);
|
||||
|
||||
extern Bool _XimRegisterTriggerKeysCallback(
|
||||
Xim im,
|
||||
INT16 len,
|
||||
|
|
@ -654,17 +643,6 @@ extern int _Ximctstoutf8(
|
|||
Status *state
|
||||
);
|
||||
|
||||
extern int _Ximctstoutf8(
|
||||
#if NeedFunctionPrototypes
|
||||
XIM im,
|
||||
char *from,
|
||||
int from_len,
|
||||
char *to,
|
||||
int to_len,
|
||||
Status *state
|
||||
#endif
|
||||
);
|
||||
|
||||
extern int _XimLcctstombs(
|
||||
XIM im,
|
||||
char *from,
|
||||
|
|
@ -697,17 +675,6 @@ extern int _XimCheckDataSize(
|
|||
int len
|
||||
);
|
||||
|
||||
extern int _XimLcctstoutf8(
|
||||
#if NeedFunctionPrototypes
|
||||
XIM im,
|
||||
char *from,
|
||||
int from_len,
|
||||
char *to,
|
||||
int to_len,
|
||||
Status *state
|
||||
#endif
|
||||
);
|
||||
|
||||
extern void _XimSetHeader(
|
||||
XPointer buf,
|
||||
CARD8 major_opcode,
|
||||
|
|
@ -747,17 +714,6 @@ extern int _XimProtoUtf8LookupString(
|
|||
Status *state
|
||||
);
|
||||
|
||||
extern int _XimProtoUtf8LookupString(
|
||||
#if NeedFunctionPrototypes
|
||||
XIC xic,
|
||||
XKeyEvent *ev,
|
||||
char *buffer,
|
||||
int bytes,
|
||||
KeySym *keysym,
|
||||
Status *state
|
||||
#endif
|
||||
);
|
||||
|
||||
extern void _XimRegisterFilter(
|
||||
Xic ic
|
||||
);
|
||||
|
|
@ -817,17 +773,6 @@ extern int _XimLookupUTF8Text(
|
|||
XComposeStatus *status
|
||||
);
|
||||
|
||||
extern int _XimLookupUTF8Text(
|
||||
#if NeedFunctionPrototypes
|
||||
Xic ic,
|
||||
XKeyEvent *event,
|
||||
char *buffer,
|
||||
int nbytes,
|
||||
KeySym *keysym,
|
||||
XComposeStatus *status
|
||||
#endif
|
||||
);
|
||||
|
||||
extern EVENTMASK _XimGetWindowEventmask(
|
||||
Xic ic
|
||||
);
|
||||
|
|
@ -979,17 +924,6 @@ extern int _XimLocalUtf8LookupString(
|
|||
Status *status
|
||||
);
|
||||
|
||||
extern int _XimLocalUtf8LookupString(
|
||||
#if NeedFunctionPrototypes
|
||||
XIC ic,
|
||||
XKeyEvent *ev,
|
||||
char *buffer,
|
||||
int bytes,
|
||||
KeySym *keysym,
|
||||
Status *status
|
||||
#endif
|
||||
);
|
||||
|
||||
extern Bool _XimThaiFilter(
|
||||
Display *d,
|
||||
Window w,
|
||||
|
|
|
|||
|
|
@ -627,11 +627,6 @@ typedef struct {
|
|||
int (*ctstoutf8)(
|
||||
XIM, char*, int, char*, int, Status *
|
||||
);
|
||||
int (*ctstoutf8)(
|
||||
#if NeedFunctionPrototypes
|
||||
XIM, char*, int, char*, int, Status *
|
||||
#endif
|
||||
);
|
||||
} XIMMethodsRec, *XIMMethods;
|
||||
|
||||
/*
|
||||
|
|
@ -704,11 +699,6 @@ typedef struct {
|
|||
char* (*utf8_reset)(
|
||||
XIC
|
||||
);
|
||||
char* (*utf8_reset)(
|
||||
#if NeedFunctionPrototypes
|
||||
XIC
|
||||
#endif
|
||||
);
|
||||
int (*mb_lookup_string)(
|
||||
XIC, XKeyEvent*, char*, int, KeySym*, Status*
|
||||
);
|
||||
|
|
@ -718,11 +708,6 @@ typedef struct {
|
|||
int (*utf8_lookup_string)(
|
||||
XIC, XKeyEvent*, char*, int, KeySym*, Status*
|
||||
);
|
||||
int (*utf8_lookup_string)(
|
||||
#if NeedFunctionPrototypes
|
||||
XIC, XKeyEvent*, char*, int, KeySym*, Status*
|
||||
#endif
|
||||
);
|
||||
} XICMethodsRec, *XICMethods;
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue