From 9aaa55cd7f22b0a0078dd7c2f283a9a84c373001 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Mon, 23 Jan 2023 02:25:16 -0800
Subject: [PATCH] add textures and frames for various use cases

---
 data/art/border-medium.png         | Bin 0 -> 641 bytes
 data/art/border-panel.png          | Bin 0 -> 446 bytes
 data/art/border-thin.png           | Bin 0 -> 471 bytes
 data/art/border-window.png         | Bin 0 -> 563 bytes
 docs/dev/Lua API.rst               |  15 ++++++-----
 library/LuaApi.cpp                 |   4 +++
 library/include/modules/Textures.h |   8 ++++++
 library/lua/gui.lua                |  39 +++++++++++++++++++++--------
 library/modules/Textures.cpp       |  28 +++++++++++++++++++++
 plugins/lua/orders.lua             |   2 +-
 10 files changed, 79 insertions(+), 17 deletions(-)
 create mode 100644 data/art/border-medium.png
 create mode 100644 data/art/border-panel.png
 create mode 100644 data/art/border-thin.png
 create mode 100644 data/art/border-window.png

diff --git a/data/art/border-medium.png b/data/art/border-medium.png
new file mode 100644
index 0000000000000000000000000000000000000000..529a60ee433fd2358d7252a8108ecef2cd4463d6
GIT binary patch
literal 641
zcmV-{0)G98P)<h;3K|Lk000e1NJLTq001}u001Ni0ssI2Q}Ax70000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!2}wjjRCwC#Sg}sSFc7^~8QLX643#RS
z0|R2~h=kNXfUTdv4}kaqexMRR&<|i>D}R6#sT*unh7LiB=un|9u))<AT}%=;v0Kw1
za!Q8SckT1t`QF(L&-0Et2dCZWtak|d;)ly=)SWNhdF1h?(I0dk#;dEzhped@Pf7S1
z=8ijza(L+)0EIEW5x@_uHpG!pzC10ojL}1DLxFX^XxjyfFQLSs0JJv8MV7mZb}(C^
zEk6G35-dxTQd6LW@+euE49)Ue+oSRyYYCd5UwN;jW@+Sn^p$Iy)sN-62<VoA`6_>k
zbP~IB^j1c{tVfSeK4D^lZ*2&i;t5LmGgnj!L$K^o&Kwa_w=kDfvnrrX_#;vSwO5|D
z6s}Xj44)N`sB#f!anB(ars`ME>*aO`I|Hg}6%5L=U60Cr0{K8xuIh!JBgmAa;-q>r
zSr#SfR|;r(#@{p0!j^#R$)15?W!SvuxN~rRKLu$7d7)aHN!6zkdsPT%nJnB7&|uc;
z50XxtDKty&G^HZ_gf+w&p>FePp#O&JrFt2kOG{VQSbsC=+d9|lsuh|$@<MexNZALe
zbNx=rs(e4-_~CL0E-nZwnHE+;NuIzTxqoh_4o_y}o@IF|w+^imu`^cPaPNwH3PL}P
zy6c<RF%VV*hNMep0LvG-;-)ypY9QIGaZB<ozyQC4_G@ab=rsTU01jnXNoGw=04e|g
b00;m8000000Mb*F00000NkvXXu0mjfS^FAo

literal 0
HcmV?d00001

