Fixed some navigation stuff, etc.

Author: gjbauer

edit.h

@@ -36,11 +36,13 @@
 #define EDITOR_SCHEME	1
 #define BOUNDARY_SCHEME	2
 
+//Our different operating modes
 #define EDIT_MODE	0
 #define NOT_SAVED	1
 #define OPEN_FILE	2
 #define NEW_FILE	3
-#define DEL_LINE	4
+#define SAVE_AS		4
+#define DEL_LINE	5
 
 //Define our data-structures
 struct Window
@@ -88,8 +90,8 @@ void key_left(struct Window *, struct Cursor *);
 void ins_char(int, char, char *);
 void del_char(struct Window *, struct Cursor *);
 void del_line(int, char *);
-void dialog(struct Window *, char *);
-bool msg_box(struct Window *w, char *msg);
+void dialog(struct Window *, char *, char *);
+bool msg_box(struct Window *, char *);
 int dialog_input(struct Window *, char *);
 void open(struct Window *, struct File *);
 void save(struct Window *, struct File *);

file.c

@@ -59,6 +59,8 @@ void save(struct Window *w, struct File *f)
 		fclose(f->fp);
 		f->saved=true;
 	}
+	else
+		mode=SAVE_AS;
 }
 
 void new(struct Window *w, struct File *f, struct Cursor *c)

input.c

@@ -28,11 +28,11 @@ void repos_x(struct Window *w, struct Cursor *c)
  *to the end of the given line*/
 {
 	int max, pos=get_line_number_pos(c->y, w->contents);
-	max=get_end_of_line(pos, w->contents)-pos;
-	if (c->x>max)
+	max=get_end_of_line(pos, w->contents);
+	if (c->x>max-pos)
 	{
-		c->x=max;
-		c->abs=pos+max;
+		c->x=max-pos;
+		c->abs=max;
 	}
 	else
 		c->abs=pos+c->x;
@@ -44,6 +44,8 @@ void key_up(struct Window *w, struct Cursor *c)
 {
 	if (c->y>0)
 	{
+		if(c->y==w->top)
+			w->top--;
 		c->y--;
 		repos_x(w, c);
 	}
@@ -57,6 +59,8 @@ void key_down(struct Window *w, struct Cursor *c)
 {
 	if (get_line_number_pos(c->y+1, w->contents)!=EOF)
 	{
+		if(c->y-w->top==w->height-3)
+			w->top++;
 		c->y++;
 		repos_x(w, c);
 	}
@@ -122,9 +126,10 @@ void get_input(struct Window *w, struct Cursor *c, struct File *f)
 			key_right(w, c);
 			break;
 		case KEY_F(1):
+			save(w, f);
 			break;
 		case KEY_F(2):
-			save(w, f);
+			mode=SAVE_AS;
 			break;
 		case KEY_F(3):
 			svdmd=OPEN_FILE;

main.c

@@ -46,11 +46,12 @@ int main(int argc, char *argv[])
 	{
 		cbreak();
 		curs_set(1);
+		getmaxyx(stdscr, w->height, w->width); //Get the dimensions of current screen (stdscr) and place those values into the Window structure
 
-		print_editor(w);
 		switch (mode)
 		{
 			case EDIT_MODE:
+				dialog(w, "[Esc] Quit  [F1] Save  [F2] Save as  [F3] Open  [F4] New  [F5] Delete line", "Unnamed Text Editor");
 				print_contents(w, c, f);
 				get_input(w, c, f);
 				break;
@@ -64,15 +65,15 @@ int main(int argc, char *argv[])
 					mode=EDIT_MODE;
 				break;
 			case OPEN_FILE:
-				dialog(w, "File path:");
+				dialog(w, "File path:", "Open File");
 				if(!dialog_input(w,f->path))
 				{
 					open(w,f);
 					mode=EDIT_MODE;
 				}
 				break;
 			case NEW_FILE:
-				dialog(w, "File path:");
+				dialog(w, "File path:", "New File");
 				if(!dialog_input(w,f->path))
 				{
 					new(w,f,c);
@@ -85,13 +86,21 @@ int main(int argc, char *argv[])
 				}
 				break;
 			case DEL_LINE:
-				dialog(w, "Line number:");
+				dialog(w, "Line number:", "Delete Line");
 				if(!dialog_input(w,ln))
 				{
 					del_line(atoi(ln)-1, w->contents);
 					mode=EDIT_MODE;
 				}
 				break;
+			case SAVE_AS:
+				dialog(w, "File path:", "Save As");
+				if(!dialog_input(w,f->path))
+				{
+					save(w, f);
+					mode=EDIT_MODE;
+				}
+				break;
 		}
 		refresh();
 		clear();

print.c

@@ -57,7 +57,7 @@ void content_line_print(int r, struct Window *w, struct Cursor *c)	//Print line
 	attrset(COLOR_PAIR(EDITOR_SCHEME));		//Turn on attribute for the boundary color scheme
 	move(r+1, 0);					//Set cursor to the beginning of the line for the y-position "row" -- all being relative to editor bounds
 
-	j = get_line_number_pos(r, w->contents);
+	j = get_line_number_pos(r+w->top, w->contents);
 	if (r==c->y)
 		j += (long) c->x-(c->x%w->width)-floor(c->x/w->width);
 
@@ -72,25 +72,13 @@ void content_line_print(int r, struct Window *w, struct Cursor *c)	//Print line
 		addch('>');
 }
 
-void print_editor(struct Window *w)
-{
-	getmaxyx(stdscr, w->height, w->width);	//Get the dimensions of current screen (stdscr) and place those values into the Window structure
-	
-	attrset(COLOR_PAIR(EDITOR_SCHEME));			//Set color pair for editor (black text on white background)
-	move(0, 0);
-	for (int i = 0; i < w->height * w->width; i++) printw(" ");
-	
-	border_line_print(0, "Unnamed Text Editor", w);			//Print a Cyan line from the given y position (0, representing the first line)
-	border_line_print(w->height - 1, "[Esc] Quit  [F1] Help  [F2] Save  [F3] Open  [F4] New  [F5] Delete line", w);	//Print the bottom line
-}
-
 void print_contents(struct Window *w, struct Cursor *c, struct File *f)
 {
-    int i=0, pos = get_line_number_pos(w->top, w->contents);
-    while (pos<w->height-2)
+    int i=0;
+    while (i<w->height-2)
     {
-        content_line_print(pos, w, c);
-        pos++;
+        content_line_print(i, w, c);
+        i++;
     }
     move(c->y-w->top+1, c->x%w->width);
 }
@@ -115,9 +103,13 @@ bool msg_box(struct Window *w, char *msg)
 	}
 }
 
-void dialog(struct Window *w, char *prompt)
+void dialog(struct Window *w, char *prompt, char *msg)
 {
-	print_editor(w);
+	attrset(COLOR_PAIR(EDITOR_SCHEME));
+	move(0, 0);
+	for (int i = 0; i < w->height * w->width; i++) printw(" ");
+	
+	border_line_print(0, msg, w);	
 	border_line_print(w->height-1, prompt, w);
 	move(w->height-1, strlen(prompt));
 }