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

Timestamp:

Sep 28, 1999, 10:00:58 AM (26 years ago)

Author:

dengert

Message:

Caret functions added

File:

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

trunk/src/user32/caret.cpp

@@ -1 @@
-/* $Id: caret.cpp,v 1.1 1999-09-27 18:20:00 dengert Exp $ */
+/* $Id: caret.cpp,v 1.2 1999-09-28 08:00:56 dengert Exp $ */
 
 /*
@@ -9 +9 @@
 
 #define INCL_WIN
+#define INCL_GPI
 #include <os2.h>
 #include <os2sel.h>
@@ -19 +20 @@
 #include "oslibwin.h"
 #include "dcdata.h"
+#include "dc.h"
+#include "caret.h"
 
 #undef SEVERITY_ERROR
@@ -26 +29 @@
 #define OPEN32API _System
 #endif
+
+#pragma data_seg(_GLOBALDATA)
 
 static HWND hwndCaret;
@@ -33 +38 @@
 static BOOL CaretIsVisible;
 
+#pragma data_seg()
+
+PVOID   APIENTRY  GpiQueryDCData (HPS hps);
+VOID    OPEN32API _O32_SetLastError( DWORD );
+BOOL    OPEN32API _O32_CreateCaret (HWND hwnd, HBITMAP hbm, int width, int height);
+BOOL    APIENTRY  _DestroyCaret (void);
+UINT    APIENTRY  _GetCaretBlinkTime (void);
+BOOL    APIENTRY  _HideCaret (HWND hwnd);
+BOOL    APIENTRY  _SetCaretBlinkTime (UINT mSecs);
+BOOL    APIENTRY  _ShowCaret (HWND hwnd);
+
 BOOL WIN32API CreateCaret (HWND hwnd, HBITMAP hBmp, int width, int height)
 {
+   dprintf(("USER32:  CreateCaret"));
+
    if (hwnd == NULLHANDLE)
    {
@@ -69 +87 @@
    USHORT sel = RestoreOS2FS();
 
+   dprintf(("USER32:  DestroyCaret"));
+
    hwndCaret      = 0;
    hbmCaret       = 0;
@@ -81 +101 @@
 }
 
+BOOL WIN32API SetCaretBlinkTime (UINT mSecs)
+{
+   USHORT sel = RestoreOS2FS();
+   BOOL rc;
+
+   dprintf(("USER32:  SetCaretBlinkTime"));
+
+   rc = _SetCaretBlinkTime (mSecs);
+
+   SetFS(sel);
+   return (rc);
+}
 
 UINT WIN32API GetCaretBlinkTime()
@@ -87 +119 @@
    USHORT sel = RestoreOS2FS();
 
+   dprintf(("USER32:  GetCaretBlinkTime"));
+
    rc = _GetCaretBlinkTime();
 
@@ -93 +127 @@
 }
 
+BOOL WIN32API SetCaretPos (int x, int y)
+{
+   USHORT     sel = RestoreOS2FS();
+   LONG       xNew = 0, yNew = 0;
+   BOOL       result = TRUE;
+   BOOL       rc;
+   CURSORINFO cursorInfo;
+   POINTL     caretPos = { x, y };
+
+   dprintf(("USER32:  SetCaretPos"));
+
+   rc = WinQueryCursorInfo (HWND_DESKTOP, &cursorInfo);
+   if (rc == TRUE)
+   {
+      HWND hwnd = cursorInfo.hwnd;
+      Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromOS2Handle (hwnd);
+      if (wnd)
+      {
+        if (wnd->isOwnDC())
+        {
+           HPS     hps  = wnd->getOwnDC();
+           pDCData pHps = (pDCData)GpiQueryDCData(hps);
+           if (!pHps)
+           {
+              _O32_SetLastError (ERROR_INTERNAL_ERROR);
+              SetFS(sel);
+              return FALSE;
+           }
+           GpiConvert (pHps->hps, CVTC_WORLD, CVTC_DEVICE, 1, &caretPos);
+           xNew = caretPos.x;
+
+           if (isYup (pHps))
+              yNew = caretPos.y;
+           else
+              yNew = caretPos.y - cursorInfo.cy;
+        }
+        else
+        {
+           long height = wnd->getWindowHeight();
+           caretPos.y = height - caretPos.y - 1;
+           xNew = caretPos.x;
+           yNew = caretPos.y - cursorInfo.cy;
+        }
+
+        hwndCaret = wnd->getWindowHandle();
+        CaretPosX = x;
+        CaretPosY = y;
+
+        rc = WinCreateCursor (cursorInfo.hwnd, xNew, yNew, 0, 0, CURSOR_SETPOS, NULL);
+      }
+   }
+   if (rc == FALSE)
+   {
+      _O32_SetLastError (ERROR_INVALID_PARAMETER);
+      result = FALSE;
+   }
+
+   SetFS(sel);
+   return (result);
+}
+
 BOOL WIN32API GetCaretPos (PPOINT pPoint)
 {
    USHORT sel = RestoreOS2FS();
    CURSORINFO cursorInfo;
+
+   dprintf(("USER32:  GetCaretPos"));
 
    if (WinQueryCursorInfo (HWND_DESKTOP, &cursorInfo))
@@ -102 +199 @@
       if (cursorInfo.hwnd != HWND_DESKTOP)
       {
-         HPS hps = NULLHANDLE;
+         HPS hps   = NULLHANDLE;
          HWND hwnd = cursorInfo.hwnd;
          Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromOS2Handle (hwnd);
@@ -115 +212 @@
             cursorInfo.y = caretPos.y;
          } else {
-            caretPos.y += cursorInfo.cy;
-            convertDevicePoint( cursorInfo.hwnd, &caretPos, 1);
-            cursorInfo.y = caretPos.y;
+            long height  = wnd->getWindowHeight();
+            caretPos.y  += cursorInfo.cy;
+            cursorInfo.y = height - caretPos.y - 1;
          }
       }
@@ -133 +230 @@
 }
 
+BOOL WIN32API ShowCaret (HWND hwnd)
+{
+   USHORT sel = RestoreOS2FS();
+   BOOL   rc = FALSE;
+
+   dprintf(("USER32:  ShowCaret"));
+
+   CaretIsVisible = TRUE;
+   rc = _ShowCaret (Win32BaseWindow::Win32ToOS2Handle (hwnd));
+
+   SetFS(sel);
+   return (rc);
+}
+
 BOOL WIN32API HideCaret (HWND hwnd)
 {
    USHORT sel = RestoreOS2FS();
    BOOL rc = FALSE;
-   Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
+
+   dprintf(("USER32:  HideCaret"));
 
    CaretIsVisible = FALSE;
-
-   if (wnd)
-       rc = _HideCaret (wnd->getOS2WindowHandle());
-
-   SetFS(sel);
-   return (rc);
-}
-
-BOOL WIN32API SetCaretBlinkTime (UINT mSecs)
-{
-   USHORT sel = RestoreOS2FS();
-   BOOL rc;
-
-   rc = _SetCaretBlinkTime (mSecs);
-
-   SetFS(sel);
-   return (rc);
-}
-
-BOOL WIN32API SetCaretPos (int x, int y)
-{
-   USHORT     sel = RestoreOS2FS();
-   LONG       xNew = 0, yNew = 0;
-   BOOL       result = TRUE;
-   BOOL       rc;
+   rc = _HideCaret (Win32BaseWindow::Win32ToOS2Handle (hwnd));
+
+   SetFS(sel);
+   return (rc);
+}
+
+void recreateCaret (HWND hwndFocus)
+{
    CURSORINFO cursorInfo;
-   POINTL     caretPos = { x, y };
-
-   rc = WinQueryCursorInfo (HWND_DESKTOP, &cursorInfo);
-   if (rc == TRUE)
-   {
-      HWND hwnd = cursorInfo.hwnd;
-      Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromOS2Handle (hwnd);
-      if (wnd && wnd->isOwnDC())
-      {
-         HPS     hps  = wnd->getOwnDC();
-         pDCData pHps = (pDCData)GpiQueryDCData(hps);
-         if (!pHps)
-         {
-            _O32_SetLastError (ERROR_INTERNAL_ERROR);
-            SetFS(sel);
-            return FALSE;
-         }
-#if 0
-         convertWinWorldPointToPMDevicePoint (pHps, &caretPos, 1);
-
-         xNew = caretPos.x;
-
-         if (doesYAxisGrowNorth(pHps) == TRUE)
-         {
-            yNew = caretPos.y;
-         }
-         else
-         {
-            yNew = caretPos.y - cursorInfo.cy;
-         }
-#endif
-      }
-      else
-      {
-//         convertWinDevicePointToPMDevicePoint (cursorInfo.hwnd, &caretPos, 1);
-         xNew = caretPos.x;
-         yNew = caretPos.y - cursorInfo.cy;
-      }
-
-      hwndCaret = wnd->getWindowHandle();
-      CaretPosX = x;
-      CaretPosY = y;
-
-      rc = WinCreateCursor (cursorInfo.hwnd, xNew, yNew, 0, 0, CURSOR_SETPOS, NULL);
-   }
-   if (rc == FALSE)
-   {
-      _O32_SetLastError (ERROR_INVALID_PARAMETER);
-      result = FALSE;
-   }
-
-   SetFS(sel);
-   return (result);
-}
-
-BOOL WIN32API ShowCaret (HWND hwnd)
-{
-   USHORT sel = RestoreOS2FS();
-   BOOL   rc = FALSE;
-
-   CaretIsVisible = TRUE;
-   rc = _ShowCaret (Win32ToOS2Handle (hwnd));
-
-   SetFS(sel);
-   return (result);
-}
-
-void recreateCaret (HWND hwndFocus)
-{
-   CURSORINFO cursorInfo;
-
-   if ((hwndCaret == hwndFocus)
-       && !WinQueryCursorInfo (HWND_DESKTOP, &cursorInfo))
+
+   if ((hwndCaret == hwndFocus) &&
+       !WinQueryCursorInfo (HWND_DESKTOP, &cursorInfo))
    {
       CreateCaret (hwndCaret, hbmCaret, CaretWidth, CaretHeight);