aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Init.c
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2011-10-10 17:59:01 +0200
committerReinhard Tartler <siretart@tauware.de>2011-10-10 17:59:01 +0200
commite01b9177b41f7d27a934d41fa38d550fa0026b45 (patch)
treea5cbd3193d1a628272c244c4e50f8e0e685bdeb1 /nx-X11/programs/Xserver/hw/nxagent/Init.c
parent39b738a67a14dde67b2a811d56ac84934fcef52d (diff)
downloadnx-libs-e01b9177b41f7d27a934d41fa38d550fa0026b45.tar.gz
nx-libs-e01b9177b41f7d27a934d41fa38d550fa0026b45.tar.bz2
nx-libs-e01b9177b41f7d27a934d41fa38d550fa0026b45.zip
Imported nxagent-3.5.0-5.tar.gznxagent/3.5.0-5
Summary: Imported nxagent-3.5.0-5.tar.gz Keywords: Imported nxagent-3.5.0-5.tar.gz into Git repository
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Init.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Init.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index 4f675a630..f4fc3c7e5 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
@@ -128,6 +128,10 @@ void OsVendorEndRedirectErrorFFunction();
* new X server tree.
*/
+
+static void nxagentGrabServerCallback(CallbackListPtr *callbacks, pointer data,
+ pointer args);
+
#ifdef NXAGENT_UPGRADE
void ddxInitGlobals(void)
@@ -209,6 +213,11 @@ void InitOutput(ScreenInfo *screenInfo, int argc, char *argv[])
NXUnsetLibraryPath(1);
+ if (serverGeneration == 1)
+ {
+ AddCallback(&ServerGrabCallback, nxagentGrabServerCallback, NULL);
+ }
+
if (nxagentUserDefinedFontPath == 0)
{
#ifdef TEST
@@ -479,6 +488,17 @@ void OsVendorEndRedirectErrorFFunction()
int SelectWaitTime = 10000; /* usec */
#endif
+ServerGrabInfoRec nxagentGrabServerInfo;
+
+static void nxagentGrabServerCallback(CallbackListPtr *callbacks, pointer data,
+ pointer args)
+{
+ ServerGrabInfoRec *grab = (ServerGrabInfoRec*)args;
+
+ nxagentGrabServerInfo.client = grab->client;
+ nxagentGrabServerInfo.grabstate = grab->grabstate;
+}
+
#ifdef DPMSExtension
void DPMSSet(int level)