UI: Added theme menu

Author: chrisws

ChangeLog

@@ -1,5 +1,6 @@
 2020-06-14 (12.19)
 	UI: Use theme colours in main display #94
+	UI: Added theme menu
 
 2020-06-14 (12.19)
 	FLTK: line numbers colours #93

src/lib/jsmn

@@ -809,7 +809,6 @@ void Runtime::setActive(bool active) {
   if (active) {
     setWindowRect(_saveRect);
   } else {
-    SDL_SetWindowPosition(_window, _saveRect.x, _saveRect.y);
     SDL_SetWindowSize(_window, _saveRect.w, _saveRect.h);
     setWindowSize(_saveRect.w, _saveRect.h);
   }

src/lib/lodepng

@@ -20,6 +20,7 @@
 #include "common/keymap.h"
 #include "ui/system.h"
 #include "ui/inputs.h"
+#include "ui/theme.h"
 
 #define MENU_CONSOLE    0
 #define MENU_SOURCE     1
@@ -45,7 +46,8 @@
 #define MENU_HELP       21
 #define MENU_SHORTCUT   22
 #define MENU_SHARE      23
-#define MENU_SIZE       24
+#define MENU_THEME      24
+#define MENU_SIZE       25
 #define MENU_COMPLETION_0  (MENU_SIZE + 1)
 #define MENU_COMPLETION_1  (MENU_SIZE + 2)
 #define MENU_COMPLETION_2  (MENU_SIZE + 3)
@@ -78,6 +80,7 @@
 #define MENU_STR_ON      "ON"
 #define MENU_STR_AUDIO   " Audio  [%s] "
 #define MENU_STR_EDITOR  " Editor [%s] "
+#define MENU_STR_THEME   " Theme  [%s] "
 #define MENU_STR_CONSOLE " Console "
 #define MENU_STR_CONTROL " Control Mode [%s] "
 #define MENU_STR_DEBUG   " Debug "
@@ -398,6 +401,10 @@ void System::handleMenu(MAEvent &event) {
   case MENU_EDITMODE:
     opt_ide = (opt_ide == IDE_NONE ? IDE_INTERNAL : IDE_NONE);
     break;
+  case MENU_THEME:
+    g_themeId = (g_themeId + 1) % NUM_THEMES;
+    setRestart();
+    break;
   case MENU_AUDIO:
     opt_mute_audio = !opt_mute_audio;
     break;
@@ -1007,6 +1014,9 @@ void System::showMenu() {
         sprintf(buffer, MENU_STR_EDITOR, opt_ide == IDE_NONE ? MENU_STR_OFF : MENU_STR_ON);
         items->add(new String(buffer));
         _systemMenu[index++] = MENU_EDITMODE;
+        sprintf(buffer, MENU_STR_THEME, themeName());
+        items->add(new String(buffer));
+        _systemMenu[index++] = MENU_THEME;
       }
       sprintf(buffer, MENU_STR_AUDIO, (opt_mute_audio ? MENU_STR_OFF : MENU_STR_ON));
       items->add(new String(buffer));

src/lib/miniaudio

@@ -67,7 +67,6 @@ int textedit_move_to_word_next(EditBuffer *str, int c) {
 #define LINE_BUFFER_SIZE 200
 #define INDENT_LEVEL 2
 #define HELP_WIDTH 22
-#define NUM_THEMES 6
 #define TWISTY1_OPEN  "> "
 #define TWISTY1_CLOSE "< "
 #define TWISTY2_OPEN  "  > "
@@ -90,6 +89,18 @@ int g_lineMarker[MAX_MARKERS] = {
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
 };
 
+const char *themeName() {
+  switch (g_themeId) {
+  case 0: return "Dark";
+  case 1: return "Light";
+  case 2: return "Shian";
+  case 3: return "ATOM 1";
+  case 4: return "ATOM 2";
+  case 5: return "R157";
+  default: return "";
+  }
+}
+
 // see: http://ethanschoonover.com/solarized#features
 #define sol_base03  0x002b36
 #define sol_base02  0x073642

src/platform/sdl/runtime.cpp

@@ -1,6 +1,6 @@
 // This file is part of SmallBASIC
 //
-// Copyright(C) 2001-2019 Chris Warren-Smith.
+// Copyright(C) 2001-2020 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
@@ -20,40 +20,12 @@
 #include <ctype.h>
 #include "lib/stb/stb_textedit.h"
 #include "ui/inputs.h"
+#include "ui/theme.h"
 #include "common/smbas.h"
 #include "common/keymap.h"
 
-extern unsigned g_themeId;
-extern int g_user_theme[];
-#define THEME_COLOURS 17
-
 struct TextEditInput;
 
-struct EditTheme {
-  EditTheme();
-  EditTheme(int fg, int bg);
-  void setId(const unsigned themeId);
-  void selectTheme(const int theme[]);
-
-  int _color;
-  int _background;
-  int _selection_color;
-  int _selection_background;
-  int _number_color;
-  int _number_selection_color;
-  int _number_selection_background;
-  int _cursor_color;
-  int _cursor_background;
-  int _match_background;
-  int _row_cursor;
-  int _syntax_comments;
-  int _syntax_text;
-  int _syntax_command;
-  int _syntax_statement;
-  int _syntax_digit;
-  int _row_marker;
-};
-
 struct StackTraceNode {
   StackTraceNode(const char *keyword, int type, int line)
     : _keyword(keyword), _type(type), _line(line) {}

src/ui/system.cpp

@@ -0,0 +1,45 @@
+// This file is part of SmallBASIC
+//
+// Copyright(C) 2001-2020 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
+//
+
+#ifndef THEME_H
+#define THEME_H
+
+#define THEME_COLOURS 17
+#define NUM_THEMES 6
+
+extern unsigned g_themeId;
+extern int g_user_theme[];
+
+const char *themeName();
+
+struct EditTheme {
+  EditTheme();
+  EditTheme(int fg, int bg);
+  void setId(const unsigned themeId);
+  void selectTheme(const int theme[]);
+
+  int _color;
+  int _background;
+  int _selection_color;
+  int _selection_background;
+  int _number_color;
+  int _number_selection_color;
+  int _number_selection_background;
+  int _cursor_color;
+  int _cursor_background;
+  int _match_background;
+  int _row_cursor;
+  int _syntax_comments;
+  int _syntax_text;
+  int _syntax_command;
+  int _syntax_statement;
+  int _syntax_digit;
+  int _row_marker;
+};
+
+#endif

src/ui/textedit.cpp

@@ -11,7 +11,7 @@
 #include "common/pproc.h"
 #include "lib/maapi.h"
 #include "ui/system.h"
-#include "ui/textedit.h"
+#include "ui/theme.h"
 
 extern System *g_system;