Merge branch 'dev' into work/v1.7

# Conflicts:
#	CMakeLists.txt
#	res/about/version.gmi

3 files changed, 7 insertions, 7 deletions

diff --git a/src/gmutil.c b/src/gmutil.c
index d547d27d..d87de8f6 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -620,7 +620,7 @@ const iString *canonicalUrl_String(const iString *d) {
        - all non-reserved characters decoded (i.e., it's an IRI)
        - expect for spaces, which are always `%20`
        This means a canonical URL can be used on a gemtext link line without modifications. */
-    iString *canon = maybeUrlDecodeExclude_String(d, "/?:;#&= ");
+    iString *canon = maybeUrlDecodeExclude_String(d, "%/?:;#&= ");
     /* `canon` may now be NULL if nothing was decoded. */
     if (indexOfCStr_String(canon ? canon : d, " ") != iInvalidPos ||
         indexOfCStr_String(canon ? canon : d, "\n") != iInvalidPos) {
diff --git a/src/main.c b/src/main.c
index efe96ad9..c8a9c335 100644
--- a/src/main.c
+++ b/src/main.c
@@ -68,6 +68,7 @@ int main(int argc, char **argv) {
                           "DHE-RSA-AES256-GCM-SHA384");
     SDL_SetHint(SDL_HINT_VIDEO_ALLOW_SCREENSAVER, "1");
     SDL_SetHint(SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK, "1");
+    SDL_SetHint(SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR, "0");
     if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER)) {
         fprintf(stderr, "[SDL] init failed: %s\n", SDL_GetError());
         return -1;
diff --git a/src/ui/text_simple.c b/src/ui/text_simple.c
index 3afc631a..e88b09a8 100644
--- a/src/ui/text_simple.c
+++ b/src/ui/text_simple.c
@@ -169,6 +169,7 @@ static iRect runSimple_Font_(iFont *d, const iRunArgs *args) {
                 if (!notify_WrapText_(wrap, chPos, 0, iMax(xpos, xposExtend) - orig.x, iFalse)) {
                     break;
                 }
+                lastWordEnd = NULL;
                 xpos = xposExtend = orig.x;
                 ypos += d->height;
                 prevCh = ch;
@@ -240,21 +241,19 @@ static iRect runSimple_Font_(iFont *d, const iRunArgs *args) {
             iAssert(wrap);
             const char *wrapPos = currentPos;
             int advance = x1 - orig.x;
-            if (lastWordEnd != args->text.start && wrap->mode == word_WrapTextMode) {
-                wrapPos = skipSpace_CStr(lastWordEnd);
+            if (lastWordEnd && wrap->mode == word_WrapTextMode) {
+                wrapPos = skipSpace_CStr(lastWordEnd); /* go back */
                 wrapPos = iMin(wrapPos, args->text.end);
                 advance = wrapAdvance;
             }
-//            if (args->continueFrom_out) {
-//                *args->continueFrom_out = wrapPos;
-//            }
             if (!notify_WrapText_(wrap, wrapPos, 0, advance, iFalse)) {
                 break;
             }
+            lastWordEnd = NULL;
             xpos = xposExtend = orig.x;
             ypos += d->height;
             prevCh = 0;
-            chPos = wrapPos; /* go back */
+            chPos = wrapPos;
             continue;
         }
         const int yLineMax = ypos + d->height;