tilegaps layout added

layouts/init.lua

@@ -1,3 +1,3 @@
-require("layouts.tile")
+require("layouts.tilegaps")
 
 module("layouts")

layouts/tile.lua

@@ -1,221 +0,0 @@
----------------------------------------------------------------------------
--- @author Donald Ephraim Curtis <dcurtis@cs.uiowa.edu>
--- @author Julien Danjou <julien@danjou.info>
--- @copyright 2009 Donald Ephraim Curtis
--- @copyright 2008 Julien Danjou
--- @release v3.4.11
----------------------------------------------------------------------------
-
--- Grab environment we need
-local ipairs = ipairs
-local math = math
-local tag = require("awful.tag")
-
---- Tiled layouts module for awful
-module("layouts.tile")
-
-local function tile_group(cls, wa, orientation, fact, group)
-    -- get our orientation right
-    local height = "height"
-    local width = "width"
-    local x = "x"
-    local y = "y"
-    if orientation == "top" or orientation == "bottom" then
-        height = "width"
-        width = "height"
-        x = "y"
-        y = "x"
-    end
-
-    -- make this more generic (not just width)
-    available = wa[width] - (group.coord - wa[x])
-
-    -- find our total values
-    local total_fact = 0
-    local min_fact = 1
-    local size = group.size
-    for c = group.first,group.last do
-        -- determine the width/height based on the size_hint
-        local i = c - group.first +1
-        local size_hints = cls[c].size_hints
-        local size_hint = size_hints["min_"..width] or size_hints["base_"..width] or 0
-        size_hint = size_hint + cls[c].border_width*2
-        size = math.max(size_hint, size)
-
-        -- calculate the height
-        if not fact[i] then
-            fact[i] = min_fact
-        else
-            min_fact = math.min(fact[i],min_fact)
-        end
-        total_fact = total_fact + fact[i]
-    end
-    size = math.min(size, available)
-
-    local coord = wa[y]
-    local geom = {}
-    local used_size = 0
-    local unused = wa[height]
-    local stat_coord = wa[x]
-    --stat_coord = size
-    for c = group.first,group.last do
-        local i = c - group.first +1
-        geom[width] = size
-        geom[height] = math.floor(unused * fact[i] / total_fact)
-        geom[x] = group.coord
-        geom[y] = coord
-
-
-        coord = coord + geom[height]
-        unused = unused - geom[height]
-        total_fact = total_fact - fact[i]
-        used_size = math.max(used_size, geom[width])
- 
-
-        -- Useless gap.
-        useless_gap = 25
-        if useless_gap > 0
-        then
-            -- Top and left clients are shrinked by two steps and
-            -- get moved away from the border. Other clients just
-            -- get shrinked in one direction.
-
-            top = false
-            left = false
-
-            if geom[y] == wa[y] then
-                top = true
-            end
-
-            if geom[x] == 0 or geom[x] == wa[x] then
-                left = true
-            end
-
-            if top then
-                geom[height] = geom[height] - 2 * useless_gap
-                geom[y] = geom[y] + useless_gap
-            else
-                geom[height] = geom[height] - useless_gap
-            end
-
-            if left then
-                geom[width] = geom[width] - 2 * useless_gap
-                geom[x] = geom[x] + useless_gap
-            else
-                geom[width] = geom[width] - useless_gap
-            end
-        end
-        -- End of useless gap.
-
-        geom = cls[c]:geometry(geom)
-   end
-
-    return used_size
-end
-
-local function tile(param, orientation)
-    local t = tag.selected(param.screen)
-    orientation = orientation or "right"
-
-    -- this handles are different orientations
-    local height = "height"
-    local width = "width"
-    local x = "x"
-    local y = "y"
-    if orientation == "top" or orientation == "bottom" then
-        height = "width"
-        width = "height"
-        x = "y"
-        y = "x"
-    end
-
-    local cls = param.clients
-    local nmaster = math.min(tag.getnmaster(t), #cls)
-    local nother = math.max(#cls - nmaster,0)
-
-    local mwfact = tag.getmwfact(t)
-    local wa = param.workarea
-    local ncol = tag.getncol(t)
-
-    local data = tag.getdata(t).windowfact
-
-    if not data then
-        data = {}
-        tag.getdata(t).windowfact = data
-    end
-
-    local coord = wa[x]
-    local place_master = true
-    if orientation == "left" or orientation == "top" then
-        -- if we are on the left or top we need to render the other windows first
-        place_master = false
-    end
-
-    -- this was easier than writing functions because there is a lot of data we need
-    for d = 1,2 do
-        if place_master and nmaster > 0 then
-            local size = wa[width]
-            if nother > 0 then
-                size = math.min(wa[width] * mwfact, wa[width] - (coord - wa[x]))
-            end
-            if not data[0] then
-                data[0] = {}
-            end
-            coord = coord + tile_group(cls, wa, orientation, data[0], {first=1, last=nmaster, coord = coord, size = size})
-        end
-
-        if not place_master and nother > 0 then
-            local last = nmaster
-
-            -- we have to modify the work area size to consider left and top views
-            local wasize = wa[width]
-            if nmaster > 0 and (orientation == "left" or orientation == "top") then
-                wasize = wa[width] - wa[width]*mwfact
-            end
-            for i = 1,ncol do
-                -- Try to get equal width among remaining columns
-                local size = math.min( (wasize - (coord - wa[x])) / (ncol - i + 1) )
-                local first = last + 1
-                last = last + math.floor((#cls - last)/(ncol - i + 1))
-                -- tile the column and update our current x coordinate
-                if not data[i] then
-                    data[i] = {}
-                end
-                coord = coord + tile_group(cls, wa, orientation, data[i], { first = first, last = last, coord = coord, size = size })
-            end
-        end
-        place_master = not place_master
-    end
-
-end
-
-right = {}
-right.name = "tile"
-right.arrange = tile
-
---- The main tile algo, on left.
--- @param screen The screen number to tile.
-left = {}
-left.name = "tileleft"
-function left.arrange(p)
-    return tile(p, "left")
-end
-
---- The main tile algo, on bottom.
--- @param screen The screen number to tile.
-bottom = {}
-bottom.name = "tilebottom"
-function bottom.arrange(p)
-    return tile(p, "bottom")
-end
-
---- The main tile algo, on top.
--- @param screen The screen number to tile.
-top = {}
-top.name = "tiletop"
-function top.arrange(p)
-    return tile(p, "top")
-end
-
-arrange = right.arrange
-name = right.name

rc.lua.blackburn

@@ -18,6 +18,7 @@ local naughty         = require("naughty")
 local vicious         = require("vicious")
 local scratch         = require("scratch")
 local yawn            = require("yawn")
+local layouts         = require("layouts")
 
 -- Run once function
 
@@ -97,6 +98,7 @@ layouts =
     awful.layout.suit.fair,                 -- 3
     awful.layout.suit.tile.left,            -- 4
     awful.layout.suit.tile.top,             -- 5
+    layouts.tilegaps,                       -- 6
 }
 
 

rc.lua.dremora

@@ -18,6 +18,7 @@ local naughty         = require("naughty")
 local vicious         = require("vicious")
 local scratch         = require("scratch")
 local yawn            = require("yawn")
+local layouts         = require("layouts")
 
 -- Run once function
 
@@ -98,6 +99,7 @@ layouts =
     awful.layout.suit.fair,                 -- 3
     awful.layout.suit.tile.left,            -- 4
     awful.layout.suit.tile.top,             -- 5
+    layouts.tilegaps,                       -- 6
 }
 
 

rc.lua.multicolor

@@ -17,6 +17,7 @@ beautiful       = require("beautiful")
 naughty         = require("naughty")
 vicious         = require("vicious")
 scratch         = require("scratch")
+layouts         = require("layouts")
 
 -- }}}
 
