Changeset 18 for trunk/src/helpers/winh.c

Timestamp:

Jan 1, 2001, 4:30:29 PM (25 years ago)

Author:

umoeller

Message:

Tons of updates.

File:

• trunk/src/helpers/winh.c (modified) (11 diffs)

trunk/src/helpers/winh.c

@@ -1608 +1608 @@
  *      area and will adjust coordinates accordingly. This can
  *      happen when changing video resolutions.
+ *
+ *@@changed V0.9.7 (2000-12-20) [umoeller]: fixed invalid params if INI key not found
  */
 
@@ -1617 +1619 @@
 {
     BOOL    brc = FALSE;
-    SWP     swp, swpNow;
+    SWP     swp;
     ULONG   cbswp = sizeof(swp);
-    ULONG   fl2 = fl;
+    ULONG   fl2 = (fl & ~SWP_ZORDER);
 
     if (PrfQueryProfileData(hIni, pszApp, pszKey, &swp, &cbswp))
@@ -1631 +1633 @@
         {
             // if no resize, we need to get the current position
+            SWP swpNow;
             brc = WinQueryWindowPos(hwnd, &swpNow);
             swp.cx = swpNow.cx;
@@ -1649 +1652 @@
     }
     else
+    {
         // window pos not found in INI: unset SWP_MOVE etc.
+        WinQueryWindowPos(hwnd, &swp);
         fl2 &= ~(SWP_MOVE | SWP_SIZE);
+    }
 
     WinSetWindowPos(hwnd,
@@ -2124 +2130 @@
  *
  *      Example:
- +      PPRESPARAMS ppp = NULL;
- +      CHAR szFont[] = "9.WarpSans";
- +      LONG lColor = CLR_WHITE;
- +      winhStorePresParam(&ppp, PP_FONTNAMESIZE, sizeof(szFont), szFont);
- +      winhStorePresParam(&ppp, PP_BACKGROUNDCOLOR, sizeof(lColor), &lColor);
- +      WinCreateWindow(...., ppp);
- +      free(ppp);
+ *
+ +          PPRESPARAMS ppp = NULL;
+ +          CHAR szFont[] = "9.WarpSans";
+ +          LONG lColor = CLR_WHITE;
+ +          winhStorePresParam(&ppp, PP_FONTNAMESIZE, sizeof(szFont), szFont);
+ +          winhStorePresParam(&ppp, PP_BACKGROUNDCOLOR, sizeof(lColor), &lColor);
+ +          WinCreateWindow(...., ppp);
+ +          free(ppp);
  *
  *@@added V0.9.0 [umoeller]
@@ -2494 +2501 @@
  *@@added V0.9.6 (2000-10-16) [umoeller]
  *@@changed V0.9.7 (2000-12-10) [umoeller]: PROGDETAILS.swpInitial no longer zeroed... this broke VIOs
+ *@@changed V0.9.7 (2000-12-17) [umoeller]: PROGDETAILS.pszEnvironment no longer zeroed
  */
 
@@ -2510 +2518 @@
     ProgDetails.Length = sizeof(PROGDETAILS);
     ProgDetails.progt.fbVisible = SHE_VISIBLE;
-    ProgDetails.pszEnvironment = 0;
+    // ProgDetails.pszEnvironment = 0;
 
     // memset(&ProgDetails.swpInitial, 0, sizeof(SWP));
@@ -3156 +3164 @@
  *      SWP structure (*pswpFrame).
  *
+ *      The client window is created with the frame as
+ *      its parent and owner and gets an ID of FID_CLIENT.
+ *
  *      Alternatively, you can set pswpFrame to NULL
  *      and specify FCF_SHELLPOSITION with flFrameCreateFlags.
@@ -3215 +3226 @@
         {
             if (pswpFrame)
+            {
                 // position frame
                 WinSetWindowPos(hwndFrame,
@@ -3224 +3236 @@
                                 pswpFrame->fl);
 
-            // position client
-            // WinQueryWindowRect(hwndFrame, &rclClient);
-            // doesn't work because it might be invisible V0.9.7 (2000-12-08) [umoeller]
-            rclClient.xLeft = 0;
-            rclClient.yBottom = 0;
-            rclClient.xRight = pswpFrame->cx;
-            rclClient.yTop = pswpFrame->cy;
-            WinCalcFrameRect(hwndFrame,
-                             &rclClient,
-                             TRUE);     // calc client from frame
-            WinSetWindowPos(*phwndClient,
-                            HWND_TOP,
-                            rclClient.xLeft,
-                            rclClient.yBottom,
-                            rclClient.xRight - rclClient.xLeft,
-                            rclClient.yTop - rclClient.yBottom,
-                            SWP_MOVE | SWP_SIZE | SWP_SHOW);
+                // position client
+                // WinQueryWindowRect(hwndFrame, &rclClient);
+                // doesn't work because it might be invisible V0.9.7 (2000-12-08) [umoeller]
+                rclClient.xLeft = 0;
+                rclClient.yBottom = 0;
+                rclClient.xRight = pswpFrame->cx;
+                rclClient.yTop = pswpFrame->cy;
+                WinCalcFrameRect(hwndFrame,
+                                 &rclClient,
+                                 TRUE);     // calc client from frame
+                WinSetWindowPos(*phwndClient,
+                                HWND_TOP,
+                                rclClient.xLeft,
+                                rclClient.yBottom,
+                                rclClient.xRight - rclClient.xLeft,
+                                rclClient.yTop - rclClient.yBottom,
+                                SWP_MOVE | SWP_SIZE | SWP_SHOW);
+            }
         }
     }
@@ -3590 +3603 @@
     flCmd2 = flCmd | DT_WORDBREAK | DT_TEXTATTRS;
 
-    ulCharHeight = gpihQueryLineSpacing(hps, pszText);
+    ulCharHeight = gpihQueryLineSpacing(hps);
 
     while (   (lDrawn)