Changes in / [30:20]

Location:

/trunk

Files:

• bitmap.cpp (modified) (3 diffs)
• config.h (modified) (1 diff)
• czech/gotrescz.rc (modified) (1 diff)
• deutsch/gotresde.rc (modified) (1 diff)
• dll/gotchdll.c (modified) (2 diffs)
• english/gotresen.rc (modified) (10 diffs)
• english/makefile (modified) (4 diffs)
• file_id.diz (deleted)
• gotcha.cpp (modified) (13 diffs)
• gotcha.h (modified) (5 diffs)
• id.h (modified) (3 diffs)
• italiano/gotresit.rc (modified) (1 diff)
• mainwin.cpp (modified) (13 diffs)
• makefile (modified) (6 diffs)
• makefile.emx (modified) (1 diff)
• mmio.cpp (added)
• mmio.h (added)
• portbras/gotresbr.rc (modified) (1 diff)
• savebmp.cpp (modified) (16 diffs)
• setgot.cmd (modified) (1 diff)
• settings.cpp (modified) (29 diffs)
• settings.h (modified) (6 diffs)
• version.h (modified) (1 diff)

/trunk/bitmap.cpp

@@ -19 +19 @@
 
 // ** CaptureWindow ******************************************************* /*FOLD00*/
-#include <ctype.h>
+
 #define MAX_WAIT   15
 
@@ -36 +36 @@
 
     // wait for the selected window to rise to the surface
-    if (f)
+    if ((hwndParent != HWND_DESKTOP) &&  f)
     {
         WinSetWindowPos (hwndParent, HWND_TOP, 0,0, 0,0, SWP_ZORDER);
@@ -149 +149 @@
                sizeof (aptl) / sizeof (POINTL), /* Number of points in aptl */
                aptl, ROP_SRCCOPY, BBO_IGNORE);
-
-    SWCNTRL  swctl;
-    PID      pid;
-    TID      tid;
-    BOOL screen = FALSE, region = FALSE;
-    CHAR title[11];
-
-    if (!f) {
-        //hwndParent = WinQueryFocus(HWND_DESKTOP);
-        if (hwndParent == hwndFrame) {
-            hwndParent = WinQueryWindow(hwndFrame, QW_NEXTTOP );
-        }
-        screen = TRUE;
-        if (prcl)
-            region = TRUE;
-    }
-
-    int rc = WinQueryWindowProcess(hwndParent, &pid, &tid);
-    if (WinQuerySwitchEntry(WinQuerySwitchHandle(hwndParent, pid),
-                            &swctl))
-        WinQuerySwitchEntry(WinQuerySwitchHandle(NULLHANDLE, pid),
-                            &swctl);
-
-    char buffer[MAXNAMEL+4];
-    int length = strlen( swctl.szSwtitle );
-    strcpy(buffer, swctl.szSwtitle);
-    char *p;
-    p = buffer;
-    for (int i = 0; i < (length < 11 ? length : 11); i++) {
-        if ( ispunct( *p ) || *p == '\\' || isblank( *p )) {
-            *p = '_';
-        }
-        p++;
-    }
-
-    if (region)
-        snprintf( title, length < 8 ? length + 3 : 11, "SR%s", buffer);
-    else if (screen)
-        snprintf( title, length < 8 ? length + 3 : 11, "SC%s", buffer);
-    else
-        snprintf( title, length < 8 ? length + 3 : 11, "WD%s", buffer);
-
-    SaveBitmap (hbm, hpsMem, sWidth, sHeight, bmp.cBitCount, title);
+    SaveBitmap (hbm, hpsMem, sWidth, sHeight, bmp.cBitCount);
 
     // re-associate the previous bit map and the memory presentation space

/trunk/config.h

@@ -36 +36 @@
 
 // Default language for resources and help.
-#ifdef _QUIET_
-#define PSZ_DEFAULTLANGUAGEMOD  "goqresen"
-#else
-#define PSZ_DEFAULTLANGUAGEMOD  "gotresen"
-#endif
-#define PSZ_DEFAULTLANGUAGEHELP  "gotcha_en"
+#define PSZ_DEFAULTLANGUAGE  "english"
+#define PSZ_DEFAULTLANGUAGEHELP  PSZ_DEFAULTLANGUAGE
 

/trunk/czech/gotrescz.rc

@@ -312 +312 @@
     IDS_BMF_PBM        "Portable Pixel-map (ppm)"
     IDS_BMF_JP2        "Jpeg 2000 (provided by the Open Source OpenJPEG library) (jp2)"
+    IDS_BMF_JBG        "JBIG Joint Bi-level Image experts Group (jbg)"
+    IDS_BMF_RAW        "Camera RAW Image Format (raw)"
     IDS_BMF_DIB        "Device Independent Bitmap (dib)"
 

/trunk/deutsch/gotresde.rc

@@ -267 +267 @@
     IDS_BMF_PBM        "Portable Pixel-map (ppm)"
     IDS_BMF_JP2        "Jpeg 2000 (provided by the Open Source OpenJPEG library) (jp2)"
+    IDS_BMF_JBG        "JBIG Joint Bi-level Image experts Group (jbg)"
+    IDS_BMF_RAW        "Camera RAW Image Format (raw)"
     IDS_BMF_DIB        "Device Independent Bitmap (dib)"
 

/trunk/dll/gotchdll.c

@@ -23 +23 @@
 #include "../id.h"
 
-//#define  __PMPRINTF__
-//#include "PMPRINTF.H"
-
-/* pre-accelerator input hook, undocumented, */
-#define HK_PREACCEL 17
-
 HAB     habDLL;
 HWND    hwndFrame;
 HMODULE hMod;
+PFN     pfnInput;
 
 void EXPENTRY InitDLL (HAB hab, HWND hwnd)
@@ -37 +32 @@
     habDLL = hab;
     hwndFrame = hwnd;
