Cleaned up last bit...added documentation, made sure everything is functional...implemented argv file-open

Author: gjbauer

edit.h

@@ -65,37 +65,45 @@ struct File
 	bool saved;
 };
 
-struct Change
+/*struct Change		//Not implemented, possibly later
 {
 	int line;	//Line of the change
 	char *ot;	//Old text of the line
 	char *nt;	//New text of the line
 	struct Change *prev;
 	struct Change *next;
-};
+};*/
 
 extern int mode, svdmd;
 extern char ln[NAME_MAX];
 
 //Define our functions
+
+//print.c
 void initialize_editor();							//Initialize NCurses and color mode
 void border_line_print(int, char *, struct Window *);			//Print a Cyan line at row "r" with text "t", with restrictions of Window "w"
 void content_line_print(int, struct Window *, struct Cursor *);	//Print line at row "r" with text "t", with restrictions and contents of Window "w", using cursor position x,y
-void print_editor(struct Window *);						//Prints the editor sans file contents
 void print_contents(struct Window *, struct Cursor *, struct File *);	//Prints the inner contents of the editor
+void dialog(struct Window *, char *, char *);
+bool msg_box(struct Window *, char *);
+void run_mode(int, struct Window *, struct Cursor *, struct File *);
+
+//text.c
 int get_line_number_pos(int, char *);					//Gets the position of the line number 'line' in text 'text'
 int get_end_of_line(int, char *);
-void get_input(struct Window *, struct Cursor *, struct File *);
-void key_left(struct Window *, struct Cursor *);
+unsigned long long array_size(int);
 void ins_char(int, char, char *);
 void del_char(struct Window *, struct Cursor *);
 void del_line(int, char *);
-void dialog(struct Window *, char *, char *);
-bool msg_box(struct Window *, char *);
+
+//input.c
+void get_input(struct Window *, struct Cursor *, struct File *);
+void key_left(struct Window *, struct Cursor *);
 int dialog_input(struct Window *, char *);
+
+//file.c
 void open(struct Window *, struct File *);
 void save(struct Window *, struct File *);
 void new(struct Window *, struct File *, struct Cursor *);
-unsigned long long array_size(int);
 
 #endif /* EDIT_H */

file.c

@@ -24,7 +24,8 @@
 
 void open(struct Window *w, struct File *f)
 /*Opens a file, copies the contents, and
- *assesses file permissions*/
+ *assesses file permissions
+ */
 {
 	struct stat f_stat;
 	f->fp = fopen(f->path, "r");
@@ -50,6 +51,7 @@ void open(struct Window *w, struct File *f)
 }
 
 void save(struct Window *w, struct File *f)
+//Saves the file. If it cannot - calls SAVE_AS
 {
 	f->fp = fopen(f->path, "w");
 
@@ -64,6 +66,7 @@ void save(struct Window *w, struct File *f)
 }
 
 void new(struct Window *w, struct File *f, struct Cursor *c)
+//Creates a blank file
 {
 	f->fp=NULL;
 	f->ro=true;

input.c

@@ -161,13 +161,19 @@ void get_input(struct Window *w, struct Cursor *c, struct File *f)
 			if (k!='\n')
 				c->x++;
 			else
-				c->y++;
+			{
+				c->x=0; c->y++;
+			}
 			f->saved=false;
 			break;
 	}
 }
 
 int dialog_input(struct Window *w, char *str)
+/*When recieving input from a prompt
+ *as opposed to the regular EDIT_MODE
+ *use this function instead of get_input
+ */
 {
 	int i=strlen(str);
 	int k;

main.c

@@ -39,69 +39,18 @@ int main(int argc, char *argv[])
 	struct File *f = malloc(sizeof(struct File));
 	f->saved=true;
 
-	struct Change *ch = malloc(sizeof(struct Change));
+	if (argc)
+	{
+		strcpy(f->path, argv[1]);
+		open(w, f);
+	}
 
+	//Initialize curses
 	initialize_editor();
-	while(1)
+	while(1)	//Run until user quits application
 	{
-		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
-		
-		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;
-			case NOT_SAVED:
-				if(msg_box(w, "File not saved! Do you want to continue?"))
-				{
-					strcpy(f->path, "");
-					mode=svdmd;
-				}
-				else
-					mode=EDIT_MODE;
-				break;
-			case OPEN_FILE:
-				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:", "New File");
-				if(!dialog_input(w,f->path))
-				{
-					new(w,f,c);
-					if (f->fp = fopen(f->path, "w"))
-					{
-						f->ro=false;
-						fclose(f->fp);
-					}
-					mode=EDIT_MODE;
-				}
-				break;
-			case DEL_LINE:
-				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;
-		}
+		run_mode(mode, w, c, f);	//Print to the console according to our mode of operation
 		refresh();
 		clear();
 	}

print.c

@@ -22,7 +22,8 @@
  */
 #include "edit.h"
 
