Merge branch 'master' of adastra7.net:yessiest/reno

Rakefile

@@ -62,7 +62,10 @@ end
 
 desc "Uninstall from .config"
 task :clean do
-  rm_rf "#{ConfigPath}/awesome"
+  base = ["libs","modules","themes","widgets","rc.lua"]
+  base.each { |x| 
+    rm_rf "#{ConfigPath}/awesome/"+x
+  }
 end 
 
 desc "Wipe configuration and reinstall from scratch"

desktop.conf

@@ -3,7 +3,7 @@
 terminal    = "$HOME/.local/bin/st"
 browser     = "prime-run librewolf"
 modkey      = "Mod4"
-theme       = "unity"
+theme       = "reno98"
 shell       = "zsh"
 
 # Keybindings

modules/desktop.lua

@@ -232,3 +232,27 @@ client.connect_signal("manage",function(c)
     end
 end)
 end --}}}
+
+-- Find a client to focus on when switching tags
+for s in screen do
+    for _,t in pairs(awful.tag.gettags(s)) do
+        t:connect_signal("property::selected", function(t)
+            if not client.focus then
+                local c = t:clients()[1]
+                if c then
+                    client.focus = c
+                end
+            end
+        end)
+    end
+end
+-- Focus on the previous client once the newer client is closed
+client.connect_signal("unmanage",function(c)
+    local focused_clients = screen.primary.clients
+    local prev
+    for _,v in pairs(focused_clients) do
+        if v == c then break end
+        prev = v
+    end
+    client.focus = prev
+end)

themes/reno98/COPYRIGHT

@@ -0,0 +1,12 @@
+Notice: all assets in the layouts directory and taglist directory, as well as submenu.png, belong to the AwesomeWM team and respective authors of these assets.
+
+The following assets in the titlebar directory are made specifically for reno98 and are licensed under CC0:
+close_focus.png
+close_normal.png
+maximized_focus_inactive.png
+maximized_normal_inactive.png
+maximized_normal_active.png
+minimize_focus.png
+minimize_normal.png
+
+Other assets in the directory are kept from the default theme of AwesomeWM and belong to the respecitve authors.

themes/reno98/config/global.json

