Added quote indicator preference

Also, added a command that gets posted when the mouse exits or enters the window area. This lets the hover outline to be updated accordingly.

9 files changed, 53 insertions, 5 deletions

diff --git a/src/app.c b/src/app.c
index b38f8ae2..da106141 100644
--- a/src/app.c
+++ b/src/app.c
@@ -182,6 +182,7 @@ static iString *serializePrefs_App_(const iApp *d) {
     appendFormat_String(str, "linewidth.set arg:%d\n", d->prefs.lineWidth);
     appendFormat_String(str, "prefs.biglede.changed arg:%d\n", d->prefs.bigFirstParagraph);
     appendFormat_String(str, "prefs.sideicon.changed arg:%d\n", d->prefs.sideIcon);
+    appendFormat_String(str, "quoteicon.set arg:%d\n", d->prefs.quoteIcon ? 1 : 0);
     appendFormat_String(str, "prefs.hoveroutline.changed arg:%d\n", d->prefs.hoverOutline);
     appendFormat_String(str, "theme.set arg:%d auto:1\n", d->prefs.theme);
     appendFormat_String(str, "ostheme arg:%d\n", d->prefs.useSystemTheme);
@@ -735,6 +736,12 @@ static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
         destroy_Widget(d);
         return iTrue;
     }
