Menu
▾
▴
[ jEdit-commits ] SF.net SVN: jedit: [11126] plugins/SshConsole/trunk
|
From: <ez...@us...> - 2007-11-24 01:41:31
|
Revision: 11126
http://jedit.svn.sourceforge.net/jedit/?rev=11126&view=rev
Author: ezust
Date: 2007-11-23 17:41:26 -0800 (Fri, 23 Nov 2007)
Log Message:
-----------
Some refactoring, and cleaning up of error messages.
Started work on the JCTerm but it isn't used/working yet.
Modified Paths:
--------------
plugins/SshConsole/trunk/build.xml
plugins/SshConsole/trunk/console/ssh/Connection.java
plugins/SshConsole/trunk/console/ssh/ConsoleState.java
plugins/SshConsole/trunk/console/ssh/Shell.java
plugins/SshConsole/trunk/console/ssh/SshConsolePlugin.java
plugins/SshConsole/trunk/index.html
Added Paths:
-----------
plugins/SshConsole/trunk/console/ssh/JCTerm.java
plugins/SshConsole/trunk/lib/
plugins/SshConsole/trunk/lib/jcterm-0.0.9.tar.gz
Modified: plugins/SshConsole/trunk/build.xml
===================================================================
--- plugins/SshConsole/trunk/build.xml 2007-11-23 20:29:44 UTC (rev 11125)
+++ plugins/SshConsole/trunk/build.xml 2007-11-24 01:41:26 UTC (rev 11126)
@@ -5,12 +5,13 @@
It is based on the standard build.xml file for jEdit plugins.
</description>
+ <property name="docs-proc.target" value="none" />
<property file="build.properties"/>
<property file="../build.properties"/>
<property file="${user.home}/.build.properties"/>
<property file="${user.home}/build.properties"/>
- <property name="docs-proc.target" value="none"/>
+
<property name="build.support" value="../../build-support" />
<property name="compiler.source" value="1.5" />
<property name="compiler.target" value="1.5" />
@@ -20,6 +21,11 @@
<property name="install.dir" value=".."/>
<property name="build.dir" value="build"/>
+ <target name="build.prepare" description="untar the source for jcterm">
+ <untar compression="gzip" dest="${basedir}" src="lib/jcterm-0.0.9.tar.gz" />
+ </target>
+
+
<path id="project.class.path">
<pathelement location="${jedit.install.dir}/jedit.jar"/>
<pathelement location="${jedit.plugins.dir}/FTP.jar"/>
Modified: plugins/SshConsole/trunk/console/ssh/Connection.java
===================================================================
--- plugins/SshConsole/trunk/console/ssh/Connection.java 2007-11-23 20:29:44 UTC (rev 11125)
+++ plugins/SshConsole/trunk/console/ssh/Connection.java 2007-11-24 01:41:26 UTC (rev 11126)
@@ -55,10 +55,10 @@
}
keyAttempts = 0;
session.setUserInfo(this);
-
// Timeout hardcoded to 60seconds
session.connect(60000);
channel=session.openChannel("shell");
+
((ChannelShell)channel).setAgentForwarding(true);
// channel.setInputStream(System.in);
// channel.setOutputStream(System.out);
Modified: plugins/SshConsole/trunk/console/ssh/ConsoleState.java
===================================================================
--- plugins/SshConsole/trunk/console/ssh/ConsoleState.java 2007-11-23 20:29:44 UTC (rev 11125)
+++ plugins/SshConsole/trunk/console/ssh/ConsoleState.java 2007-11-24 01:41:26 UTC (rev 11126)
@@ -65,9 +65,8 @@
ConnectionInfo newInfo = ConnectionManager.getConnectionInfo(newPath);
path = newPath;
// update current directory in the CommandOutputParser
- if (dirChangeListener != null)
- dirChangeListener.setDirectory(path);
+
if (info == null || !newInfo.equals(info)) {
info = newInfo;
if (conn != null) try
@@ -85,6 +84,8 @@
}
}
// update current directory
+ if (dirChangeListener != null)
+ dirChangeListener.setDirectory(path);
newPath = ConnectionManager.extractDirectory(newPath);
if (newPath == null || dir.equals(newPath)) return;
dir = newPath;
Added: plugins/SshConsole/trunk/console/ssh/JCTerm.java
===================================================================
--- plugins/SshConsole/trunk/console/ssh/JCTerm.java (rev 0)
+++ plugins/SshConsole/trunk/console/ssh/JCTerm.java 2007-11-24 01:41:26 UTC (rev 11126)
@@ -0,0 +1,534 @@
+package console.ssh;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Toolkit;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.gjt.sp.util.Log;
+
+import com.jcraft.jcterm.Connection;
+import com.jcraft.jcterm.Emulator;
+import com.jcraft.jcterm.EmulatorVT100;
+import com.jcraft.jcterm.Term;
+
+import console.Console;
+import console.ConsolePane;
+
+/**
+ * A wrapper around the ConsolePane that provides a Term interface for
+ * com.jcraft.jcterm.EmulatorVT100. Based on the JCTermSwing.java.
+ *
+ * @author ezust
+ *
+ * @deprecated - not working yet - stay tuned.
+ *
+ */
+public class JCTerm implements Term, KeyListener
+{
+
+ Console c;
+
+ ConsolePane cp;
+
+ OutputStream out;
+
+ InputStream in;
+
+ Emulator emulator = null;
+
+ Connection connection = null;
+
+ private Graphics2D graphics;
+
+ private java.awt.Color defaultbground = Color.black;
+
+ private java.awt.Color defaultfground = Color.white;
+
+ private java.awt.Color bground = Color.black;
+
+ private java.awt.Color fground = Color.white;
+
+ private boolean bold = false;
+
+ private boolean underline = false;
+
+ private boolean reverse = false;
+
+ private int term_width = 80;
+
+ private int term_height = 24;
+
+ private int descent = 0;
+
+ private int x = 0;
+
+ private int y = 0;
+
+ private int char_width;
+
+ private int char_height;
+
+ // private int line_space=0;
+ private int line_space = -2;
+
+ private int compression = 0;
+
+ private final Object[] colors = { Color.black, Color.red, Color.green, Color.yellow,
+ Color.blue, Color.magenta, Color.cyan, Color.white };
+
+ public JCTerm(Console console, ConsolePane consolePane)
+ {
+ cp = consolePane;
+ // enableEvents(AWTEvent.KEY_EVENT_MASK);
+ cp.addKeyListener(this);
+ graphics = (Graphics2D) cp.getGraphics();
+
+ /*
+ * background=new BufferedImage(char_width, char_height,
+ * BufferedImage.TYPE_INT_RGB); { Graphics2D
+ * foog=(Graphics2D)(background.getGraphics());
+ * foog.setColor(getBackGround()); foog.fillRect(0, 0,
+ * char_width, char_height); foog.dispose(); }
+ */
+ setSize(getTermWidth(), getTermHeight());
+
+ /*
+ * if(splash!=null) splash.draw(img, getTermWidth(),
+ * getTermHeight()); else clear();
+ */
+
+ cp.setPreferredSize(new Dimension(getTermWidth(), getTermHeight()));
+
+ cp.setSize(getTermWidth(), getTermHeight());
+ cp.enableInputMethods(true);
+
+ cp.setFocusTraversalKeysEnabled(false);
+ // setOpaque(true);
+ }
+
+ public void setSize(int w, int h)
+ {
+
+ cp.setSize(w, h);
+ // BufferedImage imgOrg=img;
+ if (graphics != null)
+ graphics.dispose();
+
+ int column = w / getCharWidth();
+ int row = h / getCharHeight();
+ term_width = column;
+ term_height = row;
+
+ if (emulator != null)
+ emulator.reset();
+
+ clear_area(0, 0, w, h);
+
+ /*
+ * if(imgOrg!=null){ Shape clip=graphics.getClip();
+ * graphics.setClip(0, 0, getTermWidth(), getTermHeight());
+ * graphics.drawImage(imgOrg, 0, 0, term_area);
+ * graphics.setClip(clip); }
+ */
+
+ /*
+ * if(cursor_graphics!=null) cursor_graphics.dispose();
+ *
+ * cursor_graphics=(Graphics2D)(img.getGraphics());
+ * cursor_graphics.setColor(getForeGround());
+ * cursor_graphics.setXORMode(getBackGround());
+ */
+ //setAntiAliasing(antialiasing);
+
+ if (connection != null)
+ {
+ connection.requestResize(this);
+ }
+
+ }
+
+ public void start(Connection connection)
+ {
+ this.connection = connection;
+ in = connection.getInputStream();
+ out = connection.getOutputStream();
+ emulator = new EmulatorVT100(this, in);
+ emulator.reset();
+ emulator.start();
+ clear();
+ redraw(0, 0, getTermWidth(), getTermHeight());
+ }
+
+ public void paint(Graphics g)
+ {
+ cp.paint(g);
+ }
+
+ public void processKeyEvent(KeyEvent e)
+ {
+ // System.out.println(e);
+ int id = e.getID();
+ if (id == KeyEvent.KEY_PRESSED)
+ {
+ keyPressed(e);
+ }
+ else if (id == KeyEvent.KEY_RELEASED)
+ {
+ /* keyReleased(e); */
+ }
+ else if (id == KeyEvent.KEY_TYPED)
+ {
+ keyTyped(e);/* keyTyped(e); */
+ }
+ e.consume(); // ??
+ }
+
+ byte[] obuffer = new byte[3];
+
+ public void keyPressed(KeyEvent e)
+ {
+ int keycode = e.getKeyCode();
+ byte[] code = null;
+ switch (keycode)
+ {
+ case KeyEvent.VK_CONTROL:
+ case KeyEvent.VK_SHIFT:
+ case KeyEvent.VK_ALT:
+ case KeyEvent.VK_CAPS_LOCK:
+ return;
+ case KeyEvent.VK_ENTER:
+ code = emulator.getCodeENTER();
+ break;
+ case KeyEvent.VK_UP:
+ code = emulator.getCodeUP();
+ break;
+ case KeyEvent.VK_DOWN:
+ code = emulator.getCodeDOWN();
+ break;
+ case KeyEvent.VK_RIGHT:
+ code = emulator.getCodeRIGHT();
+ break;
+ case KeyEvent.VK_LEFT:
+ code = emulator.getCodeLEFT();
+ break;
+ case KeyEvent.VK_F1:
+ code = emulator.getCodeF1();
+ break;
+ case KeyEvent.VK_F2:
+ code = emulator.getCodeF2();
+ break;
+ case KeyEvent.VK_F3:
+ code = emulator.getCodeF3();
+ break;
+ case KeyEvent.VK_F4:
+ code = emulator.getCodeF4();
+ break;
+ case KeyEvent.VK_F5:
+ code = emulator.getCodeF5();
+ break;
+ case KeyEvent.VK_F6:
+ code = emulator.getCodeF6();
+ break;
+ case KeyEvent.VK_F7:
+ code = emulator.getCodeF7();
+ break;
+ case KeyEvent.VK_F8:
+ code = emulator.getCodeF8();
+ break;
+ case KeyEvent.VK_F9:
+ code = emulator.getCodeF9();
+ break;
+ case KeyEvent.VK_F10:
+ code = emulator.getCodeF10();
+ break;
+ case KeyEvent.VK_TAB:
+ code = emulator.getCodeTAB();
+ break;
+ }
+ if (code != null)
+ {
+ try
+ {
+ out.write(code, 0, code.length);
+ out.flush();
+ }
+ catch (Exception ee)
+ {
+ }
+ return;
+ }
+
+ char keychar = e.getKeyChar();
+ if ((keychar & 0xff00) == 0)
+ {
+ obuffer[0] = (byte) (e.getKeyChar());
+ try
+ {
+ out.write(obuffer, 0, 1);
+ out.flush();
+ }
+ catch (Exception ee)
+ {
+ }
+ }
+ }
+
+ public void keyTyped(KeyEvent e)
+ {
+ char keychar = e.getKeyChar();
+ if ((keychar & 0xff00) != 0)
+ {
+ char[] foo = new char[1];
+ foo[0] = keychar;
+ try
+ {
+ byte[] goo = new String(foo).getBytes("EUC-JP");
+ out.write(goo, 0, goo.length);
+ out.flush();
+ }
+ catch (Exception eee)
+ {
+ }
+ }
+ }
+
+ public int getTermWidth()
+ {
+ return char_width * term_width;
+ }
+
+ public int getTermHeight()
+ {
+ return char_height * term_height;
+ }
+
+ public int getCharWidth()
+ {
+ return char_width;
+ }
+
+ public int getCharHeight()
+ {
+ return char_height;
+ }
+
+ public int getColumnCount()
+ {
+ return term_width;
+ }
+
+ public int getRowCount()
+ {
+ return term_height;
+ }
+
+ public void clear()
+ {
+ c.clear();
+ graphics.setColor(getBackGround());
+ graphics.fillRect(0, 0, char_width * term_width, char_height * term_height);
+ graphics.setColor(getForeGround());
+ }
+
+ public void setCursor(int x, int y)
+ {
+ // TODO : we need to calculate the caret position when giving an x,y coord?
+
+ // System.out.println("setCursor: "+x+","+y);
+ this.x = x;
+ this.y = y;
+ }
+
+ public void draw_cursor()
+ {
+ cp.getGraphics().fillRect(x, y - char_height, char_width, char_height);
+ cp.repaint(x, y - char_height, char_width, char_height);
+ }
+
+ public void redraw(int x, int y, int width, int height)
+ {
+ cp.repaint(x, y, width, height);
+ }
+
+ public void clear_area(int x1, int y1, int x2, int y2)
+ {
+ // System.out.println("clear_area: "+x1+" "+y1+" "+x2+" "+y2);
+ graphics.setColor(getBackGround());
+ graphics.fillRect(x1, y1, x2 - x1, y2 - y1);
+ graphics.setColor(getForeGround());
+ }
+
+ public void scroll_area(int x, int y, int w, int h, int dx, int dy)
+ {
+ // System.out.println("scroll_area: "+x+" "+y+" "+w+" "+h+"
+ // "+dx+" "+dy);
+ graphics.copyArea(x, y, w, h, dx, dy);
+ cp.repaint(x + dx, y + dy, w, h);
+ }
+
+ public void drawBytes(byte[] buf, int s, int len, int x, int y)
+ {
+ // clear_area(x, y, x+len*char_width, y+char_height);
+ // graphics.setColor(getForeGround());
+
+ // System.out.println("drawString: "+x+","+y+" "+len+" "+new
+ // String(buf, s, len));
+
+ graphics.drawBytes(buf, s, len, x, y - descent);
+ if (bold)
+ graphics.drawBytes(buf, s, len, x + 1, y - descent);
+
+ if (underline)
+ {
+ graphics.drawLine(x, y - 1, x + len * char_width, y - 1);
+ }
+
+ }
+
+ public void drawString(String str, int x, int y)
+ {
+ // clear_area(x, y, x+str.length()*char_width, y+char_height);
+ // graphics.setColor(getForeGround());
+ graphics.drawString(str, x, y - descent);
+ if (bold)
+ graphics.drawString(str, x + 1, y - descent);
+
+ if (underline)
+ {
+ graphics.drawLine(x, y - 1, x + str.length() * char_width, y - 1);
+ }
+
+ }
+
+ public void beep()
+ {
+ Toolkit.getDefaultToolkit().beep();
+ }
+
+ /** Ignores key released events. */
+ public void keyReleased(KeyEvent event)
+ {
+ }
+
+ // public void keyPressed(KeyEvent event){}
+
+ public void setLineSpace(int foo)
+ {
+ this.line_space = foo;
+ }
+
+/* public boolean getAntiAliasing()
+ {
+ return antialiasing;
+ }
+
+ public void setAntiAliasing(boolean foo)
+ {
+ if (graphics == null)
+ return;
+ antialiasing = foo;
+ java.lang.Object mode = foo ? RenderingHints.VALUE_TEXT_ANTIALIAS_ON
+ : RenderingHints.VALUE_TEXT_ANTIALIAS_OFF;
+ RenderingHints hints = new RenderingHints(RenderingHints.KEY_TEXT_ANTIALIASING,
+ mode);
+ graphics.setRenderingHints(hints);
+ }
+*/
+ public void setCompression(int compression)
+ {
+ if (compression < 0 || 9 < compression)
+ return;
+ this.compression = compression;
+ }
+
+ private java.awt.Color toColor(Object o)
+ {
+ if (o instanceof String)
+ {
+ return java.awt.Color.getColor((String) o);
+ }
+ if (o instanceof java.awt.Color)
+ {
+ return (java.awt.Color) o;
+ }
+ return Color.white;
+ }
+
+ public void setDefaultForeGround(Object f)
+ {
+ defaultfground = toColor(f);
+ }
+
+ public void setDefaultBackGround(Object f)
+ {
+ defaultbground = toColor(f);
+ }
+
+ public void setForeGround(Object f)
+ {
+ fground = toColor(f);
+ cp.setForeground(fground);
+ }
+
+ public void setBackGround(Object b)
+ {
+ bground = toColor(b);
+ cp.setBackground(bground);
+
+ }
+
+ private java.awt.Color getForeGround()
+ {
+ if (reverse)
+ return bground;
+ return fground;
+ }
+
+ private java.awt.Color getBackGround()
+ {
+ if (reverse)
+ return fground;
+ return bground;
+ }
+
+ public Object getColor(int index)
+ {
+ if (colors == null || index < 0 || colors.length <= index)
+ return null;
+ return colors[index];
+ }
+
+ public void setBold()
+ {
+ bold = true;
+ }
+
+ public void setUnderline()
+ {
+ underline = true;
+ }
+
+ public void setReverse()
+ {
+ reverse = true;
+ if (graphics != null)
+ graphics.setColor(getForeGround());
+ }
+
+ public void resetAllAttributes()
+ {
+ bold = false;
+ underline = false;
+ reverse = false;
+ bground = defaultbground;
+ fground = defaultfground;
+ if (graphics != null)
+ graphics.setColor(getForeGround());
+ }
+}
\ No newline at end of file
Property changes on: plugins/SshConsole/trunk/console/ssh/JCTerm.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: plugins/SshConsole/trunk/console/ssh/Shell.java
===================================================================
--- plugins/SshConsole/trunk/console/ssh/Shell.java 2007-11-23 20:29:44 UTC (rev 11125)
+++ plugins/SshConsole/trunk/console/ssh/Shell.java 2007-11-24 01:41:26 UTC (rev 11126)
@@ -101,7 +101,7 @@
cs.os.flush();
}
catch (IOException ioe ) {
- Log.log(Log.ERROR, this, "IOException writing to ssh pipe", ioe);
+ Log.log(Log.WARNING, this, "IOException writing to ssh pipe - closing connection");
cs.close();
}
@@ -129,13 +129,7 @@
/** sends a ctrl-Z down the pipe, to suspend the current job */
public void detach(Console console)
{
- ConsoleState cs = ConnectionManager.getConsoleState(console);
-// console.getOutput().print(console.getWarningColor(), "Job Control disabled.\n");
- if (cs.os != null) try {
- cs.os.write(SUSPEND);
- cs.os.flush();
- }
- catch (IOException IOE) {};
+ new ShellAction(console, SUSPEND).actionPerformed(null);
}
Modified: plugins/SshConsole/trunk/console/ssh/SshConsolePlugin.java
===================================================================
--- plugins/SshConsole/trunk/console/ssh/SshConsolePlugin.java 2007-11-23 20:29:44 UTC (rev 11125)
+++ plugins/SshConsole/trunk/console/ssh/SshConsolePlugin.java 2007-11-24 01:41:26 UTC (rev 11126)
@@ -1,17 +1,14 @@
package console.ssh;
-import java.util.regex.Matcher;
import org.gjt.sp.jedit.EBMessage;
import org.gjt.sp.jedit.EBPlugin;
import org.gjt.sp.jedit.EditAction;
import org.gjt.sp.jedit.jEdit;
import org.gjt.sp.jedit.msg.VFSPathSelected;
-import org.gjt.sp.util.Log;
import console.Console;
import console.ConsolePlugin;
-import console.Output;
/**
SshConsole - a jEdit plugin that offers a ssh shell to the Console that responds
Modified: plugins/SshConsole/trunk/index.html
===================================================================
--- plugins/SshConsole/trunk/index.html 2007-11-23 20:29:44 UTC (rev 11125)
+++ plugins/SshConsole/trunk/index.html 2007-11-24 01:41:26 UTC (rev 11126)
@@ -68,9 +68,9 @@
</p>
<ul>
-<li> Interpret or ignore vt10x escape codes for color changes. Or properly set the termainal to "dumb"? </li>
-<li> Check the FSB to determine if a "cd" is given a valid directory, and don't call ConsoleState.setPath() to update the sshconsole's path unless it is valid.</li>
-<li> Use FSB and existing sftp:// VFS connection to calculate completions? </li>
+<li> Interpret or ignore vt10x escape codes for color changes - use <a href="http://www.jcraft.com/jcterm/">jcterm</a> or set the termainal to "dumb"? </li>
+<li> Check the FSB to determine if a "cd" is given a valid directory, and don't call <tt>ConsoleState.setPath()</tt> to update the sshconsole's path unless it is valid.</li>
+<li> Use FSB and existing sftp:// VFS connection to calculate possible completions. </li>
<li> Make the Console Commandos smarter, so that they can execute in the ssh or System shell depending on the VFS used in the path. Perhaps add a VFS to Shell Mapping feature of Console so that Commandos can work in other shell/VFS combos too?
</li>
</ul>
Added: plugins/SshConsole/trunk/lib/jcterm-0.0.9.tar.gz
===================================================================
(Binary files differ)
Property changes on: plugins/SshConsole/trunk/lib/jcterm-0.0.9.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|