diff options
Diffstat (limited to 'xorg-server/hw/xwin/win.h')
| -rwxr-xr-x[-rw-r--r--] | xorg-server/hw/xwin/win.h | 37 |
1 files changed, 9 insertions, 28 deletions
diff --git a/xorg-server/hw/xwin/win.h b/xorg-server/hw/xwin/win.h index c4847670e..7b4a8425c 100644..100755 --- a/xorg-server/hw/xwin/win.h +++ b/xorg-server/hw/xwin/win.h @@ -96,7 +96,6 @@ #define WIN_SERVER_NONE 0x0L /* 0 */ #define WIN_SERVER_SHADOW_GDI 0x1L /* 1 */ -#define WIN_SERVER_SHADOW_DD 0x2L /* 2 */ #define WIN_SERVER_SHADOW_DDNL 0x4L /* 4 */ #define AltMapIndex Mod1MapIndex @@ -431,37 +430,20 @@ typedef struct _winPrivScreenRec { int iE3BCachedPress; Bool fE3BFakeButton2Sent; - /* Privates used by shadow fb GDI server */ + /* Privates used by shadow fb GDI engine */ HBITMAP hbmpShadow; HDC hdcScreen; HDC hdcShadow; HWND hwndScreen; BITMAPINFOHEADER *pbmih; - /* Privates used by shadow fb and primary fb DirectDraw servers */ + /* Privates used by shadow fb DirectDraw Nonlocking engine */ LPDIRECTDRAW pdd; - LPDIRECTDRAWSURFACE pddsPrimary; - LPDIRECTDRAW2 pdd2; - - /* Privates used by shadow fb DirectDraw server */ - LPDIRECTDRAWSURFACE pddsShadow; - LPDDSURFACEDESC pddsdShadow; - -#ifdef XWIN_PRIMARYFB - /* Privates used by primary fb DirectDraw server */ - LPDIRECTDRAWSURFACE pddsOffscreen; - LPDDSURFACEDESC pddsdOffscreen; - LPDDSURFACEDESC pddsdPrimary; -#endif - - /* Privates used by shadow fb DirectDraw Nonlocking server */ LPDIRECTDRAW4 pdd4; LPDIRECTDRAWSURFACE4 pddsShadow4; LPDIRECTDRAWSURFACE4 pddsPrimary4; - BOOL fRetryCreateSurface; - - /* Privates used by both shadow fb DirectDraw servers */ LPDIRECTDRAWCLIPPER pddcPrimary; + BOOL fRetryCreateSurface; #ifdef XWIN_MULTIWINDOWEXTWM /* Privates used by multi-window external window manager */ @@ -889,13 +871,6 @@ Bool winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv); /* - * winshaddd.c - */ - -Bool - winSetEngineFunctionsShadowDD(ScreenPtr pScreen); - -/* * winshadddnl.c */ @@ -1194,6 +1169,12 @@ Bool winCreateMsgWindowThread(void); /* + * winos.c + */ +void +winOS(void); + +/* * END DDX and DIX Function Prototypes */ |