]> git.madduck.net Git - etc/awesome.git/blobdiff - .config/awesome/rc.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

identify browser window better
[etc/awesome.git] / .config / awesome / rc.lua
index dce23958dac9a89c54b4c79f7cc35a41c38bb693..554ecbbce94a0eb9349a17bf031fca7f3aada56b 100644 (file)
@@ -29,7 +29,7 @@ layouts =
     "tileleft",
     "tilebottom",
     "tiletop",
---    "magnifier",
+    "magnifier",
     "max",
 --    "spiral",
 --    "dwindle",
@@ -40,6 +40,7 @@ layouts =
 -- the application class or instance. The instance is useful when running
 -- a console app in a terminal like (Music on Console)
 --    xterm -name mocp -e mocp
+-- OVERRULED BY TILEDAPPS BELOW
 floatapps =
 {
     -- by class
@@ -51,12 +52,30 @@ floatapps =
     ["Play stream"] = true
 }
 
+-- Applications that should never float, assuming everything else floats
+-- (by instance)
+tiledapps =
+{
+    ["urxvt"] = true
+}
+
+-- Applications that should be maximised
+-- (by instance)
+maxapps =
+{
+    ["Navigator"] = true,
+    -- jpilot is -v
+    ["-v"] = true,
+    ["Xpdf"] = true
+}
+
 -- Applications to be moved to a pre-defined tag by class or instance.
--- Use the screen and workspace indices.
+-- Use the screen and tags indices.
 apptags =
 {
-    ["Firefox"] = { screen = 1, tag = 9 },
-    ["jpilot"] = { screen = 1, tag = 8 },
+    ["Navigator"] = { screen = 1, tag = 9 },
+    -- jpilot is -v
+    ["-v"] = { screen = 1, tag = 8 },
 }
 
 -- Define if we want to use titlebar on all applications.
@@ -87,7 +106,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,15 +127,14 @@ 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
 
 -- Create a textbox widget
-mytextbox = widget({ type = "textbox", name = "mytextbox", align = "right" })
--- Set the default text in textbox
-mytextbox.text = "<b><small> awesome " .. AWESOME_VERSION .. " </small></b>"
+mytimebox = widget({ type = "textbox", name = "mytimebox", align = "right" })
+mybatterybox = widget({ type = "textbox", name = "mybatterybox", align = "right" })
 mypromptbox = widget({ type = "textbox", name = "mypromptbox", align = "left" })
 
 -- Create an iconbox widget
@@ -138,21 +156,42 @@ for s = 1, screen.count() do
     mylayoutbox[s].text = "<bg image=\"" .. AWESOME_DATADIR .. "/layouts/tilew.png\" resize=\"true\"/>"
 end
 
+--Battery widget
+batterywidget = widget({ type = 'progressbar', name = 'batterywidget' })
+batterywidget.width = 100
+batterywidget.height = 0.8
+batterywidget.gap = 1
+batterywidget.border_padding = 1
+batterywidget.border_width = 1
+batterywidget.ticks_count = 10
+batterywidget.ticks_gap = 1
+batterywidget.vertical = false
+batterywidget:bar_properties_set('bat', {
+  bg = 'black',
+  fg = 'blue4',
+  fg_off = 'red',
+  reverse = false,
+  min_value = 0,
+  max_value = 100
+})
+-- }}}
+
 -- Create a statusbar for each screen and add it
 mystatusbar = {}
 for s = 1, screen.count() do
     mystatusbar[s] = statusbar({ position = "top", name = "mystatusbar" .. s,
-                                   fg = beautiful.fg_normal, bg = beautiful.bg_normal })
+                                 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,
+--        batterywidget,
+        mybatterybox,
+        mytimebox,
         mylayoutbox[s],
         s == screen.count() and mysystray or nil
-    }
+    })
     mystatusbar[s].screen = s
 end
 -- }}}
