better serverinfo ui

acagliano · Jul 12, 2022 · 503e9e9 · 503e9e9
1 parent f4a01a3
commit 503e9e9
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 14 deletions.
diff --git a/src/gfx/TrekGFX.c b/src/gfx/TrekGFX.c
@@ -12,8 +12,6 @@ unsigned char TrekGFX_init(void)
     void *base;
     unsigned char i;
 
-    ti_CloseAll();
-
     appvar = ti_Open("TrekGFX", "r");
     if (appvar == 0)
     {
@@ -23,6 +21,7 @@ unsigned char TrekGFX_init(void)
     table = base = (char*)ti_GetDataPtr(appvar) + TrekGFX_HEADER_SIZE;
     if (*table != 31)
     {
+        ti_Close(appvar);
         return 0;
     }
 

diff --git a/src/gfx/internal.h b/src/gfx/internal.h
@@ -9,6 +9,7 @@ extern "C" {
 #include "icon_error.h"
 #include "icon_networkdown.h"
 #include "icon_networkup.h"
+#include "icon_security.h"
 #include "log_debug.h"
 #include "log_error.h"
 #include "log_info.h"

diff --git a/src/lcars/text.c b/src/lcars/text.c
@@ -63,7 +63,7 @@ int text_GetCenterX(char* string){
 }
 
 int num_GetLength(int number){
-    return 1 + (number >= 10) + (number >= 100);
+    return 1 + (number >= 10) + (number >= 100) + (number >= 1000) + (number >= 10000);
 }
 
 uint8_t gfx_VCenterText(uint8_t y, uint8_t box_height, uint8_t font_height){

diff --git a/src/main.c b/src/main.c
@@ -66,6 +66,7 @@ gfx_UninitedRLETSprite(splash, splash_size);
 gfx_UninitedRLETSprite(err_icon, icon_error_size);
 gfx_UninitedRLETSprite(icon_netup, icon_networkup_size);
 gfx_UninitedRLETSprite(icon_netdown, icon_networkdown_size);
+gfx_UninitedRLETSprite(icon_security, icon_security_size);
 gfx_UninitedRLETSprite(log_error, log_error_size);
 gfx_UninitedRLETSprite(log_info, log_info_size);
 gfx_UninitedRLETSprite(log_debug, log_debug_size);
@@ -178,26 +179,36 @@ void ServerSelect(void){
         }
 
         if(key || firstrender){
-            window_data_t win = {3, 260, 20, 100, 195, 2, 181};
+            window_data_t win = {3, 260, 20, 90, 195, 2, 181};
             ti_var_t tfp = ti_Open(9*offset+filenames, "r");
             gfx_ZeroScreen();
 
             // main GUI elements
             gfx_RenderMenuTitle("Server Info", 3, 5);
             gfx_RenderWindow(&win);
             gfx_SetTextFGColor(255);
-            gfx_PrintStringXY("[Enter] Connect to selected host", 5, 130);
-            if(offset>0) gfx_ColoredText("[Left] Select previous server", 5, 140, 255);
-            else gfx_ColoredText("[Left] Select previous server", 5, 140, 74);
-            if(offset<(filect-1)) gfx_ColoredText("[Right] Select next server", 5, 150, 255);
-            else gfx_ColoredText("[Right] Select next server", 5, 150, 74);
+            gfx_PrintStringXY("[Enter] Connect to selected host", 5, 120);
+            if(offset>0) gfx_ColoredText("[Left] Select previous server", 5, 130, 255);
+            else gfx_ColoredText("[Left] Select previous server", 5, 130, 74);
+            if(offset<(filect-1)) gfx_ColoredText("[Right] Select next server", 5, 140, 255);
+            else gfx_ColoredText("[Right] Select next server", 5, 140, 74);
             gfx_SetTextFGColor(0);
             if(tfp) {
                 // if appv opened
-                gfx_PrintStringXY("Hostname: ", 10, 30);
-                gfx_PrintStringXY(ti_GetDataPtr(tfp)+7, 15, 40);
-                gfx_PrintStringXY("Keyfile: ", 10, 55);
-                gfx_PrintStringXY(9*offset+filenames, 15, 65);
+                size_t filesize = ti_GetSize(tfp);
+                size_t keylen = filesize - strlen(ti_GetDataPtr(tfp)+7);
+                keylen -= 8; keylen *= 8;
+                gfx_PrintStringXY("Keyfile: ", 10, 35);
+                gfx_PrintString(9*offset+filenames);
+                gfx_RLETSprite(log_server, 10, 50);
+                gfx_RLETSprite(icon_security, 10, 65);
+                gfx_PrintStringXY(ti_GetDataPtr(tfp)+7, 25, 50);
+                gfx_SetTextXY(25, 65);
+                gfx_PrintUInt(keylen, num_GetLength(keylen));
+                gfx_PrintString("-bit session key");
+                gfx_PrintStringXY("RSA-<=2048 cipher, key exch", 25, 75);
+                gfx_PrintStringXY("AES-256 cipher, login", 25, 85);
+
                 ti_Close(tfp);
             }
             else {
@@ -234,6 +245,7 @@ int main(void) {
     zx7_Decompress(splash, splash_compressed);
     zx7_Decompress(icon_netup, icon_networkup_compressed);
     zx7_Decompress(icon_netdown, icon_networkdown_compressed);
+    zx7_Decompress(icon_security, icon_security_compressed);
     zx7_Decompress(log_error, log_error_compressed);
     zx7_Decompress(log_info, log_info_compressed);
     zx7_Decompress(log_debug, log_debug_compressed);

diff --git a/src/versioning.c b/src/versioning.c
@@ -6,7 +6,7 @@
 #include "flags.h"
 #define TrekGFX_HEADER_SIZE 2
 
-uint8_t version[] = {0, 0, 110};
+uint8_t version[] = {0, 0, 111};
 char versionstr[16] = {0};
 uint8_t gfx_version[2] = {0};
 uint8_t gfx_reqd[2] = {1, 5};