Merge branch 'master' into develop

This commit is contained in:
Quan Guo 2015-09-26 01:46:14 +02:00
commit 399d7ddf64
2 changed files with 20 additions and 5 deletions

View File

@ -5,6 +5,15 @@ Provides Mac OSX like 'Expose' view of all clients.
This is a fork from [revelation](https://github.com/bioe007/awesome-revelation) This is a fork from [revelation](https://github.com/bioe007/awesome-revelation)
It is modified from the original revelation.lua for incorperating with awesome 3.5 or later. It is modified from the original revelation.lua for incorperating with awesome 3.5 or later.
It also have some features. It also have some features.
**Now master branch works for both master and stable awesome WM**
~~Master branch is only working with awesome master branch.~~
~~For current stable version of awesome, 3.5.6, please checkout stable version~~
## Changes since 2014-02-19
## Changes since 2014-02-19 ## Changes since 2014-02-19
* Now the revlation is able to handle the special clients(float, fullscreen or maximized etc.) * Now the revlation is able to handle the special clients(float, fullscreen or maximized etc.)
* When you select an minimized client, the revelation will un-minimized it and then focuse on it. * When you select an minimized client, the revelation will un-minimized it and then focuse on it.

View File

@ -30,8 +30,8 @@ local capi = {
mouse = mouse, mouse = mouse,
screen = screen screen = screen
} }
-- the function is still in develop version
--local delayed_call = require("gears.timer").delayed_call local delayed_call = (type(timer) ~= 'table' and require("gears.timer").delayed_call)
local clientData = {} -- table that holds the positions and sizes of floating clients local clientData = {} -- table that holds the positions and sizes of floating clients
@ -66,7 +66,7 @@ local revelation = {
curr_tag_only = false, curr_tag_only = false,
font = "monospace 20", font = "monospace 20",
fg = beautiful.fg_normal, fg = beautiful.fg_normal,
hintsize = beautiful.xresources.apply_dpi(50) hintsize = (type(beautiful.xresources) == 'table' and beautiful.xresources.apply_dpi(50) or 60)
} }
@ -154,8 +154,14 @@ function revelation.expose(args)
awful.tag.viewonly(t[scr], t.screen) awful.tag.viewonly(t[scr], t.screen)
end end
capi.awesome.emit_signal("refresh")
revelation.expose_callback(t, zt) if type(delayed_call) == 'function' then
delayed_call(function () revelation.expose_callback(t, zt) end )
else
revelation.expose_callback(t, zt)
-- No need for awesome WM 3.5.6
--capi.awesome.emit_signal("refresh")
end
end end