Changeset 1944 for trunk/src/user32/caret.cpp

Timestamp:

Dec 2, 1999, 5:34:43 PM (26 years ago)

Author:

cbratschi

Message:

Show/HideCaret fix, removed TextOut workaround

File:

• trunk/src/user32/caret.cpp (modified) (8 diffs)

trunk/src/user32/caret.cpp

@@ -1 @@
-/* $Id: caret.cpp,v 1.7 1999-10-25 20:17:16 sandervl Exp $ */
+/* $Id: caret.cpp,v 1.8 1999-12-02 16:34:43 cbratschi Exp $ */
 
 /*
@@ -37 +37 @@
 static int CaretWidth, CaretHeight;
 static int CaretPosX, CaretPosY;
-static BOOL CaretIsVisible;
+static INT CaretIsVisible; //visible if > 0
 
 #pragma data_seg()
@@ -62 +62 @@
        if (rc)
        {
-           hwndCaret   = hwnd;
-           hbmCaret    = hBmp;
-           CaretWidth  = width;
-           CaretHeight = height;
+           hwndCaret      = hwnd;
+           hbmCaret       = hBmp;
+           CaretWidth     = width;
+           CaretHeight    = height;
+           CaretIsVisible = 0;
        }
 
@@ -83 +84 @@
    CaretWidth     = 0;
    CaretHeight    = 0;
-   CaretIsVisible = FALSE;
+   CaretIsVisible = 0;
 
    rc = _DestroyCaret();
@@ -218 +219 @@
    dprintf(("USER32:  ShowCaret %x", hwnd));
 
-   CaretIsVisible = TRUE;
-   rc = _ShowCaret (Win32BaseWindow::Win32ToOS2Handle (hwnd));
+   CaretIsVisible++;
+   if (CaretIsVisible == 1)
+     rc = _ShowCaret (Win32BaseWindow::Win32ToOS2Handle (hwnd));
+   else
+     rc = TRUE;
 
    return (rc);
@@ -230 +234 @@
    dprintf(("USER32:  HideCaret"));
 
-   CaretIsVisible = FALSE;
-   rc = _HideCaret (Win32BaseWindow::Win32ToOS2Handle (hwnd));
+   CaretIsVisible--;
+   if (CaretIsVisible == 0)
+     rc = _HideCaret (Win32BaseWindow::Win32ToOS2Handle (hwnd));
+   else
+     rc = TRUE;
 
    return (rc);
@@ -239 +246 @@
 {
    CURSORINFO cursorInfo;
+   INT x;
 
    if ((hwndFocus != 0) && (hwndCaret == hwndFocus) &&
@@ -247 +255 @@
       CreateCaret (hwndCaret, hbmCaret, CaretWidth, CaretHeight);
       SetCaretPos (CaretPosX, CaretPosY);
-      if (CaretIsVisible)
-         ShowCaret (hwndCaret);
-   }
-}
+      if (CaretIsVisible > 0)
+        _ShowCaret(Win32BaseWindow::Win32ToOS2Handle(hwndCaret));
+   }
+}