Get things somewhat ported over

Eeems-Org · Jan 29, 2024 · 98d03bc · 98d03bc
1 parent 6f4cd9b
commit 98d03bc
Show file tree

Hide file tree

Showing 13 changed files with 74 additions and 72 deletions.
diff --git a/applications/display-server/connection.cpp b/applications/display-server/connection.cpp
@@ -286,13 +286,14 @@ void Connection::readSocket(){
                 auto repaint = Blight::repaint_t::from_message(message.get());
                 O_DEBUG(
                     "Repaint requested:"
-                    << QString("%6 (%1,%2) %3x%4 %5")
+                    << QString("%6 (%1,%2) %3x%4 %5 %7")
                         .arg(repaint.x)
                         .arg(repaint.y)
                         .arg(repaint.width)
                         .arg(repaint.height)
                         .arg(repaint.waveform)
                         .arg(repaint.identifier)
+                        .arg(repaint.marker)
                         .toStdString()
                         .c_str()
                 );
@@ -312,7 +313,7 @@ void Connection::readSocket(){
                     surface,
                     rect,
                     (EPFrameBuffer::WaveformMode)repaint.waveform,
-                    message->header.ackid,
+                    repaint.marker,
                     false,
                     [message, this]{ ack(message, 0, nullptr); }
                 );
@@ -471,13 +472,17 @@ void Connection::readSocket(){
                 break;
             }
             case Blight::MessageType::Ping:{
+#ifdef ACK_DEBUG
                 O_DEBUG("Pong" << message->header.ackid);
+#endif
                 break;
             }
             case Blight::MessageType::Ack:
                 do_ack = false;
                 if(message->header.ackid == pingId){
+#ifdef ACK_DEBUG
                     O_DEBUG("Pong recieved" << message->header.ackid);
+#endif
                     m_notRespondingTimer.stop();
                     m_pingTimer.stop();
                     m_pingTimer.start();

diff --git a/applications/display-server/dbusinterface.cpp b/applications/display-server/dbusinterface.cpp
@@ -270,6 +270,14 @@ QStringList DbusInterface::getSurfaces(QDBusMessage message){
     return surfaces;
 }
 
+QDBusUnixFileDescriptor DbusInterface::frameBuffer(QDBusMessage message){
+    if(message.service() != "codes.eeems.oxide1"){
+        sendErrorReply(QDBusError::AccessDenied, "Access denied");
+        return QDBusUnixFileDescriptor();
+    }
+    return QDBusUnixFileDescriptor(::open("/dev/fb0", O_RDWR));
+}
+
 Connection* DbusInterface::focused(){ return m_focused; }
 
 void DbusInterface::serviceOwnerChanged(const QString& name, const QString& oldOwner, const QString& newOwner){

diff --git a/applications/display-server/dbusinterface.h b/applications/display-server/dbusinterface.h
@@ -66,6 +66,7 @@ public slots:
     QDBusUnixFileDescriptor getSurface(ushort identifier, QDBusMessage message);
     void setFlags(QString identifier, const QStringList& flags, QDBusMessage message);
     QStringList getSurfaces(QDBusMessage message);
+    QDBusUnixFileDescriptor frameBuffer(QDBusMessage message);
 
 signals:
     void clipboardChanged(const QByteArray& data);

diff --git a/applications/system-service/apibase.cpp b/applications/system-service/apibase.cpp
@@ -1,6 +1,7 @@
 #include "apibase.h"
 #include "appsapi.h"
 
+#include <QWindow>
 #include <liboxide/oxideqml.h>
 
 int APIBase::hasPermission(QString permission, const char* sender){
@@ -31,14 +32,14 @@ int APIBase::getSenderPid() {
 }
 int APIBase::getSenderPgid() { return getpgid(getSenderPid()); }
 
-#include "moc_apibase.cpp"
-
-QImage* getFrameBuffer(){
-    static auto framebuffer = Oxide::QML::getImageForWindow(getFrameBufferWindow());
-    return &framebuffer;
-}
-
 QWindow* getFrameBufferWindow(){
     static auto window = qApp->focusWindow();
     return window;
 }
+
+QImage getFrameBuffer(){
+    static auto frameBuffer = Oxide::QML::getImageForWindow(getFrameBufferWindow());
+    return frameBuffer;
+}
+
+#include "moc_apibase.cpp"
diff --git a/applications/system-service/apibase.h b/applications/system-service/apibase.h
@@ -29,6 +29,6 @@ class APIBase : public QObject, protected QDBusContext {
     int getSenderPgid();
 };
 QWindow* getFrameBufferWindow();
-QImage* getFrameBuffer();
+QImage getFrameBuffer();
 
 #endif // APIBASE_H
diff --git a/applications/system-service/application.cpp b/applications/system-service/application.cpp
@@ -904,29 +904,23 @@ QStringList Application::getActiveMounts(){
     return activeMounts;
 }
 void Application::showSplashScreen(){
-    auto frameBuffer = getFrameBuffer();
+    return;
     qDebug() << "Waiting for other painting to finish...";
-    Oxide::Sentry::sentry_transaction("application", "showSplashScreen", [this, frameBuffer](Oxide::Sentry::Transaction* t){
+    Oxide::Sentry::sentry_transaction("application", "showSplashScreen", [this](Oxide::Sentry::Transaction* t){
 #ifdef SENTRY
         if(t != nullptr){
             sentry_transaction_set_tag(t->inner, "application", name().toStdString().c_str());
         }
 #else
             Q_UNUSED(t);
 #endif
-        Oxide::Sentry::sentry_span(t, "wait", "Wait for screen to be ready", [frameBuffer](){
-            dispatchToMainThread([frameBuffer]{
-                while(frameBuffer->paintingActive()){
-                    // TODO - don't spinlock
-                }
-            });
-        });
         qDebug() << "Displaying splashscreen for" << name();
-        Oxide::Sentry::sentry_span(t, "paint", "Draw splash screen", [this, frameBuffer](){
-            dispatchToMainThread([this, frameBuffer]{
-                QPainter painter(frameBuffer);
-                auto size = frameBuffer->size();
-                auto rect = frameBuffer->rect();
+        Oxide::Sentry::sentry_span(t, "paint", "Draw splash screen", [this](){
+            dispatchToMainThread([this]{
+                auto frameBuffer = getFrameBuffer();
+                QPainter painter(&frameBuffer);
+                auto size = frameBuffer.size();
+                auto rect = frameBuffer.rect();
                 auto fm = painter.fontMetrics();
                 painter.fillRect(rect, Qt::white);
                 QString splashPath = splash();
@@ -946,11 +940,11 @@ void Application::showSplashScreen(){
                         QPoint(
                             (size.width() / 2) - (splashWidth / 2),
                             (size.height() / 2) - (splashWidth / 2)
-                            ),
+                        ),
                         splashSize
-                        );
+                    );
                     painter.drawImage(splashRect, splash, splash.rect());
-                    Oxide::QML::repaint(getFrameBufferWindow(), frameBuffer->rect(), Blight::HighQualityGrayscale, true);
+                    Oxide::QML::repaint(getFrameBufferWindow(), frameBuffer.rect(), Blight::HighQualityGrayscale/*, true*/);
                 }
                 painter.end();
                 notificationAPI->drawNotificationText("Loading " + displayName() + "...");

diff --git a/applications/system-service/appsapi.cpp b/applications/system-service/appsapi.cpp
@@ -855,17 +855,13 @@ AppsAPI::~AppsAPI() {
     settings.sync();
     dispatchToMainThread([this]{
         auto frameBuffer = getFrameBuffer();
-        qDebug() << "Waiting for other painting to finish...";
-        while(frameBuffer->paintingActive()){
-            // TODO - don't spinlock
-        }
-        QPainter painter(frameBuffer);
-        auto rect = frameBuffer->rect();
+        QPainter painter(&frameBuffer);
+        auto rect = frameBuffer.rect();
         auto fm = painter.fontMetrics();
         qDebug() << "Clearing screen...";
         painter.setPen(Qt::white);
         painter.fillRect(rect, Qt::black);
-        Oxide::QML::repaint(getFrameBufferWindow(), rect, Blight::Mono, true);
+        Oxide::QML::repaint(getFrameBufferWindow(), rect, Blight::Mono/*, true*/);
         painter.end();
         qDebug() << "Stopping applications...";
         for(auto app : applications){
@@ -882,7 +878,7 @@ AppsAPI::~AppsAPI() {
             app->deleteLater();
         }
         applications.clear();
-        QPainter painter2(frameBuffer);
+        QPainter painter2(&frameBuffer);
         qDebug() << "Displaying final quit message...";
         painter2.fillRect(rect, Qt::black);
         painter2.setPen(Qt::white);
@@ -894,7 +890,7 @@ AppsAPI::~AppsAPI() {
             painter2.translate(-x, -y);
         }
         painter2.drawText(rect, Qt::AlignCenter, "Goodbye!");
-        Oxide::QML::repaint(getFrameBufferWindow(), rect, Blight::Mono, true);
+        Oxide::QML::repaint(getFrameBufferWindow(), rect, Blight::Mono/*, true*/);
         painter2.end();
     });
 }

diff --git a/applications/system-service/main.cpp b/applications/system-service/main.cpp
@@ -11,6 +11,7 @@
 #include <liboxide.h>
 #include <liboxide/oxideqml.h>
 #include <libblight.h>
+#include <libblight/connection.h>
 
 #include "dbusservice.h"
 #include "controller.h"
@@ -65,6 +66,12 @@ int main(int argc, char* argv[]){
         }
         return QProcess::execute("/usr/bin/xochitl", QStringList());
     }
+    Blight::connection()->onDisconnect([](int res){
+        // TODO - attempt to reconnect
+        if(res){
+            qApp->exit(res);
+        }
+    });
     qputenv("XDG_CURRENT_DESKTOP", "OXIDE");
     QThread::currentThread()->setObjectName("main");
     qputenv("QMLSCENE_DEVICE", "software");

diff --git a/applications/system-service/notification.cpp b/applications/system-service/notification.cpp
@@ -175,7 +175,8 @@ void Notification::setOwner(QString owner){
 
 bool Notification::hasPermission(QString permission, const char* sender){ return notificationAPI->hasPermission(permission, sender); }
 
-void Notification::paintNotification(Application *resumeApp) {
+void Notification::paintNotification(Application *resumeApp){
+    return;
     qDebug() << "Painting notification" << identifier();
     dispatchToMainThread([this] { screenBackup = screenAPI->copy(); });
     updateRect = notificationAPI->paintNotification(text(), m_icon);
@@ -184,11 +185,11 @@ void Notification::paintNotification(Application *resumeApp) {
     QTimer::singleShot(2000, [this, resumeApp] {
         dispatchToMainThread([this]{
             auto frameBuffer = getFrameBuffer();
-            QPainter painter(frameBuffer);
+            QPainter painter(&frameBuffer);
             painter.drawImage(updateRect, screenBackup, updateRect);
             painter.end();
             qDebug() << "Finished displaying notification" << identifier();
-            Oxide::QML::repaint(getFrameBufferWindow(), updateRect, Blight::Mono, true);
+            Oxide::QML::repaint(getFrameBufferWindow(), updateRect, Blight::Mono/*, true*/);
         });
         if (!notificationAPI->notificationDisplayQueue.isEmpty()) {
             Oxide::dispatchToMainThread([resumeApp] {

diff --git a/applications/system-service/notificationapi.cpp b/applications/system-service/notificationapi.cpp
@@ -108,42 +108,38 @@ QRect NotificationAPI::paintNotification(const QString &text, const QString &ico
     return dispatchToMainThread<QRect>([&notification]{
         qDebug() << "Painting to framebuffer...";
         auto frameBuffer = getFrameBuffer();
-        QPainter painter(frameBuffer);
-        QPoint pos(0, frameBuffer->height() - notification.height());
+        QPainter painter(&frameBuffer);
+        QPoint pos(0, frameBuffer.height() - notification.height());
         if(systemAPI->landscape()){
             notification = notification.transformed(QTransform().rotate(90.0));
             pos.setX(0);
-            pos.setY(frameBuffer->height() - notification.height());
+            pos.setY(frameBuffer.height() - notification.height());
         }
         auto updateRect = notification.rect().translated(pos);
         painter.drawImage(updateRect, notification);
         painter.end();
         qDebug() << "Updating screen " << updateRect << "...";
-        Oxide::QML::repaint(getFrameBufferWindow(), frameBuffer->rect(), Blight::Grayscale, true);
+        Oxide::QML::repaint(getFrameBufferWindow(), frameBuffer.rect(), Blight::Grayscale/*, true*/);
         return updateRect;
     });
 }
 void NotificationAPI::errorNotification(const QString &text) {
     dispatchToMainThread([] {
         auto frameBuffer = getFrameBuffer();
-        qDebug() << "Waiting for other painting to finish...";
-        while (frameBuffer->paintingActive()) {
-            // TODO - don't spinlock
-        }
         qDebug() << "Displaying error text";
-        QPainter painter(frameBuffer);
-        painter.fillRect(frameBuffer->rect(), Qt::white);
+        QPainter painter(&frameBuffer);
+        painter.fillRect(frameBuffer.rect(), Qt::white);
         painter.end();
-        Oxide::QML::repaint(getFrameBufferWindow(), frameBuffer->rect(), Blight::Mono, true);
+        Oxide::QML::repaint(getFrameBufferWindow(), frameBuffer.rect(), Blight::Mono/*, true*/);
     });
     notificationAPI->paintNotification(text, "");
 }
 QImage NotificationAPI::notificationImage(const QString& text, const QString& iconPath){
     auto padding = 10;
     auto radius = 10;
     auto frameBuffer = getFrameBuffer();
-    auto size = frameBuffer->size();
-    auto boundingRect = QPainter(frameBuffer).fontMetrics().boundingRect(
+    auto size = frameBuffer.size();
+    auto boundingRect = QPainter(&frameBuffer).fontMetrics().boundingRect(
         QRect(0, 0, size.width() / 2, size.height() / 8),
         Qt::AlignCenter | Qt::TextWordWrap, text
     );
@@ -184,11 +180,11 @@ QImage NotificationAPI::notificationImage(const QString& text, const QString& ic
 }
 
 void NotificationAPI::drawNotificationText(const QString& text, QColor color, QColor background){
-    auto frameBuffer = getFrameBuffer();
-    dispatchToMainThread([frameBuffer, text, color, background]{
-        QPainter painter(frameBuffer);
+    dispatchToMainThread([text, color, background]{
+        auto frameBuffer = getFrameBuffer();
+        QPainter painter(&frameBuffer);
         int padding = 10;
-        auto size = frameBuffer->size();
+        auto size = frameBuffer.size();
         auto fm = painter.fontMetrics();
         int textHeight = fm.height() + padding;
         QImage textImage(

diff --git a/applications/system-service/screenapi.cpp b/applications/system-service/screenapi.cpp
@@ -17,7 +17,7 @@ QDBusObjectPath ScreenAPI::screenshot(){
     return dispatchToMainThread<QDBusObjectPath>([this, filePath]{
         QImage screen = copy();
         QRect rect = notificationAPI->paintNotification("Taking Screenshot...", "");
-        Oxide::QML::repaint(getFrameBufferWindow(), rect, Blight::Mono, true);
+        Oxide::QML::repaint(getFrameBufferWindow(), rect, Blight::Mono/*, true*/);
         QDBusObjectPath path("/");
         bool saved = (
             systemAPI->landscape()
@@ -29,11 +29,6 @@ QDBusObjectPath ScreenAPI::screenshot(){
         }else{
             path = addScreenshot(filePath)->qPath();
         }
-        auto frameBuffer = getFrameBuffer();
-        QPainter painter(frameBuffer);
-        painter.drawImage(rect, screen, rect);
-        painter.end();
-        Oxide::QML::repaint(getFrameBufferWindow(), rect, Blight::HighQualityGrayscale, true);
         notificationAPI->add(
             QUuid::createUuid().toString(),
             "codes.eeems.tarnish",
@@ -47,12 +42,7 @@ QDBusObjectPath ScreenAPI::screenshot(){
 
 QImage ScreenAPI::copy(){
     return Oxide::dispatchToMainThread<QImage>([]{
-        auto frameBuffer = getFrameBuffer();
-        qDebug() << "Waiting for other painting to finish...";
-        while(frameBuffer->paintingActive()){
-            // TODO - don't spin lock
-        }
-        return frameBuffer->copy();
+        return getFrameBuffer().copy();
     });
 }
 
@@ -210,8 +200,8 @@ bool ScreenAPI::drawFullscreenImage(QString path, double rotate){
             Q_UNUSED(t);
             Oxide::dispatchToMainThread([img]{
                 auto frameBuffer = getFrameBuffer();
-                QRect rect = frameBuffer->rect();
-                QPainter painter(frameBuffer);
+                QRect rect = frameBuffer.rect();
+                QPainter painter(&frameBuffer);
                 painter.fillRect(rect, Qt::white);
                 painter.setRenderHints(
                     QPainter::Antialiasing | QPainter::SmoothPixmapTransform,
@@ -227,7 +217,7 @@ bool ScreenAPI::drawFullscreenImage(QString path, double rotate){
                 painter.translate(0 - img.width() / 2, 0 - img.height() / 2);
                 painter.drawPixmap(img.rect(), QPixmap::fromImage(img));
                 painter.end();
-                Oxide::QML::repaint(getFrameBufferWindow(), frameBuffer->rect(), Blight::HighQualityGrayscale, true);
+                Oxide::QML::repaint(getFrameBufferWindow(), frameBuffer.rect(), Blight::HighQualityGrayscale/*, true*/);
             });
         });
     return true;

diff --git a/interfaces/blight.xml b/interfaces/blight.xml
@@ -44,5 +44,8 @@
     <method name="getSurfaces">
       <arg type="as" direction="out"/>
     </method>
+    <method name="frameBuffer">
+      <arg type="h" direction="out"/>
+    </method>
   </interface>
 </node>
diff --git a/shared/liboxide/oxideqml.cpp b/shared/liboxide/oxideqml.cpp
@@ -148,7 +148,7 @@ namespace Oxide {
 
         void repaint(QWindow* window, QRectF rect, Blight::WaveformMode waveform, bool sync){
             auto buf = getSurfaceForWindow(window);
-            auto _marker = 0;
+            unsigned int _marker = 0;
             if(sync){
                 _marker = ++marker;
             }