From e7905a5cff2b6174d92527ab6bbdd8358b98b877 Mon Sep 17 00:00:00 2001
From: Alexander Gavrilov <angavrilov@gmail.com>
Date: Thu, 22 Nov 2012 19:38:45 +0400
Subject: [PATCH] Add docs for the automaterial plugin, and use the new Painter
 class.

---
 NEWS                             |   3 +
 Readme.html                      | 123 ++++++++++++++++++++-----------
 Readme.rst                       |  39 ++++++++++
 images/automaterial-mat.png      | Bin 0 -> 5187 bytes
 images/automaterial-pos.png      | Bin 0 -> 3007 bytes
 library/include/modules/Screen.h |   4 +
 plugins/automaterial.cpp         |  69 ++++++-----------
 7 files changed, 147 insertions(+), 91 deletions(-)
 create mode 100644 images/automaterial-mat.png
 create mode 100644 images/automaterial-pos.png

diff --git a/NEWS b/NEWS
index e12608d34..6ba9a769f 100644
--- a/NEWS
+++ b/NEWS
@@ -47,6 +47,9 @@ DFHack future
     properly designated barracks be used again for storage of squad equipment.
   New Search plugin by falconne:
     Adds an incremental search function to the Stocks, Trading and Unit List screens.
+  New AutoMaterial plugin by falconne:
+    Makes building constructions (walls, floors, fortifications, etc) a little bit easier by
+    saving you from having to trawl through long lists of materials each time you place one.
   Dfusion plugin:
     Reworked to make use of lua modules, now all the scripts can be used from other scripts.
 
diff --git a/Readme.html b/Readme.html
index f520e1a82..5b231b429 100644
--- a/Readme.html
+++ b/Readme.html
@@ -508,33 +508,34 @@ access DF memory and allow for easier development of new tools.</p>
 <li><a class="reference internal" href="#in-game-interface-tools" id="id131">In-game interface tools</a><ul>
 <li><a class="reference internal" href="#dwarf-manipulator" id="id132">Dwarf Manipulator</a></li>
 <li><a class="reference internal" href="#search" id="id133">Search</a></li>
-<li><a class="reference internal" href="#gui-liquids" id="id134">gui/liquids</a></li>
-<li><a class="reference internal" href="#gui-mechanisms" id="id135">gui/mechanisms</a></li>
-<li><a class="reference internal" href="#gui-rename" id="id136">gui/rename</a></li>
-<li><a class="reference internal" href="#gui-room-list" id="id137">gui/room-list</a></li>
-<li><a class="reference internal" href="#gui-choose-weapons" id="id138">gui/choose-weapons</a></li>
-<li><a class="reference internal" href="#gui-guide-path" id="id139">gui/guide-path</a></li>
-<li><a class="reference internal" href="#gui-workshop-job" id="id140">gui/workshop-job</a></li>
-<li><a class="reference internal" href="#gui-workflow" id="id141">gui/workflow</a></li>
-<li><a class="reference internal" href="#gui-assign-rack" id="id142">gui/assign-rack</a></li>
+<li><a class="reference internal" href="#automaterial" id="id134">AutoMaterial</a></li>
+<li><a class="reference internal" href="#gui-liquids" id="id135">gui/liquids</a></li>
+<li><a class="reference internal" href="#gui-mechanisms" id="id136">gui/mechanisms</a></li>
+<li><a class="reference internal" href="#gui-rename" id="id137">gui/rename</a></li>
+<li><a class="reference internal" href="#gui-room-list" id="id138">gui/room-list</a></li>
+<li><a class="reference internal" href="#gui-choose-weapons" id="id139">gui/choose-weapons</a></li>
+<li><a class="reference internal" href="#gui-guide-path" id="id140">gui/guide-path</a></li>
+<li><a class="reference internal" href="#gui-workshop-job" id="id141">gui/workshop-job</a></li>
+<li><a class="reference internal" href="#gui-workflow" id="id142">gui/workflow</a></li>
+<li><a class="reference internal" href="#gui-assign-rack" id="id143">gui/assign-rack</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#behavior-mods" id="id143">Behavior Mods</a><ul>
-<li><a class="reference internal" href="#siege-engine" id="id144">Siege Engine</a><ul>
-<li><a class="reference internal" href="#rationale" id="id145">Rationale</a></li>
-<li><a class="reference internal" href="#configuration-ui" id="id146">Configuration UI</a></li>
+<li><a class="reference internal" href="#behavior-mods" id="id144">Behavior Mods</a><ul>
+<li><a class="reference internal" href="#siege-engine" id="id145">Siege Engine</a><ul>
+<li><a class="reference internal" href="#rationale" id="id146">Rationale</a></li>
+<li><a class="reference internal" href="#configuration-ui" id="id147">Configuration UI</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#power-meter" id="id147">Power Meter</a></li>
-<li><a class="reference internal" href="#steam-engine" id="id148">Steam Engine</a><ul>
-<li><a class="reference internal" href="#id1" id="id149">Rationale</a></li>
-<li><a class="reference internal" href="#construction" id="id150">Construction</a></li>
-<li><a class="reference internal" href="#operation" id="id151">Operation</a></li>
-<li><a class="reference internal" href="#explosions" id="id152">Explosions</a></li>
-<li><a class="reference internal" href="#save-files" id="id153">Save files</a></li>
+<li><a class="reference internal" href="#power-meter" id="id148">Power Meter</a></li>
+<li><a class="reference internal" href="#steam-engine" id="id149">Steam Engine</a><ul>
+<li><a class="reference internal" href="#id1" id="id150">Rationale</a></li>
+<li><a class="reference internal" href="#construction" id="id151">Construction</a></li>
+<li><a class="reference internal" href="#operation" id="id152">Operation</a></li>
+<li><a class="reference internal" href="#explosions" id="id153">Explosions</a></li>
+<li><a class="reference internal" href="#save-files" id="id154">Save files</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#add-spatter" id="id154">Add Spatter</a></li>
+<li><a class="reference internal" href="#add-spatter" id="id155">Add Spatter</a></li>
 </ul>
 </li>
 </ul>
