--- BasiliskII/src/AmigaOS/video_amiga.cpp 2000/07/22 18:25:48 1.8 +++ BasiliskII/src/AmigaOS/video_amiga.cpp 2000/10/16 17:37:58 1.11 @@ -33,6 +33,7 @@ #include #include "sysdeps.h" +#include "cpu_emulation.h" #include "main.h" #include "adb.h" #include "prefs.h" @@ -284,7 +285,8 @@ static bool init_screen_cgfx(ULONG mode_ break; case 15: case 16: - if (format != PIXFMT_RGB16) { + // !!! PIXFMT_RGB15 is correct !!! + if (format != PIXFMT_RGB15) { ErrorAlert(GetString(STR_WRONG_SCREEN_FORMAT_ERR)); return false; } @@ -653,6 +655,13 @@ static __saveds void periodic_func(void) case IDCMP_RAWKEY: if (qualifier & IEQUALIFIER_REPEAT) // Keyboard repeat is done by MacOS break; + if ((qualifier & (IEQUALIFIER_LALT | IEQUALIFIER_LSHIFT | IEQUALIFIER_CONTROL)) == + (IEQUALIFIER_LALT | IEQUALIFIER_LSHIFT | IEQUALIFIER_CONTROL) && code == 0x5f) { + SetInterruptFlag(INTFLAG_NMI); + TriggerInterrupt(); + break; + } + if (code & IECODE_UP_PREFIX) ADBKeyUp(keycode2mac[code & 0x7f]); else