frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: Try to get closer to the correct refcnt for cursors. 

This commit introduces a memory leak, as the refcnt never seems to get
        down to 0 and thus cursors will not be freed. Solves the problems with
        GNOME segfaulting every 30 seconds though.
This commit is contained in:
Peter Hutterer 2007-03-29 19:12:32 +09:30
parent 0c607f4b19
commit 20e4314b17
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dix/cursor.c
View File

@ -196,11 +196,10 @@ AllocCursorARGB(unsigned char *psrcbits, unsigned char *pmaskbits, CARD32 *argb,
bits->height = cm->height; bits->height = cm->height;
bits->xhot = cm->xhot; bits->xhot = cm->xhot;
bits->yhot = cm->yhot; bits->yhot = cm->yhot;
bits->refcnt = -1; pCurs->refcnt = 0;
CheckForEmptyMask(bits); CheckForEmptyMask(bits);
pCurs->bits = bits; pCurs->bits = bits;
pCurs->refcnt = 1;
#ifdef XFIXES #ifdef XFIXES
pCurs->serialNumber = ++cursorSerial; pCurs->serialNumber = ++cursorSerial;
pCurs->name = None; pCurs->name = None;
@ -224,6 +223,7 @@ AllocCursorARGB(unsigned char *psrcbits, unsigned char *pmaskbits, CARD32 *argb,
{ {
if (DevHasCursor(pDev)) if (DevHasCursor(pDev))
{ {
pCurs->refcnt++;
if (!( *pscr->RealizeCursor)(pDev, pscr, pCurs)) if (!( *pscr->RealizeCursor)(pDev, pscr, pCurs))
{ {
/* Realize failed for device pDev on screen pscr. /* Realize failed for device pDev on screen pscr.
@ -419,7 +419,7 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
} }
CheckForEmptyMask(bits); CheckForEmptyMask(bits);
pCurs->bits = bits; pCurs->bits = bits;
pCurs->refcnt = 1; pCurs->refcnt = 0;
#ifdef XFIXES #ifdef XFIXES
pCurs->serialNumber = ++cursorSerial; pCurs->serialNumber = ++cursorSerial;
pCurs->name = None; pCurs->name = None;
@ -440,6 +440,7 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
{ {
pscr = screenInfo.screens[nscr]; pscr = screenInfo.screens[nscr];
pCurs->refcnt++;
if (!(*pscr->RealizeCursor)(inputInfo.pointer, pscr, pCurs)) if (!(*pscr->RealizeCursor)(inputInfo.pointer, pscr, pCurs))
{ {
DeviceIntPtr pDevIt = inputInfo.devices; /*dev iterator*/ DeviceIntPtr pDevIt = inputInfo.devices; /*dev iterator*/
@ -470,6 +471,7 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
{ {
if (DevHasCursor(pDev)) if (DevHasCursor(pDev))
{ {
pCurs->refcnt++;
if (!( *pscr->RealizeCursor)(pDev, pscr, pCurs)) if (!( *pscr->RealizeCursor)(pDev, pscr, pCurs))
{ {
/* Realize failed for device pDev on screen pscr. /* Realize failed for device pDev on screen pscr.