Changeset 5482

Timestamp:

Apr 5, 2001, 11:31:28 AM (24 years ago)

Author:

sandervl

Message:

rewrote ShowCursor

Location:

trunk/src/user32

Files:

• USER32.DEF (modified) (2 diffs)
• initterm.cpp (modified) (1 diff)
• initterm.h (modified) (2 diffs)
• oslibwin.cpp (modified) (2 diffs)
• oslibwin.h (modified) (2 diffs)
• winicon.cpp (modified) (3 diffs)

trunk/src/user32/USER32.DEF ¶

@@ -1 @@
-; $Id: USER32.DEF,v 1.50 2001-02-21 21:30:43 sandervl Exp $
+; $Id: USER32.DEF,v 1.51 2001-04-05 09:31:27 sandervl Exp $
 
 LIBRARY USER32 INITINSTANCE TERMINSTANCE
@@ -16 +16 @@
     __SetCaretBlinkTime         = PMMERGE.10005
     __ShowCaret                 = PMMERGE.10007
+    __ShowCursor                = PMMERGE.10018
     WinReplyMsg                 = PMMERGE.5325
     _GpiEnableYInversion        = PMGPI.723

trunk/src/user32/initterm.cpp ¶

@@ -139 +139 @@
 {
    dprintf(("user32 exit\n"));
-   ShowCursor(TRUE);
+   RestoreCursor();
    DestroyDesktopWindow();
    Win32BaseWindow::DestroyAll();

trunk/src/user32/initterm.h ¶

@@ -1 @@
-/* $Id: initterm.h,v 1.3 2000-01-18 20:08:10 sandervl Exp $ */
+/* $Id: initterm.h,v 1.4 2001-04-05 09:31:27 sandervl Exp $ */
 
 /*
@@ -15 +15 @@
 extern DWORD hInstanceUser32;
 
+//winicon.cpp
+void RestoreCursor();
+
 #endif //__INITTERM_H__

trunk/src/user32/oslibwin.cpp ¶

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.89 2001-03-27 16:17:52 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.90 2001-04-05 09:31:27 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -846 +846 @@
 //******************************************************************************
 //******************************************************************************
+BOOL OSLibWinShowPointer(BOOL fShow)
+{
+  return WinShowPointer(HWND_DESKTOP, fShow);
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/oslibwin.h ¶

@@ -1 @@
-/* $Id: oslibwin.h,v 1.51 2001-03-27 16:17:52 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.52 2001-04-05 09:31:27 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -309 +309 @@
 BOOL   OSLibWinGetMaxPosition(HWND hwndOS2, RECT *rect);
 
+BOOL   OSLibWinShowPointer(BOOL fShow);
+
 #endif //__OSLIBWIN_H__

trunk/src/user32/winicon.cpp ¶

@@ -1 @@
-/* $Id: winicon.cpp,v 1.20 2001-03-27 16:17:52 sandervl Exp $ */
+/* $Id: winicon.cpp,v 1.21 2001-04-05 09:31:28 sandervl Exp $ */
 /*
  * Win32 Icon Code for OS/2
@@ -54 +54 @@
 #include "oslibres.h"
 #include "oslibwin.h"
+#include "dc.h"
 
 #define DBG_LOCALLOG    DBG_winicon
@@ -410 +411 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API ShowCursor( BOOL bShow)
+INT OPEN32API __ShowCursor(BOOL bShow);
+
+inline INT _ShowCursor (BOOL bShow)
+{
+ INT yyrc;
+ USHORT sel = RestoreOS2FS();
+
+    yyrc = __ShowCursor(bShow);
+    SetFS(sel);
+
+    return yyrc;
+}
+//******************************************************************************
+static int cursorshowcnt = 0;
+//******************************************************************************
+void RestoreCursor()
+{
+    dprintf2(("USER32: RestoreCursor %d", cursorshowcnt));
+    while(cursorshowcnt != 0)
+    {
+        if(cursorshowcnt > 0 )
+        {
+            ShowCursor(FALSE);
+        }
+        else
+        {
+            ShowCursor(TRUE);
+        }
+    }
+}
+//******************************************************************************
+//******************************************************************************
+int WIN32API ShowCursor(BOOL bShow)
 {
     dprintf2(("USER32: ShowCursor %d", bShow));
-    return O32_ShowCursor(bShow);
-}
-//******************************************************************************
-//******************************************************************************
+    cursorshowcnt = cursorshowcnt + ((bShow) ? 1 : -1);
+    return _ShowCursor(bShow);
+}
 /***********************************************************************
  *           CreateCursorIconIndirect