Fix outdated help message

script/build-minimal-static-toxic.sh

@@ -131,11 +131,15 @@ mkdir -p "$BUILD_DIR"
 # Build Toxcore
 cd "$BUILD_DIR"
 
+# The git hash of the c-toxcore version we're using
 TOXCORE_VERSION="25a56c354937e9c8c4c50a64c3b4cfc099c34e29"
-TOXCORE_HASH="78749dccfd2e6ec95d59d7a07c882aa034754a9ff62113b95281927e71b42574"
+
+# The sha256sum of the c-toxcore tarball for TOXCORE_VERSION
+TOXCORE_HASH="8448752e6286c747130254571fde2db8e2fc073a8116f9fff489ed53af546c0a"
+
 TOXCORE_FILENAME="c-toxcore-$TOXCORE_VERSION.tar.gz"
 
-wget --timeout=10 -O "$TOXCORE_FILENAME" "https://github.com/TokTok/c-toxcore/archive/master.tar.gz"
+wget --timeout=10 -O "$TOXCORE_FILENAME" "https://github.com/TokTok/c-toxcore/archive/$TOXCORE_VERSION.tar.gz"
 check_sha256 "$TOXCORE_HASH" "$TOXCORE_FILENAME"
 tar -o -xf "$TOXCORE_FILENAME"
 rm "$TOXCORE_FILENAME"
@@ -160,8 +164,8 @@ cmake --build _build --target install
 # location with SSL_CERT_FILE env variable.
 cd "$BUILD_DIR"
 
-CURL_VERSION="7.74.0"
-CURL_HASH="e56b3921eeb7a2951959c02db0912b5fcd5fdba5aca071da819e1accf338bbd7"
+CURL_VERSION="7.77.0"
+CURL_HASH="b0a3428acb60fa59044c4d0baae4e4fc09ae9af1d8a3aa84b2e3fbcd99841f77"
 CURL_FILENAME="curl-$CURL_VERSION.tar.gz"
 
 wget --timeout=10 -O "$CURL_FILENAME" "https://curl.haxx.se/download/$CURL_FILENAME"
@@ -178,7 +182,8 @@ cd curl*
   --without-ca-path \
   --with-ca-fallback \
   --with-nghttp2 \
-  --with-brotli
+  --with-brotli \
+  --with-openssl
 make
 make install
 sed -i 's|-lbrotlidec |-lbrotlidec-static -lbrotlicommon-static |g' $BUILD_DIR/prefix-curl/lib/pkgconfig/libcurl.pc

src/game_base.c

@@ -540,20 +540,20 @@ static void game_draw_border(const GameData *game, const int max_x, const int ma
     const int x = (max_x - game_max_x) / 2;
     const int y = (max_y - game_max_y) / 2;
 
-    wattron(win, A_BOLD | COLOR_PAIR(GAME_BORDER_COLOUR));
+    wattron(win, COLOR_PAIR(GAME_BORDER_COLOUR));
 
-    mvwaddch(win, y, x, ' ');
-    mvwhline(win, y, x + 1, ' ', game_max_x - 1);
-    mvwvline(win, y + 1, x, ' ', game_max_y - 1);
-    mvwvline(win, y, x - 1, ' ', game_max_y + 1);
-    mvwaddch(win, y, x + game_max_x, ' ');
-    mvwvline(win, y + 1, x + game_max_x, ' ', game_max_y - 1);
-    mvwvline(win, y, x + game_max_x + 1, ' ', game_max_y + 1);
-    mvwaddch(win, y + game_max_y, x, ' ');
-    mvwhline(win, y + game_max_y, x + 1, ' ', game_max_x - 1);
-    mvwaddch(win, y + game_max_y, x + game_max_x, ' ');
+    mvwaddch(win, y, x, ACS_ULCORNER);
+    mvwhline(win, y, x + 1, ACS_HLINE, game_max_x - 1);
+    mvwvline(win, y + 1, x, ACS_VLINE, game_max_y - 1);
+    mvwvline(win, y, x - 1, ACS_VLINE, game_max_y + 1);
+    mvwaddch(win, y, x + game_max_x, ACS_URCORNER);
+    mvwvline(win, y + 1, x + game_max_x, ACS_VLINE, game_max_y - 1);
+    mvwvline(win, y, x + game_max_x + 1, ACS_VLINE, game_max_y + 1);
+    mvwaddch(win, y + game_max_y, x, ACS_LLCORNER);
+    mvwhline(win, y + game_max_y, x + 1, ACS_HLINE, game_max_x - 1);
+    mvwaddch(win, y + game_max_y, x + game_max_x, ACS_LRCORNER);
 
-    wattroff(win, A_BOLD | COLOR_PAIR(GAME_BORDER_COLOUR));
+    wattroff(win, COLOR_PAIR(GAME_BORDER_COLOUR));
 }
 
 static void game_draw_status(const GameData *game, const int max_x, const int max_y)
@@ -561,7 +561,7 @@ static void game_draw_status(const GameData *game, const int max_x, const int ma
     WINDOW *win = game->window;
 
     int x = ((max_x - game->game_max_x) / 2) - 1;
-    int y = ((max_y - game->game_max_y) / 2) - 1;
+    const int y = ((max_y - game->game_max_y) / 2) - 1;
 
     wattron(win, A_BOLD);
 

src/game_base.h

@@ -31,7 +31,7 @@
 #include "game_util.h"
 #include "windows.h"
 
-#define GAME_BORDER_COLOUR BAR_TEXT
+#define GAME_BORDER_COLOUR BAR_SOLID
 
 
 /* Max size of a default square game window */

src/help.c

@@ -174,7 +174,7 @@ static void help_draw_global(ToxWindow *self)
     wprintw(win, "  /decline <id>              : Decline friend request\n");
     wprintw(win, "  /requests                  : List pending friend requests\n");
     wprintw(win, "  /connect <ip> <port> <key> : Manually connect to a DHT node\n");
-    wprintw(win, "  /status <type> <msg>       : Set status with optional note\n");
+    wprintw(win, "  /status <type>             : Set status (Online, Busy, Away)\n");
     wprintw(win, "  /note <msg>                : Set a personal note\n");
     wprintw(win, "  /nick <nick>               : Set your nickname\n");
     wprintw(win, "  /nospam <value>            : Change part of your Tox ID to stop spam\n");

src/toxic.c

@@ -383,6 +383,7 @@ static void init_term(void)
         init_pair(BLACK_BG, COLOR_BLACK, bar_bg_color);
         init_pair(PURPLE_BG, COLOR_MAGENTA, bar_bg_color);
         init_pair(BAR_TEXT, bar_fg_color, bar_bg_color);
+        init_pair(BAR_SOLID, bar_bg_color, bar_bg_color);
         init_pair(BAR_ACCENT, bar_accent_color, bar_bg_color);
         init_pair(BAR_NOTIFY, bar_notify_color, bar_bg_color);
         init_pair(STATUS_ONLINE, COLOR_GREEN, bar_bg_color);

src/windows.h

@@ -72,6 +72,7 @@ typedef enum {
     STATUS_BUSY,
     STATUS_AWAY,
     BAR_NOTIFY,
+    BAR_SOLID,
 } C_COLOURS;
 
 /* tab alert types: lower types take priority (this relies on the order of C_COLOURS) */