From 4373c0fb944fd4b66ed754c5402938ab4ddbdc1c Mon Sep 17 00:00:00 2001 From: bladeoner Date: Thu, 13 Dec 2018 18:44:28 +0100 Subject: [PATCH] Backport Add special S9xDisplayStringType to pass additional info. --- source/snes9x/font.h | 14 +++++++------- source/snes9x/gfx.cpp | 32 +++++++++++++++++++++++++------- source/snes9x/gfx.h | 2 +- source/snes9x/messages.h | 4 +++- 4 files changed, 36 insertions(+), 16 deletions(-) diff --git a/source/snes9x/font.h b/source/snes9x/font.h index b74dbb1..2762b60 100644 --- a/source/snes9x/font.h +++ b/source/snes9x/font.h @@ -132,13 +132,13 @@ static const char *font[] = " ", //2345678/2345678/2345678/2345678/2345678/2345678/2345678/2345678/2345678/2345678/2345678/2345678/2345678/2345678/2345678/2345678 " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", + " . . ", + " .#. .#. . ..... ", + " .##. .##. .#. .#####. ", + " .###. .###. .###. .###. ", + " .##. .##. .#####. .#. ", + " .#. .#. ..... . ", + " . . ", " ", //2345678/2345678/2345678/2345678/2345678/2345678/2345678/2345678/2345678/2345678/2345678/2345678/2345678/2345678/2345678/2345678 " ", diff --git a/source/snes9x/gfx.cpp b/source/snes9x/gfx.cpp index d200a8d..c1fa4b5 100644 --- a/source/snes9x/gfx.cpp +++ b/source/snes9x/gfx.cpp @@ -23,6 +23,7 @@ extern struct SLineMatrixData LineMatrixData[240]; void S9xComputeClipWindows (void); static int font_width = 8, font_height = 9; +void (*S9xCustomDisplayString) (const char *, int, int, bool, int) = NULL; static void SetupOBJ (void); static void DrawOBJS (int); @@ -38,6 +39,7 @@ static inline void DrawBackgroundMode7 (int, void (*DrawMath) (uint32, uint32, i static inline void DrawBackdrop (void); static inline void RenderScreen (bool8); static uint16 get_crosshair_color (uint8); +static void S9xDisplayStringType (const char *, int, int, bool, int); #define TILE_PLUS(t, x) (((t) & 0xfc00) | ((t + x) & 0x3ff)) @@ -1825,6 +1827,12 @@ void S9xDisplayChar (uint16 *s, uint8 c) static void DisplayStringFromBottom (const char *string, int linesFromBottom, int pixelsFromLeft, bool allowWrap) { + if (S9xCustomDisplayString) + { + S9xCustomDisplayString (string, linesFromBottom, pixelsFromLeft, allowWrap, S9X_NO_INFO); + return; + } + if (linesFromBottom <= 0) linesFromBottom = 1; @@ -1856,6 +1864,16 @@ static void DisplayStringFromBottom (const char *string, int linesFromBottom, in } } +static void S9xDisplayStringType (const char *string, int linesFromBottom, int pixelsFromLeft, bool allowWrap, int type) +{ + if (S9xCustomDisplayString) + { + S9xCustomDisplayString (string, linesFromBottom, pixelsFromLeft, allowWrap, type); + return; + } + S9xDisplayString (string, linesFromBottom, pixelsFromLeft, allowWrap); +} + static void DisplayFrameRate (void) { char string[10]; @@ -1886,8 +1904,8 @@ static void DisplayFrameRate (void) static void DisplayPressedKeys (void) { - static char KeyMap[] = { '0', '1', '2', 'R', 'L', 'X', 'A', '>', '<', 'v', '^', 'S', 's', 'Y', 'B' }; - static int KeyOrder[] = { 8, 10, 7, 9, 0, 6, 14, 13, 5, 1, 4, 3, 2, 11, 12 }; // < ^ > v A B Y X L R S s + static unsigned char KeyMap[] = { '0', '1', '2', 'R', 'L', 'X', 'A', 225, 224, 227, 226, 'S', 's', 'Y', 'B' }; + static int KeyOrder[] = { 8, 10, 7, 9, 0, 6, 14, 13, 5, 1, 4, 3, 2, 11, 12 }; // < ^ > v A B Y X L R S s enum controllers controller; int line = Settings.DisplayMovieFrame && S9xMovieActive() ? 2 : 1; @@ -1910,7 +1928,7 @@ static void DisplayPressedKeys (void) uint8 buttons = buf[4]; sprintf(string, "#%d %d: (%03d,%03d) %c%c", port + 1, ids[0] + 1, x, y, (buttons & 0x40) ? 'L' : ' ', (buttons & 0x80) ? 'R' : ' '); - S9xDisplayString(string, line++, 1, false); + S9xDisplayStringType(string, line++, 1, false, S9X_PRESSED_KEYS_INFO); break; } @@ -1925,7 +1943,7 @@ static void DisplayPressedKeys (void) sprintf(string, "#%d %d: (%03d,%03d) %c%c%c%c", port + 1, ids[0] + 1, x, y, (buttons & 0x80) ? 'F' : ' ', (buttons & 0x40) ? 'C' : ' ', (buttons & 0x20) ? 'T' : ' ', (buttons & 0x10) ? 'P' : ' '); - S9xDisplayString(string, line++, 1, false); + S9xDisplayStringType(string, line++, 1, false, S9X_PRESSED_KEYS_INFO); break; } @@ -1944,7 +1962,7 @@ static void DisplayPressedKeys (void) sprintf(string, "#%d %d: (%03d,%03d) %c%c%c / (%03d,%03d) %c%c%c", port + 1, ids[0] + 1, x1, y1, (buttons & 0x80) ? 'T' : ' ', (buttons & 0x20) ? 'S' : ' ', offscreen1 ? 'O' : ' ', x2, y2, (buttons & 0x40) ? 'T' : ' ', (buttons & 0x10) ? 'S' : ' ', offscreen2 ? 'O' : ' '); - S9xDisplayString(string, line++, 1, false); + S9xDisplayStringType(string, line++, 1, false, S9X_PRESSED_KEYS_INFO); break; } @@ -1959,7 +1977,7 @@ static void DisplayPressedKeys (void) string[6 + i]= (pad & mask) ? KeyMap[j] : ' '; } - S9xDisplayString(string, line++, 1, false); + S9xDisplayStringType(string, line++, 1, false, S9X_PRESSED_KEYS_INFO); break; } @@ -1978,7 +1996,7 @@ static void DisplayPressedKeys (void) string[6 + i]= (pad & mask) ? KeyMap[j] : ' '; } - S9xDisplayString(string, line++, 1, false); + S9xDisplayStringType(string, line++, 1, false, S9X_PRESSED_KEYS_INFO); } } diff --git a/source/snes9x/gfx.h b/source/snes9x/gfx.h index c97fd4f..0ad8ca3 100644 --- a/source/snes9x/gfx.h +++ b/source/snes9x/gfx.h @@ -192,6 +192,6 @@ void S9xSetPalette (void); void S9xSyncSpeed (void); // called instead of S9xDisplayString if set to non-NULL -extern void (*S9xCustomDisplayString) (const char *, int, int, bool); +extern void (*S9xCustomDisplayString) (const char *, int, int, bool, int type); #endif diff --git a/source/snes9x/messages.h b/source/snes9x/messages.h index 9d78167..a7dfe74 100644 --- a/source/snes9x/messages.h +++ b/source/snes9x/messages.h @@ -22,6 +22,7 @@ enum // Individual message numbers enum { + S9X_NO_INFO, S9X_ROM_INFO, S9X_HEADERS_INFO, S9X_CONFIG_INFO, @@ -52,7 +53,8 @@ enum S9X_WRONG_MOVIE_SNAPSHOT, S9X_NOT_A_MOVIE_SNAPSHOT, S9X_SNAPSHOT_INCONSISTENT, - S9X_AVI_INFO + S9X_AVI_INFO, + S9X_PRESSED_KEYS_INFO, }; #endif