@@ -1887,7 +1888,14 @@ screen from constantly resetting to the top.</p>
 <tr class="field"><th class="field-name" colspan="2">military-color-assigned:</th></tr>
 <tr class="field"><td>&nbsp;</td><td class="field-body"><p class="first">Color squad candidates already assigned to other squads in yellow/green
 to make them stand out more in the list.</p>
-<img alt="images/tweak-mil-color.png" class="last" src="images/tweak-mil-color.png" />
+<img alt="images/tweak-mil-color.png" src="images/tweak-mil-color.png" />
+</td>
+</tr>
+<tr class="field"><th class="field-name" colspan="2">military-training:</th></tr>
+<tr class="field"><td>&nbsp;</td><td class="field-body"><p class="first last">Speeds up melee squad training by removing an almost certainly
+unintended inverse dependency of training speed on unit count
+(i.e. the more units you have, the slower it becomes), and making
+the units spar more.</p>
 </td>
 </tr>
 </tbody>
@@ -2776,6 +2784,8 @@ are mostly implemented by lua scripts.</p>
 <p class="first admonition-title">Note</p>
 <p>In order to avoid user confusion, as a matter of policy all these tools
 display the word &quot;DFHack&quot; on the screen somewhere while active.</p>
+<p>When that is not appropriate because they merely add keybinding hints to
+existing DF screens, they deliberately use red instead of green for the key.</p>
 <p class="last">As an exception, the tweak plugin described above does not follow this
 guideline because it arguably just fixes small usability bugs in the game UI.</p>
 </div>
@@ -2836,15 +2846,42 @@ are actually visible in the list; the same effect applies to the Trade
 Value numbers displayed by the screen. Because of this, pressing the 't'
 key while search is active clears the search instead of executing the trade.</p>
 </div>