-    DosLoadModule (NULL, 0, "GOTCHDLL", &hMod);
+    DosLoadModule (NULL, 0, "GOTCHA", &hMod);
+    DosQueryProcAddr (hMod, 0, "InputProc", &pfnInput);
+}
+
+void EXPENTRY StartInputHook (void)
+{
+    WinSetHook (habDLL, NULLHANDLE, HK_INPUT, pfnInput, hMod);
+}
+
+void EXPENTRY StopInputHook (void)
+{
+    WinReleaseHook (habDLL, NULLHANDLE, HK_INPUT, pfnInput, hMod);
+    DosFreeModule (hMod);
 }
 
 BOOL EXPENTRY InputProc (HAB hab, PQMSG pqmsg, ULONG ul)
 {
-    USHORT usFlags;
-    USHORT usScan;
-    
-    if (pqmsg->msg != WM_CHAR
-        || (usFlags = SHORT1FROMMP(pqmsg->mp1), usScan =
-            SHORT2FROMMP (pqmsg->mp2), (usFlags & KC_SCANCODE)) == 0){
-        return FALSE;
-    }
-    
-    if (CHAR4FROMMP(pqmsg->mp1) == 0x54 ) {
-        if (usFlags & KC_KEYUP) {
-            WinPostMsg (hwndFrame, WM_COMMAND,
-                        MPFROM2SHORT (WID_PB_SETTINGS,0), 0);
-            /*DosBeep( 1000, 10 );
-            DosBeep( 2000, 20 );
-            DosBeep( 3000, 30 ); */
-            return TRUE;
-        } else {
-           /* DosBeep( 3000, 30 );
-            DosBeep( 2000, 20 );
-            DosBeep( 1000, 10 );*/
-            return TRUE;
+    if (pqmsg->msg == WM_CHAR) {
+        if ((SHORT1FROMMP (pqmsg->mp1) & KC_VIRTUALKEY) &&
+            (SHORT2FROMMP (pqmsg->mp2) == VK_PRINTSCRN)) {
+            if (SHORT1FROMMP (pqmsg->mp1) & KC_KEYUP) {
+                WinPostMsg (hwndFrame, WM_COMMAND,
+                            MPFROM2SHORT (WID_PB_SCREENREGION,0), 0);
+                /*DosBeep( 1000, 10 );
+                DosBeep( 2000, 20 );
+                DosBeep( 3000, 30 ); */
+                return TRUE;
+            } else {
+                /*DosBeep( 3000, 30 );
+                DosBeep( 2000, 20 );
+                DosBeep( 1000, 10 ); */
+                return TRUE;
+            }
         }
     }
-    else if (usScan == VK_PRINTSCRN || CHAR4FROMMP(pqmsg->mp1) == 93 ) {
-        if (usFlags & KC_KEYUP) {
-            WinPostMsg (hwndFrame, WM_COMMAND,
-                        MPFROM2SHORT (WID_PB_SETCAPTURETYPE,0), 0);
-            return TRUE;
-        }
-
-    }
     return FALSE;
-}
-
-void EXPENTRY StartInputHook (void)
-{
-    WinSetHook (habDLL, NULLHANDLE, HK_PREACCEL, (PFN) InputProc, hMod);
-}
-
-void EXPENTRY StopInputHook (void)
-{
-    WinReleaseHook (habDLL, NULLHANDLE, HK_PREACCEL, (PFN) InputProc, hMod);
-    DosFreeModule (hMod);
 }
 

/trunk/english/gotresen.rc

@@ -36 +36 @@
 /*     "Thorsten Thielen",     /* Translator's name */
 /*     "English",              /* Language to be used for online help */
-/*     "Gotcha_en",              /* Name of the help file */
+/*     "english",              /* Name of the help file */
 }
 
@@ -57 +57 @@
 BEGIN
    "a",    WID_PB_ABOUT, CHAR, ALT
-   VK_F1,  WID_PB_ABOUT, VIRTUALKEY, ALT 
    "e",    WID_PB_SETTINGS, CHAR, ALT
-   "h"     HM_GENERAL_HELP, CHAR, ALT /* Also F1*/
+/*   VK_F1,  WID_PB_ABOUT, VIRTUALKEY */
 
    "c",    WID_RB_CLIPBOARD, CHAR, ALT
    "f",    WID_RB_FILE, CHAR, ALT
 
-   "g",    WID_CB_HIDEWINDOW, CHAR, ALT
+   "h",    WID_CB_HIDEWINDOW, CHAR, ALT
    "d",    WID_CB_DELAYEDCAPTURE, CHAR, ALT
 
@@ -78 +77 @@
 WINDOWTEMPLATE ID_DLG_MAIN
 BEGIN
-    FRAME   PSZ_NAMEVERSION, ID_DLG_MAIN, 98, 66, 200, 85,
+    FRAME   PSZ_NAMEVERSION, ID_DLG_MAIN, 98, 66, 200, 70,
             FS_NOBYTEALIGN | FS_DLGBORDER | NOT WS_VISIBLE,
             FCF_TITLEBAR | FCF_SYSMENU | FCF_AUTOICON | FCF_TASKLIST | FCF_MINBUTTON
     BEGIN          /* Please do NOT try to translate the "thth.wc..." ;-)*/
-        WINDOW          "", FID_CLIENT, 0, 0, 200, 85, "thth.wc.gotcha.main",
+        WINDOW          "", FID_CLIENT, 0, 0, 200, 70, "thth.wc.gotcha.main",
                         FS_NOBYTEALIGN | NOT WS_VISIBLE
         BEGIN
-            GROUPBOX        "Save image to ...", WID_TEST, 4, 51, 90, 30
-            AUTORADIOBUTTON "~Clipboard", WID_RB_CLIPBOARD, 10, 63, 78, 10, WS_TABSTOP
-            AUTORADIOBUTTON "~File", WID_RB_FILE, 10, 53, 78, 10, WS_TABSTOP
-            GROUPBOX        "Capture ...", WID_NIL, 100, 19, 96, 62
-            PUSHBUTTON      "~Screen", WID_PB_SCREEN, 104, 59, 88, 12 
-            PUSHBUTTON      "Screen ~region", WID_PB_SCREENREGION, 104, 47, 88, 12
-            PUSHBUTTON      "~Window", WID_PB_WINDOW, 104, 35, 88, 12
-            PUSHBUTTON      "Window ~interior", WID_PB_WINDOWINTERIOR, 104, 23, 88, 12
-            GROUPBOX        "Options", WID_NIL, 4, 19, 90, 30
-            AUTOCHECKBOX    "Hide ~Gotcha!", WID_CB_HIDEWINDOW, 10, 31, 48, 10
-            AUTOCHECKBOX    "~Delayed capture", WID_CB_DELAYEDCAPTURE, 10, 21, 58, 10
-            PUSHBUTTON      "~Help", HM_GENERAL_HELP, 135, 4, 60, 12             
-            PUSHBUTTON      "S~ettings", WID_PB_SETTINGS, 70, 4, 60, 12
-            PUSHBUTTON      "~About", WID_PB_ABOUT, 5, 4, 60, 12 
+            GROUPBOX        "Save image to ...", WID_TEST, 4, 36, 90, 30
+            AUTORADIOBUTTON "~Clipboard", WID_RB_CLIPBOARD, 10, 48, 78, 10, WS_TABSTOP
+            AUTORADIOBUTTON "~File", WID_RB_FILE, 10, 38, 78, 10, WS_TABSTOP
+            GROUPBOX        "Capture ...", WID_NIL, 100, 4, 96, 62
+            PUSHBUTTON      "~Screen", WID_PB_SCREEN, 104, 44, 88, 12
+            PUSHBUTTON      "Screen ~region", WID_PB_SCREENREGION, 104, 32, 88, 12
+            PUSHBUTTON      "~Window", WID_PB_WINDOW, 104, 20, 88, 12
+            PUSHBUTTON      "Window ~interior", WID_PB_WINDOWINTERIOR, 104, 8, 88, 12
+            GROUPBOX        "Options", WID_NIL, 4, 4, 90, 30
+            AUTOCHECKBOX    "~Hide Gotcha!", WID_CB_HIDEWINDOW, 10, 16, 78, 10
+            AUTOCHECKBOX    "~Delayed capt.", WID_CB_DELAYEDCAPTURE, 10, 6, 78, 10
         END
     END
@@ -109 +105 @@
     BEGIN
         ICON            1, 1000, 8, 58, 21, 16, WS_GROUP
-        LTEXT           PSZ_NAMEVERSION, WID_NIL, 42, 64, 150, 9
+        LTEXT           PSZ_NAMEVERSION, WID_NIL, 42, 64, 202, 9
                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x00C80A0AL
-        LTEXT           "Screen/window capture utility", WID_NIL, 42, 56, 150, 8
-        LTEXT           "Copyright (c) 1998-2007 Thorsten Thielen", WID_NIL, 
-                        42, 48, 150, 8
-        LTEXT           "Copyright (c) 2018 The Netlabs Gotcha Group", WID_NIL, 
-                        42, 40, 150, 8 
-        LTEXT           "All rights Reserved", WID_NIL, 42, 32, 50, 8
-        LTEXT           "WWW: http://trac.netlabs.org/gotcha", WID_NIL, 
-                         42, 24, 150, 8, DT_WORDBREAK
+        LTEXT           "Screen/window capture utility", WID_NIL, 42, 53, 202, 8
+        LTEXT           "Copyright (c) 1998-2007 Thorsten Thielen", WID_NIL, 42, 44, 
+                        202, 8
+        LTEXT           "e-Mail: thth@c2226.de", WID_NIL, 42, 32, 202, 8
+        LTEXT           "WWW: http://www.c2226.de/programs/gotcha", WID_NIL, 42, 13, 232, 17, DT_WORDBREAK
         LTEXT           "English translation: Thorsten Thielen", WID_NIL,
-                        42, 16, 150, 8
-        DEFPUSHBUTTON   "Ok", WID_NIL, 79, 4, 42, 10
+                        42, 4, 202, 8
+        DEFPUSHBUTTON   "Ok", WID_NIL, 8, 6, 22, 26
     END
 END
@@ -166 +159 @@
         DEFPUSHBUTTON   "~Ok", WID_PB_OK, 5, 4, 60, 14
         PUSHBUTTON      "~Undo", WID_PB_UNDO, 70, 4, 60, 14
-        PUSHBUTTON      "~Help", WID_PB_HELP, 215, 4, 60, 14, BS_HELP | 
+        PUSHBUTTON      "Help", WID_PB_HELP, 215, 4, 60, 14, BS_HELP | 
                         BS_NOPOINTERFOCUS
     END
@@ -187 +180 @@
         GROUPBOX        "Image file ~format", WID_NIL, 5, 5, 240, 44, DT_MNEMONIC
         LISTBOX         WID_LB_FILEFORMAT, 11, 9, 228, 30, LS_NOADJUSTPOS
-
+/*        AUTORADIOBUTTON "1.2 (What Windoze calls ""OS/2 format"")", WID_RB_BMF12, 11, 
+                        29, 208, 10, WS_TABSTOP | WS_GROUP
+        AUTORADIOBUTTON "1.6 (Windoze format)", WID_RB_BMF16, 11, 19, 208, 10, 
+                        WS_TABSTOP
+        AUTORADIOBUTTON "2.0 (Full OS/2 format)", WID_RB_BMF20, 11, 9, 208, 10, 
+                        WS_TABSTOP */
     END
 END
@@ -204 +202 @@
         GROUPBOX        "Options", WID_NIL, 5, 5, 220, 50
         AUTOCHECKBOX    "Always on ~top of all windows", WID_CB_SSWALWAYSONTOP, 13, 35, 204, 10
-        AUTOCHECKBOX    "Hide ~Gotcha during capture", WID_CB_SSWHIDE, 13, 25, 204, 10
+        AUTOCHECKBOX    "~Hide when doing a capture", WID_CB_SSWHIDE, 13, 25, 204, 10
     END
 END
@@ -240 +238 @@
         GROUPBOX        "Online help", WID_NIL, 5, 5, 119, 54
         LISTBOX         WID_LB_LANGUAGESHELP, 11, 9, 106, 40, LS_NOADJUSTPOS
-        /*CONTROL         4, WID_NIL, 130, 5, 84, 36, WC_STATIC, SS_BITMAP | 
-                        WS_GROUP | WS_VISIBLE*/
-        LTEXT           "Note: A restart is required for these settings to take effect."
-                        WID_ST_LANGNOTE, 130, 45, 114, 70, DT_WORDBREAK
+        CONTROL         4, WID_NIL, 130, 5, 84, 36, WC_STATIC, SS_BITMAP | 
+                        WS_GROUP | WS_VISIBLE
+        LTEXT           "Note: This settings will take effect for the first "
+                        "time at the next start of the program.",
+                        WID_ST_LANGNOTE, 130, 45, 114, 70, 
+                        DT_WORDBREAK
     END
 END
@@ -250 +250 @@
 {
     IDS_QUIETMODE                      " (quiet mode)"
-    IDS_SETTINGS                       "~Settings\tALT+e"
-    IDS_PRODUCTINFORMATION             "Product information\tALT+a"
+    IDS_SETTINGS                       "~Settings...\tALT+E"
+    IDS_PRODUCTINFORMATION             "Product information\tALT+A"
     IDS_HEADER_ERROR                   "ERROR"
     IDS_ERROR_COULDNOTRETRIEVEHEADER   "Could not retrieve bitmap info header (0x%08lx)"
@@ -281 +281 @@
     IDS_BMF_PBM        "Portable Pixel-map (ppm)"
     IDS_BMF_JP2        "Jpeg 2000 (provided by the Open Source OpenJPEG library) (jp2)"
+    IDS_BMF_JBG        "JBIG Joint Bi-level Image experts Group (jbg)"
+    IDS_BMF_RAW        "Camera RAW Image Format (raw)"
     IDS_BMF_DIB        "Device Independent Bitmap (dib)"
 
     IDS_SNAPLABEL                      "Snap!"
-    IDS_GENERALHELP                    "Gotcha! ~help\tF1"
+    IDS_GENERALHELP                    "Gotcha! ~help..."
 }

/trunk/english/makefile

@@ -39 +39 @@
 GOTBUILDMACHINE = Zobopeep
 !endif
-!ifdef %_QUIET_
-RESOURCE = goqresen
-!else
-RESOURCE = gotresen
-!endif
-
 
 CC = WCC386.EXE
@@ -68 +62 @@
 #    $(CC) /I$(INCLDIR) $(CFLAGS) $*.c
     
-all: $(RESOURCE).dll gotcha_en.hlp
+all: gotresen.dll gotcha_en.hlp
 
 
-$(RESOURCE).dll: &
-    $(RESOURCE).res
+gotresen.dll: &
+    gotresen.res
     $(SED) -e "s;(GOTMAJOR);$(GOTMAJOR);g" &
     -e "s;(GOTMINOR);$(GOTMINOR);g"   &
@@ -80 +74 @@
     -e "s;Sun \|Mon \|Tue \|Wed \|Thu \|Fri \|Sat ;;g" &
     -e "s;(GOTBUILDMACHINE);$(GOTBUILDMACHINE);g"   &
-    $(RESOURCE).lnk.tpl > $(RESOURCE).lnk 
-    $(LINK) @$(RESOURCE).lnk f ..\tools\dll.obj lib clib3r.lib 
-    $(RC) $(RESOURCE).res $(RESOURCE).dll
-    lxlite /x- /b- $(RESOURCE).dll
+    gotresen.lnk.tpl > gotresen.lnk 
+    $(LINK) @gotresen.lnk f ..\tools\dll.obj lib clib3r.lib 
+    $(RC) gotresen.res gotresen.dll
+    lxlite /x- /b- gotresen.dll
     $(COPY) *.dll ..\bin
     
-$(RESOURCE).res:    $(RESOURCE).rc &
+gotresen.res:    gotresen.rc &
                  ../id.h &
                  ../common.rc &
                  ../version.h
-        $(RC) $(RFLAGS) -r $(RESOURCE).rc $@
+        $(RC) $(RFLAGS) -r gotresen.rc $@
         
 gotcha_en.hlp:     gotcha_en.ipf ../common.ipf &
@@ -96 +90 @@
                    $(DATA)/gotcha.bmp
                    wipfc -l en_US gotcha_en.ipf $@      
-                   $(COPY) *.hlp readme ..\bin
+                   $(COPY) *.hlp ..\bin
 
 clean:: .symbolic 

/trunk/gotcha.cpp

@@ -34 +34 @@
 PFNWP       OldFrameWP, wpOldButton;
 PSETTINGS   pset;
-BOOL        g_fQuiet = FALSE, g_fIdle = FALSE, g_fSetPathName = FALSE;
+BOOL        g_fQuiet = FALSE;
 HWND        g_hwndMenuSSW;
 HMODULE     g_hmod = NULLHANDLE;
@@ -44 +44 @@
 #include "savebmp.cpp"
 
-// ** CheckCmdlineArgs **************************************************** /*FOLD00*/
+// ** CheckCmdlineArgs **************************************************** /*fold00*/
 
 BOOL CheckCmdlineArgs (int argc, char *argv[])
@@ -72 +72 @@
                     pset->SetFileSaveStyle (FSS_NUMFILES);
                     pset->SetNumSaveDir (argv[i]);
-                    g_fSetPathName = TRUE;
                 }
         }
