Replace & improve terminal emulator

keymaps/learn-ide.cson

@@ -1,18 +1,17 @@
 '.platform-darwin':
-  'cmd-i': 'learn-ide:toggle-terminal'
+  'cmd-I': 'learn-ide:toggle-terminal'
   'cmd-;': 'learn-ide:toggle-focus'
 
-'.platform-darwin .learn-terminal':
-  'cmd-c': 'learn-ide:copy'
-  'cmd-v': 'learn-ide:paste'
+'.platform-win32, .platform-linux':
+  'ctrl-I': 'learn-ide:toggle-terminal'
+  'ctrl-;': 'learn-ide:toggle-focus'
+
+'.platform-darwin .terminal':
   'cmd-=': 'learn-ide:increase-font-size'
   'cmd--': 'learn-ide:decrease-font-size'
   'cmd-0': 'learn-ide:reset-font-size'
 
-'.platform-win32 .learn-terminal':
-  # TODO: make these work & remove listeners in TerminalView
-  # 'ctrl-shift-C': 'learn-ide:copy'
-  # 'ctrl-shift-V': 'learn-ide:paste'
+'.platform-win32 .terminal':
   'ctrl-+': 'learn-ide:increase-font-size'
   'ctrl-_': 'learn-ide:decrease-font-size'
   'ctrl-0': 'learn-ide:reset-font-size'

lib/learn-ide.coffee

@@ -1,7 +1,7 @@
 localStorage = require './local-storage'
 {CompositeDisposable} = require 'atom'
 Terminal = require './terminal'
-TerminalView = require './views/terminal'
+TerminalView = require './terminal-view'
 StatusView = require './views/status'
 {BrowserWindow} = require 'remote'
 {EventEmitter} = require 'events'
@@ -61,8 +61,7 @@ module.exports =
       path: config.path
       token: @token.get()
 
-    @termView = new TerminalView(@term, null, @isTerminalWindow)
-    @termView.toggle()
+    @termView = new TerminalView(@term)
 
   activateStatusView: (state) ->
     @statusView = new StatusView state, @term, {@isTerminalWindow}
@@ -79,7 +78,7 @@ module.exports =
 
     # listen for learn:open event from other render processes (url handler)
     bus.on 'learn:open', (lab) =>
-      @termView.openLab(lab.slug)
+      @learnOpen(lab.slug)
       atom.getCurrentWindow().focus()
 
     # tidy up when the window closes
@@ -90,16 +89,21 @@ module.exports =
 
   activateSubscriptions: ->
     @subscriptions.add atom.commands.add 'atom-workspace',
-      'learn-ide:open': (e) => @termView.openLab(e.detail.path)
+      'learn-ide:open': (e) => @learnOpen(e.detail.path)
       'learn-ide:toggle-terminal': () => @termView.toggle()
       'learn-ide:toggle-focus': => @termView.toggleFocus()
-      'learn-ide:focus': => @termView.fullFocus()
+      'learn-ide:focus': => @termView.focusEmulator()
       'learn-ide:toggle:debugger': => @term.toggleDebugger()
       'learn-ide:reset-connection': => @term.reset()
       'learn-ide:view-version': => @viewVersion()
       'learn-ide:update-check': -> updater.checkForUpdate()
       'learn-ide:about': => @about()
 
+    @subscriptions.add atom.commands.add '.terminal',
+      'core:copy': => @termView.copyText()
+      'core:paste': => @termView.pasteText()
+      'learn-ide:clear-terminal': => @term.send('')
+
     atom.config.onDidChange "#{name}.terminalFontColor", ({newValue}) =>
       @termView.updateFontColor(newValue)
 
@@ -112,7 +116,7 @@ module.exports =
     openPath = localStorage.get('learnOpenLabOnActivation')
     if openPath
       localStorage.delete('learnOpenLabOnActivation')
-      @termView.openLab(openPath)
+      @learnOpen(openPath)
 
 
   activateNotifier: ->
@@ -187,6 +191,10 @@ module.exports =
     priority = (rightMostTile?.priority || 0) - 1
     statusBar.addRightTile({item: @statusView, priority})
 
