]> git.madduck.net Git - etc/awesome.git/blobdiff - util/init.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / etc / awesome.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge pull request #418 from cool-cool-sweat/full_notify
[etc/awesome.git] / util / init.lua
diff --git a/util/init.lua b/util/init.lua
index a44d52c6527ec3acb4a97873253ff46bdcaca581..55bfa26a557d7676331b7472a304bae0204372e2 100644 (file)
--- a/util/init.lua
+++ b/util/init.lua
@@ -1,27 +1,21 @@
-
 --[[
 --[[
-                                                  
-     Lain                                         
+
+     Lain
      Layouts, widgets and utilities for Awesome WM
      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              
-                                                  
+
+     Utilities section
+
+     Licensed under GNU General Public License v2
+      * (c) 2013,      Luca CPZ
+      * (c) 2010-2012, Peter Hofmann
+
 --]]
 
 local awful        = require("awful")
 --]]
 
 local awful        = require("awful")
-local beautiful    = require("beautiful")
-local math         = { sqrt = math.sqrt }
-local mouse        = mouse
+local sqrt         = math.sqrt
 local pairs        = pairs
 local pairs        = pairs
-local string       = string
 local client       = client
 local client       = client
-local screen       = screen
 local tonumber     = tonumber
 local tonumber     = tonumber
-
 local wrequire     = require("lain.helpers").wrequire
 local setmetatable = setmetatable
 
 local wrequire     = require("lain.helpers").wrequire
 local setmetatable = setmetatable
 
@@ -29,29 +23,23 @@ local setmetatable = setmetatable
 -- lain.util
 local util = { _NAME = "lain.util" }
 
 -- lain.util
 local util = { _NAME = "lain.util" }
 
--- Like awful.menu.clients, but only show clients of currently selected
--- tags.
+-- Like awful.menu.clients, but only show clients of currently selected tags
 function util.menu_clients_current_tags(menu, args)
     -- List of currently selected tags.
 function util.menu_clients_current_tags(menu, args)
     -- List of currently selected tags.
-    local cls_tags = awful.tag.selectedlist(mouse.screen)
+    local cls_tags = awful.screen.focused().selected_tags
+
+    if cls_tags == nil then return nil end
 
     -- Final list of menu items.
     local cls_t = {}
 
 
     -- Final list of menu items.
     local cls_t = {}
 
-    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.
-    for i = 1,#cls_tags
-    do
-        local t = cls_tags[i]
+    for i = 1,#cls_tags do
+        local t   = cls_tags[i]
         local cls = t:clients()
 
         local cls = t:clients()
 
