From 5c7574bce8cb816be1d677734d5cd864bb7a72a2 Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Thu, 5 Mar 2020 08:37:56 -0600
Subject: [PATCH] convert hotkeys_popup to awful.popup instead of wibox

---
 lib/awful/hotkeys_popup/widget.lua | 39 ++++++++++++++++++------------
 tests/test-awesomerc.lua           | 12 ++++-----
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/lib/awful/hotkeys_popup/widget.lua b/lib/awful/hotkeys_popup/widget.lua
index cdc73151a..e8957e3f1 100644
--- a/lib/awful/hotkeys_popup/widget.lua
+++ b/lib/awful/hotkeys_popup/widget.lua
@@ -570,7 +570,16 @@ function widget.new(args)
         end
         table.insert(pages, columns)
 
-        local mywibox = wibox({
+        -- Function to place the widget in the center and account for the
+        -- workarea. This will be called in the placement field of the
+        -- awful.popup constructor.
+        local place_func = function(c)
+            awful.placement.centered(c, {honor_workarea = true})
+        end
+
+        -- Construct the popup with the widget
+        local mypopup = awful.popup {
+            widget = pages[1],
             ontop = true,
             bg=self.bg,
             fg=self.fg,
@@ -578,20 +587,20 @@ function widget.new(args)
             border_width = self.border_width,
             border_color = self.border_color,
             shape = self.shape,
-        })
+            placement = place_func,
+            minimum_width = wibox_width,
+            minimum_height = wibox_height,
+        }
+
         local widget_obj = {
             current_page = 1,
-            wibox = mywibox,
+            popup = mypopup,
         }
-        mywibox:geometry({
-            x = wa.x + math.floor((wa.width - wibox_width - self.border_width*2) / 2),
-            y = wa.y + math.floor((wa.height - wibox_height - self.border_width*2) / 2),
-            width = wibox_width,
-            height = wibox_height,
-        })
-        mywibox:set_widget(pages[1])
 
-        mywibox.buttons = {
+        -- Set up the mouse buttons to hide the popup
+        -- Any keybinding except what the keygrabber wants wil hide the popup
+        -- too
+        mypopup.buttons = {
             awful.button({ }, 1, function () widget_obj:hide() end),
             awful.button({ }, 3, function () widget_obj:hide() end)
         }
@@ -599,18 +608,18 @@ function widget.new(args)
         function widget_obj.page_next(_self)
             if _self.current_page == #pages then return end
             _self.current_page = _self.current_page + 1
-            _self.wibox:set_widget(pages[_self.current_page])
+            _self.popup:set_widget(pages[_self.current_page])
         end
         function widget_obj.page_prev(_self)
             if _self.current_page == 1 then return end
             _self.current_page = _self.current_page - 1
-            _self.wibox:set_widget(pages[_self.current_page])
+            _self.popup:set_widget(pages[_self.current_page])
         end
         function widget_obj.show(_self)
-            _self.wibox.visible = true
+            _self.popup.visible = true
         end
         function widget_obj.hide(_self)
-            _self.wibox.visible = false
+            _self.popup.visible = false
             if _self.keygrabber then
                 awful.keygrabber.stop(_self.keygrabber)
             end
diff --git a/tests/test-awesomerc.lua b/tests/test-awesomerc.lua
index bf3601206..448d25c2b 100644
--- a/tests/test-awesomerc.lua
+++ b/tests/test-awesomerc.lua
@@ -270,23 +270,23 @@ local steps = {
             assert(num_pairs(cached_wiboxes[s]) == 2)
         end
 
-        local hotkeys_wibox
+        local hotkeys_popup
         local visible_hotkeys_widget
         for _, widget in pairs(cached_wiboxes[s]) do
-            hotkeys_wibox = widget.wibox
-            if hotkeys_wibox.visible then
+            hotkeys_popup = widget.popup
+            if hotkeys_popup.visible then
                 visible_hotkeys_widget = widget
             end
         end
 
         if count == 2 then
-            assert(hotkeys_wibox ~= nil)
-            assert(hotkeys_wibox.visible)
+            assert(hotkeys_popup ~= nil)
+            assert(hotkeys_popup.visible)
             -- Should disappear on anykey
             root.fake_input("key_press", "Super_L")
 
         elseif count == 3 then
-            assert(not hotkeys_wibox.visible)
+            assert(not hotkeys_popup.visible)
             root.fake_input("key_release", "Super_L")
             test_context.hotkeys01_clients_before = #client.get()
             -- imitate fake client with name "vim"