add awsetbg to PATH

[etc/awesome.git] / .config / awesome / rc.lua

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index bc3da285bf7821a86b64a07fca0bee64b9105c33..232909528e5f01395ba1fadc526ca0dd1752ac99 100644 (file)
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -1,18 +1,18 @@
 -- awesome 3 configuration file
 
 -- awesome 3 configuration file
 

-AWESOME_DATADIR = "/home/madduck/code/awesome"
-package.path = AWESOME_DATADIR .. "/lib/?.lua;" .. package.path
-

 -- Include awesome library, with lots of useful function!
 require("awful")
 require("tabulous")
 -- Include awesome library, with lots of useful function!
 require("awful")
 require("tabulous")

-
--- Uncomment this to activate autotabbing
--- tabulous.autotab_start()
+require("beautiful")

 
 -- {{{ Variable definitions
 
 -- {{{ Variable definitions

--- This is used later as the default terminal to run.
+-- This is a file path to a theme file which will defines colors.
+theme_path = "/home/madduck/code/awesome/share/awesome/themes/default"
+
+-- This is used later as the default terminal and editor to run.

 terminal = "x-terminal-emulator"
 terminal = "x-terminal-emulator"

+editor = "sensible-editor"
+editor_cmd = terminal .. " -e " .. editor

 
 -- Default modkey.
 -- Usually, Mod4 is the key with a logo between Control and Alt.
 
 -- Default modkey.
 -- Usually, Mod4 is the key with a logo between Control and Alt.


@@ -28,17 +28,24 @@ layouts =
     "tileleft",
     "tilebottom",
     "tiletop",
     "tileleft",
     "tilebottom",
     "tiletop",

+    "fairh",
+    "fairv",

     "magnifier",
     "max",
     "magnifier",
     "max",

-    "spiral",
-    "dwindle",
+--    "spiral",
+--    "dwindle",

     "floating"
 }
 
     "floating"
 }
 

--- Table of clients that should be set floating
-floatings =
+-- Table of clients that should be set floating. The index may be either
+-- 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 =

 {
 {

-    ["mplayer"] = true,
+    -- by class
+    ["MPlayer"] = true,

     ["pinentry"] = true,
     ["GIMP"] = true,
     ["twinkle"] = true,
     ["pinentry"] = true,
     ["GIMP"] = true,
     ["twinkle"] = true,


@@ -46,125 +53,171 @@ floatings =
     ["Play stream"] = true
 }
 
     ["Play stream"] = true
 }
 

--- Color & Appearance definitions, we use these later to display things
-font = "RotisSansSerif 10"
-border_width = 1
+-- Applications that should never float, assuming everything else floats
+-- (by instance)
+tiledapps =
+{
+    ["urxvt"] = true
+}

 
 

-bg_normal = "#222222"
-fg_normal = "#aaaaaa"
-border_normal = "#000000"
+-- Applications that should be maximised
+-- (by instance)
+maxapps =
+{
+    ["Navigator"] = true,
+    -- jpilot is -v
+    ["-v"] = true,
+    ["Xpdf"] = true,
+    ["gscan2pdf"] = true
+}

 
 

-bg_focus = "#535d6c"
-fg_focus = "#ffffff"
-border_focus = bg_focus
-border_marked = "#91231C"
+-- Applications to be moved to a pre-defined tag by class or instance.
+-- Use the screen and tags indices.
+apptags =
+{
+    ["Navigator"] = { screen = 1, tag = 9 },
+    -- jpilot is -v
+    ["-v"] = { screen = 1, tag = 8 },
+}

 
 

-awesome.font_set(font)
-awesome.colors_set({ fg = fg_normal, bg = bg_normal })
+-- Define if we want to use titlebar on all applications.
+use_titlebar = false
+-- }}}
+
+-- {{{ Initialization
+-- Initialize theme (colors).
+beautiful.init(theme_path)
+
+-- Register theme in awful.
+-- This allows to not pass plenty of arguments to each function
+-- to inform it about colors we want it to draw.
+awful.beautiful.register(beautiful)

 
 

+-- Uncomment this to activate autotabbing
+-- tabulous.autotab_start()

 -- }}}
 
 -- {{{ Tags
 -- }}}
 
 -- {{{ Tags

--- Define tags table
+-- Define tags table.

 tags = {}
 for s = 1, screen.count() do
 tags = {}
 for s = 1, screen.count() do

-    -- Each screen has its own tag table
+    -- Each screen has its own tag table.

     tags[s] = {}
     tags[s] = {}

-    -- Create 9 tags per screen
+    -- Create 9 tags per screen.

     for tagnumber = 1, 9 do
     for tagnumber = 1, 9 do

-        tags[s][tagnumber] = tag({ name = tagnumber, layout = layouts[1] })
+        tags[s][tagnumber] = tag({ name = tagnumber, layout = layouts[6] })

         -- Add tags to screen one by one
         -- split at 0.5/50% exactly
         -- Add tags to screen one by one
         -- split at 0.5/50% exactly

-        tags[s][tagnumber].mwfact = 0.5
-        tags[s][tagnumber]:add(s)
+        -- tags[s][tagnumber].mwfact = 0.5
+        tags[s][tagnumber].screen = s

     end
     -- I'm sure you want to see at least one tag.
     tags[s][1].selected = true
 end
 -- }}}
 
     end
     -- I'm sure you want to see at least one tag.
     tags[s][1].selected = true
 end
 -- }}}
 

