aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-10-03 23:39:01 +0200
committerMihai Moldovan <ionic@ionic.de>2019-10-10 11:35:23 +0200
commit646e3ce242a00687877259d3b2d7866e0f42f2fb (patch)
tree343e95ac4cdae50d4aa6bbf14c1519a65f1d423c /nx-X11/programs/Xserver
parent8482abd31304b4555cabf135c3a41a961cba7845 (diff)
downloadnx-libs-646e3ce242a00687877259d3b2d7866e0f42f2fb.tar.gz
nx-libs-646e3ce242a00687877259d3b2d7866e0f42f2fb.tar.bz2
nx-libs-646e3ce242a00687877259d3b2d7866e0f42f2fb.zip
Screen.c: cleanup code a bit
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c30
1 files changed, 14 insertions, 16 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index ae64c0a18..2b1146496 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -418,27 +418,23 @@ FIXME: We'll check for ReparentNotify and LeaveNotify events after
Window nxagentCreateIconWindow(void)
{
- XSetWindowAttributes attributes;
- unsigned long valuemask;
- XSizeHints* sizeHints;
- XWMHints* wmHints;
- Window w;
- Mask mask;
-
/*
* Create icon window.
*/
- attributes.override_redirect = False;
- attributes.colormap = DefaultColormap(nxagentDisplay, DefaultScreen(nxagentDisplay));
- attributes.background_pixmap = nxagentScreenSaverPixmap;
- valuemask = CWOverrideRedirect | CWBackPixmap | CWColormap;
+ XSetWindowAttributes attributes = {
+ .override_redirect = False,
+ .colormap = DefaultColormap(nxagentDisplay, DefaultScreen(nxagentDisplay)),
+ .background_pixmap = nxagentScreenSaverPixmap,
+ };
+
+ unsigned long valuemask = CWOverrideRedirect | CWBackPixmap | CWColormap;
#ifdef TEST
fprintf(stderr, "nxagentCreateIconWindow: Going to create new icon window.\n");
#endif
- w = XCreateWindow(nxagentDisplay, DefaultRootWindow(nxagentDisplay),
+ Window w = XCreateWindow(nxagentDisplay, DefaultRootWindow(nxagentDisplay),
0, 0, 1, 1, 0,
DefaultDepth(nxagentDisplay, DefaultScreen(nxagentDisplay)),
InputOutput,
@@ -458,14 +454,17 @@ Window nxagentCreateIconWindow(void)
* Set hints to the window manager for the icon window.
*/
- if ((sizeHints = XAllocSizeHints()))
+ XSizeHints* sizeHints = XAllocSizeHints();
+ XWMHints* wmHints = XAllocWMHints();;
+
+ if (sizeHints)
{
sizeHints->flags = PMinSize | PMaxSize;
sizeHints->min_width = sizeHints->max_width = 1;
sizeHints->min_height = sizeHints->max_height = 1;
}
- if ((wmHints = XAllocWMHints()))
+ if (wmHints)
{
wmHints->flags = IconPixmapHint | IconMaskHint;
wmHints->initial_state = IconicState;
@@ -483,7 +482,6 @@ Window nxagentCreateIconWindow(void)
}
char *window_name = nxagentWindowName;
-
Xutf8SetWMProperties(nxagentDisplay, w,
window_name, window_name,
NULL , 0 , sizeHints, wmHints, NULL);
@@ -495,7 +493,7 @@ Window nxagentCreateIconWindow(void)
* Enable events from the icon window.
*/
- mask = nxagentGetDefaultEventMask();
+ Mask mask = nxagentGetDefaultEventMask();
XSelectInput(nxagentDisplay, w, (mask & ~(KeyPressMask |
KeyReleaseMask)) | StructureNotifyMask);