+    else if (equal_Command(cmd, "quoteicon.set")) {
+        const int arg = arg_Command(cmd);
+        setFlags_Widget(findChild_Widget(d, "prefs.quoteicon.0"), selected_WidgetFlag, arg == 0);
+        setFlags_Widget(findChild_Widget(d, "prefs.quoteicon.1"), selected_WidgetFlag, arg == 1);
+        return iFalse;
+    }
     else if (equal_Command(cmd, "doctheme.dark.set")) {
         updateColorThemeButton_(findChild_Widget(d, "prefs.doctheme.dark"), arg_Command(cmd));
         return iFalse;
@@ -946,6 +953,11 @@ iBool handleCommand_App(const char *cmd) {
         postCommand_App("document.layout.changed");
         return iTrue;
     }
+    else if (equal_Command(cmd, "quoteicon.set")) {
+        d->prefs.quoteIcon = arg_Command(cmd) != 0;
+        postCommand_App("document.layout.changed");
+        return iTrue;
+    }
     else if (equal_Command(cmd, "prefs.biglede.changed")) {
         d->prefs.bigFirstParagraph = arg_Command(cmd) != 0;
         postCommand_App("document.layout.changed");
@@ -1091,6 +1103,10 @@ iBool handleCommand_App(const char *cmd) {
             findChild_Widget(dlg, format_CStr("prefs.linewidth.%d", d->prefs.lineWidth)),
             selected_WidgetFlag,
             iTrue);
+        setFlags_Widget(
+            findChild_Widget(dlg, format_CStr("prefs.quoteicon.%d", d->prefs.quoteIcon)),
+            selected_WidgetFlag,
+            iTrue);
         setToggle_Widget(findChild_Widget(dlg, "prefs.biglede"), d->prefs.bigFirstParagraph);
         setToggle_Widget(findChild_Widget(dlg, "prefs.sideicon"), d->prefs.sideIcon);
         updateColorThemeButton_(findChild_Widget(dlg, "prefs.doctheme.dark"), d->prefs.docThemeDark);
diff --git a/src/gmdocument.c b/src/gmdocument.c
index 7982d57b..f2ac936f 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -290,7 +290,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
     iRangecc         contentLine   = iNullRange;
     iInt2            pos           = zero_I2();
     iBool            isFirstText   = isGemini && prefs->bigFirstParagraph;
-    iBool            addQuoteIcon  = iTrue;
+    iBool            addQuoteIcon  = prefs->quoteIcon;
     iBool            isPreformat   = iFalse;
     iRangecc         preAltText    = iNullRange;
     int              preFont       = preformatted_FontId;
@@ -446,7 +446,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             pushBack_Array(&d->layout, &quoteRun);
         }
         else if (type != quote_GmLineType) {
-            addQuoteIcon = iTrue;
+            addQuoteIcon = prefs->quoteIcon;
         }
         /* Link icon. */
         if (type == link_GmLineType) {
@@ -485,6 +485,9 @@ static void doLayout_GmDocument_(iGmDocument *d) {
         iRangecc runLine = line;
         /* Create one or more text runs for this line. */
         run.flags |= startOfLine_GmRunFlag;
+        if (!prefs->quoteIcon && type == quote_GmLineType) {
+            run.flags |= quoteBorder_GmRunFlag;
+        }
         iAssert(!isEmpty_Range(&runLine)); /* must have something at this point */
         while (!isEmpty_Range(&runLine)) {
             /* Little bit of breathing space between wrapped lines. */
@@ -835,7 +838,7 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
             violet_Hue,
             pink_Hue
         };
-        static const float hues[]    = { 5, 25, 40, 56, 80, 120, 160, 180, 208, 231, 270, 324 };
+        static const float hues[] = { 5, 25, 40, 56, 80, 120, 160, 180, 208, 231, 270, 324 };
         static const struct {
             int index[2];
         } altHues[iElemCount(hues)] = {
diff --git a/src/gmdocument.h b/src/gmdocument.h
index 05bf026c..f27446ab 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -79,6 +79,7 @@ enum iGmRunFlags {
     startOfLine_GmRunFlag = iBit(2),
     endOfLine_GmRunFlag   = iBit(3),
     siteBanner_GmRunFlag  = iBit(4), /* area reserved for the site banner */
+    quoteBorder_GmRunFlag = iBit(5),
 };
 
 struct Impl_GmRun {
diff --git a/src/prefs.c b/src/prefs.c
index 146f3838..1fcb1b8e 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -7,6 +7,7 @@ void init_Prefs(iPrefs *d) {
     d->retainWindowSize  = iTrue;
     d->zoomPercent       = 100;
     d->forceLineWrap     = iFalse;
+    d->quoteIcon         = iTrue;
     d->font              = nunito_TextFont;
     d->headingFont       = nunito_TextFont;
     d->lineWidth         = 40;
diff --git a/src/prefs.h b/src/prefs.h
index a19cc0ca..bfc0c174 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -25,6 +25,7 @@ struct Impl_Prefs {
     int lineWidth;
     iBool bigFirstParagraph;
     iBool forceLineWrap;
+    iBool quoteIcon;
     iBool sideIcon;
     iBool hoverOutline;
     enum iGmDocumentTheme docThemeDark;
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 558c320d..8d3716a6 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1234,6 +1234,10 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         refresh_Widget(w);
         updateWindowTitle_DocumentWidget_(d);
     }
+    else if (equal_Command(cmd, "window.mouse.exited")) {
+        updateOutlineOpacity_DocumentWidget_(d);
+        return iFalse;
+    }
     else if (equal_Command(cmd, "theme.changed") && document_App() == d) {
         updateTheme_DocumentWidget_(d);
         invalidate_DocumentWidget_(d);
@@ -2116,7 +2120,6 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
     }
     else if (run->audioId) {
         /* Audio player UI is drawn afterwards as a dynamic overlay. */
-        //fillRect_Paint(&d->paint, moved_Rect(run->visBounds, origin), red_ColorId);
         return;
     }
     enum iColorId      fg  = run->color;
@@ -2181,6 +2184,12 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                 goto runDrawn;
             }
         }
+        if (run->flags & quoteBorder_GmRunFlag) {
+            drawVLine_Paint(&d->paint,
+                            addX_I2(visPos, -gap_Text * 5 / 2),
+                            height_Rect(run->visBounds),
+                            tmQuoteIcon_ColorId);
+        }
         drawRange_Text(run->font, visPos, fg, run->text);
 //        printf("{%s}\n", cstr_Rangecc(run->text));
     runDrawn:;
diff --git a/src/ui/util.c b/src/ui/util.c
index 35eea9c3..bef839dc 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -991,6 +991,12 @@ iWidget *makePreferences_Widget(void) {
             addRadioButton_(widths, "prefs.linewidth.1000", "Window", "linewidth.set arg:1000");
         }
         addChildFlags_Widget(values, iClob(widths), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
+        addChild_Widget(headings, iClob(makeHeading_Widget("Quote indicator:")));
+        iWidget *quote = new_Widget(); {
+            addRadioButton_(quote, "prefs.quoteicon.1", "Icon", "quoteicon.set arg:1");
+            addRadioButton_(quote, "prefs.quoteicon.0", "Line", "quoteicon.set arg:0");
+        }
+        addChildFlags_Widget(values, iClob(quote), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
         addChild_Widget(headings, iClob(makeHeading_Widget("Big 1st paragaph:")));
         addChild_Widget(values, iClob(makeToggle_Widget("prefs.biglede")));
         makeTwoColumnHeading_("WIDE LAYOUT", headings, values);
diff --git a/src/ui/window.c b/src/ui/window.c
index 40215506..c5194ea0 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -524,6 +524,7 @@ void init_Window(iWindow *d, iRect rect) {
     d->lastRect = rect;
     d->pendingCursor = NULL;
     d->isDrawFrozen = iTrue;
+    d->isMouseInside = iTrue;
     uint32_t flags = 0;
 #if defined (iPlatformApple)
     SDL_SetHint(SDL_HINT_RENDER_DRIVER, shouldDefaultToMetalRenderer_MacOS() ? "metal" : "opengl");
@@ -543,7 +544,7 @@ void init_Window(iWindow *d, iRect rect) {
     if (left_Rect(rect) >= 0 || top_Rect(rect) >= 0) {
         SDL_SetWindowPosition(d->win, left_Rect(rect), top_Rect(rect));
     }
-    const iInt2 minSize = init_I2(425, 250);
+    const iInt2 minSize = init_I2(425, 300);
     SDL_SetWindowMinimumSize(d->win, minSize.x, minSize.y);
     SDL_SetWindowTitle(d->win, "Lagrange");
     /* Some info. */ {
@@ -655,6 +656,12 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
             return iTrue;
         case SDL_WINDOWEVENT_LEAVE:
             unhover_Widget();
+            d->isMouseInside = iFalse;
+            postCommand_App("window.mouse.exited");
+            return iTrue;
+        case SDL_WINDOWEVENT_ENTER:
+            d->isMouseInside = iTrue;
+            postCommand_App("window.mouse.entered");
             return iTrue;
         default:
             break;
@@ -812,6 +819,9 @@ iInt2 coord_Window(const iWindow *d, int x, int y) {
 }
 
 iInt2 mouseCoord_Window(const iWindow *d) {
+    if (!d->isMouseInside) {
+        return init_I2(-1000000, -1000000);
+    }
     int x, y;
     SDL_GetMouseState(&x, &y);
     return coord_Window(d, x, y);
diff --git a/src/ui/window.h b/src/ui/window.h
index da4a2123..3ede1578 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -37,6 +37,7 @@ struct Impl_Window {
     iInt2         initialPos;
     iRect         lastRect; /* updated when window is moved/resized */
     iBool         isDrawFrozen; /* avoids premature draws while restoring window state */
+    iBool         isMouseInside;
     SDL_Renderer *render;
     iWidget *     root;
     float         pixelRatio;