-        for k, c in pairs(cls)
-        do
+        for k, c in pairs(cls) do
             cls_t[#cls_t + 1] = { awful.util.escape(c.name) or "",
                                   function ()
                                       c.minimized = false
             cls_t[#cls_t + 1] = { awful.util.escape(c.name) or "",
                                   function ()
                                       c.minimized = false
@@ -63,112 +51,118 @@ 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
-    local m = awful.menu.new(menu)
+    local m = awful.menu(menu)
     m:show(args)
     m:show(args)
-    return m
-end
-
--- 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)
-end
-
--- Read the nice value of pid from /proc.
-local function get_nice_value(pid)
-    local n = first_line('/proc/' .. pid .. '/stat')
-    if n == nil
-    then
-        -- This should not happen. But I don't want to crash, either.
-        return 0
-    end
 
 
-    -- Remove pid and tcomm. This is necessary because tcomm may contain
-    -- nasty stuff such as whitespace or additional parentheses...
-    n = string.gsub(n, '.*%) ', '')
-
-    -- Field number 17 now is the nice value.
-    fields = split(n, ' ')
-    return tonumber(fields[17])
+    return m
 end
 
 end
 
--- To be used as a signal handler for "focus"
--- This requires beautiful.border_focus{,_highprio,_lowprio}.
-function util.niceborder_focus(c)
-    local n = get_nice_value(c.pid)
-    if n == 0
-    then
-        c.border_color = beautiful.border_focus
-    elseif n < 0
-    then
-        c.border_color = beautiful.border_focus_highprio
+-- Magnify a client: set it to "float" and resize it.
+function util.magnify_client(c, width_f, height_f)
+    if c and not c.floating then
+        util.magnified_client = c
+        util.mc(c, width_f, height_f)
     else
     else
-        c.border_color = beautiful.border_focus_lowprio
+        util.magnified_client = nil
+        c.floating = false
     end
 end
 
     end
 end
 
--- To be used as a signal handler for "unfocus"
--- This requires beautiful.border_normal{,_highprio,_lowprio}.
-function util.niceborder_unfocus(c)
-    local n = get_nice_value(c.pid)
-    if n == 0
-    then
-        c.border_color = beautiful.border_normal
-    elseif n < 0
-    then
-        c.border_color = beautiful.border_normal_highprio
-    else
-        c.border_color = beautiful.border_normal_lowprio
-    end
+-- https://github.com/lcpz/lain/issues/195
+function util.mc(c, width_f, height_f)
+    c = c or util.magnified_client
+    if not c then return end
+
+    c.floating   = true
+    local s      = awful.screen.focused()
+    local mg     = s.workarea
+    local g      = {}
+    local mwfact = width_f or s.selected_tag.master_width_factor or 0.5
+    g.width      = sqrt(mwfact) * mg.width
+    g.height     = sqrt(height_f or mwfact) * mg.height
+    g.x          = mg.x + (mg.width - g.width) / 2
+    g.y          = mg.y + (mg.height - g.height) / 2
+
+    if c then c:geometry(g) end -- if c is still a valid object
 end
 
 -- Non-empty tag browsing
 -- direction in {-1, 1} <-> {previous, next} non-empty tag
 function util.tag_view_nonempty(direction, sc)
 end
 
 -- Non-empty tag browsing
 -- direction in {-1, 1} <-> {previous, next} non-empty tag
 function util.tag_view_nonempty(direction, sc)
-   local s = sc or mouse.screen or 1
-   local scr = screen[s]
+   local s = sc or awful.screen.focused()
 
 
-   for i = 1, #tags[s] do
-       awful.tag.viewidx(direction,s)
-       if #awful.client.visible(s) > 0 then
+   for i = 1, #s.tags do
+       awful.tag.viewidx(direction, s)
+       if #s.clients > 0 then
            return
        end
    end
 end
 
            return
        end
    end
 end
 
--- Dynamically rename the current tag you have focused.
-function util.prompt_rename_tag(mypromptbox)
-    local tag = awful.tag.selected(mouse.screen)
-    awful.prompt.run({prompt="Rename tag: "}, mypromptbox[mouse.screen].widget,
-    function(text)
-        if text:len() > 0 then
-            tag.name = text
-            tag:emit_signal("property::name")
+-- {{{ Dynamic tagging
+
+-- Add a new tag
+function util.add_tag(layout)
+    awful.prompt.run {
+        prompt       = "New tag name: ",
+        textbox      = awful.screen.focused().mypromptbox.widget,
+        exe_callback = function(name)
+            if not name or #name == 0 then return end
+            awful.tag.add(name, { screen = awful.screen.focused(), layout = layout or awful.layout.suit.tile }):view_only()
         end
         end
-    end)
+    }
+end
+
+-- Rename current tag
+function util.rename_tag()
+    awful.prompt.run {
+        prompt       = "Rename tag: ",
+        textbox      = awful.screen.focused().mypromptbox.widget,
+        exe_callback = function(new_name)
+            if not new_name or #new_name == 0 then return end
+            local t = awful.screen.focused().selected_tag
+            if t then
+                t.name = new_name
+            end
+        end
+    }
+end
+
+-- Move current tag
+-- pos in {-1, 1} <-> {previous, next} tag position
+function util.move_tag(pos)
+    local tag = awful.screen.focused().selected_tag
+    if tonumber(pos) <= -1 then
+        awful.tag.move(tag.index - 1, tag)
+    else
+        awful.tag.move(tag.index + 1, tag)
+    end
+end
+
+-- Delete current tag
+-- Any rule set on the tag shall be broken
+function util.delete_tag()
+    local t = awful.screen.focused().selected_tag
+    if not t then return end
+    t:delete()
+end
+
+-- }}}
+
+-- On the fly useless gaps change
+function util.useless_gaps_resize(thatmuch, s, t)
+    local scr = s or awful.screen.focused()
+    local tag = t or scr.selected_tag
+    tag.gap = tag.gap + tonumber(thatmuch)
+    awful.layout.arrange(scr)
 end
 
 return setmetatable(util, { __index = wrequire })
 end
 
 return setmetatable(util, { __index = wrequire })
awesome window-manager configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.