Changeset 91 for trunk/src/helpers/dialog.c

Timestamp:

Aug 2, 2001, 10:36:35 PM (24 years ago)

Author:

umoeller

Message:

Misc changes

File:

• trunk/src/helpers/dialog.c (modified) (17 diffs)

trunk/src/helpers/dialog.c

@@ -110 +110 @@
     const char  *pcszControlsFont;  // from dlghCreateDlg
 
+    // V0.9.14 (2001-08-01) [umoeller]
     HPS         hps;
-    /* const char  *pcszFontLast;
-    LONG        lcidLast; */
+    const char  *pcszFontLast;
+    LONG        lcidLast;
+    FONTMETRICS fmLast;
+
 } DLGPRIVATE, *PDLGPRIVATE;
 
@@ -148 +151 @@
     BOOL        fIsNestedTable;     // if TRUE, pvDefinition points to a nested TABLEDEF;
                                     // if FALSE, pvDefinition points to a CONTROLDEF as
-                                    // specified by the user
+                                    // specified by the caller
 
     PVOID       pvDefinition;       // either a PTABLEDEF or a PCONTROLDEF
@@ -225 +228 @@
  *@@changed V0.9.12 (2001-05-31) [umoeller]: fixed various things with statics
  *@@changed V0.9.12 (2001-05-31) [umoeller]: fixed broken fonts
+ *@@changed V0.9.14 (2001-08-01) [umoeller]: now caching fonts, which is significantly faster
  */
 
@@ -232 +236 @@
                       PDLGPRIVATE pDlgData)
 {
-    BOOL        fFind = FALSE;
-    RECTL       rclText;
-    LONG        lcid = 0;
-
     const char *pcszFontThis = pControlDef->pcszFont;
                     // can be NULL,
@@ -248 +248 @@
     if (pcszFontThis)
     {
-        FONTMETRICS fm;
         LONG lPointSize = 0;
 
-        // create new font
-        lcid = gpihFindPresFont(NULLHANDLE,        // no window yet
-                                FALSE,
-                                pDlgData->hps,
-                                pcszFontThis,
-                                &fm,
-                                &lPointSize);
-        GpiSetCharSet(pDlgData->hps, lcid);
-        if (fm.fsDefn & FM_DEFN_OUTLINE)
-            gpihSetPointSize(pDlgData->hps, lPointSize);
-
-        pszlAuto->cy = fm.lMaxBaselineExt + fm.lExternalLeading;
+        // check if we can reuse font data from last time
+        // V0.9.14 (2001-08-01) [umoeller]
+        if (strhcmp(pcszFontThis,
+                    pDlgData->pcszFontLast))
+        {
+            // different font than last time:
+
+            // delete old font?
+            if (pDlgData->lcidLast)
+            {
+                GpiSetCharSet(pDlgData->hps, LCID_DEFAULT);
+                GpiDeleteSetId(pDlgData->hps, pDlgData->lcidLast);
+            }
+
+            // create new font
+            pDlgData->lcidLast = gpihFindPresFont(NULLHANDLE,        // no window yet
+                                                  FALSE,
+                                                  pDlgData->hps,
+                                                  pcszFontThis,
+                                                  &pDlgData->fmLast,
+                                                  &lPointSize);
+
+            GpiSetCharSet(pDlgData->hps, pDlgData->lcidLast);
+            if (pDlgData->fmLast.fsDefn & FM_DEFN_OUTLINE)
+                gpihSetPointSize(pDlgData->hps, lPointSize);
+
+            pDlgData->pcszFontLast = pcszFontThis;
+        }
+
+        pszlAuto->cy =   pDlgData->fmLast.lMaxBaselineExt
+                       + pDlgData->fmLast.lExternalLeading;
     }
 
@@ -300 +318 @@
         }
     }
-
-    /* if (lcid)
-    {
-        GpiSetCharSet(pDlgData->hps, LCID_DEFAULT);
-        GpiDeleteSetId(pDlgData->hps, lcid);
-    } */
-
 }
 
@@ -336 +347 @@
                                         | BS_CHECKBOX
                                         | BS_RADIOBUTTON))
+            {
+                // give a little extra width for the box bitmap
                 pszlAuto->cx += 20;     // @@todo
+                // and height
+                pszlAuto->cy += 2;
+            }
             else if (pControlDef->flStyle & BS_BITMAP)
                 ;
