4 files changed, 28 insertions, 12 deletions

diff --git a/src/app.c b/src/app.c
index 5eceebec..42244c80 100644
--- a/src/app.c
+++ b/src/app.c
@@ -98,6 +98,7 @@ struct Impl_App {
     float        uiScale;
     int          zoomPercent;
     iBool        forceWrap;
+    iBool        forceSoftwareRender;
     enum iColorTheme theme;
     iBool        useSystemTheme;
     iString      gopherProxy;
@@ -304,6 +305,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
     d->pendingRefresh    = iFalse;
     d->zoomPercent       = 100;
     d->forceWrap         = iFalse;
+    d->forceSoftwareRender = checkArgument_CommandLine(&d->args, "sw") != NULL;
     d->certs             = new_GmCerts(dataDir_App_);
     d->visited           = new_Visited();
     d->bookmarks         = new_Bookmarks();
@@ -531,10 +533,14 @@ int zoom_App(void) {
     return app_.zoomPercent;
 }
 
-iBool isLineWrapForced_App(void) {
+iBool forceLineWrap_App(void) {
     return app_.forceWrap;
 }
 
+iBool forceSoftwareRender_App(void) {
+    return app_.forceSoftwareRender;
+}
+
 enum iColorTheme colorTheme_App(void) {
     return app_.theme;
 }
diff --git a/src/app.h b/src/app.h
index 69b8d274..a5b1266d 100644
--- a/src/app.h
+++ b/src/app.h
@@ -58,7 +58,8 @@ iBool       isRefreshPending_App        (void);
 uint32_t    elapsedSinceLastTicker_App  (void); /* milliseconds */
 
 int                 zoom_App            (void);
-iBool               isLineWrapForced_App(void);
+iBool               forceLineWrap_App   (void);
+iBool               forceSoftwareRender_App(void);
 enum iColorTheme    colorTheme_App      (void);
 const iString *     schemeProxy_App     (iRangecc scheme);
 
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index fce548b4..ab8af9b8 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -269,7 +269,7 @@ static iRect documentBounds_DocumentWidget_(const iDocumentWidget *d) {
 }
 
 static int forceBreakWidth_DocumentWidget_(const iDocumentWidget *d) {
-    if (isLineWrapForced_App()) {
+    if (forceLineWrap_App()) {
         const iRect bounds    = bounds_Widget(constAs_Widget(d));
         const iRect docBounds = documentBounds_DocumentWidget_(d);
         return right_Rect(bounds) - left_Rect(docBounds) - gap_UI * d->pageMargin;
diff --git a/src/ui/window.c b/src/ui/window.c
index 0a63a941..38df42e0 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -477,26 +477,35 @@ static void drawBlank_Window_(iWindow *d) {
     SDL_RenderPresent(d->render);
 }
 
-// #define ENABLE_SWRENDER
+iBool create_Window_(iWindow *d, iRect rect, uint32_t flags) {
+    flags |= SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI;
+    if (SDL_CreateWindowAndRenderer(
+            width_Rect(rect), height_Rect(rect), flags, &d->win, &d->render)) {
+        return iFalse;
+    }
+    return iTrue;
+}
 
 void init_Window(iWindow *d, iRect rect) {
     theWindow_ = d;
     iZap(d->cursors);
     d->pendingCursor = NULL;
     d->isDrawFrozen = iTrue;
-    uint32_t flags = SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI;
-#if defined (ENABLE_SWRENDER)
-    SDL_SetHint(SDL_HINT_RENDER_DRIVER, "software");
-#elif defined (iPlatformApple)
+    uint32_t flags = 0;
+#if defined (iPlatformApple)
     SDL_SetHint(SDL_HINT_RENDER_DRIVER, "metal");
 #else
     flags |= SDL_WINDOW_OPENGL;
 #endif
     SDL_SetHint(SDL_HINT_RENDER_VSYNC, "1");
-    if (SDL_CreateWindowAndRenderer(
-            width_Rect(rect), height_Rect(rect), flags, &d->win, &d->render)) {
-        fprintf(stderr, "Error when creating window: %s\n", SDL_GetError());
-        exit(-2);
+    /* First try SDL's default renderer that should be the best option. */
+    if (forceSoftwareRender_App() || !create_Window_(d, rect, flags)) {
+        /* No luck, maybe software only? This should always work as long as there is a display. */
+        SDL_SetHint(SDL_HINT_RENDER_DRIVER, "software");
+        if (!create_Window_(d, rect, 0)) {
+            fprintf(stderr, "Error when creating window: %s\n", SDL_GetError());
+            exit(-2);
+        }
     }
     if (left_Rect(rect) >= 0) {
         SDL_SetWindowPosition(d->win, left_Rect(rect), top_Rect(rect));