calendar: let ability to disable icon (see notes section in the wiki); closes #351

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

diff --git a/util/quake.lua b/util/quake.lua
index 4c428039df23ec9c6d41732280219c5ec1b6fa7d..bf78fcee4b5008de9365ab9149e177c74c256894 100644 (file)
--- a/util/quake.lua
+++ b/util/quake.lua
@@ -27,6 +27,8 @@ local quake = {}
 
 function quake:display()
     if self.followtag then self.screen = awful.screen.focused() end
 
 function quake:display()
     if self.followtag then self.screen = awful.screen.focused() end

+    local toscan = self.screen
+    if self.onlyone then toscan = nil end

 
     -- First, we locate the client
     local client = nil
 
     -- First, we locate the client
     local client = nil


@@ -34,7 +36,7 @@ function quake:display()
     for c in awful.client.iterate(function (c)
         -- c.name may be changed!
         return c.instance == self.name
     for c in awful.client.iterate(function (c)
         -- c.name may be changed!
         return c.instance == self.name

-    end, nil, self.screen)
+    end, nil, toscan)

     do
         i = i + 1
         if i == 1 then
     do
         i = i + 1
         if i == 1 then


@@ -64,7 +66,7 @@ function quake:display()
     client.floating = true
     client.border_width = self.border
     client.size_hints_honor = false
     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
 
     -- Set not sticky and on top
     client.sticky = false


@@ -128,6 +130,7 @@ function quake:new(config)
     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.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.onlyone    = conf.onlyone   or false      -- one instance for all screens

     conf.overlap    = conf.overlap   or false      -- overlap wibox
     conf.screen     = conf.screen    or awful.screen.focused()
     conf.settings   = conf.settings
     conf.overlap    = conf.overlap   or false      -- overlap wibox
     conf.screen     = conf.screen    or awful.screen.focused()
     conf.settings   = conf.settings