Add --raw flag

Updated dbus API. Now it sends a signal with every capture, it may
be captureFailed or a captureTaken which contains the raw image
bytes in png format. You have to add an id to the screenshot calls
so it will be returned as a way to know the origin of the signal.

src/utils/dbusutils.cpp

@@ -0,0 +1,55 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "dbusutils.h"
+#include "src/utils/systemnotification.h"
+#include <QApplication>
+#include <QTextStream>
+#include <QFile>
+
+DBusUtils::DBusUtils(QObject *parent) : QObject(parent) {
+    m_id = qHash(qApp->arguments().join(" "));
+}
+
+DBusUtils::DBusUtils(uint id, QObject *parent) :
+    QObject(parent), m_id(id)
+{
+}
+
+void DBusUtils::checkDBusConnection(const QDBusConnection &c) {
+    if (!c.isConnected()) {
+        SystemNotification().sendMessage(tr("Unable to connect via DBus"));
+        qApp->exit();
+    }
+}
+
+void DBusUtils::captureTaken(uint id, QByteArray rawImage) {
+    if (m_id == id) {
+        QFile file;
+        file.open(stdout, QIODevice::WriteOnly);
+        file.write(rawImage);
+        file.close();
+        qApp->exit();
+    }
+}
+
+void DBusUtils::captureFailed(uint id) {
+    if (m_id == id) {
+        QTextStream(stdout) << "screenshot failed";
+        qApp->exit();
+    }
+}

src/utils/dbusutils.h

@@ -0,0 +1,42 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef TERMINALUTILS_H
+#define TERMINALUTILS_H
+
+#include "src/cli/commandlineparser.h"
+#include <QDBusConnection>
+#include <QObject>
+
+class DBusUtils : public QObject
+{
+    Q_OBJECT
+public:
+    explicit DBusUtils(QObject *parent = nullptr);
+    explicit DBusUtils(uint id, QObject *parent = nullptr);
+
+    void checkDBusConnection(const QDBusConnection &connection);
+
+public slots:
+    void captureTaken(uint id, QByteArray rawImage);
+    void captureFailed(uint id);
+
+private:
+    uint m_id;
+};
+
+#endif // TERMINALUTILS_H

src/utils/desktopinfo.cpp

@@ -1,3 +1,20 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
 #include "desktopinfo.h"
 #include <QProcessEnvironment>
 

src/utils/desktopinfo.h

@@ -1,3 +1,20 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
 #ifndef DESKTOPINFO_H
 #define DESKTOPINFO_H
 

src/utils/screengrabber.cpp

@@ -26,7 +26,28 @@ ScreenGrabber::ScreenGrabber(QObject *parent) : QObject(parent) {
 
 }
 
-QPixmap ScreenGrabber::grabEntireDesktop() {
+QPixmap ScreenGrabber::grabEntireDesktop(bool &ok) {
+    ok = true; // revisit later
+    if(m_info.waylandDectected()) {
+        ok = false;
+        QPixmap res;
+        /*
+        habdle screenshot based on DE
+
+        switch (m_info.windowManager()) {
+        case m_info.GNOME:
+            // https://github.com/GNOME/gnome-shell/blob/695bfb96160033be55cfb5ac41c121998f98c328/data/org.gnome.Shell.Screenshot.xml
+            break;
+        case m_info.KDE:
+            // https://github.com/KDE/spectacle/blob/517a7baf46a4ca0a45f32fd3f2b1b7210b180134/src/PlatformBackends/KWinWaylandImageGrabber.cpp#L145
+            break;
+        default:
+            ok = false;
+            break;
+        }
+        */
+        return res;
+    }
     QRect geometry;
     for (QScreen *const screen : QGuiApplication::screens()) {
         geometry = geometry.united(screen->geometry());

src/utils/screengrabber.h

@@ -18,6 +18,7 @@
 #ifndef SCREENGRABBER_H
 #define SCREENGRABBER_H
 
+#include "src/utils/desktopinfo.h"
 #include <QObject>
 
 class ScreenGrabber : public QObject
@@ -25,8 +26,10 @@ class ScreenGrabber : public QObject
     Q_OBJECT
 public:
     explicit ScreenGrabber(QObject *parent = nullptr);
-    QPixmap grabEntireDesktop();
+    QPixmap grabEntireDesktop(bool &ok);
 
+private:
+    DesktopInfo m_info;
 };
 
 #endif // SCREENGRABBER_H