5 files changed, 32 insertions, 19 deletions

diff --git a/src/app.c b/src/app.c
index 828f5097..e807f09d 100644
--- a/src/app.c
+++ b/src/app.c
@@ -258,6 +258,7 @@ static iString *serializePrefs_App_(const iApp *d) {
         { "prefs.bookmarks.addbottom", &d->prefs.addBookmarksToBottom },
         { "prefs.archive.openindex", &d->prefs.openArchiveIndexPages },
         { "prefs.font.warnmissing", &d->prefs.warnAboutMissingGlyphs },
+        { "prefs.blink", &d->prefs.blinkingCursor },
     };
     iForIndices(i, boolPrefs) {
         appendFormat_String(str, "%s.changed arg:%d\n", boolPrefs[i].id, *boolPrefs[i].value);
@@ -2600,6 +2601,10 @@ iBool handleCommand_App(const char *cmd) {
         d->prefs.uiAnimations = arg_Command(cmd) != 0;
         return iTrue;
     }
+    else if (equal_Command(cmd, "prefs.blink.changed")) {
+        d->prefs.blinkingCursor = arg_Command(cmd) != 0;
+        return iTrue;
+    }
     else if (equal_Command(cmd, "prefs.time.24h.changed")) {
         d->prefs.time24h = arg_Command(cmd) != 0;
         return iTrue;
@@ -2911,6 +2916,8 @@ iBool handleCommand_App(const char *cmd) {
         iWidget *dlg = makePreferences_Widget();
         updatePrefsThemeButtons_(dlg);
         setText_InputWidget(findChild_Widget(dlg, "prefs.downloads"), &d->prefs.strings[downloadDir_PrefsString]);
+        /* TODO: Use a common table in Prefs to do this more conviently.
+           Also see `serializePrefs_App_()`. */
         setToggle_Widget(findChild_Widget(dlg, "prefs.hoverlink"), d->prefs.hoverLink);
         setToggle_Widget(findChild_Widget(dlg, "prefs.smoothscroll"), d->prefs.smoothScrolling);
         setToggle_Widget(findChild_Widget(dlg, "prefs.imageloadscroll"), d->prefs.loadImageInsteadOfScrolling);
@@ -2921,7 +2928,7 @@ iBool handleCommand_App(const char *cmd) {
         setToggle_Widget(findChild_Widget(dlg, "prefs.ostheme"), d->prefs.useSystemTheme);
         setToggle_Widget(findChild_Widget(dlg, "prefs.customframe"), d->prefs.customFrame);
         setToggle_Widget(findChild_Widget(dlg, "prefs.animate"), d->prefs.uiAnimations);
-//        setText_InputWidget(findChild_Widget(dlg, "prefs.userfont"), &d->prefs.symbolFontPath);
+        setToggle_Widget(findChild_Widget(dlg, "prefs.blink"), d->prefs.blinkingCursor);
         updatePrefsPinSplitButtons_(dlg, d->prefs.pinSplit);
         updateScrollSpeedButtons_(dlg, mouse_ScrollType, d->prefs.smoothScrollSpeed[mouse_ScrollType]);
         updateScrollSpeedButtons_(dlg, keyboard_ScrollType, d->prefs.smoothScrollSpeed[keyboard_ScrollType]);
@@ -2933,13 +2940,6 @@ iBool handleCommand_App(const char *cmd) {
         setToggle_Widget(findChild_Widget(dlg, "prefs.retainwindow"), d->prefs.retainWindowSize);
         setText_InputWidget(findChild_Widget(dlg, "prefs.uiscale"),
                             collectNewFormat_String("%g", uiScale_Window(as_Window(d->window))));
-//        setFlags_Widget(findChild_Widget(dlg, format_CStr("prefs.font.%d", d->prefs.font)),
-//                        selected_WidgetFlag,
-//                        iTrue);
-//        setFlags_Widget(
-//            findChild_Widget(dlg, format_CStr("prefs.headingfont.%d", d->prefs.headingFont)),
-//            selected_WidgetFlag,
-//            iTrue);
         setFlags_Widget(findChild_Widget(dlg, "prefs.mono.gemini"),
                         selected_WidgetFlag,
                         d->prefs.monospaceGemini);
diff --git a/src/prefs.c b/src/prefs.c
index 10df9ade..5d85f195 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -42,6 +42,7 @@ void init_Prefs(iPrefs *d) {
     d->zoomPercent       = 100;
     d->sideIcon          = iTrue;
     d->hideToolbarOnScroll = iTrue;
+    d->blinkingCursor    = iTrue;
     d->pinSplit          = 1;
     d->time24h           = iTrue;
     d->returnKey         = default_ReturnKeyBehavior;
diff --git a/src/prefs.h b/src/prefs.h
index c9abfc8e..f22953c5 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -72,6 +72,7 @@ struct Impl_Prefs {
     iBool            uiAnimations;
     float            uiScale;
     iBool            hideToolbarOnScroll;
+    iBool            blinkingCursor;
     /* Document presentation */
     int              zoomPercent;
     iBool            sideIcon;
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 49cc0a1e..b910f905 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -588,7 +588,7 @@ static void updateVisible_InputWidget_(iInputWidget *d) {
     }
     d->visWrapLines.start += delta;
     d->visWrapLines.end   += delta;
-    iAssert(contains_Range(&d->visWrapLines, cursorY));
+//    iAssert(contains_Range(&d->visWrapLines, cursorY));
     if (!isFocused_Widget(d) && d->maxWrapLines == 1) {
         d->visWrapLines.start = 0;
         d->visWrapLines.end = 1;
@@ -711,7 +711,10 @@ static uint32_t cursorTimer_(uint32_t interval, void *w) {
     return interval;
 }
 
-static void startOrStopCursorTimer_InputWidget_(iInputWidget *d, iBool doStart) {
+static void startOrStopCursorTimer_InputWidget_(iInputWidget *d, int doStart) {
+    if (!prefs_App()->blinkingCursor && doStart == 1) {
+        doStart = iFalse;
+    }
     if (doStart && !d->timer) {
         d->timer = SDL_AddTimer(refreshInterval_InputWidget_, cursorTimer_, d);
     }
@@ -2167,6 +2170,12 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         return iFalse;
     }
 #if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    else if (isCommand_UserEvent(ev, "prefs.blink.changed")) {
+        if (isEditing_InputWidget_(d) && arg_Command(command_UserEvent(ev))) {
+            startOrStopCursorTimer_InputWidget_(d, 2);
+        }
+        return iFalse;
+    }
     else if (isEditing_InputWidget_(d) && (isCommand_UserEvent(ev, "window.focus.lost") ||
                                            isCommand_UserEvent(ev, "window.focus.gained"))) {
         startOrStopCursorTimer_InputWidget_(d, isCommand_UserEvent(ev, "window.focus.gained"));
@@ -2613,10 +2622,10 @@ static void draw_InputWidget_(const iInputWidget *d) {
         return;
     }
     const iRect contentBounds = contentBounds_InputWidget_(d);
-    iInt2       drawPos    = topLeft_Rect(contentBounds);
-    const int   fg         = isHint                                   ? uiAnnotation_ColorId
-                             : isFocused /*&& !isEmpty_Array(&d->lines)*/ ? uiInputTextFocused_ColorId
-                                                                      : uiInputText_ColorId;
+    iInt2       drawPos       = topLeft_Rect(contentBounds);
+    const int   fg            = isHint      ? uiAnnotation_ColorId
+                                : isFocused ? uiInputTextFocused_ColorId
+                                            : uiInputText_ColorId;
 #if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
     setClip_Paint(&p,
                   adjusted_Rect(bounds,
@@ -2685,7 +2694,8 @@ static void draw_InputWidget_(const iInputWidget *d) {
         wrapText.context  = NULL;
     }
     /* Draw the insertion point. */
-    if (isFocused && d->cursorVis && contains_Range(&visLines, d->cursor.y) &&
+    if (isFocused && (d->cursorVis || !prefs_App()->blinkingCursor) &&
+        contains_Range(&visLines, d->cursor.y) &&
         (deviceType_App() == desktop_AppDeviceType || isEmpty_Range(&d->mark))) {
         iInt2    curSize;
         iRangecc cursorChar    = iNullRange;
diff --git a/src/ui/util.c b/src/ui/util.c
index db24b6fc..a46c7f80 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -2629,9 +2629,8 @@ iWidget *makePreferences_Widget(void) {
     }
     /* User Interface. */ {
         appendTwoColumnTabPage_Widget(tabs, "${heading.prefs.interface}", '2', &headings, &values);
-#if defined (LAGRANGE_ENABLE_CUSTOM_FRAME)
-        addDialogToggle_(headings, values, "${prefs.customframe}", "prefs.customframe");
-#endif
+        addDialogToggle_(headings, values, "${prefs.animate}", "prefs.animate");
+        addDialogToggle_(headings, values, "${prefs.blink}", "prefs.blink");
         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.returnkey}")));
         /* Return key behaviors. */ {
             iLabelWidget *returnKey = makeMenuButton_LabelWidget(
@@ -2645,7 +2644,9 @@ iWidget *makePreferences_Widget(void) {
             setId_Widget(addChildFlags_Widget(values, iClob(returnKey), alignLeft_WidgetFlag),
                          "prefs.returnkey");
         }
-        addDialogToggle_(headings, values, "${prefs.animate}", "prefs.animate");
+#if defined (LAGRANGE_ENABLE_CUSTOM_FRAME)
+        addDialogToggle_(headings, values, "${prefs.customframe}", "prefs.customframe");
+#endif
         makeTwoColumnHeading_("${heading.prefs.scrolling}", headings, values);
         addDialogToggle_(headings, values, "${prefs.smoothscroll}", "prefs.smoothscroll");
         /* Scroll speeds. */ {