Merge branch 'dev' into work/v1.8

# Conflicts:
#	CMakeLists.txt
#	res/lang/es.bin
#	res/lang/fr.bin
#	res/lang/gl.bin
#	res/lang/ie.bin
#	res/lang/ru.bin
#	res/lang/sk.bin
#	res/lang/sr.bin
#	res/lang/tok.bin
#	src/ui/documentwidget.c

3 files changed, 31 insertions, 16 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index c271ad94..508047a6 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -2065,14 +2065,20 @@ iRangecc findLoc_GmRun(const iGmRun *d, iInt2 pos) {
     if (pos.y < top_Rect(d->bounds)) {
         return (iRangecc){ d->text.start, d->text.start };
     }
+    if (pos.y > bottom_Rect(d->bounds)) {
+        return (iRangecc){ d->text.end, d->text.end };
+    }
     const int x = pos.x - left_Rect(d->bounds);
     if (x <= 0) {
         return (iRangecc){ d->text.start, d->text.start };
     }
+    if (x > d->bounds.size.x) {
+        return (iRangecc){ d->text.end, d->text.end };
+    }
     iRangecc loc;
     tryAdvanceNoWrap_Text(d->font, d->text, x, &loc.start);
     loc.end = loc.start;
-    if (!contains_Range(&d->text, loc.start)) {
+    if (!contains_Range(&d->text, loc.start) && loc.start != d->text.end) {
         return iNullRange; /* it's some other text */
     }
     iChar ch;
diff --git a/src/macos.m b/src/macos.m
index d737e9e8..784a8612 100644
--- a/src/macos.m
+++ b/src/macos.m
@@ -570,7 +570,11 @@ static NSMenuItem *makeMenuItems_(NSMenu *menu, MenuCommands *commands, const iM
             deinit_String(&itemTitle);
             [item setTarget:commands];
             if (isChecked) {
+#if defined (__MAC_10_13)
                 [item setState:NSControlStateValueOn];
+#else
+                [item setState:NSOnState];
+#endif
                 selectedItem = item;
             }
             [item setEnabled:!isDisabled];
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 44db3e5b..ee669c1a 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -3419,7 +3419,7 @@ static void beginMarkingSelection_DocumentWidget_(iDocumentWidget *d, iInt2 pos)
     invalidateWideRunsWithNonzeroOffset_DocumentWidget_(d);
     resetWideRuns_DocumentWidget_(d); /* Selections don't support horizontal scrolling. */
     iChangeFlags(d->flags, selecting_DocumentWidgetFlag, iTrue);
-    d->selectMark = sourceLoc_DocumentWidget_(d, pos);
+    d->initialSelectMark = d->selectMark = sourceLoc_DocumentWidget_(d, pos);
     refresh_Widget(as_Widget(d));
 }
 
@@ -3843,7 +3843,13 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                     }
                 }
                 else {
-                    d->selectMark.end = (d->selectMark.end > d->selectMark.start ? loc.end : loc.start);
+                    d->selectMark.end = loc.end;// (d->selectMark.end > d->selectMark.start ? loc.end : loc.start);
+                    if (loc.start < d->initialSelectMark.start) {
+                        d->selectMark.end = loc.start;
+                    }
+                    if (isEmpty_Range(&d->selectMark)) {
+                        d->selectMark = d->initialSelectMark;
+                    }
                 }
             }
             iAssert((!d->selectMark.start && !d->selectMark.end) ||
@@ -3861,13 +3867,13 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                     d->initialSelectMark.start =
                         d->initialSelectMark.end = d->selectMark.start;
                 }
-                if (!isEmpty_Range(&d->initialSelectMark)) {
-                    if (d->selectMark.end > d->selectMark.start) {
-                        d->selectMark.start = d->initialSelectMark.start;
-                    }
-                    else if (d->selectMark.end < d->selectMark.start) {
-                        d->selectMark.start = d->initialSelectMark.end;
-                    }
+            }
+            if (d->initialSelectMark.start) {
+                if (d->selectMark.end > d->selectMark.start) {
+                    d->selectMark.start = d->initialSelectMark.start;
+                }
+                else if (d->selectMark.end < d->selectMark.start) {
+                    d->selectMark.start = d->initialSelectMark.end;
                 }
             }
 //            printf("mark %zu ... %zu\n", d->selectMark.start - cstr_String(source_GmDocument(d->doc)),
@@ -4072,12 +4078,11 @@ static void fillRange_DrawContext_(iDrawContext *d, const iGmRun *run, enum iCol
         }
         int w = width_Rect(run->visBounds) - x;
         if (contains_Range(&run->text, mark.end) || mark.end < run->text.start) {
-            w = measureRange_Text(
-                    run->font,
-                    !*isInside ? mark
-                               : (iRangecc){ run->text.start, iMax(run->text.start, mark.end) })
-                    .advance.x;
-            *isInside = iFalse;
+            iRangecc mk = !*isInside ? mark
+                              : (iRangecc){ run->text.start, iMax(run->text.start, mark.end) };
+            mk.start    = iMax(mk.start, run->text.start);
+            w           = measureRange_Text(run->font, mk).advance.x;
+            *isInside   = iFalse;
         }
         else {
             *isInside = iTrue; /* at least until the next run */