From 986cf9b89690bb11f453fc617fac005f98483912 Mon Sep 17 00:00:00 2001 From: Andrea Odetti Date: Tue, 15 Dec 2020 17:37:21 +0000 Subject: [PATCH] Make size of hi-res for applen work on Pi3. Signed-off-by: Andrea Odetti --- linux.md | 14 ++++++++------ source/frontends/ncurses/world.cpp | 8 ++++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/linux.md b/linux.md index 4afe0ea3..b6902fee 100644 --- a/linux.md +++ b/linux.md @@ -59,14 +59,16 @@ Frontend based on ncurses, with a ASCII art graphic mode. Keyboard shortcuts -* F2: terminate emulator -* F12: Load Snapshot -* ALT-RIGHT: wider hi res graphis -* ALT-LEFT: narrower hi res graphics -* ALT-UP: vertical hi res (smaller) -* ALT-DOWN: vertical hires (bigger) +* ``F2``: reset the machine +* ``F3``: terminate the emulator +* ``F11``, ``F12``: Save, Load Snapshot +* ``ALT-RIGHT``: wider hi res graphis +* ``ALT-LEFT``: narrower hi res graphics +* ``ALT-UP``: vertical hi res (smaller) +* ``ALT-DOWN``: vertical hires (bigger) In order to properly appreciate the wider hi res graphics, open a big terminal window and choose a small font size. +Try ``CTRL-`` as well if ``ALT--` does not work: terminals do not report a consistent keycode for these combinations. The joystick uses evdev (currently the device name is hardcoded). diff --git a/source/frontends/ncurses/world.cpp b/source/frontends/ncurses/world.cpp index d1800487..29ce9b0e 100644 --- a/source/frontends/ncurses/world.cpp +++ b/source/frontends/ncurses/world.cpp @@ -467,16 +467,16 @@ int ProcessKeyboard() case 0x14a: // DEL ch = 0x7f; break; - case 544: // ALT - LEFT (Ctrl would be 546) + case 543 ... 546: // Various values for Ctrl/Alt - Left on Ubuntu and Pi OS asciiArt->changeColumns(-1); break; - case 559: // ALT - RIGHT (561) + case 558 ... 561: // Ctrl/Alt - Right asciiArt->changeColumns(+1); break; - case 565: // ALT - UP (567) + case 564 ... 567: // Ctrl/Alt - Up asciiArt->changeRows(-1); break; - case 524: // ALT - DOWN (526) + case 523 ... 526: // Ctrl/Alt - Down asciiArt->changeRows(+1); break; default: