]> git.madduck.net Git - etc/awesome.git/commitdiff

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:

widgets: screen notification setting added
authorluke bonham <dada@archlinux.info>
Sat, 11 Oct 2014 12:45:14 +0000 (14:45 +0200)
committerluke bonham <dada@archlinux.info>
Sat, 11 Oct 2014 12:45:14 +0000 (14:45 +0200)
widgets/alsabar.lua
widgets/calendar.lua
widgets/net.lua

index 96d57b08008f2b1e4921661a5fce6d254703c216..65a2b33018ea043e6c2458030058e00096fcc9b8 100644 (file)
@@ -41,7 +41,8 @@ local alsabar = {
         font      = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")),
         font_size = "11",
         color     = beautiful.fg_normal,
         font      = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")),
         font_size = "11",
         color     = beautiful.fg_normal,
-        bar_size  = 18
+        bar_size  = 18,
+        screen    = 1
     },
 
     _current_level = 0,
     },
 
     _current_level = 0,
@@ -55,6 +56,7 @@ function alsabar.notify()
         title   = "",
         text    = "",
         timeout = 4,
         title   = "",
         text    = "",
         timeout = 4,
+        screen  = alsabar.notifications.screen,
         font    = alsabar.notifications.font .. " " ..
                   alsabar.notifications.font_size,
         fg      = alsabar.notifications.color
         font    = alsabar.notifications.font .. " " ..
                   alsabar.notifications.font_size,
         fg      = alsabar.notifications.color
index f9aed39820f38e6484825bb7779cf5912e63b97d..bada79e90a6b01fd2e40d5e3603b7adae0b42cb6 100644 (file)
@@ -30,7 +30,7 @@ function calendar:hide()
     end
 end
 
     end
 end
 
-function calendar:show(t_out, inc_offset)
+function calendar:show(t_out, inc_offset, scr)
     calendar:hide()
 
     local offs = inc_offset or 0
     calendar:hide()
 
     local offs = inc_offset or 0
@@ -99,6 +99,7 @@ function calendar:show(t_out, inc_offset)
         fg = calendar.fg,
         bg = calendar.bg,
         timeout = tims,
         fg = calendar.fg,
         bg = calendar.bg,
         timeout = tims,
+        screen = scr or 1
     })
 end
 
     })
 end
 
index 2bfd375c337deb3f7b97fb211425ad07a8b32ab8..ed6a2efd76e179603fa4fdf2823d187d9b383492 100644 (file)
@@ -45,6 +45,7 @@ local function worker(args)
     local iface = args.iface or net.get_device()
     local units = args.units or 1024 --kb
     local notify = args.notify or "on"
     local iface = args.iface or net.get_device()
     local units = args.units or 1024 --kb
     local notify = args.notify or "on"
+    local screen = args.screen or 1
     local settings = args.settings or function() end
 
     net.widget = wibox.widget.textbox('')
     local settings = args.settings or function() end
 
     net.widget = wibox.widget.textbox('')
@@ -88,6 +89,7 @@ local function worker(args)
                     position = "top_left",
                     icon     = helpers.icons_dir .. "no_net.png",
                     fg       = notify_fg or "#FFFFFF",
                     position = "top_left",
                     icon     = helpers.icons_dir .. "no_net.png",
                     fg       = notify_fg or "#FFFFFF",
+                    screen   = screen
                 })
                 helpers.set_map(iface, false)
             end
                 })
                 helpers.set_map(iface, false)
             end