Merge pull request #32 from brad-colbert/save_gfx_mode

v1.2.10 Save gfx mode

Author: brad-colbert

YAIL.XEX

@@ -7,7 +7,6 @@
 #include "consts.h"
 #include "settings.h"
 #include "types.h"
-#include "app_key.h"
 #include "fujinet-io.h"
 #include "utility.h"
 
@@ -28,7 +27,6 @@ extern void* ORG_SDLIST;
 extern void graphics_8_console_dl[];
 extern void graphics_9_console_dl[];
 extern Settings settings;
-extern byte CURRENT_MODE;
 
 // Globals
 bool console_state = false;
@@ -110,7 +108,7 @@ void process_command(byte ntokens)
         #else
         "stream - [arg0...argN] Stream images\n\r";
         #endif
-        byte SAVED_MODE = CURRENT_MODE;
+        byte SAVED_MODE = settings.gfx_mode;
 
         setGraphicsMode(GRAPHICS_0);
         cputs(help);                              // Show the help text
@@ -152,6 +150,10 @@ void process_command(byte ntokens)
                     break;
             }
         }
+
+        // Save the graphics mode if not in text mode
+        if(settings.gfx_mode > GRAPHICS_0)
+            put_settings(SETTINGS_GFX);  // save the graphics mode on the FN
     }
 
     if(strncmp(tokens[0], "cls", 3) == 0)
@@ -214,9 +216,8 @@ void process_command(byte ntokens)
         {
             if(strncmp(tokens[1], "server", 3) == 0)
             {
-                //strncpy(server, tokens[2], 79);
-                strncpy(settings.url, tokens[2], MAX_APPKEY_LEN);
-                put_settings();  // save the URL on the FN
+                strncpy(settings.url, tokens[2], SERVER_URL_SIZE);
+                put_settings(SETTINGS_URL);  // save the URL on the FN
             }
         }
     }

src/app_key.c

@@ -3,6 +3,7 @@
 #include "console.h"
 #include "files.h"
 #include "utility.h"
+#include "settings.h"
 #include "consts.h"
 #include "types.h"
 
@@ -38,14 +39,14 @@ byte framebuffer[FRAMEBUFFER_SIZE + 32];  // 32 bytes of padding
 //
 extern char* console_buff;
 extern byte console_lines;
+extern Settings settings;
 
 // Globals
 void* ORG_SDLIST = 0;
 void* VDSLIST_STATE = 0;
 byte ORG_GPRIOR = 0x0;
 byte NMI_STATE = 0x0;
 byte ORG_COLOR1, ORG_COLOR2;
-byte CURRENT_MODE = 0;
 DLDef dlDef;
 ImageData image = { {0, 0, 0, 0, 0, 0}, framebuffer };
 
@@ -113,7 +114,7 @@ void restoreGraphicsState(void)
 
 void setGraphicsMode(const byte mode)
 {
-    if(mode == CURRENT_MODE)
+    if(mode == settings.gfx_mode)
         return;
 
     makeDisplayList(mode);
@@ -165,7 +166,7 @@ void setGraphicsMode(const byte mode)
         break;
     }
 
-    CURRENT_MODE = mode;
+    settings.gfx_mode = mode;
 }
 
 void makeDisplayList(byte mode)
@@ -194,15 +195,15 @@ void makeDisplayList(byte mode)
 
 void show_console()
 {
-    switch(CURRENT_MODE)
+    switch(settings.gfx_mode)
     {
         case GRAPHICS_0: // {0, DL_CHR40x8x1, 1, 0, CONSOLE_MEM}
             break;
         case GRAPHICS_8: // {8, DL_MAP320x1x1, 211, 0, 0}
         {
-            CURRENT_MODE |= GRAPHICS_CONSOLE_EN;
+            settings.gfx_mode |= GRAPHICS_CONSOLE_EN;
 
-            makeDisplayList(CURRENT_MODE);
+            makeDisplayList(settings.gfx_mode);
 
             OS.sdlst = dlDef.address;
             ANTIC.nmien = 0x40;
@@ -213,9 +214,9 @@ void show_console()
         case GRAPHICS_10:
         case GRAPHICS_11:
         {
-            CURRENT_MODE |= GRAPHICS_CONSOLE_EN;
+            settings.gfx_mode |= GRAPHICS_CONSOLE_EN;
 
-            makeDisplayList(CURRENT_MODE);
+            makeDisplayList(settings.gfx_mode);
 
             OS.sdlst = dlDef.address;
             OS.vdslst = disable_9_dli;
@@ -227,7 +228,7 @@ void show_console()
 
 void hide_console()
 {
-    switch(CURRENT_MODE) // ^ GRAPHICS_CONSOLE_EN)
+    switch(settings.gfx_mode) // ^ GRAPHICS_CONSOLE_EN)
     {
         case GRAPHICS_0: // {0, DL_CHR40x8x1, 1, 0, CONSOLE_MEM}
             break;
@@ -236,9 +237,9 @@ void hide_console()
         case GRAPHICS_10_CONSOLE:
         case GRAPHICS_11_CONSOLE:
         {
-            CURRENT_MODE &= (byte)~GRAPHICS_CONSOLE_EN;
+            settings.gfx_mode &= (byte)~GRAPHICS_CONSOLE_EN;
 
-            makeDisplayList(CURRENT_MODE);
+            makeDisplayList(settings.gfx_mode);
             //POKEW(SDLSTL, gfxState.dl.address);
 
             OS.sdlst = dlDef.address;

src/app_key.h

@@ -3,7 +3,6 @@
 #include "files.h"
 #include "utility.h"
 #include "netimage.h"
-#include "app_key.h"
 #include "settings.h"
 #include "version.h"
 #include "utility.h"
@@ -21,7 +20,7 @@ char version[] = "YAIL (Yet Another Image Loader) v" TOSTR(MAJOR_VERSION) "." TO
 
 char buff[256]; // A block of memory to be used by all.
 bool done = false;
-Settings settings;
+extern Settings settings;
 
 void help()
 {
@@ -62,9 +61,6 @@ int main(int argc, char* argv[])
     // Convert the version string to internal code format
     atascii_to_internal(version, 40);
 
-    // Initialize the settings
-    get_settings();
-
     //
     if(argc > 1)
     {
@@ -78,7 +74,9 @@ int main(int argc, char* argv[])
 
         // Initialize the frame buffer
         saveCurrentGraphicsState();
-        setGraphicsMode(GRAPHICS_8);
+
+        // Initialize the settings.  Set defaults if no saved settings are found.
+        get_settings();
         clearFrameBuffer();
 
         // Show console on startup

src/console.c

@@ -16,7 +16,6 @@
 //
 extern byte buff[];
 extern ImageData image;
-extern byte CURRENT_MODE;
 extern Settings settings;
 
 void stream_image(char* args[])
@@ -60,7 +59,7 @@ void stream_image(char* args[])
 
     // Send which graphics mode we are in
     memset(buff, 0, 256);
-    sprintf(buff, "gfx %d ", CURRENT_MODE &= ~GRAPHICS_CONSOLE_EN);
+    sprintf(buff, "gfx %d ", settings.gfx_mode &= ~GRAPHICS_CONSOLE_EN);
     if(FN_ERR_OK != network_write(settings.url, buff, 6))
     {
         show_console();