diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-06-08 23:20:11 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-06-08 23:28:28 +0930 |
| commit | 2854abd39d4deb79c9ee9bcc931fad969392cfc5 (patch) | |
| tree | fe757a7e7cd81d2af0a76fd2c532eaeec73b13c5 | |
| parent | c68ca0c7b2c72df0501d26bf7f640029ff2d9568 (diff) | |
xnest: fix up sprite funcs to stop compiler warnings.
| -rw-r--r-- | hw/xnest/Cursor.c | 8 | ||||
| -rw-r--r-- | hw/xnest/Screen.c | 2 | ||||
| -rw-r--r-- | hw/xnest/XNCursor.h | 21 |
3 files changed, 22 insertions, 9 deletions
diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c index 138698068..3e676d11b 100644 --- a/hw/xnest/Cursor.c +++ b/hw/xnest/Cursor.c @@ -36,7 +36,7 @@ is" without express or implied warranty. #include "Args.h" Bool -xnestRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) +xnestRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor) { XImage *ximage; Pixmap source, mask; @@ -116,7 +116,7 @@ xnestRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) } Bool -xnestUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) +xnestUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor) { XFreeCursor(xnestDisplay, xnestCursor(pCursor, pScreen)); xfree(xnestGetCursorPriv(pCursor, pScreen)); @@ -141,7 +141,7 @@ xnestRecolorCursor(ScreenPtr pScreen, CursorPtr pCursor, Bool displayed) &fg_color, &bg_color); } -void xnestSetCursor (ScreenPtr pScreen, CursorPtr pCursor, int x, int y) +void xnestSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x, int y) { if (pCursor) { @@ -152,6 +152,6 @@ void xnestSetCursor (ScreenPtr pScreen, CursorPtr pCursor, int x, int y) } void -xnestMoveCursor (ScreenPtr pScreen, int x, int y) +xnestMoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) { } diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c index 11c180bbb..9d157a3c6 100644 --- a/hw/xnest/Screen.c +++ b/hw/xnest/Screen.c @@ -124,6 +124,8 @@ static miPointerSpriteFuncRec xnestPointerSpriteFuncs = xnestUnrealizeCursor, xnestSetCursor, xnestMoveCursor, + NULL, + NULL }; Bool diff --git a/hw/xnest/XNCursor.h b/hw/xnest/XNCursor.h index 9705f6bea..627be03fd 100644 --- a/hw/xnest/XNCursor.h +++ b/hw/xnest/XNCursor.h @@ -28,10 +28,21 @@ typedef struct { #define xnestCursor(pCursor, pScreen) \ (xnestGetCursorPriv(pCursor, pScreen)->cursor) -Bool xnestRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor); -Bool xnestUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor); -void xnestRecolorCursor(ScreenPtr pScreen, CursorPtr pCursor, Bool displayed); -void xnestSetCursor (ScreenPtr pScreen, CursorPtr pCursor, int x, int y); -void xnestMoveCursor (ScreenPtr pScreen, int x, int y); +Bool xnestRealizeCursor(DeviceIntPtr pDev, + ScreenPtr pScreen, + CursorPtr pCursor); +Bool xnestUnrealizeCursor(DeviceIntPtr pDev, + ScreenPtr pScreen, + CursorPtr pCursor); +void xnestRecolorCursor(ScreenPtr pScreen, + CursorPtr pCursor, + Bool displayed); +void xnestSetCursor (DeviceIntPtr pDev, + ScreenPtr pScreen, + CursorPtr pCursor, + int x, int y); +void xnestMoveCursor (DeviceIntPtr pDev, + ScreenPtr pScreen, + int x, int y); #endif /* XNESTCURSOR_H */ |