Release v4.2: internal menus RMF pass, update/HTTP layout, menu docs

Author: d3nd3

.cursor/commands/menu-know-how.md

@@ -117,8 +117,8 @@ Notice:
 * `backdrop` is primary full-background control. in many cut-frame layouts, `backfill` reads as frame-local/border-region fill
 * RMF tint  use ABGR-style interpretation
 * plain words are flow text; `<text ...>` is interactive/clickable area text.
-* Avoid long prose under `<center>` on 480p; prefer `<left>` + small inset (`<blank 20-32 1>`) for reliable wrapping/visibility.
-
+* CAUTION: `<center>` layout treats each space separated word as a new line, then if you use double quote around your space separated text, if the length is longer than the remaining space in the frame, it will not be rendered.
+* Seems wise to try to use 2 giant blank borders either side of the content, but they must be injected with resolution dependent pixels as: ((width_of_inner_frame_px - centered_content_size_px) / 2) . Then you have a fixed size area across resolutions. CAVEAT: hr element cant be used cos has inbuilt left
 
 ---
 
@@ -228,11 +228,14 @@ hbr *hard line break*
 center *A layout command which forces all following areas to appear centred on the screen and applies a carriage return (I admit that this is not ideal). If you wish to centre a line with spaces in it, then place the phrase in quotes.*
 
 normal *A layout command which places all following areas to the right of the previous area until no more will fit, and then a carriage return is applied. This is the default layout state, all areas appearing from left to right just like on a page of text.*
+aka **normal** will **target the next line with free space in it**
 
 left 
 ```xml
 A layout command which places all the following areas from the left of the page going right. The only difference between this and <normal> is that <left> starts from the next available place on the left of the page and not the current “next area position”.
 ```
+aka **left** will **always prioritise a new line further vertically down the frame even if off the screen, as long as that new line starts more left than the next line** 
+CAVEAT: hr element cant be used cos has inbuilt left
 
 right *A layout command which places the following areas at the right of the page working left.*
 
@@ -496,4 +499,9 @@ ifge
 ifne
 ifeq
 ifset
-ifclr
+ifclr
+
+
+---
+
+![[Pasted image 20260217062306.png]]

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v4.2
+
+- Internal menus: RMF layout and content pass across SoF Buddy tabs (main, input, lighting, perf, scaling, social, texture, tweaks, HTTP, update help/prompt), loading header, and HTTP providers; FS_LoadFile override and internal menu hooks refined.
+- Menu docs: menu-know-how guidance and build/makefile tweaks.
+
 ## v4.1
 
 - Windows updater UX polish: silenced noisy extractor stderr/stdout (`tar`, `7z`, PowerShell fallback) in `update_from_zip.cmd` so successful fallback installs do not show misleading error spam.

VERSION

@@ -1 +1 @@
-4.1
+4.2

hdr/version.h

@@ -7,4 +7,4 @@
     Increment version using: ./increment_version.sh
 */
 
-#define SOFBUDDY_VERSION "4.1"
+#define SOFBUDDY_VERSION "4.2"

makefile

