aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-12-28 18:39:48 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-01-06 00:50:30 +0100
commit576255425576c6ee02a18f622de47daa66ced718 (patch)
tree6b6288de27c0dcae42ab45980a28e468b37bd621 /nx-X11
parentaa0662bbda71c3258c80a0b5d55dd17dd376be78 (diff)
downloadnx-libs-576255425576c6ee02a18f622de47daa66ced718.tar.gz
nx-libs-576255425576c6ee02a18f622de47daa66ced718.tar.bz2
nx-libs-576255425576c6ee02a18f622de47daa66ced718.zip
Window.c: code simplifications/scope
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Window.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index 4d9de081d..d60be1aa7 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -1281,35 +1281,30 @@ void nxagentConfigureWindow(WindowPtr pWin, unsigned int mask)
if (mask & CWX)
{
valuemask |= CWX;
-
values.x = nxagentWindowPriv(pWin)->x = pWin->origin.x - wBorderWidth(pWin);
}
if (mask & CWY)
{
valuemask |= CWY;
-
values.y = nxagentWindowPriv(pWin)->y = pWin->origin.y - wBorderWidth(pWin);
}
if (mask & CWWidth)
{
valuemask |= CWWidth;
-
values.width = nxagentWindowPriv(pWin)->width = pWin->drawable.width;
}
if (mask & CWHeight)
{
valuemask |= CWHeight;
-
values.height = nxagentWindowPriv(pWin)->height = pWin->drawable.height;
}
if (mask & CWBorderWidth)
{
valuemask |= CWBorderWidth;
-
values.border_width = nxagentWindowPriv(pWin)->borderWidth =
pWin->borderWidth;
}
@@ -3447,10 +3442,7 @@ void nxagentSetTopLevelEventMask(WindowPtr pWin)
*/
void nxagentFlushConfigureWindow(void)
{
- ConfiguredWindowStruct *index;
- XWindowChanges changes;
-
- index = nxagentConfiguredWindowList;
+ ConfiguredWindowStruct *index = nxagentConfiguredWindowList;
while (index)
{
@@ -3493,8 +3485,10 @@ void nxagentFlushConfigureWindow(void)
if (nxagentExposeQueue.exposures[i].synchronize == 1)
{
- changes.x = nxagentExposeQueue.exposures[i].serial;
- changes.y = -2;
+ XWindowChanges changes = {
+ .x = nxagentExposeQueue.exposures[i].serial,
+ .y = -2
+ };
#ifdef DEBUG
fprintf(stderr, "nxagentFlushConfigureWindow: Sending synch ConfigureWindow for "