Use ASCII number in \char definition

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index 0f6b9b6acb45497873240cd060a5267aa4d47789..0633bcbd54d1d4972f8c96b5e1122b1a2d89b0f9 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -52,6 +52,7 @@
 #include "frontends/Application.h"
 
 #include "support/ConsoleApplication.h"
+#include "support/convert.h"
 #include "support/lassert.h"
 #include "support/debug.h"
 #include "support/environment.h"
@@ -73,6 +74,8 @@
 #include <string>
 #include <vector>
 
+#include <qglobal.h> // For QT_VERSION
+
 using namespace std;
 using namespace lyx::support;
 
@@ -121,6 +124,14 @@ RunMode run_mode = PREFERRED;
 OverwriteFiles force_overwrite = UNSPECIFIED;
 
 
+// Scale the GUI by this factor. This works whether we have a HiDpi screen
+// or not and scales everything, also fonts. Can only be changed by setting
+// the QT_SCALE_FACTOR environment variable before launching LyX and only
+// works properly with Qt 5.6 or higher.
+
+double qt_scale_factor = 1.0;
+
+
 namespace {
 
 // Filled with the command line arguments "foo" of "-sysdir foo" or
@@ -303,6 +314,17 @@ int LyX::exec(int & argc, char * argv[])
        // we need to parse for "-dbg" and "-help"
        easyParse(argc, argv);
 
+#if QT_VERSION >= 0x050600
+       // Check whether Qt will scale all GUI elements and accordingly
+       // set the scale factor so that to avoid blurred images and text
+       char const * const scale_factor = getenv("QT_SCALE_FACTOR");
+       if (scale_factor) {
+               qt_scale_factor = convert<double>(scale_factor);
+               if (qt_scale_factor < 1.0)
+                       qt_scale_factor = 1.0;
+       }
+#endif
+
        try {
                init_package(os::utf8_argv(0), cl_system_support, cl_user_support);
        } catch (ExceptionMessage const & message) {