Eugeny/tabby
1
1
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2024-12-24 11:02:47 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:Eugeny/terminus

Browse Source
This commit is contained in:
Eugene Pankov 2017-04-30 13:42:32 +02:00
commit cb6e9243c1
16 changed files with 123 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/index.pug
View File

@ -29,6 +29,6 @@ html
div
h1.terminus-title Terminus
.progress
.bar(style='width: 50%')
.bar(style='width: 0%')

2
app/src/entry.ts
View File

@ -21,7 +21,7 @@ if ((<any>global).require('electron-is-dev')) {
}
findPlugins().then(async plugins => {
let pluginsModules = loadPlugins(plugins, (current, total) => {
let pluginsModules = await loadPlugins(plugins, (current, total) => {
(<HTMLElement>document.querySelector('.progress .bar')).style.width = 100 * current / total + '%'
})
let module = await getRootModule(pluginsModules)

9
app/src/plugins.ts
View File

@ -62,10 +62,11 @@ export async function findPlugins (): Promise<IPluginEntry[]> {
return foundPlugins
}
export function loadPlugins (foundPlugins: IPluginEntry[], progress: ProgressCallback): any[] {
export async function loadPlugins (foundPlugins: IPluginEntry[], progress: ProgressCallback): Promise<any[]> {
let plugins: any[] = []
progress(0, 1)
foundPlugins.forEach((foundPlugin, index) => {
let index = 0
for (let foundPlugin of foundPlugins) {
console.info(`Loading ${foundPlugin.name}: ${(<any>global).require.resolve(foundPlugin.path)}`)
progress(index, foundPlugins.length)
try {
@ -74,7 +75,9 @@ export function loadPlugins (foundPlugins: IPluginEntry[], progress: ProgressCal
} catch (error) {
console.error(`Could not load ${foundPlugin.name}:`, error)
}
})
await delay(1)
index++
}
progress(1, 1)
return plugins
}

68
terminus-core/src/components/appRoot.component.pug
View File

@ -1,9 +1,14 @@
title-bar(*ngIf='config.store.appearance.frame == "full" && config.store.appearance.dock == "off"')
title-bar(
*ngIf='config.store.appearance.frame == "full" && config.store.appearance.dock == "off"',
[class.inset]='hostApp.platform == Platform.macOS'
)
.content(
[class.tabs-on-top]='config.store.appearance.tabsOnTop'
[class.tabs-on-top]='config.store.appearance.tabsLocation == "top"'
)
.tab-bar
.tab-bar(
[class.inset]='hostApp.platform == Platform.macOS && config.store.appearance.frame == "thin" && config.store.appearance.tabsLocation == "top"'
)
.tabs
tab-header(
*ngFor='let tab of app.tabs; let idx = index',
@ -11,42 +16,45 @@ title-bar(*ngIf='config.store.appearance.frame == "full" && config.store.appeara
[tab]='tab',
[active]='tab == app.activeTab',
[hasActivity]='tab.hasActivity',
[class.drag-region]='hostApp.platform == Platform.macOS',
@animateTab,
(click)='app.selectTab(tab)',
(closeClicked)='app.closeTab(tab)',
)
button.btn.btn-secondary(
*ngFor='let button of getLeftToolbarButtons()',
[title]='button.title',
(click)='button.click()',
)
i.fa([class]='"fa fa-" + button.icon')
.btn-group
button.btn.btn-secondary.btn-tab-bar(
*ngFor='let button of getLeftToolbarButtons()',
[title]='button.title',
(click)='button.click()',
)
i.fa([class]='"fa fa-" + button.icon')
.drag-space
.btn-group
button.btn.btn-secondary.btn-tab-bar(
*ngFor='let button of getRightToolbarButtons()',
[title]='button.title',
(click)='button.click()',
)
i.fa([class]='"fa fa-" + button.icon')
button.btn.btn-secondary(
*ngFor='let button of getRightToolbarButtons()',
[title]='button.title',
(click)='button.click()',
.btn-group.window-controls(
*ngIf='config.store.appearance.frame == "thin" && (hostApp.platform == Platform.Windows || hostApp.platform == Platform.Linux)',
)
i.fa([class]='"fa fa-" + button.icon')
button.btn.btn-secondary.btn-minimize(
*ngIf='config.store.appearance.frame == "thin"',
(click)='hostApp.minimize()',
)
i.fa.fa-window-minimize
button.btn.btn-secondary.btn-maximize(
*ngIf='config.store.appearance.frame == "thin"',
(click)='hostApp.toggleMaximize()',
)
i.fa.fa-window-maximize
button.btn.btn-secondary.btn-close(
*ngIf='config.store.appearance.frame == "thin"',
(click)='hostApp.quit()',
)
i.fa.fa-close
button.btn.btn-secondary.btn-minimize.btn-tab-bar(
(click)='hostApp.minimize()',
)
i.fa.fa-window-minimize
button.btn.btn-secondary.btn-maximize.btn-tab-bar(
(click)='hostApp.toggleMaximize()',
)
i.fa.fa-window-maximize
button.btn.btn-secondary.btn-close.btn-tab-bar(
(click)='hostApp.quit()',
)
i.fa.fa-close
start-page(*ngIf='app.tabs.length == 0')

13
terminus-core/src/components/appRoot.component.scss
View File

@ -5,6 +5,7 @@
flex-direction: column;
overflow: hidden;
-webkit-user-select: none;
-webkit-user-drag: none;
-webkit-font-smoothing: antialiased;
cursor: default;
animation: 0.5s ease-out fadeIn;
@ -29,7 +30,7 @@ $tab-border-radius: 4px;
height: $tabs-height;
display: flex;
&>button {
.btn-tab-bar {
line-height: $tabs-height + 2px;
cursor: pointer;
@ -48,7 +49,7 @@ $tab-border-radius: 4px;
&.btn-minimize {
margin-left: 10px;
}
&.btn-minimize, &.btn-maximize {
font-size: 8px;
}
@ -69,6 +70,14 @@ $tab-border-radius: 4px;
flex: 1 0 25%;
-webkit-app-region: drag;
}
.window-controls {
flex: 0 0 none;
}
&.inset {
padding-left: 85px;
}
}
.tabs-content {

3
terminus-core/src/components/appRoot.component.ts
View File

@ -3,7 +3,7 @@ import { trigger, style, animate, transition, state } from '@angular/animations'
import { ToasterConfig } from 'angular2-toaster'
import { ElectronService } from '../services/electron.service'
import { HostAppService } from '../services/hostApp.service'
import { HostAppService, Platform } from '../services/hostApp.service'
import { HotkeysService } from '../services/hotkeys.service'
import { Logger, LogService } from '../services/log.service'
import { QuitterService } from '../services/quitter.service'
@ -43,6 +43,7 @@ import { AppService, IToolbarButton, ToolbarButtonProvider } from '../api'
})
export class AppRootComponent {
toasterConfig: ToasterConfig
Platform = Platform
private logger: Logger
constructor(

4
terminus-core/src/components/tabHeader.component.scss
View File

@ -61,4 +61,8 @@ $tabs-height: 40px;
display: block;
opacity: 1;
}
&.drag-region {
-webkit-app-region: drag;
}
}

2
terminus-core/src/components/titleBar.component.scss
View File

@ -31,7 +31,7 @@ $titlebar-height: 30px;
font-size: 12px;
}
&.inset-titlebar {
&.inset {
flex-basis: 36px;
.title {

8
terminus-core/src/components/titleBar.component.ts
View File

@ -1,5 +1,4 @@
import { Component, HostBinding } from '@angular/core'
import { HostAppService, Platform } from '../services/hostApp.service'
import { Component } from '@angular/core'
@Component({
selector: 'title-bar',
@ -7,9 +6,4 @@ import { HostAppService, Platform } from '../services/hostApp.service'
styles: [require('./titleBar.component.scss')],
})
export class TitleBarComponent {
@HostBinding('class.inset-titlebar') insetTitlebar = false
constructor (public hostApp: HostAppService) {
this.insetTitlebar = hostApp.platform == Platform.macOS
}
}

10
terminus-core/src/configDefaults.yaml
View File

@ -1,7 +1,7 @@
appearance:
dock: 'off'
dockScreen: 'current'
dock: off
dockScreen: current
dockFill: 50
tabsOnTop: true
theme: 'Standard'
frame: 'thin'
tabsLocation: top
theme: Standard
frame: thin

13
terminus-core/src/theme.scss
View File

@ -82,13 +82,14 @@ title-bar {
}
}
$border-color: #141414;
app-root {
&> .content {
background: $body-bg2;
.tab-bar {
&>button {
.btn-tab-bar {
&:not(:hover):not(:active) {
background: $body-bg2;
}
@ -105,6 +106,8 @@ app-root {
tab-header {
background: $body-bg2;
border-left: 1px solid transparent;
border-right: 1px solid transparent;
.index {
color: #555;
@ -121,17 +124,22 @@ app-root {
&.active {
background: $body-bg;
border-left: 1px solid $border-color;
border-right: 1px solid $border-color;
}
}
}
}
&.tabs-on-top .tab-bar {
border-bottom: 1px solid $border-color;
tab-header {
border-top: 1px solid transparent;
&.active {
border-top: 1px solid $teal;
margin-bottom: -1px;
}
&.has-activity:not(.active) {
@ -141,13 +149,14 @@ app-root {
}
&:not(.tabs-on-top) .tab-bar {
margin-bottom: 3px;
border-top: 1px solid $border-color;
tab-header {
border-bottom: 1px solid transparent;
&.active {
border-bottom: 1px solid $teal;
margin-top: -1px;
}
&.has-activity:not(.active) {

6
terminus-settings/src/components/settingsTab.component.pug
View File

@ -19,20 +19,20 @@ ngb-tabset.vertical(type='tabs')
label Show tabs
br
div(
'[(ngModel)]'='config.store.appearance.tabsOnTop',
'[(ngModel)]'='config.store.appearance.tabsLocation',
(ngModelChange)='config.save()',
ngbRadioGroup
)
label.btn.btn-secondary
input(
type='radio',
[value]='true'
[value]='"top"'
)
| On the top
label.btn.btn-secondary
input(
type='radio',
[value]='false'
[value]='"bottom"'
)
| At the bottom
.col.col-lg-6

3
terminus-terminal/src/api.ts
View File

@ -1,3 +1,4 @@
import { Observable } from 'rxjs'
import { TerminalTabComponent } from './components/terminalTab.component'
export { TerminalTabComponent }
@ -18,7 +19,7 @@ export interface SessionOptions {
cwd?: string
env?: any
recoveryId?: string
recoveredTruePID?: number
recoveredTruePID$?: Observable<number>
}
export abstract class SessionPersistenceProvider {

45
terminus-terminal/src/persistenceProviders.ts
View File

@ -1,6 +1,8 @@
import * as fs from 'fs-promise'
import { exec, spawn } from 'mz/child_process'
import { exec as execCallback } from 'child_process'
import { AsyncSubject } from 'rxjs'
import { Injectable } from '@angular/core'
import { Logger, LogService } from 'terminus-core'
import { SessionOptions, SessionPersistenceProvider } from './api'
@ -36,12 +38,12 @@ export class ScreenPersistenceProvider extends SessionPersistenceProvider {
}
async attachSession (recoveryId: any): Promise<SessionOptions> {
let lines: string[]
try {
lines = (await exec('screen -list'))[0].toString().split('\n')
} catch (result) {
lines = result.stdout.split('\n')
}
let lines = await new Promise<string[]>(resolve => {
execCallback('screen -list', (_err, stdout) => {
// returns an error code on macOS
resolve(stdout.split('\n'))
})
})
let screenPID = lines
.filter(line => line.indexOf('.' + recoveryId) !== -1)
.map(line => parseInt(line.trim().split('.')[0]))[0]
@ -50,25 +52,36 @@ export class ScreenPersistenceProvider extends SessionPersistenceProvider {
return null
}
let child = (await listProcesses()).find(x => x.ppid === screenPID)
let truePID_ = new AsyncSubject<number>()
if (!child) {
this.logger.error(`Could not find any children of the screen process (PID ${screenPID})!`)
}
if (child.command == 'login') {
child = (await listProcesses()).find(x => x.ppid === child.pid)
}
let recoveredTruePID = child.pid
this.extractShellPID(screenPID).then(pid => {
truePID_.next(pid)
truePID_.complete()
})
return {
recoveryId,
recoveredTruePID,
recoveredTruePID$: truePID_.asObservable(),
command: 'screen',
args: ['-r', recoveryId],
}
}
async extractShellPID (screenPID: number): Promise<number> {
let child = (await listProcesses()).find(x => x.ppid === screenPID)
if (!child) {
throw new Error(`Could not find any children of the screen process (PID ${screenPID})!`)
}
if (child.command == 'login') {
await delay(1000)
child = (await listProcesses()).find(x => x.ppid === child.pid)
}
return child.pid
}
async startSession (options: SessionOptions): Promise<any> {
let configPath = '/tmp/.termScreenConfig'
await fs.writeFile(configPath, `

8
terminus-terminal/src/services/sessions.service.ts
View File

@ -43,7 +43,13 @@ export class Session {
env: env,
})
this.truePID = options.recoveredTruePID || (<any>this.pty).pid
if (options.recoveredTruePID$) {
options.recoveredTruePID$.subscribe(pid => {
this.truePID = pid
})
} else {
this.truePID = (<any>this.pty).pid
}
this.open = true

2
webpack.config.js
View File

@ -5,6 +5,6 @@ module.exports = [
require('./terminus-terminal/webpack.config.js'),
require('./terminus-clickable-links/webpack.config.js'),
require('./terminus-community-color-schemes/webpack.config.js'),
require('./terminus-plugin-manager/webpack.config.js'),
//require('./terminus-plugin-manager/webpack.config.js'),
require('./terminus-theme-hype/webpack.config.js'),
]