@@ -83 +82 @@
                 pset->SetFileSaveStyle (FSS_FORCEFILE);
                 pset->SetForceSaveFile (argv[i]);
-                g_fSetPathName = TRUE;
             }
         }
@@ -89 +87 @@
         else if (stricmp (argv[i], "-i") == 0)
         {
-            g_fIdle = TRUE;
             pset->SetFlag (SEI_IDLEPRIORITY, TRUE);
         }
@@ -114 +111 @@
 
     //DisplayError("DEBUG", "%d", Version());
-#ifdef _QUIET_
-    if ((Version() < 1))
+#ifdef _USEDLL_
+    if (g_fQuiet && (Version() < 1))
     {
         DisplayError("GOTCHA.DLL TO OLD",
@@ -126 +123 @@
         exit (0);
     }
-
-    bool fPrtScr = FALSE;
-    ULONG ulDataSize;
-    int rc;
-
-    rc = PrfQueryProfileSize( HINI_PROFILE, "PM_ControlPanel", "PrintScreen",
-                             &ulDataSize );
-    rc = PrfQueryProfileData(HINI_USERPROFILE, "PM_ControlPanel", "PrintScreen",
-                             &fPrtScr, &ulDataSize);
-    if (fPrtScr || !rc) {
-        fPrtScr = TRUE;
-        bool temp = FALSE;
-        rc = PrfWriteProfileData(HINI_USERPROFILE, "PM_ControlPanel", "PrintScreen",
-                                 &temp, sizeof(bool));
-    }
 #endif
 
@@ -152 +134 @@
     pset = new SETTINGS;
 
-    pset->idleSetInIni = pset->QueryFlag(SEI_IDLEPRIORITY);
-    pset->saveStyle = pset->QuerySaveStyle ();
-    pset->pNumSaveDir = pset->QueryNumSaveDir ();
-    pset->pForceSaveFile = pset->QueryForceSaveFile();
-    pset->bSerialCapture = pset->SerialCapture ();
     // check cmd line args and if "-a" found take screenshot and exit
     if (CheckCmdlineArgs (argc, argv))
     {
         CaptureWindow (HWND_DESKTOP, HWND_DESKTOP, NULL, TRUE);
-        pset->SetFileSaveStyle(pset->saveStyle);
         delete pset;
         WinDestroyMsgQueue (hmq);
@@ -183 +159 @@
 
     // init the quiet mode
-    //if (g_fQuiet)
-    //{
-#ifdef _QUIET_
-//#if 1
-    DebugHereIAm();
+    if (g_fQuiet)
+    {
+#ifdef _USEDLL_
         InitDLL (hab, hwndFrame);
         StartInputHook ();
 #endif
 
-        //CHAR ach[61];
-        //WinQueryWindowText (hwndFrame, sizeof (ach), ach);
-        //strcat (ach, RSTR (IDS_QUIETMODE));
-        //WinSetWindowText (hwndFrame, ach);
-        //WinSetWindowPos (hwndFrame, NULLHANDLE, 0,0, 0,0, SWP_MINIMIZE);
-        //HSWITCH hswitch = WinQuerySwitchHandle(hwndFrame, 0);
-        //WinRemoveSwitchEntry(hswitch);
-    //}
+        CHAR ach[61];
+        WinQueryWindowText (hwndFrame, sizeof (ach), ach);
+        strcat (ach, RSTR (IDS_QUIETMODE));
+        WinSetWindowText (hwndFrame, ach);
+        WinSetWindowPos (hwndFrame, NULLHANDLE, 0,0, 0,0, SWP_MINIMIZE);
+    }
 
     // position snapshot window
@@ -224 +196 @@
         WinDispatchMsg (hab, &qmsg);
 
-
-    // Set priorty to unless user set regular since running -q sets it to idle in the ini
-    if (g_fIdle || g_fQuiet) {
-        pset->SetFlag (SEI_IDLEPRIORITY, pset->idleSetInIni);
-        if (g_fQuiet) {
-            pset->SetFileSaveStyle (pset->saveStyle); // changed with -q
-            pset->SerialCapture (pset->bSerialCapture); // changed with -q
-        }
-    }
-    // Don't change the ini stored paths if the paths were set from the command line
-    if (g_fSetPathName) {
-        pset->SetFileSaveStyle(pset->saveStyle);
-        pset->SetForceSaveFile (pset->pForceSaveFile);
-        pset->SetNumSaveDir (pset->pNumSaveDir);
-    }
     // save size, etc. of snapshot window
     WinQueryWindowPos (hwndSnapshot, &swp);
@@ -251 +208 @@
     WinDestroyWindow (hwndFrame);
 
-#ifdef _QUIET_
-//#if 1
-    if (fPrtScr || !rc) {
-        PrfWriteProfileData(HINI_USERPROFILE, "PM_ControlPanel", "PrintScreen",
-                            &fPrtScr, sizeof(bool));
-    }
-    //if (g_fQuiet)
+#ifdef _USEDLL_
+    if (g_fQuiet)
         StopInputHook ();
 #endif
@@ -290 +242 @@
 }
 
-APIRET saymsg2(int DefaultButton, HWND hwnd,  PCSZ pszTitle, PCSZ pszFmt, ...)
-{
-  ULONG i;
-  APIRET rc;
-  CHAR szMsg[4096];
-  va_list va;
-  MB2INFO *pmbInfo;
-  MB2D mb2dBut[3];
-  ULONG ulInfoSize = (sizeof(MB2INFO) + (sizeof(MB2D) * 2));
-
-  va_start(va, pszFmt);
-  szMsg[sizeof(szMsg) - 1] = 0;
-  vsprintf(szMsg, pszFmt, va);
-  va_end(va);
-
-  if (szMsg[sizeof(szMsg) - 1]) {
-    fprintf(stderr, "Buffer overflow in saymsg2 - need %u bytes\n", strlen(szMsg) + 1);
-    fflush(stderr);
-  }
-
-  memset(mb2dBut, 0, sizeof(MB2D) * 3);
-  strcpy(mb2dBut[0].achText,"Ok");
-  strcpy(mb2dBut[1].achText,"Cancel");
-  strcpy(mb2dBut[2].achText,"Settings");
-  mb2dBut[0].idButton = 1;
-  mb2dBut[1].idButton = 2;
-  mb2dBut[2].idButton = 3;
-  if (DefaultButton)
-    mb2dBut[DefaultButton - 1].flStyle = BS_DEFAULT;
-  pmbInfo = (MB2INFO *) malloc(ulInfoSize);
-  memset(pmbInfo, 0, ulInfoSize);
-  if (pmbInfo) {
-    pmbInfo->cb         = ulInfoSize;
-    pmbInfo->hIcon      = 0;
-    pmbInfo->cButtons   = 3;
-    pmbInfo->flStyle    = MB_MOVEABLE | MB_ICONQUESTION ;
-    pmbInfo->hwndNotify = NULLHANDLE;
-    for (i = 0; i < 3; i++) {
-      memcpy( pmbInfo->mb2d+i , mb2dBut+i , sizeof(MB2D));
-    }
-    rc = WinMessageBox2(HWND_DESKTOP, hwnd,
-                        szMsg, pszTitle, SM2_DIALOG,
-                        pmbInfo);
-    WinSetFocus(HWND_DESKTOP, SM2_DIALOG);
-    free(pmbInfo);
-    return rc;
-  }
-  return MBID_ERROR;
-}
-// ** AddSysMenuItem ****************************************************** /*FOLD00*/
+// ** AddSysMenuItem ****************************************************** /*fold00*/
 
 VOID AddSysMenuItem (HWND hwndFrame, MENUITEM *Item, PSZ Text)
@@ -370 +273 @@
 VOID SetIdlePriority (BOOL f)
 {
-#if 0 //#ifndef _QUEIT_
     if (f)
         DosSetPriority(PRTYS_PROCESS, PRTYC_IDLETIME, 0, 0);
     else
         DosSetPriority(PRTYS_PROCESS, PRTYC_REGULAR, 0, 0);
-#else
-    DosSetPriority(PRTYS_PROCESS, PRTYC_FOREGROUNDSERVER, 0, 0);
-#endif
 }
 

/trunk/gotcha.h

@@ -39 +39 @@
 #include <stdarg.h>
 
+#include "mmioos2.h"
+
 #include "config.h"
 
@@ -46 +48 @@
 #include "helper.h"
 #include "settings.h"
-
-#define  _PMPRINTF_
-#include "PMPRINTF.H"
 
 #define PSZ_EXTENSION    ".bmp"
@@ -70 +69 @@
 
 extern PSETTINGS pset;
-extern HWND hwndFrame, hwndSnapshot, g_hwndMenuSSW, g_hwndSettingsDialog, g_hwndPage0;
+extern HWND hwndFrame, hwndSnapshot, g_hwndMenuSSW;
 
 extern HMODULE g_hmod;
@@ -85 +84 @@
 
 HBITMAP  CaptureWindow (HWND hwnd, HWND hwndParent, PRECTL prcl, BOOL f);
-VOID     SaveBitmap (HBITMAP hbm, HPS hps, int width, int height,
-                     int bitCount, char *title);
+VOID     SaveBitmap (HBITMAP hbm, HPS hps, int width, int height, int bitCount);
 VOID     SaveBitmapToClipboard (HBITMAP hbm);
-//VOID     SaveBitmapToFile (HBITMAP hbm, PSZ psz, HPS hps);
+VOID     SaveBitmapToFile (HBITMAP hbm, PSZ psz, HPS hps);
 VOID     StartSelection (HWND hwnd);
-BOOL     SelectSaveFile (char *title);
+BOOL     SelectSaveFile (VOID);
 BOOL     DoTracking (RECTL *prclTrack);
 VOID     AddSysMenuItem (HWND hwndFrame, MENUITEM *Item, PSZ Text);
@@ -111 +109 @@
 
 VOID     DisplayError (PSZ pszTitle, PSZ psz, ...);
-APIRET   saymsg2(int DefaultButton, HWND hwnd,
-                 PCSZ pszTitle, PCSZ pszFmt, ...);
 VOID     DoCountdown (ULONG ul);
 VOID     AdjustSaveTypeButtons (BOOL f);
 
-//BOOL SetEAs (PSZ psz);
+BOOL SetEAs (PSZ psz);
 VOID SetIdlePriority (BOOL f);
 

/trunk/id.h

@@ -28 +28 @@
 #define ID_DLG_SETTINGSPAGE3      6
 #define ID_DLG_SETTINGSPAGE4      7
-#define SM2_DIALOG                8
-#define ID_DLG_SETTINGSPAGE0      9
 
 #define WID_NIL                   0
@@ -76 +74 @@
 #define WID_LB_FILEFORMAT         43
 #define WID_PB_EXIT               44
-#define WID_PB_SETCAPTURETYPE     45
 
 #define IDM_SSWPOPUP              1
@@ -160 +157 @@
 #define IDS_BMF_PBM                         29
 #define IDS_BMF_JP2                         30
-#define IDS_BMF_DIB                         31
+#define IDS_BMF_JBG                         31
+#define IDS_BMF_RAW                         32
+#define IDS_BMF_DIB                         33
 #define IDS_SNAPLABEL                       34
 #define IDS_GENERALHELP                     35
-#define IDS_MAINWIN                         36
 
 #define MAIN_HELP_TABLE                     1

/trunk/italiano/gotresit.rc

@@ -323 +323 @@
     IDS_BMF_PBM        "Portable Pixel-map (ppm)"
     IDS_BMF_JP2        "Jpeg 2000 (provided by the Open Source OpenJPEG library) (jp2)"
+    IDS_BMF_JBG        "JBIG Joint Bi-level Image experts Group (jbg)"
+    IDS_BMF_RAW        "Camera RAW Image Format (raw)"
     IDS_BMF_DIB        "Device Independent Bitmap (dib)"   
     

/trunk/mainwin.cpp

@@ -18 +18 @@
  ***/
 
-// ** CreateMainWindow **************************************************** /*FOLD00*/
+// ** CreateMainWindow **************************************************** /*fold00*/
 
 HWND CreateMainWindow (VOID)
 {
-#ifdef _QUIET_
-//#if 1
-    hwndFrame = WinLoadDlg (HWND_OBJECT, NULLHANDLE, NULL, GETMODULE,
-                            ID_DLG_MAIN, NULL);
-#else
     hwndFrame = WinLoadDlg (HWND_DESKTOP, NULLHANDLE, NULL, GETMODULE,
                             ID_DLG_MAIN, NULL);
-#endif
     OldFrameWP = WinSubclassWindow (hwndFrame, FrameProcedure);
 
@@ -76 +70 @@
 }
 
-// ** Drag **************************************************************** /*FOLD00*/
+// ** Drag **************************************************************** /*fold00*/
 
 VOID Drag (HWND hwnd)
@@ -116 +110 @@
 }
 
