util.markup: fixed typos

diff --git a/util/markup.lua b/util/markup.lua
index 6d1331eb7672c1917d4877096058131c21602caf..63f94864da231fed330a7f6cdb268df1076f205c 100644 (file)
--- a/util/markup.lua
+++ b/util/markup.lua
@@ -25,37 +25,37 @@ function markup.small(text)     return format("<small>%s</small>", text) end
 
 -- Set the font
 function markup.font(font, text)
 
 -- Set the font
 function markup.font(font, text)

-  return format("<span font='%s'>%s</span>", font, text)
+    return format("<span font='%s'>%s</span>", font, text)

 end
 
 -- Set the foreground
 function markup.fg.color(color, text)
 end
 
 -- Set the foreground
 function markup.fg.color(color, text)

-  return format("<span foreground='%s'>%s</span>", fg, bg, text)
+    return format("<span foreground='%s'>%s</span>", color, text)

 end
 
 -- Set the background
 function markup.bg.color(color, text)
 end
 
 -- Set the background
 function markup.bg.color(color, text)

-  return format("<span background='%s'>%s</span>", fg, bg, text)
+    return format("<span background='%s'>%s</span>", color, text)

 end
 
 -- Set foreground and background
 function markup.color(fg, bg, text)
 end
 
 -- Set foreground and background
 function markup.color(fg, bg, text)

-  return format("<span foreground='%s' background='%s'>%s</span>", fg, bg, text)
+    return format("<span foreground='%s' background='%s'>%s</span>", fg, bg, text)

 end
 
 -- Set font and foreground
 function markup.fontfg(font, fg, text)
 end
 
 -- Set font and foreground
 function markup.fontfg(font, fg, text)

-  return format("<span font='%s' foreground='%s'>%s</span>", font, fg, text)
+    return format("<span font='%s' foreground='%s'>%s</span>", font, fg, text)

 end
 
 -- Set font and background
 function markup.fontbg(font, bg, text)
 end
 
 -- Set font and background
 function markup.fontbg(font, bg, text)

-  return format("<span font='%s' background='%s'>%s</span>", font, bg, text)
+    return format("<span font='%s' background='%s'>%s</span>", font, bg, text)

 end
 
 -- Set font, foreground and background
 function markup.fontcolor(font, fg, bg, text)
 end
 
 -- Set font, foreground and background
 function markup.fontcolor(font, fg, bg, text)

-  return format("<span font='%s' foreground='%s' background='%s'>%s</span>", font, fg, bg, text)
+    return format("<span font='%s' foreground='%s' background='%s'>%s</span>", font, fg, bg, text)

 end
 
 -- link markup.{fg,bg}(...) calls to markup.{fg,bg}.color(...)
 end
 
 -- link markup.{fg,bg}(...) calls to markup.{fg,bg}.color(...)

diff --git a/widget/alsabar.lua b/widget/alsabar.lua
index 557e97b8d31486116723c0ba39866adfb2d7a10d..9601f09242f5426ece53cb431714f7f6f08f92be 100644 (file)
--- a/widget/alsabar.lua
+++ b/widget/alsabar.lua
@@ -36,8 +36,11 @@ local function factory(args)
     local settings   = args.settings or function() end
     local width      = args.width or 63
     local height     = args.height or 1
     local settings   = args.settings or function() end
     local width      = args.width or 63
     local height     = args.height or 1

+    local margins    = args.margins or 1
+    local paddings   = args.paddings or 1

     local ticks      = args.ticks or false
     local ticks_size = args.ticks_size or 7
     local ticks      = args.ticks or false
     local ticks_size = args.ticks_size or 7

+    local step       = args.step or '5%'

 
     alsabar.cmd                 = args.cmd or "amixer"
     alsabar.channel             = args.channel or "Master"
 
     alsabar.cmd                 = args.cmd or "amixer"
     alsabar.channel             = args.channel or "Master"


@@ -51,10 +54,13 @@ local function factory(args)
         alsabar.notification_preset.font = "Monospace 10"
     end
 
         alsabar.notification_preset.font = "Monospace 10"
     end
 

-    local format_cmd = string.format("%s get %s", alsabar.cmd, alsabar.channel)
+    local format_get_cmd = string.format("%s get %s", alsabar.cmd, alsabar.channel)
+    local format_inc_cmd = string.format("%s sset %s %s+", alsabar.cmd, alsabar.channel, step)
+    local format_dec_cmd = string.format("%s sset %s %s-" , alsabar.cmd, alsabar.channel, step)
+    local format_tog_cmd = string.format("%s sset %s toggle", alsabar.cmd, alsabar.channel)

 
     if alsabar.togglechannel then
 
     if alsabar.togglechannel then

-        format_cmd = { awful.util.shell, "-c", string.format("%s get %s; %s get %s",
+        format_get_cmd = { awful.util.shell, "-c", string.format("%s get %s; %s get %s",

         alsabar.cmd, alsabar.channel, alsabar.cmd, alsabar.togglechannel) }
     end
 
         alsabar.cmd, alsabar.channel, alsabar.cmd, alsabar.togglechannel) }
     end
 


@@ -63,8 +69,8 @@ local function factory(args)
         forced_width     = width,
         color            = alsabar.colors.unmute,
         background_color = alsabar.colors.background,
         forced_width     = width,
         color            = alsabar.colors.unmute,
         background_color = alsabar.colors.background,

-        margins          = 1,
-        paddings         = 1,
+        margins          = margins,
+        paddings         = paddings,

         ticks            = ticks,
         ticks_size       = ticks_size,
         widget           = wibox.widget.progressbar
         ticks            = ticks,
         ticks_size       = ticks_size,
         widget           = wibox.widget.progressbar


@@ -73,7 +79,7 @@ local function factory(args)
     alsabar.tooltip = awful.tooltip({ objects = { alsabar.bar } })
 
     function alsabar.update(callback)
     alsabar.tooltip = awful.tooltip({ objects = { alsabar.bar } })
 
     function alsabar.update(callback)

-        helpers.async(format_cmd, function(mixer)
+        helpers.async(format_get_cmd, function(mixer)

             local vol, playback = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
 
             if not vol or not playback then return end
             local vol, playback = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
 
             if not vol or not playback then return end


@@ -146,6 +152,14 @@ local function factory(args)
 
     helpers.newtimer(string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel), timeout, alsabar.update)
 
 
     helpers.newtimer(string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel), timeout, alsabar.update)
 

+    alsabar.bar:connect_signal("button::press", function(_,_,_,button)
+    if (button == 4)     then awful.spawn(format_inc_cmd)
+    elseif (button == 5) then awful.spawn(format_dec_cmd)
+    elseif (button == 1) then awful.spawn(format_tog_cmd)
+    end
+    alsabar.update()
+end)
+

     return alsabar
 end
 
     return alsabar
 end
 

diff --git a/wiki b/wiki
index 0d9b19badf44b16c27663dd4dc7f49699a51be73..1acb69eb3cf431b9102978c6117144980e8a2939 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 0d9b19badf44b16c27663dd4dc7f49699a51be73
+Subproject commit 1acb69eb3cf431b9102978c6117144980e8a2939