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

awful: prompt history index is local to prompt 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-08-12 08:39:31 +02:00
parent ab66b87377
commit 594308316a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/awful.lua.in
View File

@ -39,7 +39,7 @@ hooks = {}
hooks.user = {} hooks.user = {}
prompt = {} prompt = {}
prompt.history = {} prompt.history = {}
prompt.history.data = { max = 50, index = 0, table = {} } prompt.history.data = { max = 50, table = {} }
completion = {} completion = {}
screen = {} screen = {}
layout = {} layout = {}
@ -922,6 +922,7 @@ function prompt.run(args, textbox, exe_callback, completion_callback)
local prettyprompt = args.prompt or "" local prettyprompt = args.prompt or ""
local inv_col = args.fg_cursor or theme.fg_focus or "black" local inv_col = args.fg_cursor or theme.fg_focus or "black"
local cur_col = args.bg_cursor or theme.bg_focus or "white" local cur_col = args.bg_cursor or theme.bg_focus or "white"
local history_index = #prompt.history.data.table + 1
-- The cursor position -- The cursor position
local cur_pos = 1 local cur_pos = 1
-- The completion element to use on completion request. -- The completion element to use on completion request.
@ -930,7 +931,6 @@ function prompt.run(args, textbox, exe_callback, completion_callback)
return return
end end
textbox.text = prettyprompt .. prompt_text_with_cursor(text, inv_col, cur_col, cur_pos) textbox.text = prettyprompt .. prompt_text_with_cursor(text, inv_col, cur_col, cur_pos)
prompt.history.data.index = #prompt.history.data.table + 1
capi.keygrabber.run( capi.keygrabber.run(
function (mod, key) function (mod, key)
local has_ctrl = false local has_ctrl = false
@ -1042,20 +1042,20 @@ function prompt.run(args, textbox, exe_callback, completion_callback)
elseif key == "Right" then elseif key == "Right" then
cur_pos = cur_pos + 1 cur_pos = cur_pos + 1
elseif key == "Up" then elseif key == "Up" then
if prompt.history.data.index > 1 then if history_index > 1 then
prompt.history.data.index = prompt.history.data.index - 1 history_index = history_index - 1
command = prompt.history.data.table[prompt.history.data.index] command = prompt.history.data.table[history_index]
cur_pos = #command + 2 cur_pos = #command + 2
end end
elseif key == "Down" then elseif key == "Down" then
if prompt.history.data.index < #prompt.history.data.table then if history_index < #prompt.history.data.table then
prompt.history.data.index = prompt.history.data.index + 1 history_index = history_index + 1
command = prompt.history.data.table[prompt.history.data.index] command = prompt.history.data.table[history_index]
cur_pos = #command + 2 cur_pos = #command + 2
elseif prompt.history.data.index == #prompt.history.data.table then elseif history_index == #prompt.history.data.table then
prompt.history.data.index = prompt.history.data.index + 1 history_index = history_index + 1
command = "" command = ""
cur_pos = 1 cur_pos = 1