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

Cygwin/X: update for MPX cursor API changes

Browse Source 
Bring Cygwin/X up to date with cursor API changes

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
This commit is contained in:
Jon TURNEY 2008-11-02 18:27:10 +00:00
parent d61e902aab
commit 829a8a970d
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hw/xwin/wincursor.c
View File

@ -62,7 +62,7 @@ extern Bool g_fSoftwareCursor;
*/ */
static void static void
winPointerWarpCursor (ScreenPtr pScreen, int x, int y); winPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y);
static Bool static Bool
winCursorOffScreen (ScreenPtr *ppScreen, int *x, int *y); winCursorOffScreen (ScreenPtr *ppScreen, int *x, int *y);
@ -79,7 +79,7 @@ miPointerScreenFuncRec g_winPointerCursorFuncs =
static void static void
winPointerWarpCursor (ScreenPtr pScreen, int x, int y) winPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
{ {
winScreenPriv(pScreen); winScreenPriv(pScreen);
RECT rcClient; RECT rcClient;
@ -119,7 +119,7 @@ winPointerWarpCursor (ScreenPtr pScreen, int x, int y)
} }
/* Call the mi warp procedure to do the actual warping in X. */ /* Call the mi warp procedure to do the actual warping in X. */
miPointerWarpCursor (pScreen, x, y); miPointerWarpCursor (pDev, pScreen, x, y);
} }
static Bool static Bool
@ -436,7 +436,7 @@ winLoadCursor (ScreenPtr pScreen, CursorPtr pCursor, int screen)
* Convert the X cursor representation to native format if possible. * Convert the X cursor representation to native format if possible.
*/ */
static Bool static Bool
winRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor) winRealizeCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
{ {
if(pCursor == NULL || pCursor->bits == NULL) if(pCursor == NULL || pCursor->bits == NULL)
return FALSE; return FALSE;
@ -452,7 +452,7 @@ winRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)
* Free the storage space associated with a realized cursor. * Free the storage space associated with a realized cursor.
*/ */
static Bool static Bool
winUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) winUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
{ {
return TRUE; return TRUE;
} }
@ -463,7 +463,7 @@ winUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
* Set the cursor sprite and position. * Set the cursor sprite and position.
*/ */
static void static void
winSetCursor (ScreenPtr pScreen, CursorPtr pCursor, int x, int y) winSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x, int y)
{ {
POINT ptCurPos, ptTemp; POINT ptCurPos, ptTemp;
HWND hwnd; HWND hwnd;
@ -537,20 +537,35 @@ winSetCursor (ScreenPtr pScreen, CursorPtr pCursor, int x, int y)
/* /*
* QuartzMoveCursor * winMoveCursor
* Move the cursor. This is a noop for us. * Move the cursor. This is a noop for us.
*/ */
static void static void
winMoveCursor (ScreenPtr pScreen, int x, int y) winMoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
{ {
} }
static Bool
winDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScr)
{
winScreenPriv(pScr);
return pScreenPriv->cursor.spriteFuncs->DeviceCursorInitialize(pDev, pScr);
}
static void
winDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScr)
{
winScreenPriv(pScr);
return pScreenPriv->cursor.spriteFuncs->DeviceCursorCleanup(pDev, pScr);
}
static miPointerSpriteFuncRec winSpriteFuncsRec = { static miPointerSpriteFuncRec winSpriteFuncsRec = {
winRealizeCursor, winRealizeCursor,
winUnrealizeCursor, winUnrealizeCursor,
winSetCursor, winSetCursor,
winMoveCursor winMoveCursor,
winDeviceCursorInitialize,
winDeviceCursorCleanup
}; };