From 4f289ab10bed498de206858e43f7bace50f349b9 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomasharte@Xiaoyuns-MacBook.local>
Date: Thu, 12 Oct 2017 22:33:00 -0400
Subject: [PATCH] Corrects some deficiencies in Vic-20 keyboard mapping.

... albeit without yet being clear on the wiring behind restore.
---
 Machines/Commodore/Vic-20/KeyboardMapper.cpp |  6 ++++++
 Machines/Commodore/Vic-20/Vic20.cpp          | 12 ++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Machines/Commodore/Vic-20/KeyboardMapper.cpp b/Machines/Commodore/Vic-20/KeyboardMapper.cpp
index 98e82b589..013da837d 100644
--- a/Machines/Commodore/Vic-20/KeyboardMapper.cpp
+++ b/Machines/Commodore/Vic-20/KeyboardMapper.cpp
@@ -61,6 +61,12 @@ uint16_t KeyboardMapper::mapped_key_for_key(Inputs::Keyboard::Key key) {
 		BIND(Enter, KeyReturn);
 		BIND(Space, KeySpace);
 		BIND(BackSpace, KeyDelete);
+		
+		BIND(Escape, KeyRunStop);
+		BIND(F1, KeyF1);
+		BIND(F3, KeyF3);
+		BIND(F5, KeyF5);
+		BIND(F7, KeyF7);
 	}
 #undef BIND
 	return KeyboardMachine::Machine::KeyNotMapped;
diff --git a/Machines/Commodore/Vic-20/Vic20.cpp b/Machines/Commodore/Vic-20/Vic20.cpp
index 8baf3ba6f..3ac582610 100644
--- a/Machines/Commodore/Vic-20/Vic20.cpp
+++ b/Machines/Commodore/Vic-20/Vic20.cpp
@@ -111,10 +111,14 @@ class KeyboardVIA: public MOS::MOS6522::IRQDelegatePortHandler {
 
 		/// Sets whether @c key @c is_pressed.
 		void set_key_state(uint16_t key, bool is_pressed) {
-			if(is_pressed)
-				columns_[key & 7] &= ~(key >> 3);
-			else
-				columns_[key & 7] |= (key >> 3);
+			if(key == KeyRestore) {
+				// TODO: how is restore wired?
+			} else {
+				if(is_pressed)
+					columns_[key & 7] &= ~(key >> 3);
+				else
+					columns_[key & 7] |= (key >> 3);
+			}
 		}
 
 		/// Sets all keys as unpressed.