Fixes

neutrinolabs · May 10, 2022 · 4d9dcc9 · 4d9dcc9
1 parent a651706
commit 4d9dcc9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/module/rdpClientCon.c b/module/rdpClientCon.c
@@ -849,6 +849,10 @@ rdpClientConProcessScreenSizeMsg(rdpPtr dev, rdpClientCon *clientCon,
     if ((dev->width != width) || (dev->height != height))
     {
 #if defined(XORGXRDP_LRANDR)
+        /* even though we are not using the built in randr, we still need
+         * to call this so driver can setup */
+        ok = RRScreenSizeSet(dev->pScreen, width, height, mmwidth, mmheight);
+        LLOGLN(0, ("rdpClientConProcessScreenSizeMsg: RRScreenSizeSet ok=[%d]", ok));
         ok = rdpLRRScreenSizeSet(dev, width, height, mmwidth, mmheight);
         LLOGLN(0, ("rdpClientConProcessScreenSizeMsg: LRRScreenSizeSet ok=[%d]", ok));
 #else
@@ -1287,8 +1291,9 @@ rdpClientConProcessMsgClientInfo(rdpPtr dev, rdpClientCon *clientCon)
     if (clientCon->shmemstatus == SHM_UNINITIALIZED
        || clientCon->shmemstatus == SHM_RESIZING)
     {
-        clientCon->shmemstatus = rdpClientConUseHelper() ? shmemstatus
-                            : convertSharedMemoryStatusToActive(shmemstatus);
+        //clientCon->shmemstatus = rdpClientConUseHelper() ? shmemstatus
+        //                    : convertSharedMemoryStatusToActive(shmemstatus);
+        clientCon->shmemstatus = convertSharedMemoryStatusToActive(shmemstatus);
     }
 
     return 0;

diff --git a/module/rdpMain.c b/module/rdpMain.c
@@ -283,7 +283,7 @@ xorgxrdpDeferredStartup(OsTimerPtr timer, CARD32 now, pointer arg)
             return 0;
         }
     }
-    g_timer = TimerSet(g_timer, 0, 100, xorgxrdpDeferredStartup, pScreen);
+    g_timer = TimerSet(g_timer, 0, 1, xorgxrdpDeferredStartup, pScreen);
     return 0;
 }