GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-06-08 13:30:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed #9845, fixed #10302 - allow alternative OSC52 suffix

Browse Source
This commit is contained in:
Eugene 2025-02-25 00:37:16 +01:00
parent c7b39bdca7
commit e407ee8bf1
No known key found for this signature in database
GPG Key ID: 5896FCBBDD1CF4F4
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tabby-terminal/src/middleware/oscProcessing.ts
View File

@ -3,7 +3,7 @@ import { Subject, Observable } from 'rxjs'
import { SessionMiddleware } from '../api/middleware' import { SessionMiddleware } from '../api/middleware'
const OSCPrefix = Buffer.from('\x1b]') const OSCPrefix = Buffer.from('\x1b]')
const OSCSuffix = Buffer.from('\x07') const OSCSuffixes = [Buffer.from('\x07'), Buffer.from('\x1b\\')]
export class OSCProcessor extends SessionMiddleware { export class OSCProcessor extends SessionMiddleware {
get cwdReported$ (): Observable<string> { return this.cwdReported } get cwdReported$ (): Observable<string> { return this.cwdReported }
@ -14,11 +14,22 @@ export class OSCProcessor extends SessionMiddleware {
feedFromSession (data: Buffer): void { feedFromSession (data: Buffer): void {
let startIndex = 0 let startIndex = 0
while (data.includes(OSCPrefix, startIndex) && data.includes(OSCSuffix, startIndex)) { while (data.includes(OSCPrefix, startIndex)) {
const params = data.subarray(data.indexOf(OSCPrefix, startIndex) + OSCPrefix.length) const si = startIndex
const oscString = params.subarray(0, params.indexOf(OSCSuffix)).toString() if (!OSCSuffixes.some(s => data.includes(s, si))) {
break
}
startIndex = data.indexOf(OSCSuffix, startIndex) + OSCSuffix.length const params = data.subarray(data.indexOf(OSCPrefix, startIndex) + OSCPrefix.length)
const [closesSuffix, closestSuffixIndex] = OSCSuffixes
.map((suffix): [Buffer, number] => [suffix, params.indexOf(suffix)])
.filter(([_, index]) => index !== -1)
.sort(([_, a], [__, b]) => a - b)[0]
const oscString = params.subarray(0, closestSuffixIndex).toString()
startIndex = data.indexOf(closesSuffix, startIndex) + closesSuffix.length
const [oscCodeString, ...oscParams] = oscString.split(';') const [oscCodeString, ...oscParams] = oscString.split(';')
const oscCode = parseInt(oscCodeString) const oscCode = parseInt(oscCodeString)