X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/3549383d58191b5f90cec0573fe0b0f1249fe15f..02e533f0246bf670c8bb5cc14f78df14a53533fe:/.config/awesome/rc.lua?ds=sidebyside

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 8cd9f1e..c6f2149 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -373,7 +373,13 @@ globalkeys = awful.util.table.join(
                   mypromptbox[mouse.screen].widget,
                   awful.util.eval, nil,
                   awful.util.getdir("cache") .. "/history_eval")
-              end)
+              end),
+    awful.key({ modkey }, "F1", function () awful.screen.focus(3) end),
+    awful.key({ modkey }, "F2", function () awful.screen.focus(1) end),
+    awful.key({ modkey }, "F3", function () awful.screen.focus(2) end),
+    awful.key({ modkey }, "F1", function () awful.client.movetoscreen(c, 3) end),
+    awful.key({ modkey }, "F2", function () awful.client.movetoscreen(c, 1) end),
+    awful.key({ modkey }, "F3", function () awful.client.movetoscreen(c, 2) end)
 )
 
 clientkeys = awful.util.table.join(
@@ -381,7 +387,8 @@ clientkeys = awful.util.table.join(
     awful.key({ modkey, "Shift"   }, "c",      function (c) c:kill()                         end),
     awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ),
     awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end),
-    awful.key({ modkey,           }, "o",      awful.client.movetoscreen                        ),
+    awful.key({ modkey,           }, "o",      function (c) awful.client.movetoscreen(c, c.screen-1) end),
+    awful.key({ modkey,           }, "p",      function (c) awful.client.movetoscreen(c, c.screen+1) end),
     awful.key({ modkey, "Shift"   }, "r",      function (c) c:redraw()                       end),
     awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end),
     awful.key({ modkey,           }, "n",      function (c) c.minimized = not c.minimized    end),
@@ -401,10 +408,6 @@ clientkeys = awful.util.table.join(
                 c.maximized_horizontal = false
                 c.maximized_vertical = false
             end
-            -- b = c.maximized_horizontal + c.maximized_vertical * 2
-            -- b = (b + 1) % 4
-            -- c.maximized_horizontal = b & 1
-            -- c.maximized_vertical = (b & 2) >>1
         end)
 )
 
@@ -510,7 +513,8 @@ awful.rules.rules = {
                      floating = true,
                      keys = clientkeys,
                      buttons = clientbuttons },
-      callback = awful.placement.centered },
+      callback = awful.placement.centered
+    },
     { rule = { class = "URxvt" },
       properties = { floating = false } },
     { rule = { class = "URxvt", instance = "irc" },
@@ -519,12 +523,6 @@ awful.rules.rules = {
       properties = { tag = tags[screen.count() == 3 and 1 or screen.count()][9], switchtotag = false, floating = false } },
     { rule = { class = "Icedove", instance = "Mail" },
       properties = { tag = tags[screen.count() == 3 and 1 or screen.count()][8], switchtotag = false, floating = false } },
---    { rule = { class = "Iceweasel", instance = "Dialog" },
---      properties = { floating = true } },
-   -- { rule = { name = "OpenOffice.org" },
-  --    properties = { switchtotag = true, floating = true, maximized_vertical = true, maximized_horizontal = true, callback = awful.placement.no_offscreen } },
- --   { rule = { name = "Okular" },
---      properties = { switchtotag = true, floating = true, maximized_vertical = true, maximized_horizontal = true, callback = awful.placement.no_offscreen } },
 }
 -- }}}