Changeset 9156

Timestamp:

Aug 28, 2002, 10:21:48 AM (23 years ago)

Author:

sandervl

Message:

PF: Added custom function to hide mouse cursor when the primary surface (screen) is locked by the app to prevent display corruption with color/animated mouse pointers

Location:

trunk

Files:

• include/custombuild.h (modified) (1 diff)
• src/ddraw/OS2DDRAW.CPP (modified) (3 diffs)
• src/ddraw/OS2DDRAW.H (modified) (2 diffs)
• src/ddraw/OS2SURFACE.CPP (modified) (4 diffs)

trunk/include/custombuild.h

@@ -123 +123 @@
 void WIN32API SetCustomFullScreenMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP);
 
+//Force DirectSurface Lock & Unlock methods to hide & show the mouse cursor
+BOOL WIN32API SetCustomHideCursorOnLock(BOOL state);
+
 #endif  /*__CUSTOMBUILD_H__*/
 

trunk/src/ddraw/OS2DDRAW.CPP

@@ -1 @@
-/* $Id: OS2DDRAW.CPP,v 1.36 2002-08-12 15:06:21 sandervl Exp $ */
+/* $Id: OS2DDRAW.CPP,v 1.37 2002-08-28 08:20:04 sandervl Exp $ */
 
 /*
@@ -46 +46 @@
 
 
-BOOL bUseFSDD = FALSE;
-BOOL fNoFSDD = FALSE;
+BOOL bUseFSDD          = FALSE;
+BOOL fNoFSDD           = FALSE;
+BOOL fHideCursorOnLock = FALSE;
 
 FOURCC SupportedFourCCs[]   = {FOURCC_SCRN,FOURCC_LUT8,FOURCC_R565,FOURCC_RGB3,FOURCC_RGB4};
@@ -68 +69 @@
     ModesDive[0].iRatio = 0;
     fNoFSDD = TRUE;
+}
+//******************************************************************************
+//Force DirectSurface Lock & Unlock methods to hide & show the mouse cursor
+//******************************************************************************
+BOOL WIN32API SetCustomHideCursorOnLock(BOOL state)
+{
+    BOOL preState = fHideCursorOnLock;
+    fHideCursorOnLock = state;
+    return preState;
 }
 //******************************************************************************

trunk/src/ddraw/OS2DDRAW.H

@@ -1 @@
-/* $Id: OS2DDRAW.H,v 1.16 2002-06-08 13:12:33 sandervl Exp $ */
+/* $Id: OS2DDRAW.H,v 1.17 2002-08-28 08:20:05 sandervl Exp $ */
 
 /*
@@ -219 +219 @@
 #define FOURCC_UYVY  mmioFOURCC( 'U', 'Y', 'V', 'Y' )
 
+extern BOOL fHideCursorOnLock;
+
 #endif

trunk/src/ddraw/OS2SURFACE.CPP

@@ -1 @@
-/* $Id: OS2SURFACE.CPP,v 1.46 2002-07-03 15:44:37 sandervl Exp $ */
+/* $Id: OS2SURFACE.CPP,v 1.47 2002-08-28 08:20:05 sandervl Exp $ */
 
 /*
@@ -4890 +4890 @@
 #endif
     me->fLocked = TRUE;
+
+    if(me->diveBufNr == DIVE_BUFFER_SCREEN) 
+    {
+        //If fHideCursorOnLock is set, then we hide the cursor to prevent
+        //the app from corruption the mouse cursor (color/animated pointers)
+        if(fHideCursorOnLock) ShowCursor(FALSE);
+    }
   }
 
@@ -5334 +5341 @@
 
     rc = DD_OK;
+
+    if(me->diveBufNr == DIVE_BUFFER_SCREEN) 
+    {
+        //If fHideCursorOnLock is set, then we hide the cursor to prevent in SurfLock4
+        //the app from corruption the mouse cursor (color/animated pointers)
+        //We need to show it again here
+        if(fHideCursorOnLock) ShowCursor(TRUE);
+    }
   }
 
@@ -5441 +5456 @@
     dprintf(("DDRAW: Unlock OK\n\n"));
     rc = DD_OK;
-
   }