summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSpencer Janssen <sjanssen@cse.unl.edu>2007-03-28 23:57:53 +0200
committerSpencer Janssen <sjanssen@cse.unl.edu>2007-03-28 23:57:53 +0200
commit667ad60e5d37e986833db2d56d839f545f1b2156 (patch)
tree346b7d8fb88b04e71dced57e919dd4461574efff
parentef6ff953e8ab5be8d542b33d26963141662fa0ea (diff)
downloadmetatile-667ad60e5d37e986833db2d56d839f545f1b2156.tar
metatile-667ad60e5d37e986833db2d56d839f545f1b2156.zip
Fix refreshKeyboardMapping issues. Requires the latest X11-extras
darcs-hash:20070328215753-a5988-ee705ccb076ddccb83aa32f0c6b04247e255ed58
-rw-r--r--Main.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Main.hs b/Main.hs
index 59c4d5f..bfa6247 100644
--- a/Main.hs
+++ b/Main.hs
@@ -16,7 +16,7 @@
import Data.Bits
import qualified Data.Map as M
-import Graphics.X11.Xlib
+import Graphics.X11.Xlib hiding (refreshKeyboardMapping)
import Graphics.X11.Xlib.Extras
import Graphics.X11.Xinerama
@@ -153,7 +153,7 @@ handle e@(MappingNotifyEvent {window = w}) = do
-- this fromIntegral is only necessary with the old X11 version that uses
-- Int instead of CInt. TODO delete it when there is a new release of X11
let m = (request e, first_keycode e, fromIntegral $ count e)
- io $ refreshKeyboardMapping m
+ withDisplay $ \d -> io $ refreshKeyboardMapping d m
when (request e == mappingKeyboard) $ withDisplay $ io . flip grabKeys w
-- click on an unfocussed window