summaryrefslogtreecommitdiffstats
path: root/xlib
diff options
context:
space:
mode:
authorstanton <stanton>1999-04-16 01:51:06 (GMT)
committerstanton <stanton>1999-04-16 01:51:06 (GMT)
commit03656f44f81469f459031fa3a4a7b09c8bc77712 (patch)
tree31378e81bd58f8c726fc552d6b30cbf3ca07497b /xlib
parent404fc236f34304df53b7e44bc7971d786b87d453 (diff)
downloadtk-03656f44f81469f459031fa3a4a7b09c8bc77712.zip
tk-03656f44f81469f459031fa3a4a7b09c8bc77712.tar.gz
tk-03656f44f81469f459031fa3a4a7b09c8bc77712.tar.bz2
* Merged 8.1 branch into the main trunk
Diffstat (limited to 'xlib')
-rw-r--r--xlib/X11/X.h6
-rw-r--r--xlib/X11/Xlib.h71
-rw-r--r--xlib/X11/Xutil.h24
-rw-r--r--xlib/xdraw.c4
-rw-r--r--xlib/xgc.c5
5 files changed, 10 insertions, 100 deletions
diff --git a/xlib/X11/X.h b/xlib/X11/X.h
index 55a3133..a7f6566 100644
--- a/xlib/X11/X.h
+++ b/xlib/X11/X.h
@@ -59,7 +59,11 @@ typedef unsigned long VisualID;
typedef unsigned long Time;
-typedef unsigned short KeyCode;
+typedef unsigned long KeyCode; /* In order to use IME, the Macintosh needs
+ * to pack 3 bytes into the keyCode field in
+ * the XEvent. In the real X.h, a KeyCode is
+ * defined as a short, which wouldn't be big
+ * enough. */
/*****************************************************************
* RESERVED RESOURCE AND CONSTANT DEFINITIONS
diff --git a/xlib/X11/Xlib.h b/xlib/X11/Xlib.h
index 44358bd..b185394 100644
--- a/xlib/X11/Xlib.h
+++ b/xlib/X11/Xlib.h
@@ -546,7 +546,7 @@ typedef struct {
Bool same_screen; /* same screen flag */
char trans_chars[XMaxTransChars];
/* translated characters */
- int nchars;
+ int nbytes;
} XKeyEvent;
typedef XKeyEvent XKeyPressedEvent;
typedef XKeyEvent XKeyReleasedEvent;
@@ -1190,24 +1190,6 @@ typedef int (*XErrorHandler) ( /* WARNING, this type not in Xlib spec */
_XFUNCPROTOBEGIN
-extern Atom XInternAtom(
-#if NeedFunctionPrototypes
- Display* /* display */,
- _Xconst char* /* atom_name */,
- Bool /* only_if_exists */
-#endif
-);
-
-
-extern GC XCreateGC(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- unsigned long /* valuemask */,
- XGCValues* /* values */
-#endif
-);
-
extern void XDrawLine(
#if NeedFunctionPrototypes
@@ -1234,57 +1216,6 @@ extern void XFillRectangle(
#endif
);
-extern void XFreeGC(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */
-#endif
-);
-
-extern Status XParseColor(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Colormap /* colormap */,
- _Xconst char* /* spec */,
- XColor* /* exact_def_return */
-#endif
-);
-
-extern void XSetClipMask(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- Pixmap /* pixmap */
-#endif
-);
-
-
-extern void XSetClipOrigin(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- int /* clip_x_origin */,
- int /* clip_y_origin */
-#endif
-);
-
-extern void XSetForeground(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- unsigned long /* foreground */
-#endif
-);
-
-extern void XSetTSOrigin(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- int /* ts_x_origin */,
- int /* ts_y_origin */
-#endif
-);
-
#include "tkIntXlibDecls.h"
diff --git a/xlib/X11/Xutil.h b/xlib/X11/Xutil.h
index 6332850..f6c0a36 100644
--- a/xlib/X11/Xutil.h
+++ b/xlib/X11/Xutil.h
@@ -448,14 +448,6 @@ extern Status XGetTextProperty(
#endif
);
-extern XVisualInfo *XGetVisualInfo(
-#if NeedFunctionPrototypes
- Display* /* display */,
- long /* vinfo_mask */,
- XVisualInfo* /* vinfo_template */,
- int* /* nitems_return */
-#endif
-);
extern Status XGetWMClientMachine(
#if NeedFunctionPrototypes
@@ -652,14 +644,6 @@ extern void XSetTextProperty(
#endif
);
-extern void XSetWMClientMachine(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- XTextProperty* /* text_prop */
-#endif
-);
-
extern void XSetWMHints(
#if NeedFunctionPrototypes
Display* /* display */,
@@ -762,14 +746,6 @@ extern void XShrinkRegion(
#endif
);
-extern Status XStringListToTextProperty(
-#if NeedFunctionPrototypes
- char** /* list */,
- int /* count */,
- XTextProperty* /* text_prop_return */
-#endif
-);
-
extern void XSubtractRegion(
#if NeedFunctionPrototypes
Region /* sra */,
diff --git a/xlib/xdraw.c b/xlib/xdraw.c
index e62f90b..796f2f7 100644
--- a/xlib/xdraw.c
+++ b/xlib/xdraw.c
@@ -9,10 +9,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: xdraw.c,v 1.3 1999/03/10 07:04:47 stanton Exp $
+ * RCS: @(#) $Id: xdraw.c,v 1.4 1999/04/16 01:51:55 stanton Exp $
*/
-#include "tkInt.h"
+#include "tk.h"
/*
*----------------------------------------------------------------------
diff --git a/xlib/xgc.c b/xlib/xgc.c
index 802b075..6dea7be 100644
--- a/xlib/xgc.c
+++ b/xlib/xgc.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: xgc.c,v 1.2 1998/09/14 18:24:03 stanton Exp $
+ * RCS: @(#) $Id: xgc.c,v 1.3 1999/04/16 01:51:55 stanton Exp $
*/
#include <tkInt.h>
@@ -150,8 +150,7 @@ XChangeGC(d, gc, mask, values)
*----------------------------------------------------------------------
*/
-void
-XFreeGC(d, gc)
+void XFreeGC(d, gc)
Display * d;
GC gc;
{