nested: port to new compat API.

This ports nested to the new server compat API.

Signed-off-by: Dave Airlie <airlied@redhat.com>

3 files changed, 150 insertions, 43 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index fd60a31..44dc656 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,4 +28,4 @@ nested_drv_la_LDFLAGS = -module -avoid-version
 nested_drv_la_LIBADD = $(XORG_LIBS) $(X11_LIBS) $(XEXT_LIBS)
 nested_drv_ladir = @moduledir@/drivers
 
-nested_drv_la_SOURCES = driver.c nested_input.c nested_input.h xlibclient.c client.h
+nested_drv_la_SOURCES = driver.c nested_input.c nested_input.h xlibclient.c client.h compat-api.h
diff --git a/src/compat-api.h b/src/compat-api.h
new file mode 100644
index 0000000..b74a582
--- /dev/null
+++ b/src/compat-api.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2012 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+ *
+ * Author: Dave Airlie <airlied@redhat.com>
+ */
+
+/* this file provides API compat between server post 1.13 and pre it,
+   it should be reused inside as many drivers as possible */
+#ifndef COMPAT_API_H
+#define COMPAT_API_H
+
+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
+#endif
+
+#ifndef XF86_HAS_SCRN_CONV
+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
+#endif
+
+#ifndef XF86_SCRN_INTERFACE
+
+#define SCRN_ARG_TYPE int
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
+
+#define SCREEN_ARG_TYPE int
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
+
+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
+
+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
+
+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
+#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
+
+#define FREE_SCREEN_ARGS_DECL int arg, int flags
+#define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0
+
+#define VT_FUNC_ARGS_DECL int arg, int flags
+#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags)
+
+#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex)
+#else
+#define SCRN_ARG_TYPE ScrnInfoPtr
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
+
+#define SCREEN_ARG_TYPE ScreenPtr
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
+
+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS pScreen
+
+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
+#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
+
+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
+#define SWITCH_MODE_ARGS(arg, m) arg, m
+
+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
+#define FREE_SCREEN_ARGS(x) (x)
+
+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
+#define VT_FUNC_ARGS(flags) pScrn
+
+#define XF86_ENABLEDISABLEFB_ARG(x) (x)
+
+#endif
+
+#endif
diff --git a/src/driver.c b/src/driver.c
index 5ff6e23..b38e492 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -32,6 +32,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <xorg-server.h>
 #include <fb.h>
 #include <micmap.h>
@@ -42,9 +46,7 @@
 #include <xf86str.h>
 #include "xf86Xinput.h"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "compat-api.h"
 
 #include "client.h"
 #include "nested_input.h"
@@ -67,22 +69,21 @@ static Bool NestedDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op,
                              pointer ptr);
 
 static Bool NestedPreInit(ScrnInfoPtr pScrn, int flags);
-static Bool NestedScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
-                             char **argv);
-
-static Bool NestedSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
-static void NestedAdjustFrame(int scrnIndex, int x, int y, int flags);
-static Bool NestedEnterVT(int scrnIndex, int flags);
-static void NestedLeaveVT(int scrnIndex, int flags);
-static void NestedFreeScreen(int scrnIndex, int flags);
-static ModeStatus NestedValidMode(int scrnIndex, DisplayModePtr mode,
+static Bool NestedScreenInit(SCREEN_INIT_ARGS_DECL);
+
+static Bool NestedSwitchMode(SWITCH_MODE_ARGS_DECL);
+static void NestedAdjustFrame(ADJUST_FRAME_ARGS_DECL);
+static Bool NestedEnterVT(VT_FUNC_ARGS_DECL);
+static void NestedLeaveVT(VT_FUNC_ARGS_DECL);
+static void NestedFreeScreen(FREE_SCREEN_ARGS_DECL);
+static ModeStatus NestedValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode,
                                   Bool verbose, int flags);
 
 static Bool NestedSaveScreen(ScreenPtr pScreen, int mode);
 static Bool NestedCreateScreenResources(ScreenPtr pScreen);
 
 static void NestedShadowUpdate(ScreenPtr pScreen, shadowBufPtr pBuf);
-static Bool NestedCloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool NestedCloseScreen(CLOSE_SCREEN_ARGS_DECL);
 
 static void NestedBlockHandler(pointer data, OSTimePtr wt, pointer LastSelectMask);
 static void NestedWakeupHandler(pointer data, int i, pointer LastSelectMask);
@@ -541,15 +542,14 @@ NestedWakeupHandler(pointer data, int i, pointer LastSelectMask) {
 }
 
 /* Called at each server generation */
