Improve awesome conf

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/config/awesome/rc.lua b/config/awesome/rc.lua
index 2f0f578..a27550b 100644 (file)
--- a/config/awesome/rc.lua
+++ b/config/awesome/rc.lua
@@ -7,7 +7,7 @@ require("awful.rules")
 require("vicious")
 require("beautiful")
 
-terminal = "x-terminal-emulator"
+terminal = "urxvtcd"
 lock     = 'xscreensaver-command -lock'
 beautiful.init(awful.util.getdir("config").."/theme")
 
@@ -503,8 +503,8 @@ awful.rules.rules = {
 -- {{{ Signals
 
 function warp_mouse(c)
-    local o = awful.mouse.client_under_pointer()
-    if not o or o ~= c then
+    local o = mouse.object_under_pointer()
+    if not o or (o ~= c and type(o) == "client") then
         local g = c:geometry()
         mouse.coords({ x = g.x + 5, y = g.y + 5 }, true)
     end