diff --git a/BasiliskII/src/SDL/keycodes b/BasiliskII/src/SDL/keycodes index da918560..1ee627a8 100644 --- a/BasiliskII/src/SDL/keycodes +++ b/BasiliskII/src/SDL/keycodes @@ -352,6 +352,113 @@ sdl Quartz 82 82 # KP 0 65 65 # KP . +# +# cocoa (SDL2) +# +sdl cocoa +53 53 # Esc +122 122 # F1 +120 120 # F2 +99 99 # F3 +118 118 # F4 +96 96 # F5 +97 97 # F6 +98 98 # F7 +100 100 # F8 +101 101 # F9 +109 109 # F10 +103 103 # F11 +111 111 # F12 +105 105 # F13/PrintScrn +107 107 # F14/Scroll Lock +113 113 # F15/Pause +10 10 # ` +18 18 # 1 +19 19 # 2 +20 20 # 3 +21 21 # 4 +23 23 # 5 +22 22 # 6 +26 26 # 7 +28 28 # 8 +25 25 # 9 +29 29 # 0 +27 27 # - +24 24 # = +51 51 # Backspace +114 114 # Help/Insert +115 115 # Home +116 116 # Page Up +71 71 # Num Lock +81 81 # KP = +75 75 # KP / +67 67 # KP * +48 48 # Tab +12 12 # Q +13 13 # W +14 14 # E +15 15 # R +17 17 # T +16 16 # Y +32 32 # U +34 34 # I +31 31 # O +35 35 # P +33 33 # [ +30 30 # ] +36 36 # Return +117 117 # Delete +119 119 # End +121 121 # Page Down +89 89 # KP 7 +91 91 # KP 8 +92 92 # KP 9 +78 78 # KP - +57 57 # Caps Lock +0 0 # A +1 1 # S +2 2 # D +3 3 # F +5 5 # G +4 4 # H +38 38 # J +40 40 # K +37 37 # L +41 41 # ; +39 39 # ' +42 42 # \ +86 86 # KP 4 +87 87 # KP 5 +88 88 # KP 6 +69 69 # KP + +56 56 # Shift +50 50 # International +6 6 # Z +7 7 # X +8 8 # C +9 9 # V +11 11 # B +45 45 # N +46 46 # M +43 43 # , +47 47 # . +44 44 # / +126 62 # Cursor Up +123 59 # Cursor Left +125 61 # Cursor Down +124 60 # Cursor Right +83 83 # KP 1 +84 84 # KP 2 +85 85 # KP 3 +76 76 # KP Enter +54 54 # Ctrl +58 58 # Option +55 55 # Command +54 54 # Ctrl Left +49 49 # Space +82 82 # KP 0 +65 65 # KP . + # # Windows # diff --git a/BasiliskII/src/SDL/video_sdl2.cpp b/BasiliskII/src/SDL/video_sdl2.cpp index 755de8d3..e95a08f7 100644 --- a/BasiliskII/src/SDL/video_sdl2.cpp +++ b/BasiliskII/src/SDL/video_sdl2.cpp @@ -1099,6 +1099,12 @@ void driver_base::update_palette(void) if ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT) { SDL_SetSurfacePalette(s, sdl_palette); + SDL_LockMutex(sdl_update_video_mutex); + sdl_update_video_rect.x = 0; + sdl_update_video_rect.y = 0; + sdl_update_video_rect.w = VIDEO_MODE_X; + sdl_update_video_rect.h = VIDEO_MODE_Y; + SDL_UnlockMutex(sdl_update_video_mutex); } } @@ -1930,7 +1936,7 @@ static int kc_decode(SDL_Keysym const & ks, bool key_down) case SDLK_9: return 0x19; case SDLK_0: return 0x1d; - case SDLK_BACKQUOTE: return 0x0a; + case SDLK_BACKQUOTE: case 167: return 0x32; case SDLK_MINUS: case SDLK_UNDERSCORE: return 0x1b; case SDLK_EQUALS: case SDLK_PLUS: return 0x18; case SDLK_LEFTBRACKET: return 0x21;