version 0.7

Makefile

@@ -1,8 +1,7 @@
 # Compiler and flags
 CPPC = g++
 CPPC_FLAGS = -std=c++23 -s -O3 -lncursesw -lcurl -lmenu -lpanel -Wall -Wextra -Wno-write-strings
-# Debug flags:
-# CPPC_FLAGS = -ggdb -std=c++23 -lncursesw -lcurl -lmenu -lpanel -Wall -Wextra -Wno-write-strings
+DEBUG_FLAGS = -ggdb -std=c++23 -lncursesw -lcurl -lmenu -lpanel -Wall -Wextra -Wno-write-strings
 
 
 SRC_PATH := src
@@ -11,16 +10,18 @@ BIN_PATH := build/bin
 
 
 SRC_FILES := $(shell find $(SRC_PATH) -name '*.cpp')
-# Generate corresponding object file paths by replacing src/ with build/obj/
 OBJ_FILES := $(patsubst $(SRC_PATH)/%.cpp,$(OBJ_PATH)/%.o,$(SRC_FILES))
 
 
 all: make-build-dir $(BIN_PATH)/bakatui
 
 
+debug: CPPC_FLAGS = $(DEBUG_FLAGS)
+debug: make-build-dir $(BIN_PATH)/bakatui
+
+
 make-build-dir:
 	mkdir -p $(OBJ_PATH)
-	mkdir -p $(OBJ_PATH)/marks
 	mkdir -p $(BIN_PATH)
 
 
@@ -35,4 +36,4 @@ $(OBJ_PATH)/%.o: $(SRC_PATH)/%.cpp
 clean:
 	rm -fr build
 
-.PHONY: all clean install
+.PHONY: all clean install debug

README.md

