diff --git a/FemMonitor/main.c b/FemMonitor/main.c index e11ad68..b1e0f0c 100644 --- a/FemMonitor/main.c +++ b/FemMonitor/main.c @@ -18,6 +18,7 @@ #include "common.h" #include "company.h" #include "mail.h" +#include "numbers.h" #define KEY_QUIT 'q' @@ -65,15 +66,17 @@ int main(int argc, const char* argv[]) // setup various status windows // the bottom windows will be one row shorter to fit the status line at the end - WINDOW* topleft = create_newwin(LINES/3, COLS/2, 0, 0); - WINDOW* midleft = create_newwin(LINES/3, COLS/2, LINES/3, 0); - WINDOW* botleft = create_newwin(LINES/3 - 1, COLS/2, LINES*2/3, 0); + WINDOW* topleft = create_newwin(LINES/4, COLS/2, 0, 0); + WINDOW* topmidleft = create_newwin(LINES/4, COLS/2, LINES/4, 0); + WINDOW* botmidleft = create_newwin(LINES/4, COLS/2, LINES*2/4, 0); + WINDOW* botleft = create_newwin(LINES/4 - 1, COLS/2, LINES*3/4, 0); WINDOW* topright = create_newwin(LINES/2, COLS/2, 0, COLS/2); WINDOW* botright = create_newwin(LINES/2 - 1, COLS/2, LINES/2, COLS/2); - company_init(topleft, LINES/3, COLS/2); - bool_init(midleft, LINES/3, COLS/2); - mail_init(botleft, LINES/3 - 1, COLS/2); + company_init(topleft, LINES/4, COLS/2); + numbers_init(topmidleft, LINES/4, COLS/2); + bool_init(botmidleft, LINES/4, COLS/2); + mail_init(botleft, LINES/4 - 1, COLS/2); booru_init(botright, LINES/2 - 1, COLS/2); time_t t; @@ -81,10 +84,11 @@ int main(int argc, const char* argv[]) char ch; while ((ch = tolower(getch())) != KEY_QUIT) { - bool_refresh(NULL); - booru_refresh(NULL); - mail_refresh(NULL); company_refresh(NULL); + numbers_refresh(NULL); + bool_refresh(NULL); + mail_refresh(NULL); + booru_refresh(NULL); time(&t); tm = *localtime(&t); @@ -104,6 +108,7 @@ int main(int argc, const char* argv[]) bool_destroy(); booru_destroy(); mail_destroy(); + numbers_destroy(); company_destroy(); destroy_win(topleft); diff --git a/FemMonitor/numbers.c b/FemMonitor/numbers.c new file mode 100644 index 0000000..3532d9a --- /dev/null +++ b/FemMonitor/numbers.c @@ -0,0 +1,31 @@ +#include +#include + +#include "common.h" +#include "numbers.h" + + +static WINDOW* window = NULL; +static int height; +static int width; + +void numbers_init(WINDOW* win, int h, int w) +{ + window = win; + height = h; + width = w; + + mvwprintw(window, 0, START_COL, " Number Research "); + wrefresh(window); +} + +void* numbers_refresh(void* arg) +{ + srand((unsigned) time(NULL)); + mvwprintw(window, START_ROW, START_COL, "%d", rand()); + wrefresh(window); +} + +void numbers_destroy() +{ +} diff --git a/FemMonitor/numbers.h b/FemMonitor/numbers.h new file mode 100644 index 0000000..4c26bfe --- /dev/null +++ b/FemMonitor/numbers.h @@ -0,0 +1,10 @@ +#ifndef numbers_h +#define numbers_h + +#include + +void numbers_init(WINDOW* win, int h, int w); +void* numbers_refresh(void* arg); +void numbers_destroy(void); + +#endif /* numbers_h */