]> 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:

alsa{bar}: add togglechannel back
authorcopycat-killer <dada@archlinux.info>
Mon, 23 Jan 2017 16:58:35 +0000 (17:58 +0100)
committercopycat-killer <dada@archlinux.info>
Mon, 23 Jan 2017 16:58:35 +0000 (17:58 +0100)
widgets/alsa.lua
widgets/alsabar.lua
wiki

index 7c853c971fe4fb2876f00598ee34ceedd413c4db..c86db3340bbf3350d85bb6c57075e15414dd7136 100644 (file)
@@ -8,6 +8,7 @@
 --]]
 
 local helpers      = require("lain.helpers")
 --]]
 
 local helpers      = require("lain.helpers")
+local shell        = require("awful.util").shell
 local wibox        = require("wibox")
 local string       = { match  = string.match,
                        format = string.format }
 local wibox        = require("wibox")
 local string       = { match  = string.match,
                        format = string.format }
@@ -22,9 +23,16 @@ local function worker(args)
     local timeout  = args.timeout or 5
     local settings = args.settings or function() end
 
     local timeout  = args.timeout or 5
     local settings = args.settings or function() end
 
-    alsa.cmd     = args.cmd or "amixer"
-    alsa.channel = args.channel or "Master"
-    alsa.last    = {}
+    alsa.cmd           = args.cmd or "amixer"
+    alsa.channel       = args.channel or "Master"
+    alsa.togglechannel = args.togglechannel
+
+    if alsa.togglechannel then
+        alsa.cmd = { shell, "-c", string.format("%s get %s; %s get %s",
+        alsa.cmd, alsa.channel, alsa.cmd, alsa.togglechannel) }
+    end
+
+    alsa.last = {}
 
     function alsa.update()
         helpers.async(alsa.cmd, function(mixer)
 
     function alsa.update()
         helpers.async(alsa.cmd, function(mixer)
@@ -39,6 +47,7 @@ local function worker(args)
     end
 
     timer_id = string.format("alsa-%s-%s", alsa.cmd, alsa.channel)
     end
 
     timer_id = string.format("alsa-%s-%s", alsa.cmd, alsa.channel)
+
     helpers.newtimer(timer_id, timeout, alsa.update)
 
     return alsa
     helpers.newtimer(timer_id, timeout, alsa.update)
 
     return alsa
index bc8d8d35531b903248a7b04b40420eb79d855a3a..fde5eec5e5a9a9b67dd6f79142fec98b36c415b0 100644 (file)
@@ -44,6 +44,7 @@ local function worker(args)
 
     alsabar.cmd                 = args.cmd or "amixer"
     alsabar.channel             = args.channel or "Master"
 
     alsabar.cmd                 = args.cmd or "amixer"
     alsabar.channel             = args.channel or "Master"
+    alsabar.togglechannel       = args.togglechannel
     alsabar.colors              = args.colors or alsabar.colors
     alsabar.followtag           = args.followtag or false
     alsabar._notify             = args.notify or "on"
     alsabar.colors              = args.colors or alsabar.colors
     alsabar.followtag           = args.followtag or false
     alsabar._notify             = args.notify or "on"
@@ -54,6 +55,11 @@ local function worker(args)
         alsabar.notification_preset.font = "Monospace 11"
     end
 
         alsabar.notification_preset.font = "Monospace 11"
     end
 
+    if alsabar.togglechannel then
+        alsabar.cmd = { awful.util.shell, "-c", string.format("%s get %s; %s get %s",
+        alsabar.cmd, alsabar.channel, alsabar.cmd, alsabar.togglechannel) }
+    end
+
     alsabar.bar = wibox.widget {
         forced_height    = height,
         forced_width     = width,
     alsabar.bar = wibox.widget {
         forced_height    = height,
         forced_width     = width,
diff --git a/wiki b/wiki
index 85fa41e74a7ed2923f6e289273e436ff187c6fdc..66836bbf1ffc0dd3bd3aef4799fff78ded9df4ec 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 85fa41e74a7ed2923f6e289273e436ff187c6fdc
+Subproject commit 66836bbf1ffc0dd3bd3aef4799fff78ded9df4ec