Merge remote-tracking branch 'upstream/master' into v51.05

Author: ab9rf

.github/workflows/generate-symbols.yml

@@ -163,8 +163,9 @@ jobs:
         pip install itch-dl
         minor=$(echo "${{ inputs.version }}" | cut -d. -f1)
         patch=$(echo "${{ inputs.version }}" | cut -d. -f2)
-        itch-dl https://kitfoxgames.itch.io/dwarf-fortress --download-to . --api-key $ITCH_API_KEY
-        tar xjf "kitfoxgames/dwarf-fortress/files/dwarf_fortress_${minor}_${patch}_linux.tar.bz2" -C DF_itch
+        fname="dwarf_fortress_${minor}_${patch}_linux.tar.bz2"
+        itch-dl https://kitfoxgames.itch.io/dwarf-fortress --download-to . --api-key $ITCH_API_KEY --filter-files-glob "${fname}"
+        tar xjf "kitfoxgames/dwarf-fortress/files/${fname}" -C DF_itch
         tar xjf dfhack-symbols-linux64-build.tar.bz2 -C DF_itch
         xml/symbols_gen_linux.sh ${{ inputs.version }} ITCH DF_itch
 
@@ -270,8 +271,9 @@ jobs:
         pip install itch-dl
         minor=$(echo "${{ inputs.version }}" | cut -d. -f1)
         patch=$(echo "${{ inputs.version }}" | cut -d. -f2)
-        itch-dl https://kitfoxgames.itch.io/dwarf-fortress --download-to . --api-key $ITCH_API_KEY
-        unzip -d DF_itch "kitfoxgames/dwarf-fortress/files/dwarf_fortress_${minor}_${patch}_windows.zip"
+        fname="dwarf_fortress_${minor}_${patch}_windows.zip"
+        itch-dl https://kitfoxgames.itch.io/dwarf-fortress --download-to . --api-key $ITCH_API_KEY --filter-files-glob "${fname}"
+        unzip -d DF_itch "kitfoxgames/dwarf-fortress/files/${fname}"
         xml/symbols_gen_windows.sh ${{ inputs.version }} ITCH DF_itch
 
     # Classic

.github/workflows/watch-df-release.yml

@@ -117,7 +117,8 @@ jobs:
     - name: Compare versions
       uses: nick-fields/retry@v3
       with:
-        timeout_minutes: 2
+        timeout_minutes: 5
+        retry_wait_seconds: 60
         command: |
           version=$(wget "${{ matrix.url }}" -qO- | tr '"' '\n' | fgrep 'tar.bz2' | head -n1 | sed -r 's/${{ matrix.prefix }}_([0-9]{2})_([0-9]{2})_linux.tar.bz2/\1.\2/')
           echo "latest ${{ matrix.channel }} version: $version"

docs/changelog.txt

@@ -72,6 +72,15 @@ Template for new versions:
 
 ## Misc Improvements
 - Compatibility with DF 51.05
+# 51.04-r1.1
+
+## Fixes
+- `gui/launcher`: ensure commandline is fully visible when searching through history and switching from a very long command to a short command
+- `gui/launcher`: flatten text when pasting multi-line text from the clipboard
+- Ctrl-a hotkeys have been changed to something else (Ctrl-n) for tools that also have an editable text field, where Ctrl-a is interpreted as select all text
+
+## API
+- ``Core::getUnpausedMs``: new API for getting unpaused ms since load in a fort-mode game
 
 # 51.04-r1
 

library/Core.cpp

@@ -145,20 +145,20 @@ bool PerfCounters::getIgnorePauseState() {
     return ignore_pause_state;
 }
 
-void PerfCounters::registerTick(uint32_t baseline_ms) {
+uint32_t PerfCounters::registerTick(uint32_t baseline_ms) {
     if (!World::isFortressMode() || World::ReadPauseState()) {
         last_tick_baseline_ms = 0;
-        return;
+        return 0;
     }
 
     // only update when the tick counter has advanced
     if (!world || last_frame_counter == world->frame_counter)
-        return;
+        return 0;
     last_frame_counter = world->frame_counter;
 
     if (last_tick_baseline_ms == 0) {
         last_tick_baseline_ms = baseline_ms;
-        return;
+        return 0;
     }
 
     uint32_t elapsed_ms = baseline_ms - last_tick_baseline_ms;
@@ -173,6 +173,8 @@ void PerfCounters::registerTick(uint32_t baseline_ms) {
 
     recent_ticks.history[recent_ticks.head_idx] = elapsed_ms;
     recent_ticks.sum_ms += elapsed_ms;
+
+    return elapsed_ms;
 }
 
 uint32_t PerfCounters::getUnpausedFps() {
@@ -1705,6 +1707,7 @@ bool Core::InitMainThread() {
     }
 
     perf_counters.reset();
+    unpaused_ms = 0;
 
     return true;
 }
@@ -2141,7 +2144,7 @@ int Core::Update()
         }
 
         uint32_t start_ms = p->getTickCount();
-        perf_counters.registerTick(start_ms);
+        unpaused_ms += perf_counters.registerTick(start_ms);
         doUpdate(out);
         perf_counters.incCounter(perf_counters.total_update_ms, start_ms);
     }
