Skip to content

Forward touch scroll events as terminal input #2708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
splch wants to merge 3 commits into
base: master
Choose a base branch
from
+31 −2
Open

Forward touch scroll events as terminal input #2708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d501ca9
Forward touch scroll events as terminal input
splch Mar 21, 2026
73a8b15
Simplify: keep newScrollTop untouched, add handleScrollDelta separately
splch Mar 21, 2026
fe0325a
Inline variables and remove unnecessary bubbles property
splch Mar 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions app/TerminalView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ - (void)userContentController:(WKUserContentController *)userContentController d
}
@end

@interface TerminalView ()
@interface TerminalView () {
CGFloat _prevScrollY;
}

@property (nonatomic) NSMutableArray<UIKeyCommand *> *keyCommands;
@property ScrollbarView *scrollbarView;
Expand Down Expand Up @@ -104,6 +106,7 @@ - (void)setTerminal:(Terminal *)terminal {
}

_terminal = terminal;
_prevScrollY = 0;
[_terminal addObserver:self forKeyPath:@"loaded" options:NSKeyValueObservingOptionInitial context:nil];
if (_terminal.loaded)
[self installTerminalView];
Expand Down Expand Up @@ -268,7 +271,12 @@ - (void)userContentController:(WKUserContentController *)userContentController d
}

- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
[self.terminal.webView evaluateJavaScript:[NSString stringWithFormat:@"exports.newScrollTop(%f)", scrollView.contentOffset.y] completionHandler:nil];
CGFloat newY = scrollView.contentOffset.y;
[self.terminal.webView evaluateJavaScript:[NSString stringWithFormat:@"exports.newScrollTop(%f)", newY] completionHandler:nil];
CGFloat delta = newY - _prevScrollY;
_prevScrollY = newY;
if (delta != 0)
[self.terminal.webView evaluateJavaScript:[NSString stringWithFormat:@"exports.handleScrollDelta(%f)", delta] completionHandler:nil];
}

- (void)setKeyboardAppearance:(UIKeyboardAppearance)keyboardAppearance {
Expand Down
21 changes: 21 additions & 0 deletions app/terminal/term.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,27 @@ exports.getCharacterSize = () => {
};

exports.clearScrollback = () => term.clearScrollback();

// Forward scroll delta as synthetic WheelEvents into hterm's onMouse_ pipeline.
let scrollDeltaRemainder = 0;
exports.handleScrollDelta = (delta) => {
if (term.vt.mouseReport === term.vt.MOUSE_REPORT_DISABLED && term.isPrimaryScreen())
return;
const charH = term.scrollPort_.characterSize.height;
if (!charH) return;
scrollDeltaRemainder += delta;
const lines = Math.trunc(scrollDeltaRemainder / charH);
if (lines === 0) return;
scrollDeltaRemainder -= lines * charH;
for (let i = 0; i < Math.abs(lines); i++) {
term.scrollPort_.screen_.dispatchEvent(new WheelEvent('wheel', {
deltaY: lines > 0 ? 1 : -1,
deltaMode: WheelEvent.DOM_DELTA_LINE,
cancelable: true,
}));
}
};

exports.setUserGesture = () => term.accessibilityReader_.hasUserGesture = true;

hterm.openUrl = (url) => native.openLink(url);
Expand Down