X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/d49431160a573985bf33998b5201877aa288b24e..4148ccdfcd5ed620163f9d78e6224c684a358ac7:/util/quake.lua

diff --git a/util/quake.lua b/util/quake.lua
index 6023e3f..c563695 100644
--- a/util/quake.lua
+++ b/util/quake.lua
@@ -54,15 +54,15 @@ function quake:display()
 
     if not client then
         -- The client does not exist, we spawn it
-        awful.util.spawn(string.format("%s %s %s", self.app,
-                         string.format(self.argname, self.name), self.extra),
-                         false, self.screen)
+        cmd = string.format("%s %s %s", self.app,
+              string.format(self.argname, self.name), self.extra)
+        awful.spawn(cmd, { tag = self.screen.selected_tag })
         self.notexist = true
         return
     end
 
     -- Resize
-    awful.client.floating.set(client, true)
+    client.floating = true
     client.border_width = self.border
     client.size_hints_honor = false
     if self.notexist then
@@ -81,8 +81,8 @@ function quake:display()
     if self.visible then
         client.hidden = false
         client:raise()
-        self.last_tag = awful.tag.selected(self.screen)
-        client:tags({awful.tag.selected(self.screen)})
+        self.last_tag = self.screen.selected_tag
+        client:tags({self.screen.selected_tag})
         capi.client.focus = client
    else
         client.hidden = true
@@ -97,31 +97,37 @@ function quake:display()
 end
 
 function quake:compute_size()
-    local geom = screen[self.screen].workarea
-    local width, height
-    if self.width  <= 1 then width = math.floor(geom.width * self.width) - 2 * self.border end
-    if self.height <= 1 then height = math.floor(geom.height * self.height) end
+    local geom
+    if not self.overlap then
+        geom = screen[self.screen].workarea
+    else
+        geom = screen[self.screen].geometry
+    end
+    local width, height = self.width, self.height
+    if width  <= 1 then width = math.floor(geom.width * width) - 2 * self.border end
+    if height <= 1 then height = math.floor(geom.height * height) end
     local x, y
     if     self.horiz == "left"  then x = geom.x
-    elseif self.horiz == "right" then x = geom.width + geom.x - self.width
-    else   x = geom.x + (geom.width - self.width)/2 end
+    elseif self.horiz == "right" then x = geom.width + geom.x - width
+    else   x = geom.x + (geom.width - width)/2 end
     if     self.vert == "top"    then y = geom.y
-    elseif self.vert == "bottom" then y = geom.height + geom.y - self.height
-    else   y = geom.y + (geom.height - self.height)/2 end
+    elseif self.vert == "bottom" then y = geom.height + geom.y - height
+    else   y = geom.y + (geom.height - height)/2 end
     self.geometry = { x = x, y = y, width = width, height = height }
 end
 
 function quake:new(config)
     local conf = config or {}
 
-    conf.app       = conf.app       or "xterm"    -- application to spawn
-    conf.name      = conf.name      or "QuakeDD"  -- window name
-    conf.argname   = conf.argname   or "-name %s" -- how to specify window name
-    conf.extra     = conf.extra     or ""         -- extra arguments
-    conf.visible   = conf.visible   or false      -- initially not visible
-    conf.border    = conf.border    or 1          -- client border width
-    conf.followtag = conf.followtag or false      -- spawn on currently focused screen
-    conf.screen    = conf.screen    or awful.screen.focused()
+    conf.app        = conf.app       or "xterm"    -- application to spawn
+    conf.name       = conf.name      or "QuakeDD"  -- window name
+    conf.argname    = conf.argname   or "-name %s" -- how to specify window name
+    conf.extra      = conf.extra     or ""         -- extra arguments
+    conf.border     = conf.border    or 1          -- client border width
+    conf.visible    = conf.visible   or false      -- initially not visible
+    conf.followtag  = conf.followtag or false      -- spawn on currently focused screen
+    conf.overlap    = conf.overlap   or false      -- overlap wibox
+    conf.screen     = conf.screen    or awful.screen.focused()
 
     -- If width or height <= 1 this is a proportion of the workspace
     conf.height       = conf.height       or 0.25     -- height
@@ -155,15 +161,13 @@ end
 
 function quake:toggle()
      if self.followtag then self.screen = awful.screen.focused() end
-     local current_tag = awful.tag.selected(self.screen)
-     if self.last_tag ~= current_tag and self.visible then
-         awful.client.movetotag(current_tag, self:display())
+     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)
      else
          self.visible = not self.visible
          self:display()
      end
 end
 
-setmetatable(quake, { __call = function(_, ...) return quake:new(...) end })
-
-return quake
+return setmetatable(quake, { __call = function(_, ...) return quake:new(...) end })