UI: changed display of BLACK to be a slightly ligher onyx colour.

Author: chrisws

ChangeLog

@@ -1,3 +1,8 @@
+2018-10-20 (0.12.14)
+	UI: fix navigation when network access down then available
+	UI: changed display of "BLACK" to be a slightly ligher onyx colour.
+	ANDROID: update help tip in scratch window
+
 2018-10-13 (0.12.14)
 	COMMON: fix about page logo
 

src/common/inet2.c

@@ -312,10 +312,12 @@ socket_t net_listen(int server_port) {
  * disconnect the given network connection
  */
 void net_disconnect(socket_t s) {
+  if (s != -1) {
 #if defined(_Win32)
-  closesocket(s);
+    closesocket(s);
 #else
-  close(s);
+    close(s);
 #endif
+  }
 }
 

src/platform/android/app/src/main/assets/main.bas

@@ -58,12 +58,13 @@ func mk_scratch()
     text << "rem Welcome to SmallBASIC"
     text << "rem"
     if (is_sdl) then
-      text << "rem Press F1 for keyword help."
+      text << "rem Press F1 or F2 for keyword help."
       text << "rem Press and hold Ctrl then press 'h' for editor help."
       text << "rem Press and hold Ctrl then press 'r' to RUN this program."
       text << "rem Click the right mouse button for menu options."
     else
       text << "rem Press the 3 vertical dots for menu options."
+      text << "rem Press and drag the line numbers to scroll."
     endif
     try
       tsave scratch_file, text

src/ui/inputs.cpp

@@ -56,7 +56,7 @@ int get_color(var_p_t value, int def) {
     } else if (n[0] == '#' && n[1]) {
       result = strtol(n + 1, NULL, 16);
     } else if (strcasecmp(n, "black") == 0) {
-      result = 0;
+      result = DEFAULT_BACKGROUND;
     } else if (strcasecmp(n, "red") == 0) {
       result = 0x800000;
     } else if (strcasecmp(n, "green") == 0) {

src/ui/inputs.h

@@ -16,9 +16,10 @@
 #include "ui/strlib.h"
 #include "ui/shape.h"
 #include "ui/image.h"
+#include "ui/utils.h"
 
 const uint32_t colors[] = {
-  0x000000, // 0 black
+  DEFAULT_BACKGROUND, // 0 black
   0x000080, // 1 blue
   0x008000, // 2 green
   0x008080, // 3 cyan

src/ui/system.cpp

@@ -491,6 +491,13 @@ char *System::loadResource(const char *fileName) {
       opt_file_permitted = 0;
     }
   }
+  if (buffer == NULL) {
+    // remove failed item from history
+    strlib::String *old = _history.peek();
+    if (old && old->equals(fileName)) {
+      delete _history.pop();
+    }
+  }
   return buffer;
 }
 

src/ui/utils.h

@@ -17,7 +17,7 @@
 #endif
 
 #define DEFAULT_FOREGROUND 0xa1a1a1
-#define DEFAULT_BACKGROUND 0
+#define DEFAULT_BACKGROUND 0x121212
 #define HANDLE_SCREEN_BUFFER HANDLE_SCREEN
 #define USER_MESSAGE_EXIT 1000