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

XQuartz: More 1.6 server API updates

This commit is contained in:
Jeremy Huddleston 2008-11-22 14:23:23 -08:00
parent ad0f232165
commit 8964b8d0ec
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hw/xquartz/xpr/xprCursor.c
View File

@ -185,7 +185,7 @@ load_cursor(CursorPtr src, 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
QuartzRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) QuartzRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
{ {
if(pCursor == NULL || pCursor->bits == NULL) if(pCursor == NULL || pCursor->bits == NULL)
return FALSE; return FALSE;
@ -201,7 +201,7 @@ QuartzRealizeCursor(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
QuartzUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) QuartzUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
{ {
return TRUE; return TRUE;
} }
@ -212,7 +212,7 @@ QuartzUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
* Set the cursor sprite and position. * Set the cursor sprite and position.
*/ */
static void static void
QuartzSetCursor(ScreenPtr pScreen, CursorPtr pCursor, int x, int y) QuartzSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x, int y)
{ {
QuartzCursorScreenPtr ScreenPriv = CURSOR_PRIV(pScreen); QuartzCursorScreenPtr ScreenPriv = CURSOR_PRIV(pScreen);
@ -245,16 +245,26 @@ QuartzSetCursor(ScreenPtr pScreen, CursorPtr pCursor, int x, int y)
* Move the cursor. This is a noop for us. * Move the cursor. This is a noop for us.
*/ */
static void static void
QuartzMoveCursor(ScreenPtr pScreen, int x, int y) QuartzMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
{ {
} }
/* TODO: New for 1.6 ... probably noop */
static Bool QuartzDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen) {
return TRUE;
}
/* TODO: New for 1.6 ... probably noop */
static void QuartzDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen) {
}
static miPointerSpriteFuncRec quartzSpriteFuncsRec = { static miPointerSpriteFuncRec quartzSpriteFuncsRec = {
QuartzRealizeCursor, QuartzRealizeCursor,
QuartzUnrealizeCursor, QuartzUnrealizeCursor,
QuartzSetCursor, QuartzSetCursor,
QuartzMoveCursor QuartzMoveCursor,
QuartzDeviceCursorInitialize,
QuartzDeviceCursorCleanup
}; };
@ -293,7 +303,7 @@ QuartzCrossScreen(ScreenPtr pScreen, Bool entering)
* *
*/ */
static void static void
QuartzWarpCursor(ScreenPtr pScreen, int x, int y) QuartzWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
{ {
if (quartzServerVisible) if (quartzServerVisible)
{ {
@ -305,8 +315,8 @@ QuartzWarpCursor(ScreenPtr pScreen, int x, int y)
CGWarpMouseCursorPosition(CGPointMake(sx + x, sy + y)); CGWarpMouseCursorPosition(CGPointMake(sx + x, sy + y));
} }
miPointerWarpCursor(pScreen, x, y); miPointerWarpCursor(pDev, pScreen, x, y);
miPointerUpdate(); miPointerUpdateSprite(pDev);
} }
@ -404,13 +414,15 @@ QuartzResumeXCursor(ScreenPtr pScreen, int x, int y)
WindowPtr pWin; WindowPtr pWin;
CursorPtr pCursor; CursorPtr pCursor;
pWin = GetSpriteWindow(); /* TODO: Tablet? */
pWin = GetSpriteWindow(darwinPointer);
if (pWin->drawable.pScreen != pScreen) if (pWin->drawable.pScreen != pScreen)
return; return;
pCursor = GetSpriteCursor(); pCursor = GetSpriteCursor(darwinPointer);
if (pCursor == NULL) if (pCursor == NULL)
return; return;
QuartzSetCursor(pScreen, pCursor, x, y); QuartzSetCursor(darwinPointer, pScreen, pCursor, x, y);
} }