X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/f82f0ed20542258833e866c8f33bc54c57c3b863..a5d68067cfa5759bf55576784563092b5ca5629f:/util/init.lua?ds=sidebyside

diff --git a/util/init.lua b/util/init.lua
index 3db478d..1fc5805 100644
--- a/util/init.lua
+++ b/util/init.lua
@@ -13,14 +13,10 @@
 --]]
 
 local awful        = require("awful")
-local beautiful    = require("beautiful")
-local math         = { sqrt = math.sqrt }
+local sqrt         = math.sqrt
 local pairs        = pairs
-local string       = { gsub = string.gsub }
 local client       = client
-local screen       = screen
 local tonumber     = tonumber
-
 local wrequire     = require("lain.helpers").wrequire
 local setmetatable = setmetatable
 
@@ -71,29 +67,28 @@ function util.menu_clients_current_tags(menu, args)
 end
 
 -- Magnify a client: set it to "float" and resize it.
-function util.magnify_client(c)
+function util.magnify_client(c, width_f, height_f)
     if c and not c.floating then
-        util.mc(c)
         util.magnified_client = c
+        util.mc(c, width_f, height_f)
     else
-        c.floating = false
         util.magnified_client = nil
+        c.floating = false
     end
 end
 
 -- https://github.com/copycat-killer/lain/issues/195
-function util.mc(c)
+function util.mc(c, width_f, height_f)
     c = c or util.magnified_client
     if not c then return end
 
     c.floating   = true
     local s      = awful.screen.focused()
-    local mg     = s.geometry
-    local tag    = s.selected_tag
-    local mwfact = beautiful.master_width_factor or 0.5
+    local mg     = s.workarea
     local g      = {}
-    g.width      = math.sqrt(mwfact) * mg.width
-    g.height     = math.sqrt(mwfact) * mg.height
+    local mwfact = width_f or s.selected_tag.master_width_factor or 0.5
+    g.width      = sqrt(mwfact) * mg.width
+    g.height     = sqrt(height_f or mwfact) * mg.height
     g.x          = mg.x + (mg.width - g.width) / 2
     g.y          = mg.y + (mg.height - g.height) / 2
 
@@ -116,13 +111,13 @@ end
 -- {{{ Dynamic tagging
 
 -- Add a new tag
-function util.add_tag()
+function util.add_tag(layout)
     awful.prompt.run {
         prompt       = "New tag name: ",
         textbox      = awful.screen.focused().mypromptbox.widget,
         exe_callback = function(name)
             if not name or #name == 0 then return end
-            awful.tag.add(name, { screen = awful.screen.focused() }):view_only()
+            awful.tag.add(name, { screen = awful.screen.focused(), layout = layout or awful.layout.layouts[0] }):view_only()
         end
     }
 end
@@ -146,11 +141,10 @@ end
 -- pos in {-1, 1} <-> {previous, next} tag position
 function util.move_tag(pos)
     local tag = awful.screen.focused().selected_tag
-    local idx = awful.tag.getidx(tag)
     if tonumber(pos) <= -1 then
-        awful.tag.move(idx - 1, tag)
+        awful.tag.move(tag.index - 1, tag)
     else
-        awful.tag.move(idx + 1, tag)
+        awful.tag.move(tag.index + 1, tag)
     end
 end
 
@@ -166,9 +160,9 @@ end
 
 -- On the fly useless gaps change
 function util.useless_gaps_resize(thatmuch)
-    beautiful.useless_gap = beautiful.useless_gap or 0
-    beautiful.useless_gap = tonumber(beautiful.useless_gap) + thatmuch
-    awful.layout.arrange(awful.screen.focused())
+    local scr = awful.screen.focused()
+    scr.selected_tag.gap = scr.selected_tag.gap + tonumber(thatmuch)
+    awful.layout.arrange(scr)
 end
 
 return setmetatable(util, { __index = wrequire })