summaryrefslogtreecommitdiffstats
path: root/xlib
diff options
context:
space:
mode:
Diffstat (limited to 'xlib')
-rw-r--r--xlib/X11/X.h10
-rw-r--r--xlib/X11/Xlib.h23
-rw-r--r--xlib/X11/Xutil.h41
-rw-r--r--xlib/xcolors.c2
-rw-r--r--xlib/xgc.c85
5 files changed, 72 insertions, 89 deletions
diff --git a/xlib/X11/X.h b/xlib/X11/X.h
index b43967e..2a9cd52 100644
--- a/xlib/X11/X.h
+++ b/xlib/X11/X.h
@@ -73,9 +73,7 @@ typedef unsigned long KeyCode; /* In order to use IME, the Macintosh needs
* RESERVED RESOURCE AND CONSTANT DEFINITIONS
*****************************************************************/
-#ifndef _WIN32
-# define None 0L /* See bug [9e31fd9449] and below */
-#endif
+/* #define None 0L See bug [9e31fd9449] and below */
#define ParentRelative 1L /* background pixmap in CreateWindow
and ChangeWindowAttributes */
@@ -181,9 +179,7 @@ are reserved in the protocol for errors and replies. */
#define ShiftMask (1<<0)
#define LockMask (1<<1)
-#ifndef _WIN32
-# define ControlMask (1<<2) /* See bug [9e31fd9449] and below */
-#endif
+/* #define ControlMask (1<<2) See bug [9e31fd9449] and below */
#define Mod1Mask (1<<3)
#define Mod2Mask (1<<4)
#define Mod3Mask (1<<5)
@@ -191,9 +187,7 @@ are reserved in the protocol for errors and replies. */
#define Mod5Mask (1<<7)
/* See bug [9e31fd9449], this way prevents conflicts with Win32 headers */
-#ifdef _WIN32
enum _Bug9e31fd9449 { None = 0, ControlMask = (1<<2) };
-#endif
/* modifier names. Used to build a SetModifierMapping request or
to read a GetModifierMapping request. These correspond to the
diff --git a/xlib/X11/Xlib.h b/xlib/X11/Xlib.h
index 8d8ec68..b4b04d7 100644
--- a/xlib/X11/Xlib.h
+++ b/xlib/X11/Xlib.h
@@ -45,13 +45,6 @@
#endif
#endif
-#ifndef X_WCHAR
-#include <stddef.h>
-#else
-/* replace this with #include or typedef appropriate for your system */
-typedef unsigned long wchar_t;
-#endif
-
typedef char *XPointer;
#define Bool int
@@ -541,7 +534,7 @@ typedef struct {
Bool send_event; /* true if this came from a SendEvent request */
Display *display; /* Display the event was read from */
Window window; /* "event" window it is reported relative to */
- Window root; /* root window that the event occured on */
+ Window root; /* root window that the event occurred on */
Window subwindow; /* child window */
Time time; /* milliseconds */
int x, y; /* pointer x, y coordinates in event window */
@@ -562,7 +555,7 @@ typedef struct {
Bool send_event; /* true if this came from a SendEvent request */
Display *display; /* Display the event was read from */
Window window; /* "event" window it is reported relative to */
- Window root; /* root window that the event occured on */
+ Window root; /* root window that the event occurred on */
Window subwindow; /* child window */
Time time; /* milliseconds */
int x, y; /* pointer x, y coordinates in event window */
@@ -580,7 +573,7 @@ typedef struct {
Bool send_event; /* true if this came from a SendEvent request */
Display *display; /* Display the event was read from */
Window window; /* "event" window reported relative to */
- Window root; /* root window that the event occured on */
+ Window root; /* root window that the event occurred on */
Window subwindow; /* child window */
Time time; /* milliseconds */
int x, y; /* pointer x, y coordinates in event window */
@@ -597,7 +590,7 @@ typedef struct {
Bool send_event; /* true if this came from a SendEvent request */
Display *display; /* Display the event was read from */
Window window; /* "event" window reported relative to */
- Window root; /* root window that the event occured on */
+ Window root; /* root window that the event occurred on */
Window subwindow; /* child window */
Time time; /* milliseconds */
int x, y; /* pointer x, y coordinates in event window */
@@ -1049,13 +1042,6 @@ typedef struct {
XFontSet font_set;
} XmbTextItem;
-typedef struct {
- wchar_t *chars;
- int nchars;
- int delta;
- XFontSet font_set;
-} XwcTextItem;
-
typedef void (*XIMProc)();
typedef struct _XIM *XIM;
@@ -1139,7 +1125,6 @@ typedef struct _XIMText {
Bool encoding_is_wchar;
union {
char *multi_byte;
- wchar_t *wide_char;
} string;
} XIMText;
diff --git a/xlib/X11/Xutil.h b/xlib/X11/Xutil.h
index bf372fb..38ae9f5 100644
--- a/xlib/X11/Xutil.h
+++ b/xlib/X11/Xutil.h
@@ -543,22 +543,6 @@ extern int XOffsetRegion(
#endif
);
-extern Bool XPointInRegion(
-#if NeedFunctionPrototypes
- Region /* r */,
- int /* x */,
- int /* y */
-#endif
-);
-
-extern Region XPolygonRegion(
-#if NeedFunctionPrototypes
- XPoint* /* points */,
- int /* n */,
- int /* fill_rule */
-#endif
-);
-
extern int XRectInRegion(
#if NeedFunctionPrototypes
Region /* r */,
@@ -764,22 +748,6 @@ extern int XmbTextListToTextProperty(
#endif
);
-extern int XwcTextListToTextProperty(
-#if NeedFunctionPrototypes
- Display* /* display */,
- wchar_t** /* list */,
- int /* count */,
- XICCEncodingStyle /* style */,
- XTextProperty* /* text_prop_return */
-#endif
-);
-
-extern void XwcFreeStringList(
-#if NeedFunctionPrototypes
- wchar_t** /* list */
-#endif
-);
-
extern Status XTextPropertyToStringList(
#if NeedFunctionPrototypes
XTextProperty* /* text_prop */,
@@ -797,15 +765,6 @@ extern int XmbTextPropertyToTextList(
#endif
);
-extern int XwcTextPropertyToTextList(
-#if NeedFunctionPrototypes
- Display* /* display */,
- XTextProperty* /* text_prop */,
- wchar_t*** /* list_return */,
- int* /* count_return */
-#endif
-);
-
extern void XUnionRectWithRegion(
#if NeedFunctionPrototypes
XRectangle* /* rectangle */,
diff --git a/xlib/xcolors.c b/xlib/xcolors.c
index 78fd44b..31db297 100644
--- a/xlib/xcolors.c
+++ b/xlib/xcolors.c
@@ -347,7 +347,7 @@ XParseColor(
/*
* If *p does not point to the end of the string, there were invalid
- * digits in the spec. Ergo, it is not a vailid color string.
+ * digits in the spec. Ergo, it is not a valid color string.
* (Bug f0188aca9e)
*/
diff --git a/xlib/xgc.c b/xlib/xgc.c
index 9eaf7ae..94d2ffd 100644
--- a/xlib/xgc.c
+++ b/xlib/xgc.c
@@ -84,7 +84,7 @@ static void FreeClipMask(GC gc) {
TkpReleaseRegion(((TkpClipMask*) gc->clip_mask)->value.region);
}
#endif
- ckfree(gc->clip_mask);
+ ckfree((char *) gc->clip_mask);
gc->clip_mask = None;
}
}
@@ -564,7 +564,6 @@ XDrawSegments(
}
#endif
-#if 0
char *
XFetchBuffer(
Display *display,
@@ -580,7 +579,7 @@ XFetchName(
Window w,
char **window_name_return)
{
- return (Status) 0;
+ return Success;
}
Atom *
@@ -592,14 +591,16 @@ XListProperties(
return (Atom *) 0;
}
-void
+int
XMapRaised(
Display *display,
Window w)
{
+ return Success;
}
-void
+#if 0
+int
XPutImage(
Display *display,
Drawable d,
@@ -612,9 +613,11 @@ XPutImage(
unsigned int width,
unsigned int height)
{
+ return 0;
}
+#endif
-void
+int
XQueryTextExtents(
Display *display,
XID font_ID,
@@ -625,9 +628,10 @@ XQueryTextExtents(
int *font_descent_return,
XCharStruct *overall_return)
{
+ return Success;
}
-void
+int
XReparentWindow(
Display *display,
Window w,
@@ -635,32 +639,72 @@ XReparentWindow(
int x,
int y)
{
+ return BadWindow;
}
-void
-XRotateBuffers(
+int
+XUndefineCursor(
Display *display,
- int rotate)
+ Window w)
{
+ return Success;
}
-void
-XStoreBuffer(
+Window
+XCreateWindow(
Display *display,
- _Xconst char *bytes,
- int nbytes,
- int buffer)
+ Window parent,
+ int x,
+ int y,
+ unsigned int width,
+ unsigned int height,
+ unsigned int border_width,
+ int depth,
+ unsigned int clazz,
+ Visual *visual,
+ unsigned long value_mask,
+ XSetWindowAttributes *attributes)
{
+ return 0;
}
-void
-XUndefineCursor(
- Display *display,
- Window w)
+int
+XPointInRegion(
+ Region rgn,
+ int x,
+ int y)
{
+ return 0;
+}
+
+int
+XUnionRegion(
+ Region srca,
+ Region srcb,
+ Region dr_return)
+{
+ return 0;
+}
+
+Region
+XPolygonRegion(
+ XPoint *pts,
+ int n,
+ int rule)
+{
+ return 0;
+}
+
+int
+XOffsetRegion(
+ Region rgn,
+ int dx,
+ int dy)
+{
+ return 0;
}
-#endif
+
/*
* Local Variables:
* mode: c
@@ -668,3 +712,4 @@ XUndefineCursor(
* fill-column: 78
* End:
*/
+
generated by cgit v0.12 at 2024-12-12 10:54:43 (GMT)