aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2020-05-26 00:51:58 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-10-17 22:38:05 +0200
commitf534a48601a2b239db48ebb8b984f2951c57dc3e (patch)
treee3490fc94ba2ce02ec70f87174c5a9c33e660d6c /nx-X11
parentd7a091a6402f625c9213b6d403b8e19f0e133b49 (diff)
downloadnx-libs-f534a48601a2b239db48ebb8b984f2951c57dc3e.tar.gz
nx-libs-f534a48601a2b239db48ebb8b984f2951c57dc3e.tar.bz2
nx-libs-f534a48601a2b239db48ebb8b984f2951c57dc3e.zip
Screen.c: move attributes/valuemask to inner scopes
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index c7e158636..5c543da19 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -844,8 +844,6 @@ Bool nxagentOpenScreen(ScreenPtr pScreen,
DepthPtr depths;
int numVisuals, numDepths;
int depthIndex;
- unsigned long valuemask;
- XSetWindowAttributes attributes;
Bool resetAgentPosition = False;
VisualID defaultVisual;
@@ -1678,15 +1676,16 @@ N/A
if (nxagentDoFullGeneration == 1 ||
nxagentReconnectTrap == 1)
{
- valuemask = CWBackPixel | CWEventMask | CWColormap |
- (nxagentOption(AllScreens) == 1 ? CWOverrideRedirect : 0);
-
- attributes.background_pixel = nxagentBlackPixel;
- attributes.event_mask = nxagentGetDefaultEventMask();
- attributes.colormap = nxagentDefaultVisualColormap(nxagentDefaultVisual(pScreen));
+ unsigned long valuemask = CWBackPixel | CWEventMask | CWColormap;
+ XSetWindowAttributes attributes = {
+ .background_pixel = nxagentBlackPixel,
+ .event_mask = nxagentGetDefaultEventMask(),
+ .colormap = nxagentDefaultVisualColormap(nxagentDefaultVisual(pScreen))
+ };
if (nxagentOption(AllScreens) == 1)
{
+ valuemask |= CWOverrideRedirect;
attributes.override_redirect = True;
}
@@ -1753,8 +1752,7 @@ N/A
if (nxagentOption(Rootless) == 0)
{
- valuemask = CWEventMask;
- attributes.event_mask = PointerMotionMask;
+ XSetWindowAttributes inpattributes = {.event_mask = PointerMotionMask};
nxagentInputWindows[pScreen->myNum] =
XCreateWindow(nxagentDisplay,
@@ -1764,7 +1762,7 @@ N/A
nxagentOption(Height),
0, 0, InputOnly,
nxagentDefaultVisual(pScreen),
- valuemask , &attributes);
+ CWEventMask, &inpattributes);
if (nxagentReportWindowIds)
{