Polish native editor UI and console

Author: gajop

LuaUI/images/scenedit/modifications/scissors-rotated.png

@@ -74,11 +74,14 @@ end
 
 -- when "cursor: normal" is set via RCSS, "cursornormal" will be sent to the engine... and so on for the rest
 RmlUi.SetMouseCursorAlias("default", 'cursornormal')
-RmlUi.SetMouseCursorAlias("pointer", 'Move') -- command cursors use the command name. TODO: replace with actual pointer cursor?
+-- A CSS pointer is UI affordance, not the engine's animated Move-command
+-- cursor. Keeping the normal cursor avoids a distracting cursor swap for
+-- every button, grid item, and dropdown.
+RmlUi.SetMouseCursorAlias("pointer", 'cursornormal')
 RmlUi.SetMouseCursorAlias("move", 'uimove')
 RmlUi.SetMouseCursorAlias("nesw-resize", 'uiresized2')
 RmlUi.SetMouseCursorAlias("nwse-resize", 'uiresized1')
 RmlUi.SetMouseCursorAlias("ns-resize", 'uiresizev')
 RmlUi.SetMouseCursorAlias("ew-resize", 'uiresizeh')
 
-RmlUi.CreateContext("shared")
+RmlUi.CreateContext("shared")

LuaUI/rml_setup2.lua

@@ -17,11 +17,12 @@ LCS = LCS()
 CHILILFX_DIR = "libs_sb/chilifx/chilifx/"
 
 function widget:Initialize()
-    -- if not WG.Chili then
-    --     Spring.Log("ChiliFX", LOG.ERROR, "Missing chiliui.")
-    --     widgetHandler:RemoveWidget(widget)
-    --     return
-    -- end
+    -- ChiliFX only backs Chili/Chotify. Native and RmlUi own their effects, so
+    -- do not even construct this legacy effect library in those UI modes.
+    if Spring.GetGameRulesParam("sb_ui") ~= "chili" then
+        widgetHandler:RemoveWidget(widget)
+        return
+    end
 
     ChiliFX = VFS.Include(CHILILFX_DIR .. "core.lua", nil)
 

LuaUI/widgets/api_chilifx.lua

@@ -27,6 +27,7 @@ local cfg = {
 
 local debugButtonEnabled = false
 local profilerButtonEnabled = false
+local engineConsoleHidden = false
 
 local Spring    = Spring
 local VFS       = VFS
@@ -663,11 +664,19 @@ end
 
 -- ---------- Widget lifecycle ----------
 function widget:Initialize()
+	-- Rust owns the developer console in its UI mode. Keep this guard separate
+	-- from the legacy `useRml` flag so this widget never changes engine-console
+	-- state while removing itself for Rust.
+	if Spring.GetGameRulesParam("sb_ui") ~= "rmlui" then
+		widgetHandler:RemoveWidget(self)
+		return
+	end
 	if Spring.GetGameRulesParam("useRml") ~= "true" then
 		widgetHandler:RemoveWidget(self)
 		return
 	end
 	Spring.SendCommands('console 0')
+	engineConsoleHidden = true
 	if Spring.GetGameRulesParam("gameMode") == "play" then
 		widgetHandler:RemoveWidget(self)
 		return
@@ -716,7 +725,9 @@ function widget:Shutdown()
 	rml.dataModel = nil
 	mouseCaptured = false
 	WG.DevConsole = nil
-	Spring.SendCommands('console 1')
+	if engineConsoleHidden then
+		Spring.SendCommands('console 1')
+	end
 end
 
 function widget:Update()

LuaUI/widgets/dbg_dev_console_rmlui.lua

@@ -168,6 +168,12 @@ local function Show(title, rows, key, mx, my)
 end
 
 function widget:Initialize()
+	-- The native UI owns its own cursor tip. `useRml` is false for Rust today,
+	-- but keep this explicit so a stale compatibility flag cannot load both.
+	if Spring.GetGameRulesParam("sb_ui") ~= "rmlui" then
+		widgetHandler:RemoveWidget(widget)
+		return
+	end
 	if Spring.GetGameRulesParam("useRml") ~= "true" then
 		widgetHandler:RemoveWidget(widget)
 		return

LuaUI/widgets/gui_rmlui_cursortip.lua

@@ -19,3 +19,9 @@ The old names (`rust-rmlui.json`, `mixed-rust-*`) named the *chonsole*, not the
 UI, so `rust-rmlui` was the Lua UI. They are renamed above.
 
     just run config/ui-rust.json
+
+Manual Rust-Chonsole sessions use a stable history file at
+`$XDG_STATE_HOME/springboard/chonsole-history` (or
+`~/.local/state/springboard/chonsole-history`). Set `SBC_CHONSOLE_HISTORY` to
+use a different file while testing. Smoke and E2E runs deliberately keep their
+history inside their disposable isolated write directory.

config/README.md

@@ -21,3 +21,4 @@ thiserror = "2.0.18"
 ctrl_macros = "0.1.0"
 image = { version = "0.25", default-features = false, features = ["png", "bmp", "jpeg", "tga"] }
 zip = { version = "2.2", default-features = false, features = ["deflate"] }
+sysinfo = "0.37"