madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

fs: options moved to constructor; #closes 259
authorcopycat-killer <dada@archlinux.info>
Mon, 9 Jan 2017 12:04:02 +0000 (13:04 +0100)
committercopycat-killer <dada@archlinux.info>
Mon, 9 Jan 2017 12:04:02 +0000 (13:04 +0100)
lain-git.rockspec
util/init.lua
widgets/fs.lua
wiki

index b8d7abb3c27b7f89dc7d61e497a92f36f1ff73e3..c3a7dbdfdbe75acbf5817a1d1e6738927e939866 100644 (file)
@@ -15,8 +15,8 @@ description = {
    license = "GPL v2"
 }
 dependencies = {
-   "lua >= 5.1",
-   "awesome >= 3.5",
+   "lua >= 5.3",
+   "awesome >= 4.0",
    "alsa-utils",
    "curl",
    "imagemagick"
index 9a6d18275ca18e9dd2d6892f5de6dcd83e1e42e4..a7b53d27b54c6c93f5819185be969512beb1c61f 100644 (file)
@@ -33,7 +33,7 @@ local util = { _NAME = "lain.util" }
 -- tags.
 function util.menu_clients_current_tags(menu, args)
     -- List of currently selected tags.
-    local cls_tags = awful.tag.selectedlist(mouse.screen)
+    local cls_tags = awful.screen.focused().selected_tags
 
     -- Final list of menu items.
     local cls_t = {}
@@ -89,15 +89,18 @@ end
 function util.mc(c)
     c = c or magnified_client
     if not c then return end
-    awful.client.floating.set(c, true)
-    local mg = screen[mouse.screen].geometry
-    local tag = awful.tag.selected(mouse.screen)
-    local mwfact = awful.tag.getmwfact(tag)
-    local g = {}
-    g.width = math.sqrt(mwfact) * mg.width
-    g.height = math.sqrt(mwfact) * mg.height
-    g.x = mg.x + (mg.width - g.width) / 2
-    g.y = mg.y + (mg.height - g.height) / 2
+
+    c.floating   = true
+    local s      = awful.screen.selected()
+    local mg     = s.geometry
+    local tag    = s.selected_tag
+    local mwfact = beautiful.master_width_factor or 0.5
+    local g      = {}
+    g.width      = math.sqrt(mwfact) * mg.width
+    g.height     = math.sqrt(mwfact) * mg.height
+    g.x          = mg.x + (mg.width - g.width) / 2
+    g.y          = mg.y + (mg.height - g.height) / 2
+
     if c then c:geometry(g) end -- if c is still a valid object
 end
 
@@ -148,12 +151,12 @@ end
 -- Non-empty tag browsing
 -- direction in {-1, 1} <-> {previous, next} non-empty tag
 function util.tag_view_nonempty(direction, sc)
-   local s = sc or mouse.screen or 1
+   local s = sc or awful.screen.focused()
    local scr = screen[s]
 
-   for i = 1, #awful.tag.gettags(s) do
-       awful.tag.viewidx(direction,s)
-       if #awful.client.visible(s) > 0 then
+   for i = 1, #s.tags do
+       awful.tag.viewidx(direction, s)
+       if #s.clients > 0 then
            return
        end
    end
@@ -191,7 +194,7 @@ end
 -- Move current tag
 -- pos in {-1, 1} <-> {previous, next} tag position
 function util.move_tag(pos)
-    local tag = awful.tag.selected(mouse.screen)
+    local tag = awful.screen.focused().selected_tag
     local idx = awful.tag.getidx(tag)
     if tonumber(pos) <= -1 then
         awful.tag.move(idx - 1, tag)
index aa05bdeee94909319ff74e8fdf08e0f71e806f25..f578f8bb240bfe150c354f2363e7fd5f692509a2 100644 (file)
@@ -35,10 +35,10 @@ function fs.hide()
     end
 end
 
-function fs.show(seconds, options, scr)
+function fs.show(seconds, scr)
     fs.hide()
 
-    local cmd = (options and string.format("dfs %s", options)) or "dfs"
+    local cmd = (fs.options and string.format("dfs %s", fs.options)) or "dfs"
     local ws = helpers.read_pipe(helpers.scripts_dir .. cmd):gsub("\n*$", "")
 
     if fs.followtag then
@@ -65,6 +65,7 @@ local function worker(args)
     local notify           = args.notify or "on"
     local settings         = args.settings or function() end
 
+    fs.options             = args.options
     fs.followtag           = args.followtag or false
     fs.notification_preset = args.notification_preset or { fg = beautiful.fg_normal }
 
diff --git a/wiki b/wiki
index 42ecadbcd535153aa7229b8afed660a3bd349b78..d288b2dc5a2021af8ccd23e02c9fb0c6a97eda2a 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 42ecadbcd535153aa7229b8afed660a3bd349b78
+Subproject commit d288b2dc5a2021af8ccd23e02c9fb0c6a97eda2a