make X server share more than 1 LorieBuffer simultaneously.

Author: twaik

app/src/main/cpp/lorie/InitOutput.c

@@ -99,6 +99,7 @@ typedef struct {
     void *mem;
 } LoriePixmapPriv;
 
+#define LORIE_PIXMAP_PRIV_FROM_PIXMAP(pixmap) (pixmap ? ((LoriePixmapPriv*) exaGetPixmapDriverPrivate(pixmap)) : NULL)
 #define LORIE_BUFFER_FROM_PIXMAP(pixmap) (pixmap ? ((LoriePixmapPriv*) exaGetPixmapDriverPrivate(pixmap))->buffer : NULL)
 
 void OsVendorInit(void) {
@@ -132,7 +133,7 @@ void OsVendorInit(void) {
 void lorieActivityConnected(void) {
     pvfb->state->drawRequested = pvfb->state->cursor.updated = true;
     lorieSendSharedServerState(pvfb->stateFd);
-    lorieSendRootWindowBuffer(LORIE_BUFFER_FROM_PIXMAP(pScreenPtr->devPrivate));
+    lorieRegisterBuffer(LORIE_BUFFER_FROM_PIXMAP(pScreenPtr->devPrivate));
 }
 
 static LoriePixmapPriv* lorieRootWindowPixmapPriv(void) {
@@ -396,6 +397,7 @@ static void loriePerformVblanks(void);
 static Bool lorieRedraw(__unused ClientPtr pClient, __unused void *closure) {
     int status, nonEmpty;
     LoriePixmapPriv* priv;
+    PixmapPtr root = pScreenPtr && pScreenPtr->root ? pScreenPtr->GetWindowPixmap(pScreenPtr->root) : NULL;
 
     loriePerformVblanks();
 
@@ -405,7 +407,7 @@ static Bool lorieRedraw(__unused ClientPtr pClient, __unused void *closure) {
         return TRUE;
 
     nonEmpty = RegionNotEmpty(DamageRegion(pvfb->damage));
-    priv = lorieRootWindowPixmapPriv();
+    priv = root ? exaGetPixmapDriverPrivate(root) : NULL;
 
     if (!priv)
         // Impossible situation, but let's skip this step
@@ -457,7 +459,7 @@ static Bool lorieCreateScreenResources(ScreenPtr pScreen) {
     DamageRegister(&(*pScreen->GetScreenPixmap)(pScreen)->drawable, pvfb->damage);
     pvfb->fpsTimer = TimerSet(NULL, 0, 5000, lorieFramecounter, pScreen);
 
-    lorieSendRootWindowBuffer(LORIE_BUFFER_FROM_PIXMAP(pScreen->devPrivate));
+    lorieRegisterBuffer(LORIE_BUFFER_FROM_PIXMAP(pScreenPtr->devPrivate));
 
     return TRUE;
 }
@@ -517,7 +519,7 @@ static Bool lorieRRScreenSetSize(ScreenPtr pScreen, CARD16 width, CARD16 height,
         pScreen->DestroyPixmap(oldPixmap);
     }
 
-    lorieSendRootWindowBuffer(LORIE_BUFFER_FROM_PIXMAP(pScreen->devPrivate));
+    lorieRegisterBuffer(LORIE_BUFFER_FROM_PIXMAP(pScreenPtr->devPrivate));
 
     pScreen->ResizeWindow(pScreen->root, 0, 0, width, height, NULL);
     RegionReset(&pScreen->root->winSize, &box);
@@ -782,6 +784,7 @@ void lorieExaDestroyPixmap(__unused ScreenPtr pScreen, void *driverPriv) {
         if (!priv->imported)
             LorieBuffer_unlock(priv->buffer);
         LorieBuffer_release(priv->buffer);
+        lorieUnregisterBuffer(priv->buffer);
     }
     free(priv);
 }

app/src/main/cpp/lorie/activity.c

@@ -191,16 +191,19 @@ static int xcallback(int fd, int events, __unused void* data) {
                     close(stateFd); // Closing file descriptor does not unmmap shared memory fragment.
                     break;
                 }
-                case EVENT_SHARED_ROOT_WINDOW_BUFFER: {
+                case EVENT_ADD_BUFFER: {
                     static LorieBuffer* buffer = NULL;
                     const LorieBuffer_Desc* desc;
                     LorieBuffer_recvHandleFromUnixSocket(conn_fd, &buffer);
                     desc = LorieBuffer_description(buffer);
-                    log(INFO, "Received shared buffer width %d height %d format %d", desc->width, desc->height, desc->format);
-                    rendererRemoveAllBuffers();
+                    log(INFO, "Received shared buffer width %d height %d format %d type %d id %llu", desc->width, desc->height, desc->format, desc->type, desc->id);
                     rendererAddBuffer(buffer);
                     break;
                 }
+                case EVENT_REMOVE_BUFFER: {
+                    rendererRemoveBuffer(e.removeBuffer.id);
+                    break;
+                }
             }
         }
 

app/src/main/cpp/lorie/buffer.c

@@ -127,7 +127,10 @@ static LorieBuffer* allocate(int32_t width, int32_t stride, int32_t height, int8
                 return NULL;
 
             AHardwareBuffer_describe(b.desc.buffer, &desc);
+            b.desc.width = desc.width;
+            b.desc.height = desc.height;
             b.desc.stride = desc.stride;
+            b.desc.format = desc.format;
             break;
         }
         default: return NULL;

app/src/main/cpp/lorie/cmdentrypoint.c

@@ -37,6 +37,8 @@ void lorieKeysymKeyboardEvent(KeySym keysym, int down);
 char *xtrans_unix_path_x11 = NULL;
 char *xtrans_unix_dir_x11 = NULL;
 
+struct xorg_list registeredBuffers;
+
 static void* startServer(__unused void* cookie) {
     char* envp[] = { NULL };
     exit(dix_main(argc, (char**) argv, envp));
@@ -196,6 +198,7 @@ Java_com_termux_x11_CmdEntryPoint_start(JNIEnv *env, __unused jclass cls, jobjec
     // Trigger it first time
     AChoreographer_postFrameCallback(choreographer, (AChoreographer_frameCallback) lorieChoreographerFrameCallback, choreographer);
 
+    xorg_list_init(&registeredBuffers);
     pthread_create(&t, NULL, startServer, vm);
     return JNI_TRUE;
 }
@@ -261,10 +264,13 @@ void handleLorieEvents(int fd, __unused int ready, __unused void *ignored) {
     valuator_mask_zero(&mask);
 
     if (ready & X_NOTIFY_ERROR) {
+        LorieBuffer* buf;
         InputThreadUnregisterDev(fd);
         close(fd);
         conn_fd = -1;
         lorieEnableClipboardSync(FALSE);
+        while ((buf = LorieBufferList_first(&registeredBuffers)))
+            LorieBuffer_removeFromList(buf);
         return;
     }
 
@@ -433,11 +439,30 @@ void lorieSendSharedServerState(int memfd) {
     }
 }
 
-void lorieSendRootWindowBuffer(LorieBuffer* buffer) {
+void lorieRegisterBuffer(LorieBuffer* buffer) {
+    unsigned long id = LorieBuffer_description(buffer)->id;
+    if (LorieBufferList_findById(&registeredBuffers, id))
+        return; // Already registered
+
     if (conn_fd != -1 && buffer) {
-        lorieEvent e = { .type = EVENT_SHARED_ROOT_WINDOW_BUFFER };
+        lorieEvent e = { .type = EVENT_ADD_BUFFER };
         write(conn_fd, &e, sizeof(e));
         LorieBuffer_sendHandleToUnixSocket(buffer, conn_fd);
+        LorieBuffer_addToList(buffer, &registeredBuffers);
+        const LorieBuffer_Desc* desc = LorieBuffer_description(buffer);
+        log(INFO, "Received shared buffer width %d height %d format %d type %d id %llu", desc->width, desc->height, desc->format, desc->type, desc->id);
+    }
+}
+
+void lorieUnregisterBuffer(LorieBuffer* buffer) {
+    unsigned long id;
+    if (!buffer || (!LorieBufferList_findById(&registeredBuffers, (id = LorieBuffer_description(buffer)->id))))
+        return;  // Not exist or not registered so no need to unregister
+
+    if (conn_fd != -1 && buffer) {
+        lorieEvent e = { .removeBuffer = { .t = EVENT_REMOVE_BUFFER, .id = id } };
+        write(conn_fd, &e, sizeof(e));
+        LorieBuffer_removeFromList(buffer);
     }
 }
 

app/src/main/cpp/lorie/lorie.h

@@ -32,7 +32,8 @@ void lorieTriggerWorkingQueue(void);
 void lorieChoreographerFrameCallback(__unused long t, AChoreographer* d);
 void lorieActivityConnected(void);
 void lorieSendSharedServerState(int memfd);
-void lorieSendRootWindowBuffer(LorieBuffer* buffer);
+void lorieRegisterBuffer(LorieBuffer* buffer);
+void lorieUnregisterBuffer(LorieBuffer* buffer);
 bool lorieConnectionAlive(void);
 
 __unused void rendererInit(JNIEnv* env);
@@ -88,7 +89,8 @@ static inline __always_inline void lorie_mutex_unlock(pthread_mutex_t* mutex, pi
 typedef enum {
     EVENT_UNKNOWN __unused = 0,
     EVENT_SHARED_SERVER_STATE,
-    EVENT_SHARED_ROOT_WINDOW_BUFFER,
+    EVENT_ADD_BUFFER,
+    EVENT_REMOVE_BUFFER,
     EVENT_SCREEN_SIZE,
     EVENT_TOUCH,
     EVENT_MOUSE,
@@ -110,6 +112,10 @@ typedef union {
         size_t name_size;
         char *name;
     } screenSize;
+    struct {
+        uint8_t t;
+        unsigned long id;
+    } removeBuffer;
     struct {
         uint8_t t;
         uint16_t type, id, x, y;

app/src/main/cpp/lorie/renderer.c

@@ -521,10 +521,13 @@ void rendererRedrawLocked(JNIEnv* env) {
     // The buffer will not be released until this function ends, but main thread can modify buffer list
     pthread_mutex_lock(&stateLock);
     LorieBuffer *buffer = LorieBufferList_findById(&buffers, state->rootWindowTextureID);
+    // Probably X server requested us to draw removed buffer and immediately requested to remove it. Let's display it one last time.
+    if (!buffer)
+        buffer = LorieBufferList_findById(&removedBuffers, state->rootWindowTextureID);
     pthread_mutex_unlock(&stateLock);
     if (!buffer) {
         log("Buffer %llu not found", state->rootWindowTextureID);
-        usleep(2); // probably other thread did not push the buffer yet.
+        usleep(4000); // probably other thread did not push the buffer yet, 4 ms should be enough time to finish this.
         return;
     }