Update roll-up for the last few weeks

Author: FrodeSolheim

Makefile.am

@@ -848,6 +848,8 @@ libfsemu2_a_SOURCES = \
 	fsemu/manymouse/manymouse.h \
 	fsemu/manymouse/windows_wminput.c \
 	fsemu/manymouse/x11_xinput2.c \
+	fsemu/src/fsemu.c \
+	fsemu/src/fsemu.h \
 	fsemu/src/fsemu-all.h \
 	fsemu/src/fsemu-button.h \
 	fsemu/src/fsemu-action.c \
@@ -1049,13 +1051,11 @@ fsuae_data_files = \
 libfsemu2_a_SOURCES += $(fsemu_data_files)
 
 data/.fsemu: $(fsemu_data_files) ${fsuae_data_files}
-	mkdir -p $(b)/data/Fonts
-	cp $(s)/fsemu/fonts/saira/* $(b)/data/Fonts/
-	mkdir -p $(b)/data/Icons
-	cp $(s)/fsemu/icons/fontawesome/* $(b)/data/Icons/
-	mkdir -p $(b)/data/Images
-	cp $(s)/fsemu/images/* $(b)/data/Images/
-	cp $(s)/src/fsuae/images/* $(b)/data/Images/
+	mkdir -p $(b)/data/
+	cp $(s)/fsemu/fonts/saira/* $(b)/data/
+	cp $(s)/fsemu/icons/fontawesome/* $(b)/data/
+	cp $(s)/fsemu/images/* $(b)/data/
+	cp $(s)/src/fsuae/images/* $(b)/data/
 	touch data/.fsemu
 
 fsemu-data: data/.fsemu
@@ -1731,14 +1731,14 @@ EXTRA_DIST = $(TESTS) $(EXTRA_TESTS) \
 	flac/include/FLAC/stream_encoder.h \
 	fsemu/gamemode/LICENSE.txt \
 	fsemu/gamemode/README.md \
+	fsemu/libinih/ini.c \
+	fsemu/libinih/ini.h \
+	fsemu/libinih/LICENSE.txt \
 	fs-uae.spec \
 	icon/fs-uae.ico \
 	glad/include/glad/glad.h \
 	glad/include/KHR/khrplatform.h \
 	glad/LICENSE \
-	libinih/ini.c \
-	libinih/ini.h \
-	libinih/LICENSE.txt \
 	libnfd/build/dont_run_premake.txt \
 	libnfd/build/gmake_linux/Makefile \
 	libnfd/build/gmake_linux/nfd.make \

dist/macos/Info.plist.in

@@ -46,7 +46,7 @@
 	<key>NSAppleScriptEnabled</key>
 	<false/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2011-2019 Frode Solheim</string>
+	<string>Copyright 2011-2021 Frode Solheim</string>
 	<key>NSMainNibFile</key>
 	<string></string>
 	<key>NSPrincipalClass</key>

docs/compiling.md

@@ -28,7 +28,7 @@ Install dependencies for bootstrapping and building FS-UAE:
     sudo zypper install autoconf automake freetype2-devel gcc gcc-c++ gettext \
     glib2-devel libpng-devel libtool libXi-devel openal-devel SDL2-devel zip
 
-## Fedora
+### Fedora
 
 Install dependencies for running bootstrap:
 
@@ -38,7 +38,7 @@ Install dependencies for building FS-UAE:
 
     sudo dnf install SDL2-devel glib2-devel libpng-devel gcc gcc-c++ openal-devel libXi-devel zip libmpeg2-devel SDL2_ttf-devel glew-devel zlib-devel freetype-devel hicolor-icon-theme
 
-## Windows
+### Windows
 
 Install latest msys2-x86_64 from www.msys2.org/ and follow the installation
 instructions to get an updated MSYS2 installation. Then start

docs/options/uae_rtg_modes

@@ -0,0 +1,9 @@
+Summary: RTG color modes
+Type: Choice
+Default: 0x212
+
+The value is really a bit mask, and other combinations are available.
+
+Value: 0x212 (8bit + 16bit PC + 32bit BGRA)
+Value: 0x602 (8bit + 16bit + 32bit BGRA)
+Value: 0x112 (8bit + 16bit + 32bit RGBA)

docs/scripts/update.py

@@ -360,7 +360,7 @@ def main():
         f.close()
 
     with open(
-        "../fs-uae-launcher/fsgs/options/constants.py", "w", encoding="UTF-8"
+        "../fs-uae-launcher-private/fsgamesys/options/constants.py", "w", encoding="UTF-8"
     ) as f:
         f.write(
             """\
@@ -375,7 +375,7 @@ def main():
             f.write('{} = "{}"\n'.format(key.upper().strip("__"), key))
 
     with open(
-        "../fs-uae-launcher/fsgs/options/option.py", "w", encoding="UTF-8"
+        "../fs-uae-launcher-private/fsgamesys/options/option.py", "w", encoding="UTF-8"
     ) as f:
         f.write(
             """\
@@ -394,13 +394,13 @@ class Option(object):
             f.write('    {} = "{}"\n'.format(key.upper().strip("__"), key))
 
     with open(
-        "../fs-uae-launcher/launcher/option.py", "w", encoding="UTF-8"
+        "../fs-uae-launcher-private/launcher/option.py", "w", encoding="UTF-8"
     ) as f:
         f.write(
             """\
 # Automatically generated - do not edit by hand
 
-from fsgs.options.option import Option as BaseOption
+from fsgamesys.options.option import Option as BaseOption
 
 
 # noinspection PyClassHasNoInit
@@ -546,7 +546,7 @@ def lower(s):
         for option in sorted(codes.keys()):
             write_option(f, option)
     shutil.move(
-        "doc/options2.py", "../fs-uae-launcher/launcher/ui/config/expand.py"
+        "doc/options2.py", "../fs-uae-launcher-private/launcher/ui/config/expand.py"
     )
 
 

fsemu/.vscode/c_cpp_properties.json

@@ -0,0 +1,27 @@
+
+The "inih" library is distributed under the New BSD license:
+
+Copyright (c) 2009, Ben Hoyt
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Ben Hoyt nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY BEN HOYT ''AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL BEN HOYT BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

fsemu/.vscode/settings.json

@@ -0,0 +1,199 @@
+/* inih -- simple .INI file parser
+
+inih is released under the New BSD license (see LICENSE.txt). Go to the project
+home page for more info:
+
+https://github.com/benhoyt/inih
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef USE_GLIB
+#include <glib.h>
+#endif
+
+#ifdef _MSC_VER
+#define _CRT_SECURE_NO_WARNINGS
+#endif
+
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+
+#include "ini.h"
+
+#if !INI_USE_STACK
+#include <stdlib.h>
+#endif
+
+#define MAX_SECTION 50
+#define MAX_NAME 50
+
+/* Strip whitespace chars off end of given string, in place. Return s. */
+static char* rstrip(char* s)
+{
+    char* p = s + strlen(s);
+    while (p > s && isspace((unsigned char)(*--p)))
+        *p = '\0';
+    return s;
+}
+
+/* Return pointer to first non-whitespace char in given string. */
+static char* lskip(const char* s)
+{
+    while (*s && isspace((unsigned char)(*s)))
+        s++;
+    return (char*)s;
+}
+
+/* Return pointer to first char c or ';' comment in given string, or pointer to
+   null at end of string if neither found. ';' must be prefixed by a whitespace
+   character to register as a comment. */
+static char* find_char_or_comment(const char* s, char c)
+{
+    int was_whitespace = 0;
+    while (*s && *s != c && !(was_whitespace && *s == ';')) {
+        was_whitespace = isspace((unsigned char)(*s));
+        s++;
+    }
+    return (char*)s;
+}
+
+/* Version of strncpy that ensures dest (size bytes) is null-terminated. */
+static char* strncpy0(char* dest, const char* src, size_t size)
+{
+    strncpy(dest, src, size);
+    dest[size - 1] = '\0';
+    return dest;
+}
+
+/* See documentation in header file. */
+int ini_parse_stream(ini_reader reader, void* stream, ini_handler handler,
+                     void* user)
+{
+    /* Uses a fair bit of stack (use heap instead if you need to) */
+#if INI_USE_STACK
+    char line[INI_MAX_LINE];
+#else
+    char* line;
+#endif
+    char section[MAX_SECTION] = "";
+    char prev_name[MAX_NAME] = "";
+
+    char* start;
+    char* end;
+    char* name;
+    char* value;
+    int lineno = 0;
+    int error = 0;
+
+#if !INI_USE_STACK
+    line = (char*)malloc(INI_MAX_LINE);
+    if (!line) {
+        return -2;
+    }
+#endif
+
+    /* Scan through stream line by line */
+    while (reader(line, INI_MAX_LINE, stream) != NULL) {
+        lineno++;
+
+        start = line;
+#if INI_ALLOW_BOM
+        if (lineno == 1 && (unsigned char)start[0] == 0xEF &&
+                           (unsigned char)start[1] == 0xBB &&
+                           (unsigned char)start[2] == 0xBF) {
+            start += 3;
+        }
+#endif
+        start = lskip(rstrip(start));
+
+        if (*start == ';' || *start == '#') {
+            /* Per Python ConfigParser, allow '#' comments at start of line */
+        }
+#if INI_ALLOW_MULTILINE
+        else if (*prev_name && *start && start > line) {
+            /* Non-black line with leading whitespace, treat as continuation
+               of previous name's value (as per Python ConfigParser). */
+            if (!handler(user, section, prev_name, start) && !error)
+                error = lineno;
+        }
+#endif
+        else if (*start == '[') {
+            /* A "[section]" line */
+            end = find_char_or_comment(start + 1, ']');
+            if (*end == ']') {
+                *end = '\0';
+                strncpy0(section, start + 1, sizeof(section));
+                *prev_name = '\0';
+            }
+            else if (!error) {
+                /* No ']' found on section line */
+                error = lineno;
+            }
+        }
+        else if (*start && *start != ';') {
+            /* Not a comment, must be a name[=:]value pair */
+            end = find_char_or_comment(start, '=');
+            if (*end != '=') {
+                end = find_char_or_comment(start, ':');
+            }
+            if (*end == '=' || *end == ':') {
+                *end = '\0';
+                name = rstrip(start);
+                value = lskip(end + 1);
+                end = find_char_or_comment(value, '\0');
+                if (*end == ';')
+                    *end = '\0';
+                rstrip(value);
+
+                /* Valid name[=:]value pair found, call handler */
+                strncpy0(prev_name, name, sizeof(prev_name));
+                if (!handler(user, section, name, value) && !error)
+                    error = lineno;
+            }
+            else if (!error) {
+                /* No '=' or ':' found on name[=:]value line */
+                error = lineno;
+            }
+        }
+
+#if INI_STOP_ON_FIRST_ERROR
+        if (error)
+            break;
+#endif
+    }
+
+#if !INI_USE_STACK
+    free(line);
+#endif
+
+    return error;
+}
+
+/* See documentation in header file. */
+int ini_parse_file(FILE* file, ini_handler handler, void* user)
+{
+    return ini_parse_stream((ini_reader)fgets, file, handler, user);
+}
+
+/* See documentation in header file. */
+int ini_parse(const char* filename, ini_handler handler, void* user)
+{
+    FILE* file;
+    int error;
+
+#ifdef USE_GLIB
+    file = g_fopen(filename, "r");
+#else
+    file = fopen(filename, "r");
+#endif
+    if (!file)
+        return -1;
+    error = ini_parse_file(file, handler, user);
+    fclose(file);
+    return error;
+}