fix rootless

rootless

rootless

meson.build

@@ -280,7 +280,7 @@ else
     build_xquartz = get_option('xquartz') == 'true'
 endif
 
-build_rootless = false
+build_rootless = true
 if build_xquartz
     build_rootless = true
 endif

mi/miexpose.c

@@ -408,7 +408,6 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
     xRectangle *prect;
     int numRects, regionnumrects;
 #ifdef COMPOSITE
-    WindowPtr orig_pWin = pWin;
 #endif
 
     /*
@@ -496,6 +495,7 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
 #ifdef COMPOSITE
         /* Make sure alpha will sample as 1.0 for opaque windows */
         if (drawable->depth == 32) {
+            WindowPtr orig_pWin = pWin;
             int effective_depth = orig_pWin->drawable.depth;
 
             if (effective_depth == 32) {

miext/rootless/rootlessCommon.c

@@ -135,10 +135,8 @@ RootlessResolveColormap(ScreenPtr pScreen, int first_color,
 }
 
 unsigned long RootlessWID(WindowPtr pWindow) {
-    ScreenPtr pScreen = pWindow->drawable.pScreen;
     WindowPtr top = TopLevelParent(pWindow);
     RootlessWindowRec *winRec;
-    PixmapPtr curPixmap;
 
     if (top == NULL) {
         return 0;

miext/rootless/rootlessWindow.c

@@ -795,24 +795,12 @@ StartFrameResize(WindowPtr pWin, Bool gravity,
     ScreenPtr pScreen = pWin->drawable.pScreen;
     RootlessWindowRec *winRec = WINREC(pWin);
 
-    BoxRec rect;
-    int oldX2, newX2;
-    int oldY2, newY2;
     unsigned int weight;
 
-    oldX2 = oldX + oldW, newX2 = newX + newW;
-    oldY2 = oldY + oldH, newY2 = newY + newH;
-
     /* Decide which resize weighting to use */
     weight = ResizeWeighting(oldX, oldY, oldW, oldH, oldBW,
                              newX, newY, newW, newH, newBW);
 
-    /* Compute intersection between old and new rects */
-    rect.x1 = max(oldX, newX);
-    rect.y1 = max(oldY, newY);
-    rect.x2 = min(oldX2, newX2);
-    rect.y2 = min(oldY2, newY2);
-
     RL_DEBUG_MSG("RESIZE TOPLEVEL WINDOW with gravity %i ", gravity);
     RL_DEBUG_MSG("%d %d %d %d %d   %d %d %d %d %d\n",
                  oldX, oldY, oldW, oldH, oldBW, newX, newY, newW, newH, newBW);
@@ -849,8 +837,6 @@ FinishFrameResize(WindowPtr pWin, Bool gravity, int oldX, int oldY,
                   unsigned int newBW)
 {
     ScreenPtr pScreen = pWin->drawable.pScreen;
-    RootlessWindowRec *winRec = WINREC(pWin);
-    int i;
 
     /* Redraw everything. FIXME: there must be times when we don't need
        to do this. Perhaps when top-left weighting and no gravity? */