Xserver: Present extension backport from X.org

nx-X11/config/cf/X11.tmpl

@@ -223,6 +223,9 @@ XORGRELSTRING = XorgManVersionString
 #ifndef BuildRender
 #define BuildRender		YES
 #endif
+#ifndef BuildPresent
+#define BuildPresent		YES
+#endif
 
 #ifndef BuildRandR
 #define BuildRandR		YES

nx-X11/config/cf/xorg.cf

@@ -449,6 +449,11 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 # define BuildRender		YES
 #endif
 
+/* Build Present extension */
+#ifndef BuildPresent
+# define BuildPresent		YES
+#endif
+
 #if 0
 #ifndef JoystickSupport
 # define JoystickSupport	NO

nx-X11/include/extensions/Imakefile

@@ -20,6 +20,9 @@ RANDRHEADERS = randr.h randrproto.h
 #if BuildRender
 RENDERHEADERS = render.h renderproto.h
 #endif
+#if BuildPresent
+PRESENTHEADERS = presentproto.h presenttokens.h
+#endif
 #if BuildXfixes
 XFIXESHEADERS = xfixeswire.h xfixesproto.h
 #endif
@@ -43,6 +46,7 @@ EXTRAHEADERS = \
 	$(XVMCHEADERS) \
 	$(RANDRHEADERS) \
 	$(RENDERHEADERS) \
+	$(PRESENTHEADERS) \
 	$(XFIXESHEADERS) \
 	$(COMPOSITEHEADERS) \
 	$(DAMAGEHEADERS) \

nx-X11/include/extensions/presentproto.h

@@ -0,0 +1,248 @@
+/*
+ * Copyright © 2013 Keith Packard
+ *
+ * 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, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _PRESENT_PROTO_H_
+#define _PRESENT_PROTO_H_
+
+#include <nx-X11/extensions/presenttokens.h>
+
+#define Window CARD32
+#define Pixmap CARD32
+#define Region CARD32
+#define XSyncFence CARD32
+#define EventID CARD32
+
+typedef struct {
+    Window  window B32;
+    CARD32  serial B32;
+} xPresentNotify;
+#define sz_xPresentNotify               8
+
+typedef struct {
+    CARD8   reqType;
+    CARD8   presentReqType;
+    CARD16  length B16;
+    CARD32  majorVersion B32;
+    CARD32  minorVersion B32;
+} xPresentQueryVersionReq;
+#define sz_xPresentQueryVersionReq   12
+
+typedef struct {
+    BYTE    type;   /* X_Reply */
+    BYTE    pad1;
+    CARD16  sequenceNumber B16;
+    CARD32  length B32;
+    CARD32  majorVersion B32;
+    CARD32  minorVersion B32;
+    CARD32  pad2 B32;
+    CARD32  pad3 B32;
+    CARD32  pad4 B32;
+    CARD32  pad5 B32;
+} xPresentQueryVersionReply;
+#define sz_xPresentQueryVersionReply	32
+
+typedef struct {
+    CARD8   reqType;
+    CARD8   presentReqType;
+    CARD16  length B16;
+    Window  window B32;
+
+    Pixmap  pixmap B32;
+    CARD32  serial B32;
+
+    Region  valid B32;
+    Region  update B32;
+
+    INT16   x_off B16;
+    INT16   y_off B16;
+    CARD32  target_crtc B32;
+
+    XSyncFence wait_fence B32;
+    XSyncFence idle_fence B32;
+
+    CARD32  options B32;
+    CARD32  pad1 B32;
+
+    CARD64  target_msc;
+    CARD64  divisor;
+    CARD64  remainder;
+    /* followed by a LISTofPRESENTNOTIFY */
+} xPresentPixmapReq;
+#define sz_xPresentPixmapReq	72
+
+typedef struct {
+    CARD8   reqType;
+    CARD8   presentReqType;
+    CARD16  length B16;
+    Window  window B32;
+
+    CARD32  serial B32;
+    CARD32  pad0 B32;
+
+    CARD64  target_msc;
+    CARD64  divisor;
+    CARD64  remainder;
+} xPresentNotifyMSCReq;
+#define sz_xPresentNotifyMSCReq	40
+
+typedef struct {
+    CARD8   reqType;
+    CARD8   presentReqType;
+    CARD16  length B16;
+    CARD32  eid B32;
+    CARD32  window B32;
+    CARD32  eventMask B32;
+} xPresentSelectInputReq;
+#define sz_xPresentSelectInputReq   16
+
+typedef struct {
+    CARD8   reqType;
+    CARD8   presentReqType;
+    CARD16  length B16;
+    CARD32  target B32;
+} xPresentQueryCapabilitiesReq;
+#define sz_xPresentQueryCapabilitiesReq   8
+
+typedef struct {
+    BYTE    type;   /* X_Reply */
+    BYTE    pad1;
+    CARD16  sequenceNumber B16;
+    CARD32  length B32;
+    CARD32  capabilities B32;
+    CARD32  pad3 B32;
+    CARD32  pad4 B32;
+    CARD32  pad5 B32;
+    CARD32  pad6 B32;
+    CARD32  pad7 B32;
+} xPresentQueryCapabilitiesReply;
+#define sz_xPresentQueryCapabilitiesReply       32
+
+/*
+ * Events
+ *
+ * All Present events are X Generic Events
+ */
+
+typedef struct {
+    CARD8 type;
+    CARD8 extension;
+    CARD16 sequenceNumber B16;
+    CARD32 length;
+    CARD16 evtype B16;
+    CARD16 pad2;
+    CARD32 eid B32;
+    CARD32 window B32;
+    INT16  x B16;
+    INT16  y B16;
+    CARD16 width B16;
+    CARD16 height B16;
+    INT16  off_x B16;
+    INT16  off_y B16;
+
+    CARD16 pixmap_width B16;
+    CARD16 pixmap_height B16;
+    CARD32 pixmap_flags B32;
+} xPresentConfigureNotify;
+#define sz_xPresentConfigureNotify 40
+
+typedef struct {
+    CARD8 type;
+    CARD8 extension;
+    CARD16 sequenceNumber B16;
+    CARD32 length;
+    CARD16 evtype B16;
+    CARD8  kind;
+    CARD8  mode;
+    CARD32 eid B32;
+    Window window B32;
+    CARD32 serial B32;
+    CARD64 ust;
+
+    CARD64 msc;
+} xPresentCompleteNotify;
+#define sz_xPresentCompleteNotify 40
+
+typedef struct {
+    CARD8 type;
+    CARD8 extension;
+    CARD16 sequenceNumber B16;
+    CARD32 length;
+    CARD16 evtype B16;
+    CARD16 pad2 B16;
+    CARD32 eid B32;
+    Window window B32;
+    CARD32 serial B32;
+    Pixmap pixmap B32;
+    CARD32 idle_fence B32;
+} xPresentIdleNotify;
+#define sz_xPresentIdleNotify   32
+
+#if PRESENT_FUTURE_VERSION
+typedef struct {
+    CARD8 type;
+    CARD8 extension;
+    CARD16 sequenceNumber B16;
+    CARD32 length;
+    CARD16 evtype B16;
+    CARD8 update_window;
+    CARD8 pad1;
+    CARD32 eid B32;
+    Window event_window B32;
+    Window window B32;
+    Pixmap pixmap B32;
+    CARD32 serial B32;
+
+    /* 32-byte boundary */
+
+    Region valid_region B32;
+    Region update_region B32;
+
+    xRectangle valid_rect;
+
+    xRectangle update_rect;
+
+    INT16 x_off B16;
+    INT16 y_off B16;
+    CARD32 target_crtc B32;
+
+    XSyncFence wait_fence B32;
+    XSyncFence idle_fence B32;
+
+    CARD32 options B32;
+    CARD32 pad2 B32;
+
+    CARD64 target_msc;
+    CARD64 divisor;
+    CARD64 remainder;
+
+} xPresentRedirectNotify;
+
+#define sz_xPresentRedirectNotify 104
+#endif
+
+#undef Window
+#undef Pixmap
+#undef Region
+#undef XSyncFence
+#undef EventID
+
+#endif