@@ -722 +738 @@
                 PDLGPRIVATE pDlgData)
 {
-    ULONG   ul;
+    // ULONG   ul;
     LONG    lX;
     PLISTNODE pNode;
@@ -791 +807 @@
                   PDLGPRIVATE pDlgData)
 {
-    ULONG   ul;
+    // ULONG   ul;
     LONG    lY;
     PLISTNODE pNode;
@@ -864 +880 @@
                 PROCESSMODE ProcessMode)
 {
-    ULONG ul;
+    // ULONG ul;
     PLISTNODE pNode;
     CONTROLPOS cpTable;
@@ -943 +959 @@
 
     return (arc);
+}
+
+/*
+ *@@ FreeTable:
+ *      frees the specified table and recurses
+ *      into nested tables, if necessary.
+ *
+ *      This was added with V0.9.14 to fix the
+ *      bad memory leaks with nested tables.
+ *
+ *@@added V0.9.14 (2001-08-01) [umoeller]
+ */
+
+VOID FreeTable(PTABLEDEF pTable)
+{
+    // for each table, clean up the rows
+    PLISTNODE pRowNode;
+    FOR_ALL_NODES(&pTable->llRows, pRowNode)
+    {
+        PROWDEF pRow = (PROWDEF)pRowNode->pItemData;
+
+        // for each row, clean up the columns
+        PLISTNODE pColumnNode;
+        FOR_ALL_NODES(&pRow->llColumns, pColumnNode)
+        {
+            PCOLUMNDEF pColumn = (PCOLUMNDEF)pColumnNode->pItemData;
+
+            if (pColumn->fIsNestedTable)
+            {
+                // nested table: recurse!
+                PTABLEDEF pNestedTable = (PTABLEDEF)pColumn->pvDefinition;
+                FreeTable(pNestedTable);
+            }
+
+            free(pColumn);
+        }
+        lstClear(&pRow->llColumns);
+
+        free(pRow);
+    }
+    lstClear(&pTable->llRows);
+
+    free(pTable);
 }
 
@@ -1181 +1240 @@
  *
  *@@changed V0.9.14 (2001-07-07) [umoeller]: fixed disabled mouse with hwndOwner == HWND_DESKTOP
+ *@@changed V0.9.14 (2001-08-01) [umoeller]: fixed major memory leaks with nested tables
  */
 
@@ -1270 +1330 @@
                         // create "table" column for this
                         PCOLUMNDEF pColumnDef;
-                        arc = CreateColumn(pCurrentRow,
-                                           TRUE,        // nested table
-                                           pCurrentTable,
-                                           &pColumnDef);
-                        if (!arc)
-                            lstAppendItem(&pCurrentRow->llColumns, pColumnDef);
+                        if (!(arc = CreateColumn(pCurrentRow,
+                                                 TRUE,        // nested table
+                                                 pCurrentTable,
+                                                 &pColumnDef)))
+                            lstAppendItem(&pCurrentRow->llColumns,
+                                          pColumnDef);
                     }
                 }
@@ -1319 +1379 @@
             {
                 PCOLUMNDEF pColumnDef;
-                arc = CreateColumn(pCurrentRow,
-                                   FALSE,        // no nested table
-                                   (PVOID)pItemThis->ulData,
-                                   &pColumnDef);
-                if (!arc)
-                    lstAppendItem(&pCurrentRow->llColumns, pColumnDef);
+                if (!(arc = CreateColumn(pCurrentRow,
+                                         FALSE,        // no nested table
+                                         (PVOID)pItemThis->ulData,
+                                         &pColumnDef)))
+                    lstAppendItem(&pCurrentRow->llColumns,
+                                  pColumnDef);
             break; }
 
@@ -1416 +1476 @@
                        PROCESS_CALC_SIZES);
 
+            if (pDlgData->lcidLast)
+            {
+                GpiSetCharSet(pDlgData->hps, LCID_DEFAULT);
+                GpiDeleteSetId(pDlgData->hps, pDlgData->lcidLast);
+            }
             if (pDlgData->hps)
                 WinReleasePS(pDlgData->hps);
@@ -1506 +1571 @@
             PTABLEDEF pTable = (PTABLEDEF)pTableNode->pItemData;
 
-            // for each table, clean up the rows
-            PLISTNODE pRowNode;
-            FOR_ALL_NODES(&pTable->llRows, pRowNode)
-            {
-                PROWDEF pRow = (PROWDEF)pRowNode->pItemData;
-
-                // for each row, clean up the columns
-                PLISTNODE pColumnNode;
-                FOR_ALL_NODES(&pRow->llColumns, pColumnNode)
-                {
-                    PCOLUMNDEF pColumn = (PCOLUMNDEF)pColumnNode->pItemData;
-                    free(pColumn);
-                }
-                lstClear(&pRow->llColumns);
-
-                free(pRow);
-            }
-            lstClear(&pTable->llRows);
-
-            free(pTable);
+            FreeTable(pTable);
+                    // this may recurse for nested tables
         }
 
@@ -1532 +1579 @@
 
         free(pDlgData);
+    }
+
+    if (arc)
+    {
+        CHAR szErr[300];
+        sprintf(szErr, "Error %d occured in dlghCreateDlg.", arc);
+        winhDebugBox(hwndOwner,
+                     "Error in Dialog Manager",
+                     szErr);
     }