Remove fret, optimize suspend/resume, move button handling to qml

applications/applications.pro

@@ -10,7 +10,6 @@ SUBDIRS = \
     lockscreen \
     notify-send \
     process-manager \
-    screenshot-tool \
     screenshot-viewer \
     settings-manager \
     system-service \
@@ -29,7 +28,6 @@ launcher.depends = system-service update-desktop-database
 lockscreen.depends = system-service
 notify-send.depends = system-service
 process-manager.depends =
-screenshot-tool.depends = system-service
 screenshot-viewer.depends = system-service
 settings-manager.depends = system-service
 system-service.depends =

applications/display-server/dbusinterface.cpp

@@ -6,18 +6,21 @@
 #include <QDBusUnixFileDescriptor>
 #include <QCoreApplication>
 #include <QQmlComponent>
+#include <QFileInfo>
 #include <sys/poll.h>
 #include <unistd.h>
 #include <QDBusMetaType>
 #include <liboxide/debug.h>
 #include <liboxide/epaper.h>
+#include <liboxide/devicesettings.h>
 #include <libblight/types.h>
 #include <libblight/socket.h>
 #include <cstring>
 
 DbusInterface::DbusInterface(QObject* parent)
 : QObject(parent),
-  m_focused(nullptr)
+  m_focused(nullptr),
+  buttonsDevNumber{QFileInfo(deviceSettings.getButtonsDevicePath()).baseName().midRef(5).toInt()}
 {
     engine.load(QUrl(QStringLiteral("qrc:/Workspace.qml")));
     if(engine.rootObjects().isEmpty()){
@@ -369,7 +372,7 @@ void DbusInterface::serviceOwnerChanged(const QString& name, const QString& oldO
 }
 
 void DbusInterface::inputEvents(unsigned int device, const std::vector<input_event>& events){
-    if(m_focused != nullptr){
+    if(m_focused != nullptr && device != buttonsDevNumber){
         m_focused->inputEvents(device, events);
     }
     for(auto connection : qAsConst(connections)){

applications/display-server/dbusinterface.h

@@ -92,6 +92,7 @@ private slots:
         QByteArray selection;
         QByteArray secondary;
     } clipboards;
+    unsigned int buttonsDevNumber;
 
     Connection* getConnection(QDBusMessage message);
     Connection* getConnection(QString identifier);

applications/display-server/evdevhandler.cpp

@@ -23,7 +23,8 @@ EvDevHandler* EvDevHandler::init(){
 }
 
 EvDevHandler::EvDevHandler()
-: QThread()
+: QThread(),
+  enabled{true}
 {
     setObjectName("EvDevHandler");
     reloadDevices();
@@ -46,13 +47,12 @@ bool EvDevHandler::hasDevice(event_device device){
 void EvDevHandler::reloadDevices(){
     O_DEBUG("Reloading devices");
     for(auto& device : deviceSettings.inputDevices()){
-        if(device.device == deviceSettings.getButtonsDevicePath()){
-            continue;
-        }
         if(!hasDevice(device) && device.fd > 0){
             auto input = new EvDevDevice(this, device);
             connect(input, &EvDevDevice::inputEvents, this, [this, input](auto events){
-                dbusInterface->inputEvents(input->number(), events);
+                if(enabled){
+                    dbusInterface->inputEvents(input->number(), events);
+                }
             }, Qt::QueuedConnection);
             O_DEBUG(input->name() << "added");
             devices.append(input);

applications/display-server/evdevhandler.h

@@ -18,9 +18,6 @@ class EvDevHandler : public QThread{
     EvDevHandler();
     ~EvDevHandler();
 
-signals:
-    void inputEvents(unsigned int device, const std::vector<input_event>& events);
-
 private:
     QList<EvDevDevice*> devices;
     bool hasDevice(event_device device);

applications/system-service/application.cpp

@@ -13,7 +13,6 @@
 #include "systemapi.h"
 #include "notificationapi.h"
 #include "screenapi.h"
-#include "buttonhandler.h"
 #include "apibase.h"
 
 using namespace Oxide::Applications;