]> git.madduck.net Git - etc/awesome.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / etc / awesome.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c179b24)
small code fixes
authorluke bonham <dadasignificanulla@gmail.com>
Sun, 15 Sep 2013 14:17:33 +0000 (16:17 +0200)
committerluke bonham <dadasignificanulla@gmail.com>
Sun, 15 Sep 2013 14:17:33 +0000 (16:17 +0200)
layout/cascadetile.lua patch | blob | history
layout/centerwork.lua patch | blob | history
layout/termfair.lua patch | blob | history
layout/uselessfair.lua patch | blob | history
layout/uselesspiral.lua patch | blob | history
layout/uselesstile.lua patch | blob | history

diff --git a/layout/cascadetile.lua b/layout/cascadetile.lua
index a94bbed6fee277f2477a1f7571fd48cad63b166c..98821e31e08bd8889d97bed328081a4e54e5d1e3 100644 (file)
--- a/layout/cascadetile.lua
+++ b/layout/cascadetile.lua
@@ -43,11 +43,7 @@ function cascadetile.arrange(p)
 
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width.
 
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width.
-    local useless_gap = tonumber(beautiful.useless_gap_width)
-    if useless_gap == nil
-    then
-        useless_gap = 0
-    end
+    local useless_gap = tonumber(beautiful.useless_gap_width) or 0
 
     -- Screen.
     local wa = p.workarea
 
     -- Screen.
     local wa = p.workarea
diff --git a/layout/centerwork.lua b/layout/centerwork.lua
index 2035c655d1c71e4b45eddb0f922eeb3477bfbada..b8175eaf52bda1675370b025a0293360bb4c5740 100644 (file)
--- a/layout/centerwork.lua
+++ b/layout/centerwork.lua
@@ -24,11 +24,7 @@ local centerwork =
 function centerwork.arrange(p)
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width .
 function centerwork.arrange(p)
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width .
-    local useless_gap = tonumber(beautiful.useless_gap_width)
-    if useless_gap == nil
-    then
-        useless_gap = 0
-    end
+    local useless_gap = tonumber(beautiful.useless_gap_width) or 0
 
     -- Screen.
     local wa = p.workarea
 
     -- Screen.
     local wa = p.workarea
diff --git a/layout/termfair.lua b/layout/termfair.lua
index 62eef9ab6663d585a1054d33f361d024646b22eb..4beab8f25cdb96cc145c6046304aa67f636c29bb 100644 (file)
--- a/layout/termfair.lua
+++ b/layout/termfair.lua
@@ -14,15 +14,7 @@ local math      = { ceil  = math.ceil,
                     max   = math.max }
 local tonumber  = tonumber
 
                     max   = math.max }
 local tonumber  = tonumber
 
-local termfair =
-{
-    name    = "termfair",
-
-    -- You can set the number of columns and rows,
-    -- -- otherwise they are read from awful.tag
-    nmaster = 0, -- columns
-    ncol    = 0  -- rows
-}
+local termfair  = { name = "termfair" }
 
 function termfair.arrange(p)
     -- Layout with fixed number of vertical columns (read from nmaster).
 
 function termfair.arrange(p)
     -- Layout with fixed number of vertical columns (read from nmaster).
@@ -45,11 +37,7 @@ function termfair.arrange(p)
 
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width.
 
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width.
-    local useless_gap = tonumber(beautiful.useless_gap_width)
-    if useless_gap == nil
-    then
-        useless_gap = 0
-    end
+    local useless_gap = tonumber(beautiful.useless_gap_width) or 0
 
     -- Screen.
     local wa = p.workarea
 
     -- Screen.
     local wa = p.workarea
@@ -57,22 +45,10 @@ function termfair.arrange(p)
 
     -- How many vertical columns?
     local t = tag.selected(p.screen)
 
     -- How many vertical columns?
     local t = tag.selected(p.screen)
-    local num_x
-    if termfair.nmaster ~= 0
-    then
-        num_x = termfair.nmaster
-    else
-        num_x = tag.getnmaster(t)
-    end
+    local num_x = termfair.nmaster or tag.getnmaster(t)
 
     -- Do at least "desired_y" rows.
 
     -- Do at least "desired_y" rows.
-    local desired_y
-    if termfair.ncol ~= 0
-    then
-        desired_y = termfair.ncol
-    else
-        desired_y = tag.getncol(t)
-    end
+    local desired_y = termfair.ncol or tag.getncol(t)
 
     if #cls > 0
     then
 
     if #cls > 0
     then
diff --git a/layout/uselessfair.lua b/layout/uselessfair.lua
index 92e8d45244e815573764b890e5e3b0581c345dbf..7499d91f4c68af17ba86eeb48e480b0338166472 100644 (file)
--- a/layout/uselessfair.lua
+++ b/layout/uselessfair.lua
@@ -18,11 +18,7 @@ local uselessfair = {}
 local function fair(p, orientation)
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width.
 local function fair(p, orientation)
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width.
-    local useless_gap = tonumber(beautiful.useless_gap_width)
-    if useless_gap == nil
-    then
-        useless_gap = 0
-    end
+    local useless_gap = tonumber(beautiful.useless_gap_width) or 0
 
     local wa = p.workarea
     local cls = p.clients
 
     local wa = p.workarea
     local cls = p.clients
@@ -88,7 +84,7 @@ local function fair(p, orientation)
                     g.height = g.height - 2 * useless_gap
                     g.y = g.y + useless_gap
                 else
                     g.height = g.height - 2 * useless_gap
                     g.y = g.y + useless_gap
                 else
-                    g.height = g.height - useless_gap
+                    g.height = g.height - useless_gap 
                 end
             end
             -- End of useless gap.
                 end
             end
             -- End of useless gap.
diff --git a/layout/uselesspiral.lua b/layout/uselesspiral.lua
index 695728c328ba45cb022a15d9abf5da0cf49d7e99..ad2ba0426ab71d8d3094ffd59ddcbf89a2be2c4a 100644 (file)
--- a/layout/uselesspiral.lua
+++ b/layout/uselesspiral.lua
@@ -17,11 +17,7 @@ local uselesspiral = {}
 local function spiral(p, spiral)
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width.
 local function spiral(p, spiral)
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width.
-    local useless_gap = tonumber(beautiful.useless_gap_width)
-    if useless_gap == nil
-    then
-        useless_gap = 0
-    end
+    local useless_gap = tonumber(beautiful.useless_gap_width) or 0
 
     local wa = p.workarea
     local cls = p.clients
 
     local wa = p.workarea
     local cls = p.clients
@@ -69,26 +65,26 @@ local function spiral(p, spiral)
             left = false
 
             if wa2.y == static_wa.y then
             left = false
 
             if wa2.y == static_wa.y then
-                 top = true
+               top = true
             end
 
             if wa2.x == static_wa.x then
             end
 
             if wa2.x == static_wa.x then
-                 left = true
+               left = true
             end
 
             end
 
-           if top then
-                 wa2.height = wa2.height - 2 * useless_gap
-                  wa2.y = wa2.y + useless_gap
+            if top then
+                wa2.height = wa2.height - 2 * useless_gap
+                wa2.y = wa2.y + useless_gap
             else
             else
-                 wa2.height = wa2.height - useless_gap
-           end
-
-           if left then
-                         wa2.width = wa2.width - 2 * useless_gap
-                  wa2.x = wa2.x + useless_gap
-           else
-                 wa2.width = wa2.width - useless_gap
-           end
+                wa2.height = wa2.height - useless_gap
+            end
+
+            if left then
+                wa2.width = wa2.width - 2 * useless_gap
+                wa2.x = wa2.x + useless_gap
+            else
+                wa2.width = wa2.width - useless_gap
+            end
         end
         -- End of useless gap.
 
         end
         -- End of useless gap.
 
diff --git a/layout/uselesstile.lua b/layout/uselesstile.lua
index cd288ed32d74c73f428ff44b69bb9fdd5f88fd0b..78f7bec18cea23a28886c1bdd743cc025f65237b 100644 (file)
--- a/layout/uselesstile.lua
+++ b/layout/uselesstile.lua
@@ -21,11 +21,7 @@ local uselesstile = {}
 local function tile_group(cls, wa, orientation, fact, group)
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width .
 local function tile_group(cls, wa, orientation, fact, group)
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width .
-    local useless_gap = tonumber(beautiful.useless_gap_width)
-    if useless_gap == nil
-    then
-        useless_gap = 0
-    end
+    local useless_gap = tonumber(beautiful.useless_gap_width) or 0
 
     -- get our orientation right
     local height = "height"
 
     -- get our orientation right
     local height = "height"
awesome window-manager configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.