-// ** FrameProcedure ****************************************************** /*FOLD00*/
+// ** FrameProcedure ****************************************************** /*fold00*/
 
 MRESULT EXPENTRY FrameProcedure (HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
@@ -279 +273 @@
             break;
 
-        case WID_PB_SETCAPTURETYPE:
-            //int capType;
-
-            switch (pset->QuerySSWCaptureType ())
-            {
-            case CAP_WINDOWINT:
-                WinSendMsg (hwndFrame, WM_COMMAND,
-                            MPFROM2SHORT (WID_PB_WINDOWINTERIOR,0), 0);
-            case CAP_SCREENREGION:
-                WinSendMsg (hwndFrame, WM_COMMAND,
-                            MPFROM2SHORT (WID_PB_SCREENREGION,0), 0);
-            case CAP_WINDOW:
-                WinSendMsg (hwndFrame, WM_COMMAND,
-                            MPFROM2SHORT (WID_PB_WINDOW,0), 0);
-            default:
-               WinSendMsg (hwndFrame, WM_COMMAND,
-                            MPFROM2SHORT (WID_PB_SCREEN,0), 0);
-            }
-            break;
-
         case WID_PB_SCREEN:
             usCap = CAP_SCREEN;
-#ifdef _QUIET_
-//#if 1
-            WinShowWindow (g_hwndSettingsDialog, FALSE);
-            // WinSendMsg (g_hwndSettingsDialog, WM_CLOSE, 0,0); //Needs to go to the setting dialog
-            // Replace current global with pset->GetSettingDialogHwnd () or such
-            // Need for all 4 cases;
-#endif
             WinSendMsg (hwnd, UM_PREPARECAPTURE, 0,0);
             break;
@@ -313 +280 @@
         case WID_PB_SCREENREGION:
             usCap = CAP_SCREENREGION;
-#ifdef _QUIET_
-//#if 1
-            WinShowWindow (g_hwndSettingsDialog, FALSE);
-#endif
             WinSendMsg (hwnd, UM_PREPARECAPTURE, 0,0);
             break;
@@ -322 +285 @@
         case WID_PB_WINDOWINTERIOR:
             usCap = CAP_WINDOWINT;
-#ifdef _QUIET_
-//#if 1
-            WinShowWindow (g_hwndSettingsDialog, FALSE);
-#endif
             WinSendMsg (hwnd, UM_PREPARECAPTURE, 0,0);
             break;
@@ -331 +290 @@
         case WID_PB_WINDOW:
             usCap = CAP_WINDOW;
-#ifdef _QUIET_
-//#if 1
-            WinShowWindow (g_hwndSettingsDialog, FALSE);
-#endif
             WinSendMsg (hwnd, UM_PREPARECAPTURE, 0,0);
             break;
@@ -359 +314 @@
 
         usState = STATE_WAITFORHIDE;
-
-        if (usCap == CAP_SCREENREGION || usCap == CAP_SCREEN) {
-#ifdef _QUIET_
-            hwndParent = WinQueryFocus(HWND_DESKTOP);
-#else
-            hwndParent = WinQueryWindow(hwndFrame, QW_NEXTTOP );
-#endif
-        }
-#ifndef _QUIET_
-//#if 0
         if (WinQueryButtonCheckstate (hwnd, WID_CB_HIDEWINDOW))
             WinShowWindow (WinQueryWindow (hwnd, QW_PARENT), FALSE);
         else
-#endif
             WinSendMsg (hwnd, UM_WINDOWHIDDEN, 0,0);
         return MRESULT (FALSE);
@@ -402 +346 @@
             {
                 usState = STATE_WINDOWSELECTED;
-                int rc = saymsg2(1, hwnd,  "Capture", "Do you wish to continue?");
-                
-                if (rc == 1)
-                    WinPostMsg (hwnd, UM_WINDOWSELECTED,
-                                MPFROMHWND (HWND_DESKTOP),
-                                MPFROMHWND (HWND_DESKTOP));
-                if (rc == 2)
-                    WinSendMsg (hwnd, UM_ABORT, 0,0);
-                if (rc == 3) {
-                    pset->Dialog ();
-                    WinPostMsg (hwnd, UM_WINDOWSELECTED,
-                                MPFROMHWND (HWND_DESKTOP),
-                                MPFROMHWND (HWND_DESKTOP));
-                }
+                WinPostMsg (hwnd, UM_WINDOWSELECTED,
+                            MPFROMHWND (HWND_DESKTOP),
+                            MPFROMHWND (HWND_DESKTOP));
             }
             else
@@ -484 +417 @@
                                                              FALSE));
             hwndCap = HWND (mp1);
