diff options
| -rw-r--r-- | src/de/mud/terminal/VDUBuffer.java | 8 | ||||
| -rw-r--r-- | src/de/mud/terminal/vt320.java | 10 | ||||
| -rw-r--r-- | src/org/connectbot/service/TerminalBridge.java | 5 |
3 files changed, 6 insertions, 17 deletions
diff --git a/src/de/mud/terminal/VDUBuffer.java b/src/de/mud/terminal/VDUBuffer.java index 90d5452..cb77ad6 100644 --- a/src/de/mud/terminal/VDUBuffer.java +++ b/src/de/mud/terminal/VDUBuffer.java @@ -26,7 +26,6 @@ package de.mud.terminal; import java.util.Arrays; -import android.util.Log; /** * Implementation of a Video Display Unit (VDU) buffer. This class contains @@ -339,7 +338,7 @@ public class VDUBuffer { (topMargin > 0 ? topMargin - 1 : 0) : bottomMargin)); - System.out.println("l is "+l+", top is "+top+", bottom is "+bottom+", bottomargin is "+bottomMargin+", topMargin is "+topMargin); + // System.out.println("l is "+l+", top is "+top+", bottom is "+bottom+", bottomargin is "+bottomMargin+", topMargin is "+topMargin); if (scrollDown) { if (n > (bottom - top)) n = (bottom - top); @@ -644,7 +643,6 @@ public class VDUBuffer { * @param l line that is the margin */ public void setTopMargin(int l) { - //System.out.println("trying setTopMargin " + l); if (l > bottomMargin) { topMargin = bottomMargin; bottomMargin = l; @@ -652,7 +650,6 @@ public class VDUBuffer { topMargin = l; if (topMargin < 0) topMargin = 0; if (bottomMargin > height - 1) bottomMargin = height - 1; - //System.out.println("final setTopMargin " + topMargin); } /** @@ -669,7 +666,6 @@ public class VDUBuffer { * @param l line that is the margin */ public void setBottomMargin(int l) { - //System.out.println("trying setBottomMargin " + l); if (l < topMargin) { bottomMargin = topMargin; topMargin = l; @@ -677,7 +673,6 @@ public class VDUBuffer { bottomMargin = l; if (topMargin < 0) topMargin = 0; if (bottomMargin > height - 1) bottomMargin = height - 1; - //System.out.println("final setBottomMargin " + bottomMargin); } /** @@ -787,7 +782,6 @@ public class VDUBuffer { bottomMargin = h - 1; update = new boolean[h + 1]; update[0] = true; - /* FIXME: ??? if(resizeStrategy == RESIZE_FONT) setBounds(getBounds()); diff --git a/src/de/mud/terminal/vt320.java b/src/de/mud/terminal/vt320.java index 49af8f0..03fc853 100644 --- a/src/de/mud/terminal/vt320.java +++ b/src/de/mud/terminal/vt320.java @@ -1737,8 +1737,6 @@ public abstract class vt320 extends VDUBuffer implements VDUInput { break; case 'M': // RI System.out.println("ESC M : R is "+R+", tm is "+tm+", bm is "+bm); - if (R > bm) // outside scrolling region - break; if (R > tm) { // just go up 1 line. R--; } else { // scroll down @@ -1945,7 +1943,7 @@ public abstract class vt320 extends VDUBuffer implements VDUInput { break; case 'r': // XTERM_RESTORE if (true || debug > 1) - System.out.println("m1ESC [ ? " + DCEvars[0] + " r"); + System.out.println("ESC [ ? " + DCEvars[0] + " r"); /* DEC Mode reset */ for (int i = 0; i <= DCEvar; i++) { switch (DCEvars[i]) { @@ -2418,17 +2416,15 @@ public abstract class vt320 extends VDUBuffer implements VDUInput { } else R = rows - 1; int bot = R; - System.out.println("setBottomMargin R="+R); if (R >= DCEvars[0]) { R = DCEvars[0] - 1; if (R < 0) R = 0; } setMargins(R, bot); - System.out.println("setTopMargin R="+R); _SetCursor(0, 0); if (debug > 1) - System.out.println("m2ESC [" + DCEvars[0] + " ; " + DCEvars[1] + " r"); + System.out.println("ESC [" + DCEvars[0] + " ; " + DCEvars[1] + " r"); break; case 'G': /* CUP / cursor absolute column */ C = DCEvars[0]; @@ -2699,7 +2695,7 @@ public abstract class vt320 extends VDUBuffer implements VDUInput { if (debug > 3) System.out.print("" + DCEvars[i] + ";"); } - if (debug > 4) + if (debug > 3) System.out.print(" (attributes = " + attributes + ")m \n"); break; default: diff --git a/src/org/connectbot/service/TerminalBridge.java b/src/org/connectbot/service/TerminalBridge.java index 9f8bd9d..2c2f56d 100644 --- a/src/org/connectbot/service/TerminalBridge.java +++ b/src/org/connectbot/service/TerminalBridge.java @@ -29,7 +29,6 @@ import org.connectbot.util.PubkeyDatabase; import org.connectbot.util.PubkeyUtils; import android.database.Cursor; -import android.database.sqlite.SQLiteDatabase; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Color; @@ -506,7 +505,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal if (printing) { int key = keymap.get(keyCode, event.getMetaState()); - Log.d(TAG, Integer.toString(event.getMetaState())); + //Log.d(TAG, Integer.toString(event.getMetaState())); if (ctrlPressed) { //if((event.getMetaState() & KeyEvent.META_SYM_ON) != 0) { @@ -520,7 +519,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal // handle pressing f-keys if((event.getMetaState() & KeyEvent.META_SHIFT_ON) != 0) { - Log.d(TAG, "yay pressing an fkey"); + //Log.d(TAG, "yay pressing an fkey"); switch(key) { case '!': ((vt320)buffer).keyPressed(vt320.KEY_F1, ' ', 0); return true; case '@': ((vt320)buffer).keyPressed(vt320.KEY_F2, ' ', 0); return true; |