Merge remote-tracking branch 'refs/remotes/origin/master'

[dotfiles.git] / awesome / utils.lua

diff --git a/awesome/utils.lua b/awesome/utils.lua
index 8bbf3400941d2cf8de6cd4c353bdef8b9c537ab7..0f12be1aab2c6ba50fd5ae8d5efb339c7449c9b0 100644 (file)
--- a/awesome/utils.lua
+++ b/awesome/utils.lua
@@ -1,26 +1,53 @@
-local utils = { }
+local utils  = { }
+local io     = { popen = io.popen }
+local string = { match = string.match,
+                 lower = string.lower}
+
 utils.rules = { }
 utils.globalkeys = { }
 
 local host = io.popen("hostname")
 utils.host = host:read("*l")
 
-function utils.run_or_kill(command)
-    -- Check throught the clients if the class match the command
-    local lower_command=string.lower(command)
+function utils.is_dir(path)
+    return os.execute(('[ -d "%s" ]'):format(path))
+end
+
+function utils.run_or_kill(prg, cprop, screen)
+    if not prg then
+        do return nil end
+    end
+
+    if not cprop then
+        cprop = { }
+    end
+
+    if not cprop.class then
+        cprop.class = prg
+    end
+
+    if not cprop.instance then
+        cprop.instance = ""
+    end
+
+    cprop.class = string.lower(cprop.class)
+    cprop.instance = string.lower(cprop.instance)
+
     for k, c in pairs(client.get()) do
         -- apparently some steam games don't have a client class
-        if c.class ~= nil then
-            local class=string.lower(c.class)
-            if string.match(class, lower_command) then
-                for i, v in ipairs(c:tags()) do
-                    c:kill()
-                    return
-                end
+        if c.class == nil then
+            return
+        end
+        local class=string.lower(c.class)
+        local instance=string.lower(c.instance)
+        if string.match(class, cprop.class) and string.match(instance, cprop.instance) then
+            for i, v in ipairs(c:tags()) do
+                c:kill()
+                return
             end
         end
     end
-    awful.util.spawn(command)
+    awful.util.spawn_with_shell(prg, screen)
 end
 
 -- http://awesome.naquadah.org/wiki/Autostart#Simple_way
@@ -33,13 +60,19 @@ function utils.run_once(prg,arg_string,pname,screen)
        pname = prg
     end
 
-    if not arg_string then 
+    if not arg_string then
         awful.util.spawn_with_shell("pgrep -f -u $USER -x '" .. pname .. "' || (" .. prg .. ")",screen)
     else
         awful.util.spawn_with_shell("pgrep -f -u $USER -x '" .. pname .. " ".. arg_string .."' || (" .. prg .. " " .. arg_string .. ")",screen)
     end
 end
 
+function utils.get_default_sink()
+    local f = io.popen('ponymix defaults --short')
+    line = f:read('*l')
+    f:close()
+    return string.match(line, "^sink%s*%d*%s*(.-)%s")
+end
 
 function utils.joinTables(t1, t2)
     for k,v in ipairs(t2) do table.insert(t1, v) end return t1
@@ -53,4 +86,8 @@ function utils.globalkeys.append(keys)
     globalkeys = awful.util.table.join(globalkeys, keys)
 end
 
+function utils.has_battery()
+    return utils.is_dir("/sys/class/power_supply/BAT0")
+end
+
 return utils