git-svn-id: svn://imanolbarba.net/PAD@13 c2ee353e-ed0d-4329-bf56-03aec153487f

Imanol-Mikel Barba Sabariego
1 parent e2923995
Showing 8 changed files with 37 additions and 27 deletions
readline/bin/pad/prac1/Command.class
readline/bin/pad/prac1/Console.class
readline/bin/pad/prac1/Line.class
readline/src/pad/prac1/Command.java
readline/src/pad/prac1/Console.java
readline/src/pad/prac1/EditableBufferedReader.java
readline/src/pad/prac1/Line.java
readline/src/pad/prac1/MainClass.java
@@ -9,6 +9,7 @@ public class Command
 	public static final int INSERT_CHAR = 0;
 	public static final int DELETE_CHAR = 1;
 	public static final int MOVE_CURSOR = 2;
+	public static final int NEWLINE 	= 3;
  
 	private int type;
 	private int value;
@@ -99,6 +99,11 @@ public class Console implements Observer
 				Coordinate xy = new Coordinate(cmd.getValue()%numCols,currentRow);
 				moveCursorTo(xy);
 			break;
+			
+			case Command.NEWLINE:
+				System.out.print((char)EditableBufferedReader.LINE_FEED);
+				System.out.print((char)EditableBufferedReader.RETURN_KEY);
+				currentRow++;				
 		}
 	}
 }
@@ -191,13 +191,4 @@ public class EditableBufferedReader extends BufferedReader
 		System.out.println("");
 		return line.toString();
 	}
-}
-
-
-/* TO-DO
- * 
- * up/down keys (needs text to work)
- * pgup pgdown keys (goesto penultima linea visible)
- * cursor keys skip final \n on a line
- * careful if overwrite mode and final character is \n
- */
+}
 \ No newline at end of file
@@ -88,25 +88,30 @@ public class Line extends Observable
 	{
 		if(c == EditableBufferedReader.LINE_FEED)
 		{
-			sendCommand(Command.INSERT_CHAR,EditableBufferedReader.RETURN_KEY);
+			sendCommand(Command.NEWLINE);
+			insertCharAt(c, cursorPosition-1);
+			cursorPosition++;
 		}
-		switch(writeMode)
+		else
 		{
-			case EditableBufferedReader.INSERT:
-				sendCommand(Command.INSERT_CHAR,(int)c);
-				insertCharAt(c, cursorPosition-1);
-				cursorPosition++;
+			switch(writeMode)
+			{
+				case EditableBufferedReader.INSERT:
+					sendCommand(Command.INSERT_CHAR,(int)c);
+					insertCharAt(c, cursorPosition-1);
+					cursorPosition++;
+					break;
+					
+				case EditableBufferedReader.OVERWRITE:
+					if(cursorPosition != line.length()+1)
+					{
+						removeCharAt(cursorPosition-1);
+					}
+					sendCommand(Command.INSERT_CHAR,(int)c);
+					insertCharAt(c, cursorPosition-1);
+					cursorPosition++;
 				break;
-				
-			case EditableBufferedReader.OVERWRITE:
-				if(cursorPosition != line.length()+1)
-				{
-					removeCharAt(cursorPosition-1);
-				}
-				sendCommand(Command.INSERT_CHAR,(int)c);
-				insertCharAt(c, cursorPosition-1);
-				cursorPosition++;
-			break;
+			}
 		}
 	}
  
@@ -12,5 +12,13 @@ public class MainClass
 		System.out.println("\nLine read: \n" + editable.readLine());
 		editable.close();
 	}
-
 }
+
+/* TO-DO
+ * up/down keys
+ * pgup pgdown keys (goesto penultima linea visible)
+ * implement change of terminal dimensions
+ * 
+ * TO-FIX
+ * Cursor keys, Home and end keys when new line, reset line length
+ */
 \ No newline at end of file