regex implemented

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

regex implemented
git-svn-id: svn://imanolbarba.net/PAD@12 c2ee353e-ed0d-4329-bf56-03aec153487f
Imanol-Mikel Barba Sabariego
1 parent a59076a2
Showing 4 changed files with 77 additions and 64 deletions
readline/bin/pad/prac1/Console.class
readline/bin/pad/prac1/EditableBufferedReader.class
readline/src/pad/prac1/Console.java
readline/src/pad/prac1/EditableBufferedReader.java
@@ -7,24 +7,36 @@ import java.util.regex.Pattern;
 public class Console implements Observer 
 {
-	private int currentCol;
+	private int numCols;
+	private int numRows;
 	private int currentRow;
 	public void updateCurrentPos()
 	{
 		Coordinate pos = getCurrentPos();
-		currentCol = pos.x();
 		currentRow = pos.y();
 	}
+	public void updateTermSize()
+	{
+		System.out.print((char)EditableBufferedReader.ESC);
+		System.out.print((char)EditableBufferedReader.ESC_SEQ);
+		System.out.print("18t");
+		Pattern pattern = Pattern.compile("8;(\\d+);(\\d+)");
+		Scanner scanner = new Scanner(System.in);
+        scanner.findWithinHorizon(pattern,0);
+        numCols = Integer.parseInt(scanner.match().group(2));
+        numRows = Integer.parseInt(scanner.match().group(1));
+	}
+	
 	public Coordinate getCurrentPos()
 	{
 		System.out.print((char)EditableBufferedReader.ESC);
 		System.out.print((char)EditableBufferedReader.ESC_SEQ);
 		System.out.print("6n");
-		Pattern pattern = Pattern.compile("(\\d*);(\\d*)");
+		Pattern pattern = Pattern.compile("(\\d+);(\\d+)");
 		Scanner scanner = new Scanner(System.in);
-        scanner.findWithinHorizon(pattern,0); 
+        scanner.findWithinHorizon(pattern,0);
 		return new Coordinate(Integer.parseInt(scanner.match().group(2)),
 							  Integer.parseInt(scanner.match().group(1)));
 	}
@@ -65,6 +77,7 @@ public class Console implements Observer
 	public void update(Observable obs, Object arg)
 	{
 		updateCurrentPos();
+		updateTermSize();
 		Line line = (Line)obs;
 		Command cmd = (Command)arg;		
 		switch(cmd.getType())
@@ -78,8 +91,12 @@ public class Console implements Observer
 			break;
 			case Command.MOVE_CURSOR:
-				Coordinate xy = new Coordinate(cmd.getValue(),currentRow);
-				//Gestionar si excede el numero de columnas con modulos y asi
+				currentRow += cmd.getValue()/numCols;
+				if(currentRow > numRows)
+				{
+					currentRow = numRows;
+				}
+				Coordinate xy = new Coordinate(cmd.getValue()%numCols,currentRow);
 				moveCursorTo(xy);
 			break;
 		}
 package pad.prac1;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
 import java.util.Scanner;
-import java.util.regex.Pattern;
 public class EditableBufferedReader extends BufferedReader 
@@ -81,74 +82,72 @@ public class EditableBufferedReader extends BufferedReader
 	private void parseKey() throws IOException
 	{
-		Pattern pattern;
 		Scanner scanner = new Scanner(System.in);
-		pattern = Pattern.compile("(.{1})");
-		if(scanner.findWithinHorizon(pattern,0) != null)
+        if(scanner.findWithinHorizon("(\\033)?", 0).length() > 0)
 		{
-			int character = (int)scanner.match().group(1).charAt(0);
-			if(character >= 0x20 || character == EOF || character == BACKSPACE || character == RETURN_KEY)
+			scanner.skip("(\\033)?");
+			if(scanner.findWithinHorizon("(\\[)?", 0).length() > 0)
 			{
-		        switch(character)
-		        {
-					case EOF:
-						endOfFile = true;
+				scanner.skip("(\\[)?");
+	    		int character = (int)scanner.findWithinHorizon("(?s).{1}", 0).charAt(0);
+	        	switch(character)
+	        	{
+			        case FORWARD:
+						line.setCursorTo(line.getCursorPosition()+1);
+					break;
+						
+					case BACKWARD:
+						line.setCursorTo(line.getCursorPosition()-1);
 					break;
-					case BACKSPACE:
-					case BACKSPACE_DEL:
-						line.delChar(DEL_BACKWARD);
+					case DEL:
+						line.delChar(DEL_FORWARD);
 					break;
-							
-					case RETURN_KEY:
-						character = LINE_FEED;
-					default:
-						line.addChar((char)character);
+						
+					case INSERT_KEY:
+						line.toggleMode();
 					break;
-		        }
-		        return;
+	        	}
+	        	return;
+    		}
+			else if(scanner.findWithinHorizon("O?", 0).length() > 0)
+			{
+				scanner.skip("O?");
+        		int character = (int)scanner.findWithinHorizon("(?s).{1}", 0).charAt(0);
+            	switch(character)
+            	{
+    	        	case HOME:
+    					line.setCursorTo(1);
+    				break;
+    					
+    				case END:
+    					line.setCursorTo(line.length()+1);
+    				break;
+            	}
+            	return;
 			}
 		}
-        pattern = Pattern.compile("\\^\\[\\[(.{1}).*");
-        if(scanner.findWithinHorizon(pattern,3) != null) //escape sequence
+        else
         {
-        	int character = scanner.match().group(1).charAt(0);
+        	int character = (int)scanner.findWithinHorizon("(?s).{1}", 0).charAt(0);
         	switch(character)
-        	{
-		        case FORWARD:
-					line.setCursorTo(line.getCursorPosition()+1);
-				break;
-					
-				case BACKWARD:
-					line.setCursorTo(line.getCursorPosition()-1);
+	        {
+				case EOF:
+					endOfFile = true;
 				break;
-				case DEL:
-					line.delChar(DEL_FORWARD);
-				break;
-					
-				case INSERT_KEY:
-					line.toggleMode();
+				case BACKSPACE:
+				case BACKSPACE_DEL:
+					line.delChar(DEL_BACKWARD);
 				break;
-        	}
-        	return;
-        }
-        pattern = Pattern.compile("\\^\\[O(\\w{1})");
-        if(scanner.findWithinHorizon(pattern,3) != null) //HOME or END
-        {
-        	
-        	int character = (int)scanner.match().group(1).charAt(0);
-        	switch(character)
-        	{
-	        	case HOME:
-					line.setCursorTo(1);
-				break;
-					
-				case END:
-					line.setCursorTo(line.length()+1);
+						
+				case RETURN_KEY:
+					character = LINE_FEED;
+				default:
+					line.addChar((char)character);
 				break;
-        	}
-        	return;
+	        }
+	        return;
         }
 	}
@@ -199,9 +198,6 @@ public class EditableBufferedReader extends BufferedReader
  * 
  * up/down keys (needs text to work)
  * pgup pgdown keys (goesto penultima linea visible)
- * read terminal size
- * update size dynamically
- * long strings wrap down
  * cursor keys skip final \n on a line
  * careful if overwrite mode and final character is \n
  */