quake: skip_wibox -> overlap and default to false, followtag redefault to faluse...

diff --git a/README.rst b/README.rst
index e37d210ab92aac9e2e06e0c1d18488edf8c8e755..4072d35c2550402fc4ccf40890435c80118b4e7d 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -31,7 +31,7 @@ Just make sure that:
 
 - Your code fits with the general style of the module. In particular, you should use the same indentation pattern that the code uses, and also avoid adding space at the ends of lines.
 
 
 - Your code fits with the general style of the module. In particular, you should use the same indentation pattern that the code uses, and also avoid adding space at the ends of lines.
 

-- Your code its easy to understand, maintainable, and modularized. You should also avoid code duplication wherever possible by adding functions or using ``lain.helpers``. If something is unclear, and you can't write it in such a way that it will be clear, explain it with a comment.
+- Your code its easy to understand, maintainable, and modularized. You should also avoid code duplication wherever possible by adding functions or using lain.helpers_. If something is unclear, and you can't write it in such a way that it will be clear, explain it with a comment.

 
 - You test your changes before submitting to make sure that not only your code works, but did not break other parts of the module too!
 
 
 - You test your changes before submitting to make sure that not only your code works, but did not break other parts of the module too!
 


@@ -51,3 +51,4 @@ Screenshots
 .. _awesome-vain: https://github.com/vain/awesome-vain
 .. _Awesome: https://github.com/awesomeWM/awesome
 .. _wiki: https://github.com/copycat-killer/lain/wiki
 .. _awesome-vain: https://github.com/vain/awesome-vain
 .. _Awesome: https://github.com/awesomeWM/awesome
 .. _wiki: https://github.com/copycat-killer/lain/wiki

+.. _lain.helpers: https://github.com/copycat-killer/lain/blob/master/helpers.lua

diff --git a/util/quake.lua b/util/quake.lua
index 9f548a83f8f7517025b8f9759992007060da9777..6e520b54281e6c039b47102a2ae380693f0485d9 100644 (file)
--- a/util/quake.lua
+++ b/util/quake.lua
@@ -98,7 +98,7 @@ end
 
 function quake:compute_size()
     local geom
 
 function quake:compute_size()
     local geom

-    if self.skip_wibox then
+    if not self.overlap then

         geom = screen[self.screen].workarea
     else
         geom = screen[self.screen].geometry
         geom = screen[self.screen].workarea
     else
         geom = screen[self.screen].geometry


@@ -119,15 +119,15 @@ end
 function quake:new(config)
     local conf = config or {}
 
 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 true       -- spawn on currently focused screen
-    conf.skip_wibox = conf.skip_wibox or true       -- skip the wibox (defaut) or overlap it
-    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
 
     -- If width or height <= 1 this is a proportion of the workspace
     conf.height       = conf.height       or 0.25     -- height

diff --git a/wiki b/wiki
index b0e838ade84ae851bceb2479bb16c1447057abb7..006cb79c302aef03dd064430dd2ceba2689dacc7 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit b0e838ade84ae851bceb2479bb16c1447057abb7
+Subproject commit 006cb79c302aef03dd064430dd2ceba2689dacc7