summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--res/about/version.gmi8
-rw-r--r--src/app.c7
-rw-r--r--src/ui/documentwidget.c52
4 files changed, 34 insertions, 35 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d23ff2ad..b18ead27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,8 +177,8 @@ if (ENABLE_X11_SWRENDER)
177endif () 177endif ()
178if (ENABLE_KERNING) 178if (ENABLE_KERNING)
179 target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_KERNING=1) 179 target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_KERNING=1)
180endif ()
181if (ENABLE_WINDOWPOS_FIX) 180if (ENABLE_WINDOWPOS_FIX)
181endif ()
182 target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_WINDOWPOS_FIX=1) 182 target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_WINDOWPOS_FIX=1)
183endif () 183endif ()
184target_link_libraries (app PUBLIC the_Foundation::the_Foundation) 184target_link_libraries (app PUBLIC the_Foundation::the_Foundation)
diff --git a/res/about/version.gmi b/res/about/version.gmi
index fb2859dd..32f1e49f 100644
--- a/res/about/version.gmi
+++ b/res/about/version.gmi
@@ -1,9 +1,9 @@
1``` 1```
2 __ __ __ ___ 2 __ __ __ ___
3| /\ / _` |__) /\ |\ | / _` |__ 3| /\ / _` |__) /\ |\ | / _` |__
4|___ /~~\ \__> | \ /~~\ | \| \__> |___ 4|___ /~~\ \__> | \ /~~\ | \| \__> |___
5 5
6``` 6```
7# Release notes 7# Release notes
8 8
9## 0.2 9## 0.2
diff --git a/src/app.c b/src/app.c
index 2928522b..57fadf65 100644
--- a/src/app.c
+++ b/src/app.c
@@ -544,9 +544,9 @@ int zoom_App(void) {
544 544
545iBool forceLineWrap_App(void) { 545iBool forceLineWrap_App(void) {
546 return app_.forceWrap; 546 return app_.forceWrap;
547iBool forceSoftwareRender_App(void) {
547} 548}
548 549
549iBool forceSoftwareRender_App(void) {
550 if (app_.forceSoftwareRender) { 550 if (app_.forceSoftwareRender) {
551 return iTrue; 551 return iTrue;
552 } 552 }
@@ -919,7 +919,7 @@ iBool handleCommand_App(const char *cmd) {
919 const iPtrArray *homepages = 919 const iPtrArray *homepages =
920 list_Bookmarks(d->bookmarks, NULL, filterTagsRegExp_Bookmarks, pattern); 920 list_Bookmarks(d->bookmarks, NULL, filterTagsRegExp_Bookmarks, pattern);
921 if (isEmpty_PtrArray(homepages)) { 921 if (isEmpty_PtrArray(homepages)) {
922 postCommand_App("open url:about:lagrange"); 922 postCommand_App("open url:about:lagrange");
923 } 923 }
924 else { 924 else {
925 iStringSet *urls = iClob(new_StringSet()); 925 iStringSet *urls = iClob(new_StringSet());
@@ -1047,8 +1047,7 @@ void openInDefaultBrowser_App(const iString *url) {
1047 concatPath_CStr(cstr_String(execPath_App()), "../urlopen.bat"), 1047 concatPath_CStr(cstr_String(execPath_App()), "../urlopen.bat"),
1048 cstr_String(url), 1048 cstr_String(url),
1049 NULL)) 1049 NULL))
1050 /* TODO: Should consult environment variables to find the 1050 /* TODO: The prompt window is shown momentarily... */
1051 right cmd.exe. Also, the prompt window is shown momentarily... */
1052#endif 1051#endif
1053 ); 1052 );
1054 start_Process(proc); 1053 start_Process(proc);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 91b33464..70e66180 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -60,8 +60,8 @@ struct Impl_MediaRequest {
60 60
61static void updated_MediaRequest_(iAnyObject *obj) { 61static void updated_MediaRequest_(iAnyObject *obj) {
62 iMediaRequest *d = obj; 62 iMediaRequest *d = obj;
63 postCommandf_App("media.updated link:%u request:%p", d->linkId, d); 63 postCommandf_App("media.updated link:%u request:%p", d->linkId, d);
64} 64 }
65 65
66static void finished_MediaRequest_(iAnyObject *obj) { 66static void finished_MediaRequest_(iAnyObject *obj) {
67 iMediaRequest *d = obj; 67 iMediaRequest *d = obj;
@@ -369,9 +369,9 @@ static void updateHover_DocumentWidget_(iDocumentWidget *d, iInt2 mouse) {
369 if (d->hoverLink && 369 if (d->hoverLink &&
370 linkFlags_GmDocument(d->doc, d->hoverLink->linkId) & permanent_GmLinkFlag) { 370 linkFlags_GmDocument(d->doc, d->hoverLink->linkId) & permanent_GmLinkFlag) {
371 setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_ARROW); /* not dismissable */ 371 setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_ARROW); /* not dismissable */
372 }
373 } 372 }
374} 373}
374}
375 375
376static void updateVisible_DocumentWidget_(iDocumentWidget *d) { 376static void updateVisible_DocumentWidget_(iDocumentWidget *d) {
377 const iRangei visRange = visibleRange_DocumentWidget_(d); 377 const iRangei visRange = visibleRange_DocumentWidget_(d);
@@ -1208,7 +1208,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
1208 "document.request.cancelled doc:%p url:%s", d, cstr_String(d->mod.url)); 1208 "document.request.cancelled doc:%p url:%s", d, cstr_String(d->mod.url));
1209 iReleasePtr(&d->request); 1209 iReleasePtr(&d->request);
1210 if (d->state != ready_RequestState) { 1210 if (d->state != ready_RequestState) {
1211 d->state = ready_RequestState; 1211 d->state = ready_RequestState;
1212 postCommand_App("navigate.back"); 1212 postCommand_App("navigate.back");
1213 } 1213 }
1214 updateFetchProgress_DocumentWidget_(d); 1214 updateFetchProgress_DocumentWidget_(d);
@@ -1256,9 +1256,9 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
1256 } 1256 }
1257 else if (startsWith_String(&d->sourceMime, "image/")) { 1257 else if (startsWith_String(&d->sourceMime, "image/")) {
1258 appendCStr_String(savePath, cstr_String(&d->sourceMime) + 6); 1258 appendCStr_String(savePath, cstr_String(&d->sourceMime) + 6);
1259 }
1260 }
1261 if (fileExists_FileInfo(savePath)) { 1259 if (fileExists_FileInfo(savePath)) {
1260 }
1261 }
1262 /* Make it unique. */ 1262 /* Make it unique. */
1263 iDate now; 1263 iDate now;
1264 initCurrent_Date(&now); 1264 initCurrent_Date(&now);
@@ -1567,21 +1567,21 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
1567 } 1567 }
1568 else { 1568 else {
1569 if (!isEmpty_Range(&d->selectMark)) { 1569 if (!isEmpty_Range(&d->selectMark)) {
1570 pushBackN_Array( 1570 pushBackN_Array(
1571 &items, 1571 &items,
1572 (iMenuItem[]){ { "Copy", 0, 0, "copy" }, { "---", 0, 0, NULL } }, 1572 (iMenuItem[]){ { "Copy", 0, 0, "copy" }, { "---", 0, 0, NULL } },
1573 2); 1573 2);
1574 } 1574 }
1575 pushBackN_Array( 1575 pushBackN_Array(
1576 &items, 1576 &items,
1577 (iMenuItem[]){ 1577 (iMenuItem[]){
1578 { "Go Back", navigateBack_KeyShortcut, "navigate.back" }, 1578 { "Go Back", navigateBack_KeyShortcut, "navigate.back" },
1579 { "Go Forward", navigateForward_KeyShortcut, "navigate.forward" }, 1579 { "Go Forward", navigateForward_KeyShortcut, "navigate.forward" },
1580 { "Reload Page", reload_KeyShortcut, "navigate.reload" }, 1580 { "Reload Page", reload_KeyShortcut, "navigate.reload" },
1581 { "---", 0, 0, NULL }, 1581 { "---", 0, 0, NULL },
1582 { "Copy Page URL", 0, 0, "document.copylink" }, 1582 { "Copy Page URL", 0, 0, "document.copylink" },
1583 { "---", 0, 0, NULL } }, 1583 { "---", 0, 0, NULL } },
1584 6); 1584 6);
1585 if (isEmpty_Range(&d->selectMark)) { 1585 if (isEmpty_Range(&d->selectMark)) {
1586 pushBackN_Array( 1586 pushBackN_Array(
1587 &items, 1587 &items,
@@ -1873,23 +1873,23 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
1873 (flags & (imageFileExtension_GmLinkFlag | audioFileExtension_GmLinkFlag) || 1873 (flags & (imageFileExtension_GmLinkFlag | audioFileExtension_GmLinkFlag) ||
1874 showHost)) { 1874 showHost)) {
1875 format_String(&str, 1875 format_String(&str,
1876 " \u2014%s%s%s\r%c%s", 1876 " \u2014%s%s%s\r%c%s",
1877 showHost ? " " : "", 1877 showHost ? " " : "",
1878 showHost ? (flags & mailto_GmLinkFlag 1878 showHost ? (flags & mailto_GmLinkFlag
1879 ? cstr_String(url) 1879 ? cstr_String(url)
1880 : ~flags & gemini_GmLinkFlag 1880 : ~flags & gemini_GmLinkFlag
1881 ? format_CStr("%s://%s", 1881 ? format_CStr("%s://%s",
1882 cstr_Rangecc(parts.scheme), 1882 cstr_Rangecc(parts.scheme),
1883 cstr_Rangecc(parts.host)) 1883 cstr_Rangecc(parts.host))
1884 : cstr_Rangecc(parts.host)) 1884 : cstr_Rangecc(parts.host))
1885 : "", 1885 : "",
1886 showHost && (showImage || showAudio) ? " \u2014" : "", 1886 showHost && (showImage || showAudio) ? " \u2014" : "",
1887 showImage || showAudio 1887 showImage || showAudio
1888 ? asciiBase_ColorEscape + fg 1888 ? asciiBase_ColorEscape + fg
1889 : (asciiBase_ColorEscape + 1889 : (asciiBase_ColorEscape +
1890 linkColor_GmDocument(doc, run->linkId, domain_GmLinkPart)), 1890 linkColor_GmDocument(doc, run->linkId, domain_GmLinkPart)),
1891 showImage ? " View Image \U0001f5bc" 1891 showImage ? " View Image \U0001f5bc"
1892 : showAudio ? " Play Audio \U0001f3b5" : ""); 1892 : showAudio ? " Play Audio \U0001f3b5" : "");
1893 } 1893 }
1894 if (run->flags & endOfLine_GmRunFlag && flags & visited_GmLinkFlag) { 1894 if (run->flags & endOfLine_GmRunFlag && flags & visited_GmLinkFlag) {
1895 iDate date; 1895 iDate date;