Merge pull request #144 from stwa/patch-1

[etc/awesome.git] / util / init.lua

diff --git a/util/init.lua b/util/init.lua
index a44d52c6527ec3acb4a97873253ff46bdcaca581..ac3afec9e5238bb888cd24b110dee9e13467913c 100644 (file)
--- a/util/init.lua
+++ b/util/init.lua
@@ -1,15 +1,15 @@
 
 --[[
 
 --[[

-                                                  
-     Lain                                         
-     Layouts, widgets and utilities for Awesome WM
-                                                  
-     Utilities section                            
-                                                  
-     Licensed under GNU General Public License v2 
-      * (c) 2013,      Luke Bonham                
-      * (c) 2010-2012, Peter Hofmann              
-                                                  
+                                                   
+     Lain                                          
+     Layouts, widgets and utilities for Awesome WM 
+                                                   
+     Utilities section                             
+                                                   
+     Licensed under GNU General Public License v2  
+      * (c) 2013,      Luke Bonham                 
+      * (c) 2010-2012, Peter Hofmann               
+                                                   

 --]]
 
 local awful        = require("awful")
 --]]
 
 local awful        = require("awful")


@@ -17,7 +17,7 @@ local beautiful    = require("beautiful")
 local math         = { sqrt = math.sqrt }
 local mouse        = mouse
 local pairs        = pairs
 local math         = { sqrt = math.sqrt }
 local mouse        = mouse
 local pairs        = pairs

-local string       = string
+local string       = { gsub = string.gsub }

 local client       = client
 local screen       = screen
 local tonumber     = tonumber
 local client       = client
 local screen       = screen
 local tonumber     = tonumber


@@ -38,10 +38,7 @@ function util.menu_clients_current_tags(menu, args)
     -- Final list of menu items.
     local cls_t = {}
 
     -- Final list of menu items.
     local cls_t = {}
 

-    if cls_tags == nil
-    then
-        return nil
-    end
+    if cls_tags == nil then return nil end

 
     -- For each selected tag get all clients of that tag and add them to
     -- the menu. A click on a menu item will raise that client.
 
     -- For each selected tag get all clients of that tag and add them to
     -- the menu. A click on a menu item will raise that client.


@@ -63,17 +60,11 @@ function util.menu_clients_current_tags(menu, args)
     end
 
     -- No clients? Then quit.
     end
 
     -- No clients? Then quit.

-    if #cls_t <= 0
-    then
-        return nil
-    end
+    if #cls_t <= 0 then return nil end

 
     -- menu may contain some predefined values, otherwise start with a
     -- fresh menu.
 
     -- menu may contain some predefined values, otherwise start with a
     -- fresh menu.

-    if not menu
-    then
-        menu = {}
-    end
+    if not menu then menu = {} end

 
     -- Set the list of items and show the menu.
     menu.items = cls_t
 
     -- Set the list of items and show the menu.
     menu.items = cls_t


@@ -84,17 +75,21 @@ end
 
 -- Magnify a client: Set it to "float" and resize it.
 function util.magnify_client(c)
 
 -- Magnify a client: Set it to "float" and resize it.
 function util.magnify_client(c)

-    awful.client.floating.set(c, true)
-
-    local mg = screen[mouse.screen].geometry
-    local tag = awful.tag.selected(mouse.screen)
-    local mwfact = awful.tag.getmwfact(tag)
-    local g = {}
-    g.width = math.sqrt(mwfact) * mg.width
-    g.height = math.sqrt(mwfact) * mg.height
-    g.x = mg.x + (mg.width - g.width) / 2
-    g.y = mg.y + (mg.height - g.height) / 2
-    c:geometry(g)
+    if not awful.client.floating.get(c) then
+        awful.client.floating.set(c, true)
+
+        local mg = screen[mouse.screen].geometry
+        local tag = awful.tag.selected(mouse.screen)
+        local mwfact = awful.tag.getmwfact(tag)
+        local g = {}
+        g.width = math.sqrt(mwfact) * mg.width
+        g.height = math.sqrt(mwfact) * mg.height
+        g.x = mg.x + (mg.width - g.width) / 2
+        g.y = mg.y + (mg.height - g.height) / 2
+        c:geometry(g)
+    else
+        awful.client.floating.set(c, false)
+    end

 end
 
 -- Read the nice value of pid from /proc.
 end
 
 -- Read the nice value of pid from /proc.


