From 54fbed833005cf4933108160a0175df4d42f5df7 Mon Sep 17 00:00:00 2001 From: Simon <33755707+Crotex@users.noreply.github.com> Date: Thu, 9 Jan 2020 14:12:58 +0100 Subject: [PATCH] Added paging - Navigation via 'm' and 'n' --- menu.c | 85 +++++++++++++++++++++++++++++++++++----------------------- menu.h | 19 ++++++++++--- 2 files changed, 66 insertions(+), 38 deletions(-) diff --git a/menu.c b/menu.c index c516898..982c135 100644 --- a/menu.c +++ b/menu.c @@ -40,11 +40,59 @@ void get_console_dimensions(int* width, int* height) *height = csbi.srWindow.Bottom - csbi.srWindow.Top + 1; } -void show_menu(const int itemc, const struct MenuItem itemv[], const char title[], const bool loopback, const bool pause, const struct MenuBorder *border) +void page(const struct MenuPage *pages, const size_t page_count) { + unsigned int page_index = 0; + bool action_performed, loop, pageChanged = true; + char pageKey, itemKey; + + do { + do { + show_menu(pages[page_index].item_count, pages[page_index].items, pages[page_index].title, pages[page_index].border); + + // Wait for user selection + putchar('>'); + putchar(' '); + + loop = pages[page_index].loopback; + pageKey = _getch(); + + if (pageKey == 'm') + page_index < page_count - 1 ? page_index++ : page_index; + else if (pageKey == 'n') + page_index > 0 ? page_index-- : page_index; + else { + pageChanged = false; + itemKey = pageKey; + do { + action_performed = false; + + itemKey != pageKey ? itemKey = _getch() : pageKey; + pageKey = 0; + for (int i = 0; i < pages[page_index].item_count; ++i) { + if (pages[page_index].items[i].key == itemKey) { + // Perform action + system("cls"); + pages[page_index].items[i].action(); + action_performed = true; + + // Pause if requested + if (pages[page_index].pause) { + putchar('\n'); + system("pause"); + } + } + } + } while (!action_performed); + } + } while (loop || pageChanged); + + page_index = 0; + } while (1); +} + +void show_menu(const int itemc, const struct MenuItem itemv[], const char title[], const struct MenuBorder *border) { unsigned width, height, item_index; - char key; - bool action_performed; // Clear the console window system("cls"); @@ -132,35 +180,4 @@ void show_menu(const int itemc, const struct MenuItem itemv[], const char title[ i != height - 2 ? putchar(border->line_vertical) : putchar(' '); } } - - // Wait for user selection - putchar('>'); - putchar(' '); - action_performed = false; - do { - key = _getch(); - for (int i = 0; i < itemc; ++i) - { - if (itemv[i].key == key) - { - // Perform action - system("cls"); - itemv[i].action(); - action_performed = true; - - // Pause if requested - if (pause) - { - putchar('\n'); - system("pause"); - } - } - } - } while (!action_performed); - - // Show menu again if requested - if (loopback) - { - show_menu(itemc, itemv, title, loopback, pause, border); - } } \ No newline at end of file diff --git a/menu.h b/menu.h index 67c905a..92981a7 100644 --- a/menu.h +++ b/menu.h @@ -2,6 +2,8 @@ #include "pch.h" + + /// Represents one menu item in a menu. struct MenuItem { char* text; @@ -9,6 +11,8 @@ struct MenuItem { void* (*action)(void); }; + + /// Represents a border in which a menu is displayed. struct MenuBorder { char line_vertical; @@ -23,11 +27,18 @@ struct MenuBorder { const extern struct MenuBorder DEFAULT, MODERN, NO_BORDER, SOLID; -/// Displaces a CUI menu to the user and lets them choose an option, then calls the corresponding function. +/// Represents a page in the menu. +struct MenuPage { + const struct MenuItem* items; + const size_t item_count; + char* title; + bool loopback, pause; + const struct MenuBorder* border; +}; + +/// Displaces a CUI menu to the user /// The length of the array itemv of menu items. /// An array of all menu items to display in the menu. /// The title of the menu. -/// If this parameter is set to true, the menu will be displayed again after an action is executed. -/// If this parameter is set to true, a pausecommand will be run after an action is executed. /// Specifies the border in which the menu is displayed. -void show_menu(const int itemc, const struct MenuItem itemv[], const char title[], const bool loopback, const bool pause, const struct MenuBorder *border); \ No newline at end of file +void show_menu(const int itemc, const struct MenuItem itemv[], const char title[], const struct MenuBorder *border); \ No newline at end of file