From b11a3ead1e1e711453c6875f15d445ca75aceb08 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Thu, 14 Sep 2023 01:31:19 -0700
Subject: [PATCH] make DFHack logo respond to clicks, not mouseover

---
 data/art/{dfhack.png => logo.png} | Bin
 data/art/logo_hovered.png         | Bin 0 -> 997 bytes
 plugins/lua/hotkeys.lua           |  82 ++++++++++++++----------------
 3 files changed, 39 insertions(+), 43 deletions(-)
 rename data/art/{dfhack.png => logo.png} (100%)
 create mode 100644 data/art/logo_hovered.png

diff --git a/data/art/dfhack.png b/data/art/logo.png
similarity index 100%
rename from data/art/dfhack.png
rename to data/art/logo.png
diff --git a/data/art/logo_hovered.png b/data/art/logo_hovered.png
new file mode 100644
index 0000000000000000000000000000000000000000..133dc5aaf8c98921bcc0203ebd986d4915c726cd
GIT binary patch
literal 997
zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU{K*;VqjoM?_9r?fq_A?#5JNMI6tkVJh3R1
z!7(L2DOJHUH!(dmC^a#qvhZZ84FdynuBVG*NX4x^;l3V^0tME82+L~p2oUfRDbcWD
znbfGk@-VjRg@DUD#r1Qu{4aUhL_S#56#iN(u!KWtvG)ab(b}7u9-KmJv)|>Hmo0zz
z_v-&`smylI&dxUf{O|L}>hsUMmR`EzVf0}8rca9<uQeacXM1LM*J|$Wr7I7nT<G%i
z^Lz5;(<h<D=bvZi=KhuE_b4)v`dqd5Z0XAV`~QFYCUz=2JA2ou1&<#m&-fea_=I8c
zrnkTICr$ED3Hs@MFd;zi>E}w0#FC<-Nq&dZ?#n#LDB@Q+fByWIM$L&H6PR5kXT6d3
zzL_)a>@{zrrhR+%+_`@J_@n}hKc7A^EnB^M^)<cy_w9|04qY~9|Dm_iz3ole??Z=}
zxYw^+_wC!aEpCEyqW*n3T~bySR_CHM^-zS~^rh!syvXQY@QTmM+WIL|R@={w8x5ab
zep#|GKx3*`kfmI|^Sh4~2lRDyL*F;Ix3|}?$yt4Ml}B59J3Bl3-Mn%Q5vRtNCQ-GE
z3N$_4L?=GZF!}XPMnPfq>eV*9EKCx&Z{1qbXH+|%xn}DeKY#yhVYh-sj~xORy}Wj9
znvI>12j_wr1~YxsYByNh+D_#@(0TW6Y^LnR`7>uK{`>GDKug;-l=Y2B&P0};Lt1|f
zZ)i%mvIHCqa-GoSI^XYCM96#&?@1?B41Hd|ejVzxW#`V$d=?o)qh|M%4O+}hiW4L^
zD)~yy^;2K#bS@%RcwM51nhJ+^N}KUM9)`OrHWn5Sq8(p5@CLfOv&Z(XkW5P2D6!to
z*7oiD_lvh|=+aLMd0sbf#tepEi_Ejlq<l`ySj1meR>pDe#NVSwStZ&JJ7#_U{Ml@F
z@09B5YQ{=a>E2na%NOghemU%-HhJN{SMT0ki*w(gcaS}tm7z2*@7=R!%et5sU+fT+
zI#9Kb;oSN2hJF40!P>F$@x~4Z86(-9e>polGcz+=ofmUrl9|sn@lmtMy}NfO#wr*~
zoY=U^CPl%KXX<N@vyDfS9ts<ZcDvr<WO{e`=%$Su4|28K<8oNZ_wN0BLpwXWtc&-b
z7AbnIF*Y@Iy*l;u(<gCd3JYKQcLdZlnC%j@bm{Ky_OS3PFDpwko9)@>=GrJHE1R32
zzc^>Y|8L*QPQ28xwYAmyR?E`;q_~6QtWR#o@{8^pJ+?^*&$HB6d;NNNomB1B*SiY;
zJI<2+EB<OZ12e-`-z&RiI_t6+7#R3cBRtc5eHpYE7#KJhAmCE)WDvvC)z4*}Q$iB}
Dn&!gY

literal 0
HcmV?d00001

diff --git a/plugins/lua/hotkeys.lua b/plugins/lua/hotkeys.lua
index be1a95570..f74b54416 100644
--- a/plugins/lua/hotkeys.lua
+++ b/plugins/lua/hotkeys.lua
@@ -5,7 +5,8 @@ local helpdb = require('helpdb')
 local overlay = require('plugins.overlay')
 local widgets = require('gui.widgets')
 
-local textures = dfhack.textures.loadTileset('hack/data/art/dfhack.png', 8, 12)
+local logo_textures = dfhack.textures.loadTileset('hack/data/art/logo.png', 8, 12)
+local logo_hovered_textures = dfhack.textures.loadTileset('hack/data/art/logo_hovered.png', 8, 12)
 
 local function get_command(cmdline)
     local first_word = cmdline:trim():split(' +')[1]
@@ -28,7 +29,6 @@ HotspotMenuWidget = defclass(HotspotMenuWidget, overlay.OverlayWidget)
 HotspotMenuWidget.ATTRS{
     default_pos={x=5,y=1},
     default_enabled=true,
-    hotspot=false,
     version=2,
     viewscreens={
         'adopt_region',
@@ -48,54 +48,50 @@ HotspotMenuWidget.ATTRS{
         'update_region',
         'world'
     },
-    overlay_onupdate_max_freq_seconds=0,
     frame={w=4, h=3}
 }
 
 function HotspotMenuWidget:init()
-    self.mouseover = false
-end
-
-function HotspotMenuWidget:overlay_onupdate()
-    local hasMouse = self:getMousePos()
-    if hasMouse and not self.mouseover then
-        self.mouseover = true
-        return true
+    local to_pen = dfhack.pen.parse
+    local function tp(idx, ch)
+        return to_pen{
+            tile=function() return dfhack.textures.getTexposByHandle(logo_textures[idx]) end,
+            ch=ch,
+            fg=COLOR_GREY,
+        }
+    end
+    local function tph(idx, ch)
+        return to_pen{
+            tile=function() return dfhack.textures.getTexposByHandle(logo_hovered_textures[idx]) end,
+            ch=ch,
+            fg=COLOR_WHITE,
+        }
+    end
+    local function get_tile_token(idx, ch)
+        return {
+            tile=tp(idx, ch),
+            htile=tph(idx, ch),
+            width=1,
+        }
     end
-    self.mouseover = hasMouse
-end
 
-function HotspotMenuWidget:overlay_trigger()
-    return MenuScreen{hotspot=self}:show()
+    self:addviews{
+        widgets.Label{
+            text={
+                get_tile_token(1, '!'), get_tile_token(2, 'D'), get_tile_token(3, 'F'), get_tile_token(4, '!'), NEWLINE,
+                get_tile_token(5, '!'), get_tile_token(6, 'H'), get_tile_token(7, 'a'), get_tile_token(8, '!'), NEWLINE,
+                get_tile_token(9, '!'), get_tile_token(10, 'c'), get_tile_token(11, 'k'), get_tile_token(12, '!'),
+            },
+        },
+    }
 end
 
-local dscreen = dfhack.screen
-
-function HotspotMenuWidget:onRenderBody(dc)
-    local x, y = dc.x, dc.y
-    local tp = function(offset)
-        return dfhack.textures.getTexposByHandle(textures[offset])
-    end
-
-    if tp(1) == nil then
-        dscreen.paintString(COLOR_WHITE, x, y + 0, '!DF!')
-        dscreen.paintString(COLOR_WHITE, x, y + 1, '!Ha!')
-        dscreen.paintString(COLOR_WHITE, x, y + 2, '!ck!')
-    else
-        dscreen.paintTile(COLOR_WHITE, x + 0, y + 0, '!', tp(1))
-        dscreen.paintTile(COLOR_WHITE, x + 1, y + 0, 'D', tp(2))
-        dscreen.paintTile(COLOR_WHITE, x + 2, y + 0, 'F', tp(3))
-        dscreen.paintTile(COLOR_WHITE, x + 3, y + 0, '!', tp(4))
-
-        dscreen.paintTile(COLOR_WHITE, x + 0, y + 1, '!', tp(5))
-        dscreen.paintTile(COLOR_WHITE, x + 1, y + 1, 'H', tp(6))
-        dscreen.paintTile(COLOR_WHITE, x + 2, y + 1, 'a', tp(7))
-        dscreen.paintTile(COLOR_WHITE, x + 3, y + 1, '!', tp(8))
-
-        dscreen.paintTile(COLOR_WHITE, x + 0, y + 2, '!', tp(9))
-        dscreen.paintTile(COLOR_WHITE, x + 1, y + 2, 'c', tp(10))
-        dscreen.paintTile(COLOR_WHITE, x + 2, y + 2, 'k', tp(11))
-        dscreen.paintTile(COLOR_WHITE, x + 3, y + 2, '!', tp(12))
+function HotspotMenuWidget:onInput(keys)
+    if HotspotMenuWidget.super.onInput(self, keys) then
+        return true
+    elseif keys._MOUSE_L_DOWN and self:getMousePos() then
+        MenuScreen{hotspot=self}:show()
+        return true
     end
 end
 
@@ -290,7 +286,7 @@ function Menu:onInput(keys)
             df.global.enabler.mouse_lbut = 0
             return true
         end
-        if not self:getMouseFramePos() and not self.hotspot:getMousePos() then
+        if not self:getMouseFramePos() then
             self.parent_view:dismiss()
             return true
         end