Add option to insert a linebreak on <enter> instead of sending a message (#727)

Author: VAWVAW

docs/iamb.5

@@ -272,6 +272,10 @@ A message must be sent to the room before marking it read.
 Defines whether or not read confirmations are displayed.
 .It Sy request_timeout
 Defines the maximum time per request in seconds.
+.It Sy send_on_enter
+If
+.Sy true
+(the default), pressing enter in insert mode will send the message instead of inserting a linebreak.
 .It Sy sort
 Configures how to sort the lists shown in windows like
 .Sy :rooms

src/config.rs

@@ -872,6 +872,7 @@ pub struct TunableValues {
     pub default_split: SplitDirection,
     pub ssl_verify: bool,
     pub cache_policy: MediaRetentionPolicy,
+    pub send_on_enter: bool,
 }
 
 #[derive(Clone, Debug, Default, Deserialize)]
@@ -928,6 +929,7 @@ pub struct Tunables {
     pub default_split: Option<SplitDirection>,
     pub ssl_verify: Option<bool>,
     pub cache_policy: Option<MediaRetentionPolicy>,
+    pub send_on_enter: Option<bool>,
 }
 
 impl Tunables {
@@ -982,6 +984,7 @@ impl Tunables {
             default_split: self.default_split.or(other.default_split),
             ssl_verify: self.ssl_verify.or(other.ssl_verify),
             cache_policy: self.cache_policy.or(other.cache_policy),
+            send_on_enter: self.send_on_enter.or(other.send_on_enter),
         }
     }
 
@@ -1028,6 +1031,7 @@ impl Tunables {
             default_split: self.default_split.unwrap_or_default(),
             ssl_verify: self.ssl_verify.unwrap_or(true),
             cache_policy: self.cache_policy.unwrap_or_default(),
+            send_on_enter: self.send_on_enter.unwrap_or(true),
         }
     }
 }

src/keybindings.rs

@@ -9,7 +9,7 @@ use modalkit::env::vim::keybindings::{InputStep, VimBindings};
 use modalkit::keybindings::{EdgeEvent, EdgeRepeat, InputBindings};
 
 use crate::base::{Keybindings, MATRIX_ID_WORD};
-use crate::config::{Keys, SplitDirection};
+use crate::config::{Keys, SplitDirection, TunableValues};
 use crate::prelude::*;
 
 pub type IambStep = InputStep<IambInfo>;
@@ -19,11 +19,11 @@ fn once(key: &TerminalKey) -> (EdgeRepeat, EdgeEvent<TerminalKey, CommonKeyClass
 }
 
 /// Initialize the default keybinding state.
-pub fn setup_keybindings() -> Keybindings {
+pub fn setup_keybindings(tunables: &TunableValues) -> Keybindings {
     let mut ism = Keybindings::empty();
 
     let vim = VimBindings::default()
-        .submit_on_enter(false)
+        .submit_on_enter(!tunables.send_on_enter)
         .cursor_open(MATRIX_ID_WORD.clone());
 
     vim.setup(&mut ism);

src/main.rs

@@ -288,7 +288,7 @@ impl Application {
         let backend = CrosstermBackend::new(stdout());
         let terminal = Terminal::new(backend)?;
 
-        let mut bindings = crate::keybindings::setup_keybindings();
+        let mut bindings = crate::keybindings::setup_keybindings(&settings.tunables);
         settings.setup(&mut bindings);
         let bindings = KeyManager::new(bindings);
 

src/tests.rs

@@ -201,6 +201,7 @@ pub fn mock_tunables() -> TunableValues {
         default_split: Default::default(),
         ssl_verify: true,
         cache_policy: Default::default(),
+        send_on_enter: true,
     }
 }