From ba8448f02b2edd7b9e199f7841687b8f44e1c757 Mon Sep 17 00:00:00 2001 From: luke bonham Date: Sun, 15 Sep 2013 16:17:33 +0200 Subject: [PATCH] small code fixes --- layout/cascadetile.lua | 6 +----- layout/centerwork.lua | 6 +----- layout/termfair.lua | 32 ++++---------------------------- layout/uselessfair.lua | 8 ++------ layout/uselesspiral.lua | 32 ++++++++++++++------------------ layout/uselesstile.lua | 6 +----- 6 files changed, 23 insertions(+), 67 deletions(-) diff --git a/layout/cascadetile.lua b/layout/cascadetile.lua index a94bbed..98821e3 100644 --- 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. - 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 diff --git a/layout/centerwork.lua b/layout/centerwork.lua index 2035c65..b8175ea 100644 --- 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 . - 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 diff --git a/layout/termfair.lua b/layout/termfair.lua index 62eef9a..4beab8f 100644 --- a/layout/termfair.lua +++ b/layout/termfair.lua @@ -14,15 +14,7 @@ local math = { ceil = math.ceil, 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). @@ -45,11 +37,7 @@ function termfair.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 @@ -57,22 +45,10 @@ function termfair.arrange(p) -- 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. - 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 diff --git a/layout/uselessfair.lua b/layout/uselessfair.lua index 92e8d45..7499d91 100644 --- 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 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 @@ -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 - useless_gap + g.height = g.height - useless_gap end end -- End of useless gap. diff --git a/layout/uselesspiral.lua b/layout/uselesspiral.lua index 695728c..ad2ba04 100644 --- 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 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 @@ -69,26 +65,26 @@ local function spiral(p, spiral) left = false if wa2.y == static_wa.y then - top = true + top = true end if wa2.x == static_wa.x then - left = true + left = true 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 - wa2.height = wa2.height - 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 + 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. diff --git a/layout/uselesstile.lua b/layout/uselesstile.lua index cd288ed..78f7bec 100644 --- 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 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"