fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-04-27 01:20:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

if CreateIconIndirect creates an icon instead of a cursor, try it again

Browse source 
with icon mask and color bitmap.
This commit is contained in:
Alexander Gottwald 2004-04-27 09:17:22 +00:00
parent abb7579cf9
commit 588b02614d
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
hw/xwin/wincursor.c
View file

@ -47,11 +47,6 @@
#define BRIGHTNESS(x) (x##Red * 0.299 + x##Green * 0.587 + x##Blue * 0.114)
#define RGB_TO_16(x) \
((((x##Blue>>10)&0x1f)<<10) | \
(((x##Red>>10)&0x1f)<<5) | \
(((x##Green>>10)&0x1f)<<0))
#if 1
# define WIN_DEBUG_MSG winDebug
#else
@ -371,6 +366,22 @@ winLoadCursor (ScreenPtr pScreen, CursorPtr pCursor, int screen)
ii.hbmMask = hAnd;
ii.hbmColor = hXor;
hCursor = (HCURSOR) CreateIconIndirect( &ii );
GetIconInfo(hCursor, &ii);
if (ii.fIcon)
{
HCURSOR hCursor2;
WIN_DEBUG_MSG("winLoadCursor: CreateIconIndirect returned no "
"cursor. Trying again.\n");
ii.fIcon = FALSE;
ii.xHotspot = pCursor->bits->xhot;
ii.yHotspot = pCursor->bits->yhot;
hCursor2 = (HCURSOR) CreateIconIndirect( &ii );
DestroyIcon(hCursor);
hCursor = hCursor2;
}
}
if (hAnd)