first attempt to make it leakless
This commit is contained in:
streetturtle
parent
855677d667
commit
29118150a9
|
|
@ -7,6 +7,10 @@
|
|||
-- @copyright 2018 Pavel Makhov
|
||||
-------------------------------------------------
|
||||
|
||||
local capi = {
|
||||
screen = screen,
|
||||
client = client,
|
||||
}
|
||||
local awful = require("awful")
|
||||
local gfs = require("gears.filesystem")
|
||||
local wibox = require("wibox")
|
||||
|
|
@ -16,76 +20,121 @@ local completion = require("awful.completion")
|
|||
|
||||
local run_shell = awful.widget.prompt()
|
||||
|
||||
local w = wibox {
|
||||
visible = false,
|
||||
ontop = true,
|
||||
height = 1060,
|
||||
width = 1920
|
||||
}
|
||||
|
||||
w:setup {
|
||||
{
|
||||
{
|
||||
{
|
||||
{
|
||||
text = '',
|
||||
font = 'Play 18',
|
||||
widget = wibox.widget.textbox,
|
||||
},
|
||||
id = 'icon',
|
||||
top = 9,
|
||||
left = 10,
|
||||
layout = wibox.container.margin
|
||||
},
|
||||
{
|
||||
run_shell,
|
||||
left = 10,
|
||||
layout = wibox.container.margin,
|
||||
},
|
||||
id = 'left',
|
||||
layout = wibox.layout.fixed.horizontal
|
||||
},
|
||||
widget = wibox.container.background,
|
||||
bg = '#333333',
|
||||
shape = function(cr, width, height)
|
||||
gears.shape.rounded_rect(cr, width, height, 3)
|
||||
end,
|
||||
shape_border_color = '#74aeab',
|
||||
shape_border_width = 1,
|
||||
forced_width = 200,
|
||||
forced_height = 50
|
||||
},
|
||||
layout = wibox.container.place
|
||||
}
|
||||
|
||||
local function launch(s)
|
||||
awful.spawn.with_line_callback(os.getenv("HOME") .. "/.config/awesome/awesome-wm-widgets/run-shell/scratch_6.sh " .. tostring(awful.screen.focused().geometry.x), {
|
||||
stdout = function(line)
|
||||
w.visible = true
|
||||
w.bgimage = '/tmp/i3lock-' .. line .. '.png'
|
||||
awful.placement.top(w, { margins = { top = 20 }, parent = awful.screen.focused() })
|
||||
awful.prompt.run {
|
||||
prompt = "<b>Run</b>: ",
|
||||
bg_cursor = '#74aeab',
|
||||
textbox = run_shell.widget,
|
||||
completion_callback = completion.shell,
|
||||
exe_callback = function(...)
|
||||
run_shell:spawn_and_handle_error(...)
|
||||
end,
|
||||
history_path = gfs.get_cache_dir() .. "/history",
|
||||
done_callback = function()
|
||||
-- w.bgimage=''
|
||||
w.visible = false
|
||||
awful.spawn([[bash -c 'rm -f /tmp/i3lock*']])
|
||||
end
|
||||
}
|
||||
end,
|
||||
stderr = function(line)
|
||||
naughty.notify { text = "ERR:" .. line }
|
||||
end,
|
||||
})
|
||||
local function get_screen(s)
|
||||
return s and capi.screen[s]
|
||||
end
|
||||
|
||||
return {
|
||||
launch = launch
|
||||
}
|
||||
|
||||
local widget = {}
|
||||
|
||||
function widget.new()
|
||||
local widget_instance = {
|
||||
_cached_wiboxes = {},
|
||||
}
|
||||
|
||||
|
||||
function widget_instance:_create_wibox()
|
||||
local w = wibox {
|
||||
visible = false,
|
||||
ontop = true,
|
||||
height = 1060,
|
||||
width = 1920
|
||||
}
|
||||
|
||||
w:setup {
|
||||
{
|
||||
{
|
||||
{
|
||||
{
|
||||
text = 'a',
|
||||
font = 'awesomewm-font 13',
|
||||
widget = wibox.widget.textbox,
|
||||
},
|
||||
id = 'icon',
|
||||
left = 10,
|
||||
layout = wibox.container.margin
|
||||
},
|
||||
{
|
||||
run_shell,
|
||||
left = 10,
|
||||
layout = wibox.container.margin,
|
||||
},
|
||||
id = 'left',
|
||||
layout = wibox.layout.fixed.horizontal
|
||||
},
|
||||
widget = wibox.container.background,
|
||||
bg = '#333333',
|
||||
shape = function(cr, width, height)
|
||||
gears.shape.rounded_rect(cr, width, height, 3)
|
||||
end,
|
||||
shape_border_color = '#74aeab',
|
||||
shape_border_width = 1,
|
||||
forced_width = 200,
|
||||
forced_height = 50
|
||||
},
|
||||
layout = wibox.container.place
|
||||
}
|
||||
|
||||
return w
|
||||
end
|
||||
|
||||
function widget_instance:launch(s, c)
|
||||
-- c = c or capi.client.focus
|
||||
-- s = s or (c and c.screen or awful.screen.focused())
|
||||
s = 1
|
||||
naughty.notify{text = 'screen ' .. s}
|
||||
if not self._cached_wiboxes[s] then
|
||||
self._cached_wiboxes[s] = {}
|
||||
naughty.notify{text = 'nope'}
|
||||
end
|
||||
if not self._cached_wiboxes[s][1] then
|
||||
self._cached_wiboxes[s][1] = self:_create_wibox()
|
||||
naughty.notify{text = 'nope'}
|
||||
end
|
||||
local w = self._cached_wiboxes[s][1]
|
||||
awful.spawn.with_line_callback(os.getenv("HOME") .. "/.config/awesome/awesome-wm-widgets/run-shell/scratch_6.sh " .. tostring(awful.screen.focused().geometry.x), {
|
||||
stdout = function(line)
|
||||
w.visible = true
|
||||
w.bgimage = '/tmp/i3lock-' .. line .. '.png'
|
||||
awful.placement.top(w, { margins = { top = 20 }, parent = awful.screen.focused() })
|
||||
awful.prompt.run {
|
||||
prompt = "<b>Run</b>: ",
|
||||
bg_cursor = '#74aeab',
|
||||
textbox = run_shell.widget,
|
||||
completion_callback = completion.shell,
|
||||
exe_callback = function(...)
|
||||
run_shell:spawn_and_handle_error(...)
|
||||
end,
|
||||
history_path = gfs.get_cache_dir() .. "/history",
|
||||
done_callback = function()
|
||||
-- w.bgimage=''
|
||||
w.visible = false
|
||||
w.bgimage = ''
|
||||
awful.spawn([[bash -c 'rm -f /tmp/i3lock*']])
|
||||
end
|
||||
}
|
||||
end,
|
||||
stderr = function(line)
|
||||
naughty.notify { text = "ERR:" .. line }
|
||||
end,
|
||||
})
|
||||
|
||||
end
|
||||
|
||||
return widget_instance
|
||||
end
|
||||
|
||||
local function get_default_widget()
|
||||
if not widget.default_widget then
|
||||
widget.default_widget = widget.new()
|
||||
end
|
||||
return widget.default_widget
|
||||
end
|
||||
|
||||
function widget.launch(...)
|
||||
return get_default_widget():launch(...)
|
||||
end
|
||||
|
||||
|
||||
return widget
|
||||
|
|
|
|||
Loading…
Reference in New Issue