Snapshot aea001abfc1b38fec3a821bcd5174cc77dc75787 from master branch of git://git.jetbrains.org/idea/community.git

Change-Id: Icdea2a2bd7ad43b4d05967b1f0479db3bda1c93c

8 files changed, 33 insertions, 30 deletions

diff --git a/plugins/terminal/lib/jediterm-pty-0.04.jar b/plugins/terminal/lib/jediterm-pty-0.04.jar
deleted file mode 100644
index 59ec12ca454b..000000000000
--- a/plugins/terminal/lib/jediterm-pty-0.04.jar
+++ /dev/null
diff --git a/plugins/terminal/lib/jediterm-pty-0.05.jar b/plugins/terminal/lib/jediterm-pty-0.05.jar
new file mode 100644
index 000000000000..7767509f2c40
--- /dev/null
+++ b/plugins/terminal/lib/jediterm-pty-0.05.jar
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/AbstractTerminalRunner.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/AbstractTerminalRunner.java
index cc1d6c85c8ca..d5ff763908b9 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/AbstractTerminalRunner.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/AbstractTerminalRunner.java
@@ -18,7 +18,7 @@ import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowManager;
 import com.intellij.util.ui.UIUtil;
-import com.jediterm.emulator.TtyConnector;
+import com.jediterm.terminal.TtyConnector;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -44,9 +44,16 @@ public abstract class AbstractTerminalRunner<T extends Process> {
         try {
           doRun();
         }
-        catch (Exception e) {
+        catch (final Exception e) {
           LOG.warn("Error running terminal", e);
-          Messages.showErrorDialog(AbstractTerminalRunner.this.getProject(), getTitle(), e.getMessage());
+          
+          UIUtil.invokeLaterIfNeeded(new Runnable() {
+
+            @Override
+            public void run() {
+              Messages.showErrorDialog(AbstractTerminalRunner.this.getProject(), e.getMessage(), getTitle());
+            }
+          });
         }
       }
     });
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminal.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminal.java
index f605ffbb0511..8a633edf5a8c 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminal.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminal.java
@@ -8,11 +8,10 @@ import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.WriteExternalException;
 import com.intellij.ui.components.JBScrollBar;
 import com.intellij.util.containers.HashMap;
-import com.jediterm.emulator.display.BackBuffer;
-import com.jediterm.emulator.display.LinesBuffer;
-import com.jediterm.emulator.display.StyleState;
-import com.jediterm.emulator.ui.SwingJediTerminal;
-import com.jediterm.emulator.ui.SwingTerminalPanel;
+import com.jediterm.terminal.display.BackBuffer;
+import com.jediterm.terminal.display.StyleState;
+import com.jediterm.terminal.ui.SwingJediTerminal;
+import com.jediterm.terminal.ui.SwingTerminalPanel;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -27,8 +26,8 @@ public class JBTerminal extends SwingJediTerminal {
   }
 
   @Override
