From feafb9ced02f0290118e4d566e74eb50cd66276e Mon Sep 17 00:00:00 2001
From: "Adrian C. (anrxc)" <anrxc@sysphere.org>
Date: Sun, 20 Sep 2009 12:48:21 +0200
Subject: rc.lua: revert 3a5b9d5 breaks floating layout

---
 rc.lua | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

(limited to 'rc.lua')

diff --git a/rc.lua b/rc.lua
index ce45f0e..d16758b 100644
--- a/rc.lua
+++ b/rc.lua
@@ -303,7 +303,7 @@ datewidget:buttons(awful.util.table.join(
 -- {{{ System tray
 systray = widget({ type = "systray" })
 -- }}}
--- }}}n
+-- }}}
 
 -- {{{ Wibox initialisation
 wibox     = {}
@@ -380,7 +380,7 @@ root.buttons(awful.util.table.join(
 
 -- Client mouse bindings
 clientbuttons = awful.util.table.join(
-    awful.button({ }, 1, function (c) client.focus = c end),
+    awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
     awful.button({ modkey }, 1, awful.mouse.client.move),
     awful.button({ modkey }, 3, awful.mouse.client.resize)
 )
@@ -502,13 +502,27 @@ globalkeys = awful.util.table.join(
     awful.key({ modkey }, "p",   function () awful.screen.focus_relative(1) end),
     awful.key({ modkey }, "s",   function () scratchpad.toggle() end),
     awful.key({ altkey }, "Tab", awful.client.urgent.jumpto),
-    awful.key({ modkey }, "Tab", function () awful.client.focus.history.previous() end),
-    awful.key({ modkey }, "j",   function () awful.client.focus.byidx(1) end),
-    awful.key({ modkey }, "k",   function () awful.client.focus.byidx(-1) end),
-    awful.key({ modkey }, "#48", function () awful.client.focus.bydirection("down") end),
-    awful.key({ modkey }, "#34", function () awful.client.focus.bydirection("up") end),
-    awful.key({ modkey }, "#47", function () awful.client.focus.bydirection("left") end),
-    awful.key({ modkey }, "#51", function () awful.client.focus.bydirection("right") end),
+    awful.key({ modkey }, "Tab", function () awful.client.focus.history.previous()
+        if client.focus then client.focus:raise() end
+    end),
+    awful.key({ modkey }, "j",   function () awful.client.focus.byidx(1)
+        if client.focus then client.focus:raise() end
+    end),
+    awful.key({ modkey }, "k",   function () awful.client.focus.byidx(-1)
+        if client.focus then client.focus:raise() end
+    end),
+    awful.key({ modkey }, "#48", function () awful.client.focus.bydirection("down")
+        if client.focus then client.focus:raise() end
+    end),
+    awful.key({ modkey }, "#34", function () awful.client.focus.bydirection("up")
+        if client.focus then client.focus:raise() end
+    end),
+    awful.key({ modkey }, "#47", function () awful.client.focus.bydirection("left")
+        if client.focus then client.focus:raise() end
+    end),
+    awful.key({ modkey }, "#51", function () awful.client.focus.bydirection("right")
+        if client.focus then client.focus:raise() end
+    end),
     awful.key({ modkey, "Shift" }, "j",   function () awful.client.swap.byidx(1) end),
     awful.key({ modkey, "Shift" }, "k",   function () awful.client.swap.byidx(-1) end),
     awful.key({ modkey, "Shift" }, "#48", function () awful.client.swap.bydirection("down") end),
@@ -672,7 +686,6 @@ end)
 -- }}}
 
 -- {{{ Focus signal functions
-client.add_signal("focus",   function (c) c:raise() end)
 client.add_signal("focus",   function (c) c.border_color = beautiful.border_focus end)
 client.add_signal("unfocus", function (c) c.border_color = beautiful.border_normal end)
 -- }}}
-- 
cgit v1.2.3