[X2go-Commits] x2goagent.git - master (branch) updated: 3.4.0.5-15-g24eee38

The branch, master has been updated via 24eee38cfe9e4933443ac2d861ba3e0afea8e22b (commit) via 16587ed8b30d7c11baf6102dde2799650ebab495 (commit) via 15ba0c4ed1535fcd0c8b1d26d7a9afe0e45329e3 (commit) via 2e7c9ecb90ac85781be862769e1b6e5e52193b47 (commit) via 0d26f66bef490708e1301eec3bf17e61e00ed08b (commit) via d287da5ccdbf84ac3b515fdd5db42154341e24e0 (commit) via a7e8f76164f44ed4b6a1d1dcc13e336d1c7fad20 (commit) from e906831917d7d8dfbc3db298df70af9ae9e083d5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 24eee38cfe9e4933443ac2d861ba3e0afea8e22b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jul 3 16:59:21 2011 +0200 Now fully patched in NX code from NX-X11-3.5.0-1, depend on NX libs >= 3.5.0. commit 16587ed8b30d7c11baf6102dde2799650ebab495 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jul 3 16:57:36 2011 +0200 dh fix for renamed changelog files (dh_installdocs) commit 15ba0c4ed1535fcd0c8b1d26d7a9afe0e45329e3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jul 3 16:57:02 2011 +0200 remove renamed changelogs commit 2e7c9ecb90ac85781be862769e1b6e5e52193b47 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jul 3 16:55:48 2011 +0200 re-create original NX, X, Xorg changelogs that had been previously dropped commit 0d26f66bef490708e1301eec3bf17e61e00ed08b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jul 3 16:29:23 2011 +0200 Imakefile update for x2goagent 3.5.0.2 (taken from nxagent 3.5.0-1) commit d287da5ccdbf84ac3b515fdd5db42154341e24e0 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jul 3 16:21:43 2011 +0200 patching in nxagent CHANGELOG entries that occurred between 3.4.0-5 and 3.5.0-1, X2go-ification of LICENSE file commit a7e8f76164f44ed4b6a1d1dcc13e336d1c7fad20 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jul 3 16:10:13 2011 +0200 patching in nxagent changes between 3.4.0-5 and 3.5.0-1, includes copyright headers ----------------------------------------------------------------------- Summary of changes: CHANGELOG | 14 +- CHANGELOG.NX => CHANGELOG.NX.original | 4 + .../cf/host.def.X.original => CHANGELOG.X.original | 0 CHANGELOG.X => ChangeLog.X.org | 0 LICENSE | 5 +- config/cf/host.def | 2 +- config/cf/host.def.NX.original | 2 +- debian/changelog | 8 + debian/control | 36 +- debian/x2goagent.docs | 5 +- extras/Mesa/src/mesa/main/WSDrawBuffer.h | 2 +- .../Mesa/src/mesa/main/WSDrawBuffer.h.NX.original | 2 +- include/Xpoll.h.in | 2 +- include/Xpoll.h.in.NX.original | 2 +- lib/SM/sm_client.c | 4 +- lib/X11/ConnDis.c | 2 +- lib/X11/ConnDis.c.NX.original | 2 +- lib/X11/Imakefile.NX.original | 2 +- lib/X11/OpenDis.c | 2 +- lib/X11/OpenDis.c.NX.original | 2 +- lib/X11/XlibAsync.c | 2 +- lib/X11/XlibAsync.c.NX.original | 2 +- lib/X11/XlibInt.c | 2 +- lib/X11/XlibInt.c.NX.original | 2 +- lib/X11/Xlibint.h | 2 +- lib/X11/Xlibint.h.NX.original | 2 +- lib/Xt/Imakefile | 2 +- lib/Xt/Imakefile.NX.original | 2 +- lib/Xt/NextEvent.c | 2 +- lib/Xt/NextEvent.c.NX.original | 2 +- lib/xtrans/Xtranssock.c | 2 +- lib/xtrans/Xtranssock.c.NX.original | 2 +- programs/Imakefile | 2 +- programs/Imakefile.NX.original | 2 +- programs/Xserver/GL/glx/render2.c | 2 +- programs/Xserver/GL/glx/render2swap.c | 2 +- programs/Xserver/Imakefile.NX.original | 2 +- programs/Xserver/Xext/Imakefile | 2 +- programs/Xserver/Xext/Imakefile.NX.original | 2 +- programs/Xserver/Xext/security.c | 2 +- programs/Xserver/Xext/security.c.NX.original | 2 +- programs/Xserver/hw/nxagent/Agent.h | 2 +- programs/Xserver/hw/nxagent/Args.c | 15 +- programs/Xserver/hw/nxagent/Args.h | 2 +- programs/Xserver/hw/nxagent/Atoms.c | 30 +- programs/Xserver/hw/nxagent/Atoms.h | 4 +- programs/Xserver/hw/nxagent/Binder.c | 2 +- programs/Xserver/hw/nxagent/Binder.h | 2 +- programs/Xserver/hw/nxagent/CHANGELOG | 156 +++++++- programs/Xserver/hw/nxagent/Client.c | 2 +- programs/Xserver/hw/nxagent/Client.h | 2 +- programs/Xserver/hw/nxagent/Clipboard.c | 2 +- programs/Xserver/hw/nxagent/Clipboard.h | 2 +- programs/Xserver/hw/nxagent/Colormap.c | 2 +- programs/Xserver/hw/nxagent/Colormap.h | 2 +- programs/Xserver/hw/nxagent/Composite.c | 2 +- programs/Xserver/hw/nxagent/Composite.h | 2 +- programs/Xserver/hw/nxagent/Cursor.c | 2 +- programs/Xserver/hw/nxagent/Cursor.h | 2 +- programs/Xserver/hw/nxagent/Dialog.c | 2 +- programs/Xserver/hw/nxagent/Dialog.h | 2 +- programs/Xserver/hw/nxagent/Display.c | 2 +- programs/Xserver/hw/nxagent/Display.h | 2 +- programs/Xserver/hw/nxagent/Drawable.c | 2 +- programs/Xserver/hw/nxagent/Drawable.h | 2 +- programs/Xserver/hw/nxagent/Error.c | 2 +- programs/Xserver/hw/nxagent/Error.h | 2 +- programs/Xserver/hw/nxagent/Events.c | 477 ++++++++++++++++++-- programs/Xserver/hw/nxagent/Events.h | 4 +- programs/Xserver/hw/nxagent/Extensions.c | 2 +- programs/Xserver/hw/nxagent/Extensions.h | 2 +- programs/Xserver/hw/nxagent/Font.c | 4 +- programs/Xserver/hw/nxagent/Font.h | 2 +- programs/Xserver/hw/nxagent/GC.c | 2 +- programs/Xserver/hw/nxagent/GCOps.c | 2 +- programs/Xserver/hw/nxagent/GCOps.h | 2 +- programs/Xserver/hw/nxagent/GCs.h | 2 +- programs/Xserver/hw/nxagent/Handlers.c | 2 +- programs/Xserver/hw/nxagent/Handlers.h | 2 +- programs/Xserver/hw/nxagent/Holder.c | 2 +- programs/Xserver/hw/nxagent/Holder.h | 2 +- programs/Xserver/hw/nxagent/Icons.h | 2 +- programs/Xserver/hw/nxagent/Image.c | 2 +- programs/Xserver/hw/nxagent/Image.h | 2 +- programs/Xserver/hw/nxagent/Imakefile | 3 +- programs/Xserver/hw/nxagent/Init.c | 6 +- programs/Xserver/hw/nxagent/Init.h | 2 +- programs/Xserver/hw/nxagent/Keyboard.c | 2 +- programs/Xserver/hw/nxagent/Keyboard.h | 2 +- programs/Xserver/hw/nxagent/Keystroke.c | 26 +- programs/Xserver/hw/nxagent/Keystroke.h | 2 +- programs/Xserver/hw/nxagent/LICENSE | 2 +- programs/Xserver/hw/nxagent/Literals.h | 2 +- programs/Xserver/hw/nxagent/Millis.c | 2 +- programs/Xserver/hw/nxagent/Millis.h | 2 +- programs/Xserver/hw/nxagent/NXdispatch.c | 2 +- .../Xserver/hw/nxagent/NXdispatch.c.NX.original | 2 +- programs/Xserver/hw/nxagent/NXdixfonts.c | 2 +- .../Xserver/hw/nxagent/NXdixfonts.c.NX.original | 2 +- programs/Xserver/hw/nxagent/NXevents.c | 2 +- programs/Xserver/hw/nxagent/NXevents.c.NX.original | 2 +- programs/Xserver/hw/nxagent/NXextension.c | 2 +- .../Xserver/hw/nxagent/NXextension.c.NX.original | 2 +- programs/Xserver/hw/nxagent/NXglyph.c | 2 +- programs/Xserver/hw/nxagent/NXglyph.c.NX.original | 2 +- programs/Xserver/hw/nxagent/NXglyphcurs.c | 2 +- .../Xserver/hw/nxagent/NXglyphcurs.c.NX.original | 2 +- programs/Xserver/hw/nxagent/NXglyphstr.h | 2 +- .../Xserver/hw/nxagent/NXglyphstr.h.NX.original | 2 +- programs/Xserver/hw/nxagent/NXmiglyph.c | 2 +- .../Xserver/hw/nxagent/NXmiglyph.c.NX.original | 2 +- programs/Xserver/hw/nxagent/NXpicture.c | 2 +- .../Xserver/hw/nxagent/NXpicture.c.NX.original | 2 +- programs/Xserver/hw/nxagent/NXpicturestr.h | 2 +- .../Xserver/hw/nxagent/NXpicturestr.h.NX.original | 2 +- programs/Xserver/hw/nxagent/NXproperty.c | 2 +- .../Xserver/hw/nxagent/NXproperty.c.NX.original | 2 +- programs/Xserver/hw/nxagent/NXrandr.c | 2 +- programs/Xserver/hw/nxagent/NXrandr.c.NX.original | 2 +- programs/Xserver/hw/nxagent/NXrender.c | 2 +- programs/Xserver/hw/nxagent/NXrender.c.NX.original | 2 +- programs/Xserver/hw/nxagent/NXwindow.c | 2 +- programs/Xserver/hw/nxagent/NXwindow.c.NX.original | 2 +- programs/Xserver/hw/nxagent/NXxrandr.c | 2 +- programs/Xserver/hw/nxagent/NXxrandr.h | 2 +- programs/Xserver/hw/nxagent/NXxrandrint.h | 2 +- programs/Xserver/hw/nxagent/Options.c | 2 +- programs/Xserver/hw/nxagent/Options.h | 9 +- programs/Xserver/hw/nxagent/Pixels.c | 2 +- programs/Xserver/hw/nxagent/Pixels.h | 20 +- programs/Xserver/hw/nxagent/Pixmap.c | 2 +- programs/Xserver/hw/nxagent/Pixmaps.h | 2 +- programs/Xserver/hw/nxagent/Pointer.c | 36 ++- programs/Xserver/hw/nxagent/Pointer.h | 11 +- programs/Xserver/hw/nxagent/Reconnect.c | 6 +- programs/Xserver/hw/nxagent/Reconnect.h | 2 +- programs/Xserver/hw/nxagent/Render.c | 293 +++++++++++- programs/Xserver/hw/nxagent/Render.h | 4 +- programs/Xserver/hw/nxagent/Rootless.c | 101 ++++- programs/Xserver/hw/nxagent/Rootless.h | 2 +- programs/Xserver/hw/nxagent/Screen.c | 130 ++---- programs/Xserver/hw/nxagent/Screen.h | 6 +- programs/Xserver/hw/nxagent/Splash.c | 2 +- programs/Xserver/hw/nxagent/Splash.h | 2 +- programs/Xserver/hw/nxagent/Split.c | 2 +- programs/Xserver/hw/nxagent/Split.h | 2 +- programs/Xserver/hw/nxagent/TestExt.c | 2 +- programs/Xserver/hw/nxagent/Trap.c | 2 +- programs/Xserver/hw/nxagent/Trap.h | 2 +- programs/Xserver/hw/nxagent/Utils.h | 2 +- programs/Xserver/hw/nxagent/Visual.c | 2 +- programs/Xserver/hw/nxagent/Visual.h | 2 +- programs/Xserver/hw/nxagent/Window.c | 90 ++++- programs/Xserver/hw/nxagent/Windows.h | 4 +- programs/Xserver/hw/nxagent/X/NXdamage.c | 2 +- .../Xserver/hw/nxagent/X/NXdamage.c.NX.original | 2 +- programs/Xserver/hw/nxagent/X/NXdispatch.c | 2 +- .../Xserver/hw/nxagent/X/NXdispatch.c.NX.original | 2 +- programs/Xserver/hw/nxagent/X/NXdixfonts.c | 2 +- .../Xserver/hw/nxagent/X/NXdixfonts.c.NX.original | 2 +- programs/Xserver/hw/nxagent/X/NXevents.c | 2 +- .../Xserver/hw/nxagent/X/NXevents.c.NX.original | 2 +- programs/Xserver/hw/nxagent/X/NXextension.c | 2 +- .../Xserver/hw/nxagent/X/NXextension.c.NX.original | 2 +- programs/Xserver/hw/nxagent/X/NXglxext.c | 2 +- .../Xserver/hw/nxagent/X/NXglxext.c.NX.original | 2 +- programs/Xserver/hw/nxagent/X/NXglyph.c | 2 +- .../Xserver/hw/nxagent/X/NXglyph.c.NX.original | 2 +- programs/Xserver/hw/nxagent/X/NXglyphcurs.c | 2 +- .../Xserver/hw/nxagent/X/NXglyphcurs.c.NX.original | 2 +- programs/Xserver/hw/nxagent/X/NXglyphstr.h | 2 +- .../Xserver/hw/nxagent/X/NXglyphstr.h.NX.original | 2 +- programs/Xserver/hw/nxagent/X/NXmiexpose.c | 2 +- .../Xserver/hw/nxagent/X/NXmiexpose.c.NX.original | 2 +- programs/Xserver/hw/nxagent/X/NXmiglyph.c | 2 +- .../Xserver/hw/nxagent/X/NXmiglyph.c.NX.original | 2 +- programs/Xserver/hw/nxagent/X/NXmitrap.c | 2 +- .../Xserver/hw/nxagent/X/NXmitrap.c.NX.original | 2 +- programs/Xserver/hw/nxagent/X/NXmiwindow.c | 2 +- .../Xserver/hw/nxagent/X/NXmiwindow.c.NX.original | 2 +- programs/Xserver/hw/nxagent/X/NXpicture.c | 54 +++- .../Xserver/hw/nxagent/X/NXpicture.c.NX.original | 54 +++- programs/Xserver/hw/nxagent/X/NXpicturestr.h | 2 +- .../hw/nxagent/X/NXpicturestr.h.NX.original | 2 +- programs/Xserver/hw/nxagent/X/NXproperty.c | 2 +- .../Xserver/hw/nxagent/X/NXproperty.c.NX.original | 2 +- programs/Xserver/hw/nxagent/X/NXrandr.c | 2 +- .../Xserver/hw/nxagent/X/NXrandr.c.NX.original | 2 +- programs/Xserver/hw/nxagent/X/NXrender.c | 60 +++- .../Xserver/hw/nxagent/X/NXrender.c.NX.original | 60 +++- programs/Xserver/hw/nxagent/X/NXresource.c | 2 +- .../Xserver/hw/nxagent/X/NXresource.c.NX.original | 2 +- programs/Xserver/hw/nxagent/X/NXshm.c | 2 +- programs/Xserver/hw/nxagent/X/NXshm.c.NX.original | 2 +- programs/Xserver/hw/nxagent/X/NXwindow.c | 2 +- .../Xserver/hw/nxagent/X/NXwindow.c.NX.original | 2 +- programs/Xserver/hw/nxagent/X/NXxvdisp.c | 2 +- .../Xserver/hw/nxagent/X/NXxvdisp.c.NX.original | 2 +- programs/Xserver/hw/nxagent/nxagent.xpm | 2 +- programs/Xserver/hw/nxagent/nxmissing.xpm | 2 +- programs/Xserver/hw/nxagent/os2Stub.c | 2 +- programs/Xserver/hw/nxagent/screensaver | 2 +- programs/Xserver/mi/Imakefile | 2 +- programs/Xserver/mi/Imakefile.NX.original | 2 +- programs/Xserver/os/Imakefile | 2 +- programs/Xserver/os/Imakefile.NX.original | 2 +- programs/Xserver/os/WaitFor.c | 2 +- programs/Xserver/os/WaitFor.c.NX.original | 2 +- programs/Xserver/os/auth.c | 2 +- programs/Xserver/os/auth.c.NX.original | 2 +- programs/Xserver/os/log.c | 2 +- programs/Xserver/os/log.c.NX.original | 2 +- programs/Xserver/os/utils.c | 2 +- programs/Xserver/os/utils.c.NX.original | 2 +- programs/nxauth/CHANGELOG | 10 +- programs/nxauth/Imakefile | 2 +- programs/nxauth/LICENSE | 2 +- programs/nxauth/parsedpy.c | 2 +- programs/nxauth/process.c | 2 +- programs/nxauth/xauth.c | 2 +- programs/xterm/Imakefile | 2 +- programs/xterm/Imakefile.NX.original | 2 +- programs/xterm/charproc.c | 2 +- programs/xterm/charproc.c.NX.original | 2 +- programs/xterm/main.c | 2 +- programs/xterm/main.c.NX.original | 2 +- 226 files changed, 1695 insertions(+), 434 deletions(-) rename CHANGELOG.NX => CHANGELOG.NX.original (99%) copy config/cf/host.def.X.original => CHANGELOG.X.original (100%) rename CHANGELOG.X => ChangeLog.X.org (100%) The diff of changes is: diff --git a/CHANGELOG b/CHANGELOG index 96f4a81..20aa2a2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,8 +1,18 @@ ChangeLog: -nx-X11-3.4.0.5 +x2go-X11-3.5.0.2 -- Changed version numbering scheme, upstream now maintained by X2go project +- forked nx-X11-3.5.0-1 + +nx-X11-3.5.0-1 + +- Opened the 3.5.0 branch based on nx-X11-3.4.0-4. + +- Updated copyright to year 2011. + +nx-X11-3.4.0-4 + +- Fixed TR06H02359. Removed compiler warnings. nx-X11-3.4.0-3 diff --git a/CHANGELOG.NX b/CHANGELOG.NX.original similarity index 99% rename from CHANGELOG.NX rename to CHANGELOG.NX.original index e433f2c..4faf2ad 100644 --- a/CHANGELOG.NX +++ b/CHANGELOG.NX.original @@ -1,5 +1,9 @@ ChangeLog: +nx-X11-3.4.0-4 + +- Fixed TR06H02359. Removed compiler warnings. + nx-X11-3.4.0-3 - Updated copyright to year 2010. diff --git a/config/cf/host.def.X.original b/CHANGELOG.X.original similarity index 100% copy from config/cf/host.def.X.original copy to CHANGELOG.X.original diff --git a/CHANGELOG.X b/ChangeLog.X.org similarity index 100% rename from CHANGELOG.X rename to ChangeLog.X.org diff --git a/LICENSE b/LICENSE index e394a65..d841e1c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,9 @@ -Copyright (c) 2001, 2010 NoMachine - http://www.nomachine.com/. +Copyright (c) 2001, 2011 NoMachine - http://www.nomachine.com/. +Copyright (c) 2011 X2go Project - http://wiki.x2go.org/. NX-X11 and NX extensions to X are copyright of NoMachine. +X2go-X11 (x2goagent) is a fork of NX-X11 (nxagent), the same +license applies for X2go's NX-X11 fork. Redistribution and use of this software is allowed according to the following terms: diff --git a/config/cf/host.def b/config/cf/host.def index 607e4f0..e9f53c2 100644 --- a/config/cf/host.def +++ b/config/cf/host.def @@ -31,7 +31,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/config/cf/host.def.NX.original b/config/cf/host.def.NX.original index 607e4f0..e9f53c2 100644 --- a/config/cf/host.def.NX.original +++ b/config/cf/host.def.NX.original @@ -31,7 +31,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/debian/changelog b/debian/changelog index a9f178d..2ccae7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +x2goagent (3.5.0.2-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (3.5.0.2): + - Patched in NX code from NX-X11-3.5.0-1 + * Depend on NX libs >= 3.5.0. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 03 Jul 2011 16:57:57 +0200 + x2goagent (3.4.0.5-0~x2go1) unstable; urgency=low * Changed version numbering scheme, upstream now maintained by diff --git a/debian/control b/debian/control index ca10b9a..ee244d0 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,15 @@ Source: x2goagent Section: x11 Priority: extra Maintainer: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -Build-Depends: debhelper (>= 7), libxcomp-dev, libxcompext-dev, libxcompshad-dev, zlib1g-dev, libfreetype6-dev, xorg-dev +Build-Depends: + debhelper (>= 7), + libxcomp-dev (>= 3.5.0), + libxcompext-dev (>= 3.5.0), + libxcompshad-dev (>= 3.5.0), + zlib1g-dev, + libfreetype6-dev, + xorg-dev, + xutils-dev Standards-Version: 3.9.2 Homepage: http://code.x2go.org/releases/source/x2goagent Vcs-Git: git://code.x2go.org/x2goagent.git @@ -10,16 +18,20 @@ Vcs-Browser: http://code.x2go.org/gitweb?p=x2goagent.git;a=summary Package: x2goagent Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Special NX-ized client, was developed by NoMachine to handle X sessions - This is thhe agent providing X transport of X session is nxagent. This - is based on the well known Xnest "nested" server. nxagent, like Xnest, +Depends: + ${shlibs:Depends}, + ${misc:Depends} +Description: Special X2go-ized X agent, forked from NX-X11 (NoMachine) + x2goagent is an agent providing X transport of X sessions. The application + is based on the well known Xnest "nested" server. x2goagent, like Xnest, is an X server for its own clients, and at the same time, an X client - for the real X server. The main scope of nxagent is to eliminate X - round-trips or transform them into asynchronous replies. nxproxy does - not make any effort to minimize round-trips by itself, this is demanded - of nxagent. Being an X server, nxagent is able to resolve locally all - the property/atoms related requests, ensuring that the most common - source of round-trips are nearly reduced to zero. + for a system's local X server. . - This version was modified for x2go system. + The main scope of x2goagent is to eliminate X round-trips or transform + them into asynchronous replies. x2goagent works together with nxproxy from + NoMachine. nxproxy itself does not make any effort to minimize round-trips + by itself, this is demanded of x2goagent. + . + Being an X server, x2goagent is able to resolve all the property/atoms related + requests locally, ensuring that the most common source of round-trips are nearly + reduced to zero. diff --git a/debian/x2goagent.docs b/debian/x2goagent.docs index f812472..4abf21a 100644 --- a/debian/x2goagent.docs +++ b/debian/x2goagent.docs @@ -1,2 +1,3 @@ -CHANGELOG.NX -CHANGELOG.X +CHANGELOG +CHANGELOG.NX.original +CHANGELOG.X.original diff --git a/extras/Mesa/src/mesa/main/WSDrawBuffer.h b/extras/Mesa/src/mesa/main/WSDrawBuffer.h index 39910ea..b4d805d 100644 --- a/extras/Mesa/src/mesa/main/WSDrawBuffer.h +++ b/extras/Mesa/src/mesa/main/WSDrawBuffer.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/extras/Mesa/src/mesa/main/WSDrawBuffer.h.NX.original b/extras/Mesa/src/mesa/main/WSDrawBuffer.h.NX.original index 39910ea..b4d805d 100644 --- a/extras/Mesa/src/mesa/main/WSDrawBuffer.h.NX.original +++ b/extras/Mesa/src/mesa/main/WSDrawBuffer.h.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/include/Xpoll.h.in b/include/Xpoll.h.in index b44b926..dcea39c 100644 --- a/include/Xpoll.h.in +++ b/include/Xpoll.h.in @@ -53,7 +53,7 @@ from The Open Group. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/include/Xpoll.h.in.NX.original b/include/Xpoll.h.in.NX.original index b44b926..dcea39c 100644 --- a/include/Xpoll.h.in.NX.original +++ b/include/Xpoll.h.in.NX.original @@ -53,7 +53,7 @@ from The Open Group. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/lib/SM/sm_client.c b/lib/SM/sm_client.c index 02f9ccd..499be5e 100644 --- a/lib/SM/sm_client.c +++ b/lib/SM/sm_client.c @@ -239,7 +239,9 @@ char *errorStringRet; SIZEOF (smRegisterClientMsg), WORD64COUNT (extra), smRegisterClientMsg, pMsg, pData); - STORE_ARRAY8 (pData, 0, NULL); + previousId = NULL; + + STORE_ARRAY8 (pData, 0, previousId); IceFlush (iceConn); diff --git a/lib/X11/ConnDis.c b/lib/X11/ConnDis.c index 5dba9cc..30146a9 100644 --- a/lib/X11/ConnDis.c +++ b/lib/X11/ConnDis.c @@ -28,7 +28,7 @@ in this Software without prior written authorization from The Open Group. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/lib/X11/ConnDis.c.NX.original b/lib/X11/ConnDis.c.NX.original index 5dba9cc..30146a9 100644 --- a/lib/X11/ConnDis.c.NX.original +++ b/lib/X11/ConnDis.c.NX.original @@ -28,7 +28,7 @@ in this Software without prior written authorization from The Open Group. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/lib/X11/Imakefile.NX.original b/lib/X11/Imakefile.NX.original index 3aca4df..d8d0601 100644 --- a/lib/X11/Imakefile.NX.original +++ b/lib/X11/Imakefile.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/lib/X11/OpenDis.c b/lib/X11/OpenDis.c index c0e44da..e9d0197 100644 --- a/lib/X11/OpenDis.c +++ b/lib/X11/OpenDis.c @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/lib/X11/OpenDis.c.NX.original b/lib/X11/OpenDis.c.NX.original index c0e44da..e9d0197 100644 --- a/lib/X11/OpenDis.c.NX.original +++ b/lib/X11/OpenDis.c.NX.original @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/lib/X11/XlibAsync.c b/lib/X11/XlibAsync.c index 4764f13..70bd82b 100644 --- a/lib/X11/XlibAsync.c +++ b/lib/X11/XlibAsync.c @@ -29,7 +29,7 @@ from The Open Group. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/lib/X11/XlibAsync.c.NX.original b/lib/X11/XlibAsync.c.NX.original index 4764f13..70bd82b 100644 --- a/lib/X11/XlibAsync.c.NX.original +++ b/lib/X11/XlibAsync.c.NX.original @@ -29,7 +29,7 @@ from The Open Group. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/lib/X11/XlibInt.c b/lib/X11/XlibInt.c index 8ea4d32..47e2ea1 100644 --- a/lib/X11/XlibInt.c +++ b/lib/X11/XlibInt.c @@ -29,7 +29,7 @@ from The Open Group. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/lib/X11/XlibInt.c.NX.original b/lib/X11/XlibInt.c.NX.original index 8ea4d32..47e2ea1 100644 --- a/lib/X11/XlibInt.c.NX.original +++ b/lib/X11/XlibInt.c.NX.original @@ -29,7 +29,7 @@ from The Open Group. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/lib/X11/Xlibint.h b/lib/X11/Xlibint.h index 96ee095..56da234 100644 --- a/lib/X11/Xlibint.h +++ b/lib/X11/Xlibint.h @@ -30,7 +30,7 @@ from The Open Group. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/lib/X11/Xlibint.h.NX.original b/lib/X11/Xlibint.h.NX.original index 96ee095..56da234 100644 --- a/lib/X11/Xlibint.h.NX.original +++ b/lib/X11/Xlibint.h.NX.original @@ -30,7 +30,7 @@ from The Open Group. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/lib/Xt/Imakefile b/lib/Xt/Imakefile index a48081c..6399e46 100644 --- a/lib/Xt/Imakefile +++ b/lib/Xt/Imakefile @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/lib/Xt/Imakefile.NX.original b/lib/Xt/Imakefile.NX.original index a48081c..6399e46 100644 --- a/lib/Xt/Imakefile.NX.original +++ b/lib/Xt/Imakefile.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/lib/Xt/NextEvent.c b/lib/Xt/NextEvent.c index af63651..e6cd9cb 100644 --- a/lib/Xt/NextEvent.c +++ b/lib/Xt/NextEvent.c @@ -61,7 +61,7 @@ in this Software without prior written authorization from The Open Group. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/lib/Xt/NextEvent.c.NX.original b/lib/Xt/NextEvent.c.NX.original index af63651..e6cd9cb 100644 --- a/lib/Xt/NextEvent.c.NX.original +++ b/lib/Xt/NextEvent.c.NX.original @@ -61,7 +61,7 @@ in this Software without prior written authorization from The Open Group. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/lib/xtrans/Xtranssock.c b/lib/xtrans/Xtranssock.c index b1e5a47..50b6770 100644 --- a/lib/xtrans/Xtranssock.c +++ b/lib/xtrans/Xtranssock.c @@ -55,7 +55,7 @@ from the copyright holders. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/lib/xtrans/Xtranssock.c.NX.original b/lib/xtrans/Xtranssock.c.NX.original index b1e5a47..50b6770 100644 --- a/lib/xtrans/Xtranssock.c.NX.original +++ b/lib/xtrans/Xtranssock.c.NX.original @@ -55,7 +55,7 @@ from the copyright holders. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Imakefile b/programs/Imakefile index dad15fa..9480baf 100644 --- a/programs/Imakefile +++ b/programs/Imakefile @@ -5,7 +5,7 @@ XCOMM $Xorg: Imakefile,v 1.4 2000/08/17 19:47:01 cpqbld Exp $ XCOMM $XFree86: xc/programs/Imakefile,v 3.54 2003/04/14 20:37:16 herrb Exp $ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Imakefile.NX.original b/programs/Imakefile.NX.original index dad15fa..9480baf 100644 --- a/programs/Imakefile.NX.original +++ b/programs/Imakefile.NX.original @@ -5,7 +5,7 @@ XCOMM $Xorg: Imakefile,v 1.4 2000/08/17 19:47:01 cpqbld Exp $ XCOMM $XFree86: xc/programs/Imakefile,v 3.54 2003/04/14 20:37:16 herrb Exp $ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/GL/glx/render2.c b/programs/Xserver/GL/glx/render2.c index 39d0c13..f4491b2 100644 --- a/programs/Xserver/GL/glx/render2.c +++ b/programs/Xserver/GL/glx/render2.c @@ -43,7 +43,7 @@ #include "unpack.h" #include "g_disptab.h" #include "g_disptab_EXT.h" - +#include "indirect_size.h" void __glXDisp_Map1f(GLbyte *pc) { diff --git a/programs/Xserver/GL/glx/render2swap.c b/programs/Xserver/GL/glx/render2swap.c index 65ac5e1..0225970 100644 --- a/programs/Xserver/GL/glx/render2swap.c +++ b/programs/Xserver/GL/glx/render2swap.c @@ -43,7 +43,7 @@ #include "unpack.h" #include "g_disptab.h" #include "g_disptab_EXT.h" - +#include "indirect_size.h" void __glXDispSwap_Map1f(GLbyte *pc) { diff --git a/programs/Xserver/Imakefile.NX.original b/programs/Xserver/Imakefile.NX.original index 8a29e66..6bf7801 100644 --- a/programs/Xserver/Imakefile.NX.original +++ b/programs/Xserver/Imakefile.NX.original @@ -2,7 +2,7 @@ XCOMM $XdotOrg: xc/programs/Xserver/Imakefile,v 1.37 2005/11/18 18:15:23 ajax Ex XCOMM $Xorg: Imakefile,v 1.4 2001/03/14 18:42:02 pookie Exp $ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/Xext/Imakefile b/programs/Xserver/Xext/Imakefile index 697c8dd..b75f891 100644 --- a/programs/Xserver/Xext/Imakefile +++ b/programs/Xserver/Xext/Imakefile @@ -8,7 +8,7 @@ XCOMM $XFree86: xc/programs/Xserver/Xext/Imakefile,v 3.43 2003/04/21 18:56:48 sv /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/Xext/Imakefile.NX.original b/programs/Xserver/Xext/Imakefile.NX.original index 697c8dd..b75f891 100644 --- a/programs/Xserver/Xext/Imakefile.NX.original +++ b/programs/Xserver/Xext/Imakefile.NX.original @@ -8,7 +8,7 @@ XCOMM $XFree86: xc/programs/Xserver/Xext/Imakefile,v 3.43 2003/04/21 18:56:48 sv /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/Xext/security.c b/programs/Xserver/Xext/security.c index d271e1b..2139425 100644 --- a/programs/Xserver/Xext/security.c +++ b/programs/Xserver/Xext/security.c @@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/Xext/security.c.NX.original b/programs/Xserver/Xext/security.c.NX.original index d271e1b..2139425 100644 --- a/programs/Xserver/Xext/security.c.NX.original +++ b/programs/Xserver/Xext/security.c.NX.original @@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Agent.h b/programs/Xserver/hw/nxagent/Agent.h index 3f2c93f..dbed1e0 100644 --- a/programs/Xserver/hw/nxagent/Agent.h +++ b/programs/Xserver/hw/nxagent/Agent.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Args.c b/programs/Xserver/hw/nxagent/Args.c index c2e58bd..8fbb275 100644 --- a/programs/Xserver/hw/nxagent/Args.c +++ b/programs/Xserver/hw/nxagent/Args.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -562,11 +562,15 @@ int ddxProcessArgument(int argc, char *argv[], int i) if (!strcmp(argv[i],"fullscreen")) { nxagentChangeOption(Fullscreen, True); + + nxagentChangeOption(AllScreens, True); } else if (!strcmp(argv[i],"ipaq")) { nxagentChangeOption(Fullscreen, True); + nxagentChangeOption(AllScreens, True); + nxagentIpaq = True; } else @@ -1071,10 +1075,14 @@ static void nxagentParseOptions(char *name, char *value) else if (!strcmp(value, "1")) { nxagentChangeOption(Fullscreen, True); + + nxagentChangeOption(AllScreens, True); } else if (!strcmp(value, "0")) { nxagentChangeOption(Fullscreen, False); + + nxagentChangeOption(AllScreens, False); } else { @@ -1680,6 +1688,11 @@ N/A nxagentChangeOption(Fullscreen, False); } + if (nxagentOption(AllScreens) == UNDEFINED) + { + nxagentChangeOption(AllScreens, False); + } + if (nxagentOption(Binder) == UNDEFINED) { nxagentChangeOption(Binder, False); diff --git a/programs/Xserver/hw/nxagent/Args.h b/programs/Xserver/hw/nxagent/Args.h index 92650a4..9cb97ca 100644 --- a/programs/Xserver/hw/nxagent/Args.h +++ b/programs/Xserver/hw/nxagent/Args.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Atoms.c b/programs/Xserver/hw/nxagent/Atoms.c index 7f12406..578731f 100644 --- a/programs/Xserver/hw/nxagent/Atoms.c +++ b/programs/Xserver/hw/nxagent/Atoms.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -66,19 +66,21 @@ Atom nxagentAtoms[NXAGENT_NUMBER_OF_ATOMS]; static char *nxagentAtomNames[NXAGENT_NUMBER_OF_ATOMS + 1] = { - "NX_IDENTITY", /* 0 */ - "WM_PROTOCOLS", /* 1 */ - "WM_DELETE_WINDOW", /* 2 */ - "WM_NX_READY", /* 3 */ - "MCOPGLOBALS", /* 4 */ - "NX_CUT_BUFFER_SERVER", /* 5 */ - "TARGETS", /* 6 */ - "TEXT", /* 7 */ - "NX_AGENT_SIGNATURE", /* 8 */ - "NXDARWIN", /* 9 */ - "CLIPBOARD", /* 10 */ - "TIMESTAMP", /* 11 */ - "UTF8_STRING", /* 12 */ + "NX_IDENTITY", /* 0 */ + "WM_PROTOCOLS", /* 1 */ + "WM_DELETE_WINDOW", /* 2 */ + "WM_NX_READY", /* 3 */ + "MCOPGLOBALS", /* 4 */ + "NX_CUT_BUFFER_SERVER", /* 5 */ + "TARGETS", /* 6 */ + "TEXT", /* 7 */ + "NX_AGENT_SIGNATURE", /* 8 */ + "NXDARWIN", /* 9 */ + "CLIPBOARD", /* 10 */ + "TIMESTAMP", /* 11 */ + "UTF8_STRING", /* 12 */ + "_NET_WM_STATE", /* 13 */ + "_NET_WM_STATE_FULLSCREEN", /* 14 */ NULL, NULL }; diff --git a/programs/Xserver/hw/nxagent/Atoms.h b/programs/Xserver/hw/nxagent/Atoms.h index d8acb94..d5b7fe5 100644 --- a/programs/Xserver/hw/nxagent/Atoms.h +++ b/programs/Xserver/hw/nxagent/Atoms.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -22,7 +22,7 @@ #include "../../include/window.h" #include "screenint.h" -#define NXAGENT_NUMBER_OF_ATOMS 14 +#define NXAGENT_NUMBER_OF_ATOMS 16 extern Atom nxagentAtoms[NXAGENT_NUMBER_OF_ATOMS]; diff --git a/programs/Xserver/hw/nxagent/Binder.c b/programs/Xserver/hw/nxagent/Binder.c index 34433bd..d40aaeb 100644 --- a/programs/Xserver/hw/nxagent/Binder.c +++ b/programs/Xserver/hw/nxagent/Binder.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Binder.h b/programs/Xserver/hw/nxagent/Binder.h index e0da3e3..f28a82b 100644 --- a/programs/Xserver/hw/nxagent/Binder.h +++ b/programs/Xserver/hw/nxagent/Binder.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/CHANGELOG b/programs/Xserver/hw/nxagent/CHANGELOG index a0e9bea..fc6f2a8 100644 --- a/programs/Xserver/hw/nxagent/CHANGELOG +++ b/programs/Xserver/hw/nxagent/CHANGELOG @@ -1,8 +1,160 @@ ChangeLog: -nxagent-3.4.0.5 +x2goagent-3.5.0.2 -- Changed version numbering scheme, upstream now maintained by X2go project. +- forked nxagent-3.5.0-1 + +nxagent-3.5.0-2 + +- Fixed TR0502449. Initialized font server path even if font server + connection fails. + +nxagent-3.5.0-1 + +- Opened the 3.5.0 branch based on nxagent-3.4.0-16. + +- Updated copyright to year 2009. + +- Fixed TR0302438. Added a check in function exporting property in + order to handle the case looking up an atom name returns a null + pointer. + +nxagent-3.4.0-16 + +- Updated copyright to year 2011. + +nxagent-3.4.0-15 + +- Added reference to fixed TR11H02405. + +nxagent-3.4.0-14 + +- Reverted fix for TR03H02335 implemented in nxagent-3.4.0-6. The + emulation of right click by Control key + left click introduces + issues for some applications changing the reaction to the left click + depending on the state of Control key. Issue reported in TR03H02335 + affects Apple laptop touchpads having a single button acting as + left button: on those devices the right button can be emulated by + a double-fingered tap (using two fingertips simultaneously). + +nxagent-3.4.0-13 + +- Fixed TR12H02414. Exported property must be split if ChangeProperty + request exceeds 262140 bytes. + +- Reset AllScreens option at reconnection time if full screen mode + have to be automatically turned off. + +nxagent-3.4.0-12 + +- If one of the two full screen modes is active ('one screen' or 'all + screens') both keystrokes Ctrl-Alt-F and Ctrl-Alt-Shift-F change the + mode back to 'windowed'. + +- Fixed TR11H02405. XRenderFreePicture is called only for pictures + that were actually created on the X server side. + +- Ctrl+Alt+f switch fullscreen to all monitors, while Ctrl+Alt+Shift+f + does it to one monitor only. + +- If the fullscreen option is enabled at the startup, session starts + in the fullscreen mode on all monitors. + +- Added a call to XReparentWindow in the nxagentSwitchAllScreens(). + +- Corrected focus and grab when switching to fullscreen on + all monitors. + +- Removed a compile warning e deleted some unused variables. + +- Removed nxagentPointerAndKeyboardGrabbed variable. + +- Use the override redirect attribute to switch to fullscreen to all + monitors instead of send _NET_WM_FULLSCREEN_MONITORS hint to the WM. + +- Added nxagentMinimizeFromFullScreen(), nxagentMaximizeToFullScreen() + and nxagentCreateIconWindow(). + +- Removed check on EnterNotify to grab the keyboard in fullscreen + mode not only if mode is 'NotifyNormal'. + +nxagent-3.4.0-11 + +- Corrected switching between viewport mode and resize mode. + +- Fixed TR04H02340. Keycode is correctly translated in shadow sessions + also if the remote X display is using evdev. + +nxagent-3.4.0-10 + +- Handled XGrabKeyboard() return value. + +- Fixed TR10D01512. NumLock and CapsLock keys are now synchronized + between local and remote. + +nxagent-3.4.0-9 + +- Fixed TR06H02362. No icon was swown in the task bar. + +- Fixed keyboard grab in fullscreen mode. + +- Fixed compiler warnings. + +nxagent-3.4.0-8 + +- Grab the keyboard in fullscreen mode on EnterNotify only if mode is + 'NotifyNormal'. + +- Yield control in the dispatch loop in case we stop the smart sche- + duler timer while waiting for a reply from the remote display. + +nxagent-3.4.0-7 + +- Fixed TR08D01478. The communication with the compiz window manager + by means of the _NET_WM_PING property was not handled properly. + +- Fixed a type mismatch in XKB events on 64 bit platforms. + +- Moved grab/ungrab keyboard from focus in/out event to enter/leave + notify event. + +- Removed nxagentIconWindow because it's not longer used. + +nxagent-3.4.0-6 + +- Fixed TR09F02102. Problem was with pointer buttons map. + +- Fixed TR02H02327. Some KeyRelease events was discarded. + +- Fixed up Num and Caps locks. + +- Fixed TR03H02335. Emulated right mouse button for Mac clients. + +- Added utilities to print info about internal and remote windows. + +- Fixed TR01F01995. Solved a picture resource leak by destroying remo- + te pictures only when their reference counter returns to zero. + +- Fixed TR04H02337. Errors occurred because pictures with no drawable + were handled badly. + +- Implemented handling nxagent's private for gradient pictures and so- + lid fill picture. + +- Fixed BadMatch condition check in function ProcRenderComposite. + +- Fixed nxagentComposite() to handle situations with source picture + drawable pointing to NULL. + +- Implemented render acceleration for requests: CreateSolidFill, + CreateLinearGradient, CreateRadialGradient, CreateConicalGradient. + +- Fixed TR03G02196. Dialogs are shown to the fore when the NX session + is in fullscreen mode. + +- Changed mechanism to switch to fullscreen mode. Now the override + redirect attribute is no longer used and _NET_WM_STATE_FULLSCREEN + hint is sent to the WM. nxagent-3.4.0-5 diff --git a/programs/Xserver/hw/nxagent/Client.c b/programs/Xserver/hw/nxagent/Client.c index acfaab7..63ed0e1 100644 --- a/programs/Xserver/hw/nxagent/Client.c +++ b/programs/Xserver/hw/nxagent/Client.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Client.h b/programs/Xserver/hw/nxagent/Client.h index 45f87fc..a9b06c8 100644 --- a/programs/Xserver/hw/nxagent/Client.h +++ b/programs/Xserver/hw/nxagent/Client.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Clipboard.c b/programs/Xserver/hw/nxagent/Clipboard.c index eb83023..2742e14 100644 --- a/programs/Xserver/hw/nxagent/Clipboard.c +++ b/programs/Xserver/hw/nxagent/Clipboard.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Clipboard.h b/programs/Xserver/hw/nxagent/Clipboard.h index 2750ddf..43189df 100644 --- a/programs/Xserver/hw/nxagent/Clipboard.h +++ b/programs/Xserver/hw/nxagent/Clipboard.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Colormap.c b/programs/Xserver/hw/nxagent/Colormap.c index 259aa3b..b0f0507 100644 --- a/programs/Xserver/hw/nxagent/Colormap.c +++ b/programs/Xserver/hw/nxagent/Colormap.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Colormap.h b/programs/Xserver/hw/nxagent/Colormap.h index 8321e80..b296059 100644 --- a/programs/Xserver/hw/nxagent/Colormap.h +++ b/programs/Xserver/hw/nxagent/Colormap.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Composite.c b/programs/Xserver/hw/nxagent/Composite.c index b0640ff..c79104f 100644 --- a/programs/Xserver/hw/nxagent/Composite.c +++ b/programs/Xserver/hw/nxagent/Composite.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Composite.h b/programs/Xserver/hw/nxagent/Composite.h index fb1d6d8..e875d00 100644 --- a/programs/Xserver/hw/nxagent/Composite.h +++ b/programs/Xserver/hw/nxagent/Composite.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Cursor.c b/programs/Xserver/hw/nxagent/Cursor.c index 141ba3a..9ed7c23 100644 --- a/programs/Xserver/hw/nxagent/Cursor.c +++ b/programs/Xserver/hw/nxagent/Cursor.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Cursor.h b/programs/Xserver/hw/nxagent/Cursor.h index 11e407e..df7dc44 100644 --- a/programs/Xserver/hw/nxagent/Cursor.h +++ b/programs/Xserver/hw/nxagent/Cursor.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Dialog.c b/programs/Xserver/hw/nxagent/Dialog.c index 2f807b1..0fb9491 100644 --- a/programs/Xserver/hw/nxagent/Dialog.c +++ b/programs/Xserver/hw/nxagent/Dialog.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Dialog.h b/programs/Xserver/hw/nxagent/Dialog.h index aa845c7..bd12f30 100644 --- a/programs/Xserver/hw/nxagent/Dialog.h +++ b/programs/Xserver/hw/nxagent/Dialog.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Display.c b/programs/Xserver/hw/nxagent/Display.c index c950ef1..2c5450d 100644 --- a/programs/Xserver/hw/nxagent/Display.c +++ b/programs/Xserver/hw/nxagent/Display.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Display.h b/programs/Xserver/hw/nxagent/Display.h index 35b7857..454150d 100644 --- a/programs/Xserver/hw/nxagent/Display.h +++ b/programs/Xserver/hw/nxagent/Display.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Drawable.c b/programs/Xserver/hw/nxagent/Drawable.c index 7505709..9c16774 100644 --- a/programs/Xserver/hw/nxagent/Drawable.c +++ b/programs/Xserver/hw/nxagent/Drawable.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Drawable.h b/programs/Xserver/hw/nxagent/Drawable.h index 146610e..c987fa1 100644 --- a/programs/Xserver/hw/nxagent/Drawable.h +++ b/programs/Xserver/hw/nxagent/Drawable.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Error.c b/programs/Xserver/hw/nxagent/Error.c index 963cfa2..43bf859 100644 --- a/programs/Xserver/hw/nxagent/Error.c +++ b/programs/Xserver/hw/nxagent/Error.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Error.h b/programs/Xserver/hw/nxagent/Error.h index 2d6083d..e55fd71 100644 --- a/programs/Xserver/hw/nxagent/Error.h +++ b/programs/Xserver/hw/nxagent/Error.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Events.c b/programs/Xserver/hw/nxagent/Events.c index ca21423..b9da934 100644 --- a/programs/Xserver/hw/nxagent/Events.c +++ b/programs/Xserver/hw/nxagent/Events.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -76,7 +76,9 @@ #include "input.h" #endif +#define Time XlibXID #include "XKBlib.h" +#undef Time #define GC XlibGC #define Font XlibFont @@ -219,6 +221,16 @@ static void nxagentForwardRemoteExpose(void); static int nxagentClipAndSendExpose(WindowPtr pWin, pointer ptr); /* + * This is from NXproperty.c. + */ + +int GetWindowProperty(WindowPtr pWin, Atom property, long longOffset, + long longLength, Bool delete, Atom type, + Atom *actualType, int *format, unsigned + long *nItems, unsigned long *bytesAfter, + unsigned char **propData); + +/* * Associate a resource to a drawable and * store the region affected by the split * operation. @@ -274,6 +286,280 @@ void ProcessInputEvents() mieqProcessInputEvents(); } +#ifdef DEBUG_TREE + +/* + * Print ID and name of window. + */ + +void nxagentRemoteWindowID(Window window, Bool newline) +{ +#ifdef NO_I18N + char *winName; +#else + XTextProperty tp; +#endif + + fprintf(stderr, "0x%lx", window); + + if (!window) + { + fprintf(stderr, " (none) "); + } + else + { + if (window == DefaultRootWindow(nxagentDisplay)) + { + fprintf(stderr, " (the root window) "); + } + +#ifdef NO_I18N + + if (!XFetchName(nxagentDisplay, window, &winName)) + { + fprintf(stderr, " (has no name) "); + } + else if (winName) + { + fprintf(stderr, " \"%s\" ", winName); + XFree(winName); + } + +#else + + if (XGetWMName(nxagentDisplay, window, &tp) != 0) + { + fprintf(stderr, " (has no name) "); + } + else if (tp.nitems > 0) + { + int count = 0; + int i, ret; + char **list = NULL; + + fprintf(stderr, " \""); + + ret = XmbTextPropertyToTextList(nxagentDisplay, &tp, &list, &count); + + if ((ret == Success || ret > 0) && list != NULL) + { + for (i = 0; i < count; i++) + { + fprintf(stderr, "%s", list[i]); + } + + XFreeStringList(list); + } + else + { + fprintf(stderr, "%s", tp.value); + } + + fprintf(stderr, "\" "); + } + +#endif + + else + { + fprintf(stderr, " (has no name) "); + } + } + + if (newline == TRUE) + { + fprintf(stderr, "\n"); + } + + return; +} + +/* + * Print info about remote window. + */ + +void nxagentRemoteWindowInfo(Window win, int indent, Bool newLine) +{ + XWindowAttributes attributes; + int i; + + if (XGetWindowAttributes(nxagentDisplay, win, &attributes) == 0) + { + return; + } + + for (i = 0; i < indent; i++) + { + fprintf(stderr, " "); + } + + fprintf(stderr, "x=%d y=%d width=%d height=%d class=%s map_state=%s " + "override_redirect=%s\n", attributes.x, attributes.y, + attributes.width, attributes.height, (attributes.class == 0) ? + "InputOutput" : "InputOnly", (attributes.map_state == 0) ? + "IsUnmapped" : (attributes.map_state == 1 ? + "IsUnviewable" : "IsViewable"), + (attributes.override_redirect == 0) ? + "No" : "Yes" ); + + if (newLine == TRUE) + { + fprintf(stderr, "\n"); + } +} + +/* + * Walk remote windows tree. + */ + +void nxagentRemoteWindowsTree(Window window, int level) +{ + int i, j; + Window rootWin, parentWin; + unsigned int numChildren; + Window *childList; + + if (!XQueryTree(nxagentDisplay, window, &rootWin, &parentWin, &childList, + &numChildren)) + { + fprintf(stderr, "nxagentRemoteWindowsTree - XQueryTree failed.\n"); + + return; + } + + if (level == 0) + { + fprintf(stderr, "\n"); + + fprintf(stderr, " Root Window ID: "); + nxagentRemoteWindowID(rootWin, TRUE); + + fprintf(stderr, " Parent window ID: "); + nxagentRemoteWindowID(parentWin, TRUE); + } + + if (level == 0 || numChildren > 0) + { + fprintf(stderr, " "); + + for (j = 0; j < level; j++) + { + fprintf(stderr, " "); + } + + fprintf(stderr, "%d child%s%s\n", numChildren, (numChildren == 1) ? "" : + "ren", (numChildren == 1) ? ":" : "."); + } + + for (i = (int) numChildren - 1; i >= 0; i--) + { + fprintf(stderr, " "); + + for (j = 0; j < level; j++) + { + fprintf(stderr, " "); + } + + nxagentRemoteWindowID(childList[i], TRUE); + + nxagentRemoteWindowInfo(childList[i], (level * 5) + 6, TRUE); + + nxagentRemoteWindowsTree(childList[i], level + 1); + } + + if (childList) + { + XFree((char *) childList); + } +} + +/* + * Print info about internal window. + */ + +void nxagentInternalWindowInfo(WindowPtr pWin, int indent, Bool newLine) +{ + int i; + int result; + unsigned long ulReturnItems; + unsigned long ulReturnBytesLeft; + Atom atomReturnType; + int iReturnFormat; + unsigned char *pszReturnData = NULL; + + fprintf(stderr, "Window ID=[0x%lx] Remote ID=[0x%lx] ", pWin -> drawable.id, + nxagentWindow(pWin)); + + result = GetWindowProperty(pWin, MakeAtom("WM_NAME", 7, False) , 0, + sizeof(CARD32), False, AnyPropertyType, + &atomReturnType, &iReturnFormat, + &ulReturnItems, &ulReturnBytesLeft, + &pszReturnData); + + fprintf(stderr, "Name: "); + + if (result == Success && pszReturnData != NULL) + { + pszReturnData[ulReturnItems] = '\0'; + + fprintf(stderr, "\"%s\"\n", (char *) pszReturnData); + } + else + { + fprintf(stderr, "%s\n", "( has no name )"); + } + + for (i = 0; i < indent; i++) + { + fprintf(stderr, " "); + } + + fprintf(stderr, "x=%d y=%d width=%d height=%d class=%s map_state=%s " + "override_redirect=%s", pWin -> drawable.x, pWin -> drawable.y, + pWin -> drawable.width, pWin -> drawable.height, + (pWin -> drawable.class == 0) ? "InputOutput" : + "InputOnly", (pWin -> mapped == 0) ? + "IsUnmapped" : (pWin -> mapped == 1 ? + "IsUnviewable" : "IsViewable"), + (pWin -> overrideRedirect == 0) ? + "No" : "Yes"); + + if (newLine == TRUE) + { + fprintf(stderr, "\n"); + } +} + +/* + * Walk internal windows tree. + */ + +void nxagentInternalWindowsTree(WindowPtr pWin, int indent) +{ + WindowPtr pChild; + int i; + + while (pWin) + { + pChild = pWin -> firstChild; + + for (i = 0; i < indent; i++) + { + fprintf(stderr, " "); + } + + nxagentInternalWindowInfo(pWin, indent, TRUE); + + fprintf(stderr, "\n"); + + nxagentInternalWindowsTree(pChild, indent + 4); + + pWin = pWin -> nextSib; + } +} + +#endif /* DEBUG_TREE */ + void nxagentSwitchResizeMode(ScreenPtr pScreen) { XSizeHints sizeHints; @@ -290,8 +576,14 @@ void nxagentSwitchResizeMode(ScreenPtr pScreen) nxagentLaunchDialog(DIALOG_DISABLE_DESKTOP_RESIZE_MODE); - sizeHints.max_width = nxagentOption(RootWidth); - sizeHints.max_height = nxagentOption(RootHeight); + if (nxagentOption(Fullscreen) == 0) + { + sizeHints.max_width = nxagentOption(RootWidth); + sizeHints.max_height = nxagentOption(RootHeight); + + XSetWMNormalHints(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], + &sizeHints); + } } else { @@ -299,7 +591,8 @@ void nxagentSwitchResizeMode(ScreenPtr pScreen) nxagentLaunchDialog(DIALOG_ENABLE_DESKTOP_RESIZE_MODE); - nxagentRRSetScreenConfig(pScreen, nxagentOption(Width), nxagentOption(Height)); + nxagentRRSetScreenConfig(pScreen, nxagentOption(Width), + nxagentOption(Height)); if (nxagentOption(ClientOs) == ClientOsWinnt) { @@ -308,10 +601,10 @@ void nxagentSwitchResizeMode(ScreenPtr pScreen) sizeHints.max_width = WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); sizeHints.max_height = HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); - } - XSetWMNormalHints(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], - &sizeHints); + XSetWMNormalHints(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], + &sizeHints); + } } void nxagentShadowSwitchResizeMode(ScreenPtr pScreen) @@ -511,6 +804,7 @@ void nxagentDispatchEvents(PredicateFuncPtr predicate) Bool startKbd = False; Bool closeSession = False; Bool switchFullscreen = False; + Bool switchAllScreens = False; /* * Last entered top level window. @@ -655,6 +949,22 @@ void nxagentDispatchEvents(PredicateFuncPtr predicate) { break; } + + #ifdef DEBUG_TREE + + case doDebugTree: + { + fprintf(stderr, "\n ========== nxagentRemoteWindowsTree ==========\n"); + nxagentRemoteWindowsTree(nxagentWindow(WindowTable[0]), 0); + + fprintf(stderr, "\n========== nxagentInternalWindowsTree ==========\n"); + nxagentInternalWindowsTree(WindowTable[0], 0); + + break; + } + + #endif /* DEBUG_TREE */ + case doCloseSession: { closeSession = TRUE; @@ -679,6 +989,12 @@ void nxagentDispatchEvents(PredicateFuncPtr predicate) break; } + case doSwitchAllScreens: + { + switchAllScreens = TRUE; + + break; + } case doViewportMoveUp: { nxagentMoveViewport(pScreen, 0, -nxagentOption(Height)); @@ -779,6 +1095,8 @@ void nxagentDispatchEvents(PredicateFuncPtr predicate) if (nxagentOption(ViewOnly) == 0 && nxagentOption(Shadow) == 1 && result == doNothing) { + X.xkey.keycode = nxagentConvertKeycode(X.xkey.keycode); + NXShadowEvent(nxagentDisplay, X); } @@ -790,14 +1108,21 @@ void nxagentDispatchEvents(PredicateFuncPtr predicate) int sendKey = 0; /* +FIXME: If we don't flush the queue here, it could happen + that the inputInfo structure will not be up to date + when we perform the following check on down keys. +*/ + ProcessInputEvents(); + +/* FIXME: Don't enqueue the KeyRelease event if the key was not already pressed. This workaround avoids a fake KeyPress is enqueued by the XKEYBOARD extension. Another solution would be to let the events are enqueued and to remove the KeyPress afterwards. */ - - if (inputInfo.keyboard -> key -> down[X.xkey.keycode >> 3] & (1 << (X.xkey.keycode & 7))) + if (BitIsOn(inputInfo.keyboard -> key -> down, + nxagentConvertKeycode(X.xkey.keycode))) { sendKey = 1; } @@ -854,6 +1179,8 @@ FIXME: Don't enqueue the KeyRelease event if the key was if (nxagentOption(ViewOnly) == 0 && nxagentOption(Shadow)) { + X.xkey.keycode = nxagentConvertKeycode(X.xkey.keycode); + NXShadowEvent(nxagentDisplay, X); } } @@ -917,7 +1244,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was X.xbutton.subwindow == None)) { x.u.u.type = ButtonPress; - x.u.u.detail = X.xbutton.button; + x.u.u.detail = inputInfo.pointer -> button -> map[nxagentReversePointerMap[X.xbutton.button - 1]]; x.u.keyButtonPointer.time = nxagentLastEventTime = GetTimeInMillis(); if (nxagentOption(Rootless)) @@ -990,7 +1317,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was if (minimize != True) { x.u.u.type = ButtonRelease; - x.u.u.detail = X.xbutton.button; + x.u.u.detail = inputInfo.pointer -> button -> map[nxagentReversePointerMap[X.xbutton.button - 1]]; x.u.keyButtonPointer.time = nxagentLastEventTime = GetTimeInMillis(); if (nxagentOption(Rootless)) @@ -1344,13 +1671,11 @@ FIXME: Don't enqueue the KeyRelease event if the key was nxagentScreenTrap = 0; } - if (nxagentOption(Fullscreen)) + if (nxagentOption(Fullscreen) == 1 && + X.xcrossing.window == nxagentFullscreenWindow && + X.xcrossing.detail != NotifyInferior) { - if (X.xcrossing.window == nxagentFullscreenWindow && - X.xcrossing.detail != NotifyInferior) - { - nxagentGrabPointerAndKeyboard(&X); - } + nxagentGrabPointerAndKeyboard(&X); } if (X.xcrossing.detail != NotifyInferior) @@ -1399,14 +1724,11 @@ FIXME: Don't enqueue the KeyRelease event if the key was nxagentLastEnteredWindow = NULL; } - if (nxagentOption(Fullscreen)) + if (X.xcrossing.window == nxagentDefaultWindows[0] && + X.xcrossing.detail != NotifyInferior && + X.xcrossing.mode == NotifyNormal) { - if (X.xcrossing.window == nxagentFullscreenWindow && - X.xcrossing.detail != NotifyInferior && - X.xcrossing.mode == NotifyNormal) - { - nxagentUngrabPointerAndKeyboard(&X); - } + nxagentUngrabPointerAndKeyboard(&X); } if (X.xcrossing.detail != NotifyInferior) @@ -1660,7 +1982,8 @@ FIXME: Don't enqueue the KeyRelease event if the key was } if (nxagentUseNXTrans == 1 && nxagentOption(Rootless) == 0 && - nxagentOption(Nested) == 0 && X.xmap.window != nxagentIconWindow) + nxagentOption(Nested) == 0 && + X.xmap.window != nxagentIconWindow) { nxagentVisibility = VisibilityFullyObscured; } @@ -1699,14 +2022,17 @@ FIXME: Don't enqueue the KeyRelease event if the key was } } - if (nxagentOption(Fullscreen) == 1) + if (nxagentOption(AllScreens) == 1) { if (X.xmap.window == nxagentIconWindow) { pScreen = nxagentScreen(X.xmap.window); nxagentMaximizeToFullScreen(pScreen); } + } + if (nxagentOption(Fullscreen) == 1) + { nxagentVisibility = VisibilityUnobscured; nxagentVisibilityStop = False; nxagentVisibilityTimeout = GetTimeInMillis() + 2000; @@ -1716,10 +2042,17 @@ FIXME: Don't enqueue the KeyRelease event if the key was } case MappingNotify: { + XMappingEvent *mappingEvent = (XMappingEvent *) &X; + #ifdef DEBUG fprintf(stderr, "nxagentDispatchEvents: WARNING! Going to handle new MappingNotify event.\n"); #endif + if (mappingEvent -> request == MappingPointer) + { + nxagentInitPointerMap(); + } + break; } default: @@ -1793,20 +2126,40 @@ FIXME: Don't enqueue the KeyRelease event if the key was if (nxagentWMIsRunning) { - if (nxagentOption(Fullscreen)) + if (nxagentOption(AllScreens)) { nxagentMinimizeFromFullScreen(pScreen); } else { - XIconifyWindow(nxagentDisplay, nxagentDefaultWindows[0], DefaultScreen(nxagentDisplay)); + XIconifyWindow(nxagentDisplay, nxagentDefaultWindows[0], + DefaultScreen(nxagentDisplay)); } } } if (switchFullscreen) { - nxagentSwitchFullscreen(pScreen, !nxagentOption(Fullscreen)); + if (nxagentOption(AllScreens) == 1 && nxagentOption(Fullscreen) == 1) + { + nxagentSwitchAllScreens(pScreen, 0); + } + else + { + nxagentSwitchFullscreen(pScreen, !nxagentOption(Fullscreen)); + } + } + + if (switchAllScreens) + { + if (nxagentOption(AllScreens) == 0 && nxagentOption(Fullscreen) == 1) + { + nxagentSwitchFullscreen(pScreen, 0); + } + else + { + nxagentSwitchAllScreens(pScreen, !nxagentOption(AllScreens)); + } } if (startKbd) @@ -1959,8 +2312,16 @@ int nxagentHandleKeyPress(XEvent *X, enum HandleEventResult *result) return 1; } - nxagentLastEventTime = nxagentLastKeyPressTime = GetTimeInMillis(); + if (X -> xkey.keycode == 66) + { + nxagentXkbState.Caps = (~nxagentXkbState.Caps & 1); + } + else if (X -> xkey.keycode == 77) + { + nxagentXkbState.Num = (~nxagentXkbState.Num & 1); + } + nxagentLastEventTime = nxagentLastKeyPressTime = GetTimeInMillis(); x.u.u.type = KeyPress; x.u.u.detail = nxagentConvertKeycode(X -> xkey.keycode); @@ -2398,7 +2759,8 @@ int nxagentHandleClientMessageEvent(XEvent *X, enum HandleEventResult *result) } if (X -> xclient.window == (nxagentOption(Fullscreen) ? - nxagentIconWindow : nxagentDefaultWindows[0])) + nxagentIconWindow : nxagentDefaultWindows[0]) || + nxagentWMIsRunning == 0) { *result = doCloseSession; } @@ -2995,7 +3357,7 @@ int nxagentHandleConfigureNotify(XEvent* X) if (X -> xconfigure.window == nxagentDefaultWindows[pScreen -> myNum]) { - if (nxagentOption(Fullscreen) == 0) + if (nxagentOption(AllScreens) == 0) { if (nxagentOption(DesktopResize) == 1) { @@ -3064,6 +3426,34 @@ int nxagentHandleConfigureNotify(XEvent* X) doRandR = 0; } + nxagentChangeOption(Width, X -> xconfigure.width); + nxagentChangeOption(Height, X -> xconfigure.height); + + XMoveResizeWindow(nxagentDisplay, nxagentInputWindows[0], 0, 0, + X -> xconfigure.width, X -> xconfigure.height); + + if (nxagentOption(Fullscreen) == 0) + { + nxagentMoveViewport(pScreen, 0, 0); + } + else + { + nxagentChangeOption(RootX, (nxagentOption(Width) - + nxagentOption(RootWidth)) / 2); + nxagentChangeOption(RootY, (nxagentOption(Height) - + nxagentOption(RootHeight)) / 2); + nxagentChangeOption(ViewportXSpan, nxagentOption(Width) - + nxagentOption(RootWidth)); + nxagentChangeOption(ViewportYSpan, nxagentOption(Height) - + nxagentOption(RootHeight)); + + nxagentUpdateViewportFrame(0, 0, nxagentOption(RootWidth), + nxagentOption(RootHeight)); + + XMoveWindow(nxagentDisplay, nxagentWindow(WindowTable[pScreen -> myNum]), + nxagentOption(RootX), nxagentOption(RootY)); + } + if (doRandR) { #ifdef TEST @@ -3085,8 +3475,6 @@ int nxagentHandleConfigureNotify(XEvent* X) int nxagentHandleReparentNotify(XEvent* X) { - ScreenPtr pScreen = nxagentScreen(X -> xreparent.window); - #ifdef TEST fprintf(stderr, "nxagentHandleReparentNotify: Going to handle a new reparent event.\n"); #endif @@ -3203,7 +3591,6 @@ int nxagentHandleReparentNotify(XEvent* X) XlibWindow *childrenReturn = NULL; unsigned int nchildrenReturn = 0; Status result; - XSizeHints hints; XWindowAttributes attributes; int x, y; int xParent, yParent; @@ -3443,6 +3830,8 @@ void nxagentGrabPointerAndKeyboard(XEvent *X) int resource; + int result; + #ifdef TEST fprintf(stderr, "nxagentGrabPointerAndKeyboard: Grabbing pointer and keyboard with event at [%p].\n", (void *) X); @@ -3461,8 +3850,22 @@ void nxagentGrabPointerAndKeyboard(XEvent *X) fprintf(stderr, "nxagentGrabPointerAndKeyboard: Going to grab the keyboard in context [B1].\n"); #endif - XGrabKeyboard(nxagentDisplay, nxagentFullscreenWindow, - True, GrabModeAsync, GrabModeAsync, now); + result = XGrabKeyboard(nxagentDisplay, nxagentFullscreenWindow, + True, GrabModeAsync, GrabModeAsync, now); + + if (result != GrabSuccess) + { + return; + } + + /* + * The smart scheduler could be stopped while + * waiting for the reply. In this case we need + * to yield explicitly to avoid to be stuck in + * the dispatch loop forever. + */ + + isItTimeToYield = 1; #ifdef TEST fprintf(stderr, "nxagentGrabPointerAndKeyboard: Going to grab the pointer in context [B2].\n"); diff --git a/programs/Xserver/hw/nxagent/Events.h b/programs/Xserver/hw/nxagent/Events.h index 238a229..c74fa15 100644 --- a/programs/Xserver/hw/nxagent/Events.h +++ b/programs/Xserver/hw/nxagent/Events.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -29,9 +29,11 @@ enum HandleEventResult { doNothing = 0, doMinimize, + doDebugTree, doCloseSession, doStartKbd, doSwitchFullscreen, + doSwitchAllScreens, doViewportMoveUp, doViewportMoveLeft, doViewportMoveRight, diff --git a/programs/Xserver/hw/nxagent/Extensions.c b/programs/Xserver/hw/nxagent/Extensions.c index e76cbb4..aced24f 100644 --- a/programs/Xserver/hw/nxagent/Extensions.c +++ b/programs/Xserver/hw/nxagent/Extensions.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Extensions.h b/programs/Xserver/hw/nxagent/Extensions.h index 620645d..5335cf8 100644 --- a/programs/Xserver/hw/nxagent/Extensions.h +++ b/programs/Xserver/hw/nxagent/Extensions.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Font.c b/programs/Xserver/hw/nxagent/Font.c index 13b8193..178ed3c 100644 --- a/programs/Xserver/hw/nxagent/Font.c +++ b/programs/Xserver/hw/nxagent/Font.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -1269,7 +1269,7 @@ Bool nxagentReconnectFailedFonts(void *p0) const int maxAttempt = 5; char **fontPaths, **localFontPaths, **newFontPaths; - char fontServerPath[256]; + char fontServerPath[256] = ""; int nPaths = 0; Bool repeat = True; diff --git a/programs/Xserver/hw/nxagent/Font.h b/programs/Xserver/hw/nxagent/Font.h index 75ae3f6..63cb6aa 100644 --- a/programs/Xserver/hw/nxagent/Font.h +++ b/programs/Xserver/hw/nxagent/Font.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/GC.c b/programs/Xserver/hw/nxagent/GC.c index c53e3b9..71562d9 100644 --- a/programs/Xserver/hw/nxagent/GC.c +++ b/programs/Xserver/hw/nxagent/GC.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/GCOps.c b/programs/Xserver/hw/nxagent/GCOps.c index 8573079..e18b034 100644 --- a/programs/Xserver/hw/nxagent/GCOps.c +++ b/programs/Xserver/hw/nxagent/GCOps.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/GCOps.h b/programs/Xserver/hw/nxagent/GCOps.h index 7ae6d99..fa4967a 100644 --- a/programs/Xserver/hw/nxagent/GCOps.h +++ b/programs/Xserver/hw/nxagent/GCOps.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/GCs.h b/programs/Xserver/hw/nxagent/GCs.h index bec2900..f7e1347 100644 --- a/programs/Xserver/hw/nxagent/GCs.h +++ b/programs/Xserver/hw/nxagent/GCs.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Handlers.c b/programs/Xserver/hw/nxagent/Handlers.c index be407f1..310b572 100644 --- a/programs/Xserver/hw/nxagent/Handlers.c +++ b/programs/Xserver/hw/nxagent/Handlers.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Handlers.h b/programs/Xserver/hw/nxagent/Handlers.h index fe8aeef..3d3b335 100644 --- a/programs/Xserver/hw/nxagent/Handlers.h +++ b/programs/Xserver/hw/nxagent/Handlers.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Holder.c b/programs/Xserver/hw/nxagent/Holder.c index a9ac77c..bfd907c 100644 --- a/programs/Xserver/hw/nxagent/Holder.c +++ b/programs/Xserver/hw/nxagent/Holder.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Holder.h b/programs/Xserver/hw/nxagent/Holder.h index 9896aee..c39b987 100644 --- a/programs/Xserver/hw/nxagent/Holder.h +++ b/programs/Xserver/hw/nxagent/Holder.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Icons.h b/programs/Xserver/hw/nxagent/Icons.h index 2189238..3ac2e1a 100644 --- a/programs/Xserver/hw/nxagent/Icons.h +++ b/programs/Xserver/hw/nxagent/Icons.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Image.c b/programs/Xserver/hw/nxagent/Image.c index e8405ed..e499b7a 100644 --- a/programs/Xserver/hw/nxagent/Image.c +++ b/programs/Xserver/hw/nxagent/Image.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Image.h b/programs/Xserver/hw/nxagent/Image.h index 7805b03..57272ab 100644 --- a/programs/Xserver/hw/nxagent/Image.h +++ b/programs/Xserver/hw/nxagent/Image.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Imakefile b/programs/Xserver/hw/nxagent/Imakefile index 0b3d3b1..254267e 100644 --- a/programs/Xserver/hw/nxagent/Imakefile +++ b/programs/Xserver/hw/nxagent/Imakefile @@ -206,7 +206,8 @@ DEFINES = -g $(OS_DEFINES) $(EXT_DEFINES) $(UPG_DEFINES) \ -DNXAGENT_SPLASH \ -DNXAGENT_ARTSD \ -UNX_DEBUG_INPUT \ - -UPANORAMIX + -UPANORAMIX \ + -UDEBUG_TREE all:: $(OBJS) diff --git a/programs/Xserver/hw/nxagent/Init.c b/programs/Xserver/hw/nxagent/Init.c index 15335e3..89a85db 100644 --- a/programs/Xserver/hw/nxagent/Init.c +++ b/programs/Xserver/hw/nxagent/Init.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -74,7 +74,7 @@ is" without express or implied warranty. #undef DEBUG #undef DUMP -#define NXAGENT_VERSION "3.4.0.5" +#define NXAGENT_VERSION "3.5.0.2" /* * ProcVector array defined in tables.c. @@ -193,7 +193,7 @@ void InitOutput(ScreenInfo *screenInfo, int argc, char *argv[]) if (serverGeneration <= 1) { fprintf(stderr, "\nNXAGENT - Version " NXAGENT_VERSION "\n\n"); - fprintf(stderr, "Copyright (C) 2001, 2010 NoMachine.\n"); + fprintf(stderr, "Copyright (C) 2001, 2011 NoMachine.\n"); fprintf(stderr, "See http://www.nomachine.com/ for more information.\n\n"); fprintf(stderr, "Info: Agent running with pid '%d'.\n", getpid()); diff --git a/programs/Xserver/hw/nxagent/Init.h b/programs/Xserver/hw/nxagent/Init.h index 576c1a7..cf154e8 100644 --- a/programs/Xserver/hw/nxagent/Init.h +++ b/programs/Xserver/hw/nxagent/Init.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Keyboard.c b/programs/Xserver/hw/nxagent/Keyboard.c index b991072..a34bce7 100644 --- a/programs/Xserver/hw/nxagent/Keyboard.c +++ b/programs/Xserver/hw/nxagent/Keyboard.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Keyboard.h b/programs/Xserver/hw/nxagent/Keyboard.h index 1a95335..0e11a8a 100644 --- a/programs/Xserver/hw/nxagent/Keyboard.h +++ b/programs/Xserver/hw/nxagent/Keyboard.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Keystroke.c b/programs/Xserver/hw/nxagent/Keystroke.c index a2e4fb0..6c6e477 100644 --- a/programs/Xserver/hw/nxagent/Keystroke.c +++ b/programs/Xserver/hw/nxagent/Keystroke.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -92,6 +92,18 @@ int nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result) { switch (sym) { + #ifdef DEBUG_TREE + + case XK_q: + case XK_Q: + { + *result = doDebugTree; + + break; + } + + #endif /* DEBUG_TREE */ + case XK_t: case XK_T: { @@ -104,7 +116,7 @@ int nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result) { if (nxagentOption(Rootless) == False) { - *result = doSwitchFullscreen; + *result = doSwitchAllScreens; } break; @@ -270,6 +282,16 @@ int nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result) { switch (sym) { + case XK_f: + case XK_F: + { + if (nxagentOption(Rootless) == 0) + { + *result = doSwitchFullscreen; + } + + break; + } case XK_Left: case XK_KP_Left: { diff --git a/programs/Xserver/hw/nxagent/Keystroke.h b/programs/Xserver/hw/nxagent/Keystroke.h index e9ca59f..ef71a88 100644 --- a/programs/Xserver/hw/nxagent/Keystroke.h +++ b/programs/Xserver/hw/nxagent/Keystroke.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/LICENSE b/programs/Xserver/hw/nxagent/LICENSE index 141ca13..8446e6f 100644 --- a/programs/Xserver/hw/nxagent/LICENSE +++ b/programs/Xserver/hw/nxagent/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2001, 2010 NoMachine - http://www.nomachine.com/. +Copyright (c) 2001, 2011 NoMachine - http://www.nomachine.com/. NXAGENT and NX extensions to X are copyright of NoMachine. diff --git a/programs/Xserver/hw/nxagent/Literals.h b/programs/Xserver/hw/nxagent/Literals.h index 377dd7e..aaa3430 100644 --- a/programs/Xserver/hw/nxagent/Literals.h +++ b/programs/Xserver/hw/nxagent/Literals.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Millis.c b/programs/Xserver/hw/nxagent/Millis.c index bde85f0..e9c739e 100644 --- a/programs/Xserver/hw/nxagent/Millis.c +++ b/programs/Xserver/hw/nxagent/Millis.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Millis.h b/programs/Xserver/hw/nxagent/Millis.h index 2125eca..69d247b 100644 --- a/programs/Xserver/hw/nxagent/Millis.h +++ b/programs/Xserver/hw/nxagent/Millis.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXdispatch.c b/programs/Xserver/hw/nxagent/NXdispatch.c index 5106ffa..4f59b80 100644 --- a/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/programs/Xserver/hw/nxagent/NXdispatch.c @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXdispatch.c.NX.original b/programs/Xserver/hw/nxagent/NXdispatch.c.NX.original index 5106ffa..4f59b80 100644 --- a/programs/Xserver/hw/nxagent/NXdispatch.c.NX.original +++ b/programs/Xserver/hw/nxagent/NXdispatch.c.NX.original @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXdixfonts.c b/programs/Xserver/hw/nxagent/NXdixfonts.c index 0d85842..1cccfd9 100644 --- a/programs/Xserver/hw/nxagent/NXdixfonts.c +++ b/programs/Xserver/hw/nxagent/NXdixfonts.c @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXdixfonts.c.NX.original b/programs/Xserver/hw/nxagent/NXdixfonts.c.NX.original index 0d85842..1cccfd9 100644 --- a/programs/Xserver/hw/nxagent/NXdixfonts.c.NX.original +++ b/programs/Xserver/hw/nxagent/NXdixfonts.c.NX.original @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXevents.c b/programs/Xserver/hw/nxagent/NXevents.c index cd8ced7..f697cf3 100644 --- a/programs/Xserver/hw/nxagent/NXevents.c +++ b/programs/Xserver/hw/nxagent/NXevents.c @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXevents.c.NX.original b/programs/Xserver/hw/nxagent/NXevents.c.NX.original index cd8ced7..f697cf3 100644 --- a/programs/Xserver/hw/nxagent/NXevents.c.NX.original +++ b/programs/Xserver/hw/nxagent/NXevents.c.NX.original @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXextension.c b/programs/Xserver/hw/nxagent/NXextension.c index 852ad15..1d86bf8 100644 --- a/programs/Xserver/hw/nxagent/NXextension.c +++ b/programs/Xserver/hw/nxagent/NXextension.c @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXextension.c.NX.original b/programs/Xserver/hw/nxagent/NXextension.c.NX.original index 852ad15..1d86bf8 100644 --- a/programs/Xserver/hw/nxagent/NXextension.c.NX.original +++ b/programs/Xserver/hw/nxagent/NXextension.c.NX.original @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXglyph.c b/programs/Xserver/hw/nxagent/NXglyph.c index 5524819..22483b3 100644 --- a/programs/Xserver/hw/nxagent/NXglyph.c +++ b/programs/Xserver/hw/nxagent/NXglyph.c @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXglyph.c.NX.original b/programs/Xserver/hw/nxagent/NXglyph.c.NX.original index 5524819..22483b3 100644 --- a/programs/Xserver/hw/nxagent/NXglyph.c.NX.original +++ b/programs/Xserver/hw/nxagent/NXglyph.c.NX.original @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXglyphcurs.c b/programs/Xserver/hw/nxagent/NXglyphcurs.c index 614d2db..9212bf4 100644 --- a/programs/Xserver/hw/nxagent/NXglyphcurs.c +++ b/programs/Xserver/hw/nxagent/NXglyphcurs.c @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXglyphcurs.c.NX.original b/programs/Xserver/hw/nxagent/NXglyphcurs.c.NX.original index 614d2db..9212bf4 100644 --- a/programs/Xserver/hw/nxagent/NXglyphcurs.c.NX.original +++ b/programs/Xserver/hw/nxagent/NXglyphcurs.c.NX.original @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXglyphstr.h b/programs/Xserver/hw/nxagent/NXglyphstr.h index 08ffb35..0f122be 100644 --- a/programs/Xserver/hw/nxagent/NXglyphstr.h +++ b/programs/Xserver/hw/nxagent/NXglyphstr.h @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXglyphstr.h.NX.original b/programs/Xserver/hw/nxagent/NXglyphstr.h.NX.original index 08ffb35..0f122be 100644 --- a/programs/Xserver/hw/nxagent/NXglyphstr.h.NX.original +++ b/programs/Xserver/hw/nxagent/NXglyphstr.h.NX.original @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXmiglyph.c b/programs/Xserver/hw/nxagent/NXmiglyph.c index 806cf29..09901ba 100644 --- a/programs/Xserver/hw/nxagent/NXmiglyph.c +++ b/programs/Xserver/hw/nxagent/NXmiglyph.c @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXmiglyph.c.NX.original b/programs/Xserver/hw/nxagent/NXmiglyph.c.NX.original index 806cf29..09901ba 100644 --- a/programs/Xserver/hw/nxagent/NXmiglyph.c.NX.original +++ b/programs/Xserver/hw/nxagent/NXmiglyph.c.NX.original @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXpicture.c b/programs/Xserver/hw/nxagent/NXpicture.c index a9c501b..d32cdb6 100644 --- a/programs/Xserver/hw/nxagent/NXpicture.c +++ b/programs/Xserver/hw/nxagent/NXpicture.c @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXpicture.c.NX.original b/programs/Xserver/hw/nxagent/NXpicture.c.NX.original index a9c501b..d32cdb6 100644 --- a/programs/Xserver/hw/nxagent/NXpicture.c.NX.original +++ b/programs/Xserver/hw/nxagent/NXpicture.c.NX.original @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXpicturestr.h b/programs/Xserver/hw/nxagent/NXpicturestr.h index 26a95fe..91eab01 100644 --- a/programs/Xserver/hw/nxagent/NXpicturestr.h +++ b/programs/Xserver/hw/nxagent/NXpicturestr.h @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXpicturestr.h.NX.original b/programs/Xserver/hw/nxagent/NXpicturestr.h.NX.original index 26a95fe..91eab01 100644 --- a/programs/Xserver/hw/nxagent/NXpicturestr.h.NX.original +++ b/programs/Xserver/hw/nxagent/NXpicturestr.h.NX.original @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXproperty.c b/programs/Xserver/hw/nxagent/NXproperty.c index 14b6136..20a6bd6 100644 --- a/programs/Xserver/hw/nxagent/NXproperty.c +++ b/programs/Xserver/hw/nxagent/NXproperty.c @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXproperty.c.NX.original b/programs/Xserver/hw/nxagent/NXproperty.c.NX.original index 14b6136..20a6bd6 100644 --- a/programs/Xserver/hw/nxagent/NXproperty.c.NX.original +++ b/programs/Xserver/hw/nxagent/NXproperty.c.NX.original @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXrandr.c b/programs/Xserver/hw/nxagent/NXrandr.c index b7039e1..d593fa6 100644 --- a/programs/Xserver/hw/nxagent/NXrandr.c +++ b/programs/Xserver/hw/nxagent/NXrandr.c @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXrandr.c.NX.original b/programs/Xserver/hw/nxagent/NXrandr.c.NX.original index b7039e1..d593fa6 100644 --- a/programs/Xserver/hw/nxagent/NXrandr.c.NX.original +++ b/programs/Xserver/hw/nxagent/NXrandr.c.NX.original @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXrender.c b/programs/Xserver/hw/nxagent/NXrender.c index 0940a36..43607ac 100644 --- a/programs/Xserver/hw/nxagent/NXrender.c +++ b/programs/Xserver/hw/nxagent/NXrender.c @@ -31,7 +31,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXrender.c.NX.original b/programs/Xserver/hw/nxagent/NXrender.c.NX.original index 0940a36..43607ac 100644 --- a/programs/Xserver/hw/nxagent/NXrender.c.NX.original +++ b/programs/Xserver/hw/nxagent/NXrender.c.NX.original @@ -31,7 +31,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXwindow.c b/programs/Xserver/hw/nxagent/NXwindow.c index 0954cf8..95ecde9 100644 --- a/programs/Xserver/hw/nxagent/NXwindow.c +++ b/programs/Xserver/hw/nxagent/NXwindow.c @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXwindow.c.NX.original b/programs/Xserver/hw/nxagent/NXwindow.c.NX.original index 0954cf8..95ecde9 100644 --- a/programs/Xserver/hw/nxagent/NXwindow.c.NX.original +++ b/programs/Xserver/hw/nxagent/NXwindow.c.NX.original @@ -6,7 +6,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXxrandr.c b/programs/Xserver/hw/nxagent/NXxrandr.c index 8d05175..37b2c74 100644 --- a/programs/Xserver/hw/nxagent/NXxrandr.c +++ b/programs/Xserver/hw/nxagent/NXxrandr.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXxrandr.h b/programs/Xserver/hw/nxagent/NXxrandr.h index 4e800e9..160dc65 100644 --- a/programs/Xserver/hw/nxagent/NXxrandr.h +++ b/programs/Xserver/hw/nxagent/NXxrandr.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/NXxrandrint.h b/programs/Xserver/hw/nxagent/NXxrandrint.h index ae3a03d..97ae77e 100644 --- a/programs/Xserver/hw/nxagent/NXxrandrint.h +++ b/programs/Xserver/hw/nxagent/NXxrandrint.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Options.c b/programs/Xserver/hw/nxagent/Options.c index 1f04b0d..5d78556 100644 --- a/programs/Xserver/hw/nxagent/Options.c +++ b/programs/Xserver/hw/nxagent/Options.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Options.h b/programs/Xserver/hw/nxagent/Options.h index 1bc7eaa..7850a05 100644 --- a/programs/Xserver/hw/nxagent/Options.h +++ b/programs/Xserver/hw/nxagent/Options.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -103,6 +103,13 @@ typedef struct _AgentOptions int Fullscreen; /* + * True if the fullscreen NX session will + * extend on all available screens. + */ + + int AllScreens; + + /* * Set to the auto-disconnect timeout, if * the user activated this feature. */ diff --git a/programs/Xserver/hw/nxagent/Pixels.c b/programs/Xserver/hw/nxagent/Pixels.c index 10c705d..d3ab9dd 100644 --- a/programs/Xserver/hw/nxagent/Pixels.c +++ b/programs/Xserver/hw/nxagent/Pixels.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Pixels.h b/programs/Xserver/hw/nxagent/Pixels.h index e046771..918d74d 100644 --- a/programs/Xserver/hw/nxagent/Pixels.h +++ b/programs/Xserver/hw/nxagent/Pixels.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -108,6 +108,12 @@ FIXME: The condition checking for the render avoid problems with the render composi- te on XFree86 remote server. */ +/* +FIXME: Changed macro: NXAGENT_SHOULD_DEFER_COMPOSITE + to handle situation, when pSrc -> pDrawable + is NULL. This case happens with gradients + and solid fill. + #define NXAGENT_SHOULD_DEFER_COMPOSITE(pSrc, pMask, pDst) \ ((nxagentRenderVersionMajor == 0 && \ nxagentRenderVersionMinor == 8 && \ @@ -118,6 +124,18 @@ FIXME: The condition checking for the render nxagentOption(DeferLevel) == 1) || \ (nxagentOption(DeferLevel) >= 2 && \ nxagentOption(LinkType) < LINK_TYPE_ADSL)) +*/ +#define NXAGENT_SHOULD_DEFER_COMPOSITE(pSrc, pMask, pDst) \ + ((nxagentRenderVersionMajor == 0 && \ + nxagentRenderVersionMinor == 8 && \ + (pDst) -> pDrawable -> type == DRAWABLE_PIXMAP) || \ + (nxagentOption(DeferLevel) >= 2 && \ + nxagentOption(LinkType) < LINK_TYPE_ADSL) || \ + (nxagentOption(DeferLevel) == 1 && \ + (pDst) -> pDrawable -> type == DRAWABLE_PIXMAP && \ + (((pSrc) -> pDrawable && nxagentDrawableStatus((pSrc) -> pDrawable) == NotSynchronized) || \ + ((pMask) && nxagentDrawableStatus((pMask) -> pDrawable) == NotSynchronized)))) + #define NXAGENT_SHOULD_DEFER_PUTIMAGE(pDrawable) \ (nxagentSplitTrap == 0 && \ diff --git a/programs/Xserver/hw/nxagent/Pixmap.c b/programs/Xserver/hw/nxagent/Pixmap.c index 1718c73..ad7e9c3 100644 --- a/programs/Xserver/hw/nxagent/Pixmap.c +++ b/programs/Xserver/hw/nxagent/Pixmap.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Pixmaps.h b/programs/Xserver/hw/nxagent/Pixmaps.h index 234650d..98d5666 100644 --- a/programs/Xserver/hw/nxagent/Pixmaps.h +++ b/programs/Xserver/hw/nxagent/Pixmaps.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Pointer.c b/programs/Xserver/hw/nxagent/Pointer.c index 34012d3..a751974 100644 --- a/programs/Xserver/hw/nxagent/Pointer.c +++ b/programs/Xserver/hw/nxagent/Pointer.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -57,6 +57,13 @@ is" without express or implied warranty. #undef TEST #undef DEBUG +/* + * The nxagentReversePointerMap array is used to + * memorize remote display pointer map. + */ + +unsigned char nxagentReversePointerMap[MAXBUTTONS]; + void nxagentChangePointerControl(DeviceIntPtr pDev, PtrCtrl *ctrl) { /* @@ -125,6 +132,8 @@ int nxagentPointerProc(DeviceIntPtr pDev, int onoff) return Success; } + nxagentInitPointerMap(); + nxagentEnablePointerEvents(); break; @@ -155,3 +164,28 @@ int nxagentPointerProc(DeviceIntPtr pDev, int onoff) return Success; } + +void nxagentInitPointerMap(void) +{ + int numButtons; + + int i; + + unsigned char pointerMap[MAXBUTTONS]; + + #ifdef DEBUG + fprintf(stderr, "nxagentInitPointerMap: Going to retrieve the " + "pointer map from remote display.\n"); + #endif + + numButtons = XGetPointerMapping(nxagentDisplay, pointerMap, MAXBUTTONS); + + /* + * Computing revers pointer map. + */ + + for (i = 1; i <= numButtons; i++) + { + nxagentReversePointerMap[pointerMap[i - 1] - 1] = i; + } +} diff --git a/programs/Xserver/hw/nxagent/Pointer.h b/programs/Xserver/hw/nxagent/Pointer.h index 0807b08..3b9ccce 100644 --- a/programs/Xserver/hw/nxagent/Pointer.h +++ b/programs/Xserver/hw/nxagent/Pointer.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -38,8 +38,17 @@ is" without express or implied warranty. (ButtonPressMask | ButtonReleaseMask | PointerMotionMask | \ EnterWindowMask | LeaveWindowMask) +/* + * The nxagentReversePointerMap array is used to + * memorize remote display pointer map. + */ + +extern unsigned char nxagentReversePointerMap[MAXBUTTONS]; + void nxagentChangePointerControl(DeviceIntPtr pDev, PtrCtrl *ctrl); int nxagentPointerProc(DeviceIntPtr pDev, int onoff); +void nxagentInitPointerMap(void); + #endif /* __Pointer_H__ */ diff --git a/programs/Xserver/hw/nxagent/Reconnect.c b/programs/Xserver/hw/nxagent/Reconnect.c index 598ffc1..b786602 100644 --- a/programs/Xserver/hw/nxagent/Reconnect.c +++ b/programs/Xserver/hw/nxagent/Reconnect.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -81,6 +81,8 @@ extern Bool nxagentUninstallFontServerPath(void); extern void nxagentRemoveXConnection(void); +extern void nxagentInitPointerMap(void); + static char *nxagentGetReconnectError(void); void nxagentInitializeRecLossyLevel(void); @@ -584,6 +586,8 @@ Bool nxagentReconnectSession(void) nxagentOldKeyboard = NULL; } + nxagentInitPointerMap(); + nxagentDeactivatePointerGrab(); nxagentWakeupByReconnect(); diff --git a/programs/Xserver/hw/nxagent/Reconnect.h b/programs/Xserver/hw/nxagent/Reconnect.h index 12d0742..c321bfa 100644 --- a/programs/Xserver/hw/nxagent/Reconnect.h +++ b/programs/Xserver/hw/nxagent/Reconnect.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Render.c b/programs/Xserver/hw/nxagent/Render.c index 6bc54c8..6c74c14 100644 --- a/programs/Xserver/hw/nxagent/Render.c +++ b/programs/Xserver/hw/nxagent/Render.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -147,8 +147,6 @@ void nxagentCursorPostSaveRenderInfo(CursorPtr pCursor, ScreenPtr pScreen, int nxagentCreatePicture(PicturePtr pPicture, Mask mask); -void nxagentDestroyPicture(PicturePtr pPicture); - int nxagentChangePictureClip(PicturePtr pPicture, int clipType, int nRects, xRectangle *rects, int xOrigin, int yOrigin); @@ -586,16 +584,16 @@ XRenderPictFormat *nxagentMatchingFormats(PictFormatPtr pFormat) void nxagentDestroyPicture(PicturePtr pPicture) { + if (pPicture == NULL || nxagentPicturePriv(pPicture) -> picture == 0) + { + return; + } + #ifdef TEST fprintf(stderr, "nxagentDestroyPicture: Going to destroy picture at [%p].\n", (void *) pPicture); #endif - if (pPicture == NULL) - { - return; - } - XRenderFreePicture(nxagentDisplay, nxagentPicturePriv(pPicture) -> picture); @@ -1010,12 +1008,15 @@ void nxagentComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pD #ifdef DEBUG - fprintf(stderr, "nxagentComposite: Source Picture [%lu][%p] with drawable [%s%s][%p].\n", - nxagentPicturePriv(pSrc) -> picture, (void *) pSrc, - (pSrc -> pDrawable -> type == DRAWABLE_PIXMAP && - nxagentIsShmPixmap((PixmapPtr) pSrc -> pDrawable)) ? "Shared " : "", - pSrc -> pDrawable -> type == DRAWABLE_PIXMAP ? "Pixmap" : "Window", - (void *) pSrc -> pDrawable); + if (pSrc -> pDrawable != NULL) + { + fprintf(stderr, "nxagentComposite: Source Picture [%lu][%p] with drawable [%s%s][%p].\n", + nxagentPicturePriv(pSrc) -> picture, (void *) pSrc, + (pSrc -> pDrawable -> type == DRAWABLE_PIXMAP && + nxagentIsShmPixmap((PixmapPtr) pSrc -> pDrawable)) ? "Shared " : "", + pSrc -> pDrawable -> type == DRAWABLE_PIXMAP ? "Pixmap" : "Window", + (void *) pSrc -> pDrawable); + } fprintf(stderr, "nxagentComposite: Destination Picture [%lu][%p] with drawable [%s%s][%p].\n", nxagentPicturePriv(pDst) -> picture, (void *) pDst, @@ -1064,16 +1065,19 @@ void nxagentComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pD * the wrong data. */ - nxagentSynchronizeShmPixmap(pSrc -> pDrawable, xSrc, ySrc, width, height); - - if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) + if (pSrc -> pDrawable != NULL) { - #ifdef TEST - fprintf(stderr, "nxagentComposite: Synchronizing the source drawable [%p].\n", - (void *) pSrc -> pDrawable); - #endif + nxagentSynchronizeShmPixmap(pSrc -> pDrawable, xSrc, ySrc, width, height); - nxagentSynchronizeDrawable(pSrc -> pDrawable, DO_WAIT, NEVER_BREAK, NULL); + if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) + { + #ifdef TEST + fprintf(stderr, "nxagentComposite: Synchronizing the source drawable [%p].\n", + (void *) pSrc -> pDrawable); + #endif + + nxagentSynchronizeDrawable(pSrc -> pDrawable, DO_WAIT, NEVER_BREAK, NULL); + } } if (pDst -> pDrawable != pSrc -> pDrawable) @@ -2811,3 +2815,248 @@ Bool nxagentDisconnectAllPicture() return True; } +void nxagentRenderCreateSolidFill(PicturePtr pPicture, xRenderColor *color) +{ + Picture id; + + if (nxagentRenderEnable == False) + { + return; + } + + #ifdef DEBUG + + fprintf(stderr, "nxagentRenderCreateSolidFill: Got called.\n"); + + if (pPicture == NULL) + { + fprintf(stderr, "nxagentRenderCreateSolidFill: WARNING! pPicture pointer is NULL.\n"); + } + + if (color == NULL) + { + fprintf(stderr, "nxagentRenderCreateSolidFill: WARNING! color pointer is NULL.\n"); + } + + #endif /* #ifdef DEBUG */ + + memset(&(nxagentPicturePriv(pPicture) -> lastServerValues), 0, + sizeof(XRenderPictureAttributes_)); + + id = XRenderCreateSolidFill(nxagentDisplay, (XRenderColor *) color); + + #ifdef DEBUG + XSync(nxagentDisplay, 0); + #endif + + #ifdef TEST + fprintf(stderr, "nxagentRenderCreateSolidFill: Created solid fill xid [%lu].\n", id); + #endif + + nxagentPicturePriv(pPicture) -> picture = id; +} + +void nxagentRenderCreateLinearGradient(PicturePtr pPicture, xPointFixed *p1, + xPointFixed *p2, int nStops, + xFixed *stops, + xRenderColor *colors) +{ + Picture id; + + XLinearGradient linearGradient; + + if (nxagentRenderEnable == False) + { + return; + } + + #ifdef DEBUG + + fprintf(stderr, "nxagentRenderCreateLinearGradient: Got called.\n"); + + if (pPicture == NULL) + { + fprintf(stderr, "nxagentRenderCreateLinearGradient: WARNING! pPicture pointer is NULL.\n"); + } + + if (p1 == NULL) + { + fprintf(stderr, "nxagentRenderCreateLinearGradient: WARNING! p1 pointer is NULL.\n"); + } + + if (p2 == NULL) + { + fprintf(stderr, "nxagentRenderCreateLinearGradient: WARNING! p2 pointer is NULL.\n"); + } + + if (stops == NULL) + { + fprintf(stderr, "nxagentRenderCreateLinearGradient: WARNING! stops pointer is NULL.\n"); + } + + if (colors == NULL) + { + fprintf(stderr, "nxagentRenderCreateLinearGradient: WARNING! colors pointer is NULL.\n"); + } + + #endif /* #ifdef DEBUG */ + + memset(&(nxagentPicturePriv(pPicture) -> lastServerValues), 0, + sizeof(XRenderPictureAttributes_)); + + linearGradient.p1.x = (XFixed) p1 -> x; + linearGradient.p1.y = (XFixed) p1 -> y; + linearGradient.p2.x = (XFixed) p2 -> x; + linearGradient.p2.y = (XFixed) p2 -> y; + + id = XRenderCreateLinearGradient(nxagentDisplay, &linearGradient, + (XFixed *) stops, + (XRenderColor *) colors, nStops); + + #ifdef DEBUG + XSync(nxagentDisplay, 0); + #endif + + #ifdef TEST + fprintf(stderr, "nxagentRenderCreateLinearGradient: Created linear gradient xid [%lu].\n", id); + #endif + + nxagentPicturePriv(pPicture) -> picture = id; +} + +void nxagentRenderCreateRadialGradient(PicturePtr pPicture, xPointFixed *inner, + xPointFixed *outer, + xFixed innerRadius, + xFixed outerRadius, + int nStops, + xFixed *stops, + xRenderColor *colors) +{ + Picture id; + + XRadialGradient radialGradient; + + if (nxagentRenderEnable == False) + { + return; + } + + #ifdef DEBUG + + fprintf(stderr, "nxagentRenderCreateRadialGradient: Got called.\n"); + + if (pPicture == NULL) + { + fprintf(stderr, "nxagentRenderCreateRadialGradient: WARNING! pPicture pointer is NULL.\n"); + } + + if (inner == NULL) + { + fprintf(stderr, "nxagentRenderCreateRadialGradient: WARNING! inner pointer is NULL.\n"); + } + + if (outer == NULL) + { + fprintf(stderr, "nxagentRenderCreateRadialGradient: WARNING! outer pointer is NULL.\n"); + } + + if (stops == NULL) + { + fprintf(stderr, "nxagentRenderCreateRadialGradient: WARNING! stops pointer is NULL.\n"); + } + + if (colors == NULL) + { + fprintf(stderr, "nxagentRenderCreateRadialGradient: WARNING! colors pointer is NULL.\n"); + } + + #endif /* #ifdef DEBUG */ + + memset(&(nxagentPicturePriv(pPicture) -> lastServerValues), 0, + sizeof(XRenderPictureAttributes_)); + + radialGradient.inner.x = (XFixed) inner -> x; + radialGradient.inner.y = (XFixed) inner -> y; + radialGradient.inner.radius = (XFixed) innerRadius; + radialGradient.outer.x = (XFixed) outer -> x; + radialGradient.outer.y = (XFixed) outer -> y; + radialGradient.outer.radius = (XFixed) outerRadius; + + id = XRenderCreateRadialGradient(nxagentDisplay, &radialGradient, + (XFixed *) stops, + (XRenderColor *) colors, nStops); + + #ifdef DEBUG + XSync(nxagentDisplay, 0); + #endif + + #ifdef TEST + fprintf(stderr, "nxagentRenderCreateRadialGradient: Created radial gradient xid [%lu].\n", id); + #endif + + nxagentPicturePriv(pPicture) -> picture = id; +} + +void nxagentRenderCreateConicalGradient(PicturePtr pPicture, + xPointFixed *center, + xFixed angle, int nStops, + xFixed *stops, + xRenderColor *colors) +{ + Picture id; + + XConicalGradient conicalGradient; + + if (nxagentRenderEnable == False) + { + return; + } + + #ifdef DEBUG + + fprintf(stderr, "nxagentRenderCreateConicalGradient: Got called.\n"); + + if (pPicture == NULL) + { + fprintf(stderr, "nxagentRenderCreateConicalGradient: WARNING! pPicture pointer is NULL.\n"); + } + + if (center == NULL) + { + fprintf(stderr, "nxagentRenderCreateConicalGradient: WARNING! center pointer is NULL.\n"); + } + + if (stops == NULL) + { + fprintf(stderr, "nxagentRenderCreateConicalGradient: WARNING! stops pointer is NULL.\n"); + } + + if (colors == NULL) + { + fprintf(stderr, "nxagentRenderCreateConicalGradient: WARNING! colors pointer is NULL.\n"); + } + + #endif /* #ifdef DEBUG */ + + memset(&(nxagentPicturePriv(pPicture) -> lastServerValues), 0, + sizeof(XRenderPictureAttributes_)); + + conicalGradient.center.x = (XFixed) center -> x; + conicalGradient.center.y = (XFixed) center -> y; + conicalGradient.angle = (XFixed) angle; + + id = XRenderCreateConicalGradient(nxagentDisplay, &conicalGradient, + (XFixed *) stops, + (XRenderColor *) colors, nStops); + + #ifdef DEBUG + XSync(nxagentDisplay, 0); + #endif + + #ifdef TEST + fprintf(stderr, "nxagentRenderCreateConicalGradient: Created conical gradient xid [%lu].\n", id); + #endif + + nxagentPicturePriv(pPicture) -> picture = id; +} + diff --git a/programs/Xserver/hw/nxagent/Render.h b/programs/Xserver/hw/nxagent/Render.h index 81ba336..6f61ca8 100644 --- a/programs/Xserver/hw/nxagent/Render.h +++ b/programs/Xserver/hw/nxagent/Render.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -105,4 +105,6 @@ void nxagentDisconnectPicture(pointer p0, XID x1, void* p2); void nxagentReconnectGlyphSet(void* p0, XID x1, void *p2); +void nxagentDestroyPicture(PicturePtr pPicture); + #endif /* __Render_H__ */ diff --git a/programs/Xserver/hw/nxagent/Rootless.c b/programs/Xserver/hw/nxagent/Rootless.c index a8ce4c7..74d2d1f 100644 --- a/programs/Xserver/hw/nxagent/Rootless.c +++ b/programs/Xserver/hw/nxagent/Rootless.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -625,7 +625,9 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value) { XlibAtom *atoms = malloc(nUnits * sizeof(*atoms)); Atom *input = value; + char *atomName = NULL; int i; + int j = 0; freeMem = True; export = True; @@ -633,16 +635,41 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value) for (i = 0; i < nUnits; i++) { - atoms[i] = nxagentLocalToRemoteAtom(input[i]); - - if (atoms[i] == None) - { - #ifdef WARNING - fprintf(stderr, "nxagentExportProperty: WARNING! Failed to convert local atom %ld [%s].\n", - (long int) input[i], validateString(NameForAtom(input[i]))); - #endif - } + /* + * Exporting the _NET_WM_PING property could + * result in rootless windows being grayed out + * when the compiz window manager is running. + * + * Better solution would probably be to handle + * the communication with the window manager + * instead of just getting rid of the property. + */ + + if ((atomName = NameForAtom(input[i])) != NULL && + strcmp(atomName, "_NET_WM_PING") != 0) + { + atoms[j] = nxagentLocalToRemoteAtom(input[i]); + + if (atoms[j] == None) + { + #ifdef WARNING + fprintf(stderr, "nxagentExportProperty: WARNING! Failed to convert local atom %ld [%s].\n", + (long int) input[i], validateString(atomName)); + #endif + } + + j++; + } + #ifdef TEST + else + { + fprintf(stderr, "nxagentExportProperty: WARNING! " + "Not exporting the _NET_WM_PING property.\n"); + } + #endif } + + nUnits = j; } else if (strcmp(typeS, "WINDOW") == 0) { @@ -700,7 +727,57 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value) } else { - XChangeProperty(nxagentDisplay, nxagentWindow(pWin), propertyX, typeX, format, mode, (void*)output, nUnits); + #ifdef TEST + fprintf(stderr, "nxagentExportProperty: Property [%lu] format [%i] " + "units [%lu].\n", propertyX, format, nUnits); + #endif + + if ((format >> 3) * nUnits + sizeof(xChangePropertyReq) < + (MAX_REQUEST_SIZE << 2)) + { + XChangeProperty(nxagentDisplay, nxagentWindow(pWin), propertyX, typeX, + format, mode, (void*)output, nUnits); + } + else if (mode == PropModeReplace) + { + int n; + char *data; + + XDeleteProperty(nxagentDisplay, nxagentWindow(pWin), propertyX); + + data = (char *) output; + + while (nUnits > 0) + { + if ((format >> 3) * nUnits + sizeof(xChangePropertyReq) < + (MAX_REQUEST_SIZE << 2)) + { + n = nUnits; + } + else + { + n = ((MAX_REQUEST_SIZE << 2) - sizeof(xChangePropertyReq)) / + (format >> 3); + } + + XChangeProperty(nxagentDisplay, nxagentWindow(pWin), propertyX, + typeX, format, PropModeAppend, (void*) data, n); + + nUnits -= n; + + data = (char *) data + n * (format >> 3); + } + } + else + { + #ifdef WARNING + fprintf(stderr, "nxagentExportProperty: WARNING! " + "Property [%lu] too long.\n", propertyX); + #endif + + goto nxagentExportPropertyError; + } + nxagentAddPropertyToList(propertyX, pWin); } } @@ -715,6 +792,8 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value) #endif } + nxagentExportPropertyError: + if (freeMem) { xfree(output); diff --git a/programs/Xserver/hw/nxagent/Rootless.h b/programs/Xserver/hw/nxagent/Rootless.h index ece4c9d..1ea258d 100644 --- a/programs/Xserver/hw/nxagent/Rootless.h +++ b/programs/Xserver/hw/nxagent/Rootless.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Screen.c b/programs/Xserver/hw/nxagent/Screen.c index 28f17ca..2919970 100644 --- a/programs/Xserver/hw/nxagent/Screen.c +++ b/programs/Xserver/hw/nxagent/Screen.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -292,7 +292,7 @@ void nxagentMinimizeFromFullScreen(ScreenPtr pScreen) { XUnmapWindow(nxagentDisplay, nxagentFullscreenWindow); - if(nxagentIpaq) + if (nxagentIpaq) { XMapWindow(nxagentDisplay, nxagentIconWindow); XIconifyWindow(nxagentDisplay, nxagentIconWindow, @@ -307,7 +307,7 @@ void nxagentMinimizeFromFullScreen(ScreenPtr pScreen) void nxagentMaximizeToFullScreen(ScreenPtr pScreen) { - if(nxagentIpaq) + if (nxagentIpaq) { XUnmapWindow(nxagentDisplay, nxagentIconWindow); @@ -334,7 +334,7 @@ FIXME: We'll chech for ReparentNotify and LeaveNotify events after XReparentWind for (i = 0; i < 100 && nxagentWMIsRunning; i++) { #ifdef TEST - fprintf(stderr, "nxagentSwitchFullscreen: WARNING! Going to wait for the ReparentNotify event.\n"); + fprintf(stderr, "nxagentMaximizeToFullscreen: WARNING! Going to wait for the ReparentNotify event.\n"); #endif if (XCheckTypedWindowEvent(nxagentDisplay, nxagentFullscreenWindow, ReparentNotify, &e)) @@ -981,6 +981,10 @@ Bool nxagentOpenScreen(int index, ScreenPtr pScreen, nxagentChangeOption(Fullscreen, False); + nxagentChangeOption(AllScreens, False); + + nxagentFullscreenWindow = 0; + resetAgentPosition = True; } @@ -1384,10 +1388,13 @@ N/A nxagentChangeOption(Height, gattributes.height); } - if (nxagentOption(Fullscreen)) + if (nxagentOption(AllScreens)) { - attributes.override_redirect = True; + attributes.override_redirect = True; + } + if (nxagentOption(Fullscreen)) + { /* * We need to disable the host's screensaver or * it will otherwise grab the screen even if it @@ -1614,7 +1621,7 @@ N/A nxagentReconnectTrap == 1) { valuemask = CWBackPixel | CWEventMask | CWColormap | - (nxagentOption(Fullscreen) == 1 ? CWOverrideRedirect : 0); + (nxagentOption(AllScreens) == 1 ? CWOverrideRedirect : 0); attributes.background_pixel = nxagentBlackPixel; @@ -1622,10 +1629,13 @@ N/A attributes.colormap = nxagentDefaultVisualColormap(nxagentDefaultVisual(pScreen)); - if (nxagentOption(Fullscreen) == 1) + if (nxagentOption(AllScreens) == 1) { attributes.override_redirect = True; + } + if (nxagentOption(Fullscreen) == 1) + { if (nxagentReconnectTrap) { /* @@ -1771,7 +1781,7 @@ N/A sizeHints.width = nxagentOption(RootWidth); sizeHints.height = nxagentOption(RootHeight); - if (nxagentOption(DesktopResize) == 1) + if (nxagentOption(DesktopResize) == 1 || nxagentOption(Fullscreen) == 1) { sizeHints.max_width = WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); sizeHints.max_height = HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); @@ -1816,30 +1826,14 @@ N/A XClearWindow(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum]); - if (nxagentOption(Fullscreen)) - { - valuemask = CWBackPixmap | CWColormap | CWOverrideRedirect; - } - else - { - valuemask = CWBackPixmap | CWColormap; - } - - attributes.background_pixmap = nxagentScreenSaverPixmap; - attributes.colormap = DefaultColormap(nxagentDisplay, DefaultScreen(nxagentDisplay)); - - if (nxagentOption(Fullscreen)) + if (nxagentOption(AllScreens)) { - attributes.override_redirect = False; if (nxagentReconnectTrap) { XGrabKeyboard(nxagentDisplay, nxagentFullscreenWindow, True, GrabModeAsync, GrabModeAsync, CurrentTime); } - } - if (nxagentOption(Fullscreen)) - { nxagentIconWindow = nxagentCreateIconWindow(); } else @@ -1897,13 +1891,6 @@ N/A */ XSetWMProtocols(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], &deleteWMatom, 1); - - /* - if (nxagentOption(Fullscreen)) - { - XSetWMProtocols(nxagentDisplay, nxagentIconWindow, &deleteWMatom, 1); - } - */ } else { @@ -2202,8 +2189,6 @@ Bool nxagentResizeScreen(ScreenPtr pScreen, int width, int height, int oldMmWidth; int oldMmHeight; - RegionPtr pRootWinSize; - #ifdef TEST nxagentPrintAgentGeometry("Before Resize Screen", "nxagentResizeScreen:"); #endif @@ -2283,13 +2268,10 @@ FIXME: We should try to restore the previously if (nxagentOption(Fullscreen)) { - nxagentChangeOption(Width, WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay))); - nxagentChangeOption(Height, HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay))); - - nxagentChangeOption(RootX, (WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)) - - nxagentOption(RootWidth)) / 2); - nxagentChangeOption(RootY, (HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay)) - - nxagentOption(RootHeight)) / 2); + nxagentChangeOption(RootX, (nxagentOption(Width) - + nxagentOption(RootWidth)) / 2); + nxagentChangeOption(RootY, (nxagentOption(Height) - + nxagentOption(RootHeight)) / 2); } else { @@ -2301,62 +2283,6 @@ FIXME: We should try to restore the previously nxagentChangeOption(ViewportYSpan, nxagentOption(Height) - nxagentOption(RootHeight)); /* - * Change agent window size and size hints. - */ - - sizeHints.flags = PPosition | PMinSize | PMaxSize; - sizeHints.x = nxagentOption(X); - sizeHints.y = nxagentOption(Y); - - sizeHints.min_width = MIN_NXAGENT_WIDTH; - sizeHints.min_height = MIN_NXAGENT_HEIGHT; - sizeHints.width = width; - sizeHints.height = height; - - if (nxagentOption(DesktopResize) == 1) - { - sizeHints.max_width = WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); - sizeHints.max_height = HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); - } - else - { - sizeHints.max_width = nxagentOption(RootWidth); - sizeHints.max_height = nxagentOption(RootHeight); - } - - if (nxagentUserGeometry.flag & XValue || nxagentUserGeometry.flag & YValue) - { - sizeHints.flags |= USPosition; - } - - if (nxagentUserGeometry.flag & WidthValue || nxagentUserGeometry.flag & HeightValue) - { - sizeHints.flags |= USSize; - } - - XSetWMNormalHints(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], &sizeHints); - - if (nxagentOption(Fullscreen)) - { - XResizeWindow(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], - WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)), - HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay))); - - XResizeWindow(nxagentDisplay, nxagentInputWindows[pScreen -> myNum], - WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)), - HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay))); - } - else - { - XResizeWindow(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], width, height); - - if (nxagentOption(Rootless) == 0) - { - XResizeWindow(nxagentDisplay, nxagentInputWindows[pScreen -> myNum], width, height); - } - } - - /* * Set properties for the agent root window. */ @@ -2377,8 +2303,6 @@ FIXME: We should try to restore the previously (*pScreen -> PositionWindow)(WindowTable[pScreen -> myNum], 0, 0); - pRootWinSize = &WindowTable[pScreen -> myNum] -> winSize; - nxagentSetRootClip(pScreen, 1); XMoveWindow(nxagentDisplay, nxagentWindow(WindowTable[0]), @@ -2386,6 +2310,12 @@ FIXME: We should try to restore the previously nxagentMoveViewport(pScreen, 0, 0); + /* + * Update pointer bounds. + */ + + ScreenRestructured(pScreen); + #ifdef TEST nxagentPrintAgentGeometry("After Resize Screen", "nxagentResizeScreen:"); #endif diff --git a/programs/Xserver/hw/nxagent/Screen.h b/programs/Xserver/hw/nxagent/Screen.h index 6ffebe0..5b19577 100644 --- a/programs/Xserver/hw/nxagent/Screen.h +++ b/programs/Xserver/hw/nxagent/Screen.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -48,6 +48,7 @@ extern ScreenPtr nxagentDefaultScreen; extern Pixmap nxagentPixmapLogo; extern Window nxagentIconWindow; + extern Window nxagentFullscreenWindow; extern RegionRec nxagentShadowUpdateRegion; @@ -61,6 +62,8 @@ extern short nxagentShadowUid; void nxagentSetScreenInfo(ScreenInfo *screenInfo); void nxagentSetPixmapFormats(ScreenInfo *screenInfo); +void nxagentPrintGeometry(); + extern Window nxagentDefaultWindows[MAXSCREENS]; extern Window nxagentInputWindows[MAXSCREENS]; extern Window nxagentScreenSaverWindows[MAXSCREENS]; @@ -87,6 +90,7 @@ extern int nxagentBitsPerPixel(int depth); void nxagentSetScreenSaverTime(void); void nxagentMinimizeFromFullScreen(ScreenPtr pScreen); + void nxagentMaximizeToFullScreen(ScreenPtr pScreen); Window nxagentCreateIconWindow(void); diff --git a/programs/Xserver/hw/nxagent/Splash.c b/programs/Xserver/hw/nxagent/Splash.c index 7425bac..027a7a3 100644 --- a/programs/Xserver/hw/nxagent/Splash.c +++ b/programs/Xserver/hw/nxagent/Splash.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Splash.h b/programs/Xserver/hw/nxagent/Splash.h index 91f18b7..ee6908a 100644 --- a/programs/Xserver/hw/nxagent/Splash.h +++ b/programs/Xserver/hw/nxagent/Splash.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Split.c b/programs/Xserver/hw/nxagent/Split.c index bf7f705..4cc2ea6 100644 --- a/programs/Xserver/hw/nxagent/Split.c +++ b/programs/Xserver/hw/nxagent/Split.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Split.h b/programs/Xserver/hw/nxagent/Split.h index 60be29b..2be449a 100644 --- a/programs/Xserver/hw/nxagent/Split.h +++ b/programs/Xserver/hw/nxagent/Split.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/TestExt.c b/programs/Xserver/hw/nxagent/TestExt.c index 1d5fdee..6bce2ea 100644 --- a/programs/Xserver/hw/nxagent/TestExt.c +++ b/programs/Xserver/hw/nxagent/TestExt.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Trap.c b/programs/Xserver/hw/nxagent/Trap.c index 22de3bc..f5e6bde 100644 --- a/programs/Xserver/hw/nxagent/Trap.c +++ b/programs/Xserver/hw/nxagent/Trap.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Trap.h b/programs/Xserver/hw/nxagent/Trap.h index aa6937e..9258e3b 100644 --- a/programs/Xserver/hw/nxagent/Trap.h +++ b/programs/Xserver/hw/nxagent/Trap.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Utils.h b/programs/Xserver/hw/nxagent/Utils.h index 830b275..f5bd55d 100644 --- a/programs/Xserver/hw/nxagent/Utils.h +++ b/programs/Xserver/hw/nxagent/Utils.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Visual.c b/programs/Xserver/hw/nxagent/Visual.c index f389316..b086c0e 100644 --- a/programs/Xserver/hw/nxagent/Visual.c +++ b/programs/Xserver/hw/nxagent/Visual.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Visual.h b/programs/Xserver/hw/nxagent/Visual.h index c682f92..8436f79 100644 --- a/programs/Xserver/hw/nxagent/Visual.h +++ b/programs/Xserver/hw/nxagent/Visual.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/Window.c b/programs/Xserver/hw/nxagent/Window.c index 449458a..3e6d41d 100644 --- a/programs/Xserver/hw/nxagent/Window.c +++ b/programs/Xserver/hw/nxagent/Window.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -692,6 +692,73 @@ void nxagentRestackWindow(WindowPtr pWin, WindowPtr pOldNextSib) void nxagentSwitchFullscreen(ScreenPtr pScreen, Bool switchOn) { + XEvent e; + + if (nxagentOption(Rootless) == 1) + { + return; + } + + if (switchOn == 0) + { + nxagentWMDetect(); + + /* + * The smart scheduler could be stopped while + * waiting for the reply. In this case we need + * to yield explicitly to avoid to be stuck in + * the dispatch loop forever. + */ + + isItTimeToYield = 1; + + if (nxagentWMIsRunning == 0) + { + #ifdef WARNING + fprintf(stderr, "Warning: Can't switch to window mode, no window manager " + "has been detected.\n"); + #endif + + return; + } + } + + #ifdef TEST + fprintf(stderr, "nxagentSwitchFullscreen: Switching to %s mode.\n", + switchOn ? "fullscreen" : "windowed"); + #endif + + nxagentChangeOption(Fullscreen, switchOn); + + memset(&e, 0, sizeof(e)); + + e.xclient.type = ClientMessage; + e.xclient.message_type = nxagentAtoms[13]; /* _NET_WM_STATE */ + e.xclient.display = nxagentDisplay; + e.xclient.window = nxagentDefaultWindows[pScreen -> myNum]; + e.xclient.format = 32; + e.xclient.data.l[0] = nxagentOption(Fullscreen) ? 1 : 0; + e.xclient.data.l[1] = nxagentAtoms[14]; /* _NET_WM_STATE_FULLSCREEN */ + + XSendEvent(nxagentDisplay, DefaultRootWindow(nxagentDisplay), False, + SubstructureRedirectMask, &e); + + if (switchOn == 1) + { + nxagentFullscreenWindow = nxagentDefaultWindows[pScreen -> myNum]; + + nxagentGrabPointerAndKeyboard(NULL); + } + else + { + nxagentFullscreenWindow = None; + + nxagentUngrabPointerAndKeyboard(NULL); + } +} + +void nxagentSwitchAllScreens(ScreenPtr pScreen, Bool switchOn) +{ Window w; XSetWindowAttributes attributes; unsigned long valuemask; @@ -721,6 +788,8 @@ void nxagentSwitchFullscreen(ScreenPtr pScreen, Bool switchOn) XUnmapWindow(nxagentDisplay, w); XChangeWindowAttributes(nxagentDisplay, w, valuemask, &attributes); + XReparentWindow(nxagentDisplay, w, DefaultRootWindow(nxagentDisplay), 0, 0); + if (switchOn) { /* @@ -738,7 +807,7 @@ void nxagentSwitchFullscreen(ScreenPtr pScreen, Bool switchOn) for (i = 0; i < 100 && nxagentWMIsRunning; i++) { #ifdef TEST - fprintf(stderr, "nxagentSwitchFullscreen: WARNING! Going to wait for the ReparentNotify event.\n"); + fprintf(stderr, "nxagentSwitchAllScreens: WARNING! Going to wait for the ReparentNotify event.\n"); #endif if (XCheckTypedWindowEvent(nxagentDisplay, w, ReparentNotify, &e)) @@ -767,6 +836,8 @@ void nxagentSwitchFullscreen(ScreenPtr pScreen, Bool switchOn) */ nxagentChangeOption(Fullscreen, True); + nxagentChangeOption(AllScreens, True); + /* * Save the window-mode configuration. @@ -845,9 +916,9 @@ void nxagentSwitchFullscreen(ScreenPtr pScreen, Bool switchOn) */ #ifdef WARNING - fprintf(stderr, "nxagentSwitchFullscreen: WARNING! Expected ReparentNotify event missing.\n"); + fprintf(stderr, "nxagentSwitchAllScreens: WARNING! Expected ReparentNotify event missing.\n"); #endif - + nxagentWMIsRunning = False; attributes.override_redirect = False; XChangeWindowAttributes(nxagentDisplay, w, valuemask, &attributes); @@ -861,7 +932,6 @@ void nxagentSwitchFullscreen(ScreenPtr pScreen, Bool switchOn) * It could be necessary: * - To restore screensaver. * - To set or reset nxagentForceBackingStore flag. - * - To grab keyboard. * - To propagate device settings to the X server if no WM is running. */ @@ -870,7 +940,10 @@ void nxagentSwitchFullscreen(ScreenPtr pScreen, Bool switchOn) */ nxagentChangeOption(Fullscreen, False); + nxagentChangeOption(AllScreens, False); + XDestroyWindow(nxagentDisplay, nxagentIconWindow); + nxagentIconWindow = nxagentFullscreenWindow = None; if (nxagentOption(DesktopResize) == 1) @@ -920,7 +993,7 @@ void nxagentSwitchFullscreen(ScreenPtr pScreen, Bool switchOn) XMoveResizeWindow(nxagentDisplay, nxagentInputWindows[0], 0, 0, nxagentOption(Width), nxagentOption(Height)); - nxagentSetPrintGeometry(pScreen -> myNum); + nxagentSetPrintGeometry(pScreen -> myNum); } #ifdef VIEWPORT_FRAME @@ -2422,6 +2495,11 @@ void nxagentMapDefaultWindows() #endif XMapWindow(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum]); + + if (nxagentOption(Fullscreen) == 1 && nxagentWMIsRunning == 1) + { + nxagentMaximizeToFullScreen(pScreen); + } } /* diff --git a/programs/Xserver/hw/nxagent/Windows.h b/programs/Xserver/hw/nxagent/Windows.h index 6fc97b3..3ca74ba 100644 --- a/programs/Xserver/hw/nxagent/Windows.h +++ b/programs/Xserver/hw/nxagent/Windows.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -222,6 +222,8 @@ void nxagentSetTopLevelEventMask(WindowPtr pWin); void nxagentSwitchFullscreen(ScreenPtr pScreen, Bool switchOn); +void nxagentSwitchAllScreens(ScreenPtr pScreen, Bool switchOn); + void nxagentMoveViewport(ScreenPtr pScreen, int hShift, int vShift); #ifdef VIEWPORT_FRAME diff --git a/programs/Xserver/hw/nxagent/X/NXdamage.c b/programs/Xserver/hw/nxagent/X/NXdamage.c index 7bc1c74..cf5d48b 100644 --- a/programs/Xserver/hw/nxagent/X/NXdamage.c +++ b/programs/Xserver/hw/nxagent/X/NXdamage.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXdamage.c.NX.original b/programs/Xserver/hw/nxagent/X/NXdamage.c.NX.original index 7bc1c74..cf5d48b 100644 --- a/programs/Xserver/hw/nxagent/X/NXdamage.c.NX.original +++ b/programs/Xserver/hw/nxagent/X/NXdamage.c.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXdispatch.c b/programs/Xserver/hw/nxagent/X/NXdispatch.c index ba4e1e6..69ad30d 100644 --- a/programs/Xserver/hw/nxagent/X/NXdispatch.c +++ b/programs/Xserver/hw/nxagent/X/NXdispatch.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXdispatch.c.NX.original b/programs/Xserver/hw/nxagent/X/NXdispatch.c.NX.original index ba4e1e6..69ad30d 100644 --- a/programs/Xserver/hw/nxagent/X/NXdispatch.c.NX.original +++ b/programs/Xserver/hw/nxagent/X/NXdispatch.c.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXdixfonts.c b/programs/Xserver/hw/nxagent/X/NXdixfonts.c index 225ecda..04fc047 100644 --- a/programs/Xserver/hw/nxagent/X/NXdixfonts.c +++ b/programs/Xserver/hw/nxagent/X/NXdixfonts.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXdixfonts.c.NX.original b/programs/Xserver/hw/nxagent/X/NXdixfonts.c.NX.original index 225ecda..04fc047 100644 --- a/programs/Xserver/hw/nxagent/X/NXdixfonts.c.NX.original +++ b/programs/Xserver/hw/nxagent/X/NXdixfonts.c.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXevents.c b/programs/Xserver/hw/nxagent/X/NXevents.c index 8e87d58..c5593ad 100644 --- a/programs/Xserver/hw/nxagent/X/NXevents.c +++ b/programs/Xserver/hw/nxagent/X/NXevents.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXevents.c.NX.original b/programs/Xserver/hw/nxagent/X/NXevents.c.NX.original index 8e87d58..c5593ad 100644 --- a/programs/Xserver/hw/nxagent/X/NXevents.c.NX.original +++ b/programs/Xserver/hw/nxagent/X/NXevents.c.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXextension.c b/programs/Xserver/hw/nxagent/X/NXextension.c index 6e67b7f..ead9b9d 100644 --- a/programs/Xserver/hw/nxagent/X/NXextension.c +++ b/programs/Xserver/hw/nxagent/X/NXextension.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXextension.c.NX.original b/programs/Xserver/hw/nxagent/X/NXextension.c.NX.original index 6e67b7f..ead9b9d 100644 --- a/programs/Xserver/hw/nxagent/X/NXextension.c.NX.original +++ b/programs/Xserver/hw/nxagent/X/NXextension.c.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXglxext.c b/programs/Xserver/hw/nxagent/X/NXglxext.c index 172252b..51c5479 100644 --- a/programs/Xserver/hw/nxagent/X/NXglxext.c +++ b/programs/Xserver/hw/nxagent/X/NXglxext.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXglxext.c.NX.original b/programs/Xserver/hw/nxagent/X/NXglxext.c.NX.original index 172252b..51c5479 100644 --- a/programs/Xserver/hw/nxagent/X/NXglxext.c.NX.original +++ b/programs/Xserver/hw/nxagent/X/NXglxext.c.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXglyph.c b/programs/Xserver/hw/nxagent/X/NXglyph.c index 6340de5..cd65fdc 100644 --- a/programs/Xserver/hw/nxagent/X/NXglyph.c +++ b/programs/Xserver/hw/nxagent/X/NXglyph.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXglyph.c.NX.original b/programs/Xserver/hw/nxagent/X/NXglyph.c.NX.original index 6340de5..cd65fdc 100644 --- a/programs/Xserver/hw/nxagent/X/NXglyph.c.NX.original +++ b/programs/Xserver/hw/nxagent/X/NXglyph.c.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXglyphcurs.c b/programs/Xserver/hw/nxagent/X/NXglyphcurs.c index d6cd966..7a1d813 100644 --- a/programs/Xserver/hw/nxagent/X/NXglyphcurs.c +++ b/programs/Xserver/hw/nxagent/X/NXglyphcurs.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXglyphcurs.c.NX.original b/programs/Xserver/hw/nxagent/X/NXglyphcurs.c.NX.original index d6cd966..7a1d813 100644 --- a/programs/Xserver/hw/nxagent/X/NXglyphcurs.c.NX.original +++ b/programs/Xserver/hw/nxagent/X/NXglyphcurs.c.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXglyphstr.h b/programs/Xserver/hw/nxagent/X/NXglyphstr.h index e78a1bf..fa6b5fb 100644 --- a/programs/Xserver/hw/nxagent/X/NXglyphstr.h +++ b/programs/Xserver/hw/nxagent/X/NXglyphstr.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXglyphstr.h.NX.original b/programs/Xserver/hw/nxagent/X/NXglyphstr.h.NX.original index e78a1bf..fa6b5fb 100644 --- a/programs/Xserver/hw/nxagent/X/NXglyphstr.h.NX.original +++ b/programs/Xserver/hw/nxagent/X/NXglyphstr.h.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXmiexpose.c b/programs/Xserver/hw/nxagent/X/NXmiexpose.c index c71ea81..3fc73cf 100644 --- a/programs/Xserver/hw/nxagent/X/NXmiexpose.c +++ b/programs/Xserver/hw/nxagent/X/NXmiexpose.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXmiexpose.c.NX.original b/programs/Xserver/hw/nxagent/X/NXmiexpose.c.NX.original index c71ea81..3fc73cf 100644 --- a/programs/Xserver/hw/nxagent/X/NXmiexpose.c.NX.original +++ b/programs/Xserver/hw/nxagent/X/NXmiexpose.c.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXmiglyph.c b/programs/Xserver/hw/nxagent/X/NXmiglyph.c index efb2958..5f32334 100644 --- a/programs/Xserver/hw/nxagent/X/NXmiglyph.c +++ b/programs/Xserver/hw/nxagent/X/NXmiglyph.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXmiglyph.c.NX.original b/programs/Xserver/hw/nxagent/X/NXmiglyph.c.NX.original index efb2958..5f32334 100644 --- a/programs/Xserver/hw/nxagent/X/NXmiglyph.c.NX.original +++ b/programs/Xserver/hw/nxagent/X/NXmiglyph.c.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXmitrap.c b/programs/Xserver/hw/nxagent/X/NXmitrap.c index d2bead0..f418654 100644 --- a/programs/Xserver/hw/nxagent/X/NXmitrap.c +++ b/programs/Xserver/hw/nxagent/X/NXmitrap.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXmitrap.c.NX.original b/programs/Xserver/hw/nxagent/X/NXmitrap.c.NX.original index d2bead0..f418654 100644 --- a/programs/Xserver/hw/nxagent/X/NXmitrap.c.NX.original +++ b/programs/Xserver/hw/nxagent/X/NXmitrap.c.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXmiwindow.c b/programs/Xserver/hw/nxagent/X/NXmiwindow.c index be1096c..1902949 100644 --- a/programs/Xserver/hw/nxagent/X/NXmiwindow.c +++ b/programs/Xserver/hw/nxagent/X/NXmiwindow.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXmiwindow.c.NX.original b/programs/Xserver/hw/nxagent/X/NXmiwindow.c.NX.original index be1096c..1902949 100644 --- a/programs/Xserver/hw/nxagent/X/NXmiwindow.c.NX.original +++ b/programs/Xserver/hw/nxagent/X/NXmiwindow.c.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXpicture.c b/programs/Xserver/hw/nxagent/X/NXpicture.c index 18697a5..d9054b4 100644 --- a/programs/Xserver/hw/nxagent/X/NXpicture.c +++ b/programs/Xserver/hw/nxagent/X/NXpicture.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -62,6 +62,7 @@ #include "Screen.h" #include "Pixmaps.h" #include "Drawable.h" +#include "Render.h" #define PANIC #define WARNING @@ -872,6 +873,9 @@ AllocatePicture (ScreenPtr pScreen) else ppriv->ptr = (pointer)NULL; } + + nxagentPicturePriv(pPicture) -> picture = 0; + return pPicture; } @@ -1063,7 +1067,49 @@ static void initGradient(SourcePictPtr pGradient, int stopCount, static PicturePtr createSourcePicture(void) { PicturePtr pPicture; - pPicture = (PicturePtr) xalloc(sizeof(PictureRec)); + + extern int nxagentPicturePrivateIndex; + + unsigned int totalPictureSize; + + DevUnion *ppriv; + + char *privPictureRecAddr; + + int i; + + /* + * Compute size of entire PictureRect, plus privates. + */ + + totalPictureSize = sizeof(PictureRec) + + picturePrivateCount * sizeof(DevUnion) + + sizeof(nxagentPrivPictureRec); + + pPicture = (PicturePtr) xalloc(totalPictureSize); + + if (pPicture != NULL) + { + ppriv = (DevUnion *) (pPicture + 1); + + for (i = 0; i < picturePrivateCount; ++i) + { + /* + * Other privates are inaccessible. + */ + + ppriv[i].ptr = NULL; + } + + privPictureRecAddr = (char *) &ppriv[picturePrivateCount]; + + ppriv[nxagentPicturePrivateIndex].ptr = (pointer) privPictureRecAddr; + + pPicture -> devPrivates = ppriv; + + nxagentPicturePriv(pPicture) -> picture = 0; + } + pPicture->pDrawable = 0; pPicture->pFormat = 0; pPicture->pNext = 0; @@ -1697,6 +1743,10 @@ FreePicture (pointer value, if (--pPicture->refcnt == 0) { +#ifdef NXAGENT_SERVER + nxagentDestroyPicture(pPicture); +#endif + if (pPicture->transform) xfree (pPicture->transform); if (!pPicture->pDrawable) { diff --git a/programs/Xserver/hw/nxagent/X/NXpicture.c.NX.original b/programs/Xserver/hw/nxagent/X/NXpicture.c.NX.original index 18697a5..d9054b4 100644 --- a/programs/Xserver/hw/nxagent/X/NXpicture.c.NX.original +++ b/programs/Xserver/hw/nxagent/X/NXpicture.c.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -62,6 +62,7 @@ #include "Screen.h" #include "Pixmaps.h" #include "Drawable.h" +#include "Render.h" #define PANIC #define WARNING @@ -872,6 +873,9 @@ AllocatePicture (ScreenPtr pScreen) else ppriv->ptr = (pointer)NULL; } + + nxagentPicturePriv(pPicture) -> picture = 0; + return pPicture; } @@ -1063,7 +1067,49 @@ static void initGradient(SourcePictPtr pGradient, int stopCount, static PicturePtr createSourcePicture(void) { PicturePtr pPicture; - pPicture = (PicturePtr) xalloc(sizeof(PictureRec)); + + extern int nxagentPicturePrivateIndex; + + unsigned int totalPictureSize; + + DevUnion *ppriv; + + char *privPictureRecAddr; + + int i; + + /* + * Compute size of entire PictureRect, plus privates. + */ + + totalPictureSize = sizeof(PictureRec) + + picturePrivateCount * sizeof(DevUnion) + + sizeof(nxagentPrivPictureRec); + + pPicture = (PicturePtr) xalloc(totalPictureSize); + + if (pPicture != NULL) + { + ppriv = (DevUnion *) (pPicture + 1); + + for (i = 0; i < picturePrivateCount; ++i) + { + /* + * Other privates are inaccessible. + */ + + ppriv[i].ptr = NULL; + } + + privPictureRecAddr = (char *) &ppriv[picturePrivateCount]; + + ppriv[nxagentPicturePrivateIndex].ptr = (pointer) privPictureRecAddr; + + pPicture -> devPrivates = ppriv; + + nxagentPicturePriv(pPicture) -> picture = 0; + } + pPicture->pDrawable = 0; pPicture->pFormat = 0; pPicture->pNext = 0; @@ -1697,6 +1743,10 @@ FreePicture (pointer value, if (--pPicture->refcnt == 0) { +#ifdef NXAGENT_SERVER + nxagentDestroyPicture(pPicture); +#endif + if (pPicture->transform) xfree (pPicture->transform); if (!pPicture->pDrawable) { diff --git a/programs/Xserver/hw/nxagent/X/NXpicturestr.h b/programs/Xserver/hw/nxagent/X/NXpicturestr.h index b6cee91..0d1a8e1 100644 --- a/programs/Xserver/hw/nxagent/X/NXpicturestr.h +++ b/programs/Xserver/hw/nxagent/X/NXpicturestr.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXpicturestr.h.NX.original b/programs/Xserver/hw/nxagent/X/NXpicturestr.h.NX.original index b6cee91..0d1a8e1 100644 --- a/programs/Xserver/hw/nxagent/X/NXpicturestr.h.NX.original +++ b/programs/Xserver/hw/nxagent/X/NXpicturestr.h.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXproperty.c b/programs/Xserver/hw/nxagent/X/NXproperty.c index d02f3f0..cd1ec6d 100644 --- a/programs/Xserver/hw/nxagent/X/NXproperty.c +++ b/programs/Xserver/hw/nxagent/X/NXproperty.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXproperty.c.NX.original b/programs/Xserver/hw/nxagent/X/NXproperty.c.NX.original index d02f3f0..cd1ec6d 100644 --- a/programs/Xserver/hw/nxagent/X/NXproperty.c.NX.original +++ b/programs/Xserver/hw/nxagent/X/NXproperty.c.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXrandr.c b/programs/Xserver/hw/nxagent/X/NXrandr.c index e1bb441..5f460f2 100644 --- a/programs/Xserver/hw/nxagent/X/NXrandr.c +++ b/programs/Xserver/hw/nxagent/X/NXrandr.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXrandr.c.NX.original b/programs/Xserver/hw/nxagent/X/NXrandr.c.NX.original index e1bb441..5f460f2 100644 --- a/programs/Xserver/hw/nxagent/X/NXrandr.c.NX.original +++ b/programs/Xserver/hw/nxagent/X/NXrandr.c.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXrender.c b/programs/Xserver/hw/nxagent/X/NXrender.c index ffc1997..89e7901 100644 --- a/programs/Xserver/hw/nxagent/X/NXrender.c +++ b/programs/Xserver/hw/nxagent/X/NXrender.c @@ -26,7 +26,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -116,7 +116,6 @@ int nxagentCursorSaveRenderInfo(ScreenPtr, CursorPtr); void nxagentCursorPostSaveRenderInfo(CursorPtr, ScreenPtr, PicturePtr, int, int); int nxagentRenderRealizeCursor(ScreenPtr, CursorPtr); int nxagentCreatePicture(PicturePtr, Mask); -void nxagentDestroyPicture(PicturePtr pPicture); void nxagentChangePicture(PicturePtr, Mask); int nxagentChangePictureClip(PicturePtr, int, int, xRectangle *, int, int); void nxagentComposite(CARD8, PicturePtr, PicturePtr, PicturePtr, INT16, INT16, @@ -132,6 +131,28 @@ void nxagentSetPictureFilter(PicturePtr pPicture, char *filter, int name_size, void nxagentTrapezoids(CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid *traps); +void nxagentRenderCreateSolidFill(PicturePtr pPicture, xRenderColor *color); + +void nxagentRenderCreateLinearGradient(PicturePtr pPicture, xPointFixed *p1, + xPointFixed *p2, int nStops, + xFixed *stops, + xRenderColor *colors); + +void nxagentRenderCreateRadialGradient(PicturePtr pPicture, xPointFixed *inner, + xPointFixed *outer, + xFixed innerRadius, + xFixed outerRadius, + int nStops, + xFixed *stops, + xRenderColor *colors); + +void nxagentRenderCreateConicalGradient(PicturePtr pPicture, + xPointFixed *center, + xFixed angle, int nStops, + xFixed *stops, + xRenderColor *colors); + + /* * The void pointer is actually a XGlyphElt8. */ @@ -823,8 +844,6 @@ ProcRenderFreePicture (ClientPtr client) VERIFY_PICTURE (pPicture, stuff->picture, client, SecurityDestroyAccess, RenderErrBase + BadPicture); - nxagentDestroyPicture(pPicture); - FreeResource (stuff->picture, RT_NONE); return(client->noClientException); } @@ -926,9 +945,16 @@ ProcRenderComposite (ClientPtr client) RenderErrBase + BadPicture); VERIFY_ALPHA (pMask, stuff->mask, client, SecurityReadAccess, RenderErrBase + BadPicture); +/* +FIXME: Imported change from newest version of Xorg. Changed pSrc to pDst. + if ((pSrc->pDrawable && pSrc->pDrawable->pScreen != pDst->pDrawable->pScreen) || (pMask && pMask->pDrawable && pSrc->pDrawable->pScreen != pMask->pDrawable->pScreen)) return BadMatch; +*/ + if ((pSrc->pDrawable && pSrc->pDrawable->pScreen != pDst->pDrawable->pScreen) || + (pMask && pMask->pDrawable && pDst->pDrawable->pScreen != pMask->pDrawable->pScreen)) + return BadMatch; ValidatePicture (pSrc); if (pMask) @@ -2336,6 +2362,11 @@ static int ProcRenderCreateSolidFill(ClientPtr client) pPicture = CreateSolidPicture(stuff->pid, &stuff->color, &error); if (!pPicture) return error; + /* AGENT SERVER */ + + nxagentRenderCreateSolidFill(pPicture, &stuff -> color); + + /* AGENT SERVER */ if (!AddResource (stuff->pid, PictureType, (pointer)pPicture)) return BadAlloc; return Success; @@ -2367,6 +2398,12 @@ static int ProcRenderCreateLinearGradient (ClientPtr client) stuff->nStops, stops, colors, &error); if (!pPicture) return error; + /* AGENT SERVER */ + + nxagentRenderCreateLinearGradient(pPicture, &stuff->p1, &stuff->p2, + stuff->nStops, stops, colors); + + /* AGENT SERVER */ if (!AddResource (stuff->pid, PictureType, (pointer)pPicture)) return BadAlloc; return Success; @@ -2397,6 +2434,14 @@ static int ProcRenderCreateRadialGradient (ClientPtr client) stuff->nStops, stops, colors, &error); if (!pPicture) return error; + /* AGENT SERVER */ + + nxagentRenderCreateRadialGradient(pPicture, &stuff->inner, &stuff->outer, + stuff->inner_radius, + stuff->outer_radius, + stuff->nStops, stops, colors); + + /* AGENT SERVER */ if (!AddResource (stuff->pid, PictureType, (pointer)pPicture)) return BadAlloc; return Success; @@ -2426,6 +2471,13 @@ static int ProcRenderCreateConicalGradient (ClientPtr client) stuff->nStops, stops, colors, &error); if (!pPicture) return error; + /* AGENT SERVER */ + + nxagentRenderCreateConicalGradient(pPicture, &stuff->center, + stuff->angle, stuff->nStops, stops, + colors); + + /* AGENT SERVER */ if (!AddResource (stuff->pid, PictureType, (pointer)pPicture)) return BadAlloc; return Success; diff --git a/programs/Xserver/hw/nxagent/X/NXrender.c.NX.original b/programs/Xserver/hw/nxagent/X/NXrender.c.NX.original index ffc1997..89e7901 100644 --- a/programs/Xserver/hw/nxagent/X/NXrender.c.NX.original +++ b/programs/Xserver/hw/nxagent/X/NXrender.c.NX.original @@ -26,7 +26,7 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -116,7 +116,6 @@ int nxagentCursorSaveRenderInfo(ScreenPtr, CursorPtr); void nxagentCursorPostSaveRenderInfo(CursorPtr, ScreenPtr, PicturePtr, int, int); int nxagentRenderRealizeCursor(ScreenPtr, CursorPtr); int nxagentCreatePicture(PicturePtr, Mask); -void nxagentDestroyPicture(PicturePtr pPicture); void nxagentChangePicture(PicturePtr, Mask); int nxagentChangePictureClip(PicturePtr, int, int, xRectangle *, int, int); void nxagentComposite(CARD8, PicturePtr, PicturePtr, PicturePtr, INT16, INT16, @@ -132,6 +131,28 @@ void nxagentSetPictureFilter(PicturePtr pPicture, char *filter, int name_size, void nxagentTrapezoids(CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid *traps); +void nxagentRenderCreateSolidFill(PicturePtr pPicture, xRenderColor *color); + +void nxagentRenderCreateLinearGradient(PicturePtr pPicture, xPointFixed *p1, + xPointFixed *p2, int nStops, + xFixed *stops, + xRenderColor *colors); + +void nxagentRenderCreateRadialGradient(PicturePtr pPicture, xPointFixed *inner, + xPointFixed *outer, + xFixed innerRadius, + xFixed outerRadius, + int nStops, + xFixed *stops, + xRenderColor *colors); + +void nxagentRenderCreateConicalGradient(PicturePtr pPicture, + xPointFixed *center, + xFixed angle, int nStops, + xFixed *stops, + xRenderColor *colors); + + /* * The void pointer is actually a XGlyphElt8. */ @@ -823,8 +844,6 @@ ProcRenderFreePicture (ClientPtr client) VERIFY_PICTURE (pPicture, stuff->picture, client, SecurityDestroyAccess, RenderErrBase + BadPicture); - nxagentDestroyPicture(pPicture); - FreeResource (stuff->picture, RT_NONE); return(client->noClientException); } @@ -926,9 +945,16 @@ ProcRenderComposite (ClientPtr client) RenderErrBase + BadPicture); VERIFY_ALPHA (pMask, stuff->mask, client, SecurityReadAccess, RenderErrBase + BadPicture); +/* +FIXME: Imported change from newest version of Xorg. Changed pSrc to pDst. + if ((pSrc->pDrawable && pSrc->pDrawable->pScreen != pDst->pDrawable->pScreen) || (pMask && pMask->pDrawable && pSrc->pDrawable->pScreen != pMask->pDrawable->pScreen)) return BadMatch; +*/ + if ((pSrc->pDrawable && pSrc->pDrawable->pScreen != pDst->pDrawable->pScreen) || + (pMask && pMask->pDrawable && pDst->pDrawable->pScreen != pMask->pDrawable->pScreen)) + return BadMatch; ValidatePicture (pSrc); if (pMask) @@ -2336,6 +2362,11 @@ static int ProcRenderCreateSolidFill(ClientPtr client) pPicture = CreateSolidPicture(stuff->pid, &stuff->color, &error); if (!pPicture) return error; + /* AGENT SERVER */ + + nxagentRenderCreateSolidFill(pPicture, &stuff -> color); + + /* AGENT SERVER */ if (!AddResource (stuff->pid, PictureType, (pointer)pPicture)) return BadAlloc; return Success; @@ -2367,6 +2398,12 @@ static int ProcRenderCreateLinearGradient (ClientPtr client) stuff->nStops, stops, colors, &error); if (!pPicture) return error; + /* AGENT SERVER */ + + nxagentRenderCreateLinearGradient(pPicture, &stuff->p1, &stuff->p2, + stuff->nStops, stops, colors); + + /* AGENT SERVER */ if (!AddResource (stuff->pid, PictureType, (pointer)pPicture)) return BadAlloc; return Success; @@ -2397,6 +2434,14 @@ static int ProcRenderCreateRadialGradient (ClientPtr client) stuff->nStops, stops, colors, &error); if (!pPicture) return error; + /* AGENT SERVER */ + + nxagentRenderCreateRadialGradient(pPicture, &stuff->inner, &stuff->outer, + stuff->inner_radius, + stuff->outer_radius, + stuff->nStops, stops, colors); + + /* AGENT SERVER */ if (!AddResource (stuff->pid, PictureType, (pointer)pPicture)) return BadAlloc; return Success; @@ -2426,6 +2471,13 @@ static int ProcRenderCreateConicalGradient (ClientPtr client) stuff->nStops, stops, colors, &error); if (!pPicture) return error; + /* AGENT SERVER */ + + nxagentRenderCreateConicalGradient(pPicture, &stuff->center, + stuff->angle, stuff->nStops, stops, + colors); + + /* AGENT SERVER */ if (!AddResource (stuff->pid, PictureType, (pointer)pPicture)) return BadAlloc; return Success; diff --git a/programs/Xserver/hw/nxagent/X/NXresource.c b/programs/Xserver/hw/nxagent/X/NXresource.c index 8c69217..d1c8325 100644 --- a/programs/Xserver/hw/nxagent/X/NXresource.c +++ b/programs/Xserver/hw/nxagent/X/NXresource.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXresource.c.NX.original b/programs/Xserver/hw/nxagent/X/NXresource.c.NX.original index 8c69217..d1c8325 100644 --- a/programs/Xserver/hw/nxagent/X/NXresource.c.NX.original +++ b/programs/Xserver/hw/nxagent/X/NXresource.c.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXshm.c b/programs/Xserver/hw/nxagent/X/NXshm.c index b99cbe3..eaaa920 100644 --- a/programs/Xserver/hw/nxagent/X/NXshm.c +++ b/programs/Xserver/hw/nxagent/X/NXshm.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXshm.c.NX.original b/programs/Xserver/hw/nxagent/X/NXshm.c.NX.original index b99cbe3..eaaa920 100644 --- a/programs/Xserver/hw/nxagent/X/NXshm.c.NX.original +++ b/programs/Xserver/hw/nxagent/X/NXshm.c.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXwindow.c b/programs/Xserver/hw/nxagent/X/NXwindow.c index 4022bc3..76e86fd 100644 --- a/programs/Xserver/hw/nxagent/X/NXwindow.c +++ b/programs/Xserver/hw/nxagent/X/NXwindow.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXwindow.c.NX.original b/programs/Xserver/hw/nxagent/X/NXwindow.c.NX.original index 4022bc3..76e86fd 100644 --- a/programs/Xserver/hw/nxagent/X/NXwindow.c.NX.original +++ b/programs/Xserver/hw/nxagent/X/NXwindow.c.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXxvdisp.c b/programs/Xserver/hw/nxagent/X/NXxvdisp.c index aa90222..f6dad31 100644 --- a/programs/Xserver/hw/nxagent/X/NXxvdisp.c +++ b/programs/Xserver/hw/nxagent/X/NXxvdisp.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/X/NXxvdisp.c.NX.original b/programs/Xserver/hw/nxagent/X/NXxvdisp.c.NX.original index aa90222..f6dad31 100644 --- a/programs/Xserver/hw/nxagent/X/NXxvdisp.c.NX.original +++ b/programs/Xserver/hw/nxagent/X/NXxvdisp.c.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/nxagent.xpm b/programs/Xserver/hw/nxagent/nxagent.xpm index 5955f17..dd8be6c 100644 --- a/programs/Xserver/hw/nxagent/nxagent.xpm +++ b/programs/Xserver/hw/nxagent/nxagent.xpm @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/nxmissing.xpm b/programs/Xserver/hw/nxagent/nxmissing.xpm index e7dee27..854e0a6 100644 --- a/programs/Xserver/hw/nxagent/nxmissing.xpm +++ b/programs/Xserver/hw/nxagent/nxmissing.xpm @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/os2Stub.c b/programs/Xserver/hw/nxagent/os2Stub.c index 80419d8..9ec7e6b 100644 --- a/programs/Xserver/hw/nxagent/os2Stub.c +++ b/programs/Xserver/hw/nxagent/os2Stub.c @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/hw/nxagent/screensaver b/programs/Xserver/hw/nxagent/screensaver index 4c5c106..ef7cd66 100644 --- a/programs/Xserver/hw/nxagent/screensaver +++ b/programs/Xserver/hw/nxagent/screensaver @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/mi/Imakefile b/programs/Xserver/mi/Imakefile index 322ad09..b85a9f9 100644 --- a/programs/Xserver/mi/Imakefile +++ b/programs/Xserver/mi/Imakefile @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/mi/Imakefile.NX.original b/programs/Xserver/mi/Imakefile.NX.original index 322ad09..b85a9f9 100644 --- a/programs/Xserver/mi/Imakefile.NX.original +++ b/programs/Xserver/mi/Imakefile.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/os/Imakefile b/programs/Xserver/os/Imakefile index 3acf663..22be060 100644 --- a/programs/Xserver/os/Imakefile +++ b/programs/Xserver/os/Imakefile @@ -7,7 +7,7 @@ XCOMM $XFree86: xc/programs/Xserver/os/Imakefile,v 3.40 2003/09/09 03:20:41 dawe /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/os/Imakefile.NX.original b/programs/Xserver/os/Imakefile.NX.original index 3acf663..22be060 100644 --- a/programs/Xserver/os/Imakefile.NX.original +++ b/programs/Xserver/os/Imakefile.NX.original @@ -7,7 +7,7 @@ XCOMM $XFree86: xc/programs/Xserver/os/Imakefile,v 3.40 2003/09/09 03:20:41 dawe /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/os/WaitFor.c b/programs/Xserver/os/WaitFor.c index 31b8f12..2ef4742 100644 --- a/programs/Xserver/os/WaitFor.c +++ b/programs/Xserver/os/WaitFor.c @@ -50,7 +50,7 @@ SOFTWARE. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/os/WaitFor.c.NX.original b/programs/Xserver/os/WaitFor.c.NX.original index 31b8f12..2ef4742 100644 --- a/programs/Xserver/os/WaitFor.c.NX.original +++ b/programs/Xserver/os/WaitFor.c.NX.original @@ -50,7 +50,7 @@ SOFTWARE. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/os/auth.c b/programs/Xserver/os/auth.c index 711f40b..dfb6f88 100644 --- a/programs/Xserver/os/auth.c +++ b/programs/Xserver/os/auth.c @@ -30,7 +30,7 @@ from The Open Group. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/os/auth.c.NX.original b/programs/Xserver/os/auth.c.NX.original index 711f40b..dfb6f88 100644 --- a/programs/Xserver/os/auth.c.NX.original +++ b/programs/Xserver/os/auth.c.NX.original @@ -30,7 +30,7 @@ from The Open Group. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/os/log.c b/programs/Xserver/os/log.c index d3aef03..04e24b8 100644 --- a/programs/Xserver/os/log.c +++ b/programs/Xserver/os/log.c @@ -80,7 +80,7 @@ OR PERFORMANCE OF THIS SOFTWARE. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/os/log.c.NX.original b/programs/Xserver/os/log.c.NX.original index d3aef03..04e24b8 100644 --- a/programs/Xserver/os/log.c.NX.original +++ b/programs/Xserver/os/log.c.NX.original @@ -80,7 +80,7 @@ OR PERFORMANCE OF THIS SOFTWARE. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/os/utils.c b/programs/Xserver/os/utils.c index 5821dd6..7e62654 100644 --- a/programs/Xserver/os/utils.c +++ b/programs/Xserver/os/utils.c @@ -54,7 +54,7 @@ OR PERFORMANCE OF THIS SOFTWARE. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/Xserver/os/utils.c.NX.original b/programs/Xserver/os/utils.c.NX.original index 5821dd6..7e62654 100644 --- a/programs/Xserver/os/utils.c.NX.original +++ b/programs/Xserver/os/utils.c.NX.original @@ -54,7 +54,7 @@ OR PERFORMANCE OF THIS SOFTWARE. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/nxauth/CHANGELOG b/programs/nxauth/CHANGELOG index 1134b40..1efd1cf 100644 --- a/programs/nxauth/CHANGELOG +++ b/programs/nxauth/CHANGELOG @@ -1,8 +1,14 @@ ChangeLog: -nxauth-3.4.0.5 +x2goauth-3.5.0.2 -- Changed version numbering scheme, upstream now maintained by X2go project. +- forked nxauth-3.5.0-1 + +nxauth-3.5.0-1 + +- Opened the 3.5.0 branch based on nxauth-3.4.0-3. + +- Updated copyright to year 2011. nxauth-3.4.0-3 diff --git a/programs/nxauth/Imakefile b/programs/nxauth/Imakefile index 07b1ca7..00bfa92 100644 --- a/programs/nxauth/Imakefile +++ b/programs/nxauth/Imakefile @@ -7,7 +7,7 @@ XCOMM $XFree86: xc/programs/xauth/Imakefile,v 3.5 2001/03/30 02:15:23 keithp Exp /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAUTH, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/nxauth/LICENSE b/programs/nxauth/LICENSE index 626b9c5..6fe38fe 100644 --- a/programs/nxauth/LICENSE +++ b/programs/nxauth/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2001, 2010 NoMachine - http://www.nomachine.com/. +Copyright (c) 2001, 2011 NoMachine - http://www.nomachine.com/. NXAUTH and NX extensions to X are copyright of NoMachine. diff --git a/programs/nxauth/parsedpy.c b/programs/nxauth/parsedpy.c index 8ce4681..52cc380 100644 --- a/programs/nxauth/parsedpy.c +++ b/programs/nxauth/parsedpy.c @@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/xauth/parsedpy.c,v 3.6 2001/12/14 20:01:15 dawes Exp $ */ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAUTH, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/nxauth/process.c b/programs/nxauth/process.c index 57090e2..eaf9354 100644 --- a/programs/nxauth/process.c +++ b/programs/nxauth/process.c @@ -30,7 +30,7 @@ from The Open Group. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAUTH, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/nxauth/xauth.c b/programs/nxauth/xauth.c index 5a37c34..77130a1 100644 --- a/programs/nxauth/xauth.c +++ b/programs/nxauth/xauth.c @@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAUTH, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/xterm/Imakefile b/programs/xterm/Imakefile index 349190d..4620c2c 100644 --- a/programs/xterm/Imakefile +++ b/programs/xterm/Imakefile @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/xterm/Imakefile.NX.original b/programs/xterm/Imakefile.NX.original index 349190d..4620c2c 100644 --- a/programs/xterm/Imakefile.NX.original +++ b/programs/xterm/Imakefile.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/xterm/charproc.c b/programs/xterm/charproc.c index f8f53d5..78bb9a1 100644 --- a/programs/xterm/charproc.c +++ b/programs/xterm/charproc.c @@ -84,7 +84,7 @@ in this Software without prior written authorization from The Open Group. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/xterm/charproc.c.NX.original b/programs/xterm/charproc.c.NX.original index f8f53d5..78bb9a1 100644 --- a/programs/xterm/charproc.c.NX.original +++ b/programs/xterm/charproc.c.NX.original @@ -84,7 +84,7 @@ in this Software without prior written authorization from The Open Group. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/xterm/main.c b/programs/xterm/main.c index b1393d0..36068a4 100644 --- a/programs/xterm/main.c +++ b/programs/xterm/main.c @@ -93,7 +93,7 @@ SOFTWARE. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/programs/xterm/main.c.NX.original b/programs/xterm/main.c.NX.original index b1393d0..36068a4 100644 --- a/programs/xterm/main.c.NX.original +++ b/programs/xterm/main.c.NX.original @@ -93,7 +93,7 @@ SOFTWARE. /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NX-X11, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ hooks/post-receive -- x2goagent.git (X2go (NX-like) Agent) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goagent.git" (X2go (NX-like) Agent).