@@ -3,6 +3,12 @@
 
 > ### Dependencies:
 > [nlohmann-json](https://github.com/nlohmann/json)  
+> ncurses  
 
 > [!IMPORTANT]  
-> Only marks work right now
+> Only folowing works:
+> - [x] Login  
+> - [x] Marks  
+> - [x] Timetable  
+> - [ ] Komens  
+> - [ ] Absence

src/const.h

@@ -1,7 +1,7 @@
 #include <string_view>
 #ifndef VERSION
 
-#define VERSION "0.5"
+#define VERSION "0.7"
 #define NAME "bakatui"
 
 inline constexpr auto hash_djb2a(const std::string_view sv) {

src/helper_funcs.cpp

@@ -9,9 +9,11 @@
 #include <fstream>
 #include <iostream>
 #include <locale>
+#include <panel.h>
 #include <string>
 #include <termios.h>
 #include <unistd.h>
+#include "main.h"
 
 void safe_exit(int code) {
   switch (code) {
@@ -149,7 +151,10 @@ void wprint_in_middle(WINDOW *win, int starty, int startx, int width,
   temp = (width - length) / 2;
   x = startx + (int)temp;
   wattron(win, color);
-  mvwaddwstr(win, y, x, string);
+  if (mvwaddwstr(win, y, x, string) == ERR) {
+    if(config.verbose){
+    std::wcerr << RED"[ERROR]"<< RESET" wprint_in_middle failed to print " << string << "\n";
+  }}
   wattroff(win, color);
   refresh();
 }
@@ -217,4 +222,16 @@ std::wstring string_to_wstring(const std::string &str) {
 std::string wstring_to_string(const std::wstring &wstr) {
   std::wstring_convert<std::codecvt_utf8<wchar_t>> converter;
   return converter.to_bytes(wstr);
-}
+}
+
+void move_panel_relative(PANEL *panel, int dy, int dx) {
+  WINDOW *win = panel_window(panel);
+  int y, x;
+
+  getbegyx(win, y, x);
+
+  int new_y = y + dy;
+  int new_x = x + dx;
+
+  move_panel(panel, new_y, new_x);
+}

src/main_menu.cpp

@@ -5,9 +5,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <curses.h>
-#include <locale>
 #include <menu.h>
-#include <string>
 
 #include "marks.h"
 

src/marks.cpp

@@ -8,8 +8,6 @@
 #include <cstring>
 #include <curses.h>
 #include <format>
-#include <iostream>
-#include <locale>
 #include <menu.h>
 #include <nlohmann/json.hpp>
 #include <panel.h>
@@ -47,6 +45,7 @@ void marks_page() {
   size_t size_my_panels = resp_from_api["Subjects"].size();
   my_panels = new (std::nothrow) PANEL *[size_my_panels];
 
+  // trows compiler warning for some reason but cannot be removed
   PANEL *top;
   int ch;
 
@@ -137,7 +136,7 @@ void init_wins(WINDOW **wins, int n, json marks_json) {
   x = DEFAULT_X_OFFSET;
   uint8_t curent_color = 0;
 
-  int MaxHight = 0;
+  unsigned int MaxHight = 0;
   // this loop through subjects
   for (i = 0; i < n; ++i) {
 
@@ -154,7 +153,7 @@ void init_wins(WINDOW **wins, int n, json marks_json) {
              wsub_name.c_str(), wsub_avg_s.c_str());
 
     size_t max_text_length = wcslen(label);
-    for (int j = 0; j < marks_json["Subjects"][i]["Marks"].size(); j++) {
+    for (unsigned int j = 0; j < static_cast<unsigned int>(marks_json["Subjects"][i]["Marks"].size()); j++) {
       std::string caption =
           rm_tr_le_whitespace(marks_json["Subjects"][i]["Marks"][j]["Caption"]);
       std::string theme =
@@ -179,8 +178,7 @@ void init_wins(WINDOW **wins, int n, json marks_json) {
       MaxHight = 0;
     }
 
-    if (marks_json["Subjects"][i]["Marks"].size() * 2 + DEFAULT_PADDING >
-        MaxHight) {
+    if (static_cast<unsigned int>(marks_json["Subjects"][i]["Marks"].size()) * 2 + DEFAULT_PADDING > MaxHight) {
       MaxHight =
           marks_json["Subjects"][i]["Marks"].size() * 2 + DEFAULT_PADDING;
     }
@@ -198,6 +196,8 @@ void init_wins(WINDOW **wins, int n, json marks_json) {
 /* Show the window with a border and a label */
 void win_show(WINDOW *win, wchar_t *label, int label_color, int width,
               int height, json marks_json, int SubjectIndex) {
+  
+  // is the compiler smoking weed or something, why is it thinking starty is not used ??
   int startx, starty;
 
   wresize(win, height, width);

src/net.cpp

@@ -129,8 +129,9 @@ void login(std::string username, std::string password) {
 }
 
 void refresh_access_token() {
-  // DEBUG
+  if(config.verbose) {
   std::clog << "refreshing access token please wait...\n";
+  }
 
   json authfile_parsed = json::parse(SoRAuthFile(false, ""));
 
@@ -157,6 +158,7 @@ void refresh_access_token() {
 
   access_token = resp_parsed["access_token"];
 }
+
 void is_access_token_empty() {
   if (access_token.empty()) {
     json authfile_parsed = json::parse(SoRAuthFile(false, ""));
@@ -167,6 +169,7 @@ void is_access_token_empty() {
 // supports all endpoints that only require access_token
 json get_data_from_endpoint(std::string endpoint) {
   is_access_token_empty();
+  access_token_refreshed:
   std::string req_data =
       std::format("Authorization=Bearer&access_token={}", access_token);
 
@@ -178,6 +181,7 @@ json get_data_from_endpoint(std::string endpoint) {
               << " code: " << http_code << "\nrequest: " << req_data
               << "\nresponse: " << response << std::endl;
     refresh_access_token();
+    goto access_token_refreshed;
   }
 
   return json::parse(response);

src/timetable.cpp

@@ -3,14 +3,17 @@
 #include "const.h"
 #include "helper_funcs.h"
 #include "net.h"
+#include "types.h"
 #include <cstdint>
 #include <curses.h>
 #include <cwchar>
-#include <fstream>
 #include <iostream>
 #include <ncurses.h>
 #include <nlohmann/json.hpp>
+#include <panel.h>
 #include <string>
+#include <sys/types.h>
+#include <vector>
 
 using nlohmann::json;
 #define BOTTOM_PADDING 3
@@ -20,11 +23,21 @@ using nlohmann::json;
 const wchar_t *day_abriviations[] = {nullptr, L"Mo", L"Tu", L"We",
                                      L"Th",   L"Fr", L"Sa", L"Su"};
 
-void draw_grid(const uint8_t num_of_columns, const uint8_t num_of_rows,
-               const uint16_t cell_width, const uint16_t cell_height);
+void draw_days(WINDOW **&day_windows, uint16_t cell_height, uint8_t num_of_days,
+               json &resp_from_api);
 
-uint8_t hour_id_to_index(uint8_t *HourIdLookupTable, uint8_t id) {
-  for (uint8_t i = 0; i < 10; i++) {
+void draw_lessons(WINDOW **&lesson_windows, uint8_t num_of_columns,
+                  uint16_t cell_width, std::vector<uint8_t> &HourIdLookupTable,
+                  json &resp_from_api);
+
+void draw_cells(uint8_t num_of_columns, uint8_t num_of_days,
+                uint16_t cell_width, uint16_t cell_height,
+                std::vector<std::vector<WINDOW *>> &cells,
+                std::vector<uint8_t> &HourIdLookupTable, json &resp_from_api);
+
+uint8_t hour_id_to_index(const std::vector<uint8_t> &HourIdLookupTable,
+                         uint8_t id) {
+  for (uint8_t i = 0; i < HourIdLookupTable.size(); i++) {
     if (HourIdLookupTable[i] == id) {
       return i;
     }
@@ -53,16 +66,29 @@ std::wstring get_data_for_atom(json &resp_from_api, json *atom,
           .get<std::string>());
 }
 
+json *find_atom_by_indexes(json &resp_from_api, uint8_t day_index,
+                           uint8_t hour_index,
+                           const std::vector<uint8_t> &HourIdLookupTable) {
+  for (uint8_t k = 0; k < resp_from_api["Days"][day_index]["Atoms"].size();
+       k++) {
+    if (resp_from_api["Days"][day_index]["Atoms"][k]["HourId"].get<uint8_t>() ==
+        HourIdLookupTable[hour_index]) {
+      return &resp_from_api["Days"][day_index]["Atoms"][k];
+    }
+  }
+  return nullptr; // No matching atom found
+}
+
 void timetable_page() {
   // DONT FORGET TO UNCOMMENT
-  // json resp_from_api =
-  // bakaapi::get_data_from_endpoint("api/3/timetable/actual");
-  std::ifstream f("test-data/timetable.json");
-  json resp_from_api = json::parse(f);
+  json resp_from_api =
+      bakaapi::get_data_from_endpoint("api/3/timetable/actual");
+  /*std::ifstream f("test-data/timetable.json");
+  json resp_from_api = json::parse(f);*/
 
   // this may be unnecessary but i dont have enaugh data to test it
   // it sorts the hours by start time
-  uint8_t *HourIdLookupTable = new uint8_t[resp_from_api["Hours"].size()];
+  std::vector<uint8_t> HourIdLookupTable(resp_from_api["Hours"].size());
   {
     using Id_and_Start_time = std::tuple<uint8_t, std::string>;
     //                                   ID,      start_time
@@ -156,24 +182,288 @@ void timetable_page() {
   std::vector<std::vector<WINDOW *>> cells(
       num_of_days, std::vector<WINDOW *>(num_of_columns));
 
+  // init day windows
   for (uint8_t i = 0; i < num_of_days; i++) {
     day_windows[i] = newwin(cell_height, DEFAULT_OFFSET,
                             i * cell_height + DEFAULT_OFFSET, 0);
+  }
+
+  // init cell windows
+  for (uint8_t i = 0; i < num_of_columns; i++) {
+    lesson_windows[i] =
+        newwin(DEFAULT_OFFSET, cell_width, 0, i * cell_width + DEFAULT_OFFSET);
+  }
+  draw_lessons(lesson_windows, num_of_columns, cell_width, HourIdLookupTable,
+               resp_from_api);
+  // days have to be drawn after lessons for some reason i actualy have no idea
+  // why
+  draw_days(day_windows, cell_height, num_of_days, resp_from_api);
+
+  // init the cell windows
+  for (uint8_t i = 0; i < num_of_days; i++) {
+    for (uint8_t j = 0; j < num_of_columns; j++) {
+      cells[i][j] =
+          newwin(cell_height, cell_width, i * cell_height + DEFAULT_OFFSET,
+                 j * cell_width + DEFAULT_OFFSET);
+    }
+  }
+  draw_cells(num_of_columns, num_of_days, cell_width, cell_height, cells,
+             HourIdLookupTable, resp_from_api);
+
+  refresh();
+
+  SelectorType selected_cell(0, 0, 0, num_of_columns - 1, 0, num_of_days - 1);
+  std::array<WINDOW *, 4> selector_windows;
+  std::array<PANEL *, 4> selector_panels;
+
+  {
+    const chtype corners[] = {
+        ACS_ULCORNER, /* Upper left corner */
+        ACS_URCORNER, /* Upper right corner */
+        ACS_LLCORNER, /* Lower left corner */
+        ACS_LRCORNER  /* Lower right corner */
+    };
+
+    unsigned short x_offset, y_offset;
+    for (uint8_t i = 0; i < selector_windows.size(); i++) {
+
+      if (!(i % 2 == 0)) {
+        x_offset = cell_width - 1;
+      } else {
+        x_offset = 0;
+      }
+      if (!(i < 2)) {
+        y_offset = cell_height - 1;
+      } else {
+        y_offset = 0;
+      }
+
+      selector_windows[i] =
+          newwin(1, 1, DEFAULT_OFFSET + y_offset, DEFAULT_OFFSET + x_offset);
+      selector_panels[i] = new_panel(selector_windows[i]);
+      wattron(selector_windows[i], COLOR_PAIR(COLOR_RED));
+      mvwaddch(selector_windows[i], 0, 0, corners[i]);
+      wattroff(selector_windows[i], COLOR_PAIR(COLOR_RED));
+    }
+  }
+
+  update_panels();
+  doupdate();
+
+  WINDOW *infobox_window;
+  PANEL *infobox_panel;
+
+  bool is_info_box_open = false;
+  int ch;
+  while ((ch = getch()) != KEY_F(1)) {
+    if (is_info_box_open) {
+
+      hide_panel(infobox_panel);
+      del_panel(infobox_panel);
+
+      delwin(infobox_window);
+
+      touchwin(stdscr);
+      refresh();
+
+      // Redraw everithing
+      draw_days(day_windows, cell_height, num_of_days, resp_from_api);
+      draw_lessons(lesson_windows, num_of_columns, cell_width,
+                   HourIdLookupTable, resp_from_api);
+      draw_cells(num_of_columns, num_of_days, cell_width, cell_height, cells,
+                 HourIdLookupTable, resp_from_api);
+
+      for (uint8_t i = 0; i < selector_panels.size(); i++) {
+        top_panel(selector_panels[i]);
+      }
+      update_panels();
+      doupdate();
+
+      is_info_box_open = false;
+      continue;
+    }
+  run_loop_again:
+    switch (ch) {
+    case KEY_UP:
+    case 'k':
+      selected_cell.y--;
+      break;
+    case KEY_DOWN:
+    case 'j':
+      selected_cell.y++;
+      break;
+    case KEY_LEFT:
+    case 'h':
+      selected_cell.x--;
+      break;
+    case KEY_RIGHT:
+    case 'l':
+      selected_cell.x++;
+      break;
+    case 10: // ENTER
+      json *atom = find_atom_by_indexes(resp_from_api, selected_cell.y,
+                                        selected_cell.x, HourIdLookupTable);
+      if (atom == nullptr) {
+        std::cerr << RED "[ERROR]" << RESET " Selector at invalid position\n";
+        safe_exit(129);
+      }
+
+      infobox_window = newwin(LINES * 0.6, COLS * 0.6, LINES * 0.2, COLS * 0.2);
+      infobox_panel = new_panel(infobox_window);
+      is_info_box_open = true;
+
+      wattron(infobox_window, COLOR_PAIR(COLOR_MAGENTA));
+      box(infobox_window, 0, 0);
+      mvwaddch(infobox_window, 2, 0, ACS_LTEE);
+      mvwhline(infobox_window, 2, 1, ACS_HLINE, COLS * 0.6 - 2);
+      mvwaddch(infobox_window, 2, COLS * 0.6 - 1, ACS_RTEE);
+      wattroff(infobox_window, COLOR_PAIR(COLOR_MAGENTA));
+
+      std::wstring Caption;
+      if (atom->contains("Change") && !atom->at("Change").is_null()) {
+        if (!atom->at("Change")["TypeName"].is_null()) {
+          Caption = string_to_wstring(
+              atom->at("Change")["TypeName"].get<std::string>());
+        }
+      }
+
+      if (Caption.empty()) {
+        try {
+          Caption = get_data_for_atom(resp_from_api, atom, "Subjects",
+                                      "SubjectId", "Name");
+        } catch (...) {
+          __asm__("nop");
+        }
+      }
+
+      std::wstring Teacher = L"";
+      try {
+        Teacher = get_data_for_atom(resp_from_api, atom, "Teachers",
+                                    "TeacherId", "Name");
+      } catch (...) {
+        __asm__("nop");
+      }
+      Teacher.insert(0, L"Teacher: ");
+
+      std::wstring Groups = L"";
+      try {
+        for (uint8_t i = 0; i < atom->at("GroupIds").size(); i++) {
+          for (uint8_t j = 0; j < resp_from_api["Groups"].size(); j++) {
+            if (resp_from_api["Groups"][j]["Id"].get<std::string>() ==
+                atom->at("GroupIds")[i].get<std::string>()) {
+              Groups.append(string_to_wstring(
+                  resp_from_api["Groups"][j]["Name"].get<std::string>()));
+              if (static_cast<size_t>(i + 1) < atom->at("GroupIds").size()) {
+                Groups.append(L", ");
+              }
+            }
+          }
+        }
+      } catch (const std::exception &e) {
+        std::cerr << RED "[ERROR]" << RESET " " << e.what() << "\n";
+      }
+      Groups = wrm_tr_le_whitespace(Groups);
+      Groups.insert(0, L"Groups: ");
+
+      std::wstring Room = L"";
+      try {
+        Room =
+            get_data_for_atom(resp_from_api, atom, "Rooms", "RoomId", "Name");
+        if (Room.empty()) {
+          Room = get_data_for_atom(resp_from_api, atom, "Rooms", "RoomId",
+                                   "Abbrev");
+          ;
+        }
+      } catch (...) {
+        __asm__("nop");
+      }
+      Room.insert(0, L"Room: ");
+
+      std::wstring Theme = L"";
+      try {
+        Theme = wrm_tr_le_whitespace(
+            string_to_wstring(atom->at("Theme").get<std::string>()));
+      } catch (...) {
+        __asm__("nop");
+      }
+      Theme.insert(0, L"Theme: ");
+
+      wprint_in_middle(infobox_window, 1, 0, getmaxx(infobox_window),
+                       Caption.c_str(), COLOR_PAIR(COLOR_CYAN));
+
+      // printing out of order to reduce wattro* directives
+      wattron(infobox_window, COLOR_PAIR(COLOR_YELLOW));
+      mvwaddwstr(infobox_window, 3, 1, Teacher.c_str());
+      mvwaddwstr(infobox_window, 5, 1, Room.c_str());
+      wattroff(infobox_window, COLOR_PAIR(COLOR_YELLOW));
+
+      wattron(infobox_window, COLOR_PAIR(COLOR_CYAN));
+      mvwaddwstr(infobox_window, 4, 1, Groups.c_str());
+      mvwaddwstr(infobox_window, 6, 1, Theme.c_str());
+      wattroff(infobox_window, COLOR_PAIR(COLOR_CYAN));
+
+      top_panel(infobox_panel);
+      update_panels();
+      doupdate();
+      continue;
+      break;
+    }
+    { // print selected indicator
+      chtype top_left_corner =
+          mvwinch(cells[selected_cell.y][selected_cell.x], 0, 0);
+
+      if (!((top_left_corner & A_CHARTEXT) == 32)) {
+        for (uint8_t i = 0; i < selector_panels.size(); i++) {
+          unsigned short x_offset, y_offset;
+          if (!(i % 2 == 0)) {
+            x_offset = cell_width - 1;
+          } else {
+            x_offset = 0;
+          }
+          if (!(i < 2)) {
+            y_offset = cell_height - 1;
+          } else {
+            y_offset = 0;
+          }
+
+          move_panel(selector_panels[i],
+                     DEFAULT_OFFSET + y_offset + selected_cell.y * cell_height,
+                     DEFAULT_OFFSET + x_offset + selected_cell.x * cell_width);
+        }
+        draw_cells(num_of_columns, num_of_days, cell_width, cell_height, cells,
+                   HourIdLookupTable, resp_from_api);
+        update_panels();
+        doupdate();
+
+      } else {
+        // skip if the cell is empty
+        goto run_loop_again;
+      }
+    }
+  }
+  delete[] day_windows;
+  delete[] lesson_windows;
+  endwin();
+}
+
+void draw_days(WINDOW **&day_windows, uint16_t cell_height, uint8_t num_of_days,
+               json &resp_from_api) {
+  for (uint8_t i = 0; i < num_of_days; i++) {
     // this wont draw left boarder window making it so it looks partially
     // offscreen
     wborder(day_windows[i], ' ', 0, 0, 0, ACS_HLINE, 0, ACS_HLINE, 0);
-    const wchar_t *day_abriv =
-        day_abriviations[resp_from_api["Days"][i]["DayOfWeek"].get<uint8_t>()];
 
-    wprint_in_middle(day_windows[i], cell_height / 2, 0, wcslen(day_abriv),
-                     day_abriv, COLOR_PAIR(0));
+    mvwaddwstr(
+        day_windows[i], cell_height / 2, 0,
+        day_abriviations[resp_from_api["Days"][i]["DayOfWeek"].get<uint8_t>()]);
     wrefresh(day_windows[i]);
   }
+}
 
+void draw_lessons(WINDOW **&lesson_windows, uint8_t num_of_columns,
+                  uint16_t cell_width, std::vector<uint8_t> &HourIdLookupTable,
+                  json &resp_from_api) {
   for (uint8_t i = 0; i < num_of_columns; i++) {
-
-    lesson_windows[i] =
-        newwin(DEFAULT_OFFSET, cell_width, 0, i * cell_width + DEFAULT_OFFSET);
     wborder(lesson_windows[i], 0, 0, ' ', 0, ACS_VLINE, ACS_VLINE, 0, 0);
     std::wstring caption;
     std::wstring start_time;
@@ -182,9 +472,6 @@ void timetable_page() {
     for (uint8_t j = 0; j < resp_from_api["Hours"].size(); j++) {
       if (resp_from_api["Hours"][j]["Id"].get<uint8_t>() ==
           HourIdLookupTable[i]) {
-        // DEBUG
-        // std::clog <<
-        // resp_from_api["Hours"][j]["Caption"].get<std::string>();
 
         std::string caption_ascii =
             resp_from_api["Hours"][j]["Caption"].get<std::string>();
@@ -202,45 +489,37 @@ void timetable_page() {
     }
     std::cerr << RED "[ERROR]" << RESET " Hour with id " << HourIdLookupTable[i]
               << " not found\n";
-    goto timetable_error_exit;
+    safe_exit(128);
 
   hour_id_found:
 
-    wprint_in_middle(lesson_windows[i], 0, cell_width / 2, caption.length(),
-                     caption.c_str(), COLOR_PAIR(0));
-    wprint_in_middle(lesson_windows[i], 1, 1, start_time.length(),
-                     start_time.c_str(), COLOR_PAIR(0));
-    print_in_middle(lesson_windows[i], 1, cell_width / 2, 1, "-",
-                    COLOR_PAIR(0));
-    wprint_in_middle(lesson_windows[i], 1, cell_width - end_time.length() - 1,
-                     end_time.length(), end_time.c_str(), COLOR_PAIR(0));
+    wprint_in_middle(lesson_windows[i], 0, 0, cell_width, caption.c_str(),
+                     COLOR_PAIR(0));
+    mvwaddwstr(lesson_windows[i], 1, 1, start_time.c_str());
+    print_in_middle(lesson_windows[i], 1, 0, cell_width, "-", COLOR_PAIR(0));
+    mvwaddwstr(lesson_windows[i], 1, cell_width - end_time.length() - 1,
+               end_time.c_str());
     wrefresh(lesson_windows[i]);
   }
+}
 
+void draw_cells(uint8_t num_of_columns, uint8_t num_of_days,
+                uint16_t cell_width, uint16_t cell_height,
+                std::vector<std::vector<WINDOW *>> &cells,
+                std::vector<uint8_t> &HourIdLookupTable, json &resp_from_api) {
   for (uint8_t i = 0; i < num_of_days; i++) {
     for (uint8_t j = 0; j < num_of_columns; j++) {
-      cells[i][j] =
-          newwin(cell_height, cell_width, i * cell_height + DEFAULT_OFFSET,
-                 j * cell_width + DEFAULT_OFFSET);
 
-      json *atom;
-      for (uint8_t k = 0; k < resp_from_api["Days"][i]["Atoms"].size(); k++) {
-        if (resp_from_api["Days"][i]["Atoms"][k]["HourId"].get<uint8_t>() ==
-            HourIdLookupTable[j]) {
-          atom = &resp_from_api["Days"][i]["Atoms"][k];
-          goto correct_atom_found;
-        }
+      json *atom = find_atom_by_indexes(resp_from_api, i, j, HourIdLookupTable);
+      if (atom == nullptr) {
+        continue;
       }
-      continue;
-    correct_atom_found:
       std::wstring Subject_Abbrev;
       std::wstring Room_Abbrev;
       std::wstring Teacher_Abbrev;
       try {
         if (atom->contains("Change") && !atom->at("Change").is_null()) {
 
-          std::clog << "Change: " << atom->at("Change") << "\n";
-
           switch (
               hash_djb2a(atom->at("Change")["ChangeType"].get<std::string>())) {
           case "Canceled"_sh:
@@ -295,17 +574,13 @@ void timetable_page() {
           __asm__("nop");
         }
 
-        wprint_in_middle(cells[i][j], cell_height / 2,
-                         cell_width / 2 - wcslen(Subject_Abbrev.c_str()) / 2,
-                         wcslen(Subject_Abbrev.c_str()), Subject_Abbrev.c_str(),
-                         COLOR_PAIR(0));
-        wprint_in_middle(cells[i][j], cell_height - 2,
-                         cell_width - wcslen(Room_Abbrev.c_str()) - 1,
-                         wcslen(Room_Abbrev.c_str()), Room_Abbrev.c_str(),
-                         COLOR_PAIR(0));
-        wprint_in_middle(cells[i][j], cell_height - 2, 1,
-                         wcslen(Teacher_Abbrev.c_str()), Teacher_Abbrev.c_str(),
-                         COLOR_PAIR(0));
+        wprint_in_middle(cells[i][j], cell_height / 2, 0, cell_width,
+                         Subject_Abbrev.c_str(), COLOR_PAIR(0));
+        mvwaddwstr(cells[i][j], cell_height - 2,
+                   cell_width - wcslen(Room_Abbrev.c_str()) - 1,
+                   Room_Abbrev.c_str());
+
+        mvwaddwstr(cells[i][j], cell_height - 2, 1, Teacher_Abbrev.c_str());
         wrefresh(cells[i][j]);
       } catch (const std::exception &e) {
         std::cerr << RED "[ERROR]" << RESET " " << e.what() << "\n";
@@ -314,11 +589,4 @@ void timetable_page() {
       }
     }
   }
-  refresh();
-  getch();
-timetable_error_exit:
-  delete[] HourIdLookupTable;
-  delete[] day_windows;
-  delete[] lesson_windows;
-  endwin();
-}
+}

src/types.h

@@ -2,8 +2,146 @@
 #ifndef _ba_ty_hg_
 #define _ba_ty_hg_
 
+#include <istream>
 struct Config {
-    bool verbose = false;
-    bool ignoressl = false;
+  bool verbose = false;
+  bool ignoressl = false;
 };
+
+class LimitedInt {
+private:
+  int value;
+  const int min_value;
+  const int max_value;
+
+  void setValue(int new_value) {
+    int range = max_value - min_value + 1;
+    if (new_value < min_value || new_value > max_value) {
+      new_value = ((new_value - min_value) % range + range) % range + min_value;
+    }
+    value = new_value;
+  }
+
+public:
+  // Constructors
+  LimitedInt(int initial_value = 0, int min = std::numeric_limits<int>::min(),
+             int max = std::numeric_limits<int>::max())
+      : min_value(min), max_value(max) {
+    if (min >= max)
+      throw std::invalid_argument("Min must be less than max");
+    setValue(initial_value);
+  }
+
+  // Conversion operators
+  operator int() const { return value; } // Implicit conversion to int
+
+  // Assignment operators
+  LimitedInt &operator=(int rhs) {
+    setValue(rhs);
+    return *this;
+  }
+
+  // Compound assignment with BoundedInt
+  LimitedInt &operator+=(const LimitedInt &rhs) {
+    setValue(value + rhs.value);
+    return *this;
+  }
+
+  // Compound assignment with int
+  LimitedInt &operator+=(int rhs) {
+    setValue(value + rhs);
+    return *this;
+  }
+
+  // Similarly define -=, *=, /=, %=, &=, |=, ^=, <<=, >>= for both types
+
+  // Increment/decrement
+  LimitedInt &operator++() { // Prefix ++
+    setValue(value + 1);
+    return *this;
+  }
+
+  LimitedInt operator++(int) { // Postfix ++
+    LimitedInt temp = *this;
+    setValue(value + 1);
+    return temp;
+  }
+
+  LimitedInt &operator--() { // Prefix --
+    setValue(value - 1);
+    return *this;
+  }
+
+  LimitedInt operator--(int) { // Postfix --
+    LimitedInt temp = *this;
+    setValue(value - 1);
+    return temp;
+  }
+
+  // Binary arithmetic operators
+  friend LimitedInt operator+(const LimitedInt &lhs, const LimitedInt &rhs) {
+    LimitedInt result = lhs;
+    result += rhs;
+    return result;
+  }
+
+  friend LimitedInt operator+(const LimitedInt &lhs, int rhs) {
+    LimitedInt result = lhs;
+    result += rhs;
+    return result;
+  }
+
+  friend LimitedInt operator+(int lhs, const LimitedInt &rhs) {
+    LimitedInt result(lhs, rhs.min_value, rhs.max_value);
+    result += rhs;
+    return result;
+  }
+
+  // Similarly define -, *, /, %, &, |, ^, <<, >> for all combinations
+
+  // Unary operators
+  LimitedInt operator-() const {
+    return LimitedInt(-value, min_value, max_value);
+  }
+
+  LimitedInt operator+() const { return *this; }
+
+  // Comparison operators
+  friend bool operator==(const LimitedInt &lhs, const LimitedInt &rhs) {
+    return lhs.value == rhs.value;
+  }
+
+  friend bool operator!=(const LimitedInt &lhs, const LimitedInt &rhs) {
+    return lhs.value != rhs.value;
+  }
+
+  friend bool operator<(const LimitedInt &lhs, const LimitedInt &rhs) {
+    return lhs.value < rhs.value;
+  }
+
+  // Similarly define >, <=, >= for both BoundedInt and int comparisons
+
+  // Stream operators
+  friend std::ostream &operator<<(std::ostream &os, const LimitedInt &bi) {
+    os << bi.value;
+    return os;
+  }
+
+  friend std::istream &operator>>(std::istream &is, LimitedInt &bi) {
+    int temp;
+    is >> temp;
+    bi.setValue(temp);
+    return is;
+  }
+};
+
+struct SelectorType {
+  LimitedInt x;
+  LimitedInt y;
+
+  SelectorType(int xArg, int yArg, int min_limit_x, int max_limit_x,
+               int min_limit_y, int max_limit_y)
+      : x(xArg, min_limit_x, max_limit_x), y(yArg, min_limit_y, max_limit_y) {}
+};
+
 #endif