diff options
| author | Adam Vogt <vogt.adam@gmail.com> | 2010-02-22 15:45:12 +0100 |
|---|---|---|
| committer | Adam Vogt <vogt.adam@gmail.com> | 2010-02-22 15:45:12 +0100 |
| commit | 85ce17a356afa5371be37f4bc2a46c54987343ce (patch) | |
| tree | 1fd5ed844cab3b3dfddb9d398ece4524e9308810 /XMonad/Main.hsc | |
| parent | d11fc9b2358ace8b4727c9b9d905be94879b44f7 (diff) | |
| download | xmonad-85ce17a356afa5371be37f4bc2a46c54987343ce.tar.gz xmonad-85ce17a356afa5371be37f4bc2a46c54987343ce.tar.xz xmonad-85ce17a356afa5371be37f4bc2a46c54987343ce.zip | |
Resolve conflicts Geoff Reedy's window focus hack.
Ignore-this: a71f3cb0507642e828f4bdfdc7ccd289
darcs-hash:20100222144512-1499c-f733b3d845d3d45da0713653796caae461b09b15.gz
Diffstat (limited to 'XMonad/Main.hsc')
| -rw-r--r-- | XMonad/Main.hsc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/XMonad/Main.hsc b/XMonad/Main.hsc index 33838c8..0d279f9 100644 --- a/XMonad/Main.hsc +++ b/XMonad/Main.hsc @@ -121,12 +121,8 @@ xmonad initxmc = do , keyActions = keys xmc xmc , buttonActions = mouseBindings xmc xmc , mouseFocused = False - , mousePosition = Nothing } - st = XState - { windowset = initialWinset - , mapped = S.empty - , waitingUnmap = M.empty - , dragging = Nothing } + , mousePosition = Nothing + , currentEvent = Nothing } st = XState { windowset = initialWinset |