+<div class="section" id="automaterial">
+<h2><a class="toc-backref" href="#id134">AutoMaterial</a></h2>
+<p>The automaterial plugin makes building constructions (walls, floors, fortifications,
+etc) a little bit easier by saving you from having to trawl through long lists of
+materials each time you place one.</p>
+<p>Firstly, it moves the last used material for a given construction type to the top of
+the list, if there are any left. So if you build a wall with chalk blocks, the next
+time you place a wall the chalk blocks will be at the top of the list, regardless of
+distance (it only does this in &quot;grouped&quot; mode, as individual item lists could be huge).
+This should mean you can place most constructions without having to search for your
+preferred material type.</p>
+<img alt="images/automaterial-mat.png" src="images/automaterial-mat.png" />
+<p>Pressing 'a' while highlighting any material will enable that material for &quot;auto select&quot;
+for this construction type. You can enable multiple materials as autoselect. Now the next
+time you place this type of construction, the plugin will automatically choose materials
+for you from the kinds you enabled. If there is enough to satisfy the whole placement,
+you won't be prompted with the material screen - the construction will be placed and you
+will be back in the construction menu as if you did it manually.</p>
+<p>When choosing the construction placement, you will see a couple of options:</p>
+<img alt="images/automaterial-pos.png" src="images/automaterial-pos.png" />
+<p>Use 'a' here to temporarily disable the material autoselection, e.g. if you need
+to go to the material selection screen so you can toggle some materials on or off.</p>
+<p>The other option (auto type selection, off by default) can be toggled on with 't'. If you
+toggle this option on, instead of returning you to the main construction menu after selecting
+materials, it returns you back to this screen. If you use this along with several autoselect
+enabled materials, you should be able to place complex constructions more conveniently.</p>
+</div>
 <div class="section" id="gui-liquids">
-<h2><a class="toc-backref" href="#id134">gui/liquids</a></h2>
+<h2><a class="toc-backref" href="#id135">gui/liquids</a></h2>
 <p>To use, bind to a key (the example config uses Alt-L) and activate in the 'k' mode.</p>
 <img alt="images/liquids.png" src="images/liquids.png" />
 <p>While active, use the suggested keys to switch the usual liquids parameters, and Enter
 to select the target area and apply changes.</p>
 </div>
 <div class="section" id="gui-mechanisms">
-<h2><a class="toc-backref" href="#id135">gui/mechanisms</a></h2>
+<h2><a class="toc-backref" href="#id136">gui/mechanisms</a></h2>
 <p>To use, bind to a key (the example config uses Ctrl-M) and activate in the 'q' mode.</p>
 <img alt="images/mechanisms.png" src="images/mechanisms.png" />
 <p>Lists mechanisms connected to the building, and their links. Navigating the list centers
@@ -2854,7 +2891,7 @@ focus on the current one. Shift-Enter has an effect equivalent to pressing Enter
 re-entering the mechanisms ui.</p>
 </div>
 <div class="section" id="gui-rename">
-<h2><a class="toc-backref" href="#id136">gui/rename</a></h2>
+<h2><a class="toc-backref" href="#id137">gui/rename</a></h2>
 <p>Backed by the rename plugin, this script allows entering the desired name
 via a simple dialog in the game ui.</p>
 <ul>
@@ -2877,7 +2914,7 @@ their species string.</p>
 unit profession change to Ctrl-Shift-T.</p>
 </div>
 <div class="section" id="gui-room-list">
-<h2><a class="toc-backref" href="#id137">gui/room-list</a></h2>
+<h2><a class="toc-backref" href="#id138">gui/room-list</a></h2>
 <p>To use, bind to a key (the example config uses Alt-R) and activate in the 'q' mode,
 either immediately or after opening the assign owner page.</p>
 <img alt="images/room-list.png" src="images/room-list.png" />
@@ -2885,7 +2922,7 @@ either immediately or after opening the assign owner page.</p>
 list, and allows unassigning them.</p>
 </div>
 <div class="section" id="gui-choose-weapons">
-<h2><a class="toc-backref" href="#id138">gui/choose-weapons</a></h2>
+<h2><a class="toc-backref" href="#id139">gui/choose-weapons</a></h2>
 <p>Bind to a key (the example config uses Ctrl-W), and activate in the Equip-&gt;View/Customize
 page of the military screen.</p>
 <p>Depending on the cursor location, it rewrites all 'individual choice weapon' entries
@@ -2896,7 +2933,7 @@ only that entry, and does it even if it is not 'individual choice'.</p>
 and may lead to inappropriate weapons being selected.</p>
 </div>
 <div class="section" id="gui-guide-path">
-<h2><a class="toc-backref" href="#id139">gui/guide-path</a></h2>
+<h2><a class="toc-backref" href="#id140">gui/guide-path</a></h2>
 <p>Bind to a key (the example config uses Alt-P), and activate in the Hauling menu with
 the cursor over a Guide order.</p>
 <img alt="images/guide-path.png" src="images/guide-path.png" />
