diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/osc-notify-decorator.ts | 2 | ||||
| -rw-r--r-- | src/osc-notify-middleware.ts | 26 |
2 files changed, 22 insertions, 6 deletions
diff --git a/src/osc-notify-decorator.ts b/src/osc-notify-decorator.ts index abfb796..4beb029 100644 --- a/src/osc-notify-decorator.ts +++ b/src/osc-notify-decorator.ts @@ -28,7 +28,7 @@ export default class OscNotifyDecorator extends TerminalDecorator { private attachToSession(session: BaseSession, tab: BaseTerminalTabComponent<any>) { const middleware = new OscNotifyMiddleware( - () => (<any>tab).title, + () => (<any>tab).customTitle || (<any>tab).title, () => { this.hostWindow.bringToFront(); const parent = this.app.getParentTab(tab); diff --git a/src/osc-notify-middleware.ts b/src/osc-notify-middleware.ts index ad2946c..dcfcc1a 100644 --- a/src/osc-notify-middleware.ts +++ b/src/osc-notify-middleware.ts @@ -4,6 +4,16 @@ import { Observable, Subject } from "rxjs"; const oscPrefix = Buffer.from("\x1b]"); const oscSuffix = Buffer.from("\x07"); +function cleanTitle(raw: string): string { + const t = (raw ?? "").trim(); + if (!t) return "Terminal"; + if (t.includes("/") || t.includes("\\")) { + const segs = t.split(/[/\\]/).filter(s => s.length > 0); + return segs.length ? segs[segs.length - 1] : t; + } + return t; +} + export default class OscNotifyMiddleware extends SessionMiddleware { getTitle: () => string; onClick: () => void; @@ -39,11 +49,11 @@ export default class OscNotifyMiddleware extends SessionMiddleware { const oscCode = parseInt(oscCodeString); if (oscCode === 9) { - const notification = new Notification(this.getTitle() || "Terminal", { - body: oscParams[0] - }); - notification.onclick = () => this.onClick(); - this.notifications.push(notification); + this.showNotification(cleanTitle(this.getTitle()), oscParams[0] ?? ""); + } else if (oscCode === 777 && oscParams[0] === "notify") { + const title = oscParams[1] || cleanTitle(this.getTitle()); + const body = oscParams.slice(2).join(";"); + this.showNotification(title, body); } else { continue; } @@ -52,6 +62,12 @@ export default class OscNotifyMiddleware extends SessionMiddleware { super.feedFromSession(data); } + private showNotification(title: string, body: string): void { + const notification = new Notification(title || "Terminal", { body }); + notification.onclick = () => this.onClick(); + this.notifications.push(notification); + } + close(): void { this.notifications.forEach((notification) => notification.close()); this.notifications = []; |