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

awful.prompt: reset 'selectall' correctly 

Signed-off-by: koniu <gkusnierz@gmail.com>
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
koniu 2009-08-31 20:37:18 +01:00 committed by Julien Danjou
parent 4c835b5ef9
commit 2b0de2f23e
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/awful/prompt.lua.in
View File

@ -161,11 +161,12 @@ function run(args, textbox, exe_callback, completion_callback, history_path, his
local cur_ul = args.ul_cursor local cur_ul = args.ul_cursor
local text = args.text or "" local text = args.text or ""
local font = args.font or theme.font local font = args.font or theme.font
local selectall = args.selectall
history_check_load(history_path, history_max) history_check_load(history_path, history_max)
local history_index = history_items(history_path) + 1 local history_index = history_items(history_path) + 1
-- The cursor position -- The cursor position
local cur_pos = (args.selectall and 1) or text:wlen() + 1 local cur_pos = (selectall and 1) or text:wlen() + 1
-- The completion element to use on completion request. -- The completion element to use on completion request.
local ncomp = 1 local ncomp = 1
if not textbox or not exe_callback then if not textbox or not exe_callback then
@ -173,7 +174,7 @@ function run(args, textbox, exe_callback, completion_callback, history_path, his
end end
textbox.text = prompt_text_with_cursor{ textbox.text = prompt_text_with_cursor{
text = text, text_color = inv_col, cursor_color = cur_col, text = text, text_color = inv_col, cursor_color = cur_col,
cursor_pos = cur_pos, cursor_ul = cur_ul, selectall = args.selectall, cursor_pos = cur_pos, cursor_ul = cur_ul, selectall = selectall,
font = font, prompt = prettyprompt } font = font, prompt = prettyprompt }
capi.keygrabber.run( capi.keygrabber.run(
@ -203,7 +204,7 @@ function run(args, textbox, exe_callback, completion_callback, history_path, his
-- Control cases -- Control cases
if mod.Control then if mod.Control then
args.selectall = nil selectall = nil
if key == "a" then if key == "a" then
cur_pos = 1 cur_pos = 1
elseif key == "b" then elseif key == "b" then
@ -257,7 +258,7 @@ function run(args, textbox, exe_callback, completion_callback, history_path, his
command = command_before_comp command = command_before_comp
textbox.text = prompt_text_with_cursor{ textbox.text = prompt_text_with_cursor{
text = command_before_comp, text_color = inv_col, cursor_color = cur_col, text = command_before_comp, text_color = inv_col, cursor_color = cur_col,
cursor_pos = cur_pos, cursor_ul = cur_ul, selectall = args.selectall, cursor_pos = cur_pos, cursor_ul = cur_ul, selectall = selectall,
font = font, prompt = prettyprompt } font = font, prompt = prettyprompt }
return true return true
end end
@ -325,7 +326,7 @@ function run(args, textbox, exe_callback, completion_callback, history_path, his
-- wlen() is UTF-8 aware but #key is not, -- wlen() is UTF-8 aware but #key is not,
-- so check that we have one UTF-8 char but advance the cursor of # position -- so check that we have one UTF-8 char but advance the cursor of # position
if key:wlen() == 1 then if key:wlen() == 1 then
if args.selectall then command = "" end if selectall then command = "" end
command = command:sub(1, cur_pos - 1) .. key .. command:sub(cur_pos) command = command:sub(1, cur_pos - 1) .. key .. command:sub(cur_pos)
cur_pos = cur_pos + #key cur_pos = cur_pos + #key
end end
@ -335,13 +336,13 @@ function run(args, textbox, exe_callback, completion_callback, history_path, his
elseif cur_pos > #command + 1 then elseif cur_pos > #command + 1 then
cur_pos = #command + 1 cur_pos = #command + 1
end end
args.selectall = nil selectall = nil
end end
-- Update textbox -- Update textbox
textbox.text = prompt_text_with_cursor{ textbox.text = prompt_text_with_cursor{
text = command, text_color = inv_col, cursor_color = cur_col, text = command, text_color = inv_col, cursor_color = cur_col,
cursor_pos = cur_pos, cursor_ul = cur_ul, selectall = args.selectall, cursor_pos = cur_pos, cursor_ul = cur_ul, selectall = selectall,
font = font, prompt = prettyprompt } font = font, prompt = prettyprompt }
return true return true