Fix screenshots

Eeems-Org · Feb 2, 2024 · 2a8bdeb · 2a8bdeb
1 parent a12f708
commit 2a8bdeb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/applications/system-service/apibase.cpp b/applications/system-service/apibase.cpp
@@ -36,6 +36,7 @@ int APIBase::getSenderPgid() { return getpgid(getSenderPid()); }
 
 QImage* getFrameBuffer(){
     static QImage* image = nullptr;
+    static QFile* file = nullptr;
     if(image == nullptr){
         auto compositor = getCompositorDBus();
         auto reply = compositor->frameBuffer();
@@ -49,9 +50,9 @@ QImage* getFrameBuffer(){
             O_WARNING("Framebuffer fd is not valid");
             return nullptr;
         }
-        QFile file;
-        file.open(dup(qfd.fileDescriptor()), QFile::ReadOnly);
-        auto data = file.map(0, file.size());
+        file = new QFile();
+        file->open(dup(qfd.fileDescriptor()), QFile::ReadOnly);
+        uchar* data = file->map(0, file->size());
         image = new QImage(data, 1404, 1872, 2808, QImage::Format_RGB16);
     }
     return image;

diff --git a/applications/system-service/main.cpp b/applications/system-service/main.cpp
@@ -165,8 +165,7 @@ int main(int argc, char* argv[]){
 
     Blight::shared_buf_t buffer = createBuffer();
     if(buffer != nullptr){
-        auto frameBuffer = getFrameBuffer();
-        auto size = frameBuffer->size();
+        auto size = getFrameBuffer()->size();
         int splashWidth = size.width() / 2;
         QSize splashSize(splashWidth, splashWidth);
         QRect splashRect(QPoint(

diff --git a/applications/system-service/screenapi.cpp b/applications/system-service/screenapi.cpp
@@ -20,16 +20,17 @@ QDBusObjectPath ScreenAPI::screenshot(){
         ""
     );
     notification->display();
-    QImage screen = copy();
+    auto screen = getFrameBuffer();
     bool saved = false;
     QDBusObjectPath path("/");
-    if(screen.size().isEmpty()){
+    if(screen->size().isEmpty()){
         O_WARNING("Could not get copy of screen");
     }else{
         if(systemAPI->landscape()){
-            screen = screen.transformed(QTransform().rotate(270.0));
+            saved = screen->transformed(QTransform().rotate(270.0)).save(filePath);
+        }else{
+            saved = screen->save(filePath);
         }
-        saved = screen.save(filePath);
         if(saved){
             path = addScreenshot(filePath)->qPath();
         }else if(!saved){
@@ -47,8 +48,6 @@ QDBusObjectPath ScreenAPI::screenshot(){
     return path;
 }
 
-QImage ScreenAPI::copy(){ return getFrameBuffer()->copy(); }
-
 QDBusObjectPath ScreenAPI::addScreenshot(QByteArray blob){
     if(!hasPermission("screen")){
         return QDBusObjectPath("/");

diff --git a/applications/system-service/screenapi.h b/applications/system-service/screenapi.h
@@ -39,7 +39,6 @@ class ScreenAPI : public APIBase {
     bool enabled();
     QList<QDBusObjectPath> screenshots();
     Q_INVOKABLE QDBusObjectPath screenshot();
-    QImage copy();
 
 public slots:
     QDBusObjectPath addScreenshot(QByteArray blob);