Merge pull request #17 from jmtomas/5

2 files changed, 26 insertions, 5 deletions

diff --git a/client.cpp b/client.cpp
index 80d784c..bed62c5 100644
--- a/client.cpp
+++ b/client.cpp
@@ -52,11 +52,7 @@ struct Client {
 		Point window_end(window_start);
 		for (int i = 0; i < window_h; i++) {
 			for (int j = 0; j < window_w; j++) {
-				if (window_end == cursor) {
-					view[pos(j, i)] = '$';
-				} else {
-					view[pos(j, i)] = window_end.element();
-				}
+				view[pos(j, i)] = window_end.element();
 				if (window_end.element() == '\n') {
 					for (int k = j + 1; k < window_w; k++) {
 						view[pos(k, i)] = 0;
diff --git a/jet2.cpp b/jet2.cpp
index afbc604..9fb4027 100644
--- a/jet2.cpp
+++ b/jet2.cpp
@@ -33,6 +33,8 @@ int main(int argc, char *argv[]) {
 	connect(s, (sockaddr *) &addr, sizeof(sockaddr_in));
 
 	int mode = NORMAL_MODE;
+	int cursor_x = 0;
+	int cursor_y = 0;
 
 	int quit = 0;
 	while (!quit) {
@@ -47,6 +49,7 @@ int main(int argc, char *argv[]) {
 		for (int i = 0; i < window_width * window_height; i++) {
 			printw("%c", view[i]);
 		}
+		move(cursor_y, cursor_x);
 
 		int8_t mov[2];
 		int8_t del[1];
@@ -64,11 +67,33 @@ int main(int argc, char *argv[]) {
 					mov[0] = OP_MOVE1;
 					mov[1] = -1;
 					write(s, mov, 2);
+					do {
+						if (cursor_x <= 0) {
+							if (cursor_y > 0) {
+								cursor_x = window_width - 1;
+								cursor_y--;
+							}
+						} else {
+							cursor_x--;
+						}
+					} while (view[pos(cursor_x, cursor_y)] == 0);
 					break;
 				case 'l':
 					mov[0] = OP_MOVE1;
 					mov[1] = 1;
 					write(s, mov, 2);
+					do {
+						if (cursor_x >= window_width - 1) {
+							if (cursor_y < window_height - 1) {
+								cursor_x = 0;
+								cursor_y++;
+							} else {
+								break;
+							}
+						} else {
+							cursor_x++;
+						}
+					} while (view[pos(cursor_x, cursor_y)] == 0);
 					break;
 			}
 		} else {