Support primary clipboard

helix-term/src/application.rs

@@ -82,7 +82,7 @@ impl Application {
 
         let mut editor = Editor::new(size, theme_loader.clone(), syn_loader.clone());
 
-        let editor_view = Box::new(ui::EditorView::new(std::mem::take(&mut config.keys)));
+        let editor_view = Box::new(ui::EditorView::new(std::mem::take(&mut config.keys), config.terminal.middle_click_paste));
         compositor.push(editor_view);
 
         if !args.files.is_empty() {

helix-term/src/config.rs

@@ -19,16 +19,21 @@ pub struct LspConfig {
     pub display_messages: bool,
 }
 
-#[derive(Debug, Clone, PartialEq, Deserialize)]
+#[derive(Debug, Default, Clone, PartialEq, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct TerminalConfig {
+    #[serde(default = "mouse_default")]
     pub mouse: bool,
+    #[serde(default = "middle_click_paste_default")]
+    pub middle_click_paste: bool,
+}
+
+fn mouse_default() -> bool {
+    true
 }
 
-impl Default for TerminalConfig {
-    fn default() -> Self {
-        Self { mouse: true }
-    }
+fn middle_click_paste_default() -> bool {
+    true
 }
 
 #[test]

helix-term/src/ui/editor.rs

@@ -29,6 +29,7 @@ use tui::buffer::Buffer as Surface;
 
 pub struct EditorView {
     keymaps: Keymaps,
+    middle_click_paste: bool,
     on_next_key: Option<Box<dyn FnOnce(&mut commands::Context, KeyEvent)>>,
     last_insert: (commands::Command, Vec<KeyEvent>),
     completion: Option<Completion>,
@@ -40,14 +41,15 @@ const OFFSET: u16 = 7; // 1 diagnostic + 5 linenr + 1 gutter
 
 impl Default for EditorView {
     fn default() -> Self {
-        Self::new(Keymaps::default())
+        Self::new(Keymaps::default(), true)
     }
 }
 
 impl EditorView {
-    pub fn new(keymaps: Keymaps) -> Self {
+    pub fn new(keymaps: Keymaps, middle_click_paste: bool) -> Self {
         Self {
             keymaps,
+            middle_click_paste,
             on_next_key: None,
             last_insert: (commands::Command::normal_mode, Vec::new()),
             completion: None,
@@ -861,6 +863,10 @@ impl Component for EditorView {
                 kind: MouseEventKind::Up(MouseButton::Left),
                 ..
             }) => {
+                if !self.middle_click_paste {
+                    return EventResult::Ignored;
+                }
+
                 let (view, doc) = current!(cx.editor);
                 let range = doc.selection(view.id).primary();
 
@@ -889,6 +895,10 @@ impl Component for EditorView {
                 modifiers,
                 ..
             }) => {
+                if !self.middle_click_paste {
+                    return EventResult::Ignored;
+                }
+
                 let editor = &mut cx.editor;
 
                 if modifiers == crossterm::event::KeyModifiers::ALT {