frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

miext: rootless: fix unused variables 

Compiling w/ -Werror (which our CI does) breaks compile due a buch of
unused variables.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1703>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-09-24 10:39:01 +02:00 committed by Marge Bot
parent 6ee163cb94
commit 143a6a21e1
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
miext/rootless/rootlessCommon.c
View File

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

14
miext/rootless/rootlessWindow.c
View File

@ -795,24 +795,12 @@ StartFrameResize(WindowPtr pWin, Bool gravity,
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
RootlessWindowRec *winRec = WINREC(pWin); RootlessWindowRec *winRec = WINREC(pWin);
BoxRec rect;
int oldX2, newX2;
int oldY2, newY2;
unsigned int weight; unsigned int weight;
oldX2 = oldX + oldW, newX2 = newX + newW;
oldY2 = oldY + oldH, newY2 = newY + newH;
/* Decide which resize weighting to use */ /* Decide which resize weighting to use */
weight = ResizeWeighting(oldX, oldY, oldW, oldH, oldBW, weight = ResizeWeighting(oldX, oldY, oldW, oldH, oldBW,
newX, newY, newW, newH, newBW); 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("RESIZE TOPLEVEL WINDOW with gravity %i ", gravity);
RL_DEBUG_MSG("%d %d %d %d %d %d %d %d %d %d\n", RL_DEBUG_MSG("%d %d %d %d %d %d %d %d %d %d\n",
oldX, oldY, oldW, oldH, oldBW, newX, newY, newW, newH, newBW); 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) unsigned int newBW)
{ {
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
RootlessWindowRec *winRec = WINREC(pWin);
int i;
/* Redraw everything. FIXME: there must be times when we don't need /* Redraw everything. FIXME: there must be times when we don't need
to do this. Perhaps when top-left weighting and no gravity? */ to do this. Perhaps when top-left weighting and no gravity? */