2 files changed, 30 insertions, 5 deletions

diff --git a/AlsaSeq.hs b/AlsaSeq.hs
index 7c831bd..e0ec6a2 100644
--- a/AlsaSeq.hs
+++ b/AlsaSeq.hs
@@ -1,4 +1,4 @@
-module AlsaSeq (withAlsaInit, parseAlsaEvents, forwardNoteEvent, cmdlineAlsaConnect, printChordLn) where
+module AlsaSeq (withAlsaInit, parseAlsaEvents, forwardNoteEvent, cmdlineAlsaConnect, printChordLn, showChord) where
 import qualified Sound.ALSA.Exception as AlsaExc
 import qualified Sound.ALSA.Sequencer.Address as Addr
 import qualified Sound.ALSA.Sequencer as SndSeq
@@ -31,6 +31,8 @@ joinWords ls = foldr1 (\a b -> a ++ " " ++ b) ls
 printWords [] = return () -- print nothing if no words (not an empty line)
 printWords ls = putStrLn $ joinWords ls
 
+showChord ls = joinWords $ pitchWords ls
+
 showPitch x = 
   let (octave, pitch) = Haskore.Basic.Pitch.fromInt $ fromIntegral x
   in Haskore.Basic.Pitch.classFormat pitch (show octave)
diff --git a/axis.hs b/axis.hs
index 37b187f..3e0b8b1 100644
--- a/axis.hs
+++ b/axis.hs
@@ -53,13 +53,28 @@ main =
           putStrLn x'
           fontSurface <- SDL.TTF.renderUTF8Blended font x' (SDL.Color 0 255 0)
           fontClipRect <- SDL.getClipRect fontSurface
---        _ <- SDL.fillRect videoSurface (Just fontClipRect) (SDL.Pixel 0)
-          _ <- SDL.fillRect videoSurface (Just videoClipRect) (SDL.Pixel 0)
+          _ <- SDL.fillRect videoSurface (Just (widenRect fontClipRect videoClipRect)) (SDL.Pixel 0) -- clear a horizontal band
           _ <- SDL.blitSurface fontSurface (Just fontClipRect) videoSurface (Just fontClipRect)
---        _ <- SDL.updateRect videoSurface fontClipRect
-          _ <- SDL.updateRect videoSurface videoClipRect
           return ()
 
+        Control.Monad.when (midiKeysDown' /= midiKeysDown) $ do
+          let chord = showChord midiKeysDown'
+          putStrLn chord
+          if (chord /= "")
+          then do
+            chordFontSurface <- SDL.TTF.renderUTF8Blended font chord (SDL.Color 0 255 0)
+            chordFontClipRect <- SDL.getClipRect chordFontSurface
+            let r = chordFontClipRect `underNeath` (SDL.Rect 0 0 0 70)
+            _ <- SDL.fillRect videoSurface (Just (widenRect r videoClipRect)) (SDL.Pixel 0) -- clear a horizontal band
+            _ <- SDL.blitSurface chordFontSurface (Just chordFontClipRect) videoSurface (Just r)
+            return ()
+          else do
+            _ <- SDL.fillRect videoSurface (Just (widenRect (SDL.Rect 0 70 0 70) videoClipRect)) (SDL.Pixel 0) -- clear a horizontal band
+            return ()
+          return ()
+
+        _ <- SDL.updateRect videoSurface videoClipRect
+
         let framerate = 30
         let delay = 1000 `div` framerate - 1000 * (floor $ dtime ds)
         SDL.delay (delay)
@@ -68,6 +83,14 @@ main =
 
   loop Set.empty Set.empty clockSession_ netwireIsCool ""
 
+widenRect a b =
+  let ((SDL.Rect x1 y1 w1 h1), (SDL.Rect x2 _ w2 _)) = (a, b) in
+    (SDL.Rect x2 y1 w2 h1)
+
+underNeath a b =
+  let ((SDL.Rect x1 y1 w1 h1), (SDL.Rect _ _ _ h2)) = (a, b) in
+    (SDL.Rect x1 (y1+h2) w1 h1)
+
 parseSDLEvents :: Set.Set SDL.Keysym -> IO (Set.Set SDL.Keysym)
 parseSDLEvents keysDown = do
   event <- SDL.pollEvent