Ticket #126: libview_fix_1_of_1_rev_d97ece7b69c3__126_Copy_to_workspace__same_thing_in_the_Inspector__this_line___becomes_invisible.patch

DeviceWorkstation.st

@@ -42 +42 @@
 !
 
 Object subclass:#DeviceFontMetrics
-        instanceVariableNames:'encoding ascent descent maxAscent maxDescent minWidth maxWidth
-                averageWidth minCode maxCode direction'
+        instanceVariableNames:'ascent descent maxAscent maxDescent minWidth maxWidth
+                averageWidth minCode maxCode direction encoding overHang'
         classVariableNames:''
         poolDictionaries:''
         privateIn:DeviceWorkstation
@@ -5578 +5578 @@
     ^ info
 !
 
+fontDetailMetricsOf:fontId userInputString:aString
+    "return a average font Width and overHang for a specified character fonts metrics 
+     info object"
+
+    |info|
+
+    info := DeviceWorkstation::DeviceFontMetrics new.
+    info
+      avgWidth:(self widthOf:aString inFont:fontId)
+      overHang:(self overHangOf:aString inFont:fontId).
+
+    ^ info
+!
+
 fontResolutionOf:fontId
     "return the resolution (as dpiX @ dpiY) of the font - this is usually the displays resolution,
      but due to errors in some XServer installations, some use 75dpi fonts on higher
@@ -5892 +5906 @@
     "return the width in pixels of a string in a specific font"
 
     ^ self widthOf:aString from:1 to:(aString size) inFont:aFontId
+!
+
+overHangOf:aString from:index1 to:index2 inFont:aFontId
+    "return the overHang in pixels of a substring in a specific font"
+
+    ^ self subclassResponsibility
+!
+
+overHangOf:aString inFont:aFontId
+    "return the overHang in pixels of a string in a specific font"
+
+    ^ self overHangOf:aString from:1 to:(aString size) inFont:aFontId
 ! !
 
 !DeviceWorkstation methodsFor:'grabbing'!
@@ -8482 +8508 @@
     encoding := encodingArg.
 !
 
-averageWidth
-    "return the averageWidth"
-
-    ^ averageWidth
+ascent:ascentArg descent:descentArg maxAscent:maxAscentArg maxDescent:maxDescentArg
+minWidth:minWidthArg maxWidth:maxWidthArg avgWidth:avgWidthArg minCode:minCodeArg maxCode:maxCodeArg
+direction:directionArg encoding:encodingArg overHang:overHangArg
+    "set corresponding instance variables"
+
+    ascent := ascentArg.
+    descent := descentArg.
+    maxAscent := maxAscentArg.
+    maxDescent := maxDescentArg.
+    minWidth := minWidthArg.
+    maxWidth := maxWidthArg.
+    averageWidth := avgWidthArg.
+    minCode := minCodeArg.
+    maxCode := maxCodeArg.
+    direction := directionArg.
+    encoding := encodingArg.
+    overHang := overHangArg.
 !
 
 descent
@@ -8494 +8533 @@
     ^ descent
 !
 
+maxAscent
+    "return the maxAscent"
+
+    ^ maxAscent
+!
+
+maxDescent
+    "return the maxDescent"
+
+    ^ maxDescent
+!
+
+minWidth
+    "return the minWidth"
+
+    ^ minWidth
+!
+
+maxWidth
+    "return the maxWidth"
+
+    ^ maxWidth
+!
+
+averageWidth
+    "return the averageWidth"
+
+    ^ averageWidth
+!
+
+minCode
+    ^ minCode ? 0
+!
+
+maxCode
+    ^ maxCode ? 16rFFFF
+!
+
 direction
     "return the drawing direction (think of hebrew and arabic !!)"
 
@@ -8506 +8583 @@
     ^ encoding
 !
 
-maxAscent
-    "return the maxAscent"
-
-    ^ maxAscent
-!
-
-maxCode
-    ^ maxCode ? 16rFFFF
-!
-
-maxDescent
-    "return the maxDescent"
-
-    ^ maxDescent
-!
-
-maxWidth
-    "return the maxWidth"
-
-    ^ maxWidth
-!
-
-minCode
-    ^ minCode ? 0
-!
-
-minWidth
-    "return the minWidth"
-
-    ^ minWidth
+overHang
+    "return font the overHang"
+
+    ^ overHang
 ! !
 
 !DeviceWorkstation class methodsFor:'documentation'!

WinWorkstation.st

@@ -170 +170 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
+#include <assert.h>
 /* #include <malloc.h> */
 /* #include <math.h> */
 /* #include <string.h> */
@@ -10773 +10774 @@
 
     unsigned char *cp;
     OBJ cls;
-    int i1, i2, n, l, toDisplay;
+    SIZE size;
+    TEXTMETRICW tmet;
+    short maxDisplayBuffer;
+    int i1, i2, n, l, getMetricsResult, avgWidth, toDisplay;
     int nInstBytes;
 
 
@@ -10787 +10791 @@
         HDC hDC;
         HFONT hOldFont;
 
