From aa22917aeba47ffcf581f56afeb73c2f289d0194 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Tue, 31 Jan 2023 23:52:30 -0800
Subject: [PATCH 1/2] add new control panel textures

---
 data/art/control-panel.png         | Bin 0 -> 639 bytes
 library/include/modules/Textures.h |   5 +++++
 library/modules/Textures.cpp       |   7 +++++++
 3 files changed, 12 insertions(+)
 create mode 100644 data/art/control-panel.png

diff --git a/data/art/control-panel.png b/data/art/control-panel.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f5e9468af89d99e93137a1b95babf4479dae8bd
GIT binary patch
literal 639
zcmV-_0)YLAP)<h;3K|Lk000e1NJLTq002+`000;W0ssI2;&|=*0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!2T4RhRCwBAl#!8P7)gKyLWS#pk8|PD
z^Y<rJe@X80l@~eTTxyvE1YQ~KK=SSD>u4(3A3g<=htBMUaLt3`NV13#62n`I8G)`W
z_&$#$%@e+90!i7xmv9k?If5q3NHXXBPDM0xAif2H7l&7)Ddyo6gfJj}Hqtf%k{fqy
zge&m(Km_-j51)>n*bih_TR4gc@F8Lt;#+5}7$AG^wIxJ4)b)VIZigGlA`ssyX{nRs
zVdFxEv;Ds?#W8&g1Yf?thx-`<Aijn86UYW4AR8hG^e37!7Bu6C_bp8UW=ci|51v0n
z<|0Qa900uvj9W<b0s%apnFgV6$p*+#4fiV0lkj*33Nj6w;uqPsXaJIXQA+9I2Ovor
zIjXTF>7fgNr7<Mw0vTwT7VcGuAR>m7b_o~%u_MWvUY0|bj-U%3tmRHzOPX`%2R}hG
z2U6Lxa|!~>WK6$dO|)o98o7K%7J=5okOl)8LAz+rH_V0y<>ml^oryEnG8qCMJ-q{A
z$Vsb^)9@H=S`Lb)C9c{SnBa$P(-K!(8s4-d)x(3jX$b_sZ(Kq5FlxIJqJa3eG}B;i
zTH<O;qm^Xv@)_QohBvCwS|&imGH9EYc$(8xYfBHO*5znhdbBM);@Z-K4FKy~TC}AH
zb>{&xf`zp$jp=_(A7T|B?41W(z9qZ!01#jRdw6w(;>%@%0000EWmrjOO-%qQ00008
Z000000002eQ<DGy002ovPDHLkV1iy921@_{

literal 0
HcmV?d00001

diff --git a/library/include/modules/Textures.h b/library/include/modules/Textures.h
index 446bd1962..a438f01f4 100644
--- a/library/include/modules/Textures.h
+++ b/library/include/modules/Textures.h
@@ -46,6 +46,11 @@ DFHACK_EXPORT long getIconsTexposStart();
  */
 DFHACK_EXPORT long getOnOffTexposStart();
 
+/**
+ * Get the first texpos for the control panel icons. 10x2 grid.
+ */
+DFHACK_EXPORT long getControlPanelTexposStart();
+
 /**
  * Get the first texpos for the DFHack borders. Each is a 7x3 grid.
  */
diff --git a/library/modules/Textures.cpp b/library/modules/Textures.cpp
index 7781bfc10..25d44695a 100644
--- a/library/modules/Textures.cpp
+++ b/library/modules/Textures.cpp
@@ -23,6 +23,7 @@ static long g_green_pin_texpos_start = -1;
 static long g_red_pin_texpos_start = -1;
 static long g_icons_texpos_start = -1;
 static long g_on_off_texpos_start = -1;
+static long g_control_panel_texpos_start = -1;
 static long g_thin_borders_texpos_start = -1;
 static long g_medium_borders_texpos_start = -1;
 static long g_panel_borders_texpos_start = -1;
@@ -127,6 +128,8 @@ void Textures::init(color_ostream &out) {
                                           &g_icons_texpos_start);
     g_num_dfhack_textures += load_textures(out, "hack/data/art/on-off.png",
                                           &g_on_off_texpos_start);
+    g_num_dfhack_textures += load_textures(out, "hack/data/art/control-panel.png",
+                                          &g_control_panel_texpos_start);
     g_num_dfhack_textures += load_textures(out, "hack/data/art/border-thin.png",
                                           &g_thin_borders_texpos_start);
     g_num_dfhack_textures += load_textures(out, "hack/data/art/border-medium.png",
@@ -187,6 +190,10 @@ long Textures::getOnOffTexposStart() {
     return g_on_off_texpos_start;
 }
 
+long Textures::getControlPanelTexposStart() {
+    return g_control_panel_texpos_start;
+}
+
 long Textures::getThinBordersTexposStart() {
     return g_thin_borders_texpos_start;
 }

From 5127f0657193766a8e96d983f76f19acd393cd84 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Tue, 31 Jan 2023 23:55:30 -0800
Subject: [PATCH 2/2] expose new tiles to Lua

---
 library/LuaApi.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 699c8aef7..bb2392546 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -1694,6 +1694,7 @@ static const LuaWrapper::FunctionReg dfhack_textures_module[] = {
     WRAPM(Textures, getRedPinTexposStart),
     WRAPM(Textures, getIconsTexposStart),
     WRAPM(Textures, getOnOffTexposStart),
+    WRAPM(Textures, getControlPanelTexposStart),
     WRAPM(Textures, getThinBordersTexposStart),
     WRAPM(Textures, getMediumBordersTexposStart),
     WRAPM(Textures, getPanelBordersTexposStart),