fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-01-29 15:50:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add commandline option to enable software cursor use winDebug and

Browse source 
winErrorFVerb instead of ErrorF to set explicit loglevels
This commit is contained in:
Alexander Gottwald 2004-04-22 20:16:51 +00:00
parent e6bbc8bcc4
commit 86cb4602fa
3 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hw/xwin/winglobals.c
View file

@ -64,6 +64,7 @@ Bool g_fKeyboardHookLL = FALSE;
HHOOK g_hhookKeyboardLL = NULL;
HWND g_hwndKeyboardFocus = NULL;
Bool g_fNoHelpMessageBox = FALSE;
Bool g_fSoftwareCursor = FALSE;
/*

7
hw/xwin/winprocarg.c
View file

@ -49,6 +49,7 @@ extern Bool g_fXdmcpEnabled;
extern char * g_pszCommandLine;
extern Bool g_fKeyboardHookLL;
extern Bool g_fNoHelpMessageBox;
extern Bool g_fSoftwareCursor;
/*
@ -1147,6 +1148,12 @@ ddxProcessArgument (int argc, char *argv[], int i)
return 1;
}
if (IS_OPTION ("-swcursor"))
{
g_fSoftwareCursor = TRUE;
return 1;
}
return 0;
}

27
hw/xwin/winscrinit.c
View file

@ -34,6 +34,7 @@
/* $XFree86: xc/programs/Xserver/hw/xwin/winscrinit.c,v 1.27 2003/07/29 21:25:18 dawes Exp $ */
#include "win.h"
#include "winmsg.h"
#include "safeAlpha.h"
@ -72,6 +73,7 @@ winMWExtWMProcs = {
extern winScreenInfo g_ScreenInfo[];
extern miPointerScreenFuncRec g_winPointerCursorFuncs;
extern int g_iScreenPrivateIndex;
extern Bool g_fSoftwareCursor;
/*
@ -106,7 +108,7 @@ winScreenInit (int index,
HDC hdc;
#if CYGDEBUG || YES
ErrorF ("winScreenInit - dwWidth: %ld dwHeight: %ld\n",
winErrorFVerb (2, "winScreenInit - dwWidth: %ld dwHeight: %ld\n",
pScreenInfo->dwWidth, pScreenInfo->dwHeight);
#endif
@ -231,8 +233,13 @@ winScreenInit (int index,
return FALSE;
}
if (!g_fSoftwareCursor)
winInitCursor(pScreen);
else
winErrorFVerb(2, "winScreenInit - Using software cursor\n");
#if CYGDEBUG || YES
ErrorF ("winScreenInit - returning\n");
winDebug ("winScreenInit - returning\n");
#endif
return TRUE;
@ -268,7 +275,7 @@ winFinishScreenInitFB (int index,
+ winCountBits (pScreenPriv->dwGreenMask)
+ winCountBits (pScreenPriv->dwBlueMask);
ErrorF ("winFinishScreenInitFB - Masks: %08x %08x %08x\n",
winErrorFVerb (2, "winFinishScreenInitFB - Masks: %08x %08x %08x\n",
(unsigned int) pScreenPriv->dwRedMask,
(unsigned int) pScreenPriv->dwGreenMask,
(unsigned int) pScreenPriv->dwBlueMask);
@ -385,14 +392,14 @@ winFinishScreenInitFB (int index,
/* KDrive does miDCInitialize right after miInitializeBackingStore */
/* Setup the cursor routines */
#if CYGDEBUG
ErrorF ("winFinishScreenInitFB - Calling miDCInitialize ()\n");
winDebug ("winFinishScreenInitFB - Calling miDCInitialize ()\n");
#endif
miDCInitialize (pScreen, &g_winPointerCursorFuncs);
/* KDrive does winCreateDefColormap right after miDCInitialize */
/* Create a default colormap */
#if CYGDEBUG
ErrorF ("winFinishScreenInitFB - Calling winCreateDefColormap ()\n");
winDebug ("winFinishScreenInitFB - Calling winCreateDefColormap ()\n");
#endif
if (!winCreateDefColormap (pScreen))
{
@ -410,7 +417,7 @@ winFinishScreenInitFB (int index,
)
{
#if CYGDEBUG
ErrorF ("winFinishScreenInitFB - Calling shadowInit ()\n");
winDebug ("winFinishScreenInitFB - Calling shadowInit ()\n");
#endif
if (!shadowInit (pScreen,
pScreenPriv->pwinShadowUpdate,
@ -425,11 +432,11 @@ winFinishScreenInitFB (int index,
/* Handle multi-window external window manager mode */
if (pScreenInfo->fMWExtWM)
{
ErrorF ("winScreenInit - MultiWindowExtWM - Calling RootlessInit\n");
winDebug ("winScreenInit - MultiWindowExtWM - Calling RootlessInit\n");
RootlessInit(pScreen, &winMWExtWMProcs);
ErrorF ("winScreenInit - MultiWindowExtWM - RootlessInit returned\n");
winDebug ("winScreenInit - MultiWindowExtWM - RootlessInit returned\n");
rootless_CopyBytes_threshold = 0;
rootless_FillBytes_threshold = 0;
@ -571,7 +578,7 @@ winFinishScreenInitFB (int index,
#ifdef XWIN_MULTIWINDOW
#if CYGDEBUG || YES
if (pScreenInfo->fMultiWindow)
ErrorF ("winFinishScreenInitFB - Calling winInitWM.\n");
winDebug ("winFinishScreenInitFB - Calling winInitWM.\n");
#endif
/* Initialize multi window mode */
@ -594,7 +601,7 @@ winFinishScreenInitFB (int index,
pScreenPriv->fBadDepth = FALSE;
#if CYGDEBUG || YES
ErrorF ("winFinishScreenInitFB - returning\n");
winDebug ("winFinishScreenInitFB - returning\n");
#endif
return TRUE;