@@ -100,7 +100,8 @@ all: $(MENU_DATA_CPP) $(FEATURES_TXT) $(FEATURE_CONFIG_H) $(FEATURE_LIST_H) $(VE
 
 FORCE:
 
-$(MENU_DATA_CPP): FORCE $(GENERATE_MENU_EMBED_PY)
+SOFBUDDY_RMF_FILES = $(shell find $(MENU_LIBRARY_DIR) -name '*.rmf' 2>/dev/null || true)
+$(MENU_DATA_CPP): $(GENERATE_MENU_EMBED_PY) $(SOFBUDDY_RMF_FILES)
 	@python3 $(GENERATE_MENU_EMBED_PY)
 
 # Create build directory

src/features/http_maps/http_maps.cpp

@@ -1080,6 +1080,7 @@ static void http_maps_download_worker(std::string map_bsp_path, std::string zip_
 				DeleteFileA(temp_zip_path.c_str());
 				PrintOut(PRINT_DEV, "http_maps: Downloaded and extracted %s\n", map_bsp_path.c_str());
 				http_maps_queue_status(job_id, "HTTP map ready.");
+				g_http_maps_state.worker_did_download.store(true, std::memory_order_release);
 				success = true;
 			} else {
 				DeleteFileA(temp_zip_path.c_str());

src/features/internal_menus/hooks/fs_loadfile_override.cpp

@@ -63,17 +63,25 @@ int internal_menus_fs_loadfile_override_callback(char* path, void** buffer, bool
     const std::vector<uint8_t>& vec = file_it->second;
     if (vec.empty()) return original(path, buffer, override_pak);
 
-    // Use the engine's allocator so the engine can free the buffer later.
+    std::string content(vec.begin(), vec.end());
+    content.erase(std::remove(content.begin(), content.end(), '\r'), content.end());
+    const char* inset = internal_menus_get_content_inset_rmf();
+    const char* inset_tall = internal_menus_get_content_inset_tall_rmf();
+    for (std::string::size_type pos = 0; (pos = content.find("{content_inset_tall}", pos)) != std::string::npos; )
+        content.replace(pos, 20, inset_tall), pos += std::strlen(inset_tall);
+    for (std::string::size_type pos = 0; (pos = content.find("{content_inset}", pos)) != std::string::npos; )
+        content.replace(pos, 15, inset), pos += std::strlen(inset);
+    for (std::string::size_type pos = 0; (pos = content.find("tall}", pos)) != std::string::npos; )
+        content.replace(pos, 5, "");
+
+    const int size = static_cast<int>(content.size() + 1);
     static void* (*Z_Malloc)(int) = nullptr;
     if (!Z_Malloc) Z_Malloc = (void*(*)(int))rvaToAbsExe((void*)0x0001F120);
     if (!Z_Malloc) return original(path, buffer, override_pak);
-
-    const int size = static_cast<int>(vec.size() + 1);
     void* copy = Z_Malloc(size);
     if (!copy) return original(path, buffer, override_pak);
-    std::memcpy(copy, vec.data(), vec.size());
-    static_cast<char*>(copy)[vec.size()] = '\0';
+    std::memcpy(copy, content.c_str(), content.size() + 1);
     *buffer = copy;
-    return static_cast<int>(vec.size());  // Same convention as FS_LoadFile: return size, buffer set.
+    return static_cast<int>(content.size());
 }
 #endif

src/features/internal_menus/internal_menus.cpp

@@ -52,7 +52,7 @@ void create_loading_cvars() {
 
 }
 
-constexpr int kSofBuddyCenterPanelVirtualWidth = 592;
+constexpr int kSofBuddyCenterPanelVirtualWidth = 640;
 constexpr int kSofBuddyDefaultRow1ContentWidth = 400;
 constexpr int kSofBuddyDefaultRow2ContentWidth = 520;
 
@@ -68,11 +68,13 @@ void create_layout_cvars() {
     constexpr int kLayoutCvarFlags = 0;
     orig_Cvar_Get("_sofbuddy_menu_vid_w", "640", kLayoutCvarFlags, nullptr);
     orig_Cvar_Get("_sofbuddy_menu_vid_h", "480", kLayoutCvarFlags, nullptr);
-    orig_Cvar_Get("_sofbuddy_sb_center_panel_px", "592", kLayoutCvarFlags, nullptr);
+    orig_Cvar_Get("_sofbuddy_sb_center_panel_px", "640", kLayoutCvarFlags, nullptr);
     orig_Cvar_Get("_sofbuddy_sb_tabs_row1_prefix_px", "96", kLayoutCvarFlags, nullptr);
     orig_Cvar_Get("_sofbuddy_sb_tabs_row2_prefix_px", "36", kLayoutCvarFlags, nullptr);
     orig_Cvar_Get("_sofbuddy_sb_tabs_row1_prefix_rmf", "<blank 96 1>", kLayoutCvarFlags, nullptr);
     orig_Cvar_Get("_sofbuddy_sb_tabs_row2_prefix_rmf", "<blank 36 1>", kLayoutCvarFlags, nullptr);
+    orig_Cvar_Get("_sofbuddy_sb_tabs_row1_suffix_rmf", "<blank 96 1>", kLayoutCvarFlags, nullptr);
+    orig_Cvar_Get("_sofbuddy_sb_tabs_row2_suffix_rmf", "<blank 36 1>", kLayoutCvarFlags, nullptr);
     _sofbuddy_sb_tabs_row1_content_px = orig_Cvar_Get("_sofbuddy_sb_tabs_row1_content_px", "400", kLayoutCvarFlags, nullptr);
     _sofbuddy_sb_tabs_row2_content_px = orig_Cvar_Get("_sofbuddy_sb_tabs_row2_content_px", "520", kLayoutCvarFlags, nullptr);
     _sofbuddy_sb_tabs_center_bias_px = orig_Cvar_Get("_sofbuddy_sb_tabs_center_bias_px", "0", kLayoutCvarFlags, nullptr);
@@ -182,8 +184,12 @@ void Cmd_SoFBuddy_Apply_Profile_Visual_f() {
 void update_layout_cvars(bool trigger_reloadall_if_changed) {
     if (!orig_Cvar_Get || !orig_Cvar_Set2) return;
 
-    const int vid_w = (current_vid_w > 0) ? current_vid_w : 640;
-    const int vid_h = (current_vid_h > 0) ? current_vid_h : 480;
+    int vid_w = (current_vid_w > 0) ? current_vid_w : 0;
+    int vid_h = (current_vid_h > 0) ? current_vid_h : 0;
+    if (vid_w <= 0 && viddef_width && *viddef_width > 0) vid_w = *viddef_width;
+    if (vid_h <= 0 && viddef_height && *viddef_height > 0) vid_h = *viddef_height;
+    if (vid_w <= 0) vid_w = 640;
+    if (vid_h <= 0) vid_h = 480;
 
     // center_panel uses frame units (560 / 640 of screen width).
     const int center_panel_px = (vid_w * kSofBuddyCenterPanelVirtualWidth + 320) / 640;
@@ -211,6 +217,8 @@ void update_layout_cvars(bool trigger_reloadall_if_changed) {
     set_runtime_cvar_int("_sofbuddy_sb_tabs_row2_prefix_px", row2_prefix_px);
     set_runtime_cvar_str("_sofbuddy_sb_tabs_row1_prefix_rmf", row1_rmf);
     set_runtime_cvar_str("_sofbuddy_sb_tabs_row2_prefix_rmf", row2_rmf);
+    set_runtime_cvar_str("_sofbuddy_sb_tabs_row1_suffix_rmf", row1_rmf);
+    set_runtime_cvar_str("_sofbuddy_sb_tabs_row2_suffix_rmf", row2_rmf);
 
     static int last_vid_w = -1;
     static int last_vid_h = -1;
@@ -225,6 +233,32 @@ void update_layout_cvars(bool trigger_reloadall_if_changed) {
 
 } // namespace
 
+static int internal_menus_content_inset_px(void) {
+    int inner_frame_px = 0;
+    if (orig_Cvar_Get) {
+        cvar_t* c = orig_Cvar_Get("_sofbuddy_sb_center_panel_px", "640", 0, nullptr);
+        if (c && c->value > 0) inner_frame_px = static_cast<int>(c->value + 0.5f);
+    }
+    if (inner_frame_px <= 0) {
+        int vid_w = (current_vid_w > 0) ? current_vid_w : 0;
+        if (vid_w <= 0 && viddef_width && *viddef_width > 0) vid_w = *viddef_width;
+        if (vid_w <= 0) vid_w = 640;
+        inner_frame_px = (vid_w * 640 + 320) / 640;
+    }
+    const int centered_content_size_px = 640;
+    return std::max(28, (inner_frame_px - centered_content_size_px) / 2);
+}
+const char* internal_menus_get_content_inset_rmf(void) {
+    static char buf[32];
+    std::snprintf(buf, sizeof(buf), "<blank %d 1>", internal_menus_content_inset_px());
+    return buf;
+}
+const char* internal_menus_get_content_inset_tall_rmf(void) {
+    static char buf[32];
+    std::snprintf(buf, sizeof(buf), "<blank %d 10000>", internal_menus_content_inset_px());
+    return buf;
+}
+
 bool internal_menus_should_lock_loading_input(void) {
     if (!orig_Cvar_Get) return true;
     cvar_t* c = orig_Cvar_Get("_sofbuddy_loading_lock_input", "1", CVAR_SOFBUDDY_ARCHIVE, nullptr);

src/features/internal_menus/menu_library/loading/loading_header.rmf

@@ -13,7 +13,7 @@
 <hbr>
 <hbar "misc/l_clip" "misc/l_bullet" cvar menu_loading><hbr>
 <hbr>
-<font type title tint gray atint gray>
+<font type title tint lblue atint lblue>
 <ctext _sofbuddy_loading_current atext "Map: "><hbr>
 <hbr>
 <ctext _sofbuddy_loading_status atext "Download: "><hbr>

src/features/internal_menus/menu_library/sof_buddy/sb_http.rmf

@@ -8,7 +8,5 @@
 <defaults noborder tiptint black tipbtint white tipfont title>
 
 <frame root 640 0>
-<frame left_spacer 24 0 cut root page sof_buddy/sb_margin_backdrop>
-<frame center_panel 592 0 cut root page sof_buddy/sb_http_content>
-<frame right_spacer 24 0 cut root page sof_buddy/sb_margin_backdrop>
+<frame center_panel 640 0 cut root page sof_buddy/sb_http_content>
 </stm>