Changeset 155 for trunk/src

Timestamp:

Apr 17, 2002, 10:11:38 PM (23 years ago)

Author:

umoeller

Message:

Patches from Martin and Paul, plus regexp support.

Location:

trunk/src/helpers

Files:

• dialog.c (modified) (12 diffs)
• encodings.c (modified) (1 diff)
• helpers_pre.in (modified) (1 diff)
• nls.c (modified) (1 diff)
• prfh.c (modified) (2 diffs)
• regexp.c (added)
• winh.c (modified) (1 diff)

trunk/src/helpers/dialog.c

@@ -46 +46 @@
 #define INCL_WINWINDOWMGR
 #define INCL_WINFRAMEMGR
+#define INCL_WINPOINTERS
+#define INCL_WININPUT
 #define INCL_WINDIALOGS
-#define INCL_WININPUT
 #define INCL_WINSTATICS
 #define INCL_WINBUTTONS
@@ -123 +124 @@
     LONG        lcidLast;
     FONTMETRICS fmLast;
+
+    LONG        cxBorder,
+                cyBorder;           // cached now V0.9.19 (2002-04-17) [umoeller]
 
 } DLGPRIVATE, *PDLGPRIVATE;
@@ -409 +413 @@
                 else if (!(pControlDef->flStyle & BS_USERBUTTON))
                 {
-                    pszlAuto->cx += (2 * WinQuerySysValue(HWND_DESKTOP, SV_CXBORDER) + 15);
-                    pszlAuto->cy += (2 * WinQuerySysValue(HWND_DESKTOP, SV_CYBORDER) + 15);
+                    pszlAuto->cx += (2 * pDlgData->cxBorder + 15);
+                    pszlAuto->cy += (2 * pDlgData->cyBorder + 15);
                 }
             }