@@ -1,7 +1,7 @@
 {
     "widgets.dismal":{
-        "x":0,
+        "pos":"top_left",
-        "y":26
+        "ignore_wibars":false
     },
     "widgets.rootmenu":{},
     "widgets.lockscreen":{},

themes/reno98/icons/README

@@ -1,3 +1,3 @@
 Licensed under conditions of CC0 (https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt)
 
-To the extent possible under law, Yessiest (yessiest@memeware.net) has waived all copyright and related or neighboring rights to Reno98 icons
+To the extent possible under law, Yessiest (yessiest@memeware.net) has waived all copyright and related or neighboring rights to Reno icons

themes/reno98/theme.lua

@@ -325,6 +325,7 @@ theme["battery-missing-symbolic"] = themes_path.."reno98/icons/battery-missing-s
 theme["ac-adapter-symbolic"] = themes_path.."reno98/icons/ac-adapter-symbolic.png"
 theme["backlight-symbolic"] = themes_path.."reno98/icons/backlight-symbolic.png"
 theme["notifications-area-symbolic"] = themes_path.."reno98/icons/notifications-area-symbolic.png"
+theme["notifications-area-flagged-symbolic"] = themes_path.."reno98/icons/notifications-area-flagged-symbolic.png"
 
 theme["mpc-previous-symbolic"] = themes_path.."reno98/icons/mpc-previous-symbolic.png"
 
@@ -335,6 +336,11 @@ theme["mpc-next-symbolic"] = themes_path.."reno98/icons/mpc-next-symbolic.png"
 theme["action-poweroff-symbolic"] = themes_path.."reno98/icons/action-poweroff-symbolic.png"
 theme["action-lock-screen-symbolic"] = themes_path.."reno98/icons/action-lock-screen-symbolic.png"
 theme["action-suspend-symbolic"] = themes_path.."reno98/icons/action-suspend-symbolic.png"
+theme["volume-high-symbolic"] = themes_path.."reno98/icons/volume-high-symbolic.png"
+theme["volume-medium-symbolic"] = themes_path.."reno98/icons/volume-medium-symbolic.png"
+theme["volume-low-symbolic"] = themes_path.."reno98/icons/volume-low-symbolic.png"
+theme["volume-muted-symbolic"] = themes_path.."reno98/icons/volume-muted-symbolic.png"
+
 -- Notification popups settings
 theme.notification_width = 240
 theme.notification_height = 60

themes/serenity/COPYRIGHT

@@ -0,0 +1,12 @@
+Notice: all assets in the layouts directory and taglist directory, as well as submenu.png, belong to the AwesomeWM team and respective authors of these assets.
+
+The following assets in the titlebar directory are made specifically for reno98 and are licensed under CC0:
+close_focus.png
+close_normal.png
+maximized_focus_inactive.png
+maximized_normal_inactive.png
+maximized_normal_active.png
+minimize_focus.png
+minimize_normal.png
+
+Other assets in the directory are kept from the default theme of AwesomeWM and belong to the respecitve authors.

themes/serenity/config/global.json

@@ -1,7 +1,7 @@
 {
     "widgets.dismal":{
-        "x":0,
+        "pos":"top_left",
-        "y":26
+        "ignore_wibars":false
     },
     "widgets.rootmenu":{},
     "widgets.lockscreen":{},

themes/serenity/icons/README

@@ -1,3 +1,3 @@
 Licensed under conditions of CC0 (https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt)
 
-To the extent possible under law, Yessiest (yessiest@memeware.net) has waived all copyright and related or neighboring rights to Reno98 icons
+To the extent possible under law, Yessiest (yessiest@memeware.net) has waived all copyright and related or neighboring rights to Reno icons

themes/serenity/theme.lua

@@ -427,6 +427,7 @@ theme["battery-missing-symbolic"] = themes_path.."serenity/icons/battery-missing
 theme["ac-adapter-symbolic"] = themes_path.."serenity/icons/ac-adapter-symbolic.png"
 theme["backlight-symbolic"] = themes_path.."serenity/icons/backlight-symbolic.png"
 theme["notifications-area-symbolic"] = themes_path.."serenity/icons/notifications-area-symbolic.png"
+theme["notifications-area-flagged-symbolic"] = themes_path.."serenity/icons/notifications-area-flagged-symbolic.png"
 
 theme["mpc-previous-symbolic"] = themes_path.."serenity/icons/mpc-previous-symbolic.png"
 
@@ -437,6 +438,10 @@ theme["mpc-next-symbolic"] = themes_path.."serenity/icons/mpc-next-symbolic.png"
 theme["action-poweroff-symbolic"] = themes_path.."serenity/icons/action-poweroff-symbolic.png"
 theme["action-lock-screen-symbolic"] = themes_path.."serenity/icons/action-lock-screen-symbolic.png"
 theme["action-suspend-symbolic"] = themes_path.."serenity/icons/action-suspend-symbolic.png"
+theme["volume-high-symbolic"] = themes_path.."serenity/icons/volume-high-symbolic.png"
+theme["volume-medium-symbolic"] = themes_path.."serenity/icons/volume-medium-symbolic.png"
+theme["volume-low-symbolic"] = themes_path.."serenity/icons/volume-low-symbolic.png"
+theme["volume-muted-symbolic"] = themes_path.."serenity/icons/volume-muted-symbolic.png"
 -- Notification popups settings
 theme.notification_width = 240
 theme.notification_height = 60

themes/unity/COPYRIGHT

@@ -0,0 +1,14 @@
+Notice: all assets in the layouts directory and taglist directory, as well as submenu.png, belong to the AwesomeWM team and respective authors of these assets.
+
+The following assets in the titlebar directory are taken from the Ambiance theme:
+close_focus.png
+close_normal.png
+maximized_focus_inactive.png
+maximized_normal_inactive.png
+maximized_normal_active.png
+minimize_focus.png
+minimize_normal.png
+
+Other assets in the directory are kept from the default theme of AwesomeWM and belong to the respecitve authors.
+
+background.png art is taken from Ubuntu release 20.04

themes/unity/WARNING.txt

@@ -1,3 +1,3 @@
 A compositor (like compton) is ***required*** for this theme to work as intended.
 This is in part due to the fact that it makes the top bar look less bland, and in part due to the fact that your titlebar corners will look weird otherwise (the corners won't be properly cut).
-You may, of course, dismiss using a compositor, but don't tell me about not exactly round corners being a "bug" in this theme afterwards - it's the best you can get with Awesome.
+You may, of course, dismiss using a compositor, but don't tell me about not exactly round corners being a "bug" in this theme afterwards - it's the best you can get with X11.

themes/unity/config/global.json

@@ -1,7 +1,7 @@
 {
     "widgets.dismal":{
-        "x":0,
+        "pos":"top_left",
-        "y":26
+        "ignore_wibars":false
     },
     "widgets.rootmenu":{},
     "widgets.lockscreen":{},

themes/unity/icons/README

@@ -1,3 +1,3 @@
 Licensed under conditions of CC0 (https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt)
 
-To the extent possible under law, Yessiest (yessiest@memeware.net) has waived all copyright and related or neighboring rights to Reno98 icons
+To the extent possible under law, Yessiest (yessiest@memeware.net) has waived all copyright and related or neighboring rights to Reno icons

themes/unity/theme.lua

@@ -227,6 +227,7 @@ theme["battery-missing-symbolic"] = themes_path.."unity/icons/battery-missing-sy
 theme["ac-adapter-symbolic"] = themes_path.."unity/icons/ac-adapter-symbolic.png"
 theme["backlight-symbolic"] = themes_path.."unity/icons/backlight-symbolic.png"
 theme["notifications-area-symbolic"] = themes_path.."unity/icons/notifications-area-symbolic.png"
+theme["notifications-area-flagged-symbolic"] = themes_path.."unity/icons/notifications-area-flagged-symbolic.png"
 
 theme["mpc-previous-symbolic"] = themes_path.."unity/icons/mpc-previous-symbolic.png"
 
@@ -265,6 +266,7 @@ for _,v in pairs({
     "ac-adapter-symbolic",
     "backlight-symbolic",
     "notifications-area-symbolic",
+    "notifications-area-flagged-symbolic",
     "mpc-previous-symbolic",
     "mpc-play-symbolic",
     "mpc-pause-symbolic",

themes/unity_mate/COPYRIGHT

@@ -0,0 +1,14 @@
+Notice: all assets in the layouts directory and taglist directory, as well as submenu.png, belong to the AwesomeWM team and respective authors of these assets.
+
+The following assets in the titlebar directory are taken from the Ambiance theme:
+close_focus.png
+close_normal.png
+maximized_focus_inactive.png
+maximized_normal_inactive.png
+maximized_normal_active.png
+minimize_focus.png
+minimize_normal.png
+
+Other assets in the directory are kept from the default theme of AwesomeWM and belong to the respecitve authors.
+
+background.png art is taken from Ubuntu release 20.04

themes/unity_mate/WARNING.txt

@@ -1,3 +1,3 @@
 A compositor (like compton) is ***required*** for this theme to work as intended.
 This is in part due to the fact that it makes the top bar look less bland, and in part due to the fact that your titlebar corners will look weird otherwise (the corners won't be properly cut).
-You may, of course, dismiss using a compositor, but don't tell me about not exactly round corners being a "bug" in this theme afterwards - it's the best you can get with Awesome.
+You may, of course, dismiss using a compositor, but don't tell me about not exactly round corners being a "bug" in this theme afterwards - it's the best you can get with X11.

themes/unity_mate/config/global.json

@@ -1,7 +1,7 @@
 {
     "widgets.dismal":{
-        "x":0,
+        "pos":"top_left",
-        "y":26
+        "ignore_wibars":false
     },
     "widgets.rootmenu":{},
     "widgets.lockscreen":{},

themes/unity_mate/icons/README

@@ -1,3 +1,3 @@
 Licensed under conditions of CC0 (https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt)
 
-To the extent possible under law, Yessiest (yessiest@memeware.net) has waived all copyright and related or neighboring rights to Reno98 icons
+To the extent possible under law, Yessiest (yessiest@memeware.net) has waived all copyright and related or neighboring rights to Reno icons

themes/unity_mate/theme.lua

@@ -227,6 +227,7 @@ theme["battery-missing-symbolic"] = themes_path.."unity_mate/icons/battery-missi
 theme["ac-adapter-symbolic"] = themes_path.."unity_mate/icons/ac-adapter-symbolic.png"
 theme["backlight-symbolic"] = themes_path.."unity_mate/icons/backlight-symbolic.png"
 theme["notifications-area-symbolic"] = themes_path.."unity_mate/icons/notifications-area-symbolic.png"
+theme["notifications-area-flagged-symbolic"] = themes_path.."unity_mate/icons/notifications-area-flagged-symbolic.png"
 
 theme["mpc-previous-symbolic"] = themes_path.."unity_mate/icons/mpc-previous-symbolic.png"
 
@@ -265,6 +266,7 @@ for _,v in pairs({
     "ac-adapter-symbolic",
     "backlight-symbolic",
     "notifications-area-symbolic",
+    "notifications-area-flagged-symbolic",
     "mpc-previous-symbolic",
     "mpc-play-symbolic",
     "mpc-pause-symbolic",

widgets/desktop/notifications.lua

@@ -53,6 +53,32 @@ return function(args)
             popup.visible = false
         end
     end)
+    -- create popup button
+    local clip_widget
+    local clip_icon
+    do
+        local style = awmtk2.create_style("notifications",
+            awmtk2.generic.iconified_widget,args.style,args.vertical)
+        local templates = awmtk2.create_template_lib("notifications",awmtk2.templates,args.templates)
+        local t = awmtk2.build_templates(templates,style,args.vertical)
+        clip_widget = wibox.widget(t.button(t.icon({
+            image = beautiful["notifications-area-symbolic"],
+            id = "notification-icon",
+            resize = true,
+        })))
+        clip_icon = clip_widget:get_children_by_id("notification-icon")[1]
+        clip_widget:connect_signal("button::press",style.button.onpress)
+        clip_widget:connect_signal("button::release",style.button.onrelease)
+        clip_widget:connect_signal("button::press",function(self,x,y,button)
+            clip_icon.image = beautiful["notifications-area-symbolic"]
+            if button == 1 then
+                popup.visible = (not popup.visible)
+                if popup.visible then
+                    popup:move_next_to(mouse.current_widget_geometry)
+                end
+            end
+        end)
+    end
     naughty.config.notify_callback = function(update_args)
         count = count + 1
         local w = wibox.widget(t.button(t.article({
@@ -86,29 +112,8 @@ return function(args)
         end)
         table.insert(pager.list,1,w)
         pager:update()
+        clip_icon.image = beautiful["notifications-area-flagged-symbolic"]
         return update_args
     end
-    -- create popup button
-    local clip_widget
-    do
-        local style = awmtk2.create_style("notifications",
-            awmtk2.generic.iconified_widget,args.style,args.vertical)
-        local templates = awmtk2.create_template_lib("notifications",awmtk2.templates,args.templates)
-        local t = awmtk2.build_templates(templates,style,args.vertical)
-        clip_widget = wibox.widget(t.button(t.icon({
-            image = beautiful["notifications-area-symbolic"],
-            resize = true,
-        })))
-        clip_widget:connect_signal("button::press",style.button.onpress)
-        clip_widget:connect_signal("button::release",style.button.onrelease)
-        clip_widget:connect_signal("button::press",function(self,x,y,button)
-            if button == 1 then
-                popup.visible = (not popup.visible)
-                if popup.visible then
-                    popup:move_next_to(mouse.current_widget_geometry)
-                end
-            end
-        end)
-    end
     return clip_widget
 end

widgets/dismal.lua

@@ -75,6 +75,23 @@ return function(args)
         layout = wibox.layout.fixed.horizontal,
         spacing = style.container.spacing
     }))
+    local available_positions = {
+        top_left = awful.placement.top_left,
+        top_right = awful.placement.top_right,
+        bottom_left = awful.placement.bottom_left,
+        bottom_right = awful.placement.bottom_right,
+        left = awful.placement.left,
+        right = awful.placement.right,
+        top = awful.placement.top,
+        bottom = awful.placement.bottom,
+        centered = awful.placement.centered
+    }
+    local honor_workarea = true
+    if (args.ignore_wibars) then
+        honor_workarea = false
+    end
+    local popup_position = (args.pos and available_positions[args.pos])
+        or available_positions["top_left"]
     local button_cache = gears.cache(function(name,exec,description,icon,key)
         -- beacause apparently cache doesn't allow nil values
         if icon == "" then icon = nil end
@@ -208,9 +225,8 @@ return function(args)
             ask.k(":dismal.run", function()
                 results_list:reset()
                 dismal.visible = true
-                dismal.x = args.x or 0
-                dismal.y = args.y or 0
                 if dismal.visible then
+                    popup_position(dismal,{honor_workarea=honor_workarea})
                     awful.prompt.run {
                         prompt = "<b>Run: </b>",
                         textbox = input_field,