@@ -2904,7 +2941,7 @@ the cursor over a Guide order.</p>
 computes it when the order is executed for the first time.</p>
 </div>
 <div class="section" id="gui-workshop-job">
-<h2><a class="toc-backref" href="#id140">gui/workshop-job</a></h2>
+<h2><a class="toc-backref" href="#id141">gui/workshop-job</a></h2>
 <p>Bind to a key (the example config uses Alt-A), and activate with a job selected in
 a workshop in the 'q' mode.</p>
 <img alt="images/workshop-job.png" src="images/workshop-job.png" />
@@ -2940,7 +2977,7 @@ and then try to change the input item type, now it won't let you select <em>plan
 you have to unset the material first.</p>
 </div>
 <div class="section" id="gui-workflow">
-<h2><a class="toc-backref" href="#id141">gui/workflow</a></h2>
+<h2><a class="toc-backref" href="#id142">gui/workflow</a></h2>
 <p>Bind to a key (the example config uses Alt-W), and activate with a job selected
 in a workshop in the 'q' mode.</p>
 <img alt="images/workflow.png" src="images/workflow.png" />
@@ -2970,7 +3007,7 @@ suit your need, and set the item count range.</p>
 <p>If you don't need advanced settings, you can just press 'y' to confirm creation.</p>
 </div>
 <div class="section" id="gui-assign-rack">
-<h2><a class="toc-backref" href="#id142">gui/assign-rack</a></h2>
+<h2><a class="toc-backref" href="#id143">gui/assign-rack</a></h2>
 <p>Bind to a key (the example config uses P), and activate when viewing a weapon
 rack in the 'q' mode.</p>
 <img alt="images/assign-rack.png" src="images/assign-rack.png" />
@@ -2995,7 +3032,7 @@ of currently assigned racks for every valid squad.</p>
 </div>
 </div>
 <div class="section" id="behavior-mods">
-<h1><a class="toc-backref" href="#id143">Behavior Mods</a></h1>
+<h1><a class="toc-backref" href="#id144">Behavior Mods</a></h1>
 <p>These plugins, when activated via configuration UI or by detecting certain
 structures in RAWs, modify the game engine behavior concerning the target
 objects to add features not otherwise present.</p>
@@ -3006,20 +3043,20 @@ technical challenge, and do not represent any long-term plans to produce more
 similar modifications of the game.</p>
 </div>
 <div class="section" id="siege-engine">
-<h2><a class="toc-backref" href="#id144">Siege Engine</a></h2>
+<h2><a class="toc-backref" href="#id145">Siege Engine</a></h2>
 <p>The siege-engine plugin enables siege engines to be linked to stockpiles, and
 aimed at an arbitrary rectangular area across Z levels, instead of the original
 four directions. Also, catapults can be ordered to load arbitrary objects, not
 just stones.</p>
 <div class="section" id="rationale">
-<h3><a class="toc-backref" href="#id145">Rationale</a></h3>
+<h3><a class="toc-backref" href="#id146">Rationale</a></h3>
 <p>Siege engines are a very interesting feature, but sadly almost useless in the current state
 because they haven't been updated since 2D and can only aim in four directions. This is an
 attempt to bring them more up to date until Toady has time to work on it. Actual improvements,
 e.g. like making siegers bring their own, are something only Toady can do.</p>
 </div>
 <div class="section" id="configuration-ui">
-<h3><a class="toc-backref" href="#id146">Configuration UI</a></h3>
+<h3><a class="toc-backref" href="#id147">Configuration UI</a></h3>
 <p>The configuration front-end to the plugin is implemented by the gui/siege-engine
 script. Bind it to a key (the example config uses Alt-A) and activate after selecting
 a siege engine in 'q' mode.</p>
@@ -3042,7 +3079,7 @@ menu.</p>
 </div>
 </div>
 <div class="section" id="power-meter">
-<h2><a class="toc-backref" href="#id147">Power Meter</a></h2>
+<h2><a class="toc-backref" href="#id148">Power Meter</a></h2>
 <p>The power-meter plugin implements a modified pressure plate that detects power being
 supplied to gear boxes built in the four adjacent N/S/W/E tiles.</p>
 <p>The configuration front-end is implemented by the gui/power-meter script. Bind it to a
