Remove debug output (shame on me)

This commit is contained in:
johni0702
2015-08-17 22:27:22 +02:00
parent 6da06f1000
commit dcd4cbdfaa

View File

@@ -510,127 +510,118 @@ public class GuiTextArea extends Gui implements GuiElement, GuiOutsideClickableE
return; return;
} }
try { if (GuiScreen.isCtrlKeyDown()) {
if (GuiScreen.isCtrlKeyDown()) {
switch (keyCode) {
case Keyboard.KEY_A: // Select all
cursorX = cursorY = 0;
selectionY = text.length - 1;
selectionX = text[selectionY].length();
updateCurrentXOffset();
updateCurrentYOffset();
return;
case Keyboard.KEY_C: // Copy
GuiScreen.setClipboardString(getSelectedText());
return;
case Keyboard.KEY_V: // Paste
if (enabled) {
writeText(GuiScreen.getClipboardString());
}
return;
case Keyboard.KEY_X: // Cut
if (enabled) {
GuiScreen.setClipboardString(cutSelectedText());
}
return;
}
}
boolean words = GuiScreen.isCtrlKeyDown();
boolean select = GuiScreen.isShiftKeyDown();
switch (keyCode) { switch (keyCode) {
case Keyboard.KEY_HOME: case Keyboard.KEY_A: // Select all
cursorX = 0; cursorX = cursorY = 0;
break; selectionY = text.length - 1;
case Keyboard.KEY_END: selectionX = text[selectionY].length();
cursorX = text[cursorY].length(); updateCurrentXOffset();
break; updateCurrentYOffset();
case Keyboard.KEY_LEFT: return;
if (cursorX == 0) { case Keyboard.KEY_C: // Copy
if (cursorY > 0) { GuiScreen.setClipboardString(getSelectedText());
cursorY--; return;
cursorX = text[cursorY].length(); case Keyboard.KEY_V: // Paste
} if (enabled) {
} else { writeText(GuiScreen.getClipboardString());
if (words) {
cursorX -= getPreviousWordLength();
} else {
cursorX--;
}
} }
break; return;
case Keyboard.KEY_RIGHT: case Keyboard.KEY_X: // Cut
if (cursorX == text[cursorY].length()) { if (enabled) {
if (cursorY < text.length - 1) { GuiScreen.setClipboardString(cutSelectedText());
cursorY++;
cursorX = 0;
}
} else {
if (words) {
cursorX += getNextWordLength();
} else {
cursorX++;
}
} }
break; return;
case Keyboard.KEY_UP: }
}
boolean words = GuiScreen.isCtrlKeyDown();
boolean select = GuiScreen.isShiftKeyDown();
switch (keyCode) {
case Keyboard.KEY_HOME:
cursorX = 0;
break;
case Keyboard.KEY_END:
cursorX = text[cursorY].length();
break;
case Keyboard.KEY_LEFT:
if (cursorX == 0) {
if (cursorY > 0) { if (cursorY > 0) {
cursorY--; cursorY--;
cursorX = Math.min(cursorX, text[cursorY].length()); cursorX = text[cursorY].length();
} }
break; } else {
case Keyboard.KEY_DOWN: if (words) {
if (cursorY + 1 < text.length) { cursorX -= getPreviousWordLength();
} else {
cursorX--;
}
}
break;
case Keyboard.KEY_RIGHT:
if (cursorX == text[cursorY].length()) {
if (cursorY < text.length - 1) {
cursorY++; cursorY++;
cursorX = Math.min(cursorX, text[cursorY].length()); cursorX = 0;
} }
break; } else {
case Keyboard.KEY_BACK: if (words) {
if (enabled) { cursorX += getNextWordLength();
if (getSelectedText().length() > 0) { } else {
deleteSelectedText(); cursorX++;
} else if (words) {
deletePreviousWord();
} else {
deletePreviousChar();
}
} }
return; }
case Keyboard.KEY_DELETE: break;
if (enabled) { case Keyboard.KEY_UP:
if (getSelectedText().length() > 0) { if (cursorY > 0) {
deleteSelectedText(); cursorY--;
} else if (words) { cursorX = Math.min(cursorX, text[cursorY].length());
deleteNextWord(); }
} else { break;
deleteNextChar(); case Keyboard.KEY_DOWN:
} if (cursorY + 1 < text.length) {
cursorY++;
cursorX = Math.min(cursorX, text[cursorY].length());
}
break;
case Keyboard.KEY_BACK:
if (enabled) {
if (getSelectedText().length() > 0) {
deleteSelectedText();
} else if (words) {
deletePreviousWord();
} else {
deletePreviousChar();
} }
return; }
default: return;
if (enabled) { case Keyboard.KEY_DELETE:
if (key == '\r') { if (enabled) {
key = '\n'; if (getSelectedText().length() > 0) {
} deleteSelectedText();
writeChar(key); } else if (words) {
deleteNextWord();
} else {
deleteNextChar();
} }
return; }
} return;
default:
if (enabled) {
if (key == '\r') {
key = '\n';
}
writeChar(key);
}
return;
}
updateCurrentXOffset(); updateCurrentXOffset();
updateCurrentYOffset(); updateCurrentYOffset();
if (!select) { if (!select) {
selectionX = cursorX; selectionX = cursorX;
selectionY = cursorY; selectionY = cursorY;
}
} finally {
System.out.println(cursorX + "/" + cursorY);
System.out.println(selectionX + "/" + selectionY);
System.out.println("Lines (" + text.length + "): ");
for (String line : text) {
System.out.println(line);
}
} }
} }