+  learnOpen: (labSlug) ->
+    if labSlug?
+      @term.send("learn open #{labSlug.toString()}\r")
+
   about: ->
     shell.openExternal(ABOUT_URL)
 

lib/terminal-view.coffee

@@ -0,0 +1,80 @@
+{$, View} = require 'atom-space-pen-views'
+{clipboard} = require 'electron'
+TerminalEmulator = require 'xterm'
+TerminalEmulator.loadAddon 'fit'
+
+module.exports =
+class TerminalView extends View
+  @content: ->
+    @div class: 'terminal-resizer tool-panel', =>
+      @div class: 'terminal-resize-handle', outlet: 'resizeHandle'
+      @div class: 'emulator-container', outlet: 'emulatorContainer'
+
+  initialize: (@terminal) ->
+    @emulator = new TerminalEmulator({cursorBlink: true})
+    @subscribe()
+    @attach()
+
+  subscribe: ->
+    @emulator.on 'data', (data) =>
+      @terminal.send(data)
+
+    @terminal.on 'message', (msg) =>
+      @emulator.write(msg)
+
+    @on 'mousedown', '.terminal-resize-handle', (e) =>
+      @resizeStarted(e)
+
+  attach: ->
+    atom.workspace.addBottomPanel({item: this})
+    @emulator.open(@emulatorContainer[0])
+
+  copyText: ->
+    selection = document.getSelection()
+    rawText = selection.toString()
+    preparedText = rawText.replace(/\u00A0/g, ' ').replace(/\s+(\n)?$/gm, '$1')
+
+    clipboard.writeText(preparedText)
+
+  pasteText: ->
+    rawText = clipboard.readText()
+    preparedText = rawText.replace(/\n/g, '\r')
+
+    @terminal.send(preparedText)
+
+  toggleFocus: ->
+    hasFocus = document.activeElement is @emulator.textarea
+
+    if hasFocus then @transferFocus() else @focusEmulator()
+
+  transferFocus: ->
+    atom.workspace.getActivePane().activate()
+
+  focusEmulator: ->
+    @emulator.focus()
+
+  resizeStarted: =>
+    $(document).on('mousemove', @resizeTerminal)
+    $(document).on('mouseup', @resizeStopped)
+
+  resizeStopped: =>
+    $(document).off('mousemove', @resizeTerminal)
+    $(document).off('mouseup', @resizeStopped)
+
+  resizeTerminal: ({pageY, which}) =>
+    return @resizeStopped() unless which is 1
+
+    height = @outerHeight() + @offset().top - pageY
+
+    return if height < 100
+
+    # resize container and fit emulator inside it
+    @emulatorContainer.height(height - @resizeHandle.height())
+    @emulator.fit()
+
+    # then get emulator height and fit containers around it
+    rowHeight = parseInt(@emulator.rowContainer.style.lineHeight)
+    newHeight = rowHeight * @emulator.rows
+    @emulatorContainer.height(newHeight)
+    @height(newHeight + @resizeHandle.height())
+

lib/terminal.coffee

@@ -1,4 +1,3 @@
-utf8 = require 'utf8'
 {EventEmitter} = require 'events'
 atomHelper = require './atom-helper'
 path = require 'path'
@@ -32,7 +31,8 @@ module.exports = class Terminal extends EventEmitter
         resolve()
 
       @socket.on 'message', (message) =>
-        @emit 'message', utf8.decode(atob(message))
+        decoded = new Buffer(message, 'base64').toString()
+        @emit 'message', decoded
 
       @socket.on 'close', =>
         @emit 'close'

lib/updater.coffee

@@ -1,6 +1,5 @@
 fs = require 'fs'
 path = require 'path'
-{shell} = require 'electron'
 semver = require 'semver'
 {learnCo} = require './config'
 fetch = require './fetch'
@@ -172,6 +171,8 @@ module.exports =
     false
 
   _updateFailed: (detail) ->
+    {shell, clipboard} = require 'electron'
+
     description = 'The installation seems to have been interrupted.'
     buttons = [
       {
@@ -191,7 +192,6 @@ module.exports =
       buttons.push
         text: 'Copy this log'
         onDidClick: ->
-          {clipboard} = require 'electron'
           clipboard.writeText(detail)
 
     @updateNotification =