@@ -3053,11 +3090,11 @@ in the build menu.</p>
 configuration page, but configures parameters relevant to the modded power meter building.</p>
 </div>
 <div class="section" id="steam-engine">
-<h2><a class="toc-backref" href="#id148">Steam Engine</a></h2>
+<h2><a class="toc-backref" href="#id149">Steam Engine</a></h2>
 <p>The steam-engine plugin detects custom workshops with STEAM_ENGINE in
 their token, and turns them into real steam engines.</p>
 <div class="section" id="id1">
-<h3><a class="toc-backref" href="#id149">Rationale</a></h3>
+<h3><a class="toc-backref" href="#id150">Rationale</a></h3>
 <p>The vanilla game contains only water wheels and windmills as sources of
 power, but windmills give relatively little power, and water wheels require
 flowing water, which must either be a real river and thus immovable and
@@ -3068,7 +3105,7 @@ it can be done just by combining existing features of the game engine
 in a new way with some glue code and a bit of custom logic.</p>
 </div>
 <div class="section" id="construction">
-<h3><a class="toc-backref" href="#id150">Construction</a></h3>
+<h3><a class="toc-backref" href="#id151">Construction</a></h3>
 <p>The workshop needs water as its input, which it takes via a
 passable floor tile below it, like usual magma workshops do.
 The magma version also needs magma.</p>
@@ -3092,7 +3129,7 @@ short axles that can be built later than both of the engines.</p>
 </div>
 </div>
 <div class="section" id="operation">
-<h3><a class="toc-backref" href="#id151">Operation</a></h3>
+<h3><a class="toc-backref" href="#id152">Operation</a></h3>
 <p>In order to operate the engine, queue the Stoke Boiler job (optionally
 on repeat). A furnace operator will come, possibly bringing a bar of fuel,
 and perform it. As a result, a &quot;boiling water&quot; item will appear
@@ -3123,7 +3160,7 @@ decrease it by further 4%, and also decrease the whole steam
 use rate by 10%.</p>
 </div>
 <div class="section" id="explosions">
-<h3><a class="toc-backref" href="#id152">Explosions</a></h3>
+<h3><a class="toc-backref" href="#id153">Explosions</a></h3>
 <p>The engine must be constructed using barrel, pipe and piston
 from fire-safe, or in the magma version magma-safe metals.</p>
 <p>During operation weak parts get gradually worn out, and
@@ -3132,7 +3169,7 @@ toppled during operation by a building destroyer, or a
 tantruming dwarf.</p>
 </div>
 <div class="section" id="save-files">
-<h3><a class="toc-backref" href="#id153">Save files</a></h3>
+<h3><a class="toc-backref" href="#id154">Save files</a></h3>
 <p>It should be safe to load and view engine-using fortresses
 from a DF version without DFHack installed, except that in such
 case the engines won't work. However actually making modifications
@@ -3143,7 +3180,7 @@ being generated.</p>
 </div>
 </div>
 <div class="section" id="add-spatter">
-<h2><a class="toc-backref" href="#id154">Add Spatter</a></h2>
+<h2><a class="toc-backref" href="#id155">Add Spatter</a></h2>
 <p>This plugin makes reactions with names starting with <tt class="docutils literal">SPATTER_ADD_</tt>
 produce contaminants on the items instead of improvements. The produced
 contaminants are immune to being washed away by water or destroyed by
diff --git a/Readme.rst b/Readme.rst
index 1f5ac08fd..e6554cac0 100644
--- a/Readme.rst
+++ b/Readme.rst
@@ -1968,6 +1968,9 @@ are mostly implemented by lua scripts.
     In order to avoid user confusion, as a matter of policy all these tools
     display the word "DFHack" on the screen somewhere while active.
 
+    When that is not appropriate because they merely add keybinding hints to
+    existing DF screens, they deliberately use red instead of green for the key.
+
     As an exception, the tweak plugin described above does not follow this
     guideline because it arguably just fixes small usability bugs in the game UI.
 
@@ -2046,6 +2049,42 @@ Value numbers displayed by the screen. Because of this, pressing the 't'
 key while search is active clears the search instead of executing the trade.
 
 
