X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=config%2Fawesome%2Frc.lua;h=a27550b75cbe49e912ce4922f8650a32c033098b;hb=609886c6cadc4e00226f3ef27557d247eeffa93a;hp=8df6ac9652935fc69220eab758ec8599eb55923d;hpb=67dce9601ce243c9121422a300d88ba78389b78e;p=~madcoder%2Fdotfiles.git

diff --git a/config/awesome/rc.lua b/config/awesome/rc.lua
index 8df6ac9..a27550b 100644
--- a/config/awesome/rc.lua
+++ b/config/awesome/rc.lua
@@ -7,7 +7,7 @@ require("awful.rules")
 require("vicious")
 require("beautiful")
 
-terminal = "x-terminal-emulator"
+terminal = "urxvtcd"
 lock     = 'xscreensaver-command -lock'
 beautiful.init(awful.util.getdir("config").."/theme")
 
@@ -196,6 +196,19 @@ function make_icon(fname, left, right, h, bg)
     return ib
 end
 
+function draw_dashes_h(img, x, y, on, off, len, color)
+    for i = 0, len, on + off do
+        img:draw_line(x + i, y, x + i + on - 1, y, color)
+    end
+end
+
+function draw_dashes_v(img, x, y, on, off, len, color)
+    for i = 0, len, on + off do
+        img:draw_line(x, y + i, x, y + i + on - 1, color)
+    end
+end
+
+
 local mywidgets = {}
 
 -- {{{ Taglist
@@ -217,25 +230,60 @@ mypromptbox = awful.widget.prompt{
 -- }}}
 -- {{{ CPU Widgets
 
-table.insert(mywidgets, make_icon('cpu.png', 16, 4, 16))
+local cpuwidgets = {}
+for i = 1, io.popen("grep -c ^cpu /proc/stat"):read("*n") do
+    local cpu = {}
+
+    cpu.widget = widget{ type = 'imagebox' }
+    cpu.update = function(cpu, value)
+        local color
+
+        if value < 25 then
+            color = beautiful.fg_focus
+        elseif value < 50 then
+            color = 'yellow'
+        elseif value < 75 then
+            color = 'orange'
+        else
+            color = 'red'
+        end
+
+        if cpu.color == color then return end
+        local img = image.argb32(11, 16, nil)
+        draw_dashes_h(img, 0,  4, 2, 1, 7, color)
+        draw_dashes_h(img, 0, 11, 2, 1, 7, color)
+        draw_dashes_v(img, 0,  4, 2, 1, 7, color)
+        draw_dashes_v(img, 7,  4, 2, 1, 7, color)
+        img:draw_rectangle(2, 6, 4, 4, true, color)
+        cpu.widget.image = img
+        cpu.percent = value
+    end
+    table.insert(mywidgets, cpu.widget)
+    cpuwidgets[i] = cpu
+end
 
-cputextwidget = widget({ type = 'textbox' })
+cputextwidget = widget{ type = 'textbox' }
 
 vicious.register(cputextwidget, vicious.widgets.cpu,
 function (widget, args)
     local r = tonumber(args[1])
     local percent = args[1]..'%'
+
+    for i = 1, #args do
+        cpuwidgets[i]:update(args[i])
+    end
+
     if r < 10 then
         percent = '0'..percent
     end
     if r < 25 then
-        percent = fg(theme.fg_focus, percent)
+        percent = fg(beautiful.fg_focus, percent)
     elseif r < 50 then
         percent = fg('yellow', percent)
     elseif r < 75 then
         percent = fg('orange', percent)
     else
-        percent = fg('#ff4040', percent)
+        percent = fg('red', percent)
     end
     return percent..' '
 end, 2)
@@ -247,7 +295,7 @@ table.insert(mywidgets, cputextwidget)
 
 table.insert(mywidgets, make_icon('mem.png', 16, 4, 16))
 
-memtextwidget = widget({ type = 'textbox' })
+memtextwidget = widget{ type = 'textbox' }
 
 vicious.register(memtextwidget, vicious.widgets.mem, function (widget, args)
     -- Add extra preceding zeroes when needed
@@ -257,7 +305,7 @@ vicious.register(memtextwidget, vicious.widgets.mem, function (widget, args)
         percent = '0'..percent
     end
     if r < 50 then
-        percent = fg(theme.fg_focus, percent)
+        percent = fg(beautiful.fg_focus, percent)
     elseif r < 80 then
         percent = fg('orange', percent)
     else
@@ -273,7 +321,7 @@ table.insert(mywidgets, memtextwidget)
 
 table.insert(mywidgets, make_icon('clock.png', 16, 4, 16))
 
-clockwidget = widget({ type = "textbox" })
+clockwidget = widget{ type = "textbox" }
 vicious.register(clockwidget, vicious.widgets.date,
                  fg(theme.fg_focus, "%H:%M") .. " %a %d %b  ", 10)
 
@@ -455,8 +503,8 @@ awful.rules.rules = {
 -- {{{ Signals
 
 function warp_mouse(c)
-    local o = awful.mouse.client_under_pointer()
-    if not o or o ~= c then
+    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