Add command line option for use default sdl cursor.

3 files changed, 10 insertions, 2 deletions

diff --git a/src/commandline.cpp b/src/commandline.cpp
index 1a7ad7dba..562726a1e 100644
--- a/src/commandline.cpp
+++ b/src/commandline.cpp
@@ -158,6 +158,7 @@ void parseOptions(const int argc, char *const argv[])
         { "renderer",       required_argument, nullptr, 'r' },
         { "server-type",    required_argument, nullptr, 'y' },
         { "enable-ipc",     no_argument,       nullptr, 'I' },
+        { "default-cursor", no_argument,       nullptr, 'q' },
         { nullptr,          0,                 nullptr, 0 }
     };
 
@@ -251,6 +252,10 @@ void parseOptions(const int argc, char *const argv[])
                 break;
             case 'I':
                 options.ipc = true;
+                break;
+            case 'q':
+                options.defaultCursor = true;
+                break;
             default:
                 break;
         }
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 227b0c463..60ce059ea 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -257,7 +257,8 @@ void Gui::postInit(Graphics *const graphics)
     Widget::setGlobalFont(mGuiFont);
 
     // Initialize mouse cursor and listen for changes to the option
-    setUseCustomCursor(config.getBoolValue("customcursor"));
+    setUseCustomCursor(config.getBoolValue("customcursor") &&
+        !settings.options.defaultCursor);
     setDoubleClick(config.getBoolValue("doubleClick"));
     config.addListener("customcursor", mConfigListener);
     config.addListener("doubleClick", mConfigListener);
diff --git a/src/options.h b/src/options.h
index d0ee5c34b..82839482b 100644
--- a/src/options.h
+++ b/src/options.h
@@ -64,7 +64,8 @@ struct Options final
         noOpenGL(false),
         safeMode(false),
         testMode(false),
-        ipc(false)
+        ipc(false),
+        defaultCursor(false)
     {}
 
     A_DELETE_COPY(Options)
@@ -94,6 +95,7 @@ struct Options final
     bool safeMode;
     bool testMode;
     bool ipc;
+    bool defaultCursor;
 };
 
 #endif  // OPTIONS_H