Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use awful.keygrabber in awful.prompt 

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
dodo 2012-04-30 17:47:37 +02:00 committed by Uli Schlachter
parent ac5af147f0
commit 200a5272fa
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,9 +13,9 @@ local ipairs = ipairs
local pcall = pcall local pcall = pcall
local capi = local capi =
{ {
keygrabber = keygrabber,
selection = selection selection = selection
} }
local keygrabber = require("awful.keygrabber")
local util = require("awful.util") local util = require("awful.util")
local beautiful = require("beautiful") local beautiful = require("beautiful")
@ -166,6 +166,7 @@ end
-- @param changed_callback Optional parameter: the callback function to call with command as argument when a command was changed. -- @param changed_callback Optional parameter: the callback function to call with command as argument when a command was changed.
-- @param keypressed_callback Optional parameter: the callback function to call with mod table, key and command as arguments when a key was pressed. -- @param keypressed_callback Optional parameter: the callback function to call with mod table, key and command as arguments when a key was pressed.
function run(args, textbox, exe_callback, completion_callback, history_path, history_max, done_callback, changed_callback, keypressed_callback) function run(args, textbox, exe_callback, completion_callback, history_path, history_max, done_callback, changed_callback, keypressed_callback)
local grabber
local theme = beautiful.get() local theme = beautiful.get()
if not args then args = {} end if not args then args = {} end
local command = args.text or "" local command = args.text or ""
@ -199,7 +200,7 @@ function run(args, textbox, exe_callback, completion_callback, history_path, his
local exec = function() local exec = function()
textbox:set_markup("") textbox:set_markup("")
history_add(history_path, command) history_add(history_path, command)
capi.keygrabber.stop() keygrabber.stop(grabber)
exe_callback(command) exe_callback(command)
if done_callback then done_callback() end if done_callback then done_callback() end
end end
@ -213,7 +214,7 @@ function run(args, textbox, exe_callback, completion_callback, history_path, his
prompt = prettyprompt }) prompt = prettyprompt })
end end
capi.keygrabber.run( grabber = keygrabber.run(
function (modifiers, key, event) function (modifiers, key, event)
if event ~= "press" then return end if event ~= "press" then return end
-- Convert index array to hash table -- Convert index array to hash table
@ -247,7 +248,7 @@ function run(args, textbox, exe_callback, completion_callback, history_path, his
-- Get out cases -- Get out cases
if (mod.Control and (key == "c" or key == "g")) if (mod.Control and (key == "c" or key == "g"))
or (not mod.Control and key == "Escape") then or (not mod.Control and key == "Escape") then
capi.keygrabber.stop() keygrabber.stop(grabber)
textbox:set_markup("") textbox:set_markup("")
if done_callback then done_callback() end if done_callback then done_callback() end
return false return false