From: copycat-killer Date: Mon, 23 Jan 2017 14:28:35 +0000 (+0100) Subject: wiki updated X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/0180aa3bc348520c01479c40cdf6343e36ce3e59?ds=inline wiki updated --- diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua index 430063b..6a03a10 100644 --- a/widgets/alsabar.lua +++ b/widgets/alsabar.lua @@ -1,7 +1,10 @@ + --[[ - 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 helpers = require("lain.helpers") @@ -13,20 +16,11 @@ local string = { format = string.format, match = string.match, rep = string.rep } local tonumber = tonumber -local type = type local setmetatable = setmetatable -local terminal = "urxvtc" or "xterm" -- ALSA volume bar -- lain.widgets.alsabar local alsabar = { -<<<<<<< HEAD -======= - channel = "Master", - step = "1%", - mixer = "amixer", - ->>>>>>> 09c0a3f27b6c0b61a55e7875b9a967e98cd3daf8 colors = { background = "#000000", mute = "#EB8F8F", @@ -38,16 +32,15 @@ local alsabar = { } local function worker(args) - local args = args or {} - local timeout = args.timeout or 5 - local settings = args.settings or function() end - local width = args.width or 63 - local height = args.height or 1 - local ticks = args.ticks or false - local ticks_size = args.ticks_size or 7 - local vertical = args.vertical or false - -<<<<<<< HEAD + local args = args or {} + local timeout = args.timeout or 5 + local settings = args.settings or function() end + local width = args.width or 63 + local height = args.height or 1 + local ticks = args.ticks or false + local ticks_size = args.ticks_size or 7 + local vertical = args.vertical or false + alsabar.cmd = args.cmd or "amixer" alsabar.channel = args.channel or "Master" alsabar.colors = args.colors or alsabar.colors @@ -58,18 +51,6 @@ local function worker(args) if not alsabar.notification_preset then alsabar.notification_preset = naughty.config.defaults alsabar.notification_preset.font = "Monospace 11" -======= - alsabar.mixer = args.mixer or alsabar.mixer - alsabar.channel = args.channel or alsabar.channel - alsabar.togglechannel = args.togglechannel or alsabar.togglechannel - alsabar.cmd = args.cmd or {"bash", "-c", string.format("%s get %s", alsabar.mixer, alsabar.channel)} - alsabar.step = args.step or alsabar.step - alsabar.colors = args.colors or alsabar.colors - alsabar.notifications = args.notifications or alsabar.notifications - alsabar.followtag = args.followtag or false - if alsabar.togglechannel then - alsabar.cmd = args.cmd or { "bash", "-c", string.format("%s get %s; %s get %s", alsabar.mixer, alsabar.channel, alsabar.mixer, alsabar.togglechannel)} ->>>>>>> 09c0a3f27b6c0b61a55e7875b9a967e98cd3daf8 end alsabar.bar = wibox.widget { @@ -85,34 +66,12 @@ local function worker(args) layout = vertical and wibox.container.rotate } - alsabar.bar:buttons (awful.util.table.join( - awful.button({}, 1, function() - awful.spawn(string.format('%s -e alsamixer', terminal)) - end), - awful.button({}, 2, function() - awful.spawn(string.format("%s set %s 100%%", alsabar.mixer, alsabar.channel)) - alsabar.update() - end), - awful.button({}, 3, function() - awful.spawn(string.format("%s set %s toggle", alsabar.mixer, alsabar.togglechannel or alsabar.channel)) - alsabar.update() - end), - awful.button({}, 4, function() - awful.spawn(string.format("%s set %s %s+", alsabar.mixer, alsabar.channel, alsabar.step)) - alsabar.update() - end), - awful.button({}, 5, function() - awful.spawn(string.format("%s set %s %s-", alsabar.mixer, alsabar.channel, alsabar.step)) - alsabar.update() - end))) - alsabar.tooltip = awful.tooltip({ objects = { alsabar.bar } }) - function alsabar.update(callback) + function alsabar.update() helpers.async(alsabar.cmd, function(mixer) local volu,mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)") - if (volu and tonumber(volu) ~= alsabar._current_level) or (mute and string.match(mute, "on") ~= alsabar._muted) - then + if (volu and tonumber(volu) ~= alsabar._current_level) or (mute and string.match(mute, "on") ~= alsabar._muted) then alsabar._current_level = tonumber(volu) or alsabar._current_level alsabar.bar:set_value(alsabar._current_level / 100) if (not mute and tonumber(volu) == 0) or mute == "off" then @@ -130,8 +89,6 @@ local function worker(args) volume_now.status = mute settings() - - if type(callback) == "function" then callback() end end end) end @@ -152,12 +109,10 @@ local function worker(args) if alsabar.followtag then preset.screen = awful.screen.focused() end - if alsabar._notify == "on" then - alsabar.id = naughty.notify ({ - replaces_id = alsabar.id, - preset = preset - }).id - end + alsabar.id = naughty.notify ({ + replaces_id = alsabar.id, + preset = preset + }).id end) end diff --git a/wiki b/wiki index a361f62..2e19b23 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit a361f62a126fb7de921bc3c49db8a35bebad355a +Subproject commit 2e19b23ba12894682699acdb70eeb130e51a9f3b