--- {{{ Statusbar
--- Create a taglist widget
-mytaglist = widget({ type = "taglist", name = "mytaglist" })
-mytaglist:mouse_add(mouse({}, 1, function (object, tag) awful.tag.viewonly(tag) end))
-mytaglist:mouse_add(mouse({ modkey }, 1, function (object, tag) awful.client.movetotag(tag) end))
-mytaglist:mouse_add(mouse({}, 3, function (object, tag) tag.selected = not tag.selected end))
-mytaglist:mouse_add(mouse({ modkey }, 3, function (object, tag) awful.client.toggletag(tag) end))
-mytaglist:mouse_add(mouse({ }, 4, awful.tag.viewnext))
-mytaglist:mouse_add(mouse({ }, 5, awful.tag.viewprev))
-function mytaglist.label(t)
-    local text = ""
-    if t.selected then
-        text = "<bg color='"..bg_focus.."'/> <span color='"..fg_focus.."'>"..t.name.."</span> "
-    else
-        text = " "..t.name.." "
-    end
-    return text
-end
-
--- 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({ }, 4, function () awful.client.focus(1) end))
-mytasklist:mouse_add(mouse({ }, 5, function () awful.client.focus(-1) end))
-function mytasklist.label(c)
-    local text = ""
-    if c.floating then
-        text = "<bg image=\"" .. AWESOME_DATADIR .. "/icons/floatingw.png\" align=\"right\"/>"
-    end
-    if client.focus_get() == c then
-        text = text .. " <bg color='"..bg_focus.."'/><span color='"..awful.escape(fg_focus).."'>"..c.name.."</span> "
-    else
-        text = text .. " "..awful.escape(c.name).." "
-    end
-    return text
-end
-
+-- {{{ Wibox

 -- Create a textbox widget
 mytextbox = widget({ type = "textbox", name = "mytextbox", align = "right" })
 -- Set the default text in textbox
 -- 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>"
-mypromptbox = widget({ type = "textbox", name = "mypromptbox", align = "left" })
+mytextbox.text = "<b><small> " .. AWESOME_RELEASE .. " </small></b>"
+
+-- Create a laucher widget and a main menu
+myawesomemenu = {
+   {"manual", terminal .. " -e man awesome" },
+   {"edit config", editor_cmd .. " " .. awful.util.getdir("config") .. "/rc.lua" },
+   {"restart", awesome.restart },
+   {"quit", awesome.quit }
+}

 
 

--- Create an iconbox widget
-myiconbox = widget({ type = "textbox", name = "myiconbox", align = "left" })
-myiconbox.text = "<bg image=\"" .. AWESOME_DATADIR .. "/icons/awesome16.png\" resize=\"true\"/>"
+mymainmenu = {
+   {"awesome", myawesomemenu, "/home/madduck/code/awesome/share/awesome/icons/awesome16.png" },
+   {"open terminal", terminal }
+}
+
+mylauncher = awful.widget.launcher({ name = "mylauncher",
+                                     image = "/home/madduck/code/awesome/share/awesome/icons/awesome16.png",
+                                     menu = { id="mymainmenu", items=mymainmenu } })

 
 -- Create a systray
 mysystray = widget({ type = "systray", name = "mysystray", align = "right" })
 
 
 -- Create a systray
 mysystray = widget({ type = "systray", name = "mysystray", align = "right" })
 

--- Create an iconbox widget which will contains an icon indicating which layout we're using.
--- We need one layoutbox per screen.
+-- Create textbox widgets
+mytimebox = widget({ type = "textbox", name = "mytimebox", align = "right" })
+mybatterybox = widget({ type = "textbox", name = "mybatterybox", align = "right" })
+
+-- Create a wibox for each screen and add it
+mywibox = {}
+mypromptbox = {}

 mylayoutbox = {}
 mylayoutbox = {}

-for s = 1, screen.count() do
-    mylayoutbox[s] = widget({ type = "textbox", name = "mylayoutbox", align = "right" })
-    mylayoutbox[s]:mouse_add(mouse({ }, 1, function () awful.layout.inc(layouts, 1) end))
-    mylayoutbox[s]:mouse_add(mouse({ }, 3, function () awful.layout.inc(layouts, -1) end))
-    mylayoutbox[s]:mouse_add(mouse({ }, 4, function () awful.layout.inc(layouts, 1) end))
-    mylayoutbox[s]:mouse_add(mouse({ }, 5, function () awful.layout.inc(layouts, -1) end))
-    mylayoutbox[s].text = "<bg image=\"" .. AWESOME_DATADIR .. "/layouts/tilew.png\" resize=\"true\"/>"
-end
+mytaglist = {}
+mytaglist.buttons = { button({ }, 1, awful.tag.viewonly),
+                      button({ modkey }, 1, awful.client.movetotag),
+                      button({ }, 3, function (tag) tag.selected = not tag.selected end),
+                      button({ modkey }, 3, awful.client.toggletag),
+                      button({ }, 4, awful.tag.viewnext),
+                      button({ }, 5, awful.tag.viewprev) }
+mytasklist = {}
+mytasklist.buttons = { button({ }, 1, function (c) client.focus = c; c:raise() end),
+                       button({ }, 3, function () awful.menu.clients({ width=250 }) end),
+                       button({ }, 4, function () awful.client.focus.byidx(1) end),
+                       button({ }, 5, function () awful.client.focus.byidx(-1) end) }

 
 

--- Create a statusbar for each screen and add it
-mystatusbar = {}

 for s = 1, screen.count() do
 for s = 1, screen.count() do

-    mystatusbar[s] = statusbar({ position = "top", name = "mystatusbar" .. s,
-                                   fg = fg_normal, bg = bg_normal })
-    -- Add widgets to the statusbar - order matters
-    mystatusbar[s]:widget_add(mytaglist)
-    mystatusbar[s]:widget_add(mytasklist)
-    mystatusbar[s]:widget_add(mypromptbox)
-    mystatusbar[s]:widget_add(mytextbox)
-    mystatusbar[s]:widget_add(mylayoutbox[s])
-    mystatusbar[s]:add(s)
+    mylayoutbox[s] = widget({ type = "imagebox", name = "mylayoutbox", align = "right" })
+    mylayoutbox[s]:buttons({ button({ }, 1, function () awful.layout.inc(layouts, 1) end),
+                             button({ }, 3, function () awful.layout.inc(layouts, -1) end),
+                             button({ }, 4, function () awful.layout.inc(layouts, 1) end),
+                             button({ }, 5, function () awful.layout.inc(layouts, -1) end) })
+    -- Create a taglist widget
+    mytaglist[s] = awful.widget.taglist.new(s, awful.widget.taglist.label.all, mytaglist.buttons)
+
+    -- Create a tasklist widget
+    mytasklist[s] = awful.widget.tasklist.new(function(c)
+                                                  return awful.widget.tasklist.label.currenttags(c, s)
+                                              end, mytasklist.buttons)
+
+    -- Create the wibox
+    mywibox[s] = wibox({ position = "top", fg = beautiful.fg_normal, bg = beautiful.bg_normal })
+    -- Add widgets to the wibox - order matters
+    mywibox[s].widgets = { mytaglist[s],
+                           mytasklist[s],
+                           mypromptbox[s],
+                           mybatterybox,
+                           mytimebox,
+                           mylayoutbox[s],
+                           s == screen.count() and mysystray or nil }
+    mywibox[s].screen = s

 end
 end

-mystatusbar[screen.count()]:widget_add(mysystray)

 -- }}}
 
 -- }}}
 

