gregor/jprototerm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pane sync start != pane sync select

Browse Source
This commit is contained in:
Gregor Lohaus
2026-06-19 15:19:12 +02:00
parent 8bd8170270
commit 47b2daa782
5 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gregor/jprototerm/AppConfig.java
View File

@@ -50,6 +50,7 @@ public record AppConfig(
"open_font_selector",
"open_scrollback",
"create_worktree",
"pane_sync_start",
"pane_sync_select",
"pane_sync_commit",
"pane_sync_end",
@@ -119,7 +120,8 @@ public record AppConfig(
Map.entry("open_font_selector", KeyBinding.parse("ALT+T")),
Map.entry("open_scrollback", KeyBinding.parse("ALT+S")),
Map.entry("create_worktree", KeyBinding.parse("ALT+W")),
Map.entry("pane_sync_select", KeyBinding.parse("ALT+Y")),
Map.entry("pane_sync_start", KeyBinding.parse("ALT+Y")),
Map.entry("pane_sync_select", KeyBinding.parse("SPACE")),
Map.entry("pane_sync_commit", KeyBinding.parse("ALT+SHIFT+Y")),
Map.entry("pane_sync_end", KeyBinding.parse("ALT+U")),
Map.entry("paste", KeyBinding.parse("CTRL+SHIFT+V"))

17
src/main/java/com/gregor/jprototerm/Compositor.java
View File

@@ -144,14 +144,19 @@ public final class Compositor {
return paneSyncSelectMode;
}
public void togglePaneSyncSelection() {
TerminalPane active = activePane();
if (active == null) {
public void startPaneSyncSelection() {
if (activePane() == null || paneSyncSelectMode) {
return;
}
if (!paneSyncSelectMode) {
paneSyncSelectMode = true;
paneSyncSelection.clear();
paneSyncSelectMode = true;
paneSyncSelection.clear();
layoutVersion++;
}
public void togglePaneSyncSelection() {
TerminalPane active = activePane();
if (active == null || !paneSyncSelectMode) {
return;
}
if (!paneSyncSelection.add(active)) {
paneSyncSelection.remove(active);

9
src/main/java/com/gregor/jprototerm/TerminalWindow.java
View File

@@ -72,6 +72,7 @@ final class TerminalWindow {
keyActions.put("open_font_selector", this::openFontSelector);
keyActions.put("open_scrollback", this::openScrollbackInEditor);
keyActions.put("create_worktree", this::createWorktreeInEditor);
keyActions.put("pane_sync_start", compositor::startPaneSyncSelection);
keyActions.put("pane_sync_select", compositor::togglePaneSyncSelection);
keyActions.put("pane_sync_commit", compositor::commitPaneSyncSelection);
keyActions.put("pane_sync_end", compositor::endPaneSync);
@@ -134,8 +135,12 @@ final class TerminalWindow {
private void handlePressed(KeyEvent event) {
for (Map.Entry<String, Runnable> action : keyActions.entrySet()) {
if (config.keybindings().get(action.getKey()).matches(event)) {
if (compositor.isPaneSyncSelecting() && !allowedDuringPaneSyncSelection(action.getKey())) {
String actionName = action.getKey();
if (config.keybindings().get(actionName).matches(event)) {
if (actionName.equals("pane_sync_select") && !compositor.isPaneSyncSelecting()) {
continue;
}
if (compositor.isPaneSyncSelecting() && !allowedDuringPaneSyncSelection(actionName)) {
event.consume();
return;
}