Merge pull request #660 from JunoLab/sp/webglterm

webgl terminal renderer

Author: aviatesk

lib/package/config.coffee

@@ -469,11 +469,15 @@ config =
         type: 'boolean'
         default: false
         order: 8
-      rendererType:
-        title: 'Fallback Renderer'
-        type: 'boolean'
-        default: false
-        description: 'Enable this if you\'re experiencing slowdowns in the built-in terminals.'
+      terminalRendererType:
+        title: 'Terminal Renderer'
+        type: 'string'
+        enum: ['webgl', 'canvas', 'dom']
+        default: 'webgl'
+        radio: true
+        description: 'The `webgl` renderer is fastest, but is still experimental. `canvas` performs well
+                      in many cases, while `dom` is a slow falback. Note that it\'s not possible
+                      to hot-swap to the `webgl` renderer.'
         order: 9
   remoteOptions:
     type: 'object'

lib/runtime/console.js

@@ -45,7 +45,7 @@ export function activate (_ink) {
     atom.config.observe('julia-client.consoleOptions.cursorStyle', updateTerminalSettings),
     atom.config.observe('julia-client.consoleOptions.maximumConsoleSize', updateTerminalSettings),
     atom.config.observe('julia-client.consoleOptions.macOptionIsMeta', updateTerminalSettings),
-    atom.config.observe('julia-client.consoleOptions.rendererType', updateTerminalSettings),
+    atom.config.observe('julia-client.consoleOptions.terminalRendererType', updateTerminalSettings),
     atom.config.observe('julia-client.consoleOptions.cursorBlink', updateTerminalSettings)
   )
 
@@ -198,7 +198,7 @@ function terminalOptions () {
   const opts = {
     scrollback: atom.config.get('julia-client.consoleOptions.maximumConsoleSize'),
     cursorStyle: atom.config.get('julia-client.consoleOptions.cursorStyle'),
-    rendererType: atom.config.get('julia-client.consoleOptions.rendererType') ? 'dom' : 'canvas',
+    rendererType: atom.config.get('julia-client.consoleOptions.terminalRendererType'),
     cursorBlink: atom.config.get('julia-client.consoleOptions.cursorBlink'),
   }
   if (process.platform === 'darwin') {
@@ -211,22 +211,7 @@ function updateTerminalSettings () {
   const settings = terminalOptions()
   forEachPane((item) => {
     for (const key in settings) {
-      if (key === 'rendererType') {
-        if (!item.element.initialized) continue
-      }
-      try {
-        const setting = settings[key]
-        item.terminal.setOption(key, setting)
-        if (!item.persistentState) {
-          item.persistentState = { opts: {} }
-        }
-        if (!item.persistentState.opts) {
-          item.persistentState.opts = {}
-        }
-        item.persistentState.opts[key] = setting
-      } catch (err) {
-        console.warn('Error while applying settings for terminal:', item, err)
-      }
+      item.setOption(key, settings[key])
     }
   }, /terminal\-julia\-\d+|julia\-terminal|terminal\-remote\-julia\-\d+/)
 }