diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-08-22 20:18:48 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-08-22 20:18:48 +0200 |
| commit | b517b66efcbb30bb7f7add4fb5bfe48f3185b615 (patch) | |
| tree | 670e83bba0c6919e7e73910bd09a20f9f03bb2e1 | |
| parent | f9e4a54c48ec9730d1e977a57dae89042e7bfb5e (diff) | |
| parent | f9c2d560d40721617d5813fed8bd04af8431c75c (diff) | |
| download | nx-libs-b517b66efcbb30bb7f7add4fb5bfe48f3185b615.tar.gz nx-libs-b517b66efcbb30bb7f7add4fb5bfe48f3185b615.tar.bz2 nx-libs-b517b66efcbb30bb7f7add4fb5bfe48f3185b615.zip | |
Merge branch 'uli42-pr/fix_wm_props' into 3.6.x
Attributes GH PR #721: https://github.com/ArcticaProject/nx-libs/pull/721
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Screen.c | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 11efbf359..036e5b4b8 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -853,8 +853,6 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, unsigned long valuemask; XSetWindowAttributes attributes; XWindowAttributes gattributes; - XSizeHints* sizeHints; - XWMHints* wmHints; Mask mask; Bool resetAgentPosition = False; @@ -1870,6 +1868,9 @@ N/A XSelectInput(nxagentDisplay, nxagentFullscreenWindow, mask); } + XSizeHints* sizeHints; + XWMHints* wmHints; + if ((sizeHints = XAllocSizeHints())) { sizeHints->flags = PPosition | PMinSize | PMaxSize; @@ -1898,15 +1899,6 @@ N/A sizeHints->flags |= USSize; } - Xutf8SetWMProperties(nxagentDisplay, - nxagentDefaultWindows[pScreen->myNum], - nxagentWindowName, - nxagentWindowName, - argv , argc , &sizeHints, &wmHints, NULL); - - if (sizeHints) - XFree(sizeHints); - if ((wmHints = XAllocWMHints())) { wmHints->icon_pixmap = nxagentIconPixmap; @@ -1920,9 +1912,24 @@ N/A { wmHints->flags = IconPixmapHint; } + } - XSetWMHints(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], wmHints); - XFree(wmHints); + Xutf8SetWMProperties(nxagentDisplay, + nxagentDefaultWindows[pScreen->myNum], + nxagentWindowName, + nxagentWindowName, + argv , argc , sizeHints, wmHints, NULL); + + if (sizeHints) + { + XFree(sizeHints); + sizeHints = NULL; + } + + if (wmHints) + { + XFree(wmHints); + wmHints = NULL; } /* |