--- previous/src/keymap.c	2018/04/24 19:25:10	1.1
+++ previous/src/keymap.c	2018/04/24 19:27:32	1.1.1.3
@@ -18,6 +18,405 @@ const char Keymap_fileid[] = "Hatari key
 #include "screen.h"
 #include "debugui.h"
 #include "log.h"
+#include "ioMem.h"
+#include "m68000.h"
+#include "dma.h"
+#include "sysReg.h"
+
+#include "SDL.h"
+
+
+#define IO_SEG_MASK	0x1FFFF
+
+/*
+ 
+ Byte at address 0x0200e00a contains modifier key values:
+ 
+ x--- ----  valid
+ -x-- ----  alt_right
+ --x- ----  alt_left
+ ---x ----  command_right
+ ---- x---  command_left
+ ---- -x--  shift_right
+ ---- --x-  shift_left
+ ---- ---x  control
+ 
+ 
+ Byte at address 0x0200e00b contains key values:
+ 
+ x--- ----  key up (1) or down (0)
+ -xxx xxxx  key_code
+ 
+ */
+
+
+void Keymap_Init(void) {
+    if(ConfigureParams.Keyboard.bDisableKeyRepeat)
+        SDL_EnableKeyRepeat(0, 0);
+    else
+        SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
+}
+
+Uint8 nextkeycode;
+Uint8 modkeys;
+Uint8 ralt;
+Uint8 lalt;
+Uint8 rcom;
+Uint8 lcom;
+Uint8 rshift;
+Uint8 lshift;
+Uint8 ctrl;
+
+/*--------------------------- Monitor, move to different place --------------------------*/
+#define LOG_MON_LEVEL LOG_DEBUG
+
+/* Monitor Register 0 */
+#define DMAOUT_ENABLE   0x80
+#define DMAOUT_DAV      0x40
+#define DMAOUT_OVR      0x20
+#define DMAIN_ENABLE    0x08
+#define DMAIN_DAV       0x04
+#define DMAIN_OVR       0x02
+
+/* Monitor Register 1 */
+#define KM_INT          0x80
+#define KM_DAV          0x40
+#define KM_OVR          0x20
+#define KM_CLR_NMI      0x10
+#define CONTROL_INT     0x08
+#define CONTROL_DAV     0x04
+#define CONTROL_OVR     0x02
+
+/* Monitor Register 2 */
+#define DTX_PEND        0x80
+#define DTX             0x40
+#define CTX_PEND        0x20
+#define CTX             0x10
+#define RTX_PEND        0x08
+#define RTX             0x04
+#define RESET           0x02
+#define TXLOOP          0x01
+
+/* Monitor Register 3 */
+
+
+struct {
+    Uint8 status_dma;
+    Uint8 status_kbdmouse;
+    Uint8 status_x;
+    Uint8 command;
+} monitor_csr;
+
+void Monitor_CSR_Read(void) {
+    Uint8 reg = IoAccessCurrentAddress&0x3;
+    Uint8 val;
+    
+    switch (reg) {
+        case 0:
+            Log_Printf(LOG_MON_LEVEL, "Monitor: DMA CSR read at $%08x PC=$%08x\n", IoAccessCurrentAddress, m68k_getpc());
+            val = monitor_csr.status_dma; //DMAOUT_ENABLE|DMAOUT_OVR; // 0xA0;
+            break;
+            
+        case 1:
+            //Log_Printf(LOG_MON_LEVEL, "Monitor: Keyboard status read at $%08x PC=$%08x\n", IoAccessCurrentAddress, m68k_getpc());
+            val = monitor_csr.status_kbdmouse|0xF0; //KM_INT|KM_DAV|KM_OVR|KM_CLR_NMI; // 0xF0;
+            break;
+            
+        case 2:
+            Log_Printf(LOG_MON_LEVEL, "Monitor: X status read at $%08x PC=$%08x\n", IoAccessCurrentAddress, m68k_getpc());
+            val = monitor_csr.status_x; //CTX|RESET|TXLOOP // 0x13;
+            break;
+            
+        case 3:
+            Log_Printf(LOG_MON_LEVEL, "Monitor: Command read at $%08x PC=$%08x\n", IoAccessCurrentAddress, m68k_getpc());
+            val = monitor_csr.command;
+            break;
+    }
+    IoMem[IoAccessCurrentAddress&IO_SEG_MASK] = val;
+}
+
+void Monitor_CSR_Write(void) {
+    Uint8 reg = IoAccessCurrentAddress&0x3;
+    Uint8 val = IoMem[IoAccessCurrentAddress&IO_SEG_MASK];
+    Uint8 sound[32768];
+    Uint32 length;
+    
+    switch (reg) {
+        case 0:
+            Log_Printf(LOG_MON_LEVEL, "Monitor: DMA CSR write at $%08x, val = %02x, PC=$%08x\n",
+                       IoAccessCurrentAddress, val, m68k_getpc());
+            monitor_csr.status_dma = val;
+            if (monitor_csr.status_dma&DMAOUT_ENABLE) {
+                dma_memory_read(sound, &length, CHANNEL_SOUNDOUT);
+                monitor_csr.status_dma |= DMAOUT_ENABLE;
+            }
+            break;
+            
+        case 1:
+            Log_Printf(LOG_MON_LEVEL, "Monitor: Keyboard status write at $%08x, val = %02x, PC=$%08x\n",
+                       IoAccessCurrentAddress, val, m68k_getpc());
+            monitor_csr.status_kbdmouse = val;
+            break;
+            
+        case 2:
+            Log_Printf(LOG_MON_LEVEL, "Monitor: X status write at $%08x, val = %02x, PC=$%08x\n",
+                       IoAccessCurrentAddress, val, m68k_getpc());
+            monitor_csr.status_x = val;
+            break;
+            
+        case 3:
+            Log_Printf(LOG_MON_LEVEL, "Monitor: Command write at $%08x, val = %02x, PC=$%08x\n",
+                       IoAccessCurrentAddress, val, m68k_getpc());
+            monitor_csr.command = val;
+            switch (monitor_csr.command) {
+                case 0xc4:
+                    set_interrupt(INT_SND_OUT_DMA, SET_INT);
+                    monitor_csr.status_dma = 0x00;
+                    break;
+                    
+                default:
+                    break;
+            }
+            break;
+    }
+}
+
+/*------------------------------ End of monitor code -------------------------------*/
+
+void Keycode_Read(void) {
+    //Log_Printf(LOG_WARN, "Keycode read at $%08x PC=$%08x\n", IoAccessCurrentAddress, m68k_getpc());
+    //IoMem[0xe002]=0x93;
+    monitor_csr.status_kbdmouse = DTX_PEND | CTX | RESET | TXLOOP;
+    IoMem[0xe008]=0x10;
+    
+    IoMem[0xe00a]=modkeys; // Set modifier Keys
+    IoMem[0xe00b]=nextkeycode; // Press virtual Key
+    nextkeycode=nextkeycode | 0x80; // Automatically release virtual Key
+}
+
+
+void KeyTranslator(SDL_keysym *sdlkey) { // Translate SDL Keys to NeXT Keycodes
+    Log_Printf(LOG_WARN, "Key pressed: %s\n", SDL_GetKeyName(sdlkey->sym));
+
+    int symkey = sdlkey->sym;
+	int modkey = sdlkey->mod;
+    if (ShortCut_CheckKeys(modkey, symkey, 1)) // Check if we pressed a shortcut
+        ShortCut_ActKey();
+    else
+
+    switch (sdlkey->sym) {
+        
+        case SDLK_RIGHTBRACKET: nextkeycode = 0x04;
+            break;
+        case SDLK_LEFTBRACKET: nextkeycode = 0x05;
+            break;
+        case SDLK_i: nextkeycode = 0x06;
+            break;
+        case SDLK_o: nextkeycode = 0x07;
+            break;
+        case SDLK_p: nextkeycode = 0x08;
+            break;
+        case SDLK_LEFT: nextkeycode = 0x09;
+            break;
+        case SDLK_KP0: nextkeycode = 0x0B;
+            break;
+        case SDLK_KP_PERIOD: nextkeycode = 0x0C;
+            break;
+        case SDLK_KP_ENTER: nextkeycode = 0x0D;
+            break;
+        case SDLK_DOWN: nextkeycode = 0x0F;
+            break;
+        case SDLK_RIGHT: nextkeycode = 0x10;
+            break;
+        case SDLK_KP1: nextkeycode = 0x11;
+            break;
+        case SDLK_KP4: nextkeycode = 0x12;
+            break;
+        case SDLK_KP6: nextkeycode = 0x13;
+            break;
+        case SDLK_KP3: nextkeycode = 0x14;
+            break;
+        case SDLK_KP_PLUS: nextkeycode = 0x15;
+            break;
+        case SDLK_UP: nextkeycode = 0x16;
+            break;
+        case SDLK_KP2: nextkeycode = 0x17;
+            break;
+        case SDLK_KP5: nextkeycode = 0x18;
+            break;
+        case SDLK_BACKSPACE: nextkeycode = 0x1B;
+            break;
+        case SDLK_EQUALS: nextkeycode = 0x1C;
+            break;
+        case SDLK_MINUS: nextkeycode = 0x1D;
+            break;
+        case SDLK_8: nextkeycode = 0x1E;
+            break;
+        case SDLK_9: nextkeycode = 0x1F;
+            break;
+        case SDLK_0: nextkeycode = 0x20;
+            break;
+        case SDLK_KP7: nextkeycode = 0x21;
+            break;
+        case SDLK_KP8: nextkeycode = 0x22;
+            break;
+        case SDLK_KP9: nextkeycode = 0x23;
+            break;
+        case SDLK_KP_MINUS: nextkeycode = 0x24;
+            break;
+        case SDLK_KP_MULTIPLY: nextkeycode = 0x25;
+            break;
+        case SDLK_BACKQUOTE: nextkeycode = 0x26;
+            break;
+        case SDLK_KP_EQUALS: nextkeycode = 0x27;
+            break;
+        case SDLK_KP_DIVIDE: nextkeycode = 0x28;
+            break;            
+        case SDLK_RETURN: nextkeycode = 0x2A;
+            break;
+        case SDLK_BACKSLASH: nextkeycode = 0x2B;
+            break;
+        case SDLK_SEMICOLON: nextkeycode = 0x2C;
+            break;
+        case SDLK_l: nextkeycode = 0x2D;
+            break;
+        case SDLK_COMMA: nextkeycode = 0x2E;
+            break;
+        case SDLK_PERIOD: nextkeycode = 0x2F;
+            break;
+        case SDLK_SLASH: nextkeycode = 0x30;
+            break;
+        case SDLK_z: nextkeycode = 0x31;
+            break;
+        case SDLK_x: nextkeycode = 0x32;
+            break;
+        case SDLK_c: nextkeycode = 0x33;
+            break;
+        case SDLK_v: nextkeycode = 0x34;
+            break;
+        case SDLK_b: nextkeycode = 0x35;
+            break;
+        case SDLK_m: nextkeycode = 0x36;
+            break;
+        case SDLK_n: nextkeycode = 0x37;
+            break;
+        case SDLK_SPACE: nextkeycode = 0x38;
+            break;
+        case SDLK_a: nextkeycode = 0x39;
+            break;
+        case SDLK_s: nextkeycode = 0x3A;
+            break;
+        case SDLK_d: nextkeycode = 0x3B;
+            break;
+        case SDLK_f: nextkeycode = 0x3C;
+            break;            
+        case SDLK_g: nextkeycode = 0x3D;
+            break;
+        case SDLK_k: nextkeycode = 0x3E;
+            break;
+        case SDLK_j: nextkeycode = 0x3F;
+            break;
+        case SDLK_h: nextkeycode = 0x40;
+            break;
+        case SDLK_TAB: nextkeycode = 0x41;
+            break;
+        case SDLK_q: nextkeycode = 0x42;
+            break;
+        case SDLK_w: nextkeycode = 0x43;
+            break;
+        case SDLK_e: nextkeycode = 0x44;
+            break;
+        case SDLK_r: nextkeycode = 0x45;
+            break;
+        case SDLK_u: nextkeycode = 0x46;
+            break;
+        case SDLK_y: nextkeycode = 0x47;
+            break;
+        case SDLK_t: nextkeycode = 0x48;
+            break;
+        case SDLK_ESCAPE: nextkeycode = 0x49;
+            break;
+        case SDLK_1: nextkeycode = 0x4A;
+            break;
+        case SDLK_2: nextkeycode = 0x4B;
+            break;
+        case SDLK_3: nextkeycode = 0x4C;
+            break;
+        case SDLK_4: nextkeycode = 0x4D;
+            break;
+        case SDLK_7: nextkeycode = 0x4E;
+            break;
+        case SDLK_6: nextkeycode = 0x4F;
+            break;
+        case SDLK_5: nextkeycode = 0x50;
+            break;
+            
+        /* Modifier Keys */
+        case SDLK_RMETA: ctrl = 0x01;
+            break;
+        case SDLK_LMETA: ctrl = 0x01;
+            break;
+        case SDLK_LSHIFT: lshift = 0x02;
+            break;
+        case SDLK_RSHIFT: rshift = 0x04;
+            break;
+        case SDLK_LCTRL: lcom = 0x08;
+            break;
+        case SDLK_RCTRL: rcom = 0x10;
+            break;
+        case SDLK_LALT: lalt = 0x20;
+            break;
+        case SDLK_RALT: ralt = 0x40;
+            break;
+        case SDLK_CAPSLOCK: lshift = 0x02, rshift = 0x04;
+            break;
+            
+        /* Special keys not yet emulated:
+         SOUND_UP_KEY           0x1A
+         SOUND_DOWN_KEY         0x02
+         BRIGHTNESS_UP_KEY      0x19
+         BRIGHTNESS_DOWN_KEY	0x01
+         POWER_KEY              0x58
+         */
+
+        default: break;
+    }
+    modkeys = 0x80 | ralt | lalt | rcom | lcom | rshift | lshift | ctrl;
+    Log_Printf(LOG_WARN, "Modkeys: $%02x\n", modkeys);
+}
+
+
+void KeyRelease(SDL_keysym *sdlkey) { //release modifier Keys
+    int symkey = sdlkey->sym;
+	int modkey = sdlkey->mod;
+    if (ShortCut_CheckKeys(modkey, symkey, 0))
+		return;
+
+    switch (sdlkey->sym) {
+            
+        case SDLK_RMETA: ctrl = 0x00;
+            break;
+        case SDLK_LMETA: ctrl = 0x00;
+            break;
+        case SDLK_LSHIFT: lshift = 0x00;
+            break;
+        case SDLK_RSHIFT: rshift = 0x00;
+            break;
+        case SDLK_LCTRL: lcom = 0x00;
+            break;
+        case SDLK_RCTRL: rcom = 0x00;
+            break;
+        case SDLK_LALT: lalt = 0x00;
+            break;
+        case SDLK_RALT: ralt = 0x00;
+            break;
+        case SDLK_CAPSLOCK: lshift = 0x00, rshift = 0x00;
+            break;
+        default: break;
+    }
+    modkeys = 0x80 | ralt | lalt | rcom | lcom | rshift | lshift | ctrl;
+    Log_Printf(LOG_WARN, "Modkeys: $%02x\n", modkeys);
+}