@@ -112,6 +113,7 @@ layouts =
     awful.layout.suit.max,                  -- 10
     --awful.layout.suit.max.fullscreen,     -- 11
     --awful.layout.suit.magnifier           -- 12
+    layouts.tilegaps,                       -- 13
 }
 
 -- }}}

rc.lua.powerarrow-darker

@@ -17,6 +17,7 @@ beautiful       = require("beautiful")
 naughty         = require("naughty")
 vicious         = require("vicious")
 scratch         = require("scratch")
+layouts         = require("layouts")
 
 -- }}}
 
@@ -116,6 +117,7 @@ layouts =
     awful.layout.suit.max,                  -- 10
     --awful.layout.suit.max.fullscreen,     -- 11
     --awful.layout.suit.magnifier           -- 12
+    layouts.tilegaps,                       -- 13
 }
 
 -- }}}

rc.lua.rainbow

@@ -103,7 +103,7 @@ layouts =
     awful.layout.suit.fair,                 -- 3
     awful.layout.suit.tile.bottom,          -- 4
     awful.layout.suit.fair.horizontal,      -- 5
-    layouts.tile,                           -- 6
+    layouts.tilegaps,                       -- 6
 }
 
 -- }}}
@@ -556,7 +556,7 @@ function (widget, args)
          bg = "#242424" })
          no_net_shown = false
        end
-       return gray .. " Net " .. coldef .. "<span color='#e54c62'>Off " .. coldef
+       return gray .. " Net " .. coldef .. "<span color='#eb8f8f'>Off " .. coldef
     else
        no_net_shown = true
        return ''
@@ -922,6 +922,11 @@ awful.rules.rules = {
           properties = { floating = true } },
 
     { rule = { class = "Dwb" },
+          properties = { tag = tags[1][1],
+                         maximized_horizontal = true,
+                         maximized_vertical = true } },
+
+    { rule = { instance = "plugin-container" },
           properties = { tag = tags[1][1] } },
 
 	  { rule = { class = "Gimp" },

rc.lua.steamburn

@@ -17,6 +17,7 @@ beautiful       = require("beautiful")
 naughty         = require("naughty")
 vicious         = require("vicious")
 scratch         = require("scratch")
+layouts         = require("layouts") 
 
 
 -- Run once function
@@ -105,6 +106,7 @@ layouts =
     awful.layout.suit.max,                  -- 10
     --awful.layout.suit.max.fullscreen,     -- 11
     --awful.layout.suit.magnifier           -- 12
+    layouts.tilegaps,                       -- 13
 }
 
 

