ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

First support of DGA 2.0 for DirectDraw.

This commit is contained in:
Lionel Ulmer 1999-12-04 04:22:04 +00:00 committed by Alexandre Julliard
parent fdf71277e5
commit ba02d1d7d5
5 changed files with 447 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

353
graphics/ddraw.c
View File

@ -37,6 +37,10 @@
#include "ts_xf86dga.h"
#endif /* defined(HAVE_LIBXXF86DGA) */
#ifdef HAVE_LIBXXF86DGA2
#include "ts_xf86dga2.h"
#endif /* defined(HAVE_LIBXXF86DGA2) */
#ifdef HAVE_LIBXXF86VM
#include "ts_xf86vmode.h"
#endif /* defined(HAVE_LIBXXF86VM) */
@ -109,6 +113,10 @@ static struct ICOM_VTABLE(IDirectDraw4) dga_dd4vt;
static struct ICOM_VTABLE(IDirectDrawPalette) dga_ddpalvt;
#endif /* defined(HAVE_LIBXXF86DGA) */
#ifdef HAVE_LIBXXF86DGA2
static struct ICOM_VTABLE(IDirectDrawSurface4) dga2_dds4vt;
#endif /* defined(HAVE_LIBXXF86DGA2) */
static struct ICOM_VTABLE(IDirectDrawSurface4) xlib_dds4vt;
static struct ICOM_VTABLE(IDirectDraw) xlib_ddvt;
static struct ICOM_VTABLE(IDirectDraw2) xlib_dd2vt;
@ -163,14 +171,46 @@ static XF86VidModeModeInfo *orig_mode = NULL;
static int XShmErrorFlag = 0;
#endif
static BOOL
static BYTE
DDRAW_DGA_Available(void)
{
#ifdef HAVE_LIBXXF86DGA
int evbase, evret, fd;
int fd, evbase, evret, majver, minver;
static BYTE return_value = 0xFF;
if (Options.noDGA)
/* This prevents from probing X times for DGA */
if (return_value != 0xFF)
return return_value;
if (Options.noDGA) {
return_value = 0;
return 0;
}
/* First, query the extenstion and its version */
if (!TSXF86DGAQueryExtension(display,&evbase,&evret)) {
return_value = 0;
return 0;
}
if (!TSXF86DGAQueryVersion(display,&majver,&minver)) {
return_value = 0;
return 0;
}
#ifdef HAVE_LIBXXF86DGA2
if (majver >= 2) {
/* We have DGA 2.0 available ! */
if (TSXDGAOpenFramebuffer(display, DefaultScreen(display))) {
TSXDGACloseFramebuffer(display, DefaultScreen(display));
return_value = 2;
} else {
return_value = 0;
}
return return_value;
} else {
#endif /* defined(HAVE_LIBXXF86DGA2) */
/* You don't have to be root to use DGA extensions. Simply having access to /dev/mem will do the trick */
/* This can be achieved by adding the user to the "kmem" group on Debian 2.x systems, don't know about */
@ -178,7 +218,15 @@ DDRAW_DGA_Available(void)
if ((fd = open("/dev/mem", O_RDWR)) != -1)
close(fd);
return (fd != -1) && TSXF86DGAQueryExtension(display,&evbase,&evret);
if (fd != -1)
return_value = 1;
else
return_value = 0;
return return_value;
#ifdef HAVE_LIBXXF86DGA2
}
#endif /* defined(HAVE_LIBXXF86DGA2) */
#else /* defined(HAVE_LIBXXF86DGA) */
return 0;
#endif /* defined(HAVE_LIBXXF86DGA) */
@ -833,6 +881,40 @@ static HRESULT WINAPI DGA_IDirectDrawSurface4Impl_Flip(
}
#endif /* defined(HAVE_LIBXXF86DGA) */
#ifdef HAVE_LIBXXF86DGA2
static HRESULT WINAPI DGA2_IDirectDrawSurface4Impl_Flip(
LPDIRECTDRAWSURFACE4 iface,LPDIRECTDRAWSURFACE4 flipto,DWORD dwFlags
) {
ICOM_THIS(IDirectDrawSurface4Impl,iface);
IDirectDrawSurface4Impl* iflipto=(IDirectDrawSurface4Impl*)flipto;
DWORD xheight;
LPBYTE surf;
TRACE("(%p)->Flip(%p,%08lx)\n",This,iflipto,dwFlags);
iflipto = _common_find_flipto(This,iflipto);
/* and flip! */
TSXDGASetViewport(display,DefaultScreen(display),0,iflipto->t.dga.fb_height, XDGAFlipRetrace);
TSXDGASync(display,DefaultScreen(display));
TSXFlush(display);
if (iflipto->s.palette && iflipto->s.palette->cm)
TSXDGAInstallColormap(display,DefaultScreen(display),iflipto->s.palette->cm);
/* We need to switch the lowlevel surfaces, for DGA this is: */
/* The height within the framebuffer */
xheight = This->t.dga.fb_height;
This->t.dga.fb_height = iflipto->t.dga.fb_height;
iflipto->t.dga.fb_height = xheight;
/* And the assciated surface pointer */
surf = This->s.surface_desc.u1.lpSurface;
This->s.surface_desc.u1.lpSurface = iflipto->s.surface_desc.u1.lpSurface;
iflipto->s.surface_desc.u1.lpSurface = surf;
return DD_OK;
}
#endif /* defined(HAVE_LIBXXF86DGA2) */
static HRESULT WINAPI Xlib_IDirectDrawSurface4Impl_Flip(
LPDIRECTDRAWSURFACE4 iface,LPDIRECTDRAWSURFACE4 flipto,DWORD dwFlags
) {
@ -950,6 +1032,11 @@ static HRESULT WINAPI DGA_IDirectDrawSurface4Impl_SetPalette(
if( This->s.palette != NULL )
IDirectDrawPalette_Release( (IDirectDrawPalette*)This->s.palette );
This->s.palette = ipal;
#ifdef HAVE_LIBXXF86DGA2
if (This->s.ddraw->e.dga.version == 2)
TSXDGAInstallColormap(display,DefaultScreen(display),This->s.palette->cm);
else
#endif /* defined(HAVE_LIBXXF86DGA2) */
TSXF86DGAInstallColormap(display,DefaultScreen(display),This->s.palette->cm);
}
return DD_OK;
@ -1241,6 +1328,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_BltFast(
LPBYTE sbuf, dbuf;
RECT rsrc2;
if (TRACE_ON(ddraw)) {
FIXME("(%p)->(%ld,%ld,%p,%p,%08lx)\n",
This,dstx,dsty,src,rsrc,trans
@ -1487,6 +1575,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetAttachedSurface(
TRACE("(%p)->GetAttachedSurface(%p,%p)\n", This, lpddsd, lpdsf);
if (TRACE_ON(ddraw)) {
TRACE(" caps ");_dump_DDSCAPS((void *) &(lpddsd->dwCaps));
DPRINTF("\n");
}
chain = This->s.chain;
if (!chain)
@ -1569,11 +1658,11 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_AddAttachedSurface(
int i;
struct _surface_chain *chain;
IDirectDrawSurface4_AddRef(iface);
FIXME("(%p)->(%p)\n",This,surf);
chain = This->s.chain;
/* IDirectDrawSurface4_AddRef(surf); */
if (chain) {
for (i=0;i<chain->nrofsurfaces;i++)
if (chain->surfaces[i] == isurf)
@ -1990,9 +2079,16 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetPalette(
LPDIRECTDRAWPALETTE* lplpDDPalette )
{
ICOM_THIS(IDirectDrawSurface4Impl,iface);
FIXME("(%p)->(%p),stub!\n", This, lplpDDPalette);
TRACE("(%p)->(%p),stub!\n", This, lplpDDPalette);
if (This->s.palette != NULL) {
IDirectDrawPalette_AddRef( (IDirectDrawPalette*) This->s.palette );
*lplpDDPalette = (IDirectDrawPalette*) This->s.palette;
return DD_OK;
} else {
return DDERR_NOPALETTEATTACHED;
}
}
static HRESULT WINAPI IDirectDrawSurface4Impl_SetOverlayPosition(
@ -2182,6 +2278,58 @@ static ICOM_VTABLE(IDirectDrawSurface4) dga_dds4vt =
};
#endif /* defined(HAVE_LIBXXF86DGA) */
#ifdef HAVE_LIBXXF86DGA2
static ICOM_VTABLE(IDirectDrawSurface4) dga2_dds4vt =
{
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectDrawSurface4Impl_QueryInterface,
IDirectDrawSurface4Impl_AddRef,
DGA_IDirectDrawSurface4Impl_Release,
IDirectDrawSurface4Impl_AddAttachedSurface,
IDirectDrawSurface4Impl_AddOverlayDirtyRect,
IDirectDrawSurface4Impl_Blt,
IDirectDrawSurface4Impl_BltBatch,
IDirectDrawSurface4Impl_BltFast,
IDirectDrawSurface4Impl_DeleteAttachedSurface,
IDirectDrawSurface4Impl_EnumAttachedSurfaces,
IDirectDrawSurface4Impl_EnumOverlayZOrders,
DGA2_IDirectDrawSurface4Impl_Flip,
IDirectDrawSurface4Impl_GetAttachedSurface,
IDirectDrawSurface4Impl_GetBltStatus,
IDirectDrawSurface4Impl_GetCaps,
IDirectDrawSurface4Impl_GetClipper,
IDirectDrawSurface4Impl_GetColorKey,
IDirectDrawSurface4Impl_GetDC,
IDirectDrawSurface4Impl_GetFlipStatus,
IDirectDrawSurface4Impl_GetOverlayPosition,
IDirectDrawSurface4Impl_GetPalette,
IDirectDrawSurface4Impl_GetPixelFormat,
IDirectDrawSurface4Impl_GetSurfaceDesc,
IDirectDrawSurface4Impl_Initialize,
IDirectDrawSurface4Impl_IsLost,
IDirectDrawSurface4Impl_Lock,
IDirectDrawSurface4Impl_ReleaseDC,
IDirectDrawSurface4Impl_Restore,
IDirectDrawSurface4Impl_SetClipper,
IDirectDrawSurface4Impl_SetColorKey,
IDirectDrawSurface4Impl_SetOverlayPosition,
DGA_IDirectDrawSurface4Impl_SetPalette,
DGA_IDirectDrawSurface4Impl_Unlock,
IDirectDrawSurface4Impl_UpdateOverlay,
IDirectDrawSurface4Impl_UpdateOverlayDisplay,
IDirectDrawSurface4Impl_UpdateOverlayZOrder,
IDirectDrawSurface4Impl_GetDDInterface,
IDirectDrawSurface4Impl_PageLock,
IDirectDrawSurface4Impl_PageUnlock,
IDirectDrawSurface4Impl_SetSurfaceDesc,
IDirectDrawSurface4Impl_SetPrivateData,
IDirectDrawSurface4Impl_GetPrivateData,
IDirectDrawSurface4Impl_FreePrivateData,
IDirectDrawSurface4Impl_GetUniquenessValue,
IDirectDrawSurface4Impl_ChangeUniquenessValue
};
#endif /* defined(HAVE_LIBXXF86DGA2) */
static ICOM_VTABLE(IDirectDrawSurface4) xlib_dds4vt =
{
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
@ -2460,6 +2608,11 @@ static HRESULT WINAPI DGA_IDirectDrawPaletteImpl_SetEntries(
This->palents[start+i].peGreen = palent[i].peGreen;
This->palents[start+i].peFlags = palent[i].peFlags;
}
#ifdef HAVE_LIBXXF86DGA2
if (This->ddraw->e.dga.version == 2)
TSXDGAInstallColormap(display,DefaultScreen(display),This->cm);
else
#endif /* defined(HAVE_LIBXXF86DGA2) */
TSXF86DGAInstallColormap(display,DefaultScreen(display),This->cm);
return DD_OK;
}
@ -2926,6 +3079,11 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_CreateSurface(
IDirectDraw2_AddRef(iface);
(*ilpdsf)->ref = 1;
#ifdef HAVE_LIBXXF86DGA2
if (This->e.dga.version == 2)
ICOM_VTBL(*ilpdsf) = (ICOM_VTABLE(IDirectDrawSurface)*)&dga2_dds4vt;
else
#endif /* defined(HAVE_LIBXXF86DGA2) */
ICOM_VTBL(*ilpdsf) = (ICOM_VTABLE(IDirectDrawSurface)*)&dga_dds4vt;
(*ilpdsf)->s.ddraw = This;
(*ilpdsf)->s.palette = NULL;
@ -3291,12 +3449,11 @@ static HRESULT WINAPI IDirectDraw2Impl_SetCooperativeLevel(
LPDIRECTDRAW2 iface,HWND hwnd,DWORD cooplevel
) {
ICOM_THIS(IDirectDraw2Impl,iface);
/*
int i;
const struct {
int mask;
char *name;
} flagmap[] = {
} flags[] = {
#define FE(x) { x, #x},
FE(DDSCL_FULLSCREEN)
FE(DDSCL_ALLOWREBOOT)
@ -3309,9 +3466,17 @@ static HRESULT WINAPI IDirectDraw2Impl_SetCooperativeLevel(
FE(DDSCL_CREATEDEVICEWINDOW)
#undef FE
};
*/
FIXME("(%p)->(%08lx,%08lx)\n",This,(DWORD)hwnd,cooplevel);
if (TRACE_ON(ddraw)) {
DPRINTF(" - ");
for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++) {
if (flags[i].mask & cooplevel) {
DPRINTF("%s ",flags[i].name);
}
}
DPRINTF("\n");
}
This->d.mainWindow = hwnd;
/* This will be overwritten in the case of Full Screen mode.
@ -3507,6 +3672,12 @@ static HRESULT WINAPI DGA_IDirectDrawImpl_SetDisplayMode(
TRACE("(%p)->(%ld,%ld,%ld)\n", This, width, height, depth);
#ifdef HAVE_LIBXXF86DGA2
if (This->e.dga.version == 2)
/* For the moment, we suppose we have the correct display settings when in DGA 2.0 mode */
return DD_OK;
#endif /* defined(HAVE_LIBXXF86DGA2) */
/* We hope getting the asked for depth */
if (_common_depth_to_pixelformat(depth, &(This->d.directdraw_pixelformat), &(This->d.screen_pixelformat), NULL) != -1) {
/* I.e. no visual found or emulated */
@ -3527,6 +3698,9 @@ static HRESULT WINAPI DGA_IDirectDrawImpl_SetDisplayMode(
_common_IDirectDrawImpl_SetDisplayMode(This);
#ifdef HAVE_LIBXXF86VM
#ifdef HAVE_LIBXXF86DGA2
if (This->e.dga.version == 1) /* Only for DGA 1.0, it crashes with DGA 2.0 */
#endif /* defined(HAVE_LIBXXF86DGA2) */
{
XF86VidModeModeInfo **all_modes, *vidmode = NULL;
XF86VidModeModeLine mod_tmp;
@ -4018,6 +4192,19 @@ static ULONG WINAPI DGA_IDirectDraw2Impl_Release(LPDIRECTDRAW2 iface) {
TRACE("(%p)->() decrementing from %lu.\n", This, This->ref );
if (!--(This->ref)) {
#ifdef HAVE_LIBXXF86DGA2
if (This->e.dga.version == 2) {
TRACE("Closing access to the FrameBuffer\n");
TSXDGACloseFramebuffer(display, DefaultScreen(display));
/* Set the input handling back to absolute */
X11DRV_EVENT_SetInputMehod(X11DRV_INPUT_ABSOLUTE);
/* Ungrab mouse and keyboard */
TSXUngrabPointer(display, CurrentTime);
TSXUngrabKeyboard(display, CurrentTime);
} else
#endif /* defined(HAVE_LIBXXF86DGA2) */
TSXF86DGADirectVideo(display,DefaultScreen(display),0);
if (This->d.window && (This->d.mainWindow != This->d.window))
DestroyWindow(This->d.window);
@ -4346,7 +4533,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_EnumDisplayModes(
emu = 0;
while ((i < npixmap) ||
(emu != 4)) {
int mode_index;
int mode_index = 0;
int send_mode = 0;
int j;
@ -4509,6 +4696,9 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_GetDisplayMode(
lpddsfd->u.dwRefreshRate = 60;
lpddsfd->ddsCaps.dwCaps = DDSCAPS_PALETTE;
lpddsfd->ddpfPixelFormat = This->d.directdraw_pixelformat;
if (TRACE_ON(ddraw)) {
_dump_surface_desc(lpddsfd);
}
return DD_OK;
}
#endif /* defined(HAVE_LIBXXF86DGA) */
@ -4526,6 +4716,9 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_GetDisplayMode(
lpddsfd->u.dwRefreshRate = 60;
lpddsfd->ddsCaps.dwCaps = DDSCAPS_PALETTE;
lpddsfd->ddpfPixelFormat = This->d.directdraw_pixelformat;
if (TRACE_ON(ddraw)) {
_dump_surface_desc(lpddsfd);
}
return DD_OK;
}
@ -4972,27 +5165,27 @@ static LRESULT WINAPI Xlib_DDWndProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lPa
static HRESULT WINAPI DGA_DirectDrawCreate( LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnkOuter) {
#ifdef HAVE_LIBXXF86DGA
IDirectDrawImpl** ilplpDD=(IDirectDrawImpl**)lplpDD;
int memsize,banksize,width,major,minor,flags,height;
int memsize,banksize,major,minor,flags;
char *addr;
int fd;
int depth;
int dga_version;
int width, height;
/* Must be able to access /dev/mem for DGA extensions to work, root is not neccessary. --stephenc */
if ((fd = open("/dev/mem", O_RDWR)) != -1)
close(fd);
/* Get DGA availability / version */
dga_version = DDRAW_DGA_Available();
if (fd == -1) {
MESSAGE("Must be able to access /dev/mem to use XF86DGA!\n");
MessageBoxA(0,"Using the XF86DGA extension requires access to /dev/mem.","WINE DirectDraw",MB_OK|MB_ICONSTOP);
return E_UNEXPECTED;
}
if (!DDRAW_DGA_Available()) {
TRACE("No XF86DGA detected.\n");
if (dga_version == 0) {
MessageBoxA(0,"Unable to initialize DGA.","WINE DirectDraw",MB_OK|MB_ICONSTOP);
return DDERR_GENERIC;
}
*ilplpDD = (IDirectDrawImpl*)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirectDrawImpl));
ICOM_VTBL(*ilplpDD) = &dga_ddvt;
(*ilplpDD)->ref = 1;
ICOM_VTBL(*ilplpDD) = &dga_ddvt;
#ifdef HAVE_LIBXXF86DGA2
if (dga_version == 1) {
(*ilplpDD)->e.dga.version = 1;
#endif /* defined(HAVE_LIBXXF86DGA2) */
TSXF86DGAQueryVersion(display,&major,&minor);
TRACE("XF86DGA is version %d.%d\n",major,minor);
TSXF86DGAQueryDirectVideo(display,DefaultScreen(display),&flags);
@ -5007,7 +5200,6 @@ static HRESULT WINAPI DGA_DirectDrawCreate( LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnk
addr,width,banksize,memsize
);
TRACE("viewport height: %d\n",height);
/* Get the screen dimensions as seen by Wine.
In that case, it may be better to ignore the -desktop mode and return the
real screen size => print a warning */
@ -5015,10 +5207,9 @@ static HRESULT WINAPI DGA_DirectDrawCreate( LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnk
(*ilplpDD)->d.width = MONITOR_GetWidth(&MONITOR_PrimaryMonitor);
if (((*ilplpDD)->d.height != height) ||
((*ilplpDD)->d.width != width))
WARN("You seem to be runnin in -desktop mode. This may prove dangerous in DGA mode...\n");
WARN("You seem to be running in -desktop mode. This may prove dangerous in DGA mode...\n");
(*ilplpDD)->e.dga.fb_addr = addr;
(*ilplpDD)->e.dga.fb_memsize = memsize;
(*ilplpDD)->e.dga.fb_banksize = banksize;
(*ilplpDD)->e.dga.vpmask = 0;
/* just assume the default depth is the DGA depth too */
@ -5027,7 +5218,115 @@ static HRESULT WINAPI DGA_DirectDrawCreate( LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnk
#ifdef RESTORE_SIGNALS
SIGNAL_Init();
#endif
#ifdef HAVE_LIBXXF86DGA2
} else {
DDPIXELFORMAT *pf = &((*ilplpDD)->d.directdraw_pixelformat);
XDGAMode *modes;
int i, num_modes;
int mode_to_use = 0;
(*ilplpDD)->e.dga.version = 2;
TSXGrabPointer(display, DefaultRootWindow(display), True,
PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
TSXGrabKeyboard(display, DefaultRootWindow(display), True, GrabModeAsync,
GrabModeAsync, CurrentTime);
TSXDGAQueryVersion(display,&major,&minor);
TRACE("XDGA is version %d.%d\n",major,minor);
TRACE("Opening the frame buffer.\n");
if (!TSXDGAOpenFramebuffer(display, DefaultScreen(display))) {
ERR("Error opening the frame buffer !!!\n");
TSXUngrabPointer(display, CurrentTime);
TSXUngrabKeyboard(display, CurrentTime);
return DDERR_GENERIC;
}
/* Set the input handling for relative mouse movements */
X11DRV_EVENT_SetInputMehod(X11DRV_INPUT_RELATIVE);
/* List all available modes */
modes = TSXDGAQueryModes(display, DefaultScreen(display), &num_modes);
if (TRACE_ON(ddraw)) {
TRACE("Available modes :\n");
for (i = 0; i < num_modes; i++) {
DPRINTF(" %d) - %s (FB: %dx%d / VP: %dx%d) - depth %d -",
modes[i].num,
modes[i].name, modes[i].imageWidth, modes[i].imageHeight,
modes[i].viewportWidth, modes[i].viewportHeight,
modes[i].depth);
if (modes[i].flags & XDGAConcurrentAccess) DPRINTF(" XDGAConcurrentAccess ");
if (modes[i].flags & XDGASolidFillRect) DPRINTF(" XDGASolidFillRect ");
if (modes[i].flags & XDGABlitRect) DPRINTF(" XDGABlitRect ");
if (modes[i].flags & XDGABlitTransRect) DPRINTF(" XDGABlitTransRect ");
if (modes[i].flags & XDGAPixmap) DPRINTF(" XDGAPixmap ");
DPRINTF("\n");
if ((MONITOR_GetHeight(&MONITOR_PrimaryMonitor) == modes[i].viewportHeight) &&
(MONITOR_GetWidth(&MONITOR_PrimaryMonitor) == modes[i].viewportWidth) &&
(MONITOR_GetDepth(&MONITOR_PrimaryMonitor) == modes[i].depth)) {
mode_to_use = modes[i].num;
}
}
}
if (mode_to_use == 0) {
ERR("Could not find mode !\n");
mode_to_use = 1;
} else {
DPRINTF("Using mode number %d\n", mode_to_use);
}
/* Now, get the device / mode description */
(*ilplpDD)->e.dga.dev = TSXDGASetMode(display, DefaultScreen(display), mode_to_use);
(*ilplpDD)->e.dga.fb_width = (*ilplpDD)->e.dga.dev->mode.imageWidth;
TSXDGASetViewport(display,DefaultScreen(display),0,0, XDGAFlipImmediate);
(*ilplpDD)->e.dga.fb_height = (*ilplpDD)->e.dga.dev->mode.viewportHeight;
TRACE("video framebuffer: begin %p, width %d, memsize %d\n",
(*ilplpDD)->e.dga.dev->data,
(*ilplpDD)->e.dga.dev->mode.imageWidth,
((*ilplpDD)->e.dga.dev->mode.imageWidth *
(*ilplpDD)->e.dga.dev->mode.imageHeight *
((*ilplpDD)->e.dga.dev->mode.bitsPerPixel / 8))
);
TRACE("viewport height: %d\n", (*ilplpDD)->e.dga.dev->mode.viewportHeight);
/* Get the screen dimensions as seen by Wine.
In that case, it may be better to ignore the -desktop mode and return the
real screen size => print a warning */
(*ilplpDD)->d.height = MONITOR_GetHeight(&MONITOR_PrimaryMonitor);
(*ilplpDD)->d.width = MONITOR_GetWidth(&MONITOR_PrimaryMonitor);
(*ilplpDD)->e.dga.fb_addr = (*ilplpDD)->e.dga.dev->data;
(*ilplpDD)->e.dga.fb_memsize = ((*ilplpDD)->e.dga.dev->mode.imageWidth *
(*ilplpDD)->e.dga.dev->mode.imageHeight *
((*ilplpDD)->e.dga.dev->mode.bitsPerPixel / 8));
(*ilplpDD)->e.dga.vpmask = 0;
/* Fill the screen pixelformat */
if ((*ilplpDD)->e.dga.dev->mode.depth == 8) {
pf->dwFlags = DDPF_PALETTEINDEXED8;
pf->u1.dwRBitMask = 0;
pf->u2.dwGBitMask = 0;
pf->u3.dwBBitMask = 0;
} else {
pf->dwFlags = DDPF_RGB;
pf->u1.dwRBitMask = (*ilplpDD)->e.dga.dev->mode.redMask;
pf->u2.dwGBitMask = (*ilplpDD)->e.dga.dev->mode.greenMask;
pf->u3.dwBBitMask = (*ilplpDD)->e.dga.dev->mode.blueMask;
}
pf->dwFourCC = 0;
pf->u.dwRGBBitCount = (*ilplpDD)->e.dga.dev->mode.bitsPerPixel;
pf->u4.dwRGBAlphaBitMask= 0;
(*ilplpDD)->d.screen_pixelformat = *pf;
}
#endif /* defined(HAVE_LIBXXF86DGA2) */
return DD_OK;
#else /* defined(HAVE_LIBXXF86DGA) */
return DDERR_INVALIDDIRECTDRAWGUID;

12
graphics/ddraw_private.h
View File

@ -1,6 +1,12 @@
#ifndef __GRAPHICS_WINE_DDRAW_PRIVATE_H
#define __GRAPHICS_WINE_DDRAW_PRIVATE_H
#include "config.h"
#ifdef HAVE_LIBXXF86DGA2
#include "ts_xf86dga2.h"
#endif /* defined(HAVE_LIBXXF86DGA2) */
#include "ddraw.h"
#include "winuser.h"
@ -74,9 +80,13 @@ struct _common_directdrawdata
struct _dga_directdrawdata
{
DWORD fb_width,fb_height,fb_banksize,fb_memsize;
DWORD fb_width,fb_height,fb_memsize;
void* fb_addr;
unsigned int vpmask;
#ifdef HAVE_LIBXXF86DGA2
int version;
XDGADevice *dev;
#endif /* define(HAVE_LIBXXF86DGA2) */
};
struct _xlib_directdrawdata

4
include/ts_xlib.h
View File

@ -91,6 +91,8 @@ extern int TSXGetKeyboardControl(Display*, XKeyboardState*);
extern int TSXGetScreenSaver(Display*, int*, int*, int*, int*);
extern int TSXGetWindowProperty(Display*, Window, Atom, long, long, int, Atom, Atom*, int*, unsigned long*, unsigned long*, unsigned char**);
extern int TSXGetWindowAttributes(Display*, Window, XWindowAttributes*);
extern int TSXGrabKeyboard(Display*, Window, int, int, int, Time);
extern int TSXGrabPointer(Display*, Window, int, unsigned int, int, int, Window, Cursor, Time);
extern int TSXGrabServer(Display*);
extern int TSXInstallColormap(Display*, Colormap);
extern KeyCode TSXKeysymToKeycode(Display*, KeySym);
@ -129,6 +131,8 @@ extern int TSXStoreName(Display*, Window, const char*);
extern int TSXSync(Display*, int);
extern int TSXTextExtents(XFontStruct*, const char*, int, int*, int*, int*, XCharStruct*);
extern int TSXTextWidth(XFontStruct*, const char*, int);
extern int TSXUngrabKeyboard(Display*, Time);
extern int TSXUngrabPointer(Display*, Time);
extern int TSXUngrabServer(Display*);
extern int TSXUninstallColormap(Display*, Colormap);
extern int TSXUnmapWindow(Display*, Window);

4
tsx11/X11_calls
View File

@ -78,6 +78,8 @@ XGetVisualInfo
XGetWMSizeHints
XGetWindowAttributes
XGetWindowProperty
XGrabKeyboard
XGrabPointer
XGrabServer
XIconifyWindow
XInitThreads
@ -157,6 +159,8 @@ XSync
XSynchronize
XTextExtents
XTextWidth
XUngrabKeyboard
XUngrabPointer
XUngrabServer
XUninstallColormap
XUnionRectWithRegion

44
tsx11/ts_xlib.c
View File

@ -840,6 +840,28 @@ int TSXGetWindowAttributes(Display* a0, Window a1, XWindowAttributes* a2)
return r;
}
int TSXGrabKeyboard(Display* a0, Window a1, int a2, int a3, int a4, Time a5)
{
int r;
TRACE("Call XGrabKeyboard\n");
EnterCriticalSection( &X11DRV_CritSection );
r = XGrabKeyboard(a0, a1, a2, a3, a4, a5);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XGrabKeyboard\n");
return r;
}
int TSXGrabPointer(Display* a0, Window a1, int a2, unsigned int a3, int a4, int a5, Window a6, Cursor a7, Time a8)
{
int r;
TRACE("Call XGrabPointer\n");
EnterCriticalSection( &X11DRV_CritSection );
r = XGrabPointer(a0, a1, a2, a3, a4, a5, a6, a7, a8);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XGrabPointer\n");
return r;
}
int TSXGrabServer(Display* a0)
{
int r;
@ -1258,6 +1280,28 @@ int TSXTextWidth(XFontStruct* a0, const char* a1, int a2)
return r;
}
int TSXUngrabKeyboard(Display* a0, Time a1)
{
int r;
TRACE("Call XUngrabKeyboard\n");
EnterCriticalSection( &X11DRV_CritSection );
r = XUngrabKeyboard(a0, a1);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XUngrabKeyboard\n");
return r;
}
int TSXUngrabPointer(Display* a0, Time a1)
{
int r;
TRACE("Call XUngrabPointer\n");
EnterCriticalSection( &X11DRV_CritSection );
r = XUngrabPointer(a0, a1);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XUngrabPointer\n");
return r;
}
int TSXUngrabServer(Display* a0)
{
int r;