finalized widget polymorphism

libs/awmtk2.lua

@@ -7,7 +7,6 @@
 --  you should have received a copy of the gnu general public license along with reno desktop. if not, see <https://www.gnu.org/licenses/>. 
 -- renotk (formerly awmtk2) - template/granular styling library for reno
 local wibox = require("wibox")
-local awful = require("awful")
 local gears = require("gears")
 local beautiful = require("beautiful")
 beautiful.widgets = beautiful.widgets or {}
@@ -16,20 +15,26 @@ beautiful.templates = beautiful.templates or {}
 local awmtk = {}
 
 -- {{{ utils
-awmtk.create_delta = function(name,instance_delta,class_delta,parent_delta)
+awmtk.create_delta = function(name,instance_delta,class_delta,parent_delta,vertical)
     -- to save memory, we create proxies for lower layers called "deltas"
     -- this function creates that proxy layer using metatables
     -- fun story - i used instance_delta instead of {} at first.
     -- the results were horrifying and confusing.
     return setmetatable({},{
-        __index = function(self,k)
+        __index = function(_,k)
             -- per-instance overrides are top priority
             if rawget(instance_delta,k) then
                 return rawget(instance_delta,k)
             -- class-wide overrides are second in priority
             elseif type(class_delta[name]) == "table"
                 and rawget(class_delta[name],k) then
-                return rawget(class_delta[name],k)
+                if vertical and
+                   type(rawget(class_delta[name],"vertical")) == "table" and
+                   rawget(class_delta[name],"vertical")[k] then
+                    return rawget(class_delta[name].vertical,k)
+                else
+                    return rawget(class_delta[name],k)
+                end
             -- parent is fallback
             elseif parent_delta[k] then
                 return parent_delta[k]
@@ -38,17 +43,18 @@ awmtk.create_delta = function(name,instance_delta,class_delta,parent_delta)
     })
 end
 
-awmtk.create_style = function(name,parent,overrides)
+awmtk.create_style = function(name,parent,overrides,vertical)
     -- a style is essentially a layer of deltas upon the previous (parent) style
     local new_style = {}
     local odelta = (overrides and overrides[name]) or {}
     local cdelta = beautiful.widgets[name] or {}
-    for name,parent_class in pairs(parent) do
-        new_style[name] = awmtk.create_delta(
-            name,
+    for class_name,parent_class in pairs(parent) do
+        new_style[class_name] = awmtk.create_delta(
+            class_name,
             odelta,
             cdelta,
-            parent_class
+            parent_class,
+            vertical
         )
     end
     return new_style
@@ -66,7 +72,7 @@ end
 
 awmtk.build_templates = function(templates,style,vertical)
     local new_templates = {}
-    for name,template in pairs(awmtk.proto_templates) do
+    for name,_ in pairs(awmtk.proto_templates) do
         new_templates[name] = templates[name](style,vertical)
     end
     return new_templates
@@ -205,6 +211,15 @@ awmtk.proto_style.slider = awmtk.create_delta("slider", {
 
 awmtk.proto_style.checkbox = awmtk.create_delta("checkbox", {
 }, awmtk.proto_style,awmtk.proto_style.base)
+
+awmtk.proto_style.icon = awmtk.create_delta("icon", {
+    constraint = "max",
+    height = 100,
+    width = 100,
+    valign = "center",
+    halign = "center",
+    margins = 0
+}, awmtk.proto_style,awmtk.proto_style.base)
 -- }}}  
 
 -- {{{ generic templates 
@@ -278,6 +293,40 @@ awmtk.proto_templates = {
         end
     end,
 
+    icon = function(style)
+        return function(args)
+            args = args or {}
+            return {
+                {
+                    {
+                        {
+                            image = args.image,
+                            id = args.id,
+                            resize = args.resize,
+                            widget = wibox.widget.imagebox
+                        },
+                        widget = wibox.container.margin,
+                        margins = args.margins or style.icon.margins
+                    },
+                    strategy = args.constraint or style.icon.constraint,
+                    height = args.height or
+                        style.icon.height,
+                    width = args.width or
+                        style.icon.width,
+                    widget = awmtk.wrap_hooks(wibox.container.constraint,
+                        args),
+                    id = "constraint"
+                },
+                --widget = awmtk.wrap_hooks(
+                widget = wibox.container.place,
+                 --   args
+                --),
+                valign = args.valign or style.icon.valign,
+                halign = style.icon.halign or style.icon.halign
+            }
+        end
+    end,
+
     vseparator = function(style)
         -- i'm running out of comments
         return function(options)
@@ -435,26 +484,50 @@ awmtk.proto_templates = {
         end
     end,
 
-    slider = function(style)
+    slider = function(style,vertical)
         -- slider widget but wired to work with the awmtk2 namespace system
         return function(args)
-            return awmtk.merge({
-                handle_shape = style.slider.handle_shape or style.slider.shape,
-                handle_color = style.slider.bg_normal,
-                handle_margins = style.slider.handle_margins,
-                handle_width = style.slider.handle_width,
-                handle_border_color = style.slider.handle_border_color,
-                handle_border_width = style.slider.handle_border_width,
-                bar_shape = style.slider.bar_shape or style.slider.shape,
-                bar_height = style.slider.bar_height,
-                bar_color = style.slider.bg_focus,
-                bar_margins = style.slider.bar_margins,
-                bar_border_width = style.slider.bar_border_width,
-                bar_border_color = style.slider.bar_border_color,
-                forced_width = style.slider.width,
-                forced_height = style.slider.height,
-                widget = awmtk.wrap_hooks(wibox.widget.slider,args)
-            },args or {})
+            if not vertical then
+                return awmtk.merge({
+                    handle_shape = style.slider.handle_shape or style.slider.shape,
+                    handle_color = style.slider.bg_normal,
+                    handle_margins = style.slider.handle_margins,
+                    handle_width = style.slider.handle_width,
+                    handle_border_color = style.slider.handle_border_color,
+                    handle_border_width = style.slider.handle_border_width,
+                    bar_shape = style.slider.bar_shape or style.slider.shape,
+                    bar_height = style.slider.bar_height,
+                    bar_color = style.slider.bg_focus,
+                    bar_margins = style.slider.bar_margins,
+                    bar_border_width = style.slider.bar_border_width,
+                    bar_border_color = style.slider.bar_border_color,
+                    forced_width = style.slider.width,
+                    forced_height = style.slider.height,
+                    widget = awmtk.wrap_hooks(wibox.widget.slider,args)
+                },args or {})
+            else
+                return {
+                    awmtk.merge({
+                        handle_shape = style.slider.handle_shape or style.slider.shape,
+                        handle_color = style.slider.bg_normal,
+                        handle_margins = style.slider.handle_margins,
+                        handle_width = style.slider.handle_width,
+                        handle_border_color = style.slider.handle_border_color,
+                        handle_border_width = style.slider.handle_border_width,
+                        bar_shape = style.slider.bar_shape or style.slider.shape,
+                        bar_height = style.slider.bar_height,
+                        bar_color = style.slider.bg_focus,
+                        bar_margins = style.slider.bar_margins,
+                        bar_border_width = style.slider.bar_border_width,
+                        bar_border_color = style.slider.bar_border_color,
+                        forced_width = style.slider.width,
+                        forced_height = style.slider.height,
+                        widget = awmtk.wrap_hooks(wibox.widget.slider,args)
+                    },args or {}),
+                    widget = wibox.container.rotate,
+                    direction = "west"
+                }
+            end
         end
     end,
 

libs/builder.lua

@@ -51,11 +51,17 @@ return function(description,opts)
     end
     local function inner_builder(struct,vertical)
         if struct.widget then -- External widget descriptions
-            return require(struct.widget)(gears.table.join({
+            local args = gears.table.join({
                 layout = (struct.layout and inner_builder(struct.layout)),                         client = (struct.client and c),
                 screen = (struct.screen and s),
-                vertical = vertical
-            },struct.options or {},opts.passthrough or {}))
+                vertical = (function()
+                    if type(struct.vertical) ~= "nil" then
+                        return struct.vertical
+                    end
+                    return vertical
+                end)()
+            },struct.options or {},opts.passthrough or {})
+            return require(struct.widget)(args)
         elseif struct.list then -- List descriptions
             local list = {
                 layout = wibox.layout.fixed[(

libs/context_menu.lua

@@ -8,8 +8,6 @@
 -- POLYMENU - brutal deluxe
 -- This isn't in the widgets folder because it's too meta to be there
 local awful = require("awful")
-local gears = require("gears")
-local menubar_utils = require("menubar.utils")
 local wibox = require("wibox")
 local awmtk2 = require("awmtk2")
 

modules/collect_garbage.lua

@@ -5,12 +5,18 @@
 --  Reno desktop is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 --
 --  You should have received a copy of the GNU General Public License along with Reno desktop. If not, see <https://www.gnu.org/licenses/>. 
+--  garbage collection timer
 local gears = require("gears")
 gears.timer {
-    timeout = 10,
+    timeout = 30,
     autostart = true,
     callback = function()
-        collectgarbage("step", 20000)
-        return true
+        local out_string = tostring(os.date()) .. "\nLua memory usage:"..tostring(collectgarbage("count")).."\n"
+        collectgarbage()
+        out_string = out_string .. "\nLua memory usage after GC: "..tostring(collectgarbage("count")).."\n"
+        out_string = out_string.."Objects alive:"
+        for name, obj in pairs{button = button, client = client, drawable = drawable, drawin = drawin, key = key, screen = screen, tag = tag } do
+            out_string = out_string .. "\n" .. tostring(name) .. " = "..tostring(obj.instances())
+        end
     end
 }

modules/desktop.lua

@@ -11,8 +11,6 @@ local wibox = require("wibox")
 local awful = require("awful")
 local beautiful = require("beautiful")
 local builder = require("builder")
-local mbarutils = require("menubar").utils
-local menugen = require("context_menu")
 local json = require("dkjson")
 
 local function read_file(fname)
@@ -49,9 +47,9 @@ end -- }}}
 do --{{{ Screen
 local wibar_config = {}
 local style = awmtk2.create_style("wibar",awmtk2.generic.composite_widget,{})
-for k,v in pairs({"wibar_top","wibar_bottom","wibar_left","wibar_right"}) do
-    style[v] = awmtk2.create_delta(v, {}, 
-        (beautiful.widgets and beautiful.widgets.wibar) or {}, 
+for _,v in pairs({"wibar_top","wibar_bottom","wibar_left","wibar_right"}) do
+    style[v] = awmtk2.create_delta(v, {},
+        (beautiful.widgets and beautiful.widgets.wibar) or {},
         style.wibar)
     wibar_config[v] = read_file(root_path.."/themes/"..global.theme.."/config/"..v..".json")
 end
@@ -59,18 +57,14 @@ local templates = awmtk2.create_template_lib("wibar",awmtk2.templates,{})
 local t = awmtk2.build_templates(templates,style)
 
 awful.screen.connect_for_each_screen(function(s)
-    for k,v in pairs({"wibar_top","wibar_bottom","wibar_left","wibar_right"}) do
+    for _,v in pairs({"wibar_top","wibar_bottom","wibar_left","wibar_right"}) do
         local contents = { widget = wibox.container.background }
         if wibar_config[v] then
             contents = builder(wibar_config[v],{
                 client = c,
                 style = style[v],
                 buttons = buttons,
-                screen = s,
-                passthrough = {
-                    vertical = ((v == "wibar_left") or
-                                (v == "wibar_right"))
-                }
+                screen = s
             })
             s[v] = awful.wibar({
                 -- There really isn't a better way to do this. I wish there was.
@@ -99,10 +93,10 @@ end -- }}}
 do -- {{{ Titlebars
 local titlebar_config = {}
 local style = awmtk2.create_style("titlebar",awmtk2.generic.composite_widget,{})
-for k,v in pairs({"titlebar_top","titlebar_left","titlebar_right","titlebar_bottom"}) do
+for _,v in pairs({"titlebar_top","titlebar_left","titlebar_right","titlebar_bottom"}) do
     -- Create styles for each titlebar
-    style[v] = awmtk2.create_delta(v, {}, 
-        (beautiful.widgets and beautiful.widgets.titlebar) or {}, 
+    style[v] = awmtk2.create_delta(v, {},
+        (beautiful.widgets and beautiful.widgets.titlebar) or {},
         style.titlebar)
     -- Load in json layouts for titlebars
     titlebar_config[v] = read_file(root_path.."/themes/"..global.theme.."/config/"..v..".json")
@@ -238,4 +232,3 @@ client.connect_signal("manage",function(c)
     end
 end)
 end --}}}
-    

modules/powermanX.lua

@@ -9,7 +9,6 @@
 local sysctl = require("syscontrol")
 local naughty = require("naughty")
 local gears = require("gears")
-local awful = require("awful")
 local batteries = sysctl.power_supply.enumerate()
 local state_tracking = {}
 -- Configuration variables
@@ -17,12 +16,12 @@ local cfg = config.powerman or {}
 local quality_min = cfg.battery_quality_min or 33
 local capacity_min = cfg.battery_capacity_min or 15
 -- Main loop
-local update_loop = gears.timer({
+gears.timer({
     timeout = 2,
     autostart = true,
     callback = function()
-        for k,v in pairs(batteries) do
-            local data,err = sysctl.power_supply.read_attribs(v)
+        for _,v in pairs(batteries) do
+            local data,_ = sysctl.power_supply.read_attribs(v)
             state_tracking[v] = state_tracking[v] or {}
             if data.type == "Battery" then
                 if (tonumber(data.quality) < quality_min) and 

modules/xdg_data.lua

@@ -136,7 +136,6 @@ awesome.connect_signal("xdg::dir_finished",function(dir)
         end
         -- Save the cache if it doesn't exist yet
         io.open(gears.filesystem.get_xdg_cache_home()..".reno_xdg_cache.json","w"):write(json.encode(xdg)):close()
-        require("naughty").notify({title = "Human time: "..tostring(os.time()-start_human),text = "Computer time: "..tostring(os.clock()-start_computer)})
         -- Finally, call the all_finished signal
         awesome.emit_signal("xdg::all_finished")
     end

themes/reno98/config/client_menu.json

@@ -1,7 +1,8 @@
 {
     "list": [
-        {"widget": "widgets.clientcontrols"},
-        {"widget": "widgets.clientbuttons"}
+        {"widget": "widgets.clientmenu.volume","vertical":false},
+        {"widget": "widgets.clientmenu.controls"},
+        {"widget": "widgets.clientmenu.buttons"}
     ],
     "vertical":true
 }

themes/reno98/config/root_menu.json

@@ -2,22 +2,27 @@
     "list": [
         {"widget": "widgets.base.popuptitle",
             "options":{
-                "icon":"icons/reno98.png",
-                "title":"Reno 98"
-            }
+                "title":"Reno Unity"
+            },
+            "vertical":true
         },
-        {"widget": "widgets.base.tagswitcher",
-            "screen":true
-        },
-        {"widget": "widgets.rootcontrols"},
-        {"widget": "widgets.xdgmenu",
-            "options": {
-                "exclude_category": [
-                    "Other"
-                ]
-            }
-        },
-        {"widget": "widgets.rootbuttons"}
+        { 
+            "list": [
+                {"widget": "widgets.base.tagswitcher",
+                    "screen":true
+                },
+                {"widget": "widgets.rootmenu.controls"},
+                {"widget": "widgets.xdgmenu",
+                    "options": {
+                        "exclude_category": [
+                            "Other"
+                        ]
+                    }
+                },
+                {"widget": "widgets.rootmenu.buttons"}
+            ],
+            "vertical": true
+        }
     ],
-    "vertical": true
+    "vertical": false
 }

themes/reno98/config/wibar_bottom.json

@@ -2,10 +2,7 @@
     "align": {
         "left": [
             {
-                "widget": "widgets.launcher"
-            },
-            {
-                "widget": "widgets.tasklist",
+                "widget": "widgets.desktop.tasklist",
                 "screen": true
             }
         ],
@@ -13,6 +10,9 @@
             
         ],
         "right": [
+            {
+                "widget": "widgets.desktop.launcher"
+            }
         ]
     }
 }  

themes/reno98/config/wibar_top.json

@@ -1,30 +1,25 @@
 { 
     "align": {
         "left": [ 
-            { "widget": "widgets.soundclown" }
+            { "widget": "widgets.desktop.soundclown" }
         ],
         "center": [
             
         ],
         "right": [
-            { "widget": "widgets.notifications",
+            { "widget":"widgets.desktop.volume" },
+            { "widget": "widgets.desktop.notifications",
                 "screen": true
             },
-            { "widget": "widgets.wallpapers",
+            { "widget": "widgets.desktop.wallpapers",
                 "screen": true,
                 "options": {
                     "path": "$HOME/Pictures/Wallpapers"
                 }
             },
-            { "widget": "widgets.base.subpanel",
-              "layout": {
-                  "list": [
-                    { "widget": "widgets.battery" },
-                    { "widget": "widgets.base.systray" },
-                    { "widget": "widgets.base.clock" }
-                  ]
-              }
-            }
+            { "widget": "widgets.desktop.battery" },
+            { "widget": "widgets.base.systray" },
+            { "widget": "widgets.base.clock" }
         ]
     }
 }  

themes/unity/config/client_menu.json

@@ -1,8 +1,8 @@
 {
     "list": [
-        {"widget": "widgets.clientvolume"},
-        {"widget": "widgets.clientcontrols"},
-        {"widget": "widgets.clientbuttons"}
+        {"widget": "widgets.clientmenu.volume","vertical":false},
+        {"widget": "widgets.clientmenu.controls"},
+        {"widget": "widgets.clientmenu.buttons"}
     ],
     "vertical":true
 }

themes/unity/config/root_menu.json

@@ -3,20 +3,26 @@
         {"widget": "widgets.base.popuptitle",
             "options":{
                 "title":"Reno Unity"
-            }
+            },
+            "vertical":true
         },
-        {"widget": "widgets.base.tagswitcher",
-            "screen":true
-        },
-        {"widget": "widgets.rootcontrols"},
-        {"widget": "widgets.xdgmenu",
-            "options": {
-                "exclude_category": [
-                    "Other"
-                ]
-            }
-        },
-        {"widget": "widgets.rootbuttons"}
+        { 
+            "list": [
+                {"widget": "widgets.base.tagswitcher",
+                    "screen":true
+                },
+                {"widget": "widgets.rootmenu.controls"},
+                {"widget": "widgets.xdgmenu",
+                    "options": {
+                        "exclude_category": [
+                            "Other"
+                        ]
+                    }
+                },
+                {"widget": "widgets.rootmenu.buttons"}
+            ],
+            "vertical": true
+        }
     ],
-    "vertical": true
+    "vertical": false
 }

themes/unity/config/wibar_left.json

@@ -2,7 +2,7 @@
     "align": {
         "left": [
             {
-                "widget": "widgets.tasklist",
+                "widget": "widgets.desktop.tasklist",
                 "screen": true
             }
         ],
@@ -11,7 +11,7 @@
         ],
         "right": [
             {
-                "widget": "widgets.launcher"
+                "widget": "widgets.desktop.launcher"
             }
         ]
     },

themes/unity/config/wibar_top.json

@@ -1,23 +1,23 @@
 { 
     "align": {
         "left": [ 
-            { "widget": "widgets.soundclown" }
+            { "widget": "widgets.desktop.soundclown" }
         ],
         "center": [
             
         ],
         "right": [
-            { "widget":"widgets.volume" },
-            { "widget": "widgets.notifications",
+            { "widget":"widgets.desktop.volume" },
+            { "widget": "widgets.desktop.notifications",
                 "screen": true
             },
-            { "widget": "widgets.wallpapers",
+            { "widget": "widgets.desktop.wallpapers",
                 "screen": true,
                 "options": {
                     "path": "$HOME/Pictures/Wallpapers"
                 }
             },
-            { "widget": "widgets.battery" },
+            { "widget": "widgets.desktop.battery" },
             { "widget": "widgets.base.systray" },
             { "widget": "widgets.base.clock" }
         ]

themes/unity/theme.lua

@@ -25,6 +25,7 @@ theme.bg_minimize   = "#2E2E2E"
 theme.bg_highlight  = "#45433D"
 theme.bg_systray    = theme.bg_normal
 
+
 theme.fg_normal     = "#e1dec7"
 theme.fg_focus      = "#e1dec7"
 theme.fg_urgent     = "#e1dec7"
@@ -39,12 +40,36 @@ theme.border_normal = "#c0c0c0"
 theme.border_focus  = "#c0c0c0"
 theme.border_marked = "#c0c0c0"
 
-local bsize = 50
+local wibar_height = 26
+local wibar_width = 56
+
+
+theme.horizontal_button_bg_focus = {
+    type = "linear",
+    from = {0,0},
+    to = {0,wibar_height},
+    stops = {
+      {0,"#32322C"},
+      {1,"#4E4E46"}
+    }
+}
+
+theme.horizontal_button_bg_normal = {
+    type = "linear",
+    from = {0,0},
+    to = {0,wibar_height},
+    stops = {
+        {0,"#51514E"},
+        {1,"#343431"}
+    }
+}
+
+theme.horizontal_button_border_bg = "#51514E"
 
 theme.button_bg_focus = {
     type = "radial",
-    from = {bsize/2,-0.5*bsize,bsize/10},
-    to = {bsize/2,-0.5*bsize,bsize*2},
+    from = {wibar_width/2,-0.5*wibar_width,wibar_width/10},
+    to = {wibar_width/2,-0.5*wibar_width,wibar_width*2},
     stops = {
         { 0 , "#FFFFFFBB"},
         { 0.45, "#DF744E99"},
@@ -55,8 +80,8 @@ theme.button_bg_focus = {
 
 theme.button_bg_normal = {
     type = "radial",
-    from = {bsize/2,-0.5*bsize,bsize/10},
-    to = {bsize/2,-0.2*bsize,bsize*1.5},
+    from = {wibar_width/2,-0.5*wibar_width,wibar_width/10},
+    to = {wibar_width/2,-0.2*wibar_width,wibar_width*1.5},
     stops = {
         { 0 , "#FFFFFFFF"},
         { 0.5, "#33333333"},
@@ -99,8 +124,8 @@ theme.bar_bg_inverted_focus = {
 
 theme.bar_border_color = {
     type = "radial",
-    from = {bsize/2,bsize/(-3),bsize/8},
-    to = {bsize/2,bsize/(-5),bsize*1},
+    from = {wibar_width/2,wibar_width/(-3),wibar_width/8},
+    to = {wibar_width/2,wibar_width/(-5),wibar_width*1},
     stops = {
         { 0 , "#FFFFFF66"},
         { 1, "#43434366"},
@@ -193,7 +218,7 @@ local icons = {
     "battery-good-charging-symbolic",
     "battery-low-charging-symbolic"
 }
-for k,v in pairs(icons) do
+for _,v in pairs(icons) do
     theme[v] = themes_path.."unity/icons/"..v..".png"
     theme[v:gsub("-charging","")] = themes_path.."unity/icons/"..v:gsub("-charging","")..".png"
 end
@@ -224,7 +249,7 @@ theme.wallpapers_icon = themes_path.."unity/icons/wallpapers.png"
 -- This one has to be baked as a surface to avoid memory leaks
 theme.icon_default = themes_path.."unity/icons/unknown-app.png"
 
-for k,v in pairs({
+for _,v in pairs({
     "battery-caution-symbolic",
     "battery-empty-symbolic",
     "battery-full-symbolic",
@@ -304,8 +329,8 @@ theme.widgets = {
             shape = function(cr,width,height)
                 return gears.shape.rounded_rect(cr,width,height,0)
             end,
-            height = 26,
-            width = 60,
+            height = wibar_height,
+            width = wibar_width+6,
             margins = 3,
             stretch = true
         },
@@ -332,6 +357,10 @@ theme.widgets = {
             border_color = theme.bg_normal,
             paddings = {2,2,2,2}
         },
+        icon = {
+            width = 25,
+            height = 25
+        }
     },
     -- }}}
     -- {{{ Menus
@@ -432,6 +461,10 @@ theme.widgets = {
         article = {
             icon_size = 30
         },
+        icon = {
+            height = 60,
+            width = 100
+        }
     },
     -- }}}
     soundclown = {
@@ -469,46 +502,88 @@ theme.widgets = {
         }
     },
     tasklist = {
+        icon = {
+            margins = 2
+        },
         button = {
             width = 160,
-            height = 44,
-            margins = 5,
+            height = wibar_width-4,
+            margins = 4,
             shape_focus = theme.button_shape,
             shape_normal = theme.button_shape,
             shape_urgent = theme.button_shape,
             shape_minimize = theme.button_shape,
-            bg_normal = theme.button_bg_normal,
-            bg_focus = theme.button_bg_focus,
-            bg_urgent = theme.bg_urgent,
-            bg_minimize = theme.bg_minimize,
-            shape_border_color_normal = theme.bar_border_color,
-            shape_border_color_focus = theme.bar_border_color,
-            shape_border_color_urgent = theme.bar_border_color,
-            shape_border_color_minimize = theme.bar_border_color,
             shape_border_width_normal = dpi(1),
             shape_border_width_focus = dpi(1),
             shape_border_width_urgent = dpi(1),
             shape_border_width_minimize = dpi(1),
+            bg_normal = theme.horizontal_button_bg_normal,
+            bg_focus = theme.horizontal_button_bg_focus,
+            bg_urgent = theme.bg_urgent,
+            bg_minimize = theme.bg_minimize,
+            shape_border_color_normal = theme.horizontal_button_border_bg,
+            shape_border_color_focus = theme.horizontal_button_border_bg,
+            shape_border_color_minimize = theme.horizontal_button_border_bg,
+            shape_border_color_urgent = theme.horizontal_button_border_bg,
+            vertical = {
+                margins = 2,
+                shape_border_width_normal = dpi(1),
+                shape_border_width_focus = dpi(1),
+                shape_border_width_urgent = dpi(1),
+                shape_border_width_minimize = dpi(1),
+                bg_normal = theme.button_bg_normal,
+                bg_focus = theme.button_bg_focus,
+                bg_urgent = theme.bg_urgent,
+                bg_minimize = theme.bg_minimize,
+                shape_border_color_normal = theme.bar_border_color,
+                shape_border_color_focus = theme.bar_border_color,
+                shape_border_color_urgent = theme.bar_border_color,
+                shape_border_color_minimize = theme.bar_border_color
+            }
         }
     },
     launcher = {
+        icon = {
+            width = wibar_width,
+            height = wibar_width,
+            margins = 2
+        },
         button = {
-            margins = 5,
-            bg_normal = theme.button_bg_normal,
-            bg_focus = theme.button_bg_focus,
+            forced_height = wibar_width,
+            forced_width = wibar_width,
+            margins = 2,
+            bg_normal = theme.horizontal_button_bg_normal,
+            bg_focus = theme.horizontal_button_bg_focus,
             shape_border_width = dpi(1),
-            shape_border_color = theme.bar_border_color,
+            shape_border_color = theme.horizontal_button_border_bg,
+            vertical = {
+                margins = 1,
+                bg_normal = theme.button_bg_normal,
+                bg_focus = theme.button_bg_focus,
+                shape_border_width = dpi(1),
+                shape_border_color = theme.bar_border_color,
+                onpress = function(widget)
+                    widget:set_bg(theme.button_bg_focus)
+                end,
+                onrelease = function(widget)
+                    widget:set_bg(theme.button_bg_normal)
+                end
+            },
             onpress = function(widget)
-                widget:set_bg(theme.button_bg_focus)
+                widget:set_bg(theme.horizontal_button_bg_focus)
             end,
             onrelease = function(widget)
-                widget:set_bg(theme.button_bg_normal)
+                widget:set_bg(theme.horizontal_button_bg_normal)
             end
         }
     },
     lockscreen = {
         popup = {
             margins = 0
+        },
+        icon = {
+            width = 150,
+            height = 150
         }
     },
     lockbar = {
@@ -592,12 +667,23 @@ theme.widgets = {
         wibar_top = {
             bg_normal = theme.bar_bg_normal,
             fg_normal = theme.fg_normal,
-            size = 22,
+            height = 28,
         },
         wibar_left = {
             bg_normal = "#0D0D0966",
             border_width = dpi(1),
             border_color = "#26262666"
+        },
+        wibar_bottom = {
+            bg_normal = theme.bar_bg_normal,
+            fg_normal = theme.fg_normal,
+            height = 28,
+            margins = 0
+        },
+        wibar_right = {
+            bg_normal = "#0D0D0966",
+            border_width = dpi(1),
+            border_color = "#26262666"
         }
     }
 }
@@ -662,7 +748,7 @@ theme.templates = {
                     ontop = true
                 },options or {})
             end
-        end
+        end,
     }
 }
 

themes/unity_mate/COPYING.txt

@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.

themes/unity_mate/WARNING.txt

@@ -0,0 +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.

themes/unity_mate/config/client_menu.json

@@ -0,0 +1,8 @@
+{
+    "list": [
+        {"widget": "widgets.clientmenu.volume","vertical":false},
+        {"widget": "widgets.clientmenu.controls"},
+        {"widget": "widgets.clientmenu.buttons"}
+    ],
+    "vertical":true
+}

themes/unity_mate/config/global.json

@@ -0,0 +1,9 @@
+{
+    "widgets.dismal":{
+        "x":0,
+        "y":26
+    },
+    "widgets.rootmenu":{},
+    "widgets.lockscreen":{},
+    "widgets.base.keypopup":{}
+}

themes/unity_mate/config/lockpanel.json

@@ -0,0 +1,5 @@
+{
+    "widgets.lock.clock":{
+        "format": "%a %b %d\n %H: %M"
+    }   
+}

themes/unity_mate/config/root_menu.json

@@ -0,0 +1,28 @@
+{
+    "list": [
+        {"widget": "widgets.base.popuptitle",
+            "options":{
+                "title":"Reno Unity"
+            },
+            "vertical":true
+        },
+        { 
+            "list": [
+                {"widget": "widgets.base.tagswitcher",
+                    "screen":true
+                },
+                {"widget": "widgets.rootmenu.controls"},
+                {"widget": "widgets.xdgmenu",
+                    "options": {
+                        "exclude_category": [
+                            "Other"
+                        ]
+                    }
+                },
+                {"widget": "widgets.rootmenu.buttons"}
+            ],
+            "vertical": true
+        }
+    ],
+    "vertical": false
+}

themes/unity_mate/config/root_menu_test.json

@@ -0,0 +1,32 @@
+{
+    "list": [
+        {
+            "list": [
+                {"widget": "widgets.base.popuptitle",
+                    "options":{
+                        "title":"Reno Unity"
+                    }
+                },
+                {"widget": "widgets.rootcontrols"},
+                {"widget": "widgets.xdgmenu",
+                    "options": {
+                        "exclude_category": [
+                            "Other"
+                        ]
+                    }
+                }
+            ],
+            "vertical": true
+        },
+        {
+            "list":[
+                {"widget": "widgets.base.tagswitcher",
+                    "screen":true
+                },
+                {"widget": "widgets.rootbuttons"}
+            ],
+            "vertical":true
+        }
+    ],
+    "vertical":false
+}

themes/unity_mate/config/titlebar_top.json

@@ -0,0 +1,42 @@
+{ 
+"align": {
+    "left": [
+        {
+            "widget":"widgets.clientmenu",
+            "client":true
+        }
+    ],
+    "center": [
+        {
+            "draggable": true
+        },
+        {
+            "builtin": "titlewidget",
+            "client" : true,
+            "options": {
+                "align": "left"
+            }
+        }
+    ],
+    "right": [
+        { "widget": "widgets.base.subpanel",
+          "layout": {
+                "list": [
+                    {
+                        "builtin": "minimizebutton",
+                        "client": true
+                    },
+                    {
+                        "builtin": "maximizedbutton",
+                        "client": true
+                    },
+                    {
+                        "builtin": "closebutton",
+                        "client": true
+                    }
+                ]
+          }
+        }
+    ]
+}
+}  

themes/unity_mate/config/wibar_bottom.json

@@ -0,0 +1,18 @@
+{ 
+    "align": {
+        "left": [
+            {
+                "widget": "widgets.desktop.tasklist",
+                "screen": true
+            }
+        ],
+        "center": [
+            
+        ],
+        "right": [
+            {
+                "widget": "widgets.desktop.launcher"
+            }
+        ]
+    }
+}  

themes/unity_mate/config/wibar_top.json

@@ -0,0 +1,25 @@
+{ 
+    "align": {
+        "left": [ 
+            { "widget": "widgets.desktop.soundclown" }
+        ],
+        "center": [
+            
+        ],
+        "right": [
+            { "widget":"widgets.desktop.volume" },
+            { "widget": "widgets.desktop.notifications",
+                "screen": true
+            },
+            { "widget": "widgets.desktop.wallpapers",
+                "screen": true,
+                "options": {
+                    "path": "$HOME/Pictures/Wallpapers"
+                }
+            },
+            { "widget": "widgets.desktop.battery" },
+            { "widget": "widgets.base.systray" },
+            { "widget": "widgets.base.clock" }
+        ]
+    }
+}  

themes/unity_mate/icons/README

@@ -0,0 +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

themes/unity_mate/theme.lua

@@ -0,0 +1,757 @@
+-- Reno Unity - Unity theme for Reno desktop
+--[[
+    Reno Unity - A theme for Reno desktop
+
+    Written in 2022 by Yessiest (yessiest@memeware.net)
+
+    To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty.
+
+    You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. 
+--]]
+local theme_assets = require("beautiful.theme_assets")
+local xresources = require("beautiful.xresources")
+local dpi = xresources.apply_dpi
+local gears = require("gears")
+local themes_path = root_path.."/themes/"
+
+local theme = {}
+
+theme.font          = "Ubuntu 8"
+
+theme.bg_normal     = "#19191D"
+theme.bg_focus      = "#3E3E3E"
+theme.bg_urgent     = "#2E2E2E"
+theme.bg_minimize   = "#2E2E2E"