summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Denney <wnoise@ofb.net>2007-09-30 00:47:55 +0200
committerAaron Denney <wnoise@ofb.net>2007-09-30 00:47:55 +0200
commit948ebedab0b47a5c419d3b3836f26df2f6702244 (patch)
tree1ea0c8d24742dfec9c503dbd7e608ba7dd8cdf9f
parent0fb82e56bba406be32553591667016972462b1e0 (diff)
downloadmetatile-948ebedab0b47a5c419d3b3836f26df2f6702244.tar
metatile-948ebedab0b47a5c419d3b3836f26df2f6702244.zip
On change of keyboard mapping, grabKeys from the root window.
darcs-hash:20070929224755-859d9-9427b5ca7c0c924bd8a841a86cb1cd17dfe511f1
-rw-r--r--Main.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/Main.hs b/Main.hs
index 326955a..39e5dcd 100644
--- a/Main.hs
+++ b/Main.hs
@@ -178,9 +178,11 @@ handle (UnmapEvent {ev_window = w, ev_send_event = synthetic}) = whenX (isClient
else modify (\s -> s { waitingUnmap = M.adjust pred w (waitingUnmap s) })
-- set keyboard mapping
-handle e@(MappingNotifyEvent {ev_window = w}) = do
+handle e@(MappingNotifyEvent {}) = do
io $ refreshKeyboardMapping e
- when (ev_request e == mappingKeyboard) $ withDisplay $ io . flip grabKeys w
+ when (ev_request e == mappingKeyboard) $ withDisplay $ \dpy -> do
+ rootw <- asks theRoot
+ io $ grabKeys dpy rootw
-- handle button release, which may finish dragging.
handle e@(ButtonEvent {ev_event_type = t})