minesweeper 0.8.8.4 → 0.8.8.5
raw patch · 2 files changed
+30/−30 lines, 2 files
Files
- GTK.hs +29/−29
- minesweeper.cabal +1/−1
GTK.hs view
@@ -14,7 +14,7 @@ import GTK.Score import Paths_minesweeper -import Graphics.UI.Gtk hiding (event)+import Graphics.UI.Gtk import Graphics.UI.Gtk.Glade import Graphics.UI.Gtk.Gdk.EventM import Graphics.Rendering.Cairo (liftIO) -- ???@@ -33,7 +33,7 @@ , frame :: AspectFrame , table :: DrawingArea , window :: Window- , event :: Event -> IO ()+ , event_ :: Event -> IO () , tSize :: MVar Board , setPref :: Configuration -> IO (Maybe Configuration)@@ -43,7 +43,7 @@ ------------------------------------------------------ guiState :: (Event -> IO ()) -> IO () -> IO GUIState-guiState event saveState = do+guiState event_ saveState = do unsafeInitGUIForThreadedRTS xml <- msglade@@ -62,7 +62,7 @@ , infoLabel = infoLabel , frame = frame , table = table- , event = event+ , event_ = event_ , window = window , tSize = tSize , setPref = setPref @@ -77,20 +77,20 @@ table `on` exposeEvent $ alwaysTrue $ redrawCanvas gst onDestroy window $ saveState >> mainQuit- onFocusOut window $ const $ alwaysTrue $ event FocusOut+ onFocusOut window $ const $ alwaysTrue $ event_ FocusOut onFocusIn window $ const $ alwaysTrue $ eventFocusIn' gst mapM_ (addMenuItem xml) [ ("quit", widgetDestroy window)- , ("new", event NewEvent)- , ("pref", event OpenPreferences)- , ("scores", event ShowScores)- , ("reveal", event $ RevealEvent Nothing)- , ("mark", event $ MarkEvent Nothing)- , ("undo", event UndoEvent)- , ("redo", event RedoEvent)- , ("hint", event HintEvent)- , ("fullhint",event FullHintEvent)+ , ("new", event_ NewEvent)+ , ("pref", event_ OpenPreferences)+ , ("scores", event_ ShowScores)+ , ("reveal", event_ $ RevealEvent Nothing)+ , ("mark", event_ $ MarkEvent Nothing)+ , ("undo", event_ UndoEvent)+ , ("redo", event_ RedoEvent)+ , ("hint", event_ HintEvent)+ , ("fullhint",event_ FullHintEvent) , ("help", popUpHelp) , ("about", popUpAbout) ]@@ -107,7 +107,7 @@ eventFocusIn' gst = do pos <- getPosition gst- event gst $ FocusIn pos+ event_ gst $ FocusIn pos getPosition g = do (x, y) <- widgetGetPointer (table g)@@ -117,10 +117,10 @@ eventKey gst = do k <- eventKeyName liftIO $ case k of- "Right" -> alwaysTrue $ event gst RightEvent - "Left" -> alwaysTrue $ event gst LeftEvent - "Up" -> alwaysTrue $ event gst UpEvent - "Down" -> alwaysTrue $ event gst DownEvent + "Right" -> alwaysTrue $ event_ gst RightEvent + "Left" -> alwaysTrue $ event_ gst LeftEvent + "Up" -> alwaysTrue $ event_ gst UpEvent + "Down" -> alwaysTrue $ event_ gst DownEvent _ -> return False eventMotion :: GUIState -> EventM EMotion ()@@ -128,11 +128,11 @@ pos <- eventCoordinates liftIO $ do n <- calculatePosition pos gst- event gst $ MouseMotion n+ event_ gst $ MouseMotion n eventCrossing :: GUIState -> EventM ECrossing () eventCrossing gst = - liftIO $ event gst $ MouseMotion Nothing+ liftIO $ event_ gst $ MouseMotion Nothing eventButt :: GUIState -> EventM EButton () eventButt gst = do@@ -141,13 +141,13 @@ liftIO $ do n <- calculatePosition pos gst case (n, b) of- (Just _, LeftButton) -> event gst $ RevealEvent n- (Just _, RightButton) -> event gst $ MarkEvent n+ (Just _, LeftButton) -> event_ gst $ RevealEvent n+ (Just _, RightButton) -> event_ gst $ MarkEvent n _ -> return () redrawCanvas :: GUIState -> EventM EExpose () redrawCanvas gst - = liftIO $ event gst UpdateTable + = liftIO $ event_ gst UpdateTable calculatePosition :: (Double, Double) -> GUIState -> IO (Maybe Square)@@ -171,7 +171,7 @@ swapMVar (tSize gst) size -- ha megváltozott törölni a képernyőt!! postGUISync $ redrawSigns gst size sl waitTill (addUTCTime 0.02 time)- event gst DrawingDone+ event_ gst DrawingDone ShowTime s -> do postGUISync $ labelSetText (timeLabel gst) s@@ -179,19 +179,19 @@ ShowInfo s -> do postGUISync $ labelSetText (infoLabel gst) s waitTill (addUTCTime 0.02 time)- event gst InfoDrawingDone+ event_ gst InfoDrawingDone {- PopUpScores c es attrs -> do attrs' <- postGUISync $ showScores gst c es attrs- event gst $ ScoresClosed attrs'+ event_ gst $ ScoresClosed attrs' -} PopUpNewScore c e es attrs -> do (name, attrs') <- postGUISync $ newScore gst c e es attrs- event gst $ NewScoreClosed name attrs'+ event_ gst $ NewScoreClosed name attrs' PopUpPreferences c -> do mc <- postGUISync $ setPref gst c- event gst $ PreferencesClosed mc+ event_ gst $ PreferencesClosed mc popUpHelp = do
minesweeper.cabal view
@@ -1,5 +1,5 @@ name: minesweeper-version: 0.8.8.4+version: 0.8.8.5 category: Game synopsis: Minesweeper game which is always solvable without guessing description: