awesome: use TERMINAL env as much as possible

[dotfiles.git] / awesome / utils.lua

diff --git a/awesome/utils.lua b/awesome/utils.lua
index 070cb3ea51c1678dba196709675a80436f16247e..40422416fa798df90f2ee3d4f3b5dd28265fa49e 100644 (file)
--- a/awesome/utils.lua
+++ b/awesome/utils.lua
@@ -13,6 +13,17 @@ function utils.is_dir(path)
     return os.execute(('[ -d "%s" ]'):format(path))
 end
 
     return os.execute(('[ -d "%s" ]'):format(path))
 end
 

+function utils.spawn_terminal(prg, cprop, cb)
+    local join = require("gears.table").join
+    local term_cmd = {terminal}
+    if cprop and cprop.instance then
+        if terminal:match("rxvt") then
+            term_cmd = join(term_cmd, {"-name", cprop.instance})
+        end
+    end
+    awful.spawn(join(term_cmd, {"-e", prg}), cprop, cb)
+end
+

 function utils.run_or_kill(prg, cprop, screen)
     if not prg then
         do return nil end
 function utils.run_or_kill(prg, cprop, screen)
     if not prg then
         do return nil end


@@ -79,11 +90,11 @@ function utils.joinTables(t1, t2)
 end
 
 function utils.rules.append(rules)
 end
 
 function utils.rules.append(rules)

-    awful.rules.rules = awful.util.table.join(awful.rules.rules, rules)
+    awful.rules.rules = gears.table.join(awful.rules.rules, rules)

 end
 
 function utils.globalkeys.append(keys)
 end
 
 function utils.globalkeys.append(keys)

-    globalkeys = awful.util.table.join(globalkeys, keys)
+    globalkeys = gears.table.join(globalkeys, keys)

 end
 
 function utils.has_battery()
 end
 
 function utils.has_battery()