]> git.madduck.net Git - etc/awesome.git/blobdiff - .config/awesome/rc.lua

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:

projects / etc / awesome.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
replace custom firefox focus hack with new activate filter
[etc/awesome.git] / .config / awesome / rc.lua
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 382ee9ecd2fad21867670b5173572053af2968c3..b2b49c337be12b159f540d439fc12d10211249f5 100644 (file)
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -312,13 +312,13 @@ globalkeys = awful.util.table.join(
     awful.key({ modkey,           }, "Escape", awful.tag.history.restore,
               {description = "go back", group = "tag"}),
 
     awful.key({ modkey,           }, "Escape", awful.tag.history.restore,
               {description = "go back", group = "tag"}),
 
-    awful.key({ modkey,           }, "j",
+    awful.key({ modkey,           }, "k",
         function ()
             awful.client.focus.byidx( 1)
         end,
         {description = "focus next by index", group = "client"}
     ),
         function ()
             awful.client.focus.byidx( 1)
         end,
         {description = "focus next by index", group = "client"}
     ),
-    awful.key({ modkey,           }, "k",
+    awful.key({ modkey,           }, "j",
         function ()
             awful.client.focus.byidx(-1)
         end,
         function ()
             awful.client.focus.byidx(-1)
         end,
@@ -328,13 +328,13 @@ globalkeys = awful.util.table.join(
               {description = "show main menu", group = "awesome"}),
 
     -- Layout manipulation
               {description = "show main menu", group = "awesome"}),
 
     -- Layout manipulation
-    awful.key({ modkey, "Shift"   }, "j", function () awful.client.swap.byidx(  1)    end,
+    awful.key({ modkey, "Shift"   }, "k", function () awful.client.swap.byidx(  1)    end,
               {description = "swap with next client by index", group = "client"}),
               {description = "swap with next client by index", group = "client"}),
-    awful.key({ modkey, "Shift"   }, "k", function () awful.client.swap.byidx( -1)    end,
+    awful.key({ modkey, "Shift"   }, "j", function () awful.client.swap.byidx( -1)    end,
               {description = "swap with previous client by index", group = "client"}),
               {description = "swap with previous client by index", group = "client"}),
-    awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end,
+    awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative( 1) end,
               {description = "focus the next screen", group = "screen"}),
               {description = "focus the next screen", group = "screen"}),
-    awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end,
+    awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative(-1) end,
               {description = "focus the previous screen", group = "screen"}),
     awful.key({ modkey,           }, "u", awful.client.urgent.jumpto,
               {description = "jump to urgent client", group = "client"}),
               {description = "focus the previous screen", group = "screen"}),
     awful.key({ modkey,           }, "u", awful.client.urgent.jumpto,
               {description = "jump to urgent client", group = "client"}),
@@ -523,6 +523,13 @@ root.keys(globalkeys)
 
 -- {{{ Rules
 -- Rules to apply to new clients (through the "manage" signal).
 
 -- {{{ Rules
 -- Rules to apply to new clients (through the "manage" signal).
+
+local function move_to_tag(s, t)
+    return function(c)
+        c:move_to_tag(tags[s][t])
+    end
+end
+
 awful.rules.rules = {
     -- All clients will match this rule.
     { rule = { },
 awful.rules.rules = {
     -- All clients will match this rule.
     { rule = { },
@@ -532,10 +539,10 @@ awful.rules.rules = {
                      raise = true,
                      keys = clientkeys,
                      buttons = clientbuttons,
                      raise = true,
                      keys = clientkeys,
                      buttons = clientbuttons,
+                     screen = awful.screen.preferred,
                      placement = awful.placement.no_overlap+awful.placement.no_offscreen,
                      placement = awful.placement.no_overlap+awful.placement.no_offscreen,
-                     -- https://github.com/awesomeWM/awesome/issues/1091#issuecomment-246933520
-                     screen = function (c) return awesome.startup and c.screen or awful.screen.focused() end,
-     }
+                     floating = true
+                 },
     },
 
     -- Add titlebars to normal clients and dialogs
     },
 
     -- Add titlebars to normal clients and dialogs
@@ -553,42 +560,40 @@ awful.rules.rules = {
                } },
     { rule = { class = "URxvt", instance = "irc" },
                properties = {
                } },
     { rule = { class = "URxvt", instance = "irc" },
                properties = {
---                   screen = screen.count(),
---                   tag = screen.count() == 1 and "2" or "1"
+                   switchtotag = true
                },
                },
-               callback = function(c) c:move_to_tag(tags[1][2]) end
+               callback = move_to_tag(screen.count(), screen.count() == 1 and 2 or 1)
            },
            },
-    { rule = { class = "Firefox" },
+    { rule = { class = "Firefox", instance = "Navigator" },
                properties = {
                    floating = false,
                properties = {
                    floating = false,
---                   screen = screen.count(),
---                   tag = screen.count() == 1 and "2" or "1"
                },
                },
-               callback = function(c) c:move_to_tag(tags[1][9]) end
+               callback = move_to_tag(screen.count() == 1 and 1 or 2, 9)
            },
            },
-    { rule = { class = "Icedove" },
+    { rule = { class = "Icedove", instance = "Mail" },
                properties = {
                    floating = false,
                properties = {
                    floating = false,
---                   screen = screen.count(),
---                   tag = screen.count() == 1 and "2" or "1"
                },
                },
-               callback = function(c) c:move_to_tag(tags[1][8]) end
+               callback = move_to_tag(screen.count() == 1 and 1 or 2, 8)
            },
            },
-    { rule = { class = "chromium" },
+    { rule = { class = "chromium", instance = "chromium" },
                properties = {
                    floating = false,
                properties = {
                    floating = false,
---                   screen = screen.count(),
---                   tag = screen.count() == 1 and "2" or "1"
                },
                },
-               callback = function(c) c:move_to_tag(tags[1][9]) end
+               callback = move_to_tag(screen.count() == 1 and 1 or 2, 9)
            },
     { rule = { class = "Gscan2pdf" },
                properties = {
            },
     { rule = { class = "Gscan2pdf" },
                properties = {
-                   floating = false,
                    screen = 1,
                    screen = 1,
-                   tag = "7"
+                   tag = "5"
+               },
+               callback = move_to_tag(1, 5)
+           },
+    { rule = { name = "gscan2pdf .*" },
+               properties = {
+                   floating = false,
                },
                },
---               callback = function(c) c:move_to_tag(tags[1][9]) end
+               callback = move_to_tag(1, 5)
            },
 }
 -- }}}
            },
 }
 -- }}}
@@ -661,14 +666,6 @@ end)
 client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
 client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
 
 client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
 client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
 
--- https://www.mail-archive.com/awesome@naquadah.org/msg08285.html
-client.disconnect_signal("request::activate", awful.ewmh.activate)
-client.connect_signal("request::activate", function(c, context, hints)
-    if c.class == "Firefox" and context == "ewmh" then
-        return
-    end
-    return awful.ewmh.activate(c, context, hints)
-end)
--- }}}
+awful.ewmh.add_activate_filter(function(c) if c.class == "Firefox" then return false end end)
 
 -- vim:ft=lua:sw=4:sts=4:ts=4:et
 
 -- vim:ft=lua:sw=4:sts=4:ts=4:et
awesome window-manager configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.