madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

small fixes
authorcopycat-killer <dada@archlinux.info>
Sun, 22 Jan 2017 01:13:02 +0000 (02:13 +0100)
committercopycat-killer <dada@archlinux.info>
Sun, 22 Jan 2017 01:13:02 +0000 (02:13 +0100)
util/init.lua
util/separators.lua
widgets/contrib/tpbat/init.lua
widgets/fs.lua

index 5596afa1aee19c196c935ea7915a988ef66ea835..3db478d987ca068a1c1771df98f9e42e68bcc82a 100644 (file)
@@ -166,6 +166,7 @@ end
 
 -- On the fly useless gaps change
 function util.useless_gaps_resize(thatmuch)
+    beautiful.useless_gap = beautiful.useless_gap or 0
     beautiful.useless_gap = tonumber(beautiful.useless_gap) + thatmuch
     awful.layout.arrange(awful.screen.focused())
 end
index af3e3a82b6762b2c107562a1a44c3d97e44ac711..abf57c4b9c0e75892127147dc2df135e5e7761f7 100644 (file)
@@ -8,15 +8,11 @@
 --]]
 
 local wibox     = require("wibox")
-local beautiful = require("beautiful")
 local gears     = require("gears")
 
 -- Lain Cairo separators util submodule
 -- lain.util.separators
-local separators = {}
-
-local height = beautiful.separators_height or 0
-local width  = beautiful.separators_width or 9
+local separators = { height = 0, width = 9 }
 
 -- [[ Arrow
 
@@ -24,7 +20,9 @@ local width  = beautiful.separators_width or 9
 function separators.arrow_right(col1, col2)
     local widget = wibox.widget.base.make_widget()
 
-    widget.fit = function(m, w, h) return width, height end
+    widget.fit = function(m, w, h)
+        return separators.width, separators.height
+    end
 
     widget.draw = function(mycross, wibox, cr, width, height)
         if col2 ~= "alpha" then
@@ -62,7 +60,9 @@ end
 function separators.arrow_left(col1, col2)
     local widget = wibox.widget.base.make_widget()
 
-    widget.fit = function(m, w, h) return width, height end
+    widget.fit = function(m, w, h)
+        return separators.width, separators.height
+    end
 
     widget.draw = function(mycross, wibox, cr, width, height)
         if col1 ~= "alpha" then
index 0a22526fedffb3e6937d86218861ff2d088bbfa1..8b53a4b25f986c9b294a3cc137478410289ef57b 100644 (file)
@@ -34,22 +34,20 @@ local smapi        = require("smapi")
 local tpbat = { }
 local tpbat_notification = nil
 
-function tpbat:hide()
-    if tpbat_notification ~= nil
-    then
-        naughty.destroy(tpbat_notification)
-        tpbat_notification = nil
-    end
+function tpbat.hide()
+    if not tpbat.notification then return end
+    naughty.destroy(tpbat.notification)
+    tpbat.notification = nil
 end
 
-function tpbat:show(t_out)
-    tpbat:hide()
+function tpbat.show(t_out)
+    tpbat.hide()
 
     local bat   = self.bat
-    local t_out = t_out or 0
 
     if bat == nil or not bat:installed() then return end
 
+    local t_out = t_out or 0
     local mfgr   = bat:get('manufacturer') or "no_mfgr"
     local model  = bat:get('model') or "no_model"
     local chem   = bat:get('chemistry') or "no_chem"
@@ -73,7 +71,7 @@ function tpbat:show(t_out)
                 .. string.format("\n%s \t\t\t %s", status:upper(), msg)
 
     tpbat_notification = naughty.notify({
-        preset = { fg = beautiful.fg_normal },
+        preset = naughty.config.defaults,
         text = str,
         timeout = t_out,
         screen = client.focus and client.focus.screen or 1
@@ -161,8 +159,8 @@ function tpbat.register(args)
 
     newtimer("tpbat-" .. bat.name, timeout, update)
 
-    widget:connect_signal('mouse::enter', function () tpbat:show() end)
-    widget:connect_signal('mouse::leave', function () tpbat:hide() end)
+    widget:connect_signal('mouse::enter', function () tpbat.show() end)
+    widget:connect_signal('mouse::leave', function () tpbat.hide() end)
 
     return tpbat.widget
 end
index faa803804b4db8885a989368f5a48c92a2a4b018..391c26009ed3e9960d16bb9ca5e25895330bd486 100644 (file)
@@ -61,7 +61,14 @@ local function worker(args)
 
     fs.options             = args.options
     fs.followtag           = args.followtag or false
-    fs.notification_preset = args.notification_preset or naughty.config.defaults
+    fs.notification_preset = args.notification_preset
+
+    if not fs.notification_preset then
+        fs.notification_preset      = naughty.config.defaults
+        fs.notification_preset.font = "Monospace 10"
+        fs.notification_preset.fg   = "#FFFFFF"
+        fs.notification_preset.bg   = "#000000"
+    end
 
     fs.widget = wibox.widget.textbox()