diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-12 13:48:18 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-12 13:48:18 +0000 |
| commit | e2c8d047679db3bbb166d709b86e18180be6d713 (patch) | |
| tree | d7468ac76dc71bb8d38c816be6db988bcbcbb863 /libXext | |
| parent | 57fb3f76b66c5f7a9f7bed9c42fb9fec9d56ee05 (diff) | |
| parent | 7730393619080086530e24d3b594351b4114f608 (diff) | |
| download | vcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.tar.gz vcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.tar.bz2 vcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libXext')
| -rw-r--r-- | libXext/include/X11/extensions/XShm.h | 8 | ||||
| -rw-r--r-- | libXext/include/X11/extensions/xtestext1.h | 14 | ||||
| -rw-r--r-- | libXext/man/XShm.man | 10 | ||||
| -rw-r--r-- | libXext/src/XShm.c | 8 |
4 files changed, 27 insertions, 13 deletions
diff --git a/libXext/include/X11/extensions/XShm.h b/libXext/include/X11/extensions/XShm.h index daeef3e32..824ab3206 100644 --- a/libXext/include/X11/extensions/XShm.h +++ b/libXext/include/X11/extensions/XShm.h @@ -75,17 +75,17 @@ int XShmPixmapFormat( Display* /* dpy */
);
-Status XShmAttach(
+Bool XShmAttach(
Display* /* dpy */,
XShmSegmentInfo* /* shminfo */
);
-Status XShmDetach(
+Bool XShmDetach(
Display* /* dpy */,
XShmSegmentInfo* /* shminfo */
);
-Status XShmPutImage(
+Bool XShmPutImage(
Display* /* dpy */,
Drawable /* d */,
GC /* gc */,
@@ -99,7 +99,7 @@ Status XShmPutImage( Bool /* send_event */
);
-Status XShmGetImage(
+Bool XShmGetImage(
Display* /* dpy */,
Drawable /* d */,
XImage* /* image */,
diff --git a/libXext/include/X11/extensions/xtestext1.h b/libXext/include/X11/extensions/xtestext1.h index d6fae784e..9c2876315 100644 --- a/libXext/include/X11/extensions/xtestext1.h +++ b/libXext/include/X11/extensions/xtestext1.h @@ -81,4 +81,18 @@ typedef struct { Window window;
} XTestFakeAckEvent;
+_XFUNCPROTOBEGIN
+
+int XTestFakeInput(register Display *dpy, char *action_list_addr, int action_list_size, int ack_flag);
+int XTestGetInput(register Display *dpy, int action_handling);
+int XTestQueryInputSize(register Display *dpy, unsigned long *size_return);
+int XTestPressKey(Display *display, int device_id, unsigned long delay, unsigned int keycode, unsigned int key_action);
+int XTestPressButton(Display * display, int device_id, unsigned long delay, unsigned int button_number, unsigned int button_action);
+int XTestMovePointer(Display *display, int device_id, unsigned long delay[], int x[], int y[], unsigned int count);
+int XTestFlush(Display *display);
+int XTestStopInput(register Display *dpy);
+int XTestReset(register Display *dpy);
+
+_XFUNCPROTOEND
+
#endif /* _XTESTEXT1_H */
diff --git a/libXext/man/XShm.man b/libXext/man/XShm.man index 793680090..87e34c3ca 100644 --- a/libXext/man/XShm.man +++ b/libXext/man/XShm.man @@ -70,14 +70,14 @@ Bool XShmQueryVersion( int *major, *minor;
Bool *pixmaps);
.LP
-Status XShmPixmapFormat(
+int XShmPixmapFormat(
Display *display);
.LP
-Status XShmAttach(
+Bool XShmAttach(
Display *display;
XShmSegmentInfo *shminfo);
.LP
-Status XShmDetach(
+Bool XShmDetach(
Display *display;
XShmSegmentInfo *shminfo);
@@ -91,7 +91,7 @@ XImage *XShmCreateImage ( XShmSegmentInfo *shminfo;
unsigned int width, height);
.LP
-Status XShmPutImage(
+Bool XShmPutImage(
Display *display;
Drawable d;
GC gc;
@@ -100,7 +100,7 @@ Status XShmPutImage( unsigned int width, height;
bool send_event);
.LP
-Status XShmGetImage (
+Bool XShmGetImage (
Display *display;
Drawable d;
XImage *image;
diff --git a/libXext/src/XShm.c b/libXext/src/XShm.c index cffd30756..e4bc1f3e0 100644 --- a/libXext/src/XShm.c +++ b/libXext/src/XShm.c @@ -223,7 +223,7 @@ int XShmPixmapFormat(Display *dpy) }
-Status XShmAttach(Display *dpy, XShmSegmentInfo *shminfo)
+Bool XShmAttach(Display *dpy, XShmSegmentInfo *shminfo)
{
XExtDisplayInfo *info = find_display (dpy);
register xShmAttachReq *req;
@@ -243,7 +243,7 @@ Status XShmAttach(Display *dpy, XShmSegmentInfo *shminfo) }
-Status XShmDetach(Display *dpy, XShmSegmentInfo *shminfo)
+Bool XShmDetach(Display *dpy, XShmSegmentInfo *shminfo)
{
XExtDisplayInfo *info = find_display (dpy);
register xShmDetachReq *req;
@@ -312,7 +312,7 @@ XImage *XShmCreateImage ( return image;
}
-Status XShmPutImage (
+Bool XShmPutImage (
register Display *dpy,
Drawable d,
GC gc,
@@ -354,7 +354,7 @@ Status XShmPutImage ( }
-Status XShmGetImage(
+Bool XShmGetImage(
register Display *dpy,
Drawable d,
XImage *image,
|