@@ -2337,6 +2340,7 @@ void Core::onStateChange(color_ostream &out, state_change_event event)
     case SC_WORLD_LOADED:
     {
         perf_counters.reset();
+        unpaused_ms = 0;
         Persistence::Internal::load(out);
         plug_mgr->doLoadWorldData(out);
         loadModScriptPaths(out);

library/include/Core.h

@@ -100,9 +100,11 @@ namespace DFHack
         bool getIgnorePauseState();
 
         // noop if game is paused and getIgnorePauseState() returns false
-        void incCounter(uint32_t &perf_counter, uint32_t baseline_ms);
+        void incCounter(uint32_t &counter, uint32_t baseline_ms);
+
+        // returns number of unpaused ms since last tick
+        uint32_t registerTick(uint32_t baseline_ms);
 
-        void registerTick(uint32_t baseline_ms);
         uint32_t getUnpausedFps();
 
     private:
@@ -219,6 +221,7 @@ namespace DFHack
         static void cheap_tokenise(std::string const& input, std::vector<std::string> &output);
 
         PerfCounters perf_counters;
+        uint32_t getUnpausedMs() { return unpaused_ms; }
 
         lua_State* getLuaState(bool bypass_assertion = false) {
             assert(bypass_assertion || isSuspended());
@@ -334,6 +337,8 @@ namespace DFHack
 
         lua_State* State;
 
+        uint32_t unpaused_ms; // reset to 0 on map load
+
         friend class CoreService;
         friend class ServerConnection;
         friend class CoreSuspender;

library/lua/gui/widgets/edit_field.lua

@@ -114,7 +114,6 @@ function EditField:init()
         self:setFocus(true)
     end
 
-    self.start_pos = 1
     self.cursor = #self.text + 1
     self.ignore_keys = self.ignore_keys or {}
 

library/lua/gui/widgets/text_area.lua

@@ -69,7 +69,15 @@ function TextArea:setText(text)
         self:getCursor()
     )
 
-    return self.text_area:setText(text)
+    self.text_area:setText(text)
+
+    if self.one_line_mode then
+        self.render_start_x = 1
+        local cursor = self:getCursor()
+        if cursor then
+            self:setCursor(math.min(self:getCursor(), #text + 1))
+        end
+    end
 end
 
 function TextArea:getCursor()

library/lua/gui/widgets/text_area/text_area_content.lua

@@ -127,7 +127,11 @@ function TextAreaContent:eraseSelection()
 end
 
 function TextAreaContent:setClipboard(text)
-    dfhack.internal.setClipboardTextCp437Multiline(text)
+    if self.one_line_mode then
+        dfhack.internal.setClipboardTextCp437(text)
+    else
+        dfhack.internal.setClipboardTextCp437Multiline(text)
+    end
 end
 
 function TextAreaContent:copy()
@@ -151,7 +155,7 @@ function TextAreaContent:copy()
             self:lineStartOffset(),
             self:lineEndOffset()
         )
-        if curr_line:sub(-1,-1) ~= NEWLINE then
+        if not self.one_line_mode and curr_line:sub(-1,-1) ~= NEWLINE then
             curr_line = curr_line .. NEWLINE
         end
 
@@ -170,8 +174,9 @@ function TextAreaContent:cut()
 end
 
 function TextAreaContent:paste()
-    local clipboard_lines = dfhack.internal.getClipboardTextCp437Multiline()
-    local clipboard = table.concat(clipboard_lines, '\n')
+    local clipboard = self.one_line_mode and
+        dfhack.internal.getClipboardTextCp437() or
+        table.concat(dfhack.internal.getClipboardTextCp437Multiline(), '\n')
     if clipboard then
         if self.clipboard_mode == CLIPBOARD_MODE.LINE and not self:hasSelection() then
             local origin_offset = self.cursor

library/lua/json.lua

@@ -1,5 +1,6 @@
 local _ENV = mkmodule('json')
-local internal = require 'json.internal'
+
+local internal = require('json.internal')
 local fs = dfhack.filesystem
 
 encode_defaults = {
@@ -39,7 +40,7 @@ function decode_file(path, ...)
     end
     local contents = f:read('*all')
     f:close()
-    return decode(contents, ...)
+    return decode(contents, ...) or {}
 end
 
 local _file = defclass()