From 962e7c83df850ea06f50df5db52c5e8b5c6e6bf8 Mon Sep 17 00:00:00 2001 From: Jonathan Daugherty Date: Fri, 10 Jul 2015 13:53:21 -0700 Subject: [PATCH] Rename appMakeVtyEvent to appLiftVtyEvent --- programs/AttrDemo.hs | 2 +- programs/CustomEventDemo.hs | 2 +- programs/DialogDemo.hs | 2 +- programs/EditDemo.hs | 2 +- programs/LayerDemo.hs | 2 +- programs/ListDemo.hs | 2 +- programs/Main.hs | 2 +- programs/MarkupDemo.hs | 2 +- programs/PaddingDemo.hs | 2 +- programs/SuspendAndResumeDemo.hs | 2 +- programs/ViewportScrollDemo.hs | 2 +- src/Brick/Main.hs | 6 +++--- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/AttrDemo.hs b/programs/AttrDemo.hs index ecfe548..bc786c0 100644 --- a/programs/AttrDemo.hs +++ b/programs/AttrDemo.hs @@ -55,7 +55,7 @@ app = , appStartEvent = return , appAttrMap = const theMap , appChooseCursor = neverShowCursor - , appMakeVtyEvent = id + , appLiftVtyEvent = id } main :: IO () diff --git a/programs/CustomEventDemo.hs b/programs/CustomEventDemo.hs index fd28ee0..b1a5bd5 100644 --- a/programs/CustomEventDemo.hs +++ b/programs/CustomEventDemo.hs @@ -61,7 +61,7 @@ theApp = , appHandleEvent = appEvent , appStartEvent = return , appAttrMap = def - , appMakeVtyEvent = VtyEvent + , appLiftVtyEvent = VtyEvent } main :: IO () diff --git a/programs/DialogDemo.hs b/programs/DialogDemo.hs index 589330e..f245e80 100644 --- a/programs/DialogDemo.hs +++ b/programs/DialogDemo.hs @@ -54,7 +54,7 @@ theApp = , M.appHandleEvent = appEvent , M.appStartEvent = return , M.appAttrMap = const theMap - , M.appMakeVtyEvent = id + , M.appLiftVtyEvent = id } main :: IO () diff --git a/programs/EditDemo.hs b/programs/EditDemo.hs index fc2cc84..8bcb515 100644 --- a/programs/EditDemo.hs +++ b/programs/EditDemo.hs @@ -44,7 +44,7 @@ theApp = , M.appHandleEvent = appEvent , M.appStartEvent = return , M.appAttrMap = const theMap - , M.appMakeVtyEvent = id + , M.appLiftVtyEvent = id } main :: IO () diff --git a/programs/LayerDemo.hs b/programs/LayerDemo.hs index c219b50..58552d3 100644 --- a/programs/LayerDemo.hs +++ b/programs/LayerDemo.hs @@ -59,7 +59,7 @@ app = , M.appStartEvent = return , M.appHandleEvent = appEvent , M.appAttrMap = const def - , M.appMakeVtyEvent = id + , M.appLiftVtyEvent = id , M.appChooseCursor = M.neverShowCursor } diff --git a/programs/ListDemo.hs b/programs/ListDemo.hs index 27a5fa9..d88d646 100644 --- a/programs/ListDemo.hs +++ b/programs/ListDemo.hs @@ -84,7 +84,7 @@ theApp = , M.appHandleEvent = appEvent , M.appStartEvent = return , M.appAttrMap = const theMap - , M.appMakeVtyEvent = id + , M.appLiftVtyEvent = id } main :: IO () diff --git a/programs/Main.hs b/programs/Main.hs index a6d3ba0..4f5c709 100644 --- a/programs/Main.hs +++ b/programs/Main.hs @@ -146,7 +146,7 @@ theApp = , appStartEvent = return , appHandleEvent = appEvent , appAttrMap = const theAttrMap - , appMakeVtyEvent = id + , appLiftVtyEvent = id } main :: IO () diff --git a/programs/MarkupDemo.hs b/programs/MarkupDemo.hs index 68c1259..6433081 100644 --- a/programs/MarkupDemo.hs +++ b/programs/MarkupDemo.hs @@ -33,7 +33,7 @@ app = , appAttrMap = const theMap , appStartEvent = return , appChooseCursor = neverShowCursor - , appMakeVtyEvent = id + , appLiftVtyEvent = id } main :: IO () diff --git a/programs/PaddingDemo.hs b/programs/PaddingDemo.hs index 261dbfb..0b02985 100644 --- a/programs/PaddingDemo.hs +++ b/programs/PaddingDemo.hs @@ -50,7 +50,7 @@ app = , appStartEvent = return , appAttrMap = const def , appChooseCursor = neverShowCursor - , appMakeVtyEvent = id + , appLiftVtyEvent = id } main :: IO () diff --git a/programs/SuspendAndResumeDemo.hs b/programs/SuspendAndResumeDemo.hs index f62730b..587cc8d 100644 --- a/programs/SuspendAndResumeDemo.hs +++ b/programs/SuspendAndResumeDemo.hs @@ -55,7 +55,7 @@ theApp = , appHandleEvent = appEvent , appStartEvent = return , appAttrMap = const def - , appMakeVtyEvent = id + , appLiftVtyEvent = id } main :: IO () diff --git a/programs/ViewportScrollDemo.hs b/programs/ViewportScrollDemo.hs index bf04554..52fce01 100644 --- a/programs/ViewportScrollDemo.hs +++ b/programs/ViewportScrollDemo.hs @@ -65,7 +65,7 @@ app = , M.appStartEvent = return , M.appHandleEvent = appEvent , M.appAttrMap = const def - , M.appMakeVtyEvent = id + , M.appLiftVtyEvent = id , M.appChooseCursor = M.neverShowCursor } diff --git a/src/Brick/Main.hs b/src/Brick/Main.hs index 6c62e77..e8b76a8 100644 --- a/src/Brick/Main.hs +++ b/src/Brick/Main.hs @@ -87,7 +87,7 @@ data App s e = -- initial scrolling requests, for example. , appAttrMap :: s -> AttrMap -- ^ The attribute map that should be used during rendering. - , appMakeVtyEvent :: Event -> e + , appLiftVtyEvent :: Event -> e -- ^ The event constructor to use to wrap Vty events in your own -- event type. For example, if the application's event type is -- 'Event', this is just 'id'. @@ -121,7 +121,7 @@ simpleMain w = , appHandleEvent = resizeOrQuit , appStartEvent = return , appAttrMap = def - , appMakeVtyEvent = id + , appLiftVtyEvent = id , appChooseCursor = neverShowCursor } in defaultMain app () @@ -141,7 +141,7 @@ data InternalNext a = InternalSuspendAndResume RenderState (IO a) runWithNewVty :: IO Vty -> Chan e -> App s e -> RenderState -> s -> IO (InternalNext s) runWithNewVty buildVty chan app initialRS initialSt = do withVty buildVty $ \vty -> do - pid <- forkIO $ supplyVtyEvents vty (appMakeVtyEvent app) chan + pid <- forkIO $ supplyVtyEvents vty (appLiftVtyEvent app) chan let runInner rs st = do (result, newRS) <- runVty vty chan app st rs case result of