XLibre/xf86-video-wsfb
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-wsfb.git synced 2026-03-24 01:25:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add compat-api.h for compatibility with xserver 1.13

Browse Source
This commit is contained in:
Matthieu Herrb
2012-09-09 11:41:58 +02:00
parent 4a3eb3bf6b
commit 586b722fb1
3 changed files with 142 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.am
View File

@@ -29,4 +29,5 @@ wsfb_drv_la_LDFLAGS = -module -avoid-version
wsfb_drv_ladir = @moduledir@/drivers
wsfb_drv_la_SOURCES = \
wsfb_driver.c
compat_api.h \
wsfb_driver.c

98
src/compat-api.h Normal file
View File

@@ -0,0 +1,98 @@
/*
* 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 VT_FUNC_ARGS_DECL int arg, int flags
#define VT_FUNC_ARGS pScrn->scrnIndex, 0
#define SCRN_OR_INDEX_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 VT_FUNC_ARGS_DECL ScrnInfoPtr arg
#define VT_FUNC_ARGS pScrn
#define SCRN_OR_INDEX_ARG(x) (x)
#endif
#endif

83
src/wsfb_driver.c
View File

@@ -78,6 +78,8 @@
#include "xf86xv.h"
#endif
#include "compat-api.h"
#ifdef X_PRIVSEP
extern int priv_open_device(const char *);
#else
@@ -110,15 +112,15 @@ static const OptionInfoRec * WsfbAvailableOptions(int, int);
static void WsfbIdentify(int);
static Bool WsfbProbe(DriverPtr, int);
static Bool WsfbPreInit(ScrnInfoPtr, int);
static Bool WsfbScreenInit(int, ScreenPtr, int, char **);
static Bool WsfbCloseScreen(int, ScreenPtr);
static Bool WsfbScreenInit(SCREEN_INIT_ARGS_DECL);
static Bool WsfbCloseScreen(CLOSE_SCREEN_ARGS_DECL);
static void *WsfbWindowLinear(ScreenPtr, CARD32, CARD32, int, CARD32 *,
void *);
static void WsfbPointerMoved(int, int, int);
static Bool WsfbEnterVT(int, int);
static void WsfbLeaveVT(int, int);
static Bool WsfbSwitchMode(int, DisplayModePtr, int);
static int WsfbValidMode(int, DisplayModePtr, Bool, int);
static void WsfbPointerMoved(SCRN_ARG_TYPE, int, int);
static Bool WsfbEnterVT(VT_FUNC_ARGS_DECL);
static void WsfbLeaveVT(VT_FUNC_ARGS_DECL);
static Bool WsfbSwitchMode(SWITCH_MODE_ARGS_DECL);
static int WsfbValidMode(SCRN_ARG_TYPE, DisplayModePtr, Bool, int);
static void WsfbLoadPalette(ScrnInfoPtr, int, int *, LOCO *, VisualPtr);
static Bool WsfbSaveScreen(ScreenPtr, int);
static void WsfbSave(ScrnInfoPtr);
@@ -151,7 +153,7 @@ enum { WSFB_ROTATE_NONE = 0,
*/
static int pix24bpp = 0;
#define WSFB_VERSION 4000
#define WSFB_VERSION 4000
#define WSFB_NAME "wsfb"
#define WSFB_DRIVER_NAME "wsfb"
@@ -210,7 +212,7 @@ WsfbSetup(pointer module, pointer opts, int *errmaj, int *errmin)
/* Check that we're being loaded on a OpenBSD or NetBSD system. */
LoaderGetOS(&osname, NULL, NULL, NULL);
if (!osname || (strcmp(osname, "openbsd") != 0 &&
strcmp(osname, "netbsd") != 0)) {
strcmp(osname, "netbsd") != 0)) {
if (errmaj)
*errmaj = LDR_BADOS;
if (errmin)
@@ -241,7 +243,7 @@ typedef struct {
void * shadow;
CloseScreenProcPtr CloseScreen;
CreateScreenResourcesProcPtr CreateScreenResources;
void (*PointerMoved)(int, int, int);
void (*PointerMoved)(SCRN_ARG_TYPE, int, int);
EntityInfoPtr pEnt;
struct wsdisplay_cmap saved_cmap;
@@ -343,7 +345,7 @@ static Bool
WsfbProbe(DriverPtr drv, int flags)
{
int i, fd, entity;
GDevPtr *devSections;
GDevPtr *devSections;
int numDevSections;
const char *dev;
Bool foundScreen = FALSE;
@@ -664,7 +666,7 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags)
static Bool
WsfbCreateScreenResources(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
WsfbPtr fPtr = WSFBPTR(pScrn);
PixmapPtr pPixmap;
Bool ret;
@@ -690,7 +692,7 @@ WsfbCreateScreenResources(ScreenPtr pScreen)
static Bool
WsfbShadowInit(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
WsfbPtr fPtr = WSFBPTR(pScrn);
if (!shadowSetup(pScreen))
@@ -702,9 +704,9 @@ WsfbShadowInit(ScreenPtr pScreen)
}
static Bool
WsfbScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
WsfbScreenInit(SCREEN_INIT_ARGS_DECL)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
WsfbPtr fPtr = WSFBPTR(pScrn);
VisualPtr visual;
int ret, flags, ncolors;
@@ -868,7 +870,7 @@ WsfbScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
"RENDER extension initialisation failed.");
}
if (fPtr->shadowFB && !WsfbShadowInit(pScreen)) {
xf86DrvMsg(scrnIndex, X_ERROR,
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"shadow framebuffer initialization failed\n");
return FALSE;
}
@@ -877,15 +879,15 @@ WsfbScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
if (!fPtr->rotate)
WsfbDGAInit(pScrn, pScreen);
else
xf86DrvMsg(scrnIndex, X_INFO, "Rotated display, "
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Rotated display, "
"disabling DGA\n");
#endif
if (fPtr->rotate) {
xf86DrvMsg(scrnIndex, X_INFO, "Enabling Driver Rotation, "
"disabling RandR\n");
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Enabling Driver Rotation, " "disabling RandR\n");
xf86DisableRandR();
if (pScrn->bitsPerPixel == 24)
xf86DrvMsg(scrnIndex, X_WARNING,
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Rotation might be broken in 24 bpp\n");
}
@@ -937,9 +939,9 @@ WsfbScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
}
static Bool
WsfbCloseScreen(int scrnIndex, ScreenPtr pScreen)
WsfbCloseScreen(CLOSE_SCREEN_ARGS_DECL)
{
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
PixmapPtr pPixmap;
WsfbPtr fPtr = WSFBPTR(pScrn);
@@ -971,14 +973,14 @@ WsfbCloseScreen(int scrnIndex, ScreenPtr pScreen)
/* Unwrap CloseScreen. */
pScreen->CloseScreen = fPtr->CloseScreen;
TRACE_EXIT("WsfbCloseScreen");
return (*pScreen->CloseScreen)(scrnIndex, pScreen);
return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
}
static void *
WsfbWindowLinear(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode,
CARD32 *size, void *closure)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
WsfbPtr fPtr = WSFBPTR(pScrn);
if (fPtr->linebytes)
@@ -992,9 +994,9 @@ WsfbWindowLinear(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode,
}
static void
WsfbPointerMoved(int index, int x, int y)
WsfbPointerMoved(SCRN_ARG_TYPE arg, int x, int y)
{
ScrnInfoPtr pScrn = xf86Screens[index];
SCRN_INFO_PTR(arg);
WsfbPtr fPtr = WSFBPTR(pScrn);
int newX, newY;
@@ -1026,13 +1028,13 @@ WsfbPointerMoved(int index, int x, int y)
}
/* Pass adjusted pointer coordinates to wrapped PointerMoved function. */
(*fPtr->PointerMoved)(index, newX, newY);
(*fPtr->PointerMoved)(arg, newX, newY);
}
static Bool
WsfbEnterVT(int scrnIndex, int flags)
WsfbEnterVT(VT_FUNC_ARGS_DECL)
{
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
SCRN_INFO_PTR(arg);
TRACE_ENTER("EnterVT");
pScrn->vtSema = TRUE;
@@ -1041,20 +1043,20 @@ WsfbEnterVT(int scrnIndex, int flags)
}
static void
WsfbLeaveVT(int scrnIndex, int flags)
WsfbLeaveVT(VT_FUNC_ARGS_DECL)
{
#if DEBUG
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
SCRN_INFO_PTR(arg);
#endif
TRACE_ENTER("LeaveVT");
}
static Bool
WsfbSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
WsfbSwitchMode(SWITCH_MODE_ARGS_DECL)
{
#if DEBUG
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
SCRN_INFO_PTR(arg);
#endif
TRACE_ENTER("SwitchMode");
@@ -1063,10 +1065,10 @@ WsfbSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
}
static int
WsfbValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
WsfbValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
{
#if DEBUG
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
SCRN_INFO_PTR(arg);
#endif
TRACE_ENTER("ValidMode");
@@ -1132,7 +1134,7 @@ WsfbLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
static Bool
WsfbSaveScreen(ScreenPtr pScreen, int mode)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
WsfbPtr fPtr = WSFBPTR(pScrn);
int state;
@@ -1143,7 +1145,7 @@ WsfbSaveScreen(ScreenPtr pScreen, int mode)
if (mode != SCREEN_SAVER_FORCER) {
state = xf86IsUnblank(mode)?WSDISPLAYIO_VIDEO_ON:
WSDISPLAYIO_VIDEO_OFF;
WSDISPLAYIO_VIDEO_OFF;
ioctl(fPtr->fd,
WSDISPLAYIO_SVIDEO, &state);
}
@@ -1240,9 +1242,9 @@ WsfbDGASetMode(ScrnInfoPtr pScrn, DGAModePtr pDGAMode)
frameY0 = pScrn->frameY0;
}
if (!(*pScrn->SwitchMode)(scrnIdx, pMode, 0))
if (!(*pScrn->SwitchMode)(SWITCH_MODE_ARGS(pScrn, pMode)))
return FALSE;
(*pScrn->AdjustFrame)(scrnIdx, frameX0, frameY0, 0);
(*pScrn->AdjustFrame)(ADJUST_FRAME_ARGS(pScrn, frameX0, frameY0));
return TRUE;
}
@@ -1250,7 +1252,7 @@ WsfbDGASetMode(ScrnInfoPtr pScrn, DGAModePtr pDGAMode)
static void
WsfbDGASetViewport(ScrnInfoPtr pScrn, int x, int y, int flags)
{
(*pScrn->AdjustFrame)(pScrn->pScreen->myNum, x, y, flags);
(*pScrn->AdjustFrame)(ADJUST_FRAME_ARGS(pScrn, x, y));
}
static int
@@ -1359,4 +1361,3 @@ WsfbDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op,
return FALSE;
}
}