X-Git-Url: https://harishankar.org/repos/?p=wordblah.git;a=blobdiff_plain;f=wordblox.c;h=6ad88e1eb439767e95592284b5a2b295a57d4280;hp=174346d7145c237b444920dd7251383feee9f845;hb=d29b37aa1b82dbd3c4baa55396521296f4a88ef4;hpb=3657c15588e4b2607d9225659f66158d92a85262

diff --git a/wordblox.c b/wordblox.c
index 174346d..6ad88e1 100644
--- a/wordblox.c
+++ b/wordblox.c
@@ -8,67 +8,90 @@
 #include "wordblox.h"
 #include "constantstrings.h"
 
+void set_clue_across_word (Puzzle *p)
+{
+	print_puzzle (p);
+	if (p->grid_frozen == false)
+	{
+		printf (UNFROZEN_GRID);
+		char ch = getchar ();
+		return;
+	}
+	int index;
+	String clue; 
+	printf (INPUT_INDEX);
+	index = get_num ();
+	printf (INPUT_CLUE);
+	fgets (clue, MAX_CLUE_LENGTH, stdin);
+	char* cl = strtok (clue, "\n");
+	
+	bool res = set_across_clue (p, cl, index);
+	if (res == false)
+		printf (NO_WORD_INDEX);
+}
+
 /* clear a cell in the grid */
 void clear_cell (Puzzle *p)
 {
 	print_puzzle (p);
+	if (p->grid_frozen == true) 
+	{
+		printf (FROZEN_GRID);
+		char ch = getchar ();
+		return;
+	}
 	int row, col;
 	printf (INPUT_ROW);
-	scanf ("%d", &row);
+	row = get_num (); 
 	printf (INPUT_COL);
-	scanf ("%d", &col);
+	col = get_num ();
 	if (row >= p->grid_size || col >= p->grid_size)
 	{
 		printf (EXCEED_GRID_SIZE);
 		char ch = getchar ();
-		ch = getchar ();
 		return;
 	}
 	p->chars[row][col] = ' ';
 	print_puzzle (p);
 	
 	char ch = getchar ();
-	ch = getchar ();
 }
 
 /* add a down word to the grid */
 void add_down_word (Puzzle *p)
 {
 	print_puzzle (p);
-	if (p->grid_frozen) 
+	if (p->grid_frozen == true) 
 	{
 		printf (FROZEN_GRID);
 		char ch = getchar ();
-		ch = getchar ();
 		return;
 	}
-	char word[MAX_PUZZLE_SIZE];
+	char wd[MAX_PUZZLE_SIZE];
 	int row, col;
 	printf (INPUT_WORD);
-	scanf ("%s", word);
+	fgets (wd, MAX_PUZZLE_SIZE, stdin);
+	char *word = strtok (wd, "\n");
 	if (! is_valid_word (word))
 	{
 		printf (INVALID_WORD);
 		char ch = getchar ();
-		ch = getchar ();
 		return;
 	}
 	printf (INPUT_ROW);
-	scanf ("%d", &row);
+	row = get_num ();
 	printf (INPUT_COL);
-	scanf ("%d", &col);
+	col = get_num ();
 	if (row >= p->grid_size || col >= p->grid_size) 
 	{
 		printf (EXCEED_GRID_SIZE);
 		char ch = getchar ();
-		ch = getchar ();
 		return;
 	}
 	if (strlen (word) > (p->grid_size - row))
 	{
 		printf (WORD_TOO_LONG);
 		char ch = getchar ();
-		ch = getchar ();
 		return;
 	}
 	
@@ -77,38 +100,37 @@ void add_down_word (Puzzle *p)
 	
 	print_puzzle (p);
 	char ch = getchar ();
-	ch = getchar ();
 }
 
 /* add an across word to the grid */
 void add_across_word (Puzzle *p)
 {
 	print_puzzle (p);
-	if (p->grid_frozen) 
+	if (p->grid_frozen == true) 
 	{
 		printf (FROZEN_GRID);
+		char ch = getchar ();
 		return;
 	}
-	char word[MAX_PUZZLE_SIZE];
+	char wd[MAX_PUZZLE_SIZE];
 	int row, col;	
 	printf (INPUT_WORD);
-	scanf ("%s", word);
+	fgets (wd, p->grid_size, stdin);
+	char *word = strtok (wd, "\n");
 	if (! is_valid_word (word))
 	{
 		printf (INVALID_WORD);
 		char ch = getchar ();
-		ch = getchar ();
 		return;
 	}	
 	printf (INPUT_ROW);
-	scanf ("%d", &row);
+	row = get_num ();
 	printf (INPUT_COL);
-	scanf ("%d", &col);
+	col = get_num ();
 	if (row >= p->grid_size || col >= p->grid_size)
 	{
 		printf (EXCEED_GRID_SIZE);
 		char ch = getchar ();
-		ch = getchar ();
 		return;
 	}
 	
@@ -116,7 +138,6 @@ void add_across_word (Puzzle *p)
 	{
 		printf (WORD_TOO_LONG);
 		char ch = getchar ();
-		ch = getchar ();
 		return;
 	}
 	
@@ -125,7 +146,6 @@ void add_across_word (Puzzle *p)
 		
 	print_puzzle (p);
 	char ch = getchar ();
-	ch = getchar ();
 }
 
 void puzzle_editor_loop (Puzzle *p, const char *filename) 