-static Bool NestedScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
-                             char **argv) {
-    ScrnInfoPtr pScrn;
+static Bool NestedScreenInit(SCREEN_INIT_ARGS_DECL)
+{
+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     NestedPrivatePtr pNested;
     Pixel redMask, greenMask, blueMask;
 
-    xf86DrvMsg(scrnIndex, X_INFO, "NestedScreenInit\n");
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NestedScreenInit\n");
 
-    pScrn = xf86Screens[pScreen->myNum];
     pNested = PNESTED(pScrn);
     /*NESTEDScrn = pScrn;*/
 
@@ -560,7 +560,7 @@ static Bool NestedScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
     
     //Load_Nested_Mouse();
 
-    pNested->clientData = NestedClientCreateScreen(scrnIndex,
+    pNested->clientData = NestedClientCreateScreen(pScrn->scrnIndex,
                                                    pNested->displayName,
                                                    pScrn->virtualX,
                                                    pScrn->virtualY,
@@ -571,7 +571,7 @@ static Bool NestedScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
                                                    &redMask, &greenMask, &blueMask);
     
     if (!pNested->clientData) {
-        xf86DrvMsg(scrnIndex, X_ERROR, "Failed to create client screen\n");
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to create client screen\n");
         return FALSE;
     }
     
@@ -624,7 +624,7 @@ static Bool NestedScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
 static Bool
 NestedCreateScreenResources(ScreenPtr pScreen) {
     xf86DrvMsg(pScreen->myNum, X_INFO, "NestedCreateScreenResources\n");
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     NestedPrivatePtr pNested = PNESTED(pScrn);
     Bool ret;
 
@@ -644,16 +644,16 @@ NestedCreateScreenResources(ScreenPtr pScreen) {
 static void
 NestedShadowUpdate(ScreenPtr pScreen, shadowBufPtr pBuf) {
     RegionPtr pRegion = DamageRegion(pBuf->pDamage);
-    NestedClientUpdateScreen(PCLIENTDATA(xf86Screens[pScreen->myNum]),
+    NestedClientUpdateScreen(PCLIENTDATA(xf86ScreenToScrn(pScreen)),
                              pRegion->extents.x1, pRegion->extents.y1,
                              pRegion->extents.x2, pRegion->extents.y2);
 }
 
 static Bool
-NestedCloseScreen(int scrnIndex, ScreenPtr pScreen) {
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+NestedCloseScreen(CLOSE_SCREEN_ARGS_DECL) {
+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 
-    xf86DrvMsg(scrnIndex, X_INFO, "NestedCloseScreen\n");
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NestedCloseScreen\n");
 
     shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen));
 
@@ -661,7 +661,7 @@ NestedCloseScreen(int scrnIndex, ScreenPtr pScreen) {
     NestedClientCloseScreen(PCLIENTDATA(pScrn));
 
     pScreen->CloseScreen = PNESTED(pScrn)->CloseScreen;
-    return (*pScreen->CloseScreen)(scrnIndex, pScreen);
+    return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
 }
 
 static Bool NestedSaveScreen(ScreenPtr pScreen, int mode) {
@@ -669,38 +669,44 @@ static Bool NestedSaveScreen(ScreenPtr pScreen, int mode) {
     return TRUE;
 }
 
-static Bool NestedSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) {
-    xf86DrvMsg(scrnIndex, X_INFO, "NestedSwitchMode\n");
+static Bool NestedSwitchMode(SWITCH_MODE_ARGS_DECL) {
+    SCRN_INFO_PTR(arg);
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NestedSwitchMode\n");
     return TRUE;
 }
 
-static void NestedAdjustFrame(int scrnIndex, int x, int y, int flags) {
-    xf86DrvMsg(scrnIndex, X_INFO, "NestedAdjustFrame\n");
+static void NestedAdjustFrame(ADJUST_FRAME_ARGS_DECL) {
+    SCRN_INFO_PTR(arg);
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NestedAdjustFrame\n");
 }
 
-static Bool NestedEnterVT(int scrnIndex, int flags) {
-    xf86DrvMsg(scrnIndex, X_INFO, "NestedEnterVT\n");
+static Bool NestedEnterVT(VT_FUNC_ARGS_DECL) {
+    SCRN_INFO_PTR(arg);
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NestedEnterVT\n");
     return TRUE;
 }
 
-static void NestedLeaveVT(int scrnIndex, int flags) {
-    xf86DrvMsg(scrnIndex, X_INFO, "NestedLeaveVT\n");
+static void NestedLeaveVT(VT_FUNC_ARGS_DECL) {
+    SCRN_INFO_PTR(arg);
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NestedLeaveVT\n");
 }
 
-static void NestedFreeScreen(int scrnIndex, int flags) {
-    xf86DrvMsg(scrnIndex, X_INFO, "NestedFreeScreen\n");
+static void NestedFreeScreen(FREE_SCREEN_ARGS_DECL) {
+    SCRN_INFO_PTR(arg);
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NestedFreeScreen\n");
 }
 
-static ModeStatus NestedValidMode(int scrnIndex, DisplayModePtr mode,
+static ModeStatus NestedValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode,
                                   Bool verbose, int flags) {
-    xf86DrvMsg(scrnIndex, X_INFO, "NestedValidMode:\n");
+    SCRN_INFO_PTR(arg);
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NestedValidMode:\n");
 
     if (!mode)
-        xf86DrvMsg(scrnIndex, X_ERROR, "NULL MODE!\n");
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "NULL MODE!\n");
 
-    xf86DrvMsg(scrnIndex, X_INFO, "  name: %s\n", mode->name);
-    xf86DrvMsg(scrnIndex, X_INFO, "  HDisplay: %d\n", mode->HDisplay);
-    xf86DrvMsg(scrnIndex, X_INFO, "  VDisplay: %d\n", mode->VDisplay);
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "  name: %s\n", mode->name);
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "  HDisplay: %d\n", mode->HDisplay);
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "  VDisplay: %d\n", mode->VDisplay);
     return MODE_OK;
 }