Skip to content

W
wine-winehq
Commit f13c65b4 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

winex11: Get rid of the old ddraw HAL support.

parent 6db79587
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 509 deletions
dlls/winex11.drv/Makefile.in
View file @ f13c65b4
......@@ -30,7 +30,6 @@ C_SRCS = \
text.c \
window.c \
wintab.c \
x11ddraw.c \
x11drv_main.c \
xdnd.c \
xfont.c \
......
dlls/winex11.drv/init.c
View file @ f13c65b4
......@@ -304,15 +304,6 @@ INT CDECL X11DRV_ExtEscape( X11DRV_PDEVICE *physDev, INT escape, INT in_count, L
}
break;
case DCICOMMAND:
if (in_data)
{
const DCICMD *lpCmd = in_data;
if (lpCmd->dwVersion != DD_VERSION) break;
return X11DRV_DCICommand(in_count, lpCmd, out_data);
}
break;
case X11DRV_ESCAPE:
if (in_data && in_count >= sizeof(enum x11drv_escape_codes))
{
......
dlls/winex11.drv/settings.c
View file @ f13c65b4
......@@ -31,7 +31,6 @@
#include "windef.h"
#include "winreg.h"
#include "wingdi.h"
#include "ddrawi.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(x11settings);
......@@ -439,39 +438,3 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode,
devmode->dmBitsPerPel, devmode->dmDisplayFrequency, handler_name);
return DISP_CHANGE_BADMODE;
}
/***********************************************************************
* DirectDraw HAL interface
*
*/
static DWORD PASCAL X11DRV_Settings_SetMode(LPDDHAL_SETMODEDATA data)
{
TRACE("Mode %d requested by DDHAL (%s)\n", data->dwModeIndex, handler_name);
switch (pSetCurrentMode(data->dwModeIndex))
{
case DISP_CHANGE_SUCCESSFUL:
X11DRV_DDHAL_SwitchMode(data->dwModeIndex, NULL, NULL);
data->ddRVal = DD_OK;
break;
case DISP_CHANGE_BADMODE:
data->ddRVal = DDERR_WRONGMODE;
break;
default:
data->ddRVal = DDERR_UNSUPPORTEDMODE;
}
return DDHAL_DRIVER_HANDLED;
}
int X11DRV_Settings_CreateDriver(LPDDHALINFO info)
{
if (!dd_mode_count) return 0; /* no settings defined */
TRACE("Setting up display settings for DDRAW (%s)\n", handler_name);
info->dwNumModes = dd_mode_count;
info->lpModeInfo = dd_modes;
X11DRV_DDHAL_SwitchMode(pGetCurrentMode(), NULL, NULL);
info->lpDDCallbacks->SetMode = X11DRV_Settings_SetMode;
return TRUE;
}
dlls/winex11.drv/x11ddraw.c deleted 100644 → 0
View file @ 6db79587
/*
* DirectDraw driver interface
*
* Copyright 2001 TransGaming Technologies, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include <stdarg.h>
#include <string.h>
#include <X11/Xlib.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "x11drv.h"
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
typedef struct _X11DRIVERINFO {
const GUID * lpGuid;
DWORD dwSize;
LPVOID lpvData;
struct _X11DRIVERINFO*lpNext;
} X11DRIVERINFO,*LPX11DRIVERINFO;
typedef struct _X11DEVICE {
LPX11DRIVERINFO lpInfo;
} X11DEVICE,*LPX11DEVICE;
static LPDDRAWI_DDRAWSURFACE_LCL X11DRV_DD_Primary;
static LPDDRAWI_DDRAWSURFACE_GBL X11DRV_DD_PrimaryGbl;
static HWND X11DRV_DD_PrimaryWnd;
static HBITMAP X11DRV_DD_PrimaryDIB;
static Drawable X11DRV_DD_PrimaryDrawable;
static ATOM X11DRV_DD_UserClass;
static UINT X11DRV_DD_GrabMessage;
static WNDPROC X11DRV_DD_GrabOldProcedure;
static void X11DRV_DDHAL_SetPalEntries(Colormap pal, DWORD dwBase, DWORD dwNumEntries,
LPPALETTEENTRY lpEntries);
static void SetPrimaryDIB(HBITMAP hBmp)
{
X11DRV_DD_PrimaryDIB = hBmp;
if (hBmp) {
X11DRV_DD_PrimaryDrawable = X11DRV_get_pixmap( hBmp );
} else {
X11DRV_DD_PrimaryDrawable = 0;
}
}
static LRESULT WINAPI GrabWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
struct x11drv_thread_data *data = x11drv_thread_data();
if(message != X11DRV_DD_GrabMessage)
return CallWindowProcA(X11DRV_DD_GrabOldProcedure, hWnd, message, wParam, lParam);
TRACE("hwnd=%p, grab=%ld\n", hWnd, wParam);
if (!data) return 0;
if (wParam)
{
/* find the X11 window that ddraw uses */
Window win = X11DRV_get_whole_window(hWnd);
TRACE("X11 window: %ld\n", win);
if (!win) {
TRACE("host off desktop\n");
win = root_window;
}
wine_tsx11_lock();
XGrabPointer(data->display, win, True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime);
wine_tsx11_unlock();
data->grab_window = win;
}
else
{
wine_tsx11_lock();
XUngrabPointer(data->display, CurrentTime);
wine_tsx11_unlock();
data->grab_window = None;
}
return 0;
}
static void GrabPointer(BOOL grab)
{
if(grab) {
Display *display = thread_display();
Window window = X11DRV_get_whole_window(GetFocus());
if(window && display)
{
wine_tsx11_lock();
XSetInputFocus(display, window, RevertToParent, CurrentTime);
wine_tsx11_unlock();
}
}
if(!X11DRV_DD_GrabMessage)
X11DRV_DD_GrabMessage = RegisterWindowMessageA("WINE_X11DRV_GRABPOINTER");
X11DRV_DD_GrabOldProcedure = (WNDPROC)SetWindowLongPtrA(X11DRV_DD_PrimaryWnd,
GWLP_WNDPROC, (LONG_PTR)GrabWndProc);
SendMessageW(X11DRV_DD_PrimaryWnd, X11DRV_DD_GrabMessage, grab, 0);
if(SetWindowLongPtrA(X11DRV_DD_PrimaryWnd, GWLP_WNDPROC,
(LONG_PTR)X11DRV_DD_GrabOldProcedure) != (LONG_PTR)GrabWndProc)
ERR("Window procedure has been changed!\n");
}
static DWORD PASCAL X11DRV_DDHAL_DestroyDriver(LPDDHAL_DESTROYDRIVERDATA data)
{
data->ddRVal = DD_OK;
return DDHAL_DRIVER_HANDLED;
}
static DWORD PASCAL X11DRV_DDHAL_CreateSurface(LPDDHAL_CREATESURFACEDATA data)
{
if (data->lpDDSurfaceDesc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) {
X11DRV_DD_Primary = *data->lplpSList;
X11DRV_DD_PrimaryWnd = X11DRV_DD_Primary->lpSurfMore->lpDDRAWReserved;
X11DRV_DD_PrimaryGbl = X11DRV_DD_Primary->lpGbl;
SetPrimaryDIB((HBITMAP)GET_LPDDRAWSURFACE_GBL_MORE(X11DRV_DD_PrimaryGbl)->hKernelSurface);
X11DRV_DD_UserClass = GlobalFindAtomA("WINE_DDRAW");
if (dxgrab) GrabPointer(TRUE);
}
data->ddRVal = DD_OK;
return DDHAL_DRIVER_NOTHANDLED;
}
static DWORD PASCAL X11DRV_DDHAL_CreatePalette(LPDDHAL_CREATEPALETTEDATA data)
{
FIXME("stub\n");
/* only makes sense to do anything if the X server is running at 8bpp,
* which few people do nowadays */
data->ddRVal = DD_OK;
return DDHAL_DRIVER_HANDLED;
}
static DDHAL_DDCALLBACKS hal_ddcallbacks = {
sizeof(DDHAL_DDCALLBACKS),
0x3ff, /* all callbacks are 32-bit */
X11DRV_DDHAL_DestroyDriver,
X11DRV_DDHAL_CreateSurface,
NULL, /* SetColorKey */
NULL, /* SetMode */
NULL, /* WaitForVerticalBlank */
NULL, /* CanCreateSurface */
X11DRV_DDHAL_CreatePalette,
NULL, /* GetScanLine */
NULL, /* SetExclusiveMode */
NULL /* FlipToGDISurface */
};
static DWORD PASCAL X11DRV_DDHAL_DestroySurface(LPDDHAL_DESTROYSURFACEDATA data)
{
if (data->lpDDSurface == X11DRV_DD_Primary) {
if (dxgrab) GrabPointer(FALSE);
X11DRV_DD_Primary = NULL;
X11DRV_DD_PrimaryWnd = 0;
X11DRV_DD_PrimaryGbl = NULL;
SetPrimaryDIB(0);
X11DRV_DD_UserClass = 0;
}
data->ddRVal = DD_OK;
return DDHAL_DRIVER_HANDLED;
}
static DWORD PASCAL X11DRV_DDHAL_SetPalette(LPDDHAL_SETPALETTEDATA data)
{
if (data->lpDDPalette && data->lpDDPalette->u1.dwReserved1) {
if (data->lpDDSurface == X11DRV_DD_Primary) {
FIXME("stub\n");
/* we should probably find the ddraw window (maybe data->lpDD->lpExclusiveOwner->hWnd),
* and attach the palette to it
*
* Colormap pal = data->lpDDPalette->u1.dwReserved1;
*/
}
}
data->ddRVal = DD_OK;
return DDHAL_DRIVER_HANDLED;
}
static DDHAL_DDSURFACECALLBACKS hal_ddsurfcallbacks = {
sizeof(DDHAL_DDSURFACECALLBACKS),
0x3fff, /* all callbacks are 32-bit */
X11DRV_DDHAL_DestroySurface,
NULL, /* Flip */
NULL, /* SetClipList */
NULL, /* Lock */
NULL, /* Unlock */
NULL, /* Blt */
NULL, /* SetColorKey */
NULL, /* AddAttachedSurface */
NULL, /* GetBltStatus */
NULL, /* GetFlipStatus */
NULL, /* UpdateOverlay */
NULL, /* SetOverlayPosition */
NULL, /* reserved4 */
X11DRV_DDHAL_SetPalette
};
static DWORD PASCAL X11DRV_DDHAL_DestroyPalette(LPDDHAL_DESTROYPALETTEDATA data)
{
Colormap pal = data->lpDDPalette->u1.dwReserved1;
if (pal)
{
wine_tsx11_lock();
XFreeColormap(gdi_display, pal);
wine_tsx11_unlock();
}
data->ddRVal = DD_OK;
return DDHAL_DRIVER_HANDLED;
}
static DWORD PASCAL X11DRV_DDHAL_SetPaletteEntries(LPDDHAL_SETENTRIESDATA data)
{
X11DRV_DDHAL_SetPalEntries(data->lpDDPalette->u1.dwReserved1,
data->dwBase, data->dwNumEntries,
data->lpEntries);
data->ddRVal = DD_OK;
return DDHAL_DRIVER_HANDLED;
}
static DDHAL_DDPALETTECALLBACKS hal_ddpalcallbacks = {
sizeof(DDHAL_DDPALETTECALLBACKS),
0x3, /* all callbacks are 32-bit */
X11DRV_DDHAL_DestroyPalette,
X11DRV_DDHAL_SetPaletteEntries
};
static X11DEVICE x11device = {
NULL
};
static DWORD PASCAL X11DRV_DDHAL_GetDriverInfo(LPDDHAL_GETDRIVERINFODATA data)
{
LPX11DRIVERINFO info = x11device.lpInfo;
while (info) {
if (IsEqualGUID(&data->guidInfo, info->lpGuid)) {
DWORD dwSize = info->dwSize;
data->dwActualSize = dwSize;
if (data->dwExpectedSize < dwSize) dwSize = data->dwExpectedSize;
memcpy(data->lpvData, info->lpvData, dwSize);
data->ddRVal = DD_OK;
return DDHAL_DRIVER_HANDLED;
}
info = info->lpNext;
}
data->ddRVal = DDERR_CURRENTLYNOTAVAIL;
return DDHAL_DRIVER_HANDLED;
}
static DDHALINFO hal_info = {
sizeof(DDHALINFO),
&hal_ddcallbacks,
&hal_ddsurfcallbacks,
&hal_ddpalcallbacks,
{ /* vmiData */
0 /* fpPrimary */
},
{ /* ddCaps (only stuff the HAL implements here) */
sizeof(DDCORECAPS), /* dwSize */
DDCAPS_GDI | DDCAPS_PALETTE, /* dwCaps */
DDCAPS2_CERTIFIED | DDCAPS2_NONLOCALVIDMEM | DDCAPS2_NOPAGELOCKREQUIRED | DDCAPS2_CANRENDERWINDOWED |
DDCAPS2_WIDESURFACES | DDCAPS2_PRIMARYGAMMA | DDCAPS2_FLIPNOVSYNC, /* dwCaps2 */
0, /* dwCKeyCaps */
0, /* dwFXCaps */
0, /* dwFXAlphaCaps */
DDPCAPS_8BIT | DDPCAPS_PRIMARYSURFACE, /* dwPalCaps */
0, /* dwSVCaps */
0, /* dwAlphaBltConstBitDepths */
0, /* dwAlphaBltPixelBitDepths */
0, /* dwAlphaBltSurfaceBitDepths */
0, /* dwAlphaOverlayBltConstBitDepths */
0, /* dwAlphaOverlayBltPixelBitDepths */
0, /* dwAlphaOverlayBltSurfaceBitDepths */
0, /* dwZBufferBitDepths */
16*1024*1024, /* dwVidMemTotal */
16*1024*1024, /* dwVidMemFree */
0, /* dwMaxVisibleOverlays */
0, /* dwCurrVisibleOverlays */
0, /* dwNumFourCCCodes */
0, /* dwAlignBoundarySrc */
0, /* dwAlignSizeSrc */
0, /* dwAlignBoundaryDest */
0, /* dwAlignSizeDest */
0, /* dwAlignStrideAlign */
{0}, /* dwRops */
{ /* ddsCaps */
DDSCAPS_BACKBUFFER | DDSCAPS_FLIP | DDSCAPS_FRONTBUFFER |
DDSCAPS_OFFSCREENPLAIN | DDSCAPS_PALETTE | DDSCAPS_PRIMARYSURFACE |
DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY |
DDSCAPS_VISIBLE | DDSCAPS_LOCALVIDMEM | DDSCAPS_NONLOCALVIDMEM /* dwCaps */
},
0, /* dwMinOverlayStretch */
0, /* dwMaxOverlayStretch */
0, /* dwMinLiveVideoStretch */
0, /* dwMaxLiveVideoStretch */
0, /* dwMinHwCodecStretch */
0, /* dwMaxHwCodecStretch */
0, /* dwReserved1 */
0, /* dwReserved2 */
0, /* dwReserved2 */
0, /* dwSVBCaps */
0, /* dwSVBCKeyCaps */
0, /* dwSVBFXCaps */
{0}, /* dwSVBRops */
0, /* dwVSBCaps */
0, /* dwVSBCKeyCaps */
0, /* dwVSBFXCaps */
{0}, /* dwVSBRops */
0, /* dwSSBCaps */
0, /* dwSSBCKeyCaps */
0, /* dwSSBFXCaps */
{0}, /* dwSSBRops */
0, /* dwMaxVideoPorts */
0, /* dwCurrVideoPorts */
0 /* dwSVBCaps */
},
0, /* dwMonitorFrequency */
X11DRV_DDHAL_GetDriverInfo,
0, /* dwModeIndex */
NULL, /* lpdwFourCC */
0, /* dwNumModes */
NULL, /* lpModeInfo */
DDHALINFO_ISPRIMARYDISPLAY | DDHALINFO_MODEXILLEGAL | DDHALINFO_GETDRIVERINFOSET, /* dwFlags */
&x11device,
0, /* hInstance */
0, /* lpD3DGlobalDriverData */
0, /* lpD3DHALCallbacks */
NULL /* lpDDExeBufCallbacks */
};
static LPDDHALDDRAWFNS ddraw_fns;
static DWORD ddraw_ver;
static void X11DRV_DDHAL_SetInfo(void)
{
(ddraw_fns->lpSetInfo)(&hal_info, FALSE);
}
INT X11DRV_DCICommand(INT cbInput, const DCICMD *lpCmd, LPVOID lpOutData)
{
TRACE("(%d,(%d,%d,%d),%p)\n", cbInput, lpCmd->dwCommand,
lpCmd->dwParam1, lpCmd->dwParam2, lpOutData);
switch (lpCmd->dwCommand) {
case DDNEWCALLBACKFNS:
ddraw_fns = (LPDDHALDDRAWFNS)lpCmd->dwParam1;
return TRUE;
case DDVERSIONINFO:
{
LPDDVERSIONDATA lpVer = lpOutData;
ddraw_ver = lpCmd->dwParam1;
if (!lpVer) break;
/* well, whatever... the DDK says so */
lpVer->dwHALVersion = DD_RUNTIME_VERSION;
}
return TRUE;
case DDGET32BITDRIVERNAME:
{
LPDD32BITDRIVERDATA lpData = (LPDD32BITDRIVERDATA)lpOutData;
/* here, we could ask ddraw to load a separate DLL, that
* would contain the 32-bit ddraw HAL */
strcpy(lpData->szName,"x11drv");
/* the entry point named here should initialize our hal_info
* with 32-bit entry points (ignored for now) */
strcpy(lpData->szEntryPoint,"DriverInit");
lpData->dwContext = 0;
}
return TRUE;
case DDCREATEDRIVEROBJECT:
{
LPDWORD lpInstance = lpOutData;
/* FIXME: get x11drv's hInstance */
X11DRV_Settings_CreateDriver(&hal_info);
(ddraw_fns->lpSetInfo)(&hal_info, FALSE);
*lpInstance = hal_info.hInstance;
}
return TRUE;
}
return 0;
}
void X11DRV_DDHAL_SwitchMode(DWORD dwModeIndex, LPVOID fb_addr, LPVIDMEM fb_mem)
{
LPDDHALMODEINFO info = &hal_info.lpModeInfo[dwModeIndex];
hal_info.dwModeIndex = dwModeIndex;
hal_info.dwMonitorFrequency = info->wRefreshRate;
hal_info.vmiData.fpPrimary = (FLATPTR)fb_addr;
hal_info.vmiData.dwDisplayWidth = info->dwWidth;
hal_info.vmiData.dwDisplayHeight = info->dwHeight;
hal_info.vmiData.lDisplayPitch = info->lPitch;
hal_info.vmiData.ddpfDisplay.dwSize = info->dwBPP ? sizeof(hal_info.vmiData.ddpfDisplay) : 0;
hal_info.vmiData.ddpfDisplay.dwFlags = (info->wFlags & DDMODEINFO_PALETTIZED) ? DDPF_PALETTEINDEXED8 : 0;
hal_info.vmiData.ddpfDisplay.u1.dwRGBBitCount = (info->dwBPP > 24) ? 24 : info->dwBPP;
hal_info.vmiData.ddpfDisplay.u2.dwRBitMask = info->dwRBitMask;
hal_info.vmiData.ddpfDisplay.u3.dwGBitMask = info->dwGBitMask;
hal_info.vmiData.ddpfDisplay.u4.dwBBitMask = info->dwBBitMask;
hal_info.vmiData.dwNumHeaps = fb_mem ? 1 : 0;
hal_info.vmiData.pvmList = fb_mem;
X11DRV_DDHAL_SetInfo();
}
static void X11DRV_DDHAL_SetPalEntries(Colormap pal, DWORD dwBase, DWORD dwNumEntries,
LPPALETTEENTRY lpEntries)
{
XColor c;
unsigned int n;
if (pal) {
wine_tsx11_lock();
c.flags = DoRed|DoGreen|DoBlue;
c.pixel = dwBase;
for (n=0; n<dwNumEntries; n++,c.pixel++) {
c.red = lpEntries[n].peRed << 8;
c.green = lpEntries[n].peGreen << 8;
c.blue = lpEntries[n].peBlue << 8;
XStoreColor(gdi_display, pal, &c);
}
XFlush(gdi_display); /* update display immediately */
wine_tsx11_unlock();
}
}
dlls/winex11.drv/x11drv.h
View file @ f13c65b4
......@@ -466,8 +466,6 @@ extern void X11DRV_DIB_DeleteDIBSection(X_PHYSBITMAP *physBitmap, DIBSECTION *di
extern void X11DRV_DIB_CopyDIBSection(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst,
DWORD xSrc, DWORD ySrc, DWORD xDest, DWORD yDest,
DWORD width, DWORD height);
struct _DCICMD;
extern INT X11DRV_DCICommand(INT cbInput, const struct _DCICMD *lpCmd, LPVOID lpOutData);
/**************************************************************************
* X11 GDI driver
......@@ -593,7 +591,6 @@ extern unsigned int screen_bpp;
extern unsigned int screen_depth;
extern RECT virtual_screen_rect;
extern unsigned int text_caps;
extern int dxgrab;
extern int use_xkb;
extern int use_take_focus;
extern int use_primary_selection;
......@@ -848,8 +845,6 @@ LPDDHALMODEINFO X11DRV_Settings_SetHandlers(const char *name,
unsigned int nmodes,
int reserve_depths);
extern void X11DRV_DDHAL_SwitchMode(DWORD dwModeIndex, LPVOID fb_addr, LPVIDMEM fb_mem);
/* XIM support */
extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN;
extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN;
......
dlls/winex11.drv/x11drv_main.c
View file @ f13c65b4
......@@ -75,7 +75,6 @@ unsigned int screen_bpp;
unsigned int screen_depth;
RECT virtual_screen_rect;
Window root_window;
int dxgrab = 0;
int usexvidmode = 1;
int usexrandr = 1;
int usexcomposite = 1;
......@@ -406,9 +405,6 @@ static void setup_options(void)
if (!get_config_key( hkey, appkey, "Decorated", buffer, sizeof(buffer) ))
decorated_mode = IS_OPTION_TRUE( buffer[0] );
if (!get_config_key( hkey, appkey, "DXGrab", buffer, sizeof(buffer) ))
dxgrab = IS_OPTION_TRUE( buffer[0] );
if (!get_config_key( hkey, appkey, "UseXVidMode", buffer, sizeof(buffer) ))
usexvidmode = IS_OPTION_TRUE( buffer[0] );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment