mirror of
https://gitlab.freedesktop.org/xorg/xserver.git
synced 2025-12-31 18:20:08 +01:00
converting X11 cursors to Win32 works (copied from
hw/winwin32rootlesscursor.c) initialization corrected. Cursor is now
actually shown.
This commit is contained in:
parent
1af1c3c716
commit
4051be4eb1
2 changed files with 10 additions and 7 deletions
|
|
@ -35,9 +35,12 @@ typedef struct {
|
|||
extern glWinDebugSettingsRec glWinDebugSettings;
|
||||
|
||||
typedef struct {
|
||||
/* from GetSystemMetrics */
|
||||
int sm_cx;
|
||||
int sm_cy;
|
||||
|
||||
BOOL visible;
|
||||
HCURSOR handle;
|
||||
QueryBestSizeProcPtr QueryBestSize;
|
||||
miPointerSpriteFuncPtr spriteFuncs;
|
||||
} glWinCursorRec;
|
||||
|
|
@ -60,5 +63,11 @@ extern glWinScreenRec glWinScreens[MAXSCREENS];
|
|||
#define glWinGetScreenPriv(pScreen) &glWinScreens[pScreen->myNum]
|
||||
#define glWinScreenPriv(pScreen) glWinScreenRec *pScreenPriv = glWinGetScreenPriv(pScreen);
|
||||
|
||||
#if 1
|
||||
#define GLWIN_DEBUG_MSG if (glWinDebugSettings.enableDebug) ErrorF
|
||||
#else
|
||||
#define GLWIN_DEBUG_MSG(a, ...)
|
||||
#endif
|
||||
|
||||
extern Bool glWinInitCursor (ScreenPtr pScreen);
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
/* ggs: needed to call back to glx with visual configs */
|
||||
extern void GlxSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs, void **configprivs);
|
||||
|
||||
static glWinDebugSettingsRec glWinDebugSettings = { 1, 0, 0, 0};
|
||||
glWinDebugSettingsRec glWinDebugSettings = { 1, 0, 0, 0};
|
||||
|
||||
static void glWinInitDebugSettings(void)
|
||||
{
|
||||
|
|
@ -140,12 +140,6 @@ GLuint __glFloorLog2(GLuint val)
|
|||
return c;
|
||||
}
|
||||
|
||||
#if 1
|
||||
#define GLWIN_DEBUG_MSG if (glWinDebugSettings.enableDebug) ErrorF
|
||||
#else
|
||||
#define GLWIN_DEBUG_MSG(a, ...)
|
||||
#endif
|
||||
|
||||
/* some prototypes */
|
||||
static Bool glWinScreenProbe(int screen);
|
||||
static Bool glWinInitVisuals(VisualPtr *visualp, DepthPtr *depthp,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue