if (mouse.isMouse1()) {
// Selection.
- if (inSelection) {
- selectionColumn1 = leftColumn + mouse.getX();
- selectionLine1 = topLine + mouse.getY();
- } else if (mouse.isShift()) {
- inSelection = true;
- selectionColumn0 = leftColumn + mouse.getX();
- selectionLine0 = topLine + mouse.getY();
- selectionColumn1 = selectionColumn0;
- selectionLine1 = selectionLine0;
- }
+ inSelection = true;
+ selectionColumn0 = leftColumn + mouse.getX();
+ selectionLine0 = topLine + mouse.getY();
+ selectionColumn1 = selectionColumn0;
+ selectionLine1 = selectionLine0;
// Set the row and column
int newLine = topLine + mouse.getY();
public void onMouseMotion(final TMouseEvent mouse) {
if (mouse.isMouse1()) {
+ // Set the row and column
+ int newLine = topLine + mouse.getY();
+ int newX = leftColumn + mouse.getX();
+ if ((newLine < 0) || (newX < 0)) {
+ return;
+ }
+
// Selection.
if (inSelection) {
- selectionColumn1 = leftColumn + mouse.getX();
- selectionLine1 = topLine + mouse.getY();
- } else if (mouse.isShift()) {
+ selectionColumn1 = newX;
+ selectionLine1 = newLine;
+ } else {
inSelection = true;
- selectionColumn0 = leftColumn + mouse.getX();
- selectionLine0 = topLine + mouse.getY();
+ selectionColumn0 = newX;
+ selectionLine0 = newLine;
selectionColumn1 = selectionColumn0;
selectionLine1 = selectionLine0;
}
- // Set the row and column
- int newLine = topLine + mouse.getY();
- int newX = leftColumn + mouse.getX();
if (newLine > document.getLineCount() - 1) {
// Go to the end
document.setLineNumber(document.getLineCount() - 1);
}
return;
}
-
document.setLineNumber(newLine);
setCursorY(mouse.getY());
if (newX >= document.getCurrentLine().getDisplayLength()) {
selectionLine1 = document.getLineNumber();
}
return;
- } else {
- inSelection = false;
}
// Pass to children
super.onMouseDown(mouse);
}
- /**
- * Handle mouse release events.
- *
- * @param mouse mouse button release event
- */
- @Override
- public void onMouseUp(final TMouseEvent mouse) {
- inSelection = false;
-
- // Pass to children
- super.onMouseDown(mouse);
- }
-
/**
* Handle keystrokes.
*
int endRow = selectionLine1;
if (((selectionColumn1 < selectionColumn0)
- && (selectionLine1 <= selectionLine0))
- || ((selectionColumn1 <= selectionColumn0)
- && (selectionLine1 < selectionLine0))
+ && (selectionLine1 == selectionLine0))
+ || (selectionLine1 < selectionLine0)
) {
- // The user selected from bottom-right to top-left. Reverse the
- // coordinates for the inverted section.
+ // The user selected from bottom-to-top and/or right-to-left.
+ // Reverse the coordinates for the inverted section.
startCol = selectionColumn1;
startRow = selectionLine1;
endCol = selectionColumn0;
int endCol = selectionColumn1;
int endRow = selectionLine1;
+ /*
+ System.err.println("INITIAL: " + startRow + " " + startCol + " " +
+ endRow + " " + endCol + " " +
+ document.getLineNumber() + " " + document.getCursor());
+ */
+
if (((selectionColumn1 < selectionColumn0)
- && (selectionLine1 <= selectionLine0))
- || ((selectionColumn1 <= selectionColumn0)
- && (selectionLine1 < selectionLine0))
+ && (selectionLine1 == selectionLine0))
+ || (selectionLine1 < selectionLine0)
) {
- // The user selected from bottom-right to top-left. Reverse the
- // coordinates for the inverted section.
+ // The user selected from bottom-to-top and/or right-to-left.
+ // Reverse the coordinates for the inverted section.
startCol = selectionColumn1;
startRow = selectionLine1;
endCol = selectionColumn0;
endRow = selectionLine0;
+
+ if (endRow >= document.getLineCount()) {
+ // The selection started beyond EOF, trim it to EOF.
+ endRow = document.getLineCount() - 1;
+ endCol = document.getLine(endRow).getDisplayLength();
+ } else if (endRow == document.getLineCount() - 1) {
+ // The selection started beyond EOF, trim it to EOF.
+ if (endCol >= document.getLine(endRow).getDisplayLength()) {
+ endCol = document.getLine(endRow).getDisplayLength() - 1;
+ }
+ }
+ }
+ /*
+ System.err.println("FLIP: " + startRow + " " + startCol + " " +
+ endRow + " " + endCol + " " +
+ document.getLineNumber() + " " + document.getCursor());
+ System.err.println(" --END: " + endRow + " " + document.getLineCount() +
+ " " + document.getLine(endRow).getDisplayLength());
+ */
+
+ assert (endRow < document.getLineCount());
+ if (endCol >= document.getLine(endRow).getDisplayLength()) {
+ endCol = document.getLine(endRow).getDisplayLength() - 1;
+ }
+ if (endCol < 0) {
+ endCol = 0;
+ }
+ if (startCol >= document.getLine(startRow).getDisplayLength()) {
+ startCol = document.getLine(startRow).getDisplayLength() - 1;
+ }
+ if (startCol < 0) {
+ startCol = 0;
}
// Place the cursor on the selection end, and "press backspace" until
// the cursor matches the selection start.
+ /*
+ System.err.println("BEFORE: " + startRow + " " + startCol + " " +
+ endRow + " " + endCol + " " +
+ document.getLineNumber() + " " + document.getCursor());
+ */
document.setLineNumber(endRow);
document.setCursor(endCol + 1);
while (!((document.getLineNumber() == startRow)
&& (document.getCursor() == startCol))
) {
+ /*
+ System.err.println("DURING: " + startRow + " " + startCol + " " +
+ endRow + " " + endCol + " " +
+ document.getLineNumber() + " " + document.getCursor());
+ */
+
document.backspace();
}
alignTopLine(true);
int endRow = selectionLine1;
if (((selectionColumn1 < selectionColumn0)
- && (selectionLine1 <= selectionLine0))
- || ((selectionColumn1 <= selectionColumn0)
- && (selectionLine1 < selectionLine0))
+ && (selectionLine1 == selectionLine0))
+ || (selectionLine1 < selectionLine0)
) {
- // The user selected from bottom-right to top-left. Reverse the
- // coordinates for the inverted section.
+ // The user selected from bottom-to-top and/or right-to-left.
+ // Reverse the coordinates for the inverted section.
startCol = selectionColumn1;
startRow = selectionLine1;
endCol = selectionColumn0;