From 51ddb1efba57b4c41addd3a00b87bce2c2443741 Mon Sep 17 00:00:00 2001
From: Andreas Longo <git@andreaslongo.com>
Date: Tue, 15 Feb 2022 18:03:08 +0100
Subject: Fix #209: Match space characters in battery status string

---
 batteryarc-widget/batteryarc.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'batteryarc-widget')

diff --git a/batteryarc-widget/batteryarc.lua b/batteryarc-widget/batteryarc.lua
index 1b6752a..3d38af4 100644
--- a/batteryarc-widget/batteryarc.lua
+++ b/batteryarc-widget/batteryarc.lua
@@ -89,7 +89,7 @@ local function worker(user_args)
         local charge = 0
         local status
         for s in stdout:gmatch("[^\r\n]+") do
-            local cur_status, charge_str, _ = string.match(s, '.+: (%a+), (%d?%d?%d)%%,?(.*)')
+            local cur_status, charge_str, _ = string.match(s, '.+: ([%a%s]+), (%d?%d?%d)%%,?(.*)')
             if cur_status ~= nil and charge_str ~=nil then
                 local cur_charge = tonumber(charge_str)
                 if cur_charge > charge then
-- 
cgit v1.2.3


From fbe207a0f9110dc3a686cb85d9f2bea19bc0aef3 Mon Sep 17 00:00:00 2001
From: Andrew Slice <edward.andrew.slice@gmail.com>
Date: Mon, 11 Apr 2022 17:26:01 -0400
Subject: Add notification_position parameters to batteryarc-widget. Add
 widget_height and widget_width parameters to ram-widget.

---
 batteryarc-widget/README.md      | 1 +
 batteryarc-widget/batteryarc.lua | 2 ++
 ram-widget/README.md             | 2 ++
 ram-widget/ram-widget.lua        | 5 ++++-
 4 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'batteryarc-widget')

diff --git a/batteryarc-widget/README.md b/batteryarc-widget/README.md
index a257b2f..98a2956 100644
--- a/batteryarc-widget/README.md
+++ b/batteryarc-widget/README.md
@@ -39,6 +39,7 @@ It is possible to customize widget by providing a table with all or some of the
 | `warning_msg_icon` | ~/.config/awesome/awesome-wm-widgets/batteryarc-widget/spaceman.jpg | Icon of the warning popup |
 | `enable_battery_warning` | `true` | Display low battery warning |
 | `show_notification_mode` | `on_hover` | How to trigger a notification with the battery status: `on_hover`, `on_click` or `off`  |
+| `notification_position` | `top_left` | Where to show she notification when triggered. Values: `top_right`, `top_left`, `bottom_left`, `bottom_right`, `top_middle`, `bottom_middle`. (default `top_right`) |
 
 ## Requirements
 
diff --git a/batteryarc-widget/batteryarc.lua b/batteryarc-widget/batteryarc.lua
index 1b6752a..161e114 100644
--- a/batteryarc-widget/batteryarc.lua
+++ b/batteryarc-widget/batteryarc.lua
@@ -29,6 +29,7 @@ local function worker(user_args)
     local size = args.size or 18
     local timeout = args.timeout or 10
     local show_notification_mode = args.show_notification_mode or 'on_hover' -- on_hover / on_click
+    local notification_position = args.notification_position or 'top_right' -- see naughty.notify position argument
 
     local main_color = args.main_color or beautiful.fg_color
     local bg_color = args.bg_color or '#ffffff11'
@@ -146,6 +147,7 @@ local function worker(user_args)
                         title = "Battery status",
                         timeout = 5,
                         width = 200,
+                        position = notification_position,
                     }
                 end)
     end
diff --git a/ram-widget/README.md b/ram-widget/README.md
index 6e80976..568245b 100644
--- a/ram-widget/README.md
+++ b/ram-widget/README.md
@@ -15,6 +15,8 @@ It is possible to customize widget by providing a table with all or some of the
 | `color_used` | `beautiful.bg_urgent` | Color for used RAM |
 | `color_free` | `beautiful.fg_normal` | Color for free RAM |
 | `color_buf`  | `beautiful.border_color_active` | Color for buffers/cache |
+| `widget_height` | `25` | Height of the widget |
+| `widget_width` | `25` | Width of the widget |
 | `widget_show_buf`  | `false` | Whether to display buffers/cache separately in the tray widget. If `false`, buffers/cache are considered free RAM. |
 | `timeout`    | 1 | How often (in seconds) the widget refreshes |
 
diff --git a/ram-widget/ram-widget.lua b/ram-widget/ram-widget.lua
index 1b5cdcf..867d28e 100644
--- a/ram-widget/ram-widget.lua
+++ b/ram-widget/ram-widget.lua
@@ -15,6 +15,8 @@ local function worker(user_args)
     local color_free = args.color_free or beautiful.fg_normal
     local color_buf  = args.color_buf  or beautiful.border_color_active
     local widget_show_buf = args.widget_show_buf or false
+    local widget_height = args.widget_height or 25
+    local widget_width = args.widget_width or 25
 
     --- Main ram widget shown on wibar
     ramgraph_widget = wibox.widget {
@@ -25,7 +27,8 @@ local function worker(user_args)
            color_buf,
         },
         display_labels = false,
-        forced_width = 25,
+        forced_height = widget_height,
+        forced_width = widget_width,
         widget = wibox.widget.piechart
     }
 
-- 
cgit v1.2.3