aboutsummaryrefslogtreecommitdiffstats
path: root/core.lua
diff options
context:
space:
mode:
authorMatthias Richter <vrld@vrld.org>2012-03-14 14:14:16 +0100
committerMatthias Richter <vrld@vrld.org>2012-03-14 14:14:16 +0100
commit465aaf18853e0e96f4a26642fea884919f9a2f88 (patch)
tree2a0ff552d2bd14886fc94d6a23f387a939788d3f /core.lua
parent370c10c78770bc3c1a70a086b238e7a8e5197fb9 (diff)
downloadQuickie-465aaf18853e0e96f4a26642fea884919f9a2f88.tar.gz
Quickie-465aaf18853e0e96f4a26642fea884919f9a2f88.tar.bz2
Quickie-465aaf18853e0e96f4a26642fea884919f9a2f88.tar.xz
Quickie-465aaf18853e0e96f4a26642fea884919f9a2f88.zip
Add gui.core.(disable|clear)KeyFocus
Diffstat (limited to 'core.lua')
-rw-r--r--core.lua50
1 files changed, 28 insertions, 22 deletions
diff --git a/core.lua b/core.lua
index bb5295a..3df98e8 100644
--- a/core.lua
+++ b/core.lua
@@ -17,6 +17,9 @@ local function isActive(id) return context.active == id end
local function setKeyFocus(id) context.keyfocus = id end
local function hasKeyFocus(id) return context.keyfocus == id end
+local function disableKeyFocus() return setKeyFocus{} end
+local function clearKeyFocus() return setKeyFocus(nil) end
+
-- input
local mouse = {x = 0, y = 0, down = false}
local keyboard = {key = nil, code = -1}
@@ -50,7 +53,7 @@ end
function keyboard.tryGrab(id)
if not context.keyfocus then
- context.keyfocus = id
+ setKeyFocus(id)
end
end
@@ -136,25 +139,28 @@ local function draw()
end
return {
- mouse = mouse,
- keyboard = keyboard,
-
- generateID = generateID,
- setHot = setHot,
- setActive = setActive,
- setKeyFocus = setKeyFocus,
- isHot = isHot,
- isActive = isActive,
- hasKeyFocus = hasKeyFocus,
- makeCyclable = makeCyclable,
-
- style = require((...):match("(.-)[^%.]+$") .. '.style-default'),
- color = color,
- registerDraw = registerDraw,
- draw = draw,
-
- strictAnd = strictAnd,
- strictOr = strictOr,
- save_pack = save_pack,
- save_unpack = save_unpack,
+ mouse = mouse,
+ keyboard = keyboard,
+
+ generateID = generateID,
+ setHot = setHot,
+ setActive = setActive,
+ setKeyFocus = setKeyFocus,
+ isHot = isHot,
+ isActive = isActive,
+ hasKeyFocus = hasKeyFocus,
+
+ disableKeyFocus = disableKeyFocus,
+ clearKeyFocus = clearKeyFocus,
+ makeCyclable = makeCyclable,
+
+ style = require((...):match("(.-)[^%.]+$") .. '.style-default'),
+ color = color,
+ registerDraw = registerDraw,
+ draw = draw,
+
+ strictAnd = strictAnd,
+ strictOr = strictOr,
+ save_pack = save_pack,
+ save_unpack = save_unpack,
}