+--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
+})
+-- }}}
+
+

 -- {{{ Mouse bindings
 -- {{{ Mouse bindings

-awesome.mouse_add(mouse({ }, 3, function () awful.spawn(terminal) end))
-awesome.mouse_add(mouse({ }, 4, awful.tag.viewnext))
-awesome.mouse_add(mouse({ }, 5, awful.tag.viewprev))
+awesome.buttons({
+    button({ }, 3, function () awful.menu.new({ id="mymainmenu", items=mymainmenu }) end),
+    button({ }, 4, awful.tag.viewnext),
+    button({ }, 5, awful.tag.viewprev)
+})

 -- }}}
 
 -- {{{ Key bindings
 -- }}}
 
 -- {{{ Key bindings


@@ -193,40 +246,51 @@ for i = 1, keynumber do
                    end):add()
     keybinding({ modkey, "Shift" }, i,
                    function ()
                    end):add()
     keybinding({ modkey, "Shift" }, i,
                    function ()

-                       local screen = mouse.screen
-                       if tags[screen][i] then
-                           awful.client.movetotag(tags[screen][i])
+                       if client.focus then
+                           if tags[client.focus.screen][i] then
+                               awful.client.movetotag(tags[client.focus.screen][i])
+                           end

                        end
                    end):add()
     keybinding({ modkey, "Control", "Shift" }, i,
                    function ()
                        end
                    end):add()
     keybinding({ modkey, "Control", "Shift" }, i,
                    function ()

-                       local screen = mouse.screen
-                       if tags[screen][i] then
-                           awful.client.toggletag(tags[screen][i])
+                       if client.focus then
+                           if tags[client.focus.screen][i] then
+                               awful.client.toggletag(tags[client.focus.screen][i])
+                           end

                        end
                    end):add()
 end
 
 keybinding({ modkey }, "Left", awful.tag.viewprev):add()
 keybinding({ modkey }, "Right", awful.tag.viewnext):add()
                        end
                    end):add()
 end
 
 keybinding({ modkey }, "Left", awful.tag.viewprev):add()
 keybinding({ modkey }, "Right", awful.tag.viewnext):add()

+keybinding({ modkey }, "Escape", awful.tag.history.restore):add()

 
 -- Standard program
 
 -- Standard program

-keybinding({ modkey }, "Return", function () awful.spawn(terminal) end):add()
+keybinding({ modkey }, "Return", function () awful.util.spawn(terminal) end):add()

 
 

-keybinding({ modkey, "Control" }, "r", awesome.restart):add()
+keybinding({ modkey, "Control" }, "r", function ()
+                                           mypromptbox[mouse.screen].text =
+                                               awful.util.escape(awful.util.restart())
+                                        end):add()

 keybinding({ modkey, "Shift" }, "q", awesome.quit):add()
 
 -- Client manipulation
 keybinding({ modkey, "Shift" }, "q", awesome.quit):add()
 
 -- Client manipulation

-keybinding({ modkey, "Shift" }, "c", function () client.focus_get():kill() end):add()
-keybinding({ modkey }, "j", function () awful.client.focus(1); client.focus_get():raise() end):add()
-keybinding({ modkey }, "k", function () awful.client.focus(-1);  client.focus_get():raise() end):add()
+keybinding({ modkey }, "m", awful.client.maximize):add()
+keybinding({ modkey }, "f", function () client.focus.fullscreen = not client.focus.fullscreen end):add()
+keybinding({ modkey, "Shift" }, "c", function () client.focus:kill() end):add()
+keybinding({ modkey }, "j", function () awful.client.focus.byidx(1); client.focus:raise() end):add()
+keybinding({ modkey }, "k", function () awful.client.focus.byidx(-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, "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 }, "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()
 
 -- Layout manipulation
 keybinding({ modkey }, "l", function () awful.tag.incmwfact(0.05) end):add()


@@ -240,25 +304,45 @@ keybinding({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -
 
 -- Prompt
 keybinding({ modkey }, "F1", function ()
 
 -- Prompt
 keybinding({ modkey }, "F1", function ()

-                                     awful.prompt({ prompt = "Run: ", cursor_fg = fg_focus, cursor_bg = bg_focus }, mypromptbox, awful.spawn, awful.completion.bash)
-                                 end):add()
+                                 awful.prompt.run({ prompt = "Run: " }, mypromptbox[mouse.screen], awful.util.spawn, awful.completion.bash,
+                                                  awful.util.getdir("cache") .. "/history")
+                             end):add()

 keybinding({ modkey }, "F4", function ()
 keybinding({ modkey }, "F4", function ()

-                                     awful.prompt({ prompt = "Run Lua code: ", cursor_fg = fg_focus, cursor_bg = bg_focus }, mypromptbox, awful.eval, awful.prompt.bash)
-                                 end):add()
+                                 awful.prompt.run({ prompt = "Run Lua code: " }, mypromptbox[mouse.screen], awful.util.eval, awful.prompt.bash,
+                                                  awful.util.getdir("cache") .. "/history_eval")
+                             end):add()
+
+keybinding({ modkey, "Ctrl" }, "i", function ()
+                                        local s = mouse.screen
+                                        if mypromptbox[s].text then
+                                            mypromptbox[s].text = nil
+                                        else
+                                            mypromptbox[s].text = nil
+                                            if client.focus.class then
+                                                mypromptbox[s].text = "Class: " .. client.focus.class .. " "
+                                            end
+                                            if client.focus.instance then
+                                                mypromptbox[s].text = mypromptbox[s].text .. "Instance: ".. client.focus.instance .. " "
+                                            end
+                                            if client.focus.role then
+                                                mypromptbox[s].text = mypromptbox[s].text .. "Role: ".. client.focus.role
+                                            end
+                                        end
+                                    end):add()

 
 --- Tabulous, tab manipulation
 keybinding({ modkey, "Control" }, "y", function ()
     local tabbedview = tabulous.tabindex_get()
     local nextclient = awful.client.next(1)
 
 
 --- Tabulous, tab manipulation
 keybinding({ modkey, "Control" }, "y", function ()
     local tabbedview = tabulous.tabindex_get()
     local nextclient = awful.client.next(1)
 

-    if tabbedview == nil then
+    if not tabbedview then

         tabbedview = tabulous.tabindex_get(nextclient)
 
         tabbedview = tabulous.tabindex_get(nextclient)
 

-        if tabbedview == nil then
+        if not tabbedview then

             tabbedview = tabulous.tab_create()
             tabulous.tab(tabbedview, nextclient)
         else
             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)
         end
     else
         tabulous.tab(tabbedview, nextclient)


@@ -270,7 +354,7 @@ keybinding({ modkey, "Shift" }, "y", tabulous.untab):add()
 keybinding({ modkey }, "y", function ()
    local tabbedview = tabulous.tabindex_get()
 
 keybinding({ modkey }, "y", function ()
    local tabbedview = tabulous.tabindex_get()
 

-   if tabbedview ~= nil then
+   if tabbedview then

        local n = tabulous.next(tabbedview)
        tabulous.display(tabbedview, n)
    end
        local n = tabulous.next(tabbedview)
        tabulous.display(tabbedview, n)
    end


@@ -282,7 +366,7 @@ keybinding({ modkey, 'Shift' }, "t", function ()
     local tabbedview = tabulous.tabindex_get()
     local clients = awful.client.getmarked()
 
     local tabbedview = tabulous.tabindex_get()
     local clients = awful.client.getmarked()
 

-    if tabbedview == nil then
+    if not tabbedview then

         tabbedview = tabulous.tab_create(clients[1])
         table.remove(clients, 1)
     end
         tabbedview = tabulous.tab_create(clients[1])
         table.remove(clients, 1)
     end


@@ -308,118 +392,236 @@ end
 
 -- {{{ Hooks
 -- Hook function to execute when focusing a client.
 
 -- {{{ Hooks
 -- Hook function to execute when focusing a client.

-function hook_focus(c)
+awful.hooks.focus.register(function (c)

     if not awful.client.ismarked(c) then
     if not awful.client.ismarked(c) then

-        c.border_color = border_focus
+        c.border_color = beautiful.border_focus

     end
     end

-end
+end)

 
 -- Hook function to execute when unfocusing a client.
 
 -- Hook function to execute when unfocusing a client.

-function hook_unfocus(c)
+awful.hooks.unfocus.register(function (c)

     if not awful.client.ismarked(c) then
     if not awful.client.ismarked(c) then

-        c.border_color = border_normal
+        c.border_color = beautiful.border_normal

     end
     end

-end
+end)

 
 -- Hook function to execute when marking a client
 
 -- Hook function to execute when marking a client

-function hook_marked(c)
-    c.border_color = border_marked
-end
+awful.hooks.marked.register(function (c)
+    c.border_color = beautiful.border_marked
+end)

 
 

--- Hook function to execute when unmarking a client
-function hook_unmarked(c)
-    c.border_color = border_focus
-end
+-- Hook function to execute when unmarking a client.
+awful.hooks.unmarked.register(function (c)
+    c.border_color = beautiful.border_focus
+end)

 
 

--- Hook function to execute when the mouse is over a client.
-function hook_mouseover(c)
+-- Hook function to execute when the mouse enters a client.
+awful.hooks.mouse_enter.register(function (c)

     -- Sloppy focus, but disabled for magnifier layout
     -- Sloppy focus, but disabled for magnifier layout

-    if awful.layout.get(c.screen) ~= "magnifier" then
-        c:focus_set()
+    if awful.layout.get(c.screen) ~= "magnifier"
+        and awful.client.focus.filter(c) then
+        client.focus = c

     end
     end

-end
+end)

 
 -- Hook function to execute when a new client appears.
 
 -- Hook function to execute when a new client appears.

-function hook_manage(c)
+awful.hooks.manage.register(function (c)
+    if use_titlebar then
+        -- Add a titlebar
+        awful.titlebar.add(c, { modkey = modkey })
+    end

     -- Add mouse bindings
     -- Add mouse bindings

-    c:mouse_add(mouse({ }, 1, function (c) c:focus_set(); 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))
+    c:buttons({
+        button({ }, 1, function (c) client.focus = c; c:raise() end),
+        button({ modkey }, 1, function (c) c:mouse_move() end),
+        button({ modkey }, 3, function (c) c:mouse_resize() end)
+    })

     -- New client may not receive focus
     -- if they're not focusable, so set border anyway.
     -- New client may not receive focus
     -- if they're not focusable, so set border anyway.

-    c.border_width = border_width
-    c.border_color = border_normal
-    c:focus_set()
-    if floatings[c.name:lower()] then
-        c.floating = true
+    c.border_width = beautiful.border_width
+    c.border_color = beautiful.border_normal
+    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
+        c.floating = floatapps[cls]
+    elseif floatapps[inst] then
+        c.floating = floatapps[inst]

     end
     end

-    -- Honor size hints
+
+    -- Override with tiledapps
+    c.floating = not (tiledapps[inst] or tiledapps[cls])
+
+    -- Check application->screen/tag mappings.
+    local target
+    if apptags[cls] then
+        target = apptags[cls]
+    elseif apptags[inst] then
+        target = apptags[inst]
+    end
+    if target then
+        c.screen = target.screen
+        awful.client.movetotag(tags[target.screen][target.tag], c)
+    end
+
+    -- Set the windows at the slave,
+    -- i.e. put it at the end of others instead of setting it master.
+    -- awful.client.setslave(c)
+
+    -- Honor size hints: if you want to drop the gaps between windows, set this to false.

     c.honorsizehints = true
     c.honorsizehints = true

-end

 
 

--- Hook function to execute when arranging the screen
+    -- 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)
 -- (tag switch, new client, etc)

-function hook_arrange(screen)
+awful.hooks.arrange.register(function (screen)

     local layout = awful.layout.get(screen)
     local layout = awful.layout.get(screen)

-    mylayoutbox[screen].text = "<bg image=\"" .. AWESOME_DATADIR .. "/icons/layouts/" .. layout .. "w.png\" resize=\"true\"/>"
+    if layout then
+        mylayoutbox[screen].image = image("/home/madduck/code/awesome/share/awesome/icons/layouts/" .. layout .. "w.png")
+    else
+        mylayoutbox[screen].image = nil
+    end
+
+    -- Give focus to the latest client in history if no window has focus
+    -- or if the current window is a desktop or a dock one.
+    if not client.focus then
+        local c = awful.client.focus.history.get(screen, 0)
+        if c then client.focus = c end
+    end

 
     -- Uncomment if you want mouse warping
     --[[
 
     -- Uncomment if you want mouse warping
     --[[

-    local sel = client.focus_get()
-    if sel then
-        local c_c = sel.coords
-        local m_c = mouse.coords
+    if client.focus then
+        local c_c = client.focus:geometry()
+        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
 
         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
     ]]
             end
         end
     end
     ]]

-end
+end)

 
 -- Hook called every second
 
 -- Hook called every second

-function hook_timer ()
+awful.hooks.timer.register(1, function ()

     -- For unix time_t lovers
     -- mytextbox.text = " " .. os.time() .. " time_t "
     -- Otherwise use:
     -- 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
 
 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 '-';
+    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
 -- Set up some hooks

-awful.hooks.focus(hook_focus)
-awful.hooks.unfocus(hook_unfocus)
-awful.hooks.marked(hook_marked)
-awful.hooks.unmarked(hook_unmarked)
-awful.hooks.manage(hook_manage)
-awful.hooks.mouseover(hook_mouseover)
-awful.hooks.arrange(hook_arrange)
-awful.hooks.timer(1, hook_timer)
+awful.hooks.timer.register(120, hook_battery)
+-- awful.hooks.timer.register(5, get_bat)

 -- }}}
 
 cmdmodkey = "Mod3"
 
 -- xmms2 & sound
 -- }}}
 
 cmdmodkey = "Mod3"
 
 -- xmms2 & sound

-keybinding({ cmdmodkey }, "Prior", function () awful.spawn("amixer set Master 2+") end):add()
-keybinding({ cmdmodkey }, "Next", function () awful.spawn("amixer set Master 2-") end):add()
-keybinding({ cmdmodkey }, "Up", function () awful.spawn("amixer set PCM 2+") end):add()
-keybinding({ cmdmodkey }, "Down", function () awful.spawn("amixer set PCM 2-") end):add()
-keybinding({ cmdmodkey }, "Home", function () awful.spawn("amixer set Mic toggle") end):add()
-keybinding({ cmdmodkey }, "End", function () awful.spawn("amixer set Master toggle") end):add()
-keybinding({ cmdmodkey }, "Left", function () awful.spawn("xmms2 prev") end):add()
-keybinding({ cmdmodkey }, "Right", function () awful.spawn("xmms2 next") end):add()
-keybinding({ cmdmodkey }, "space", function () awful.spawn("xmms2 toggleplay") end):add()
-keybinding({ cmdmodkey }, "backslash", function () awful.spawn("xmms2 current | head -1 | xmessage -nearmouse -timeout 5 -file -") end):add()
-keybinding({ cmdmodkey, "Shift" }, "backslash", function () awful.spawn("xmms2 list | xmessage -nearmouse -timeout 5 -file -") end):add()
+keybinding({ cmdmodkey }, "Prior", function () awful.util.spawn("amixer set Master 2+") end):add()
+keybinding({ cmdmodkey }, "Next", function () awful.util.spawn("amixer set Master 2-") end):add()
+keybinding({ cmdmodkey }, "Up", function () awful.util.spawn("amixer set PCM 2+") end):add()
+keybinding({ cmdmodkey }, "Down", function () awful.util.spawn("amixer set PCM 2-") end):add()
+keybinding({ cmdmodkey }, "Home", function () awful.util.spawn("amixer set Mic toggle") end):add()
+keybinding({ cmdmodkey }, "End", function () awful.util.spawn("amixer set Master toggle") end):add()
+keybinding({ cmdmodkey }, "Left", function () awful.util.spawn("xmms2 prev") end):add()
+keybinding({ cmdmodkey }, "Right", function () awful.util.spawn("xmms2 next") end):add()
+keybinding({ cmdmodkey }, "space", function () awful.util.spawn("xmms2 toggleplay") end):add()
+keybinding({ cmdmodkey }, "backslash", function () awful.util.spawn("xmms2 current | head -1 | xmessage -nearmouse -timeout 5 -file -") end):add()
+keybinding({ cmdmodkey, "Shift" }, "backslash", function () awful.util.spawn("xmms2 list | xmessage -nearmouse -timeout 5 -file -") end):add()

 
 -- misc apps
 
 -- misc apps

-keybinding({ cmdmodkey }, "n", function () awful.spawn("sensible-browser") end):add()
-keybinding({ cmdmodkey }, "m", function () awful.spawn(terminal .. " -e mutt -f =store") end):add()
-keybinding({ cmdmodkey }, "t", function () awful.spawn(terminal) end):add()
-keybinding({ cmdmodkey }, "c", function () awful.spawn(terminal .. " -e python") end):add()
-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()
+keybinding({ cmdmodkey }, "n", function () awful.util.spawn("sensible-browser") end):add()
+keybinding({ cmdmodkey }, "m", function () awful.util.spawn(terminal .. " -e mutt -f =store") end):add()
+keybinding({ cmdmodkey }, "t", function () awful.util.spawn(terminal) end):add()
+keybinding({ cmdmodkey }, "c", function () awful.util.spawn(terminal .. " -e python") end):add()
+keybinding({ cmdmodkey }, "r", function () awful.util.spawn("gmrun") end):add()
+keybinding({ cmdmodkey }, "j", function () awful.util.spawn("jpilot") end):add()
+keybinding({ cmdmodkey }, "x", function () awful.util.spawn("/sbin/start-stop-daemon --start --background --exec /usr/bin/xscreensaver; xscreensaver-command -lock") end):add()
+keybinding({ cmdmodkey, "Shift" }, "x", function () awful.util.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
+
+hook_battery()