projects
/
wordblah.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Completed the clues across and down functionality
[wordblah.git]
/
wordblox.h
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
};
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 */
typedef char String[MAX_CLUE_LENGTH];
/* The main puzzle struct type */
@@
-40,8
+50,8
@@
int get_num ()
}
/* Set the terminal colour */
}
/* Set the terminal colour */
-void set_color (enum COLOR fg, enum COLOR bg) {
- printf ("\x1B[%d;%d
m", 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 */
}
/* Reset the terminal colour */
@@
-188,7
+198,7
@@
Puzzle load_puzzle (const char* file) {
void print_puzzle (Puzzle *p)
{
printf ("\n");
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);
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 ++)
{
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] == '#') {
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
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)
{
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
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
{
}
else
{
- set_color (BLACK, WHITE);
+ set_color (BLACK, WHITE
,NORMAL
);
printf (" ");
}
printf (" ");
}
- set_color (BLACK, WHITE);
+ set_color (BLACK, WHITE
, BOLD
);
printf ("%c", p->chars[i][j]);
}
reset_color ();
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)
{
/* 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 ++)
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 ("\n
DOWN - 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 ++)
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;
}
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 ++)
{
{
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;
}
}
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");
{
/* 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");
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");
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");
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 ++)
{
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");
}
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");
printf ("\u255A");
for (int i = 0; i < padding; i ++)
printf ("\u2550");