-void initialize_editor()	//Initialize NCurses
+void initialize_editor()
+//Initialize curses
 {
 	initscr();						//Initialize screen and curses mode
 	if (has_colors() == FALSE)				//Check to see if the console supports colored print, if not, then execute the following segment
@@ -35,10 +36,14 @@ void initialize_editor()	//Initialize NCurses
 	init_pair(EDITOR_SCHEME, COLOR_BLACK, COLOR_WHITE);	//Initialize color pair of black text on a white background (for editor)
 	init_pair(BOUNDARY_SCHEME, COLOR_BLACK, COLOR_CYAN);	//Initialize color pair of black text on a cyan background (for top and bottom boundaries)
 	keypad(stdscr, TRUE);
-	noecho();
+	cbreak();
+	curs_set(1);
 }
 
-void border_line_print(int r, char *t, struct Window *w)	//Print a Cyan line at row "r" with text "t", with restrictions of Window "w"
+void border_line_print(int r, char *t, struct Window *w)
+/*Print a Cyan line at row "r" with text "t", with
+ *restrictions of Window "w"
+ */
 {
 	attrset(COLOR_PAIR(BOUNDARY_SCHEME));		//Turn on attribute for the boundary color scheme
 	move(r, 0);					//Set cursor to the beginning of the line for the y-position "row"
@@ -50,7 +55,10 @@ void border_line_print(int r, char *t, struct Window *w)	//Print a Cyan line at
 	move(r, 0);					//Move the cursor back to the beginning of the line of the first row printed
 }
 
-void content_line_print(int r, struct Window *w, struct Cursor *c)	//Print line at row "r" with text "t", with restrictions and contents of Window "w", using cursor position x,y
+void content_line_print(int r, struct Window *w, struct Cursor *c)
+/*Print line at row "r" with text "t", with restrictions and
+ *contents of Window "w", using cursor position x,y
+ */
 {
 	long i = 0, j;
 
@@ -73,6 +81,7 @@ void content_line_print(int r, struct Window *w, struct Cursor *c)	//Print line
 }
 
 void print_contents(struct Window *w, struct Cursor *c, struct File *f)
+//Used to print all of the regular editor contents
 {
     int i=0;
     while (i<w->height-2)
@@ -84,6 +93,9 @@ void print_contents(struct Window *w, struct Cursor *c, struct File *f)
 }
 
 bool msg_box(struct Window *w, char *msg)
+/*A very cimple continue/cancel message
+ *window
+ */
 {
 	attrset(COLOR_PAIR(BOUNDARY_SCHEME));
 	move(0,0);
@@ -104,6 +116,11 @@ bool msg_box(struct Window *w, char *msg)
 }
 
 void dialog(struct Window *w, char *prompt, char *msg)
+/*Prints a string msg on the top line
+ *and prompt on the bottom. Used equally
+ *for drawing the regular editor as well
+ *as for various prompts
+ */
 {
 	attrset(COLOR_PAIR(EDITOR_SCHEME));
 	move(0, 0);
@@ -114,3 +131,64 @@ void dialog(struct Window *w, char *prompt, char *msg)
 	move(w->height-1, strlen(prompt));
 }
 
+void run_mode(int m, struct Window *w, struct Cursor *c, struct File *f)
+/*Prints to the console the coresponding output
+ *based upon the current given mode of operation
+ */
+{
+	switch (m)
+	{
+		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;
+		case NOT_SAVED:
+			if(msg_box(w, "File not saved! Do you want to continue?"))
+			{
+				strcpy(f->path, "");
+				m=svdmd;
+			}
+			else
+				m=EDIT_MODE;
+			break;
+		case OPEN_FILE:
+			dialog(w, "File path:", "Open File");
+			if(!dialog_input(w,f->path))
+			{
+				open(w,f);
+				m=EDIT_MODE;
+			}
+			break;
+		case NEW_FILE:
+			dialog(w, "File path:", "New File");
+			if(!dialog_input(w,f->path))
+			{
+				new(w,f,c);
+				if (f->fp = fopen(f->path, "w"))
+				{
+					f->ro=false;
+					fclose(f->fp);
+				}
+				m=EDIT_MODE;
+			}
+			break;
+		case DEL_LINE:
+			dialog(w, "Line number:", "Delete Line");
+			if(!dialog_input(w,ln))
+			{
+				del_line(atoi(ln)-1, w->contents);
+				m=EDIT_MODE;
+			}
+			break;
+		case SAVE_AS:
+			dialog(w, "File path:", "Save As");
+			if(!dialog_input(w,f->path))
+			{
+				save(w, f);
+				m=EDIT_MODE;
+			}
+			break;
+	}
+}
+

text.c

@@ -94,12 +94,14 @@ void ins_char(int pos, char k, char *str)
 }
 
 void del_char(struct Window *w, struct Cursor *c)
+//Deletes a given character
 {
 	key_left(w,c);
 	for(int pos=c->abs;w->contents[pos]!='\0'; pos++) w->contents[pos]=w->contents[pos+1];
 }
 
 void del_line(int line, char *text)
+//Deletes a given line
 {
 	int start = get_line_number_pos(line, text);
 	int diff = get_end_of_line(start, text)-start+1;