diff options
Diffstat (limited to 'nx-X11/lib/include/X11')
| -rw-r--r-- | nx-X11/lib/include/X11/ImUtil.h | 12 | ||||
| -rw-r--r-- | nx-X11/lib/include/X11/XKBlib.h | 2 | ||||
| -rw-r--r-- | nx-X11/lib/include/X11/Xlib.h | 16 | ||||
| -rw-r--r-- | nx-X11/lib/include/X11/Xlibint.h | 29 |
4 files changed, 39 insertions, 20 deletions
diff --git a/nx-X11/lib/include/X11/ImUtil.h b/nx-X11/lib/include/X11/ImUtil.h index a8b95eead..c0aface46 100644 --- a/nx-X11/lib/include/X11/ImUtil.h +++ b/nx-X11/lib/include/X11/ImUtil.h @@ -16,16 +16,16 @@ _XGetBitsPerPixel( extern int _XSetImage( XImage *srcimg, - register XImage *dstimg, - register int x, - register int y); + XImage *dstimg, + int x, + int y); extern int _XReverse_Bytes( - register unsigned char *bpt, - register int nb); + unsigned char *bpt, + int nb); extern void _XInitImageFuncPtrs( - register XImage *image); + XImage *image); #endif /* !defined(_X11_IMUTIL_H_) && !defined(_IM_UTIL_H_) */ diff --git a/nx-X11/lib/include/X11/XKBlib.h b/nx-X11/lib/include/X11/XKBlib.h index dd2841e9a..5d46a4820 100644 --- a/nx-X11/lib/include/X11/XKBlib.h +++ b/nx-X11/lib/include/X11/XKBlib.h @@ -397,7 +397,7 @@ extern Bool XkbTranslateKeyCode( extern int XkbTranslateKeySym( Display * /* dpy */, - register KeySym * /* sym_return */, + KeySym * /* sym_return */, unsigned int /* modifiers */, char * /* buffer */, int /* nbytes */, diff --git a/nx-X11/lib/include/X11/Xlib.h b/nx-X11/lib/include/X11/Xlib.h index 362fdb69e..5f3a407f9 100644 --- a/nx-X11/lib/include/X11/Xlib.h +++ b/nx-X11/lib/include/X11/Xlib.h @@ -292,7 +292,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 */ @@ -364,9 +364,9 @@ 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 */ @@ -1858,6 +1858,16 @@ extern XIOErrorHandler XSetIOErrorHandler ( XIOErrorHandler /* handler */ ); +typedef void (*XIOErrorExitHandler) ( /* WARNING, this type not in Xlib spec */ + Display*, /* display */ + void* /* user_data */ +); + +extern void XSetIOErrorExitHandler ( + Display*, /* display */ + XIOErrorExitHandler, /* handler */ + void* /* user_data */ +); extern XPixmapFormatValues *XListPixmapFormats( Display* /* display */, diff --git a/nx-X11/lib/include/X11/Xlibint.h b/nx-X11/lib/include/X11/Xlibint.h index ce20b9a3d..e5b97e3a5 100644 --- a/nx-X11/lib/include/X11/Xlibint.h +++ b/nx-X11/lib/include/X11/Xlibint.h @@ -236,6 +236,11 @@ struct _XDisplay unsigned long last_request_read_upper32bit; unsigned long request_upper32bit; #endif + + struct _XErrorThreadInfo *error_threads; + + XIOErrorExitHandler exit_handler; + void *exit_handler_data; }; #define XAllocIDs(dpy,ids,n) (*(dpy)->idlist_alloc)(dpy,ids,n) @@ -475,15 +480,15 @@ extern LockInfoPtr _Xglobal_lock; */ #if defined(MALLOC_0_RETURNS_NULL) || defined(__clang_analyzer__) -# define Xmalloc(size) malloc(((size) == 0 ? 1 : (size))) -# define Xrealloc(ptr, size) realloc((ptr), ((size) == 0 ? 1 : (size))) -# define Xcalloc(nelem, elsize) calloc(((nelem) == 0 ? 1 : (nelem)), (elsize)) +# define Xmalloc(size) malloc((size_t)((size) == 0 ? 1 : (size))) +# define Xrealloc(ptr, size) realloc((ptr), (size_t)((size) == 0 ? 1 : (size))) +# define Xcalloc(nelem, elsize) calloc((size_t)((nelem) == 0 ? 1 : (nelem)), (size_t)(elsize)) #else -# define Xmalloc(size) malloc((size)) -# define Xrealloc(ptr, size) realloc((ptr), (size)) -# define Xcalloc(nelem, elsize) calloc((nelem), (elsize)) +# define Xmalloc(size) malloc((size_t)(size)) +# define Xrealloc(ptr, size) realloc((ptr), (size_t)(size)) +# define Xcalloc(nelem, elsize) calloc((size_t)(nelem), (size_t)(elsize)) #endif @@ -581,7 +586,7 @@ extern void *_XGetRequest(Display *dpy, CARD8 type, size_t len); bytes after the request. "n" must be a multiple of 4! */ #define GetReqExtra(name, n, req) \ - GetReqSized(name, SIZEOF(x##name##Req) + n, req) + GetReqSized(name, SIZEOF(x##name##Req) + n, req) /* * GetResReq is for those requests that have a resource ID @@ -591,7 +596,7 @@ extern void *_XGetRequest(Display *dpy, CARD8 type, size_t len); #define GetResReq(name, rid, req) \ req = (xResourceReq *) _XGetRequest(dpy, X_##name, SIZEOF(xResourceReq)); \ - req->id = (rid) + if (req) req->id = (rid) /* * GetEmptyReq is for those requests that have no arguments @@ -673,7 +678,7 @@ extern void _XFlushGCCache(Display *dpy, GC gc); #ifndef DataRoutineIsProcedure #define Data(dpy, data, len) {\ if (dpy->bufptr + (len) <= dpy->bufmax) {\ - memcpy(dpy->bufptr, data, (int)len);\ + memcpy(dpy->bufptr, data, (int)(len));\ dpy->bufptr += ((len) + 3) & ~3;\ } else\ _XSend(dpy, data, len);\ @@ -709,7 +714,7 @@ extern void _XFlushGCCache(Display *dpy, GC gc); #define Data32(dpy, data, len) _XData32(dpy, (_Xconst long *)data, len) extern int _XData32( Display *dpy, - _Xconst long *data, + _Xconst long *data, unsigned len ); extern void _XRead32( @@ -1427,6 +1432,10 @@ extern int _XDefaultError( extern int _XDefaultIOError( Display *dpy); +extern void _XDefaultIOErrorExit( + Display *dpy, + void *user_data); + extern void _XSetClipRectangles ( Display *dpy, GC gc, |