@@ -477 +481 @@
                               PDLGPRIVATE pDlgData)
 {
-    APIRET arc = NO_ERROR;
-
+    APIRET      arc = NO_ERROR;
+    PCONTROLDEF pControlDef = NULL;
     ULONG       ulExtraCX = 0,
                 ulExtraCY = 0;
+
     if (pColumnDef->fIsNestedTable)
     {
@@ -519 +524 @@
     {
         // no nested table, but control:
-        PCONTROLDEF pControlDef = (PCONTROLDEF)pColumnDef->pvDefinition;
         SIZEL       szlAuto;
+
+        pControlDef = (PCONTROLDEF)pColumnDef->pvDefinition;
 
         // do auto-size calculations only on the first loop
@@ -576 +582 @@
         } // end if (ProcessMode == PROCESS_1_CALC_SIZES)
 
-
         ulExtraCX
         = ulExtraCY
@@ -586 +591 @@
     pColumnDef->cpColumn.cy =   pColumnDef->cpControl.cy
                                + ulExtraCY;
+
+    if (    (pControlDef)
+         && ((ULONG)pControlDef->pcszClass == 0xffff0002L)
+       )
+    {
+        // hack the stupid drop-down combobox where the
+        // size of the drop-down is the full size of the
+        // control: when creating the control, we _do_
+        // specify the full size, but for the column,
+        // we must rather use a single line with
+        // the current font
+        // V0.9.19 (2002-04-17) [umoeller]
+        if (pControlDef->flStyle & (CBS_DROPDOWN | CBS_DROPDOWNLIST))
+        {
+            LONG cyMargin = 3 * pDlgData->cyBorder;
+
+            SetDlgFont(pControlDef, pDlgData);
+
+            pColumnDef->cpColumn.cy
+                =   pDlgData->fmLast.lMaxBaselineExt
+                  + pDlgData->fmLast.lExternalLeading
+                  + 2 * cyMargin
+                  + ulExtraCY;
+        }
+    }
 
     return (arc);
@@ -802 +832 @@
 
             case 0xffff0002L:   // combobox
-                // hack the stupid drop-down combobox which doesn't
-                // expand otherwise (the size of the drop-down is
-                // the full size of the control... duh)
+            {
                 if (flStyle & (CBS_DROPDOWN | CBS_DROPDOWNLIST))
                 {
-                    y -= 100;
-                    cy += 100;
+                    // in ColumnCalcSizes, we have set pColumnDef->cpColumn.cy
+                    // to the height of a single line to get the position
+                    // calculations right...
+                    // present cy is pColumnDef->cpControl.cy,
+                    // the user-specified size of the expanded combo
+                    // present y is the bottom of the combo's entry field
+                    ULONG cyDelta = pColumnDef->cpControl.cy - pColumnDef->cpColumn.cy;
+                    _Pmpf((__FUNCTION__ ": combo cpColumn.cy = %d, cpControl.cy = %d",
+                            pColumnDef->cpColumn.cy,
+                            pColumnDef->cpControl.cy));
+                    _Pmpf(("   cyDelta = %d", cyDelta));
+                    y -= cyDelta + 3 * pDlgData->cyBorder + pControlDef->ulSpacing;
+                    // cy += cyDelta;
                 }
+            }
             break;
 
@@ -819 +859 @@
                 if (flStyle & ES_MARGIN)
                 {
-                    LONG cxMargin = 3 * WinQuerySysValue(HWND_DESKTOP, SV_CXBORDER);
-                    LONG cyMargin = 3 * WinQuerySysValue(HWND_DESKTOP, SV_CYBORDER);
+                    LONG cxMargin = 3 * pDlgData->cxBorder;
+                    LONG cyMargin = 3 * pDlgData->cyBorder;
 
                     x += cxMargin;
@@ -877 +917 @@
                                 NULL,
                                 NULL);
+                winhSetPresColor(hwndDebug, PP_FOREGROUNDCOLOR, RGBCOL_DARKGREEN);
+
+                /*
+                // and another one for the control size
+                hwndDebug =
+                   WinCreateWindow(pDlgData->hwndDlg,   // parent
+                                WC_STATIC,
+                                "",
+                                WS_VISIBLE | SS_FGNDFRAME,
+                                pColumnDef->cpControl.x + pDlgData->ptlTotalOfs.x,
+                                pColumnDef->cpControl.y + pDlgData->ptlTotalOfs.y,
+                                pColumnDef->cpControl.cx,
+                                pColumnDef->cpControl.cy,
+                                pDlgData->hwndDlg,   // owner
+                                HWND_BOTTOM,
+                                -1,
+                                NULL,
+                                NULL);
                 winhSetPresColor(hwndDebug, PP_FOREGROUNDCOLOR, RGBCOL_RED);
+                */
             }
 #endif
@@ -1472 +1531 @@
 
     pDlgData->pcszControlsFont = pcszControlsFont;
+
+    // cache these now too V0.9.19 (2002-04-17) [umoeller]
+    pDlgData->cxBorder = WinQuerySysValue(HWND_DESKTOP, SV_CXBORDER);
+    pDlgData->cyBorder = WinQuerySysValue(HWND_DESKTOP, SV_CYBORDER);
 
     *ppDlgData = pDlgData;
@@ -1799 +1862 @@
  *      A regular standard dialog would use something like
  *
- +          FCF_TITLEBAR | FCF_SYSMENU | FCF_DLGBORDER | FCF_NOBYTEALIGN
+ +          FCF_TITLEBAR | FCF_SYSMENU | FCF_DLGBORDER | FCF_NOBYTEALIGN | FCF_CLOSEBUTTON
  *
  *      for flCreateFlags. To make the dlg sizeable, specify
  *      FCF_SIZEBORDER instead of FCF_DLGBORDER.
+ *
+ *      dialog.h defines FCF_FIXED_DLG and FCF_SIZEABLE_DLG
+ *      to make this more handy.
  *
  *      <B>Usage:</B>

trunk/src/helpers/encodings.c

@@ -44 +44 @@
 
 #pragma hdrstop
+
+/*
+ *@@category: Helpers\National Language Support\Encodings
+ *      See encodings.c.
+ */
 
 /*

trunk/src/helpers/helpers_pre.in

@@ -43 +43 @@
 $(OUTPUTDIR)\linklist.obj \
 $(OUTPUTDIR)\math.obj \
+$(OUTPUTDIR)\regexp.obj \
 $(OUTPUTDIR)\tree.obj \
 $(OUTPUTDIR)\xml.obj \

trunk/src/helpers/nls.c

@@ -66 +66 @@
 
 /*
- *@@category: Helpers\C helpers\National Language Support
- *      See stringh.c and xstring.c.
+ *@@category: Helpers\National Language Support
+ *      See nls.c.
  */
 

trunk/src/helpers/prfh.c

@@ -89 +89 @@
  *
  *@@changed V0.9.12 (2001-05-12) [umoeller]: changed prototypes to return APIRET now
+ *@@changed V0.9.19 (2002-04-11) [pr]: Fixed app. with no keys
  */
 
@@ -100 +101 @@
 
     // get size of keys list for pszApp
-    if (    (!PrfQueryProfileSize(hIni, (PSZ)pcszApp, NULL, &ulSizeOfKeysList))
-         || (ulSizeOfKeysList == 0)
-       )
+    if (!PrfQueryProfileSize(hIni, (PSZ)pcszApp, NULL, &ulSizeOfKeysList))
         arc = PRFERR_KEYSLIST;
     else
     {
-        pKeys = (PSZ)malloc(ulSizeOfKeysList);
-        if (!pKeys)
+        if (ulSizeOfKeysList == 0)
+            ulSizeOfKeysList = 1;    // V0.9.19 (2002-04-11) [pr]
+
+        if (!(pKeys = (PSZ)malloc(ulSizeOfKeysList)))
             arc = ERROR_NOT_ENOUGH_MEMORY;
         else
+        {
+            *pKeys = 0;
             if (!PrfQueryProfileData(hIni, (PSZ)pcszApp, NULL, pKeys, &ulSizeOfKeysList))
                 arc = PRFERR_KEYSLIST;
+        }
     }
 

trunk/src/helpers/winh.c

@@ -2563 +2563 @@
 
 /*
+ *@@ winhPlaceBesides:
+ *      attempts to place hwnd somewhere besides
+ *      hwndRelative.
+ *
+ *      fl is presently ignored, but should be
+ *      PLF_SMART for future extensions.
+ *
+ *      Works only if hwnd is a desktop child.
+ *
+ *@@added V0.9.19 (2002-04-17) [umoeller]
+ */
+
+BOOL winhPlaceBesides(HWND hwnd,
+                      HWND hwndRelative,
+                      ULONG fl)
+{
+    BOOL brc = FALSE;
+
+    SWP     swpRel,
+            swpThis;
+    LONG    xNew, yNew;
+
+    if (    (WinQueryWindowPos(hwndRelative, &swpRel))
+         && (WinQueryWindowPos(hwnd, &swpThis))
+       )
+    {
+        HWND    hwndRelParent,
+                hwndThisParent;
+        POINTL  ptlRel = {swpRel.x, swpRel.y};
+        if (    (hwndRelParent = WinQueryWindow(hwndRelative, QW_PARENT))
+             && (hwndThisParent = WinQueryWindow(hwnd, QW_PARENT))
+             && (hwndRelParent != hwndThisParent)
+           )
+        {
+            WinMapWindowPoints(hwndRelParent,
+                               hwndThisParent,
+                               &ptlRel,
+                               1);
+        }
+
+        // place right first
+        xNew = ptlRel.x + swpRel.cx;
+        // center vertically
+        yNew = ptlRel.y  + ((swpRel.cy - swpThis.cy) / 2);
+
+        if (xNew + swpThis.cy > WinQuerySysValue(HWND_DESKTOP, SV_CXSCREEN))
+        {
+            // place left then
+            xNew = ptlRel.x - swpThis.cx;
+
+            if (xNew < 0)
+            {
+                // center then
+                winhCenterWindow(hwnd);
+                brc = TRUE;
+            }
+        }
+
+        if (!brc)
+            brc = WinSetWindowPos(hwnd,
+                                  0,
+                                  xNew,
+                                  yNew,
+                                  0,
+                                  0,
+                                  SWP_MOVE);
+    }
+
+    return brc;
+}
+
+/*
  *@@ winhFindWindowBelow:
  *      finds the window with the same parent