From f9b2be5a2ee5d92c4ddaf6f0ec7314df5672ae7f Mon Sep 17 00:00:00 2001
From: Scott Duensing <scott@kangaroopunch.com>
Date: Wed, 11 Mar 2020 19:36:43 -0500
Subject: [PATCH] Starting b10

---
 makePiRoot.sh  | 2 ++
 singe/main.c   | 5 +++++
 singe/singe.c  | 8 ++++----
 singe/singe.h  | 2 +-
 singe/singe.rc | 8 ++++----
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/makePiRoot.sh b/makePiRoot.sh
index a790edeaa..5e1a4a2c4 100755
--- a/makePiRoot.sh
+++ b/makePiRoot.sh
@@ -42,3 +42,5 @@ git clone https://github.com/raspberrypi/tools.git
 wget https://raw.githubusercontent.com/riscv/riscv-poky/master/scripts/sysroot-relativelinks.py
 chmod +x sysroot-relativelinks.py
 ./sysroot-relativelinks.py buster/
+
+sudo apt-get install lib32z1
diff --git a/singe/main.c b/singe/main.c
index 9f5faa0bd..9bb981a8a 100644
--- a/singe/main.c
+++ b/singe/main.c
@@ -119,9 +119,14 @@ void showUsage(char *name, char *message) {
 
 	// Extract any missing support files.  We do this here so they're not generated if launched from a front end.
 	if (!utilPathExists("Singe")) utilMkDirP("Singe", 0777);
+	// Singe/Framework.singe
 	temp = utilCreateString("Singe%cFramework.singe", utilGetPathSeparator());
 	extractFile(temp, Framework_singe, Framework_singe_len);
 	free(temp);
+	// Singe/controls.cfg.example
+	temp = utilCreateString("Singe%ccontrols.cfg.example", utilGetPathSeparator());
+	extractFile(temp, controls_cfg, controls_cfg_len);
+	free(temp);
 	temp = NULL;
 
 #ifdef _WIN32
diff --git a/singe/singe.c b/singe/singe.c
index 7f561ecb9..9d7b557e3 100644
--- a/singe/singe.c
+++ b/singe/singe.c
@@ -2143,15 +2143,15 @@ void processKey(bool down, int32_t keysym, int32_t scancode) {
 								_requestScreenShot = true;
 							}
 						}
-						callLua(down ? "onInputPressed" : "onInputReleased", "ii", move, NOMOUSE);
+						callLua(down ? "onInputPressed" : "onInputReleased", "i", move);
 					}
 				}
 			}
 		}
 	} else {
 		// Full keyboard
-		callLua(down ? "onInputPressed" : "onInputReleased", "ii", keysym, NOMOUSE);
-		callLua(down ? "onKeyPressed" : "onKeyReleased", "i", scancode);
+		callLua(down ? "onInputPressed" : "onInputReleased", "i", keysym);
+		callLua(down ? "onKeyPressed" : "onKeyReleased", "ii", keysym, scancode);
 	}
 }
 
@@ -2553,7 +2553,7 @@ void singe(SDL_Window *window, SDL_Renderer *renderer) {
 						y  = (int32_t)(event.motion.y    * _overlayScaleY);
 						xr = (int32_t)(event.motion.xrel * _overlayScaleX);
 						yr = (int32_t)(event.motion.yrel * _overlayScaleY);
-						callLua("onMouseMoved", "iiiii", x, y, xr, yr, NOMOUSE);
+						callLua("onMouseMoved", "iiiii", x, y, xr, yr, 0);
 					}
 					break;
 
diff --git a/singe/singe.h b/singe/singe.h
index 2c1b03211..65e2ecfea 100644
--- a/singe/singe.h
+++ b/singe/singe.h
@@ -31,7 +31,7 @@
 
 // Don't forget to update singe.rc!
 #define SINGE_VERSION       2.00
-#define VERSION_STRING      "v2.00b9"
+#define VERSION_STRING      "v2.00b10"
 #define COPYRIGHT_END_YEAR  "2020"
 
 
diff --git a/singe/singe.rc b/singe/singe.rc
index 85c2e4e9b..aec3d4d86 100644
--- a/singe/singe.rc
+++ b/singe/singe.rc
@@ -1,7 +1,7 @@
 101 ICON "/tmp/icon.ico"
 1 VERSIONINFO
-FILEVERSION     2,0,0,9
-PRODUCTVERSION  2,0,0,9
+FILEVERSION     2,0,0,10
+PRODUCTVERSION  2,0,0,10
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
@@ -9,12 +9,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName", "Kangaroo Punch Studios"
       VALUE "FileDescription", "Somewhat Interactive Nostalgic Game Engine"
-      VALUE "FileVersion", "2.00b9"
+      VALUE "FileVersion", "2.00b10"
       VALUE "InternalName", "Singe"
       VALUE "LegalCopyright", "Copyright 2006-2020 Scott C. Duensing"
       VALUE "OriginalFilename", "singe.exe"
       VALUE "ProductName", "Singe"
-      VALUE "ProductVersion", "2.00b9"
+      VALUE "ProductVersion", "2.00b10"
     END
   END
   BLOCK "VarFileInfo"