dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-04-01 22:35:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

terminal: use Ctrl-L to start/continue live message, as Alt-Enter is not always supported (#1607)

Browse Source 
* terminal: use Ctrl-L to start/continue live message, as Alt-Enter is not always supported

* refactor
This commit is contained in:
Evgeny Poberezkin
2022-12-19 13:05:54 +00:00
committed by GitHub
parent 86271fe109
commit ffa37b1684
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Simplex/Chat/Terminal/Input.hs
View File

@@ -123,15 +123,22 @@ receiveFromTTY cc@ChatController {inputQ, activeTo} ct@ChatTerminal {termSize, t
forever $ getKey >>= liftIO . processKey >> withTermLock ct (updateInput ct)
where
processKey :: (Key, Modifiers) -> IO ()
processKey = \case
(EnterKey, ms) ->
when (ms == mempty || ms == altKey) $
atomically (readTVar termState >>= submitInput ms)
>>= mapM_ (uncurry endLiveMessage)
key -> atomically $ do
ac <- readTVar activeTo
live <- isJust <$> readTVar liveMessageState
modifyTVar termState $ updateTermState ac live (width termSize) key
processKey key = case key of
(EnterKey, ms)
| ms == mempty -> submit False
| ms == altKey -> submit True
| otherwise -> pure ()
(CharKey c, ms)
| (c == 'l' || c == 'L') && ms == ctrlKey -> submit True
| otherwise -> update key
_ -> update key
submit live =
atomically (readTVar termState >>= submitInput live)
>>= mapM_ (uncurry endLiveMessage)
update key = atomically $ do
ac <- readTVar activeTo
live <- isJust <$> readTVar liveMessageState
modifyTVar termState $ updateTermState ac live (width termSize) key
endLiveMessage :: String -> LiveMessage -> IO ()
endLiveMessage sentMsg lm = do
@@ -143,13 +150,13 @@ receiveFromTTY cc@ChatController {inputQ, activeTo} ct@ChatTerminal {termSize, t
where
kill sel = deRefWeak (sel lm) >>= mapM_ killThread
submitInput :: Modifiers -> TerminalState -> STM (Maybe (String, LiveMessage))
submitInput ms ts = do
submitInput :: Bool -> TerminalState -> STM (Maybe (String, LiveMessage))
submitInput live ts = do
let s = inputString ts
lm_ <- readTVar liveMessageState
case lm_ of
Just LiveMessage {chatName}
| ms == altKey -> do
| live -> do
writeTVar termState ts' {previousInput}
writeTBQueue inputQ $ "/live " <> chatNameStr chatName
| otherwise ->
@@ -157,7 +164,7 @@ receiveFromTTY cc@ChatController {inputQ, activeTo} ct@ChatTerminal {termSize, t
where
previousInput = chatNameStr chatName <> " " <> s
_
| ms == altKey -> when (isSend s) $ do
| live -> when (isSend s) $ do
writeTVar termState ts' {previousInput = s}
writeTBQueue inputQ $ "/live " <> s
| otherwise -> do