[brightness] rework brightness widget

also remove brightnessarc widget, as now it's possible to create arcchart widget in brightness widget

1 files changed, 108 insertions, 39 deletions

diff --git a/brightness-widget/brightness.lua b/brightness-widget/brightness.lua
index 4686041..d5a79a9 100644
--- a/brightness-widget/brightness.lua
+++ b/brightness-widget/brightness.lua
@@ -5,66 +5,135 @@
 -- https://github.com/streetturtle/awesome-wm-widgets/tree/master/brightness-widget
 
 -- @author Pavel Makhov
--- @copyright 2017-2019 Pavel Makhov
+-- @copyright 2021 Pavel Makhov
 -------------------------------------------------
 
+local awful = require("awful")
 local wibox = require("wibox")
 local watch = require("awful.widget.watch")
 local spawn = require("awful.spawn")
+local naughty = require("naughty")
 
-local PATH_TO_ICON = "/usr/share/icons/Arc/status/symbolic/display-brightness-symbolic.svg"
-local GET_BRIGHTNESS_CMD = "light -G"   -- "xbacklight -get"
-local INC_BRIGHTNESS_CMD = "light -A 5" -- "xbacklight -inc 5"
-local DEC_BRIGHTNESS_CMD = "light -U 5" -- "xbacklight -dec 5"
+local ICON_DIR = os.getenv("HOME") .. '/.config/awesome/awesome-wm-widgets/brightness-widget/'
+local get_brightness_cmd
+local inc_brightness_cmd
+local dec_brightness_cmd
 
 local brightness_widget = {}
 
+local function show_warning(message)
+    naughty.notify{
+        preset = naughty.config.presets.critical,
+        title = 'Brightness Widget',
+        text = message}
+end
+
 local function worker(user_args)
 
     local args = user_args or {}
 
-    local get_brightness_cmd = args.get_brightness_cmd or GET_BRIGHTNESS_CMD
-    local inc_brightness_cmd = args.inc_brightness_cmd or INC_BRIGHTNESS_CMD
-    local dec_brightness_cmd = args.dec_brightness_cmd or DEC_BRIGHTNESS_CMD
-    local path_to_icon = args.path_to_icon or PATH_TO_ICON
+    local type = args.type or 'arc' -- arc or icon_and_text
+    local path_to_icon = args.path_to_icon or ICON_DIR .. 'brightness.svg'
     local font = args.font or 'Play 9'
-    local timeout = args.timeout or 1
-
-    local brightness_text = wibox.widget.textbox()
-    brightness_text:set_font(font)
-
-    local brightness_icon = wibox.widget {
-        {
-            image = path_to_icon,
-            resize = false,
-            widget = wibox.widget.imagebox,
-        },
-        top = 3,
-        widget = wibox.container.margin
-    }
-
-    brightness_widget = wibox.widget {
-        brightness_icon,
-        brightness_text,
-        layout = wibox.layout.fixed.horizontal,
-    }
+    local timeout = args.timeout or 100
+
+    local program = args.program or 'light'
+    local step = args.step or 5
+    if program == 'light' then
+        get_brightness_cmd = 'sh -c "light -G"'
+        inc_brightness_cmd = 'sh -c "light -A ' .. step .. '"'
+        dec_brightness_cmd = 'sh -c "light -U ' .. step .. '"'
+    elseif program == 'xbacklight' then
+        get_brightness_cmd = 'xbacklight -get'
+        inc_brightness_cmd = 'xbacklight -inc ' .. step
+        dec_brightness_cmd = 'xbacklight -dec ' .. step
+    else
+        show_warning(program .. " command is not supported by the widget")
+        return
+    end
+
+    if type == 'icon_and_text' then
+        brightness_widget.widget = wibox.widget {
+            {
+                {
+                    image = path_to_icon,
+                    resize = false,
+                    widget = wibox.widget.imagebox,
+                },
+                valigh = 'center',
+                layout = wibox.container.place
+            },
+            {
+                id = 'txt',
+                font = font,
+                widget = wibox.widget.textbox
+            },
+            spacing = 4,
+            layout = wibox.layout.fixed.horizontal,
+            set_value = function(self, level)
+                self:get_children_by_id('txt')[1]:set_text(level .. '%')
+            end
+        }
+    elseif type == 'arc' then
+        brightness_widget.widget = wibox.widget {
+            {
+                {
+                    image = path_to_icon,
+                    resize = true,
+                    widget = wibox.widget.imagebox,
+                },
+                valigh = 'center',
+                layout = wibox.container.place
+            },
+            max_value = 100,
+            thickness = 2,
+            start_angle = 4.71238898, -- 2pi*3/4
+            forced_height = 18,
+            forced_width = 18,
+            bg = bg_color,
+            paddings = 2,
+            colors = {color},
+            widget = wibox.container.arcchart,
+            set_value = function(self, level)
+                self:set_value(level)
+            end
+        }
+    else
+        show_warning(type .. " type is not supported by the widget")
+        return
+
+    end
 
     local update_widget = function(widget, stdout, _, _, _)
         local brightness_level = tonumber(string.format("%.0f", stdout))
-        widget:set_text(" " .. brightness_level .. "%")
+        widget:set_value(brightness_level)
+    end
+
+    function brightness_widget:inc()
+        spawn.easy_async(inc_brightness_cmd, function()
+            spawn.easy_async(get_brightness_cmd, function(out)
+                update_widget(brightness_widget.widget, out)
+            end)
+        end)
+    end
+    function brightness_widget:dec()
+        spawn.easy_async(dec_brightness_cmd, function()
+            spawn.easy_async(get_brightness_cmd, function(out)
+                update_widget(brightness_widget.widget, out)
+            end)
+        end)
     end
 
-    brightness_widget:connect_signal("button::press", function(_, _, _, button)
-        if (button == 4) then
-            spawn(inc_brightness_cmd, false)
-        elseif (button == 5) then
-            spawn(dec_brightness_cmd, false)
-        end
-    end)
+    brightness_widget.widget:buttons(
+            awful.util.table.join(
+                    awful.button({}, 4, function() brightness_widget:inc() end),
+                    awful.button({}, 5, function() brightness_widget:dec() end)
+            )
+    )
 
-    watch(get_brightness_cmd, timeout, update_widget, brightness_text)
+    watch(get_brightness_cmd, timeout, update_widget, brightness_widget.widget)
 
-    return brightness_widget
+    return brightness_widget.widget
 end
 
 return setmetatable(brightness_widget, { __call = function(_, ...)