Merge branch 'dev' into work/v1.7

6 files changed, 40 insertions, 13 deletions

diff --git a/src/app.c b/src/app.c
index 91472075..be96bf6c 100644
--- a/src/app.c
+++ b/src/app.c
@@ -122,6 +122,7 @@ struct Impl_App {
     uint32_t     lastTickerTime;
     uint32_t     elapsedSinceLastTicker;
     iBool        isRunning;
+    iBool        isRunningUnderWindowSystem;
 #if defined (LAGRANGE_ENABLE_IDLE_SLEEP)
     iBool        isIdling;
     uint32_t     lastEventTime;
@@ -626,6 +627,12 @@ static iBool hasCommandLineOpenableScheme_(const iRangecc uri) {
 }
 
 static void init_App_(iApp *d, int argc, char **argv) {
+#if defined (iPlatformLinux)
+    d->isRunningUnderWindowSystem = !iCmpStr(SDL_GetCurrentVideoDriver(), "x11") ||
+                                    !iCmpStr(SDL_GetCurrentVideoDriver(), "wayland");
+#else
+    d->isRunningUnderWindowSystem = iTrue;
+#endif
     init_CommandLine(&d->args, argc, argv);
     /* Where was the app started from? We ask SDL first because the command line alone is
        not a reliable source of this information, particularly when it comes to different
@@ -749,7 +756,8 @@ static void init_App_(iApp *d, int argc, char **argv) {
     mulfv_I2(&d->initialWindowRect.size, desktopDPI_Win32());
 #endif
 #if defined (iPlatformLinux)
-    /* Scale by the primary (?) monitor DPI. */ {
+    /* Scale by the primary (?) monitor DPI. */ 
+    if (isRunningUnderWindowSystem_App()) {
         float vdpi;
         SDL_GetDisplayDPI(0, NULL, NULL, &vdpi);
         const float factor = vdpi / 96.0f;
@@ -1586,6 +1594,10 @@ enum iAppDeviceType deviceType_App(void) {
 #endif
 }
 
+iBool isRunningUnderWindowSystem_App(void) {
+    return app_.isRunningUnderWindowSystem;
+}
+
 iGmCerts *certs_App(void) {
     return app_.certs;
 }
diff --git a/src/app.h b/src/app.h
index 5d1d42e1..55bec5a6 100644
--- a/src/app.h
+++ b/src/app.h
@@ -87,6 +87,8 @@ iBool               isLandscape_App     (void);
 iLocalDef iBool     isPortrait_App      (void) { return !isLandscape_App(); }
 enum iAppDeviceType deviceType_App      (void);
 iLocalDef iBool     isPortraitPhone_App (void) { return isPortrait_App() && deviceType_App() == phone_AppDeviceType; }
+iBool               isRunningUnderWindowSystem_App  (void);
+
 iGmCerts *          certs_App           (void);
 iVisited *          visited_App         (void);
 iBookmarks *        bookmarks_App       (void);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 83f38dee..76e843d5 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -4213,12 +4213,12 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
     /* Fill the background. */ {
         if (run->linkId && linkFlags & isOpen_GmLinkFlag && ~linkFlags & content_GmLinkFlag) {
             /* Open links get a highlighted background. */
-            int bg = tmBackgroundOpenLink_ColorId;
-            const int frame = tmFrameOpenLink_ColorId;
+            int       bg       = tmBackgroundOpenLink_ColorId;
+            const int frame    = tmFrameOpenLink_ColorId;
             iRect     wideRect = { init_I2(left_Rect(d->widgetBounds), visPos.y),
-                               init_I2(width_Rect(d->widgetBounds) +
+                                   init_I2(width_Rect(d->widgetBounds) +
                                            width_Widget(d->widget->scroll),
-                                       height_Rect(run->visBounds)) };
+                                           height_Rect(run->visBounds)) };
             /* The first line is composed of two runs that may be drawn in either order, so
                only draw half of the background. */
             if (run->flags & decoration_GmRunFlag) {
@@ -4238,8 +4238,11 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
 //                    &d->paint, addY_I2(bottomLeft_Rect(wideRect), -1), width_Rect(wideRect), frame);
 //            }
         }
-        else if (run->linkId) {
-            /* Normal background for runs that may change appearance. */
+        else { 
+            /* Normal background for other runs. There are cases when runs get drawn multiple times,
+               e.g., at the buffer boundary, and there are slightly overlapping characters in
+               monospace blocks. Clearing the background here ensures a cleaner visual appearance
+               since only one glyph is visible at any given point. */
             fillRect_Paint(&d->paint, (iRect){ visPos, run->visBounds.size }, tmBackground_ColorId);
         }
     }
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index fa65cf3c..690107a2 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -541,6 +541,11 @@ static int contentHeight_InputWidget_(const iInputWidget *d) {
     return size_Range(&d->visWrapLines) * lineHeight_Text(d->font);
 }
 
+static void updateTextInputRect_InputWidget_(const iInputWidget *d) {
+    const iRect bounds = bounds_Widget(constAs_Widget(d));
+    SDL_SetTextInputRect(&(SDL_Rect){ bounds.pos.x, bounds.pos.y, bounds.size.x, bounds.size.y });    
+}
+
 static void updateMetrics_InputWidget_(iInputWidget *d) {
     iWidget *w = as_Widget(d);
     updateSizeForFixedLength_InputWidget_(d);
@@ -553,6 +558,7 @@ static void updateMetrics_InputWidget_(iInputWidget *d) {
     invalidateBuffered_InputWidget_(d);
     if (height_Rect(w->rect) != oldHeight) {
         postCommand_Widget(d, "input.resized");
+        updateTextInputRect_InputWidget_(d);
     }
 }
 
@@ -988,6 +994,7 @@ void begin_InputWidget(iInputWidget *d) {
         iZap(d->mark);
     }
     enableEditorKeysInMenus_(iFalse);
+    updateTextInputRect_InputWidget_(d);
     updateVisible_InputWidget_(d);
 }
 
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 58294c6a..3bfa600b 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -311,7 +311,7 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
 #endif
             drawLines_Paint(&p, points + 2, 3, frame2);
             drawLines_Paint(
-                &p, points, !isHover && flags & d->flags.noTopFrame ? 2 : 3, frame);
+                &p, points, !isHover && d->flags.noTopFrame ? 2 : 3, frame);
         }
     }
     setClip_Paint(&p, rect);
diff --git a/src/ui/window.c b/src/ui/window.c
index 3bafd9a4..3ac02495 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -278,11 +278,14 @@ static float displayScale_Window_(const iWindow *d) {
     iUnused(d);
     return desktopDPI_Win32();
 #else
-    float vdpi = 0.0f;
-    SDL_GetDisplayDPI(SDL_GetWindowDisplayIndex(d->win), NULL, NULL, &vdpi);
-//    printf("DPI: %f\n", vdpi);
-    const float factor = vdpi / baseDPI_Window / pixelRatio_Window_(d);
-    return iMax(1.0f, factor);
+    if (isRunningUnderWindowSystem_App()) {
+        float vdpi = 0.0f;
+        SDL_GetDisplayDPI(SDL_GetWindowDisplayIndex(d->win), NULL, NULL, &vdpi);
+//      printf("DPI: %f\n", vdpi);
+        const float factor = vdpi / baseDPI_Window / pixelRatio_Window_(d);
+        return iMax(1.0f, factor);
+    }
+    return 1.0f;
 #endif
 }