diff --git a/data/art/border-panel.png b/data/art/border-panel.png
new file mode 100644
index 0000000000000000000000000000000000000000..52b24b91996f8bbd05892e4061691e3dffab0c5e
GIT binary patch
literal 446
zcmV;v0YUzWP)<h;3K|Lk000e1NJLTq001}u001Ni0ssI2Q}Ax70000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzMoC0LRCwBA{C}&2fnxCP;XeJuS3t(&
zeGx!5kg<R5=YlQY;R<kxV}i#|9%B_}fmlPKLxI*a&=@c=3=zOWNvJpm^A3PRfdGH%
z!IGYe{Nc$4m<rMS0F(tXWSv%E*Ndti0n~_aD24fnpa?OtLc=GGQYGWVQ!T+1k4r%?
ztsM$U-^i&Je~QN?8$8sbe$=6ZHZ#G?MIm`7P*N)bA^hbi*4kfIMi#3Y8kVD@QBU7;
zbif=+YB`G8Dxi}?X`Q}DUK*uE?*O^IOLK?fYNrxY?<1#p7W$_@hzO)!7%fMsmjodd
z>>zR|w0y;=*$cL;fQUN=@4Fbxi?zRx+)fy6=8ZN=s9au>TC)?Z@duziic2Ma6GnV{
zl#H4kYb_5~&q8Xukofi}sXcmJwLC;U3qAWiBcpf%h9Vutizx>H0R{j?e$peluCCPp
o000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$f;ro-<NyEw

literal 0
HcmV?d00001

diff --git a/data/art/border-thin.png b/data/art/border-thin.png
new file mode 100644
index 0000000000000000000000000000000000000000..71fa59a3eabb211550f3c1c774024cc7f13a9f14
GIT binary patch
literal 471
zcmV;|0Vw{7P)<h;3K|Lk000e1NJLTq001}u001Ni0ssI2Q}Ax70000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzUr9tkRCwC#SUV2FFbst%3kxetdJJyC
zf_ellz)`pWM?fsxs4T23tVFUDMfo^Rn%GMt)WNvTYx4a3nyuD)({#+w!{h$FzJA2G
zpZ1=kapgX!6cc6QRztb3TYB?!*_$g5Rz=?wS**j7n^QzI=x?W8m#uG7L%>?N8mzF`
z<N1T+N5-);P=IK_0m>}nQwdY=6}2<~lv&oM5~dy;rB5$hOq^o{+Nm?O6)9pDh&Gy0
zkI|eiIto~E9Ti*AQXLfoTB@VM#YD$PaRqLUlC5Re72s`F7%0wW_g^KumRUC2945gJ
z8A)NYo1+*Y7Wq`B&V=YIZbRjPdRttruS~^c@P!|`u>1I@rDe!!^Hx9FSTDW0sfc^0
zM!ozfv9pKz>ZzEGck!e2&YsfO(AP5g(QIcA<6iz?pHgvJ6iOo<hmFH8o3CsX@rC$y
z^Bp@bnT-1&mvhRx@fTnKi{d*;)y|VN0000EWmrjOO-%qQ00008000000002eQ<DGy
N002ovPDHLkV1jP;%pU*%

literal 0
HcmV?d00001

diff --git a/data/art/border-window.png b/data/art/border-window.png
new file mode 100644
index 0000000000000000000000000000000000000000..34747d69b7f1d50c660a583aeaabb9caeb9804b4
GIT binary patch
literal 563
zcmV-30?hr1P)<h;3K|Lk000e1NJLTq001}u001Ni0ssI2Q}Ax70000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzyGcYrRCwBA{C}&2fnxCP;XeJuS3t(&
zeGx!5kg<R5=YlQY;R<kxV}i#|9%B_}fmlPKLxI*a&=|15SwiwoWCSDwy#Ncct!)z?
zlB&O|K%U+X1%_x(KlvdFOohl&j={W-i~NBMS*I1)(;}*R1W==Kh+-xK{0Re>tPrh3
zbjYMpNX7@oIFaQ5E(O7~4pB(y2uzo7LHy+<F4^GWlk4eeD@6_^qjrI(NP34T{#1pf
zEJR9?@NyAS!vz<C5dLx$Ywa&9Ba2lH3$=Vq>!ONk4#nM6STVR9T2eS4hYaW7a%fL~
zB3AL0PAdrJNJy(-2!tpx>3iTqbjYMpJmoiXIZg8r?I9vX;wrz9%W0a2C}y<`v76MM
z57it>>vjUw97<|?6jH$sfJ5=OM=@*mf-Nf`;*P=lE(Y^r?e8PE6POr=2pDzffM+IL
z{c)WAbmD4uf;B!lnF(vvOniG3mrDF5P!#pRLYs^cD|(lsKqo>vu8^W0tsEtzX2)8~
z!_~8p+AhTEO04B5sXcmJwLC;U3wh~mZQsV@kKfU=drfB41B2g@ftRku6EGC%FkVbK
z00=Mu`kfg#VkT>U0000EWmrjOO-%qQ00008000000002eQ<DGy002ovPDHLkV1n=z
B=)?d3

literal 0
HcmV?d00001

diff --git a/docs/dev/Lua API.rst b/docs/dev/Lua API.rst
index c696248ab..9b1737f9f 100644
--- a/docs/dev/Lua API.rst	
+++ b/docs/dev/Lua API.rst	
@@ -4224,18 +4224,21 @@ A framed screen has the following attributes:
 
 There are the following predefined frame style tables:
 
-* ``GREY_FRAME``
+* ``WINDOW_FRAME``
 
-  A plain grey-colored frame.
+  A frame suitable for a draggable, optionally resizable window.
 
-* ``BOUNDARY_FRAME``
+* ``PANEL_FRAME``
 
-  The same frame as used by the usual full-screen DF views, like dwarfmode.
+  A frame suitable for a static (non-draggable, non-resizable) panel.
 
-* ``GREY_LINE_FRAME``
+* ``MEDIUM_FRAME``
 
-  A frame consisting of grey lines, similar to the one used by titan announcements.
+  A frame suitable for overlay widget panels.
 
+* ``THIN_FRAME``
+
+  A frame suitable for light accent elements.
 
 gui.widgets
 ===========
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index ceb79556f..439ed5d15 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -1693,6 +1693,10 @@ static const LuaWrapper::FunctionReg dfhack_textures_module[] = {
     WRAPM(Textures, getGreenPinTexposStart),
     WRAPM(Textures, getRedPinTexposStart),
     WRAPM(Textures, getIconsTexposStart),
+    WRAPM(Textures, getThinBordersTexposStart),
+    WRAPM(Textures, getMediumBordersTexposStart),
+    WRAPM(Textures, getPanelBordersTexposStart),
+    WRAPM(Textures, getWindowBordersTexposStart),
     { NULL, NULL }
 };
 
diff --git a/library/include/modules/Textures.h b/library/include/modules/Textures.h
index e3e5a8ec0..e01003704 100644
--- a/library/include/modules/Textures.h
+++ b/library/include/modules/Textures.h
@@ -41,5 +41,13 @@ DFHACK_EXPORT long getRedPinTexposStart();
  */
 DFHACK_EXPORT long getIconsTexposStart();
 
+/**
+ * Get the first texpos for the DFHack borders. Each is a 7x3 grid.
+ */
+DFHACK_EXPORT long getThinBordersTexposStart();
+DFHACK_EXPORT long getMediumBordersTexposStart();
+DFHACK_EXPORT long getPanelBordersTexposStart();
+DFHACK_EXPORT long getWindowBordersTexposStart();
+
 }
 }
diff --git a/library/lua/gui.lua b/library/lua/gui.lua
index 530848f61..e415000ae 100644
--- a/library/lua/gui.lua
+++ b/library/lua/gui.lua
@@ -789,29 +789,23 @@ end
 --------------------------
 
 -- Plain grey-colored frame.
+-- deprecated
 GREY_FRAME = {
     frame_pen = to_pen{ ch = ' ', fg = COLOR_BLACK, bg = COLOR_GREY },
     title_pen = to_pen{ fg = COLOR_BLACK, bg = COLOR_WHITE },
     signature_pen = to_pen{ fg = COLOR_BLACK, bg = COLOR_GREY },
 }
 
--- The usual boundary used by the DF screens. Often has fancy pattern in tilesets.
+-- The boundary used by the pre-steam DF screens.
+-- deprecated
 BOUNDARY_FRAME = {
     frame_pen = to_pen{ ch = 0xDB, fg = COLOR_GREY, bg = COLOR_BLACK },
     title_pen = to_pen{ fg = COLOR_BLACK, bg = COLOR_GREY },
     signature_pen = to_pen{ fg = COLOR_BLACK, bg = COLOR_GREY },
 }
 
-GREY_LINE_FRAME = {
+local BASE_FRAME = {
     frame_pen = to_pen{ ch=206, fg=COLOR_GREY, bg=COLOR_BLACK },
-    t_frame_pen = to_pen{ tile=902, ch=205, fg=COLOR_GREY, bg=COLOR_BLACK },
-    l_frame_pen = to_pen{ tile=908, ch=186, fg=COLOR_GREY, bg=COLOR_BLACK },
-    b_frame_pen = to_pen{ tile=916, ch=205, fg=COLOR_GREY, bg=COLOR_BLACK },
-    r_frame_pen = to_pen{ tile=910, ch=186, fg=COLOR_GREY, bg=COLOR_BLACK },
-    lt_frame_pen = to_pen{ tile=901, ch=201, fg=COLOR_GREY, bg=COLOR_BLACK },
-    lb_frame_pen = to_pen{ tile=915, ch=200, fg=COLOR_GREY, bg=COLOR_BLACK },
-    rt_frame_pen = to_pen{ tile=903, ch=187, fg=COLOR_GREY, bg=COLOR_BLACK },
-    rb_frame_pen = to_pen{ tile=917, ch=188, fg=COLOR_GREY, bg=COLOR_BLACK },
     title_pen = to_pen{ fg=COLOR_BLACK, bg=COLOR_GREY },
     inactive_title_pen = to_pen{ fg=COLOR_GREY, bg=COLOR_BLACK },
     signature_pen = to_pen{ fg=COLOR_GREY, bg=COLOR_BLACK },
@@ -819,6 +813,31 @@ GREY_LINE_FRAME = {
     unpinned_pen = to_pen{tile=782, ch=216, fg=COLOR_GREY, bg=COLOR_BLACK},
 }
 
+local function make_frame(name, double_line)
+    local texpos = dfhack.textures['get'..name..'BordersTexposStart']()
+    local tp = function(offset)
+        if texpos == -1 then return nil end
+        return texpos + offset
+    end
+
+    local frame = copyall(BASE_FRAME)
+    frame.t_frame_pen = to_pen{ tile=tp(1), ch=double_line and 205 or 196, fg=COLOR_GREY, bg=COLOR_BLACK }
+    frame.l_frame_pen = to_pen{ tile=tp(7), ch=double_line and 186 or 179, fg=COLOR_GREY, bg=COLOR_BLACK }
+    frame.b_frame_pen = to_pen{ tile=tp(15), ch=double_line and 205 or 196, fg=COLOR_GREY, bg=COLOR_BLACK }
+    frame.r_frame_pen = to_pen{ tile=tp(9), ch=double_line and 186 or 179, fg=COLOR_GREY, bg=COLOR_BLACK }
+    frame.lt_frame_pen = to_pen{ tile=tp(0), ch=double_line and 201 or 218, fg=COLOR_GREY, bg=COLOR_BLACK }
+    frame.lb_frame_pen = to_pen{ tile=tp(14), ch=double_line and 200 or 192, fg=COLOR_GREY, bg=COLOR_BLACK }
+    frame.rt_frame_pen = to_pen{ tile=tp(2), ch=double_line and 187 or 191, fg=COLOR_GREY, bg=COLOR_BLACK }
+    frame.rb_frame_pen = to_pen{ tile=tp(16), ch=double_line and 188 or 217, fg=COLOR_GREY, bg=COLOR_BLACK }
+    return frame
+end
+
+WINDOW_FRAME = make_frame('Window', true)
+GREY_LINE_FRAME = WINDOW_FRAME -- for compatibility with pre-steam code
+PANEL_FRAME = make_frame('Panel', false)
+MEDIUM_FRAME = make_frame('Medium', false)
+THIN_FRAME = make_frame('Thin', false)
+
 function paint_frame(dc,rect,style,title,show_pin,pinned,inactive)
     local pen = style.frame_pen
     local x1,y1,x2,y2 = dc.x1+rect.x1, dc.y1+rect.y1, dc.x1+rect.x2, dc.y1+rect.y2
diff --git a/library/modules/Textures.cpp b/library/modules/Textures.cpp
index 78ed53d97..2975dc4d8 100644
--- a/library/modules/Textures.cpp
+++ b/library/modules/Textures.cpp
@@ -22,6 +22,10 @@ static long g_dfhack_logo_texpos_start = -1;
 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_thin_borders_texpos_start = -1;
+static long g_medium_borders_texpos_start = -1;
+static long g_panel_borders_texpos_start = -1;
+static long g_window_borders_texpos_start = -1;
 
 // Converts an arbitrary Surface to something like the display format
 // (32-bit RGBA), and converts magenta to transparency if convert_magenta is set
@@ -120,6 +124,14 @@ void Textures::init(color_ostream &out) {
                                           &g_red_pin_texpos_start);
     g_num_dfhack_textures += load_textures(out, "hack/data/art/icons.png",
                                           &g_icons_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",
+                                          &g_medium_borders_texpos_start);
+    g_num_dfhack_textures += load_textures(out, "hack/data/art/border-panel.png",
+                                          &g_panel_borders_texpos_start);
+    g_num_dfhack_textures += load_textures(out, "hack/data/art/border-window.png",
+                                          &g_window_borders_texpos_start);
 
     DEBUG(textures,out).print("loaded %ld textures\n", g_num_dfhack_textures);
 
@@ -167,3 +179,19 @@ long Textures::getRedPinTexposStart() {
 long Textures::getIconsTexposStart() {
     return g_icons_texpos_start;
 }
+
+long Textures::getThinBordersTexposStart() {
+    return g_thin_borders_texpos_start;
+}
+
+long Textures::getMediumBordersTexposStart() {
+    return g_medium_borders_texpos_start;
+}
+
+long Textures::getPanelBordersTexposStart() {
+    return g_panel_borders_texpos_start;
+}
+
+long Textures::getWindowBordersTexposStart() {
+    return g_window_borders_texpos_start;
+}
diff --git a/plugins/lua/orders.lua b/plugins/lua/orders.lua
index aecd940d6..40c79fca4 100644
--- a/plugins/lua/orders.lua
+++ b/plugins/lua/orders.lua
@@ -50,7 +50,7 @@ OrdersOverlay.ATTRS{
     default_pos={x=61,y=-6},
     viewscreens='dwarfmode',
     frame={w=30, h=4},
-    frame_style=gui.GREY_LINE_FRAME,
+    frame_style=gui.MEDIUM_FRAME,
     frame_background=gui.CLEAR_PEN,
 }