commit d61053626356ee6151db17c2c62a2191fbc3ed74
parent 1e7f1766d6b2a6627eb5b92aa2d171623b2d2f00
Author: Andrew Laack <andrew@laack.co>
Date: Tue, 22 Sep 2026 12:57:38 -0500
Added forward / backward in history support (feels slightly janky rn though).
Diffstat:
4 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/include/browser.hpp b/include/browser.hpp
@@ -16,10 +16,12 @@ class Browser {
void setLinksOfCurrentLines();
public:
Browser();
- void goToSite(std::string url);
+ void goToSite(std::string url, bool addToHistory);
Site* getCurrentSite();
std::optional<uri> getPriorUri();
std::vector<std::pair<std::string, int>> renderSite();
std::vector<Line*> toLines(Site* site);
void followLinkNumber(int linkToFollow);
+ void goBack();
+ void goForward();
};
diff --git a/src/browser.cpp b/src/browser.cpp
@@ -8,7 +8,7 @@
#include <utility>
#include <vector>
-void Browser::goToSite(std::string url) {
+void Browser::goToSite(std::string url, bool addToHistory) {
Link* prior = nullptr;
@@ -35,9 +35,11 @@ void Browser::goToSite(std::string url) {
return;
}
- siteHistory.push_back(destination);
- previousIdx += 1;
-
+ if(addToHistory) {
+ siteHistory.resize(previousIdx + 1);
+ siteHistory.push_back(destination);
+ previousIdx = siteHistory.size() - 1;
+ }
if(currentSite != nullptr) {
delete currentSite;
@@ -105,6 +107,15 @@ std::optional<uri> Browser::getPriorUri() {
void Browser::followLinkNumber(int linkToFollow) {
Line* ptr = lines[links[linkToFollow-1]];
Link* ptrLnk = dynamic_cast<Link*>(ptr);
- goToSite(ptrLnk->getLinkDestination().to_string());
+ goToSite(ptrLnk->getLinkDestination().to_string(), true);
}
+void Browser::goBack() {
+ previousIdx -= 1;
+ goToSite(this->siteHistory[previousIdx]->getLinkDestination().to_string(), false);
+}
+
+void Browser::goForward() {
+ previousIdx += 1;
+ goToSite(siteHistory[previousIdx]->getLinkDestination().to_string(), false);
+}
diff --git a/src/main.cpp b/src/main.cpp
@@ -105,7 +105,7 @@ int main() {
initColors();
endwin();
- b.goToSite("gemini://tlgs.one");
+ b.goToSite("gemini://tlgs.one",true);
auto current = b.renderSite();
removeNonAscii(current);
@@ -127,6 +127,15 @@ int main() {
y += LINES / 2;
} else if (input == 0x15) {
y -= LINES / 2;
+ } else if(input == 'f') {
+ b.goForward();
+ current = b.renderSite();
+ removeNonAscii(current);
+
+ } else if(input == 'b') {
+ b.goBack();
+ current = b.renderSite();
+ removeNonAscii(current);
} else if(input == ' ') {
int linkToFollow = linkHandler();
if(linkToFollow != -1) {
@@ -134,7 +143,7 @@ int main() {
if(b.getCurrentSite()->getStatusCode() >= 10 && b.getCurrentSite()->getStatusCode() <= 19) {
std::string inputQuery = handleUserInput();
if(inputQuery != "?") { // TODO: Better handling
- b.goToSite(inputQuery);
+ b.goToSite(inputQuery,true);
current = b.renderSite();
removeNonAscii(current);
}
diff --git a/tests/browser-test.cpp b/tests/browser-test.cpp
@@ -6,9 +6,9 @@
TEST_CASE( "Basic navigation" ) {
Browser b{};
- b.goToSite("tests/sites/basic.gmi");
+ b.goToSite("tests/sites/basic.gmi", true);
REQUIRE(b.getCurrentSite()->getBody() == readFileToString("tests/sites/basic.gmi"));
- b.goToSite("basic_2.gmi");
+ b.goToSite("basic_2.gmi", true);
REQUIRE(b.getCurrentSite()->getBody() == readFileToString("tests/sites/basic_2.gmi"));
}