update
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1991, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1991, Oracle and/or its affiliates.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
|
||||
99
.CondaPkg/env/Library/include/X11/X.h
vendored
99
.CondaPkg/env/Library/include/X11/X.h
vendored
@@ -1,15 +1,34 @@
|
||||
/*
|
||||
* $XConsortium: X.h,v 1.66 88/09/06 15:55:56 jim Exp $
|
||||
*/
|
||||
|
||||
/* Definitions for the X window system likely to be used by applications */
|
||||
|
||||
#ifndef X_H
|
||||
#define X_H
|
||||
|
||||
/***********************************************************
|
||||
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
|
||||
and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
|
||||
|
||||
Copyright 1987, 1998 The Open Group
|
||||
|
||||
Permission to use, copy, modify, distribute, and sell this software and its
|
||||
documentation for any purpose is hereby granted without fee, provided that
|
||||
the above copyright notice appear in all copies and that both that
|
||||
copyright notice and this permission notice appear in supporting
|
||||
documentation.
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
Except as contained in this notice, the name of The Open Group shall not be
|
||||
used in advertising or otherwise to promote the sale, use or other dealings
|
||||
in this Software without prior written authorization from The Open Group.
|
||||
|
||||
|
||||
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
|
||||
|
||||
All Rights Reserved
|
||||
|
||||
@@ -17,7 +36,7 @@ Permission to use, copy, modify, and distribute this software and its
|
||||
documentation for any purpose and without fee is hereby granted,
|
||||
provided that the above copyright notice appear in all copies and that
|
||||
both that copyright notice and this permission notice appear in
|
||||
supporting documentation, and that the names of Digital or MIT not be
|
||||
supporting documentation, and that the name of Digital not be
|
||||
used in advertising or publicity pertaining to distribution of the
|
||||
software without specific, written prior permission.
|
||||
|
||||
@@ -30,6 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
SOFTWARE.
|
||||
|
||||
******************************************************************/
|
||||
|
||||
#define X_PROTOCOL 11 /* current protocol version */
|
||||
#define X_PROTOCOL_REVISION 0 /* current minor version */
|
||||
|
||||
@@ -40,29 +60,60 @@ SOFTWARE.
|
||||
|
||||
/* Resources */
|
||||
|
||||
#ifdef _WIN64
|
||||
/*
|
||||
* _XSERVER64 must ONLY be defined when compiling X server sources on
|
||||
* systems where unsigned long is not 32 bits, must NOT be used in
|
||||
* client or library code.
|
||||
*/
|
||||
#ifndef _XSERVER64
|
||||
# ifndef _XTYPEDEF_XID
|
||||
# define _XTYPEDEF_XID
|
||||
# ifdef _WIN64
|
||||
typedef unsigned __int64 XID;
|
||||
#else
|
||||
# else
|
||||
typedef unsigned long XID;
|
||||
# endif
|
||||
# endif
|
||||
# ifndef _XTYPEDEF_MASK
|
||||
# define _XTYPEDEF_MASK
|
||||
typedef unsigned long Mask;
|
||||
# endif
|
||||
# ifndef _XTYPEDEF_ATOM
|
||||
# define _XTYPEDEF_ATOM
|
||||
typedef unsigned long Atom; /* Also in Xdefs.h */
|
||||
# endif
|
||||
typedef unsigned long VisualID;
|
||||
typedef unsigned long Time;
|
||||
#else
|
||||
# include <X11/Xmd.h>
|
||||
# ifndef _XTYPEDEF_XID
|
||||
# define _XTYPEDEF_XID
|
||||
typedef CARD32 XID;
|
||||
# endif
|
||||
# ifndef _XTYPEDEF_MASK
|
||||
# define _XTYPEDEF_MASK
|
||||
typedef CARD32 Mask;
|
||||
# endif
|
||||
# ifndef _XTYPEDEF_ATOM
|
||||
# define _XTYPEDEF_ATOM
|
||||
typedef CARD32 Atom;
|
||||
# endif
|
||||
typedef CARD32 VisualID;
|
||||
typedef CARD32 Time;
|
||||
#endif
|
||||
|
||||
typedef XID Window;
|
||||
typedef XID Drawable;
|
||||
#ifndef _XTYPEDEF_FONT
|
||||
# define _XTYPEDEF_FONT
|
||||
typedef XID Font;
|
||||
#endif
|
||||
typedef XID Pixmap;
|
||||
typedef XID Cursor;
|
||||
typedef XID Colormap;
|
||||
typedef XID GContext;
|
||||
typedef XID KeySym;
|
||||
|
||||
typedef unsigned long Mask;
|
||||
|
||||
typedef unsigned long Atom;
|
||||
|
||||
typedef unsigned long VisualID;
|
||||
|
||||
typedef unsigned long Time;
|
||||
|
||||
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
|
||||
@@ -75,6 +126,9 @@ typedef unsigned long KeyCode; /* In order to use IME, the Macintosh needs
|
||||
|
||||
#ifndef _WIN32
|
||||
# define None 0L /* See bug [9e31fd9449] and below */
|
||||
#else
|
||||
/* Pert-Tk expects None to be a macro. See ticket [593eb0227c] */
|
||||
# define None None /* uses the enum below */
|
||||
#endif
|
||||
|
||||
#define ParentRelative 1L /* background pixmap in CreateWindow
|
||||
@@ -183,6 +237,9 @@ are reserved in the protocol for errors and replies. */
|
||||
#define LockMask (1<<1)
|
||||
#ifndef _WIN32
|
||||
# define ControlMask (1<<2) /* See bug [9e31fd9449] and below */
|
||||
#else
|
||||
/* Pert-Tk expects ControlMask to be a macro. See ticket [593eb0227c] */
|
||||
# define ControlMask ControlMask /* uses the enum below */
|
||||
#endif
|
||||
#define Mod1Mask (1<<3)
|
||||
#define Mod2Mask (1<<4)
|
||||
@@ -192,7 +249,7 @@ are reserved in the protocol for errors and replies. */
|
||||
|
||||
/* See bug [9e31fd9449], this way prevents conflicts with Win32 headers */
|
||||
#ifdef _WIN32
|
||||
enum _Bug9e31fd9449 { None = 0, ControlMask = (1<<2) };
|
||||
enum { None = 0, ControlMask = (1<<2) };
|
||||
#endif
|
||||
|
||||
/* modifier names. Used to build a SetModifierMapping request or
|
||||
@@ -263,9 +320,13 @@ enum _Bug9e31fd9449 { None = 0, ControlMask = (1<<2) };
|
||||
|
||||
/* protocol families */
|
||||
|
||||
#define FamilyInternet 0
|
||||
#define FamilyInternet 0 /* IPv4 */
|
||||
#define FamilyDECnet 1
|
||||
#define FamilyChaos 2
|
||||
#define FamilyInternet6 6 /* IPv6 */
|
||||
|
||||
/* authentication families not tied to a specific protocol */
|
||||
#define FamilyServerInterpreted 5
|
||||
|
||||
/* Property notification */
|
||||
|
||||
|
||||
13
.CondaPkg/env/Library/include/X11/Xfuncproto.h
vendored
13
.CondaPkg/env/Library/include/X11/Xfuncproto.h
vendored
@@ -163,19 +163,6 @@ in this Software without prior written authorization from The Open Group.
|
||||
# define _X_ATTRIBUTE_PRINTF(x,y)
|
||||
#endif
|
||||
|
||||
/* requires xproto >= 7.0.22 - since this uses either gcc or C99 variable
|
||||
argument macros, must be only used inside #ifdef _X_NONNULL guards, as
|
||||
many legacy X clients are compiled in C89 mode still. */
|
||||
#if __has_attribute(nonnull) \
|
||||
&& defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */
|
||||
#define _X_NONNULL(...) __attribute__((nonnull(__VA_ARGS__)))
|
||||
#elif __has_attribute(nonnull) \
|
||||
|| defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
|
||||
#define _X_NONNULL(args...) __attribute__((nonnull(args)))
|
||||
#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */
|
||||
#define _X_NONNULL(...) /* */
|
||||
#endif
|
||||
|
||||
/* requires xproto >= 7.0.22 */
|
||||
#if __has_attribute(__unused__) \
|
||||
|| defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)
|
||||
|
||||
543
.CondaPkg/env/Library/include/X11/Xlib.h
vendored
543
.CondaPkg/env/Library/include/X11/Xlib.h
vendored
@@ -1,20 +1,28 @@
|
||||
/* $XConsortium: Xlib.h,v 11.221 93/07/02 14:13:28 gildea Exp $ */
|
||||
/*
|
||||
* Copyright 1985, 1986, 1987, 1991 by the Massachusetts Institute of Technology
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software and its
|
||||
* documentation for any purpose and without fee is hereby granted, provided
|
||||
* that the above copyright notice appear in all copies and that both that
|
||||
* copyright notice and this permission notice appear in supporting
|
||||
* documentation, and that the name of M.I.T. not be used in advertising
|
||||
* or publicity pertaining to distribution of the software without specific,
|
||||
* written prior permission. M.I.T. makes no representations about the
|
||||
* suitability of this software for any purpose. It is provided "as is"
|
||||
* without express or implied warranty.
|
||||
*
|
||||
* X Window System is a Trademark of MIT.
|
||||
*
|
||||
*/
|
||||
|
||||
Copyright 1985, 1986, 1987, 1991, 1998 The Open Group
|
||||
|
||||
Permission to use, copy, modify, distribute, and sell this software and its
|
||||
documentation for any purpose is hereby granted without fee, provided that
|
||||
the above copyright notice appear in all copies and that both that
|
||||
copyright notice and this permission notice appear in supporting
|
||||
documentation.
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
Except as contained in this notice, the name of The Open Group shall not be
|
||||
used in advertising or otherwise to promote the sale, use or other dealings
|
||||
in this Software without prior written authorization from The Open Group.
|
||||
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
@@ -22,16 +30,20 @@
|
||||
* interface library (Xlib) to the X Window System Protocol (V11).
|
||||
* Structures and symbols starting with "_" are private to the library.
|
||||
*/
|
||||
#ifndef _XLIB_H_
|
||||
#define _XLIB_H_
|
||||
#ifndef _X11_XLIB_H_
|
||||
#define _X11_XLIB_H_
|
||||
|
||||
#define XlibSpecificationRelease 5
|
||||
#define XlibSpecificationRelease 6
|
||||
|
||||
#if !defined(MAC_OSX_TK)
|
||||
# include <X11/X.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#if defined(__SCO__) || defined(__UNIXWARE__)
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
|
||||
#include <X11/X.h>
|
||||
|
||||
#ifdef MAC_OSX_TK
|
||||
# include <X11/X.h>
|
||||
# define Cursor XCursor
|
||||
# define Region XRegion
|
||||
#endif
|
||||
@@ -39,18 +51,27 @@
|
||||
/* applications should not depend on these two headers being included! */
|
||||
#include <X11/Xfuncproto.h>
|
||||
|
||||
#ifndef X_WCHAR
|
||||
#ifdef X_NOT_STDC_ENV
|
||||
#define X_WCHAR
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef X_WCHAR
|
||||
#include <stddef.h>
|
||||
#else
|
||||
#ifdef __UNIXOS2__
|
||||
#include <stdlib.h>
|
||||
#else
|
||||
/* replace this with #include or typedef appropriate for your system */
|
||||
typedef unsigned long wchar_t;
|
||||
#endif
|
||||
#endif
|
||||
/* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in
|
||||
November 2000. Its presence is indicated through the following macro. */
|
||||
#define X_HAVE_UTF8_STRING 1
|
||||
|
||||
/* The Xlib structs are full of implicit padding to properly align members.
|
||||
We can't clean that up without breaking ABI, so tell clang not to bother
|
||||
complaining about it. */
|
||||
#ifdef __clang__
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wpadded"
|
||||
#endif
|
||||
|
||||
typedef char *XPointer;
|
||||
|
||||
@@ -68,40 +89,40 @@ typedef int Status;
|
||||
#define QueuedAfterReading 1
|
||||
#define QueuedAfterFlush 2
|
||||
|
||||
#define ConnectionNumber(dpy) ((dpy)->fd)
|
||||
#define RootWindow(dpy, scr) (((dpy)->screens[(scr)]).root)
|
||||
#define DefaultScreen(dpy) ((dpy)->default_screen)
|
||||
#define DefaultRootWindow(dpy) (((dpy)->screens[(dpy)->default_screen]).root)
|
||||
#define DefaultVisual(dpy, scr) (((dpy)->screens[(scr)]).root_visual)
|
||||
#define DefaultGC(dpy, scr) (((dpy)->screens[(scr)]).default_gc)
|
||||
#define BlackPixel(dpy, scr) (((dpy)->screens[(scr)]).black_pixel)
|
||||
#define WhitePixel(dpy, scr) (((dpy)->screens[(scr)]).white_pixel)
|
||||
#define ConnectionNumber(dpy) (((_XPrivDisplay)(dpy))->fd)
|
||||
#define RootWindow(dpy, scr) (ScreenOfDisplay(dpy,scr)->root)
|
||||
#define DefaultScreen(dpy) (((_XPrivDisplay)(dpy))->default_screen)
|
||||
#define DefaultRootWindow(dpy) (ScreenOfDisplay(dpy,DefaultScreen(dpy))->root)
|
||||
#define DefaultVisual(dpy, scr) (ScreenOfDisplay(dpy,scr)->root_visual)
|
||||
#define DefaultGC(dpy, scr) (ScreenOfDisplay(dpy,scr)->default_gc)
|
||||
#define BlackPixel(dpy, scr) (ScreenOfDisplay(dpy,scr)->black_pixel)
|
||||
#define WhitePixel(dpy, scr) (ScreenOfDisplay(dpy,scr)->white_pixel)
|
||||
#define AllPlanes ((unsigned long)~0L)
|
||||
#define QLength(dpy) ((dpy)->qlen)
|
||||
#define DisplayWidth(dpy, scr) (((dpy)->screens[(scr)]).width)
|
||||
#define DisplayHeight(dpy, scr) (((dpy)->screens[(scr)]).height)
|
||||
#define DisplayWidthMM(dpy, scr)(((dpy)->screens[(scr)]).mwidth)
|
||||
#define DisplayHeightMM(dpy, scr)(((dpy)->screens[(scr)]).mheight)
|
||||
#define DisplayPlanes(dpy, scr) (((dpy)->screens[(scr)]).root_depth)
|
||||
#define DisplayCells(dpy, scr) (DefaultVisual((dpy), (scr))->map_entries)
|
||||
#define ScreenCount(dpy) ((dpy)->nscreens)
|
||||
#define ServerVendor(dpy) ((dpy)->vendor)
|
||||
#define ProtocolVersion(dpy) ((dpy)->proto_major_version)
|
||||
#define ProtocolRevision(dpy) ((dpy)->proto_minor_version)
|
||||
#define VendorRelease(dpy) ((dpy)->release)
|
||||
#define DisplayString(dpy) ((dpy)->display_name)
|
||||
#define DefaultDepth(dpy, scr) (((dpy)->screens[(scr)]).root_depth)
|
||||
#define DefaultColormap(dpy, scr)(((dpy)->screens[(scr)]).cmap)
|
||||
#define BitmapUnit(dpy) ((dpy)->bitmap_unit)
|
||||
#define BitmapBitOrder(dpy) ((dpy)->bitmap_bit_order)
|
||||
#define BitmapPad(dpy) ((dpy)->bitmap_pad)
|
||||
#define ImageByteOrder(dpy) ((dpy)->byte_order)
|
||||
#define NextRequest(dpy) ((dpy)->request + 1)
|
||||
#define LastKnownRequestProcessed(dpy) ((dpy)->request)
|
||||
#define QLength(dpy) (((_XPrivDisplay)(dpy))->qlen)
|
||||
#define DisplayWidth(dpy, scr) (ScreenOfDisplay(dpy,scr)->width)
|
||||
#define DisplayHeight(dpy, scr) (ScreenOfDisplay(dpy,scr)->height)
|
||||
#define DisplayWidthMM(dpy, scr)(ScreenOfDisplay(dpy,scr)->mwidth)
|
||||
#define DisplayHeightMM(dpy, scr)(ScreenOfDisplay(dpy,scr)->mheight)
|
||||
#define DisplayPlanes(dpy, scr) (ScreenOfDisplay(dpy,scr)->root_depth)
|
||||
#define DisplayCells(dpy, scr) (DefaultVisual(dpy,scr)->map_entries)
|
||||
#define ScreenCount(dpy) (((_XPrivDisplay)(dpy))->nscreens)
|
||||
#define ServerVendor(dpy) (((_XPrivDisplay)(dpy))->vendor)
|
||||
#define ProtocolVersion(dpy) (((_XPrivDisplay)(dpy))->proto_major_version)
|
||||
#define ProtocolRevision(dpy) (((_XPrivDisplay)(dpy))->proto_minor_version)
|
||||
#define VendorRelease(dpy) (((_XPrivDisplay)(dpy))->release)
|
||||
#define DisplayString(dpy) (((_XPrivDisplay)(dpy))->display_name)
|
||||
#define DefaultDepth(dpy, scr) (ScreenOfDisplay(dpy,scr)->root_depth)
|
||||
#define DefaultColormap(dpy, scr)(ScreenOfDisplay(dpy,scr)->cmap)
|
||||
#define BitmapUnit(dpy) (((_XPrivDisplay)(dpy))->bitmap_unit)
|
||||
#define BitmapBitOrder(dpy) (((_XPrivDisplay)(dpy))->bitmap_bit_order)
|
||||
#define BitmapPad(dpy) (((_XPrivDisplay)(dpy))->bitmap_pad)
|
||||
#define ImageByteOrder(dpy) (((_XPrivDisplay)(dpy))->byte_order)
|
||||
#define NextRequest(dpy) (((_XPrivDisplay)(dpy))->request + 1)
|
||||
#define LastKnownRequestProcessed(dpy) (((_XPrivDisplay)(dpy))->request)
|
||||
|
||||
/* macros for screen oriented applications (toolkit) */
|
||||
#define ScreenOfDisplay(dpy, scr)(&((dpy)->screens[(scr)]))
|
||||
#define DefaultScreenOfDisplay(dpy) (&((dpy)->screens[(dpy)->default_screen]))
|
||||
#define ScreenOfDisplay(dpy, scr)(&((_XPrivDisplay)(dpy))->screens[scr])
|
||||
#define DefaultScreenOfDisplay(dpy) ScreenOfDisplay(dpy,DefaultScreen(dpy))
|
||||
#define DisplayOfScreen(s) ((s)->display)
|
||||
#define RootWindowOfScreen(s) ((s)->root)
|
||||
#define BlackPixelOfScreen(s) ((s)->black_pixel)
|
||||
@@ -128,7 +149,9 @@ typedef int Status;
|
||||
typedef struct _XExtData {
|
||||
int number; /* number returned by XRegisterExtension */
|
||||
struct _XExtData *next; /* next item on list of data for structure */
|
||||
int (*free_private)(); /* called to free private storage */
|
||||
int (*free_private)( /* called to free private storage */
|
||||
struct _XExtData *extension
|
||||
);
|
||||
XPointer private_data; /* data private to this extension. */
|
||||
} XExtData;
|
||||
|
||||
@@ -167,11 +190,11 @@ typedef struct {
|
||||
CapRound, CapProjecting */
|
||||
int join_style; /* JoinMiter, JoinRound, JoinBevel */
|
||||
int fill_style; /* FillSolid, FillTiled,
|
||||
FillStippled, FillOpaeueStippled */
|
||||
FillStippled, FillOpaqueStippled */
|
||||
int fill_rule; /* EvenOddRule, WindingRule */
|
||||
int arc_mode; /* ArcChord, ArcPieSlice */
|
||||
Pixmap tile; /* tile pixmap for tiling operations */
|
||||
Pixmap stipple; /* stipple 1 plane pixmap for stipping */
|
||||
Pixmap stipple; /* stipple 1 plane pixmap for stippling */
|
||||
int ts_x_origin; /* offset for tile or stipple operations */
|
||||
int ts_y_origin;
|
||||
Font font; /* default text font for text operations */
|
||||
@@ -221,6 +244,9 @@ typedef struct {
|
||||
* implementation dependent. A Screen should be treated as opaque
|
||||
* by application code.
|
||||
*/
|
||||
|
||||
struct _XDisplay; /* Forward declare before use for C++ */
|
||||
|
||||
typedef struct {
|
||||
XExtData *ext_data; /* hook for extension to hang data */
|
||||
struct _XDisplay *display;/* back pointer to display structure */
|
||||
@@ -262,7 +288,7 @@ typedef struct {
|
||||
int bit_gravity; /* one of bit gravity values */
|
||||
int win_gravity; /* one of the window gravity values */
|
||||
int backing_store; /* NotUseful, WhenMapped, Always */
|
||||
unsigned long backing_planes;/* planes to be preseved if possible */
|
||||
unsigned long backing_planes;/* planes to be preserved if possible */
|
||||
unsigned long backing_pixel;/* value to use in restoring planes */
|
||||
Bool save_under; /* should bits under be saved? (popups) */
|
||||
long event_mask; /* set of events that should be saved */
|
||||
@@ -311,6 +337,16 @@ typedef struct {
|
||||
char *address; /* pointer to where to find the bytes */
|
||||
} XHostAddress;
|
||||
|
||||
/*
|
||||
* Data structure for ServerFamilyInterpreted addresses in host routines
|
||||
*/
|
||||
typedef struct {
|
||||
int typelength; /* length of type string, in bytes */
|
||||
int valuelength; /* length of value string, in bytes */
|
||||
char *type; /* pointer to where to find the type string */
|
||||
char *value; /* pointer to where to find the address */
|
||||
} XServerInterpretedAddress;
|
||||
|
||||
/*
|
||||
* Data structure for "image" data, used by image manipulation routines.
|
||||
*/
|
||||
@@ -324,27 +360,29 @@ typedef struct _XImage {
|
||||
int bitmap_bit_order; /* LSBFirst, MSBFirst */
|
||||
int bitmap_pad; /* 8, 16, 32 either XY or ZPixmap */
|
||||
int depth; /* depth of image */
|
||||
int bytes_per_line; /* accelarator to next line */
|
||||
int bytes_per_line; /* accelerator to next line */
|
||||
int bits_per_pixel; /* bits per pixel (ZPixmap) */
|
||||
unsigned long red_mask; /* bits in z arrangment */
|
||||
unsigned long red_mask; /* bits in z arrangement */
|
||||
unsigned long green_mask;
|
||||
unsigned long blue_mask;
|
||||
XPointer obdata; /* hook for the object routines to hang on */
|
||||
struct funcs { /* image manipulation routines */
|
||||
struct _XImage *(*create_image)();
|
||||
#if NeedFunctionPrototypes
|
||||
struct _XImage *(*create_image)(
|
||||
struct _XDisplay* /* display */,
|
||||
Visual* /* visual */,
|
||||
unsigned int /* depth */,
|
||||
int /* format */,
|
||||
int /* offset */,
|
||||
char* /* data */,
|
||||
unsigned int /* width */,
|
||||
unsigned int /* height */,
|
||||
int /* bitmap_pad */,
|
||||
int /* bytes_per_line */);
|
||||
int (*destroy_image) (struct _XImage *);
|
||||
unsigned long (*get_pixel) (struct _XImage *, int, int);
|
||||
int (*put_pixel) (struct _XImage *, int, int, unsigned long);
|
||||
struct _XImage *(*sub_image)(struct _XImage *, int, int, unsigned int, unsigned int);
|
||||
int (*add_pixel) (struct _XImage *, long);
|
||||
#else
|
||||
int (*destroy_image)();
|
||||
unsigned long (*get_pixel)();
|
||||
int (*put_pixel)();
|
||||
struct _XImage *(*sub_image)();
|
||||
int (*add_pixel)();
|
||||
#endif
|
||||
} f;
|
||||
} XImage;
|
||||
|
||||
@@ -438,97 +476,67 @@ typedef struct {
|
||||
* The contents of this structure are implementation dependent.
|
||||
* A Display should be treated as opaque by application code.
|
||||
*/
|
||||
typedef struct _XDisplay {
|
||||
struct _XPrivate; /* Forward declare before use for C++ */
|
||||
struct _XrmHashBucketRec;
|
||||
|
||||
typedef struct
|
||||
_XDisplay
|
||||
{
|
||||
XExtData *ext_data; /* hook for extension to hang data */
|
||||
struct _XFreeFuncs *free_funcs; /* internal free functions */
|
||||
struct _XPrivate *private1;
|
||||
int fd; /* Network socket. */
|
||||
int conn_checker; /* ugly thing used by _XEventsQueued */
|
||||
int proto_major_version;/* maj. version of server's X protocol */
|
||||
int private2;
|
||||
int proto_major_version;/* major version of server's X protocol */
|
||||
int proto_minor_version;/* minor version of servers X protocol */
|
||||
char *vendor; /* vendor of the server hardware */
|
||||
XID resource_base; /* resource ID base */
|
||||
XID resource_mask; /* resource ID mask bits */
|
||||
XID resource_id; /* allocator current ID */
|
||||
int resource_shift; /* allocator shift to correct bits */
|
||||
XID (*resource_alloc)(); /* allocator function */
|
||||
XID private3;
|
||||
XID private4;
|
||||
XID private5;
|
||||
int private6;
|
||||
XID (*resource_alloc)( /* allocator function */
|
||||
struct _XDisplay*
|
||||
);
|
||||
int byte_order; /* screen byte order, LSBFirst, MSBFirst */
|
||||
int bitmap_unit; /* padding and data requirements */
|
||||
int bitmap_pad; /* padding requirements on bitmaps */
|
||||
int bitmap_bit_order; /* LeastSignificant or MostSignificant */
|
||||
int nformats; /* number of pixmap formats in list */
|
||||
ScreenFormat *pixmap_format; /* pixmap format list */
|
||||
int vnumber; /* Xlib's X protocol version number. */
|
||||
int private8;
|
||||
int release; /* release of the server */
|
||||
struct _XSQEvent *head, *tail; /* Input event queue. */
|
||||
struct _XPrivate *private9, *private10;
|
||||
int qlen; /* Length of input event queue */
|
||||
unsigned long request; /* sequence number of last request. */
|
||||
char *last_req; /* beginning of last request, or dummy */
|
||||
char *buffer; /* Output buffer starting address. */
|
||||
char *bufptr; /* Output buffer index pointer. */
|
||||
char *bufmax; /* Output buffer maximum+1 address. */
|
||||
XPointer private11;
|
||||
XPointer private12;
|
||||
XPointer private13;
|
||||
XPointer private14;
|
||||
unsigned max_request_size; /* maximum number 32 bit words in request*/
|
||||
struct _XrmHashBucketRec *db;
|
||||
int (*synchandler)(); /* Synchronization handler */
|
||||
int (*private15)(
|
||||
struct _XDisplay*
|
||||
);
|
||||
char *display_name; /* "host:display" string used on this connect*/
|
||||
int default_screen; /* default screen for operations */
|
||||
int nscreens; /* number of screens on this server*/
|
||||
Screen *screens; /* pointer to list of screens */
|
||||
unsigned long motion_buffer; /* size of motion buffer */
|
||||
unsigned long flags; /* internal connection flags */
|
||||
unsigned long private16;
|
||||
int min_keycode; /* minimum defined keycode */
|
||||
int max_keycode; /* maximum defined keycode */
|
||||
KeySym *keysyms; /* This server's keysyms */
|
||||
XModifierKeymap *modifiermap; /* This server's modifier keymap */
|
||||
int keysyms_per_keycode;/* number of rows */
|
||||
XPointer private17;
|
||||
XPointer private18;
|
||||
int private19;
|
||||
char *xdefaults; /* contents of defaults from server */
|
||||
char *scratch_buffer; /* place to hang scratch buffer */
|
||||
unsigned long scratch_length; /* length of scratch buffer */
|
||||
int ext_number; /* extension number on this display */
|
||||
struct _XExten *ext_procs; /* extensions initialized on this display */
|
||||
/*
|
||||
* the following can be fixed size, as the protocol defines how
|
||||
* much address space is available.
|
||||
* While this could be done using the extension vector, there
|
||||
* may be MANY events processed, so a search through the extension
|
||||
* list to find the right procedure for each event might be
|
||||
* expensive if many extensions are being used.
|
||||
*/
|
||||
Bool (*event_vec[128])(); /* vector for wire to event */
|
||||
Status (*wire_vec[128])(); /* vector for event to wire */
|
||||
KeySym lock_meaning; /* for XLookupString */
|
||||
struct _XLockInfo *lock; /* multi-thread state, display lock */
|
||||
struct _XInternalAsync *async_handlers; /* for internal async */
|
||||
unsigned long bigreq_size; /* max size of big requests */
|
||||
struct _XLockPtrs *lock_fns; /* pointers to threads functions */
|
||||
/* things above this line should not move, for binary compatibility */
|
||||
struct _XKeytrans *key_bindings; /* for XLookupString */
|
||||
Font cursor_font; /* for XCreateFontCursor */
|
||||
struct _XDisplayAtoms *atoms; /* for XInternAtom */
|
||||
unsigned int mode_switch; /* keyboard group modifiers */
|
||||
struct _XContextDB *context_db; /* context database */
|
||||
Bool (**error_vec)(); /* vector for wire to error */
|
||||
/*
|
||||
* Xcms information
|
||||
*/
|
||||
struct {
|
||||
XPointer defaultCCCs; /* pointer to an array of default XcmsCCC */
|
||||
XPointer clientCmaps; /* pointer to linked list of XcmsCmapRec */
|
||||
XPointer perVisualIntensityMaps;
|
||||
/* linked list of XcmsIntensityMap */
|
||||
} cms;
|
||||
struct _XIMFilter *im_filters;
|
||||
struct _XSQEvent *qfree; /* unallocated event queue elements */
|
||||
unsigned long next_event_serial_num; /* inserted into next queue elt */
|
||||
int (*savedsynchandler)(); /* user synchandler when Xlib usurps */
|
||||
} Display;
|
||||
|
||||
#if NeedFunctionPrototypes /* prototypes require event type definitions */
|
||||
#undef _XEVENT_
|
||||
#endif
|
||||
#ifndef _XEVENT_
|
||||
/* there is more to this structure, but it is private to Xlib */
|
||||
}
|
||||
Display,
|
||||
*_XPrivDisplay;
|
||||
|
||||
#define XMaxTransChars 7
|
||||
|
||||
#undef _XEVENT_
|
||||
#ifndef _XEVENT_
|
||||
/*
|
||||
* Definitions of specific events.
|
||||
*/
|
||||
@@ -615,7 +623,8 @@ typedef struct {
|
||||
Bool send_event; /* true if this came from a SendEvent request */
|
||||
Display *display; /* Display the event was read from */
|
||||
Window window; /* window of event */
|
||||
int mode; /* NotifyNormal, NotifyGrab, NotifyUngrab */
|
||||
int mode; /* NotifyNormal, NotifyWhileGrabbed,
|
||||
NotifyGrab, NotifyUngrab */
|
||||
int detail;
|
||||
/*
|
||||
* NotifyAncestor, NotifyVirtual, NotifyInferior,
|
||||
@@ -916,6 +925,33 @@ typedef struct {
|
||||
Window window; /* window on which event was requested in event mask */
|
||||
} XAnyEvent;
|
||||
|
||||
|
||||
/***************************************************************
|
||||
*
|
||||
* GenericEvent. This event is the standard event for all newer extensions.
|
||||
*/
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int type; /* of event. Always GenericEvent */
|
||||
unsigned long serial; /* # of last request processed */
|
||||
Bool send_event; /* true if from SendEvent request */
|
||||
Display *display; /* Display the event was read from */
|
||||
int extension; /* major opcode of extension that caused the event */
|
||||
int evtype; /* actual event type. */
|
||||
} XGenericEvent;
|
||||
|
||||
typedef struct {
|
||||
int type; /* of event. Always GenericEvent */
|
||||
unsigned long serial; /* # of last request processed */
|
||||
Bool send_event; /* true if from SendEvent request */
|
||||
Display *display; /* Display the event was read from */
|
||||
int extension; /* major opcode of extension that caused the event */
|
||||
int evtype; /* actual event type. */
|
||||
unsigned int cookie;
|
||||
void *data;
|
||||
} XGenericEventCookie;
|
||||
|
||||
/*
|
||||
* this union is defined so Xlib can always use the same sized
|
||||
* event structure internally, to avoid memory fragmentation.
|
||||
@@ -953,11 +989,13 @@ typedef union _XEvent {
|
||||
XMappingEvent xmapping;
|
||||
XErrorEvent xerror;
|
||||
XKeymapEvent xkeymap;
|
||||
XGenericEvent xgeneric;
|
||||
XGenericEventCookie xcookie;
|
||||
XID pad[24];
|
||||
} XEvent;
|
||||
#endif
|
||||
|
||||
#define XAllocID(dpy) ((*(dpy)->resource_alloc)((dpy)))
|
||||
#define XAllocID(dpy) ((*((_XPrivDisplay)(dpy))->resource_alloc)((dpy)))
|
||||
|
||||
/*
|
||||
* per character font metric information.
|
||||
@@ -1034,7 +1072,12 @@ typedef struct {
|
||||
XRectangle max_logical_extent;
|
||||
} XFontSetExtents;
|
||||
|
||||
typedef struct _XFontSet *XFontSet;
|
||||
/* unused:
|
||||
typedef void (*XOMProc)();
|
||||
*/
|
||||
|
||||
typedef struct _XOM *XOM;
|
||||
typedef struct _XOC *XOC, *XFontSet;
|
||||
|
||||
typedef struct {
|
||||
char *chars;
|
||||
@@ -1050,11 +1093,62 @@ typedef struct {
|
||||
XFontSet font_set;
|
||||
} XwcTextItem;
|
||||
|
||||
typedef void (*XIMProc)();
|
||||
#define XNRequiredCharSet "requiredCharSet"
|
||||
#define XNQueryOrientation "queryOrientation"
|
||||
#define XNBaseFontName "baseFontName"
|
||||
#define XNOMAutomatic "omAutomatic"
|
||||
#define XNMissingCharSet "missingCharSet"
|
||||
#define XNDefaultString "defaultString"
|
||||
#define XNOrientation "orientation"
|
||||
#define XNDirectionalDependentDrawing "directionalDependentDrawing"
|
||||
#define XNContextualDrawing "contextualDrawing"
|
||||
#define XNFontInfo "fontInfo"
|
||||
|
||||
typedef struct {
|
||||
int charset_count;
|
||||
char **charset_list;
|
||||
} XOMCharSetList;
|
||||
|
||||
typedef enum {
|
||||
XOMOrientation_LTR_TTB,
|
||||
XOMOrientation_RTL_TTB,
|
||||
XOMOrientation_TTB_LTR,
|
||||
XOMOrientation_TTB_RTL,
|
||||
XOMOrientation_Context
|
||||
} XOrientation;
|
||||
|
||||
typedef struct {
|
||||
int num_orientation;
|
||||
XOrientation *orientation; /* Input Text description */
|
||||
} XOMOrientation;
|
||||
|
||||
typedef struct {
|
||||
int num_font;
|
||||
XFontStruct **font_struct_list;
|
||||
char **font_name_list;
|
||||
} XOMFontInfo;
|
||||
|
||||
typedef struct _XIM *XIM;
|
||||
typedef struct _XIC *XIC;
|
||||
|
||||
typedef void (*XIMProc)(
|
||||
XIM,
|
||||
XPointer,
|
||||
XPointer
|
||||
);
|
||||
|
||||
typedef Bool (*XICProc)(
|
||||
XIC,
|
||||
XPointer,
|
||||
XPointer
|
||||
);
|
||||
|
||||
typedef void (*XIDProc)(
|
||||
Display*,
|
||||
XPointer,
|
||||
XPointer
|
||||
);
|
||||
|
||||
typedef unsigned long XIMStyle;
|
||||
|
||||
typedef struct {
|
||||
@@ -1073,17 +1167,20 @@ typedef struct {
|
||||
#define XIMStatusNone 0x0800L
|
||||
|
||||
#define XNVaNestedList "XNVaNestedList"
|
||||
#define XNQueryInputStyle "queryInputStyle"
|
||||
#define XNClientWindow "clientWindow"
|
||||
#define XNInputStyle "inputStyle"
|
||||
#define XNFocusWindow "focusWindow"
|
||||
#define XNResourceName "resourceName"
|
||||
#define XNResourceClass "resourceClass"
|
||||
#define XNGeometryCallback "geometryCallback"
|
||||
#define XNDestroyCallback "destroyCallback"
|
||||
#define XNFilterEvents "filterEvents"
|
||||
#define XNPreeditStartCallback "preeditStartCallback"
|
||||
#define XNPreeditDoneCallback "preeditDoneCallback"
|
||||
#define XNPreeditDrawCallback "preeditDrawCallback"
|
||||
#define XNPreeditCaretCallback "preeditCaretCallback"
|
||||
#define XNPreeditStateNotifyCallback "preeditStateNotifyCallback"
|
||||
#define XNPreeditAttributes "preeditAttributes"
|
||||
#define XNStatusStartCallback "statusStartCallback"
|
||||
#define XNStatusDoneCallback "statusDoneCallback"
|
||||
@@ -1101,31 +1198,47 @@ typedef struct {
|
||||
#define XNLineSpace "lineSpace"
|
||||
#define XNCursor "cursor"
|
||||
|
||||
#define XNQueryIMValuesList "queryIMValuesList"
|
||||
#define XNQueryICValuesList "queryICValuesList"
|
||||
#define XNVisiblePosition "visiblePosition"
|
||||
#define XNR6PreeditCallback "r6PreeditCallback"
|
||||
#define XNStringConversionCallback "stringConversionCallback"
|
||||
#define XNStringConversion "stringConversion"
|
||||
#define XNResetState "resetState"
|
||||
#define XNHotKey "hotKey"
|
||||
#define XNHotKeyState "hotKeyState"
|
||||
#define XNPreeditState "preeditState"
|
||||
#define XNSeparatorofNestedList "separatorofNestedList"
|
||||
|
||||
#define XBufferOverflow -1
|
||||
#define XLookupNone 1
|
||||
#define XLookupChars 2
|
||||
#define XLookupKeySym 3
|
||||
#define XLookupBoth 4
|
||||
|
||||
#if NeedFunctionPrototypes
|
||||
typedef void *XVaNestedList;
|
||||
#else
|
||||
typedef XPointer XVaNestedList;
|
||||
#endif
|
||||
|
||||
typedef struct {
|
||||
XPointer client_data;
|
||||
XIMProc callback;
|
||||
} XIMCallback;
|
||||
|
||||
typedef struct {
|
||||
XPointer client_data;
|
||||
XICProc callback;
|
||||
} XICCallback;
|
||||
|
||||
typedef unsigned long XIMFeedback;
|
||||
|
||||
#define XIMReverse 1
|
||||
#define XIMUnderline (1<<1)
|
||||
#define XIMHighlight (1<<2)
|
||||
#define XIMPrimary (1<<5)
|
||||
#define XIMSecondary (1<<6)
|
||||
#define XIMTertiary (1<<7)
|
||||
#define XIMReverse 1L
|
||||
#define XIMUnderline (1L<<1)
|
||||
#define XIMHighlight (1L<<2)
|
||||
#define XIMPrimary (1L<<5)
|
||||
#define XIMSecondary (1L<<6)
|
||||
#define XIMTertiary (1L<<7)
|
||||
#define XIMVisibleToForward (1L<<8)
|
||||
#define XIMVisibleToBackword (1L<<9)
|
||||
#define XIMVisibleToCenter (1L<<10)
|
||||
|
||||
typedef struct _XIMText {
|
||||
unsigned short length;
|
||||
@@ -1137,12 +1250,53 @@ typedef struct _XIMText {
|
||||
} string;
|
||||
} XIMText;
|
||||
|
||||
typedef struct _XIMPreeditDrawCallbackStruct {
|
||||
int caret; /* Cursor offset within pre-edit string */
|
||||
int chg_first; /* Starting change position */
|
||||
int chg_length; /* Length of the change in character count */
|
||||
XIMText *text;
|
||||
} XIMPreeditDrawCallbackStruct;
|
||||
typedef unsigned long XIMPreeditState;
|
||||
|
||||
#define XIMPreeditUnKnown 0L
|
||||
#define XIMPreeditEnable 1L
|
||||
#define XIMPreeditDisable (1L<<1)
|
||||
|
||||
typedef struct _XIMPreeditStateNotifyCallbackStruct {
|
||||
XIMPreeditState state;
|
||||
} XIMPreeditStateNotifyCallbackStruct;
|
||||
|
||||
typedef unsigned long XIMResetState;
|
||||
|
||||
#define XIMInitialState 1L
|
||||
#define XIMPreserveState (1L<<1)
|
||||
|
||||
typedef unsigned long XIMStringConversionFeedback;
|
||||
|
||||
#define XIMStringConversionLeftEdge (0x00000001)
|
||||
#define XIMStringConversionRightEdge (0x00000002)
|
||||
#define XIMStringConversionTopEdge (0x00000004)
|
||||
#define XIMStringConversionBottomEdge (0x00000008)
|
||||
#define XIMStringConversionConcealed (0x00000010)
|
||||
#define XIMStringConversionWrapped (0x00000020)
|
||||
|
||||
typedef struct _XIMStringConversionText {
|
||||
unsigned short length;
|
||||
XIMStringConversionFeedback *feedback;
|
||||
Bool encoding_is_wchar;
|
||||
union {
|
||||
char *mbs;
|
||||
wchar_t *wcs;
|
||||
} string;
|
||||
} XIMStringConversionText;
|
||||
|
||||
typedef unsigned short XIMStringConversionPosition;
|
||||
|
||||
typedef unsigned short XIMStringConversionType;
|
||||
|
||||
#define XIMStringConversionBuffer (0x0001)
|
||||
#define XIMStringConversionLine (0x0002)
|
||||
#define XIMStringConversionWord (0x0003)
|
||||
#define XIMStringConversionChar (0x0004)
|
||||
|
||||
typedef unsigned short XIMStringConversionOperation;
|
||||
|
||||
#define XIMStringConversionSubstitution (0x0001)
|
||||
#define XIMStringConversionRetrieval (0x0002)
|
||||
|
||||
typedef enum {
|
||||
XIMForwardChar, XIMBackwardChar,
|
||||
@@ -1154,6 +1308,21 @@ typedef enum {
|
||||
XIMDontChange
|
||||
} XIMCaretDirection;
|
||||
|
||||
typedef struct _XIMStringConversionCallbackStruct {
|
||||
XIMStringConversionPosition position;
|
||||
XIMCaretDirection direction;
|
||||
XIMStringConversionOperation operation;
|
||||
unsigned short factor;
|
||||
XIMStringConversionText *text;
|
||||
} XIMStringConversionCallbackStruct;
|
||||
|
||||
typedef struct _XIMPreeditDrawCallbackStruct {
|
||||
int caret; /* Cursor offset within pre-edit string */
|
||||
int chg_first; /* Starting change position */
|
||||
int chg_length; /* Length of the change in character count */
|
||||
XIMText *text;
|
||||
} XIMPreeditDrawCallbackStruct;
|
||||
|
||||
typedef enum {
|
||||
XIMIsInvisible, /* Disable caret feedback */
|
||||
XIMIsPrimary, /* UI defined caret feedback */
|
||||
@@ -1179,19 +1348,61 @@ typedef struct _XIMStatusDrawCallbackStruct {
|
||||
} data;
|
||||
} XIMStatusDrawCallbackStruct;
|
||||
|
||||
typedef int (*XErrorHandler) ( /* WARNING, this type not in Xlib spec */
|
||||
#if NeedFunctionPrototypes
|
||||
Display* /* display */,
|
||||
XErrorEvent* /* error_event */
|
||||
#endif
|
||||
);
|
||||
typedef struct _XIMHotKeyTrigger {
|
||||
KeySym keysym;
|
||||
int modifier;
|
||||
int modifier_mask;
|
||||
} XIMHotKeyTrigger;
|
||||
|
||||
typedef struct _XIMHotKeyTriggers {
|
||||
int num_hot_key;
|
||||
XIMHotKeyTrigger *key;
|
||||
} XIMHotKeyTriggers;
|
||||
|
||||
typedef unsigned long XIMHotKeyState;
|
||||
|
||||
#define XIMHotKeyStateON (0x0001L)
|
||||
#define XIMHotKeyStateOFF (0x0002L)
|
||||
|
||||
typedef struct {
|
||||
unsigned short count_values;
|
||||
char **supported_values;
|
||||
} XIMValuesList;
|
||||
|
||||
_XFUNCPROTOBEGIN
|
||||
|
||||
#if defined(WIN32) && !defined(_XLIBINT_)
|
||||
#define _Xdebug *_Xdebug_p
|
||||
#endif
|
||||
|
||||
typedef int (*XErrorHandler) ( /* WARNING, this type not in Xlib spec */
|
||||
Display* /* display */,
|
||||
XErrorEvent* /* error_event */
|
||||
);
|
||||
|
||||
typedef int (*XIOErrorHandler) ( /* WARNING, this type not in Xlib spec */
|
||||
Display* /* display */
|
||||
);
|
||||
|
||||
typedef void (*XIOErrorExitHandler) ( /* WARNING, this type not in Xlib spec */
|
||||
Display*, /* display */
|
||||
void* /* user_data */
|
||||
);
|
||||
|
||||
typedef void (*XConnectionWatchProc)(
|
||||
Display* /* dpy */,
|
||||
XPointer /* client_data */,
|
||||
int /* fd */,
|
||||
Bool /* opening */, /* open or close flag */
|
||||
XPointer* /* watch_data */ /* open sets, close uses */
|
||||
);
|
||||
|
||||
#include "tkIntXlibDecls.h"
|
||||
|
||||
#ifdef __clang__
|
||||
#pragma clang diagnostic pop
|
||||
#endif
|
||||
|
||||
_XFUNCPROTOEND
|
||||
|
||||
#if defined(MAC_OSX_TK)
|
||||
@@ -1199,4 +1410,4 @@ _XFUNCPROTOEND
|
||||
# undef Region
|
||||
#endif
|
||||
|
||||
#endif /* _XLIB_H_ */
|
||||
#endif /* _X11_XLIB_H_ */
|
||||
|
||||
4
.CondaPkg/env/Library/include/X11/Xutil.h
vendored
4
.CondaPkg/env/Library/include/X11/Xutil.h
vendored
@@ -408,11 +408,11 @@ extern int XDestroyRegion(
|
||||
Region /* r */
|
||||
);
|
||||
|
||||
extern int XEmptyRegion(
|
||||
extern Bool XEmptyRegion(
|
||||
Region /* r */
|
||||
);
|
||||
|
||||
extern int XEqualRegion(
|
||||
extern Bool XEqualRegion(
|
||||
Region /* r1 */,
|
||||
Region /* r2 */
|
||||
);
|
||||
|
||||
16
.CondaPkg/env/Library/include/X11/keysymdef.h
vendored
16
.CondaPkg/env/Library/include/X11/keysymdef.h
vendored
@@ -437,8 +437,10 @@ SOFTWARE.
|
||||
#define XK_dead_O 0xfe87
|
||||
#define XK_dead_u 0xfe88
|
||||
#define XK_dead_U 0xfe89
|
||||
#define XK_dead_small_schwa 0xfe8a
|
||||
#define XK_dead_capital_schwa 0xfe8b
|
||||
#define XK_dead_schwa 0xfe8a
|
||||
#define XK_dead_SCHWA 0xfe8b
|
||||
#define XK_dead_small_schwa 0xfe8a /* deprecated, remove in 2025 */
|
||||
#define XK_dead_capital_schwa 0xfe8b /* deprecated, remove in 2025 */
|
||||
|
||||
#define XK_dead_greek 0xfe8c
|
||||
|
||||
@@ -656,7 +658,8 @@ SOFTWARE.
|
||||
#define XK_diaeresis 0x00a8 /* U+00A8 DIAERESIS */
|
||||
#define XK_copyright 0x00a9 /* U+00A9 COPYRIGHT SIGN */
|
||||
#define XK_ordfeminine 0x00aa /* U+00AA FEMININE ORDINAL INDICATOR */
|
||||
#define XK_guillemotleft 0x00ab /* U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
|
||||
#define XK_guillemetleft 0x00ab /* U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
|
||||
#define XK_guillemotleft 0x00ab /* deprecated misspelling */
|
||||
#define XK_notsign 0x00ac /* U+00AC NOT SIGN */
|
||||
#define XK_hyphen 0x00ad /* U+00AD SOFT HYPHEN */
|
||||
#define XK_registered 0x00ae /* U+00AE REGISTERED SIGN */
|
||||
@@ -671,8 +674,10 @@ SOFTWARE.
|
||||
#define XK_periodcentered 0x00b7 /* U+00B7 MIDDLE DOT */
|
||||
#define XK_cedilla 0x00b8 /* U+00B8 CEDILLA */
|
||||
#define XK_onesuperior 0x00b9 /* U+00B9 SUPERSCRIPT ONE */
|
||||
#define XK_masculine 0x00ba /* U+00BA MASCULINE ORDINAL INDICATOR */
|
||||
#define XK_guillemotright 0x00bb /* U+00BB RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
|
||||
#define XK_ordmasculine 0x00ba /* U+00BA MASCULINE ORDINAL INDICATOR */
|
||||
#define XK_masculine 0x00ba /* deprecated inconsistent name */
|
||||
#define XK_guillemetright 0x00bb /* U+00BB RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
|
||||
#define XK_guillemotright 0x00bb /* deprecated misspelling */
|
||||
#define XK_onequarter 0x00bc /* U+00BC VULGAR FRACTION ONE QUARTER */
|
||||
#define XK_onehalf 0x00bd /* U+00BD VULGAR FRACTION ONE HALF */
|
||||
#define XK_threequarters 0x00be /* U+00BE VULGAR FRACTION THREE QUARTERS */
|
||||
@@ -737,6 +742,7 @@ SOFTWARE.
|
||||
#define XK_odiaeresis 0x00f6 /* U+00F6 LATIN SMALL LETTER O WITH DIAERESIS */
|
||||
#define XK_division 0x00f7 /* U+00F7 DIVISION SIGN */
|
||||
#define XK_oslash 0x00f8 /* U+00F8 LATIN SMALL LETTER O WITH STROKE */
|
||||
#define XK_ooblique 0x00f8 /* U+00F8 LATIN SMALL LETTER O WITH STROKE */
|
||||
#define XK_ugrave 0x00f9 /* U+00F9 LATIN SMALL LETTER U WITH GRAVE */
|
||||
#define XK_uacute 0x00fa /* U+00FA LATIN SMALL LETTER U WITH ACUTE */
|
||||
#define XK_ucircumflex 0x00fb /* U+00FB LATIN SMALL LETTER U WITH CIRCUMFLEX */
|
||||
|
||||
Reference in New Issue
Block a user