Update to tmux 1.2

[~madcoder/dotfiles.git] / config / awesome / rc.lua

diff --git a/config/awesome/rc.lua b/config/awesome/rc.lua
index 2f0f578..1aede82 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")
 
@@ -393,7 +393,7 @@ globalkeys = awful.util.table.join(
     awful.key(k_ms, "Tab", function () awful.screen.focus_relative(-1) end),
 
     -- Mod+Enter: Launch a new terminal
-    awful.key(k_m,  "e",      function() awful.util.spawn("firefox") end),
+    awful.key(k_m,  "e",      function() awful.util.spawn("chromium-browser") end),
     awful.key(k_m,  "Return", function() awful.util.spawn(terminal) end),
     awful.key(k_ac, "r", awesome.restart),
     awful.key(k_m, "F12", function() awful.util.spawn(lock) end),
@@ -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