dmlib: tools/64vw.c annotate

annotate tools/64vw.c @ 1707:a0986cfd6f9d

More consistently use DMGrowBuf in the lib64gfx APIs, and implement "backwards" RLE decoding and encoding (optionally regards input/output). Not tested very much yet, there may be bugs.

author	Matti Hamalainen <ccr@tnsp.org>
date	Tue, 05 Jun 2018 21:58:10 +0300
parents	7f74073813c6
children	f4015f6cb173

rev	line source
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
1437 0d5295a5af57 Also do some renaming in here .. Matti Hamalainen <ccr@tnsp.org> parents: 1435 diff changeset	2 * 64vw - Display some C64 etc graphics formats via libSDL
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3 * Programmed and designed by Matti 'ccr' Hamalainen
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	4 * (C) Copyright 2012 Tecnic Software productions (TNSP)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5 *
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6 * Please read file 'COPYING' for information on license and distribution.
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7 */
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8 #include "dmlib.h"
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9 #include "dmargs.h"
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10 #include "dmfile.h"
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	11 #include "lib64gfx.h"
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	12 #include <SDL.h>
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	13
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14
1565 58aa34bb4f03 Fix page up/down skip amounts. Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	15 #define SET_SKIP_AMOUNT 10
58aa34bb4f03 Fix page up/down skip amounts. Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	16
58aa34bb4f03 Fix page up/down skip amounts. Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	17
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	18 int optVFlags = 0;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	19 int optScrWidth, optScrHeight;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	20 int optForcedFormat = -1;
1391 f3c5f80511ae Add "probe only" mode to view64. Matti Hamalainen <ccr@tnsp.org> parents: 1386 diff changeset	21 BOOL optProbeOnly = FALSE;
1666 94d45136a6fd Add option to 64vw to list only filenames of recognized files (-l). Implies probe (-p). Matti Hamalainen <ccr@tnsp.org> parents: 1639 diff changeset	22 BOOL optListOnly = FALSE;
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	23 size_t noptFilenames1 = 0, noptFilenames2 = 0;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	24 char **optFilenames = NULL;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	25
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	26
860 daebbf28953d The argument handling API in dmargs* was synced with th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	27 static const DMOptArg optList[] =
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	28 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	29 { 0, '?', "help", "Show this help", OPT_NONE },
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	30 { 1, 'v', "verbose", "Be more verbose", OPT_NONE },
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	31 { 2, 0, "fs", "Fullscreen", OPT_NONE },
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	32 { 3, 'S', "scale", "Scale image by factor (1-10)", OPT_ARGREQ },
1639 ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	33 { 4, 'f', "format", "Force input format (see --formats)", OPT_ARGREQ },
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	34 { 5, 'F', "formats", "List supported input formats", OPT_NONE },
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	35 { 6, 'p', "probe", "Probe only (no display)", OPT_NONE },
1666 94d45136a6fd Add option to 64vw to list only filenames of recognized files (-l). Implies probe (-p). Matti Hamalainen <ccr@tnsp.org> parents: 1639 diff changeset	36 { 7, 'l', "list", "Output list of files that were recognized (implies -p)", OPT_NONE },
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	37 };
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	38
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	39 const int optListN = sizeof(optList) / sizeof(optList[0]);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	40
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	41
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	42 void dmSetScaleFactor(float factor)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	43 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	44 optScrWidth = (int) ((float) C64_SCR_WIDTH * factor * C64_SCR_PAR_XY);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	45 optScrHeight = (int) ((float) C64_SCR_HEIGHT * factor);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	46 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	47
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	48
1639 ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	49 void argShowFormats()
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	50 {
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	51 printf(
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	52 "Available C64 bitmap formats (-f <frmt>):\n"
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	53 " frmt \| Type \| Description\n"
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	54 "------+-----------------+-------------------------------------\n"
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	55 );
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	56 for (int i = 0; i < ndmC64ImageFormats; i++)
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	57 {
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	58 const DMC64ImageFormat *fmt = &dmC64ImageFormats[i];
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	59 char buf[64];
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	60 printf("%-6s\| %-15s \| %s\n",
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	61 fmt->fext,
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	62 dmC64GetImageTypeString(buf, sizeof(buf), fmt->type, FALSE),
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	63 fmt->name);
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	64 }
1667 7f74073813c6 Display number of supported C64 image formats in --formats list of 64vw and gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1666 diff changeset	65 printf("%d formats supported.\n", ndmC64ImageFormats);
1639 ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	66 }
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	67
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	68
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	69 void argShowHelp()
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	70 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	71 dmPrintBanner(stdout, dmProgName, "[options] <input image file>");
860 daebbf28953d The argument handling API in dmargs* was synced with th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	72 dmArgsPrintHelp(stdout, optList, optListN, 0);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	73 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	74
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	75
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	76 BOOL argHandleOpt(const int optN, char optArg, char currArg)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	77 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	78 switch (optN)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	79 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	80 case 0:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	81 argShowHelp();
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	82 exit(0);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	83 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	84
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	85 case 1:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	86 dmVerbosity++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	87 break;
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	88
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	89 case 2:
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	90 optVFlags \|= SDL_WINDOW_FULLSCREEN_DESKTOP;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	91 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	92
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	93 case 3:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	94 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	95 float factor;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	96 if (sscanf(optArg, "%f", &factor) == 1)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	97 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	98 if (factor < 1 \|\| factor >= 10)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	99 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 941 diff changeset	100 dmErrorMsg("Invalid scale factor %1.0f, see help for valid values.\n", factor);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	101 return FALSE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	102 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	103
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	104 dmSetScaleFactor(factor);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	105 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	106 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	107 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 941 diff changeset	108 dmErrorMsg("Invalid scale factor '%s'.\n", optArg);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	109 return FALSE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	110 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	111 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	112 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	113
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	114 case 4:
1570 04769fa39dd4 Instead of specifying forced input format (-f) as a number in 64vw, Matti Hamalainen <ccr@tnsp.org> parents: 1567 diff changeset	115 optForcedFormat = -1;
04769fa39dd4 Instead of specifying forced input format (-f) as a number in 64vw, Matti Hamalainen <ccr@tnsp.org> parents: 1567 diff changeset	116 for (int i = 0; i < ndmC64ImageFormats; i++)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	117 {
1570 04769fa39dd4 Instead of specifying forced input format (-f) as a number in 64vw, Matti Hamalainen <ccr@tnsp.org> parents: 1567 diff changeset	118 const DMC64ImageFormat *fmt = &dmC64ImageFormats[i];
04769fa39dd4 Instead of specifying forced input format (-f) as a number in 64vw, Matti Hamalainen <ccr@tnsp.org> parents: 1567 diff changeset	119 if (fmt->fext != NULL &&
04769fa39dd4 Instead of specifying forced input format (-f) as a number in 64vw, Matti Hamalainen <ccr@tnsp.org> parents: 1567 diff changeset	120 strcasecmp(optArg, fmt->fext) == 0)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	121 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	122 optForcedFormat = i;
1570 04769fa39dd4 Instead of specifying forced input format (-f) as a number in 64vw, Matti Hamalainen <ccr@tnsp.org> parents: 1567 diff changeset	123 break;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	124 }
1570 04769fa39dd4 Instead of specifying forced input format (-f) as a number in 64vw, Matti Hamalainen <ccr@tnsp.org> parents: 1567 diff changeset	125 }
04769fa39dd4 Instead of specifying forced input format (-f) as a number in 64vw, Matti Hamalainen <ccr@tnsp.org> parents: 1567 diff changeset	126
04769fa39dd4 Instead of specifying forced input format (-f) as a number in 64vw, Matti Hamalainen <ccr@tnsp.org> parents: 1567 diff changeset	127 if (optForcedFormat < 0)
04769fa39dd4 Instead of specifying forced input format (-f) as a number in 64vw, Matti Hamalainen <ccr@tnsp.org> parents: 1567 diff changeset	128 {
04769fa39dd4 Instead of specifying forced input format (-f) as a number in 64vw, Matti Hamalainen <ccr@tnsp.org> parents: 1567 diff changeset	129 dmErrorMsg("Invalid image format argument '%s'.\n", optArg);
04769fa39dd4 Instead of specifying forced input format (-f) as a number in 64vw, Matti Hamalainen <ccr@tnsp.org> parents: 1567 diff changeset	130 return FALSE;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	131 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	132 break;
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	133
1391 f3c5f80511ae Add "probe only" mode to view64. Matti Hamalainen <ccr@tnsp.org> parents: 1386 diff changeset	134 case 5:
1639 ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	135 argShowFormats();
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	136 exit(0);
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	137 break;
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	138
1666 94d45136a6fd Add option to 64vw to list only filenames of recognized files (-l). Implies probe (-p). Matti Hamalainen <ccr@tnsp.org> parents: 1639 diff changeset	139 case 7:
94d45136a6fd Add option to 64vw to list only filenames of recognized files (-l). Implies probe (-p). Matti Hamalainen <ccr@tnsp.org> parents: 1639 diff changeset	140 optListOnly = TRUE;
94d45136a6fd Add option to 64vw to list only filenames of recognized files (-l). Implies probe (-p). Matti Hamalainen <ccr@tnsp.org> parents: 1639 diff changeset	141 // Fallthrough
94d45136a6fd Add option to 64vw to list only filenames of recognized files (-l). Implies probe (-p). Matti Hamalainen <ccr@tnsp.org> parents: 1639 diff changeset	142
1639 ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	143 case 6:
1395 009534f27de5 If probe mode is specified, increase verbosity to required level. Matti Hamalainen <ccr@tnsp.org> parents: 1391 diff changeset	144 if (dmVerbosity < 1)
009534f27de5 If probe mode is specified, increase verbosity to required level. Matti Hamalainen <ccr@tnsp.org> parents: 1391 diff changeset	145 dmVerbosity = 1;
1391 f3c5f80511ae Add "probe only" mode to view64. Matti Hamalainen <ccr@tnsp.org> parents: 1386 diff changeset	146 optProbeOnly = TRUE;
f3c5f80511ae Add "probe only" mode to view64. Matti Hamalainen <ccr@tnsp.org> parents: 1386 diff changeset	147 break;
f3c5f80511ae Add "probe only" mode to view64. Matti Hamalainen <ccr@tnsp.org> parents: 1386 diff changeset	148
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	149 default:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 941 diff changeset	150 dmErrorMsg("Unknown option '%s'.\n", currArg);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	151 return FALSE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	152 }
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	153
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	154 return TRUE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	155 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	156
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	157
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	158 BOOL argHandleFile1(char *filename)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	159 {
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	160 (void) filename;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	161
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	162 noptFilenames1++;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	163 return TRUE;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	164 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	165
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	166
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	167 BOOL argHandleFile2(char *filename)
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	168 {
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	169 if (noptFilenames2 < noptFilenames1)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	170 {
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	171 optFilenames[noptFilenames2++] = filename;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	172 return TRUE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	173 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	174 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	175 return FALSE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	176 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	177
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	178
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	179 int dmReadC64Image(const char filename, const DMC64ImageFormat forced, const DMC64ImageFormat fmt, DMC64Image cimage)
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	180 {
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	181 Uint8 *dataBuf = NULL;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	182 size_t dataSize;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1667 diff changeset	183 DMGrowBuf tmp;
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	184 int ret;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	185
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	186 if ((ret = dmReadDataFile(NULL, filename, &dataBuf, &dataSize)) != DMERR_OK)
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	187 goto exit;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	188
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1667 diff changeset	189 ret = dmC64DecodeBMP(cimage, dmGrowBufCreateFrom(&tmp, dataBuf, dataSize), 0, 2, fmt, forced);
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	190
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	191 exit:
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	192 dmFree(dataBuf);
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	193 return ret;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	194 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	195
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	196
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	197 int dmDecodeC64Image(const DMC64Image cimage, const DMC64ImageFormat fmt, SDL_Surface *surf)
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	198 {
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	199 DMImage bmap;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	200 int ret;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	201
1420 9b7915193683 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1417 diff changeset	202 bmap.size = surf->pitch * surf->h;
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	203 bmap.data = surf->pixels;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	204 bmap.pitch = surf->pitch;
1420 9b7915193683 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1417 diff changeset	205 bmap.width = surf->w;
9b7915193683 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1417 diff changeset	206 bmap.height = surf->h;
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	207
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	208 if (fmt->convertFrom != NULL)
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	209 ret = fmt->convertFrom(&bmap, cimage, fmt);
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	210 else
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	211 ret = dmC64ConvertGenericBMP2Image(&bmap, cimage, fmt);
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	212
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	213 return ret;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	214 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	215
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	216
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	217 int main(int argc, char *argv[])
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	218 {
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	219 SDL_Window *window = NULL;
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	220 SDL_Renderer *renderer = NULL;
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	221 SDL_Texture *texture = NULL;
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	222 SDL_Surface *surf = NULL;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	223 BOOL initSDL = FALSE, exitFlag, needRedraw;
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	224 const DMC64ImageFormat *forced;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	225 size_t currIndex, prevIndex;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	226 int ret;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	227
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	228 dmSetScaleFactor(2.0);
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	229
1596 9bc23e64f565 Bump 64vw version. Matti Hamalainen <ccr@tnsp.org> parents: 1595 diff changeset	230 dmInitProg("64vw", "Display some C64 bitmap graphics formats", "0.3", NULL, NULL);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	231
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	232 // Parse arguments, round #1
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	233 if (!dmArgsProcess(argc, argv, optList, optListN,
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	234 argHandleOpt, argHandleFile1, OPTH_BAILOUT))
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	235 exit(1);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	236
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	237 if (noptFilenames1 == 0)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	238 {
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	239 dmErrorMsg("No input file(s) specified, perhaps you need some --help\n");
1410 c29f1cea4a1c Rename a label. Matti Hamalainen <ccr@tnsp.org> parents: 1404 diff changeset	240 goto exit;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	241 }
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	242
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	243 // Allocate space for filename pointers
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	244 if ((optFilenames = dmCalloc(noptFilenames1, sizeof(char *))) == NULL)
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	245 {
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	246 dmErrorMsg("Could not allocate memory for input file list.\n");
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	247 goto exit;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	248 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	249
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	250 // Assign the filename pointers
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	251 if (!dmArgsProcess(argc, argv, optList, optListN,
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	252 NULL, argHandleFile2, OPTH_BAILOUT \| OPTH_ONLY_OTHER))
1410 c29f1cea4a1c Rename a label. Matti Hamalainen <ccr@tnsp.org> parents: 1404 diff changeset	253 goto exit;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	254
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	255 // Check for forced input format
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	256 if (optForcedFormat >= 0)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	257 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	258 forced = &dmC64ImageFormats[optForcedFormat];
1391 f3c5f80511ae Add "probe only" mode to view64. Matti Hamalainen <ccr@tnsp.org> parents: 1386 diff changeset	259 dmMsg(0, "Forced %s format image, type %d, %s\n",
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	260 forced->name, forced->type, forced->fext);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	261 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	262 else
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	263 forced = NULL;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	264
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	265 // If we are simply probing, no need to initialize SDL etc
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	266 if (optProbeOnly)
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	267 {
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	268 for (size_t n = 0; n < noptFilenames2; n++)
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	269 {
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	270 char *filename = optFilenames[n];
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	271 const DMC64ImageFormat *fmt = NULL;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	272 DMC64Image *cimage = NULL;
938 ba812817a281 Various fixes in view64. Matti Hamalainen <ccr@tnsp.org> parents: 933 diff changeset	273
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	274 if ((ret = dmReadC64Image(filename, forced, &fmt, &cimage)) != DMERR_OK)
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	275 {
1666 94d45136a6fd Add option to 64vw to list only filenames of recognized files (-l). Implies probe (-p). Matti Hamalainen <ccr@tnsp.org> parents: 1639 diff changeset	276 if (!optListOnly)
94d45136a6fd Add option to 64vw to list only filenames of recognized files (-l). Implies probe (-p). Matti Hamalainen <ccr@tnsp.org> parents: 1639 diff changeset	277 {
94d45136a6fd Add option to 64vw to list only filenames of recognized files (-l). Implies probe (-p). Matti Hamalainen <ccr@tnsp.org> parents: 1639 diff changeset	278 dmErrorMsg("Could not read image file '%s', %d: %s\n",
94d45136a6fd Add option to 64vw to list only filenames of recognized files (-l). Implies probe (-p). Matti Hamalainen <ccr@tnsp.org> parents: 1639 diff changeset	279 filename, ret, dmErrorStr(ret));
94d45136a6fd Add option to 64vw to list only filenames of recognized files (-l). Implies probe (-p). Matti Hamalainen <ccr@tnsp.org> parents: 1639 diff changeset	280 }
94d45136a6fd Add option to 64vw to list only filenames of recognized files (-l). Implies probe (-p). Matti Hamalainen <ccr@tnsp.org> parents: 1639 diff changeset	281 }
94d45136a6fd Add option to 64vw to list only filenames of recognized files (-l). Implies probe (-p). Matti Hamalainen <ccr@tnsp.org> parents: 1639 diff changeset	282 else
94d45136a6fd Add option to 64vw to list only filenames of recognized files (-l). Implies probe (-p). Matti Hamalainen <ccr@tnsp.org> parents: 1639 diff changeset	283 if (optListOnly)
94d45136a6fd Add option to 64vw to list only filenames of recognized files (-l). Implies probe (-p). Matti Hamalainen <ccr@tnsp.org> parents: 1639 diff changeset	284 {
94d45136a6fd Add option to 64vw to list only filenames of recognized files (-l). Implies probe (-p). Matti Hamalainen <ccr@tnsp.org> parents: 1639 diff changeset	285 fprintf(stdout, "%s\n", filename);
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	286 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	287 else
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	288 {
1488 c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1483 diff changeset	289 fprintf(stdout, "\n%s\n", filename);
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1483 diff changeset	290 dmC64ImageDump(stdout, cimage, fmt);
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	291 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	292
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	293 dmC64ImageFree(cimage);
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	294 }
1410 c29f1cea4a1c Rename a label. Matti Hamalainen <ccr@tnsp.org> parents: 1404 diff changeset	295 goto exit;
938 ba812817a281 Various fixes in view64. Matti Hamalainen <ccr@tnsp.org> parents: 933 diff changeset	296 }
ba812817a281 Various fixes in view64. Matti Hamalainen <ccr@tnsp.org> parents: 933 diff changeset	297
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	298 // Initialize libSDL
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	299 if (SDL_Init(SDL_INIT_VIDEO \| SDL_INIT_TIMER) != 0)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	300 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 941 diff changeset	301 dmErrorMsg("Could not initialize SDL: %s\n", SDL_GetError());
1410 c29f1cea4a1c Rename a label. Matti Hamalainen <ccr@tnsp.org> parents: 1404 diff changeset	302 goto exit;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	303 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	304 initSDL = TRUE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	305
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	306 // Open window
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	307 if ((window = SDL_CreateWindow(dmProgName,
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	308 SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	309 optScrWidth, optScrHeight,
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	310 optVFlags \| SDL_WINDOW_RESIZABLE
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	311 //\| SDL_WINDOW_HIDDEN
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	312 )) == NULL)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	313 {
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	314 dmErrorMsg("Can't create an SDL window: %s\n", SDL_GetError());
1410 c29f1cea4a1c Rename a label. Matti Hamalainen <ccr@tnsp.org> parents: 1404 diff changeset	315 goto exit;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	316 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	317
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	318 if ((renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_PRESENTVSYNC)) == NULL)
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	319 {
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	320 dmErrorMsg("Can't create an SDL renderer: %s\n", SDL_GetError());
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	321 goto exit;
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	322 }
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	323
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	324 // SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "best");
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	325
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	326 // Start main loop
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	327 currIndex = 0;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	328 prevIndex = 1;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	329 needRedraw = TRUE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	330 exitFlag = FALSE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	331 while (!exitFlag)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	332 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	333 SDL_Event event;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	334 while (SDL_PollEvent(&event))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	335 switch (event.type)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	336 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	337 case SDL_KEYDOWN:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	338 switch (event.key.keysym.sym)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	339 {
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	340 case SDLK_ESCAPE:
1420 9b7915193683 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1417 diff changeset	341 case SDLK_q:
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	342 exitFlag = TRUE;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	343 break;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	344
1595 1eb8c1dc81fd Add arrow up and down keys as alias controls to left and right. Matti Hamalainen <ccr@tnsp.org> parents: 1576 diff changeset	345 case SDLK_DOWN:
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	346 case SDLK_LEFT:
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	347 if (currIndex > 0)
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	348 currIndex--;
1552 fdd3a02d830f Add Page Up and Down keys to 64vw controls. Matti Hamalainen <ccr@tnsp.org> parents: 1517 diff changeset	349 else
fdd3a02d830f Add Page Up and Down keys to 64vw controls. Matti Hamalainen <ccr@tnsp.org> parents: 1517 diff changeset	350 currIndex = 0;
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	351 break;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	352
1595 1eb8c1dc81fd Add arrow up and down keys as alias controls to left and right. Matti Hamalainen <ccr@tnsp.org> parents: 1576 diff changeset	353 case SDLK_UP:
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	354 case SDLK_RIGHT:
1417 36016db0d0b3 Oops, the check for maximum filename index was wrong. Matti Hamalainen <ccr@tnsp.org> parents: 1415 diff changeset	355 if (currIndex < noptFilenames2 - 1)
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	356 currIndex++;
1552 fdd3a02d830f Add Page Up and Down keys to 64vw controls. Matti Hamalainen <ccr@tnsp.org> parents: 1517 diff changeset	357 else
1565 58aa34bb4f03 Fix page up/down skip amounts. Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	358 currIndex = noptFilenames2 - 1;
1552 fdd3a02d830f Add Page Up and Down keys to 64vw controls. Matti Hamalainen <ccr@tnsp.org> parents: 1517 diff changeset	359 break;
fdd3a02d830f Add Page Up and Down keys to 64vw controls. Matti Hamalainen <ccr@tnsp.org> parents: 1517 diff changeset	360
1553 e68d3b16c79e Oops, reverse the meaning of PageUp and PageDown. :D Matti Hamalainen <ccr@tnsp.org> parents: 1552 diff changeset	361 case SDLK_PAGEDOWN:
1565 58aa34bb4f03 Fix page up/down skip amounts. Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	362 if (currIndex > SET_SKIP_AMOUNT)
58aa34bb4f03 Fix page up/down skip amounts. Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	363 currIndex -= SET_SKIP_AMOUNT;
1552 fdd3a02d830f Add Page Up and Down keys to 64vw controls. Matti Hamalainen <ccr@tnsp.org> parents: 1517 diff changeset	364 else
fdd3a02d830f Add Page Up and Down keys to 64vw controls. Matti Hamalainen <ccr@tnsp.org> parents: 1517 diff changeset	365 currIndex = 0;
fdd3a02d830f Add Page Up and Down keys to 64vw controls. Matti Hamalainen <ccr@tnsp.org> parents: 1517 diff changeset	366 break;
fdd3a02d830f Add Page Up and Down keys to 64vw controls. Matti Hamalainen <ccr@tnsp.org> parents: 1517 diff changeset	367
1553 e68d3b16c79e Oops, reverse the meaning of PageUp and PageDown. :D Matti Hamalainen <ccr@tnsp.org> parents: 1552 diff changeset	368 case SDLK_PAGEUP:
1565 58aa34bb4f03 Fix page up/down skip amounts. Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	369 if (currIndex < noptFilenames2 - 1 - SET_SKIP_AMOUNT)
58aa34bb4f03 Fix page up/down skip amounts. Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	370 currIndex += SET_SKIP_AMOUNT;
1552 fdd3a02d830f Add Page Up and Down keys to 64vw controls. Matti Hamalainen <ccr@tnsp.org> parents: 1517 diff changeset	371 else
1565 58aa34bb4f03 Fix page up/down skip amounts. Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	372 currIndex = noptFilenames2 - 1;
58aa34bb4f03 Fix page up/down skip amounts. Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	373 break;
1576 e5be5235e7e1 Make home/end keys to go to first and last file respectively in 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1572 diff changeset	374
e5be5235e7e1 Make home/end keys to go to first and last file respectively in 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1572 diff changeset	375 case SDLK_HOME:
e5be5235e7e1 Make home/end keys to go to first and last file respectively in 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1572 diff changeset	376 currIndex = 0;
e5be5235e7e1 Make home/end keys to go to first and last file respectively in 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1572 diff changeset	377 break;
e5be5235e7e1 Make home/end keys to go to first and last file respectively in 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1572 diff changeset	378
e5be5235e7e1 Make home/end keys to go to first and last file respectively in 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1572 diff changeset	379 case SDLK_END:
e5be5235e7e1 Make home/end keys to go to first and last file respectively in 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1572 diff changeset	380 currIndex = noptFilenames2 - 1;
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	381 break;
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	382
1567 e81c8c7a348f Add fullscreen toggle support. Matti Hamalainen <ccr@tnsp.org> parents: 1566 diff changeset	383 case SDLK_f:
e81c8c7a348f Add fullscreen toggle support. Matti Hamalainen <ccr@tnsp.org> parents: 1566 diff changeset	384 optVFlags ^= SDL_WINDOW_FULLSCREEN_DESKTOP;
e81c8c7a348f Add fullscreen toggle support. Matti Hamalainen <ccr@tnsp.org> parents: 1566 diff changeset	385 if (SDL_SetWindowFullscreen(window, optVFlags) != 0)
e81c8c7a348f Add fullscreen toggle support. Matti Hamalainen <ccr@tnsp.org> parents: 1566 diff changeset	386 goto exit;
e81c8c7a348f Add fullscreen toggle support. Matti Hamalainen <ccr@tnsp.org> parents: 1566 diff changeset	387 break;
e81c8c7a348f Add fullscreen toggle support. Matti Hamalainen <ccr@tnsp.org> parents: 1566 diff changeset	388
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	389 default:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	390 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	391 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	392
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	393 needRedraw = TRUE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	394 break;
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	395
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	396 case SDL_WINDOWEVENT:
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	397 switch (event.window.event)
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	398 {
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	399 case SDL_WINDOWEVENT_EXPOSED:
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	400 needRedraw = TRUE;
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	401 break;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	402
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	403 case SDL_WINDOWEVENT_RESIZED:
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	404 optScrWidth = event.window.data1;
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	405 optScrHeight = event.window.data2;
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	406
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	407 needRedraw = TRUE;
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	408 break;
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	409 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	410 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	411
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	412 case SDL_QUIT:
1420 9b7915193683 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1417 diff changeset	413 goto exit;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	414 }
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	415
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	416 if (currIndex != prevIndex)
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	417 {
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	418 char *filename = optFilenames[currIndex];
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	419 const DMC64ImageFormat *fmt = NULL;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	420 DMC64Image *cimage = NULL;
1423 065dedf5890e Fix view64 window title updating. Matti Hamalainen <ccr@tnsp.org> parents: 1420 diff changeset	421 char *title = NULL;
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	422
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	423 if (surf != NULL)
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	424 {
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	425 SDL_FreeSurface(surf);
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	426 surf = NULL;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	427 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	428
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	429 if ((ret = dmReadC64Image(filename, forced, &fmt, &cimage)) != DMERR_OK)
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	430 {
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	431 dmErrorMsg("Failed to decode bitmap data %d: %s\n", ret, dmErrorStr(ret));
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	432 goto fail;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	433 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	434
1420 9b7915193683 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1417 diff changeset	435 if (fmt == NULL \|\| cimage == NULL)
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	436 {
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	437 dmErrorMsg("Probing could not find any matching image format. Perhaps try forcing a format via -f.\n");
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	438 goto fail;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	439 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	440
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	441 // Create surface (we are lazy and ugly)
1566 3b53b289df0e Use SDL_CreateRGBSurfaceWithFormat(). Matti Hamalainen <ccr@tnsp.org> parents: 1565 diff changeset	442 if ((surf = SDL_CreateRGBSurfaceWithFormat(0,
3b53b289df0e Use SDL_CreateRGBSurfaceWithFormat(). Matti Hamalainen <ccr@tnsp.org> parents: 1565 diff changeset	443 cimage->width, cimage->height, 8, SDL_PIXELFORMAT_INDEX8)) == NULL)
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	444 {
1515 66c75f6982e2 Plug some memory leaks in 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	445 dmC64ImageFree(cimage);
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	446 dmErrorMsg("Could not allocate surface.\n");
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	447 goto exit;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	448 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	449
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	450 if (dmDecodeC64Image(cimage, fmt, surf) == DMERR_OK)
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	451 {
1572 4643cd757c0b Try to make the window title more informative. Matti Hamalainen <ccr@tnsp.org> parents: 1571 diff changeset	452 title = dm_strdup_printf("%s - [%d / %d] %s (%dx%d @ %s)",
4643cd757c0b Try to make the window title more informative. Matti Hamalainen <ccr@tnsp.org> parents: 1571 diff changeset	453 dmProgName,
4643cd757c0b Try to make the window title more informative. Matti Hamalainen <ccr@tnsp.org> parents: 1571 diff changeset	454 currIndex + 1,
4643cd757c0b Try to make the window title more informative. Matti Hamalainen <ccr@tnsp.org> parents: 1571 diff changeset	455 noptFilenames2,
4643cd757c0b Try to make the window title more informative. Matti Hamalainen <ccr@tnsp.org> parents: 1571 diff changeset	456 filename,
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	457 cimage->width, cimage->height,
1572 4643cd757c0b Try to make the window title more informative. Matti Hamalainen <ccr@tnsp.org> parents: 1571 diff changeset	458 fmt->name);
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	459
1488 c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1483 diff changeset	460 if (dmVerbosity >= 1)
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1483 diff changeset	461 {
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1483 diff changeset	462 fprintf(stdout, "\n%s\n", filename);
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1483 diff changeset	463 dmC64ImageDump(stdout, cimage, fmt);
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1483 diff changeset	464 }
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	465 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	466
1516 530ce92c513f Better leak fix. :D Matti Hamalainen <ccr@tnsp.org> parents: 1515 diff changeset	467 fail:
1515 66c75f6982e2 Plug some memory leaks in 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	468 dmC64ImageFree(cimage);
66c75f6982e2 Plug some memory leaks in 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	469
1566 3b53b289df0e Use SDL_CreateRGBSurfaceWithFormat(). Matti Hamalainen <ccr@tnsp.org> parents: 1565 diff changeset	470 if (surf == NULL && (surf = SDL_CreateRGBSurfaceWithFormat(0,
1571 ad771e94af25 Use C64_SCR_* constants instead of hardcoded number values in creating surface. Matti Hamalainen <ccr@tnsp.org> parents: 1570 diff changeset	471 C64_SCR_WIDTH, C64_SCR_HEIGHT, 8, SDL_PIXELFORMAT_INDEX8)) == NULL)
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	472 {
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	473 dmErrorMsg("Could not allocate surface.\n");
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	474 goto exit;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	475 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	476
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	477 SDL_SetPaletteColors(surf->format->palette, (SDL_Color *)dmDefaultC64Palette, 0, C64_NCOLORS);
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	478
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	479 if (texture != NULL)
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	480 SDL_DestroyTexture(texture);
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	481
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	482 if ((texture = SDL_CreateTextureFromSurface(renderer, surf)) == NULL)
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	483 {
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	484 dmErrorMsg("Could not create texture from surface: %s\n", SDL_GetError());
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	485 goto exit;
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	486 }
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	487
1423 065dedf5890e Fix view64 window title updating. Matti Hamalainen <ccr@tnsp.org> parents: 1420 diff changeset	488 if (title == NULL)
065dedf5890e Fix view64 window title updating. Matti Hamalainen <ccr@tnsp.org> parents: 1420 diff changeset	489 {
1517 1be17c662b8e Always show current filename in the window title. Matti Hamalainen <ccr@tnsp.org> parents: 1516 diff changeset	490 title = dm_strdup_printf("%s - %s [%d / %d]",
1be17c662b8e Always show current filename in the window title. Matti Hamalainen <ccr@tnsp.org> parents: 1516 diff changeset	491 dmProgName, filename,
1423 065dedf5890e Fix view64 window title updating. Matti Hamalainen <ccr@tnsp.org> parents: 1420 diff changeset	492 currIndex + 1, noptFilenames2);
065dedf5890e Fix view64 window title updating. Matti Hamalainen <ccr@tnsp.org> parents: 1420 diff changeset	493 }
065dedf5890e Fix view64 window title updating. Matti Hamalainen <ccr@tnsp.org> parents: 1420 diff changeset	494
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	495 SDL_SetWindowTitle(window, title);
1423 065dedf5890e Fix view64 window title updating. Matti Hamalainen <ccr@tnsp.org> parents: 1420 diff changeset	496 dmFree(title);
065dedf5890e Fix view64 window title updating. Matti Hamalainen <ccr@tnsp.org> parents: 1420 diff changeset	497
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	498 needRedraw = TRUE;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	499 prevIndex = currIndex;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	500 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	501
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	502 if (needRedraw)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	503 {
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	504 SDL_RenderClear(renderer);
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	505 SDL_RenderCopy(renderer, texture, NULL, NULL);
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	506 SDL_RenderPresent(renderer);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	507 needRedraw = FALSE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	508 }
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	509
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	510 SDL_Delay(50);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	511 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	512
1410 c29f1cea4a1c Rename a label. Matti Hamalainen <ccr@tnsp.org> parents: 1404 diff changeset	513 exit:
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	514 // Cleanup
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	515 dmFree(optFilenames);
933 8fe48c08dbca Fix some memory leaks etc. Matti Hamalainen <ccr@tnsp.org> parents: 931 diff changeset	516
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	517 if (window != NULL)
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	518 SDL_DestroyWindow(window);
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	519
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	520 if (texture != NULL)
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	521 SDL_DestroyTexture(texture);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	522
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	523 if (surf != NULL)
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	524 SDL_FreeSurface(surf);
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	525
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	526 if (initSDL)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	527 SDL_Quit();
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	528
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	529 return 0;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	530 }

Mercurial > hg > dmlib

annotate tools/64vw.c @ 1707:a0986cfd6f9d