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

Imanol-Mikel Barba Sabariego
1 parent 8727f445
Showing 16 changed files with 64 additions and 7 deletions
JChat/.classpath
JChat/.project
JChat/.settings/org.eclipse.jdt.core.prefs
JChat/bin/pad/prac2/MyServerSocket.class
JChat/bin/pad/prac2/MySocket.class
JChat/src/pad/prac2/MyServerSocket.java
JChat/src/pad/prac2/MySocket.java
readline/bin/pad/prac1/Command.class
readline/bin/pad/prac1/Console.class
readline/bin/pad/prac1/Coordinate.class
readline/bin/pad/prac1/EditableBufferedReader.class
readline/bin/pad/prac1/Line.class
readline/src/pad/prac1/Console.java
readline/src/pad/prac1/EditableBufferedReader.java
readline/src/pad/prac1/Line.java
readline/src/pad/prac1/MainClass.java
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>JChat</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
+package pad.prac2;
+
+public class MyServerSocket {
+
+}
+package pad.prac2;
+
+public class MySocket 
+{
+
+}
@@ -22,7 +22,7 @@ public class Console implements Observer
 		updateCurrentPos();
 		if(pos > currentPos)
 		{
-			while((pos-currentPos) >= numCols)
+			while((currentXY.x()+(pos-currentPos)) > numCols)
 			{
 				currentPos += numCols - currentXY.x()+1;
 				System.out.print((char)EditableBufferedReader.ESC);
@@ -45,9 +45,6 @@ public class Console implements Observer
 		}
 		else if(pos < currentPos)
 		{
-			System.err.println(currentPos);
-			System.err.println(pos);
-			System.err.println(currentXY);
 			while((currentPos-pos) >= currentXY.x())
 			{
 				currentPos -= currentXY.x();
@@ -140,9 +140,10 @@ public class EditableBufferedReader extends BufferedReader
 				break;
  
 				case EOF:
-				case RETURN_KEY:
 					endOfFile = true;
 				break;
+				
+				case RETURN_KEY:
 				default:
 					line.addChar((char)character);
 				break;
@@ -86,9 +86,13 @@ public class Line extends Observable
  
 	public void addChar(char c)
 	{
-		if(c == EditableBufferedReader.LINE_FEED)
+		if(c == EditableBufferedReader.RETURN_KEY)
 		{
+			insertCharAt((char)EditableBufferedReader.LINE_FEED,cursorPosition-1);
+			sendCommand(Command.INSERT_CHAR,EditableBufferedReader.LINE_FEED);
 			sendCommand(Command.INSERT_CHAR,EditableBufferedReader.RETURN_KEY);
+			cursorPosition++;
+			return;
 		}
 		switch(writeMode)
 		{
@@ -12,5 +12,15 @@ public class MainClass
 		System.out.println("\nLine read: \n" + editable.readLine());
 		editable.close();
 	}
-
 }
+
+/*
+ * TODO
+ *  DETECT LINE LENGTH BEFORE PASSING ARGS TO LINE.SETCURSOR
+ *  UP/DOWN cursor
+ *  PGUP/PGDN
+ *  INSERT NEWLINE IN A STRING (SPLITTING STRINGS)
+ *  MOUSE SUPPORT
+ *  FORM SUPPORT
+ */
+