Add active window capture

Not on Mac. I still don't have a way to test there.

KShare.pro

@@ -121,7 +121,7 @@ mac {
         SOURCES += $$PWD/platformspecifics/x11/x11backend.cpp
         HEADERS += $$PWD/platformspecifics/x11/x11backend.hpp
         QT += x11extras
-        LIBS += -lxcb-cursor -lxcb-xfixes
+        LIBS += -lxcb-cursor -lxcb-xfixes -lxcb
 } else {
         error(Unsupported platform);
 }

main.cpp

@@ -3,6 +3,7 @@
 #include <QApplication>
 #include <QCommandLineParser>
 #include <QDebug>
+#include <QScreen>
 #include <QtGlobal>
 #include <formatter.hpp>
 #include <iostream>
@@ -13,6 +14,7 @@ extern "C" {
 #include "ui_mainwindow.h"
 #include <QListWidget>
 #include <notifications.hpp>
+#include <platformbackend.hpp>
 #include <worker/worker.hpp>
 
 bool verbose = false;

mainwindow.cpp

@@ -8,6 +8,7 @@
 #include <colorpicker/colorpickerscene.hpp>
 #include <formats.hpp>
 #include <hotkeying.hpp>
+#include <platformbackend.hpp>
 #include <recording/recordingformats.hpp>
 #include <settings.hpp>
 #include <uploaders/uploadersingleton.hpp>
@@ -45,13 +46,21 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
     QAction *quit = new QAction("Quit", this);
     QAction *shtoggle = new QAction("Show/Hide", this);
     QAction *fullscreen = new QAction("Take fullscreen shot", this);
-    QAction *area = new QAction("Take area shot", this);
+
+    QAction *active = new QAction("Take area shot", this);
+#ifdef PLATFORM_CAPABILITY_ACTIVEWINDOW
+    QAction *area = new QAction("Screenshot active window", this);
+    connect(active, &QAction::triggered, this, [] { screenshotter::activeDelayed(); });
+#endif
     QAction *picker = new QAction("Show color picker", this);
     QAction *rec = new QAction("Record screen", this);
     QAction *recoff = new QAction("Stop recording", this);
     menu->addActions({ quit, shtoggle, picker });
     menu->addSeparator();
     menu->addActions({ fullscreen, area });
+#ifdef PLATFORM_CAPABILITY_ACTIVEWINDOW
+    menu->addAction(area);
+#endif
     menu->addSeparator();
     menu->addActions({ rec, recoff });
     connect(quit, &QAction::triggered, this, &MainWindow::quit);
@@ -71,6 +80,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
 
     addHotkey("fullscreen", [] { screenshotter::fullscreen(); });
     addHotkey("area", [] { screenshotter::area(); });
+    addHotkey("active", [] { screenshotter::active(); });
     addHotkey("picker", [] { ColorPickerScene::showPicker(); });
     addHotkey("recordingstop", [&] { controller->end(); });
     addHotkey("recordingstart", [&] { this->rec(); });

platformspecifics/mac/macbackend.hpp

@@ -3,6 +3,8 @@
 
 #include <QPixmap>
 
+#define PLATFORM_CAPABILITY_PID
+
 class PlatformBackend {
 public:
     QPixmap getCursor();

platformspecifics/u32/u32backend.cpp

@@ -24,3 +24,7 @@ std::tuple<QPoint, QPixmap> PlatformBackend::getCursor() {
 DWORD PlatformBackend::pid() {
     return GetCurrentProcessId();
 }
+
+WId PlatformBackend::getActiveWID() {
+    return GetForegroundWindow();
+}

platformspecifics/u32/u32backend.hpp

@@ -4,6 +4,10 @@
 #include <QPixmap>
 #include <windows.h>
 
+#define PLATFORM_CAPABILITY_PID
+#define PLATFORM_CAPABILITY_ACTIVEWINDOW
+#define PLATFORM_CAPABILITY_CURSOR
+
 class PlatformBackend {
 public:
     std::tuple<QPoint, QPixmap> getCursor();

platformspecifics/x11/x11backend.cpp

@@ -27,3 +27,30 @@ std::tuple<QPoint, QPixmap> PlatformBackend::getCursor() {
 pid_t PlatformBackend::pid() {
     return getpid();
 }
+
+
+WId PlatformBackend::getActiveWID() {
+    xcb_connection_t *connection = QX11Info::connection();
+    xcb_get_input_focus_reply_t *focusReply;
+    xcb_query_tree_cookie_t treeCookie;
+    xcb_query_tree_reply_t *treeReply;
+
+    focusReply = xcb_get_input_focus_reply(connection, xcb_get_input_focus(connection), nullptr);
+    xcb_window_t window = focusReply->focus;
+    while (1) {
+        treeCookie = xcb_query_tree(connection, window);
+        treeReply = xcb_query_tree_reply(connection, treeCookie, nullptr);
+        if (!treeReply) {
+            window = 0;
+            break;
+        }
+        if (window == treeReply->root || treeReply->parent == treeReply->root) {
+            break;
+        } else {
+            window = treeReply->parent;
+        }
+        delete treeReply;
+    }
+    delete treeReply;
+    return window;
+}

platformspecifics/x11/x11backend.hpp

@@ -3,6 +3,10 @@
 
 #include <QPixmap>
 
+#define PLATFORM_CAPABILITY_PID
+#define PLATFORM_CAPABILITY_ACTIVEWINDOW
+#define PLATFORM_CAPABILITY_CURSOR
+
 class PlatformBackend {
 public:
     std::tuple<QPoint, QPixmap> getCursor();
@@ -11,6 +15,7 @@ public:
         static PlatformBackend inst;
         return inst;
     }
+    WId getActiveWID();
 };
 
 #endif // X11BACKEND_HPP

screenshotter.cpp

@@ -5,6 +5,7 @@
 #include "uploaders/uploadersingleton.hpp"
 #include <QDoubleSpinBox>
 #include <QTimer>
+#include <platformbackend.hpp>
 #include <settings.hpp>
 
 void screenshotter::area() {
@@ -26,3 +27,13 @@ void screenshotter::areaDelayed() {
 void screenshotter::fullscreenDelayed() {
     QTimer::singleShot(settings::settings().value("delay", 0.5).toFloat() * 1000, &screenshotter::fullscreen);
 }
+
+void screenshotter::activeDelayed() {
+    QTimer::singleShot(settings::settings().value("delay", 0.5).toFloat() * 1000, &screenshotter::activeDelayed);
+}
+
+void screenshotter::active() {
+#ifdef PLATFORM_CAPABILITY_ACTIVEWINDOW
+    UploaderSingleton::inst().upload(screenshotutil::window(PlatformBackend::inst().getActiveWID()));
+#endif
+}

screenshotter.hpp

@@ -3,9 +3,13 @@
 
 namespace screenshotter {
 void fullscreen();
-void area();
 void fullscreenDelayed();
+
+void area();
 void areaDelayed();
+
+void activeDelayed();
+void active();
 }
 
 #endif // SCREENSHOTTER_HPP

screenshotutil.cpp

@@ -8,6 +8,7 @@
 #include <platformbackend.hpp>
 
 QPixmap *screenshotutil::fullscreen(bool cursor) {
+#ifdef PLATFORM_CAPABILITY_CURSOR
     if (cursor) {
         QPixmap *noCursor = window(0);
         QScopedPointer<QPixmap> p(noCursor);
@@ -18,6 +19,7 @@ QPixmap *screenshotutil::fullscreen(bool cursor) {
         painter.end();
         return withCursor;
     }
+#endif
     return window(0);
 }
 
@@ -36,6 +38,7 @@ void screenshotutil::toClipboard(QString value) {
 QPixmap *screenshotutil::fullscreenArea(bool cursor, qreal x, qreal y, qreal w, qreal h) {
     auto scr = QApplication::primaryScreen();
     QRectF area(x, y, w < 0 ? scr->size().width() : w, h < 0 ? scr->size().height() : h);
+#ifdef PLATFORM_CAPABILITY_CURSOR
     if (cursor) {
         QPointF point = QCursor::pos(scr);
         if (area.contains(point)) {
@@ -48,5 +51,6 @@ QPixmap *screenshotutil::fullscreenArea(bool cursor, qreal x, qreal y, qreal w,
             return withCursor;
         }
     }
+#endif
     return new QPixmap(scr->grabWindow(0, area.x(), area.y(), area.width(), area.height()));
 }

settingsdialog.cpp

@@ -2,6 +2,7 @@
 #include "mainwindow.hpp"
 #include "ui_settingsdialog.h"
 
+#include <QCheckBox>
 #include <QDesktopServices>
 #include <QInputDialog>
 #include <QListWidget>
@@ -10,6 +11,7 @@
 #include <colorpicker/colorpickerscene.hpp>
 #include <formats.hpp>
 #include <hotkeying.hpp>
+#include <platformbackend.hpp>
 #include <recording/encoders/encodersettingsdialog.hpp>
 #include <screenshotter.hpp>
 #include <settings.hpp>
@@ -48,6 +50,9 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent), ui(new Ui::Se
 
     addHotkeyItem(ui->hotkeys, "Fullscreen image", "fullscreen", [] { screenshotter::fullscreen(); });
     addHotkeyItem(ui->hotkeys, "Area image", "area", [] { screenshotter::area(); });
+#ifdef PLATFORM_CAPABILITY_ACTIVEWINDOW
+    addHotkeyItem(ui->hotkeys, "Active window", "active", [&] { screenshotter::active(); });
+#endif
     addHotkeyItem(ui->hotkeys, "Color picker", "picker", [] { ColorPickerScene::showPicker(); });
     addHotkeyItem(ui->hotkeys, "Stop Recording", "recordingstop", [&] { MainWindow::inst()->controller->end(); });
     addHotkeyItem(ui->hotkeys, "Start Recording", "recordingstart", [&] { MainWindow::inst()->rec(); });
@@ -66,6 +71,10 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent), ui(new Ui::Se
     ui->formatBox->addItem("None");
     ui->formatBox->setCurrentIndex(settings::settings().value("recording/format", (int)formats::Recording::None).toInt());
     setWindowTitle("Settings");
+#ifndef PLATFORM_CAPABILITY_CURSOR
+    ui->captureCursor->setEnabled(false);
+    ui->captureCursor->setText("Capture cursor (disabled: implementation missing)");
+#endif
 }
 
 void SettingsDialog::setScheme(QString scheme) {