[xorg-commit-diffs] xc/programs/Xserver/hw/xwin InitOutput.c,
1.1.4.1.2.31, 1.1.4.1.2.32 win.h, 1.1.4.1.2.27,
1.1.4.1.2.28 wincmap.c, 1.1.6.4, 1.1.6.5 wincreatewnd.c,
1.1.4.1.2.9, 1.1.4.1.2.10 wingc.c, 1.1.4.1.2.4,
1.1.4.1.2.5 winkeybd.c, 1.1.4.1.2.7, 1.1.4.1.2.8 winmouse.c,
1.1.6.3, 1.1.6.4 winnativegdi.c, 1.1.4.1.2.3,
1.1.4.1.2.4 winpfbdd.c, 1.1.4.1.2.5, 1.1.4.1.2.6 winpixmap.c,
1.1.4.1.2.2, 1.1.4.1.2.3 winprocarg.c, 1.1.2.14,
1.1.2.15 winrandr.c, 1.1.2.1, 1.1.2.2 winscrinit.c,
1.1.4.1.2.15, 1.1.4.1.2.16 winshaddd.c, 1.1.4.1.2.9,
1.1.4.1.2.10 winshadddnl.c, 1.1.4.1.2.7,
1.1.4.1.2.8 winshadgdi.c, 1.1.4.1.2.12,
1.1.4.1.2.13 winvalargs.c, 1.1.2.2, 1.1.2.3
Harold L Hunt II
xorg-commit at pdx.freedesktop.org
Fri Apr 9 23:18:32 PDT 2004
Committed by: harold
Update of /cvs/xorg/xc/programs/Xserver/hw/xwin
In directory pdx:/tmp/cvs-serv2884
Modified Files:
Tag: CYGWIN
InitOutput.c win.h wincmap.c wincreatewnd.c wingc.c winkeybd.c
winmouse.c winnativegdi.c winpfbdd.c winpixmap.c winprocarg.c
winrandr.c winscrinit.c winshaddd.c winshadddnl.c winshadgdi.c
winvalargs.c
Log Message:
Make most functions static that can be static. Remove declarations for functions used in only one place from win.h and put them in that single file. Stop using WS_EX_TOPMOST for fullscreen windows. Stop manually minimizing and restoring our window when using the ShadowGDI engine in fullscreen mode. (Harold L Hunt II)
Index: InitOutput.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/InitOutput.c,v
retrieving revision 1.1.4.1.2.31
retrieving revision 1.1.4.1.2.32
diff -u -d -r1.1.4.1.2.31 -r1.1.4.1.2.32
--- a/InitOutput.c 3 Apr 2004 05:00:46 -0000 1.1.4.1.2.31
+++ b/InitOutput.c 10 Apr 2004 06:18:29 -0000 1.1.4.1.2.32
@@ -99,6 +99,9 @@
void
winLogVersionInfo (void);
+Bool
+winValidateArgs (void);
+
/*
* For the depth 24 pixmap we default to 32 bits per pixel, but
Index: win.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/win.h,v
retrieving revision 1.1.4.1.2.27
retrieving revision 1.1.4.1.2.28
diff -u -d -r1.1.4.1.2.27 -r1.1.4.1.2.28
--- a/win.h 3 Apr 2004 05:00:46 -0000 1.1.4.1.2.27
+++ b/win.h 10 Apr 2004 06:18:29 -0000 1.1.4.1.2.28
@@ -36,7 +36,6 @@
#ifndef _WIN_H_
#define _WIN_H_
-
#ifndef NO
#define NO 0
#endif
@@ -764,29 +763,8 @@
* wincmap.c
*/
-int
-winListInstalledColormaps (ScreenPtr pScreen, Colormap *pmaps);
-
-void
-winStoreColors (ColormapPtr pmap, int ndef, xColorItem *pdefs);
-
-void
-winInstallColormap (ColormapPtr pmap);
-
void
-winUninstallColormap (ColormapPtr pmap);
-
-void
-winResolveColor (unsigned short *pred,
- unsigned short *pgreen,
- unsigned short *pblue,
- VisualPtr pVisual);
-
-Bool
-winCreateColormap (ColormapPtr pmap);
-
-void
-winDestroyColormap (ColormapPtr pmap);
+winSetColormapFunctions (ScreenPtr pScreen);
Bool
winCreateDefColormap (ScreenPtr pScreen);
@@ -879,32 +857,6 @@
Bool
winCreateGCNativeGDI (GCPtr pGC);
-
-void
-winChangeGCNativeGDI (GCPtr pGC, unsigned long ulChanges);
-
-void
-winPadPixmapNativdGDI (PixmapPtr pPixmap);
-
-void
-winValidateGCNativeGDI (GCPtr pGC,
- unsigned long changes,
- DrawablePtr pDrawable);
-
-void
-winCopyGCNativeGDI (GCPtr pGCsrc, unsigned long ulMask, GCPtr pGCdst);
-
-void
-winDestroyGCNativeGDI (GCPtr pGC);
-
-void
-winChangeClipNativeGDI (GCPtr pGC, int nType, pointer pValue, int nRects);
-
-void
-winDestroyClipNativeGDI (GCPtr pGC);
-
-void
-winCopyClipNativeGDI (GCPtr pGCdst, GCPtr pGCsrc);
#endif
@@ -938,16 +890,6 @@
void
winTranslateKey (WPARAM wParam, LPARAM lParam, int *piScanCode);
-void
-winGetKeyMappings (KeySymsPtr pKeySyms, CARD8 *pModMap);
-
-void
-winKeybdBell (int iPercent, DeviceIntPtr pDeviceInt,
- pointer pCtrl, int iClass);
-
-void
-winKeybdCtrl (DeviceIntPtr pDevice, KeybdCtrl *pCtrl);
-
int
winKeybdProc (DeviceIntPtr pDeviceInt, int iState);
@@ -1004,9 +946,6 @@
* winmouse.c
*/
-void
-winMouseCtrl (DeviceIntPtr pDevice, PtrCtrl *pCtrl);
-
int
winMouseProc (DeviceIntPtr pDeviceInt, int iState);
@@ -1031,49 +970,7 @@
BYTE **ppbBits, BITMAPINFO **ppbmi);
Bool
-winAllocateFBNativeGDI (ScreenPtr pScreen);
-
-void
-winShadowUpdateNativeGDI (ScreenPtr pScreen,
- shadowBufPtr pBuf);
-
-Bool
-winCloseScreenNativeGDI (int nIndex, ScreenPtr pScreen);
-
-Bool
-winInitVisualsNativeGDI (ScreenPtr pScreen);
-
-Bool
-winAdjustVideoModeNativeGDI (ScreenPtr pScreen);
-
-Bool
-winBltExposedRegionsNativeGDI (ScreenPtr pScreen);
-
-Bool
-winActivateAppNativeGDI (ScreenPtr pScreen);
-
-Bool
winSetEngineFunctionsNativeGDI (ScreenPtr pScreen);
-
-Bool
-winRedrawScreenNativeGDI (ScreenPtr pScreen);
-
-Bool
-winRealizeInstalledPaletteNativeGDI (ScreenPtr pScreen);
-
-Bool
-winInstallColormapNativeGDI (ColormapPtr pColormap);
-
-Bool
-winStoreColorsNativeGDI (ColormapPtr pmap,
- int ndef,
- xColorItem *pdefs);
-
-Bool
-winCreateColormapNativeGDI (ColormapPtr pColormap);
-
-Bool
-winDestroyColormapNativeGDI (ColormapPtr pColormap);
#endif
@@ -1083,25 +980,7 @@
*/
Bool
-winAllocateFBPrimaryDD (ScreenPtr pScreen);
-
-Bool
-winCloseScreenPrimaryDD (int nIndex, ScreenPtr pScreen);
-
-Bool
-winInitVisualsPrimaryDD (ScreenPtr pScreen);
-
-Bool
-winAdjustVideoModePrimaryDD (ScreenPtr pScreen);
-
-Bool
-winActivateAppPrimaryDD (ScreenPtr pScreen);
-
-Bool
winSetEngineFunctionsPrimaryDD (ScreenPtr pScreen);
-
-Bool
-winHotKeyAltTabPrimaryDD (ScreenPtr pScreen);
#endif
@@ -1116,16 +995,6 @@
Bool
winDestroyPixmapNativeGDI (PixmapPtr pPixmap);
-void
-winXRotatePixmapNativeGDI (PixmapPtr pPix, int rw);
-
-void
-winYRotatePixmapNativeGDI (PixmapPtr pPix, int rh);
-
-void
-winCopyRotatePixmapNativeGDI (PixmapPtr psrcPix, PixmapPtr *ppdstPix,
- int xrot, int yrot);
-
Bool
winModifyPixmapHeaderNativeGDI (PixmapPtr pPixmap,
int iWidth, int iHeight,
@@ -1160,14 +1029,6 @@
#endif
-/*
- * winprocarg.c
- */
-
-void
-winInitializeDefaultScreens (void);
-
-
#ifdef XWIN_NATIVEGDI
/*
* winpushpxl.c
@@ -1179,25 +1040,6 @@
#endif
-#ifdef RANDR
-/*
- * winrandr.c
- */
-
-Bool
-winRandRGetInfo (ScreenPtr pScreen, Rotation *pRotations);
-
-Bool
-winRandRSetConfig (ScreenPtr pScreen,
- Rotation rotateKind,
- int rate,
- RRScreenSizePtr pSize);
-
-Bool
-winRandRInit (ScreenPtr pScreen);
-#endif /* RANDR */
-
-
/*
* winscrinit.c
*/
@@ -1212,7 +1054,7 @@
ScreenPtr pScreen,
int argc, char **argv);
-#ifdef XWIN_NATIVEGDI
+#if defined(XWIN_NATIVEGDI)
Bool
winFinishScreenInitNativeGDI (int index,
ScreenPtr pScreen,
@@ -1241,162 +1083,24 @@
*/
Bool
-winAllocateFBShadowDD (ScreenPtr pScreen);
-
-void
-winShadowUpdateDD (ScreenPtr pScreen,
- shadowBufPtr pBuf);
-
-Bool
-winCloseScreenShadowDD (int nIndex, ScreenPtr pScreen);
-
-Bool
-winInitVisualsShadowDD (ScreenPtr pScreen);
-
-Bool
-winAdjustVideoModeShadowDD (ScreenPtr pScreen);
-
-Bool
-winBltExposedRegionsShadowDD (ScreenPtr pScreen);
-
-Bool
-winActivateAppShadowDD (ScreenPtr pScreen);
-
-Bool
winSetEngineFunctionsShadowDD (ScreenPtr pScreen);
-Bool
-winRedrawScreenShadowDD (ScreenPtr pScreen);
-
-Bool
-winRealizeInstalledPaletteShadowDD (ScreenPtr pScreen);
-
-Bool
-winInstallColormapShadowDD (ColormapPtr pColormap);
-
-Bool
-winStoreColorsShadowDD (ColormapPtr pmap,
- int ndef,
- xColorItem *pdefs);
-
-Bool
-winCreateColormapShadowDD (ColormapPtr pColormap);
-
-Bool
-winDestroyColormapShadowDD (ColormapPtr pColormap);
-
-Bool
-winCreatePrimarySurfaceShadowDD (ScreenPtr pScreen);
-
-Bool
-winReleasePrimarySurfaceShadowDD (ScreenPtr pScreen);
-
/*
* winshadddnl.c
*/
Bool
-winAllocateFBShadowDDNL (ScreenPtr pScreen);
-
-void
-winShadowUpdateDDNL (ScreenPtr pScreen,
- shadowBufPtr pBuf);
-
-Bool
-winCloseScreenShadowDDNL (int nIndex, ScreenPtr pScreen);
-
-Bool
-winInitVisualsShadowDDNL (ScreenPtr pScreen);
-
-Bool
-winAdjustVideoModeShadowDDNL (ScreenPtr pScreen);
-
-Bool
-winBltExposedRegionsShadowDDNL (ScreenPtr pScreen);
-
-Bool
-winActivateAppShadowDDNL (ScreenPtr pScreen);
-
-Bool
winSetEngineFunctionsShadowDDNL (ScreenPtr pScreen);
-Bool
-winRedrawScreenShadowDDNL (ScreenPtr pScreen);
-
-Bool
-winRealizeInstalledPaletteShadowDDNL (ScreenPtr pScreen);
-
-Bool
-winInstallColormapShadowDDNL (ColormapPtr pColormap);
-
-Bool
-winStoreColorsShadowDDNL (ColormapPtr pmap,
- int ndef,
- xColorItem *pdefs);
-
-Bool
-winCreateColormapShadowDDNL (ColormapPtr pColormap);
-
-Bool
-winDestroyColormapShadowDDNL (ColormapPtr pColormap);
-
-Bool
-winCreatePrimarySurfaceShadowDDNL (ScreenPtr pScreen);
-
-Bool
-winReleasePrimarySurfaceShadowDDNL (ScreenPtr pScreen);
-
/*
* winshadgdi.c
*/
Bool
-winAllocateFBShadowGDI (ScreenPtr pScreen);
-
-void
-winShadowUpdateGDI (ScreenPtr pScreen,
- shadowBufPtr pBuf);
-
-Bool
-winCloseScreenShadowGDI (int nIndex, ScreenPtr pScreen);
-
-Bool
-winInitVisualsShadowGDI (ScreenPtr pScreen);
-
-Bool
-winAdjustVideoModeShadowGDI (ScreenPtr pScreen);
-
-Bool
-winBltExposedRegionsShadowGDI (ScreenPtr pScreen);
-
-Bool
-winActivateAppShadowGDI (ScreenPtr pScreen);
-
-Bool
-winRedrawScreenShadowGDI (ScreenPtr pScreen);
-
-Bool
winSetEngineFunctionsShadowGDI (ScreenPtr pScreen);
-Bool
-winRealizeInstalledPaletteShadowGDI (ScreenPtr pScreen);
-
-Bool
-winInstallColormapShadowGDI (ColormapPtr pColormap);
-
-Bool
-winStoreColorsShadowGDI (ColormapPtr pmap,
- int ndef,
- xColorItem *pdefs);
-
-Bool
-winCreateColormapShadowGDI (ColormapPtr pColormap);
-
-Bool
-winDestroyColormapShadowGDI (ColormapPtr pColormap);
-
/*
* winwakeup.c
@@ -1567,14 +1271,6 @@
/*
- * winvalargs.c
- */
-
-Bool
-winValidateArgs (void);
-
-
-/*
* winwndproc.c
*/
Index: wincmap.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/wincmap.c,v
retrieving revision 1.1.6.4
retrieving revision 1.1.6.5
diff -u -d -r1.1.6.4 -r1.1.6.5
--- a/wincmap.c 17 Mar 2004 20:31:50 -0000 1.1.6.4
+++ b/wincmap.c 10 Apr 2004 06:18:29 -0000 1.1.6.5
@@ -34,13 +34,66 @@
#include "win.h"
+
+/*
+ * Local prototypes
+ */
+
+static int
+winListInstalledColormaps (ScreenPtr pScreen, Colormap *pmaps);
+
+static void
+winStoreColors (ColormapPtr pmap, int ndef, xColorItem *pdefs);
+
+static void
+winInstallColormap (ColormapPtr pmap);
+
+static void
+winUninstallColormap (ColormapPtr pmap);
+
+static void
+winResolveColor (unsigned short *pred,
+ unsigned short *pgreen,
+ unsigned short *pblue,
+ VisualPtr pVisual);
+
+static Bool
+winCreateColormap (ColormapPtr pmap);
+
+static void
+winDestroyColormap (ColormapPtr pmap);
+
+static Bool
+winGetPaletteDIB (ScreenPtr pScreen, ColormapPtr pcmap);
+
+static Bool
+winGetPaletteDD (ScreenPtr pScreen, ColormapPtr pcmap);
+
+
+/*
+ * Set screen functions for colormaps
+ */
+
+void
+winSetColormapFunctions (ScreenPtr pScreen)
+{
+ pScreen->CreateColormap = winCreateColormap;
+ pScreen->DestroyColormap = winDestroyColormap;
+ pScreen->InstallColormap = winInstallColormap;
+ pScreen->UninstallColormap = winUninstallColormap;
+ pScreen->ListInstalledColormaps = winListInstalledColormaps;
+ pScreen->StoreColors = winStoreColors;
+ pScreen->ResolveColor = winResolveColor;
+}
+
+
/* See Porting Layer Definition - p. 30 */
/*
* Walk the list of installed colormaps, filling the pmaps list
* with the resource ids of the installed maps, and return
* a count of the total number of installed maps.
*/
-int
+static int
winListInstalledColormaps (ScreenPtr pScreen, Colormap *pmaps)
{
winScreenPriv(pScreen);
@@ -57,7 +110,7 @@
/* See Porting Layer Definition - p. 30 */
/* See Programming Windows - p. 663 */
-void
+static void
winInstallColormap (ColormapPtr pColormap)
{
ScreenPtr pScreen = pColormap->pScreen;
@@ -102,7 +155,7 @@
/* See Porting Layer Definition - p. 30 */
-void
+static void
winUninstallColormap (ColormapPtr pmap)
{
winScreenPriv(pmap->pScreen);
@@ -138,7 +191,7 @@
/* See Porting Layer Definition - p. 30 */
-void
+static void
winStoreColors (ColormapPtr pmap,
int ndef,
xColorItem *pdefs)
@@ -190,7 +243,7 @@
/* See Porting Layer Definition - p. 30 */
-void
+static void
winResolveColor (unsigned short *pred,
unsigned short *pgreen,
unsigned short *pblue,
@@ -205,7 +258,7 @@
/* See Porting Layer Definition - p. 29 */
-Bool
+static Bool
winCreateColormap (ColormapPtr pmap)
{
winPrivCmapPtr pCmapPriv = NULL;
@@ -255,7 +308,7 @@
/* See Porting Layer Definition - p. 29, 30 */
-void
+static void
winDestroyColormap (ColormapPtr pColormap)
{
winScreenPriv(pColormap->pScreen);
@@ -283,8 +336,7 @@
* Internal function to load the palette used by the Shadow DIB
*/
-static
-Bool
+static Bool
winGetPaletteDIB (ScreenPtr pScreen, ColormapPtr pcmap)
{
winScreenPriv(pScreen);
@@ -375,11 +427,10 @@
/*
- * Internal function to load the standard system palette being used by GDI
+ * Internal function to load the standard system palette being used by DD
*/
-static
-Bool
+static Bool
winGetPaletteDD (ScreenPtr pScreen, ColormapPtr pcmap)
{
int i;
Index: wincreatewnd.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/wincreatewnd.c,v
retrieving revision 1.1.4.1.2.9
retrieving revision 1.1.4.1.2.10
diff -u -d -r1.1.4.1.2.9 -r1.1.4.1.2.10
--- a/wincreatewnd.c 26 Mar 2004 20:39:17 -0000 1.1.4.1.2.9
+++ b/wincreatewnd.c 10 Apr 2004 06:18:29 -0000 1.1.4.1.2.10
@@ -89,7 +89,7 @@
(int) pScreenInfo->dwScreen);
/* Create the window */
- *phwnd = CreateWindowExA (WS_EX_TOPMOST, /* Extended styles */
+ *phwnd = CreateWindowExA (0, /* Extended styles */
WINDOW_CLASS, /* Class name */
szTitle, /* Window name */
WS_POPUP,
Index: wingc.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/wingc.c,v
retrieving revision 1.1.4.1.2.4
retrieving revision 1.1.4.1.2.5
diff -u -d -r1.1.4.1.2.4 -r1.1.4.1.2.5
--- a/wingc.c 26 Mar 2004 20:39:17 -0000 1.1.4.1.2.4
+++ b/wingc.c 10 Apr 2004 06:18:29 -0000 1.1.4.1.2.5
@@ -31,7 +31,41 @@
#include "win.h"
void
-winPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable, int dx, int dy, int xOrg, int yOrg);
+winPushPixels (GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable, int dx, int dy, int xOrg, int yOrg);
+
+
+/*
+ * Local prototypes
+ */
+
+#if 0
+static void
+winChangeGCNativeGDI (GCPtr pGC, unsigned long ulChanges);
+#endif
+
+static void
+winValidateGCNativeGDI (GCPtr pGC,
+ unsigned long changes,
+ DrawablePtr pDrawable);
+
+#if 0
+static void
+winCopyGCNativeGDI (GCPtr pGCsrc, unsigned long ulMask, GCPtr pGCdst);
+#endif
+
+static void
+winDestroyGCNativeGDI (GCPtr pGC);
+
+#if 0
+static void
+winChangeClipNativeGDI (GCPtr pGC, int nType, pointer pValue, int nRects);
+
+static void
+winDestroyClipNativeGDI (GCPtr pGC);
+
+static void
+winCopyClipNativeGDI (GCPtr pGCdst, GCPtr pGCsrc);
+#endif
#if 0
/* GC Handling Routines */
@@ -133,17 +167,19 @@
}
+#if 0
/* See Porting Layer Definition - p. 45 */
-void
+static void
winChangeGCNativeGDI (GCPtr pGC, unsigned long ulChanges)
{
#if 0
ErrorF ("winChangeGCNativeGDI () - Doing nothing\n");
#endif
}
+#endif
-void
+static void
winValidateGCNativeGDI (GCPtr pGC,
unsigned long ulChanges,
DrawablePtr pDrawable)
@@ -156,16 +192,18 @@
}
+#if 0
/* See Porting Layer Definition - p. 46 */
-void
+static void
winCopyGCNativeGDI (GCPtr pGCsrc, unsigned long ulMask, GCPtr pGCdst)
{
}
+#endif
/* See Porting Layer Definition - p. 46 */
-void
+static void
winDestroyGCNativeGDI (GCPtr pGC)
{
winGCPriv(pGC);
@@ -193,8 +231,9 @@
}
+#if 0
/* See Porting Layer Definition - p. 46 */
-void
+static void
winChangeClipNativeGDI (GCPtr pGC, int nType, pointer pValue, int nRects)
{
@@ -202,7 +241,7 @@
/* See Porting Layer Definition - p. 47 */
-void
+static void
winDestroyClipNativeGDI (GCPtr pGC)
{
@@ -210,8 +249,9 @@
/* See Porting Layer Definition - p. 47 */
-void
+static void
winCopyClipNativeGDI (GCPtr pGCdst, GCPtr pGCsrc)
{
}
+#endif
Index: winkeybd.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winkeybd.c,v
retrieving revision 1.1.4.1.2.7
retrieving revision 1.1.4.1.2.8
diff -u -d -r1.1.4.1.2.7 -r1.1.4.1.2.8
--- a/winkeybd.c 3 Apr 2004 22:21:56 -0000 1.1.4.1.2.7
+++ b/winkeybd.c 10 Apr 2004 06:18:29 -0000 1.1.4.1.2.8
@@ -37,7 +37,7 @@
#include "winkeybd.h"
#include "winconfig.h"
#include "winmsg.h"
-
+
#ifdef XKB
#define XKB_IN_SERVER
#include "XKBsrv.h"
@@ -48,6 +48,22 @@
/* Stored to get internal mode key states. Must be read-only. */
static unsigned short const *g_winInternalModeKeyStatesPtr = NULL;
+
+/*
+ * Local prototypes
+ */
+
+static void
+winGetKeyMappings (KeySymsPtr pKeySyms, CARD8 *pModMap);
+
+static void
+winKeybdBell (int iPercent, DeviceIntPtr pDeviceInt,
+ pointer pCtrl, int iClass);
+
+static void
+winKeybdCtrl (DeviceIntPtr pDevice, KeybdCtrl *pCtrl);
+
+
/*
* Translate a Windows WM_[SYS]KEY(UP/DOWN) message
* into an ASCII scan code.
@@ -78,7 +94,7 @@
* initializing the keyboard.
*/
-void
+static void
winGetKeyMappings (KeySymsPtr pKeySyms, CARD8 *pModMap)
{
int i;
@@ -157,7 +173,7 @@
/* Ring the keyboard bell (system speaker on PCs) */
-void
+static void
winKeybdBell (int iPercent, DeviceIntPtr pDeviceInt,
pointer pCtrl, int iClass)
{
@@ -172,7 +188,7 @@
/* Change some keyboard configuration parameters */
-void
+static void
winKeybdCtrl (DeviceIntPtr pDevice, KeybdCtrl *pCtrl)
{
g_winInternalModeKeyStatesPtr = &(pDevice->key->state);
Index: winmouse.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winmouse.c,v
retrieving revision 1.1.6.3
retrieving revision 1.1.6.4
diff -u -d -r1.1.6.3 -r1.1.6.4
--- a/winmouse.c 17 Mar 2004 20:31:51 -0000 1.1.6.3
+++ b/winmouse.c 10 Apr 2004 06:18:29 -0000 1.1.6.4
@@ -41,7 +41,16 @@
static CARD8 const *g_winMouseButtonMap = NULL;
#endif
-void
+
+/*
+ * Local prototypes
+ */
+
+static void
+winMouseCtrl (DeviceIntPtr pDevice, PtrCtrl *pCtrl);
+
+
+static void
winMouseCtrl (DeviceIntPtr pDevice, PtrCtrl *pCtrl)
{
}
Index: winnativegdi.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winnativegdi.c,v
retrieving revision 1.1.4.1.2.3
retrieving revision 1.1.4.1.2.4
diff -u -d -r1.1.4.1.2.3 -r1.1.4.1.2.4
--- a/winnativegdi.c 17 Mar 2004 20:31:51 -0000 1.1.4.1.2.3
+++ b/winnativegdi.c 10 Apr 2004 06:18:29 -0000 1.1.4.1.2.4
@@ -31,7 +31,65 @@
#include "win.h"
-Bool
+
+/*
+ * External symbols
+ */
+
+extern HWND g_hDlgExit;
+
+
+/*
+ * Local function prototypes
+ */
+
+static Bool
+winAllocateFBNativeGDI (ScreenPtr pScreen);
+
+static void
+winShadowUpdateNativeGDI (ScreenPtr pScreen,
+ shadowBufPtr pBuf);
+
+static Bool
+winCloseScreenNativeGDI (int nIndex, ScreenPtr pScreen);
+
+static Bool
+winInitVisualsNativeGDI (ScreenPtr pScreen);
+
+static Bool
+winAdjustVideoModeNativeGDI (ScreenPtr pScreen);
+
+#if 0
+static Bool
+winBltExposedRegionsNativeGDI (ScreenPtr pScreen);
+#endif
+
+static Bool
+winActivateAppNativeGDI (ScreenPtr pScreen);
+
+static Bool
+winRedrawScreenNativeGDI (ScreenPtr pScreen);
+
+static Bool
+winRealizeInstalledPaletteNativeGDI (ScreenPtr pScreen);
+
+static Bool
+winInstallColormapNativeGDI (ColormapPtr pColormap);
+
+static Bool
+winStoreColorsNativeGDI (ColormapPtr pmap,
+ int ndef,
+ xColorItem *pdefs);
+
+static Bool
+winCreateColormapNativeGDI (ColormapPtr pColormap);
+
+static Bool
+winDestroyColormapNativeGDI (ColormapPtr pColormap);
+
+
+
+static Bool
winAllocateFBNativeGDI (ScreenPtr pScreen)
{
FatalError ("winAllocateFBNativeGDI\n");
@@ -39,11 +97,13 @@
return TRUE;
}
+
/*
* We wrap whatever CloseScreen procedure was specified by fb;
* a pointer to said procedure is stored in our privates.
*/
-Bool
+
+static Bool
winCloseScreenNativeGDI (int nIndex, ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -95,7 +155,7 @@
}
-void
+static void
winShadowUpdateNativeGDI (ScreenPtr pScreen,
shadowBufPtr pBuf)
{
@@ -104,7 +164,7 @@
}
-Bool
+static Bool
winInitVisualsNativeGDI (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -199,7 +259,7 @@
/* Adjust the video mode */
-Bool
+static Bool
winAdjustVideoModeNativeGDI (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -263,7 +323,7 @@
}
-Bool
+static Bool
winActivateAppNativeGDI (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -382,15 +442,17 @@
}
-Bool
+#if 0
+static Bool
winBltExposedRegionsNativeGDI (ScreenPtr pScreen)
{
return TRUE;
}
+#endif
-Bool
+static Bool
winRedrawScreenNativeGDI (ScreenPtr pScreen)
{
FatalError ("winRedrawScreenNativeGDI\n");
@@ -398,7 +460,7 @@
}
-Bool
+static Bool
winRealizeInstalledPaletteNativeGDI (ScreenPtr pScreen)
{
FatalError ("winRealizeInstalledPaletteNativeGDI\n");
@@ -406,7 +468,7 @@
}
-Bool
+static Bool
winInstallColormapNativeGDI (ColormapPtr pColormap)
{
FatalError ("winInstallColormapNativeGDI\n");
@@ -414,7 +476,7 @@
}
-Bool
+static Bool
winStoreColorsNativeGDI (ColormapPtr pmap,
int ndef,
xColorItem *pdefs)
@@ -424,7 +486,7 @@
}
-Bool
+static Bool
winCreateColormapNativeGDI (ColormapPtr pColormap)
{
FatalError ("winCreateColormapNativeGDI\n");
@@ -432,7 +494,7 @@
}
-Bool
+static Bool
winDestroyColormapNativeGDI (ColormapPtr pColormap)
{
FatalError ("winDestroyColormapNativeGDI\n");
Index: winpfbdd.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winpfbdd.c,v
retrieving revision 1.1.4.1.2.5
retrieving revision 1.1.4.1.2.6
diff -u -d -r1.1.4.1.2.5 -r1.1.4.1.2.6
--- a/winpfbdd.c 17 Mar 2004 20:31:51 -0000 1.1.4.1.2.5
+++ b/winpfbdd.c 10 Apr 2004 06:18:29 -0000 1.1.4.1.2.6
@@ -36,17 +36,41 @@
/*
- * External global variables
+ * External symbols
*/
-extern const GUID _IID_IDirectDraw2;
+extern const GUID _IID_IDirectDraw2;
+extern HWND g_hDlgExit;
+
+
+/*
+ * Local function prototypes
+ */
+
+static Bool
+winAllocateFBPrimaryDD (ScreenPtr pScreen);
+
+static Bool
+winCloseScreenPrimaryDD (int nIndex, ScreenPtr pScreen);
+
+static Bool
+winInitVisualsPrimaryDD (ScreenPtr pScreen);
+
+static Bool
+winAdjustVideoModePrimaryDD (ScreenPtr pScreen);
+
+static Bool
+winActivateAppPrimaryDD (ScreenPtr pScreen);
+
+static Bool
+winHotKeyAltTabPrimaryDD (ScreenPtr pScreen);
/*
* Create a DirectDraw primary surface
*/
-Bool
+static Bool
winAllocateFBPrimaryDD (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -222,7 +246,7 @@
* Free our resources and private structures.
*/
-Bool
+static Bool
winCloseScreenPrimaryDD (int nIndex, ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -305,7 +329,7 @@
* to verify that last sentence.
*/
-Bool
+static Bool
winInitVisualsPrimaryDD (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -384,7 +408,7 @@
}
-Bool
+static Bool
winAdjustVideoModePrimaryDD (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -444,7 +468,7 @@
* the fb code back to the primary surface memory.
*/
-Bool
+static Bool
winActivateAppPrimaryDD (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -533,7 +557,7 @@
* fb for the duration of the deactivation.
*/
-Bool
+static Bool
winHotKeyAltTabPrimaryDD (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
Index: winpixmap.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winpixmap.c,v
retrieving revision 1.1.4.1.2.2
retrieving revision 1.1.4.1.2.3
diff -u -d -r1.1.4.1.2.2 -r1.1.4.1.2.3
--- a/winpixmap.c 17 Mar 2004 20:31:51 -0000 1.1.4.1.2.2
+++ b/winpixmap.c 10 Apr 2004 06:18:29 -0000 1.1.4.1.2.3
@@ -40,6 +40,23 @@
extern int g_iPixmapPrivateIndex;
+/*
+ * Local prototypes
+ */
+
+#if 0
+static void
+winXRotatePixmapNativeGDI (PixmapPtr pPix, int rw);
+
+static void
+winYRotatePixmapNativeGDI (PixmapPtr pPix, int rh);
+
+static void
+winCopyRotatePixmapNativeGDI (PixmapPtr psrcPix, PixmapPtr *ppdstPix,
+ int xrot, int yrot);
+#endif
+
+
/* See Porting Layer Definition - p. 34 */
/* See mfb/mfbpixmap.c - mfbCreatePixmap() */
PixmapPtr
@@ -181,12 +198,13 @@
}
+#if 0
/*
* Not used yet.
* See cfb/cfbpixmap.c
*/
-void
+static void
winXRotatePixmapNativeGDI (PixmapPtr pPix, int rw)
{
ErrorF ("winXRotatePixmap()\n");
@@ -198,7 +216,7 @@
* Not used yet.
* See cfb/cfbpixmap.c
*/
-void
+static void
winYRotatePixmapNativeGDI (PixmapPtr pPix, int rh)
{
ErrorF ("winYRotatePixmap()\n");
@@ -211,10 +229,11 @@
* See cfb/cfbpixmap.c
*/
-void
+static void
winCopyRotatePixmapNativeGDI (PixmapPtr psrcPix, PixmapPtr *ppdstPix,
int xrot, int yrot)
{
ErrorF ("winCopyRotatePixmap()\n");
/* fill in this function, look at CFB */
}
+#endif
Index: winprocarg.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/Attic/winprocarg.c,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -d -r1.1.2.14 -r1.1.2.15
--- a/winprocarg.c 3 Apr 2004 07:03:17 -0000 1.1.2.14
+++ b/winprocarg.c 10 Apr 2004 06:18:29 -0000 1.1.2.15
@@ -65,6 +65,9 @@
void OsVendorVErrorF (const char *pszFormat, va_list va_args);
#endif
+void
+winInitializeDefaultScreens (void);
+
/*
* Process arguments on the command line
Index: winrandr.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/Attic/winrandr.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- a/winrandr.c 30 Mar 2004 00:31:28 -0000 1.1.2.1
+++ b/winrandr.c 10 Apr 2004 06:18:29 -0000 1.1.2.2
@@ -32,10 +32,27 @@
/*
- * Answer queries about the RandR features supported.
+ * Local prototypes
*/
+static Bool
+winRandRGetInfo (ScreenPtr pScreen, Rotation *pRotations);
+
+static Bool
+winRandRSetConfig (ScreenPtr pScreen,
+ Rotation rotateKind,
+ int rate,
+ RRScreenSizePtr pSize);
+
Bool
+winRandRInit (ScreenPtr pScreen);
+
+
+/*
+ * Answer queries about the RandR features supported.
+ */
+
+static Bool
winRandRGetInfo (ScreenPtr pScreen, Rotation *pRotations)
{
winScreenPriv(pScreen);
@@ -83,7 +100,7 @@
* Respond to resize/rotate request from either X Server or X client app
*/
-Bool
+static Bool
winRandRSetConfig (ScreenPtr pScreen,
Rotation rotateKind,
int rate,
Index: winscrinit.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winscrinit.c,v
retrieving revision 1.1.4.1.2.15
retrieving revision 1.1.4.1.2.16
diff -u -d -r1.1.4.1.2.15 -r1.1.4.1.2.16
--- a/winscrinit.c 30 Mar 2004 00:31:28 -0000 1.1.4.1.2.15
+++ b/winscrinit.c 10 Apr 2004 06:18:29 -0000 1.1.4.1.2.16
@@ -75,6 +75,14 @@
/*
+ * Prototypes
+ */
+
+Bool
+winRandRInit (ScreenPtr pScreen);
+
+
+/*
* Local functions
*/
@@ -298,13 +306,7 @@
|| (pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD
&& pScreenInfo->fFullScreen)))
{
- pScreen->CreateColormap = winCreateColormap;
- pScreen->DestroyColormap = winDestroyColormap;
- pScreen->InstallColormap = winInstallColormap;
- pScreen->UninstallColormap = winUninstallColormap;
- pScreen->ListInstalledColormaps = winListInstalledColormaps;
- pScreen->StoreColors = winStoreColors;
- pScreen->ResolveColor = winResolveColor;
+ winSetColormapFunctions (pScreen);
/*
* NOTE: Setting whitePixel to 255 causes Magic 7.1 to allocate its
Index: winshaddd.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winshaddd.c,v
retrieving revision 1.1.4.1.2.9
retrieving revision 1.1.4.1.2.10
diff -u -d -r1.1.4.1.2.9 -r1.1.4.1.2.10
--- a/winshaddd.c 10 Apr 2004 05:11:37 -0000 1.1.4.1.2.9
+++ b/winshaddd.c 10 Apr 2004 06:18:29 -0000 1.1.4.1.2.10
@@ -34,8 +34,14 @@
#include "win.h"
+
+/*
+ * External symbols
+ */
+
extern HWND g_hDlgExit;
+
/*
* FIXME: Headers are broken, DEFINE_GUID doesn't work correctly,
* so we have to redefine it here.
@@ -56,12 +62,65 @@
/*
+ * Local prototypes
+ */
+
+static Bool
+winAllocateFBShadowDD (ScreenPtr pScreen);
+
+static void
+winShadowUpdateDD (ScreenPtr pScreen,
+ shadowBufPtr pBuf);
+
+static Bool
+winCloseScreenShadowDD (int nIndex, ScreenPtr pScreen);
+
+static Bool
+winInitVisualsShadowDD (ScreenPtr pScreen);
+
+static Bool
+winAdjustVideoModeShadowDD (ScreenPtr pScreen);
+
+static Bool
+winBltExposedRegionsShadowDD (ScreenPtr pScreen);
+
+static Bool
+winActivateAppShadowDD (ScreenPtr pScreen);
+
+static Bool
+winRedrawScreenShadowDD (ScreenPtr pScreen);
+
+static Bool
+winRealizeInstalledPaletteShadowDD (ScreenPtr pScreen);
+
+static Bool
+winInstallColormapShadowDD (ColormapPtr pColormap);
+
+static Bool
+winStoreColorsShadowDD (ColormapPtr pmap,
+ int ndef,
+ xColorItem *pdefs);
+
+static Bool
+winCreateColormapShadowDD (ColormapPtr pColormap);
+
+static Bool
+winDestroyColormapShadowDD (ColormapPtr pColormap);
+
+static Bool
+winCreatePrimarySurfaceShadowDD (ScreenPtr pScreen);
+
+static Bool
+winReleasePrimarySurfaceShadowDD (ScreenPtr pScreen);
+
+
+/*
* Create the primary surface and attach the clipper.
* Used for both the initial surface creation and during
* WM_DISPLAYCHANGE messages.
*/
-Bool
+static Bool
winCreatePrimarySurfaceShadowDD (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -119,7 +178,7 @@
* Called from WM_DISPLAYCHANGE.
*/
-Bool
+static Bool
winReleasePrimarySurfaceShadowDD (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -157,7 +216,7 @@
* that clips our blits to the unobscured client area of our display window.
*/
-Bool
+static Bool
winAllocateFBShadowDD (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -441,7 +500,7 @@
* Transfer the damaged regions of the shadow framebuffer to the display.
*/
-void
+static void
winShadowUpdateDD (ScreenPtr pScreen,
shadowBufPtr pBuf)
{
@@ -606,7 +665,7 @@
* Free our resources and private structures.
*/
-Bool
+static Bool
winCloseScreenShadowDD (int nIndex, ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -717,7 +776,7 @@
* to verify that last sentence.
*/
-Bool
+static Bool
winInitVisualsShadowDD (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -870,7 +929,7 @@
* Adjust the user proposed video mode
*/
-Bool
+static Bool
winAdjustVideoModeShadowDD (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -938,7 +997,7 @@
* Blt exposed regions to the screen
*/
-Bool
+static Bool
winBltExposedRegionsShadowDD (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -1102,7 +1161,7 @@
* Do any engine-specific appliation-activation processing
*/
-Bool
+static Bool
winActivateAppShadowDD (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -1128,7 +1187,7 @@
* Reblit the shadow framebuffer to the screen.
*/
-Bool
+static Bool
winRedrawScreenShadowDD (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -1176,7 +1235,7 @@
* Realize the currently installed colormap
*/
-Bool
+static Bool
winRealizeInstalledPaletteShadowDD (ScreenPtr pScreen)
{
return TRUE;
@@ -1187,7 +1246,7 @@
* Install the specified colormap
*/
-Bool
+static Bool
winInstallColormapShadowDD (ColormapPtr pColormap)
{
ScreenPtr pScreen = pColormap->pScreen;
@@ -1216,7 +1275,7 @@
* Store the specified colors in the specified colormap
*/
-Bool
+static Bool
winStoreColorsShadowDD (ColormapPtr pColormap,
int ndef,
xColorItem *pdefs)
@@ -1260,7 +1319,7 @@
* Colormap initialization procedure
*/
-Bool
+static Bool
winCreateColormapShadowDD (ColormapPtr pColormap)
{
HRESULT ddrval = DD_OK;
@@ -1288,7 +1347,7 @@
* Colormap destruction procedure
*/
-Bool
+static Bool
winDestroyColormapShadowDD (ColormapPtr pColormap)
{
winScreenPriv(pColormap->pScreen);
Index: winshadddnl.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winshadddnl.c,v
retrieving revision 1.1.4.1.2.7
retrieving revision 1.1.4.1.2.8
diff -u -d -r1.1.4.1.2.7 -r1.1.4.1.2.8
--- a/winshadddnl.c 26 Mar 2004 03:21:41 -0000 1.1.4.1.2.7
+++ b/winshadddnl.c 10 Apr 2004 06:18:29 -0000 1.1.4.1.2.8
@@ -34,8 +34,14 @@
#include "win.h"
+
+/*
+ * External symbols
+ */
+
extern HWND g_hDlgExit;
+
/*
* FIXME: Headers are broken, DEFINE_GUID doesn't work correctly,
* so we have to redefine it here.
@@ -57,12 +63,65 @@
/*
+ * Local prototypes
+ */
+
+static Bool
+winAllocateFBShadowDDNL (ScreenPtr pScreen);
+
+static void
+winShadowUpdateDDNL (ScreenPtr pScreen,
+ shadowBufPtr pBuf);
+
+static Bool
+winCloseScreenShadowDDNL (int nIndex, ScreenPtr pScreen);
+
+static Bool
+winInitVisualsShadowDDNL (ScreenPtr pScreen);
+
+static Bool
+winAdjustVideoModeShadowDDNL (ScreenPtr pScreen);
+
+static Bool
+winBltExposedRegionsShadowDDNL (ScreenPtr pScreen);
+
+static Bool
+winActivateAppShadowDDNL (ScreenPtr pScreen);
+
+static Bool
+winRedrawScreenShadowDDNL (ScreenPtr pScreen);
+
+static Bool
+winRealizeInstalledPaletteShadowDDNL (ScreenPtr pScreen);
+
+static Bool
+winInstallColormapShadowDDNL (ColormapPtr pColormap);
+
+static Bool
+winStoreColorsShadowDDNL (ColormapPtr pmap,
+ int ndef,
+ xColorItem *pdefs);
+
+static Bool
+winCreateColormapShadowDDNL (ColormapPtr pColormap);
+
+static Bool
+winDestroyColormapShadowDDNL (ColormapPtr pColormap);
+
+static Bool
+winCreatePrimarySurfaceShadowDDNL (ScreenPtr pScreen);
+
+static Bool
+winReleasePrimarySurfaceShadowDDNL (ScreenPtr pScreen);
+
+
+/*
* Create the primary surface and attach the clipper.
* Used for both the initial surface creation and during
* WM_DISPLAYCHANGE messages.
*/
-Bool
+static Bool
winCreatePrimarySurfaceShadowDDNL (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -120,7 +179,7 @@
* Called from WM_DISPLAYCHANGE.
*/
-Bool
+static Bool
winReleasePrimarySurfaceShadowDDNL (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -505,7 +564,7 @@
* Transfer the damaged regions of the shadow framebuffer to the display.
*/
-void
+static void
winShadowUpdateDDNL (ScreenPtr pScreen,
shadowBufPtr pBuf)
{
@@ -648,7 +707,7 @@
* Free our resources and private structures.
*/
-Bool
+static Bool
winCloseScreenShadowDDNL (int nIndex, ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -760,7 +819,7 @@
* to verify that last sentence.
*/
-Bool
+static Bool
winInitVisualsShadowDDNL (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -913,7 +972,7 @@
* Adjust the user proposed video mode
*/
-Bool
+static Bool
winAdjustVideoModeShadowDDNL (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -983,7 +1042,7 @@
* Blt exposed regions to the screen
*/
-Bool
+static Bool
winBltExposedRegionsShadowDDNL (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -1088,10 +1147,10 @@
/*
- * Do any engine-specific appliation-activation processing
+ * Do any engine-specific application-activation processing
*/
-Bool
+static Bool
winActivateAppShadowDDNL (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -1117,7 +1176,7 @@
* Reblit the shadow framebuffer to the screen.
*/
-Bool
+static Bool
winRedrawScreenShadowDDNL (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -1165,7 +1224,7 @@
* Realize the currently installed colormap
*/
-Bool
+static Bool
winRealizeInstalledPaletteShadowDDNL (ScreenPtr pScreen)
{
return TRUE;
@@ -1176,7 +1235,7 @@
* Install the specified colormap
*/
-Bool
+static Bool
winInstallColormapShadowDDNL (ColormapPtr pColormap)
{
ScreenPtr pScreen = pColormap->pScreen;
@@ -1205,7 +1264,7 @@
* Store the specified colors in the specified colormap
*/
-Bool
+static Bool
winStoreColorsShadowDDNL (ColormapPtr pColormap,
int ndef,
xColorItem *pdefs)
@@ -1249,7 +1308,7 @@
* Colormap initialization procedure
*/
-Bool
+static Bool
winCreateColormapShadowDDNL (ColormapPtr pColormap)
{
HRESULT ddrval = DD_OK;
@@ -1277,7 +1336,7 @@
* Colormap destruction procedure
*/
-Bool
+static Bool
winDestroyColormapShadowDDNL (ColormapPtr pColormap)
{
winScreenPriv(pColormap->pScreen);
Index: winshadgdi.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winshadgdi.c,v
retrieving revision 1.1.4.1.2.12
retrieving revision 1.1.4.1.2.13
diff -u -d -r1.1.4.1.2.12 -r1.1.4.1.2.13
--- a/winshadgdi.c 26 Mar 2004 20:07:03 -0000 1.1.4.1.2.12
+++ b/winshadgdi.c 10 Apr 2004 06:18:29 -0000 1.1.4.1.2.13
@@ -32,8 +32,9 @@
/*
- * External global variables
+ * External symbols
*/
+
#ifdef XWIN_MULTIWINDOW
extern DWORD g_dwCurrentThreadID;
#endif
@@ -45,16 +46,55 @@
*/
#ifdef XWIN_MULTIWINDOW
-BOOL CALLBACK
+static BOOL CALLBACK
winRedrawAllProcShadowGDI (HWND hwnd, LPARAM lParam);
static BOOL CALLBACK
winRedrawDamagedWindowShadowGDI (HWND hwnd, LPARAM lParam);
#endif
-Bool
+static Bool
+winAllocateFBShadowGDI (ScreenPtr pScreen);
+
+static void
+winShadowUpdateGDI (ScreenPtr pScreen,
+ shadowBufPtr pBuf);
+
+static Bool
+winCloseScreenShadowGDI (int nIndex, ScreenPtr pScreen);
+
+static Bool
+winInitVisualsShadowGDI (ScreenPtr pScreen);
+
+static Bool
+winAdjustVideoModeShadowGDI (ScreenPtr pScreen);
+
+static Bool
winBltExposedRegionsShadowGDI (ScreenPtr pScreen);
+static Bool
+winActivateAppShadowGDI (ScreenPtr pScreen);
+
+static Bool
+winRedrawScreenShadowGDI (ScreenPtr pScreen);
+
+static Bool
+winRealizeInstalledPaletteShadowGDI (ScreenPtr pScreen);
+
+static Bool
+winInstallColormapShadowGDI (ColormapPtr pColormap);
+
+static Bool
+winStoreColorsShadowGDI (ColormapPtr pmap,
+ int ndef,
+ xColorItem *pdefs);
+
+static Bool
+winCreateColormapShadowGDI (ColormapPtr pColormap);
+
+static Bool
+winDestroyColormapShadowGDI (ColormapPtr pColormap);
+
/*
* Internal function to get the DIB format that is compatible with the screen
@@ -227,7 +267,7 @@
* Redraw all ---?
*/
-BOOL CALLBACK
+static BOOL CALLBACK
winRedrawAllProcShadowGDI (HWND hwnd, LPARAM lParam)
{
if (hwnd == (HWND)lParam)
@@ -274,7 +314,7 @@
* Allocate a DIB for the shadow framebuffer GDI server
*/
-Bool
+static Bool
winAllocateFBShadowGDI (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -421,7 +461,7 @@
* Blit the damaged regions of the shadow fb to the screen
*/
-void
+static void
winShadowUpdateGDI (ScreenPtr pScreen,
shadowBufPtr pBuf)
{
@@ -546,7 +586,7 @@
* a pointer to said procedure is stored in our privates.
*/
-Bool
+static Bool
winCloseScreenShadowGDI (int nIndex, ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -621,7 +661,7 @@
* to verify that last sentence.
*/
-Bool
+static Bool
winInitVisualsShadowGDI (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -756,7 +796,7 @@
* Adjust the proposed video mode
*/
-Bool
+static Bool
winAdjustVideoModeShadowGDI (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -808,7 +848,7 @@
* Blt exposed regions to the screen
*/
-Bool
+static Bool
winBltExposedRegionsShadowGDI (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -855,16 +895,19 @@
* Do any engine-specific appliation-activation processing
*/
-Bool
+static Bool
winActivateAppShadowGDI (ScreenPtr pScreen)
{
+ /*
+ * 2004/04/10 - Harold - We don't seem to ned to do anything here
+ * since our window should be z-ordered correctly in fullscreen mode.
+ */
+ return TRUE;
+
+#if 0
winScreenPriv(pScreen);
winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-#if CYGDEBUG
- ErrorF ("winActivateAppShadowGDI\n");
-#endif
-
/*
* Are we active?
* Are we fullscreen?
@@ -887,9 +930,6 @@
*/
ShowWindow (pScreenPriv->hwndScreen, SW_MINIMIZE);
}
-
-#if CYGDEBUG
- ErrorF ("winActivateAppShadowGDI - Returning\n");
#endif
return TRUE;
@@ -900,7 +940,7 @@
* Reblit the shadow framebuffer to the screen.
*/
-Bool
+static Bool
winRedrawScreenShadowGDI (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -929,7 +969,7 @@
* Realize the currently installed colormap
*/
-Bool
+static Bool
winRealizeInstalledPaletteShadowGDI (ScreenPtr pScreen)
{
winScreenPriv(pScreen);
@@ -978,7 +1018,7 @@
* Install the specified colormap
*/
-Bool
+static Bool
winInstallColormapShadowGDI (ColormapPtr pColormap)
{
ScreenPtr pScreen = pColormap->pScreen;
@@ -1039,7 +1079,7 @@
* Store the specified colors in the specified colormap
*/
-Bool
+static Bool
winStoreColorsShadowGDI (ColormapPtr pColormap,
int ndef,
xColorItem *pdefs)
@@ -1099,7 +1139,7 @@
* Colormap initialization procedure
*/
-Bool
+static Bool
winCreateColormapShadowGDI (ColormapPtr pColormap)
{
LPLOGPALETTE lpPaletteNew = NULL;
@@ -1156,7 +1196,7 @@
* Colormap destruction procedure
*/
-Bool
+static Bool
winDestroyColormapShadowGDI (ColormapPtr pColormap)
{
winScreenPriv(pColormap->pScreen);
Index: winvalargs.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/Attic/winvalargs.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- a/winvalargs.c 3 Mar 2004 02:57:00 -0000 1.1.2.2
+++ b/winvalargs.c 10 Apr 2004 06:18:29 -0000 1.1.2.3
@@ -42,6 +42,14 @@
/*
+ * Prototypes
+ */
+
+Bool
+winValidateArgs (void);
+
+
+/*
* winValidateArgs - Look for invalid argument combinations
*/
More information about the xorg-commit-diffs
mailing list