From 66757dfaad692ce0aec5c6742762607cd4c9d749 Mon Sep 17 00:00:00 2001 From: OBattler Date: Wed, 18 Jan 2017 00:43:43 +0100 Subject: [PATCH] Added IBM PS/1 Model 2121 with ISA expansion, allows selecting any graphics card. --- src/ibm.h | 2 ++ src/model.c | 1 + src/win.c | 7 +++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ibm.h b/src/ibm.h index 061602145..0e95a3f30 100644 --- a/src/ibm.h +++ b/src/ibm.h @@ -415,6 +415,8 @@ enum ROM_THOR, /*Intel Advanced/ATX / 430FX / AMI BIOS / National Semiconductors PC87306*/ ROM_MRTHOR, /*Intel Advanced/ATX / 430FX / MR.BIOS / National Semiconductors PC87306*/ ROM_POWERMATE_V,/*NEC PowerMate V / 430FX / Phoenix BIOS / SMC FDC37C665*/ + + ROM_IBMPS1_2121,/*IBM PS/1 Model 2121 with ISA expansion bus*/ ROM_MAX }; diff --git a/src/model.c b/src/model.c index 64562f7a2..a6e7dc8f4 100644 --- a/src/model.c +++ b/src/model.c @@ -146,6 +146,7 @@ MODEL models[] = {"DELL System 200", ROM_DELL200, { "", cpus_286, "", NULL, "", NULL}, 0, MODEL_AT, 1, 16, 1, at_init, NULL}, {"IBM PS/1 model 2011", ROM_IBMPS1_2011, { "", cpus_ps1_m2011,"", NULL, "", NULL}, 1, MODEL_AT|MODEL_PS2, 1, 16, 1, ps1_m2011_init, NULL}, {"IBM PS/1 model 2121", ROM_IBMPS1_2121, { "Intel", cpus_i386, "", NULL, "", NULL}, 1, MODEL_AT|MODEL_PS2, 1, 16, 1, ps1_m2121_init, NULL}, + {"IBM PS/1 m.2121+ISA", ROM_IBMPS1_2121_ISA, { "Intel", cpus_i386, "", NULL, "", NULL}, 1, MODEL_AT|MODEL_PS2, 1, 16, 1, ps1_m2121_init, NULL}, {"Compaq Deskpro 386", ROM_DESKPRO_386, { "Intel", cpus_i386, "AMD", cpus_Am386, "Cyrix", cpus_486SDLC}, 0, MODEL_AT, 1, 15, 1, deskpro386_init, NULL}, {"Acer 386SX25/N", ROM_ACER386, { "Intel", cpus_acer, "", NULL, "", NULL}, 1, MODEL_AT|MODEL_PS2, 1, 16, 1, at_acer386sx_init, NULL}, {"DTK 386SX clone", ROM_DTK386, { "Intel", cpus_i386, "AMD", cpus_Am386, "Cyrix", cpus_486SDLC}, 0, MODEL_AT, 1, 16, 1, at_neat_init, NULL}, diff --git a/src/win.c b/src/win.c index ddccc1cad..0d0ac7b5a 100644 --- a/src/win.c +++ b/src/win.c @@ -1053,7 +1053,8 @@ LRESULT CALLBACK LowLevelKeyboardProc( int nCode, WPARAM wParam, LPARAM lParam ) BOOL bControlKeyDown; KBDLLHOOKSTRUCT* p; - if (nCode < 0 || nCode != HC_ACTION || (!mousecapture && !video_fullscreen)) + // if (nCode < 0 || nCode != HC_ACTION || (!mousecapture && !video_fullscreen)) + if (nCode < 0 || nCode != HC_ACTION) return CallNextHookEx( hKeyboardHook, nCode, wParam, lParam); p = (KBDLLHOOKSTRUCT*)lParam; @@ -2155,7 +2156,9 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM break; case WM_SYSCOMMAND: - if (wParam == SC_KEYMENU && HIWORD(lParam) <= 0 && (video_fullscreen || mousecapture)) + // if (wParam == SC_KEYMENU && HIWORD(lParam) <= 0 && (video_fullscreen || mousecapture)) + /* Disable ALT key *ALWAYS*, I don't think there's any use for reaching the menu that way. */ + if (wParam == SC_KEYMENU && HIWORD(lParam) <= 0) return 0; /*disable ALT key for menu*/ default: