andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xnest: fix up sprite funcs to stop compiler warnings.

Browse Source
This commit is contained in:
Peter Hutterer 2008-06-08 23:20:11 +09:30
parent c68ca0c7b2
commit 2854abd39d
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xnest/Cursor.c
View File

@ -36,7 +36,7 @@ is" without express or implied warranty.
#include "Args.h" #include "Args.h"
Bool Bool
xnestRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) xnestRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
{ {
XImage *ximage; XImage *ximage;
Pixmap source, mask; Pixmap source, mask;
@ -116,7 +116,7 @@ xnestRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
} }
Bool Bool
xnestUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) xnestUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
{ {
XFreeCursor(xnestDisplay, xnestCursor(pCursor, pScreen)); XFreeCursor(xnestDisplay, xnestCursor(pCursor, pScreen));
xfree(xnestGetCursorPriv(pCursor, pScreen)); xfree(xnestGetCursorPriv(pCursor, pScreen));
@ -141,7 +141,7 @@ xnestRecolorCursor(ScreenPtr pScreen, CursorPtr pCursor, Bool displayed)
&fg_color, &bg_color); &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) if (pCursor)
{ {
@ -152,6 +152,6 @@ void xnestSetCursor (ScreenPtr pScreen, CursorPtr pCursor, int x, int y)
} }
void void
xnestMoveCursor (ScreenPtr pScreen, int x, int y) xnestMoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
{ {
} }

2
hw/xnest/Screen.c
View File

@ -124,6 +124,8 @@ static miPointerSpriteFuncRec xnestPointerSpriteFuncs =
xnestUnrealizeCursor, xnestUnrealizeCursor,
xnestSetCursor, xnestSetCursor,
xnestMoveCursor, xnestMoveCursor,
NULL,
NULL
}; };
Bool Bool

21
hw/xnest/XNCursor.h
View File

@ -28,10 +28,21 @@ typedef struct {
#define xnestCursor(pCursor, pScreen) \ #define xnestCursor(pCursor, pScreen) \
(xnestGetCursorPriv(pCursor, pScreen)->cursor) (xnestGetCursorPriv(pCursor, pScreen)->cursor)
Bool xnestRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor); Bool xnestRealizeCursor(DeviceIntPtr pDev,
Bool xnestUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor); ScreenPtr pScreen,
void xnestRecolorCursor(ScreenPtr pScreen, CursorPtr pCursor, Bool displayed); CursorPtr pCursor);
void xnestSetCursor (ScreenPtr pScreen, CursorPtr pCursor, int x, int y); Bool xnestUnrealizeCursor(DeviceIntPtr pDev,
void xnestMoveCursor (ScreenPtr pScreen, int x, int y); 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 */ #endif /* XNESTCURSOR_H */