summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Main.hs15
1 files changed, 7 insertions, 8 deletions
diff --git a/Main.hs b/Main.hs
index 4be96b4..42fcfdf 100644
--- a/Main.hs
+++ b/Main.hs
@@ -109,18 +109,17 @@ grabKeys dpy r = forM_ (M.keys keys) $ \(m,s) -> io $ do
-- [UnmapNotify] = unmapnotify
--
handle :: Event -> W ()
-handle (MapRequestEvent {window = w}) = manage w
+handle (MapRequestEvent {window = w}) = withDisplay $ \dpy -> do
+ wa <- io $ getWindowAttributes dpy w
+ when (not (waOverrideRedirect wa)) $ manage w
+
handle (DestroyWindowEvent {window = w}) = unmanage w
handle (UnmapEvent {window = w}) = unmanage w
-handle (MappingNotifyEvent {window = w}) = do
- trace $ "Got mapping notify event for window: " ++ show w
-
-{-
-, mapping= m@(r,_,_)}) = do
+handle e@(MappingNotifyEvent {window = w}) = do
+ let m = (request e, first_keycode e, count e)
io $ refreshKeyboardMapping m
- when (r == mappingKeyboard) $ withDisplay $ \d -> grabKeys d w
--}
+ when (request e == mappingKeyboard) $ withDisplay $ flip grabKeys w
handle (KeyEvent {event_type = t, state = m, keycode = code})
| t == keyPress = withDisplay $ \dpy -> do