Completed the clues across and down functionality

Completed impelementing the clues across nd down
functionality

diff --git a/constantstrings.h b/constantstrings.h
index c8d3b58..eb4270f 100644 (file)
--- a/constantstrings.h
+++ b/constantstrings.h
@@ -21,6 +21,8 @@
 #define INVALID_WORD "Word contains illegal characters. Only alphabets allowed!"
 #define FILE_SAVED "File saved successfully"
 #define NO_WORD_INDEX "No such word with specified index" 
+#define INPUT_CONFIRM_EXIT "Are you sure you wish to exit? \
+Unsaved changes will be lost [y/N]"
 
 char *MAIN_MENU[] = 
                                        {"1. New puzzle",
@@ -35,7 +37,8 @@ char *PUZZLE_EDIT_MENU[] =
                                        "5. Freeze grid", 
                                        "6. Unfreeze grid",
                                        "7. Set Clue - Across Word",
-                                       "8. Save puzzle",
-                                       "9. Return to main menu" };
+                                       "8. Set Clue - Down Word",
+                                       "9. Save puzzle",
+                                       "10.Return to main menu" };
 
 #endif

diff --git a/wordblox.c b/wordblox.c
index 6ad88e1..ffbf471 100644 (file)
--- a/wordblox.c
+++ b/wordblox.c
@@ -8,7 +8,7 @@
 #include "wordblox.h"
 #include "constantstrings.h"
 
-void set_clue_across_word (Puzzle *p)
+void set_clue_word (Puzzle *p, enum ORIENTATION orient)
 {
        print_puzzle (p);
        if (p->grid_frozen == false)
@@ -25,7 +25,9 @@ void set_clue_across_word (Puzzle *p)
        fgets (clue, MAX_CLUE_LENGTH, stdin);
        char* cl = strtok (clue, "\n");
        
-       bool res = set_across_clue (p, cl, index);
+       bool res;
+       res = set_clue (p, cl, index, orient);
+
        if (res == false)
                printf (NO_WORD_INDEX);
 }
@@ -147,13 +149,25 @@ void add_across_word (Puzzle *p)
        print_puzzle (p);
        char ch = getchar ();
 }
+/* confirm exit */
+bool confirm_exit ()
+{
+       printf (INPUT_CONFIRM_EXIT);
+       char res[2];
+       fgets (res, 2, stdin);
+       if (toupper(res[0]) == 'Y')
+               return true;
+       else
+               return false;
+} 
 
+/* main loop for the puzzle editor */
 void puzzle_editor_loop (Puzzle *p, const char *filename) 
 {
        bool loop = true;
        while (loop) 
        {
-               print_menu (WHITE, RED, PUZZLE_MENU_TITLE, PUZZLE_EDIT_MENU, 9, 50);
+               print_menu (WHITE, RED, PUZZLE_MENU_TITLE, PUZZLE_EDIT_MENU, 10, 50);
                printf (INPUT_CHOICE);
                int ch = get_num ();
                switch (ch)
@@ -175,15 +189,19 @@ void puzzle_editor_loop (Puzzle *p, const char *filename)
                                        print_puzzle (p);
                                        ch = getchar ();
                                        break;
-                       case 7: set_clue_across_word (p);
+                       case 7: set_clue_word (p, ACROSS);
+                                       print_puzzle (p);
+                                       ch = getchar ();
+                                       break;
+                       case 8: set_clue_word (p, DOWN);
                                        print_puzzle (p);
                                        ch = getchar ();
                                        break;
-                       case 8: save_puzzle (p, filename);
+                       case 9: save_puzzle (p, filename);
                                        printf ("%s\n",FILE_SAVED);
                                        ch = getchar ();
                                        break;
-                       case 9: loop = false;
+                       case 10: loop = !confirm_exit ();
                                        break;
                }
        }

diff --git a/wordblox.h b/wordblox.h
index bde57c3..f7cd6d2 100644 (file)
--- a/wordblox.h
+++ b/wordblox.h
@@ -18,6 +18,16 @@ enum COLOR {
        WHITE=7
 };
 
+enum ATTR {
+       NORMAL = 23,
+       BOLD=1
+};
+
+enum ORIENTATION {
+       ACROSS=1,
+       DOWN=2
+};
+
 typedef char String[MAX_CLUE_LENGTH];
 
 /* The main puzzle struct type */
@@ -40,8 +50,8 @@ int get_num ()
 }
 
 /* Set the terminal colour */
