diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-24 21:23:32 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-24 21:23:32 (GMT) |
| commit | 1b4e22424f79b1e910cd4acb0352fd4ec8badbec (patch) | |
| tree | 52fad7dc3bea11e483345ea97f52a4bae86bd59e /generic/tkIntXlibDecls.h | |
| parent | 97a31b80b8c9dd4d9a19984a9b709af0265d4c43 (diff) | |
| parent | c2eaef98e73b309df7c2e262fc0c982a634d0f9d (diff) | |
| download | tk-1b4e22424f79b1e910cd4acb0352fd4ec8badbec.zip tk-1b4e22424f79b1e910cd4acb0352fd4ec8badbec.tar.gz tk-1b4e22424f79b1e910cd4acb0352fd4ec8badbec.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tkIntXlibDecls.h')
| -rw-r--r-- | generic/tkIntXlibDecls.h | 60 |
1 files changed, 37 insertions, 23 deletions
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h index e71b611..ad58e21 100644 --- a/generic/tkIntXlibDecls.h +++ b/generic/tkIntXlibDecls.h @@ -693,7 +693,7 @@ EXTERN int XQueryColors(Display *display, Colormap colormap, EXTERN Status XQueryTree(Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui); /* 91 */ -EXTERN int XSync(Display *display, Bool flag); +EXTERN int XSync(Display *display, Bool discard); /* Slot 92 is reserved */ /* Slot 93 is reserved */ /* Slot 94 is reserved */ @@ -709,14 +709,21 @@ EXTERN int XSync(Display *display, Bool flag); /* Slot 104 is reserved */ /* Slot 105 is reserved */ /* Slot 106 is reserved */ -/* Slot 107 is reserved */ -/* Slot 108 is reserved */ -/* Slot 109 is reserved */ -/* Slot 110 is reserved */ -/* Slot 111 is reserved */ -/* Slot 112 is reserved */ +/* 107 */ +EXTERN int XFlush(Display *display); +/* 108 */ +EXTERN int XGrabServer(Display *display); +/* 109 */ +EXTERN int XUngrabServer(Display *display); +/* 110 */ +EXTERN int XFree(void *data); +/* 111 */ +EXTERN int XNoOp(Display *display); +/* 112 */ +EXTERN XAfterFunction XSynchronize(Display *display, Bool onoff); /* Slot 113 is reserved */ -/* Slot 114 is reserved */ +/* 114 */ +EXTERN VisualID XVisualIDFromVisual(Visual *visual); /* Slot 115 is reserved */ /* Slot 116 is reserved */ /* Slot 117 is reserved */ @@ -1005,7 +1012,7 @@ typedef struct TkIntXlibStubs { int (*xQueryColor) (Display *display, Colormap colormap, XColor *def_in_out); /* 88 */ int (*xQueryColors) (Display *display, Colormap colormap, XColor *defs_in_out, int ncolors); /* 89 */ Status (*xQueryTree) (Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui); /* 90 */ - int (*xSync) (Display *display, Bool flag); /* 91 */ + int (*xSync) (Display *display, Bool discard); /* 91 */ void (*reserved92)(void); void (*reserved93)(void); void (*reserved94)(void); @@ -1021,14 +1028,14 @@ typedef struct TkIntXlibStubs { void (*reserved104)(void); void (*reserved105)(void); void (*reserved106)(void); - void (*reserved107)(void); - void (*reserved108)(void); - void (*reserved109)(void); - void (*reserved110)(void); - void (*reserved111)(void); - void (*reserved112)(void); + int (*xFlush) (Display *display); /* 107 */ + int (*xGrabServer) (Display *display); /* 108 */ + int (*xUngrabServer) (Display *display); /* 109 */ + int (*xFree) (void *data); /* 110 */ + int (*xNoOp) (Display *display); /* 111 */ + XAfterFunction (*xSynchronize) (Display *display, Bool onoff); /* 112 */ void (*reserved113)(void); - void (*reserved114)(void); + VisualID (*xVisualIDFromVisual) (Visual *visual); /* 114 */ void (*reserved115)(void); void (*reserved116)(void); void (*reserved117)(void); @@ -1539,14 +1546,21 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr; /* Slot 104 is reserved */ /* Slot 105 is reserved */ /* Slot 106 is reserved */ -/* Slot 107 is reserved */ -/* Slot 108 is reserved */ -/* Slot 109 is reserved */ -/* Slot 110 is reserved */ -/* Slot 111 is reserved */ -/* Slot 112 is reserved */ +#define XFlush \ + (tkIntXlibStubsPtr->xFlush) /* 107 */ +#define XGrabServer \ + (tkIntXlibStubsPtr->xGrabServer) /* 108 */ +#define XUngrabServer \ + (tkIntXlibStubsPtr->xUngrabServer) /* 109 */ +#define XFree \ + (tkIntXlibStubsPtr->xFree) /* 110 */ +#define XNoOp \ + (tkIntXlibStubsPtr->xNoOp) /* 111 */ +#define XSynchronize \ + (tkIntXlibStubsPtr->xSynchronize) /* 112 */ /* Slot 113 is reserved */ -/* Slot 114 is reserved */ +#define XVisualIDFromVisual \ + (tkIntXlibStubsPtr->xVisualIDFromVisual) /* 114 */ /* Slot 115 is reserved */ /* Slot 116 is reserved */ /* Slot 117 is reserved */ |