awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2236 from funtaps/patch-1 

Allow use of custom completion callback in prompt widget
This commit is contained in:
Emmanuel Lepage Vallée 2018-04-22 02:06:14 -04:00 committed by GitHub
parent 301d5b80c4 38f7b17f0b
commit f2bac50198
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/awful/widget/prompt.lua
View File

@ -38,7 +38,7 @@ local function run(promptbox)
return prompt.run { return prompt.run {
prompt = promptbox.prompt, prompt = promptbox.prompt,
textbox = promptbox.widget, textbox = promptbox.widget,
completion_callback = completion.shell, completion_callback = promptbox.completion_callback,
history_path = gfs.get_cache_dir() .. "/history", history_path = gfs.get_cache_dir() .. "/history",
exe_callback = function (...) exe_callback = function (...)
promptbox:spawn_and_handle_error(...) promptbox:spawn_and_handle_error(...)
@ -59,6 +59,8 @@ end
-- @tparam[opt="Run: "] string args.prompt Prompt text. -- @tparam[opt="Run: "] string args.prompt Prompt text.
-- @tparam[opt=`beautiful.prompt_bg` or `beautiful.bg_normal`] color args.bg Prompt background color. -- @tparam[opt=`beautiful.prompt_bg` or `beautiful.bg_normal`] color args.bg Prompt background color.
-- @tparam[opt=`beautiful.prompt_fg` or `beautiful.fg_normal`] color args.fg Prompt foreground color. -- @tparam[opt=`beautiful.prompt_fg` or `beautiful.fg_normal`] color args.fg Prompt foreground color.
-- @tparam[opt=`awful.completion.shell`] function args.completion_callback
-- The callback function to call to get completion. See @{awful.prompt.run} for details.
-- @return An instance of prompt widget, inherits from `wibox.container.background`. -- @return An instance of prompt widget, inherits from `wibox.container.background`.
-- @function awful.widget.prompt -- @function awful.widget.prompt
function widgetprompt.new(args) function widgetprompt.new(args)
@ -71,6 +73,7 @@ function widgetprompt.new(args)
promptbox.prompt = args.prompt or "Run: " promptbox.prompt = args.prompt or "Run: "
promptbox.fg = args.fg or beautiful.prompt_fg or beautiful.fg_normal promptbox.fg = args.fg or beautiful.prompt_fg or beautiful.fg_normal
promptbox.bg = args.bg or beautiful.prompt_bg or beautiful.bg_normal promptbox.bg = args.bg or beautiful.prompt_bg or beautiful.bg_normal
promptbox.completion_callback = args.completion_callback or completion.shell
return promptbox return promptbox
end end