v1.05

fix: disable both accesibility and win keys while app in use (Windows)
new: added bookmarks and compatibility flags to local file browser
fix: ay envelope 15 fix (ay1 core) (thanks @leiradel!)
fix: expand va() buffers
new: zxdb mousewheel
fix: restored glx window attribs to what v1.03 was using (Linux)
fix: fixed embedding of zxdb in linux builds. fix #20 (Linux,MacOS)

Author: r-lyeh

MAKE.bat

@@ -20,10 +20,15 @@ if [ "$(uname)" != "Darwin" ]; then
 # compile -------------------------------------------------------------------- do not use -O3 below. zxdb cache will contain 0-byte files otherwise.
 gcc src/app.c -I src -o ./Spectral.linux -O2 -DNDEBUG=3 -D_GNU_SOURCE -Wno-unused-result -Wno-unused-value -Wno-format -Wno-multichar -Wno-pointer-sign -Wno-string-plus-int -Wno-empty-body -lm -lX11 -lGL -lasound -lpthread -ludev $* || exit
 upx -9 Spectral.linux
+
+# embed zxdb -----------------------------------------------------------------
 #src/res/embed.linux Spectral.linux @SpectralEmBeDdEd
 #src/res/embed.linux Spectral.linux src/res/zxdb/Spectral.db.gz
 #src/res/embed.linux Spectral.linux @SpectralEmBeDdEd
-cat Spectral.linux src/res/embed src/res/zxdb/Spectral.db.gz src/res/embed > Spectral.linux
+#cat Spectral.linux src/res/embed src/res/zxdb/Spectral.db.gz src/res/embed > Spectral.linux
+dd if=src/res/embed >> Spectral.linux
+dd if=src/res/zxdb/Spectral.db.gz >> Spectral.linux
+dd if=src/res/embed >> Spectral.linux
 
 fi
 
@@ -32,10 +37,15 @@ if [ "$(uname)" = "Darwin" ]; then
 # compile --------------------------------------------------------------------
 export SDKROOT=$(xcrun --show-sdk-path)
 gcc -ObjC src/app.c -I src -o ./Spectral.osx -O3 -DNDEBUG=3 -Wno-unused-result -Wno-unused-value -Wno-format -Wno-multichar -Wno-pointer-sign -Wno-string-plus-int -Wno-empty-body -Wno-dangling-else -framework cocoa -framework iokit -framework CoreFoundation -framework CoreAudio -framework AudioToolbox -framework OpenGL -lm $* || exit
+
+# embed zxdb
 #src/res/embed.osx Spectral.osx @SpectralEmBeDdEd
 #src/res/embed.osx Spectral.osx src/res/zxdb/Spectral.db.gz
 #src/res/embed.osx Spectral.osx @SpectralEmBeDdEd
-cat Spectral.osx src/res/embed src/res/zxdb/Spectral.db.gz src/res/embed > Spectral.osx
+#cat Spectral.osx src/res/embed src/res/zxdb/Spectral.db.gz src/res/embed > Spectral.osx
+dd if=src/res/embed >> Spectral.osx
+dd if=src/res/zxdb/Spectral.db.gz >> Spectral.osx
+dd if=src/res/embed >> Spectral.osx
 
 # embed icon and make .app
 test -d Spectral.app && rm -rf Spectral.app
@@ -214,7 +224,7 @@ rem )
 
 where /q rcedit-x64 || curl -LO https://github.com/electron/rcedit/releases/download/v2.0.0/rcedit-x64.exe
 where /q rcedit-x64 && rcedit-x64 "Spectral.exe" --set-file-version "!year!.!month!.!today!.!today!!month!"
