X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/56ebe9158e0de45c56e789d626fad927cc5e75a5..4073bd7cdf79e118e97c0b0f7dba08927bc31d46:/util/quake.lua?ds=sidebyside

diff --git a/util/quake.lua b/util/quake.lua
index 4c42803..e323732 100644
--- a/util/quake.lua
+++ b/util/quake.lua
@@ -1,10 +1,9 @@
-
 --[[
-                                                   
-     Licensed under GNU General Public License v2  
-      * (c) 2016, Luke Bonham                      
-      * (c) 2015, unknown                          
-                                                   
+
+     Licensed under GNU General Public License v2
+      * (c) 2016, Luca CPZ
+      * (c) 2015, unknown
+
 --]]
 
 local awful        = require("awful")
@@ -34,7 +33,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
@@ -64,7 +63,7 @@ function quake:display()
     client.floating = true
     client.border_width = self.border
     client.size_hints_honor = false
-    client:geometry(self:compute_size())
+    client:geometry(self.geometry[self.screen] or self:compute_size())
 
     -- Set not sticky and on top
     client.sticky = false
@@ -159,7 +158,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()