"tileleft",
"tilebottom",
"tiletop",
--- "magnifier",
+ "magnifier",
"max",
-- "spiral",
-- "dwindle",
}
-- 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 },
+ ["Iceweasel"] = { screen = 1, tag = 9 },
["jpilot"] = { screen = 1, tag = 8 },
}
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.
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
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
-- }}}
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()
if mypromptbox.text then
mypromptbox.text = nil
else
- mypromptbox.text = "Class: " .. client.focus.class .. " Instance: ".. client.focus.instance
+ 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()
--[[
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
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)
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"
else
statusbar_highlight_focus = false
end
+
+hook_battery()
projects / etc / awesome.git / blobdiff