-where /q rcedit-x64 && rcedit-x64 "Spectral.exe" --set-product-version "1.041 Spectral"
+where /q rcedit-x64 && rcedit-x64 "Spectral.exe" --set-product-version "1.05-WIP Spectral"
 where /q rcedit-x64 && rcedit-x64 "Spectral.exe" --set-icon src\res\img\noto_1f47b.ico
 rem where /q rcedit-x64 && rcedit-x64 "Spectral.exe" --set-version-string "version" "value"
 rem where /q rcedit-x64 && rcedit-x64 "Spectral.exe" --set-resource-string "version" "value"

src/3rd.h

@@ -13,6 +13,7 @@
 #include "3rd_tigrmousecursor.h"
 #include "3rd_tigrdragndrop.h"
 #include "3rd_tigrtitle.h"
+#include "3rd_tigroskeys.h"
 #undef border
 #undef run
 

src/3rd_tigr.h

@@ -0,0 +1,111 @@
+void enable_os_keys( bool on );
+
+#ifdef _WIN32
+
+void enable_accessibility_keys( bool bAllowKeys ) {
+    static STICKYKEYS g_StartupStickyKeys = {sizeof(STICKYKEYS), 0};
+    static TOGGLEKEYS g_StartupToggleKeys = {sizeof(TOGGLEKEYS), 0};
+    static FILTERKEYS g_StartupFilterKeys = {sizeof(FILTERKEYS), 0};
+    static int once = 0;
+    for(;!once;once=1) {
+    // Save the current sticky/toggle/filter key settings so they can be restored them later
+    SystemParametersInfo(SPI_GETSTICKYKEYS, sizeof(STICKYKEYS), &g_StartupStickyKeys, 0);
+    SystemParametersInfo(SPI_GETTOGGLEKEYS, sizeof(TOGGLEKEYS), &g_StartupToggleKeys, 0);
+    SystemParametersInfo(SPI_GETFILTERKEYS, sizeof(FILTERKEYS), &g_StartupFilterKeys, 0);
+    }
+
+    if( bAllowKeys ) {
+        // Restore StickyKeys/etc to original state and enable Windows key
+        STICKYKEYS sk = g_StartupStickyKeys;
+        TOGGLEKEYS tk = g_StartupToggleKeys;
+        FILTERKEYS fk = g_StartupFilterKeys;
+        
+        SystemParametersInfo(SPI_SETSTICKYKEYS, sizeof(STICKYKEYS), &g_StartupStickyKeys, 0);
+        SystemParametersInfo(SPI_SETTOGGLEKEYS, sizeof(TOGGLEKEYS), &g_StartupToggleKeys, 0);
+        SystemParametersInfo(SPI_SETFILTERKEYS, sizeof(FILTERKEYS), &g_StartupFilterKeys, 0);
+    }
+    else {
+        // Disable StickyKeys/etc shortcuts but if the accessibility feature is on, 
+        // then leave the settings alone as its probably being usefully used
+ 
+        STICKYKEYS skOff = g_StartupStickyKeys;
+        if( (skOff.dwFlags & SKF_STICKYKEYSON) == 0 ) {
+            // Disable the hotkey and the confirmation
+            skOff.dwFlags &= ~SKF_HOTKEYACTIVE;
+            skOff.dwFlags &= ~SKF_CONFIRMHOTKEY;
+            SystemParametersInfo(SPI_SETSTICKYKEYS, sizeof(STICKYKEYS), &skOff, 0);
+        }
+ 
+        TOGGLEKEYS tkOff = g_StartupToggleKeys;
+        if( (tkOff.dwFlags & TKF_TOGGLEKEYSON) == 0 ) {
+            // Disable the hotkey and the confirmation
+            tkOff.dwFlags &= ~TKF_HOTKEYACTIVE;
+            tkOff.dwFlags &= ~TKF_CONFIRMHOTKEY;
+            SystemParametersInfo(SPI_SETTOGGLEKEYS, sizeof(TOGGLEKEYS), &tkOff, 0);
+        }
+ 
+        FILTERKEYS fkOff = g_StartupFilterKeys;
+        if( (fkOff.dwFlags & FKF_FILTERKEYSON) == 0 ) {
+            // Disable the hotkey and the confirmation
+            fkOff.dwFlags &= ~FKF_HOTKEYACTIVE;
+            fkOff.dwFlags &= ~FKF_CONFIRMHOTKEY; 
+            SystemParametersInfo(SPI_SETFILTERKEYS, sizeof(FILTERKEYS), &fkOff, 0);
+        }
+    }
+}
+
+static HHOOK keyhook = NULL;
+static
+LRESULT CALLBACK LowLevelKeyboardProc( int nCode, WPARAM wParam, LPARAM lParam ) {
+    // Disable Win key. Note that this will not block the Xbox Game Bar hotkeys (Win+G, Win+Alt+R, etc.)
+    if( nCode == HC_ACTION ) {
+        if( wParam == WM_KEYDOWN || wParam == WM_KEYUP ) {
+            KBDLLHOOKSTRUCT *p = (KBDLLHOOKSTRUCT*)(lParam);
+            BOOL app_active = 1; // (GetActiveWindow() == hWnd);
+            if( app_active ) {
+                // check whether ALT/CTRL/SHIFT keys are pressed
+                BOOL ALT_held = !!(p->flags & LLKHF_ALTDOWN); // !!(GetAsyncKeyState(VK_MENU) & 0x8000); //;
+                BOOL CTRL_held = !!(GetAsyncKeyState(VK_CONTROL) & 0x8000);
+                BOOL SHIFT_held = !!(GetAsyncKeyState(VK_LSHIFT) & 0x8000);
+                int down = p->vkCode;
+
+                // Disable CTRL+ESC (which opens the Start Menu)
+                if( CTRL_held && VK_ESCAPE == down )
+                    return 1;
+
+                // Disable WIN (which opens the Start Menu and, when combined with other keys, performs various system actions)
+                if( VK_LWIN == down || VK_RWIN == down )
+                    return 1;
+
+                // @fixme: following entries do not work
+
+                // Disable ALT+ESC (which cycles through open windows in the order they were opened)
+                if( ALT_held && VK_ESCAPE == down )
+                    return 1;
+
+                // Disable ALT+TAB (which opens the Task Switcher and allows cycling through open applications)
+                if( ALT_held && VK_TAB == down )
+                    return 1;
+
+                // Disable CTRL+SHIFT (which switches the keyboard input language/layout)
+                if( CTRL_held && VK_SHIFT == down )
+                    return 1;
+            }
+        }
+    }
+    return CallNextHookEx( keyhook, nCode, wParam, lParam );
+}
+
+void enable_win_key( bool on ) {
+    if(!on && !keyhook) keyhook = SetWindowsHookEx( WH_KEYBOARD_LL, LowLevelKeyboardProc, GetModuleHandle(NULL), 0 );
+    if( on &&  keyhook) UnhookWindowsHookEx( keyhook ), keyhook = NULL;
+}
+
+#endif
+
+void enable_os_keys( bool on ) {
+#ifdef _WIN32
+    enable_win_key(on);
+    enable_accessibility_keys(on);
+#endif
+}

