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

Fix software cursor

Browse source
This commit is contained in:
David Reveman 2006-04-04 10:59:04 +00:00
parent 9aa84fdd1e
commit 07695a0320
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2006-04-04 David Reveman <davidr@novell.com>
* hw/xgl/glx/xglx.c (xglxScreenInit): Re-install colormap
after initializing software cursor (#6489). (Tiago Vignatti)
2006-04-03 David Reveman <davidr@novell.com>
* hw/xgl/Makefile.am (Xgl_LDADD): Static objects before dynamic

11
hw/xgl/glx/xglx.c
View file

@ -772,6 +772,7 @@ xglxScreenInit (int index,
XColor black, dummy;
Pixmap bitmap;
Cursor cursor;
XID installedCmaps;
if (!XAllocNamedColor (xdisplay, pScreenPriv->colormap,
"black", &black, &dummy))
@ -794,6 +795,16 @@ xglxScreenInit (int index,
XFreeColors (xdisplay, pScreenPriv->colormap, &black.pixel, 1, 0);
miDCInitialize (pScreen, &xglxPointerScreenFuncs);
/* XXX: Assumes only one installed colormap. */
if ((*pScreen->ListInstalledColormaps) (pScreen, &installedCmaps))
{
ColormapPtr installedCmap;
installedCmap = LookupIDByType (installedCmaps, RT_COLORMAP);
if (installedCmap)
(*pScreen->InstallColormap) (installedCmap);
}
}
else
{