aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-06-30 16:22:25 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-06-30 16:22:25 +0200
commit4365fe38e67bc3d7dee3b948aefc42ca62e7a11e (patch)
tree8d46423c66f14e080ef534523c1c15032c03dc4d /nx-X11/programs/Xserver/hw/nxagent
parent3d255540f40b7e60dfee0807216a7705a1e9682a (diff)
parent588be6386adf9dd25bb942af9456d6c07eda4676 (diff)
downloadnx-libs-4365fe38e67bc3d7dee3b948aefc42ca62e7a11e.tar.gz
nx-libs-4365fe38e67bc3d7dee3b948aefc42ca62e7a11e.tar.bz2
nx-libs-4365fe38e67bc3d7dee3b948aefc42ca62e7a11e.zip
Merge branch 'sunweaver-pr/nx-real-wid' into 3.6.x
Attributes GH PR #463: https://github.com/ArcticaProject/nx-libs/pull/463 Reviewed by Ulrich Sibiller <uli42@gmx.de> -- Fri, 30 Jun 2017 14:16:03 +0000 (UTC)
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Args.c6
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Args.h1
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Atoms.c5
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Window.c36
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/man/nxagent.12
5 files changed, 50 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index 5db7e0110..5d74f212c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -128,6 +128,7 @@ extern const char *__progname;
char nxagentDisplayName[1024];
Bool nxagentSynchronize = False;
+Bool nxagentRealWindowProp = False;
char nxagentShadowDisplayName[1024] = {0};
@@ -404,6 +405,11 @@ int ddxProcessArgument(int argc, char *argv[], int i)
return 1;
}
+ if (!strcmp(argv[i], "-nxrealwindowprop")) {
+ nxagentRealWindowProp = True;
+ return 1;
+ }
+
if (!strcmp(argv[i], "-full")) {
nxagentFullGeneration = True;
return 1;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.h b/nx-X11/programs/Xserver/hw/nxagent/Args.h
index 5192783e5..09d045514 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.h
@@ -59,6 +59,7 @@ extern char nxagentWindowName[];
extern char nxagentDialogName[];
extern Bool nxagentSynchronize;
+extern Bool nxagentRealWindowProp;
extern Bool nxagentFullGeneration;
extern int nxagentDefaultClass;
extern Bool nxagentUserDefaultClass;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
index 0784d6c2c..9bcdee628 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
@@ -53,6 +53,11 @@
#undef TEST
#undef DEBUG
+#ifdef DEBUG
+/* for validateString() */
+#include "Utils.h"
+#endif
+
/*
* These values should be moved in
* the option repository.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index 23e1d5452..8d2123095 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -466,6 +466,18 @@ FIXME: Do all the windows for which nxagentWindowTopLevel(pWin)
nxagentRedirectWindow(pWin);
}
+ if ((nxagentRealWindowProp) && (!nxagentWindowTopLevel(pWin)))
+ {
+ Atom prop = MakeAtom("NX_REAL_WINDOW", strlen("NX_REAL_WINDOW"), True);
+
+ if (ChangeWindowProperty(pWin, prop, XA_WINDOW, 32, PropModeReplace, 1, nxagentWindowPriv(pWin), 1) != Success)
+ fprintf(stderr, "nxagentCreateWindow: Adding NX_REAL_WINDOW failed.\n");
+#ifdef DEBUG
+ else
+ fprintf(stderr, "nxagentCreateWindow: Added NX_REAL_WINDOW for Window ID [%x].\n", nxagentWindowPriv(pWin)->window);
+#endif
+ }
+
nxagentWindowPriv(pWin)->x = pWin->origin.x - wBorderWidth(pWin);
nxagentWindowPriv(pWin)->y = pWin->origin.y - wBorderWidth(pWin);
nxagentWindowPriv(pWin)->width = pWin->drawable.width;
@@ -2674,6 +2686,18 @@ void nxagentDisconnectWindow(void * p0, XID x1, void * p2)
}
#endif
+ if ((nxagentRealWindowProp) && (!nxagentWindowTopLevel(pWin)))
+ {
+ Atom prop = MakeAtom("NX_REAL_WINDOW", strlen("NX_REAL_WINDOW"), True);
+
+ if (DeleteProperty(pWin, prop) != Success)
+ fprintf(stderr, "nxagentDisconnectWindow: Deleting NX_REAL_WINDOW failed.\n");
+#ifdef DEBUG
+ else
+ fprintf(stderr, "nxagentDisconnectWindow: Deleting NX_REAL_WINDOW from Window ID [%x].\n", nxagentWindowPriv(pWin)->window);
+#endif
+ }
+
nxagentWindow(pWin) = None;
if (nxagentDrawableStatus((DrawablePtr) pWin) == NotSynchronized)
@@ -3111,6 +3135,18 @@ FIXME: Do we need to set save unders attribute here?
}
}
+ if ((nxagentRealWindowProp) && (!nxagentWindowTopLevel(pWin)))
+ {
+ Atom prop = MakeAtom("NX_REAL_WINDOW", strlen("NX_REAL_WINDOW"), True);
+
+ if (ChangeWindowProperty(pWin, prop, XA_WINDOW, 32, PropModeReplace, 1, nxagentWindowPriv(pWin), 1) != Success)
+ fprintf(stderr, "nxagentReconnectWindow: Updating NX_REAL_WINDOW failed.\n");
+#ifdef DEBUG
+ else
+ fprintf(stderr, "nxagentReconnectWindow: Updated NX_REAL_WINDOW for Window ID [%x].\n", nxagentWindowPriv(pWin)->window);
+#endif
+ }
+
if (nxagentDrawableStatus((DrawablePtr) pWin) == NotSynchronized)
{
nxagentAllocateCorruptedResource((DrawablePtr) pWin, RT_NX_CORR_WINDOW);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
index 1abec5753..89985a2f7 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
+++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
@@ -368,6 +368,8 @@ The nx-X11 system adds the following command line arguments:
.TP 8
.B \-forcenx
force use of NX protocol messages assuming communication through nxproxy
+.B \-nxrealwindowprop
+set property NX_REAL_WINDOW for each X11 client inside NX Agent, providing the window XID of the corresponding window object on the X server that NX Agent runs on
.TP 8
.B \-timeout \fIint\fP
auto-disconnect timeout in seconds (minimum allowed: 60)