Changeset 4602 for trunk/src/gdi32/text.cpp

Timestamp:

Nov 16, 2000, 5:34:49 PM (25 years ago)

Author:

sandervl

Message:

GetTextExtentPoint reimplemented

File:

• trunk/src/gdi32/text.cpp (modified) (18 diffs)

trunk/src/gdi32/text.cpp

@@ -1 @@
-/* $Id: text.cpp,v 1.13 2000-10-02 13:11:47 phaller Exp $ */
+/* $Id: text.cpp,v 1.14 2000-11-16 16:34:49 sandervl Exp $ */
 
 /*
@@ -18 +18 @@
 #include <float.h>
 #include "oslibgpi.h"
+#include <dcdata.h>
 
 #define DBG_LOCALLOG    DBG_text
@@ -112 +113 @@
   }
 
-  PVOID pHps = OSLibGpiQueryDCData(hdc);
+  pDCData pHps = (pDCData)OSLibGpiQueryDCData(hdc);
 
   if (!pHps)
@@ -167 +168 @@
     }
   }
-
+#ifdef INVERT
   flCmd = DTOS_INVERT | DTOS_WORLDRECT | DTOS_TEXTATTRS | DTOS_AMPERSAND | DTOS_VERTICALEXTENT;
+#else
+  flCmd = DTOS_WORLDRECT | DTOS_TEXTATTRS | DTOS_AMPERSAND | DTOS_VERTICALEXTENT;
+#endif
 
   LONG lMixMode = OSLibGpiQueryBackMix(pHps);
@@ -231 +235 @@
       rectPtr->bottom = lprc->bottom;
     }
-  }
+
+#ifndef INVERT
+    if (pHps->yInvert > 0) {
+      int temp        = pHps->yInvert - rectPtr->bottom;
+      rectPtr->bottom = pHps->yInvert - rectPtr->top;
+      rectPtr->top    = temp;
+    }
+#endif
+  }
+
+#ifndef INVERT
+////  dwDTFormat &= ~DT_INVERT;
+////  dwDTFormat |=  DT_INVERTCHAR;
+  int top = rectPtr->top;
+#endif
 
   if (dwDTFormat & DT_EXPANDTABS)
@@ -398 +416 @@
   if (dwDTFormat & DT_CALCRECT)
   {
+#ifndef INVERT
+    if (pHps->yInvert > 0) {
+         top              = top - rectPtr->top;
+         rectPtr->top    += top;
+         rectPtr->bottom += top;
+    } /* endif */
+#endif
     if (!(dwDTFormat & DT_RIGHT) && (rectPtr->left < xLeft))
     {
@@ -440 +465 @@
 DWORD SYSTEM EXPORT InternalGetTabbedTextExtentA(HDC hDC,LPCSTR lpString,INT nCount,INT nTabPositions,LPINT lpnTabStopPositions)
 {
-  PVOID pHps = OSLibGpiQueryDCData(hDC);
+  pDCData pHps = (pDCData)OSLibGpiQueryDCData(hDC);
   BOOL result;
   POINTLOS2 pts[TXTBOXOS_COUNT];
@@ -496 +521 @@
 LONG SYSTEM EXPORT InternalTabbedTextOutA(HDC hdc,INT x,INT y,LPCSTR lpString,INT nCount,INT nTabPositions,LPINT lpnTabStopPositions,INT nTabOrigin)
 {
-  PVOID pHps = OSLibGpiQueryDCData(hdc);
+  pDCData pHps = (pDCData)OSLibGpiQueryDCData(hdc);
   POINTLOS2 ptl;
   DWORD dimensions;
@@ -521 +546 @@
     return 0;
   }
-  if (getAlignUpdateCP(pHps) == TRUE)
+  if (getAlignUpdateCP(pHps) == TRUE) {
     OSLibGpiQueryCurrentPosition(pHps,&ptl);
+  }
   else
   {
     ptl.x = x;
     ptl.y = y;
+#ifndef INVERT
+    if (pHps->yInvert > 0) {
+       ptl.y = pHps->yInvert - ptl.y;
+    }
+#endif
   }
 
@@ -569 +600 @@
 BOOL InternalTextOutA(HDC hdc,int X,int Y,UINT fuOptions,CONST RECT *lprc,LPCSTR lpszString,INT cbCount,CONST INT *lpDx,BOOL IsExtTextOut)
 {
-  PVOID pHps = OSLibGpiQueryDCData(hdc);
+  pDCData pHps = (pDCData)OSLibGpiQueryDCData(hdc);
   ULONG flOptions = 0;
   RECTLOS2 pmRect;
@@ -607 +638 @@
         return TRUE;
       }
+#ifndef INVERT
+      if (pHps->yInvert > 0) {
+          int temp       = pHps->yInvert - pmRect.yTop;
+          pmRect.yTop    = pHps->yInvert - pmRect.yBottom;
+          pmRect.yBottom = temp;
+      }    
+#endif
 
       if (fuOptions & ETO_CLIPPED) flOptions |= CHSOS_CLIP;
@@ -642 +680 @@
     ptl.x = X;
     ptl.y = Y;
+
+#ifndef INVERT
+    if (pHps->yInvert > 0) {
+       ptl.y = pHps->yInvert - Y;
+    }
+#endif
 
     flOptions |= CHSOS_LEAVEPOS;
@@ -670 +714 @@
   ptl.y += getWorldYDeltaFor1Pixel(pHps);
 
+#ifndef INVERT
+  int vertAdjust = 0;
+  if ((pHps->taMode & 0x18) == TA_TOP) 
+  {
+      vertAdjust = OSLibGpiQueryFontMaxHeight(pHps->hps);
+  }
+  ptl.y -= vertAdjust;
+#endif
+
   hits = OSLibGpiCharStringPosAt(pHps,&ptl,&pmRect,flOptions,cbCount,lpszString,lpDx);
 
@@ -684 +737 @@
     OSLibGpiQueryCurrentPosition(pHps,&ptl);
     ptl.y -= getWorldYDeltaFor1Pixel(pHps);
+#ifndef INVERT
+    ptl.y += vertAdjust;
+#endif
     OSLibGpiSetCurrentPosition(pHps,&ptl);
   }
@@ -705 +761 @@
 BOOL WIN32API ExtTextOutA(HDC hdc,int X,int Y,UINT fuOptions,CONST RECT *lprc,LPCSTR lpszString,UINT cbCount,CONST INT *lpDx)
 {
-  dprintf(("GDI32: ExtTextOutA %x %s", hdc, lpszString));
-
-  return InternalTextOutA(hdc,X,Y,fuOptions,lprc,lpszString,cbCount,lpDx,TRUE);
+  dprintf(("GDI32: ExtTextOutA %x %s (%d,%d) %x %d %x", hdc, lpszString, X, Y, fuOptions, cbCount, lpDx));
+  return InternalTextOutA(hdc, X, Y, fuOptions, lprc, lpszString, cbCount, lpDx, TRUE);
 }
 //******************************************************************************
@@ -714 +769 @@
 {
   dprintf(("GDI32: ExtTextOutW\n"));
-
-  return InternalTextOutW(hdc,X,Y,fuOptions,lprc,lpszString,cbCount,lpDx,TRUE);
+  return InternalTextOutW(hdc, X, Y, fuOptions, lprc, lpszString, cbCount, lpDx, TRUE);
 }
 //******************************************************************************
@@ -721 +775 @@
 BOOL WIN32API TextOutA(HDC hdc,int nXStart,int nYStart,LPCSTR lpszString,int cbString)
 {
-  dprintf(("GDI32: TextOutA %x %s", hdc, lpszString));
+  dprintf(("GDI32: TextOutA %x (%d,%d) %s", hdc, nXStart, nYStart, lpszString));
 
   return InternalTextOutA(hdc,nXStart,nYStart,0,NULL,lpszString,cbString,NULL,FALSE);
@@ -765 +819 @@
   return TRUE;
 }
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API GetTextExtentPointA(HDC hdc, LPCTSTR lpsz, int cbString,
+                                  LPSIZE lpsSize)
+{
+   BOOL       rc;
+   POINTLOS2  pts[TXTBOXOS_COUNT];
+   POINTLOS2  widthHeight = { 0, 0};
+   pDCData    pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
+
+   dprintf(("GDI32: GetTextExtentPointA %s\n", lpsz));
+   if(pHps == NULL)
+   {
+      SetLastError(ERROR_INVALID_HANDLE);
+      return FALSE;
+   }
+
+   if(lpsz == NULL || cbString < 0 || lpsSize == NULL)
+   {
+      SetLastError(ERROR_INVALID_PARAMETER);
+      return FALSE;
+   }
+
+   lpsSize->cx = 0;
+   lpsSize->cy = 0;
+
+   // Verified with NT4, SP6
+   if(cbString == 0)
+   {
+      SetLastError(ERROR_SUCCESS);
+      return TRUE;
+   }
+   if(cbString > 512) {
+      dprintf(("ERROR: Oh, oh, string too long!!"));
+      DebugInt3();
+   }
+
+   rc = OSLibGpiQueryTextBox(pHps, cbString, lpsz, TXTBOXOS_COUNT, pts);
+   if(rc == FALSE)
+   {
+      SetLastError(ERROR_INVALID_PARAMETER);    //todo wrong error
+      return FALSE;
+   }
+   calcDimensions(pts, &widthHeight);
+   lpsSize->cx = widthHeight.x;
+   lpsSize->cy = widthHeight.y;
+
+   if(pHps && pHps->isPrinter && pHps->hdc)
+   {//scale for printer dcs
+       LONG alArray[2];
+
+       if (OSLibDevQueryCaps(pHps, OSLIB_CAPS_HORIZONTAL_RESOLUTION, 2, &alArray[0]))
+         lpsSize->cx = lpsSize->cx * alArray[0] / alArray[1];
+   }
+
+   dprintf(("GDI32: GetTextExtentPointA %x %s %d returned %d (%d,%d)", hdc, lpsz, cbString, rc, lpsSize->cx, lpsSize->cy));
+   SetLastError(ERROR_SUCCESS);
+   return TRUE;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API GetTextExtentPointW(HDC    hdc,
+                                  LPCWSTR lpString,
+                                  int    cbString,
+                                  PSIZE  lpSize)
+{
+  char *astring = UnicodeToAsciiString((LPWSTR)lpString);
+  BOOL  rc;
+
+  dprintf(("GDI32: GetTextExtentPointW %s\n", astring));
+  lpSize->cx = lpSize->cy = 0;
+  rc = GetTextExtentPointA(hdc,
+                           astring,
+                           cbString,
+                           lpSize);
+  FreeAsciiString(astring);
+  return(rc);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API GetTextExtentPoint32A( HDC hdc, LPCSTR lpsz, int cbString, PSIZE  lpSize)
+{
+ BOOL rc;
+
+    dprintf(("GDI32: GetTextExtentPoint32A %s\n", lpsz));
+    lpSize->cx = lpSize->cy = 0;
+    rc = GetTextExtentPointA(hdc, lpsz, cbString, lpSize);
+    return rc;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API GetTextExtentPoint32W(HDC arg1, LPCWSTR arg2, int arg3, PSIZE lpSize)
+{
+ char *astring = UnicodeToAsciiString((LPWSTR)arg2);
+ BOOL  rc;
+
+    dprintf(("GDI32: GetTextExtentPoint32W %s\n", astring));
+    rc = GetTextExtentPointA(arg1, astring, arg3, lpSize);
+    FreeAsciiString(astring);
+    return(rc);
+}
+//******************************************************************************
+//******************************************************************************