nx-X11/include/extensions/presenttokens.h

@@ -0,0 +1,101 @@
+/*
+ * Copyright © 2013 Keith Packard
+ *
+ * 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, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _PRESENT_TOKENS_H_
+#define _PRESENT_TOKENS_H_
+
+#define PRESENT_NAME			"Present"
+#define PRESENT_MAJOR			1
+#define PRESENT_MINOR			0
+
+#define PresentNumberErrors		0
+#define PresentNumberEvents		0
+
+/* Requests */
+#define X_PresentQueryVersion		0
+#define X_PresentPixmap			1
+#define X_PresentNotifyMSC		2
+#define X_PresentSelectInput		3
+#define X_PresentQueryCapabilities      4
+
+#define PresentNumberRequests		5
+
+/* Present operation options */
+#define PresentOptionNone               0
+#define PresentOptionAsync              (1 << 0)
+#define PresentOptionCopy               (1 << 1)
+#define PresentOptionUST                (1 << 2)
+
+#define PresentAllOptions       (PresentOptionAsync | \
+                                 PresentOptionCopy | \
+                                 PresentOptionUST)
+
+/* Present capabilities */
+
+#define PresentCapabilityNone           0
+#define PresentCapabilityAsync          1
+#define PresentCapabilityFence          2
+#define PresentCapabilityUST            4
+
+#define PresentAllCapabilities  (PresentCapabilityAsync | \
+                                 PresentCapabilityFence | \
+                                 PresentCapabilityUST)
+
+/* Events */
+#define PresentConfigureNotify	0
+#define PresentCompleteNotify	1
+#define PresentIdleNotify       2
+#if PRESENT_FUTURE_VERSION
+#define PresentRedirectNotify	3
+#endif
+
+/* Event Masks */
+#define PresentConfigureNotifyMask      1
+#define PresentCompleteNotifyMask       2
+#define PresentIdleNotifyMask           4
+#if PRESENT_FUTURE_VERSION
+#define PresentRedirectNotifyMask       8
+#endif
+
+#if PRESENT_FUTURE_VERSION
+#define PRESENT_REDIRECT_NOTIFY_MASK    PresentRedirectNotifyMask
+#else
+#define PRESENT_REDIRECT_NOTIFY_MASK    0
+#endif
+
+#define PresentAllEvents   (PresentConfigureNotifyMask |        \
+                            PresentCompleteNotifyMask |         \
+                            PresentIdleNotifyMask |             \
+                            PRESENT_REDIRECT_NOTIFY_MASK)
+
+/* Complete Kinds */
+
+#define PresentCompleteKindPixmap       0
+#define PresentCompleteKindNotifyMSC    1
+
+/* Complete Modes */
+
+#define PresentCompleteModeCopy         0
+#define PresentCompleteModeFlip         1
+#define PresentCompleteModeSkip         2
+
+#endif