-            if (usCap != CAP_SCREENREGION && usCap != CAP_SCREEN)
-                hwndParent = HWND (mp2);
+            hwndParent = HWND (mp2);
             if (pset->SerialCapture ())
             {
@@ -546 +478 @@
             // capture the window to a bitmap and save this
             if (usCap == CAP_SCREENREGION)
-                hbm = CaptureWindow (hwndCap, hwndParent, &rcl, FALSE);
-            else if (usCap == CAP_SCREEN)
-                hbm = CaptureWindow (hwndCap, hwndParent, NULL, FALSE);
+                hbm = CaptureWindow (hwndCap, hwndParent, &rcl, TRUE);
             else
                 hbm = CaptureWindow (hwndCap, hwndParent, NULL, TRUE);
@@ -582 +512 @@
             WinSetCapture (HWND_DESKTOP, NULLHANDLE);
 
-        pset->Load ();
-
         WinSendMsg (hwndSnapshot, UM_STOPCAPTURE, 0,0);
         WinStopTimer (hab, hwnd, ulTimer);
-#ifdef _QUIET_
-//#if 1
-        // ? FIXME to give option to reshow window.
-        if (WinQueryButtonCheckstate (hwnd, WID_CB_HIDEWINDOW))
-            WinSendMsg (g_hwndSettingsDialog, WM_CLOSE, 0,0);
-        else if (WinIsWindow ( hab, g_hwndSettingsDialog) &&
-            ! WinIsWindowVisible (g_hwndSettingsDialog))
-            WinShowWindow (g_hwndSettingsDialog, TRUE);
-        pset->HideWindow (TRUE);
-#else
+
         // re-show the windows if they are hidden
         // FIXME using global hwndFrame is pretty yukki
@@ -602 +521 @@
         if (! WinIsWindowVisible (hwndSnapshot) && pset->SnapshotWindow ())
             WinShowWindow (hwndSnapshot, TRUE);
-#endif
+
         WinEnableWindow (hwnd, TRUE);
         WinSetActiveWindow (HWND_DESKTOP, hwnd);

/trunk/makefile

@@ -35 +35 @@
 GOTBUILDMACHINE = Zobopeep
 !endif
-!ifdef %_QUIET_
-GOTCHAEXE = gotchaq
-!else
-GOTCHAEXE = gotcha
-!endif
 
 CC = wpp386.exe
@@ -52 +47 @@
 SED = sed.exe
 
-!ifdef %_QUIET_
-CFLAGS = -D_QUIET_ -otexan -zp4 -6r
-!else
 CFLAGS = -otexan -zp4 -6r
-!endif 
-
 RFLAGS = -bt=os2 -zm
 
-LFLAGS = op map=$(GOTCHAEXE) 
+LFLAGS = op map=gotcha
 
 SRCDIR = U:\Gotcha_Workspace\trunk
@@ -68 +58 @@
 PMPRINTFPATH = U:\PMPrintf
 
-all:  dll resources $(GOTCHAEXE).exe
+all:  dll resources gotcha.exe
 
 dll:  .symbolic
@@ -88 +78 @@
     $(CHDIR) ..
     
-$(GOTCHAEXE).lnk: $(GOTCHAEXE).lnk.tpl  
+gotcha.lnk: gotcha.lnk.tpl  
   $(SED) -e "s;(GOTMAJOR);$(GOTMAJOR);g" &
     -e "s;(GOTMINOR);$(GOTMINOR);g"   &
@@ -96 +86 @@
     -e "s;Sun \|Mon \|Tue \|Wed \|Thu \|Fri \|Sat ;;g" &
     -e "s;(GOTBUILDMACHINE);$(GOTBUILDMACHINE);g"   &
-    $(GOTCHAEXE).lnk.tpl > $(GOTCHAEXE).lnk  
+    gotcha.lnk.tpl > gotcha.lnk  
 
-$(GOTCHAEXE).exe: $(GOTCHAEXE).lnk gotcha.obj about.obj helper.obj rstring.obj settings.obj gotcha.res 
-    $(LINK) $(LFLAGS) @$(GOTCHAEXE).lnk f &
+gotcha.exe: gotcha.lnk gotcha.obj about.obj helper.obj rstring.obj settings.obj gotcha.res 
+    $(LINK) $(LFLAGS) @gotcha.lnk f &
     gotcha.obj, &
     about.obj,  &
@@ -106 +96 @@
     settings.obj &
     lib dll\gotchdll.lib lib mmpm2.lib lib $(GBMPATH)\gbm.lib lib $(SRCDIR)\tools\gbmmemw.lib lib $(PMPRINTFPATH)\pmprintf.lib
-    $(RC) $(RFLAGS) $(SRCDIR)\gotcha.res $(GOTCHAEXE).exe
-    $(PERL) $(MAPSYMW) $(GOTCHAEXE).map 
-    mapxqs.exe $(GOTCHAEXE).map
-    lxlite $(GOTCHAEXE).exe /x- /b-
-    lxlite $(GOTCHAEXE).exe /c:minstub
+    $(RC) $(RFLAGS) $(SRCDIR)\gotcha.res gotcha.exe
+    $(PERL) $(MAPSYMW) gotcha.map 
+    mapxqs.exe gotcha.map
+    lxlite gotcha.exe /x- /b-
+    lxlite gotcha.exe /c:minstub
     $(COPY) *.exe *.sym *.xqs *.map* readme* bin
         

/trunk/makefile.emx

@@ -56 +56 @@
                         $(TMP)/helper.$(o) \
                         $(TMP)/rstring.$(o) \
+                        $(TMP)/mmio.$(o) \
                         $(TMP)/settings.$(o) \
                         $(SRC)/gotcha.def \

/trunk/portbras/gotresbr.rc

@@ -276 +276 @@
     IDS_BMF_PBM        "Portable Pixel-map (ppm)"
     IDS_BMF_JP2        "Jpeg 2000 (provided by the Open Source OpenJPEG library) (jp2)"
+    IDS_BMF_JBG        "JBIG Joint Bi-level Image experts Group (jbg)"
+    IDS_BMF_RAW        "Camera RAW Image Format (raw)"
     IDS_BMF_DIB        "Device Independent Bitmap (dib)"
 

/trunk/savebmp.cpp

@@ -24 +24 @@
 #include "model.h"
 
+#define  __PMPRINTF__
+#include "PMPRINTF.H"
+
 /* ------------------------------ */
 static int StrideOf(const MOD *mod)
 {
+    DebugHereIAm();
         return ( ( mod->gbm.w * mod->gbm.bpp + 31 ) / 32 ) * 4;
         }
@@ -37 +41 @@
         if ( (mod->pbData = (UCHAR*) gbmmem_malloc(stride * mod->gbm.h)) == NULL )
             return FALSE;
+        DebugHereIAm();
         return TRUE;
         }
@@ -54 +59 @@
         if ( !AllocateData(modNew) )
             return MOD_ERR_MEM;
+        DebugHereIAm();
         return MOD_ERR_OK;
         }
@@ -79 +85 @@
 
         if ( (mrc = ModCreate(w, h, bpp, NULL, modNew)) != MOD_ERR_OK )
-            return mrc;
-
+                return mrc;
+        DebugHereIAm();
         memset(&(bm.bmp2), 0, sizeof(bm.bmp2));
         bm.bmp2.cbFix     = sizeof(BITMAPINFOHEADER2);
@@ -99 +105 @@
                         }
                 }
+        DebugHereIAm();
         return MOD_ERR_OK;
         }
@@ -120 +127 @@
             return grc;
         }
+        PmpfF(( "file type %i", ft ));
+        DebugHereIAm();
         gbm_query_filetype(ft, &gbmft);
-        
+        PmpfF(( "file type %i name %s flags %i bpp %i", ft, gbmft.short_name,
+               gbmft.flags, mod->gbm.bpp));
         switch ( mod->gbm.bpp )
                 {
@@ -133 +143 @@
         if ( (gbmft.flags & flag) == 0 )
             return MOD_ERR_SUPPORT;
-        
+        DebugHereIAm();
         if ( (fd = gbm_io_create(szFn, GBM_O_WRONLY)) == -1 )
                 return MOD_ERR_CREATE;
-        
-        if ( (grc = gbm_write(szFn, fd, ft, &(mod->gbm), mod->gbmrgb,
-                              mod->pbData, szOpt)) != GBM_ERR_OK )
+        DebugHereIAm();
+        if ( (grc = gbm_write(szFn, fd, ft, &(mod->gbm), mod->gbmrgb, mod->pbData, szOpt)) != GBM_ERR_OK )
                 {
                 gbm_io_close(fd);
@@ -144 +153 @@
                 return MOD_ERR_GBM(grc);
                 }
-        
+        DebugHereIAm();
         gbm_io_close(fd);
+        DebugHereIAm();
         return MOD_ERR_OK;
         }
@@ -151 +161 @@
 // ** SaveBitmap ********************************************************** /*FOLD00*/
 
-VOID SaveBitmap (HBITMAP hbm, HPS hps, int width, int height,
-                 int bitCount, char *title)
+VOID SaveBitmap (HBITMAP hbm, HPS hps, int width, int height, int bitCount)
 {
 #ifdef _DOLOGMEM_
@@ -163 +172 @@
         PSZ psz = pset->QueryForceSaveFile();
         psz = AddExtensionToFilename( psz );
-        ModCreateFromHPS( hps, width, height,
-                         (bitCount > 8 ) ? 24 : bitCount,
-                         &newmod );
-        ModWriteToFile(&newmod, psz, "" );
-        
+        //
+        /*if( ( pset->QueryFileFormat() == BMF_12 ) ||
+           ( pset->QueryFileFormat() == BMF_16 ) ||
+           ( pset->QueryFileFormat() == BMF_20 ) ) {
+            SaveBitmapToFile( hbm, psz, hps );
+            DebugHereIAm();
+        }
+        else { */
+            ModCreateFromHPS( hps, width, height,
+                             (bitCount > 8 ) ? 24 : bitCount,
+                             &newmod );
+            ModWriteToFile(&newmod, psz, "" );
+        //}
 #ifdef _DOLOGMEM_
         LogMem( "SaveBitmap-1", FALSE );
@@ -191 +208 @@
         LogDebug( "SaveBitmap()" );
 #endif
-        if (SelectSaveFile (title)) {
+        if (SelectSaveFile ()) {
 #ifdef _DOLOGDEBUG_
             LogDebug( "Before call to SaveBitmapToFile()" );
 #endif
-            ModCreateFromHPS( hps, width, height,
-                             (bitCount > 8 ) ? 24 : bitCount,
-                             &newmod );
-            ModWriteToFile(&newmod, pset->QuerySaveFile (), "" );
-
+            //DebugHereIAm();
+            /*if( ( pset->QueryFileFormat() == BMF_12 ) ||
+               ( pset->QueryFileFormat() == BMF_16 ) ||
+               ( pset->QueryFileFormat() == BMF_20 ) ) {
+                DebugHereIAm();
+                SaveBitmapToFile( hbm, pset->QuerySaveFile (), hps );
+                DebugHereIAm();
+            }
+            else {*/
+                ModCreateFromHPS( hps, width, height,
+                                 (bitCount > 8 ) ? 24 : bitCount,
+                                 &newmod );
+                ModWriteToFile(&newmod, pset->QuerySaveFile (), "" );
+            //}
 #ifdef _DOLOGDEBUG_
             LogDebug( "After call to SaveBitmapToFile()" );
@@ -230 +256 @@
 
 // ** SaveBitmapToFile **************************************************** /*FOLD00*/
-#if 0
+
 #define CB_12HEADER       sizeof (BITMAPINFOHEADER) // == 12
 #define CB_16HEADER       (sizeof (BITMAPINFOHEADER2)-24)
 #define CB_20HEADER       sizeof (BITMAPINFOHEADER2) // == 64
 
-
+#if 0
 VOID SaveBitmapToFile (HBITMAP hbm, PSZ psz, HPS hps)
 {
@@ -416 +442 @@
     }
 
+    /*else {
+#ifdef _DOLOGDEBUG_
+        LogDebug( "SaveBitmapToFile(): Starting 'else' path." );
+#endif
+        PFN xmmioClose = pset->GetMMIO()->pfmmioClose;
+//        PFN xmmioOpen = pset->GetMMIO()->pfmmioOpen;
+        PFN xmmioWrite = pset->GetMMIO()->pfmmioWrite;
+        PFN xmmioQueryHeaderLength = pset->GetMMIO()->pfmmioQueryHeaderLength;
+        PFN xmmioSetHeader = pset->GetMMIO()->pfmmioSetHeader;
+
+#ifdef _DOLOGDEBUG_
+    LogDebug( "SaveBitmapToFile(): Before GetFOURCC." );
+#endif
+        // ********* WRITE TARGET
+        FOURCC fccTargetIOProc = pset->GetFOURCC();
+
+        // Initialize our info MMIOINFO structure.
+        MMIOINFO mmioinfoTarget;
+#ifdef _DOLOGDEBUG_
+    LogDebug( "SaveBitmapToFile(): Before memset." );
+#endif
+        memset( &mmioinfoTarget, 0L, sizeof( MMIOINFO ) );
+        mmioinfoTarget.fccIOProc   = fccTargetIOProc;
+        mmioinfoTarget.ulTranslate = MMIO_TRANSLATEHEADER | MMIO_TRANSLATEDATA;
+
+#ifdef _DOLOGDEBUG_
+        LogDebug( "SaveBitmapToFile(): Trying to open file." );
+#endif
+        // Open target file.
+        HMMIO hmmioTarget;
+        if( ! ( hmmioTarget = mmioOpen( psz,
+                                        &mmioinfoTarget,
+                                        MMIO_CREATE | MMIO_WRITE |
+                                        MMIO_DENYWRITE | MMIO_NOIDENTIFY ))) {
+            DisplayError ("mmioOpen()-Error",
+                          "mmioOpen()-Error %ld", mmioinfoTarget.ulErrorRet );
+            return;
+        }
+#ifdef _DOLOGDEBUG_
+        LogDebug( "SaveBitmapToFile(): Open file ok." );
+#endif
+
+        // Set the target header.
+        ULONG ulImageHeaderLength;
+
+        mmioQueryHeaderLength( hmmioTarget, (PLONG)&ulImageHeaderLength, 0L, 0L );
+        if( ulImageHeaderLength != sizeof( MMIMAGEHEADER ) )
+        {
+            // We have a problem.....possibly incompatible versions.
+            mmioClose( hmmioTarget, 0L );
+            DisplayError ("mmioQueryHeaderLength()-Error",
+                          "mmioQueryHeaderLength()-Error",
+                          WinGetLastError (hab));
+            return;
+        }
+#ifdef _DOLOGDEBUG_
+        LogDebug( "SaveBitmapToFile(): xmmioQueryHeaderLength ok." );
+#endif
+
+        MMIMAGEHEADER mmImgHdr;
+        mmImgHdr.ulHeaderLength = ulImageHeaderLength;
+        mmImgHdr.ulContentType  = MMIO_IMAGE_UNKNOWN;
+        mmImgHdr.ulMediaType    = MMIO_MEDIATYPE_IMAGE;
+
+#ifdef _DOLOGDEBUG_
+    LogDebug( "SaveBitmapToFile(): Before memcpy (colors)." );
+#endif
+        memcpy( mmImgHdr.bmiColors,
+                PBYTE( &( pbfh2->bmp2 ) ) + sizeof( BITMAPINFOHEADER2 ),
+                cbColtab );
+
+        mmImgHdr.mmXDIBHeader.XDIBHeaderPrefix.ulMemSize = cbBits; // FIXME;
+        mmImgHdr.mmXDIBHeader.XDIBHeaderPrefix.ulPelFormat = 0; // FIXME;
+        mmImgHdr.mmXDIBHeader.XDIBHeaderPrefix.usTransType = 0; // FIXME
+        mmImgHdr.mmXDIBHeader.XDIBHeaderPrefix.ulTransVal = 0;  // FIXME
+        memcpy( &(mmImgHdr.mmXDIBHeader.BMPInfoHeader2), &bih2, sizeof (BITMAPINFOHEADER2));
+
+#ifdef _DOLOGDEBUG_
+    LogDebug( "SaveBitmapToFile(): Before xmmioSetHeader." );
+#endif
+        ULONG ulBytesRead;
+        if( ( rc = (LONG)mmioSetHeader( hmmioTarget, (MMIMAGEHEADER*)&mmImgHdr,
+                                         (LONG)sizeof( MMIMAGEHEADER ), (PLONG)&ulBytesRead,
+                                         0L, 0L ) ) != MMIO_SUCCESS )
+        {
+            // Header unavailable.
+            mmioClose( hmmioTarget, 0L );
+            DisplayError ("mmioSetHeader()-Error",
+                          "mmioSetHeader()-Error %ld", rc );
+            return;
+        }
+#ifdef _DOLOGDEBUG_
+        LogDebug( "SaveBitmapToFile(): xmmioSetHeader ok." );
+#endif
+
+        // write the actual bitmap data bits
+        if( ( rc = mmioWrite( hmmioTarget, (CHAR *) pb, cbBits ) ) == MMIO_ERROR )
+            DisplayError ("mmioWrite()-Error",
+                          "mmioWrite()-Error %ld", rc );
+#ifdef _DOLOGDEBUG_
+        LogDebug( "SaveBitmapToFile(): xmmioWrite ok." );
+#endif
+
+        if( ( rc = mmioClose( hmmioTarget, 0 ) ) != MMIO_SUCCESS )
+            DisplayError ("mmioClose()-Error",
+                          "mmioClose()-Error %ld", rc );
+#ifdef _DOLOGDEBUG_
+        LogDebug( "SaveBitmapToFile(): xmmioClose ok." );
+#endif
+    } */
+
 #ifdef _DOLOGDEBUG_
     LogDebug( "SaveBitmapToFile(): Everything done, closed file" );
@@ -432 +569 @@
 #endif
 // ** SetEAs ************************************************************** /*FOLD00*/
-#if 0
+
 BOOL SetEAs (PSZ psz)
 {
@@ -484 +621 @@
     return TRUE;
 }
-#endif
+
 // ** SelectSaveFile ****************************************************** /*FOLD00*/
 
-BOOL SelectSaveFile (char *title)
+BOOL SelectSaveFile (VOID)
 {
 #ifdef _DOLOGMEM_
@@ -496 +633 @@
     {
         CHAR   ach[_MAX_PATH];
-        for (USHORT i = 0; i < 100; i++)
+        for (USHORT i = 0; i < 10000; i++)
         {
-            sprintf( ach, "%s\\%s%02d.%s", pset->QueryNumSaveDir(),
-                    title, i, pset->GetFileExtension() );
+            sprintf( ach, "%s\\got%05d.%s", pset->QueryNumSaveDir(), i,
+                     pset->GetFileExtension() );
             if (access (ach, 0) != 0)
             {

/trunk/setgot.cmd

@@ -1 +1 @@
 
-SET GOTMAJOR=2
-SET GOTMINOR=0
+SET GOTMAJOR=1
+SET GOTMINOR=80
 SET GOTREVISION=0
-SET GOTFIXLEVEL=beta2
+SET GOTFIXLEVEL=0
 time > CLIP: < timetemp
 input %%GOTBUILDDATE < CLIP:

/trunk/settings.cpp

@@ -27 +27 @@
     // FIXME nls*/
 
-bool saveum = FALSE;
 SWP swpDef = { 0,0,0, 98,66, 0,0,0,0 };
 SWP swpDefSSW = { 0,0,0, 10,10, 0,0,0,0 };
@@ -33 +32 @@
 USHORT ausDefSSW[7] = { 0 };
 
+#if 0
 ImageFormatInfo Settings::ifi[BMF_INVALID] =
 {
-    { TRUE, BMF_JPG,   "JPEG Interchange File Format (jpg)", "jpg", "JPG" },
-    { TRUE, BMF_PNG,   "Portable Network Graphics (png)", "png", "PNG" },
-    { TRUE, BMF_OS20,  "OS/2 Bitmap 2.0 (bmp)", "bmp", "Bitmap" },
-    { TRUE, BMF_TIF,   "Microsoft/Aldus Tagged Image File Format (tif)", "tif", "TIFF" },
-    { TRUE, BMF_TGA,   "Truevision Targa/Vista (tga)", "tga", "Targa" },
-    { TRUE, BMF_PCX,   "ZSoft PC Paintbrush Image Format (pcx)", "pcx", "PCX" },
-    { TRUE, BMF_GIF,   "Portable Anymap (pnm)", "pnm", "PNM" },
-    { TRUE, BMF_PBM,   "Portable Pixel-map (ppm)", "ppm", "PPM" },
-    { TRUE, BMF_JP2,   "Jpeg 2000 (provided by the Open Source OpenJPEG library) (jp2)", "jp2", "JP2" },
-    { TRUE, BMF_DIB,   "Device Independent Bitmap (dib)", "dib", "DIB" }
+    { TRUE,  BMF_12,   0L, "Bitmap 1.2 (Saved using Gotcha! internal routine)", "bmp", "Bitmap" },
+    { TRUE,  BMF_16,   0L, "Bitmap 1.6 (Saved using Gotcha! internal routine)", "bmp", "Bitmap" },
+    { TRUE,  BMF_20,   0L, "Bitmap 2.0 (Saved using Gotcha! internal routine)", "bmp", "Bitmap" },
+    { FALSE, BMF_OS13, mmioFOURCC( 'O','S','1','3' ), "Bitmap 1.3 (Saved using OS/2 Multimedia)", "bmp", "Bitmap" },
+    { FALSE, BMF_OS20, mmioFOURCC( 'O','S','2','0' ), "Bitmap 2.0 (Saved using OS/2 Multimedia)", "bmp", "Bitmap" },
+    { FALSE, BMF_TIF,  mmioFOURCC( 'T','F','M','C' ), "TIFF compressed", "tif", "TIFF" },
+    { FALSE, BMF_TIFU, mmioFOURCC( 'T','F','M','U' ), "TIFF uncompressed", "tif", "TIFF" },
+    { FALSE, BMF_TGA,  mmioFOURCC( 'T','G','A','C' ), "TGA", "tga", "Targa" },
+    { FALSE, BMF_PCX,  mmioFOURCC( 'P','C','X','C' ), "PCX", "pcx", "PCX" },
+    { FALSE, BMF_GIF,  mmioFOURCC( 'G','I','F','C' ), "GIF", "gif", "GIF" },
+    { FALSE, BMF_JPG,  mmioFOURCC( 'J','P','E','G' ), "Jpeg (Probably won't work, reason unknown)", "jpg", "JPG" },
+    { FALSE, BMF_DIB,  mmioFOURCC( 'R','D','I','B' ), "DIB (Device Independent Bitmap)", "dib", "DIB" }
 };
 
+#else
+// pbm and gif don't save anything
+ImageFormatInfo Settings::ifi[BMF_INVALID] =
+{
+    { TRUE, BMF_JPG,  0L, "JPEG Interchange File Format (jpg)", "jpg", "JPG" },
+    { TRUE, BMF_PNG,  0L, "Portable Network Graphics (png)", "png", "PNG" },
+    { TRUE, BMF_OS20, 0L, "OS/2 Bitmap 2.0 (bmp)", "bmp", "Bitmap" },
+    { TRUE, BMF_TIF,  0L, "Microsoft/Aldus Tagged Image File Format (tif)", "tif", "TIFF" },
+    { TRUE, BMF_TGA,  0L, "Truevision Targa/Vista (tga)", "tga", "Targa" },
+    { TRUE, BMF_PCX,  0L, "ZSoft PC Paintbrush Image Format (pcx)", "pcx", "PCX" },
+    { TRUE, BMF_GIF,  0L, "Portable Anymap (pnm)", "pnm", "PNM" },
+    { TRUE, BMF_PBM,  0L, "Portable Pixel-map (ppm)", "ppm", "PPM" },
+    { TRUE, BMF_JP2,  0L, "Jpeg 2000 (provided by the Open Source OpenJPEG library) (jp2)", "jp2", "JP2" },
+    { TRUE, BMF_JBG,  0L, "JBIG Joint Bi-level Image experts Group (jbg)", "jbg", "JBG" },
+    { TRUE, BMF_RAW,  0L, "Camera RAW Image Format (raw)", "raw", "RAW" },
+    { TRUE, BMF_DIB,  0L, "Device Independent Bitmap (dib)", "dib", "DIB" }
+};
+#endif
 
 PTHTH_SE apse[] =
@@ -81 +101 @@
     new THTH_SEB (SEI_USSSW, "Snapshot", "US", &ausDefSSW, sizeof (ausDefSSW)),
 
-    new THTH_SES (SEI_LANGUAGE,     "Language", "Program", PSZ_DEFAULTLANGUAGEMOD),
+    new THTH_SES (SEI_LANGUAGE,     "Language", "Program", PSZ_DEFAULTLANGUAGE),
     new THTH_SES (SEI_LANGUAGEHELP, "Language", "Help", PSZ_DEFAULTLANGUAGEHELP),
 
@@ -92 +112 @@
 
 Settings :: Settings (VOID) :
-#ifdef _QUIET_
-//#if 1
-    ththSettings(apse, "gotchaq.ini", L_PROFILEVERSION)
-#else
-    ththSettings(apse, "gotcha.ini", L_PROFILEVERSION)
-#endif
+ththSettings(apse, "gotcha.ini", L_PROFILEVERSION)
 {
     if( ! QueryFlag( SEI_UPDATE178DONE ) ) {
@@ -120 +135 @@
         ReloadResources (QueryString(SEI_LANGUAGE));
     }
+
+    // See if we can use OS/2 Multimedia:
+    mmio = new thth_MMIO();
+    if( ! mmio->IsValid() ) {
+        delete mmio;
+        mmio = NULL;
+        if( mmio->step > 0 )
+            DisplayError( "MMIO-Error",
+                          "Could not load Multimedia IO extension. (rc=%d, step=%d)", mmio->rc, mmio->step );
+    } else {
+        MMFORMATINFO  mmfi;
+        ULONG lNumFormats = 30;
+        LONG lReturned;
+        PMMFORMATINFO pv = PMMFORMATINFO( malloc( sizeof( MMFORMATINFO ) * lNumFormats ) );
+        memset( &mmfi, 0, sizeof( MMFORMATINFO ) );
+        mmfi.ulMediaType = MMIO_MEDIATYPE_IMAGE;
+
+        if( pv ) {
+            if( mmioGetFormats( &mmfi, lNumFormats, pv, &lReturned, 0, 0 )
+                != MMIO_SUCCESS ) {
+                DisplayError( "MMIO-Error",
+                              "Could not get Multimedia-IO-Format information." );
+            } else {
+                /*            DisplayError( "MMIO-Error",
+                 "'%d' formats returned", lReturned ); */
+                for( int i = 0; i < lReturned; i++ ) {
+                    for( int j = 0; j < BMF_INVALID; j++ ) {
+                        if( ifi[j].fourcc == pv[i].fccIOProc )
+                        {
+                            ifi[j].available = TRUE;
+                            break;
+                        }
+                    }
+                }
+            }
+        } else {
+            DisplayError( "MMIO-Error",
+                          "Could not get Multimedia-IO-Format information (no memory)." );
+        }
+    }
 }
 
@@ -146 +201 @@
 // FIXME YUKKI! YUKKI!! YUKKI!!! But I'm too lazy to do it better now :-)
 HWND g_hwndSettingsDialog = NULL;
-HWND g_hwndPage0 = NULL;
 
 BOOL SETTINGS :: Dialog (BOOL fOnlyLanguage)
@@ -218 +272 @@
                         MPFROMLONG (idPage[i]), MPFROMP (pszPageTab[i]));
         }
-#ifndef _QUIET_
-//#if 0
+
         // open and assign dialogs to pages
         hwndPage[0] = WinLoadDlg (hwndNB, hwndNB, (PFNWP) Page1Procedure,
@@ -229 +282 @@
         hwndPage[3] = WinLoadDlg (hwndNB, hwndNB, (PFNWP) Page4Procedure,
                                   GETMODULE, ID_DLG_SETTINGSPAGE4, this);
-#else
-        hwndPage[0] = WinLoadDlg (hwndNB, hwndNB, (PFNWP) WindowProcedure,
-                                  GETMODULE, ID_DLG_SETTINGSPAGE0, this);
-        hwndPage[1] = WinLoadDlg (hwndNB, hwndNB, (PFNWP) Page1Procedure,
-                                  GETMODULE, ID_DLG_SETTINGSPAGE1, this);
-        hwndPage[2] = WinLoadDlg (hwndNB, hwndNB, (PFNWP) Page2Procedure,
-                                  GETMODULE, ID_DLG_SETTINGSPAGE2, this);
-        hwndPage[3] = WinLoadDlg (hwndNB, hwndNB, (PFNWP) Page4Procedure,
-                                  GETMODULE, ID_DLG_SETTINGSPAGE4, this);
-        g_hwndPage0 = hwndPage[0];
-        
-#endif
     }
 #ifdef _DOLOGDEBUG_
@@ -261 +302 @@
     LogDebug( "Dialog: checkpoint 6" );
 #endif
-    WinSendDlgItemMsg (g_hwndPage0, WID_RB_FILE, BM_CLICK,
-                       MPFROMSHORT (TRUE), 0);
-    WinSendDlgItemMsg (g_hwndPage0, WID_CB_HIDEWINDOW, BM_SETCHECK,
-                       MPFROMLONG (TRUE), MPFROMLONG (0));
+
     //WinSetFocus (WinWindowFromID (hwndDlg, WID_PB_OK), TRUE);
     //WinSetFocus( hwndPage[0], TRUE );
@@ -324 +362 @@
             LogDebug( "DialogProcedure: start WID_PB_OK" );
 #endif
-            saveum = TRUE;
             WinSendMsg (hwnd, WM_CLOSE, 0,0);
 #ifdef _DOLOGDEBUG_
@@ -343 +380 @@
                                            BKM_QUERYPAGEWINDOWHWND,
                                            MPFROMLONG (id), 0);
-                // Make mp1 1 for default use it to select setting on pages
                     WinSendMsg (hwndPage, UM_SETTINGS2DIALOG, 0,0);
                 }
@@ -497 +533 @@
             WinSendDlgItemMsg( hwnd, WID_LB_FILEFORMAT, LM_SELECTITEM,
                                MPFROMSHORT(0), MPFROMSHORT(TRUE) );
-#ifdef _QUIET_
-//#if 1
-        // set play sound button
-        pset->AdjustButton (hwnd, WID_CB_DOSOUND,
-                            pset->DoSound ());
-#endif
+
         // Select appropriate radiobutton for save style.
         switch (pset->QueryFileSaveStyle ())
@@ -544 +575 @@
             else
                 pset->SetFileSaveStyle (FSS_PROMPT);
-#ifdef _QUIET_
-//#if 1
-            pset->DoSound(WinQueryButtonCheckstate
-                          (hwnd, WID_CB_DOSOUND));
-#endif
 #ifdef _DOLOGDEBUG_
             LogDebug( "Page1Procedure: checkpoint 1" );
@@ -580 +606 @@
             AdjustSaveTypeButtons
                 (BOOL (pset->QueryFileSaveStyle () == FSS_FORCEFILE));
-            pset->saveStyle = pset->QuerySaveStyle ();
-            pset->pNumSaveDir = pset->QueryNumSaveDir ();
-            pset->pForceSaveFile = pset->QueryForceSaveFile();
-
-            if (saveum)
-                pset->Save ();
 #ifdef _DOLOGDEBUG_
             LogDebug( "Page1Procedure: end UM_ADJUST" );
@@ -610 +630 @@
 }
 
-// ** Page2Procedure ****************************************************** /*FOLD00*/
+// ** Page2Procedure ****************************************************** /*fold00*/
 
 MRESULT EXPENTRY
@@ -645 +665 @@
         pset->AdjustButton (hwnd, WID_CB_SSWALWAYSONTOP,
                             pset->SSWAlwaysOnTop ());
-#ifdef _QUIET_
-//#if 1
-        pset->AdjustButton (hwnd, WID_CB_SERIALCAPTURE,
-                            pset->SerialCapture ());
-        pset->AdjustButton (hwnd, WID_CB_DELAYCOUNTDOWN,
-                            pset->DelayCountdown ());
-
-        // init delay time sb
-        WinSendDlgItemMsg (hwnd, WID_SB_DELAYTIME, SPBM_SETLIMITS,
-                           MPFROMLONG (65536), MPFROMLONG (1));
-        WinSendDlgItemMsg (hwnd, WID_SB_DELAYTIME, SPBM_SETCURRENTVALUE,
-                           MPFROMLONG (pset->QueryDelayTime ()), 0);
-
-        // init serial time sb
-        WinSendDlgItemMsg (hwnd, WID_SB_SERIALTIME, SPBM_SETLIMITS,
-                           MPFROMLONG (65536), MPFROMLONG (1));
-        WinSendDlgItemMsg (hwnd, WID_SB_SERIALTIME, SPBM_SETCURRENTVALUE,
-                           MPFROMLONG (pset->QuerySerialTime ()), 0);
-#endif
+
         switch (pset->QuerySSWCaptureType ())
         {
@@ -700 +702 @@
             LogDebug( "Page2Procedure: start UM_ADJUST" );
 #endif
-#ifndef _QUIET_
-//#if 0
         // query state of checkbuttons and set flags
         pset->SSWHide(WinQueryButtonCheckstate(hwnd, WID_CB_SSWHIDE));
@@ -713 +713 @@
             LogDebug( "Page2Procedure: checkpoint 2" );
 #endif
-#else
-            // query state of checkbuttons and set flags
-            pset->SerialCapture(WinQueryButtonCheckstate
-                                (hwnd, WID_CB_SERIALCAPTURE));
-#ifdef _DOLOGDEBUG_
-            LogDebug( "Page3Procedure: checkpoint 1" );
-#endif
-            pset->DelayCountdown(WinQueryButtonCheckstate
-                                 (hwnd, WID_CB_DELAYCOUNTDOWN));
-#endif
+
         // get ssw capture type
         if (WinSendMsg (WinWindowFromID (hwnd, WID_SSWSCREENREGION),
@@ -735 +726 @@
         else
             pset->SetSSWCaptureType (CAP_SCREEN);
-#ifdef _QUIET_
-//#if 1
-        // delay time
-        ULONG   ul;
-        if (! BOOL (WinSendDlgItemMsg (hwnd, WID_SB_DELAYTIME,
-                                       SPBM_QUERYVALUE,
-                                       MPFROMP (&ul),
-                                       MPFROM2SHORT (0, 0))))
-            ul = 5L;
-        pset->SetDelayTime (ul);
-#ifdef _DOLOGDEBUG_
-        LogDebug( "Page3Procedure: checkpoint 3" );
-#endif
-
-        // serial time
-        if (! BOOL (WinSendDlgItemMsg (hwnd, WID_SB_SERIALTIME,
-                                       SPBM_QUERYVALUE,
-                                       MPFROMP (&ul),
-                                       MPFROM2SHORT (0, 0))))
-            ul = 10L;
-        pset->SetSerialTime (ul);
-        pset->bSerialCapture = pset->SerialCapture ();
-#endif
-        if (saveum)
-            pset->Save ();
 #ifdef _DOLOGDEBUG_
         LogDebug( "Page2Procedure: end UM_ADJUST" );
@@ -876 +842 @@
                 ul = 10L;
             pset->SetSerialTime (ul);
-            pset->bSerialCapture = pset->SerialCapture ();
-            pset->idleSetInIni = pset->QueryFlag(SEI_IDLEPRIORITY);
-
-            if (saveum)
-                pset->Save ();
 #ifdef _DOLOGDEBUG_
             LogDebug( "Page3Procedure: end UM_ADJUST" );
@@ -1058 +1019 @@
                                MPFROM2SHORT (ul, sizeof (ach)), MPFROMP (ach));
             pset->SetString (SEI_LANGUAGEHELP, ach);
-
-            if (saveum)
-                pset->Save ();
         }
         return MRESULT (FALSE);
@@ -1068 +1026 @@
 }
 
-// ** AdjustSaveTypeButtons *********************************************** /*FOLD00*/
+// ** AdjustSaveTypeButtons *********************************************** /*fold00*/
 
 VOID AdjustSaveTypeButtons (BOOL f)
@@ -1121 +1079 @@
     APIRET  rc;
 
-    if ((rc = DosLoadModule(PSZ(NULL), 0, psz, &g_hmod)))
+    if ((rc = DosLoadModule(PSZ(NULL), 0, "gotresen.dll", &g_hmod)))
     {
         DisplayError("ERROR", "Could not (re)load Gotcha! resource module "
@@ -1131 +1089 @@
 
     ResourceString::Module(g_hmod);
-#ifdef _QUIET_
-//#if 1
-    pszPageTab[0] = RSTR (IDS_MAINWIN);
-    pszPageTab[1] = RSTR (IDS_PAGESAVE);
-    pszPageTab[2] = RSTR (IDS_PAGEMISC);
-    pszPageTab[3] = RSTR (IDS_PAGELANGUAGE);
-#else
+
     pszPageTab[0] = RSTR (IDS_PAGESAVE);
     pszPageTab[1] = RSTR (IDS_PAGESNAPSHOT);
     pszPageTab[2] = RSTR (IDS_PAGEMISC);
     pszPageTab[3] = RSTR (IDS_PAGELANGUAGE);
-#endif
+
     for( int i = 0; i < BMF_INVALID; i++ ) {
         ifi[ i ].label = RSTR ( IDS_BMF_JPG+i ); }
@@ -1149 +1101 @@
 }
 
-// ** SelectLanguage ****************************************************** /*FOLD00*/
+// ** SelectLanguage ****************************************************** /*fold00*/
 
 VOID Settings :: SelectLanguage (VOID)
@@ -1155 +1107 @@
     // set this to some default, as we must open the settings dialog for
     // selecting a language
-#ifdef _QUIET_
-//#if 1
-    pszPageTab[0] = RSTR (IDS_MAINWIN);
-    pszPageTab[1] = RSTR (IDS_PAGESAVE);
-    pszPageTab[2] = RSTR (IDS_PAGEMISC);
-    pszPageTab[3] = RSTR (IDS_PAGELANGUAGE);
-#else
     pszPageTab[0] = RSTR (IDS_PAGESAVE);
     pszPageTab[1] = RSTR (IDS_PAGESNAPSHOT);
     pszPageTab[2] = RSTR (IDS_PAGEMISC);
     pszPageTab[3] = RSTR (IDS_PAGELANGUAGE);
-#endif
+
     // bring up the "select language" settings page
     Dialog (TRUE);
@@ -1186 +1131 @@
     hdir = HDIR_CREATE;
     c    = 1;
-#ifdef _QUIET_
-    rc   = DosFindFirst ("goqre*.dll", &hdir, fl, &findbuf,
+    rc   = DosFindFirst ("*.dll", &hdir, fl, &findbuf,
                          sizeof (findbuf), &c, FIL_STANDARD);
-#else
-    rc   = DosFindFirst ("gotre*.dll", &hdir, fl, &findbuf,
-                         sizeof (findbuf), &c, FIL_STANDARD);
-#endif
     while (!rc)
     {
@@ -1231 +1171 @@
 }
 
-#if 0
 // ** GetFOURCC *********************************************************** /*FOLD00*/
 
@@ -1242 +1181 @@
     return 0L;
 }
-#endif
+
 // ** GetFileEAType ******************************************************* /*FOLD00*/
 

/trunk/settings.h

@@ -24 +24 @@
 
 #include "gotcha.h"
+#include "mmio.h"
 #include "./settings/thth_settings.h"
 
@@ -34 +35 @@
 
 enum { SAVESTYLE_CLIPBOARD, SAVESTYLE_FILE, };
-
+#if 0
+enum {
+    BMF_12, BMF_16, BMF_20, BMF_OS13, BMF_OS20, BMF_TIF, BMF_TIFU,
+    BMF_TGA, BMF_PCX, BMF_GIF, BMF_JPG, BMF_DIB,
+    BMF_INVALID
+};
+#else
 enum {
     BMF_JPG, BMF_PNG, BMF_OS20, BMF_TIF, BMF_TGA, BMF_PCX, BMF_GIF,
-    BMF_PBM, BMF_JP2, BMF_DIB,
+    BMF_PBM, BMF_JP2, BMF_JBG, BMF_RAW, BMF_DIB,
     BMF_INVALID
 };
-
+#endif
 enum { FSS_PROMPT, FSS_NUMFILES, FSS_FORCEFILE, };
 
@@ -48 +55 @@
     BOOL     available;
     USHORT   type;
-//    FOURCC   fourcc;
+    FOURCC   fourcc;
     PSZ      label;
     PSZ      extension;
@@ -131 +138 @@
 
     PSZ    GetFileExtension( SHORT type = BMF_INVALID );
-//    FOURCC GetFOURCC( SHORT type = BMF_INVALID );
+    FOURCC GetFOURCC( SHORT type = BMF_INVALID );
     PSZ    GetFileEAType( SHORT type = BMF_INVALID );
 
-    bool idleSetInIni;
-    int saveStyle;
-    PSZ pNumSaveDir;
-    PSZ pForceSaveFile;
-    bool bSerialCapture;
-//    BOOL           IsMMIOAvailable( VOID );
-//    class thth_MMIO      *GetMMIO( VOID );
+    BOOL           IsMMIOAvailable( VOID );
+    class thth_MMIO      *GetMMIO( VOID );
 
 protected:
@@ -176 +178 @@
     static PSZ   pszPageTab[COUNT_PAGES];
     BOOL   fAutoLanguage;
+
+    thth_MMIO    *mmio;
+
     HWND   hwndDlg;
 
@@ -193 +198 @@
 }
 
+inline BOOL Settings :: IsMMIOAvailable( VOID )
+{
+    if( mmio ) return TRUE;
+    return FALSE;
+}
+
+thth_MMIO *Settings :: GetMMIO( VOID ) { return mmio; }
+
 // ************************************************************************
 #endif

/trunk/version.h

@@ -18 +18 @@
  ***/
 
-#define PSZ_VERSION_L1     "2"
-#define PSZ_VERSION_L2     PSZ_VERSION_L1".00"
+#define PSZ_VERSION_L1     "1"
+#define PSZ_VERSION_L2     PSZ_VERSION_L1".78"
 #define PSZ_VERSION_L3     PSZ_VERSION_L2""
 
-#define PSZ_NAMEVERSION    "Gotcha! 2.00"
+#define PSZ_NAMEVERSION    "Gotcha! 1.78"