From 70ac685a5043a7b8ea9b72537dca8258198640c7 Mon Sep 17 00:00:00 2001 From: Akshay Nair Date: Sat, 21 Dec 2024 20:03:25 +0530 Subject: Minor refactor --- src/Chelleport/Control.hs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/Chelleport/Control.hs') diff --git a/src/Chelleport/Control.hs b/src/Chelleport/Control.hs index fa25681..80be6f8 100644 --- a/src/Chelleport/Control.hs +++ b/src/Chelleport/Control.hs @@ -80,15 +80,14 @@ isKeyReleaseWith :: SDL.KeyboardEventData -> SDL.Keycode -> Bool isKeyReleaseWith keyboardEvent keyCode = isKeyRelease keyboardEvent && eventToKeycode keyboardEvent == keyCode +keyModifier :: SDL.KeyboardEventData -> SDL.KeyModifier +keyModifier = SDL.keysymModifier . SDL.keyboardEventKeysym + withShift :: SDL.KeyboardEventData -> Bool -withShift event = SDL.keyModifierLeftShift modifier || SDL.keyModifierRightShift modifier - where - modifier = SDL.keysymModifier . SDL.keyboardEventKeysym $ event +withShift ev = SDL.keyModifierLeftShift (keyModifier ev) || SDL.keyModifierRightShift (keyModifier ev) withCtrl :: SDL.KeyboardEventData -> Bool -withCtrl event = SDL.keyModifierLeftCtrl modifier || SDL.keyModifierRightCtrl modifier - where - modifier = SDL.keysymModifier . SDL.keyboardEventKeysym $ event +withCtrl ev = SDL.keyModifierLeftCtrl (keyModifier ev) || SDL.keyModifierRightCtrl (keyModifier ev) directionalIncrement :: (CInt, CInt) -> Char -> (Int, Int) directionalIncrement (incX, incY) = \case -- cgit v1.3.1