Include wibox

[etc/awesome.git] / util / quake.lua

diff --git a/util/quake.lua b/util/quake.lua
index 9a3db9a4c77806aa20beda26595fd6b35afcf40f..f41447f9e4abaa141325fb275e36663c0fe4d44b 100644 (file)
--- a/util/quake.lua
+++ b/util/quake.lua
@@ -1,20 +1,17 @@
 --[[
 
      Licensed under GNU General Public License v2
-      * (c) 2016, Luke Bonham
+      * (c) 2016, Luca CPZ
       * (c) 2015, unknown
 
 --]]
 
 local awful        = require("awful")
-local capi         = { client = client }
-
-local math         = { floor  = math.floor }
-local string       = { format = string.format }
-
+local client       = client
+local math         = math
+local string       = string
 local pairs        = pairs
 local screen       = screen
-
 local setmetatable = setmetatable
 
 -- Quake-like Dropdown application spawn
@@ -33,7 +30,7 @@ function quake:display()
     for c in awful.client.iterate(function (c)
         -- c.name may be changed!
         return c.instance == self.name
-    end, nil, self.screen)
+    end)
     do
         i = i + 1
         if i == 1 then
@@ -63,7 +60,7 @@ function quake:display()
     client.floating = true
     client.border_width = self.border
     client.size_hints_honor = false
-    client:geometry(self.geometry[self.screen] or self:compute_size())
+    client:geometry(self.geometry[self.screen.index] or self:compute_size())
 
     -- Set not sticky and on top
     client.sticky = false
@@ -80,7 +77,7 @@ function quake:display()
         client:raise()
         self.last_tag = self.screen.selected_tag
         client:tags({self.screen.selected_tag})
-        capi.client.focus = client
+        client.focus = client
    else
         client.hidden = true
         local ctags = client:tags()
@@ -95,12 +92,12 @@ end
 
 function quake:compute_size()
     -- skip if we already have a geometry for this screen
-    if not self.geometry[self.screen] then
+    if not self.geometry[self.screen.index] then
         local geom
         if not self.overlap then
-            geom = screen[self.screen].workarea
+            geom = screen[self.screen.index].workarea
         else
-            geom = screen[self.screen].geometry
+            geom = screen[self.screen.index].geometry
         end
         local width, height = self.width, self.height
         if width  <= 1 then width = math.floor(geom.width * width) - 2 * self.border end
@@ -112,9 +109,9 @@ function quake:compute_size()
         if     self.vert == "top"    then y = geom.y
         elseif self.vert == "bottom" then y = geom.height + geom.y - height
         else   y = geom.y + (geom.height - height)/2 end
-        self.geometry[self.screen] = { x = x, y = y, width = width, height = height }
+        self.geometry[self.screen.index] = { x = x, y = y, width = width, height = height }
     end
-    return self.geometry[self.screen]
+    return self.geometry[self.screen.index]
 end
 
 function quake:new(config)
@@ -140,12 +137,12 @@ function quake:new(config)
 
     local dropdown = setmetatable(conf, { __index = quake })
 
-    capi.client.connect_signal("manage", function(c)
+    client.connect_signal("manage", function(c)
         if c.instance == dropdown.name and c.screen == dropdown.screen then
             dropdown:display()
         end
     end)
-    capi.client.connect_signal("unmanage", function(c)
+    client.connect_signal("unmanage", function(c)
         if c.instance == dropdown.name and c.screen == dropdown.screen then
             dropdown.visible = false
         end
@@ -158,7 +155,10 @@ function quake:toggle()
      if self.followtag then self.screen = awful.screen.focused() end
      local current_tag = self.screen.selected_tag
      if current_tag and self.last_tag ~= current_tag and self.visible then
-         self:display():move_to_tag(current_tag)
+         local c=self:display()
+         if c then
+            c:move_to_tag(current_tag)
+        end
      else
          self.visible = not self.visible
          self:display()