awesome: update rc for awesome 4.0

diff --git a/awesome/tags.lua b/awesome/tags.lua
index 7a98a974b3ad9d9241ac11257fcdb6aeb2c94131..8d9dfd3eba0d6973b2d7b372d88060acb0fd2055 100644 (file)
--- a/awesome/tags.lua
+++ b/awesome/tags.lua
@@ -3,12 +3,10 @@
 layouts =
 {
     awful.layout.suit.floating,
-    lain.layout.uselesstile,
-    lain.layout.uselesstile.left,
-    lain.layout.uselesstile.bottom,
-    lain.layout.uselesstile.top,
-    lain.layout.uselessfair,
-    lain.layout.uselessfair.horizontal,
+    awful.layout.suit.tile,
+    awful.layout.suit.tile.left,
+    awful.layout.suit.tile.bottom,
+    awful.layout.suit.tile.top,
     -- lain.layout.uselesspiral,
     -- lain.layout.uselesspiral.dwindle,
     awful.layout.suit.max,
@@ -29,41 +27,41 @@ local icon_only = true
 -- single screen {{{2
 mytags[1] = {}
 mytags[1][1] = {
-    { name = "1", layout = lain.layout.uselesstile.left,   mwfact=0.50, icon = path.."/cutiemarks/pinkie_pie.png"},
-    { name = "2", layout = lain.layout.uselesstile,        mwfact=0.60, icon = path.."/cutiemarks/rainbow_dash.png"},
-    { name = "3", layout = awful.layout.suit.max,          mwfact=0.50, icon = path.."/cutiemarks/twilight_sparkle.png"},
-    { name = "4", layout = lain.layout.uselesstile.left,   mwfact=0.60, icon = path.."/cutiemarks/doctor_whooves.png"},
-    { name = "5", layout = lain.layout.uselesstile,        mwfact=0.30, icon = path.."/cutiemarks/derpy_hooves.png"},
-    { name = "6", layout = lain.layout.uselesstile,        mwfact=0.50, icon = path.."/cutiemarks/trixie.png"},
-    { name = "7", layout = lain.layout.uselesstile.bottom, mwfact=0.80, icon = path.."/cutiemarks/soarin.png"},
-    { name = "8", layout = lain.layout.uselesstile,        mwfact=0.50, icon = path.."/cutiemarks/princess_celestia.png"},
-    { name = "9", layout = awful.layout.suit.floating,     mwfact=0.50, icon = path.."/cutiemarks/princess_luna.png"},
+    { name = "1", layout = awful.layout.suit.tile.left,   master_width_factor=0.50, icon = path.."/cutiemarks/pinkie_pie.png"},
+    { name = "2", layout = awful.layout.suit.tile,        master_width_factor=0.60, icon = path.."/cutiemarks/rainbow_dash.png"},
+    { name = "3", layout = awful.layout.suit.max,         master_width_factor=0.50, icon = path.."/cutiemarks/twilight_sparkle.png"},
+    { name = "4", layout = awful.layout.suit.tile.left,   master_width_factor=0.60, icon = path.."/cutiemarks/doctor_whooves.png"},
+    { name = "5", layout = awful.layout.suit.tile,        master_width_factor=0.30, icon = path.."/cutiemarks/derpy_hooves.png"},
+    { name = "6", layout = awful.layout.suit.tile,        master_width_factor=0.50, icon = path.."/cutiemarks/trixie.png"},
+    { name = "7", layout = awful.layout.suit.tile.bottom, master_width_factor=0.80, icon = path.."/cutiemarks/soarin.png"},
+    { name = "8", layout = awful.layout.suit.tile,        master_width_factor=0.50, icon = path.."/cutiemarks/princess_celestia.png"},
+    { name = "9", layout = awful.layout.suit.floating,    master_width_factor=0.50, icon = path.."/cutiemarks/princess_luna.png"},
 }
 
 -- Dual screen {{{2
 mytags[2] = {}
 mytags[2][1] = {
-    { name = "1", layout = lain.layout.uselesstile.left,   mwfact=0.50, icon = path.."/cutiemarks/pinkie_pie.png"},
-    { name = "2", layout = lain.layout.uselesstile.left,   mwfact=0.60, icon = path.."/cutiemarks/rainbow_dash.png"},
-    { name = "3", layout = lain.layout.uselesstile.left,   mwfact=0.60, icon = path.."/cutiemarks/twilight_sparkle.png"},
-    { name = "4", layout = lain.layout.uselesstile.left,   mwfact=0.60, icon = path.."/cutiemarks/doctor_whooves.png"},
-    { name = "5", layout = lain.layout.uselesstile.left,   mwfact=0.30, icon = path.."/cutiemarks/derpy_hooves.png"},
-    { name = "6", layout = lain.layout.uselesstile.left,   mwfact=0.70, icon = path.."/cutiemarks/trixie.png"},
-    { name = "7", layout = lain.layout.uselesstile.left,   mwfact=0.88, icon = path.."/cutiemarks/soarin.png"},
-    { name = "8", layout = lain.layout.uselesstile.left,   mwfact=0.84, icon = path.."/cutiemarks/princess_celestia.png"},
-    { name = "9", layout = awful.layout.suit.floating,     mwfact=0.50, icon = path.."/cutiemarks/princess_luna.png"},
+    { name = "1", layout = awful.layout.suit.tile.left,   master_width_factor=0.50, icon = path.."/cutiemarks/pinkie_pie.png"},
+    { name = "2", layout = awful.layout.suit.tile.left,   master_width_factor=0.60, icon = path.."/cutiemarks/rainbow_dash.png"},
+    { name = "3", layout = awful.layout.suit.tile.left,   master_width_factor=0.60, icon = path.."/cutiemarks/twilight_sparkle.png"},
+    { name = "4", layout = awful.layout.suit.tile.left,   master_width_factor=0.60, icon = path.."/cutiemarks/doctor_whooves.png"},
+    { name = "5", layout = awful.layout.suit.tile.left,   master_width_factor=0.30, icon = path.."/cutiemarks/derpy_hooves.png"},
+    { name = "6", layout = awful.layout.suit.tile.left,   master_width_factor=0.70, icon = path.."/cutiemarks/trixie.png"},
+    { name = "7", layout = awful.layout.suit.tile.left,   master_width_factor=0.88, icon = path.."/cutiemarks/soarin.png"},
+    { name = "8", layout = awful.layout.suit.tile.left,   master_width_factor=0.84, icon = path.."/cutiemarks/princess_celestia.png"},
+    { name = "9", layout = awful.layout.suit.floating,    master_width_factor=0.50, icon = path.."/cutiemarks/princess_luna.png"},
 }
 
 mytags[2][2] = {
-    { name = "1", layout = lain.layout.uselesstile,        mwfact=0.60, icon = path.."/cutiemarks/snails.png"},
-    { name = "2", layout = awful.layout.suit.max,          mwfact=0.88, icon = path.."/cutiemarks/snips.png"},
-    { name = "3", layout = lain.layout.uselesstile,        mwfact=0.50, icon = path.."/cutiemarks/lyra_heartstrings.png"},
-    { name = "4", layout = lain.layout.uselesstile.left,   mwfact=0.80, icon = path.."/cutiemarks/rarity.png"},
-    { name = "5", layout = lain.layout.uselesstile,        mwfact=0.50, icon = path.."/cutiemarks/fluttershy.png"},
-    { name = "6", layout = lain.layout.uselesstile,        mwfact=0.50, icon = path.."/cutiemarks/applejack.png"},
-    { name = "7", layout = lain.layout.uselesstile,        mwfact=0.50, icon = path.."/cutiemarks/snowflake.png"},
-    { name = "8", layout = lain.layout.uselesstile,        mwfact=0.50, icon = path.."/cutiemarks/thunderlane.png"},
-    { name = "9", layout = awful.layout.suit.max,          mwfact=0.50, icon = path.."/cutiemarks/bon_bon.png"},
+    { name = "1", layout = awful.layout.suit.tile,        master_width_factor=0.60, icon = path.."/cutiemarks/snails.png"},
+    { name = "2", layout = awful.layout.suit.max,         master_width_factor=0.88, icon = path.."/cutiemarks/snips.png"},
+    { name = "3", layout = awful.layout.suit.tile,        master_width_factor=0.50, icon = path.."/cutiemarks/lyra_heartstrings.png"},
+    { name = "4", layout = awful.layout.suit.tile.left,   master_width_factor=0.80, icon = path.."/cutiemarks/rarity.png"},
+    { name = "5", layout = awful.layout.suit.tile,        master_width_factor=0.50, icon = path.."/cutiemarks/fluttershy.png"},
+    { name = "6", layout = awful.layout.suit.tile,        master_width_factor=0.50, icon = path.."/cutiemarks/applejack.png"},
+    { name = "7", layout = awful.layout.suit.tile,        master_width_factor=0.50, icon = path.."/cutiemarks/snowflake.png"},
+    { name = "8", layout = awful.layout.suit.tile,        master_width_factor=0.50, icon = path.."/cutiemarks/thunderlane.png"},
+    { name = "9", layout = awful.layout.suit.max,         master_width_factor=0.50, icon = path.."/cutiemarks/bon_bon.png"},
 }
 
 -- Tags {{{2

diff --git a/awesome/themes/mlp/theme.lua b/awesome/themes/mlp/theme.lua
index f603a7d30c20e1d5f3ea95b2cd131c03990299e3..6efc3ce4040edc620451ef6e664bcb3b05568b97 100644 (file)
--- a/awesome/themes/mlp/theme.lua
+++ b/awesome/themes/mlp/theme.lua
@@ -90,7 +90,8 @@ theme.layout_tiletop    = theme.path.."/layouts/tiletopw.png"
 theme.layout_spiral     = theme.path.."/layouts/spiralw.png"
 theme.layout_dwindle    = theme.path.."/layouts/dwindlew.png"
 -- lain stuff
-theme.useless_gap_width = 10
+theme.useless_gap = 10
+theme.gap_single_client = false
 theme.lain_icons = "/usr/share/awesome/lib/lain/icons/layout/default/"
 theme.layout_uselessfairh      = theme.path.."/layouts/fairhw.png"
 theme.layout_uselessfair       = theme.path.."/layouts/fairvw.png"