]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/alsabar.lua

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:

projects / etc / awesome.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
moved acw/init to ccurr + code revision
[etc/awesome.git] / widgets / alsabar.lua
diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index 7f5fe87f5de80f44944d148846335454976d835a..365ac2d20ce71bcad3a6c4062169eb22fca1fc76 100644 (file)
--- a/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@ -4,6 +4,7 @@
      Licensed under GNU General Public License v2 
       * (c) 2013, Luke Bonham                     
       * (c) 2013, Rman                            
      Licensed under GNU General Public License v2 
       * (c) 2013, Luke Bonham                     
       * (c) 2013, Rman                            
+                                                  
 --]]
 
 local newtimer     = require("lain.helpers").newtimer
 --]]
 
 local newtimer     = require("lain.helpers").newtimer
@@ -12,10 +13,11 @@ local awful        = require("awful")
 local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 
 local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 
-local io           = io
-local math         = { modf  = math.modf }
-local string       = { match = string.match,
-                       rep   = string.rep }
+local io           = { popen  = io.popen }
+local math         = { modf   = math.modf }
+local string       = { format = string.format,
+                       match  = string.match,
+                       rep    = string.rep }
 local tonumber     = tonumber
 
 local setmetatable = setmetatable
 local tonumber     = tonumber
 
 local setmetatable = setmetatable
@@ -25,64 +27,78 @@ local setmetatable = setmetatable
 local alsabar =
 {
   channel = "Master",
 local alsabar =
 {
   channel = "Master",
-  step = "5%",
+  step    = "5%",
 
   colors =
   {
      background = beautiful.bg_normal,
 
   colors =
   {
      background = beautiful.bg_normal,
-     mute   = "#EB8F8F",
-     unmute = "#A4CE8A"
+     mute       = "#EB8F8F",
+     unmute     = "#A4CE8A"
   },
 
   terminal = terminal or "xterm",
   },
 
   terminal = terminal or "xterm",
-  mixer = terminal .. " -e alsamixer",
+  mixer    = terminal .. " -e alsamixer",
 
   notifications =
   {
 
   notifications =
   {
-     font = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")),
+     font      = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")),
      font_size = "11",
      font_size = "11",
-     color = beautiful.fg_focus,
-     bar_size = 18 -- Awesome default
+     color     = beautiful.fg_normal,
+     bar_size  = 18
   },
 
   _current_level = 0,
   },
 
   _current_level = 0,
-  _muted = false
+  _muted         = false
 }
 
 }
 
-function alsabar:notify()
+function alsabar.notify()
+  alsabar.update()
+
        local preset =
        {
        local preset =
        {
-      title = "", text = "",
-      timeout = 15,
-      font = alsabar.notifications.font .. " " .. alsabar.notifications.font_size,
-      fg = alsabar.notifications.color
+      title   = "",
+      text    = "",
+      timeout = 4,
+      font    = alsabar.notifications.font .. " " ..
+                alsabar.notifications.font_size,
+      fg      = alsabar.notifications.color
        }
 
        }
 
-       if alsabar._muted then
+       if alsabar._muted
+  then
                preset.title = alsabar.channel .. " - Muted"
        else
                preset.title = alsabar.channel .. " - " .. alsabar._current_level * 100 .. "%"
        end
 
                preset.title = alsabar.channel .. " - Muted"
        else
                preset.title = alsabar.channel .. " - " .. alsabar._current_level * 100 .. "%"
        end
 
-  local int = math.modf(alsabar._current_level * alsabar.notifications.bar_size)
-  preset.text = "[" .. string.rep("|", int)
-                .. string.rep(" ", alsabar.notifications.bar_size - int) .. "]"
+  int = math.modf(alsabar._current_level * alsabar.notifications.bar_size)
+  preset.text = "["
+                .. string.rep("|", int)
+                .. string.rep(" ", alsabar.notifications.bar_size - int)
+                .. "]"
 
   if alsabar._notify ~= nil then
 
   if alsabar._notify ~= nil then
-               alsabar._notify = naughty.notify ({ replaces_id = alsabar._notify.id,
-                                                      preset = preset })
+               alsabar._notify = naughty.notify ({
+        replaces_id = alsabar._notify.id,
+                         preset      = preset
+    })
        else
        else
-               alsabar._notify = naughty.notify ({ preset = preset })
+               alsabar._notify = naughty.notify ({
+        preset = preset
+    })
        end
 end
 
 local function worker(args)
     local args = args or {}
        end
 end
 
 local function worker(args)
     local args = args or {}
+    local timeout = args.timeout or 4
+    local settings = args.settings or function() end
     local width = args.width or 63
     local height = args.heigth or 1
     local width = args.width or 63
     local height = args.heigth or 1
-    local ticks = args.ticks or true
+    local ticks = args.ticks or false
     local ticks_size = args.ticks_size or 7
     local vertical = args.vertical or false
     local ticks_size = args.ticks_size or 7
     local vertical = args.vertical or false