@@ -189,7 +228,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 +237,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 +258,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 +284,27 @@ 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 = nil
+                                            if client.focus.class then
+                                                mypromptbox.text = "Class: " .. client.focus.class .. " "
+                                            end
+                                            if client.focus.instance then
+                                                mypromptbox.text = mypromptbox.text .. "Instance: ".. client.focus.instance .. " "
+                                            end
+                                            if client.focus.role then
+                                                mypromptbox.text = mypromptbox.text .. "Role: ".. client.focus.role
+                                            end
+                                        end
+                                    end):add()
 
 --- Tabulous, tab manipulation
 keybinding({ modkey, "Control" }, "y", function ()
@@ -261,7 +318,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 +395,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,16 +408,17 @@ 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.
+    -- OVERRIDDEN, SEE tiledapps BELOW
     local cls = c.class
     local inst = c.instance
     if floatapps[cls] then
@@ -369,6 +427,9 @@ function hook_manage(c)
         c.floating = floatapps[inst]
     end
 
+    -- Override with tiledapps
+    c.floating = not (tiledapps[inst] or tiledapps[cls])
+
     -- Check application->screen/tag mappings.
     local target
     if apptags[cls] then
@@ -383,31 +444,41 @@ function hook_manage(c)
 
     -- Honor size hints
     c.honorsizehints = true
+
+    -- Maximise some
+    if maxapps[inst] or maxapps[cls] then
+      awful.client.maximize(c)
+    end
 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
@@ -415,12 +486,76 @@ function hook_arrange(screen)
 end
 
 -- Hook called every second
-function hook_timer ()
+function hook_timer()
     -- For unix time_t lovers
     -- mytextbox.text = " " .. os.time() .. " time_t "
     -- Otherwise use:
-    mytextbox.text = " " .. os.date() .. " "
+    mytimebox.text = " " .. os.date() .. " "
+end
+
+-- Hook called every sixty seconds
+function hook_battery()
+    mybatterybox.text = " " .. get_acpibatt() .. " "
+end
+
+-- {{{ Statusbar battery
+--
+function get_acpibatt()
+
+    local f = io.popen('acpi -b', 'r')
+    if not f then
+      return "acpi -b failed"
+    end
+
+    local s = f:read('*l')
+    f:close()
+    if not s then
+      return laststring;
+    end
+
+    -- Battery 0: Discharging, 89%, 00:02:14 remaining
+    -- Battery 0: Charging, 58%, 00:02:14 until charged
+    -- Battery 0: Full, 100%
+    -- so find the first bit first and then go look for the time
+    local st, en, status, percent = string.find(s, '%a+%s%d:%s(%a+),%s(%d+%%)');
+    local st, en, time = string.find(s, ',%s(%d+:%d+:%d+)%s%a+', en);
+
+    if not status or not percent then -- time can be empty if we're full
+      return "couldn't parse line " .. s
+    end
+
+    if not time then
+      return percent
+    end
+
+    if status == 'Charging' then
+      status = 'c';
+    elseif status == 'Discarching' then
+      status = 'd';
+    else
+      status = '';
+    end
+
+    return percent; -- .. ' (' .. status .. ')'; -- .. ' ' .. time .. ' left';
 end
+-- }}}
+
+--{{{ batt hook
+local function get_bat()
+  local a = io.open("/sys/class/power_supply/BAT1/charge_full")
+  for line in a:lines() do
+    full = line
+  end
+  a:close()
+  local b = io.open("/sys/class/power_supply/BAT1/charge_now")
+  for line in b:lines() do
+    now = line
+  end
+  b:close()
+  batt=math.floor(now*100/full)
+  batterywidget:bar_data_add("bat",batt )
+end
+--}}}
 
 -- Set up some hooks
 awful.hooks.focus.register(hook_focus)
@@ -431,6 +566,8 @@ awful.hooks.manage.register(hook_manage)
 awful.hooks.mouseover.register(hook_mouseover)
 awful.hooks.arrange.register(hook_arrange)
 awful.hooks.timer.register(1, hook_timer)
+awful.hooks.timer.register(120, hook_battery)
+-- awful.hooks.timer.register(5, get_bat)
 -- }}}
 
 cmdmodkey = "Mod3"
@@ -466,3 +603,5 @@ if screen.count() > 1 then
 else
   statusbar_highlight_focus = false
 end
+
+hook_battery()