Changeset 101 for trunk/src/helpers

Timestamp:

Aug 26, 2001, 10:44:19 AM (24 years ago)

Author:

umoeller

Message:

Misc updates.

Location:

trunk/src/helpers

Files:

• apps.c (modified) (9 diffs)
• dialog.c (modified) (1 diff)
• winh.c (modified) (2 diffs)

trunk/src/helpers/apps.c

@@ -564 +564 @@
  *      --  PROG_PM
  *
- *      --  PROG_31_ENH
+ *      --  PROG_31_ENHSEAMLESSCOMMON
  *
  *      --  PROG_WINDOWABLEVIO
@@ -764 +764 @@
  *@@changed V0.9.12 (2001-05-27) [umoeller]: moved from winh.c to apps.c
  *@@changed V0.9.14 (2001-08-07) [pr]: removed some env. strings for Win. apps.
+ *@@changed V0.9.14 (2001-08-23) [pr]: added session type options
  */
 
 HAPP appStartApp(HWND hwndNotify,                  // in: notify window (as with WinStartApp)
-                 const PROGDETAILS *pcProgDetails) // in: program data
+                 const PROGDETAILS *pcProgDetails, // in: program data
+                 ULONG ulFlags)                    // in: session type options
 {
     HAPP            happ = NULLHANDLE;
@@ -820 +822 @@
         }
 
-        ulIsWinApp = appIsWindowsApp(ProgDetails.progt.progc);
-
-        // now try again...
+        // Set session type from option flags
+        if (ulFlags & APP_RUN_FULLSCREEN)
+        {
+            if (ProgDetails.progt.progc == PROG_WINDOWABLEVIO)
+                ProgDetails.progt.progc = PROG_FULLSCREEN;
+
+            if (ProgDetails.progt.progc == PROG_WINDOWEDVDM)
+                ProgDetails.progt.progc = PROG_VDM;
+        }
+
+        if (ulIsWinApp = appIsWindowsApp(ProgDetails.progt.progc))
+        {
+            if (ulFlags & APP_RUN_FULLSCREEN)
+                ProgDetails.progt.progc = (ulFlags & APP_RUN_ENHANCED)
+                                                ? PROG_31_ENH
+                                                : PROG_31_STD;
+            else
+            {
+                if (ulFlags & APP_RUN_STANDARD)
+                    ProgDetails.progt.progc = (ulFlags & APP_RUN_SEPARATE)
+                                                ? PROG_31_STDSEAMLESSVDM
+                                                : PROG_31_STDSEAMLESSCOMMON;
+
+                if (ulFlags & APP_RUN_ENHANCED)
+                    ProgDetails.progt.progc = (ulFlags & APP_RUN_SEPARATE)
+                                                ? PROG_31_ENHSEAMLESSVDM
+                                                : PROG_31_ENHSEAMLESSCOMMON;
+            }
+        }
 
         /*
@@ -829 +857 @@
          */
 
-        if (strcmp(ProgDetails.pszExecutable, "*") == 0)
+        if (!strcmp(ProgDetails.pszExecutable, "*"))
         {
             /*
@@ -870 +898 @@
         } // end if (strcmp(pProgDetails->pszExecutable, "*") == 0)
         else
+        {
+            PSZ pszExtension;
             switch (ProgDetails.progt.progc)
             {
@@ -880 +910 @@
                 case PROG_WINDOWABLEVIO:    // OS/2 window
                 {
-                    PSZ pszExtension = doshGetExtension(ProgDetails.pszExecutable);
-                    if (pszExtension)
+                    if (    (pszExtension = doshGetExtension(ProgDetails.pszExecutable))
+                         && (!stricmp(pszExtension, "CMD"))
+                       )
                     {
-                        if (stricmp(pszExtension, "CMD") == 0)
-                        {
-                            CallBatchCorrectly(&ProgDetails,
-                                               &strParamsPatched,
-                                               "OS2_SHELL",
-                                               "CMD.EXE");
-                        }
+                        CallBatchCorrectly(&ProgDetails,
+                                           &strParamsPatched,
+                                           "OS2_SHELL",
+                                           "CMD.EXE");
                     }
                 break; }
@@ -896 +924 @@
                 case PROG_WINDOWEDVDM:      // DOS window
                 {
-                    PSZ pszExtension = doshGetExtension(ProgDetails.pszExecutable);
-                    if (pszExtension)
+                    if (    (pszExtension = doshGetExtension(ProgDetails.pszExecutable))
+                         && (!stricmp(pszExtension, "BAT"))
+                       )
                     {
-                        if (stricmp(pszExtension, "BAT") == 0)
-                        {
-                            CallBatchCorrectly(&ProgDetails,
-                                               &strParamsPatched,
-                                               NULL,
-                                               "COMMAND.COM");
-                        }
+                        CallBatchCorrectly(&ProgDetails,
+                                           &strParamsPatched,
+                                           NULL,
+                                           "COMMAND.COM");
                     }
                 break; }
             } // end switch (ProgDetails.progt.progc)
+        }
 
         if (    (ulIsWinApp)
@@ -976 +1003 @@
         ProgDetails.pszParameters = strParamsPatched.psz;
 
-        _Pmpf(("progt.progc: %d", ProgDetails.progt.progc));
+        /*  _Pmpf(("progt.progc: %d", ProgDetails.progt.progc));
         _Pmpf(("progt.fbVisible: 0x%lX", ProgDetails.progt.fbVisible));
         _Pmpf(("progt.pszTitle: \"%s\"", (ProgDetails.pszTitle) ? ProgDetails.pszTitle : "NULL"));
@@ -1004 +1031 @@
                     ProgDetails.swpInitial.ulReserved1,
                     ProgDetails.swpInitial.ulReserved2));
+            */
 
         /* if (WinMessageBox(HWND_DESKTOP,

trunk/src/helpers/dialog.c

@@ -1062 +1062 @@
  *
  *      The main advantage compared to dialog resources is
- *      that with this  function, you will never have to
+ *      that with this function, you will never have to
  *      define control _positions_. Instead, you only specify
  *      the control _sizes_, and all positions are computed

trunk/src/helpers/winh.c

@@ -2281 +2281 @@
  *          MPARAM's, one for each control in your array.
  *          Each MPARAM will have the control's ID and the
- *          XAF* flags (winh.h) how the control shall be moved.
+ *          XAC_* flags (winh.h) how the control shall be moved.
  *          Use MPFROM2SHORT to easily create this. Example:
  *
@@ -2299 +2299 @@
  *
  *          ZERO THAT STRUCTURE (memset(&xac, 0, sizeof(XADJUSTCTRLS),
- *          or this func will not work.
- *
- *          Call this function with pswpNew == NULL and
- *          pxac pointing to that new structure. This will
- *          query the positions of all the controls listed
- *          in the MPARAMs array and store them in the
- *          XADJUSTCTRLS area.
+ *          or this func will not work (because it will intialize
+ *          things on the first WM_WINDOWPOSCHANGED).
  *
  *      3)  Intercept WM_WINDOWPOSCHANGED: