add missing cmdline option and documentation for quicksave screenshot format

git-svn-id: https://svn.code.sf.net/p/vice-emu/code/trunk@45868 379a1393-f5fb-40a0-bcee-ef074d9b53f7

Author: mrdudz

vice/doc/vice.texi

@@ -3155,7 +3155,7 @@ system/window manager. Mappings using @code{<Alt>} or
 @item @code{scpu-speed-switch-toggle}
 @tab Toggle SCPU Speed switch
 @item @code{screenshot-quicksave}
-@tab Quiksave screenshot
+@tab Quicksave screenshot
 @item @code{settings-default}
 @tab Restore default settings
 @item @code{settings-dialog}
@@ -18098,6 +18098,12 @@ Specify the action to take when the CPU encounters a 'JAM' opcode
 Specify the system file search path
 (@code{Directory}).
 
+@findex -quicksaveformat
+@item -quicksaveformat <Format>
+Specify the format of the quicksave screenshot
+(@code{QuicksaveScreenshotFormat})
+(png, gif ,bmp, iff, pcx, ppm, 4bt, artstudio, koala, minipaint).
+
 @end table
 
 @subsection Common resources
@@ -18170,6 +18176,10 @@ String specifying the filename of a screenshot file that will be written when th
 @item ExitScreenshotName1
 String specifying the filename of a screenshot file that will be written when the emulator exits. (x128)
 
+@vindex QuicksaveScreenshotFormat
+@item QuicksaveScreenshotFormat
+String specifying the format of the quicksave screenshot (png, gif ,bmp, iff, pcx, ppm, 4bt, artstudio, koala, minipaint)
+
 @vindex SaveResourcesOnExit
 @item SaveResourcesOnExit
 Boolean specifying whether the emulator should save changed settings

vice/src/main.c

@@ -30,7 +30,7 @@
  *
  */
 
-/* #define DEBUG_MAIN */
+#define DEBUG_MAIN
 
 #include "vice.h"
 
@@ -59,6 +59,7 @@
 #include "main.h"
 #include "mainlock.h"
 #include "resources.h"
+#include "screenshot.h"
 #include "sysfile.h"
 #include "types.h"
 #include "uiapi.h"
@@ -344,13 +345,19 @@ int main_program(int argc, char **argv)
         return -1;
     }
 
+    /* KLUDGES: this should really get fixed properly, so it can go into the
+       regular init function(s) */
     DBG(("main:early gfxoutput init"));
     gfxoutput_early_init((int)help_requested);
     gfxoutput_resources_init();
     if (gfxoutput_cmdline_options_init() < 0) {
         init_cmdline_options_fail("gfxoutput");
         return -1;
     }
+    if (screenshot_cmdline_options_init() < 0) {
+        init_cmdline_options_fail("screenshot");
+        return -1;
+    }
     DBG(("main:early gfxoutput init done"));
 
     /* Set factory defaults.  */

vice/src/screenshot.c

@@ -36,6 +36,7 @@
 #include <time.h>
 #include <sys/time.h>
 
+#include "cmdline.h"
 #include "gfxoutput.h"
 #include "lib.h"
 #include "log.h"
@@ -404,12 +405,51 @@ static resource_string_t resources_string[] = {
     RESOURCE_STRING_LIST_END
 };
 
+static int quicksave_set_func(const char *value, void *extra_param)
+{
+    char *s;
+    int i = 0;;
+    if (value == NULL) {
+        return -1;
+    }
+    s = lib_strdup(value);
+    while(s[i] != 0) {
+        s[i] = toupper(s[i]);
+        i++;
+    }
+    i = resources_set_string("QuicksaveScreenshotFormat", s);
+    lib_free(s);
+    return i;
+}
+
+static cmdline_option_t cmdline_options[] =
+{
+    { "-quicksaveformat", CALL_FUNCTION, CMDLINE_ATTRIB_NEED_ARGS,
+      quicksave_set_func, NULL, "QuicksaveScreenshotFormat", NULL,
+      "<Format>",
+    /* KLUDGES: this should really be generated at runtime */
+    "Specify format of quicksave screenshots ("
+#ifdef HAVE_PNG
+    "png, "
+#endif
+#ifdef HAVE_GIF
+    "gif ,"
+#endif
+    "bmp, iff, pcx, ppm, 4bt, artstudio, koala, minipaint)"
+    },
+    CMDLINE_LIST_END
+};
 
 int screenshot_resources_init(void)
 {
     return resources_register_string(resources_string);
 }
 
+int screenshot_cmdline_options_init(void)
+{
+    return cmdline_register_options(cmdline_options);
+}
+
 
 /** \brief  Callback for vsync_on_vsync_do()
  *

vice/src/screenshot.h

@@ -147,6 +147,7 @@ const char *screenshot_get_quickscreenshot_format(void);
 char *screenshot_create_datetime_string(void);
 char *screenshot_create_quickscreenshot_filename(const char *format);
 int screenshot_resources_init(void);
+int screenshot_cmdline_options_init(void);
 void screenshot_ui_auto_screenshot(void);
 
 #ifdef FEATURE_CPUMEMHISTORY