Skip to content

N
nx-libs
You need to sign in or sign up before continuing.
Commit 57625542 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

Window.c: code simplifications/scope

parent aa0662bb
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 11 deletions
nx-X11/programs/Xserver/hw/nxagent/Window.c
View file @ 57625542
...@@ -1281,35 +1281,30 @@ void nxagentConfigureWindow(WindowPtr pWin, unsigned int mask) ...@@ -1281,35 +1281,30 @@ void nxagentConfigureWindow(WindowPtr pWin, unsigned int mask)
if (mask & CWX) if (mask & CWX)
{ {
valuemask |= CWX; valuemask |= CWX;
values.x = nxagentWindowPriv(pWin)->x = pWin->origin.x - wBorderWidth(pWin); values.x = nxagentWindowPriv(pWin)->x = pWin->origin.x - wBorderWidth(pWin);
} }
if (mask & CWY) if (mask & CWY)
{ {
valuemask |= CWY; valuemask |= CWY;
values.y = nxagentWindowPriv(pWin)->y = pWin->origin.y - wBorderWidth(pWin); values.y = nxagentWindowPriv(pWin)->y = pWin->origin.y - wBorderWidth(pWin);
} }
if (mask & CWWidth) if (mask & CWWidth)
{ {
valuemask |= CWWidth; valuemask |= CWWidth;
values.width = nxagentWindowPriv(pWin)->width = pWin->drawable.width; values.width = nxagentWindowPriv(pWin)->width = pWin->drawable.width;
} }
if (mask & CWHeight) if (mask & CWHeight)
{ {
valuemask |= CWHeight; valuemask |= CWHeight;
values.height = nxagentWindowPriv(pWin)->height = pWin->drawable.height; values.height = nxagentWindowPriv(pWin)->height = pWin->drawable.height;
} }
if (mask & CWBorderWidth) if (mask & CWBorderWidth)
{ {
valuemask |= CWBorderWidth; valuemask |= CWBorderWidth;
values.border_width = nxagentWindowPriv(pWin)->borderWidth = values.border_width = nxagentWindowPriv(pWin)->borderWidth =
pWin->borderWidth; pWin->borderWidth;
} }
...@@ -3447,10 +3442,7 @@ void nxagentSetTopLevelEventMask(WindowPtr pWin) ...@@ -3447,10 +3442,7 @@ void nxagentSetTopLevelEventMask(WindowPtr pWin)
*/ */
void nxagentFlushConfigureWindow(void) void nxagentFlushConfigureWindow(void)
{ {
ConfiguredWindowStruct *index; ConfiguredWindowStruct *index = nxagentConfiguredWindowList;
XWindowChanges changes;
index = nxagentConfiguredWindowList;
while (index) while (index)
{ {
...@@ -3493,8 +3485,10 @@ void nxagentFlushConfigureWindow(void) ...@@ -3493,8 +3485,10 @@ void nxagentFlushConfigureWindow(void)
if (nxagentExposeQueue.exposures[i].synchronize == 1) if (nxagentExposeQueue.exposures[i].synchronize == 1)
{ {
changes.x = nxagentExposeQueue.exposures[i].serial; XWindowChanges changes = {
changes.y = -2; .x = nxagentExposeQueue.exposures[i].serial,
.y = -2
};
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "nxagentFlushConfigureWindow: Sending synch ConfigureWindow for " fprintf(stderr, "nxagentFlushConfigureWindow: Sending synch ConfigureWindow for "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment