X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/ba9c4565ffa44d69e8f8f5dfbd492b48a071c1f7..8406a181daaacb36b92835dde4773061836d1354:/.config/awesome/rc.lua

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 64740b2..c7cd405 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -300,6 +300,9 @@ clientkeys =
     key({ modkey }, "t", awful.client.togglemarked),
     key({ modkey,}, "m",
         function (c)
+            if not awful.client.floating then
+                awful.client.floating.toggle()
+            end
             c.maximized_horizontal = not c.maximized_horizontal
             c.maximized_vertical   = not c.maximized_vertical
         end),
@@ -485,7 +488,8 @@ awful.hooks.manage.register(function (c, startup)
 
     -- Maximise some
     if maxapps[inst] or maxapps[cls] then
-      awful.client.maximize(c)
+        c.maximized_horizontal = not c.maximized_horizontal
+        c.maximized_vertical   = not c.maximized_vertical
     end
 end)
 
@@ -555,7 +559,7 @@ function get_acpibatt()
     -- 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);
+    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
@@ -566,14 +570,15 @@ function get_acpibatt()
     end
 
     if status == 'Charging' then
-      status = 'c';
-    elseif status == 'Discarching' then
-      status = 'd';
-    else
+      status = '+';
+    elseif status == 'Discharging' then
       status = '-';
+    else
+      status = 'x';
     end
 
-    return percent; -- .. ' (' .. status .. ')'; -- .. ' ' .. time .. ' left';
+    return status .. ' ' .. time;
+    -- return percent .. ' (' .. status .. ')'; -- .. ' ' .. time .. ' left';
 end
 -- }}}