GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-09-24 17:16:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

disable progress detection when alt buffer is active

Browse Source
This commit is contained in:
Eugene Pankov
2020-03-25 22:59:44 +01:00
parent 113573b2d2
commit 5d431fa9cf
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
terminus-terminal/src/api/baseTerminalTab.component.ts
View File

@@ -68,6 +68,8 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
*/ */
enableDynamicTitle = true enableDynamicTitle = true
alternateScreenActive = false
// Deps start // Deps start
config: ConfigService config: ConfigService
element: ElementRef element: ElementRef
@@ -210,6 +212,10 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
this.session.releaseInitialDataBuffer() this.session.releaseInitialDataBuffer()
}) })
this.alternateScreenActive$.subscribe(x => {
this.alternateScreenActive = x
})
if (this.savedState) { if (this.savedState) {
this.frontend.restoreState(this.savedState) this.frontend.restoreState(this.savedState)
this.frontend.write('\r\n\r\n') this.frontend.write('\r\n\r\n')
@@ -279,7 +285,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
*/ */
write (data: string): void { write (data: string): void {
const percentageMatch = /(^|[^\d])(\d+(\.\d+)?)%([^\d]|$)/.exec(data) const percentageMatch = /(^|[^\d])(\d+(\.\d+)?)%([^\d]|$)/.exec(data)
if (percentageMatch) { if (!this.alternateScreenActive && percentageMatch) {
const percentage = percentageMatch[3] ? parseFloat(percentageMatch[2]) : parseInt(percentageMatch[2]) const percentage = percentageMatch[3] ? parseFloat(percentageMatch[2]) : parseInt(percentageMatch[2])
if (percentage > 0 && percentage <= 100) { if (percentage > 0 && percentage <= 100) {
this.setProgress(percentage) this.setProgress(percentage)
@@ -302,7 +308,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
data = data.replace(/\n/g, '\r') data = data.replace(/\n/g, '\r')
} }
if (data.includes('\r')) { if (!this.alternateScreenActive && data.includes('\r')) {
const canTrim = !data.trim().includes('\r') const canTrim = !data.trim().includes('\r')
const buttons = canTrim ? ['Paste', 'Trim whitespace and paste', 'Cancel'] : ['Paste', 'Cancel'] const buttons = canTrim ? ['Paste', 'Trim whitespace and paste', 'Cancel'] : ['Paste', 'Cancel']
const result = (await this.electron.showMessageBox( const result = (await this.electron.showMessageBox(

5
terminus-terminal/src/frontends/xtermFrontend.ts
View File

@@ -121,6 +121,11 @@ export class XTermFrontend extends Frontend {
this.xtermCore.updateCursorStyle(e) this.xtermCore.updateCursorStyle(e)
keyboardEventHandler('keyup', e) keyboardEventHandler('keyup', e)
} }
this.xtermCore._bufferService.buffers.onBufferActivate(e => {
const altBufferActive = e.activeBuffer === this.xtermCore._bufferService.buffers.alt
this.alternateScreenActive.next(altBufferActive)
})
} }
attach (host: HTMLElement): void { attach (host: HTMLElement): void {