move state into data structure

1 files changed, 11 insertions, 5 deletions

diff --git a/axis.hs b/axis.hs
index 6ecbe7e..d9a3860 100644
--- a/axis.hs
+++ b/axis.hs
@@ -43,7 +43,7 @@ _AXIS_ROWS = 7 + 4
 _AXIS_UNIQUE_COLS = 7
 _AXIS_COLS_REPEAT = 2
 _AXIS_TOPLEFT_PITCH = 81 + (7 * (_AXIS_ROWS - 7) `div` 2)
-_AXIS_BOTTOMRIGHT_PITCH = 81 - (7 * _AXIS_ROWS) - 3
+_AXIS_BOTTOMLEFT_PITCH = _AXIS_TOPLEFT_PITCH - (_AXIS_ROWS * 7)
 _AXIS_TOPRIGHT_PITCH = _AXIS_TOPLEFT_PITCH + _AXIS_UNIQUE_COLS `div` 2
 
 --_KEY_BORDER_COLOR = (SDL.Color 0 0 255)
@@ -166,6 +166,10 @@ rgbColor r g b = SDL.Pixel (shiftL (fi r) 24 .|. shiftL (fi g) 16 .|. shiftL (fi
 
 chooseFontSize h w = 30 * d `div` 1024 where d = min h w
 
+data LoopState = LoopState {
+  firstLoop :: Bool
+} deriving (Show)
+
 main =
   withAlsaInit $ \h public private q publicAddr privateAddr -> do
   cmdlineAlsaConnect h public -- fail early if bad command lines
@@ -195,7 +199,9 @@ main =
   putStrLn "Initialized."
 
   let parseAlsa keysDown = parseAlsaEvents h keysDown (forwardNoteEvent h q publicAddr)
-  let loop firstLoop midiKeysDown keysDown resolution font s w x = do
+  let loop state midiKeysDown keysDown resolution font s w x = do
+        let (LoopState firstLoop) = state
+
         (keysDown', resolution') <- parseSDLEvents keysDown resolution
         midiKeysDown' <- parseAlsa midiKeysDown
         (ds, s') <- stepSession s
@@ -216,7 +222,7 @@ main =
         videoClipRect <- SDL.getClipRect videoSurface
         let (axis_key_size, axis_key_locations) = getKeyLocations videoClipRect
 
-        let _ALL_PITCHES = Set.fromList $ map (\p -> (Event.Channel 1, Event.Pitch p)) [_AXIS_BOTTOMRIGHT_PITCH .. _AXIS_TOPRIGHT_PITCH]
+        let _ALL_PITCHES = Set.fromList $ map (\p -> (Event.Channel 1, Event.Pitch p)) [_AXIS_BOTTOMLEFT_PITCH .. _AXIS_TOPRIGHT_PITCH]
             keysOFF really = smartDrawKeys really _ALL_PITCHES Set.empty videoSurface font' axis_key_locations axis_key_size
             allKeysOFF =  keysOFF False
             allKeysReallyOFF = keysOFF True
@@ -266,9 +272,9 @@ main =
         let delay = 1000 `div` framerate - 1000 * (floor $ dtime ds)
         SDL.delay (delay)
         Control.Monad.when (not $ keyDown SDL.SDLK_ESCAPE keysDown) $
-          loop False midiKeysDown' keysDown' resolution' font' s' w' x'
+          loop (LoopState False) midiKeysDown' keysDown' resolution' font' s' w' x'
 
-  loop True Set.empty Set.empty (sWidth, sHeight) font clockSession_ netwireIsCool ""
+  loop (LoopState True) Set.empty Set.empty (sWidth, sHeight) font clockSession_ netwireIsCool ""
 
 zipzip ls = if (head ls) == [] then [] else (map head ls) : (zipzip $ map tail ls)