wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-09-11 22:37:11 +03:00
Code Issues Projects Releases Wiki Activity

Implement line selection for copy mode

Browse Source
This commit is contained in:
Benoit de Chezelles 2022-06-07 00:22:49 +02:00 committed by Wez Furlong
parent 6767144a09
commit f79ce00b65
3 changed files with 56 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/src/keyassignment.rs
View File

@ -434,7 +434,6 @@ pub enum CopyModeAssignment {
MoveToViewportMiddle,
MoveToScrollbackTop,
MoveToScrollbackBottom,
ToggleSelectionByCell,
SetSelectionMode(Option<SelectionMode>),
MoveToStartOfLineContent,
MoveToEndOfLineContent,

9
docs/copymode.md
View File

@ -32,7 +32,8 @@ reassignable.
| | `CTRL-C` |
| | `CTRL-g` |
| | `q` |
| Toggle cell selection mode | `v` |
| Cell selection | `v` |
| Line selection | `V` |
| Rectangular selection | `CTRL-v` (*since: nightly builds only*)|
| Move Left | `LeftArrow`|
| | `h` |
@ -118,8 +119,10 @@ return {
{key="^", mods="NONE", action=wezterm.action{CopyMode="MoveToStartOfLineContent"}},
{key="^", mods="SHIFT", action=wezterm.action{CopyMode="MoveToStartOfLineContent"}},
{key=" ", mods="NONE", action=wezterm.action{CopyMode="ToggleSelectionByCell"}},
{key="v", mods="NONE", action=wezterm.action{CopyMode="ToggleSelectionByCell"}},
{key=" ", mods="NONE", action=wezterm.action{CopyMode={SetSelectionMode="Cell"}}},
{key="v", mods="NONE", action=wezterm.action{CopyMode={SetSelectionMode="Cell"}}},
{key="V", mods="NONE", action=wezterm.action{CopyMode={SetSelectionMode="Line"}}},
{key="V", mods="SHIFT", action=wezterm.action{CopyMode={SetSelectionMode="Line"}}},
{key="v", mods="CTRL", action=wezterm.action{CopyMode={SetSelectionMode="Block"}}},
{key="G", mods="NONE", action=wezterm.action{CopyMode="MoveToScrollbackBottom"}},

72
wezterm-gui/src/overlay/copy.rs
View File

@ -322,14 +322,37 @@ impl CopyRenderable {
fn select_to_cursor_pos(&mut self) {
self.clamp_cursor_to_scrollback();
if let Some(start) = self.start {
let start = SelectionCoordinate {
x: start.x,
y: start.y,
let cursor_is_above_start = self.cursor.y < start.y;
let start = if self.selection_mode == SelectionMode::Line {
SelectionCoordinate {
x: if cursor_is_above_start {
usize::max_value()
} else {
0
},
y: start.y,
}
} else {
SelectionCoordinate {
x: start.x,
y: start.y,
}
};
let end = SelectionCoordinate {
x: self.cursor.x,
y: self.cursor.y,
let end = if self.selection_mode == SelectionMode::Line {
SelectionCoordinate {
x: if cursor_is_above_start {
0
} else {
usize::max_value()
},
y: self.cursor.y,
}
} else {
SelectionCoordinate {
x: self.cursor.x,
y: self.cursor.y,
}
};
self.adjust_selection(start, SelectionRange { start, end });
@ -712,18 +735,6 @@ impl CopyRenderable {
self.select_to_cursor_pos();
}
fn toggle_selection_by_cell(&mut self) {
if self.start.take().is_none() {
let coord = SelectionCoordinate {
x: self.cursor.x,
y: self.cursor.y,
};
self.start.replace(coord);
self.select_to_cursor_pos();
self.selection_mode = SelectionMode::Cell;
}
}
fn set_selection_mode(&mut self, mode: &Option<SelectionMode>) {
match mode {
None => {
@ -736,9 +747,9 @@ impl CopyRenderable {
y: self.cursor.y,
};
self.start.replace(coord);
self.select_to_cursor_pos();
}
self.selection_mode = *mode;
self.select_to_cursor_pos();
}
}
}
@ -810,7 +821,6 @@ impl Pane for CopyOverlay {
MoveToViewportMiddle => render.move_to_viewport_middle(),
MoveToScrollbackTop => render.move_to_top(),
MoveToScrollbackBottom => render.move_to_bottom(),
ToggleSelectionByCell => render.toggle_selection_by_cell(),
MoveToStartOfLineContent => render.move_to_start_of_line_content(),
MoveToEndOfLineContent => render.move_to_end_of_line_content(),
MoveToStartOfLine => render.move_to_start_of_line(),
@ -1190,12 +1200,30 @@ pub fn copy_key_table() -> KeyTable {
(
WKeyCode::Char(' '),
Modifiers::NONE,
KeyAssignment::CopyMode(CopyModeAssignment::ToggleSelectionByCell),
KeyAssignment::CopyMode(CopyModeAssignment::SetSelectionMode(Some(
SelectionMode::Cell,
))),
),
(
WKeyCode::Char('v'),
Modifiers::NONE,
KeyAssignment::CopyMode(CopyModeAssignment::ToggleSelectionByCell),
KeyAssignment::CopyMode(CopyModeAssignment::SetSelectionMode(Some(
SelectionMode::Cell,
))),
),
(
WKeyCode::Char('V'),
Modifiers::NONE,
KeyAssignment::CopyMode(CopyModeAssignment::SetSelectionMode(Some(
SelectionMode::Line,
))),
),
(
WKeyCode::Char('V'),
Modifiers::SHIFT,
KeyAssignment::CopyMode(CopyModeAssignment::SetSelectionMode(Some(
SelectionMode::Line,
))),
),
(
WKeyCode::Char('v'),