Attachment 20372 Details for Bug 18569 – Update for MPX cursor API changes

[patch] Update for MPX cursor API changes

0002-Cygwin-update-for-MPX-cursor-API-changes.patch (text/plain), 3.48 KB, created by Jon Turney on 2008-11-17 07:05:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jon Turney

Created: 2008-11-17 07:05:55 UTC

Size: 3.48 KB

patch

obsolete

>From 854d88ffa871ce0606d21015acb39724c1190e38 Mon Sep 17 00:00:00 2001
>Message-Id: <854d88ffa871ce0606d21015acb39724c1190e38.1226931512.git.jon.turney@dronecode.org.uk>
>In-Reply-To: <fb647c7a9f926318288cc9bfdc2e876aa7f457a9.1226931512.git.jon.turney@dronecode.org.uk>
>References: <fb647c7a9f926318288cc9bfdc2e876aa7f457a9.1226931512.git.jon.turney@dronecode.org.uk>
>From: Jon TURNEY <jon.turney@dronecode.org.uk>
>Date: Sun, 2 Nov 2008 18:27:10 +0000
>Subject: [PATCH 02/32] Cygwin: update for MPX cursor API changes
>
>Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
>---
> hw/xwin/wincursor.c |   33 ++++++++++++++++++++++++---------
> 1 files changed, 24 insertions(+), 9 deletions(-)
>
>diff --git a/hw/xwin/wincursor.c b/hw/xwin/wincursor.c
>index 92775e4..fcd156e 100644
>--- a/hw/xwin/wincursor.c
>+++ b/hw/xwin/wincursor.c
>@@ -62,7 +62,7 @@ extern Bool	g_fSoftwareCursor;
>  */
> 
> static void
>-winPointerWarpCursor (ScreenPtr pScreen, int x, int y);
>+winPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y);
> 
> static Bool
> winCursorOffScreen (ScreenPtr *ppScreen, int *x, int *y);
>@@ -79,7 +79,7 @@ miPointerScreenFuncRec g_winPointerCursorFuncs =
> 
> 
> static void
>-winPointerWarpCursor (ScreenPtr pScreen, int x, int y)
>+winPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
> {
>   winScreenPriv(pScreen);
>   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. */
>-  miPointerWarpCursor (pScreen, x, y);
>+  miPointerWarpCursor (pDev, pScreen, x, y);
> }
> 
> static Bool
>@@ -436,7 +436,7 @@ winLoadCursor (ScreenPtr pScreen, CursorPtr pCursor, int screen)
>  *  Convert the X cursor representation to native format if possible.
>  */
> static Bool
>-winRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)
>+winRealizeCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
> {
>   if(pCursor == NULL || pCursor->bits == NULL)
>     return FALSE;
>@@ -452,7 +452,7 @@ winRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)
>  *  Free the storage space associated with a realized cursor.
>  */
> static Bool
>-winUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
>+winUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
> {
>   return TRUE;
> }
>@@ -463,7 +463,7 @@ winUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
>  *  Set the cursor sprite and position.
>  */
> 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;
>   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.
>  */
> 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 = {
>   winRealizeCursor,
>   winUnrealizeCursor,
>   winSetCursor,
>-  winMoveCursor
>+  winMoveCursor,
>+  winDeviceCursorInitialize,
>+  winDeviceCursorCleanup
> };
> 
> 
>-- 
>1.6.0.2
>

Actions: View | Splinter Review

Attachments on bug 18569: 20372 | 20373 | 20374 | 20375

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.