+
     alsabar.channel = args.channel or alsabar.channel
     alsabar.step = args.step or alsabar.step
     alsabar.colors = args.colors or alsabar.colors
     alsabar.channel = args.channel or alsabar.channel
     alsabar.step = args.step or alsabar.step
     alsabar.colors = args.colors or alsabar.colors
@@ -97,19 +113,16 @@ local function worker(args)
     alsabar.bar:set_height(height)
     alsabar.bar:set_ticks(ticks)
     alsabar.bar:set_ticks_size(ticks_size)
     alsabar.bar:set_height(height)
     alsabar.bar:set_ticks(ticks)
     alsabar.bar:set_ticks_size(ticks_size)
+    alsabar.bar:set_vertical(vertical)
 
 
-    if vertical then
-        alsabar.bar:set_vertical(true)
-    end
-
-    function update()
+    function alsabar.update()
         -- Get mixer control contents
         local f = io.popen("amixer get " .. alsabar.channel)
         local mixer = f:read("*all")
         f:close()
 
         -- Capture mixer control state:          [5%] ... ... [on]
         -- Get mixer control contents
         local f = io.popen("amixer get " .. alsabar.channel)
         local mixer = f:read("*all")
         f:close()
 
         -- Capture mixer control state:          [5%] ... ... [on]
-        local volu, mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)") 
+        local volu, mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
 
         if volu == nil then
             volu = 0
 
         if volu == nil then
             volu = 0
@@ -119,49 +132,44 @@ local function worker(args)
         alsabar._current_level = tonumber(volu) / 100
         alsabar.bar:set_value(alsabar._current_level)
 
         alsabar._current_level = tonumber(volu) / 100
         alsabar.bar:set_value(alsabar._current_level)
 
-        if mute == "" and volu == "0" or mute == "off"
+        if not mute and tonumber(volu) == 0 or mute == "off"
         then
             alsabar._muted = true
             alsabar.tooltip:set_text (" [Muted] ")
             alsabar.bar:set_color(alsabar.colors.mute)
         else
             alsabar._muted = false
         then
             alsabar._muted = true
             alsabar.tooltip:set_text (" [Muted] ")
             alsabar.bar:set_color(alsabar.colors.mute)
         else
             alsabar._muted = false
-            alsabar.tooltip:set_text(" " .. alsabar.channel .. ": " .. volu .. "% ")
+            alsabar.tooltip:set_text(string.format(" %s:%s ", alsabar.channel, volu))
             alsabar.bar:set_color(alsabar.colors.unmute)
         end
             alsabar.bar:set_color(alsabar.colors.unmute)
         end
+
+        volume_now = {}
+        volume_now.level = tonumber(volu)
+        volume_now.status = mute
+        settings()
     end
 
     end
 
-    newtimer("alsabar", 5, update)
+    newtimer("alsabar", timeout, alsabar.update)
 
     alsabar.bar:buttons (awful.util.table.join (
           awful.button ({}, 1, function()
             awful.util.spawn(alsabar.mixer)
           end),
           awful.button ({}, 3, function()
 
     alsabar.bar:buttons (awful.util.table.join (
           awful.button ({}, 1, function()
             awful.util.spawn(alsabar.mixer)
           end),
           awful.button ({}, 3, function()
-            awful.util.spawn("amixer sset " .. alsabar.channel .. " toggle")
-            myvolumebarupdate()
+            awful.util.spawn(string.format("amixer set %s toggle", alsabar.channel))
+            alsabar.update()
           end),
           awful.button ({}, 4, function()
           end),
           awful.button ({}, 4, function()
-            awful.util.spawn("amixer sset " .. alsabar.channel .. " "
-                              .. alsabar.step .. "+")
-            myvolumebarupdate()
+            awful.util.spawn(string.format("amixer set %s %s+", alsabar.channel, alsabar.step))
+            alsabar.update()
           end),
           awful.button ({}, 5, function()
           end),
           awful.button ({}, 5, function()
-            awful.util.spawn("amixer sset " .. alsabar.channel .. " "
-                              .. alsabar.step .. "-")
-            myvolumebarupdate()
+            awful.util.spawn(string.format("amixer set %s %s-", alsabar.channel, alsabar.step))
+            alsabar.update()
           end)
     ))
 
           end)
     ))
 
-    return { 
-        widget  = alsabar.bar,
-        channel = alsabar.channel, 
-        step    = alsabar.step,
-        notify  = function() 
-                    update()
-                    alsabar.notify()
-                  end
-    }
+    return alsabar
 end
 
 return setmetatable(alsabar, { __call = function(_, ...) return worker(...) end })
 end
 
 return setmetatable(alsabar, { __call = function(_, ...) return worker(...) end })
awesome window-manager configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.