{alsa,pulse}bar updated to awesome 4.0

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

diff --git a/util/quake.lua b/util/quake.lua
index 0bd7148ae9b824a1ca502fcd173bc89f6007eb10..e54b6644a0a7e40680f80395ace14f3cb2d27e93 100644 (file)
--- a/util/quake.lua
+++ b/util/quake.lua
@@ -10,7 +10,8 @@ local awful  = require("awful")
 local capi   = { client = client,
                  mouse  = mouse,
                  screen = screen,
-                 timer  = timer }
+                 timer  = timer or require("gears.timer") }
+local math   = { floor = math.floor }
 local string = string
 
 local pairs        = pairs
@@ -52,15 +53,16 @@ function quake:display()
 
    if not client then
        -- The client does not exist, we spawn it
-       awful.util.spawn(self.app .. " " .. string.format(self.argname, self.name) ..
-                        " " .. self.extra, false, self.screen)
+       awful.util.spawn(string.format("%s %s %s", self.app,
+                        string.format(self.argname, self.name), self.extra),
+                        false, self.screen)
        self.notexist = true
        return
    end
 
    -- Resize
    awful.client.floating.set(client, true)
-   client.border_width = 0
+   client.border_width = self.border
    client.size_hints_honor = false
    if self.notexist then
        client:geometry(self.geometry)
@@ -101,6 +103,7 @@ function quake:new(config)
    conf.extra    = conf.extra    or ""         -- extra arguments
    conf.visible  = conf.visible  or false      -- initially not visible
    conf.screen   = conf.screen   or capi.mouse.screen
+   conf.border   = conf.border   or 1
 
    -- If width or height <= 1 this is a proportion of the workspace
    wibox_height = conf.wibox_height or 18       -- statusbar weight
@@ -111,8 +114,8 @@ function quake:new(config)
 
    -- Compute size
    local geom = capi.screen[conf.screen].workarea
-   if width  <= 1 then width = geom.width * width end
-   if height <= 1 then height = geom.height * height end
+   if width  <= 1 then width = math.floor(geom.width * width) end
+   if height <= 1 then height = math.floor(geom.height * height) end
    local x, y
    if     horiz == "left"  then x = geom.x
    elseif horiz == "right" then x = geom.width + geom.x - width