dmlib: tools/64vw.c annotate

annotate tools/64vw.c @ 2233:b39eb8b44f22

Rename a function.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 15 Jun 2019 05:50:22 +0300
parents	ccbb6149ddf0
children	9c4f69fcb4b1

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 /*
2162 875e2b7b24dd Change 64vw's short description. Matti Hamalainen <ccr@tnsp.org> parents: 2137 diff changeset	2 * 64vw - Displayer for various C64 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
2120 88d37ec1b4d6 Bump copyright years. Matti Hamalainen <ccr@tnsp.org> parents: 2111 diff changeset	4 * (C) Copyright 2012-2019 Tecnic Software productions (TNSP)
407 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"
2208 90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	11 #include "libgfx.h"
407 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 "lib64gfx.h"
2204 cbac4912992c Add new module "lib64util", and move some functions there from lib64gfx Matti Hamalainen <ccr@tnsp.org> parents: 2202 diff changeset	13 #include "lib64util.h"
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14 #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	15
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	16
1565 58aa34bb4f03 Fix page up/down skip amounts. Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	17 #define SET_SKIP_AMOUNT 10
58aa34bb4f03 Fix page up/down skip amounts. Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	18
58aa34bb4f03 Fix page up/down skip amounts. Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	19
1729 f4015f6cb173 Add new option -i for printing information about the images Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	20 int optVFlags = 0;
f4015f6cb173 Add new option -i for printing information about the images Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	21 int optScrWidth, optScrHeight;
f4015f6cb173 Add new option -i for printing information about the images Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	22 int optForcedFormat = -1;
f4015f6cb173 Add new option -i for printing information about the images Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	23 BOOL optInfoOnly = FALSE,
f4015f6cb173 Add new option -i for printing information about the images Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	24 optProbeOnly = FALSE,
f4015f6cb173 Add new option -i for printing information about the images Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	25 optListOnly = FALSE;
f4015f6cb173 Add new option -i for printing information about the images Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	26 size_t noptFilenames1 = 0, noptFilenames2 = 0;
f4015f6cb173 Add new option -i for printing information about the images Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	27 char **optFilenames = NULL;
2123 47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	28 char *optCharROMFilename = NULL;
2208 90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	29 DMC64Palette *optC64Palette = NULL;
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	30 char *optC64PaletteFile = NULL;
2123 47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	31
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	32 DMC64MemBlock setCharROM;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	33
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	34
860 daebbf28953d The argument handling API in dmargs* was synced with th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	35 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	36 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	37 { 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	38 { 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	39 { 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	40 { 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	41 { 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	42 { 5, 'F', "formats", "List supported input formats", OPT_NONE },
1729 f4015f6cb173 Add new option -i for printing information about the images Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	43 { 6, 'i', "info", "Print information only (no display)", OPT_NONE },
f4015f6cb173 Add new option -i for printing information about the images Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	44 { 7, 'l', "list", "Output list of files that were recognized (implies -i)", OPT_NONE },
2184 5dc1e323d3d4 Rename short option '-p' (probe only) to '-P'. Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	45 { 8, 'P', "probe", "Probe only (do not attempt to decode the image)", OPT_NONE },
2137 903effcd616b Use only long option for char ROM. Matti Hamalainen <ccr@tnsp.org> parents: 2126 diff changeset	46 { 9, 0, "char-rom", "Set character ROM file to be used.", OPT_ARGREQ },
2208 90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	47 {10, 'p', "palette" , "Set C64 palette to be used (see -p list).", OPT_ARGREQ },
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	48 };
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	49
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	50 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	51
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	52
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	53 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	54 {
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2123 diff changeset	55 optScrWidth = (int) ((float) D64_SCR_WIDTH * factor * D64_SCR_PAR_XY);
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2123 diff changeset	56 optScrHeight = (int) ((float) D64_SCR_HEIGHT * 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	57 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	58
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	59
1639 ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	60 void argShowFormats()
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	61 {
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	62 printf(
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	63 "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	64 " 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	65 "------+-----------------+-------------------------------------\n"
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 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	68 {
2200 dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2199 diff changeset	69 const DMC64ImageFormat *fmt = dmC64ImageFormatsSorted[i];
1639 ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	70 char buf[64];
1759 027fb7313d85 Add a format flag for marking formats that have broken/incomplete support and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	71 printf("%-6s\| %-15s \| %s%s\n",
1639 ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	72 fmt->fext,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1761 diff changeset	73 dmC64GetImageTypeString(buf, sizeof(buf), fmt->format->type, FALSE),
1759 027fb7313d85 Add a format flag for marking formats that have broken/incomplete support and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	74 fmt->name,
027fb7313d85 Add a format flag for marking formats that have broken/incomplete support and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	75 fmt->flags & DM_FMT_BROKEN ? " [BROKEN]" : "");
1639 ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	76 }
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	77 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	78 }
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	79
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	80
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	81 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	82 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	83 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	84 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	85 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	86
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	87
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	88 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	89 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	90 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	91 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	92 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	93 argShowHelp();
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	94 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	95 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	96
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	97 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	98 dmVerbosity++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	99 break;
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	100
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 case 2:
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	102 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	103 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	104
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	105 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	106 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	107 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	108 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	109 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	110 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	111 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 941 diff changeset	112 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	113 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	114 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	115
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	116 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	117 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	118 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	119 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 941 diff changeset	120 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	121 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	122 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	123 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	124 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	125
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	126 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	127 optForcedFormat = -1;
04769fa39dd4 Instead of specifying forced input format (-f) as a number in 64vw, Matti Hamalainen <ccr@tnsp.org> parents: 1567 diff changeset	128 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	129 {
1570 04769fa39dd4 Instead of specifying forced input format (-f) as a number in 64vw, Matti Hamalainen <ccr@tnsp.org> parents: 1567 diff changeset	130 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	131 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	132 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	133 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	134 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	135 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	136 }
1570 04769fa39dd4 Instead of specifying forced input format (-f) as a number in 64vw, Matti Hamalainen <ccr@tnsp.org> parents: 1567 diff changeset	137 }
04769fa39dd4 Instead of specifying forced input format (-f) as a number in 64vw, Matti Hamalainen <ccr@tnsp.org> parents: 1567 diff changeset	138
04769fa39dd4 Instead of specifying forced input format (-f) as a number in 64vw, Matti Hamalainen <ccr@tnsp.org> parents: 1567 diff changeset	139 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	140 {
04769fa39dd4 Instead of specifying forced input format (-f) as a number in 64vw, Matti Hamalainen <ccr@tnsp.org> parents: 1567 diff changeset	141 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	142 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	143 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	144 break;
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	145
1391 f3c5f80511ae Add "probe only" mode to view64. Matti Hamalainen <ccr@tnsp.org> parents: 1386 diff changeset	146 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	147 argShowFormats();
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	148 exit(0);
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	149 break;
ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	150
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	151 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	152 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	153 // 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	154
1639 ff794644a70a Add --formats option to 64vw and remove the format listing from --help. Matti Hamalainen <ccr@tnsp.org> parents: 1596 diff changeset	155 case 6:
1395 009534f27de5 If probe mode is specified, increase verbosity to required level. Matti Hamalainen <ccr@tnsp.org> parents: 1391 diff changeset	156 if (dmVerbosity < 1)
009534f27de5 If probe mode is specified, increase verbosity to required level. Matti Hamalainen <ccr@tnsp.org> parents: 1391 diff changeset	157 dmVerbosity = 1;
1729 f4015f6cb173 Add new option -i for printing information about the images Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	158 optInfoOnly = TRUE;
f4015f6cb173 Add new option -i for printing information about the images Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	159 break;
f4015f6cb173 Add new option -i for printing information about the images Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	160
f4015f6cb173 Add new option -i for printing information about the images Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	161 case 8:
f4015f6cb173 Add new option -i for printing information about the images Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	162 if (dmVerbosity < 1)
f4015f6cb173 Add new option -i for printing information about the images Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	163 dmVerbosity = 1;
1391 f3c5f80511ae Add "probe only" mode to view64. Matti Hamalainen <ccr@tnsp.org> parents: 1386 diff changeset	164 optProbeOnly = TRUE;
f3c5f80511ae Add "probe only" mode to view64. Matti Hamalainen <ccr@tnsp.org> parents: 1386 diff changeset	165 break;
f3c5f80511ae Add "probe only" mode to view64. Matti Hamalainen <ccr@tnsp.org> parents: 1386 diff changeset	166
2123 47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	167 case 9:
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	168 optCharROMFilename = optArg;
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	169 break;
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	170
2208 90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	171 case 10:
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	172 return argHandleC64PaletteOption(optArg, &optC64Palette, &optC64PaletteFile);
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	173
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	174 default:
2183 e3f0eaf23f4f Change the error message for unimplemented option argument. Matti Hamalainen <ccr@tnsp.org> parents: 2162 diff changeset	175 dmErrorMsg("Unimplemented option argument '%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	176 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	177 }
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	178
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	179 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	180 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	181
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	182
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	183 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	184 {
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	185 (void) filename;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	186
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	187 noptFilenames1++;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	188 return TRUE;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	189 }
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
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	192 BOOL argHandleFile2(char *filename)
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	193 {
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	194 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	195 {
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	196 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	197 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	198 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	199 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	200 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	201 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	202
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	203
2202 455a3849b8ac Comments and cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2201 diff changeset	204 int dmReadC64Image(const char filename, const DMC64ImageFormat forced,
455a3849b8ac Comments and cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2201 diff changeset	205 const DMC64ImageFormat fmt, DMC64Image cimage)
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	206 {
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	207 Uint8 *dataBuf = NULL;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	208 size_t dataSize;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1667 diff changeset	209 DMGrowBuf tmp;
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	210 int ret;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	211
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	212 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	213 goto exit;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	214
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	215 dmGrowBufConstCreateFrom(&tmp, dataBuf, dataSize);
5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	216
1729 f4015f6cb173 Add new option -i for printing information about the images Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	217 if (optProbeOnly)
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	218 ret = dmC64ProbeBMP(&tmp, fmt) != DM_PROBE_SCORE_FALSE ? DMERR_OK : DMERR_NOT_SUPPORTED;
1729 f4015f6cb173 Add new option -i for printing information about the images Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	219 else
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	220 ret = dmC64DecodeBMP(cimage, &tmp, 0, 2, fmt, forced);
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	221
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	222 exit:
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	223 dmFree(dataBuf);
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	224 return ret;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	225 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	226
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	227
2233 b39eb8b44f22 Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 2231 diff changeset	228 int dmConvertC64ImageToSDLSurface(DMC64Image cimage, SDL_Surface surf, const DMC64ImageConvSpec *spec)
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	229 {
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	230 DMImage bmap;
2224 a36c81c3df85 Make color interlace type generate a mixed palette instead of using special Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	231 BOOL charDataSet, mixedPalette;
2208 90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	232 int res;
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	233
1730 881a3fc421d8 Use the default C64 palette whenever we need it, but make it possible to override it. Matti Hamalainen <ccr@tnsp.org> parents: 1729 diff changeset	234 memset(&bmap, 0, sizeof(bmap));
881a3fc421d8 Use the default C64 palette whenever we need it, but make it possible to override it. Matti Hamalainen <ccr@tnsp.org> parents: 1729 diff changeset	235 bmap.size = surf->pitch * surf->h;
881a3fc421d8 Use the default C64 palette whenever we need it, but make it possible to override it. Matti Hamalainen <ccr@tnsp.org> parents: 1729 diff changeset	236 bmap.data = surf->pixels;
881a3fc421d8 Use the default C64 palette whenever we need it, but make it possible to override it. Matti Hamalainen <ccr@tnsp.org> parents: 1729 diff changeset	237 bmap.pitch = surf->pitch;
881a3fc421d8 Use the default C64 palette whenever we need it, but make it possible to override it. Matti Hamalainen <ccr@tnsp.org> parents: 1729 diff changeset	238 bmap.width = surf->w;
881a3fc421d8 Use the default C64 palette whenever we need it, but make it possible to override it. Matti Hamalainen <ccr@tnsp.org> parents: 1729 diff changeset	239 bmap.height = surf->h;
2224 a36c81c3df85 Make color interlace type generate a mixed palette instead of using special Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	240
a36c81c3df85 Make color interlace type generate a mixed palette instead of using special Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	241 mixedPalette = (cimage->fmt->type & D64_FMT_ILACE) && cimage->laceType == D64_ILACE_COLOR;
a36c81c3df85 Make color interlace type generate a mixed palette instead of using special Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	242 if ((res = dmC64SetImagePalette(&bmap, spec, mixedPalette)) != DMERR_OK)
2208 90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	243 {
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	244 dmErrorMsg("Could not create copy of palette.\n");
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	245 return res;
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	246 }
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	247
2126 cffadb745484 Fix character ROM data handling. Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	248 if (cimage->charData[0].data == NULL)
cffadb745484 Fix character ROM data handling. Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	249 {
cffadb745484 Fix character ROM data handling. Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	250 memcpy(&cimage->charData[0], &setCharROM, sizeof(DMC64MemBlock));
cffadb745484 Fix character ROM data handling. Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	251 charDataSet = TRUE;
cffadb745484 Fix character ROM data handling. Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	252 }
cffadb745484 Fix character ROM data handling. Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	253 else
cffadb745484 Fix character ROM data handling. Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	254 charDataSet = FALSE;
2123 47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	255
2223 5477e792def3 Remove useless DMC64ImageFormat parameter from some conversion functions. Matti Hamalainen <ccr@tnsp.org> parents: 2213 diff changeset	256 if (cimage->fmt->convertFrom != NULL)
5477e792def3 Remove useless DMC64ImageFormat parameter from some conversion functions. Matti Hamalainen <ccr@tnsp.org> parents: 2213 diff changeset	257 res = cimage->fmt->convertFrom(&bmap, cimage, spec);
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	258 else
2223 5477e792def3 Remove useless DMC64ImageFormat parameter from some conversion functions. Matti Hamalainen <ccr@tnsp.org> parents: 2213 diff changeset	259 res = dmC64ConvertGenericBMP2Image(&bmap, cimage, spec);
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	260
2126 cffadb745484 Fix character ROM data handling. Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	261 if (charDataSet)
cffadb745484 Fix character ROM data handling. Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	262 memset(&cimage->charData[0], 0, sizeof(DMC64MemBlock));
2123 47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	263
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2089 diff changeset	264 SDL_SetPaletteColors(surf->format->palette, (SDL_Color *) bmap.pal->colors, 0, bmap.pal->ncolors);
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2089 diff changeset	265
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2089 diff changeset	266 dmPaletteFree(bmap.pal);
2208 90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	267 return res;
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	268 }
1730 881a3fc421d8 Use the default C64 palette whenever we need it, but make it possible to override it. Matti Hamalainen <ccr@tnsp.org> parents: 1729 diff changeset	269
2208 90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	270 #if 0
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	271 DIR *dirh;
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	272 struct dirent *entry;
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	273
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	274 if ((dirh = opendir(npath)) == NULL)
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	275 {
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	276 int err = th_get_error();
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	277 THERR("Could not open directory '%s': %s\n",
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	278 path, th_error_str(err));
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	279 ret = FALSE;
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	280 goto out;
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	281 }
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	282
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	283 while ((entry = readdir(dirh)) != NULL)
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	284 if (entry->d_name[0] != '.')
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	285 {
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	286 if (!argHandleFileDir(npath, entry->d_name, pattern))
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	287 {
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	288 ret = FALSE;
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	289 goto out;
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	290 }
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	291 }
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	292
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	293 closedir(dirh);
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	294 #endif
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	295
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	296
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	297 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	298 {
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1837 diff changeset	299 const DMC64ImageFormat *forced;
2208 90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	300 DMC64ImageConvSpec optSpec;
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	301 SDL_Window *window = NULL;
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	302 SDL_Renderer *renderer = NULL;
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	303 SDL_Texture *texture = NULL;
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	304 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	305 BOOL initSDL = FALSE, exitFlag, needRedraw;
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	306 size_t currIndex, prevIndex;
2199 f331cc750b37 Rename variable. Matti Hamalainen <ccr@tnsp.org> parents: 2184 diff changeset	307 int res;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	308
2200 dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2199 diff changeset	309 // Initialize pre-requisites
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2199 diff changeset	310 if ((res = dmLib64GFXInit()) != DMERR_OK)
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2199 diff changeset	311 {
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2199 diff changeset	312 dmErrorMsg("Could not initialize lib64gfx: %s\n",
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2199 diff changeset	313 dmErrorStr(res));
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2199 diff changeset	314 goto exit;
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2199 diff changeset	315 }
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2199 diff changeset	316
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	317 dmSetScaleFactor(2.0);
2208 90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	318 memset(&optSpec, 0, sizeof(optSpec));
2123 47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	319 memset(&setCharROM, 0, sizeof(setCharROM));
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	320
2162 875e2b7b24dd Change 64vw's short description. Matti Hamalainen <ccr@tnsp.org> parents: 2137 diff changeset	321 dmInitProg("64vw", "Displayer for various C64 graphics formats", "0.4", 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	322
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	323 // 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	324 if (!dmArgsProcess(argc, argv, optList, optListN,
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	325 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	326 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	327
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	328 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	329 {
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	330 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	331 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	332 }
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	333
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	334 // Allocate space for filename pointers
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	335 if ((optFilenames = dmCalloc(noptFilenames1, sizeof(char *))) == NULL)
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	336 {
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	337 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	338 goto exit;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	339 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	340
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	341 // Assign the filename pointers
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	342 if (!dmArgsProcess(argc, argv, optList, optListN,
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	343 NULL, argHandleFile2, OPTH_BAILOUT \| OPTH_ONLY_OTHER))
1410 c29f1cea4a1c Rename a label. Matti Hamalainen <ccr@tnsp.org> parents: 1404 diff changeset	344 goto exit;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	345
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	346 // 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	347 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	348 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	349 forced = &dmC64ImageFormats[optForcedFormat];
1391 f3c5f80511ae Add "probe only" mode to view64. Matti Hamalainen <ccr@tnsp.org> parents: 1386 diff changeset	350 dmMsg(0, "Forced %s format image, type %d, %s\n",
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1761 diff changeset	351 forced->name, forced->format->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	352 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	353 else
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	354 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	355
1729 f4015f6cb173 Add new option -i for printing information about the images Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	356 // If we are simply displaying file information, no need to initialize SDL etc
f4015f6cb173 Add new option -i for printing information about the images Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	357 if (optInfoOnly \|\| optProbeOnly)
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	358 {
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	359 for (size_t n = 0; n < noptFilenames2; n++)
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	360 {
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	361 char *filename = optFilenames[n];
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	362 const DMC64ImageFormat *fmt = NULL;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	363 DMC64Image *cimage = NULL;
938 ba812817a281 Various fixes in view64. Matti Hamalainen <ccr@tnsp.org> parents: 933 diff changeset	364
2199 f331cc750b37 Rename variable. Matti Hamalainen <ccr@tnsp.org> parents: 2184 diff changeset	365 if ((res = dmReadC64Image(filename, forced, &fmt, &cimage)) != DMERR_OK)
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	366 {
2199 f331cc750b37 Rename variable. Matti Hamalainen <ccr@tnsp.org> parents: 2184 diff changeset	367 if (!optListOnly && res != DMERR_NOT_SUPPORTED)
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	368 {
1998 0d19d0a47faf Improve error message for not being able to decode the file. Matti Hamalainen <ccr@tnsp.org> parents: 1947 diff changeset	369 dmErrorMsg("Could not decode file '%s': %s\n",
2199 f331cc750b37 Rename variable. Matti Hamalainen <ccr@tnsp.org> parents: 2184 diff changeset	370 filename, dmErrorStr(res));
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	371 }
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	372 }
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	373 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	374 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	375 {
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	376 fprintf(stdout, "%s\n", filename);
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	377 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	378 else
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	379 {
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	380 fprintf(stdout, "\n%s\n", filename);
1822 9bec535956fd Add indentation parameter to dmC64ImageDump(). Matti Hamalainen <ccr@tnsp.org> parents: 1787 diff changeset	381 dmC64ImageDump(stdout, cimage, fmt, " ");
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	382 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	383
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	384 dmC64ImageFree(cimage);
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	385 }
1410 c29f1cea4a1c Rename a label. Matti Hamalainen <ccr@tnsp.org> parents: 1404 diff changeset	386 goto exit;
938 ba812817a281 Various fixes in view64. Matti Hamalainen <ccr@tnsp.org> parents: 933 diff changeset	387 }
ba812817a281 Various fixes in view64. Matti Hamalainen <ccr@tnsp.org> parents: 933 diff changeset	388
2208 90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	389 if (optC64PaletteFile != NULL)
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	390 {
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	391 if ((res = dmHandleExternalPalette(optC64PaletteFile, &optSpec.pal)) != DMERR_OK)
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	392 goto exit;
2213 b1e392da8346 Check for minimum number of colors in external palette. Matti Hamalainen <ccr@tnsp.org> parents: 2208 diff changeset	393
b1e392da8346 Check for minimum number of colors in external palette. Matti Hamalainen <ccr@tnsp.org> parents: 2208 diff changeset	394 if (optSpec.pal->ncolors < D64_NCOLORS)
b1e392da8346 Check for minimum number of colors in external palette. Matti Hamalainen <ccr@tnsp.org> parents: 2208 diff changeset	395 {
b1e392da8346 Check for minimum number of colors in external palette. Matti Hamalainen <ccr@tnsp.org> parents: 2208 diff changeset	396 dmErrorMsg("Palette does not have enough colors (%d < %d)\n",
b1e392da8346 Check for minimum number of colors in external palette. Matti Hamalainen <ccr@tnsp.org> parents: 2208 diff changeset	397 optSpec.pal->ncolors, D64_NCOLORS);
b1e392da8346 Check for minimum number of colors in external palette. Matti Hamalainen <ccr@tnsp.org> parents: 2208 diff changeset	398 goto exit;
b1e392da8346 Check for minimum number of colors in external palette. Matti Hamalainen <ccr@tnsp.org> parents: 2208 diff changeset	399 }
2208 90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	400 }
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	401 else
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	402 {
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	403 // No palette file specified, use internal palette
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	404 if (optC64Palette == NULL)
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	405 optC64Palette = &dmC64DefaultPalettes[0];
2231 ccbb6149ddf0 Trailing whitespace cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	406
2208 90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	407 dmMsg(1, "Using internal palette '%s' (%s).\n",
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	408 optC64Palette->name, optC64Palette->desc);
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	409
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	410 optSpec.cpal = optC64Palette;
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	411
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	412 if ((res = dmC64PaletteFromC64Palette(&optSpec.pal, optC64Palette, FALSE)) != DMERR_OK)
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	413 {
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	414 dmErrorMsg("Could not setup palette: %s\n",
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	415 dmErrorStr(res));
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	416 goto exit;
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	417 }
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	418 }
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	419
2123 47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	420 // Check character ROM filename
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	421 if (optCharROMFilename == NULL)
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	422 optCharROMFilename = DM_DEF_CHARGEN;
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	423
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	424 // Attempt to read character ROM
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	425 dmMsg(1, "Using character ROM file '%s'.\n",
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	426 optCharROMFilename);
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	427
2199 f331cc750b37 Rename variable. Matti Hamalainen <ccr@tnsp.org> parents: 2184 diff changeset	428 if ((res = dmReadDataFile(NULL, optCharROMFilename,
2126 cffadb745484 Fix character ROM data handling. Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	429 &setCharROM.data, &setCharROM.size)) != DMERR_OK)
2123 47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	430 {
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	431 dmErrorMsg("Could not read character ROM from '%s'.\n",
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	432 optCharROMFilename);
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	433 }
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	434
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	435 // 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	436 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	437 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 941 diff changeset	438 dmErrorMsg("Could not initialize SDL: %s\n", SDL_GetError());
1410 c29f1cea4a1c Rename a label. Matti Hamalainen <ccr@tnsp.org> parents: 1404 diff changeset	439 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	440 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	441 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	442
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	443 // Open window
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	444 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	445 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	446 optScrWidth, optScrHeight,
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	447 optVFlags \| SDL_WINDOW_RESIZABLE
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	448 //\| SDL_WINDOW_HIDDEN
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	449 )) == 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	450 {
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	451 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	452 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	453 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	454
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	455 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	456 {
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	457 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	458 goto exit;
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	459 }
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	460
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	461 // 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	462
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	463 // Start main loop
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	464 currIndex = 0;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	465 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	466 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	467 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	468 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	469 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	470 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	471 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	472 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	473 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	474 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	475 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	476 {
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	477 case SDLK_ESCAPE:
1420 9b7915193683 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1417 diff changeset	478 case SDLK_q:
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	479 exitFlag = TRUE;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	480 break;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	481
1595 1eb8c1dc81fd Add arrow up and down keys as alias controls to left and right. Matti Hamalainen <ccr@tnsp.org> parents: 1576 diff changeset	482 case SDLK_DOWN:
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	483 case SDLK_LEFT:
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	484 if (currIndex > 0)
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	485 currIndex--;
1552 fdd3a02d830f Add Page Up and Down keys to 64vw controls. Matti Hamalainen <ccr@tnsp.org> parents: 1517 diff changeset	486 else
fdd3a02d830f Add Page Up and Down keys to 64vw controls. Matti Hamalainen <ccr@tnsp.org> parents: 1517 diff changeset	487 currIndex = 0;
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	488 break;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	489
2073 1ad8382e3670 Make space-key go to next image in addition to arrow right/up. Matti Hamalainen <ccr@tnsp.org> parents: 2072 diff changeset	490 case SDLK_SPACE:
1595 1eb8c1dc81fd Add arrow up and down keys as alias controls to left and right. Matti Hamalainen <ccr@tnsp.org> parents: 1576 diff changeset	491 case SDLK_UP:
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	492 case SDLK_RIGHT:
1417 36016db0d0b3 Oops, the check for maximum filename index was wrong. Matti Hamalainen <ccr@tnsp.org> parents: 1415 diff changeset	493 if (currIndex < noptFilenames2 - 1)
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	494 currIndex++;
1552 fdd3a02d830f Add Page Up and Down keys to 64vw controls. Matti Hamalainen <ccr@tnsp.org> parents: 1517 diff changeset	495 else
1565 58aa34bb4f03 Fix page up/down skip amounts. Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	496 currIndex = noptFilenames2 - 1;
1552 fdd3a02d830f Add Page Up and Down keys to 64vw controls. Matti Hamalainen <ccr@tnsp.org> parents: 1517 diff changeset	497 break;
fdd3a02d830f Add Page Up and Down keys to 64vw controls. Matti Hamalainen <ccr@tnsp.org> parents: 1517 diff changeset	498
1553 e68d3b16c79e Oops, reverse the meaning of PageUp and PageDown. :D Matti Hamalainen <ccr@tnsp.org> parents: 1552 diff changeset	499 case SDLK_PAGEDOWN:
1565 58aa34bb4f03 Fix page up/down skip amounts. Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	500 if (currIndex > SET_SKIP_AMOUNT)
58aa34bb4f03 Fix page up/down skip amounts. Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	501 currIndex -= SET_SKIP_AMOUNT;
1552 fdd3a02d830f Add Page Up and Down keys to 64vw controls. Matti Hamalainen <ccr@tnsp.org> parents: 1517 diff changeset	502 else
fdd3a02d830f Add Page Up and Down keys to 64vw controls. Matti Hamalainen <ccr@tnsp.org> parents: 1517 diff changeset	503 currIndex = 0;
fdd3a02d830f Add Page Up and Down keys to 64vw controls. Matti Hamalainen <ccr@tnsp.org> parents: 1517 diff changeset	504 break;
fdd3a02d830f Add Page Up and Down keys to 64vw controls. Matti Hamalainen <ccr@tnsp.org> parents: 1517 diff changeset	505
1553 e68d3b16c79e Oops, reverse the meaning of PageUp and PageDown. :D Matti Hamalainen <ccr@tnsp.org> parents: 1552 diff changeset	506 case SDLK_PAGEUP:
1565 58aa34bb4f03 Fix page up/down skip amounts. Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	507 if (currIndex < noptFilenames2 - 1 - SET_SKIP_AMOUNT)
58aa34bb4f03 Fix page up/down skip amounts. Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	508 currIndex += SET_SKIP_AMOUNT;
1552 fdd3a02d830f Add Page Up and Down keys to 64vw controls. Matti Hamalainen <ccr@tnsp.org> parents: 1517 diff changeset	509 else
1565 58aa34bb4f03 Fix page up/down skip amounts. Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	510 currIndex = noptFilenames2 - 1;
58aa34bb4f03 Fix page up/down skip amounts. Matti Hamalainen <ccr@tnsp.org> parents: 1557 diff changeset	511 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	512
e5be5235e7e1 Make home/end keys to go to first and last file respectively in 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1572 diff changeset	513 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	514 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	515 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	516
e5be5235e7e1 Make home/end keys to go to first and last file respectively in 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1572 diff changeset	517 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	518 currIndex = noptFilenames2 - 1;
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	519 break;
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	520
1567 e81c8c7a348f Add fullscreen toggle support. Matti Hamalainen <ccr@tnsp.org> parents: 1566 diff changeset	521 case SDLK_f:
e81c8c7a348f Add fullscreen toggle support. Matti Hamalainen <ccr@tnsp.org> parents: 1566 diff changeset	522 optVFlags ^= SDL_WINDOW_FULLSCREEN_DESKTOP;
e81c8c7a348f Add fullscreen toggle support. Matti Hamalainen <ccr@tnsp.org> parents: 1566 diff changeset	523 if (SDL_SetWindowFullscreen(window, optVFlags) != 0)
e81c8c7a348f Add fullscreen toggle support. Matti Hamalainen <ccr@tnsp.org> parents: 1566 diff changeset	524 goto exit;
e81c8c7a348f Add fullscreen toggle support. Matti Hamalainen <ccr@tnsp.org> parents: 1566 diff changeset	525 break;
e81c8c7a348f Add fullscreen toggle support. Matti Hamalainen <ccr@tnsp.org> parents: 1566 diff changeset	526
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	527 default:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	528 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	529 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	530
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	531 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	532 break;
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	533
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	534 case SDL_WINDOWEVENT:
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	535 switch (event.window.event)
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	536 {
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	537 case SDL_WINDOWEVENT_EXPOSED:
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	538 needRedraw = TRUE;
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	539 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	540
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	541 case SDL_WINDOWEVENT_RESIZED:
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	542 optScrWidth = event.window.data1;
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	543 optScrHeight = event.window.data2;
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	544
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	545 needRedraw = TRUE;
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	546 break;
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	547 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	548 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	549
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	550 case SDL_QUIT:
1420 9b7915193683 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1417 diff changeset	551 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	552 }
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	553
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	554 if (currIndex != prevIndex)
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	555 {
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	556 char *filename = optFilenames[currIndex];
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	557 const DMC64ImageFormat *fmt = NULL;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	558 DMC64Image *cimage = NULL;
1423 065dedf5890e Fix view64 window title updating. Matti Hamalainen <ccr@tnsp.org> parents: 1420 diff changeset	559 char *title = NULL;
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	560
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	561 if (surf != NULL)
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	562 {
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	563 SDL_FreeSurface(surf);
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	564 surf = NULL;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	565 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	566
2199 f331cc750b37 Rename variable. Matti Hamalainen <ccr@tnsp.org> parents: 2184 diff changeset	567 if ((res = dmReadC64Image(filename, forced, &fmt, &cimage)) != DMERR_OK)
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	568 {
2199 f331cc750b37 Rename variable. Matti Hamalainen <ccr@tnsp.org> parents: 2184 diff changeset	569 if (res != DMERR_NOT_SUPPORTED)
1999 64730556fd94 Only show error message if the error is other than "not supported". Matti Hamalainen <ccr@tnsp.org> parents: 1998 diff changeset	570 {
64730556fd94 Only show error message if the error is other than "not supported". Matti Hamalainen <ccr@tnsp.org> parents: 1998 diff changeset	571 dmErrorMsg("Could not decode file '%s': %s\n",
2199 f331cc750b37 Rename variable. Matti Hamalainen <ccr@tnsp.org> parents: 2184 diff changeset	572 filename, dmErrorStr(res));
1999 64730556fd94 Only show error message if the error is other than "not supported". Matti Hamalainen <ccr@tnsp.org> parents: 1998 diff changeset	573 }
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	574 goto fail;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	575 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	576
1420 9b7915193683 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1417 diff changeset	577 if (fmt == NULL \|\| cimage == NULL)
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	578 {
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	579 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	580 goto fail;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	581 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	582
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	583 // Create surface (we are lazy and ugly)
1566 3b53b289df0e Use SDL_CreateRGBSurfaceWithFormat(). Matti Hamalainen <ccr@tnsp.org> parents: 1565 diff changeset	584 if ((surf = SDL_CreateRGBSurfaceWithFormat(0,
1947 8896d5676f1b Architectural change: remove some duplicated variables from DMC64Image Matti Hamalainen <ccr@tnsp.org> parents: 1931 diff changeset	585 cimage->fmt->width, cimage->fmt->height,
8896d5676f1b Architectural change: remove some duplicated variables from DMC64Image Matti Hamalainen <ccr@tnsp.org> parents: 1931 diff changeset	586 8, SDL_PIXELFORMAT_INDEX8)) == NULL)
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	587 {
1515 66c75f6982e2 Plug some memory leaks in 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	588 dmC64ImageFree(cimage);
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	589 dmErrorMsg("Could not allocate surface.\n");
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	590 goto exit;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	591 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	592
2233 b39eb8b44f22 Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 2231 diff changeset	593 if (dmConvertC64ImageToSDLSurface(cimage, surf, &optSpec) == DMERR_OK)
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	594 {
1572 4643cd757c0b Try to make the window title more informative. Matti Hamalainen <ccr@tnsp.org> parents: 1571 diff changeset	595 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	596 dmProgName,
4643cd757c0b Try to make the window title more informative. Matti Hamalainen <ccr@tnsp.org> parents: 1571 diff changeset	597 currIndex + 1,
4643cd757c0b Try to make the window title more informative. Matti Hamalainen <ccr@tnsp.org> parents: 1571 diff changeset	598 noptFilenames2,
4643cd757c0b Try to make the window title more informative. Matti Hamalainen <ccr@tnsp.org> parents: 1571 diff changeset	599 filename,
1947 8896d5676f1b Architectural change: remove some duplicated variables from DMC64Image Matti Hamalainen <ccr@tnsp.org> parents: 1931 diff changeset	600 cimage->fmt->width, cimage->fmt->height,
1572 4643cd757c0b Try to make the window title more informative. Matti Hamalainen <ccr@tnsp.org> parents: 1571 diff changeset	601 fmt->name);
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	602
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	603 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	604 {
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	605 fprintf(stdout, "\n%s\n", filename);
1822 9bec535956fd Add indentation parameter to dmC64ImageDump(). Matti Hamalainen <ccr@tnsp.org> parents: 1787 diff changeset	606 dmC64ImageDump(stdout, cimage, fmt, " ");
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	607 }
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	608 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	609
1516 530ce92c513f Better leak fix. :D Matti Hamalainen <ccr@tnsp.org> parents: 1515 diff changeset	610 fail:
1515 66c75f6982e2 Plug some memory leaks in 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	611 dmC64ImageFree(cimage);
66c75f6982e2 Plug some memory leaks in 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	612
1566 3b53b289df0e Use SDL_CreateRGBSurfaceWithFormat(). Matti Hamalainen <ccr@tnsp.org> parents: 1565 diff changeset	613 if (surf == NULL && (surf = SDL_CreateRGBSurfaceWithFormat(0,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2123 diff changeset	614 D64_SCR_WIDTH, D64_SCR_HEIGHT, 8, SDL_PIXELFORMAT_INDEX8)) == NULL)
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	615 {
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	616 dmErrorMsg("Could not allocate surface.\n");
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	617 goto exit;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	618 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	619
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	620
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	621 if (texture != NULL)
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	622 SDL_DestroyTexture(texture);
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	623
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	624 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	625 {
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	626 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	627 goto exit;
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	628 }
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	629
1423 065dedf5890e Fix view64 window title updating. Matti Hamalainen <ccr@tnsp.org> parents: 1420 diff changeset	630 if (title == NULL)
065dedf5890e Fix view64 window title updating. Matti Hamalainen <ccr@tnsp.org> parents: 1420 diff changeset	631 {
2072 6677535b8b9f Canonicalize the 64vw window title in case of non-supported files. Matti Hamalainen <ccr@tnsp.org> parents: 1999 diff changeset	632 title = dm_strdup_printf("%s - [%d / %d] %s",
6677535b8b9f Canonicalize the 64vw window title in case of non-supported files. Matti Hamalainen <ccr@tnsp.org> parents: 1999 diff changeset	633 dmProgName,
6677535b8b9f Canonicalize the 64vw window title in case of non-supported files. Matti Hamalainen <ccr@tnsp.org> parents: 1999 diff changeset	634 currIndex + 1,
2111 2d0db1e6b4a7 Oops, missing printf argument. Matti Hamalainen <ccr@tnsp.org> parents: 2102 diff changeset	635 noptFilenames2,
2d0db1e6b4a7 Oops, missing printf argument. Matti Hamalainen <ccr@tnsp.org> parents: 2102 diff changeset	636 filename);
1423 065dedf5890e Fix view64 window title updating. Matti Hamalainen <ccr@tnsp.org> parents: 1420 diff changeset	637 }
065dedf5890e Fix view64 window title updating. Matti Hamalainen <ccr@tnsp.org> parents: 1420 diff changeset	638
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	639 SDL_SetWindowTitle(window, title);
1423 065dedf5890e Fix view64 window title updating. Matti Hamalainen <ccr@tnsp.org> parents: 1420 diff changeset	640 dmFree(title);
065dedf5890e Fix view64 window title updating. Matti Hamalainen <ccr@tnsp.org> parents: 1420 diff changeset	641
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	642 needRedraw = TRUE;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	643 prevIndex = currIndex;
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	644 }
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	645
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	646 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	647 {
1557 5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	648 SDL_RenderClear(renderer);
5e5f75b45f8d Initial port to SDL2. Many things will not work now. Matti Hamalainen <ccr@tnsp.org> parents: 1553 diff changeset	649 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	650 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	651 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	652 }
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	653
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	654 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	655 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	656
1410 c29f1cea4a1c Rename a label. Matti Hamalainen <ccr@tnsp.org> parents: 1404 diff changeset	657 exit:
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	658 // Cleanup
d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	659 dmFree(optFilenames);
2123 47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	660 dmC64MemBlockFree(&setCharROM);
933 8fe48c08dbca Fix some memory leaks etc. Matti Hamalainen <ccr@tnsp.org> parents: 931 diff changeset	661
2102 e0281dae2cb8 Backed out changeset dcca36701cdd Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	662 if (texture != NULL)
e0281dae2cb8 Backed out changeset dcca36701cdd Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	663 SDL_DestroyTexture(texture);
e0281dae2cb8 Backed out changeset dcca36701cdd Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	664
e0281dae2cb8 Backed out changeset dcca36701cdd Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	665 if (renderer != NULL)
e0281dae2cb8 Backed out changeset dcca36701cdd Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	666 SDL_DestroyRenderer(renderer);
e0281dae2cb8 Backed out changeset dcca36701cdd Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	667
e0281dae2cb8 Backed out changeset dcca36701cdd Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	668 if (window != NULL)
e0281dae2cb8 Backed out changeset dcca36701cdd Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	669 SDL_DestroyWindow(window);
e0281dae2cb8 Backed out changeset dcca36701cdd Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	670
e0281dae2cb8 Backed out changeset dcca36701cdd Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	671 if (surf != NULL)
e0281dae2cb8 Backed out changeset dcca36701cdd Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	672 SDL_FreeSurface(surf);
1414 d6ee4dcef692 Implement multi file support in view64. Matti Hamalainen <ccr@tnsp.org> parents: 1410 diff changeset	673
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	674 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	675 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	676
2208 90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	677 dmPaletteFree(optSpec.pal);
2200 dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2199 diff changeset	678 dmLib64GFXClose();
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2199 diff changeset	679
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	680 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	681 }

Mercurial > hg > dmlib

annotate tools/64vw.c @ 2233:b39eb8b44f22