+AutoMaterial
+============
+
+The automaterial plugin makes building constructions (walls, floors, fortifications,
+etc) a little bit easier by saving you from having to trawl through long lists of
+materials each time you place one.
+
+Firstly, it moves the last used material for a given construction type to the top of
+the list, if there are any left. So if you build a wall with chalk blocks, the next
+time you place a wall the chalk blocks will be at the top of the list, regardless of
+distance (it only does this in "grouped" mode, as individual item lists could be huge).
+This should mean you can place most constructions without having to search for your
+preferred material type.
+
+.. image:: images/automaterial-mat.png
+
+Pressing 'a' while highlighting any material will enable that material for "auto select"
+for this construction type. You can enable multiple materials as autoselect. Now the next
+time you place this type of construction, the plugin will automatically choose materials
+for you from the kinds you enabled. If there is enough to satisfy the whole placement,
+you won't be prompted with the material screen - the construction will be placed and you
+will be back in the construction menu as if you did it manually.
+
+When choosing the construction placement, you will see a couple of options:
+
+.. image:: images/automaterial-pos.png
+
+Use 'a' here to temporarily disable the material autoselection, e.g. if you need
+to go to the material selection screen so you can toggle some materials on or off.
+
+The other option (auto type selection, off by default) can be toggled on with 't'. If you
+toggle this option on, instead of returning you to the main construction menu after selecting
+materials, it returns you back to this screen. If you use this along with several autoselect
+enabled materials, you should be able to place complex constructions more conveniently.
+
+
 gui/liquids
 ===========
 
diff --git a/images/automaterial-mat.png b/images/automaterial-mat.png
new file mode 100644
index 0000000000000000000000000000000000000000..5517bbc6d33636b9842da1b712cac161a74a4f39
GIT binary patch
literal 5187
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

literal 0
HcmV?d00001

