Changeset 9737 for trunk/src

Timestamp:

Jan 28, 2003, 5:21:49 PM (23 years ago)

Author:

sandervl

Message:

Fixes for InternalTextOutA without y-inversion (not activated)

Location:

trunk/src/gdi32

Files:

• oslibgpi.cpp (modified) (2 diffs)
• text.cpp (modified) (10 diffs)

trunk/src/gdi32/oslibgpi.cpp

@@ -1 @@
-/* $Id: oslibgpi.cpp,v 1.12 2002-11-29 13:46:04 sandervl Exp $ */
+/* $Id: oslibgpi.cpp,v 1.13 2003-01-28 16:21:48 sandervl Exp $ */
 
 /*
@@ -407 +407 @@
   rc = GpiQueryFontMetrics(hdc, sizeof(metrics), &metrics);
   if(rc) {
-        return metrics.lMaxAscender;
+        return max(metrics.lMaxBaselineExt, 
+                   max(metrics.lMaxAscender+metrics.lMaxDescender, 
+                       metrics.lInternalLeading+metrics.lEmHeight));
   }
   else {

trunk/src/gdi32/text.cpp

@@ -1 @@
-/* $Id: text.cpp,v 1.31 2003-01-04 13:45:10 sandervl Exp $ */
+/* $Id: text.cpp,v 1.32 2003-01-28 16:21:49 sandervl Exp $ */
 
 /*
@@ -73 +73 @@
 //******************************************************************************
 // todo: metafile support
+//#undef INVERT
+//#define INVERT_SETYINVERSION
 //******************************************************************************
 BOOL InternalTextOutA(HDC hdc,int X,int Y,UINT fuOptions,CONST RECT *lprc,LPCSTR lpszString,INT cbCount,CONST INT *lpDx,BOOL IsExtTextOut)
@@ -101 +103 @@
         return TRUE;
   }
+
+#if defined(INVERT) && !defined(INVERT_SETYINVERSION)
+  if(pHps->yInvert > 0) {
+     Y = pHps->yInvert - Y;
+  } 
+#endif
+
+#ifdef INVERT_SETYINVERSION
+  int oldyinv = GpiQueryYInversion(pHps->hps);
+  Y = oldyinv - Y;
+#endif
 
   //CB: add metafile info
@@ -115 +128 @@
       }
 #ifndef INVERT
+#ifdef INVERT_SETYINVERSION
+      if (oldyinv) {
+          int temp       = oldyinv - pmRect.yTop;
+          pmRect.yTop    = oldyinv - pmRect.yBottom;
+          pmRect.yBottom = temp;
+      }
+#else
       if (pHps->yInvert > 0) {
           int temp       = pHps->yInvert - pmRect.yTop;
@@ -120 +140 @@
           pmRect.yBottom = temp;
       }    
+#endif
 #endif
 
@@ -162 +183 @@
     }
   }
+
+#ifdef INVERT_SETYINVERSION
+  GpiEnableYInversion(pHps->hps, 0);
+#endif
+
   if (lpDx)
     flOptions |= CHSOS_VECTOR;
@@ -169 +195 @@
     ptl.x = X;
     ptl.y = Y;
-
-#ifndef INVERT
-    if (pHps->yInvert > 0) {
-       ptl.y = pHps->yInvert - Y;
-    }
-#endif
 
     flOptions |= CHSOS_LEAVEPOS;
@@ -210 +230 @@
   }
 
+#ifdef INVERT
   ptl.y += getWorldYDeltaFor1Pixel(pHps);
-
-#ifndef INVERT
+#else
+  ptl.y -= getWorldYDeltaFor1Pixel(pHps);
+
   int vertAdjust = 0;
-  if ((pHps->taMode & 0x18) == TA_TOP) 
+  if ((pHps->taMode & 0x18) != TA_TOP) 
   {
       vertAdjust = OSLibGpiQueryFontMaxHeight(pHps->hps);
@@ -228 +250 @@
   if(hits == GPIOS_ERROR) {
         dprintf(("InternalTextOutA: OSLibGpiCharStringPosAt returned GPIOS_ERROR"));
+#ifdef INVERT_SETYINVERSION
+        GpiEnableYInversion(pHps->hps, oldyinv);
+#endif
         return FALSE;
   }
@@ -241 +266 @@
   }
 
+#ifdef INVERT_SETYINVERSION
+  GpiEnableYInversion(pHps->hps, oldyinv);
+#endif
   return TRUE;
 }