ChangeLog | 42 ++++++++++++++++++++ configure.ac | 20 +++++++++ debian/changelog | 8 +++ debian/control | 2 src/Makefile.am | 1 src/accelX.c | 2 src/compat-api.h | 99 +++++++++++++++++++++++++++++++++++++++++++++++++ src/hwcursor.c | 4 - src/hwcursor.h | 2 src/rendition.c | 65 ++++++++++++++++---------------- src/rendition.h | 6 +- src/rendition_shadow.c | 6 +- src/rendition_shadow.h | 2 src/vmodes.c | 4 - src/vtypes.h | 4 + 15 files changed, 220 insertions(+), 47 deletions(-)
New commits: commit aaa31cf30a5d33d003ed6d40a519fd22cfb0e0cd Author: Maarten Lankhorst <[email protected]> Date: Wed Sep 25 15:15:52 2013 +0200 bump changelogs diff --git a/ChangeLog b/ChangeLog index b80edc2..cfccc7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +commit 3a3ee1c45e54a808947cc26ca11f0a5299571053 +Author: Adam Jackson <[email protected]> +Date: Tue Sep 25 08:54:50 2012 -0400 + + Remove mibstore.h + + Signed-off-by: Adam Jackson <[email protected]> + commit 07026400300a985ea19346a6745685bb8dfea56f Author: Dave Airlie <[email protected]> Date: Tue Jul 17 16:05:09 2012 +1000 diff --git a/debian/changelog b/debian/changelog index fc7e0ac..6076d39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-video-rendition (1:4.2.5-1) UNRELEASED; urgency=low * New upstream release * Bump standards to 3.9.3 + * Grab fix for building against x1.14. -- Maarten Lankhorst <[email protected]> Wed, 18 Jul 2012 13:27:01 +0200 commit 3a3ee1c45e54a808947cc26ca11f0a5299571053 Author: Adam Jackson <[email protected]> Date: Tue Sep 25 08:54:50 2012 -0400 Remove mibstore.h Signed-off-by: Adam Jackson <[email protected]> diff --git a/src/rendition.c b/src/rendition.c index 7c74f76..888bb4a 100644 --- a/src/rendition.c +++ b/src/rendition.c @@ -1173,7 +1173,6 @@ renditionScreenInit(SCREEN_INIT_ARGS_DECL) fbPictureInit (pScreen, 0, 0); xf86SetBlackWhitePixels(pScreen); - miInitializeBackingStore(pScreen); /*********************************************************/ /* The actual setup of the driver-specific code */ diff --git a/src/rendition.h b/src/rendition.h index f7f13d4..297117e 100644 --- a/src/rendition.h +++ b/src/rendition.h @@ -28,9 +28,6 @@ /* All drivers initialising the SW cursor need this */ #include "mipointer.h" -/* All drivers implementing backing store need this */ -#include "mibstore.h" - /* All drivers using the mi colormap manipulation need this */ #include "micmap.h" commit f56656a91086b408076be96d940848fc64384df2 Author: Maarten Lankhorst <[email protected]> Date: Wed Jul 18 13:32:05 2012 +0200 Bump standards to 3.9.3 diff --git a/debian/changelog b/debian/changelog index ae9c00d..fc7e0ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-rendition (1:4.2.5-1) UNRELEASED; urgency=low * New upstream release + * Bump standards to 3.9.3 -- Maarten Lankhorst <[email protected]> Wed, 18 Jul 2012 13:27:01 +0200 diff --git a/debian/control b/debian/control index 61bbf6f..39cb9c0 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: x11proto-xext-dev, quilt, xutils-dev, -Standards-Version: 3.9.1 +Standards-Version: 3.9.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-rendition Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-rendition.git commit 5d4568d1c9b8ff8b374238f0177d0be4618c5b50 Author: Maarten Lankhorst <[email protected]> Date: Wed Jul 18 13:28:40 2012 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index e4f078e..ae9c00d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-rendition (1:4.2.5-1) UNRELEASED; urgency=low + + * New upstream release + + -- Maarten Lankhorst <[email protected]> Wed, 18 Jul 2012 13:27:01 +0200 + xserver-xorg-video-rendition (1:4.2.4-3) unstable; urgency=low * Merge from upstream master branch up to 7b26793ba2 to cope with commit a829c5a2c5583c36c86c3c7db1063ac5ea6f6e1d Author: Maarten Lankhorst <[email protected]> Date: Wed Jul 18 13:27:37 2012 +0200 Bump changelog diff --git a/ChangeLog b/ChangeLog index ac6c38d..b80edc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,37 @@ +commit 07026400300a985ea19346a6745685bb8dfea56f +Author: Dave Airlie <[email protected]> +Date: Tue Jul 17 16:05:09 2012 +1000 + + xf86-video-rendition: bump to version 4.2.5 + + Signed-off-by: Dave Airlie <[email protected]> + +commit dcba90a3398321b2e24a5db54defa516efa4c817 +Author: Dave Airlie <[email protected]> +Date: Tue Jul 17 15:32:56 2012 +1000 + + rendition: fix build against older X servers. + + Signed-off-by: Dave Airlie <[email protected]> + +commit 23a14278543eaa1cd37709eb8ccad2ab2babc81b +Author: Dave Airlie <[email protected]> +Date: Mon Jul 16 03:44:40 2012 +0100 + + rendition: port to non-XAA server + + even though rendition never actually had working XAA support, ah well. + + Signed-off-by: Dave Airlie <[email protected]> + +commit effa2938ee2b576b8eb6cd7f774d8b1656c50e82 +Author: Dave Airlie <[email protected]> +Date: Wed Jun 6 14:13:48 2012 +0100 + + rendition: port to new compat API. + + Signed-off-by: Dave Airlie <[email protected]> + commit 7b26793ba2572c412f03e9a4acf83237fbec71bd Author: Adam Jackson <[email protected]> Date: Mon Dec 19 17:13:29 2011 -0500 commit 07026400300a985ea19346a6745685bb8dfea56f Author: Dave Airlie <[email protected]> Date: Tue Jul 17 16:05:09 2012 +1000 xf86-video-rendition: bump to version 4.2.5 Signed-off-by: Dave Airlie <[email protected]> diff --git a/configure.ac b/configure.ac index eecfd16..4adf280 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-rendition], - [4.2.4], + [4.2.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-rendition]) AC_CONFIG_SRCDIR([Makefile.am]) commit dcba90a3398321b2e24a5db54defa516efa4c817 Author: Dave Airlie <[email protected]> Date: Tue Jul 17 15:32:56 2012 +1000 rendition: fix build against older X servers. Signed-off-by: Dave Airlie <[email protected]> diff --git a/src/rendition.c b/src/rendition.c index 5fa5eca..7c74f76 100644 --- a/src/rendition.c +++ b/src/rendition.c @@ -1075,6 +1075,7 @@ renditionScreenInit(SCREEN_INIT_ARGS_DECL) VisualPtr visual; vgaHWPtr pvgaHW; int displayWidth,width,height; + int scrnIndex = pScreenInfo->scrnIndex; #ifdef DEBUG ErrorF("RENDITION: renditionScreenInit() called\n"); commit 23a14278543eaa1cd37709eb8ccad2ab2babc81b Author: Dave Airlie <[email protected]> Date: Mon Jul 16 03:44:40 2012 +0100 rendition: port to non-XAA server even though rendition never actually had working XAA support, ah well. Signed-off-by: Dave Airlie <[email protected]> diff --git a/configure.ac b/configure.ac index f74b912..eecfd16 100644 --- a/configure.ac +++ b/configure.ac @@ -71,6 +71,24 @@ AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[]) AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[]) CPPFLAGS="$SAVE_CPPFLAGS" +AC_ARG_ENABLE(xaa, + AS_HELP_STRING([--enable-xaa], + [Enable legacy X Acceleration Architecture (XAA) [default=auto]]), + [XAA="$enableval"], + [XAA=auto]) +if test "x$XAA" != xno; then + save_CFLAGS=$CFLAGS + save_CPPFLAGS=$CPPFLAGS + CFLAGS=$XORG_CFLAGS + CPPFLAGS="$XORG_CFLAGS" + AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no) + CFLAGS=$save_CFLAGS + CPPFLAGS=$save_CPPFLAGS +fi +AC_MSG_CHECKING([whether to include XAA support]) +AM_CONDITIONAL(XAA, test "x$XAA" = xyes) +AC_MSG_RESULT([$XAA]) + if test "x$XSERVER_LIBPCIACCESS" = xyes; then PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" diff --git a/src/rendition.h b/src/rendition.h index 7d104a8..f7f13d4 100644 --- a/src/rendition.h +++ b/src/rendition.h @@ -53,8 +53,10 @@ #include "fb.h" /* Drivers using the XAA interface ... */ +#ifdef HAVE_XAA_H #include "xaa.h" #include "xaalocal.h" +#endif #include "xf86fbman.h" /* HW-cursor definitions */ diff --git a/src/vtypes.h b/src/vtypes.h index 5e0abf1..b221aa3 100644 --- a/src/vtypes.h +++ b/src/vtypes.h @@ -185,7 +185,9 @@ typedef struct _renditionRec EntityInfoPtr pEnt; /* entity information */ CloseScreenProcPtr CloseScreen; /* wrap CloseScreen */ xf86CursorInfoPtr CursorInfoRec; /* Cursor data */ +#ifdef HAVE_XAA_H XAAInfoRecPtr AccelInfoRec; /* Needed for XAA */ +#endif OptionInfoPtr Options; RenditionRegRec saveRegs; } renditionRec, *renditionPtr; commit effa2938ee2b576b8eb6cd7f774d8b1656c50e82 Author: Dave Airlie <[email protected]> Date: Wed Jun 6 14:13:48 2012 +0100 rendition: port to new compat API. Signed-off-by: Dave Airlie <[email protected]> diff --git a/src/Makefile.am b/src/Makefile.am index 6770629..0666377 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,6 +31,7 @@ rendition_drv_ladir = @moduledir@/drivers rendition_drv_la_SOURCES = \ cmd2d.h \ commonregs.h \ + compat-api.h \ cscode.h \ hwcursor.c \ hwcursor.h \ diff --git a/src/accelX.c b/src/accelX.c index ed4964e..bd237b3 100644 --- a/src/accelX.c +++ b/src/accelX.c @@ -133,7 +133,7 @@ RENDITIONAccelPreInit(ScrnInfoPtr pScreenInfo) void RENDITIONAccelXAAInit(ScreenPtr pScreen) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); renditionPtr pRendition = RENDITIONPTR(pScreenInfo); XAAInfoRecPtr pXAAinfo; diff --git a/src/compat-api.h b/src/compat-api.h new file mode 100644 index 0000000..e4f03d2 --- /dev/null +++ b/src/compat-api.h @@ -0,0 +1,99 @@ +/* + * 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 <[email protected]> + */ + +/* 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 pScreenInfo = 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 VT_FUNC_ARGS_DECL int arg, int flags +#define VT_FUNC_ARGS pScreenInfo->scrnIndex, 0 + +#define XF86_SCRN_ARG(x) ((x)->scrnIndex) +#else +#define SCRN_ARG_TYPE ScrnInfoPtr +#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScreenInfo = (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 VT_FUNC_ARGS_DECL ScrnInfoPtr arg +#define VT_FUNC_ARGS pScreenInfo + +#define XF86_SCRN_ARG(x) (x) + +#endif + +#endif diff --git a/src/hwcursor.c b/src/hwcursor.c index c3b5ee8..609417a 100644 --- a/src/hwcursor.c +++ b/src/hwcursor.c @@ -75,9 +75,9 @@ RenditionHWCursorRelease (ScrnInfoPtr pScreenInfo) Bool -RenditionHWCursorInit(int scrnIndex, ScreenPtr pScreen) +RenditionHWCursorInit(ScreenPtr pScreen) { - ScrnInfoPtr pScreenInfo = xf86Screens[scrnIndex]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); renditionPtr pRendition = RENDITIONPTR(pScreenInfo); xf86CursorInfoPtr infoPtr; diff --git a/src/hwcursor.h b/src/hwcursor.h index e0d742b..cfe24d3 100644 --- a/src/hwcursor.h +++ b/src/hwcursor.h @@ -10,7 +10,7 @@ */ void RenditionHWCursorPreInit(ScrnInfoPtr pScreenInfo); -Bool RenditionHWCursorInit(int scrnIndex, ScreenPtr pScreen); +Bool RenditionHWCursorInit(ScreenPtr pScreen); void RenditionHWCursorRelease (ScrnInfoPtr pScreenInfo); #define HC_SIZE (64*64*2)/8 /* 1024 */ diff --git a/src/rendition.c b/src/rendition.c index 8da5e13..5fa5eca 100644 --- a/src/rendition.c +++ b/src/rendition.c @@ -106,14 +106,14 @@ static Bool renditionPciProbe(DriverPtr drv, int entity_num, static Bool renditionProbe(DriverPtr, int); #endif static Bool renditionPreInit(ScrnInfoPtr, int); -static Bool renditionScreenInit(int, ScreenPtr, int, char **); -static Bool renditionSwitchMode(int, DisplayModePtr, int); -static void renditionAdjustFrame(int, int, int, int); -static Bool renditionEnterVT(int, int); -static void renditionLeaveVT(int, int); -static void renditionFreeScreen(int, int); - -static ModeStatus renditionValidMode(int, DisplayModePtr, Bool, int); +static Bool renditionScreenInit(SCREEN_INIT_ARGS_DECL); +static Bool renditionSwitchMode(SWITCH_MODE_ARGS_DECL); +static void renditionAdjustFrame(ADJUST_FRAME_ARGS_DECL); +static Bool renditionEnterVT(VT_FUNC_ARGS_DECL); +static void renditionLeaveVT(VT_FUNC_ARGS_DECL); +static void renditionFreeScreen(FREE_SCREEN_ARGS_DECL); + +static ModeStatus renditionValidMode(SCRN_ARG_TYPE, DisplayModePtr, Bool, int); static Bool renditionMapMem(ScrnInfoPtr pScreenInfo); static Bool renditionUnmapMem(ScrnInfoPtr pScreenInfo); #if 0 @@ -1022,9 +1022,9 @@ renditionLeaveGraphics(ScrnInfoPtr pScreenInfo) /* Unravel the screen */ static Bool -renditionCloseScreen(int scrnIndex, ScreenPtr pScreen) +renditionCloseScreen(CLOSE_SCREEN_ARGS_DECL) { - ScrnInfoPtr pScreenInfo = xf86Screens[scrnIndex]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); renditionPtr prenditionPriv=renditionGetRec(pScreenInfo); Bool Closed = TRUE; @@ -1044,7 +1044,7 @@ renditionCloseScreen(int scrnIndex, ScreenPtr pScreen) if (prenditionPriv && (pScreen->CloseScreen = prenditionPriv->CloseScreen)) { prenditionPriv->CloseScreen = NULL; - Closed = (*pScreen->CloseScreen)(scrnIndex, pScreen); + Closed = (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); } #ifdef DEBUG @@ -1066,9 +1066,9 @@ renditionDPMSSet(ScrnInfoPtr pScreen, int mode, int flags) } static Bool -renditionScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +renditionScreenInit(SCREEN_INIT_ARGS_DECL) { - ScrnInfoPtr pScreenInfo = xf86Screens[scrnIndex]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); renditionPtr pRendition = RENDITIONPTR(pScreenInfo); Bool Inited = FALSE; unsigned char *FBBase; @@ -1109,8 +1109,8 @@ renditionScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) /* blank the screen */ renditionSaveScreen(pScreen, SCREEN_SAVER_ON); - (*pScreenInfo->AdjustFrame)(pScreenInfo->scrnIndex, - pScreenInfo->frameX0, pScreenInfo->frameY0, 0); + (*pScreenInfo->AdjustFrame)(ADJUST_FRAME_ARGS(pScreenInfo, + pScreenInfo->frameX0, pScreenInfo->frameY0)); miClearVisualTypes(); @@ -1186,7 +1186,7 @@ renditionScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) if(!xf86ReturnOptValBool(pRendition->Options, OPTION_SW_CURSOR,0)&& !pRendition->board.rotate){ /* Initialise HW cursor */ - if(!RenditionHWCursorInit(scrnIndex, pScreen)){ + if(!RenditionHWCursorInit(pScreen)){ xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR, "Hardware Cursor initalization failed!!\n"); } @@ -1238,7 +1238,7 @@ renditionScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) pScreen->SaveScreen = renditionSaveScreen; if (!Inited) - renditionCloseScreen(scrnIndex, pScreen); + renditionCloseScreen(CLOSE_SCREEN_ARGS); if (serverGeneration == 1) xf86ShowUnusedOptions(pScreenInfo->scrnIndex, pScreenInfo->options); @@ -1251,19 +1251,20 @@ renditionScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) } static Bool -renditionSwitchMode(int scrnIndex, DisplayModePtr pMode, int flags) +renditionSwitchMode(SWITCH_MODE_ARGS_DECL) { + SCRN_INFO_PTR(arg); #ifdef DEBUG ErrorF("RENDITION: renditionSwitchMode() called\n"); #endif - return renditionSetMode(xf86Screens[scrnIndex], pMode); + return renditionSetMode(pScreenInfo, mode); } static void -renditionAdjustFrame(int scrnIndex, int x, int y, int flags) +renditionAdjustFrame(ADJUST_FRAME_ARGS_DECL) { - ScrnInfoPtr pScreenInfo=xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); renditionPtr pRendition = RENDITIONPTR(pScreenInfo); int offset, virtualwidth, bitsPerPixel; @@ -1285,9 +1286,9 @@ renditionAdjustFrame(int scrnIndex, int x, int y, int flags) static Bool -renditionEnterVT(int scrnIndex, int flags) +renditionEnterVT(VT_FUNC_ARGS_DECL) { - ScrnInfoPtr pScreenInfo = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); vgaHWPtr pvgaHW = VGAHWPTR(pScreenInfo); #ifdef DEBUG @@ -1304,32 +1305,34 @@ renditionEnterVT(int scrnIndex, int flags) if (!renditionSetMode(pScreenInfo, pScreenInfo->currentMode)) return FALSE; - (*pScreenInfo->AdjustFrame)(pScreenInfo->scrnIndex, - pScreenInfo->frameX0, pScreenInfo->frameY0, 0); + (*pScreenInfo->AdjustFrame)(ADJUST_FRAME_ARGS(pScreenInfo, + pScreenInfo->frameX0, pScreenInfo->frameY0)); return TRUE; } static void -renditionLeaveVT(int scrnIndex, int flags) +renditionLeaveVT(VT_FUNC_ARGS_DECL) { + SCRN_INFO_PTR(arg); #ifdef DEBUG ErrorF("RENDITION: renditionLeaveVT() called\n"); #endif - renditionLeaveGraphics(xf86Screens[scrnIndex]); + renditionLeaveGraphics(pScreenInfo); } static void -renditionFreeScreen(int scrnIndex, int flags) +renditionFreeScreen(FREE_SCREEN_ARGS_DECL) { - renditionFreeRec(xf86Screens[scrnIndex]); + SCRN_INFO_PTR(arg); + renditionFreeRec(pScreenInfo); } static ModeStatus -renditionValidMode(int scrnIndex, DisplayModePtr pMode, Bool Verbose, +renditionValidMode(SCRN_ARG_TYPE arg, DisplayModePtr pMode, Bool Verbose, int flags) { if (pMode->Flags & V_INTERLACE) diff --git a/src/rendition.h b/src/rendition.h index 0ea5cca..7d104a8 100644 --- a/src/rendition.h +++ b/src/rendition.h @@ -65,5 +65,6 @@ #include "commonregs.h" +#include "compat-api.h" /* end of __RENDITION_H__ */ #endif diff --git a/src/rendition_shadow.c b/src/rendition_shadow.c index 5f7a5f5..b5e4ef6 100644 --- a/src/rendition_shadow.c +++ b/src/rendition_shadow.c @@ -48,9 +48,9 @@ renditionRefreshArea(ScrnInfoPtr pScreenInfo, int num, BoxPtr pbox) } void -renditionPointerMoved(int index, int x, int y) +renditionPointerMoved(SCRN_ARG_TYPE arg, int x, int y) { - ScrnInfoPtr pScreenInfo = xf86Screens[index]; + SCRN_INFO_PTR(arg); renditionPtr pRendition = RENDITIONPTR(pScreenInfo); int newX, newY; @@ -62,7 +62,7 @@ renditionPointerMoved(int index, int x, int y) newY = pScreenInfo->pScreen->width - x - 1; } - (*pRendition->board.PointerMoved)(index, newX, newY); + (*pRendition->board.PointerMoved)(arg, newX, newY); } void diff --git a/src/rendition_shadow.h b/src/rendition_shadow.h index 5d9634f..d4527a8 100644 --- a/src/rendition_shadow.h +++ b/src/rendition_shadow.h @@ -12,7 +12,7 @@ void renditionRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox); void renditionRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox); void renditionRefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox); void renditionRefreshArea32(ScrnInfoPtr pScrn, int num, BoxPtr pbox); -void renditionPointerMoved(int index, int x, int y); +void renditionPointerMoved(SCRN_ARG_TYPE arg, int x, int y); #endif diff --git a/src/vmodes.c b/src/vmodes.c index f2dae0b..ba91d1a 100644 --- a/src/vmodes.c +++ b/src/vmodes.c @@ -301,8 +301,8 @@ verite_setmode(ScrnInfoPtr pScreenInfo, struct verite_modeinfo_t *mode) pRendition->board.mode.virtualwidth=pRendition->board.mode.screenwidth; pRendition->board.init=1; - (*pScreenInfo->AdjustFrame)(pScreenInfo->scrnIndex, - pScreenInfo->frameX0, pScreenInfo->frameY0, 0); + (*pScreenInfo->AdjustFrame)(ADJUST_FRAME_ARGS(pScreenInfo, + pScreenInfo->frameX0, pScreenInfo->frameY0)); /* Need to fix up syncs */ diff --git a/src/vtypes.h b/src/vtypes.h index 3a701f4..5e0abf1 100644 --- a/src/vtypes.h +++ b/src/vtypes.h @@ -161,7 +161,7 @@ struct verite_board_t { Bool shadowfb; /* Use ShadowFB ? */ vu8 *shadowPtr; vu32 shadowPitch; - void (*PointerMoved)(int index, int x, int y); + void (*PointerMoved)(SCRN_ARG_TYPE arg, int x, int y); int rotate; /* Rotate clockwise or counterclockwise */ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