@@ -151,7 +146,7 @@ function util.tag_view_nonempty(direction, sc)
    local s = sc or mouse.screen or 1
    local scr = screen[s]
 
    local s = sc or mouse.screen or 1
    local scr = screen[s]
 

-   for i = 1, #tags[s] do
+   for i = 1, #awful.tag.gettags(s) do

        awful.tag.viewidx(direction,s)
        if #awful.client.visible(s) > 0 then
            return
        awful.tag.viewidx(direction,s)
        if #awful.client.visible(s) > 0 then
            return


@@ -159,8 +154,24 @@ function util.tag_view_nonempty(direction, sc)
    end
 end
 
    end
 end
 

--- Dynamically rename the current tag you have focused.
-function util.prompt_rename_tag(mypromptbox)
+-- {{{ Dynamic tagging
+--
+-- Add a new tag
+function util.add_tag(mypromptbox)
+    awful.prompt.run({prompt="New tag name: "}, mypromptbox[mouse.screen].widget,
+    function(text)
+        if text:len() > 0 then
+            props = { selected = true }
+            tag = awful.tag.add(new_name, props)
+            tag.name = text
+            tag:emit_signal("property::name")
+        end
+    end)
+end
+
+-- Rename current tag
+-- @author: minism
+function util.rename_tag(mypromptbox)

     local tag = awful.tag.selected(mouse.screen)
     awful.prompt.run({prompt="Rename tag: "}, mypromptbox[mouse.screen].widget,
     function(text)
     local tag = awful.tag.selected(mouse.screen)
     awful.prompt.run({prompt="Rename tag: "}, mypromptbox[mouse.screen].widget,
     function(text)


@@ -171,4 +182,48 @@ function util.prompt_rename_tag(mypromptbox)
     end)
 end
 
     end)
 end
 

+-- Move current tag
+-- pos in {-1, 1} <-> {previous, next} tag position
+function util.move_tag(pos)
+    local tag = awful.tag.selected(mouse.screen)
+    local idx = awful.tag.getidx(tag)
+    if tonumber(pos) <= -1 then
+        awful.tag.move(idx - 1, tag)
+    else
+        awful.tag.move(idx + 1, tag)
+    end
+end
+
+-- Remove current tag (if empty)
+-- Any rule set on the tag shall be broken
+function util.remove_tag()
+    local tag = awful.tag.selected(mouse.screen)
+    local prevtag = awful.tag.gettags(mouse.screen)[awful.tag.getidx(tag) - 1]
+    awful.tag.delete(tag, prevtag)
+end
+--
+-- }}}
+
+-- On the fly useless gaps change
+function util.useless_gaps_resize(thatmuch)
+    beautiful.useless_gap_width = tonumber(beautiful.useless_gap_width) + thatmuch
+    awful.layout.arrange(mouse.screen)
+end
+
+-- On the fly global border change
+function util.global_border_resize(thatmuch)
+    beautiful.global_border_width = tonumber(beautiful.global_border_width) + thatmuch
+    awful.layout.arrange(mouse.screen)
+end
+
+-- Check if an element exist on a table
+function util.element_in_table(element, tbl)
+    for _, i in pairs(tbl) do
+        if i == element then
+            return true
+        end
+    end
+    return false
+end
+

 return setmetatable(util, { __index = wrequire })
 return setmetatable(util, { __index = wrequire })