diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## 4.1.1.0 + +* Add new shortcuts to switch to the next and previous tab: + CtrlPgDown and CtrlPgUp. + This works similar to gnome-terminal and xfce4-terminal. + [#180](https://github.com/cdepillabout/termonad/pull/180). + Thanks [@juliendehos](https://github.com/juliendehos)! + ## 4.1.0.0 * Add an option for enabling "bold is bright". This forces colors from the diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -297,6 +297,8 @@ | Ctrl Shift i | Find the regex **below** the current position. | | Ctrl + | Increase font size. | | Ctrl - | Decrease font size. | +| Ctrl PgUp | Switch to previous tab. | +| Ctrl PgDown | Switch to next tab. | | Alt (number key) | Switch to tab `number`. For example, Alt 2 switches to tab 2. | ### Configuring Termonad @@ -507,4 +509,3 @@ ## Maintainers - [cdepillabout](https://github.com/cdepillabout) -- [LSLeary](https://github.com/LSLeary) diff --git a/src/Termonad/App.hs b/src/Termonad/App.hs --- a/src/Termonad/App.hs +++ b/src/Termonad/App.hs @@ -68,6 +68,8 @@ , labelNew , notebookGetNPages , notebookNew + , notebookNextPage + , notebookPrevPage , notebookSetShowBorder , onEntryActivate , onNotebookPageRemoved @@ -153,6 +155,8 @@ import Termonad.Term ( createTerm , relabelTabs + , termNextPage + , termPrevPage , termExitFocused , setShowTabs , showScrollbarToPolicy @@ -428,6 +432,18 @@ void $ onSimpleActionActivate newTabAction $ \_ -> void $ createTerm handleKeyPress mvarTMState actionMapAddAction app newTabAction applicationSetAccelsForAction app "app.newtab" ["T"] + + nextPageAction <- simpleActionNew "nextpage" Nothing + void $ onSimpleActionActivate nextPageAction $ \_ -> + termNextPage mvarTMState + actionMapAddAction app nextPageAction + applicationSetAccelsForAction app "app.nextpage" ["Page_Down"] + + prevPageAction <- simpleActionNew "prevpage" Nothing + void $ onSimpleActionActivate prevPageAction $ \_ -> + termPrevPage mvarTMState + actionMapAddAction app prevPageAction + applicationSetAccelsForAction app "app.prevpage" ["Page_Up"] closeTabAction <- simpleActionNew "closetab" Nothing void $ onSimpleActionActivate closeTabAction $ \_ -> diff --git a/src/Termonad/Term.hs b/src/Termonad/Term.hs --- a/src/Termonad/Term.hs +++ b/src/Termonad/Term.hs @@ -59,7 +59,9 @@ , notebookAppendPage , notebookDetachTab , notebookGetNPages + , notebookNextPage , notebookPageNum + , notebookPrevPage , notebookSetCurrentPage , notebookSetShowTabs , notebookSetTabReorderable @@ -138,6 +140,16 @@ altNumSwitchTerm :: Int -> TMState -> IO () altNumSwitchTerm = focusTerm + +termNextPage :: TMState -> IO () +termNextPage mvarTMState = do + note <- tmNotebook . tmStateNotebook <$> readMVar mvarTMState + notebookNextPage note + +termPrevPage :: TMState -> IO () +termPrevPage mvarTMState = do + note <- tmNotebook . tmStateNotebook <$> readMVar mvarTMState + notebookPrevPage note termExitFocused :: TMState -> IO () termExitFocused mvarTMState = do diff --git a/termonad.cabal b/termonad.cabal --- a/termonad.cabal +++ b/termonad.cabal @@ -1,5 +1,5 @@ name: termonad -version: 4.1.0.0 +version: 4.1.1.0 synopsis: Terminal emulator configurable in Haskell description: Termonad is a terminal emulator configurable in Haskell. It is extremely diff --git a/test/readme/README.lhs b/test/readme/README.lhs --- a/test/readme/README.lhs +++ b/test/readme/README.lhs @@ -297,6 +297,8 @@ | Ctrl Shift i | Find the regex **below** the current position. | | Ctrl + | Increase font size. | | Ctrl - | Decrease font size. | +| Ctrl PgUp | Switch to previous tab. | +| Ctrl PgDown | Switch to next tab. | | Alt (number key) | Switch to tab `number`. For example, Alt 2 switches to tab 2. | ### Configuring Termonad @@ -507,4 +509,3 @@ ## Maintainers - [cdepillabout](https://github.com/cdepillabout) -- [LSLeary](https://github.com/LSLeary)