themes/blackburn/theme.lua

@@ -46,6 +46,7 @@ theme.arrl_lr_pre                           = themes_dir .. "/icons/arrl_lr_pre.
 theme.arrl_lr_post                          = themes_dir .. "/icons/arrl_lr_post.png"
 
 theme.layout_tile                           = themes_dir .. "/icons/tile.png"
+theme.layout_tilegaps                       = themes_dir .. "/icons/tilegaps.png"
 theme.layout_tileleft                       = themes_dir .. "/icons/tileleft.png"
 theme.layout_tilebottom                     = themes_dir .. "/icons/tilebottom.png"
 theme.layout_tiletop                        = themes_dir .. "/icons/tiletop.png"

themes/dremora/theme.lua

@@ -36,6 +36,7 @@ theme.arrl_lr_pre                           = themes_dir .. "/icons/arrl_lr_pre.
 theme.arrl_lr_post                          = themes_dir .. "/icons/arrl_lr_post.png"
 
 theme.layout_tile                           = themes_dir .. "/icons/tile.png"
+theme.layout_tilegaps                       = themes_dir .. "/icons/tilegaps.png"
 theme.layout_tileleft                       = themes_dir .. "/icons/tileleft.png"
 theme.layout_tilebottom                     = themes_dir .. "/icons/tilebottom.png"
 theme.layout_tiletop                        = themes_dir .. "/icons/tiletop.png"

themes/multicolor/theme.lua

@@ -69,6 +69,7 @@ theme.tasklist_maximized_horizontal = ""
 theme.tasklist_maximized_vertical = "" 
 
 theme.layout_tile       = theme.confdir .. "/layouts/tile.png"
+theme.layout_tilegaps   = theme.confdir .. "/layouts/tilegaps.png"
 theme.layout_tileleft   = theme.confdir .. "/layouts/tileleft.png"
 theme.layout_tilebottom = theme.confdir .. "/layouts/tilebottom.png"
 theme.layout_tiletop    = theme.confdir .. "/layouts/tiletop.png"

themes/powerarrow-darker/theme.lua

@@ -42,6 +42,7 @@ theme.taglist_squares_sel                   = themes_dir .. "/icons/square_sel.p
 theme.taglist_squares_unsel                 = themes_dir .. "/icons/square_unsel.png"
 
 theme.layout_tile                           = themes_dir .. "/icons/tile.png"
+theme.layout_tilegaps                       = themes_dir .. "/icons/tilegaps.png"
 theme.layout_tileleft                       = themes_dir .. "/icons/tileleft.png"
 theme.layout_tilebottom                     = themes_dir .. "/icons/tilebottom.png"
 theme.layout_tiletop                        = themes_dir .. "/icons/tiletop.png"

themes/rainbow/theme.lua

@@ -12,6 +12,7 @@ themes_dir                                  = os.getenv("HOME") .. "/.config/awe
 theme.wallpaper                             = themes_dir .. "/wall.png"
 
 theme.font                                  = "Tamsyn 10"
+--theme.font                                  = "Ohsnapu 12"
 theme.fg_normal                             = "#9E9E9E"
 theme.fg_focus                              = "#EBEBFF"
 theme.bg_normal                             = "#242424"
@@ -19,7 +20,7 @@ theme.bg_focus                              = "#242424"
 theme.fg_urgent                             = "#000000"
 theme.bg_urgent                             = "#FFFFFF"
 theme.border_width                          = "1"
-theme.border_normal                         = "#222222"
+theme.border_normal                         = "#242424"
 theme.border_focus                          = "#999999"
 theme.titlebar_bg_focus                     = "#292929"
 theme.taglist_fg_focus                      = "#EBEBFF"
@@ -35,6 +36,7 @@ theme.widget_no_net_notify                  = themes_dir .. "/icons/no_net_notif
 theme.vol_mute                              = themes_dir .. "/icons/vol_mute.png"
 
 theme.layout_txt_tile                       = "[t]" 
+theme.layout_txt_tilegaps                   = "[t2]" 
 theme.layout_txt_tileleft                   = "[l]"
 theme.layout_txt_tilebottom                 = "[b]"
 theme.layout_txt_tiletop                    = "[tt]"

themes/steamburn/theme.lua

@@ -42,6 +42,7 @@ theme.taglist_squares_sel                   = themes_dir .. "/icons/square_sel.p
 theme.taglist_squares_unsel                 = themes_dir .. "/icons/square_unsel.png"
 
 theme.layout_tile                           = themes_dir .. "/icons/tile.png"
+theme.layout_tilegaps                       = themes_dir .. "/icons/tilegaps.png"
 theme.layout_tileleft                       = themes_dir .. "/icons/tileleft.png"
 theme.layout_tilebottom                     = themes_dir .. "/icons/tilebottom.png"
 theme.layout_tiletop                        = themes_dir .. "/icons/tiletop.png"