-void set_color (enum COLOR fg, enum COLOR bg) {
-       printf ("\x1B[%d;%dm", fg+30, bg+40);
+void set_color (enum COLOR fg, enum COLOR bg, enum ATTR at) {
+       printf ("\x1B[%d;%d;%dm", fg+30, bg+40, at);
 }
 
 /* Reset the terminal colour */
@@ -188,7 +198,7 @@ Puzzle load_puzzle (const char* file) {
 void print_puzzle (Puzzle *p) 
 {
        printf ("\n");
-       set_color (WHITE, CYAN);
+       set_color (WHITE, CYAN, NORMAL);
        printf ("    ");
        for (int i = 0; i < p->grid_size; i ++)
                printf ("%3d", i);
@@ -196,12 +206,12 @@ void print_puzzle (Puzzle *p)
        printf("\n");
        for (int i = 0; i < p->grid_size; i ++)
        {
-               set_color (WHITE, CYAN);
+               set_color (WHITE, CYAN, NORMAL);
                printf ("%3d ", i);
                for (int j = 0; j < p->grid_size; j ++) 
                {
                        if (p->chars[i][j] == '#') {
-                               set_color (WHITE, BLACK);
+                               set_color (WHITE, BLACK, NORMAL);
                                printf ("   ");
                        }
                        else 
@@ -209,7 +219,7 @@ void print_puzzle (Puzzle *p)
                                if (p->start_across_word[i][j] != -1 || 
                                        p->start_down_word[i][j] != -1) 
                                {
-                                       set_color (BLUE, WHITE);
+                                       set_color (BLUE, WHITE, NORMAL);
                                        if (p->start_across_word[i][j] != -1)
                                                printf ("%-2d", p->start_across_word[i][j]);
                                        else 
@@ -217,11 +227,11 @@ void print_puzzle (Puzzle *p)
                                }
                                else
                                {
-                                       set_color (BLACK, WHITE);
+                                       set_color (BLACK, WHITE,NORMAL);
                                        printf ("  ");
                                }
                                        
-                               set_color (BLACK, WHITE);
+                               set_color (BLACK, WHITE, BOLD);
                                printf ("%c", p->chars[i][j]);
                        }
                        reset_color ();
@@ -231,7 +241,7 @@ void print_puzzle (Puzzle *p)
        /* print the clues if set */
        if (p->grid_frozen == true) 
        {
-               printf ("ACROSS - CLUES\n");
+               printf ("\x1B[1mACROSS - CLUES\x1B[0m\n");
                for (int i = 0; i < p->grid_size; i ++)
                {
                        for (int j = 0; j < p->grid_size; j ++)
@@ -243,7 +253,7 @@ void print_puzzle (Puzzle *p)
                                }
                        }
                }
-               printf ("\nDOWN - CLUES\n");
+               printf ("\n\x1B[1mDOWN - CLUES\x1B[0m\n");
                for (int i = 0; i < p->grid_size; i ++)
                {
                        for (int j = 0; j < p->grid_size; j ++)
@@ -269,18 +279,30 @@ bool is_valid_word (const char *word)
        return true;
 }
 
-/* function set a clue for an across word */
-bool set_across_clue (Puzzle *p, String clue, int index) 
+
+/* function to set a clue for an across word */
+bool set_clue (Puzzle *p, String clue, int index, enum ORIENTATION order) 
 {
        for (int i = 0; i < p->grid_size; i ++)
        {
                for (int j = 0; j < p->grid_size; j ++)
                {
-                       if (p->start_across_word[i][j] == index)
+                       if (order == ACROSS)
                        {
-                               strcpy (p->clue_across[i][j], clue);
-                               return true;
-                       }       
+                               if (p->start_across_word[i][j] == index)
+                               {
+                                       strcpy (p->clue_across[i][j], clue);
+                                       return true;
+                               }
+                       }
+                       else if (order == DOWN)
+                       {
+                               if (p->start_down_word[i][j] == index)
+                               {
+                                       strcpy (p->clue_down[i][j], clue);
+                                       return true;
+                               }
+                       }               
                }
        }
        return false;
@@ -292,16 +314,16 @@ void print_menu (enum COLOR fg, enum COLOR bg, const char* title,
 {
                /* clear screen */
                printf ("\e[1;1H\e[2J");
-               set_color (fg, bg);
+               set_color (fg, bg, NORMAL);
                printf ("\u2554");
                for (int i = 0; i < padding; i ++)
                        printf ("\u2550");
                printf ("\u2557"); 
                reset_color (); printf ("\n");
-               set_color (fg, bg);
+               set_color (fg, bg, BOLD);
                printf ("\u2551%-*s\u2551", padding, title);
                reset_color (); printf ("\n");
-               set_color (fg, bg);
+               set_color (fg, bg, NORMAL);
                printf ("\u2560");
                for (int i = 0; i < padding; i ++)
                        printf ("\u2550");
@@ -309,11 +331,11 @@ void print_menu (enum COLOR fg, enum COLOR bg, const char* title,
                reset_color (); printf ("\n");
                for (int i = 0; i < num_items; i ++) 
                {
-                       set_color (fg, bg);
+                       set_color (fg, bg, NORMAL);
                        printf ("\u2551%-*s\u2551", padding, items[i]);
                        reset_color (); printf ("\n");
                }
-               set_color (fg, bg);
+               set_color (fg, bg, NORMAL);
                printf ("\u255A");
                for (int i = 0; i < padding; i ++)
                        printf ("\u2550");