separate color schemes per profile - fixes #5885, fixes #4593, fixes #…

…3516, fixes #7457, fixes #765
Eugeny · Feb 4, 2023 · 69d884e · 69d884e
1 parent e018197
commit 69d884e
Show file tree

Hide file tree

Showing 32 changed files with 192 additions and 106 deletions.
diff --git a/tabby-core/src/services/profiles.service.ts b/tabby-core/src/services/profiles.service.ts
@@ -23,6 +23,7 @@ export class ProfilesService {
         weight: 0,
         isBuiltin: false,
         isTemplate: false,
+        terminalColorScheme: null,
     }
 
     constructor (

diff --git a/tabby-linkifier/src/api.ts b/tabby-linkifier/src/api.ts
@@ -4,13 +4,13 @@ export abstract class LinkHandler {
     regex: RegExp
     priority = 1
 
-    convert (uri: string, _tab?: BaseTerminalTabComponent): Promise<string>|string {
+    convert (uri: string, _tab?: BaseTerminalTabComponent<any>): Promise<string>|string {
         return uri
     }
 
-    verify (_uri: string, _tab?: BaseTerminalTabComponent): Promise<boolean>|boolean {
+    verify (_uri: string, _tab?: BaseTerminalTabComponent<any>): Promise<boolean>|boolean {
         return true
     }
 
-    abstract handle (uri: string, tab?: BaseTerminalTabComponent): void
+    abstract handle (uri: string, tab?: BaseTerminalTabComponent<any>): void
 }
diff --git a/tabby-linkifier/src/decorator.ts b/tabby-linkifier/src/decorator.ts
@@ -14,7 +14,7 @@ export class LinkHighlighterDecorator extends TerminalDecorator {
         super()
     }
 
-    attach (tab: BaseTerminalTabComponent): void {
+    attach (tab: BaseTerminalTabComponent<any>): void {
         if (!(tab.frontend instanceof XTermFrontend)) {
             // not xterm
             return

diff --git a/tabby-linkifier/src/handlers.ts b/tabby-linkifier/src/handlers.ts
@@ -65,7 +65,7 @@ export class BaseFileHandler extends LinkHandler {
         }
     }
 
-    async convert (uri: string, tab?: BaseTerminalTabComponent): Promise<string> {
+    async convert (uri: string, tab?: BaseTerminalTabComponent<any>): Promise<string> {
         let p = untildify(uri)
         if (!path.isAbsolute(p) && tab) {
             const cwd = await tab.session?.getWorkingDirectory()
@@ -102,7 +102,7 @@ export class WindowsFileHandler extends BaseFileHandler {
         super(toastr, platform)
     }
 
-    convert (uri: string, tab?: BaseTerminalTabComponent): Promise<string> {
+    convert (uri: string, tab?: BaseTerminalTabComponent<any>): Promise<string> {
         const sanitizedUri = uri.replace(/"/g, '')
         return super.convert(sanitizedUri, tab)
     }

diff --git a/tabby-local/src/api.ts b/tabby-local/src/api.ts
@@ -1,4 +1,4 @@
-import { Profile } from 'tabby-core'
+import { BaseTerminalProfile } from 'tabby-terminal'
 
 export interface Shell {
     id: string
@@ -44,7 +44,7 @@ export interface SessionOptions {
     runAsAdministrator?: boolean
 }
 
-export interface LocalProfile extends Profile {
+export interface LocalProfile extends BaseTerminalProfile {
     options: SessionOptions
 }
 

diff --git a/tabby-local/src/components/terminalTab.component.ts b/tabby-local/src/components/terminalTab.component.ts
@@ -13,9 +13,8 @@ import { UACService } from '../services/uac.service'
     styles: BaseTerminalTabComponent.styles,
     animations: BaseTerminalTabComponent.animations,
 })
-export class TerminalTabComponent extends BaseTerminalTabComponent {
+export class TerminalTabComponent extends BaseTerminalTabComponent<LocalProfile> {
     @Input() sessionOptions: SessionOptions // Deprecated
-    @Input() profile: LocalProfile
     session: Session|null = null
 
     // eslint-disable-next-line @typescript-eslint/no-useless-constructor

diff --git a/tabby-local/src/services/terminal.service.ts b/tabby-local/src/services/terminal.service.ts
@@ -30,7 +30,7 @@ export class TerminalService {
      * Launches a new terminal with a specific shell and CWD
      * @param pause Wait for a keypress when the shell exits
      */
-    async openTab (profile?: PartialProfile<LocalProfile>|null, cwd?: string|null, pause?: boolean): Promise<TerminalTabComponent> {
+    async openTab (profile?: PartialProfile<LocalProfile>|null, cwd?: string|null, pause?: boolean): Promise<TerminalTabComponent|null> {
         if (!profile) {
             profile = await this.getDefaultProfile()
         }
@@ -55,6 +55,6 @@ export class TerminalService {
         return (await this.profilesService.openNewTabForProfile({
             ...fullProfile,
             options,
-        })) as TerminalTabComponent
+        })) as TerminalTabComponent|null
     }
 }
diff --git a/tabby-local/src/tabContextMenu.ts b/tabby-local/src/tabContextMenu.ts
@@ -22,6 +22,7 @@ export class SaveAsProfileContextMenu extends TabContextMenuItemProvider {
         if (!(tab instanceof TerminalTabComponent)) {
             return []
         }
+        const terminalTab = tab
         const items: MenuItemOptions[] = [
             {
                 label: this.translate.instant('Save as profile'),
@@ -34,8 +35,8 @@ export class SaveAsProfileContextMenu extends TabContextMenuItemProvider {
                     }
                     const profile = {
                         options: {
-                            ...tab.profile.options,
-                            cwd: await tab.session?.getWorkingDirectory() ?? tab.profile.options.cwd,
+                            ...terminalTab.profile.options,
+                            cwd: await terminalTab.session?.getWorkingDirectory() ?? terminalTab.profile.options.cwd,
                         },
                         name,
                         type: 'local',
@@ -117,13 +118,14 @@ export class NewTabContextMenu extends TabContextMenuItemProvider {
         }
 
         if (tab instanceof TerminalTabComponent && tabHeader && this.uac.isAvailable) {
+            const terminalTab = tab
             items.push({
                 label: this.translate.instant('Duplicate as administrator'),
                 click: () => {
                     this.profilesService.openNewTabForProfile({
-                        ...tab.profile,
+                        ...terminalTab.profile,
                         options: {
-                            ...tab.profile.options,
+                            ...terminalTab.profile.options,
                             runAsAdministrator: true,
                         },
                     })

diff --git a/tabby-serial/src/api.ts b/tabby-serial/src/api.ts
@@ -1,12 +1,12 @@
 import stripAnsi from 'strip-ansi'
 import { SerialPortStream } from '@serialport/stream'
-import { LogService, NotificationsService, Profile } from 'tabby-core'
+import { LogService, NotificationsService } from 'tabby-core'
 import { Subject, Observable } from 'rxjs'
 import { Injector, NgZone } from '@angular/core'
-import { BaseSession, LoginScriptsOptions, SessionMiddleware, StreamProcessingOptions, TerminalStreamProcessor } from 'tabby-terminal'
+import { BaseSession, BaseTerminalProfile, LoginScriptsOptions, SessionMiddleware, StreamProcessingOptions, TerminalStreamProcessor } from 'tabby-terminal'
 import { SerialService } from './services/serial.service'
 
-export interface SerialProfile extends Profile {
+export interface SerialProfile extends BaseTerminalProfile {
     options: SerialProfileOptions
 }
 

diff --git a/tabby-serial/src/components/serialTab.component.ts b/tabby-serial/src/components/serialTab.component.ts
@@ -14,8 +14,7 @@ import { SerialSession, BAUD_RATES, SerialProfile } from '../api'
     styles: [require('./serialTab.component.scss'), ...BaseTerminalTabComponent.styles],
     animations: BaseTerminalTabComponent.animations,
 })
-export class SerialTabComponent extends BaseTerminalTabComponent {
-    profile?: SerialProfile
+export class SerialTabComponent extends BaseTerminalTabComponent<SerialProfile> {
     session: SerialSession|null = null
     serialPort: any
     Platform = Platform
@@ -56,16 +55,11 @@ export class SerialTabComponent extends BaseTerminalTabComponent {
         super.ngOnInit()
 
         setImmediate(() => {
-            this.setTitle(this.profile!.name)
+            this.setTitle(this.profile.name)
         })
     }
 
     async initializeSession () {
-        if (!this.profile) {
-            this.logger.error('No serial profile info supplied')
-            return
-        }
-
         const session = new SerialSession(this.injector, this.profile)
         this.setSession(session)
 
@@ -121,6 +115,6 @@ export class SerialTabComponent extends BaseTerminalTabComponent {
             })),
         )
         this.serialPort.update({ baudRate: rate })
-        this.profile!.options.baudrate = rate
+        this.profile.options.baudrate = rate
     }
 }
diff --git a/tabby-ssh/src/api/interfaces.ts b/tabby-ssh/src/api/interfaces.ts
@@ -1,5 +1,4 @@
-import { Profile } from 'tabby-core'
-import { LoginScriptsOptions } from 'tabby-terminal'
+import { BaseTerminalProfile, LoginScriptsOptions } from 'tabby-terminal'
 
 export enum SSHAlgorithmType {
     HMAC = 'hmac',
@@ -8,7 +7,7 @@ export enum SSHAlgorithmType {
     HOSTKEY = 'serverHostKey',
 }
 
-export interface SSHProfile extends Profile {
+export interface SSHProfile extends BaseTerminalProfile {
     options: SSHProfileOptions
 }
 

diff --git a/tabby-ssh/src/components/sshProfileSettings.component.pug b/tabby-ssh/src/components/sshProfileSettings.component.pug
@@ -248,6 +248,11 @@ ul.nav-tabs(ngbNav, #nav='ngbNav')
                     div(*ngFor='let alg of supportedAlgorithms.serverHostKey')
                         checkbox([text]='alg', [(ngModel)]='algorithms.serverHostKey[alg]')
 
+    li(ngbNavItem)
+        a(ngbNavLink, translate) Color scheme
+        ng-template(ngbNavContent)
+            color-scheme-selector([(model)]='profile.terminalColorScheme')
+
     li(ngbNavItem)
         a(ngbNavLink, translate) Login scripts
         ng-template(ngbNavContent)

diff --git a/tabby-ssh/src/components/sshTab.component.ts b/tabby-ssh/src/components/sshTab.component.ts
@@ -19,9 +19,8 @@ import { SSHMultiplexerService } from '../services/sshMultiplexer.service'
     styles: [require('./sshTab.component.scss'), ...BaseTerminalTabComponent.styles],
     animations: BaseTerminalTabComponent.animations,
 })
-export class SSHTabComponent extends BaseTerminalTabComponent {
+export class SSHTabComponent extends BaseTerminalTabComponent<SSHProfile> {
     Platform = Platform
-    profile?: SSHProfile
     sshSession: SSHSession|null = null
     session: SSHShellSession|null = null
     sftpPanelVisible = false
@@ -45,10 +44,6 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
     }
 
     ngOnInit (): void {
-        if (!this.profile) {
-            throw new Error('Profile not set')
-        }
-
         this.logger = this.log.create('terminalTab')
 
         this.subscribeUntilDestroyed(this.hotkeys.hotkey$, hotkey => {
@@ -184,10 +179,6 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
     }
 
     private async initializeSessionMaybeMultiplex (multiplex = true): Promise<void> {
-        if (!this.profile) {
-            throw new Error('No SSH connection info supplied')
-        }
-
         this.sshSession = await this.setupOneSession(this.injector, this.profile, multiplex)
         const session = new SSHShellSession(this.injector, this.sshSession, this.profile)
 
@@ -244,13 +235,13 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
         if (!this.session?.open) {
             return true
         }
-        if (!(this.profile?.options.warnOnClose ?? this.config.store.ssh.warnOnClose)) {
+        if (!(this.profile.options.warnOnClose ?? this.config.store.ssh.warnOnClose)) {
             return true
         }
         return (await this.platform.showMessageBox(
             {
                 type: 'warning',
-                message: this.translate.instant(_('Disconnect from {host}?'), this.profile?.options),
+                message: this.translate.instant(_('Disconnect from {host}?'), this.profile.options),
                 buttons: [
                     this.translate.instant(_('Disconnect')),
                     this.translate.instant(_('Do not close')),

diff --git a/tabby-ssh/src/tabContextMenu.ts b/tabby-ssh/src/tabContextMenu.ts
@@ -18,7 +18,7 @@ export class SFTPContextMenu extends TabContextMenuItemProvider {
     }
 
     async getItems (tab: BaseTabComponent): Promise<MenuItemOptions[]> {
-        if (!(tab instanceof SSHTabComponent) || !tab.profile) {
+        if (!(tab instanceof SSHTabComponent)) {
             return []
         }
         const items = [{

diff --git a/tabby-telnet/src/components/telnetTab.component.ts b/tabby-telnet/src/components/telnetTab.component.ts
@@ -14,9 +14,8 @@ import { TelnetProfile, TelnetSession } from '../session'
     styles: [require('./telnetTab.component.scss'), ...BaseTerminalTabComponent.styles],
     animations: BaseTerminalTabComponent.animations,
 })
-export class TelnetTabComponent extends BaseTerminalTabComponent {
+export class TelnetTabComponent extends BaseTerminalTabComponent<TelnetProfile> {
     Platform = Platform
-    profile?: TelnetProfile
     session: TelnetSession|null = null
     private reconnectOffered = false
 
@@ -29,10 +28,6 @@ export class TelnetTabComponent extends BaseTerminalTabComponent {
     }
 
     ngOnInit (): void {
-        if (!this.profile) {
-            throw new Error('Profile not set')
-        }
-
         this.logger = this.log.create('telnetTab')
 
         this.subscribeUntilDestroyed(this.hotkeys.hotkey$, hotkey => {
@@ -69,10 +64,6 @@ export class TelnetTabComponent extends BaseTerminalTabComponent {
 
     async initializeSession (): Promise<void> {
         this.reconnectOffered = false
-        if (!this.profile) {
-            this.logger.error('No Telnet connection info supplied')
-            return
-        }
 
         const session = new TelnetSession(this.injector, this.profile)
         this.setSession(session)
@@ -119,7 +110,7 @@ export class TelnetTabComponent extends BaseTerminalTabComponent {
         return (await this.platform.showMessageBox(
             {
                 type: 'warning',
-                message: this.translate.instant(_('Disconnect from {host}?'), this.profile?.options),
+                message: this.translate.instant(_('Disconnect from {host}?'), this.profile.options),
                 buttons: [
                     this.translate.instant(_('Disconnect')),
                     this.translate.instant(_('Do not close')),

diff --git a/tabby-telnet/src/session.ts b/tabby-telnet/src/session.ts
@@ -2,12 +2,12 @@ import { Socket } from 'net'
 import colors from 'ansi-colors'
 import stripAnsi from 'strip-ansi'
 import { Injector } from '@angular/core'
-import { Profile, LogService } from 'tabby-core'
-import { BaseSession, LoginScriptsOptions, SessionMiddleware, StreamProcessingOptions, TerminalStreamProcessor } from 'tabby-terminal'
+import { LogService } from 'tabby-core'
+import { BaseSession, BaseTerminalProfile, LoginScriptsOptions, SessionMiddleware, StreamProcessingOptions, TerminalStreamProcessor } from 'tabby-terminal'
 import { Subject, Observable } from 'rxjs'
 
 
-export interface TelnetProfile extends Profile {
+export interface TelnetProfile extends BaseTerminalProfile {
     options: TelnetProfileOptions
 }
 

diff --git a/tabby-terminal/package.json b/tabby-terminal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tabby-terminal",
-  "version": "1.0.189-nightly.0",
+  "version": "1.0.189-nightly.2",
   "description": "Tabby's terminal emulation core",
   "keywords": [
     "tabby-builtin-plugin"