nx-libs.git - nxagent (branch) updated: nxagent/3.5.0-5-1-g55847f8 - x2go-commits

28 Dec 2011

The branch, nxagent has been updated
       via  55847f80ed60558857c288a6d3a66ded84adf98c (commit)
      from  e01b9177b41f7d27a934d41fa38d550fa0026b45 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../Xserver/hw/nxagent/Agent.h                     |    0
 .../Xserver/hw/nxagent/Args.c                      |    0
 .../Xserver/hw/nxagent/Args.h                      |    0
 .../Xserver/hw/nxagent/Atoms.c                     |    0
 .../Xserver/hw/nxagent/Atoms.h                     |    0
 .../Xserver/hw/nxagent/Binder.c                    |    0
 .../Xserver/hw/nxagent/Binder.h                    |    0
 .../Xserver/hw/nxagent/CHANGELOG                   |   14 ++
 .../Xserver/hw/nxagent/COPYING                     |    0
 .../Xserver/hw/nxagent/Client.c                    |    0
 .../Xserver/hw/nxagent/Client.h                    |    0
 .../Xserver/hw/nxagent/Clipboard.c                 |    0
 .../Xserver/hw/nxagent/Clipboard.h                 |    0
 .../Xserver/hw/nxagent/Colormap.c                  |   10 ++-
 .../Xserver/hw/nxagent/Colormap.h                  |    0
 .../Xserver/hw/nxagent/Composite.c                 |    0
 .../Xserver/hw/nxagent/Composite.h                 |    0
 .../Xserver/hw/nxagent/Cursor.c                    |    0
 .../Xserver/hw/nxagent/Cursor.h                    |    0
 .../Xserver/hw/nxagent/Dialog.c                    |    0
 .../Xserver/hw/nxagent/Dialog.h                    |    0
 .../Xserver/hw/nxagent/Display.c                   |  127 ++++++++++++-------
 .../Xserver/hw/nxagent/Display.h                   |    0
 .../Xserver/hw/nxagent/Drawable.c                  |    0
 .../Xserver/hw/nxagent/Drawable.h                  |    0
 .../Xserver/hw/nxagent/Error.c                     |    0
 .../Xserver/hw/nxagent/Error.h                     |    0
 .../Xserver/hw/nxagent/Events.c                    |   30 +++--
 .../Xserver/hw/nxagent/Events.h                    |    0
 .../Xserver/hw/nxagent/Extensions.c                |    0
 .../Xserver/hw/nxagent/Extensions.h                |    0
 .../Xserver/hw/nxagent/Font.c                      |    0
 .../Xserver/hw/nxagent/Font.h                      |    0
 .../programs => programs}/Xserver/hw/nxagent/GC.c  |    0
 .../Xserver/hw/nxagent/GCOps.c                     |    0
 .../Xserver/hw/nxagent/GCOps.h                     |    0
 .../programs => programs}/Xserver/hw/nxagent/GCs.h |    0
 .../Xserver/hw/nxagent/Handlers.c                  |    0
 .../Xserver/hw/nxagent/Handlers.h                  |    0
 .../Xserver/hw/nxagent/Holder.c                    |    0
 .../Xserver/hw/nxagent/Holder.h                    |    0
 .../Xserver/hw/nxagent/Icons.h                     |    0
 .../Xserver/hw/nxagent/Image.c                     |    0
 .../Xserver/hw/nxagent/Image.h                     |    0
 .../Xserver/hw/nxagent/Imakefile                   |    0
 .../Xserver/hw/nxagent/Init.c                      |    0
 .../Xserver/hw/nxagent/Init.h                      |    0
 .../Xserver/hw/nxagent/Keyboard.c                  |   24 ++++-
 .../Xserver/hw/nxagent/Keyboard.h                  |    3 +
 .../Xserver/hw/nxagent/Keystroke.c                 |    0
 .../Xserver/hw/nxagent/Keystroke.h                 |    0
 .../Xserver/hw/nxagent/LICENSE                     |    0
 .../Xserver/hw/nxagent/Literals.h                  |    0
 .../Xserver/hw/nxagent/Millis.c                    |    0
 .../Xserver/hw/nxagent/Millis.h                    |    0
 .../Xserver/hw/nxagent/NXcomposite.c               |    0
 .../Xserver/hw/nxagent/NXcomposite.h               |    0
 .../Xserver/hw/nxagent/NXcompositeext.h            |    0
 .../Xserver/hw/nxagent/NXcompositeint.h            |    0
 .../Xserver/hw/nxagent/NXcompositeproto.h          |    0
 .../Xserver/hw/nxagent/NXdamage.c                  |    0
 .../Xserver/hw/nxagent/NXdispatch.c                |    0
 .../Xserver/hw/nxagent/NXdispatch.c.NX.original    |    0
 .../Xserver/hw/nxagent/NXdispatch.c.XF86.original  |    0
 .../Xserver/hw/nxagent/NXdixfonts.c                |    0
 .../Xserver/hw/nxagent/NXdixfonts.c.NX.original    |    0
 .../Xserver/hw/nxagent/NXdixfonts.c.XF86.original  |    0
 .../Xserver/hw/nxagent/NXevents.c                  |    0
 .../Xserver/hw/nxagent/NXevents.c.NX.original      |    0
 .../Xserver/hw/nxagent/NXevents.c.XF86.original    |    0
 .../Xserver/hw/nxagent/NXextension.c               |    0
 .../Xserver/hw/nxagent/NXextension.c.NX.original   |    0
 .../Xserver/hw/nxagent/NXextension.c.XF86.original |    0
 .../Xserver/hw/nxagent/NXglxext.c                  |    0
 .../Xserver/hw/nxagent/NXglxext.c.NX.original      |    0
 .../Xserver/hw/nxagent/NXglxext.c.XF86.original    |    0
 .../Xserver/hw/nxagent/NXglyph.c                   |    0
 .../Xserver/hw/nxagent/NXglyph.c.NX.original       |    0
 .../Xserver/hw/nxagent/NXglyph.c.XF86.original     |    0
 .../Xserver/hw/nxagent/NXglyphcurs.c               |    0
 .../Xserver/hw/nxagent/NXglyphcurs.c.NX.original   |    0
 .../Xserver/hw/nxagent/NXglyphcurs.c.XF86.original |    0
 .../Xserver/hw/nxagent/NXglyphstr.h                |    0
 .../Xserver/hw/nxagent/NXglyphstr.h.NX.original    |    0
 .../Xserver/hw/nxagent/NXglyphstr.h.XF86.original  |    0
 .../Xserver/hw/nxagent/NXmiexpose.c                |    0
 .../Xserver/hw/nxagent/NXmiexpose.c.NX.original    |    0
 .../Xserver/hw/nxagent/NXmiexpose.c.XF86.original  |    0
 .../Xserver/hw/nxagent/NXmiglyph.c                 |    0
 .../Xserver/hw/nxagent/NXmiglyph.c.NX.original     |    0
 .../Xserver/hw/nxagent/NXmiglyph.c.XF86.original   |    0
 .../Xserver/hw/nxagent/NXmitrap.c                  |    0
 .../Xserver/hw/nxagent/NXmitrap.c.NX.original      |    0
 .../Xserver/hw/nxagent/NXmitrap.c.XF86.original    |    0
 .../Xserver/hw/nxagent/NXmiwindow.c                |    0
 .../Xserver/hw/nxagent/NXmiwindow.c.NX.original    |    0
 .../Xserver/hw/nxagent/NXmiwindow.c.XF86.original  |    0
 .../Xserver/hw/nxagent/NXpicture.c                 |    0
 .../Xserver/hw/nxagent/NXpicture.c.NX.original     |    0
 .../Xserver/hw/nxagent/NXpicture.c.XF86.original   |    0
 .../Xserver/hw/nxagent/NXpicturestr.h              |    0
 .../Xserver/hw/nxagent/NXpicturestr.h.NX.original  |    0
 .../hw/nxagent/NXpicturestr.h.XF86.original        |    0
 .../Xserver/hw/nxagent/NXproperty.c                |    0
 .../Xserver/hw/nxagent/NXproperty.c.NX.original    |    0
 .../Xserver/hw/nxagent/NXproperty.c.XF86.original  |    0
 .../Xserver/hw/nxagent/NXrender.c                  |    0
 .../Xserver/hw/nxagent/NXrender.c.NX.original      |    0
 .../Xserver/hw/nxagent/NXrender.c.XF86.original    |    0
 .../Xserver/hw/nxagent/NXresource.c                |    0
 .../Xserver/hw/nxagent/NXresource.c.NX.original    |    0
 .../Xserver/hw/nxagent/NXresource.c.XF86.original  |    0
 .../Xserver/hw/nxagent/NXshm.c                     |    0
 .../Xserver/hw/nxagent/NXshm.c.NX.original         |    0
 .../Xserver/hw/nxagent/NXshm.c.XF86.original       |    0
 .../Xserver/hw/nxagent/NXwindow.c                  |    0
 .../Xserver/hw/nxagent/NXwindow.c.NX.original      |    0
 .../Xserver/hw/nxagent/NXwindow.c.XF86.original    |    0
 .../Xserver/hw/nxagent/NXxrandr.c                  |    0
 .../Xserver/hw/nxagent/NXxrandr.h                  |    0
 .../Xserver/hw/nxagent/NXxrandrint.h               |    0
 .../Xserver/hw/nxagent/NXxvdisp.c                  |    0
 .../Xserver/hw/nxagent/NXxvdisp.c.NX.original      |    0
 .../Xserver/hw/nxagent/NXxvdisp.c.XF86.original    |    0
 .../Xserver/hw/nxagent/Options.c                   |    0
 .../Xserver/hw/nxagent/Options.h                   |    0
 .../Xserver/hw/nxagent/Pixels.c                    |    0
 .../Xserver/hw/nxagent/Pixels.h                    |    0
 .../Xserver/hw/nxagent/Pixmap.c                    |    0
 .../Xserver/hw/nxagent/Pixmaps.h                   |    0
 .../Xserver/hw/nxagent/Pointer.c                   |    0
 .../Xserver/hw/nxagent/Pointer.h                   |    0
 .../Xserver/hw/nxagent/Reconnect.c                 |    0
 .../Xserver/hw/nxagent/Reconnect.h                 |    0
 .../Xserver/hw/nxagent/Render.c                    |    0
 .../Xserver/hw/nxagent/Render.h                    |    0
 .../Xserver/hw/nxagent/Rootless.c                  |    0
 .../Xserver/hw/nxagent/Rootless.h                  |    0
 .../Xserver/hw/nxagent/Screen.c                    |   81 ++++++++++---
 .../Xserver/hw/nxagent/Screen.h                    |    0
 .../Xserver/hw/nxagent/Splash.c                    |    0
 .../Xserver/hw/nxagent/Splash.h                    |    0
 .../Xserver/hw/nxagent/Split.c                     |    0
 .../Xserver/hw/nxagent/Split.h                     |    0
 .../Xserver/hw/nxagent/TestExt.c                   |    0
 .../Xserver/hw/nxagent/Trap.c                      |    0
 .../Xserver/hw/nxagent/Trap.h                      |    0
 .../Xserver/hw/nxagent/Utils.h                     |    0
 .../Xserver/hw/nxagent/Visual.c                    |    0
 .../Xserver/hw/nxagent/Visual.h                    |    0
 .../Xserver/hw/nxagent/Window.c                    |    7 +
 .../Xserver/hw/nxagent/Windows.h                   |    0
 .../Xserver/hw/nxagent/X/NXdamage.c                |    0
 .../Xserver/hw/nxagent/X/NXdamage.c.NX.original    |    0
 .../Xserver/hw/nxagent/X/NXdamage.c.X.original     |    0
 .../Xserver/hw/nxagent/X/NXdispatch.c              |    0
 .../Xserver/hw/nxagent/X/NXdispatch.c.NX.original  |    0
 .../Xserver/hw/nxagent/X/NXdispatch.c.X.original   |    0
 .../Xserver/hw/nxagent/X/NXdixfonts.c              |    0
 .../Xserver/hw/nxagent/X/NXdixfonts.c.NX.original  |    0
 .../Xserver/hw/nxagent/X/NXdixfonts.c.X.original   |    0
 .../Xserver/hw/nxagent/X/NXevents.c                |    0
 .../Xserver/hw/nxagent/X/NXevents.c.NX.original    |    0
 .../Xserver/hw/nxagent/X/NXevents.c.X.original     |    0
 .../Xserver/hw/nxagent/X/NXextension.c             |    0
 .../Xserver/hw/nxagent/X/NXextension.c.NX.original |    0
 .../Xserver/hw/nxagent/X/NXextension.c.X.original  |    0
 .../Xserver/hw/nxagent/X/NXglxext.c                |    0
 .../Xserver/hw/nxagent/X/NXglxext.c.NX.original    |    0
 .../Xserver/hw/nxagent/X/NXglxext.c.X.original     |    0
 .../Xserver/hw/nxagent/X/NXglyph.c                 |    0
 .../Xserver/hw/nxagent/X/NXglyph.c.NX.original     |    0
 .../Xserver/hw/nxagent/X/NXglyph.c.X.original      |    0
 .../Xserver/hw/nxagent/X/NXglyphcurs.c             |    0
 .../Xserver/hw/nxagent/X/NXglyphcurs.c.NX.original |    0
 .../Xserver/hw/nxagent/X/NXglyphcurs.c.X.original  |    0
 .../Xserver/hw/nxagent/X/NXglyphstr.h              |    0
 .../Xserver/hw/nxagent/X/NXglyphstr.h.NX.original  |    0
 .../Xserver/hw/nxagent/X/NXglyphstr.h.X.original   |    0
 .../Xserver/hw/nxagent/X/NXmiexpose.c              |    0
 .../Xserver/hw/nxagent/X/NXmiexpose.c.NX.original  |    0
 .../Xserver/hw/nxagent/X/NXmiexpose.c.X.original   |    0
 .../Xserver/hw/nxagent/X/NXmiglyph.c               |    0
 .../Xserver/hw/nxagent/X/NXmiglyph.c.NX.original   |    0
 .../Xserver/hw/nxagent/X/NXmiglyph.c.X.original    |    0
 .../Xserver/hw/nxagent/X/NXmitrap.c                |    0
 .../Xserver/hw/nxagent/X/NXmitrap.c.NX.original    |    0
 .../Xserver/hw/nxagent/X/NXmitrap.c.X.original     |    0
 .../Xserver/hw/nxagent/X/NXmiwindow.c              |    0
 .../Xserver/hw/nxagent/X/NXmiwindow.c.NX.original  |    0
 .../Xserver/hw/nxagent/X/NXmiwindow.c.X.original   |    0
 .../Xserver/hw/nxagent/X/NXpicture.c               |    0
 .../Xserver/hw/nxagent/X/NXpicture.c.NX.original   |    0
 .../Xserver/hw/nxagent/X/NXpicture.c.X.original    |    0
 .../Xserver/hw/nxagent/X/NXpicturestr.h            |    0
 .../hw/nxagent/X/NXpicturestr.h.NX.original        |    0
 .../Xserver/hw/nxagent/X/NXpicturestr.h.X.original |    0
 .../Xserver/hw/nxagent/X/NXproperty.c              |    0
 .../Xserver/hw/nxagent/X/NXproperty.c.NX.original  |    0
 .../Xserver/hw/nxagent/X/NXproperty.c.X.original   |    0
 .../Xserver/hw/nxagent/X/NXrender.c                |    0
 .../Xserver/hw/nxagent/X/NXrender.c.NX.original    |    0
 .../Xserver/hw/nxagent/X/NXrender.c.X.original     |    0
 .../Xserver/hw/nxagent/X/NXresource.c              |    0
 .../Xserver/hw/nxagent/X/NXresource.c.NX.original  |    0
 .../Xserver/hw/nxagent/X/NXresource.c.X.original   |    0
 .../Xserver/hw/nxagent/X/NXshm.c                   |    0
 .../Xserver/hw/nxagent/X/NXshm.c.NX.original       |    0
 .../Xserver/hw/nxagent/X/NXshm.c.X.original        |    0
 .../Xserver/hw/nxagent/X/NXwindow.c                |    0
 .../Xserver/hw/nxagent/X/NXwindow.c.NX.original    |    0
 .../Xserver/hw/nxagent/X/NXwindow.c.X.original     |    0
 .../Xserver/hw/nxagent/X/NXxvdisp.c                |    0
 .../Xserver/hw/nxagent/X/NXxvdisp.c.NX.original    |    0
 .../Xserver/hw/nxagent/X/NXxvdisp.c.X.original     |    0
 .../Xserver/hw/nxagent/nxagent.xpm                 |    0
 .../Xserver/hw/nxagent/nxmissing.xpm               |    0
 .../Xserver/hw/nxagent/os2Stub.c                   |    0
 .../Xserver/hw/nxagent/screensaver                 |    0
 219 files changed, 212 insertions(+), 84 deletions(-)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Agent.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Args.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Args.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Atoms.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Atoms.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Binder.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Binder.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/CHANGELOG (99%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/COPYING (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Client.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Client.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Clipboard.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Clipboard.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Colormap.c (98%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Colormap.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Composite.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Composite.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Cursor.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Cursor.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Dialog.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Dialog.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Display.c (97%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Display.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Drawable.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Drawable.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Error.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Error.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Events.c (99%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Events.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Extensions.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Extensions.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Font.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Font.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/GC.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/GCOps.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/GCOps.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/GCs.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Handlers.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Handlers.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Holder.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Holder.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Icons.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Image.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Image.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Imakefile (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Init.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Init.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Keyboard.c (98%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Keyboard.h (97%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Keystroke.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Keystroke.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/LICENSE (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Literals.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Millis.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Millis.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXcomposite.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXcomposite.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXcompositeext.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXcompositeint.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXcompositeproto.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXdamage.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXdispatch.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXdispatch.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXdispatch.c.XF86.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXdixfonts.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXdixfonts.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXdixfonts.c.XF86.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXevents.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXevents.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXevents.c.XF86.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXextension.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXextension.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXextension.c.XF86.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXglxext.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXglxext.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXglxext.c.XF86.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXglyph.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXglyph.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXglyph.c.XF86.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXglyphcurs.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXglyphcurs.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXglyphcurs.c.XF86.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXglyphstr.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXglyphstr.h.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXglyphstr.h.XF86.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXmiexpose.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXmiexpose.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXmiexpose.c.XF86.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXmiglyph.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXmiglyph.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXmiglyph.c.XF86.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXmitrap.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXmitrap.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXmitrap.c.XF86.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXmiwindow.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXmiwindow.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXmiwindow.c.XF86.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXpicture.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXpicture.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXpicture.c.XF86.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXpicturestr.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXpicturestr.h.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXpicturestr.h.XF86.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXproperty.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXproperty.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXproperty.c.XF86.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXrender.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXrender.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXrender.c.XF86.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXresource.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXresource.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXresource.c.XF86.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXshm.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXshm.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXshm.c.XF86.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXwindow.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXwindow.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXwindow.c.XF86.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXxrandr.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXxrandr.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXxrandrint.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXxvdisp.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXxvdisp.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/NXxvdisp.c.XF86.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Options.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Options.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Pixels.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Pixels.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Pixmap.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Pixmaps.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Pointer.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Pointer.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Reconnect.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Reconnect.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Render.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Render.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Rootless.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Rootless.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Screen.c (97%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Screen.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Splash.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Splash.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Split.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Split.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/TestExt.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Trap.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Trap.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Utils.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Visual.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Visual.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Window.c (99%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/Windows.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXdamage.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXdamage.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXdamage.c.X.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXdispatch.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXdispatch.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXdispatch.c.X.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXdixfonts.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXdixfonts.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXdixfonts.c.X.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXevents.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXevents.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXevents.c.X.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXextension.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXextension.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXextension.c.X.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXglxext.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXglxext.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXglxext.c.X.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXglyph.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXglyph.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXglyph.c.X.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXglyphcurs.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXglyphcurs.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXglyphcurs.c.X.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXglyphstr.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXglyphstr.h.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXglyphstr.h.X.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXmiexpose.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXmiexpose.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXmiexpose.c.X.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXmiglyph.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXmiglyph.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXmiglyph.c.X.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXmitrap.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXmitrap.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXmitrap.c.X.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXmiwindow.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXmiwindow.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXmiwindow.c.X.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXpicture.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXpicture.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXpicture.c.X.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXpicturestr.h (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXpicturestr.h.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXpicturestr.h.X.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXproperty.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXproperty.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXproperty.c.X.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXrender.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXrender.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXrender.c.X.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXresource.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXresource.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXresource.c.X.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXshm.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXshm.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXshm.c.X.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXwindow.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXwindow.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXwindow.c.X.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXxvdisp.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXxvdisp.c.NX.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/X/NXxvdisp.c.X.original (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/nxagent.xpm (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/nxmissing.xpm (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/os2Stub.c (100%)
 rename {nx-X11/programs => programs}/Xserver/hw/nxagent/screensaver (100%)

The diff of changes is:

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Agent.h b/programs/Xserver/hw/nxagent/Agent.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Agent.h
rename to programs/Xserver/hw/nxagent/Agent.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/programs/Xserver/hw/nxagent/Args.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Args.c
rename to programs/Xserver/hw/nxagent/Args.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.h b/programs/Xserver/hw/nxagent/Args.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Args.h
rename to programs/Xserver/hw/nxagent/Args.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c b/programs/Xserver/hw/nxagent/Atoms.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Atoms.c
rename to programs/Xserver/hw/nxagent/Atoms.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.h b/programs/Xserver/hw/nxagent/Atoms.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Atoms.h
rename to programs/Xserver/hw/nxagent/Atoms.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Binder.c b/programs/Xserver/hw/nxagent/Binder.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Binder.c
rename to programs/Xserver/hw/nxagent/Binder.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Binder.h b/programs/Xserver/hw/nxagent/Binder.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Binder.h
rename to programs/Xserver/hw/nxagent/Binder.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/CHANGELOG b/programs/Xserver/hw/nxagent/CHANGELOG
similarity index 99%
rename from nx-X11/programs/Xserver/hw/nxagent/CHANGELOG
rename to programs/Xserver/hw/nxagent/CHANGELOG
index 0f20b79..763f066 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/CHANGELOG
+++ b/programs/Xserver/hw/nxagent/CHANGELOG
@@ -1,5 +1,19 @@
 ChangeLog:
 
+nxagent-3.5.0-7
+
+- Fixed TR10I02622. Corrected function searching for icon file.
+
+nxagent-3.5.0-6
+
+- Fixed TR10I02621. Avoided explicit call to XMapWindow() at recon-
+  nection stage.
+
+- Fixed TR10I02620. Solved error in default visual set up.
+
+- Fixed TR10H02390. Get the actual remote key code for CapsLock and
+  NumLock.
+
 nxagent-3.5.0-5
 
 - The NX agent failed to resize its own window to fit the desktop size
diff --git a/nx-X11/programs/Xserver/hw/nxagent/COPYING b/programs/Xserver/hw/nxagent/COPYING
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/COPYING
rename to programs/Xserver/hw/nxagent/COPYING
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.c b/programs/Xserver/hw/nxagent/Client.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Client.c
rename to programs/Xserver/hw/nxagent/Client.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.h b/programs/Xserver/hw/nxagent/Client.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Client.h
rename to programs/Xserver/hw/nxagent/Client.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/programs/Xserver/hw/nxagent/Clipboard.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
rename to programs/Xserver/hw/nxagent/Clipboard.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h b/programs/Xserver/hw/nxagent/Clipboard.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Clipboard.h
rename to programs/Xserver/hw/nxagent/Clipboard.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c b/programs/Xserver/hw/nxagent/Colormap.c
similarity index 98%
rename from nx-X11/programs/Xserver/hw/nxagent/Colormap.c
rename to programs/Xserver/hw/nxagent/Colormap.c
index b0f0507..fbe52db 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c
+++ b/programs/Xserver/hw/nxagent/Colormap.c
@@ -69,8 +69,9 @@ Bool nxagentCreateColormap(ColormapPtr pCmap)
   Visual *visual;
   int class;
 
-  #ifdef TEST
-  fprintf(stderr, "nxagentCreateColormap: Going to create new colormap.\n");
+  #if defined(DEBUG) || defined(DEBUG_COLORMAP)
+  fprintf(stderr, "nxagentCreateColormap: Going to create new colormap with "
+              " visual [%lu].\n", pCmap->pVisual);
   #endif
 
   pVisual = pCmap->pVisual;
@@ -511,6 +512,11 @@ Bool nxagentCreateDefaultColormap(ScreenPtr pScreen)
   unsigned short zero = 0, ones = 0xFFFF;
   Pixel wp, bp;
 
+  #if defined(DEBUG) || defined(DEBUG_COLORMAP)
+  fprintf(stderr, "Debug: Searching for the root visual [%lu].\n",
+              pScreen->rootVisual);
+  #endif
+
   for (pVisual = pScreen->visuals;
        pVisual->vid != pScreen->rootVisual;
        pVisual++);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Colormap.h b/programs/Xserver/hw/nxagent/Colormap.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Colormap.h
rename to programs/Xserver/hw/nxagent/Colormap.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Composite.c b/programs/Xserver/hw/nxagent/Composite.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Composite.c
rename to programs/Xserver/hw/nxagent/Composite.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Composite.h b/programs/Xserver/hw/nxagent/Composite.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Composite.h
rename to programs/Xserver/hw/nxagent/Composite.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c b/programs/Xserver/hw/nxagent/Cursor.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Cursor.c
rename to programs/Xserver/hw/nxagent/Cursor.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.h b/programs/Xserver/hw/nxagent/Cursor.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Cursor.h
rename to programs/Xserver/hw/nxagent/Cursor.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c b/programs/Xserver/hw/nxagent/Dialog.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Dialog.c
rename to programs/Xserver/hw/nxagent/Dialog.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Dialog.h b/programs/Xserver/hw/nxagent/Dialog.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Dialog.h
rename to programs/Xserver/hw/nxagent/Dialog.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/programs/Xserver/hw/nxagent/Display.c
similarity index 97%
rename from nx-X11/programs/Xserver/hw/nxagent/Display.c
rename to programs/Xserver/hw/nxagent/Display.c
index db70434..c60718d 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/programs/Xserver/hw/nxagent/Display.c
@@ -1482,6 +1482,10 @@ void nxagentSetDefaultVisual(void)
 
   int i;
 
+  nxagentDefaultVisualIndex = 3;
+
+  return;
+
   if (nxagentUserDefaultClass || nxagentUserDefaultDepth)
   {
     nxagentDefaultVisualIndex = UNDEFINED;
@@ -1840,68 +1844,98 @@ FIXME: Is this needed?
   nxagentDisplay = NULL;
 }
 
+static FILE *nxagentLookForIconFile(char *iconName, const char *permission,
+                                        char *return_path)
+{
+  char *path;
+  char *end;
+  char singlePath[PATH_MAX];
+  int breakLoop;
+  FILE *fptr = NULL;
+
+  #ifdef WIN32
+  const char separator = ';';
+  const char *slash = "\\";
+  #else
+  const char separator = ':';
+  const char *slash = "/";
+  #endif
+
+  if ((path = getenv("PATH")) == NULL)
+  {
+    return NULL;
+  }
+
+  for(breakLoop = 0; breakLoop == 0 && fptr == NULL; )
+  {
+    end = strchr(path, separator);
+
+    if (end != NULL)
+    {
+      strncpy(singlePath, path, (unsigned long)(end - path));
+
+      singlePath[(unsigned long)(end - path)] = 0;
+
+      path = end + 1;
+    }
+    else
+    {
+      strcpy(singlePath, path);
+
+      breakLoop = 1;
+    }
+
+    if (singlePath[strlen(singlePath)- 1] == slash[0])
+    {
+      singlePath[strlen(singlePath)- 1] = 0;
+    }
+
+    if (strlen(singlePath) + strlen(iconName) + 1 < PATH_MAX)
+    {
+      strncat(singlePath, slash, 1);
+      strcat(singlePath, iconName);
+
+      if ((fptr = fopen(singlePath, permission)) != NULL)
+      {
+        strcpy(return_path, singlePath);
+      }
+    }
+    else
+    {
+      fprintf(stderr, "Error: Path too long.\n");
+    }
+  }
+
+  return fptr;
+}
+
 Bool nxagentMakeIcon(Display *display, Pixmap *nxIcon, Pixmap *nxMask)
 {
-  char *env_path = getenv("PATH");
-  int lenght_env_path = 0;
-  char icon_filename [256];
-  char default_path [256];
-  char *icon_path = malloc( strlen(env_path) + sizeof(icon_filename) );
+  char default_path [PATH_MAX];
+  char icon_path [PATH_MAX];
   FILE *icon_fp;
   int status;
   Bool success = False;
   XlibPixmap IconPixmap;
   XlibPixmap IconShape;
 
-  if (env_path == NULL)
-    lenght_env_path = 0;
-  else
-    lenght_env_path = strlen(env_path) + 1;
-  strncpy(icon_filename, "", 255);
-  strncpy(default_path, "", 255);
-
-  strcat(icon_filename, NXAGENT_ICON_NAME);
-  strcat(default_path,"/usr/NX/share/images/");
-  strcat(default_path,icon_filename);
+  snprintf(default_path, PATH_MAX-1, "/usr/NX/share/images/%s", NXAGENT_ICON_NAME);
 
   if ((icon_fp = fopen(default_path, "r")) == NULL)
   {
-    char *s;
-    char *temp_path = malloc(lenght_env_path + strlen(icon_filename) );
-    char *temp_path1 = malloc(lenght_env_path + strlen(icon_filename) );
-
-    strncpy(temp_path, env_path, strlen(env_path));
-    strncpy(temp_path1, "", lenght_env_path + strlen(icon_filename) );
+    icon_fp = nxagentLookForIconFile(NXAGENT_ICON_NAME, "r", icon_path);
 
-    while (strlen(temp_path) > 0)
+    if (icon_fp != NULL)
     {
-       s = strpbrk (temp_path, ":");
-       if (s == NULL) break;
-
-       strncpy (temp_path1, temp_path , strlen(temp_path) - strlen(s) );
-       strncat (temp_path1, "/", 1);
-       strncat (temp_path1, icon_filename, strlen(icon_filename));
-       if ((icon_fp = fopen(temp_path1, "r")) != NULL)
-       {
-          fclose (icon_fp);
-          success = True;
-          strcpy(icon_path,temp_path1);
-          break;
-       }
-       strncpy(temp_path1, "", lenght_env_path + strlen(icon_filename) );
-       strncpy(temp_path1, s + 1, strlen(s)-1);
-       strncpy(temp_path, "", lenght_env_path + strlen(icon_filename) );
-       strcpy(temp_path, temp_path1 );
-       strncpy(temp_path1, "", lenght_env_path + strlen(icon_filename) );
-     }
-     free(temp_path);
-     free(temp_path1);
+      fclose (icon_fp);
+      success = True;
+    }
   }
   else
   {
-     fclose (icon_fp);
-     success = True;
-     strcpy(icon_path, default_path);
+    fclose (icon_fp);
+    success = True;
+    strcpy(icon_path, default_path);
   }
 
   if (success)
@@ -1948,7 +1982,6 @@ Bool nxagentMakeIcon(Display *display, Pixmap *nxIcon, Pixmap *nxMask)
      }
   }
 
-  free(icon_path);
 
   *nxIcon = IconPixmap;
   *nxMask = IconShape;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.h b/programs/Xserver/hw/nxagent/Display.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Display.h
rename to programs/Xserver/hw/nxagent/Display.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/programs/Xserver/hw/nxagent/Drawable.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Drawable.c
rename to programs/Xserver/hw/nxagent/Drawable.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.h b/programs/Xserver/hw/nxagent/Drawable.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Drawable.h
rename to programs/Xserver/hw/nxagent/Drawable.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Error.c b/programs/Xserver/hw/nxagent/Error.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Error.c
rename to programs/Xserver/hw/nxagent/Error.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Error.h b/programs/Xserver/hw/nxagent/Error.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Error.h
rename to programs/Xserver/hw/nxagent/Error.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/programs/Xserver/hw/nxagent/Events.c
similarity index 99%
rename from nx-X11/programs/Xserver/hw/nxagent/Events.c
rename to programs/Xserver/hw/nxagent/Events.c
index ce84c1b..d0efa71 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/programs/Xserver/hw/nxagent/Events.c
@@ -395,8 +395,10 @@ void nxagentRemoteWindowInfo(Window win, int indent, Bool newLine)
 
   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) ?
+                 attributes.width, attributes.height,
+                     (attributes.class == 0) ? "CopyFromParent" :
+                     ((attributes.class == 1) ? "InputOutput" : "InputOnly"),
+                     (attributes.map_state == 0) ?
                          "IsUnmapped" : (attributes.map_state == 1 ?
                              "IsUnviewable" : "IsViewable"),
                                  (attributes.override_redirect == 0) ?
@@ -415,9 +417,9 @@ void nxagentRemoteWindowInfo(Window win, int indent, Bool newLine)
 void nxagentRemoteWindowsTree(Window window, int level)
 {
   int i, j;
-  Window rootWin, parentWin;
+  unsigned long rootWin, parentWin;
   unsigned int numChildren;
-  Window *childList;
+  unsigned long *childList;
 
   if (!XQueryTree(nxagentDisplay, window, &rootWin, &parentWin, &childList,
                       &numChildren))
@@ -517,9 +519,11 @@ void nxagentInternalWindowInfo(WindowPtr pWin, int indent, Bool newLine)
   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 ?
+                     (pWin -> drawable.class == 0) ? "CopyFromParent" :
+                     ((pWin -> drawable.class == 1) ? "InputOutput" :
+                      "InputOnly"),
+                      (pWin -> mapped == 0) ?
+                             "IsUnmapped" : (pWin -> realized == 0 ?
                                  "IsUnviewable" : "IsViewable"),
                                      (pWin -> overrideRedirect == 0) ?
                                          "No" : "Yes");
@@ -1142,11 +1146,11 @@ FIXME: Don't enqueue the KeyRelease event if the key was
 
         if (nxagentXkbState.Initialized == 0)
         {
-          if (X.xkey.keycode == 66)
+          if (X.xkey.keycode == nxagentCapsLockKeycode)
           {
             nxagentXkbCapsTrap = 1;
           }
-          else if (X.xkey.keycode == 77)
+          else if (X.xkey.keycode == nxagentNumLockKeycode)
           {
             nxagentXkbNumTrap = 1;
           }
@@ -2292,11 +2296,11 @@ int nxagentHandleKeyPress(XEvent *X, enum HandleEventResult *result)
 
   if (nxagentXkbState.Initialized == 0)
   {
-    if (X -> xkey.keycode == 66)
+    if (X -> xkey.keycode == nxagentCapsLockKeycode)
     {
       nxagentXkbCapsTrap = 1;
     }
-    else if (X -> xkey.keycode == 77)
+    else if (X -> xkey.keycode == nxagentNumLockKeycode)
     {
       nxagentXkbNumTrap = 1;
     }
@@ -2312,11 +2316,11 @@ int nxagentHandleKeyPress(XEvent *X, enum HandleEventResult *result)
     return 1;
   }
 
-  if (X -> xkey.keycode == 66)
+  if (X -> xkey.keycode == nxagentCapsLockKeycode)
   {
     nxagentXkbState.Caps = (~nxagentXkbState.Caps & 1);
   }
-  else if (X -> xkey.keycode == 77)
+  else if (X -> xkey.keycode == nxagentNumLockKeycode)
   {
     nxagentXkbState.Num = (~nxagentXkbState.Num & 1);
   }
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.h b/programs/Xserver/hw/nxagent/Events.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Events.h
rename to programs/Xserver/hw/nxagent/Events.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c b/programs/Xserver/hw/nxagent/Extensions.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Extensions.c
rename to programs/Xserver/hw/nxagent/Extensions.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Extensions.h b/programs/Xserver/hw/nxagent/Extensions.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Extensions.h
rename to programs/Xserver/hw/nxagent/Extensions.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/programs/Xserver/hw/nxagent/Font.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Font.c
rename to programs/Xserver/hw/nxagent/Font.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.h b/programs/Xserver/hw/nxagent/Font.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Font.h
rename to programs/Xserver/hw/nxagent/Font.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GC.c b/programs/Xserver/hw/nxagent/GC.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/GC.c
rename to programs/Xserver/hw/nxagent/GC.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c b/programs/Xserver/hw/nxagent/GCOps.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/GCOps.c
rename to programs/Xserver/hw/nxagent/GCOps.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.h b/programs/Xserver/hw/nxagent/GCOps.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/GCOps.h
rename to programs/Xserver/hw/nxagent/GCOps.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCs.h b/programs/Xserver/hw/nxagent/GCs.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/GCs.h
rename to programs/Xserver/hw/nxagent/GCs.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/programs/Xserver/hw/nxagent/Handlers.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Handlers.c
rename to programs/Xserver/hw/nxagent/Handlers.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.h b/programs/Xserver/hw/nxagent/Handlers.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Handlers.h
rename to programs/Xserver/hw/nxagent/Handlers.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Holder.c b/programs/Xserver/hw/nxagent/Holder.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Holder.c
rename to programs/Xserver/hw/nxagent/Holder.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Holder.h b/programs/Xserver/hw/nxagent/Holder.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Holder.h
rename to programs/Xserver/hw/nxagent/Holder.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Icons.h b/programs/Xserver/hw/nxagent/Icons.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Icons.h
rename to programs/Xserver/hw/nxagent/Icons.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/programs/Xserver/hw/nxagent/Image.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Image.c
rename to programs/Xserver/hw/nxagent/Image.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.h b/programs/Xserver/hw/nxagent/Image.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Image.h
rename to programs/Xserver/hw/nxagent/Image.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/programs/Xserver/hw/nxagent/Imakefile
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Imakefile
rename to programs/Xserver/hw/nxagent/Imakefile
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/programs/Xserver/hw/nxagent/Init.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Init.c
rename to programs/Xserver/hw/nxagent/Init.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.h b/programs/Xserver/hw/nxagent/Init.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Init.h
rename to programs/Xserver/hw/nxagent/Init.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/programs/Xserver/hw/nxagent/Keyboard.c
similarity index 98%
rename from nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
rename to programs/Xserver/hw/nxagent/Keyboard.c
index 8db3889..e3b58b6 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/programs/Xserver/hw/nxagent/Keyboard.c
@@ -189,7 +189,12 @@ static char *nxagentXkbGetRules(void);
 
 unsigned int nxagentAltMetaMask;
 
-void nxagentCheckAltMetaKeys(CARD8, int);
+static void nxagentCheckAltMetaKeys(CARD8, int);
+
+CARD8 nxagentCapsLockKeycode = 66;
+CARD8 nxagentNumLockKeycode  = 77;
+
+static void nxagentCheckRemoteKeycodes(void);
 
 static CARD8 nxagentConvertedKeycodes[] =
 {
@@ -784,6 +789,8 @@ N/A
         }
       XFreeModifiermap(modifier_keymap);
 
+      nxagentCheckRemoteKeycodes();
+
       keySyms.minKeyCode = min_keycode;
       keySyms.maxKeyCode = max_keycode;
       keySyms.mapWidth = mapWidth;
@@ -1343,7 +1350,7 @@ int nxagentResetKeyboard(void)
   }
 }
 
-void  nxagentCheckAltMetaKeys(CARD8 keycode, int j)
+void nxagentCheckAltMetaKeys(CARD8 keycode, int j)
 {
   if (keycode == XKeysymToKeycode(nxagentDisplay, XK_Meta_L))
   {
@@ -1366,6 +1373,19 @@ void  nxagentCheckAltMetaKeys(CARD8 keycode, int j)
   }
 }
 
+void nxagentCheckRemoteKeycodes()
+{
+  nxagentCapsLockKeycode = XKeysymToKeycode(nxagentDisplay, XK_Caps_Lock);
+
+  nxagentNumLockKeycode  = XKeysymToKeycode(nxagentDisplay, XK_Num_Lock);
+
+  #ifdef DEBUG
+  fprintf(stderr, "nxagentCheckRemoteKeycodes: Remote CapsLock keycode "
+              "is [%d] NumLock [%d].\n", nxagentCapsLockKeycode,
+                  nxagentNumLockKeycode);
+  #endif
+}
+
 static int nxagentSaveKeyboardDeviceData(DeviceIntPtr dev, DeviceIntPtr devBackup)
 {
   if (devBackup == NULL)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.h b/programs/Xserver/hw/nxagent/Keyboard.h
similarity index 97%
rename from nx-X11/programs/Xserver/hw/nxagent/Keyboard.h
rename to programs/Xserver/hw/nxagent/Keyboard.h
index 0e11a8a..12d953d 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.h
+++ b/programs/Xserver/hw/nxagent/Keyboard.h
@@ -115,4 +115,7 @@ void nxagentResetKeycodeConversion(void);
 
 CARD8 nxagentConvertKeycode(CARD8 k);
 
+extern CARD8 nxagentCapsLockKeycode;
+extern CARD8 nxagentNumLockKeycode;
+
 #endif /* __Keyboard_H__ */
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/programs/Xserver/hw/nxagent/Keystroke.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
rename to programs/Xserver/hw/nxagent/Keystroke.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.h b/programs/Xserver/hw/nxagent/Keystroke.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Keystroke.h
rename to programs/Xserver/hw/nxagent/Keystroke.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/LICENSE b/programs/Xserver/hw/nxagent/LICENSE
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/LICENSE
rename to programs/Xserver/hw/nxagent/LICENSE
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Literals.h b/programs/Xserver/hw/nxagent/Literals.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Literals.h
rename to programs/Xserver/hw/nxagent/Literals.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Millis.c b/programs/Xserver/hw/nxagent/Millis.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Millis.c
rename to programs/Xserver/hw/nxagent/Millis.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Millis.h b/programs/Xserver/hw/nxagent/Millis.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Millis.h
rename to programs/Xserver/hw/nxagent/Millis.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXcomposite.c b/programs/Xserver/hw/nxagent/NXcomposite.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXcomposite.c
rename to programs/Xserver/hw/nxagent/NXcomposite.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXcomposite.h b/programs/Xserver/hw/nxagent/NXcomposite.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXcomposite.h
rename to programs/Xserver/hw/nxagent/NXcomposite.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h b/programs/Xserver/hw/nxagent/NXcompositeext.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h
rename to programs/Xserver/hw/nxagent/NXcompositeext.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXcompositeint.h b/programs/Xserver/hw/nxagent/NXcompositeint.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXcompositeint.h
rename to programs/Xserver/hw/nxagent/NXcompositeint.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXcompositeproto.h b/programs/Xserver/hw/nxagent/NXcompositeproto.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXcompositeproto.h
rename to programs/Xserver/hw/nxagent/NXcompositeproto.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c b/programs/Xserver/hw/nxagent/NXdamage.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXdamage.c
rename to programs/Xserver/hw/nxagent/NXdamage.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/programs/Xserver/hw/nxagent/NXdispatch.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
rename to programs/Xserver/hw/nxagent/NXdispatch.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c.NX.original b/programs/Xserver/hw/nxagent/NXdispatch.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c.NX.original
rename to programs/Xserver/hw/nxagent/NXdispatch.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c.XF86.original b/programs/Xserver/hw/nxagent/NXdispatch.c.XF86.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c.XF86.original
rename to programs/Xserver/hw/nxagent/NXdispatch.c.XF86.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c b/programs/Xserver/hw/nxagent/NXdixfonts.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
rename to programs/Xserver/hw/nxagent/NXdixfonts.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c.NX.original b/programs/Xserver/hw/nxagent/NXdixfonts.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c.NX.original
rename to programs/Xserver/hw/nxagent/NXdixfonts.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c.XF86.original b/programs/Xserver/hw/nxagent/NXdixfonts.c.XF86.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c.XF86.original
rename to programs/Xserver/hw/nxagent/NXdixfonts.c.XF86.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c b/programs/Xserver/hw/nxagent/NXevents.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXevents.c
rename to programs/Xserver/hw/nxagent/NXevents.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c.NX.original b/programs/Xserver/hw/nxagent/NXevents.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXevents.c.NX.original
rename to programs/Xserver/hw/nxagent/NXevents.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c.XF86.original b/programs/Xserver/hw/nxagent/NXevents.c.XF86.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXevents.c.XF86.original
rename to programs/Xserver/hw/nxagent/NXevents.c.XF86.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXextension.c b/programs/Xserver/hw/nxagent/NXextension.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXextension.c
rename to programs/Xserver/hw/nxagent/NXextension.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXextension.c.NX.original b/programs/Xserver/hw/nxagent/NXextension.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXextension.c.NX.original
rename to programs/Xserver/hw/nxagent/NXextension.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXextension.c.XF86.original b/programs/Xserver/hw/nxagent/NXextension.c.XF86.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXextension.c.XF86.original
rename to programs/Xserver/hw/nxagent/NXextension.c.XF86.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c b/programs/Xserver/hw/nxagent/NXglxext.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXglxext.c
rename to programs/Xserver/hw/nxagent/NXglxext.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c.NX.original b/programs/Xserver/hw/nxagent/NXglxext.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXglxext.c.NX.original
rename to programs/Xserver/hw/nxagent/NXglxext.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c.XF86.original b/programs/Xserver/hw/nxagent/NXglxext.c.XF86.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXglxext.c.XF86.original
rename to programs/Xserver/hw/nxagent/NXglxext.c.XF86.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c b/programs/Xserver/hw/nxagent/NXglyph.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXglyph.c
rename to programs/Xserver/hw/nxagent/NXglyph.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c.NX.original b/programs/Xserver/hw/nxagent/NXglyph.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXglyph.c.NX.original
rename to programs/Xserver/hw/nxagent/NXglyph.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c.XF86.original b/programs/Xserver/hw/nxagent/NXglyph.c.XF86.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXglyph.c.XF86.original
rename to programs/Xserver/hw/nxagent/NXglyph.c.XF86.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c b/programs/Xserver/hw/nxagent/NXglyphcurs.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c
rename to programs/Xserver/hw/nxagent/NXglyphcurs.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c.NX.original b/programs/Xserver/hw/nxagent/NXglyphcurs.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c.NX.original
rename to programs/Xserver/hw/nxagent/NXglyphcurs.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c.XF86.original b/programs/Xserver/hw/nxagent/NXglyphcurs.c.XF86.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c.XF86.original
rename to programs/Xserver/hw/nxagent/NXglyphcurs.c.XF86.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h b/programs/Xserver/hw/nxagent/NXglyphstr.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h
rename to programs/Xserver/hw/nxagent/NXglyphstr.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h.NX.original b/programs/Xserver/hw/nxagent/NXglyphstr.h.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h.NX.original
rename to programs/Xserver/hw/nxagent/NXglyphstr.h.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h.XF86.original b/programs/Xserver/hw/nxagent/NXglyphstr.h.XF86.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h.XF86.original
rename to programs/Xserver/hw/nxagent/NXglyphstr.h.XF86.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c b/programs/Xserver/hw/nxagent/NXmiexpose.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c
rename to programs/Xserver/hw/nxagent/NXmiexpose.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c.NX.original b/programs/Xserver/hw/nxagent/NXmiexpose.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c.NX.original
rename to programs/Xserver/hw/nxagent/NXmiexpose.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c.XF86.original b/programs/Xserver/hw/nxagent/NXmiexpose.c.XF86.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c.XF86.original
rename to programs/Xserver/hw/nxagent/NXmiexpose.c.XF86.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c b/programs/Xserver/hw/nxagent/NXmiglyph.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c
rename to programs/Xserver/hw/nxagent/NXmiglyph.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c.NX.original b/programs/Xserver/hw/nxagent/NXmiglyph.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c.NX.original
rename to programs/Xserver/hw/nxagent/NXmiglyph.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c.XF86.original b/programs/Xserver/hw/nxagent/NXmiglyph.c.XF86.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c.XF86.original
rename to programs/Xserver/hw/nxagent/NXmiglyph.c.XF86.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c b/programs/Xserver/hw/nxagent/NXmitrap.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c
rename to programs/Xserver/hw/nxagent/NXmitrap.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c.NX.original b/programs/Xserver/hw/nxagent/NXmitrap.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c.NX.original
rename to programs/Xserver/hw/nxagent/NXmitrap.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c.XF86.original b/programs/Xserver/hw/nxagent/NXmitrap.c.XF86.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c.XF86.original
rename to programs/Xserver/hw/nxagent/NXmitrap.c.XF86.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c b/programs/Xserver/hw/nxagent/NXmiwindow.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c
rename to programs/Xserver/hw/nxagent/NXmiwindow.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c.NX.original b/programs/Xserver/hw/nxagent/NXmiwindow.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c.NX.original
rename to programs/Xserver/hw/nxagent/NXmiwindow.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c.XF86.original b/programs/Xserver/hw/nxagent/NXmiwindow.c.XF86.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c.XF86.original
rename to programs/Xserver/hw/nxagent/NXmiwindow.c.XF86.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c b/programs/Xserver/hw/nxagent/NXpicture.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
rename to programs/Xserver/hw/nxagent/NXpicture.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c.NX.original b/programs/Xserver/hw/nxagent/NXpicture.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXpicture.c.NX.original
rename to programs/Xserver/hw/nxagent/NXpicture.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c.XF86.original b/programs/Xserver/hw/nxagent/NXpicture.c.XF86.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXpicture.c.XF86.original
rename to programs/Xserver/hw/nxagent/NXpicture.c.XF86.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXpicturestr.h b/programs/Xserver/hw/nxagent/NXpicturestr.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXpicturestr.h
rename to programs/Xserver/hw/nxagent/NXpicturestr.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXpicturestr.h.NX.original b/programs/Xserver/hw/nxagent/NXpicturestr.h.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXpicturestr.h.NX.original
rename to programs/Xserver/hw/nxagent/NXpicturestr.h.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXpicturestr.h.XF86.original b/programs/Xserver/hw/nxagent/NXpicturestr.h.XF86.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXpicturestr.h.XF86.original
rename to programs/Xserver/hw/nxagent/NXpicturestr.h.XF86.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/programs/Xserver/hw/nxagent/NXproperty.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
rename to programs/Xserver/hw/nxagent/NXproperty.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c.NX.original b/programs/Xserver/hw/nxagent/NXproperty.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXproperty.c.NX.original
rename to programs/Xserver/hw/nxagent/NXproperty.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c.XF86.original b/programs/Xserver/hw/nxagent/NXproperty.c.XF86.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXproperty.c.XF86.original
rename to programs/Xserver/hw/nxagent/NXproperty.c.XF86.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c b/programs/Xserver/hw/nxagent/NXrender.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXrender.c
rename to programs/Xserver/hw/nxagent/NXrender.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c.NX.original b/programs/Xserver/hw/nxagent/NXrender.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXrender.c.NX.original
rename to programs/Xserver/hw/nxagent/NXrender.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c.XF86.original b/programs/Xserver/hw/nxagent/NXrender.c.XF86.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXrender.c.XF86.original
rename to programs/Xserver/hw/nxagent/NXrender.c.XF86.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c b/programs/Xserver/hw/nxagent/NXresource.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXresource.c
rename to programs/Xserver/hw/nxagent/NXresource.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c.NX.original b/programs/Xserver/hw/nxagent/NXresource.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXresource.c.NX.original
rename to programs/Xserver/hw/nxagent/NXresource.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c.XF86.original b/programs/Xserver/hw/nxagent/NXresource.c.XF86.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXresource.c.XF86.original
rename to programs/Xserver/hw/nxagent/NXresource.c.XF86.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/programs/Xserver/hw/nxagent/NXshm.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXshm.c
rename to programs/Xserver/hw/nxagent/NXshm.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c.NX.original b/programs/Xserver/hw/nxagent/NXshm.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXshm.c.NX.original
rename to programs/Xserver/hw/nxagent/NXshm.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c.XF86.original b/programs/Xserver/hw/nxagent/NXshm.c.XF86.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXshm.c.XF86.original
rename to programs/Xserver/hw/nxagent/NXshm.c.XF86.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c b/programs/Xserver/hw/nxagent/NXwindow.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
rename to programs/Xserver/hw/nxagent/NXwindow.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c.NX.original b/programs/Xserver/hw/nxagent/NXwindow.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXwindow.c.NX.original
rename to programs/Xserver/hw/nxagent/NXwindow.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c.XF86.original b/programs/Xserver/hw/nxagent/NXwindow.c.XF86.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXwindow.c.XF86.original
rename to programs/Xserver/hw/nxagent/NXwindow.c.XF86.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXxrandr.c b/programs/Xserver/hw/nxagent/NXxrandr.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXxrandr.c
rename to programs/Xserver/hw/nxagent/NXxrandr.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXxrandr.h b/programs/Xserver/hw/nxagent/NXxrandr.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXxrandr.h
rename to programs/Xserver/hw/nxagent/NXxrandr.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXxrandrint.h b/programs/Xserver/hw/nxagent/NXxrandrint.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXxrandrint.h
rename to programs/Xserver/hw/nxagent/NXxrandrint.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c b/programs/Xserver/hw/nxagent/NXxvdisp.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c
rename to programs/Xserver/hw/nxagent/NXxvdisp.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c.NX.original b/programs/Xserver/hw/nxagent/NXxvdisp.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c.NX.original
rename to programs/Xserver/hw/nxagent/NXxvdisp.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c.XF86.original b/programs/Xserver/hw/nxagent/NXxvdisp.c.XF86.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c.XF86.original
rename to programs/Xserver/hw/nxagent/NXxvdisp.c.XF86.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.c b/programs/Xserver/hw/nxagent/Options.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Options.c
rename to programs/Xserver/hw/nxagent/Options.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.h b/programs/Xserver/hw/nxagent/Options.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Options.h
rename to programs/Xserver/hw/nxagent/Options.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixels.c b/programs/Xserver/hw/nxagent/Pixels.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Pixels.c
rename to programs/Xserver/hw/nxagent/Pixels.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixels.h b/programs/Xserver/hw/nxagent/Pixels.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Pixels.h
rename to programs/Xserver/hw/nxagent/Pixels.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/programs/Xserver/hw/nxagent/Pixmap.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
rename to programs/Xserver/hw/nxagent/Pixmap.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h b/programs/Xserver/hw/nxagent/Pixmaps.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h
rename to programs/Xserver/hw/nxagent/Pixmaps.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pointer.c b/programs/Xserver/hw/nxagent/Pointer.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Pointer.c
rename to programs/Xserver/hw/nxagent/Pointer.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pointer.h b/programs/Xserver/hw/nxagent/Pointer.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Pointer.h
rename to programs/Xserver/hw/nxagent/Pointer.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/programs/Xserver/hw/nxagent/Reconnect.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
rename to programs/Xserver/hw/nxagent/Reconnect.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.h b/programs/Xserver/hw/nxagent/Reconnect.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Reconnect.h
rename to programs/Xserver/hw/nxagent/Reconnect.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/programs/Xserver/hw/nxagent/Render.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Render.c
rename to programs/Xserver/hw/nxagent/Render.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.h b/programs/Xserver/hw/nxagent/Render.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Render.h
rename to programs/Xserver/hw/nxagent/Render.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/programs/Xserver/hw/nxagent/Rootless.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Rootless.c
rename to programs/Xserver/hw/nxagent/Rootless.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.h b/programs/Xserver/hw/nxagent/Rootless.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Rootless.h
rename to programs/Xserver/hw/nxagent/Rootless.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/programs/Xserver/hw/nxagent/Screen.c
similarity index 97%
rename from nx-X11/programs/Xserver/hw/nxagent/Screen.c
rename to programs/Xserver/hw/nxagent/Screen.c
index b847b08..de688a0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/programs/Xserver/hw/nxagent/Screen.c
@@ -839,6 +839,8 @@ Bool nxagentOpenScreen(int index, ScreenPtr pScreen,
   int bitsPerPixel;
   int sizeInBytes;
 
+  int defaultVisualIndex = 0;
+
   #ifdef TEST
   fprintf(stderr, "nxagentOpenScreen: Called for screen index [%d].\n",
               index);
@@ -1163,6 +1165,11 @@ Bool nxagentOpenScreen(int index, ScreenPtr pScreen,
      * Initialize the visuals.
      */
 
+    #if defined(DEBUG) || defined(DEBUG_COLORMAP)
+    fprintf(stderr, "Debug: Setting up visuals. Original array has size "
+                "[%d].\n", nxagentNumVisuals); 
+    #endif
+
     numVisuals = 0;
     numDepths = nxagentNumDepths;
 
@@ -1186,26 +1193,46 @@ Bool nxagentOpenScreen(int index, ScreenPtr pScreen,
        * Check for and remove the duplicates.
        */
 
-      for (j = 0; j < numVisuals; j++)
+      if (i == nxagentDefaultVisualIndex)
       {
-        if (visuals[numVisuals].class           == visuals[j].class           &&
-            visuals[numVisuals].bitsPerRGBValue == visuals[j].bitsPerRGBValue &&
-            visuals[numVisuals].ColormapEntries == visuals[j].ColormapEntries &&
-            visuals[numVisuals].nplanes         == visuals[j].nplanes         &&
-            visuals[numVisuals].redMask         == visuals[j].redMask         &&
-            visuals[numVisuals].greenMask       == visuals[j].greenMask       &&
-            visuals[numVisuals].blueMask        == visuals[j].blueMask        &&
-            visuals[numVisuals].offsetRed       == visuals[j].offsetRed       &&
-            visuals[numVisuals].offsetGreen     == visuals[j].offsetGreen     &&
-            visuals[numVisuals].offsetBlue      == visuals[j].offsetBlue)
-          break;
+        defaultVisualIndex = numVisuals;
+
+        #if defined(DEBUG) || defined(DEBUG_COLORMAP)
+        fprintf(stderr, "Debug: Set default visual index [%d].\n" ,
+                    defaultVisualIndex); 
+        #endif
       }
+      else
+      {
+        for (j = 0; j < numVisuals; j++)
+        {
+          if (visuals[numVisuals].class == visuals[j].class &&
+              visuals[numVisuals].bitsPerRGBValue ==
+                  visuals[j].bitsPerRGBValue &&
+              visuals[numVisuals].ColormapEntries ==
+                  visuals[j].ColormapEntries &&
+              visuals[numVisuals].nplanes == visuals[j].nplanes &&
+              visuals[numVisuals].redMask == visuals[j].redMask &&
+              visuals[numVisuals].greenMask == visuals[j].greenMask &&
+              visuals[numVisuals].blueMask == visuals[j].blueMask &&
+              visuals[numVisuals].offsetRed == visuals[j].offsetRed &&
+              visuals[numVisuals].offsetGreen == visuals[j].offsetGreen &&
+              visuals[numVisuals].offsetBlue == visuals[j].offsetBlue)
+            break;
+        }
+ 
+        if (j < numVisuals)
+            continue;
 
-      if (j < numVisuals)
-        continue;
+      }
 
       depthIndex = UNDEFINED;
 
+      #if defined(DEBUG) || defined(DEBUG_COLORMAP)
+      fprintf(stderr, "Debug: Added visual [%lu].\n" ,
+                  visuals[numVisuals].vid); 
+      #endif
+
       for (j = 0; j < numDepths; j++)
       {
         if (depths[j].depth == nxagentVisuals[i].depth)
@@ -1240,11 +1267,25 @@ Bool nxagentOpenScreen(int index, ScreenPtr pScreen,
 
       depths[depthIndex].numVids++;
 
+      #if defined(DEBUG) || defined(DEBUG_COLORMAP)
+      fprintf(stderr, "Debug: Registered visual [%lu] for depth [%d (%d)].\n" ,
+                  visuals[numVisuals].vid, depthIndex,
+                      depths[depthIndex].depth); 
+      #endif
+
       numVisuals++;
     }
 
-    defaultVisual = visuals[nxagentDefaultVisualIndex].vid;
-    rootDepth = visuals[nxagentDefaultVisualIndex].nplanes;
+    #if defined(DEBUG) || defined(DEBUG_COLORMAP)
+    fprintf(stderr, "Debug: Setting default visual [%d (%lu)].\n",
+                defaultVisualIndex, visuals[defaultVisualIndex].vid);
+
+    fprintf(stderr, "Debug: Setting root depth [%d].\n",
+                visuals[defaultVisualIndex].nplanes); 
+    #endif
+
+    defaultVisual = visuals[defaultVisualIndex].vid;
+    rootDepth = visuals[defaultVisualIndex].nplanes;
 
     nxagentInitAlphaVisual();
 
@@ -1271,7 +1312,7 @@ Bool nxagentOpenScreen(int index, ScreenPtr pScreen,
       return FALSE;
     }
 
-    #ifdef TEST
+    #if defined(DEBUG) || defined(DEBUG_COLORMAP)
     fprintf(stderr, "nxagentOpenScreen: Before fbScreenInit numVisuals [%d] numDepths [%d] "
               "rootDepth [%d] defaultVisual [%ld].\n", numVisuals, numDepths,
                   rootDepth, defaultVisual);
@@ -1288,7 +1329,7 @@ Bool nxagentOpenScreen(int index, ScreenPtr pScreen,
       return FALSE;
     }
 
-    #ifdef TEST
+    #if defined(DEBUG) || defined(DEBUG_COLORMAP)
     fprintf(stderr, "nxagentOpenScreen: After fbScreenInit numVisuals [%d] numDepths [%d] "
               "rootDepth [%d] defaultVisual [%ld].\n", numVisuals, numDepths,
                   rootDepth, defaultVisual);
@@ -1300,7 +1341,7 @@ Bool nxagentOpenScreen(int index, ScreenPtr pScreen,
      * and will modify numVisuals and numDepths.
      */
 
-    #ifdef TEST
+    #if defined(DEBUG) || defined(DEBUG_COLORMAP)
     fprintf(stderr, "nxagentOpenScreen: Before GLX numVisuals [%d] numDepths [%d] "
               "rootDepth [%d] defaultVisual [%ld].\n", numVisuals, numDepths,
                   rootDepth, defaultVisual);
@@ -1309,7 +1350,7 @@ Bool nxagentOpenScreen(int index, ScreenPtr pScreen,
     nxagentInitGlxExtension(&visuals, &depths, &numVisuals, &numDepths,
                                 &rootDepth, &defaultVisual);
 
-    #ifdef TEST
+    #if defined(DEBUG) || defined(DEBUG_COLORMAP)
     fprintf(stderr, "nxagentOpenScreen: After GLX numVisuals [%d] numDepths [%d] "
               "rootDepth [%d] defaultVisual [%ld].\n", numVisuals, numDepths,
                   rootDepth, defaultVisual);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.h b/programs/Xserver/hw/nxagent/Screen.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Screen.h
rename to programs/Xserver/hw/nxagent/Screen.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.c b/programs/Xserver/hw/nxagent/Splash.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Splash.c
rename to programs/Xserver/hw/nxagent/Splash.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.h b/programs/Xserver/hw/nxagent/Splash.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Splash.h
rename to programs/Xserver/hw/nxagent/Splash.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Split.c b/programs/Xserver/hw/nxagent/Split.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Split.c
rename to programs/Xserver/hw/nxagent/Split.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Split.h b/programs/Xserver/hw/nxagent/Split.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Split.h
rename to programs/Xserver/hw/nxagent/Split.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/TestExt.c b/programs/Xserver/hw/nxagent/TestExt.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/TestExt.c
rename to programs/Xserver/hw/nxagent/TestExt.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Trap.c b/programs/Xserver/hw/nxagent/Trap.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Trap.c
rename to programs/Xserver/hw/nxagent/Trap.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Trap.h b/programs/Xserver/hw/nxagent/Trap.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Trap.h
rename to programs/Xserver/hw/nxagent/Trap.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Utils.h b/programs/Xserver/hw/nxagent/Utils.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Utils.h
rename to programs/Xserver/hw/nxagent/Utils.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Visual.c b/programs/Xserver/hw/nxagent/Visual.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Visual.c
rename to programs/Xserver/hw/nxagent/Visual.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Visual.h b/programs/Xserver/hw/nxagent/Visual.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Visual.h
rename to programs/Xserver/hw/nxagent/Visual.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/programs/Xserver/hw/nxagent/Window.c
similarity index 99%
rename from nx-X11/programs/Xserver/hw/nxagent/Window.c
rename to programs/Xserver/hw/nxagent/Window.c
index 9881936..35a3598 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/programs/Xserver/hw/nxagent/Window.c
@@ -3170,10 +3170,17 @@ static void nxagentReconfigureWindow(pointer param0, XID param1, pointer data_bu
     {
         nxagentRealizeWindow (pWin);
     }
+/*
+XXX: This would break Motif menus.
+     If pWin is mapped but not realized, a followin UnmapWindow() wouldn't
+     do anything, leaving this mapped window around. XMapWindow()
+     is called in nxagentRealizeWindow() and there it is enough.
+
     else if (pWin->mapped)
     {
       XMapWindow(nxagentDisplay, nxagentWindow(pWin));
     }
+*/
     else if (nxagentOption(Rootless) && pWin -> overrideRedirect == 0 &&
                  nxagentWindowTopLevel(pWin) && nxagentIsIconic(pWin))
     {
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Windows.h b/programs/Xserver/hw/nxagent/Windows.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/Windows.h
rename to programs/Xserver/hw/nxagent/Windows.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXdamage.c b/programs/Xserver/hw/nxagent/X/NXdamage.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXdamage.c
rename to programs/Xserver/hw/nxagent/X/NXdamage.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXdamage.c.NX.original b/programs/Xserver/hw/nxagent/X/NXdamage.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXdamage.c.NX.original
rename to programs/Xserver/hw/nxagent/X/NXdamage.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXdamage.c.X.original b/programs/Xserver/hw/nxagent/X/NXdamage.c.X.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXdamage.c.X.original
rename to programs/Xserver/hw/nxagent/X/NXdamage.c.X.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c b/programs/Xserver/hw/nxagent/X/NXdispatch.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c
rename to programs/Xserver/hw/nxagent/X/NXdispatch.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c.NX.original b/programs/Xserver/hw/nxagent/X/NXdispatch.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c.NX.original
rename to programs/Xserver/hw/nxagent/X/NXdispatch.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c.X.original b/programs/Xserver/hw/nxagent/X/NXdispatch.c.X.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c.X.original
rename to programs/Xserver/hw/nxagent/X/NXdispatch.c.X.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXdixfonts.c b/programs/Xserver/hw/nxagent/X/NXdixfonts.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXdixfonts.c
rename to programs/Xserver/hw/nxagent/X/NXdixfonts.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXdixfonts.c.NX.original b/programs/Xserver/hw/nxagent/X/NXdixfonts.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXdixfonts.c.NX.original
rename to programs/Xserver/hw/nxagent/X/NXdixfonts.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXdixfonts.c.X.original b/programs/Xserver/hw/nxagent/X/NXdixfonts.c.X.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXdixfonts.c.X.original
rename to programs/Xserver/hw/nxagent/X/NXdixfonts.c.X.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXevents.c b/programs/Xserver/hw/nxagent/X/NXevents.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXevents.c
rename to programs/Xserver/hw/nxagent/X/NXevents.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXevents.c.NX.original b/programs/Xserver/hw/nxagent/X/NXevents.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXevents.c.NX.original
rename to programs/Xserver/hw/nxagent/X/NXevents.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXevents.c.X.original b/programs/Xserver/hw/nxagent/X/NXevents.c.X.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXevents.c.X.original
rename to programs/Xserver/hw/nxagent/X/NXevents.c.X.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXextension.c b/programs/Xserver/hw/nxagent/X/NXextension.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXextension.c
rename to programs/Xserver/hw/nxagent/X/NXextension.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXextension.c.NX.original b/programs/Xserver/hw/nxagent/X/NXextension.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXextension.c.NX.original
rename to programs/Xserver/hw/nxagent/X/NXextension.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXextension.c.X.original b/programs/Xserver/hw/nxagent/X/NXextension.c.X.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXextension.c.X.original
rename to programs/Xserver/hw/nxagent/X/NXextension.c.X.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXglxext.c b/programs/Xserver/hw/nxagent/X/NXglxext.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXglxext.c
rename to programs/Xserver/hw/nxagent/X/NXglxext.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXglxext.c.NX.original b/programs/Xserver/hw/nxagent/X/NXglxext.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXglxext.c.NX.original
rename to programs/Xserver/hw/nxagent/X/NXglxext.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXglxext.c.X.original b/programs/Xserver/hw/nxagent/X/NXglxext.c.X.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXglxext.c.X.original
rename to programs/Xserver/hw/nxagent/X/NXglxext.c.X.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c b/programs/Xserver/hw/nxagent/X/NXglyph.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c
rename to programs/Xserver/hw/nxagent/X/NXglyph.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c.NX.original b/programs/Xserver/hw/nxagent/X/NXglyph.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c.NX.original
rename to programs/Xserver/hw/nxagent/X/NXglyph.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c.X.original b/programs/Xserver/hw/nxagent/X/NXglyph.c.X.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c.X.original
rename to programs/Xserver/hw/nxagent/X/NXglyph.c.X.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXglyphcurs.c b/programs/Xserver/hw/nxagent/X/NXglyphcurs.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXglyphcurs.c
rename to programs/Xserver/hw/nxagent/X/NXglyphcurs.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXglyphcurs.c.NX.original b/programs/Xserver/hw/nxagent/X/NXglyphcurs.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXglyphcurs.c.NX.original
rename to programs/Xserver/hw/nxagent/X/NXglyphcurs.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXglyphcurs.c.X.original b/programs/Xserver/hw/nxagent/X/NXglyphcurs.c.X.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXglyphcurs.c.X.original
rename to programs/Xserver/hw/nxagent/X/NXglyphcurs.c.X.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXglyphstr.h b/programs/Xserver/hw/nxagent/X/NXglyphstr.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXglyphstr.h
rename to programs/Xserver/hw/nxagent/X/NXglyphstr.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXglyphstr.h.NX.original b/programs/Xserver/hw/nxagent/X/NXglyphstr.h.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXglyphstr.h.NX.original
rename to programs/Xserver/hw/nxagent/X/NXglyphstr.h.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXglyphstr.h.X.original b/programs/Xserver/hw/nxagent/X/NXglyphstr.h.X.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXglyphstr.h.X.original
rename to programs/Xserver/hw/nxagent/X/NXglyphstr.h.X.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXmiexpose.c b/programs/Xserver/hw/nxagent/X/NXmiexpose.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXmiexpose.c
rename to programs/Xserver/hw/nxagent/X/NXmiexpose.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXmiexpose.c.NX.original b/programs/Xserver/hw/nxagent/X/NXmiexpose.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXmiexpose.c.NX.original
rename to programs/Xserver/hw/nxagent/X/NXmiexpose.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXmiexpose.c.X.original b/programs/Xserver/hw/nxagent/X/NXmiexpose.c.X.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXmiexpose.c.X.original
rename to programs/Xserver/hw/nxagent/X/NXmiexpose.c.X.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXmiglyph.c b/programs/Xserver/hw/nxagent/X/NXmiglyph.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXmiglyph.c
rename to programs/Xserver/hw/nxagent/X/NXmiglyph.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXmiglyph.c.NX.original b/programs/Xserver/hw/nxagent/X/NXmiglyph.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXmiglyph.c.NX.original
rename to programs/Xserver/hw/nxagent/X/NXmiglyph.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXmiglyph.c.X.original b/programs/Xserver/hw/nxagent/X/NXmiglyph.c.X.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXmiglyph.c.X.original
rename to programs/Xserver/hw/nxagent/X/NXmiglyph.c.X.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXmitrap.c b/programs/Xserver/hw/nxagent/X/NXmitrap.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXmitrap.c
rename to programs/Xserver/hw/nxagent/X/NXmitrap.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXmitrap.c.NX.original b/programs/Xserver/hw/nxagent/X/NXmitrap.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXmitrap.c.NX.original
rename to programs/Xserver/hw/nxagent/X/NXmitrap.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXmitrap.c.X.original b/programs/Xserver/hw/nxagent/X/NXmitrap.c.X.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXmitrap.c.X.original
rename to programs/Xserver/hw/nxagent/X/NXmitrap.c.X.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXmiwindow.c b/programs/Xserver/hw/nxagent/X/NXmiwindow.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXmiwindow.c
rename to programs/Xserver/hw/nxagent/X/NXmiwindow.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXmiwindow.c.NX.original b/programs/Xserver/hw/nxagent/X/NXmiwindow.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXmiwindow.c.NX.original
rename to programs/Xserver/hw/nxagent/X/NXmiwindow.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXmiwindow.c.X.original b/programs/Xserver/hw/nxagent/X/NXmiwindow.c.X.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXmiwindow.c.X.original
rename to programs/Xserver/hw/nxagent/X/NXmiwindow.c.X.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c b/programs/Xserver/hw/nxagent/X/NXpicture.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c
rename to programs/Xserver/hw/nxagent/X/NXpicture.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c.NX.original b/programs/Xserver/hw/nxagent/X/NXpicture.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c.NX.original
rename to programs/Xserver/hw/nxagent/X/NXpicture.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c.X.original b/programs/Xserver/hw/nxagent/X/NXpicture.c.X.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c.X.original
rename to programs/Xserver/hw/nxagent/X/NXpicture.c.X.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h b/programs/Xserver/hw/nxagent/X/NXpicturestr.h
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h
rename to programs/Xserver/hw/nxagent/X/NXpicturestr.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h.NX.original b/programs/Xserver/hw/nxagent/X/NXpicturestr.h.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h.NX.original
rename to programs/Xserver/hw/nxagent/X/NXpicturestr.h.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h.X.original b/programs/Xserver/hw/nxagent/X/NXpicturestr.h.X.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h.X.original
rename to programs/Xserver/hw/nxagent/X/NXpicturestr.h.X.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXproperty.c b/programs/Xserver/hw/nxagent/X/NXproperty.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXproperty.c
rename to programs/Xserver/hw/nxagent/X/NXproperty.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXproperty.c.NX.original b/programs/Xserver/hw/nxagent/X/NXproperty.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXproperty.c.NX.original
rename to programs/Xserver/hw/nxagent/X/NXproperty.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXproperty.c.X.original b/programs/Xserver/hw/nxagent/X/NXproperty.c.X.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXproperty.c.X.original
rename to programs/Xserver/hw/nxagent/X/NXproperty.c.X.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXrender.c b/programs/Xserver/hw/nxagent/X/NXrender.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXrender.c
rename to programs/Xserver/hw/nxagent/X/NXrender.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXrender.c.NX.original b/programs/Xserver/hw/nxagent/X/NXrender.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXrender.c.NX.original
rename to programs/Xserver/hw/nxagent/X/NXrender.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXrender.c.X.original b/programs/Xserver/hw/nxagent/X/NXrender.c.X.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXrender.c.X.original
rename to programs/Xserver/hw/nxagent/X/NXrender.c.X.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXresource.c b/programs/Xserver/hw/nxagent/X/NXresource.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXresource.c
rename to programs/Xserver/hw/nxagent/X/NXresource.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXresource.c.NX.original b/programs/Xserver/hw/nxagent/X/NXresource.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXresource.c.NX.original
rename to programs/Xserver/hw/nxagent/X/NXresource.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXresource.c.X.original b/programs/Xserver/hw/nxagent/X/NXresource.c.X.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXresource.c.X.original
rename to programs/Xserver/hw/nxagent/X/NXresource.c.X.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXshm.c b/programs/Xserver/hw/nxagent/X/NXshm.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXshm.c
rename to programs/Xserver/hw/nxagent/X/NXshm.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXshm.c.NX.original b/programs/Xserver/hw/nxagent/X/NXshm.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXshm.c.NX.original
rename to programs/Xserver/hw/nxagent/X/NXshm.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXshm.c.X.original b/programs/Xserver/hw/nxagent/X/NXshm.c.X.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXshm.c.X.original
rename to programs/Xserver/hw/nxagent/X/NXshm.c.X.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXwindow.c b/programs/Xserver/hw/nxagent/X/NXwindow.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXwindow.c
rename to programs/Xserver/hw/nxagent/X/NXwindow.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXwindow.c.NX.original b/programs/Xserver/hw/nxagent/X/NXwindow.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXwindow.c.NX.original
rename to programs/Xserver/hw/nxagent/X/NXwindow.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXwindow.c.X.original b/programs/Xserver/hw/nxagent/X/NXwindow.c.X.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXwindow.c.X.original
rename to programs/Xserver/hw/nxagent/X/NXwindow.c.X.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXxvdisp.c b/programs/Xserver/hw/nxagent/X/NXxvdisp.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXxvdisp.c
rename to programs/Xserver/hw/nxagent/X/NXxvdisp.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXxvdisp.c.NX.original b/programs/Xserver/hw/nxagent/X/NXxvdisp.c.NX.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXxvdisp.c.NX.original
rename to programs/Xserver/hw/nxagent/X/NXxvdisp.c.NX.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXxvdisp.c.X.original b/programs/Xserver/hw/nxagent/X/NXxvdisp.c.X.original
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/X/NXxvdisp.c.X.original
rename to programs/Xserver/hw/nxagent/X/NXxvdisp.c.X.original
diff --git a/nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm b/programs/Xserver/hw/nxagent/nxagent.xpm
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm
rename to programs/Xserver/hw/nxagent/nxagent.xpm
diff --git a/nx-X11/programs/Xserver/hw/nxagent/nxmissing.xpm b/programs/Xserver/hw/nxagent/nxmissing.xpm
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/nxmissing.xpm
rename to programs/Xserver/hw/nxagent/nxmissing.xpm
diff --git a/nx-X11/programs/Xserver/hw/nxagent/os2Stub.c b/programs/Xserver/hw/nxagent/os2Stub.c
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/os2Stub.c
rename to programs/Xserver/hw/nxagent/os2Stub.c
diff --git a/nx-X11/programs/Xserver/hw/nxagent/screensaver b/programs/Xserver/hw/nxagent/screensaver
similarity index 100%
rename from nx-X11/programs/Xserver/hw/nxagent/screensaver
rename to programs/Xserver/hw/nxagent/screensaver


hooks/post-receive
-- 
nx-libs.git (NX libraries)

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 "nx-libs.git" (NX libraries).

    