dix: Silence -Wunused-variable warning by moving window.c off of legacy region defines

window.c:223:15: warning: unused variable 'pScreen' [-Wunused-variable,Unused Entity Issue]
    ScreenPtr pScreen = pWin->drawable.pScreen;
              ^

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston 2015-10-18 23:12:51 -07:00 committed by Adam Jackson
parent e09875701b
commit 0a5d54f721

View File

@ -220,7 +220,6 @@ log_window_info(WindowPtr pWin, int depth)
int i;
const char *win_name, *visibility;
BoxPtr rects;
ScreenPtr pScreen = pWin->drawable.pScreen;
for (i = 0; i < (depth << 2); i++)
ErrorF(" ");
@ -240,7 +239,7 @@ log_window_info(WindowPtr pWin, int depth)
ErrorF(" (%s compositing: pixmap %x)",
(pWin->redirectDraw == RedirectDrawAutomatic) ?
"automatic" : "manual",
(unsigned) pScreen->GetWindowPixmap(pWin)->drawable.id);
(unsigned) pWin->drawable.pScreen->GetWindowPixmap(pWin)->drawable.id);
#endif
switch (pWin->visibility) {
@ -259,10 +258,10 @@ log_window_info(WindowPtr pWin, int depth)
}
ErrorF(", %s", visibility);
if (REGION_NOTEMPTY(pScreen, &pWin->clipList)) {
if (RegionNotEmpty(&pWin->clipList)) {
ErrorF(", clip list:");
rects = REGION_RECTS(&pWin->clipList);
for (i = 0; i < REGION_NUM_RECTS(&pWin->clipList); i++)
rects = RegionRects(&pWin->clipList);
for (i = 0; i < RegionNumRects(&pWin->clipList); i++)
ErrorF(" [(%d, %d) to (%d, %d)]",
rects[i].x1, rects[i].y1, rects[i].x2, rects[i].y2);
ErrorF("; extents [(%d, %d) to (%d, %d)]",