This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch 3.6.x in repository nx-libs. from 7517604 nx-libs.spec: also package extensions/shapeconst.h in RPM packages. new 7c32938 nxagent: Add -version cmdline option. new eded331 nxagent: Print correct application in usage message. new deeac7e nxagent/Args.c: Mention new -options cmdline parameter in usage info. new 99fb981 hw/nxagent/: Use <function>(void) rather than <function>(). new 0371276 hw/nxagent/: Stop using non-portable '__progname', set up our own 'nxagentProgName' instead and pass it around where needed. new 92d8063 Merge branch 'sunweaver-pr/version-cmdline-option' into 3.6.x new db836fd Lift record to xorg-xserver-7.1/1.1.0 state new 0b62599 Lift record to xorg-xserver-7.1/1.1.0 state - non-functional changes only new 1c7abb0 Lift record to xorg-server-1.2.0/xorg-server-1.3.0.0 state new 39a56de Lift record to xorg-server-1.2.0/xorg-server-1.3.0.0 state - non-functional changes only new e5833a6 Lift record to xorg-server-1.4.2 state new eaae961 Merge branch 'uli42-pr/update_record' into 3.6.x new 23dd295 Lift miext to xorg-xserver-7.1/1.1.10 state new 6b0a173 Lift mi to xorg-xserver-7.1/1.1.0 state new 7368b45 Lift mi to xorg-xserver-7.1/1.1.0 state - non-functional changes only new 3fffa5b Merge branch 'uli42-pr/update_mi' into 3.6.x new 78724c4 Remove unused X11R4 DDX compatibility function miClipNotify. new 2d59dac Lift os to XORG-7_1 state new 41ff6b0 Lift os to XORG-7_1 state - non-functional changes only new 7a4aa75 Merge branch 'uli42-pr/update_os' into 3.6.x new f963593 nx-X11/programs/Xserver/{include/globals.h,mi/miinitext.c}: remove DPSEXT left-overs. new ea17fd0 nxcomp/src/Loop.cpp: Make know the agent option 'keyconv' to nxcomp and tolerate it as a valid option. new 842bb0f nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1: remove empty line on top of file. new 0ef6b0d {nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1,nxproxy/man/nxproxy.1}: magicpixel takes a boolean argument for now. new a88ca27 nxcomp/src/Loop.cpp: Harmonize log output. Uniformly, embrace port values by single quotes. new 9dd2830 nxagent: Auto-detect client-side DPI at session startup. new 29c166d nxagent: Also provide auto DPI feature via nx/nx option 'autodpi', taking only effect on session startups. new 6d40496 Merge branch 'sunweaver-pr/autodetect-dpi' into 3.6.x new 9f93e96 nx-libs.spec: Starting with Fedora 28 / RHEL 8, SunRPC support is being split out into a separate libraries (libtirpc). new a6cb858 Revert "nx-libs.spec: Starting with Fedora 28 / RHEL 8, SunRPC support is being split out into a separate libraries (libtirpc)." The 30 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: nx-X11/programs/Xserver/hw/nxagent/Args.c | 59 ++++- nx-X11/programs/Xserver/hw/nxagent/Args.h | 2 + nx-X11/programs/Xserver/hw/nxagent/Atoms.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/Binder.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Client.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Composite.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/Cursor.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/Dialog.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Display.c | 38 +-- nx-X11/programs/Xserver/hw/nxagent/Drawable.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/Error.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/Events.c | 18 +- nx-X11/programs/Xserver/hw/nxagent/Extensions.c | 19 +- nx-X11/programs/Xserver/hw/nxagent/Font.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/GC.c | 6 +- nx-X11/programs/Xserver/hw/nxagent/Image.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/Init.c | 21 +- nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c | 5 +- nx-X11/programs/Xserver/hw/nxagent/Options.c | 8 +- nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | 10 +- nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/Render.c | 6 +- nx-X11/programs/Xserver/hw/nxagent/Rootless.c | 8 +- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 46 +++- nx-X11/programs/Xserver/hw/nxagent/Split.c | 10 +- nx-X11/programs/Xserver/hw/nxagent/Visual.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Window.c | 6 +- nx-X11/programs/Xserver/hw/nxagent/compext/Z.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 14 +- nx-X11/programs/Xserver/include/globals.h | 4 - nx-X11/programs/Xserver/mi/Imakefile | 2 - nx-X11/programs/Xserver/mi/mi.h | 10 - nx-X11/programs/Xserver/mi/miclipn.c | 82 ------ nx-X11/programs/Xserver/mi/micmap.c | 4 +- nx-X11/programs/Xserver/mi/miinitext.c | 18 +- nx-X11/programs/Xserver/mi/mipointer.c | 2 +- nx-X11/programs/Xserver/mi/miscrinit.c | 26 -- nx-X11/programs/Xserver/mi/misprite.c | 22 +- nx-X11/programs/Xserver/mi/mivaltree.c | 24 +- nx-X11/programs/Xserver/mi/miwideline.c | 9 +- nx-X11/programs/Xserver/miext/damage/Imakefile | 2 +- nx-X11/programs/Xserver/miext/damage/damagestr.h | 1 + nx-X11/programs/Xserver/os/WaitFor.c | 1 + nx-X11/programs/Xserver/os/osdep.h | 2 + nx-X11/programs/Xserver/os/utils.c | 8 +- nx-X11/programs/Xserver/os/xdmauth.c | 10 +- nx-X11/programs/Xserver/record/record.c | 174 ++++--------- nx-X11/programs/Xserver/record/set.c | 305 ++--------------------- nxcomp/src/Loop.cpp | 18 +- nxcomp/src/Misc.cpp | 1 + nxproxy/man/nxproxy.1 | 3 +- 53 files changed, 354 insertions(+), 698 deletions(-) delete mode 100644 nx-X11/programs/Xserver/mi/miclipn.c -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 7c32938ac5b803a1630920dd027be33df07aa3df Author: Simon Matter <simon.matter@invoca.ch> Date: Wed Feb 21 23:39:23 2018 +0100 nxagent: Add -version cmdline option. Fixes ArcticaProject/nx-libs#653. --- nx-X11/programs/Xserver/hw/nxagent/Args.c | 11 +++++++++++ nx-X11/programs/Xserver/hw/nxagent/Args.h | 2 ++ nx-X11/programs/Xserver/hw/nxagent/Init.c | 5 +---- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 3 +++ 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index 604b331..1a43f37 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -336,6 +336,12 @@ int ddxProcessArgument(int argc, char *argv[], int i) return 0; } + if (!strcmp(argv[i], "-version")) + { + nxagentShowVersionInfo(); + exit(0); + } + /* * This had to be '-options' since the beginning * but was '-option' by mistake. Now we have to @@ -2112,6 +2118,7 @@ void ddxUseMsg() ErrorF("-R enable rootless mode\n"); ErrorF("-S enable shadow mode\n"); ErrorF("-B enable proxy binding mode\n"); + ErrorF("-version show version information and exit\n"); } static int nxagentGetDialogName() @@ -2609,3 +2616,7 @@ void nxagentSetCoalescence() nxagentChangeOption(DisplayCoalescence, timeout); } +void nxagentShowVersionInfo(void) +{ + ErrorF("NXAGENT - Version " NX_VERSION_CURRENT_STRING "\n"); +} diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.h b/nx-X11/programs/Xserver/hw/nxagent/Args.h index a3f7e34..8d6f29b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.h @@ -96,6 +96,8 @@ void nxagentSetBufferSize(void); void nxagentSetScheduler(void); void nxagentSetCoalescence(void); +void nxagentShowVersionInfo(void); + extern int nxagentUserDefinedFontPath; extern int nxagentRemoteMajor; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c index a35e3d5..17c430d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c @@ -85,9 +85,6 @@ is" without express or implied warranty. #undef DEBUG #undef DUMP -#define NXAGENT_VERSION NX_VERSION_CURRENT -#define NXAGENT_VERSION_STRING NX_VERSION_CURRENT_STRING - /* * ProcVector array defined in tables.c. */ @@ -234,7 +231,7 @@ void InitOutput(ScreenInfo *screenInfo, int argc, char *argv[]) if (serverGeneration <= 1) { - fprintf(stderr, "\nNXAGENT - Version " NXAGENT_VERSION_STRING "\n\n"); + fprintf(stderr, "\nNXAGENT - Version " NX_VERSION_CURRENT_STRING "\n\n"); fprintf(stderr, "Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)\n"); fprintf(stderr, "Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>\n"); fprintf(stderr, "Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"); diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index d06cb84..f4a9fa4 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -449,6 +449,9 @@ enable shadow mode .B \-B enable proxy binding mode .TP 8 +.B \-version +show version information and exit +.TP 8 .B \-options \fIfilename\fP path to an options file containing nx/nx options (see below). .PP -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit deeac7e0f50f4ca7346406325be2e3d26f74d750 Author: Simon Matter <simon.matter@invoca.ch> Date: Wed Feb 21 23:46:55 2018 +0100 nxagent/Args.c: Mention new -options cmdline parameter in usage info. Fixes ArcticaProject/nx-libs#639 --- nx-X11/programs/Xserver/hw/nxagent/Args.c | 1 + 1 file changed, 1 insertion(+) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index 1a43f37..1af2365 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -2095,6 +2095,7 @@ void ddxUseMsg() ErrorF("-install install colormaps directly\n"); ErrorF("The NX system adds the following arguments:\n"); + ErrorF("-options file|string file or string containing nx/nx options\n"); ErrorF("-forcenx force use of NX protocol messages assuming communication through nxproxy\n"); ErrorF("-timeout int auto-disconnect timeout in seconds (minimum allowed: 60)\n"); ErrorF("-norootlessexit don't exit if there are no clients in rootless mode\n"); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit eded33173b275b08277811c6b7bbb6dcd4949975 Author: Simon Matter <simon.matter@invoca.ch> Date: Wed Feb 21 23:49:55 2018 +0100 nxagent: Print correct application in usage message. Fixes ArcticaProject/nx-libs#639. --- nx-X11/programs/Xserver/os/utils.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 0ebb644..0166632 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -556,7 +556,12 @@ AdjustWaitForDelay (void * waitTime, unsigned long newdelay) void UseMsg(void) { +#ifdef NXAGENT_SERVER + extern const char *__progname; + ErrorF("Usage: %s [<options>] [:<display>]\n\n", __progname); +#else ErrorF("use: X [:<display>] [option]\n"); +#endif ErrorF("-a # mouse acceleration (pixels)\n"); ErrorF("-ac disable access control restrictions\n"); #ifdef MEMBUG -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 99fb9817f6452df63b0c9258342086b5769ba468 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Feb 26 12:22:15 2018 +0100 hw/nxagent/: Use <function>(void) rather than <function>(). --- nx-X11/programs/Xserver/hw/nxagent/Args.c | 12 ++++---- nx-X11/programs/Xserver/hw/nxagent/Atoms.c | 4 +-- nx-X11/programs/Xserver/hw/nxagent/Binder.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Client.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Composite.c | 4 +-- nx-X11/programs/Xserver/hw/nxagent/Cursor.c | 4 +-- nx-X11/programs/Xserver/hw/nxagent/Dialog.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Display.c | 38 ++++++++++++------------- nx-X11/programs/Xserver/hw/nxagent/Drawable.c | 4 +-- nx-X11/programs/Xserver/hw/nxagent/Error.c | 4 +-- nx-X11/programs/Xserver/hw/nxagent/Events.c | 18 ++++++------ nx-X11/programs/Xserver/hw/nxagent/Extensions.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Font.c | 4 +-- nx-X11/programs/Xserver/hw/nxagent/GC.c | 6 ++-- nx-X11/programs/Xserver/hw/nxagent/Image.c | 4 +-- nx-X11/programs/Xserver/hw/nxagent/Init.c | 12 ++++---- nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Options.c | 8 +++--- nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | 10 +++---- nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 4 +-- nx-X11/programs/Xserver/hw/nxagent/Render.c | 6 ++-- nx-X11/programs/Xserver/hw/nxagent/Rootless.c | 8 +++--- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 4 +-- nx-X11/programs/Xserver/hw/nxagent/Split.c | 10 +++---- nx-X11/programs/Xserver/hw/nxagent/Visual.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Window.c | 6 ++-- nx-X11/programs/Xserver/hw/nxagent/compext/Z.c | 4 +-- 28 files changed, 94 insertions(+), 94 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index 1af2365..cf227ab 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -2081,7 +2081,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio return useNXTrans; } -void ddxUseMsg() +void ddxUseMsg(void) { ErrorF("-display string display name of the real server\n"); ErrorF("-sync synchronize with the real server\n"); @@ -2122,7 +2122,7 @@ void ddxUseMsg() ErrorF("-version show version information and exit\n"); } -static int nxagentGetDialogName() +static int nxagentGetDialogName(void) { if (*nxagentSessionId != '\0') { @@ -2306,7 +2306,7 @@ void nxagentSetPackMethod(void) * of involved drawables. */ -void nxagentSetDeferLevel() +void nxagentSetDeferLevel(void) { int deferLevel; int tileWidth; @@ -2486,7 +2486,7 @@ void nxagentSetDeferLevel() } } -void nxagentSetBufferSize() +void nxagentSetBufferSize(void) { int size; @@ -2545,7 +2545,7 @@ void nxagentSetBufferSize() } } -void nxagentSetScheduler() +void nxagentSetScheduler(void) { /* * The smart scheduler is the default. @@ -2561,7 +2561,7 @@ void nxagentSetScheduler() } } -void nxagentSetCoalescence() +void nxagentSetCoalescence(void) { int timeout; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c index 9bcdee6..e2d97d2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c @@ -114,7 +114,7 @@ static void catchAndRedirect(Display* dpy, XErrorEvent* X) } } -static void startWMDetection() +static void startWMDetection(void) { /* * We are trying to detect if is there any client @@ -420,7 +420,7 @@ static void nxagentWriteAtom(Atom local, Atom remote, const char *string, Bool d * the Xserver values and the atom names. */ -void nxagentResetAtomMap() +void nxagentResetAtomMap(void) { unsigned i; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Binder.c b/nx-X11/programs/Xserver/hw/nxagent/Binder.c index ae1cd0f..1a6c4e9 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Binder.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Binder.c @@ -133,7 +133,7 @@ int nxagentCheckBinder(int argc, char *argv[], int i) return 0; } -int nxagentBinderLoop() +int nxagentBinderLoop(void) { struct timeval timeout; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.c b/nx-X11/programs/Xserver/hw/nxagent/Client.c index 1149545..206b6d8 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Client.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Client.c @@ -253,7 +253,7 @@ void nxagentCheckIfShadowAgent(ClientPtr client) } } -void nxagentWakeupByReconnect() +void nxagentWakeupByReconnect(void) { int i; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index 41c81cd..a13c842 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -1027,7 +1027,7 @@ void nxagentNotifySelection(XEvent *X) * requests from real X clients. */ -void nxagentResetSelectionOwner() +void nxagentResetSelectionOwner(void) { int i; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Composite.c b/nx-X11/programs/Xserver/hw/nxagent/Composite.c index 8f15794..e486718 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Composite.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Composite.c @@ -50,7 +50,7 @@ int nxagentCompositeEnable = UNDEFINED; -void nxagentCompositeExtensionInit() +void nxagentCompositeExtensionInit(void) { /* * Set the flag only if the initialization @@ -115,7 +115,7 @@ void nxagentCompositeExtensionInit() #endif } -void nxagentRedirectDefaultWindows() +void nxagentRedirectDefaultWindows(void) { int i; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c index 1db26b7..a67115c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c @@ -392,7 +392,7 @@ void nxagentReconnectCursor(void * p0, XID x1, void * p2) * The parameter is ignored at the moment. */ -void nxagentReDisplayCurrentCursor() +void nxagentReDisplayCurrentCursor(void) { CursorPtr pCursor = GetSpriteCursor(); @@ -518,7 +518,7 @@ void nxagentDisconnectCursor(void * p0, XID x1, void * p2) } } -Bool nxagentDisconnectAllCursor() +Bool nxagentDisconnectAllCursor(void) { int i; Bool r = True; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c index 73bd37a..753b9d7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c @@ -525,7 +525,7 @@ void nxagentTerminateDialog(DialogType type) #endif } -void nxagentTerminateDialogs() +void nxagentTerminateDialogs(void) { DialogType type; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c index 4f2e3c6..494a732 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c @@ -200,7 +200,7 @@ unsigned long startTime; extern void RejectWellKnownSockets(void); extern Bool nxagentReportWindowIds; -int nxagentServerOrder() +int nxagentServerOrder(void) { int whichbyte = 1; @@ -800,7 +800,7 @@ static int nxagentDisplayErrorPredicate(Display *display, int error) return error; } -void nxagentInstallDisplayHandlers() +void nxagentInstallDisplayHandlers(void) { /* * If the display was already opened, be sure @@ -849,7 +849,7 @@ void nxagentInstallDisplayHandlers() NXSetDisplayErrorPredicate(nxagentDisplayErrorPredicate); } -void nxagentPostInstallDisplayHandlers() +void nxagentPostInstallDisplayHandlers(void) { /* * This is executed after having opened the @@ -880,7 +880,7 @@ FIXME: What is the most appropriate number of elements? XSetErrorHandler(nxagentErrorHandler); } -void nxagentResetDisplayHandlers() +void nxagentResetDisplayHandlers(void) { if (nxagentDisplay != NULL) { @@ -934,7 +934,7 @@ void nxagentResetDisplayHandlers() nxagentDispatch.start = 0; } -void nxagentInstallSignalHandlers() +void nxagentInstallSignalHandlers(void) { #ifdef TEST fprintf(stderr, "nxagentInstallSignalHandlers: Installing the agent signal handlers.\n"); @@ -1040,7 +1040,7 @@ void nxagentInstallSignalHandlers() } } -void nxagentPostInstallSignalHandlers() +void nxagentPostInstallSignalHandlers(void) { #ifdef TEST fprintf(stderr, "nxagentPostInstallSignalHandlers: Dealing with the proxy signal handlers.\n"); @@ -1079,7 +1079,7 @@ void nxagentPostInstallSignalHandlers() */ } -void nxagentResetSignalHandlers() +void nxagentResetSignalHandlers(void) { struct sigaction newAction; @@ -1553,7 +1553,7 @@ void nxagentInitVisuals(void) nxagentSetDefaultVisual(); } -void nxagentInitDepths() +void nxagentInitDepths(void) { #ifdef TEST int i; @@ -1586,7 +1586,7 @@ void nxagentInitDepths() #endif } -void nxagentInitPixmapFormats() +void nxagentInitPixmapFormats(void) { int i, j; int depth; @@ -1673,7 +1673,7 @@ XXX: Some X server doesn't list 1 among available depths... #endif } -void nxagentSetDefaultDrawables() +void nxagentSetDefaultDrawables(void) { int i, j; @@ -1744,7 +1744,7 @@ void nxagentSetDefaultDrawables() } } -void nxagentCloseDisplay() +void nxagentCloseDisplay(void) { #ifdef TEST fprintf(stderr, "nxagentCloseDisplay: Called with full generation [%d] and display [%p].\n", @@ -1984,7 +1984,7 @@ Bool nxagentMakeIcon(Display *display, Pixmap *nxIcon, Pixmap *nxMask) return success; } -Bool nxagentXServerGeometryChanged() +Bool nxagentXServerGeometryChanged(void) { return (WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)) != WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplayBackup))) || @@ -2124,7 +2124,7 @@ void nxagentDisconnectDisplay(void) reconnectDisplayState = NOTHING; } -static int nxagentCheckForDefaultDepthCompatibility() +static int nxagentCheckForDefaultDepthCompatibility(void) { /* * Depending on the (reconnect) tolerance checks value, this @@ -2190,7 +2190,7 @@ static int nxagentCheckForDefaultDepthCompatibility() } } -static int nxagentCheckForDepthsCompatibility() +static int nxagentCheckForDepthsCompatibility(void) { /* * Depending on the (reconnect) tolerance checks value, this @@ -2348,7 +2348,7 @@ static int nxagentCheckForDepthsCompatibility() return (ret); } -static int nxagentCheckForPixmapFormatsCompatibility() +static int nxagentCheckForPixmapFormatsCompatibility(void) { /* * Depending on the (reconnect) tolerance checks value, this @@ -2881,7 +2881,7 @@ Bool nxagentReconnectDisplay(void *p0) return True; } -void nxagentAddXConnection() +void nxagentAddXConnection(void) { int fd = XConnectionNumber(nxagentDisplay); @@ -2895,7 +2895,7 @@ void nxagentAddXConnection() SetNotifyFd(XConnectionNumber(nxagentDisplay), nxagentNotifyConnection, X_NOTIFY_READ, NULL); } -void nxagentRemoveXConnection() +void nxagentRemoveXConnection(void) { #ifdef TEST fprintf(stderr, "nxagentRemoveXConnection: Removing the X connection [%d] " @@ -2912,7 +2912,7 @@ void nxagentRemoveXConnection() * NX transport is terminated first. */ -void nxagentWaitDisplay() +void nxagentWaitDisplay(void) { /* * Disable the smart scheduler's interrupts. @@ -2962,7 +2962,7 @@ void nxagentWaitDisplay() * the Xlib display connection. */ -void nxagentAbortDisplay() +void nxagentAbortDisplay(void) { /* * Be sure the X server socket in .X11-unix is diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c index c3d2707..8e82836 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c @@ -2593,7 +2593,7 @@ void nxagentCorruptedRegionOnWindow(void *p0, XID x, void *p2) RegionUninit(&visRegion); } -void nxagentRegionsOnScreen() +void nxagentRegionsOnScreen(void) { FindClientResourcesByType(clients[serverClient -> index], RT_NX_CORR_WINDOW, nxagentCorruptedRegionOnWindow, NULL); @@ -3024,7 +3024,7 @@ void nxagentUnmarkExposedRegion(WindowPtr pWin, RegionPtr pRegion, RegionPtr pOt } } -int nxagentSynchronizationPredicate() +int nxagentSynchronizationPredicate(void) { if (nxagentCorruptedWindows == 0 && nxagentCorruptedBackgrounds == 0 && diff --git a/nx-X11/programs/Xserver/hw/nxagent/Error.c b/nx-X11/programs/Xserver/hw/nxagent/Error.c index f5fb297..33d8abe 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Error.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Error.c @@ -247,7 +247,7 @@ int nxagentExitHandler(const char *message) return 0; } -void nxagentOpenClientsLogFile() +void nxagentOpenClientsLogFile(void) { if (*nxagentClientsLogName == '\0') { @@ -577,7 +577,7 @@ char *nxagentGetSessionPath(void) return sessionPath; } -void nxagentGetClientsPath() +void nxagentGetClientsPath(void) { if (*nxagentClientsLogName == '\0') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index 8681ab2..91a3c6e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -281,7 +281,7 @@ int nxagentCheckWindowConfiguration(XConfigureEvent* X); void nxagentRemoveDuplicatedKeys(XEvent *X); -void ProcessInputEvents() +void ProcessInputEvents(void) { #ifdef NX_DEBUG_INPUT if (nxagentDebugInput == 1) @@ -734,7 +734,7 @@ int nxagentInputEventPredicate(Display *display, XEvent *event, XPointer paramet } } -void nxagentInitDefaultEventMask() +void nxagentInitDefaultEventMask(void) { Mask mask = NoEventMask; @@ -3698,7 +3698,7 @@ int nxagentHandleReparentNotify(XEvent* X) return 1; } -void nxagentEnableKeyboardEvents() +void nxagentEnableKeyboardEvents(void) { int i; Mask mask; @@ -3719,7 +3719,7 @@ void nxagentEnableKeyboardEvents() NXAGENT_KEYBOARD_EXTENSION_EVENT_MASK); } -void nxagentDisableKeyboardEvents() +void nxagentDisableKeyboardEvents(void) { int i; Mask mask; @@ -3738,7 +3738,7 @@ void nxagentDisableKeyboardEvents() XkbSelectEvents(nxagentDisplay, XkbUseCoreKbd, 0x0, 0x0); } -void nxagentEnablePointerEvents() +void nxagentEnablePointerEvents(void) { int i; Mask mask; @@ -3755,7 +3755,7 @@ void nxagentEnablePointerEvents() } } -void nxagentDisablePointerEvents() +void nxagentDisablePointerEvents(void) { int i; Mask mask; @@ -3793,7 +3793,7 @@ void nxagentSendFakeKey(int key) mieqEnqueue(&fake); } -int nxagentInitXkbKeyboardState() +int nxagentInitXkbKeyboardState(void) { XEvent X; @@ -3954,7 +3954,7 @@ void nxagentUngrabPointerAndKeyboard(XEvent *X) XUngrabPointer(nxagentDisplay, now); } -void nxagentDeactivatePointerGrab() +void nxagentDeactivatePointerGrab(void) { GrabPtr grab = inputInfo.pointer -> grab; @@ -4595,7 +4595,7 @@ void nxagentGuessDumpInputInfo(ClientPtr client, Atom property, char *data) } } -void nxagentDeactivateInputDevicesGrabs() +void nxagentDeactivateInputDevicesGrabs(void) { fprintf(stderr, "Info: Deactivating input devices grabs.\n"); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c index 237e13f..211af8c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c @@ -82,7 +82,7 @@ void DarwinHandleGUI(int argc, char *argv[]) { } -void DarwinGlxExtensionInit() +void DarwinGlxExtensionInit(void) { GlxExtensionInit(); } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c index 5af88b1..72c5eb9 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c @@ -1252,7 +1252,7 @@ static void nxagentFailedFontReconnect(FontPtr pFont, XID param1, void * param2) return; } -static void nxagentFreeFailedToReconnectFonts() +static void nxagentFreeFailedToReconnectFonts(void) { free(nxagentFailedToReconnectFonts.font); nxagentFailedToReconnectFonts.font = NULL; @@ -1371,7 +1371,7 @@ Bool nxagentReconnectFailedFonts(void *p0) return True; } -Bool nxagentDisconnectAllFonts() +Bool nxagentDisconnectAllFonts(void) { int cid; Bool fontSuccess = True; diff --git a/nx-X11/programs/Xserver/hw/nxagent/GC.c b/nx-X11/programs/Xserver/hw/nxagent/GC.c index b6bff4c..2fac2f1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/GC.c +++ b/nx-X11/programs/Xserver/hw/nxagent/GC.c @@ -962,7 +962,7 @@ static void nxagentAddGCToList(GCPtr pGC) nxagentGCList.size++; } -void nxagentFreeGCList() +void nxagentFreeGCList(void) { struct nxagentGCRec *tempGC; @@ -977,7 +977,7 @@ void nxagentFreeGCList() } } -static void nxagentRestoreGCList() +static void nxagentRestoreGCList(void) { struct nxagentGCRec *tempGC; @@ -1215,7 +1215,7 @@ void nxagentDisconnectGC(void * p0, XID x1, void * p2) } } -Bool nxagentDisconnectAllGCs() +Bool nxagentDisconnectAllGCs(void) { int cid; Bool success = True; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c index c933c4a..7043f09 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Image.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c @@ -1616,7 +1616,7 @@ void nxagentGetImage(DrawablePtr pDrawable, int x, int y, int w, int h, * to the new proxy. */ -void nxagentResetVisualCache() +void nxagentResetVisualCache(void) { int i; @@ -1626,7 +1626,7 @@ void nxagentResetVisualCache() } } -void nxagentResetAlphaCache() +void nxagentResetAlphaCache(void) { int i; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c index 17c430d..4bd61a1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c @@ -470,7 +470,7 @@ void InitInput(argc, argv) * by FatalError(). */ -void AbortDDX() +void AbortDDX(void) { nxagentDoFullGeneration = True; @@ -492,7 +492,7 @@ void AbortDDX() * Called by GiveUp(). */ -void ddxGiveUp() +void ddxGiveUp(void) { AbortDDX(); } @@ -501,12 +501,12 @@ void ddxBeforeReset(void) { } -void OsVendorInit() +void OsVendorInit(void) { return; } -void OsVendorFatalError() +void OsVendorFatalError(void) { /* * Let the session terminate gracely @@ -538,12 +538,12 @@ void OsVendorVErrorFFunction(const char *f, va_list args) } } -void OsVendorStartRedirectErrorFFunction() +void OsVendorStartRedirectErrorFFunction(void) { nxagentStartRedirectToClientsLog(); } -void OsVendorEndRedirectErrorFFunction() +void OsVendorEndRedirectErrorFFunction(void) { nxagentEndRedirectToClientsLog(); } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 3acf498..758ec92 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -1435,7 +1435,7 @@ void nxagentCheckModifierMasks(CARD8 keycode, int j) } -void nxagentCheckRemoteKeycodes() +void nxagentCheckRemoteKeycodes(void) { nxagentCapsLockKeycode = XKeysymToKeycode(nxagentDisplay, XK_Caps_Lock); nxagentNumLockKeycode = XKeysymToKeycode(nxagentDisplay, XK_Num_Lock); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.c b/nx-X11/programs/Xserver/hw/nxagent/Options.c index dba54a6..c06967c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Options.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Options.c @@ -56,7 +56,7 @@ unsigned int nxagentPrintGeometryFlags = 0; * the options repository to the default values. */ -void nxagentInitOptions() +void nxagentInitOptions(void) { nxagentOptions.LinkType = UNDEFINED; @@ -183,7 +183,7 @@ void nxagentInitOptions() * ting. */ -void nxagentResetOptions() +void nxagentResetOptions(void) { if (nxagentLockDeferLevel == 0) { @@ -201,12 +201,12 @@ void nxagentResetOptions() nxagentOptions.KeycodeConversion = DEFAULT_KEYCODE_CONVERSION; } -void nxagentSaveOptions() +void nxagentSaveOptions(void) { memcpy(&nxagentOptionsBackup, &nxagentOptions, sizeof(AgentOptionsRec)); } -void nxagentRestoreOptions() +void nxagentRestoreOptions(void) { nxagentOptions.DeferLevel = nxagentOptionsBackup.DeferLevel; nxagentOptions.DeferTimeout = nxagentOptionsBackup.DeferTimeout; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c index 6a02f2f..25d410d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c @@ -788,7 +788,7 @@ void nxagentDisconnectPixmap(void *p0, XID x1, void *p2) } } -Bool nxagentDisconnectAllPixmaps() +Bool nxagentDisconnectAllPixmaps(void) { int r = 1; int i; @@ -1185,7 +1185,7 @@ Bool nxagentCheckPixmapIntegrity(PixmapPtr pPixmap) return integrity; } -Bool nxagentCheckAllPixmapIntegrity() +Bool nxagentCheckAllPixmapIntegrity(void) { int i; Bool imageIsGood = True; @@ -1445,7 +1445,7 @@ FIXME: If the pixmap has a different depth from the window, the return True; } -Bool nxagentFbOnShadowDisplay() +Bool nxagentFbOnShadowDisplay(void) { static Display *shadow; static Window win; @@ -1608,7 +1608,7 @@ Bool nxagentFbOnShadowDisplay() #ifdef DEBUG -void nxagentPrintResourceTypes() +void nxagentPrintResourceTypes(void) { fprintf(stderr, "nxagentPrintResourceTypes: RT_PIXMAP [%lu].\n", (unsigned long) RT_PIXMAP); fprintf(stderr, "nxagentPrintResourceTypes: RT_NX_PIXMAP [%lu].\n", (unsigned long) RT_NX_PIXMAP); @@ -1627,7 +1627,7 @@ void nxagentPrintResourcePredicate(void *value, XID id, XID type, void *cdata) (void *) value, (unsigned long) id, (unsigned long) type); } -void nxagentPrintResources() +void nxagentPrintResources(void) { Bool result; int i; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index b81796b..56ac017 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c @@ -321,7 +321,7 @@ TODO: This should be reset only when return 0; } -void nxagentInitializeRecLossyLevel() +void nxagentInitializeRecLossyLevel(void) { *(int *)reconnectLossyLevel[DISPLAY_STEP] = 0; *(int *)reconnectLossyLevel[SCREEN_STEP] = 0; @@ -805,7 +805,7 @@ static char* nxagentGetReconnectError() return nxagentReconnectErrorMessage; } -void nxagentHandleConnectionChanges() +void nxagentHandleConnectionChanges(void) { #ifdef TEST fprintf(stderr, "nxagentHandleConnectionChanges: Called.\n"); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c index e71004a..b58a16f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Render.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c @@ -447,7 +447,7 @@ nxagentCleanGlyphs(xGlyphInfo *gi, #endif /* #ifdef NXAGENT_RENDER_CLEANUP */ -void nxagentRenderExtensionInit() +void nxagentRenderExtensionInit(void) { int first_event, first_error; int major_version, minor_version; @@ -2303,7 +2303,7 @@ void nxagentTriFan(CARD8 op, PicturePtr pSrc, PicturePtr pDst, #endif } -void nxagentQueryFormats() +void nxagentQueryFormats(void) { XRenderInfo *xri; XExtDisplayInfo *info = NULL; @@ -3006,7 +3006,7 @@ void nxagentDisconnectPicture(void * p0, XID x1, void* p2) nxagentPicture(pPicture) = None; } -Bool nxagentDisconnectAllPicture() +Bool nxagentDisconnectAllPicture(void) { int i; Bool r; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c index a115dd1..82ec14f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c @@ -118,7 +118,7 @@ static void nxagentRemovePropertyFromList(void); static void nxagentPrintRootlessTopLevelWindowMap(void); -void nxagentPrintRootlessTopLevelWindowMap() +void nxagentPrintRootlessTopLevelWindowMap(void) { int i; @@ -245,7 +245,7 @@ void nxagentCirculateRootlessWindows(int direction) #ifdef DEBUG -Bool nxagentRootlessTreesMatch() +Bool nxagentRootlessTreesMatch(void) { Window root_return; Window parent_return; @@ -1178,7 +1178,7 @@ static struct{ * Removing first element from list. */ -void nxagentRemovePropertyFromList() +void nxagentRemovePropertyFromList(void) { struct nxagentPropertyRec *tmp = nxagentPropertyList.first; @@ -1242,7 +1242,7 @@ void nxagentAddPropertyToList(Atom property, WindowPtr pWin) nxagentPropertyList.size++; } -void nxagentFreePropertyList() +void nxagentFreePropertyList(void) { while (nxagentPropertyList.size != 0) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index c5aa389..36da8b9 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -367,7 +367,7 @@ FIXME: We'll check for ReparentNotify and LeaveNotify events after XReparentWind } } -Window nxagentCreateIconWindow() +Window nxagentCreateIconWindow(void) { XSetWindowAttributes attributes; unsigned long valuemask; @@ -4547,7 +4547,7 @@ void nxagentShadowAdaptToRatio(void) RegionUninit(®ion); } -void nxagentPrintGeometry() +void nxagentPrintGeometry(void) { int i; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Split.c b/nx-X11/programs/Xserver/hw/nxagent/Split.c index f66a97a..11221ea 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Split.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Split.c @@ -71,7 +71,7 @@ DrawablePtr nxagentSplitDrawable(DrawablePtr pDrawable) } } -void nxagentInitSplitResources() +void nxagentInitSplitResources(void) { int resource; @@ -93,7 +93,7 @@ void nxagentInitSplitResources() } } -SplitResourcePtr nxagentAllocSplitResource() +SplitResourcePtr nxagentAllocSplitResource(void) { int resource; @@ -193,14 +193,14 @@ void nxagentFreeSplitResource(SplitResourcePtr pResource) pResource -> gc = NULL; } -void nxagentInitUnpackResources() +void nxagentInitUnpackResources(void) { /* FIXME: This must be implemented. */ } -UnpackResourcePtr nxagentAllocUnpackResource() +UnpackResourcePtr nxagentAllocUnpackResource(void) { /* FIXME: This must be implemented. @@ -1173,7 +1173,7 @@ FIXME: Implementing the valid region policy #endif } -void nxagentHandleEmptySplitEvent() +void nxagentHandleEmptySplitEvent(void) { /* FIXME: Should run a consistency check here. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Visual.c b/nx-X11/programs/Xserver/hw/nxagent/Visual.c index eebd1fc..c123791 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Visual.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Visual.c @@ -145,7 +145,7 @@ Visual *nxagentVisualFromDepth(ScreenPtr pScreen, int depth) * of the remote display. */ -void nxagentInitAlphaVisual() +void nxagentInitAlphaVisual(void) { nxagentAlphaVisual.visualid = XAllocID(nxagentDisplay); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index 977b955..e2ce9d3 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -548,7 +548,7 @@ void nxagentSetVersionProperty(WindowPtr pWin) #endif } -Bool nxagentSomeWindowsAreMapped() +Bool nxagentSomeWindowsAreMapped(void) { WindowPtr pWin = screenInfo.screens[0]->root -> firstChild; @@ -2524,7 +2524,7 @@ void nxagentUnmapWindows(void) NXFlushDisplay(nxagentDisplay, NXFlushLink); } -void nxagentMapDefaultWindows() +void nxagentMapDefaultWindows(void) { int i; @@ -3930,7 +3930,7 @@ int nxagentRemoveItemBSPixmapList(unsigned long pixmapId) return 0; } -int nxagentEmptyBSPixmapList() +int nxagentEmptyBSPixmapList(void) { int i; diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Z.c b/nx-X11/programs/Xserver/hw/nxagent/compext/Z.c index 8f7de4e..594269d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/compext/Z.c +++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Z.c @@ -239,7 +239,7 @@ int ZDeflate(char *dest, unsigned int *destLen, const char *source, unsigned int return result; } -int ZInitEncoder() +int ZInitEncoder(void) { if (zInitialized == 0) { @@ -284,7 +284,7 @@ int ZInitEncoder() return zInitialized; } -int ZResetEncoder() +int ZResetEncoder(void) { int result; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit eaae96101dfb2b341c61060e7cf280bf3b9084e0 Merge: 92d8063 e5833a6 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 27 02:14:07 2018 +0100 Merge branch 'uli42-pr/update_record' into 3.6.x Attributes GH PR #649: https://github.com/ArcticaProject/nx-libs/pull/649 nx-X11/programs/Xserver/record/record.c | 174 ++++++------------ nx-X11/programs/Xserver/record/set.c | 305 +++----------------------------- 2 files changed, 76 insertions(+), 403 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 0371276fb4030261878dd6cfced9abd7bcd6137f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Feb 26 12:50:12 2018 +0100 hw/nxagent/: Stop using non-portable '__progname', set up our own 'nxagentProgName' instead and pass it around where needed. --- nx-X11/programs/Xserver/hw/nxagent/Args.c | 8 +++++--- nx-X11/programs/Xserver/hw/nxagent/Init.c | 4 ++-- nx-X11/programs/Xserver/os/utils.c | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index cf227ab..63433f4 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -124,7 +124,7 @@ extern int _XGetBitsPerPixel(Display *dpy, int depth); extern char dispatchExceptionAtReset; -extern const char *__progname; +const char *nxagentProgName; char nxagentDisplayName[NXAGENTDISPLAYNAMELENGTH]; Bool nxagentSynchronize = False; @@ -185,6 +185,8 @@ int ddxProcessArgument(int argc, char *argv[], int i) * Ensure that the options are set to their defaults. */ + nxagentProgName = argv[0]; + static Bool resetOptions = True; if (resetOptions == True) @@ -1185,13 +1187,13 @@ static void nxagentParseOptions(char *name, char *value) { #if !defined(PANORAMIX) && !defined(RANDR) nxagentChangeOption(Xinerama, 0); - fprintf(stderr, "Warning: No Xinerama support compiled into %s.\n", __progname); + fprintf(stderr, "Warning: No Xinerama support compiled into %s.\n", nxagentProgName); return; #else if (PANORAMIX_DISABLED_COND && RRXINERAMA_DISABLED_COND) { nxagentChangeOption(Xinerama, 0); - fprintf(stderr, "Warning: XINERAMA extension has been disabled on %s startup.\n", __progname); + fprintf(stderr, "Warning: XINERAMA extension has been disabled on %s startup.\n", nxagentProgName); return; } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c index 4bd61a1..598077b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c @@ -194,8 +194,8 @@ int nxagentX2go; void checkX2goAgent() { - extern const char *__progname; - if( strcasecmp(__progname,"x2goagent") == 0) + extern const char *nxagentProgName; + if( strcasecmp(nxagentProgName,"x2goagent") == 0) { fprintf(stderr, "\nrunning as X2Go Agent\n"); nxagentX2go=1; diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 0166632..a8155f3 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -557,8 +557,8 @@ AdjustWaitForDelay (void * waitTime, unsigned long newdelay) void UseMsg(void) { #ifdef NXAGENT_SERVER - extern const char *__progname; - ErrorF("Usage: %s [<options>] [:<display>]\n\n", __progname); + extern const char *nxagentProgName; + ErrorF("Usage: %s [<options>] [:<display>]\n\n", nxagentProgName); #else ErrorF("use: X [:<display>] [option]\n"); #endif -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 92d806399c69fda03275dcc23758498f9321434c Merge: 7517604 0371276 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 27 01:07:02 2018 +0100 Merge branch 'sunweaver-pr/version-cmdline-option' into 3.6.x Attributes GH PR #660: https://github.com/ArcticaProject/nx-libs/pull/660 Fixes: ArcticaProject/nx-libs#653 Fixes: ArcticaProject/nx-libs#639 nx-X11/programs/Xserver/hw/nxagent/Args.c | 32 ++++++++++++++------ nx-X11/programs/Xserver/hw/nxagent/Args.h | 2 ++ nx-X11/programs/Xserver/hw/nxagent/Atoms.c | 4 +-- nx-X11/programs/Xserver/hw/nxagent/Binder.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Client.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Composite.c | 4 +-- nx-X11/programs/Xserver/hw/nxagent/Cursor.c | 4 +-- nx-X11/programs/Xserver/hw/nxagent/Dialog.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Display.c | 38 ++++++++++++------------ nx-X11/programs/Xserver/hw/nxagent/Drawable.c | 4 +-- nx-X11/programs/Xserver/hw/nxagent/Error.c | 4 +-- nx-X11/programs/Xserver/hw/nxagent/Events.c | 18 +++++------ nx-X11/programs/Xserver/hw/nxagent/Extensions.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Font.c | 4 +-- nx-X11/programs/Xserver/hw/nxagent/GC.c | 6 ++-- nx-X11/programs/Xserver/hw/nxagent/Image.c | 4 +-- nx-X11/programs/Xserver/hw/nxagent/Init.c | 21 ++++++------- nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Options.c | 8 ++--- nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | 10 +++---- nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 4 +-- nx-X11/programs/Xserver/hw/nxagent/Render.c | 6 ++-- nx-X11/programs/Xserver/hw/nxagent/Rootless.c | 8 ++--- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 4 +-- nx-X11/programs/Xserver/hw/nxagent/Split.c | 10 +++---- nx-X11/programs/Xserver/hw/nxagent/Visual.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Window.c | 6 ++-- nx-X11/programs/Xserver/hw/nxagent/compext/Z.c | 4 +-- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 3 ++ nx-X11/programs/Xserver/os/utils.c | 5 ++++ 31 files changed, 124 insertions(+), 103 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit db836fd7842ec7b98cede0503073f55a70b0ff7e Author: Ulrich Sibiller <uli42@gmx.de> Date: Sun Nov 5 12:39:05 2017 +0100 Lift record to xorg-xserver-7.1/1.1.0 state --- nx-X11/programs/Xserver/record/record.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/nx-X11/programs/Xserver/record/record.c b/nx-X11/programs/Xserver/record/record.c index 48b1964..6334c97 100644 --- a/nx-X11/programs/Xserver/record/record.c +++ b/nx-X11/programs/Xserver/record/record.c @@ -41,6 +41,7 @@ and Jim Haggerty of Metheus. #define _XRECORD_SERVER_ #include <nx-X11/extensions/recordstr.h> #include "set.h" +#include "swaprep.h" #include <stdio.h> #include <assert.h> @@ -797,13 +798,13 @@ RecordADeliveredEventOrError(pcbl, nulldata, calldata) xEvent *pev = pei->events; for (ev = 0; ev < pei->count; ev++, pev++) { - int recordit; - if (pev->u.u.type == X_Error) + int recordit = 0; + if (pRCAP->pErrorSet) { recordit = RecordIsMemberOfSet(pRCAP->pErrorSet, ((xError *)(pev))->errorCode); } - else + else if (pRCAP->pDeliveredEventSet) { recordit = RecordIsMemberOfSet(pRCAP->pDeliveredEventSet, pev->u.u.type & 0177); @@ -2861,9 +2862,6 @@ SProcRecordDispatch(client) } } /* SProcRecordDispatch */ -/* XXX goes in header file */ -extern void SwapConnSetupInfo(), SwapConnSetupPrefix(); - /* RecordConnectionSetupInfo * * Arguments: @@ -2889,8 +2887,8 @@ RecordConnectionSetupInfo(pContext, pci) char * pConnSetup = (char *)malloc(prefixsize + restsize); if (!pConnSetup) return; - SwapConnSetupPrefix(pci->prefix, pConnSetup); - SwapConnSetupInfo(pci->setup, pConnSetup + prefixsize); + SwapConnSetupPrefix(pci->prefix, (xConnSetupPrefix*)pConnSetup); + SwapConnSetupInfo((char *)pci->setup, (char *)(pConnSetup + prefixsize)); RecordAProtocolElement(pContext, pci->client, XRecordClientStarted, (void *)pConnSetup, prefixsize + restsize, 0); free(pConnSetup); @@ -3015,7 +3013,7 @@ RecordCloseDown(extEntry) * Enables the RECORD extension if possible. */ void -RecordExtensionInit() +RecordExtensionInit(void) { ExtensionEntry *extentry; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 0b62599008ea195bdc492370e6cb4043c824c095 Author: Ulrich Sibiller <uli42@gmx.de> Date: Tue Feb 27 01:38:29 2018 +0100 Lift record to xorg-xserver-7.1/1.1.0 state - non-functional changes only --- nx-X11/programs/Xserver/record/record.c | 158 +++++++++----------------------- 1 file changed, 43 insertions(+), 115 deletions(-) diff --git a/nx-X11/programs/Xserver/record/record.c b/nx-X11/programs/Xserver/record/record.c index 6334c97..c18b96e 100644 --- a/nx-X11/programs/Xserver/record/record.c +++ b/nx-X11/programs/Xserver/record/record.c @@ -202,8 +202,7 @@ static int numEnabledContexts; * Side Effects: none. */ static int -RecordFindContextOnAllContexts(pContext) - RecordContextPtr pContext; +RecordFindContextOnAllContexts(RecordContextPtr pContext) { int i; @@ -466,10 +465,7 @@ RecordFindClientOnContext( * Note: this function exists mainly to make RecordARequest smaller. */ static void -RecordABigRequest(pContext, client, stuff) - RecordContextPtr pContext; - ClientPtr client; - xReq *stuff; +RecordABigRequest(RecordContextPtr pContext, ClientPtr client, xReq *stuff) { CARD32 bigLength; int bytesLeft; @@ -517,8 +513,7 @@ RecordABigRequest(pContext, client, stuff) * request for this client. The real Proc function is called. */ static int -RecordARequest(client) - ClientPtr client; +RecordARequest(ClientPtr client) { RecordContextPtr pContext; RecordClientsAndProtocolPtr pRCAP; @@ -601,10 +596,7 @@ RecordARequest(client) * the word skip in ddx.tbl.ms (the porting layer document). */ static void -RecordASkippedRequest(pcbl , nulldata, calldata) - CallbackListPtr *pcbl; - void * nulldata; - void * calldata; +RecordASkippedRequest(CallbackListPtr *pcbl, void * nulldata, void * calldata) { SkippedRequestInfoRec *psi = (SkippedRequestInfoRec *)calldata; RecordContextPtr pContext; @@ -691,10 +683,7 @@ RecordASkippedRequest(pcbl , nulldata, calldata) * chunk of data belonging to this reply, it is set to 0. */ static void -RecordAReply(pcbl, nulldata, calldata) - CallbackListPtr *pcbl; - void * nulldata; - void * calldata; +RecordAReply(CallbackListPtr *pcbl, void * nulldata, void * calldata) { RecordContextPtr pContext; RecordClientsAndProtocolPtr pRCAP; @@ -776,10 +765,7 @@ RecordAReply(pcbl, nulldata, calldata) * it for this client. */ static void -RecordADeliveredEventOrError(pcbl, nulldata, calldata) - CallbackListPtr *pcbl; - void * nulldata; - void * calldata; +RecordADeliveredEventOrError(CallbackListPtr *pcbl, void * nulldata, void * calldata) { EventInfoRec *pei = (EventInfoRec *)calldata; RecordContextPtr pContext; @@ -845,10 +831,7 @@ RecordADeliveredEventOrError(pcbl, nulldata, calldata) * it for this client. */ static void -RecordADeviceEvent(pcbl, nulldata, calldata) - CallbackListPtr *pcbl; - void * nulldata; - void * calldata; +RecordADeviceEvent(CallbackListPtr *pcbl, void * nulldata, void * calldata) { DeviceEventInfoRec *pei = (DeviceEventInfoRec *)calldata; RecordContextPtr pContext; @@ -969,9 +952,7 @@ RecordFlushAllContexts( * various callback lists. */ static int -RecordInstallHooks(pRCAP, oneclient) - RecordClientsAndProtocolPtr pRCAP; - XID oneclient; +RecordInstallHooks(RecordClientsAndProtocolPtr pRCAP, XID oneclient) { int i = 0; XID client; @@ -1064,9 +1045,7 @@ RecordInstallHooks(pRCAP, oneclient) * various callback lists. */ static void -RecordUninstallHooks(pRCAP, oneclient) - RecordClientsAndProtocolPtr pRCAP; - XID oneclient; +RecordUninstallHooks(RecordClientsAndProtocolPtr pRCAP, XID oneclient) { int i = 0; XID client; @@ -1165,9 +1144,7 @@ RecordUninstallHooks(pRCAP, oneclient) * have at least one client.) */ static void -RecordDeleteClientFromRCAP(pRCAP, position) - RecordClientsAndProtocolPtr pRCAP; - int position; +RecordDeleteClientFromRCAP(RecordClientsAndProtocolPtr pRCAP, int position) { if (pRCAP->pContext->pRecordingClient) RecordUninstallHooks(pRCAP, pRCAP->pClientIDs[position]); @@ -1214,9 +1191,7 @@ RecordDeleteClientFromRCAP(pRCAP, position) * is no more room to hold clients internal to the RCAP. */ static void -RecordAddClientToRCAP(pRCAP, clientspec) - RecordClientsAndProtocolPtr pRCAP; - XID clientspec; +RecordAddClientToRCAP(RecordClientsAndProtocolPtr pRCAP, XID clientspec) { if (pRCAP->numClients == pRCAP->sizeClients) { @@ -1262,9 +1237,7 @@ RecordAddClientToRCAP(pRCAP, clientspec) * RCAP. (A given clientspec can only be on one RCAP of a context.) */ static void -RecordDeleteClientFromContext(pContext, clientspec) - RecordContextPtr pContext; - XID clientspec; +RecordDeleteClientFromContext(RecordContextPtr pContext, XID clientspec) { RecordClientsAndProtocolPtr pRCAP; int position; @@ -1287,10 +1260,7 @@ RecordDeleteClientFromContext(pContext, clientspec) * Side Effects: none. */ static int -RecordSanityCheckClientSpecifiers(clientspecs, nspecs, errorspec) - XID *clientspecs; - int nspecs; - XID errorspec; +RecordSanityCheckClientSpecifiers(XID *clientspecs, int nspecs, XID errorspec) { int i; int clientIndex; @@ -1349,10 +1319,7 @@ RecordSanityCheckClientSpecifiers(clientspecs, nspecs, errorspec) * pClientspecs may be modified in place. */ static XID * -RecordCanonicalizeClientSpecifiers(pClientspecs, pNumClientspecs, excludespec) - XID *pClientspecs; - int *pNumClientspecs; - XID excludespec; +RecordCanonicalizeClientSpecifiers(XID *pClientspecs, int *pNumClientspecs, XID excludespec) { int i; int numClients = *pNumClientspecs; @@ -1449,10 +1416,7 @@ RecordPadAlign(int size, int align) * Side Effects: none. */ static int -RecordSanityCheckRegisterClients(pContext, client, stuff) - RecordContextPtr pContext; - ClientPtr client; - xRecordRegisterClientsReq *stuff; +RecordSanityCheckRegisterClients(RecordContextPtr pContext, ClientPtr client, xRecordRegisterClientsReq *stuff) { int err; xRecordRange *pRange; @@ -1587,9 +1551,7 @@ enum {REQ, /* set info for requests */ * RecordSetIntervals, all zeroed, and psi->size is set to size. */ static int -RecordAllocIntervals(psi, nIntervals) - SetInfoPtr psi; - int nIntervals; +RecordAllocIntervals(SetInfoPtr psi, int nIntervals) { assert(!psi->intervals); psi->intervals = (RecordSetInterval *) @@ -1711,10 +1673,7 @@ RecordConvertRangesToIntervals( * to record the new clients and protocol. */ static int -RecordRegisterClients(pContext, client, stuff) - RecordContextPtr pContext; - ClientPtr client; - xRecordRegisterClientsReq *stuff; +RecordRegisterClients(RecordContextPtr pContext, ClientPtr client, xRecordRegisterClientsReq *stuff) { int err; int i; @@ -1987,8 +1946,7 @@ bailout: */ static int -ProcRecordQueryVersion(client) - ClientPtr client; +ProcRecordQueryVersion(ClientPtr client) { /* REQUEST(xRecordQueryVersionReq); */ xRecordQueryVersionReply rep; @@ -2012,8 +1970,7 @@ ProcRecordQueryVersion(client) static int -ProcRecordCreateContext(client) - ClientPtr client; +ProcRecordCreateContext(ClientPtr client) { REQUEST(xRecordCreateContextReq); RecordContextPtr pContext; @@ -2068,8 +2025,7 @@ bailout: static int -ProcRecordRegisterClients(client) - ClientPtr client; +ProcRecordRegisterClients(ClientPtr client) { RecordContextPtr pContext; REQUEST(xRecordRegisterClientsReq); @@ -2082,8 +2038,7 @@ ProcRecordRegisterClients(client) static int -ProcRecordUnregisterClients(client) - ClientPtr client; +ProcRecordUnregisterClients(ClientPtr client) { RecordContextPtr pContext; int err; @@ -2147,9 +2102,7 @@ typedef struct { * number of ranges. Newly allocated ranges are zeroed. */ static int -RecordAllocRanges(pri, nRanges) - GetContextRangeInfoPtr pri; - int nRanges; +RecordAllocRanges(GetContextRangeInfoPtr pri, int nRanges) { int newsize; xRecordRange *pNewRange; @@ -2309,9 +2262,7 @@ RecordConvertMinorOpInfoToRanges( * The 16 bit fields of each xRecordRange are byte swapped. */ static void -RecordSwapRanges(pRanges, nRanges) - xRecordRange *pRanges; - int nRanges; +RecordSwapRanges(xRecordRange *pRanges, int nRanges) { int i; for (i = 0; i < nRanges; i++, pRanges++) @@ -2325,8 +2276,7 @@ RecordSwapRanges(pRanges, nRanges) static int -ProcRecordGetContext(client) - ClientPtr client; +ProcRecordGetContext(ClientPtr client) { RecordContextPtr pContext; REQUEST(xRecordGetContextReq); @@ -2471,8 +2421,7 @@ bailout: static int -ProcRecordEnableContext(client) - ClientPtr client; +ProcRecordEnableContext(ClientPtr client) { RecordContextPtr pContext; REQUEST(xRecordEnableContextReq); @@ -2550,8 +2499,7 @@ ProcRecordEnableContext(client) * is resumed. */ static void -RecordDisableContext(pContext) - RecordContextPtr pContext; +RecordDisableContext(RecordContextPtr pContext) { RecordClientsAndProtocolPtr pRCAP; int i; @@ -2588,8 +2536,7 @@ RecordDisableContext(pContext) static int -ProcRecordDisableContext(client) - ClientPtr client; +ProcRecordDisableContext(ClientPtr client) { RecordContextPtr pContext; REQUEST(xRecordDisableContextReq); @@ -2614,9 +2561,7 @@ ProcRecordDisableContext(client) * it from the ppAllContexts array. */ static int -RecordDeleteContext(value, id) - void * value; - XID id; +RecordDeleteContext(void * value, XID id) { int i; RecordContextPtr pContext = (RecordContextPtr)value; @@ -2656,8 +2601,7 @@ RecordDeleteContext(value, id) static int -ProcRecordFreeContext(client) - ClientPtr client; +ProcRecordFreeContext(ClientPtr client) { RecordContextPtr pContext; REQUEST(xRecordFreeContextReq); @@ -2670,8 +2614,7 @@ ProcRecordFreeContext(client) static int -ProcRecordDispatch(client) - ClientPtr client; +ProcRecordDispatch(ClientPtr client) { REQUEST(xReq); @@ -2700,8 +2643,7 @@ ProcRecordDispatch(client) static int -SProcRecordQueryVersion(client) - ClientPtr client; +SProcRecordQueryVersion(ClientPtr client) { REQUEST(xRecordQueryVersionReq); @@ -2738,8 +2680,7 @@ SwapCreateRegister(xRecordRegisterClientsReq *stuff) static int -SProcRecordCreateContext(client) - ClientPtr client; +SProcRecordCreateContext(ClientPtr client) { REQUEST(xRecordCreateContextReq); int status; @@ -2753,8 +2694,7 @@ SProcRecordCreateContext(client) static int -SProcRecordRegisterClients(client) - ClientPtr client; +SProcRecordRegisterClients(ClientPtr client) { REQUEST(xRecordRegisterClientsReq); int status; @@ -2768,8 +2708,7 @@ SProcRecordRegisterClients(client) static int -SProcRecordUnregisterClients(client) - ClientPtr client; +SProcRecordUnregisterClients(ClientPtr client) { REQUEST(xRecordUnregisterClientsReq); @@ -2783,8 +2722,7 @@ SProcRecordUnregisterClients(client) static int -SProcRecordGetContext(client) - ClientPtr client; +SProcRecordGetContext(ClientPtr client) { REQUEST(xRecordGetContextReq); @@ -2795,8 +2733,7 @@ SProcRecordGetContext(client) } /* SProcRecordGetContext */ static int -SProcRecordEnableContext(client) - ClientPtr client; +SProcRecordEnableContext(ClientPtr client) { REQUEST(xRecordEnableContextReq); @@ -2808,8 +2745,7 @@ SProcRecordEnableContext(client) static int -SProcRecordDisableContext(client) - ClientPtr client; +SProcRecordDisableContext(ClientPtr client) { REQUEST(xRecordDisableContextReq); @@ -2821,8 +2757,7 @@ SProcRecordDisableContext(client) static int -SProcRecordFreeContext(client) - ClientPtr client; +SProcRecordFreeContext(ClientPtr client) { REQUEST(xRecordFreeContextReq); @@ -2834,8 +2769,7 @@ SProcRecordFreeContext(client) static int -SProcRecordDispatch(client) - ClientPtr client; +SProcRecordDispatch(ClientPtr client) { REQUEST(xReq); @@ -2875,16 +2809,14 @@ SProcRecordDispatch(client) * The connection setup info is sent to the recording client. */ static void -RecordConnectionSetupInfo(pContext, pci) - RecordContextPtr pContext; - NewClientInfoRec *pci; +RecordConnectionSetupInfo(RecordContextPtr pContext, NewClientInfoRec *pci) { int prefixsize = SIZEOF(xConnSetupPrefix); int restsize = pci->prefix->length * 4; if (pci->client->swapped) { - char * pConnSetup = (char *)malloc(prefixsize + restsize); + char *pConnSetup = (char *)malloc(prefixsize + restsize); if (!pConnSetup) return; SwapConnSetupPrefix(pci->prefix, (xConnSetupPrefix*)pConnSetup); @@ -2930,10 +2862,7 @@ RecordConnectionSetupInfo(pContext, pci) */ static void -RecordAClientStateChange(pcbl, nulldata, calldata) - CallbackListPtr *pcbl; - void * nulldata; - void * calldata; +RecordAClientStateChange(CallbackListPtr *pcbl, void * nulldata, void * calldata) { NewClientInfoRec *pci = (NewClientInfoRec *)calldata; int i; @@ -2996,8 +2925,7 @@ RecordAClientStateChange(pcbl, nulldata, calldata) * */ static void -RecordCloseDown(extEntry) - ExtensionEntry *extEntry; +RecordCloseDown(ExtensionEntry *extEntry) { DeleteCallback(&ClientStateCallback, RecordAClientStateChange, NULL); } /* RecordCloseDown */ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 23dd2959ba5e87d078436b2389d084b76581d12f Author: Ulrich Sibiller <uli42@gmx.de> Date: Sun Nov 5 13:45:31 2017 +0100 Lift miext to xorg-xserver-7.1/1.1.10 state --- nx-X11/programs/Xserver/miext/damage/Imakefile | 2 +- nx-X11/programs/Xserver/miext/damage/damagestr.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nx-X11/programs/Xserver/miext/damage/Imakefile b/nx-X11/programs/Xserver/miext/damage/Imakefile index 34d3fcf..900f52a 100644 --- a/nx-X11/programs/Xserver/miext/damage/Imakefile +++ b/nx-X11/programs/Xserver/miext/damage/Imakefile @@ -10,7 +10,7 @@ SRCS = damage.c OBJS = damage.o - INCLUDES = -I. -I../shadow -I../../mi -I../../fb -I../../include -I$(XINCLUDESRC) \ + INCLUDES = -I. -I../../mi -I../../fb -I../../include -I$(XINCLUDESRC) \ -I$(XF86SRC)/common $(EXTRAINCLUDES) \ -I../../render -I../cw -I$(EXTINCSRC) \ `pkg-config --cflags-only-I pixman-1` diff --git a/nx-X11/programs/Xserver/miext/damage/damagestr.h b/nx-X11/programs/Xserver/miext/damage/damagestr.h index 62b3841..5b671cd 100644 --- a/nx-X11/programs/Xserver/miext/damage/damagestr.h +++ b/nx-X11/programs/Xserver/miext/damage/damagestr.h @@ -30,6 +30,7 @@ #define _DAMAGESTR_H_ #include "damage.h" +#include "gcstruct.h" #ifdef RENDER # include "picturestr.h" #endif -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 7368b45408690620b8a9c051670888b684e44637 Author: Ulrich Sibiller <uli42@gmx.de> Date: Tue Feb 27 02:47:11 2018 +0100 Lift mi to xorg-xserver-7.1/1.1.0 state - non-functional changes only --- nx-X11/programs/Xserver/mi/mipointer.c | 2 +- nx-X11/programs/Xserver/mi/misprite.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nx-X11/programs/Xserver/mi/mipointer.c b/nx-X11/programs/Xserver/mi/mipointer.c index dc5a498..5a874a4 100644 --- a/nx-X11/programs/Xserver/mi/mipointer.c +++ b/nx-X11/programs/Xserver/mi/mipointer.c @@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group. # include "dixstruct.h" # include <nx-X11/extensions/XI.h> -int miPointerScreenIndex; +int miPointerScreenIndex; static unsigned long miPointerGeneration = 0; #define GetScreenPrivate(s) ((miPointerScreenPtr) ((s)->devPrivates[miPointerScreenIndex].ptr)) diff --git a/nx-X11/programs/Xserver/mi/misprite.c b/nx-X11/programs/Xserver/mi/misprite.c index 67ac717..62acb5d 100644 --- a/nx-X11/programs/Xserver/mi/misprite.c +++ b/nx-X11/programs/Xserver/mi/misprite.c @@ -102,7 +102,7 @@ static void miSpriteComputeSaved(ScreenPtr pScreen); ((pScreen)->field = miSprite##field) /* - * void *-sprite method table + * pointer-sprite method table */ static Bool miSpriteRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060 Author: Ulrich Sibiller <uli42@gmx.de> Date: Sun Nov 5 21:25:49 2017 +0100 Lift mi to xorg-xserver-7.1/1.1.0 state I left out glx changes to miinitext.c for now. --- nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c | 5 ++--- nx-X11/programs/Xserver/mi/mi.h | 10 ---------- nx-X11/programs/Xserver/mi/micmap.c | 4 +++- nx-X11/programs/Xserver/mi/miinitext.c | 15 +++++++------- nx-X11/programs/Xserver/mi/miscrinit.c | 26 ------------------------- nx-X11/programs/Xserver/mi/misprite.c | 20 +++++++++---------- nx-X11/programs/Xserver/mi/mivaltree.c | 24 +++++++++++------------ nx-X11/programs/Xserver/mi/miwideline.c | 9 ++++++--- 8 files changed, 41 insertions(+), 72 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c b/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c index bcb88d4..04f746a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c @@ -504,7 +504,7 @@ int what; BITS32 gcmask, index, mask; RegionRec prgnWin; DDXPointRec oldCorner; - BoxRec box; + BoxRec box = {0}; WindowPtr pBgWin; GCPtr pGC; register int i; @@ -566,8 +566,7 @@ int what; } } - prect = (xRectangle *)malloc(RegionNumRects(prgn) * - sizeof(xRectangle)); + prect = (xRectangle *)calloc(RegionNumRects(prgn), sizeof(xRectangle)); if (!prect) return; diff --git a/nx-X11/programs/Xserver/mi/mi.h b/nx-X11/programs/Xserver/mi/mi.h index 409e21e..a1ad969 100644 --- a/nx-X11/programs/Xserver/mi/mi.h +++ b/nx-X11/programs/Xserver/mi/mi.h @@ -134,16 +134,6 @@ extern void miPutImage( char * /*pImage*/ ); -/* miclipn.c */ - -extern void miClipNotify( - void (* /*func*/)( - WindowPtr /* pWin */, - int /* dx */, - int /* dy */ - ) -); - /* micursor.c */ extern void miRecolorCursor( diff --git a/nx-X11/programs/Xserver/mi/micmap.c b/nx-X11/programs/Xserver/mi/micmap.c index c01d7d3..3fd0167 100644 --- a/nx-X11/programs/Xserver/mi/micmap.c +++ b/nx-X11/programs/Xserver/mi/micmap.c @@ -586,8 +586,10 @@ miDoInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, if (nvtype) { vid = (VisualID *) malloc (nvtype * sizeof (VisualID)); - if (!vid) + if (!vid) { + free(preferredCVCs); return FALSE; + } } depth->depth = d; depth->numVids = nvtype; diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c index f40ea8a..5f9d963 100644 --- a/nx-X11/programs/Xserver/mi/miinitext.c +++ b/nx-X11/programs/Xserver/mi/miinitext.c @@ -80,9 +80,6 @@ extern Bool noDamageExtension; #ifdef DBE extern Bool noDbeExtension; #endif -#ifdef DPSEXT -extern Bool noDPSExtension; -#endif #ifdef DPMSExtension extern Bool noDPMSExtension; #endif @@ -142,7 +139,6 @@ extern Bool noXIdleExtension; extern Bool noXvExtension; #endif -#define INITARGS void typedef void (*InitExtension)(void); #ifdef MITSHM @@ -228,6 +224,11 @@ extern void SecurityExtensionInit(void); extern void XFree86BigfontExtensionInit(void); #endif #ifdef GLXEXT +/* +typedef struct __GLXprovider __GLXprovider; +extern __GLXprovider __glXMesaProvider; +extern void GlxPushProvider(__GLXprovider *impl); +*/ #ifndef __DARWIN__ extern void GlxExtensionInit(void); extern void GlxWrapInitVisuals(miInitVisualsProcPtr *); @@ -290,9 +291,6 @@ static ExtensionToggle ExtensionToggleList[] = #ifdef DBE { "DOUBLE-BUFFER", &noDbeExtension }, #endif -#ifdef DPSEXT - { "DPSExtension", &noDPSExtension }, -#endif #ifdef DPMSExtension { "DPMS", &noDPMSExtension }, #endif @@ -447,6 +445,9 @@ InitExtensions(argc, argv) #endif #endif #ifdef GLXEXT + /* + GlxPushProvider(&__glXMesaProvider); + */ #ifndef __DARWIN__ if (!noGlxExtension) GlxExtensionInit(); #else diff --git a/nx-X11/programs/Xserver/mi/miscrinit.c b/nx-X11/programs/Xserver/mi/miscrinit.c index e38284c..cb46d1f 100644 --- a/nx-X11/programs/Xserver/mi/miscrinit.c +++ b/nx-X11/programs/Xserver/mi/miscrinit.c @@ -262,33 +262,7 @@ miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width, /* CreateGC */ /* CreateColormap, DestroyColormap, InstallColormap, UninstallColormap */ /* ListInstalledColormaps, StoreColors, ResolveColor */ -#ifdef NEED_SCREEN_REGIONS - pScreen->RegionCreate = RegionCreate; - pScreen->RegionInit = RegionInit; - pScreen->RegionCopy = RegionCopy; - pScreen->RegionDestroy = RegionDestroy; - pScreen->RegionUninit = RegionUninit; - pScreen->Intersect = RegionIntersect; - pScreen->Union = RegionUnion; - pScreen->Subtract = RegionSubtract; - pScreen->Inverse = RegionInverse; - pScreen->RegionReset = RegionReset; - pScreen->TranslateRegion = RegionTranslate; - pScreen->RectIn = RegionContainsRect; - pScreen->PointInRegion = RegionContainsPoint; - pScreen->RegionNotEmpty = RegionNotEmpty; - pScreen->RegionEqual = RegionEqual; - pScreen->RegionBroken = RegionBroken; - pScreen->RegionBreak = RegionBreak; - pScreen->RegionEmpty = RegionEmpty; - pScreen->RegionExtents = RegionExtents; - pScreen->RegionAppend = RegionAppend; - pScreen->RegionValidate = RegionValidate; -#endif /* NEED_SCREEN_REGIONS */ /* BitmapToRegion */ -#ifdef NEED_SCREEN_REGIONS - pScreen->RectsToRegion = RegionFromRects; -#endif /* NEED_SCREEN_REGIONS */ pScreen->SendGraphicsExpose = miSendGraphicsExpose; pScreen->BlockHandler = (ScreenBlockHandlerProcPtr)NoopDDA; pScreen->WakeupHandler = (ScreenWakeupHandlerProcPtr)NoopDDA; diff --git a/nx-X11/programs/Xserver/mi/misprite.c b/nx-X11/programs/Xserver/mi/misprite.c index 151de77..67ac717 100644 --- a/nx-X11/programs/Xserver/mi/misprite.c +++ b/nx-X11/programs/Xserver/mi/misprite.c @@ -98,8 +98,8 @@ static void miSpriteComputeSaved(ScreenPtr pScreen); ((pScreen)->field = \ ((miSpriteScreenPtr) (pScreen)->devPrivates[miSpriteScreenIndex].ptr)->field) -#define SCREEN_EPILOGUE(pScreen, field, wrapper)\ - ((pScreen)->field = wrapper) +#define SCREEN_EPILOGUE(pScreen, field)\ + ((pScreen)->field = miSprite##field) /* * void *-sprite method table @@ -298,7 +298,7 @@ miSpriteGetImage (pDrawable, sx, sy, w, h, format, planemask, pdstLine) (*pScreen->GetImage) (pDrawable, sx, sy, w, h, format, planemask, pdstLine); - SCREEN_EPILOGUE (pScreen, GetImage, miSpriteGetImage); + SCREEN_EPILOGUE (pScreen, GetImage); } static void @@ -344,7 +344,7 @@ miSpriteGetSpans (pDrawable, wMax, ppt, pwidth, nspans, pdstStart) (*pScreen->GetSpans) (pDrawable, wMax, ppt, pwidth, nspans, pdstStart); - SCREEN_EPILOGUE (pScreen, GetSpans, miSpriteGetSpans); + SCREEN_EPILOGUE (pScreen, GetSpans); } static void @@ -370,7 +370,7 @@ miSpriteSourceValidate (pDrawable, x, y, width, height) if (pScreen->SourceValidate) (*pScreen->SourceValidate) (pDrawable, x, y, width, height); - SCREEN_EPILOGUE (pScreen, SourceValidate, miSpriteSourceValidate); + SCREEN_EPILOGUE (pScreen, SourceValidate); } static void @@ -393,7 +393,7 @@ miSpriteCopyWindow (WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc) } (*pScreen->CopyWindow) (pWindow, ptOldOrg, prgnSrc); - SCREEN_EPILOGUE (pScreen, CopyWindow, miSpriteCopyWindow); + SCREEN_EPILOGUE (pScreen, CopyWindow); } static void @@ -412,7 +412,7 @@ miSpriteBlockHandler (i, blockData, pTimeout, pReadmask) (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask); - SCREEN_EPILOGUE(pScreen, BlockHandler, miSpriteBlockHandler); + SCREEN_EPILOGUE(pScreen, BlockHandler); if (!pPriv->isUp && pPriv->shouldBeUp) { @@ -434,7 +434,7 @@ miSpriteInstallColormap (pMap) (*pScreen->InstallColormap) (pMap); - SCREEN_EPILOGUE(pScreen, InstallColormap, miSpriteInstallColormap); + SCREEN_EPILOGUE(pScreen, InstallColormap); pPriv->pInstalledMap = pMap; if (pPriv->pColormap != pMap) @@ -463,7 +463,7 @@ miSpriteStoreColors (pMap, ndef, pdef) (*pScreen->StoreColors) (pMap, ndef, pdef); - SCREEN_EPILOGUE(pScreen, StoreColors, miSpriteStoreColors); + SCREEN_EPILOGUE(pScreen, StoreColors); if (pPriv->pColormap == pMap) { @@ -592,7 +592,7 @@ miSpriteSaveDoomedAreas (pWin, pObscured, dx, dy) (*pScreen->SaveDoomedAreas) (pWin, pObscured, dx, dy); - SCREEN_EPILOGUE (pScreen, SaveDoomedAreas, miSpriteSaveDoomedAreas); + SCREEN_EPILOGUE (pScreen, SaveDoomedAreas); } /* diff --git a/nx-X11/programs/Xserver/mi/mivaltree.c b/nx-X11/programs/Xserver/mi/mivaltree.c index 0435925..21534ce 100644 --- a/nx-X11/programs/Xserver/mi/mivaltree.c +++ b/nx-X11/programs/Xserver/mi/mivaltree.c @@ -237,6 +237,18 @@ miComputeClips ( dy = 32767; borderSize.y2 = dy; +#ifdef COMPOSITE + /* + * In redirected drawing case, reset universe to borderSize + */ + if (pParent->redirectDraw) + { + if (miSetRedirectBorderClipProc) + (*miSetRedirectBorderClipProc) (pParent, universe); + RegionCopy(universe, &pParent->borderSize); + } +#endif + oldVis = pParent->visibility; switch (RegionContainsRect(universe, &borderSize)) { @@ -276,18 +288,6 @@ miComputeClips ( ((pParent->eventMask | wOtherEventMasks(pParent)) & VisibilityChangeMask)) SendVisibilityNotify(pParent); -#ifdef COMPOSITE - /* - * In redirected drawing case, reset universe to borderSize - */ - if (pParent->redirectDraw) - { - if (miSetRedirectBorderClipProc) - (*miSetRedirectBorderClipProc) (pParent, universe); - RegionCopy(universe, &pParent->borderSize); - } -#endif - dx = pParent->drawable.x - pParent->valdata->before.oldAbsCorner.x; dy = pParent->drawable.y - pParent->valdata->before.oldAbsCorner.y; diff --git a/nx-X11/programs/Xserver/mi/miwideline.c b/nx-X11/programs/Xserver/mi/miwideline.c index 8fcf351..8d73eb9 100644 --- a/nx-X11/programs/Xserver/mi/miwideline.c +++ b/nx-X11/programs/Xserver/mi/miwideline.c @@ -119,7 +119,8 @@ miFillPolyHelper (pDrawable, pGC, pixel, spanData, y, overall_height, oldPixel = pGC->fgPixel; if (pixel != oldPixel) { - DoChangeGC (pGC, GCForeground, (XID *)&pixel, FALSE); + XID tmpPixel = (XID)pixel; + DoChangeGC (pGC, GCForeground, &tmpPixel, FALSE); ValidateGC (pDrawable, pGC); } } @@ -217,7 +218,8 @@ miFillRectPolyHelper ( oldPixel = pGC->fgPixel; if (pixel != oldPixel) { - DoChangeGC (pGC, GCForeground, (XID *)&pixel, FALSE); + XID tmpPixel = (XID)pixel; + DoChangeGC (pGC, GCForeground, &tmpPixel, FALSE); ValidateGC (pDrawable, pGC); } (*pGC->ops->PolyFillRect) (pDrawable, pGC, 1, &rect); @@ -1068,7 +1070,8 @@ miLineArc ( oldPixel = pGC->fgPixel; if (pixel != oldPixel) { - DoChangeGC(pGC, GCForeground, (XID *)&pixel, FALSE); + XID tmpPixel = (XID)pixel; + DoChangeGC(pGC, GCForeground, &tmpPixel, FALSE); ValidateGC (pDraw, pGC); } } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 3fffa5bd81650ffae994df1158d17c9e1d9410d2 Merge: eaae961 7368b45 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 27 02:56:01 2018 +0100 Merge branch 'uli42-pr/update_mi' into 3.6.x Attributes GH PR #650: https://github.com/ArcticaProject/nx-libs/pull/650 nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c | 5 ++--- nx-X11/programs/Xserver/mi/mi.h | 10 --------- nx-X11/programs/Xserver/mi/micmap.c | 4 +++- nx-X11/programs/Xserver/mi/miinitext.c | 15 +++++++------- nx-X11/programs/Xserver/mi/mipointer.c | 2 +- nx-X11/programs/Xserver/mi/miscrinit.c | 26 ------------------------ nx-X11/programs/Xserver/mi/misprite.c | 22 ++++++++++---------- nx-X11/programs/Xserver/mi/mivaltree.c | 24 +++++++++++----------- nx-X11/programs/Xserver/mi/miwideline.c | 9 +++++--- nx-X11/programs/Xserver/miext/damage/Imakefile | 2 +- nx-X11/programs/Xserver/miext/damage/damagestr.h | 1 + 11 files changed, 45 insertions(+), 75 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 1c7abb05bffb9f4da00222251e3bdf8add261c03 Author: Ulrich Sibiller <uli42@gmx.de> Date: Sun Nov 5 23:15:07 2017 +0100 Lift record to xorg-server-1.2.0/xorg-server-1.3.0.0 state --- nx-X11/programs/Xserver/record/set.c | 222 ----------------------------------- 1 file changed, 222 deletions(-) diff --git a/nx-X11/programs/Xserver/record/set.c b/nx-X11/programs/Xserver/record/set.c index afb1024..9a47d1b 100644 --- a/nx-X11/programs/Xserver/record/set.c +++ b/nx-X11/programs/Xserver/record/set.c @@ -44,9 +44,6 @@ from The Open Group. implemented, and RecordCreateSet will decide heuristically which one to use based on the set members. - Note: When compiling for use in the server, do not use -DTESTING. - When compiling for stand-alone testing of the set ADT, use -DTESTING. - */ #ifdef HAVE_DIX_CONFIG_H @@ -55,28 +52,7 @@ from The Open Group. #include <string.h> -#ifndef TESTING #include "misc.h" -#else -#include <stdio.h> -#include <stdlib.h> - -/* stuff that you normally get from the X Server's environment */ - -typedef int Bool; -#ifndef TRUE -#define TRUE 1 -#define FALSE 0 -#endif - -typedef unsigned short CARD16; - -#ifndef max -#define max(_a, _b) ( ((_a) > (_b)) ? (_a) : (_b) ) -#endif - -#endif /* TESTING */ - #include "set.h" static int @@ -417,20 +393,6 @@ bailout: return (RecordSetPtr)prls; } -#ifdef TESTING -typedef enum { - BitVectorImplementation, IntervalListImplementation} RecordSetImplementation; - -RecordSetImplementation _RecordSetImpl; - -static void -_RecordForceSetImplementation(setimpl) - RecordSetImplementation setimpl; -{ - _RecordSetImpl = setimpl; -} -#endif - typedef RecordSetPtr (*RecordCreateSetProcPtr)( RecordSetInterval *pIntervals, int nIntervals, @@ -455,12 +417,8 @@ _RecordSetMemoryRequirements(pIntervals, nIntervals, alignment, ppCreateSet) &bma); rlsize = IntervalListMemoryRequirements(pIntervals, nIntervals, maxMember, &rla); -#ifdef TESTING - if (_RecordSetImpl == BitVectorImplementation) -#else if ( ( (nIntervals > 1) && (maxMember <= 255) ) || (bmsize < rlsize) ) -#endif { *alignment = bma; *ppCreateSet = BitVectorCreateSet; @@ -509,183 +467,3 @@ RecordCreateSet(pIntervals, nIntervals, pMem, memsize) } return (*pCreateSet)(pIntervals, nIntervals, pMem, size); } - -/***************************************************************************/ - -#ifdef TESTING - -/* - -Test Strategy - -Having two set representations is convenient for testing because we -can play them against each other. The test code will be able to -specify which implementation to use. This breaks the encapsulation, -but that seems acceptable for testing. The crux of the test loop -looks like this: - -loop: - generate random list of Intervals - - create set A using bit vector implementation - create set B using Interval list implementation - - for each possible set member - if set A and set B disagree on whether this is a member error; - - iterate over both sets, comparing the intervals returned by each. - if intervals or number of intervals are different error; - - iterate over intervals of set A - for i = interval.first to interval.last - if i is not a member of set B error; - - iterate over intervals of set B - for i = interval.first to interval.last - if i is not a member of set A error; - - destroy sets A, B - -*/ - -int GenerateRandomIntervals(pIntervals, maxintervals) - RecordSetInterval *pIntervals; - int maxintervals; -{ - int i, nIntervals; - - nIntervals = rand() % maxintervals; - - for (i = 0; i < nIntervals; i++) - { - pIntervals[i].first = rand(); - pIntervals[i].last = pIntervals[i].first + rand(); - } - return nIntervals; -} - -#define MAXINTERVALS 100 - -int main(argc, argv) - int argc; - char **argv; -{ - RecordSetPtr bs, rs; - RecordSetInterval br, rr; - RecordSetIteratePtr bi, ri; - CARD16 i; - int testcount; - RecordSetInterval intervals[MAXINTERVALS]; - int nIntervals; - int bsize, rsize; - int balign, ralign; - int pad; - - for (testcount = 0; 1; testcount++) - { - nIntervals = GenerateRandomIntervals(intervals, MAXINTERVALS); - printf("%d nIntervals %d\n", testcount, nIntervals); - - if (testcount & 1) - { - _RecordForceSetImplementation(BitVectorImplementation); - bsize = RecordSetMemoryRequirements(intervals, nIntervals, &balign); - _RecordForceSetImplementation(IntervalListImplementation); - rsize = RecordSetMemoryRequirements(intervals, nIntervals, &ralign); - pad = (ralign - (bsize & (ralign - 1))) & (ralign - 1); - bs = (RecordSetPtr)malloc(bsize + pad + rsize ); - if (!bs) - { - fprintf(stderr, "%d: failed to alloc memory for sets\n", - testcount); - continue; - } - rs = (RecordSetPtr)(((char *)bs) + bsize + pad); - } - else - { - bs = rs = NULL; - bsize = rsize = 0; - } - - _RecordForceSetImplementation(BitVectorImplementation); - bs = RecordCreateSet(intervals, nIntervals, bs, bsize); - _RecordForceSetImplementation(IntervalListImplementation); - rs = RecordCreateSet(intervals, nIntervals, rs, rsize); - - if (!bs || !rs) - { - fprintf(stderr, "%d: failed to create sets\n", testcount); - continue; - } - - for (i = 0; i < 65535; i++) - { - unsigned long b, r; - - b = RecordIsMemberOfSet(bs, i); - r = RecordIsMemberOfSet(rs, i); - if ( (b && !r) || (!b && r) ) - { - fprintf(stderr, "%d: isMemberOfSet %d\n", - testcount, (int)i); - } - } - - bi = RecordIterateSet(bs, NULL, &br); - ri = RecordIterateSet(rs, NULL, &rr); - - while (bi && ri) - { - if ( (rr.first != br.first) || (rr.last != br.last) ) - { - fprintf(stderr, "%d: iterateSet interval value mismatch\n", - testcount); - } - bi = RecordIterateSet(bs, bi, &br); - ri = RecordIterateSet(rs, ri, &rr); - } - if (bi != ri) - { - fprintf(stderr, "%d: iterateSet interval count mismatch\n", - testcount); - } - - - bi = NULL; - while (bi = RecordIterateSet(bs, bi, &br)) - { - for (i = br.first; i <= br.last; i++) - { - if (!RecordIsMemberOfSet(rs, i)) - { - fprintf(stderr, "%d: iterateSet b / isMemberOfSet r %d\n", - testcount, (int)i); - } - } - } - - ri = NULL; - while (ri = RecordIterateSet(rs, ri, &rr)) - { - for (i = rr.first; i <= rr.last; i++) - { - if (!RecordIsMemberOfSet(bs, i) ) - { - fprintf(stderr, "%d: iterateSet r / isMemberOfSet b %d\n", - testcount, (int)i); - } - } - } - - RecordDestroySet(bs); - RecordDestroySet(rs); - - if (testcount & 1) - { - free(bs); - } - } -} - -#endif /* TESTING */ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 39a56dea4b8ba2f6ebb80555a15667ddc5137674 Author: Ulrich Sibiller <uli42@gmx.de> Date: Tue Feb 27 01:47:50 2018 +0100 Lift record to xorg-server-1.2.0/xorg-server-1.3.0.0 state - non-functional changes only --- nx-X11/programs/Xserver/record/set.c | 75 +++++++++++------------------------- 1 file changed, 22 insertions(+), 53 deletions(-) diff --git a/nx-X11/programs/Xserver/record/set.c b/nx-X11/programs/Xserver/record/set.c index 9a47d1b..116e901 100644 --- a/nx-X11/programs/Xserver/record/set.c +++ b/nx-X11/programs/Xserver/record/set.c @@ -1,4 +1,3 @@ - /* Copyright 1995, 1998 The Open Group @@ -56,9 +55,7 @@ from The Open Group. #include "set.h" static int -maxMemberInInterval(pIntervals, nIntervals) - RecordSetInterval *pIntervals; - int nIntervals; +maxMemberInInterval(RecordSetInterval *pIntervals, int nIntervals) { int i; int maxMember = -1; @@ -71,8 +68,7 @@ maxMemberInInterval(pIntervals, nIntervals) } static void -NoopDestroySet(pSet) - RecordSetPtr pSet; +NoopDestroySet(RecordSetPtr pSet) { } @@ -89,16 +85,13 @@ typedef struct { #define BITS_PER_LONG (sizeof(unsigned long) * 8) static void -BitVectorDestroySet(pSet) - RecordSetPtr pSet; +BitVectorDestroySet(RecordSetPtr pSet) { free(pSet); } static unsigned long -BitVectorIsMemberOfSet(pSet, pm) - RecordSetPtr pSet; - int pm; +BitVectorIsMemberOfSet(RecordSetPtr pSet, int pm) { BitVectorSetPtr pbvs = (BitVectorSetPtr)pSet; unsigned long *pbitvec; @@ -110,10 +103,7 @@ BitVectorIsMemberOfSet(pSet, pm) static int -BitVectorFindBit(pSet, iterbit, bitval) - RecordSetPtr pSet; - int iterbit; - Bool bitval; +BitVectorFindBit(RecordSetPtr pSet, int iterbit, Bool bitval) { BitVectorSetPtr pbvs = (BitVectorSetPtr)pSet; unsigned long *pbitvec = (unsigned long *)(&pbvs[1]); @@ -159,10 +149,8 @@ BitVectorFindBit(pSet, iterbit, bitval) static RecordSetIteratePtr -BitVectorIterateSet(pSet, pIter, pInterval) - RecordSetPtr pSet; - RecordSetIteratePtr pIter; - RecordSetInterval *pInterval; +BitVectorIterateSet(RecordSetPtr pSet, RecordSetIteratePtr pIter, + RecordSetInterval *pInterval) { int iterbit = (int)(long)pIter; int b; @@ -183,11 +171,8 @@ RecordSetOperations BitVectorNoFreeOperations = { NoopDestroySet, BitVectorIsMemberOfSet, BitVectorIterateSet }; static int -BitVectorSetMemoryRequirements(pIntervals, nIntervals, maxMember, alignment) - RecordSetInterval *pIntervals; - int nIntervals; - int maxMember; - int *alignment; +BitVectorSetMemoryRequirements(RecordSetInterval *pIntervals, int nIntervals, + int maxMember, int *alignment) { int nlongs; @@ -197,11 +182,8 @@ BitVectorSetMemoryRequirements(pIntervals, nIntervals, maxMember, alignment) } static RecordSetPtr -BitVectorCreateSet(pIntervals, nIntervals, pMem, memsize) - RecordSetInterval *pIntervals; - int nIntervals; - void *pMem; - int memsize; +BitVectorCreateSet(RecordSetInterval *pIntervals, int nIntervals, + void *pMem, int memsize) { BitVectorSetPtr pbvs; int i, j; @@ -249,16 +231,13 @@ typedef struct { } IntervalListSet, *IntervalListSetPtr; static void -IntervalListDestroySet(pSet) - RecordSetPtr pSet; +IntervalListDestroySet(RecordSetPtr pSet) { free(pSet); } static unsigned long -IntervalListIsMemberOfSet(pSet, pm) - RecordSetPtr pSet; - int pm; +IntervalListIsMemberOfSet(RecordSetPtr pSet, int pm) { IntervalListSetPtr prls = (IntervalListSetPtr)pSet; RecordSetInterval *pInterval = (RecordSetInterval *)(&prls[1]); @@ -278,10 +257,8 @@ IntervalListIsMemberOfSet(pSet, pm) static RecordSetIteratePtr -IntervalListIterateSet(pSet, pIter, pIntervalReturn) - RecordSetPtr pSet; - RecordSetIteratePtr pIter; - RecordSetInterval *pIntervalReturn; +IntervalListIterateSet(RecordSetPtr pSet, RecordSetIteratePtr pIter, + RecordSetInterval *pIntervalReturn) { RecordSetInterval *pInterval = (RecordSetInterval *)pIter; IntervalListSetPtr prls = (IntervalListSetPtr)pSet; @@ -307,22 +284,16 @@ RecordSetOperations IntervalListNoFreeOperations = { NoopDestroySet, IntervalListIsMemberOfSet, IntervalListIterateSet }; static int -IntervalListMemoryRequirements(pIntervals, nIntervals, maxMember, alignment) - RecordSetInterval *pIntervals; - int nIntervals; - int maxMember; - int *alignment; +IntervalListMemoryRequirements(RecordSetInterval *pIntervals, int nIntervals, + int maxMember, int *alignment) { *alignment = sizeof(unsigned long); return sizeof(IntervalListSet) + nIntervals * sizeof(RecordSetInterval); } static RecordSetPtr -IntervalListCreateSet(pIntervals, nIntervals, pMem, memsize) - RecordSetInterval *pIntervals; - int nIntervals; - void *pMem; - int memsize; +IntervalListCreateSet(RecordSetInterval *pIntervals, int nIntervals, + void *pMem, int memsize) { IntervalListSetPtr prls; int i, j, k; @@ -401,11 +372,9 @@ typedef RecordSetPtr (*RecordCreateSetProcPtr)( ); static int -_RecordSetMemoryRequirements(pIntervals, nIntervals, alignment, ppCreateSet) - RecordSetInterval *pIntervals; - int nIntervals; - int *alignment; - RecordCreateSetProcPtr *ppCreateSet; +_RecordSetMemoryRequirements(RecordSetInterval *pIntervals, int nIntervals, + int *alignment, + RecordCreateSetProcPtr *ppCreateSet) { int bmsize, rlsize, bma, rla; int maxMember; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit e5833a6a1fcb6a2201c519a65958c6165f7dd018 Author: Ulrich Sibiller <uli42@gmx.de> Date: Sun Nov 5 23:24:55 2017 +0100 Lift record to xorg-server-1.4.2 state --- nx-X11/programs/Xserver/record/set.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nx-X11/programs/Xserver/record/set.c b/nx-X11/programs/Xserver/record/set.c index 116e901..c3085c5 100644 --- a/nx-X11/programs/Xserver/record/set.c +++ b/nx-X11/programs/Xserver/record/set.c @@ -164,10 +164,10 @@ BitVectorIterateSet(RecordSetPtr pSet, RecordSetIteratePtr pIter, return (RecordSetIteratePtr)(long)(pInterval->last + 1); } -RecordSetOperations BitVectorSetOperations = { +static RecordSetOperations BitVectorSetOperations = { BitVectorDestroySet, BitVectorIsMemberOfSet, BitVectorIterateSet }; -RecordSetOperations BitVectorNoFreeOperations = { +static RecordSetOperations BitVectorNoFreeOperations = { NoopDestroySet, BitVectorIsMemberOfSet, BitVectorIterateSet }; static int @@ -277,10 +277,10 @@ IntervalListIterateSet(RecordSetPtr pSet, RecordSetIteratePtr pIter, return (RecordSetIteratePtr)NULL; } -RecordSetOperations IntervalListSetOperations = { +static RecordSetOperations IntervalListSetOperations = { IntervalListDestroySet, IntervalListIsMemberOfSet, IntervalListIterateSet }; -RecordSetOperations IntervalListNoFreeOperations = { +static RecordSetOperations IntervalListNoFreeOperations = { NoopDestroySet, IntervalListIsMemberOfSet, IntervalListIterateSet }; static int -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 41ff6b0344482f3146aeaaea184911b5e40df9a6 Author: Ulrich Sibiller <uli42@gmx.de> Date: Tue Feb 27 03:13:55 2018 +0100 Lift os to XORG-7_1 state - non-functional changes only --- nx-X11/programs/Xserver/os/WaitFor.c | 1 + 1 file changed, 1 insertion(+) diff --git a/nx-X11/programs/Xserver/os/WaitFor.c b/nx-X11/programs/Xserver/os/WaitFor.c index cb97039..9133adf 100644 --- a/nx-X11/programs/Xserver/os/WaitFor.c +++ b/nx-X11/programs/Xserver/os/WaitFor.c @@ -826,6 +826,7 @@ SetScreenSaverTimer(void) MIN(ScreenSaverTime, timeout) : ScreenSaverTime; } + #ifdef SCREENSAVER if (timeout && !screenSaverSuspended) { #else -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 7a4aa75de1930b88b923b878e222eb8588e33cdf Merge: 78724c4 41ff6b0 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 27 03:20:46 2018 +0100 Merge branch 'uli42-pr/update_os' into 3.6.x Attributes GH PR #651: https://github.com/ArcticaProject/nx-libs/pull/651 nx-X11/programs/Xserver/os/WaitFor.c | 1 + nx-X11/programs/Xserver/os/osdep.h | 2 ++ nx-X11/programs/Xserver/os/utils.c | 3 --- nx-X11/programs/Xserver/os/xdmauth.c | 10 ++++------ 4 files changed, 7 insertions(+), 9 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 78724c4868312044698005325025221e11d7159a Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 27 03:02:00 2018 +0100 Remove unused X11R4 DDX compatibility function miClipNotify. Backported from X.org: commit 39ce5f1544029412f4060f3e89ce1d87222ef42b Author: Adam Jackson <ajax@nwnk.net> Date: Fri Jan 6 17:05:26 2006 +0000 Remove unused X11R4 DDX compatibility function miClipNotify. Backported-to-NX-by: Mihai Moldovan <ionic@ionic.de> --- nx-X11/programs/Xserver/mi/Imakefile | 2 - nx-X11/programs/Xserver/mi/miclipn.c | 82 ------------------------------------ 2 files changed, 84 deletions(-) diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile index 15e897e..9124ace 100644 --- a/nx-X11/programs/Xserver/mi/Imakefile +++ b/nx-X11/programs/Xserver/mi/Imakefile @@ -80,7 +80,6 @@ SRCS = $(CBRT_SRC) \ misprite.c \ midispcur.c \ miscrinit.c \ - miclipn.c \ migc.c \ micmap.c \ mioverlay.c \ @@ -119,7 +118,6 @@ OBJS = $(CBRT_OBJ) \ misprite.o \ midispcur.o \ miscrinit.o \ - miclipn.o \ migc.o \ micmap.o \ mioverlay.o \ diff --git a/nx-X11/programs/Xserver/mi/miclipn.c b/nx-X11/programs/Xserver/mi/miclipn.c deleted file mode 100644 index 8bc7c3f..0000000 --- a/nx-X11/programs/Xserver/mi/miclipn.c +++ /dev/null @@ -1,82 +0,0 @@ -/* - -Copyright 1990, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall -not be used in advertising or otherwise to promote the sale, use or -other dealings in this Software without prior written authorization -from The Open Group. - -*/ - -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - -#include <nx-X11/X.h> -#include "windowstr.h" -#include "scrnintstr.h" -#include "mi.h" - -static void (*clipNotify)(WindowPtr,int,int) = 0; -static void (*ClipNotifies[MAXSCREENS])(WindowPtr,int,int); - -static void -miClipNotifyWrapper( - WindowPtr pWin, - int dx, - int dy ) -{ - if (clipNotify) - (*clipNotify)(pWin, dx, dy); - if (ClipNotifies[pWin->drawable.pScreen->myNum]) - (*ClipNotifies[pWin->drawable.pScreen->myNum])(pWin, dx, dy); -} - -/* - * miClipNotify -- - * Hook to let DDX request notification when the clipList of - * a window is recomputed on any screen. For R4 compatibility; - * better if you wrap the ClipNotify screen proc yourself. - */ - -static unsigned long clipGeneration = 0; - -void -miClipNotify ( - void (*func)( - WindowPtr /* pWin */, - int /* dx */, - int /* dy */ - ) ) -{ - int i; - - clipNotify = func; - if (clipGeneration != serverGeneration) - { - clipGeneration = serverGeneration; - for (i = 0; i < screenInfo.numScreens; i++) - { - ClipNotifies[i] = screenInfo.screens[i]->ClipNotify; - screenInfo.screens[i]->ClipNotify = miClipNotifyWrapper; - } - } -} -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 2d59daca2fbc7ac26aa2b47c45dfed51278f0e71 Author: Ulrich Sibiller <uli42@gmx.de> Date: Sun Nov 5 13:26:04 2017 +0100 Lift os to XORG-7_1 state --- nx-X11/programs/Xserver/os/osdep.h | 2 ++ nx-X11/programs/Xserver/os/utils.c | 3 --- nx-X11/programs/Xserver/os/xdmauth.c | 10 ++++------ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/nx-X11/programs/Xserver/os/osdep.h b/nx-X11/programs/Xserver/os/osdep.h index d3e9d0b..01ae7c3 100644 --- a/nx-X11/programs/Xserver/os/osdep.h +++ b/nx-X11/programs/Xserver/os/osdep.h @@ -111,9 +111,11 @@ SOFTWARE. /* MAXSELECT is the number of fds that select() can handle */ #define MAXSELECT (sizeof(fd_set) * NBBY) +#ifndef HAS_GETDTABLESIZE #if !defined(SVR4) && !defined(SYSV) #define HAS_GETDTABLESIZE #endif +#endif #include <stddef.h> diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index a8155f3..2edd8dd 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -168,9 +168,6 @@ Bool noDamageExtension = FALSE; #ifdef DBE Bool noDbeExtension = FALSE; #endif -#ifdef DPSEXT -Bool noDPSExtension = FALSE; -#endif #ifdef DPMSExtension Bool noDPMSExtension = FALSE; #endif diff --git a/nx-X11/programs/Xserver/os/xdmauth.c b/nx-X11/programs/Xserver/os/xdmauth.c index 4a59b48..eb89f4b 100644 --- a/nx-X11/programs/Xserver/os/xdmauth.c +++ b/nx-X11/programs/Xserver/os/xdmauth.c @@ -439,10 +439,12 @@ XdmToID (unsigned short cookie_length, char *cookie) { free (client); free (cookie); + free (plain); return auth->id; } } free (cookie); + free (plain); return (XID) -1; } @@ -464,10 +466,9 @@ XdmFromID (XID id, unsigned short *data_lenp, char **datap) int XdmRemoveCookie (unsigned short data_length, char *data) { - XdmAuthorizationPtr auth, prev; + XdmAuthorizationPtr auth; XdmAuthKeyPtr key_bits, rho_bits; - prev = 0; switch (data_length) { case 16: @@ -487,10 +488,7 @@ XdmRemoveCookie (unsigned short data_length, char *data) if (XdmcpCompareKeys (rho_bits, &auth->rho) && XdmcpCompareKeys (key_bits, &auth->key)) { - if (prev) - prev->next = auth->next; - else - xdmAuth = auth->next; + xdmAuth = auth->next; free (auth); return 1; } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit f963593c79db2cf2e6256129284040e1483aefa2 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 27 05:11:06 2018 +0100 nx-X11/programs/Xserver/{include/globals.h,mi/miinitext.c}: remove DPSEXT left-overs. --- nx-X11/programs/Xserver/include/globals.h | 4 ---- nx-X11/programs/Xserver/mi/miinitext.c | 3 --- 2 files changed, 7 deletions(-) diff --git a/nx-X11/programs/Xserver/include/globals.h b/nx-X11/programs/Xserver/include/globals.h index c43035c..d5b9c44 100644 --- a/nx-X11/programs/Xserver/include/globals.h +++ b/nx-X11/programs/Xserver/include/globals.h @@ -66,10 +66,6 @@ extern Bool noDamageExtension; extern Bool noDbeExtension; #endif -#ifdef DPSEXT -extern Bool noDPSExtension; -#endif - #ifdef DPMSExtension extern Bool noDPMSExtension; #endif diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c index 5f9d963..b39f8f4 100644 --- a/nx-X11/programs/Xserver/mi/miinitext.c +++ b/nx-X11/programs/Xserver/mi/miinitext.c @@ -243,9 +243,6 @@ extern void XFree86DRIExtensionInit(void); #ifdef DPMSExtension extern void DPMSExtensionInit(void); #endif -#ifdef DPSEXT -extern void DPSExtensionInit(void); -#endif #ifdef RENDER extern void RenderExtensionInit(void); #endif -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit ea17fd0597f90298e0ac994169cad24f75da11f2 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Feb 27 07:34:54 2018 +0100 nxcomp/src/Loop.cpp: Make know the agent option 'keyconv' to nxcomp and tolerate it as a valid option. Fixes ArcticaProject/nx-libs#630. --- nxcomp/src/Loop.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp index 4862748..186bb71 100644 --- a/nxcomp/src/Loop.cpp +++ b/nxcomp/src/Loop.cpp @@ -8450,7 +8450,8 @@ int ParseEnvironmentOptions(const char *env, int force) strcasecmp(name, "streaming") == 0 || strcasecmp(name, "backingstore") == 0 || strcasecmp(name, "sleep") == 0 || - strcasecmp(name, "tolerancechecks") == 0) + strcasecmp(name, "keyconv") == 0 || + strcasecmp(name, "tolerancechecks") == 0) { nxdbg << "Loop: Ignoring agent option '" << name << "' with value '" << value << "'.\n" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 842bb0f45b7be00036d86267d2d353a413409d5e Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 27 07:39:57 2018 +0100 nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1: remove empty line on top of file. Fixes: ArcticaProject/nx-libs#664 --- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 1 - 1 file changed, 1 deletion(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index f4a9fa4..294a1dc 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -1,4 +1,3 @@ - .\" Copyright 1984 - 1991, 1993, 1994, 1998 The Open Group .\" Copyright 2011 - 2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> .\" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 0ef6b0d59e1510690b8d1202675b109af5fb0402 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 27 07:48:18 2018 +0100 {nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1,nxproxy/man/nxproxy.1}: magicpixel takes a boolean argument for now. --- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 2 +- nxproxy/man/nxproxy.1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index 294a1dc..d6ed4d0 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -600,7 +600,7 @@ overrides the command line default. support pulldown menu in \fBnxagent\fR session (only available on proxy <-> agent remote sessions) .TP 8 -.B magicpixel=<int> +.B magicpixel=<bool> enable/disable magic pixel support in fullscreen mode (default: 1, enabled) .TP 8 .B sleep=<int> diff --git a/nxproxy/man/nxproxy.1 b/nxproxy/man/nxproxy.1 index 260465a..1bf070c 100644 --- a/nxproxy/man/nxproxy.1 +++ b/nxproxy/man/nxproxy.1 @@ -327,7 +327,7 @@ encryption of the point to point communication. defer=<int> tile=<string> menu=<int> - magicpixel=<int> + magicpixel=<bool> sleep=<int> .SH NX ENVIRONMENT VARIABLES -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit a88ca271751c1bcf90b352b8c5a79631263c56aa Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Feb 27 07:47:49 2018 +0100 nxcomp/src/Loop.cpp: Harmonize log output. Uniformly, embrace port values by single quotes. Fixes ArcticaProject/nx-libs#617. --- nxcomp/src/Loop.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp index 186bb71..251eb04 100644 --- a/nxcomp/src/Loop.cpp +++ b/nxcomp/src/Loop.cpp @@ -11010,8 +11010,8 @@ int SetPorts() - nxinfo << "Loop: cups port: " << cupsPort << "\n" - << std::flush; + nxinfo << "Loop: cups port: '" << cupsPort + << "'.\n" << std::flush; if (control -> ProxyMode == proxy_client) { auxPort.setDefaultTCPPort(DEFAULT_NX_AUX_PORT_OFFSET + proxyPort); @@ -11031,8 +11031,8 @@ int SetPorts() } } - nxinfo << "Loop: aux port: " << auxPort << "\n" - << std::flush; + nxinfo << "Loop: aux port: '" << auxPort + << "'.\n" << std::flush; if (control -> ProxyMode == proxy_client) { smbPort.setDefaultTCPPort(DEFAULT_NX_SMB_PORT_OFFSET + proxyPort); @@ -11042,8 +11042,8 @@ int SetPorts() } - nxinfo << "Loop: smb port: " << smbPort << "\n" - << std::flush; + nxinfo << "Loop: smb port: '" << smbPort + << "'.\n" << std::flush; if ( mediaPort.configured() ) { if (control -> ProxyMode == proxy_client) { -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 9dd2830e0c01e163a3ba92cb07476c02fd132b99 Author: Simon Matter <simon.matter@invoca.ch> Date: Mon Oct 9 11:36:23 2017 +0200 nxagent: Auto-detect client-side DPI at session startup. --- nx-X11/programs/Xserver/hw/nxagent/Args.c | 8 +++++ nx-X11/programs/Xserver/hw/nxagent/Extensions.c | 17 ++++++++-- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 42 ++++++++++++++++++++++-- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 3 ++ 4 files changed, 64 insertions(+), 6 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index 63433f4..a51ad0c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -130,6 +130,8 @@ char nxagentDisplayName[NXAGENTDISPLAYNAMELENGTH]; Bool nxagentSynchronize = False; Bool nxagentRealWindowProp = False; +Bool nxagentAutoDPI = False; + char nxagentShadowDisplayName[NXAGENTSHADOWDISPLAYNAMELENGTH] = {0}; char nxagentWindowName[NXAGENTWINDOWNAMELENGTH]; @@ -743,6 +745,11 @@ int ddxProcessArgument(int argc, char *argv[], int i) return 1; } + if (!strcmp(argv[i], "-autodpi")) { + nxagentAutoDPI = True; + return 1; + } + /* * The original -noreset option, disabling * dispatchExceptionAtReset, is the default. @@ -2091,6 +2098,7 @@ void ddxUseMsg(void) ErrorF("-class string default visual class\n"); ErrorF("-depth int default depth\n"); ErrorF("-geometry WxH+X+Y window size and position\n"); + ErrorF("-autodpi detect real server's DPI and use that in the session\n"); ErrorF("-bw int window border width\n"); ErrorF("-name string window name\n"); ErrorF("-scrns int number of screens to generate\n"); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c index 211af8c..05a4b4f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c @@ -338,15 +338,26 @@ static int nxagentRandRInitSizes(ScreenPtr pScreen) width = w[i]; height = h[i]; - mmWidth = (width * 254 + monitorResolution * 5) / (monitorResolution * 10); + if (monitorResolution < 0) + { + mmWidth = width * DisplayWidthMM(nxagentDisplay, DefaultScreen(nxagentDisplay)) / + DisplayWidth(nxagentDisplay, DefaultScreen(nxagentDisplay)); + + mmHeight = height * DisplayHeightMM(nxagentDisplay, DefaultScreen(nxagentDisplay)) / + DisplayHeight(nxagentDisplay, DefaultScreen(nxagentDisplay)); + } + else + { + mmWidth = (width * 254 + monitorResolution * 5) / (monitorResolution * 10); + mmHeight = (height * 254 + monitorResolution * 5) / (monitorResolution * 10); + + } if (mmWidth < 1) { mmWidth = 1; } - mmHeight = (height * 254 + monitorResolution * 5) / (monitorResolution * 10); - if (mmHeight < 1) { mmHeight = 1; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 36da8b9..d4a083a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -210,6 +210,9 @@ void nxagentShadowAdaptDepth(unsigned int, unsigned int, unsigned int, char **); RegionRec nxagentShadowUpdateRegion; #define NXAGENT_DEFAULT_DPI 75 +#define NXAGENT_AUTO_DPI -1 + +extern Bool nxagentAutoDPI; /* * From randr/randr.c. This was originally static @@ -1327,10 +1330,14 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, rootDepth, (long unsigned int)defaultVisual); #endif - if (monitorResolution < 1) + if ((monitorResolution < 1) && (nxagentAutoDPI == False)) { monitorResolution = NXAGENT_DEFAULT_DPI; } + else if ((monitorResolution < 1) && (nxagentAutoDPI == True)) + { + monitorResolution = NXAGENT_AUTO_DPI; + } if (!fbScreenInit(pScreen, pFrameBufferBits, nxagentOption(RootWidth), nxagentOption(RootHeight), monitorResolution, monitorResolution, PixmapBytePad(nxagentOption(RootWidth), rootDepth), bitsPerPixel)) @@ -1474,6 +1481,17 @@ N/A * return FALSE; */ + if (monitorResolution < 0) + { + pScreen->mmWidth = nxagentOption(RootWidth) * DisplayWidthMM(nxagentDisplay, + DefaultScreen(nxagentDisplay)) / DisplayWidth(nxagentDisplay, + DefaultScreen(nxagentDisplay)); + + pScreen->mmHeight = nxagentOption(RootHeight) * DisplayHeightMM(nxagentDisplay, + DefaultScreen(nxagentDisplay)) / DisplayHeight(nxagentDisplay, + DefaultScreen(nxagentDisplay)); + } + pScreen->defColormap = (Colormap) FakeClientID(0); pScreen->minInstalledCmaps = MINCMAPS; pScreen->maxInstalledCmaps = MAXCMAPS; @@ -2294,22 +2312,40 @@ Bool nxagentResizeScreen(ScreenPtr pScreen, int width, int height, if (mmWidth == 0) { - mmWidth = (width * 254 + monitorResolution * 5) / (monitorResolution * 10); + if (monitorResolution < 0) + { + mmWidth = width * DisplayWidthMM(nxagentDisplay, DefaultScreen(nxagentDisplay)) / + DisplayWidth(nxagentDisplay, DefaultScreen(nxagentDisplay)); + } + else + { + mmWidth = (width * 254 + monitorResolution * 5) / (monitorResolution * 10); + } if (mmWidth < 1) { mmWidth = 1; } + } if (mmHeight == 0) { - mmHeight = (height * 254 + monitorResolution * 5) / (monitorResolution * 10); + if (monitorResolution < 0) + { + mmHeight = height * DisplayHeightMM(nxagentDisplay, DefaultScreen(nxagentDisplay)) / + DisplayHeight(nxagentDisplay, DefaultScreen(nxagentDisplay)); + } + else + { + mmHeight = (height * 254 + monitorResolution * 5) / (monitorResolution * 10); + } if (mmHeight < 1) { mmHeight = 1; } + } pScreen -> mmWidth = mmWidth; diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index d6ed4d0..eb7307b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -393,6 +393,9 @@ auto-disconnect timeout in seconds (minimum allowed: 60) .B \-norootlessexit don't exit if there are no clients in rootless mode .TP 8 +.B \-autodpi +detect real server's DPI and set it in the agent session; the \fI-dpi <dpi>\fR cmdline option overrides \fI-autodpi\fR +.TP 8 .B \-nomagicpixel disable magic pixel support at session startup, can be re-enabled via nx/nx option on session resumption -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 29c166dbed16cbc3112b4915f4e6938b92983999 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Feb 21 22:21:15 2018 +0100 nxagent: Also provide auto DPI feature via nx/nx option 'autodpi', taking only effect on session startups. --- nx-X11/programs/Xserver/hw/nxagent/Args.c | 19 +++++++++++++++++++ nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 5 +++++ nxcomp/src/Loop.cpp | 3 ++- nxcomp/src/Misc.cpp | 1 + nxproxy/man/nxproxy.1 | 1 + 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index a51ad0c..c31acc2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -1278,6 +1278,25 @@ static void nxagentParseOptions(char *name, char *value) return; } + else if (!strcmp(name, "autodpi")) + { + if (nxagentReconnectTrap == True) + { + #ifdef DEBUG + fprintf(stderr, "nxagentParseOptions: Ignoring option 'autodpi' at reconnection.\n"); + #endif + } + else if (!strcmp(value, "0")) + { + nxagentAutoDPI = False; + } + else + { + nxagentAutoDPI = True; + } + + return; + } else if (strcmp(name, "shadowuid") == 0) { nxagentShadowUid = atoi(value); diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index eb7307b..d3069bf 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -606,6 +606,11 @@ proxy <-> agent remote sessions) .B magicpixel=<bool> enable/disable magic pixel support in fullscreen mode (default: 1, enabled) .TP 8 +.B autodpi=<bool> +enable/disable deriving session DPI automatically from real server +(default: 0, disabled); only takes effect on session startups, gets +ignored when reconnecting to a suspended session +.TP 8 .B sleep=<int> delay X server operations when suspended (provided in msec), set to \fI0\fR to keep \fBnxagent\fR session fully functional when suspended diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp index 251eb04..5365a99 100644 --- a/nxcomp/src/Loop.cpp +++ b/nxcomp/src/Loop.cpp @@ -8476,7 +8476,8 @@ int ParseEnvironmentOptions(const char *env, int force) strcasecmp(name, "tile") == 0 || strcasecmp(name, "menu") == 0 || strcasecmp(name, "magicpixel") == 0 || - strcasecmp(name, "state") == 0 ) + strcasecmp(name, "autodpi") == 0 || + strcasecmp(name, "state") == 0 ) { nxdbg << "Loop: Ignoring agent option '" << name << "' with value '" << value << "'.\n" diff --git a/nxcomp/src/Misc.cpp b/nxcomp/src/Misc.cpp index b6bf245..4f1af0e 100644 --- a/nxcomp/src/Misc.cpp +++ b/nxcomp/src/Misc.cpp @@ -344,6 +344,7 @@ defer=n\n\ tile=s\n\ menu=n\n\ magicpixel=n\n\ +autodpi=n\n\ sleep=n\n\ tolerancechecks=s\n\ keyconv=s\n\ diff --git a/nxproxy/man/nxproxy.1 b/nxproxy/man/nxproxy.1 index 1bf070c..b5ab893 100644 --- a/nxproxy/man/nxproxy.1 +++ b/nxproxy/man/nxproxy.1 @@ -328,6 +328,7 @@ encryption of the point to point communication. tile=<string> menu=<int> magicpixel=<bool> + autodpi=<bool> sleep=<int> .SH NX ENVIRONMENT VARIABLES -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 6d4049640ed1de6a29b7108ebde89947877d5d27 Merge: a88ca27 29c166d Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 27 09:33:19 2018 +0100 Merge branch 'sunweaver-pr/autodetect-dpi' into 3.6.x Attributes GH PR #522: https://github.com/ArcticaProject/nx-libs/pull/522 nx-X11/programs/Xserver/hw/nxagent/Args.c | 27 +++++++++++++++ nx-X11/programs/Xserver/hw/nxagent/Extensions.c | 17 ++++++++-- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 42 ++++++++++++++++++++++-- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 8 +++++ nxcomp/src/Loop.cpp | 3 +- nxcomp/src/Misc.cpp | 1 + nxproxy/man/nxproxy.1 | 1 + 7 files changed, 92 insertions(+), 7 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 9f93e96ec81662e48f770bca7efc9e664576a7dc Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Feb 27 09:37:58 2018 +0100 nx-libs.spec: Starting with Fedora 28 / RHEL 8, SunRPC support is being split out into a separate libraries (libtirpc). Fixes ArcticaProject/nx-libs#665. --- nx-libs.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nx-libs.spec b/nx-libs.spec index 89209f9..655c393 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -116,6 +116,10 @@ BuildRequires: libXinerama-devel BuildRequires: xorg-x11-font-utils %endif +%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8 +BuildRequires: libtirpc-devel +%endif + # For imake BuildRequires: xorg-x11-proto-devel BuildRequires: zlib-devel -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit a6cb8583adb16f299e968be4a8e99e903966e1d8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Feb 27 09:42:09 2018 +0100 Revert "nx-libs.spec: Starting with Fedora 28 / RHEL 8, SunRPC support is being split out into a separate libraries (libtirpc)." This reverts commit 9f93e96ec81662e48f770bca7efc9e664576a7dc. --- nx-libs.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nx-libs.spec b/nx-libs.spec index 655c393..89209f9 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -116,10 +116,6 @@ BuildRequires: libXinerama-devel BuildRequires: xorg-x11-font-utils %endif -%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8 -BuildRequires: libtirpc-devel -%endif - # For imake BuildRequires: xorg-x11-proto-devel BuildRequires: zlib-devel -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
-
git-admin＠x2go.org