diff options
Diffstat (limited to 'src/Wetterhorn/Core.hs')
| -rw-r--r-- | src/Wetterhorn/Core.hs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Wetterhorn/Core.hs b/src/Wetterhorn/Core.hs index b5e4a6f..d3515fc 100644 --- a/src/Wetterhorn/Core.hs +++ b/src/Wetterhorn/Core.hs @@ -26,6 +26,7 @@ import Control.Exception import Control.Monad (when) import Data.ByteString (ByteString) import qualified Data.ByteString.Char8 as CH +import Data.Char (chr, ord) import Data.Map (Map) import qualified Data.Map as Map import Data.Maybe (fromMaybe) @@ -34,8 +35,7 @@ import Numeric (showHex) import Text.Printf import Wetterhorn.Core.ForeignInterface (ForeignInterface) import qualified Wetterhorn.Core.ForeignInterface as ForeignInterface -import Wetterhorn.WlRoots (WlrInputDevice, wlrSeatKeyboardNotifyKey, wlrSeatSetKeyboard) -import Data.Char (chr, ord) +import Wetterhorn.WlRoots data WContext = WContext { ctxForeignInterface :: ForeignInterface, @@ -88,7 +88,7 @@ data KeyEvent = KeyEvent data WConfig = WConfig { keybindingHandler :: KeyEvent -> W Bool, - surfaceHandler :: SurfaceState -> Ptr () -> W () + surfaceHandler :: SurfaceState -> Surface -> W () } defaultBindings :: Map (KeyState, Word32, Word32) (W ()) @@ -109,7 +109,6 @@ defaultConfig :: WConfig defaultConfig = WConfig { keybindingHandler = \keyEvent -> do - i <- incrementState seatPtr <- (wio . ForeignInterface.getSeat . ctxForeignInterface) =<< getWContext maybe @@ -130,7 +129,7 @@ defaultConfig = $ Map.lookup (state keyEvent, modifiers keyEvent, keysym keyEvent) defaultBindings, - surfaceHandler = \state ptr -> wio (printf "Surface %s is %s\n" (showHex (ptrToIntPtr ptr) "") (show state)) + surfaceHandler = \state surface -> wio (printf "Surface %s is %s\n" (show surface) (show state)) } readWState :: ByteString -> IO WState |