Use new X server compat API

Signed-off-by: Guillem Jover <guillem@hadrons.org>

3 files changed, 115 insertions, 18 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index b8015dc..d7c63c9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,5 +30,6 @@ glide_drv_la_LDFLAGS = -module -avoid-version
 glide_drv_ladir = @moduledir@/drivers
 
 glide_drv_la_SOURCES = \
+         compat-api.h \
          glide_driver.c
 
diff --git a/src/compat-api.h b/src/compat-api.h
new file mode 100644
index 0000000..df783a8
--- /dev/null
+++ b/src/compat-api.h
@@ -0,0 +1,94 @@
+/*
+ * 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 SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
+
+#define FREE_SCREEN_ARGS_DECL int arg, int flags
+
+#define VT_FUNC_ARGS_DECL int arg, int flags
+#define VT_FUNC_ARGS pScrn->scrnIndex, 0
+
+#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 SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
+
+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
+
+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
+#define VT_FUNC_ARGS pScrn
+
+#define XF86_ENABLEDISABLEFB_ARG(x) (x)
+
+#endif
+
+#endif
diff --git a/src/glide_driver.c b/src/glide_driver.c
index 84df77a..149bb32 100644
--- a/src/glide_driver.c
+++ b/src/glide_driver.c
@@ -67,6 +67,8 @@
 #include "xf86cmap.h"
 #include "shadowfb.h"
 
+#include "compat-api.h"
+
 #include <glide.h>
 
 /* glide3x does not define this alias anymore, so let's do it ourselves. */
@@ -107,12 +109,12 @@ static const OptionInfoRec * GLIDEAvailableOptions(int chipid, int busid);
 static void	GLIDEIdentify(int flags);
 static Bool	GLIDEProbe(DriverPtr drv, int flags);
 static Bool	GLIDEPreInit(ScrnInfoPtr pScrn, int flags);
-static Bool	GLIDEScreenInit(int Index, ScreenPtr pScreen, int argc, char **argv);
-static Bool	GLIDEEnterVT(int scrnIndex, int flags);
-static void	GLIDELeaveVT(int scrnIndex, int flags);
-static Bool	GLIDECloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool	GLIDEScreenInit(SCREEN_INIT_ARGS_DECL);
+static Bool	GLIDEEnterVT(VT_FUNC_ARGS_DECL);
+static void	GLIDELeaveVT(VT_FUNC_ARGS_DECL);
+static Bool	GLIDECloseScreen(CLOSE_SCREEN_ARGS_DECL);
 static Bool	GLIDESaveScreen(ScreenPtr pScreen, int mode);
-static void     GLIDEFreeScreen(int scrnIndex, int flags);
+static void     GLIDEFreeScreen(FREE_SCREEN_ARGS_DECL);
 static void     GLIDERefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
 static Bool     GLIDEModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
 static void     GLIDERestore(ScrnInfoPtr pScrn, Bool Closing);
@@ -573,7 +575,7 @@ GLIDEPreInit(ScrnInfoPtr pScrn, int flags)
 /* Mandatory */
 /* This gets called at the start of each server generation */
 static Bool
-GLIDEScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+GLIDEScreenInit(SCREEN_INIT_ARGS_DECL)
 {
   ScrnInfoPtr pScrn;
   GLIDEPtr pGlide;
@@ -583,7 +585,7 @@ GLIDEScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
   /* 
    * First get the ScrnInfoRec
    */
-  pScrn = xf86Screens[pScreen->myNum];
+  pScrn = xf86ScreenToScrn(pScreen);
 
   pGlide = GLIDEPTR(pScrn);
 
@@ -693,9 +695,9 @@ GLIDEScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 
 /* Mandatory */
 static Bool
-GLIDEEnterVT(int scrnIndex, int flags)
+GLIDEEnterVT(VT_FUNC_ARGS_DECL)
 {
-  ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+  SCRN_INFO_PTR(arg);
   return GLIDEModeInit(pScrn, pScrn->currentMode);
 }
 
@@ -708,9 +710,9 @@ GLIDEEnterVT(int scrnIndex, int flags)
 
 /* Mandatory */
 static void
-GLIDELeaveVT(int scrnIndex, int flags)
+GLIDELeaveVT(VT_FUNC_ARGS_DECL)
 {
-  ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+  SCRN_INFO_PTR(arg);
   GLIDERestore(pScrn, FALSE);
 }
 
@@ -723,9 +725,9 @@ GLIDELeaveVT(int scrnIndex, int flags)
 
 /* Mandatory */
 static Bool
-GLIDECloseScreen(int scrnIndex, ScreenPtr pScreen)
+GLIDECloseScreen(CLOSE_SCREEN_ARGS_DECL)
 {
-  ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+  ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
   GLIDEPtr pGlide = GLIDEPTR(pScrn);
 
   if (pScrn->vtSema)
@@ -735,7 +737,7 @@ GLIDECloseScreen(int scrnIndex, ScreenPtr pScreen)
   pScrn->vtSema = FALSE;
 
   pScreen->CloseScreen = pGlide->CloseScreen;
-  return (*pScreen->CloseScreen)(scrnIndex, pScreen);
+  return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
 }
 
 
@@ -743,9 +745,9 @@ GLIDECloseScreen(int scrnIndex, ScreenPtr pScreen)
 
 /* Optional */
 static void
-GLIDEFreeScreen(int scrnIndex, int flags)
+GLIDEFreeScreen(FREE_SCREEN_ARGS_DECL)
 {
-  ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+  SCRN_INFO_PTR(arg);
   GLIDEPtr pGlide = GLIDEPTR(pScrn);
   /*
    * This only gets called when a screen is being deleted.  It does not
@@ -753,7 +755,7 @@ GLIDEFreeScreen(int scrnIndex, int flags)
    */
   if (pGlide && pGlide->ShadowPtr)
     free(pGlide->ShadowPtr);
-  GLIDEFreeRec(xf86Screens[scrnIndex]);
+  GLIDEFreeRec(pScrn);
 }
 
 
@@ -767,7 +769,7 @@ GLIDESaveScreen(ScreenPtr pScreen, int mode)
   Bool unblank;
   
   unblank = xf86IsUnblank(mode);
-  pScrn = xf86Screens[pScreen->myNum];
+  pScrn = xf86ScreenToScrn(pScreen);
   pGlide = GLIDEPTR(pScrn);
   pGlide->Blanked = !unblank;
   if (unblank)