hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-25 01:49:58 +00:00
Code Issues Projects Releases Wiki Activity

devPrivates rework: convert CursorRec and CursorBits over to new interface.

Browse source
This commit is contained in:
Eamon Walsh 2007-08-30 11:40:39 -04:00 • committed by Eamon Walsh
commit 47ab4d648b
14 changed files with 75 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hw/xnest/Cursor.c
View file

@ -104,8 +104,8 @@ xnestRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
bg_color.green = pCursor->backGreen;
bg_color.blue = pCursor->backBlue;
pCursor->devPriv[pScreen->myNum] = (pointer)xalloc(sizeof(xnestPrivCursor));
xnestCursorPriv(pCursor, pScreen)->cursor =
xnestSetCursorPriv(pCursor, pScreen, xalloc(sizeof(xnestPrivCursor)));
xnestCursor(pCursor, pScreen) =
XCreatePixmapCursor(xnestDisplay, source, mask, &fg_color, &bg_color,
pCursor->bits->xhot, pCursor->bits->yhot);
@ -119,7 +119,7 @@ Bool
xnestUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
{
XFreeCursor(xnestDisplay, xnestCursor(pCursor, pScreen));
xfree(xnestCursorPriv(pCursor, pScreen));
xfree(xnestGetCursorPriv(pCursor, pScreen));
return True;
}

9
hw/xnest/XNCursor.h
View file

@ -19,11 +19,14 @@ typedef struct {
Cursor cursor;
} xnestPrivCursor;
#define xnestCursorPriv(pCursor, pScreen) \
((xnestPrivCursor *)((pCursor)->devPriv[pScreen->myNum]))
#define xnestGetCursorPriv(pCursor, pScreen) \
((xnestPrivCursor *)dixLookupPrivate(&(pCursor)->devPrivates, pScreen))
#define xnestSetCursorPriv(pCursor, pScreen, v) \
dixSetPrivate(&(pCursor)->devPrivates, pScreen, v)
#define xnestCursor(pCursor, pScreen) \
(xnestCursorPriv(pCursor, pScreen)->cursor)
(xnestGetCursorPriv(pCursor, pScreen)->cursor)
Bool xnestRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor);
Bool xnestUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor);