X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=config%2Fawesome%2Frc.lua;h=9ecd62f12afd3300454f4ac97513ee50edee7711;hb=901f0486e49163e44626809ac42a18c6a1dd52bf;hp=1aede8297c476d8f097f3159838564fe45b6565d;hpb=3ea043145f89d7ce1d3e78a53a97e2016cf9690f;p=~madcoder%2Fdotfiles.git

diff --git a/config/awesome/rc.lua b/config/awesome/rc.lua
index 1aede82..9ecd62f 100644
--- a/config/awesome/rc.lua
+++ b/config/awesome/rc.lua
@@ -4,17 +4,18 @@
 require("awful")
 require("awful.autofocus")
 require("awful.rules")
-require("vicious")
 require("beautiful")
+require("vicious")
 
 terminal = "urxvtcd"
 lock     = 'xscreensaver-command -lock'
+lock     = 'gnome-screensaver-command --lock'
 beautiful.init(awful.util.getdir("config").."/theme")
 
 -- {{{ Modkeys
-modkey = "Mod4"
-shift = "Shift"
-alt = "Mod1"
+modkey  = "Mod4"
+shift   = "Shift"
+alt     = "Mod1"
 control = "Control"
 
 k_n   = {}
@@ -339,7 +340,7 @@ for s = 1, screen.count() do
         },
     }
 
-    if (s == 1) then
+    if s == 1 then
         table.insert(tab, widget{ type = 'systray' })
     end
     for i = #mywidgets, 1, -1 do
@@ -389,11 +390,19 @@ globalkeys = awful.util.table.join(
     awful.key(k_ms, "k", function () awful.client.swap.byidx(-1) end),
 
     -- Mod+{E/D}: Switch to next/previous screen
-    awful.key(k_m, "Tab",  function () awful.screen.focus_relative(1) end),
-    awful.key(k_ms, "Tab", function () awful.screen.focus_relative(-1) end),
+    awful.key(k_m, "Tab",  function ()
+        awful.screen.focus_relative(1)
+        coords = mouse.coords();
+        mouse.coords({ x = coords.x + 5, y = coords.y + 5}, true)
+    end),
+    awful.key(k_ms, "Tab", function ()
+        awful.screen.focus_relative(-1)
+        coords = mouse.coords()
+        mouse.coords({ x = coords.x + 5, y = coords.y + 5}, true)
+    end),
 
     -- Mod+Enter: Launch a new terminal
-    awful.key(k_m,  "e",      function() awful.util.spawn("chromium-browser") end),
+    awful.key(k_m,  "e",      function() awful.util.spawn("chromium") 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),
@@ -457,7 +466,7 @@ local clientkeys = awful.util.table.join(
         if mypromptbox.widget.text then
             mypromptbox.widget.text = ""
         else
-            mypromptbox.widget.text = "Class: " .. c.class .. " Instance: ".. c.instance
+            mypromptbox.widget.text = "Class: " .. c.class .. " Instance: ".. c.instance .. " Name: " .. c.name
         end
     end),
 
@@ -494,27 +503,17 @@ awful.rules.rules = {
     },
     { rule = { class = "MPlayer" },  properties = { floating = true } },
     { rule = { class = "pinentry" }, properties = { floating = true } },
-    -- Set Firefox to always map on tags number 2 of screen 1.
-    -- { rule = { class = "Firefox" },
-    --   properties = { tag = tags[1][2] } },
+    { rule = { class = "Claws-mail", name = "[no subject] - Compose message" },
+      properties = { maximized_vertical = true, floating = true, x = 0 } },
 }
 
 -- }}}
 -- {{{ Signals
 
-function warp_mouse(c)
-    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
-end
-
 client.add_signal("focus", function (c)
     if not awful.client.ismarked(c) then
         c.border_color = beautiful.border_focus
     end
-    warp_mouse(c)
 end)
 
 client.add_signal("unfocus", function (c)
@@ -527,14 +526,6 @@ client.add_signal("manage", function (c, startup)
     c:add_signal("mouse::enter", function(c) client.focus = c end)
 end)
 
-for s = 1, screen.count() do
-    screen[s]:add_signal("arrange", function ()
-        if client.focus and client.focus.screen == s then
-            warp_mouse(client.focus)
-        end
-    end)
-end
-
 -- }}}
 
 awful.util.spawn("xkbcomp -w 0 -R/usr/share/X11/xkb /home/madcoder/.Xkeyboard :0")