]> git.madduck.net Git - etc/awesome.git/commitdiff

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:

factor out sorted_table helper function
authormartin f. krafft <madduck@madduck.net>
Wed, 21 Feb 2018 22:23:04 +0000 (11:23 +1300)
committermartin f. krafft <madduck@madduck.net>
Thu, 22 Feb 2018 00:03:35 +0000 (13:03 +1300)
.config/awesome/rc.lua
.config/awesome/tblutils.lua [new file with mode: 0644]

index 3246cb4dfc2544157f6d5142e76afe6161c87d3c..60c913358f82d8f397e63e50bbdb721545d9dc0f 100644 (file)
@@ -12,6 +12,7 @@ local xrdb = beautiful.xresources
 local naughty = require("naughty")
 local menubar = require("menubar")
 local hotkeys_popup = require("awful.hotkeys_popup").widget
+local tblutils = require("tblutils")
 local lain = require("lain")
 local dkjson = require("lain.util").dkjson
 local math = require("math")
@@ -104,33 +105,6 @@ local function client_menu_toggle_fn()
     end
 end
 
-local function sorted_pairs(t, f)
-    local a = {}
-    for n in pairs(t) do table.insert(a, n) end
-    table.sort(a, f)
-    local i = 0      -- iterator variable
-    local iter = function ()   -- iterator function
-        i = i + 1
-        if a[i] == nil then return nil
-        else return a[i], t[a[i]]
-        end
-    end
-    return iter
-end
-
-local function print_table(tbl, indent)
-    if not indent then indent = 0 end
-    for k, v in pairs(tbl) do
-        formatting = string.rep("  ", indent) .. k .. ": "
-        if type(v) == "table" then
-            print(formatting)
-            print_table(v, indent+1)
-        else
-            print(formatting .. tostring(v))
-        end
-    end
-end
-
 local lain_bat = lain.widget.bat({
     batteries = {"BAT0", "BAT1"},
     settings = function()
@@ -213,7 +187,7 @@ ZONES = {
   ["DE"] = "Europe/Berlin"
 }
 local now = luatz.time_in(nil)
-for c, tz in sorted_pairs(ZONES) do
+for c, tz in tblutils.sorted_pairs(ZONES) do
     local t = luatz.time_in(tz)
     if math.abs(os.difftime(t, now)) > 10 then
         local widget = wibox.widget.textclock(c .. ": %H:%M (%a)", 60, tz)
@@ -323,7 +297,7 @@ awful.screen.connect_for_each_screen(function(s)
     if not tags[s.index] then
         tags[s.index] = {}
     end
-    for n,p in sorted_pairs(screentags[s.index]) do
+    for n,p in tblutils.sorted_pairs(screentags[s.index]) do
         p["screen"] = s
         n = string.sub(n, 2) -- remove leading 't' needed for syntax in table
         table.insert(tags[s.index], awful.tag.add(n, p))
diff --git a/.config/awesome/tblutils.lua b/.config/awesome/tblutils.lua
new file mode 100644 (file)
index 0000000..141645c
--- /dev/null
@@ -0,0 +1,17 @@
+local module = {}
+
+function module.sorted_pairs(t, f)
+    local a = {}
+    for n in pairs(t) do table.insert(a, n) end
+    table.sort(a, f)
+    local i = 0      -- iterator variable
+    local iter = function ()   -- iterator function
+        i = i + 1
+        if a[i] == nil then return nil
+        else return a[i], t[a[i]]
+        end
+    end
+    return iter
+end
+
+return module