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

terminus-community-color-schemes/schemes/Base16 Default Dark

@@ -1,44 +1,54 @@
-!
+! Base16 Default Dark
-! Generated with :
+! Scheme: Chris Kempson (http://chriskempson.com)
-! XRDB2Xreources.py
+
-!
+#define base00 #181818
-*.foreground:  #d8d8d8
+#define base01 #282828
-*.background:  #181818
+#define base02 #383838
-*.cursorColor: #d8d8d8
+#define base03 #585858
-!
+#define base04 #b8b8b8
-! Black
+#define base05 #d8d8d8
-*.color0:      #181818
+#define base06 #e8e8e8
-*.color8:      #585858
+#define base07 #f8f8f8
-!
+#define base08 #ab4642
-! Red
+#define base09 #dc9656
-*.color1:      #ab4642
+#define base0A #f7ca88
-*.color9:      #ab4642
+#define base0B #a1b56c
-!
+#define base0C #86c1b9
-! Green
+#define base0D #7cafc2
-*.color2:      #a1b56c
+#define base0E #ba8baf
-*.color10:     #a1b56c
+#define base0F #a16946
-!
+
-! Yellow
+*.foreground:   base05
-*.color3:      #f7ca88
+#ifdef background_opacity
-*.color11:     #f7ca88
+*.background:   [background_opacity]base00
-!
+#else
-! Blue
+*.background:   base00
-*.color4:      #7cafc2
+#endif
-*.color12:     #7cafc2
+*.cursorColor:  base05
-!
+
-! Magenta
+*.color0:       base00
-*.color5:      #ba8baf
+*.color1:       base08
-*.color13:     #ba8baf
+*.color2:       base0B
-!
+*.color3:       base0A
-! Cyan
+*.color4:       base0D
-*.color6:      #86c1b9
+*.color5:       base0E
-*.color14:     #86c1b9
+*.color6:       base0C
-!
+*.color7:       base05
-! White
+
-*.color7:      #d8d8d8
+*.color8:       base03
-*.color15:     #f8f8f8
+*.color9:       base08
-!
+*.color10:      base0B
-! Bold, Italic, Underline
+*.color11:      base0A
-*.colorBD:     #d8d8d8
+*.color12:      base0D
-!*.colorIT:
+*.color13:      base0E
-!*.colorUL:
+*.color14:      base0C
+*.color15:      base07
+
+! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt),
+! use 'shell' template to set these if necessary
+*.color16:      base09
+*.color17:      base0F
+*.color18:      base01
+*.color19:      base02
+*.color20:      base04
+*.color21:      base06

terminus-community-color-schemes/src/colorSchemes.ts

@@ -10,13 +10,23 @@ export class ColorSchemes extends TerminalColorSchemeProvider {
 
         schemeContents.keys().forEach(schemeFile => {
             let lines = (schemeContents(schemeFile) as string).split('\n')
+
+            // process #define variables
+            let variables: any = {}
+            lines
+                .filter(x => x.startsWith('#define'))
+                .map(x => x.split(' ').map(v => v.trim()))
+                .forEach(([ignore, variableName, variableValue]) => {
+                    variables[variableName] = variableValue
+                })
+
             let values: any = {}
             lines
                 .filter(x => x.startsWith('*.'))
                 .map(x => x.substring(2))
                 .map(x => x.split(':').map(v => v.trim()))
                 .forEach(([key, value]) => {
-                    values[key] = value
+                    values[key] = variables[value] ? variables[value] : value
                 })
 
             let colors: string[] = []

terminus-core/src/configDefaults.yaml

@@ -3,6 +3,7 @@ appearance:
   dockScreen: current
   dockFill: 50
   tabsLocation: top
+  cycleTabs: true
   theme: Standard
   frame: thin
   css: '/* * { color: blue !important; } */'

terminus-core/src/services/app.service.ts

@@ -3,6 +3,7 @@ import { Injectable, ComponentFactoryResolver, Injector, Optional } from '@angul
 import { DefaultTabProvider } from '../api/defaultTabProvider'
 import { BaseTabComponent } from '../components/baseTab.component'
 import { Logger, LogService } from '../services/log.service'
+import { ConfigService } from '../services/config.service'
 
 export declare type TabComponentType = new (...args: any[]) => BaseTabComponent
 
@@ -18,6 +19,7 @@ export class AppService {
     constructor (
         private componentFactoryResolver: ComponentFactoryResolver,
         @Optional() private defaultTabProvider: DefaultTabProvider,
+        private config: ConfigService,
         private injector: Injector,
         log: LogService,
     ) {
@@ -70,16 +72,24 @@ export class AppService {
     }
 
     nextTab () {
-        let tabIndex = this.tabs.indexOf(this.activeTab)
+        if (this.tabs.length > 1) {
-        if (tabIndex < this.tabs.length - 1) {
+            let tabIndex = this.tabs.indexOf(this.activeTab)
-            this.selectTab(this.tabs[tabIndex + 1])
+            if (tabIndex < this.tabs.length - 1) {
+                this.selectTab(this.tabs[tabIndex + 1])
+            } else if (this.config.store.appearance.cycleTabs) {
+                this.selectTab(this.tabs[0])
+            }
         }
     }
 
     previousTab () {
-        let tabIndex = this.tabs.indexOf(this.activeTab)
+        if (this.tabs.length > 1) {
-        if (tabIndex > 0) {
+            let tabIndex = this.tabs.indexOf(this.activeTab)
-            this.selectTab(this.tabs[tabIndex - 1])
+            if (tabIndex > 0) {
+                this.selectTab(this.tabs[tabIndex - 1])
+            } else if (this.config.store.appearance.cycleTabs) {
+                this.selectTab(this.tabs[this.tabs.length - 1])
+            }
         }
     }