Centralise mouse context data

src/Dodge/Data/HUD.hs

@@ -21,7 +21,6 @@ data HUDElement
         , _diInvFilter :: Maybe String
         , _diCloseFilter :: Maybe String
         , _diSelectionExtra :: Int
-        , _diMouseOver :: Maybe (Int, Int)
         }
     | DisplayCarte
 
@@ -40,7 +39,6 @@ data SubInventory
         { _ciSections :: IntMap (SelectionSection CombinableItem)
         , _ciSelection :: Maybe (Int, Int)
         , _ciFilter :: Maybe String
-        , _ciMouseOver :: Maybe (Int,Int)
         }
     | LockedInventory
     | DisplayTerminal {_termID :: Int}

src/Dodge/Data/Input.hs

@@ -18,8 +18,8 @@ data PressType
 
 data MouseContext
     = NoMouseContext
-    | OverInv (Int,Int)
-    | OverCombInv (Int,Int)
+    | OverInv { _mcoInv :: (Int,Int)}
+    | OverCombInv { _mcoCombInv :: (Int,Int)}
     | OverTerminalScreen
 
 data Input = Input
@@ -51,3 +51,4 @@ data TermSignal
     | TSdown
 
 makeLenses ''Input
+makeLenses ''MouseContext