added layouts

init.lua

@@ -0,0 +1,10 @@
+--[[
+     Bling
+     Layouts, widgets and utilities for Awesome WM
+--]]
+
+
+return {
+    layout = require("bling.layout")
+}
+

layout/centered.lua

@@ -0,0 +1,96 @@
+local gcolor = require("gears.color")
+local beautiful = require("beautiful")
+local math = math
+
+local mylayout = {}
+
+mylayout.name = "centered"
+
+function mylayout.arrange(p)
+    local area = p.workarea
+    local t = p.tag or screen[p.screen].selected_tag
+    local mwfact = t.master_width_factor
+    local nmaster = math.min(t.master_count, #p.clients)
+    local nslaves = #p.clients - nmaster
+
+    local master_area_width = area.width * mwfact
+    local slave_area_width  = area.width - master_area_width
+    local master_area_x = area.x + 0.5*slave_area_width
+
+    local number_of_left_sided_slaves =math.floor(nslaves/2)
+    local number_of_right_sided_slaves = nslaves - number_of_left_sided_slaves
+    local left_iterator = 0
+    local right_iterator = 0
+
+    -- Special case: no maters -> rrelapse into awesomes fair layout
+    if t.master_count == 0 then
+        awful.layout.suit.fair.arrange(p)
+        return
+    end
+
+    -- Special case: one slave -> relapse into awesomes masterstack tile layout 
+    if nslaves == 1 then
+        awful.layout.suit.tile.right.arrange(p)
+        return
+    end 
+
+    -- Special case: no slaves -> fullscreen master area
+    if nslaves < 1 then
+        master_area_width = area.width 
+        master_area_x = area.x
+    end 
+    
+    -- iterate through masters
+    for idx=1,nmaster do
+       local c = p.clients[idx]
+       local g
+       g = {
+         x = master_area_x, 
+         y = area.y + (nmaster-idx)*(area.height/nmaster),
+         width = master_area_width,
+         height = area.height/nmaster,
+       }
+       p.geometries[c] = g
+    end
+
+    -- iterate through slaves
+    for idx=1,nslaves do -- idx=nmaster+1,#p.clients do
+      local c = p.clients[idx+nmaster]
+      if idx % 2 == 0 then
+        g = {
+          x = area.x,
+          y = area.y + left_iterator * (area.height/number_of_left_sided_slaves),
+          width = slave_area_width/2,
+          height = area.height/number_of_left_sided_slaves,
+        }
+        left_iterator = left_iterator + 1
+      else
+        g = {
+          x = area.x + master_area_width + slave_area_width/2,
+          y = area.y + right_iterator * (area.height/number_of_right_sided_slaves),
+          width = slave_area_width/2,
+          height = area.height/number_of_right_sided_slaves,
+        }
+        right_iterator = right_iterator + 1
+
+      end
+      p.geometries[c] = g
+    end
+end
+
+local icon_raw = beautiful.config_path .. "/bling/icons/layouts/centered.png"
+
+local function get_icon()
+   if icon_raw ~= nil then
+      return gcolor.recolor_image(icon_raw, beautiful.fg_normal)
+   else
+      return nil
+   end
+end
+
+
+return {
+  layout = mylayout,
+  icon_raw = icon_raw,
+  get_icon = get_icon,
+}

layout/horizontal.lua

@@ -0,0 +1,70 @@
+local gcolor = require("gears.color")
+local beautiful = require("beautiful")
+local math = math
+
+local mylayout = {}
+
+mylayout.name = "horizontal"
+
+function mylayout.arrange(p)
+    local area = p.workarea
+    local t = p.tag or screen[p.screen].selected_tag
+    local mwfact = t.master_width_factor
+    local nmaster = math.min(t.master_count, #p.clients)
+    local nslaves = #p.clients - nmaster
+
+    local master_area_height = area.height * mwfact
+    local slave_area_height = area.height - master_area_height
+
+    -- Special case: no slaves
+    if nslaves == 0 then 
+        master_area_height = area.height
+        slave_area_height = 0
+    end 
+
+    -- Special case: no masters
+    if nmaster == 0 then 
+        master_area_height = 0 
+        slave_area_height = area.height
+    end 
+
+    -- itearte through masters
+    for idx=1,nmaster do
+        local c = p.clients[idx]
+        local g = {
+            x = area.x + (idx-1)*(area.width/nmaster),
+            y = area.y,
+            width = area.width/nmaster,
+            height = master_area_height,
+        }
+        p.geometries[c] = g
+    end
+
+    -- iterate through slaves
+    for idx=1,nslaves do
+        local c = p.clients[idx+nmaster]
+        local g = {
+            x = area.x,
+            y = area.y + master_area_height + (idx-1)*(slave_area_height/nslaves),
+            width = area.width,
+            height = slave_area_height/nslaves,
+        }
+        p.geometries[c] = g
+    end
+end
+
+local icon_raw = beautiful.config_path .. "/bling/icons/layouts/horizontal.png"
+
+local function get_icon()
+    if icon_raw ~= nil then
+        return gcolor.recolor_image(icon_raw, beautiful.fg_normal)
+    else
+        return nil
+    end
+end
+
+return {
+    layout = mylayout,
+    icon_raw = icon_raw,
+    get_icon = get_icon,
+}

layout/init.lua

@@ -0,0 +1,22 @@
+local beautiful = require("beautiful")
+
+local mstab = require("bling.layout.mstab")
+beautiful.layout_mstab = mstab.get_icon()
+
+local vertical = require("bling.layout.vertical")
+beautiful.layout_vertical = vertical.get_icon()
+
+local horizontal = require("bling.layout.horizontal")
+beautiful.layout_horizontal = horizontal.get_icon()
+
+local centered = require("bling.layout.centered")
+beautiful.layout_centered = centered.get_icon()
+
+local layout = {
+    mstab = mstab.layout,
+    centered = centered.layout,
+    vertical = vertical.layout,
+    horizontal = horizontal.layout
+}
+
+return layout

layout/mstab.lua

@@ -0,0 +1,197 @@
+local gears = require("gears")
+local wibox = require("wibox")
+local gcolor = require("gears.color")
+local beautiful = require("beautiful")
+
+local mylayout = {}
+
+mylayout.name = "mstab"
+
+local tabbar_height = beautiful.mstab_bar_height or 40
+local corner_radius = beautiful.mstab_corner_width or beautiful.corner_radius or 0
+local tabbar_font = beautiful.mstab_font or beautiful.font or "Monospace 8"
+local bg_focus = beautiful.mstab_bg_focus or beautiful.bg_focus or "#ff0000"
+local bg_normal = beautiful.mstab_bg_normal or beautiful.bg_normal or "#000000"
+local fg_focus = beautiful.mstab_fg_focus or beautiful.fg_focus or "#000000"
+local fg_normal = beautiful.mstab_fg_normal or beautiful.fg_normal or "#ffffff"
+
+local tabbar_orientation = "top"
+if beautiful.mstab_tabbar_orientation == "bottom" then 
+    tabbar_orientation = "bottom"
+end 
+
+-- The top_idx is the idx of the slave clients (excluding all master clients) 
+-- that should be on top of all other slave clients ("the focused slave")
+-- by creating a variable outside of the arrange function, this layout can "remember" that client
+-- by creating it as a new property of every tag, this layout can be active on different tags and 
+-- still have different "focused slave clients"
+for idx,tag in ipairs(root.tags()) do 
+    tag.top_idx = 1
+end 
+
+-- Haven't found a signal that is emitted when a new tag is added. That should work though
+-- since you can't use a layout on a tag that you haven't selected previously
+tag.connect_signal("property::selected", function(t)
+    if not t.top_idx then
+        t.top_idx = 1
+    end
+end)
+
+
+function update_tabbar(clients, t, top_idx, area, master_area_width, slave_area_width)
+
+    local s = t.screen
+
+    -- create the list of clients for the tabbar
+    local clientlist = wibox.layout.flex.horizontal()
+    for idx,c in ipairs(clients) do
+        local client_text = wibox.widget.textbox()
+        client_text.font = tabbar_font
+        client_text.align = "center"
+        client_text.valign = "center"
+        client_text.markup = "<span foreground='" .. fg_normal .. "'>" .. c. name .. "</span>"
+        local client_bg = bg_normal
+        if idx == top_idx then
+            client_bg = bg_focus 
+            client_text.markup = "<span foreground='" .. fg_focus .. "'>" .. c. name .. "</span>"
+        end
+        local client_box = wibox.widget {
+            client_text,
+            bg = client_bg,
+            widget = wibox.container.background()
+        }
+        clientlist:add(client_box)
+    end
+
+    -- if no tabbar exists, create one
+    if not s.tabbar_exists then
+		s.tabbar = wibox {
+            shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, corner_radius) end,
+		    bg = bg_normal,
+		    visible = true
+		}
+        s.tabbar_exists = true
+        
+        -- Change visibility of the tab bar when layout, selected tag or number of clients changes
+        local function adjust_visiblity(t)
+            s.tabbar.visible = (#t:clients() - t.master_count > 1) and (t.layout.name == "mstab")
+        end
+
+        tag.connect_signal("property::selected", function(t) adjust_visiblity(t) end)
+        tag.connect_signal("property::layout", function(t, layout) adjust_visiblity(t) end)
+        tag.connect_signal("tagged", function(t, c) adjust_visiblity(t) end)
+        tag.connect_signal("untagged", function(t, c) adjust_visiblity(t) end)
+    end
+
+    -- update the tabbar size and position (to support gap size change on the fly)
+    s.tabbar.x = area.x + master_area_width + t.gap
+    s.tabbar.y = area.y + t.gap
+    s.tabbar.width  = slave_area_width -  2*t.gap
+    s.tabbar.height = tabbar_height - 2*t.gap
+
+    if tabbar_orientation == "bottom" then 
+        s.tabbar.y = area.y + area.height - tabbar_height + t.gap
+    end 
+
+    -- update clientlist 
+    s.tabbar:setup {
+         layout = wibox.layout.flex.horizontal,
+         clientlist,
+    }
+
+end
+
+function mylayout.arrange(p)
+    local area = p.workarea
+    local t = p.tag or screen[p.screen].selected_tag
+    local s = t.screen
+    local mwfact = t.master_width_factor
+    local nmaster = math.min(t.master_count, #p.clients)
+    local nslaves = #p.clients - nmaster
+
+    local master_area_width = area.width * mwfact
+    local slave_area_width = area.width - master_area_width
+
+    -- Special case: No masters -> full screen slave width
+    if nmaster == 0 then
+        master_area_width = 1
+        slave_area_width = area.width
+    end
+
+    -- Special case: One or zero slaves -> no tabbar (essentially tile right)
+    if nslaves <= 1 then
+        -- since update_tabbar isnt called that way we have to hide it manually
+        if s.tabbar_exists then 
+            s.tabbar.visible = false
+        end 
+        -- otherwise just do tile right 
+        awful.layout.suit.tile.right.arrange(p)
+        return 
+    end 
+
+    -- Iterate through masters
+    for idx=1,nmaster do
+         local c = p.clients[idx]
+         local g = {
+            x = area.x,
+            y = area.y+(idx-1)*(area.height/nmaster),
+            width = master_area_width,
+            height = area.height/nmaster,
+         }
+         p.geometries[c] = g
+    end
+
+    -- TODO: The way that the slave clients are arranged is currently very hacky and unclean
+    -- because of the requirement that the shadows shouldn't just add up when more slaves are added
+    -- Currently clients are just shrunken down and placed "under" the "focused slave client"
+    -- Ideal would be hide the same way as that small scratchpad script:
+    -- https://github.com/notnew/awesome-scratch/blob/master/scratch.lua
+    
+    -- Iterate through slaves
+    -- (also creates a list of all slave clients for update_tabbar)
+    local slave_clients = {}
+    for idx=1,nslaves do
+         local c = p.clients[idx+nmaster]
+         slave_clients[#slave_clients+1] = c
+         if c == client.focus then
+             t.top_idx = #slave_clients 
+         end
+         local g = {x=1, y=1, width=1, height=1}
+         local g = {
+            x = area.x + master_area_width + slave_area_width/4,
+            y = area.y + tabbar_height + area.height/4,
+            width = slave_area_width/2,
+            height = area.height/4 - tabbar_height,
+         }
+         if idx == t.top_idx then 
+             g.width = slave_area_width
+             g.height = area.height - tabbar_height
+             g.x = area.x + master_area_width
+             g.y = area.y
+             if tabbar_orientation == "top" then 
+                 g.y = g.y + tabbar_height
+             else
+                 g.y = g.y
+             end 
+         end 
+         p.geometries[c] = g
+    end
+
+    update_tabbar(slave_clients, t, t.top_idx, area, master_area_width, slave_area_width)
+end
+
+local icon_raw = beautiful.config_path .. "/bling/icons/layouts/mstab.png"
+
+local function get_icon()
+    if icon_raw ~= nil then
+        return gcolor.recolor_image(icon_raw, beautiful.fg_normal)
+    else
+        return nil
+    end
+end
+
+return {
+    layout = mylayout,
+    icon_raw = icon_raw,
+    get_icon = get_icon,
+}

layout/vertical.lua

@@ -0,0 +1,70 @@
+local gcolor = require("gears.color")
+local beautiful = require("beautiful")
+local math = math
+
+local mylayout = {}
+
+mylayout.name = "vertical"
+
+function mylayout.arrange(p)
+    local area = p.workarea
+    local t = p.tag or screen[p.screen].selected_tag
+    local mwfact = t.master_width_factor
+    local nmaster = math.min(t.master_count, #p.clients)
+    local nslaves = #p.clients - nmaster
+
+    local master_area_width = area.width * mwfact
+    local slave_area_width = area.width - master_area_width
+
+    -- Special case: no slaves 
+    if nslaves == 0 then 
+        master_area_width = area.width
+        slave_area_width = 0
+    end 
+
+    -- Special case: no masters 
+    if nmaster == 0 then 
+        master_area_width = 0
+        slave_area_width = area.width
+    end 
+
+    -- iterate through masters
+    for idx=1,nmaster do
+        local c = p.clients[idx]
+        local g = {
+            x = area.x,
+            y = area.y + (idx-1)*(area.height/nmaster),
+            width = master_area_width,
+            height = area.height/nmaster,
+        }
+        p.geometries[c] = g
+    end
+
+    -- itearte through slaves
+    for idx=1,nslaves do
+        local c = p.clients[idx+nmaster]
+        local g = {
+            x = area.x + master_area_width + (idx-1)*(slave_area_width/nslaves),
+            y = area.y,
+            width = slave_area_width/nslaves,
+            height = area.height,
+        }
+        p.geometries[c] = g
+    end
+end
+
+local icon_raw = beautiful.config_path .. "/bling/icons/layouts/vertical.png"
+
+local function get_icon()
+    if icon_raw ~= nil then
+        return gcolor.recolor_image(icon_raw, beautiful.fg_normal)
+    else
+        return nil
+    end
+end
+
+return {
+    layout = mylayout,
+    icon_raw = icon_raw,
+    get_icon = get_icon,
+}