src/3rd_tigroskeys.h

@@ -15,7 +15,7 @@
 // glue sequential tzx/taps in zips (side A) -> side 1 etc)
 // sequential tzx/taps/dsks do not reset model
 
-#define SPECTRAL "v1.041"
+#define SPECTRAL "v1.05-WIP"
 
 #if NDEBUG >= 2
 #define DEV 0
@@ -1195,6 +1195,11 @@ int main() {
     // postfx
     crt(ZX_CRT);
 
+    // disable win key
+    // disable nag window after holding shift for 8s (windows)
+    // ensure this is called after win32 handles are created
+    enable_os_keys(0);
+
     // must be as close to frame() as possible
     audio_init();
 
@@ -1718,6 +1723,9 @@ if( do_runahead == 0 ) {
 
     } while( window_alive(app) );
 
+    // restore os keys
+    enable_os_keys(1);
+
     // zxplayer does not save state
     if(!ZX_PLAYER)
 

src/app.c

@@ -1,3 +1,5 @@
+// @fixme: excessive va()
+
 #include "res/scr/question_mark"
 
 zxdb ZXDB2;
@@ -539,6 +541,8 @@ int game_browser_keyboard(const int ENTRIES, const int numgames) { // returns cl
     int home = window_pressed(app, TK_HOME) || (window_pressed(app, TK_UP) && tigrKeyHeld(app, TK_CONTROL));
     int end  = window_pressed(app, TK_END) || (window_pressed(app, TK_DOWN) && tigrKeyHeld(app, TK_CONTROL));
 
+    scroll += tigrMouseWheel(app);
+
     scroll = CLAMP(scroll, 0, numgames-1);
     selected = CLAMP(selected, 0, numgames-1);
 
@@ -583,25 +587,34 @@ char* game_browser_v1() {
             return games[chosen];
         }
 
+    static char *buffer = 0; if(!buffer) { buffer = malloc(65536); /*rescan();*/ }
 
     int clicked = 0;
 
-    static char *buffer = 0; if(!buffer) { buffer = malloc(65536); /*rescan();*/ }
-
     int y = 0;
     for( int j = 0; j < ENTRIES; ++j ) {
         int i = scroll + j;
         if( i < 0 ) continue;
         if( i >= numgames ) continue;
 
         const char *sep = strrchr(games[i], *DIR_SEP_);
-        int is_dir = sep[1] == '\0';
+        int is_dir = sep[1] == '\0', is_file = !is_dir;
         if( is_dir ) while(0[--sep] != '/');
 
-        int color = 
-            (dbgames[i] & 0x7F) == 0 ? '\x7' :        // untested
-            (dbgames[i] & 0x7F) == 1 ? '\x4' :        // good
-            (dbgames[i] & 0x7F) == 2 ? '\x2' : '\x6'; // fail:warn
+        int flagged = 0;
+        int starred = 0;
+        if( i == selected ) {
+        if( window_pressed(app, TK_SHIFT) && window_trigger(app, TK_SPACE) ) flagged = 1;
+        if(!window_pressed(app, TK_SHIFT) && window_trigger(app, TK_SPACE) ) starred = 1;
+        }
+
+        int stars = (dbgames[i] >> 8);
+        int flags = (dbgames[i] & 0x7F);
+        int color =
+            flags == 0 ? '\x7' : // untested
+            flags == 1 ? '\x2' : // fail
+            flags == 2 ? '\x6' : // warn
+                         '\x4' ; // good
 
         const char *title = sep+1;
 
@@ -611,50 +624,34 @@ char* game_browser_v1() {
             if( strmatchi(title, wildcard) ) ui_alpha = 255;
         }
 
-        const char starred = dbgames[i] >> 8 ? (char)(dbgames[i] >> 8) : ' ';
-        sprintf(buffer, "%c%c %3d.%s ",
-            color, starred,
-            i+1, i == selected ? ">":" ");
+        ui_at(ui, 1*11 + 3, (2+y++) * 11 + 2 );
 
-        ui_at(ui, 1*11, (2+y++) * 11 );
+        sprintf(buffer, "%3d.%s", i+1, i == selected ? ">":" ");
         ui_label(buffer);
 
-        sprintf(buffer, "%s%.*s\n",
-            is_dir ? "\6" FOLDER_STR "\7\f" : "", (int)(strlen(title) - is_dir), title );
+        if( is_file && ui_click("-Toggle bookmark-", va("%c\f", "\x10\x12"[!!stars])) )
+            starred = 1;
+
+        if( is_file && ui_click("-Toggle compatibility flags-\n\2fail\7, \6warn\7, \4good", va("%c%s", color, flags == 0 || flags == 3 ? "✓":"╳")) ) // "":""
+            flagged = 1;
+
+        sprintf(buffer, "%s%c%.*s\n",
+            is_dir ? "\6" FOLDER_STR "\f" : " ", color, (int)(strlen(title) - is_dir), title );
 
         if( ui_click(NULL, buffer) ) selected = i, clicked = 1;
+
+        if( is_file )
+        if( starred || flagged ) {
+            if( flagged ) flags = (flags+1) % 4;
+            if( starred ) stars = stars != 'B' ? 'B' : 0;
+            db_set(games[i], dbgames[i] = flags + (stars << 8));
+        }
     }
 
     // issue browser
     // if( window_trigger(app, TK_LEFT)  ) { for(--up; (selected+up) >= 0 && (dbgames[selected+up]&0xFF) <= 1; --up ) ; }
     // if( window_trigger(app, TK_RIGHT) ) { for(++up; (selected+up) < numgames && (dbgames[selected+up]&0xFF) <= 1; ++up ) ; }
 
-    if( window_pressed(app, TK_CONTROL) || window_trigger(app, TK_SPACE) ) {
-        int update = 0;
-        int starred = dbgames[selected] >> 8;
-        int color = dbgames[selected] & 0xFF;
-        if( window_trigger(app, TK_SPACE) ) color = (color+1) % 4, update = 1;
-        if( window_trigger(app, 'D') ) starred = starred != 'D' ? 'D' : 0, update = 1; // disk error
-        if( window_trigger(app, 'T') ) starred = starred != 'T' ? 'T' : 0, update = 1; // tape error
-        if( window_trigger(app, 'I') ) starred = starred != 'I' ? 'I' : 0, update = 1; // i/o ports error
-        if( window_trigger(app, 'R') ) starred = starred != 'R' ? 'R' : 0, update = 1; // rom/bios error
-        if( window_trigger(app, 'E') ) starred = starred != 'E' ? 'E' : 0, update = 1; // emulation error
-        if( window_trigger(app, 'Z') ) starred = starred != 'Z' ? 'Z' : 0, update = 1; // zip error
-        if( window_trigger(app, 'S') ) starred = starred != 'S' ? 'S' : 0, update = 1; // star
-        if( window_trigger(app, '3') ) starred = starred != '3' ? '3' : 0, update = 1; // +3 only error
-        if( window_trigger(app, '4') ) starred = starred != '4' ? '4' : 0, update = 1; // 48K only error
-        if( window_trigger(app, '1') ) starred = starred != '1' ? '1' : 0, update = 1; // 128K only error
-        if( window_trigger(app, '0') ) starred = starred != '0' ? '0' : 0, update = 1; // USR0 only error
-        if( window_trigger(app, 'A') ) starred = starred != 'A' ? 'A' : 0, update = 1; // ay/audio error
-        if( window_trigger(app, 'V') ) starred = starred != 'V' ? 'V' : 0, update = 1; // video/vram error
-        if( window_trigger(app, 'H') ) starred = starred != 'H' ? 'H' : 0, update = 1; // hardware error
-        if( window_trigger(app, 'M') ) starred = starred != 'M' ? 'M' : 0, update = 1; // mem/multiload error
-        if(update) {
-            dbgames[selected] = color + (starred << 8);
-            db_set(games[selected], dbgames[selected]);
-        }
-    }
-
     if( clicked ) {
         return games[selected];
     }
@@ -1106,8 +1103,8 @@ char* game_browser_v2() {
 
         if( !num_options )
         if( selected == i ) {
-            if( tigrKeyHeld(app, TK_CONTROL) && tigrKeyDown(app, 'B') )      starred = 1;
-            if( tigrKeyHeld(app, TK_CONTROL) && tigrKeyDown(app, TK_SPACE) ) flagged = 1;
+            if(!tigrKeyHeld(app, TK_SHIFT) && tigrKeyDown(app, TK_SPACE) ) starred = 1;
+            if( tigrKeyHeld(app, TK_SHIFT) && tigrKeyDown(app, TK_SPACE) ) flagged = 1;
         }
 
         if( flagged || starred ) {