wiki updated

This commit is contained in:
copycat-killer 2017-01-06 13:43:56 +01:00
parent 716595550f
commit d49431160a
2 changed files with 116 additions and 118 deletions

View File

@ -3,6 +3,7 @@
Licensed under GNU General Public License v2
* (c) 2016, Luke Bonham
* (c) 2015, unknown
--]]
@ -18,7 +19,6 @@ local setmetatable = setmetatable
local tostring = tostring
-- Quake-like Dropdown application spawn
-- Original version: https://awesomewm.org/wiki/Drop-down_terminal#Another_solution
local quake = {}
-- If you have a rule like "awful.client.setslave" for your terminals,
@ -26,144 +26,142 @@ local quake = {}
-- run into problems with focus.
function quake:display()
-- First, we locate the client
local client = nil
local i = 0
for c in awful.client.iterate(function (c)
-- c.name may be changed!
return c.instance == self.name
end, nil, self.screen)
do
i = i + 1
if i == 1 then
client = c
else
-- Additional matching clients, let's remove the sticky bit
-- which may persist between awesome restarts. We don't close
-- them as they may be valuable. They will just turn into
-- normal clients.
c.sticky = false
c.ontop = false
c.above = false
end
end
if self.followtag then self.screen = awful.screen.focused() end
if not client and not self.visible then return end
-- First, we locate the client
local client = nil
local i = 0
for c in awful.client.iterate(function (c)
-- c.name may be changed!
return c.instance == self.name
end, nil, self.screen)
do
i = i + 1
if i == 1 then
client = c
else
-- Additional matching clients, let's remove the sticky bit
-- which may persist between awesome restarts. We don't close
-- them as they may be valuable. They will just turn into
-- normal clients.
c.sticky = false
c.ontop = false
c.above = false
end
end
if not client then
-- The client does not exist, we spawn it
awful.util.spawn(string.format("%s %s %s", self.app,
string.format(self.argname, self.name), self.extra),
false, self.screen)
self.notexist = true
return
end
if not client and not self.visible then return end
-- Resize
awful.client.floating.set(client, true)
client.border_width = self.border
client.size_hints_honor = false
if self.notexist then
self:compute_size()
client:geometry(self.geometry)
self.notexist = false
end
if not client then
-- The client does not exist, we spawn it
awful.util.spawn(string.format("%s %s %s", self.app,
string.format(self.argname, self.name), self.extra),
false, self.screen)
self.notexist = true
return
end
-- Not sticky and on top
client.sticky = false
client.ontop = true
client.above = true
client.skip_taskbar = true
-- Resize
awful.client.floating.set(client, true)
client.border_width = self.border
client.size_hints_honor = false
if self.notexist then
self:compute_size()
client:geometry(self.geometry)
self.notexist = false
end
-- Toggle display
if self.visible then
client.hidden = false
client:raise()
self.last_tag = awful.tag.selected(self.screen)
client:tags({awful.tag.selected(self.screen)})
capi.client.focus = client
-- Not sticky and on top
client.sticky = false
client.ontop = true
client.above = true
client.skip_taskbar = true
-- Toggle display
if self.visible then
client.hidden = false
client:raise()
self.last_tag = awful.tag.selected(self.screen)
client:tags({awful.tag.selected(self.screen)})
capi.client.focus = client
else
client.hidden = true
local ctags = client:tags()
for i, t in pairs(ctags) do
ctags[i] = nil
end
client:tags(ctags)
end
client.hidden = true
local ctags = client:tags()
for i, t in pairs(ctags) do
ctags[i] = nil
end
client:tags(ctags)
end
return client
return client
end
function quake:compute_size()
local geom = screen[self.screen].workarea
local width, height
if self.width <= 1 then width = math.floor(geom.width * self.width) end
if self.height <= 1 then height = math.floor(geom.height * self.height) end
local x, y
if self.horiz == "left" then x = geom.x
elseif self.horiz == "right" then x = geom.width + geom.x - self.width
else x = geom.x + (geom.width - self.width)/2 end
if self.vert == "top" then y = geom.y
elseif self.vert == "bottom" then y = geom.height + geom.y - self.height
else y = geom.y + (geom.height - self.height)/2 end
self.geometry = { x = x, y = y, width = width, height = height }
local geom = screen[self.screen].workarea
local width, height
if self.width <= 1 then width = math.floor(geom.width * self.width) - 2 * self.border end
if self.height <= 1 then height = math.floor(geom.height * self.height) end
local x, y
if self.horiz == "left" then x = geom.x
elseif self.horiz == "right" then x = geom.width + geom.x - self.width
else x = geom.x + (geom.width - self.width)/2 end
if self.vert == "top" then y = geom.y
elseif self.vert == "bottom" then y = geom.height + geom.y - self.height
else y = geom.y + (geom.height - self.height)/2 end
self.geometry = { x = x, y = y, width = width, height = height }
end
function quake:new(config)
local conf = config or {}
local conf = config or {}
conf.app = conf.app or "xterm" -- application to spawn
conf.name = conf.name or "QuakeDD" -- window name
conf.argname = conf.argname or "-name %s" -- how to specify window name
conf.extra = conf.extra or "" -- extra arguments
conf.visible = conf.visible or false -- initially not visible
conf.border = conf.border or 1 -- client border width
conf.followtag = conf.followtag or false -- spawn on currently focused screen
conf.screen = conf.screen or awful.screen.focused()
conf.app = conf.app or "xterm" -- application to spawn
conf.name = conf.name or "QuakeDD" -- window name
conf.argname = conf.argname or "-name %s" -- how to specify window name
conf.extra = conf.extra or "" -- extra arguments
conf.visible = conf.visible or false -- initially not visible
conf.border = conf.border or 1 -- client border width
conf.followtag = conf.followtag or false -- spawn on currently focused screen
conf.screen = conf.screen or awful.screen.focused()
-- If width or height <= 1 this is a proportion of the workspace
conf.height = conf.height or 0.25 -- height
conf.width = conf.width or 1 -- width
conf.vert = conf.vert or "top" -- top, bottom or center
conf.horiz = conf.horiz or "center" -- left, right or center
-- If width or height <= 1 this is a proportion of the workspace
conf.height = conf.height or 0.25 -- height
conf.width = conf.width or 1 -- width
conf.vert = conf.vert or "top" -- top, bottom or center
conf.horiz = conf.horiz or "left" -- left, right or center
local console = setmetatable(conf, { __index = quake })
capi.client.connect_signal("manage", function(c)
if c.instance == console.name and c.screen == console.screen then
console:display()
end
end)
capi.client.connect_signal("unmanage", function(c)
if c.instance == console.name and c.screen == console.screen then
console.visible = false
end
local console = setmetatable(conf, { __index = quake })
capi.client.connect_signal("manage", function(c)
if c.instance == console.name and c.screen == console.screen then
console:display()
end
end)
capi.client.connect_signal("unmanage", function(c)
if c.instance == console.name and c.screen == console.screen then
console.visible = false
end
end)
-- "Reattach" currently running quake application. This is in case awesome is restarted.
local reattach = capi.timer { timeout = 0 }
reattach:connect_signal("timeout", function()
if self.followtag then
self.screen = awful.screen.focused()
end
reattach:stop()
console:display()
end)
reattach:start()
-- "Reattach" currently running quake application. This is in case awesome is restarted.
local reattach = capi.timer { timeout = 0 }
reattach:connect_signal("timeout", function()
if self.followtag then self.screen = awful.screen.focused() end
reattach:stop()
console:display()
end)
reattach:start()
return console
return console
end
function quake:toggle()
if self.followtag then
self.screen = awful.screen.focused()
end
local current_tag = awful.tag.selected(self.screen)
if self.last_tag ~= current_tag and self.visible then
awful.client.movetotag(current_tag, self:display())
else
self.visible = not self.visible
self:display()
end
if self.followtag then self.screen = awful.screen.focused() end
local current_tag = awful.tag.selected(self.screen)
if self.last_tag ~= current_tag and self.visible then
awful.client.movetotag(current_tag, self:display())
else
self.visible = not self.visible
self:display()
end
end
setmetatable(quake, { __call = function(_, ...) return quake:new(...) end })

2
wiki

@ -1 +1 @@
Subproject commit 6e439e9a28174909c4ab0dd23eaf93785cc170e7
Subproject commit 855d23635ea54a66b246df2134b81b3961ea7d44