alec/erythros
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Applications/Internet/Cyberia: New tab defaults to blank page

Browse source
This commit is contained in:
Alec Murphy 2025-05-08 11:34:49 -04:00
parent a3223599fe
commit 2f403aaff9
2 changed files with 36 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

47
Applications/Internet/Cyberia.app/Cyberia.HC
View file

@ -340,15 +340,19 @@ U0 @cyberia_history()
HttpUrl* url = renderer->current_url; HttpUrl* url = renderer->current_url;
StrCpy(&addressbar1->text, ""); StrCpy(&addressbar1->text, "");
Bool is_alternate_port = FALSE; if (!StrICmp(url->host, "127.0.0.255")) {
if (!StrICmp(url->scheme, "http://") && url->port != 80) StrCpy(&addressbar1->text, "about:newtab");
is_alternate_port = TRUE; } else {
if (!StrICmp(url->scheme, "https://") && url->port != 443) Bool is_alternate_port = FALSE;
is_alternate_port = TRUE; if (!StrICmp(url->scheme, "http://") && url->port != 80)
if (is_alternate_port) is_alternate_port = TRUE;
String.Append(&addressbar1->text, "%s%s:%d%s%s", url->scheme, url->host, url->port, url->path, url->query); if (!StrICmp(url->scheme, "https://") && url->port != 443)
else is_alternate_port = TRUE;
String.Append(&addressbar1->text, "%s%s%s%s", url->scheme, url->host, url->path, url->query); if (is_alternate_port)
String.Append(&addressbar1->text, "%s%s:%d%s%s", url->scheme, url->host, url->port, url->path, url->query);
else
String.Append(&addressbar1->text, "%s%s%s%s", url->scheme, url->host, url->path, url->query);
}
renderer->background_widget->color = renderer->background_color; renderer->background_widget->color = renderer->background_color;
@cyberia_set_tab_title_and_icon(browser->tab, renderer->current_title, @favicon_for_page(renderer)); @cyberia_set_tab_title_and_icon(browser->tab, renderer->current_title, @favicon_for_page(renderer));
@ -392,6 +396,8 @@ U0 @cyberia_fwd_clicked()
return list->next; return list->next;
} }
U8* NEW_TAB_HTML = "<html><head><title>New tab</title><body></body></html>";
U0 @cyberia_navigate(Bool refresh = FALSE) U0 @cyberia_navigate(Bool refresh = FALSE)
{ {
win->focused_widget = NULL; win->focused_widget = NULL;
@ -400,7 +406,7 @@ U0 @cyberia_navigate(Bool refresh = FALSE)
return; return;
} }
if (MemCmp(&addressbar1->text, "http://", 7) && MemCmp(&addressbar1->text, "https://", 8)) { if (MemCmp(&addressbar1->text, "about:", 6) && MemCmp(&addressbar1->text, "http://", 7) && MemCmp(&addressbar1->text, "https://", 8)) {
U8 prepend_buf[512]; U8 prepend_buf[512];
StrPrint(prepend_buf, "https://%s", &addressbar1->text); StrPrint(prepend_buf, "https://%s", &addressbar1->text);
StrCpy(&addressbar1->text, prepend_buf); StrCpy(&addressbar1->text, prepend_buf);
@ -410,6 +416,10 @@ U0 @cyberia_navigate(Bool refresh = FALSE)
if (!url_string || !browser || !browser_task) if (!url_string || !browser || !browser_task)
return; return;
if (!StrCmp(&addressbar1->text, "about:newtab")) {
url_string = StrNew("http://127.0.0.255");
}
if (!refresh) { if (!refresh) {
browser->renderer = CAlloc(sizeof(HtmlRenderer), browser_task); browser->renderer = CAlloc(sizeof(HtmlRenderer), browser_task);
++browser->history_index; ++browser->history_index;
@ -480,7 +490,20 @@ U0 @cyberia_navigate(Bool refresh = FALSE)
U8* buffer = browser->fetch_buffer; U8* buffer = browser->fetch_buffer;
MemSet(buffer, 0, HTTP_FETCH_BUFFER_SIZE); MemSet(buffer, 0, HTTP_FETCH_BUFFER_SIZE);
@http_response* resp = Http.Get(renderer->current_url, buffer); @http_response* resp = NULL;
if (!StrCmp(&addressbar1->text, "about:newtab")) {
resp = CAlloc(sizeof(@http_response));
resp->body.data = NEW_TAB_HTML;
resp->body.length = StrLen(NEW_TAB_HTML);
resp->state = HTTP_STATE_DONE;
resp->status.code = 200;
StrCpy(&addressbar1->text, "");
win->focused_widget = addressbar1;
} else {
resp = Http.Get(renderer->current_url, buffer);
}
while (resp->state != HTTP_STATE_DONE) { while (resp->state != HTTP_STATE_DONE) {
if (resp->state >= HTTP_STATE_HEADERS_RECEIVED) { if (resp->state >= HTTP_STATE_HEADERS_RECEIVED) {
StrPrint(status_text_buffer, "Received %d bytes", resp->body.length); StrPrint(status_text_buffer, "Received %d bytes", resp->body.length);
@ -586,7 +609,7 @@ U0 @cyberia_new_tab()
tabpanel1->index = i; tabpanel1->index = i;
++tabpanel1->count; ++tabpanel1->count;
StrCpy(&addressbar1->text, "http://10.20.0.254:8000"); StrCpy(&addressbar1->text, "about:newtab");
Spawn(&@cyberia_navigate); Spawn(&@cyberia_navigate);
win->focused_widget = addressbar1; win->focused_widget = addressbar1;
} }

2
System/Libraries/Html/Renderer.HC
View file

@ -2061,7 +2061,7 @@ Context2D* @process_favicon(Context2D* tmpctx)
Context2D* @favicon_for_page(HtmlRenderer* renderer) Context2D* @favicon_for_page(HtmlRenderer* renderer)
{ {
if (!renderer) if (!renderer || !StrICmp(renderer->current_url->host, "127.0.0.255"))
return DEFAULT_FAVICON; return DEFAULT_FAVICON;
U8 status_text_buffer[HTML_WORK_BUFFER_SIZE]; U8 status_text_buffer[HTML_WORK_BUFFER_SIZE];