-        /* Windows (as in 7 or newer) limits the string size for TextOut* to 3275 */
-        const int MAX_DISPLAY_BUFFER = 3275;
+        /* Windows (as in 7 or newer) limits the string size for TextOut* changes 
+  according to the font size!  There is apparently an undocumented limit to 
+  the overall raster size.  The maximum value for the raster size is 16384. */
+
+
+  // GetTextMetricsW gives all needed font metrics
+  // If for any reason it does not work there is a fallback
+  if (GetTextMetricsW(__tmpDC, &tmet)) {
+      avgWidth = tmet.tmAveCharWidth;
+  } else {
+      static char *s = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzコーヒーアイスクリームケーキビールすしかき";
+      static int len;
+
+      if (len == 0) {
+          len = strlen(s);
+      }
+      assert(GetTextExtentPoint32(__tmpDC, s, len, &size) != 0 && "GetTextExtentPoint32 != 0, fix me");
+      avgWidth = (size.cx / (len / 2) + 1) / 2;
+  }
+
+  // Calculate the maximum buffer size for the selected font size
+  maxDisplayBuffer = 16384 / (avgWidth + tmet.tmOverhang);
 
         i1 = __intVal(index1) - 1;
         i2 = __intVal(index2) - 1;
@@ -10841 +10865 @@
                 cp += i1;
                 do {
                     /* TA_UPDATECP used => pX, pY ignored */
-                    if (! TextOutA(hDC, 0, 0, (char *)cp, MIN(toDisplay, MAX_DISPLAY_BUFFER))) { 
+                    if (! TextOutA(hDC, 0, 0, (char *)cp, MIN(toDisplay, maxDisplayBuffer))) { 
                         PRINTF(("WinWorkstation [warning]: TextOutA failed. [%d]\n", __LINE__));
                         PRINTF(("WinWorkstation [warning]: lastError=%d x:%d y:%d len:%d leftToShow=%d\n", GetLastError(), pX, pY, l, toDisplay));
                         goto error;
                     }
-                    cp += MAX_DISPLAY_BUFFER;
-                    toDisplay -= MAX_DISPLAY_BUFFER;
+                    cp += maxDisplayBuffer;
+                    toDisplay -= maxDisplayBuffer;
                 } while(toDisplay > 0);
             }
             goto ret;
@@ -10869 +10893 @@
                 w_cp += i1;
                 do {
                     /* TA_UPDATECP used => pX, pY ignored */
-                    if (! TextOutW(hDC, 0, 0, w_cp, MIN(toDisplay, MAX_DISPLAY_BUFFER))) { 
+                    if (! TextOutW(hDC, 0, 0, w_cp, MIN(toDisplay, maxDisplayBuffer))) { 
                         PRINTF(("WinWorkstation [warning]: TextOutW failed. [%d]\n", __LINE__));
                         PRINTF(("WinWorkstation [warning]: lastError=%d x:%d y:%d len:%d leftToShow=%d\n", GetLastError(), pX, pY, l, toDisplay));
                         goto error;
                     }
-                    w_cp += MAX_DISPLAY_BUFFER;
-                    toDisplay -= MAX_DISPLAY_BUFFER;
+                    w_cp += maxDisplayBuffer;
+                    toDisplay -= maxDisplayBuffer;
                 } while (toDisplay > 0);
             }
             goto ret;
@@ -13270 +13294 @@
       minCode:(rawData at:8)
       maxCode:16rFFFF "(rawData at:9)"
       direction:nil
-      encoding:(rawData at:11).
+      encoding:(rawData at:11)
+      overHang:(rawData at:12).
     ^ info
 !
 
 fontsInFamily:aFamilyName face:aFaceName filtering:filter
     "return a set of all available fonts in aFamily/aFace on this display.
-     On WinWorkStations there is curently Face
-     But only thise matching filter (if nonNil)."
+     On WinWorkStations there is currently Face
+     But only these matching filter (if nonNil)."
 
     |allFonts fonts|
 
@@ -13777 +13802 @@
       maxDescent -> (data at:4)
       minWidth   -> (data at:5)
       maxWidth   -> (data at:6)
-      avgWidth   -> (data at:7).
-      minChar    -> (data at:8).
-      maxChar    -> (data at:9).
-      defaultChar-> (data at:10).
-      charSet    -> (data at:11).
+      avgWidth   -> (data at:7)
+      minChar    -> (data at:8)
+      maxChar    -> (data at:9)
+      defaultChar-> (data at:10)
+      charSet    -> (data at:11)
+      overHang   -> (data at:12)
 "
 
 %{
@@ -13819 +13845 @@
             static int len;
 
             if (len == 0) {
-                len = strlen(s);
+                len = strlen(s);
             }
             GetTextExtentPoint32(__tmpDC, s, len, &size);
             avgWidth = (size.cx / (len / 2) + 1) / 2;
@@ -13844 +13870 @@
         __ArrayInstPtr(rawData)->a_element[9] = __MKSMALLINT(tmet.tmDefaultChar);   /* default    -> (data at:10) */
         t = __charSetSymbolFor(tmet.tmCharSet);
         __ArrayInstPtr(rawData)->a_element[10]= t; __STORE(rawData, t);             /* charSet    -> (data at:11) */
-
-        DPRINTF(("textMetrics h=%x  avgAsc=%d avgDesc=%d minW=%d maxW=%d avgW=%d\n",
+  __ArrayInstPtr(rawData)->a_element[11]= __MKSMALLINT(tmet.tmOverhang);      /* overHang   -> (data at:12) */
+
+        DPRINTF(("textMetrics h=%x  avgAsc=%d avgDesc=%d minW=%d maxW=%d avgW=%d overHang=%d\n",
                     hFont, tmet.tmAscent, tmet.tmDescent, avgWidth, tmet.tmMaxCharWidth,
-                    tmet.tmAveCharWidth));
+                    tmet.tmAveCharWidth, tmet.tmOverhang));
         RETURN (self);
     }
     RETURN (nil);