Reduce EPFrameBuffer footprint

Eeems-Org · Feb 5, 2024 · 1b4517c · 1b4517c
1 parent 1d42817
commit 1b4517c
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git a/applications/display-server/connection.cpp b/applications/display-server/connection.cpp
@@ -356,7 +356,7 @@ void Connection::readSocket(){
                 guiThread->enqueue(
                     surface,
                     rect,
-                    (EPFrameBuffer::WaveformMode)repaint.waveform,
+                    repaint.waveform,
                     repaint.marker,
                     false,
                     [message, this]{ ack(message, 0, nullptr); }
@@ -389,15 +389,15 @@ void Connection::readSocket(){
                 guiThread->enqueue(
                     surface,
                     surface->rect(),
-                    EPFrameBuffer::WaveformMode::HighQualityGrayscale,
+                    Blight::HighQualityGrayscale,
                     message->header.ackid,
                     false,
                     [message, this]{ ack(message, 0, nullptr); }
                 );
                 guiThread->enqueue(
                     nullptr,
                     rect,
-                    EPFrameBuffer::WaveformMode::HighQualityGrayscale,
+                    Blight::HighQualityGrayscale,
                     message->header.ackid,
                     true,
                     nullptr
@@ -473,7 +473,7 @@ void Connection::readSocket(){
                 guiThread->enqueue(
                     surface,
                     surface->rect(),
-                    EPFrameBuffer::WaveformMode::HighQualityGrayscale,
+                    Blight::HighQualityGrayscale,
                     message->header.ackid,
                     false,
                     [message, this]{ ack(message, 0, nullptr); }
@@ -496,7 +496,7 @@ void Connection::readSocket(){
                 guiThread->enqueue(
                     nullptr,
                     surface->geometry(),
-                    EPFrameBuffer::WaveformMode::HighQualityGrayscale,
+                    Blight::HighQualityGrayscale,
                     message->header.ackid,
                     true,
                     [message, this]{ ack(message, 0, nullptr); }

diff --git a/applications/display-server/dbusinterface.cpp b/applications/display-server/dbusinterface.cpp
@@ -380,7 +380,7 @@ void DbusInterface::exitExclusiveMode(QDBusMessage message){
     guiThread->enqueue(
         nullptr,
         EPFrameBuffer::instance()->framebuffer()->rect(),
-        EPFrameBuffer::HighQualityGrayscale,
+        Blight::HighQualityGrayscale,
         0,
         true
     );
@@ -394,7 +394,7 @@ void DbusInterface::exclusiveModeRepaint(QDBusMessage message){
 #ifdef EPAPER
     guiThread->sendUpdate(
         EPFrameBuffer::instance()->framebuffer()->rect(),
-        EPFrameBuffer::HighQualityGrayscale,
+        Blight::HighQualityGrayscale,
         0
     );
 #endif

diff --git a/applications/display-server/guithread.cpp b/applications/display-server/guithread.cpp
@@ -3,6 +3,7 @@
 #include "connection.h"
 #include "dbusinterface.h"
 
+#include <epframebuffer.h>
 #include <QAbstractEventDispatcher>
 #include <QTimer>
 #include <QPainter>
@@ -90,7 +91,7 @@ GUIThread::~GUIThread(){
 void GUIThread::enqueue(
     std::shared_ptr<Surface> surface,
     QRect region,
-    EPFrameBuffer::WaveformMode waveform,
+    Blight::WaveformMode waveform,
     unsigned int marker,
     bool global,
     std::function<void()> callback
@@ -253,7 +254,7 @@ void GUIThread::redraw(RepaintRequest& event){
     O_DEBUG("Repaint" << region.boundingRect() << "done in" << region.rectCount() << "paints, and" << cw.elapsed() << "seconds");
 }
 
-void GUIThread::sendUpdate(const QRect& rect, EPFrameBuffer::WaveformMode waveform, unsigned int marker){
+void GUIThread::sendUpdate(const QRect& rect, Blight::WaveformMode waveform, unsigned int marker){
     auto mode = rect == m_screenRect
         ? EPFrameBuffer::FullUpdate
         : EPFrameBuffer::PartialUpdate;

diff --git a/applications/display-server/guithread.h b/applications/display-server/guithread.h
@@ -4,7 +4,6 @@
 #include <QWaitCondition>
 #include <QSemaphore>
 #include <QQueue>
-#include <epframebuffer.h>
 #include <liboxide/threading.h>
 #include <libblight/concurrentqueue.h>
 
@@ -15,7 +14,7 @@
 struct RepaintRequest{
     std::shared_ptr<Surface> surface;
     QRegion region;
-    EPFrameBuffer::WaveformMode waveform;
+    Blight::WaveformMode waveform;
     unsigned int marker;
     bool global;
     std::function<void()> callback;
@@ -38,14 +37,14 @@ public slots:
     void enqueue(
         std::shared_ptr<Surface> surface,
         QRect region,
-        EPFrameBuffer::WaveformMode waveform,
+        Blight::WaveformMode waveform,
         unsigned int marker,
         bool global = false,
         std::function<void()> callback = nullptr
     );
     void notify();
     int framebuffer();
-    void sendUpdate(const QRect& rect, EPFrameBuffer::WaveformMode waveform, unsigned int marker);
+    void sendUpdate(const QRect& rect, Blight::WaveformMode waveform, unsigned int marker);
 
 private:
     GUIThread(QRect screenGeometry);

diff --git a/applications/display-server/surface.cpp b/applications/display-server/surface.cpp
@@ -109,7 +109,7 @@ void Surface::repaint(QRect rect){
     guiThread->enqueue(
         nullptr,
         geometry(),
-        EPFrameBuffer::HighQualityGrayscale,
+        Blight::HighQualityGrayscale,
         0,
         true
     );

diff --git a/shared/epaper/epaper.pro b/shared/epaper/epaper.pro
@@ -29,6 +29,12 @@ epframebuffer_h.target = epframebuffer.h
 epframebuffer_h.commands = cp $$PWD/epframebuffer.h $$OUT_PWD
 QMAKE_EXTRA_TARGETS += epframebuffer_h
 
+linux-oe-g++{
+    epframebuffer_h_install.files = epframebuffer.h
+    epframebuffer_h_install.path = /opt/include
+    INSTALLS += epframebuffer_h_install
+}
+
 PRE_TARGETDEPS += $$epframebuffer_h.target $$epimagenode_h.target
 QMAKE_CLEAN += $$epframebuffer_h.target $$epimagenode_h.target
 
diff --git a/shared/liboxide/liboxide.pro b/shared/liboxide/liboxide.pro
@@ -108,12 +108,6 @@ liboxide_h_install.depends = liboxide_h
 liboxide_h_install.path = /opt/include/
 INSTALLS += liboxide_h_install
 
-linux-oe-g++{
-    epframebuffer_h_install.files = ../epaper/epframebuffer.h
-    epframebuffer_h_install.path = /opt/include
-    INSTALLS += epframebuffer_h_install
-}
-
 QMAKE_EXTRA_TARGETS += liboxide_liboxide_h liboxide_h liboxide_h_install
 POST_TARGETDEPS += $$liboxide_liboxide_h.target $$liboxide_h.target
 QMAKE_CLEAN += $$liboxide_h.target include/liboxide/*.h