X2Go Bug report logs - #74
make nxagent keybindings configurable

Full log

Message #40 received at 74@bugs.x2go.org (full text, mbox, reply):

Received: (at 74) by bugs.x2go.org; 5 Dec 2012 23:02:50 +0000
From snalwuer@stud.informatik.uni-erlangen.de  Thu Dec  6 00:02:50 2012
Received: from faui03.informatik.uni-erlangen.de (faui03.informatik.uni-erlangen.de [IPv6:2001:638:a000:4130:131:188:30:103])
	by ymir (Postfix) with ESMTPS id 98D815DA79
	for <74@bugs.x2go.org>; Thu,  6 Dec 2012 00:02:50 +0100 (CET)
Received: from faui03c.informatik.uni-erlangen.de (faui03c.informatik.uni-erlangen.de [131.188.30.218])
	by faui03.informatik.uni-erlangen.de (Postfix) with ESMTP id 52AED683851;
	Thu,  6 Dec 2012 00:02:50 +0100 (CET)
Received: by faui03c.informatik.uni-erlangen.de (Postfix, from userid 31763)
	id 2E1BD4F2084; Thu,  6 Dec 2012 00:02:49 +0100 (CET)
From: Alexander Wuerstlein <arw@arw.name>
To: 74@bugs.x2go.org
Cc: Alexander Wuerstlein <arw@arw.name>
Subject: [PATCH] Fix build error caused by patch for #74 (missing nxagentKeystrokeFile)
Date: Thu,  6 Dec 2012 00:02:47 +0100
Message-Id: <1354748567-23433-1-git-send-email-arw@arw.name>
X-Mailer: git-send-email 1.7.10.4
In-Reply-To: <20121204135344.54254nxpjlf4npso@mail.das-netzwerkteam.de>
References: <20121204135344.54254nxpjlf4npso@mail.das-netzwerkteam.de>

Adds command line argument -keystrokefile to nxagent which fills
the nxagentKeystrokeFile variable
---
 .../302_nxagent_configurable-keystrokes.full.patch |   42 ++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/debian/patches/302_nxagent_configurable-keystrokes.full.patch b/debian/patches/302_nxagent_configurable-keystrokes.full.patch
index fb74739..8fb34df 100644
--- a/debian/patches/302_nxagent_configurable-keystrokes.full.patch
+++ b/debian/patches/302_nxagent_configurable-keystrokes.full.patch
@@ -987,3 +987,45 @@ Description: Make nxagent-specific keyboard bindings configurable
 +regions_on_screen
 +test_input
 +deactivate_input_devices_grab
+--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
++++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
+@@ -148,6 +148,8 @@
+ 
+ char nxagentVerbose = 0;
+ 
++char *nxagentKeystrokeFile = NULL;
++
+ int ddxProcessArgument(int argc, char *argv[], int i)
+ {
+   /*
+@@ -1021,6 +1023,20 @@
+     return 1;
+   }
+ 
++  if (!strcmp(argv[i], "-keystrokefile"))
++  {
++    if (i + 1 < argc)
++    {
++      if (NULL != (nxagentKeystrokeFile = strdup(argv[i + 1])))
++      {
++        return 2;
++      } else {
++	FatalError("malloc failed");
++      }
++    }
++    return 0;
++  }
++
+   return 0;
+ }
+
+--- a/nx-X11/programs/Xserver/hw/nxagent/Args.h
++++ b/nx-X11/programs/Xserver/hw/nxagent/Args.h
+@@ -83,4 +83,6 @@
+ 
+ extern int nxagentRemoteMajor;
+ 
++extern char *nxagentKeystrokeFile;
++
+ #endif /* __Args_H__ */
+
-- 
1.7.10.4

Send a report that this bug log contains spam.