Commit 26901cc5 authored by Alexander Wuerstlein's avatar Alexander Wuerstlein Committed by Mike Gabriel

Follow-up commit for 302_nxagent_configurable-keystrokes.full.patch, fixes FTBFS…

Follow-up commit for 302_nxagent_configurable-keystrokes.full.patch, fixes FTBFS problem with the first version of that patch.
parent fe598a1e
......@@ -7,6 +7,8 @@ nx-libs (2:3.5.0.17-0) UNRELEASED; urgency=low
* Add patch: 302_nxagent_configurable-keystrokes.full.patch, replaces the
hardcoded nxagent keybindings by a configurable table of keybindings.
(Closes upstream issue: #74).
* Follow-up commit for 302_nxagent_configurable-keystrokes.full.patch, fixes
FTBFS problem with the first version of that patch.
[ Mike Gabriel ]
* Add README.keystrokes to doc section of bin:package nxagent.
......
......@@ -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__ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment