waveterm/backup
0
0
Fork 0
mirror of https://github.com/wavetermdev/backup.git synced 2026-08-05 13:57:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

add meta-pageup/meta-pagedown

Browse Source
This commit is contained in:
sawka
2022-10-10 17:18:40 -07:00
parent 3bc8328c02
commit b74ed98374
4 changed files with 34 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/emain.ts
+9
View File
@@ -139,6 +139,15 @@ function createMainWindow(clientData) {
e.preventDefault();
return;
}
if (input.meta && (input.code == "PageUp" || input.code == "PageDown")) {
if (input.code == "PageUp") {
win.webContents.send("meta-pageup");
} else {
win.webContents.send("meta-pagedown");
}
e.preventDefault();
return;
}
if (input.code.startsWith("Digit") && input.meta) {
let digitNum = parseInt(input.code.substr(5));
if (isNaN(digitNum) || digitNum < 1 || digitNum > 9) {
src/main.tsx
+10 -39
View File
@@ -500,14 +500,6 @@ class TextAreaInput extends React.Component<{}, {}> {
let amt = pageSize(div);
scrollDiv(div, (e.code == "PageUp" ? -amt : amt));
}
else {
let win = GlobalModel.getActiveWindow();
if (win == null) {
return;
}
GlobalCommandRunner.swSelectLine((e.code == "PageUp" ? "-1" : "+1"));
return;
}
}
// console.log(e.code, e.keyCode, e.key, event.which, ctrlMod, e);
})();
@@ -1632,7 +1624,6 @@ class CmdInput extends React.Component<{}, {}> {
@mobxReact.observer
class LinesView extends React.Component<{sw : ScreenWindow, width : number, lines : LineType[]}, {}> {
mutObs : any;
rszObs : any;
linesRef : React.RefObject<any>;
staticRender : OV<boolean> = mobx.observable.box(true);
@@ -1641,6 +1632,7 @@ class LinesView extends React.Component<{sw : ScreenWindow, width : number, line
ignoreNextScroll : boolean = false;
visibleMap : Map<string, OV<boolean>>; // lineid => OV<vis>
lastSelectedLine : number = 0;
lastLinesLength : number = 0;
computeAnchorLine_throttled : () => void;
computeVisibleMap_debounced : () => void;
@@ -1763,7 +1755,7 @@ class LinesView extends React.Component<{sw : ScreenWindow, width : number, line
}
componentDidMount() : void {
let {sw} = this.props;
let {sw, lines} = this.props;
if (sw.anchorLine == null) {
this.computeAnchorLine();
}
@@ -1771,6 +1763,7 @@ class LinesView extends React.Component<{sw : ScreenWindow, width : number, line
this.restoreAnchorOffset("re-mount");
}
this.lastSelectedLine = sw.selectedLine.get();
this.lastLinesLength = lines.length;
let linesElem = this.linesRef.current;
if (linesElem != null) {
@@ -1808,7 +1801,7 @@ class LinesView extends React.Component<{sw : ScreenWindow, width : number, line
height: lineElem.offsetHeight,
topOffset: 0,
botOffset: 0,
containerOffset: 0,
anchorOffset: 0,
};
let containerTop = linesElem.scrollTop;
let containerBot = linesElem.scrollTop + linesElem.clientHeight;
@@ -1826,7 +1819,7 @@ class LinesView extends React.Component<{sw : ScreenWindow, width : number, line
else if (lineBot > containerBot) {
rtn.botOffset = lineBot - containerBot;
}
rtn.containerOffset = containerBot - lineBot;
rtn.anchorOffset = containerBot - lineBot;
return rtn;
}
@@ -1876,10 +1869,12 @@ class LinesView extends React.Component<{sw : ScreenWindow, width : number, line
}
componentDidUpdate(prevProps, prevState, snapshot) : void {
let {sw} = this.props;
let {sw, lines} = this.props;
if (sw.selectedLine.get() != this.lastSelectedLine) {
this.updateSelectedLine();
this.lastSelectedLine = sw.selectedLine.get();
} else if (lines.length != this.lastLinesLength) {
this.restoreAnchorOffset("line-length-change");
}
}
@@ -1964,21 +1959,6 @@ class ScreenWindowView extends React.Component<{sw : ScreenWindow}, {}> {
})();
}
@boundMethod
scrollHandler(event : any) {
let {sw} = this.props;
if (sw == null) {
return;
}
let target = event.target;
let atBottom = (target.scrollTop + 30 > (target.scrollHeight - target.offsetHeight));
if (sw.shouldFollow.get() != atBottom) {
mobx.action(() => sw.shouldFollow.set(atBottom))();
}
sw.setScrollTop_debounced(target.scrollTop);
// console.log("scroll-handler (sw)>", atBottom, target.scrollTop, target.scrollHeight, event);
}
componentDidMount() {
let wvElem = this.windowViewRef.current;
if (wvElem != null) {
@@ -2022,7 +2002,7 @@ class ScreenWindowView extends React.Component<{sw : ScreenWindow}, {}> {
return (
<div className="window-view" style={this.getWindowViewStyle()} ref={this.windowViewRef} data-windowid={sw.windowId}>
<div key="window-tag" className="window-tag">
<span>{sw.name.get()}{sw.shouldFollow.get() ? "*" : ""}</span>
<span>{sw.name.get()}</span>
</div>
<div key="lines" className="lines"></div>
<div key="window-empty" className="window-empty">
@@ -2048,21 +2028,12 @@ class ScreenWindowView extends React.Component<{sw : ScreenWindow}, {}> {
let line : LineType = null;
let screen = GlobalModel.getScreenById(sw.sessionId, sw.screenId);
let session = GlobalModel.getSessionById(sw.sessionId);
let linesStyle : any = {};
if (win.lines.length == 0) {
linesStyle.display = "none";
}
let isActive = sw.isActive();
let selectedLine = sw.selectedLine.get();
return (
<div className="window-view" style={this.getWindowViewStyle()} ref={this.windowViewRef}>
<div key="window-tag" className={cn("window-tag", {"is-active": isActive})}>
<span>
{sw.name.get()}
<If condition={sw.shouldFollow.get()}>
&nbsp;<i className="fa fa-caret-down"/>
</If>
</span>
<span>{sw.name.get()}</span>
</div>
<If condition={win.lines.length > 0}>
<LinesView sw={sw} width={this.width.get()} lines={win.lines}/>
src/model.ts
+13 -8
View File
@@ -76,6 +76,8 @@ type ElectronApi = {
onHCmd : (callback : (mods : KeyModsType) => void) => void,
onMetaArrowUp : (callback : () => void) => void,
onMetaArrowDown : (callback : () => void) => void,
onMetaPageUp : (callback : () => void) => void,
onMetaPageDown : (callback : () => void) => void,
onBracketCmd : (callback : (event : any, arg : {relative : number}, mods : KeyModsType) => void) => void,
onDigitCmd : (callback : (event : any, arg : {digit : number}, mods : KeyModsType) => void) => void,
contextScreen : (screenOpts : {screenId : string}, position : {x : number, y : number}) => void,
@@ -264,7 +266,6 @@ class ScreenWindow {
lastCols : number;
selectedLine : OV<number>;
scrollTop : OV<number>;
shouldFollow : OV<boolean> = mobx.observable.box(true);
focusType : OV<"input"|"lines"> = mobx.observable.box("input");
anchorLine : number = null;
anchorOffset : number = 0;
@@ -440,12 +441,6 @@ class ScreenWindow {
return termWrap.isFocused.get();
}
reset() {
mobx.action(() => {
this.shouldFollow.set(true);
})();
}
getWindow() : Window {
return GlobalModel.getWindowById(this.sessionId, this.windowId);
}
@@ -1359,6 +1354,8 @@ class Model {
getApi().onHCmd(this.onHCmd.bind(this));
getApi().onMetaArrowUp(this.onMetaArrowUp.bind(this));
getApi().onMetaArrowDown(this.onMetaArrowDown.bind(this));
getApi().onMetaPageUp(this.onMetaPageUp.bind(this));
getApi().onMetaPageDown(this.onMetaPageDown.bind(this));
getApi().onBracketCmd(this.onBracketCmd.bind(this));
getApi().onDigitCmd(this.onDigitCmd.bind(this));
}
@@ -1431,7 +1428,7 @@ class Model {
}
onLCmd(e : any, mods : KeyModsType) {
this.inputModel.giveFocus();
// this.inputModel.giveCmdFocus();
}
onHCmd(e : any, mods : KeyModsType) {
@@ -1471,6 +1468,14 @@ class Model {
setTimeout(() => term.updateUsedRows(true), 500);
}
onMetaPageUp() : void {
GlobalCommandRunner.swSelectLine("-1");
}
onMetaPageDown() : void {
GlobalCommandRunner.swSelectLine("+1");
}
onMetaArrowUp() : void {
GlobalCommandRunner.swSelectLine("-1");
}
src/preload.js
+2
View File
@@ -9,6 +9,8 @@ contextBridge.exposeInMainWorld("api", {
onWCmd: (callback) => ipcRenderer.on("w-cmd", callback),
onMetaArrowUp: (callback) => ipcRenderer.on("meta-arrowup", callback),
onMetaArrowDown: (callback) => ipcRenderer.on("meta-arrowdown", callback),
onMetaPageUp: (callback) => ipcRenderer.on("meta-pageup", callback),
onMetaPageDown: (callback) => ipcRenderer.on("meta-pagedown", callback),
onBracketCmd: (callback) => ipcRenderer.on("bracket-cmd", callback),
onDigitCmd: (callback) => ipcRenderer.on("digit-cmd", callback),
contextScreen: (screenOpts, position) => ipcRenderer.send("context-screen", screenOpts, position),