MULTIPLEXKEY

Author: white-rabbit-dfplex

dist/shared/data/init/dfplex.txt

@@ -18,8 +18,8 @@ Zero means unbounded.
 Enable autosave while nobody is playing. You probably shouldn't use this yet.
 [AUTOSAVE_WHILE_IDLE:NO]
 
-This key enters uniplex mode.
-[UNIPLEXKEY:92]
+This key toggles multiplex mode.
+[MULTIPLEXKEY:92]
 
 This key toggles client's debug output
 [DEBUGKEY:124]

server/config.cpp

@@ -10,7 +10,7 @@ uint32_t MAX_CLIENTS = 0;
 uint16_t PORT = 1234;
 uint16_t STATICPORT = 8000;
 std::string STATICDIR = "hack/www";
-uint32_t UNIPLEXKEY = 0;
+uint32_t MULTIPLEXKEY = 0;
 uint32_t NEXT_CLIENT_POS_KEY = 0;
 uint32_t PREV_CLIENT_POS_KEY = 0;
 bool CURSOR_IS_TEXT = false;
@@ -97,8 +97,8 @@ bool load_text_file()
         {
            SERVERDEBUGKEY = std::stol(val);
         }
-        if (key == "UNIPLEXKEY") {
-            UNIPLEXKEY = std::stol(val);
+        if (key == "MULTIPLEXKEY") {
+            MULTIPLEXKEY = std::stol(val);
 		}
 	}
 	return true;

server/config.hpp

@@ -15,7 +15,7 @@ extern uint32_t MAX_CLIENTS;
 extern uint16_t PORT;
 extern uint16_t STATICPORT;
 extern std::string STATICDIR;
-extern uint32_t UNIPLEXKEY;
+extern uint32_t MULTIPLEXKEY;
 extern uint32_t DEBUGKEY;
 extern uint32_t SERVERDEBUGKEY;
 extern uint32_t NEXT_CLIENT_POS_KEY;

server/dfplex.cpp

@@ -121,7 +121,7 @@ bool is_paused()
 void apply_key(const KeyEvent& match, Client* cl, bool raw)
 {
     // special keys
-    if (UNIPLEXKEY != 0 && (match.type == type_unicode || match.type == type_key) && match.unicode == UNIPLEXKEY)
+    if (MULTIPLEXKEY != 0 && (match.type == type_unicode || match.type == type_key) && match.unicode == MULTIPLEXKEY)
     {
         // enter uniplex mode.
         if (uniplexing_requested)

server/screenbuf.cpp

@@ -279,9 +279,9 @@ void modify_screenbuf(Client* cl)
                 {
                 case 0:
                     // uniplex
-                    if (UNIPLEXKEY)
+                    if (MULTIPLEXKEY)
                     {
-                        std::string keystr = key_display_name(UNIPLEXKEY);
+                        std::string keystr = key_display_name(MULTIPLEXKEY);
                         write_to_screen(x, y, keystr, 4, 0, 1);
 
                         write_to_screen(x + keystr.length(), y, 

server/state.cpp

@@ -61,6 +61,7 @@
 #include "df/viewscreen_optionst.h"
 #include "df/viewscreen_reportlistst.h"
 #include "df/viewscreen_textviewerst.h"
+#include "df/viewscreen_tradelistst.h"
 #include "df/viewscreen_titlest.h"
 #include "df/viewscreen_unitst.h"
 #include "df/viewscreen.h"
@@ -491,6 +492,24 @@ static bool stabilize_list_menu(Client* client)
     return true;
 }
 
+bool tradelist_advance(Client* client)
+{
+    df::viewscreen* vs;
+    virtual_identity* id;
+    UPDATE_VS(vs, id);
+    if (id == &df::viewscreen_tradelistst::_identity)
+    {
+        // apply this 32 times for paranoia.
+        for (size_t i = 0; i < 32; ++i)
+        {
+            vs->logic();
+            UPDATE_VS(vs, id);
+        }
+        return true;
+    }
+    return false;
+}
+
 // restores state for client
 // -- preconditions --
 // must be in the dfmode root menu.
@@ -650,6 +669,15 @@ RestoreResult restore_state(Client* client)
             }
         }
 
+        // tradelist immediately advances to a new screen
+        // ometimes, so we must simulate that.
+        if (tradelist_advance(client))
+        {
+            UPDATE_VS(vs, id);
+            //vs->feed_key(df::enums::interface_key::STANDARDSCROLL_DOWN);
+            //*_out << "advanced to " << get_current_menu_id() << std::endl;
+        }
+        
         ui.m_restore_progress++;
     }