Merge branch 'dev' into master

Author: shawn-grant

ConsolePrettify.depend

@@ -1,8 +1,8 @@
 # depslib dependency file v1.0
-1612746085 source:c:\users\corne\documents\c_projects\consoleprettify\prettify_functions.c
+1612834203 source:c:\users\corne\documents\c_projects\consoleprettify\prettify_functions.c
 	"ConsolePrettify.h"
 
-1612745298 c:\users\corne\documents\c_projects\consoleprettify\consoleprettify.h
+1612829669 c:\users\corne\documents\c_projects\consoleprettify\consoleprettify.h
 	<stdio.h>
 	<stdlib.h>
 	<string.h>
@@ -18,12 +18,12 @@
 	<stdbool.h>
 	"CYPHER.H"
 
-1612753080 source:c:\users\corne\documents\c_projects\consoleprettify\main.c
+1612830218 source:c:\users\corne\documents\c_projects\consoleprettify\main.c
 	<stdio.h>
 	<stdlib.h>
 	<math.h>
 	"ConsolePrettify.h"
 
-1601352266 source:c:\users\corne\documents\c_projects\consoleprettify\prettify_extras.c
+1612831493 source:c:\users\corne\documents\c_projects\consoleprettify\prettify_extras.c
 	"ConsolePrettify.h"
 

ConsolePrettify.h

@@ -70,6 +70,7 @@ void cp_table(char *, ...);
 
 //menu
 int cp_menu(char *, int, ...);
+int cp_menu2(char *, int, ...);
 
 //ordered lists
 void cp_ilist(char *, int[], int);
@@ -78,4 +79,6 @@ void cp_dlist(char *, double[], int);
 void cp_clist(char *, char[], int);
 void cp_slist(char *, char[][MAX_ARRAY_LENGTH], int);
 
+void repeatChar (char ch, char* ends, char* prefix, int times);
+
 #endif // CONSOLEPRETTIFY_H_INCLUDED

README.md

@@ -20,22 +20,25 @@ _input_
 `cp_password(variable)` | string input box with masking eg. *****
 _selection_
 `cp_menu(title, numOptions, ...)` | Displays a menu and returns the number of the selected option
+`cp_menu2(title, numOptions, ...)` | cp_menu but uses arrow keys for selection
 _lists_
 `cp_ilist(title, items, numItems)` | Displays an ordered list of integers
 `cp_flist(title, items, numItems)` | Displays an ordered list of floats
 `cp_clist(title, items, numItems)` | Displays an ordered list of characters
 `cp_slist(title, items, numItems)` | Displays an ordered list of strings
 
 ---
-> _**NOTE**: Please use `cp_textcolor()` instaed of system("color xx")._ 
+> _**NOTE**: Please use `cp_textcolor()` instaed of system("color xx")_
 
 > _**NOTE**: `cp_textbox()` accepts ONE variable. Do not use multiple specifiers_
 
+> _**NOTE**: Using newlines(\n) in `cp_menu`, `cp_menu2`, or `cp_print` will mess up the formatting_
+
 <br>
 
 ## Available Colors 🌈
-use any of these constants as the color arguments of prettify functions
-Constant Name | Value
+use any of these constants as the color argument of `cp_textcolor()`
+Constant Name | _
 --- | --- 
 RED | 12
 GREEN |  10
@@ -49,6 +52,8 @@ CYAN | 3
 GRAY | 7
 DARK_GRAY | 8
 
+Example: `cp_textcolor (BLUE);`
+
 <br>
 
 # Examples
@@ -69,11 +74,19 @@ cp_password (testString);
 
 ## Menus
 ```c
+//normal menu
 int choice = cp_menu("Select an option", 4,
                   "Buy bananas",
                   "Buy apple",
                   "Buy mango",
                   "Buy grapes");
+//arrow key selection menu
+choice = cp_menu2("Select an option", 5,
+                  "Buy bananas",
+                  "Buy apple",
+                  "Buy mango",
+                  "Buy grapes",
+                  "Buy Bananas");
 ```
 ![Output](images/output2.gif)
 
