]> 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:

allow to define in supported widgets which don't allow it already
authorluke bonham <dada@archlinux.info>
Tue, 28 Jul 2015 18:43:47 +0000 (20:43 +0200)
committercopycat-killer <dada@archlinux.info>
Wed, 5 Aug 2015 11:31:16 +0000 (13:31 +0200)
widgets/contrib/task.lua
widgets/fs.lua
widgets/imap.lua

index 6425926a6232cb5c02197226492f5ab321bb53da..3b8039f329b817b9bfa88a96c144bb97ee327144 100644 (file)
@@ -31,7 +31,7 @@ function task:hide()
     end
 end
 
     end
 end
 
-function task:show()
+function task:show(scr_pos)
     task:hide()
 
     local f, c_text
     task:hide()
 
     local f, c_text
@@ -51,6 +51,7 @@ function task:show()
                                          fg = task.fg,
                                          bg = task.bg,
                                          timeout = task.timeout,
                                          fg = task.fg,
                                          bg = task.bg,
                                          timeout = task.timeout,
+                                         screen = scr_pos or 1
                                      })
 end
 
                                      })
 end
 
@@ -106,6 +107,7 @@ function task:prompt_search()
               fg       = task.fg,
               bg       = task.bg,
               timeout  = task.timeout,
               fg       = task.fg,
               bg       = task.bg,
               timeout  = task.timeout,
+              screen   = mouse.screen
           })
       end,
       nil,
           })
       end,
       nil,
@@ -122,11 +124,12 @@ function task:attach(widget, args)
     task.bg        = args.bg or beautiful.bg_normal or "#FFFFFF"
     task.position  = args.position or "top_right"
     task.timeout   = args.timeout or 7
     task.bg        = args.bg or beautiful.bg_normal or "#FFFFFF"
     task.position  = args.position or "top_right"
     task.timeout   = args.timeout or 7
+    task.scr_pos   = args.scr_pos or 1
 
     task.notify_icon = icons_dir .. "/taskwarrior/task.png"
     task.notify_icon_small = icons_dir .. "/taskwarrior/tasksmall.png"
 
 
     task.notify_icon = icons_dir .. "/taskwarrior/task.png"
     task.notify_icon_small = icons_dir .. "/taskwarrior/tasksmall.png"
 
-    widget:connect_signal("mouse::enter", function () task:show() end)
+    widget:connect_signal("mouse::enter", function () task:show(scr_pos) end)
     widget:connect_signal("mouse::leave", function () task:hide() end)
 end
 
     widget:connect_signal("mouse::leave", function () task:hide() end)
 end
 
index 07490faa905cad335220b23bce4fd296bbc44bba..dbd45bfa79be7c26bfb52cfb0d5d60109e128e9d 100644 (file)
@@ -36,7 +36,7 @@ function fs:hide()
     end
 end
 
     end
 end
 
-function fs:show(t_out)
+function fs:show(t_out, scr)
     fs:hide()
 
     local f = io.popen(helpers.scripts_dir .. "dfs")
     fs:hide()
 
     local f = io.popen(helpers.scripts_dir .. "dfs")
@@ -44,9 +44,10 @@ function fs:show(t_out)
     f:close()
 
     notification = naughty.notify({
     f:close()
 
     notification = naughty.notify({
-        preset = fs_notification_preset,
-        text = ws,
+        preset  = fs_notification_preset,
+        text    = ws,
         timeout = t_out,
         timeout = t_out,
+        screen  = scr or 1
     })
 end
 
     })
 end
 
@@ -106,7 +107,7 @@ local function worker(args)
         end
     end
 
         end
     end
 
-    fs.widget:connect_signal('mouse::enter', function () fs:show(0) end)
+    fs.widget:connect_signal('mouse::enter', function () fs:show(0, mouse.screen) end)
     fs.widget:connect_signal('mouse::leave', function () fs:hide() end)
 
     helpers.newtimer(partition, timeout, update)
     fs.widget:connect_signal('mouse::leave', function () fs:hide() end)
 
     helpers.newtimer(partition, timeout, update)
index ea62cc7053e27e0471c2496df09887c1fd47bf2e..a17b02feb564deb1fecaa8a75aafc861fad173a1 100644 (file)
@@ -76,7 +76,7 @@ local function worker(args)
                 end
                 naughty.notify({
                     preset = mail_notification_preset,
                 end
                 naughty.notify({
                     preset = mail_notification_preset,
-                    text = nt,
+                    text = nt
                 })
             end
 
                 })
             end