@@ -133,28 +153,38 @@ void puzzle_editor_loop (Puzzle *p, const char *filename)
 	bool loop = true;
 	while (loop) 
 	{
-		print_menu (WHITE, RED, PUZZLE_MENU_TITLE, PUZZLE_EDIT_MENU, 8, 50);
+		print_menu (WHITE, RED, PUZZLE_MENU_TITLE, PUZZLE_EDIT_MENU, 9, 50);
 		printf (INPUT_CHOICE);
-		char ch = getchar ();
+		int ch = get_num ();
 		switch (ch)
 		{
-			case '1': print_puzzle (p);
-					  char ch = getchar ();
-					  ch = getchar ();
-					  break;
-			case '2': add_across_word (p);
-					  break;
-			case '3': add_down_word (p);
-					  break;
-			case '4': clear_cell (p);
-					  break;
-			case '7': save_puzzle (p, filename);
-					  printf ("%s\n",FILE_SAVED);
-					  ch = getchar ();
-					  ch = getchar ();
-					  break;
-			case '8': loop = false;
-					  break;
+			case 1: print_puzzle (p);
+					char ch = getchar ();
+					break;
+			case 2: add_across_word (p);
+					break;
+			case 3: add_down_word (p);
+					break;
+			case 4: clear_cell (p);
+					break;
+			case 5: freeze_puzzle (p);
+					print_puzzle (p);
+					ch = getchar ();
+					break;
+			case 6: unfreeze_puzzle (p);
+					print_puzzle (p);
+					ch = getchar ();
+					break;
+			case 7: set_clue_across_word (p);
+					print_puzzle (p);
+					ch = getchar ();
+					break;
+			case 8: save_puzzle (p, filename);
+					printf ("%s\n",FILE_SAVED);
+					ch = getchar ();
+					break;
+			case 9: loop = false;
+					break;
 		}
 	}
 }
@@ -164,8 +194,9 @@ void open_puzzle ()
 {
 	Puzzle p;
 	printf (INPUT_FILE);
-	char filename[256];
-	scanf("%s", filename);
+	char fname[256];
+	fgets(fname, 256, stdin);
+	char* filename = strtok (fname, "\n");
 	p = load_puzzle (filename);
 	puzzle_editor_loop (&p, filename);
 }
@@ -175,15 +206,16 @@ void new_puzzle ()
 {
 	Puzzle p; 
 	printf (INPUT_FILE);
-	char filename[256]; 
-	scanf ("%s", filename);
+	char fname[256];
+	fgets (fname, 256, stdin);
+	char* filename = strtok (fname, "\n"); 
 	printf (INPUT_GRID_SIZE);
 	int size;
-	scanf ("%d", &size);
+	size = get_num ();
 	if (size > MAX_PUZZLE_SIZE) 
 	{ 
 		printf (EXCEED_MAX_GRID_SIZE);
-		char c = getchar (); c = getchar ();
+		char c = getchar (); 
 	}
 	else
 	{
@@ -200,14 +232,14 @@ int main_loop ()
 	{
 		print_menu (WHITE, BLUE, MAIN_MENU_TITLE, MAIN_MENU, 3, 50);
 		printf (INPUT_CHOICE);
-		char ch = getchar ();
+		int ch = get_num ();
 		switch (ch)
 		{
-			case '1': new_puzzle ();
-					  break;
-			case '2': open_puzzle ();
-					  break;
-			case '3': exit (0);
+			case 1: new_puzzle ();
+					break;
+			case 2: open_puzzle ();
+					break;
+			case 3: exit (0);
 		}
 	}
 }