@@ -83,7 +96,7 @@ int choice = cp_menu("Select an option", 4,
 float items[20] = {200, 10, 80, 900, 20, 10, 80, 900, 209, 50};
 cp_flist ("List of numbers", items, 10);
 ```
->![Output](images/output3.gif)
+![Output](images/output3.gif)
 
 ## TODO
 - Add automatic Table printing

main.c

@@ -14,23 +14,24 @@ int main()
     char testString[25];
 
     cp_textcolor (GREEN); //change color
-    //cp_print("\b HELLO TO %s\n", "CONSOLE PRETTIFY");
+    cp_print("\b HELLO TO %s", "CONSOLE PRETTIFY");
+
+    cp_menu2("Select an option", 5,
+                  "Buy bananas",
+                  "Buy apple",
+                  "Buy mango",
+                  "Buy grapes",
+                  "Buy Bananas");
+
+    cp_textcolor(BLUE);
+
 
     printf (" Enter your username");
     cp_textbox ("%s", testString);
 
     printf (" Enter your password:");
     cp_password (testString);
 
-    system("cls");
-
-    /////////////////////////////////
-    int choice = cp_menu("Select an option", 4,
-                  "Buy bananas",
-                  "Buy apple",
-                  "Buy mango",
-                  "Buy grapes");
-
     ////////////////////////////////
     /*float items[20] = {200, 10, 80, 900, 20, 10, 80, 900, 209, 50};
     cp_flist("List of numbers", items, 10);

prettify_extras.c

@@ -15,7 +15,7 @@
 
     ////////////////README/////////////////
     //////////////////////////////////////
-    THIS FILE EXTENDS THE FUNCTIONS OF THE CONSOLE_PRETTIFY FRAMEWORK.
+    THIS FILE EXTENDS THE FUNCTIONS OF THE CONSOLE_PRETTIFY TOOL.
     PRETTIFY_EXTRAS COMBINES FUNCTIONS FROM PRETTIFY AS WELL AS INTRODUCES NEW FUNCTIONS TO CREATE MORE COMPLEX USER INTERFACES
 
     NOTE: prettify_functions.c and ConsolePrettify.h MUST BE PRESENT IN YOUR PROJECT

prettify_functions.c

@@ -28,10 +28,6 @@ void error(char function[25], char msg[100])
     exit(EXIT_FAILURE);
 }
 
-void cp_setCentered(int isCentered)
-{
-
-}
 
 // CHANGES TEXT COLOR
 void cp_textcolor(int COLOR){
@@ -209,6 +205,90 @@ int cp_menu(char *title, int numOptions, ...)
     }
 }
 
+int cp_menu2(char *title, int numOptions, ...)
+{
+    int i, position;
+    int maxLength = strlen(title);
+    //if its the 20th option thn, then digitsInOption will be 2
+    char key;
+    va_list args;
+    COORD coord;//where to put the cursor
+    CONSOLE_SCREEN_BUFFER_INFO cursor;//the cursor
+
+    fflush(stdin);
+
+    va_start(args, numOptions);
+
+    if (strlen("Use arrow keys") > maxLength)
+        maxLength = strlen("Use arrow keys");
+
+    //find the longest text to be displayed
+    for (i = 0; i < numOptions; i++)
+    {
+        int len = strlen(va_arg(args, char *));
+        if(len > maxLength)
+            maxLength = len;
+    }
+
+    maxLength += 5;
+    repeatChar('_', " ", "\n ", maxLength + 2);
+    printf ("\n | %-*s |", maxLength, title);
+    repeatChar('-', "|", "\n ", maxLength + 2);
+
+    //list the options
+    va_start(args, numOptions);
+    for (i = 1; i <= numOptions; i++)
+    {
+        char* option = va_arg(args, char *);
+        printf("\n |   %-*s|", maxLength -1 , option);
+    }
+
+    va_end(args);
+
+    //textbox part
+    repeatChar('_', "|", "\n ", maxLength + 2);
+    printf("\n | %-*s|", maxLength+1, "Use arrow keys");
+    repeatChar('_', "|", "\n ", maxLength + 2);
+
+    //move cursor to first option
+    GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &cursor);
+    coord.X = 3;
+    coord.Y = cursor.dwCursorPosition.Y - numOptions - 2;
+    SetConsoleCursorPosition(GetStdHandle(STD_OUTPUT_HANDLE), coord);
+
+    position = 1;
+    while ((key = getch()) != '\r'){
+
+        if (key == 72) //up arrow
+        {
+            if (position != 1)
+            {
+                position--;
+                //move the cursor to the correct option
+                coord.Y --;
+                SetConsoleCursorPosition(GetStdHandle(STD_OUTPUT_HANDLE), coord);
+            }
+        }
+        else if (key == 80) //down arrow
+        {
+            if (position != numOptions)
+            {
+                position++;
+                coord.Y ++;
+                SetConsoleCursorPosition(GetStdHandle(STD_OUTPUT_HANDLE), coord);
+            }
+        }
+    }
+
+    ///re-place the cursor outside the box
+    GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &cursor); //get the cursor
+    coord.X = 0;
+    coord.Y = cursor.dwCursorPosition.Y + (numOptions - position) + 5;
+
+    SetConsoleCursorPosition(GetStdHandle(STD_OUTPUT_HANDLE), coord);
+
+    return position;
+}
 
 //DISPLAYS AN ORDERED LIST
 /// EX. cp_ilist("Select an option", items, 3);
@@ -381,6 +461,7 @@ void cp_print(char *format, ...)
     centerPos.X = (screenWwidth - strlen(format)) / 2;
     centerPos.Y = csbi.dwCursorPosition.Y;
     SetConsoleCursorPosition(GetStdHandle(STD_OUTPUT_HANDLE), centerPos);
+
     /// print
     vprintf(format, args);