X11: Add --wmclass command line option

BUG: 400753
FIXED-IN: 3.1.0

src/lib/app/commandlineoptions.cpp

@@ -75,6 +75,10 @@ void CommandLineOptions::parseActions()
     QCommandLineOption fullscreenOption(QStringList({QSL("f"), QSL("fullscreen")}));
     fullscreenOption.setDescription(QSL("Toggles fullscreen."));
 
+    QCommandLineOption wmclassOption(QStringList({QSL("wmclass")}));
+    wmclassOption.setValueName(QSL("WM_CLASS"));
+    wmclassOption.setDescription(QSL("Application class (X11 only)."));
+
     // Parser
     QCommandLineParser parser;
     parser.setApplicationDescription(QSL("QtWebEngine based browser"));
@@ -92,6 +96,7 @@ void CommandLineOptions::parseActions()
     parser.addOption(currentTabOption);
     parser.addOption(openWindowOption);
     parser.addOption(fullscreenOption);
+    parser.addOption(wmclassOption);
     parser.addPositionalArgument(QSL("URL"), QSL("URLs to open"), QSL("[URL...]"));
 
     // parse() and not process() so we can pass arbitrary options to Chromium
@@ -186,6 +191,13 @@ void CommandLineOptions::parseActions()
         m_actions.append(pair);
     }
 
+    if (parser.isSet(wmclassOption)) {
+        ActionPair pair;
+        pair.action = Qz::CL_WMClass;
+        pair.text = parser.value(wmclassOption);
+        m_actions.append(pair);
+    }
+
     if (parser.positionalArguments().isEmpty())
         return;
 

src/lib/app/mainapplication.cpp

@@ -200,6 +200,9 @@ MainApplication::MainApplication(int &argc, char** argv)
             case Qz::CL_ExitAction:
                 m_isClosing = true;
                 return;
+            case Qz::CL_WMClass:
+                m_wmClass = pair.text.toUtf8();
+                break;
             default:
                 break;
             }
@@ -500,6 +503,11 @@ void MainApplication::setProxyStyle(ProxyStyle *style)
     setStyle(style);
 }
 
+QByteArray MainApplication::wmClass() const
+{
+    return m_wmClass;
+}
+
 History* MainApplication::history()
 {
     if (!m_history) {

src/lib/app/mainapplication.h

@@ -91,6 +91,8 @@ public:
     QString styleName() const;
     void setProxyStyle(ProxyStyle *style);
 
+    QByteArray wmClass() const;
+
     History* history();
     Bookmarks* bookmarks();
 
@@ -187,6 +189,8 @@ private:
     AutoSaver* m_autoSaver;
     ProxyStyle *m_proxyStyle = nullptr;
 
+    QByteArray m_wmClass;
+
     QList<BrowserWindow*> m_windows;
     QPointer<BrowserWindow> m_lastActiveWindow;
 

src/lib/app/qzcommon.h

@@ -82,7 +82,8 @@ enum CommandLineAction {
     CL_StartPrivateBrowsing,
     CL_StartNewInstance,
     CL_StartPortable,
-    CL_ExitAction
+    CL_ExitAction,
+    CL_WMClass
 };
 
 enum ObjectName {

src/lib/tools/qztools.cpp

@@ -18,6 +18,7 @@
 #include "qztools.h"
 #include "datapaths.h"
 #include "settings.h"
+#include "mainapplication.h"
 
 #include <QTextDocument>
 #include <QDateTime>
@@ -862,8 +863,8 @@ void QzTools::setWmClass(const QString &name, const QWidget* widget)
     if (QGuiApplication::platformName() != QL1S("xcb"))
         return;
 
-    const QByteArray &nameData = name.toUtf8();
+    const QByteArray nameData = name.toUtf8();
-    const QByteArray &classData = QByteArrayLiteral("Falkon");
+    const QByteArray classData = mApp->wmClass().isEmpty() ? QByteArrayLiteral("Falkon") : mApp->wmClass();
 
     uint32_t class_len = nameData.length() + 1 + classData.length() + 1;
     char *class_hint = (char*) malloc(class_len);