diff --git a/images/automaterial-pos.png b/images/automaterial-pos.png
new file mode 100644
index 0000000000000000000000000000000000000000..959573643a8d8a0ba3e9c686dd80e1885f4ad318
GIT binary patch
literal 3007
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
RPqr`su%$Ur%dNb){{qvQ3o-xz

literal 0
HcmV?d00001

diff --git a/library/include/modules/Screen.h b/library/include/modules/Screen.h
index 2c245ae4c..bfc393734 100644
--- a/library/include/modules/Screen.h
+++ b/library/include/modules/Screen.h
@@ -28,7 +28,9 @@ distribution.
 #include "BitArray.h"
 #include "ColorText.h"
 #include "Types.h"
+
 #include <string>
+#include <set>
 
 #include "DataDefs.h"
 #include "df/graphic.h"
@@ -51,6 +53,8 @@ namespace DFHack
 {
     class Core;
 
+    typedef std::set<df::interface_key> interface_key_set;
+
     /**
      * The Screen module
      * \ingroup grp_modules
diff --git a/plugins/automaterial.cpp b/plugins/automaterial.cpp
index ac5a4ae22..9f383b935 100644
--- a/plugins/automaterial.cpp
+++ b/plugins/automaterial.cpp
@@ -74,28 +74,6 @@ DFhackCExport command_result plugin_shutdown ( color_ostream &out )
     return CR_OK;
 }
 
-
-void OutputString(int8_t color, int &x, int &y, const std::string &text, bool newline = false, int left_margin = 0)
-{
-    Screen::paintString(Screen::Pen(' ', color, 0), x, y, text);
-    if (newline)
-    {
-        ++y;
-        x = left_margin;
-    }
-    else
-        x += text.length();
-}
-
-void OutputHotkeyString(int &x, int &y, const char *text, const char *hotkey, bool newline = false, int left_margin = 0, int8_t color = COLOR_WHITE)
-{
-    OutputString(10, x, y, hotkey);
-    string display(": ");
-    display.append(text);
-    OutputString(color, x, y, display, newline, left_margin);
-}
-
-
 static inline bool in_material_choice_stage()
 {
     return Gui::build_selector_hotkey(Core::getTopViewscreen()) && 
@@ -137,7 +115,7 @@ static inline MaterialDescriptor &get_last_used_material()
     return last_used_material[ui_build_selector->building_subtype];
 }
 
-static void set_last_used_material(MaterialDescriptor &matetial)
+static void set_last_used_material(const MaterialDescriptor &matetial)
 {
     last_used_material[ui_build_selector->building_subtype] = matetial;
 }
@@ -150,7 +128,7 @@ static MaterialDescriptor &get_last_moved_material()
     return last_moved_material[ui_build_selector->building_subtype];
 }
 
-static void set_last_moved_material(MaterialDescriptor &matetial)
+static void set_last_moved_material(const MaterialDescriptor &matetial)
 {
     last_moved_material[ui_build_selector->building_subtype] = matetial;
 }
@@ -306,9 +284,9 @@ struct jobutils_hook : public df::viewscreen_dwarfmodest
             !in_material_choice_stage() &&
             hotkeys.find(last_used_constr_subtype) != hotkeys.end())
         {
-            input->clear();
-            input->insert(hotkeys[last_used_constr_subtype]);
-            this->feed(input);
+            interface_key_set keys;
+            keys.insert(hotkeys[last_used_constr_subtype]);
+            INTERPOSE_NEXT(feed)(&keys);
         }
     }
 
@@ -349,47 +327,42 @@ struct jobutils_hook : public df::viewscreen_dwarfmodest
             MaterialDescriptor material = get_material_in_list(ui_build_selector->sel_index);
             if (material.valid)
             {
-                int left_margin = gps->dimx - 30;
-                int x = left_margin;
-                int y = 25;
-
-                string toggle_string = "Enable";
                 string title = "Disabled";
                 if (check_autoselect(material, false))
                 {
-                    toggle_string = "Disable";
                     title = "Enabled";
                 }
 
-                OutputString(COLOR_BROWN, x, y, "DFHack Autoselect: " + title, true, left_margin);
-                OutputHotkeyString(x, y, toggle_string.c_str(), "a", true, left_margin);
+                auto dims = Gui::getDwarfmodeViewDims();
+                Screen::Painter dc(dims.menu());
+
+                dc.seek(1,24).key_pen(COLOR_LIGHTRED).pen(COLOR_WHITE);
+                dc.key(interface_key::CUSTOM_A).string(": Autoselect "+title);
             }
         }
-        else if (in_placement_stage() && ui_build_selector->building_subtype != 7)
+        else if (in_placement_stage() && ui_build_selector->building_subtype < construction_type::TrackN)
         {
-            int left_margin = gps->dimx - 30;
-            int x = left_margin;
-            int y = 25;
+            string autoselect_toggle = (auto_choose_materials) ? "Disable" : "Enable";
+            string revert_toggle = (revert_to_last_used_type) ? "Disable" : "Enable";
 
-            string autoselect_toggle_string = (auto_choose_materials) ? "Disable Auto Mat-select" : "Enable Auto Mat-select";
-            string revert_toggle_string = (revert_to_last_used_type) ? "Disable Auto Type-select" : "Enable Auto Type-select";
+            auto dims = Gui::getDwarfmodeViewDims();
+            Screen::Painter dc(dims.menu());
 
-            OutputString(COLOR_BROWN, x, y, "DFHack Options", true, left_margin);
-            OutputHotkeyString(x, y, autoselect_toggle_string.c_str(), "a", true, left_margin);
-            OutputHotkeyString(x, y, revert_toggle_string.c_str(), "t", true, left_margin);
+            dc.seek(1,23).key_pen(COLOR_LIGHTRED).pen(COLOR_WHITE);
+            dc.key(interface_key::CUSTOM_A).string(": "+autoselect_toggle+" Auto Mat-Select").newline(1);
+            dc.key(interface_key::CUSTOM_T).string(": "+revert_toggle+" Auto Type-Select");
         }
     }
 };
 
-color_ostream_proxy console_out(Core::getInstance().getConsole());
-
-
 IMPLEMENT_VMETHOD_INTERPOSE(jobutils_hook, feed);
 IMPLEMENT_VMETHOD_INTERPOSE(jobutils_hook, render);
 
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
-    if (!gps || !INTERPOSE_HOOK(jobutils_hook, feed).apply() || !INTERPOSE_HOOK(jobutils_hook, render).apply())
+    if (!gps || !ui_build_selector ||
+        !INTERPOSE_HOOK(jobutils_hook, feed).apply() ||
+        !INTERPOSE_HOOK(jobutils_hook, render).apply())
         out.printerr("Could not insert jobutils hooks!\n");
 
     hotkeys[construction_type::Wall] = df::interface_key::HOTKEY_BUILDING_CONSTRUCTION_WALL;