SDL: fix issue #81 - numlock handling

Author: chrisws

ChangeLog

@@ -1,3 +1,6 @@
+2019-12-21 (0.12.17)
+	SDL: fix issue #81 - numlock handling
+
 2019-12-15 (0.12.17)
 	FLTK: add online samples command
 	FLTK: fix tab resizing

README.md

@@ -1,5 +1,11 @@
 SmallBASIC is a fast and easy to learn BASIC language interpreter ideal for everyday calculations, scripts and prototypes. SmallBASIC includes trigonometric, matrices and algebra functions, a built in IDE, a powerful string library, system, sound, and graphic commands along with structured programming syntax
 
+### Initialise dependencies
+
+```
+$ git submodule update --init
+```
+
 ## Building the SDL version
 
 Initial setup on linux

configure.ac

@@ -285,7 +285,7 @@ function buildConsole() {
          TARGET="Building Cygwin MinGW console version."
          AC_DEFINE(__MINGW32__, 1, [as above])
          AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
-         PACKAGE_LIBS="${PACKAGE_LIBS} -mconsole -lmingw32 -lwsock32 -lws2_32 -static-libgcc"
+         PACKAGE_LIBS="${PACKAGE_LIBS} -Wl,-Bstatic -mconsole -lmingw32 -lwsock32 -lws2_32 -static-libgcc"
          BUILD_SUBDIRS="src/common src/platform/console"
       fi
       AC_DEFINE(_Win32, 1, [Windows build])

src/platform/sdl/display.h

@@ -1,6 +1,6 @@
 // This file is part of SmallBASIC
 //
-// Copyright(C) 2001-2015 Chris Warren-Smith.
+// Copyright(C) 2001-2019 Chris Warren-Smith.
 //
 // This program is distributed under the terms of the GPL v2.0 or later
 // Download the GNU Public License (GPL) from www.gnu.org
@@ -9,7 +9,7 @@
 #ifndef DISPLAY_H
 #define DISPLAY_H
 
-#include <SDL.h>
+#include <SDL_video.h>
 
 #include "lib/maapi.h"
 #include "ui/strlib.h"

src/platform/sdl/main.cpp

@@ -1,13 +1,12 @@
 // This file is part of SmallBASIC
 //
-// Copyright(C) 2001-2014 Chris Warren-Smith.
+// Copyright(C) 2001-2019 Chris Warren-Smith.
 //
 // This program is distributed under the terms of the GPL v2.0 or later
 // Download the GNU Public License (GPL) from www.gnu.org
 //
 
 #include "config.h"
-#include <SDL.h>
 #include <getopt.h>
 #include <locale.h>
 

src/platform/sdl/runtime.cpp

@@ -1,6 +1,6 @@
 // This file is part of SmallBASIC
 //
-// Copyright(C) 2001-2015 Chris Warren-Smith.
+// Copyright(C) 2001-2019 Chris Warren-Smith.
 //
 // This program is distributed under the terms of the GPL v2.0 or later
 // Download the GNU Public License (GPL) from www.gnu.org
@@ -22,8 +22,11 @@
 #include "platform/sdl/keymap.h"
 #include "platform/sdl/main_bas.h"
 
-#include <SDL_clipboard.h>
 #include <SDL_audio.h>
+#include <SDL_clipboard.h>
+#include <SDL_events.h>
+#include <SDL_messagebox.h>
+#include <SDL_timer.h>
 #include <math.h>
 #include <wchar.h>
 
@@ -483,9 +486,9 @@ void Runtime::pause(int timeout) {
 void Runtime::pollEvents(bool blocking) {
   if (isActive() && !isRestart()) {
     SDL_Event ev;
-    SDL_Keymod mod;
     if (blocking ? SDL_WaitEvent(&ev) : SDL_PollEvent(&ev)) {
       MAEvent *maEvent = NULL;
+      SDL_Keymod mod;
       switch (ev.type) {
       case SDL_TEXTINPUT:
         // pre-transformed/composted text
@@ -590,7 +593,6 @@ void Runtime::pollEvents(bool blocking) {
       case SDL_WINDOWEVENT:
         switch (ev.window.event) {
         case SDL_WINDOWEVENT_FOCUS_GAINED:
-          SDL_SetModState(KMOD_NONE);
           break;
         case SDL_WINDOWEVENT_RESIZED:
           onResize(ev.window.data1, ev.window.data2);

src/platform/sdl/runtime.h

@@ -1,6 +1,6 @@
 // This file is part of SmallBASIC
 //
-// Copyright(C) 2001-2014 Chris Warren-Smith.
+// Copyright(C) 2001-2019 Chris Warren-Smith.
 //
 // This program is distributed under the terms of the GPL v2.0 or later
 // Download the GNU Public License (GPL) from www.gnu.org
@@ -10,7 +10,9 @@
 #define RUNTIME_H
 
 #include "config.h"
-#include <SDL.h>
+
+#include <SDL_keycode.h>
+#include <SDL_mouse.h>
 
 #include "lib/maapi.h"
 #include "ui/ansiwidget.h"

src/ui/canvas.h

@@ -1,6 +1,6 @@
 // This file is part of SmallBASIC
 //
-// Copyright(C) 2001-2018 Chris Warren-Smith.
+// Copyright(C) 2001-2019 Chris Warren-Smith.
 //
 // This program is distributed under the terms of the GPL v2.0 or later
 // Download the GNU Public License (GPL) from www.gnu.org
@@ -10,7 +10,8 @@
 #define UI_CANVAS
 
 #if defined(_SDL)
-#include <SDL.h>
+#include <SDL_rect.h>
+#include <SDL_surface.h>
 #define MAX_CANVAS_SIZE 20
 
 struct Canvas {