-  protected SwingTerminalPanel createTerminalPanel(StyleState styleState, BackBuffer backBuffer, LinesBuffer scrollBuffer) {
-    return new JBTerminalPanel(backBuffer, scrollBuffer, styleState, getColorScheme());
+  protected SwingTerminalPanel createTerminalPanel(StyleState styleState, BackBuffer backBuffer) {
+    return new JBTerminalPanel(backBuffer, styleState, getColorScheme());
   }
 
   public EditorColorsScheme getColorScheme() {
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalPanel.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalPanel.java
index ebb5dee870f7..7693623e3f5e 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalPanel.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalPanel.java
@@ -25,11 +25,10 @@ package org.jetbrains.plugins.terminal;
 import com.intellij.openapi.editor.colors.EditorColorsScheme;
 import com.intellij.openapi.ide.CopyPasteManager;
 import com.intellij.util.ui.GraphicsUtil;
-import com.jediterm.emulator.TextStyle;
-import com.jediterm.emulator.display.BackBuffer;
-import com.jediterm.emulator.display.LinesBuffer;
-import com.jediterm.emulator.display.StyleState;
-import com.jediterm.emulator.ui.SwingTerminalPanel;
+import com.jediterm.terminal.TextStyle;
+import com.jediterm.terminal.display.BackBuffer;
+import com.jediterm.terminal.display.StyleState;
+import com.jediterm.terminal.ui.SwingTerminalPanel;
 
 import java.awt.*;
 import java.awt.datatransfer.DataFlavor;
@@ -41,8 +40,8 @@ import java.io.IOException;
 public class JBTerminalPanel extends SwingTerminalPanel {
   private final EditorColorsScheme myColorScheme;
 
-  public JBTerminalPanel(BackBuffer backBuffer, LinesBuffer scrollBuffer, StyleState styleState, EditorColorsScheme scheme) {
-    super(backBuffer, scrollBuffer, styleState);
+  public JBTerminalPanel(BackBuffer backBuffer, StyleState styleState, EditorColorsScheme scheme) {
+    super(backBuffer, styleState);
     myColorScheme = scheme;
 
     styleState.setDefaultStyle(new TextStyle(myColorScheme.getDefaultForeground(), myColorScheme.getDefaultBackground()));
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
index f633024cd128..7a4626bd509d 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
@@ -7,9 +7,9 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.Consumer;
 import com.intellij.util.containers.HashMap;
-import com.jediterm.emulator.TtyConnector;
 import com.jediterm.pty.PtyProcess;
 import com.jediterm.pty.PtyProcessTtyConnector;
+import com.jediterm.terminal.TtyConnector;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.OutputStream;
@@ -24,19 +24,19 @@ import java.util.concurrent.Future;
 public class LocalTerminalDirectRunner extends AbstractTerminalRunner<PtyProcess> {
 
   private final Charset myDefaultCharset;
-  private final String myCommand;
+  private final String[] myCommand;
 
-  public LocalTerminalDirectRunner(Project project, Charset charset, String command) {
+  public LocalTerminalDirectRunner(Project project, String[] command) {
     super(project);
-    myDefaultCharset = charset;
+    myDefaultCharset = Charset.forName("UTF-8");
     myCommand = command;
   }
 
   @Override
   protected PtyProcess createProcess() throws ExecutionException {
     Map<String, String> envs = new HashMap<String, String>(System.getenv());
-    envs.put("TERM", "vt100");
-    return new PtyProcess(myCommand, new String[]{myCommand}, envs);
+    envs.put("TERM", "xterm");
+    return new PtyProcess(myCommand[0], myCommand, envs);
   }
 
   @Override
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/OpenLocalTerminalAction.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/OpenLocalTerminalAction.java
index ac0355086661..a4aa3afa0ac9 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/OpenLocalTerminalAction.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/OpenLocalTerminalAction.java
@@ -8,8 +8,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.SystemInfo;
 import icons.TerminalIcons;
 
-import java.nio.charset.Charset;
-
 /**
  * @author traff
  */
@@ -31,12 +29,12 @@ public class OpenLocalTerminalAction extends AnAction implements DumbAware {
 
   public void runLocalTerminal(AnActionEvent event) {
     final Project project = event.getData(PlatformDataKeys.PROJECT);
-    setupRemoteCredentialsAndRunTerminal(project);
+    runLocalTerminal(project);
   }
 
-  public static void setupRemoteCredentialsAndRunTerminal(final Project project) {
-    String terminalCommand = SystemInfo.isMac ? "/bin/tcsh" : "/bin/bash";
+  public static void runLocalTerminal(final Project project) {
+    String[] terminalCommand = SystemInfo.isMac ? new String[]{"/bin/bash", "--login"} : new String[]{"/bin/bash"};
 
-    new LocalTerminalDirectRunner(project, Charset.defaultCharset(), terminalCommand).run();
+    new LocalTerminalDirectRunner(project, terminalCommand).run();
   }
 }
diff --git a/plugins/terminal/terminal.iml b/plugins/terminal/terminal.iml
index d3d1e766dbdb..41e2aa06ec0a 100644
--- a/plugins/terminal/terminal.iml
+++ b/plugins/terminal/terminal.iml
@@ -42,7 +42,7 @@
     <orderEntry type="module-library">
       <library name="jediterm-pty">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/jediterm-pty-0.04.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/jediterm-pty-0.05.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />