X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/6024ede18627798896b2608833bc2d0b2e2d6443..9432ea1be5f0f451cbb11a7d72b98f1fbd10da76:/.config/awesome/rc.lua

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 480ea13..46d8688 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -10,7 +10,7 @@ require("beautiful")
 
 -- {{{ Variable definitions
 -- This is a file path to a theme file which will defines colors.
-theme_path = AWESOME_DATADIR .. "/themes/madduck"
+theme_path = AWESOME_DATADIR .. "/themes/default"
 
 -- This is used later as the default terminal to run.
 terminal = "x-terminal-emulator"
@@ -87,7 +87,7 @@ for s = 1, screen.count() do
         tags[s][tagnumber] = tag({ name = tagnumber, layout = layouts[1] })
         -- Add tags to screen one by one
         -- split at 0.5/50% exactly
-        tags[s][tagnumber].mwfact = 0.5
+        -- tags[s][tagnumber].mwfact = 0.5
         tags[s][tagnumber].screen = s
     end
     -- I'm sure you want to see at least one tag.
@@ -108,7 +108,7 @@ mytaglist.label = awful.widget.taglist.label.all
 
 -- Create a tasklist widget
 mytasklist = widget({ type = "tasklist", name = "mytasklist" })
-mytasklist:mouse_add(mouse({ }, 1, function (object, c) c:focus_set(); c:raise() end))
+mytasklist:mouse_add(mouse({ }, 1, function (object, c) client.focus = c; c:raise() end))
 mytasklist:mouse_add(mouse({ }, 4, function () awful.client.focusbyidx(1) end))
 mytasklist:mouse_add(mouse({ }, 5, function () awful.client.focusbyidx(-1) end))
 mytasklist.label = awful.widget.tasklist.label.currenttags
@@ -144,15 +144,14 @@ for s = 1, screen.count() do
     mystatusbar[s] = statusbar({ position = "top", name = "mystatusbar" .. s,
                                    fg = beautiful.fg_normal, bg = beautiful.bg_normal })
     -- Add widgets to the statusbar - order matters
-    mystatusbar[s].widgets =
-    {
+    mystatusbar[s]:widgets({
         mytaglist,
         mytasklist,
         mypromptbox,
         mytextbox,
         mylayoutbox[s],
         s == screen.count() and mysystray or nil
-    }
+    })
     mystatusbar[s].screen = s
 end
 -- }}}
@@ -189,7 +188,7 @@ for i = 1, keynumber do
                    end):add()
     keybinding({ modkey, "Shift" }, i,
                    function ()
-                       local sel = client.focus_get()
+                       local sel = client.focus
                        if sel then
                            if tags[sel.screen][i] then
                                awful.client.movetotag(tags[sel.screen][i])
@@ -198,7 +197,7 @@ for i = 1, keynumber do
                    end):add()
     keybinding({ modkey, "Control", "Shift" }, i,
                    function ()
-                       local sel = client.focus_get()
+                       local sel = client.focus
                        if sel then
                            if tags[sel.screen][i] then
                                awful.client.toggletag(tags[sel.screen][i])
@@ -219,17 +218,19 @@ keybinding({ modkey, "Shift" }, "q", awesome.quit):add()
 
 -- Client manipulation
 keybinding({ modkey }, "m", awful.client.maximize):add()
-keybinding({ modkey, "Shift" }, "c", function () client.focus_get():kill() end):add()
-keybinding({ modkey }, "j", function () awful.client.focusbyidx(1); client.focus_get():raise() end):add()
-keybinding({ modkey }, "k", function () awful.client.focusbyidx(-1);  client.focus_get():raise() end):add()
+keybinding({ modkey, "Shift" }, "c", function () client.focus:kill() end):add()
+keybinding({ modkey }, "j", function () awful.client.focusbyidx(1); client.focus:raise() end):add()
+keybinding({ modkey }, "k", function () awful.client.focusbyidx(-1);  client.focus:raise() end):add()
 keybinding({ modkey, "Shift" }, "j", function () awful.client.swap(1) end):add()
 keybinding({ modkey, "Shift" }, "k", function () awful.client.swap(-1) end):add()
 keybinding({ modkey, "Control" }, "j", function () awful.screen.focus(1) end):add()
 keybinding({ modkey, "Control" }, "k", function () awful.screen.focus(-1) end):add()
 keybinding({ modkey, "Control" }, "space", awful.client.togglefloating):add()
-keybinding({ modkey, "Control" }, "Return", function () client.focus_get():swap(awful.client.master()) end):add()
+keybinding({ modkey, "Control" }, "Return", function () client.focus:swap(awful.client.master()) end):add()
 keybinding({ modkey }, "o", awful.client.movetoscreen):add()
 keybinding({ modkey }, "Tab", awful.client.focus.history.previous):add()
+keybinding({ modkey }, "u", awful.client.urgent.jumpto):add()
+keybinding({ modkey, "Shift" }, "r", function () client.focus:redraw() end):add()
 
 -- Layout manipulation
 keybinding({ modkey }, "l", function () awful.tag.incmwfact(0.05) end):add()
@@ -243,11 +244,18 @@ keybinding({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -
 
 -- Prompt
 keybinding({ modkey }, "F1", function ()
-                                     awful.prompt({ prompt = "Run: " }, mypromptbox, awful.spawn, awful.completion.bash)
-                                 end):add()
+                                 awful.prompt.run({ prompt = "Run: " }, mypromptbox, awful.spawn, awful.completion.bash,
+os.getenv("HOME") .. "/.cache/awesome/history") end):add()
 keybinding({ modkey }, "F4", function ()
-                                     awful.prompt({ prompt = "Run Lua code: " }, mypromptbox, awful.eval)
-                                 end):add()
+                                 awful.prompt.run({ prompt = "Run Lua code: " }, mypromptbox, awful.eval, awful.prompt.bash,
+os.getenv("HOME") .. "/.cache/awesome/history_eval") end):add()
+keybinding({ modkey, "Ctrl" }, "i", function ()
+                                        if mypromptbox.text then
+                                            mypromptbox.text = nil
+                                        else
+                                            mypromptbox.text = "Class: " .. client.focus.class .. " Instance: ".. client.focus.instance
+                                        end
+                                    end):add()
 
 --- Tabulous, tab manipulation
 keybinding({ modkey, "Control" }, "y", function ()
@@ -261,7 +269,7 @@ keybinding({ modkey, "Control" }, "y", function ()
             tabbedview = tabulous.tab_create()
             tabulous.tab(tabbedview, nextclient)
         else
-            tabulous.tab(tabbedview, client.focus_get())
+            tabulous.tab(tabbedview, client.focus)
         end
     else
         tabulous.tab(tabbedview, nextclient)
@@ -338,7 +346,7 @@ end
 function hook_mouseover(c)
     -- Sloppy focus, but disabled for magnifier layout
     if awful.layout.get(c.screen) ~= "magnifier" then
-        c:focus_set()
+        client.focus = c
     end
 end
 
@@ -351,14 +359,14 @@ function hook_manage(c)
         awful.titlebar.add(c, { modkey = modkey })
     end
     -- Add mouse bindings
-    c:mouse_add(mouse({ }, 1, function (c) c:focus_set(); c:raise() end))
+    c:mouse_add(mouse({ }, 1, function (c) client.focus = c; c:raise() end))
     c:mouse_add(mouse({ modkey }, 1, function (c) c:mouse_move() end))
     c:mouse_add(mouse({ modkey }, 3, function (c) c:mouse_resize() end))
     -- New client may not receive focus
     -- if they're not focusable, so set border anyway.
     c.border_width = beautiful.border_width
     c.border_color = beautiful.border_normal
-    c:focus_set()
+    client.focus = c
 
     -- Check if the application should be floating.
     local cls = c.class
@@ -388,26 +396,31 @@ end
 -- Hook function to execute when arranging the screen
 -- (tag switch, new client, etc)
 function hook_arrange(screen)
-    mylayoutbox[screen].text =
-        "<bg image=\"" .. AWESOME_DATADIR .. "/icons/layouts/" .. awful.layout.get(screen) .. "w.png\" resize=\"true\"/>"
+    local layout = awful.layout.get(screen)
+    if layout then
+        mylayoutbox[screen].text =
+            "<bg image=\"/home/madduck/code/awesome/share/awesome/icons/layouts/" .. awful.layout.get(screen) .. "w.png\" resize=\"true\"/>"
+        else
+            mylayoutbox[screen].text = "No layout."
+    end
 
     -- If no window has focus, give focus to the latest in history
-    if not client.focus_get() then
+    if not client.focus then
         local c = awful.client.focus.history.get(screen, 0)
-        if c then c:focus_set() end
+        if c then client.focus = c end
     end
 
     -- Uncomment if you want mouse warping
     --[[
-    local sel = client.focus_get()
+    local sel = client.focus
     if sel then
-        local c_c = sel.coords
-        local m_c = mouse.coords
+        local c_c = sel:coords()
+        local m_c = mouse.coords()
 
         if m_c.x < c_c.x or m_c.x >= c_c.x + c_c.width or
             m_c.y < c_c.y or m_c.y >= c_c.y + c_c.height then
             if table.maxn(m_c.buttons) == 0 then
-                mouse.coords = { x = c_c.x + 5, y = c_c.y + 5}
+                mouse.coords({ x = c_c.x + 5, y = c_c.y + 5})
             end
         end
     end
@@ -457,3 +470,12 @@ keybinding({ cmdmodkey }, "r", function () awful.spawn("gmrun") end):add()
 keybinding({ cmdmodkey }, "j", function () awful.spawn("jpilot") end):add()
 keybinding({ cmdmodkey }, "x", function () awful.spawn("/sbin/start-stop-daemon --start --background --exec /usr/bin/xscreensaver; xscreensaver-command -lock") end):add()
 keybinding({ cmdmodkey, "Shift" }, "x", function () awful.spawn("xscreensaver-command -exit") end):add()
+
+-- Highlight statusbars on the screen that has focus, 
+-- set this to false if you only have one screen or 
+-- you don't like it :P
+if screen.count() > 1 then
+  statusbar_highlight_focus = true
+else
+  statusbar_highlight_focus = false
+end