quake: client maximized before awesome restart: after the restart, unmaximize and toggle to get normal geometry again
This commit is contained in:
parent
9adaa9fa32
commit
a89bbec6f3
1 changed files with 39 additions and 47 deletions
|
@ -8,15 +8,15 @@
|
||||||
--]]
|
--]]
|
||||||
|
|
||||||
local awful = require("awful")
|
local awful = require("awful")
|
||||||
local capi = { client = client,
|
local capi = { client = client }
|
||||||
timer = require("gears.timer") }
|
|
||||||
local math = { floor = math.floor }
|
local math = { floor = math.floor }
|
||||||
local string = string
|
local string = { format = string.format }
|
||||||
|
|
||||||
local pairs = pairs
|
local pairs = pairs
|
||||||
local screen = screen
|
local screen = screen
|
||||||
|
|
||||||
local setmetatable = setmetatable
|
local setmetatable = setmetatable
|
||||||
local tostring = tostring
|
|
||||||
|
|
||||||
-- Quake-like Dropdown application spawn
|
-- Quake-like Dropdown application spawn
|
||||||
local quake = {}
|
local quake = {}
|
||||||
|
@ -57,21 +57,16 @@ function quake:display()
|
||||||
cmd = string.format("%s %s %s", self.app,
|
cmd = string.format("%s %s %s", self.app,
|
||||||
string.format(self.argname, self.name), self.extra)
|
string.format(self.argname, self.name), self.extra)
|
||||||
awful.spawn(cmd, { tag = self.screen.selected_tag })
|
awful.spawn(cmd, { tag = self.screen.selected_tag })
|
||||||
self.notexist = true
|
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Resize
|
-- Set geometry
|
||||||
client.floating = true
|
client.floating = true
|
||||||
client.border_width = self.border
|
client.border_width = self.border
|
||||||
client.size_hints_honor = false
|
client.size_hints_honor = false
|
||||||
if self.notexist then
|
client:geometry(self:compute_size())
|
||||||
self:compute_size()
|
|
||||||
client:geometry(self.geometry)
|
|
||||||
self.notexist = false
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Not sticky and on top
|
-- Set not sticky and on top
|
||||||
client.sticky = false
|
client.sticky = false
|
||||||
client.ontop = true
|
client.ontop = true
|
||||||
client.above = true
|
client.above = true
|
||||||
|
@ -97,6 +92,8 @@ function quake:display()
|
||||||
end
|
end
|
||||||
|
|
||||||
function quake:compute_size()
|
function quake:compute_size()
|
||||||
|
-- skip if we already have a geometry for this screen
|
||||||
|
if not self.geometry[self.screen] then
|
||||||
local geom
|
local geom
|
||||||
if not self.overlap then
|
if not self.overlap then
|
||||||
geom = screen[self.screen].workarea
|
geom = screen[self.screen].workarea
|
||||||
|
@ -113,7 +110,9 @@ function quake:compute_size()
|
||||||
if self.vert == "top" then y = geom.y
|
if self.vert == "top" then y = geom.y
|
||||||
elseif self.vert == "bottom" then y = geom.height + geom.y - height
|
elseif self.vert == "bottom" then y = geom.height + geom.y - height
|
||||||
else y = geom.y + (geom.height - height)/2 end
|
else y = geom.y + (geom.height - height)/2 end
|
||||||
self.geometry = { x = x, y = y, width = width, height = height }
|
self.geometry[self.screen] = { x = x, y = y, width = width, height = height }
|
||||||
|
end
|
||||||
|
return self.geometry[self.screen]
|
||||||
end
|
end
|
||||||
|
|
||||||
function quake:new(config)
|
function quake:new(config)
|
||||||
|
@ -134,29 +133,22 @@ function quake:new(config)
|
||||||
conf.width = conf.width or 1 -- width
|
conf.width = conf.width or 1 -- width
|
||||||
conf.vert = conf.vert or "top" -- top, bottom or center
|
conf.vert = conf.vert or "top" -- top, bottom or center
|
||||||
conf.horiz = conf.horiz or "left" -- left, right or center
|
conf.horiz = conf.horiz or "left" -- left, right or center
|
||||||
|
conf.geometry = {} -- internal use
|
||||||
|
|
||||||
|
local dropdown = setmetatable(conf, { __index = quake })
|
||||||
|
|
||||||
local console = setmetatable(conf, { __index = quake })
|
|
||||||
capi.client.connect_signal("manage", function(c)
|
capi.client.connect_signal("manage", function(c)
|
||||||
if c.instance == console.name and c.screen == console.screen then
|
if c.instance == dropdown.name and c.screen == dropdown.screen then
|
||||||
console:display()
|
dropdown:display()
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
capi.client.connect_signal("unmanage", function(c)
|
capi.client.connect_signal("unmanage", function(c)
|
||||||
if c.instance == console.name and c.screen == console.screen then
|
if c.instance == dropdown.name and c.screen == dropdown.screen then
|
||||||
console.visible = false
|
dropdown.visible = false
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
-- "Reattach" currently running quake application. This is in case awesome is restarted.
|
return dropdown
|
||||||
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
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function quake:toggle()
|
function quake:toggle()
|
||||||
|
|
Loading…
Add table
Reference in a new issue