28 Dec '11
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).
1
0
nx-libs.git - pristine-tar (branch) updated: 720d552708d1633f265ab349e37064888a980dc3
by git-admin＠x2go.org 28 Dec '11
by git-admin＠x2go.org 28 Dec '11
28 Dec '11
The branch, pristine-tar has been updated
via 720d552708d1633f265ab349e37064888a980dc3 (commit)
via d52bfce54300ad3f7a1136756436a2f8839deca2 (commit)
via 880c82e815c04cb042c93725daa2b234d3089993 (commit)
via c28802e9005003aeac6ee044ca4fda6f3e02f9ef (commit)
via 13073aa8eb19ee4e611fc11e9a55b8e82ac71d88 (commit)
via 5c7a6eca9685c854d00c054e86703b2849e9d801 (commit)
via bf9768697939266df935cc4ea72f311c9ab95d03 (commit)
via bdc80764fb25df7654ddc4fc2a58a78f6cdd4643 (commit)
via dc4a97a51dfd32116c084dc3d5096f5b7075ff01 (commit)
via 07eb4891c1ec962b88861f2d7c0ae4e194f6c4a5 (commit)
via 9cab16c05d85a73b94c54ad3c9da50d81a108c06 (commit)
via b6b0f1691c113df8ab134bc103a2a445eb7f8cb7 (commit)
via cc43ab732b4f89f3de77b148514de6a137bb616a (commit)
via cb8ce6bf94f4c97c5e9eabb61bfdbb1c9efe08a5 (commit)
via 99dd891f5db2fe66f98cc381f20ce77587650416 (commit)
via 55446f5fa48889d66739a2274292317225394867 (commit)
via 96b8cf6eb1794e4e215ca8f45ab0b59ca5f2e2e0 (commit)
via 4242dc03a19821f436552dda1d2fe053b2ff5631 (commit)
via 855aca49f29a0c10e7a4be7c7e4b3a9c329dbdd6 (commit)
via 869c58ba2861a5a2cba956f82ec1998743c7a8c8 (commit)
via 1c994016e3eb581bb0b985f39f3f533c69470bdf (commit)
via 067a75db9ae15ae0d3da259562f8a881bcc8631d (commit)
via 207dc1154412fc98fce2ebf408daaa84afd6da04 (commit)
via 2309ff139ecb7e3e8c4aa0d14a2a9f448eb26003 (commit)
via 655f9e69d2332b9a0b84439a2f5db4e78d09342b (commit)
via 8df2e4486f796fe54c28b7e2b3738ffc6c26ab44 (commit)
via 7772f9f5ffb0626db8c3e5d2dea78d578be57914 (commit)
via 4980867e44d8496d8a896cca21898ffe83b63cf3 (commit)
via 75a12c2a66cdaa705a06aa8f96395bfbd2570878 (commit)
via 1532da8767d7df6f2a437741df57897ba698da50 (commit)
via 151e2606c75ea5aa1d86f9013a5735642e6d4b54 (commit)
via 477b9999ec926a88fe2189bf0dd2151637982482 (commit)
via a889e97c0c3b902857e2d20d2ee0fa604914044d (commit)
via 003444f353e9f455b086173267e66a5f075674f6 (commit)
via f286afc77eac31bd2a213e664302720715141e1a (commit)
via 34975ac6a6eca9a0fb350773667984cc70ca111b (commit)
via f1760f75523a87429827ea635457c4f8a4444a1a (commit)
via d22b007f9fe182a08f01faa3c3ccd60c5460b51c (commit)
via 0ada529af91606b4449a99899fb3f7d9bcedd90d (commit)
via acf941550de4ca57234feb67d4696c9ef31023ae (commit)
via 104a3d2d4946460c38a0cc77eb1601e908bf4ac7 (commit)
via da094e419764273fcb19bd8fb97434e9df2f4cba (commit)
via e484264eb55e349ea9dab9068603bef173c1c550 (commit)
via 72d776f95589cafb6e72ddebacf65172ecb8d967 (commit)
via 8f0bd3fc25e45986d652a68ea9d8ea5b62a97a6b (commit)
via b1f3cad1406f0fbb447c3fa9773443b16d65ec1c (commit)
via 0eb9189e49b96772bc6ef5c40676013158b5547b (commit)
via 49b9f6a8a6da8bc01107d662e74c558a50bafb08 (commit)
via c46a5a389acf47231b682ea9c94bd1f1abfbf0ef (commit)
via 55779a7db05e244dc98b2b042c0c64179a5fa35e (commit)
via 084c2ce77aaaec14cdcea13d2c0e0d4ebe390337 (commit)
from 4dac4d9124ad5185653db8cf05e4f3a196e07102 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 720d552708d1633f265ab349e37064888a980dc3
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:51 2011 +0100
pristine-tar data for nxagent-3.5.0-5.tar.gz
commit d52bfce54300ad3f7a1136756436a2f8839deca2
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:49 2011 +0100
pristine-tar data for nxagent-3.5.0-2.tar.gz
commit 880c82e815c04cb042c93725daa2b234d3089993
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:48 2011 +0100
pristine-tar data for nxagent-3.4.0-9.tar.gz
commit c28802e9005003aeac6ee044ca4fda6f3e02f9ef
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:47 2011 +0100
pristine-tar data for nxagent-3.4.0-8.tar.gz
commit 13073aa8eb19ee4e611fc11e9a55b8e82ac71d88
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:46 2011 +0100
pristine-tar data for nxagent-3.4.0-5.tar.gz
commit 5c7a6eca9685c854d00c054e86703b2849e9d801
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:45 2011 +0100
pristine-tar data for nxagent-3.4.0-3.tar.gz
commit bf9768697939266df935cc4ea72f311c9ab95d03
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:44 2011 +0100
pristine-tar data for nxagent-3.4.0-11.tar.gz
commit bdc80764fb25df7654ddc4fc2a58a78f6cdd4643
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:43 2011 +0100
pristine-tar data for nxagent-3.3.0-9.tar.gz
commit dc4a97a51dfd32116c084dc3d5096f5b7075ff01
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:42 2011 +0100
pristine-tar data for nxagent-3.3.0-6.tar.gz
commit 07eb4891c1ec962b88861f2d7c0ae4e194f6c4a5
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:41 2011 +0100
pristine-tar data for nxagent-3.3.0-13.tar.gz
commit 9cab16c05d85a73b94c54ad3c9da50d81a108c06
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:40 2011 +0100
pristine-tar data for nxagent-3.3.0-10.tar.gz
commit b6b0f1691c113df8ab134bc103a2a445eb7f8cb7
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:39 2011 +0100
pristine-tar data for nxagent-3.2.0-8.tar.gz
commit cc43ab732b4f89f3de77b148514de6a137bb616a
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:38 2011 +0100
pristine-tar data for nxagent-3.2.0-7.tar.gz
commit cb8ce6bf94f4c97c5e9eabb61bfdbb1c9efe08a5
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:37 2011 +0100
pristine-tar data for nxagent-3.2.0-6.tar.gz
commit 99dd891f5db2fe66f98cc381f20ce77587650416
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:36 2011 +0100
pristine-tar data for nxagent-3.2.0-5.tar.gz
commit 55446f5fa48889d66739a2274292317225394867
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:36 2011 +0100
pristine-tar data for nxagent-3.2.0-10.tar.gz
commit 96b8cf6eb1794e4e215ca8f45ab0b59ca5f2e2e0
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:34 2011 +0100
pristine-tar data for nxagent-3.1.0-7.tar.gz
commit 4242dc03a19821f436552dda1d2fe053b2ff5631
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:33 2011 +0100
pristine-tar data for nxagent-3.1.0-6.tar.gz
commit 855aca49f29a0c10e7a4be7c7e4b3a9c329dbdd6
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:32 2011 +0100
pristine-tar data for nxagent-3.1.0-2.tar.gz
commit 869c58ba2861a5a2cba956f82ec1998743c7a8c8
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:31 2011 +0100
pristine-tar data for nxcompshad-3.5.0-2.tar.gz
commit 1c994016e3eb581bb0b985f39f3f533c69470bdf
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:31 2011 +0100
pristine-tar data for nxcompshad-3.4.0-3.tar.gz
commit 067a75db9ae15ae0d3da259562f8a881bcc8631d
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:31 2011 +0100
pristine-tar data for nxcompshad-3.4.0-1.tar.gz
commit 207dc1154412fc98fce2ebf408daaa84afd6da04
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:31 2011 +0100
pristine-tar data for nxcompshad-3.3.0-3.tar.gz
commit 2309ff139ecb7e3e8c4aa0d14a2a9f448eb26003
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:30 2011 +0100
pristine-tar data for nxcompshad-3.3.0-2.tar.gz
commit 655f9e69d2332b9a0b84439a2f5db4e78d09342b
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:30 2011 +0100
pristine-tar data for nxcompshad-3.2.0-3.tar.gz
commit 8df2e4486f796fe54c28b7e2b3738ffc6c26ab44
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:30 2011 +0100
pristine-tar data for nxcompshad-3.2.0-1.tar.gz
commit 7772f9f5ffb0626db8c3e5d2dea78d578be57914
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:30 2011 +0100
pristine-tar data for nxcompshad-3.1.0-2.tar.gz
commit 4980867e44d8496d8a896cca21898ffe83b63cf3
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:29 2011 +0100
pristine-tar data for nxcompext-3.5.0-1.tar.gz
commit 75a12c2a66cdaa705a06aa8f96395bfbd2570878
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:29 2011 +0100
pristine-tar data for nxcompext-3.4.0-1.tar.gz
commit 1532da8767d7df6f2a437741df57897ba698da50
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:29 2011 +0100
pristine-tar data for nxcompext-3.3.0-4.tar.gz
commit 151e2606c75ea5aa1d86f9013a5735642e6d4b54
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:28 2011 +0100
pristine-tar data for nxcompext-3.3.0-3.tar.gz
commit 477b9999ec926a88fe2189bf0dd2151637982482
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:28 2011 +0100
pristine-tar data for nxcompext-3.3.0-2.tar.gz
commit a889e97c0c3b902857e2d20d2ee0fa604914044d
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:28 2011 +0100
pristine-tar data for nxcompext-3.2.0-1.tar.gz
commit 003444f353e9f455b086173267e66a5f075674f6
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:28 2011 +0100
pristine-tar data for nxcompext-3.1.0-2.tar.gz
commit f286afc77eac31bd2a213e664302720715141e1a
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:27 2011 +0100
pristine-tar data for nxcomp-3.5.0-2.tar.gz
commit 34975ac6a6eca9a0fb350773667984cc70ca111b
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:27 2011 +0100
pristine-tar data for nxcomp-3.5.0-1.tar.gz
commit f1760f75523a87429827ea635457c4f8a4444a1a
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:26 2011 +0100
pristine-tar data for nxcomp-3.4.0-7.tar.gz
commit d22b007f9fe182a08f01faa3c3ccd60c5460b51c
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:26 2011 +0100
pristine-tar data for nxcomp-3.4.0-6.tar.gz
commit 0ada529af91606b4449a99899fb3f7d9bcedd90d
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:25 2011 +0100
pristine-tar data for nxcomp-3.4.0-1.tar.gz
commit acf941550de4ca57234feb67d4696c9ef31023ae
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:24 2011 +0100
pristine-tar data for nxcomp-3.3.0-4.tar.gz
commit 104a3d2d4946460c38a0cc77eb1601e908bf4ac7
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:24 2011 +0100
pristine-tar data for nxcomp-3.3.0-3.tar.gz
commit da094e419764273fcb19bd8fb97434e9df2f4cba
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:23 2011 +0100
pristine-tar data for nxcomp-3.2.0-7.tar.gz
commit e484264eb55e349ea9dab9068603bef173c1c550
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:23 2011 +0100
pristine-tar data for nxcomp-3.2.0-6.tar.gz
commit 72d776f95589cafb6e72ddebacf65172ecb8d967
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:22 2011 +0100
pristine-tar data for nxcomp-3.1.0-6.tar.gz
commit 8f0bd3fc25e45986d652a68ea9d8ea5b62a97a6b
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:22 2011 +0100
pristine-tar data for nxcomp-3.1.0-4.tar.gz
commit b1f3cad1406f0fbb447c3fa9773443b16d65ec1c
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:21 2011 +0100
pristine-tar data for nxproxy-3.5.0-1.tar.gz
commit 0eb9189e49b96772bc6ef5c40676013158b5547b
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:21 2011 +0100
pristine-tar data for nxproxy-3.4.0-2.tar.gz
commit 49b9f6a8a6da8bc01107d662e74c558a50bafb08
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:21 2011 +0100
pristine-tar data for nxproxy-3.3.0-2.tar.gz
commit c46a5a389acf47231b682ea9c94bd1f1abfbf0ef
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:20 2011 +0100
pristine-tar data for nxproxy-3.2.0-1.tar.gz
commit 55779a7db05e244dc98b2b042c0c64179a5fa35e
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:20 2011 +0100
pristine-tar data for nxproxy-3.1.0-2.tar.gz
commit 084c2ce77aaaec14cdcea13d2c0e0d4ebe390337
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 28 18:21:20 2011 +0100
pristine-tar data for nxproxy-3.0.0-4.tar.gz
-----------------------------------------------------------------------
Summary of changes:
nxagent-3.1.0-2.tar.gz.delta | Bin 0 -> 9532 bytes
nxagent-3.1.0-2.tar.gz.id | 1 +
nxagent-3.1.0-6.tar.gz.delta | Bin 0 -> 9523 bytes
nxagent-3.1.0-6.tar.gz.id | 1 +
nxagent-3.1.0-7.tar.gz.delta | Bin 0 -> 9599 bytes
nxagent-3.1.0-7.tar.gz.id | 1 +
nxagent-3.2.0-10.tar.gz.delta | Bin 0 -> 9912 bytes
nxagent-3.2.0-10.tar.gz.id | 1 +
nxagent-3.2.0-5.tar.gz.delta | Bin 0 -> 9872 bytes
nxagent-3.2.0-5.tar.gz.id | 1 +
nxagent-3.2.0-6.tar.gz.delta | Bin 0 -> 9813 bytes
nxagent-3.2.0-6.tar.gz.id | 1 +
nxagent-3.2.0-7.tar.gz.delta | Bin 0 -> 9826 bytes
nxagent-3.2.0-7.tar.gz.id | 1 +
nxagent-3.2.0-8.tar.gz.delta | Bin 0 -> 9404 bytes
nxagent-3.2.0-8.tar.gz.id | 1 +
nxagent-3.3.0-10.tar.gz.delta | Bin 0 -> 9869 bytes
nxagent-3.3.0-10.tar.gz.id | 1 +
nxagent-3.3.0-13.tar.gz.delta | Bin 0 -> 9490 bytes
nxagent-3.3.0-13.tar.gz.id | 1 +
nxagent-3.3.0-6.tar.gz.delta | Bin 0 -> 9528 bytes
nxagent-3.3.0-6.tar.gz.id | 1 +
nxagent-3.3.0-9.tar.gz.delta | Bin 0 -> 9919 bytes
nxagent-3.3.0-9.tar.gz.id | 1 +
nxagent-3.4.0-11.tar.gz.delta | Bin 0 -> 9838 bytes
nxagent-3.4.0-11.tar.gz.id | 1 +
nxagent-3.4.0-3.tar.gz.delta | Bin 0 -> 9312 bytes
nxagent-3.4.0-3.tar.gz.id | 1 +
nxagent-3.4.0-5.tar.gz.delta | Bin 0 -> 10105 bytes
nxagent-3.4.0-5.tar.gz.id | 1 +
nxagent-3.4.0-8.tar.gz.delta | Bin 0 -> 9134 bytes
nxagent-3.4.0-8.tar.gz.id | 1 +
nxagent-3.4.0-9.tar.gz.delta | Bin 0 -> 9268 bytes
nxagent-3.4.0-9.tar.gz.id | 1 +
nxagent-3.5.0-2.tar.gz.delta | Bin 0 -> 9449 bytes
nxagent-3.5.0-2.tar.gz.id | 1 +
nxagent-3.5.0-5.tar.gz.delta | Bin 0 -> 9080 bytes
nxagent-3.5.0-5.tar.gz.id | 1 +
nxcomp-3.1.0-4.tar.gz.delta | Bin 0 -> 10458 bytes
nxcomp-3.1.0-4.tar.gz.id | 1 +
nxcomp-3.1.0-6.tar.gz.delta | Bin 0 -> 10420 bytes
nxcomp-3.1.0-6.tar.gz.id | 1 +
nxcomp-3.2.0-6.tar.gz.delta | Bin 0 -> 11131 bytes
nxcomp-3.2.0-6.tar.gz.id | 1 +
nxcomp-3.2.0-7.tar.gz.delta | Bin 0 -> 11219 bytes
nxcomp-3.2.0-7.tar.gz.id | 1 +
nxcomp-3.3.0-3.tar.gz.delta | Bin 0 -> 11211 bytes
nxcomp-3.3.0-3.tar.gz.id | 1 +
nxcomp-3.3.0-4.tar.gz.delta | Bin 0 -> 10762 bytes
nxcomp-3.3.0-4.tar.gz.id | 1 +
nxcomp-3.4.0-1.tar.gz.delta | Bin 0 -> 10680 bytes
nxcomp-3.4.0-1.tar.gz.id | 1 +
nxcomp-3.4.0-6.tar.gz.delta | Bin 0 -> 11254 bytes
nxcomp-3.4.0-6.tar.gz.id | 1 +
nxcomp-3.4.0-7.tar.gz.delta | Bin 0 -> 11033 bytes
nxcomp-3.4.0-7.tar.gz.id | 1 +
nxcomp-3.5.0-1.tar.gz.delta | Bin 0 -> 11312 bytes
nxcomp-3.5.0-1.tar.gz.id | 1 +
nxcomp-3.5.0-2.tar.gz.delta | Bin 0 -> 10954 bytes
nxcomp-3.5.0-2.tar.gz.id | 1 +
nxcompext-3.1.0-2.tar.gz.delta | Bin 0 -> 1789 bytes
nxcompext-3.1.0-2.tar.gz.id | 1 +
nxcompext-3.2.0-1.tar.gz.delta | Bin 0 -> 1759 bytes
nxcompext-3.2.0-1.tar.gz.id | 1 +
nxcompext-3.3.0-2.tar.gz.delta | Bin 0 -> 1912 bytes
nxcompext-3.3.0-2.tar.gz.id | 1 +
nxcompext-3.3.0-3.tar.gz.delta | Bin 0 -> 1765 bytes
nxcompext-3.3.0-3.tar.gz.id | 1 +
nxcompext-3.3.0-4.tar.gz.delta | Bin 0 -> 1862 bytes
nxcompext-3.3.0-4.tar.gz.id | 1 +
nxcompext-3.4.0-1.tar.gz.delta | Bin 0 -> 1764 bytes
nxcompext-3.4.0-1.tar.gz.id | 1 +
nxcompext-3.5.0-1.tar.gz.delta | Bin 0 -> 1872 bytes
nxcompext-3.5.0-1.tar.gz.id | 1 +
nxcompshad-3.1.0-2.tar.gz.delta | Bin 0 -> 1514 bytes
nxcompshad-3.1.0-2.tar.gz.id | 1 +
nxcompshad-3.2.0-1.tar.gz.delta | Bin 0 -> 1630 bytes
nxcompshad-3.2.0-1.tar.gz.id | 1 +
nxcompshad-3.2.0-3.tar.gz.delta | Bin 0 -> 1553 bytes
nxcompshad-3.2.0-3.tar.gz.id | 1 +
nxcompshad-3.3.0-2.tar.gz.delta | Bin 0 -> 1594 bytes
nxcompshad-3.3.0-2.tar.gz.id | 1 +
nxcompshad-3.3.0-3.tar.gz.delta | Bin 0 -> 1616 bytes
nxcompshad-3.3.0-3.tar.gz.id | 1 +
nxcompshad-3.4.0-1.tar.gz.delta | Bin 0 -> 1606 bytes
nxcompshad-3.4.0-1.tar.gz.id | 1 +
nxcompshad-3.4.0-3.tar.gz.delta | Bin 0 -> 1585 bytes
nxcompshad-3.4.0-3.tar.gz.id | 1 +
nxcompshad-3.5.0-2.tar.gz.delta | Bin 0 -> 1483 bytes
nxcompshad-3.5.0-2.tar.gz.id | 1 +
nxproxy-3.0.0-4.tar.gz.delta | Bin 0 -> 1241 bytes
nxproxy-3.0.0-4.tar.gz.id | 1 +
nxproxy-3.1.0-2.tar.gz.delta | Bin 0 -> 1232 bytes
nxproxy-3.1.0-2.tar.gz.id | 1 +
nxproxy-3.2.0-1.tar.gz.delta | Bin 0 -> 1240 bytes
nxproxy-3.2.0-1.tar.gz.id | 1 +
nxproxy-3.3.0-2.tar.gz.delta | Bin 0 -> 1238 bytes
nxproxy-3.3.0-2.tar.gz.id | 1 +
nxproxy-3.4.0-2.tar.gz.delta | Bin 0 -> 1265 bytes
nxproxy-3.4.0-2.tar.gz.id | 1 +
nxproxy-3.5.0-1.tar.gz.delta | Bin 0 -> 1231 bytes
nxproxy-3.5.0-1.tar.gz.id | 1 +
102 files changed, 51 insertions(+), 0 deletions(-)
create mode 100644 nxagent-3.1.0-2.tar.gz.delta
create mode 100644 nxagent-3.1.0-2.tar.gz.id
create mode 100644 nxagent-3.1.0-6.tar.gz.delta
create mode 100644 nxagent-3.1.0-6.tar.gz.id
create mode 100644 nxagent-3.1.0-7.tar.gz.delta
create mode 100644 nxagent-3.1.0-7.tar.gz.id
create mode 100644 nxagent-3.2.0-10.tar.gz.delta
create mode 100644 nxagent-3.2.0-10.tar.gz.id
create mode 100644 nxagent-3.2.0-5.tar.gz.delta
create mode 100644 nxagent-3.2.0-5.tar.gz.id
create mode 100644 nxagent-3.2.0-6.tar.gz.delta
create mode 100644 nxagent-3.2.0-6.tar.gz.id
create mode 100644 nxagent-3.2.0-7.tar.gz.delta
create mode 100644 nxagent-3.2.0-7.tar.gz.id
create mode 100644 nxagent-3.2.0-8.tar.gz.delta
create mode 100644 nxagent-3.2.0-8.tar.gz.id
create mode 100644 nxagent-3.3.0-10.tar.gz.delta
create mode 100644 nxagent-3.3.0-10.tar.gz.id
create mode 100644 nxagent-3.3.0-13.tar.gz.delta
create mode 100644 nxagent-3.3.0-13.tar.gz.id
create mode 100644 nxagent-3.3.0-6.tar.gz.delta
create mode 100644 nxagent-3.3.0-6.tar.gz.id
create mode 100644 nxagent-3.3.0-9.tar.gz.delta
create mode 100644 nxagent-3.3.0-9.tar.gz.id
create mode 100644 nxagent-3.4.0-11.tar.gz.delta
create mode 100644 nxagent-3.4.0-11.tar.gz.id
create mode 100644 nxagent-3.4.0-3.tar.gz.delta
create mode 100644 nxagent-3.4.0-3.tar.gz.id
create mode 100644 nxagent-3.4.0-5.tar.gz.delta
create mode 100644 nxagent-3.4.0-5.tar.gz.id
create mode 100644 nxagent-3.4.0-8.tar.gz.delta
create mode 100644 nxagent-3.4.0-8.tar.gz.id
create mode 100644 nxagent-3.4.0-9.tar.gz.delta
create mode 100644 nxagent-3.4.0-9.tar.gz.id
create mode 100644 nxagent-3.5.0-2.tar.gz.delta
create mode 100644 nxagent-3.5.0-2.tar.gz.id
create mode 100644 nxagent-3.5.0-5.tar.gz.delta
create mode 100644 nxagent-3.5.0-5.tar.gz.id
create mode 100644 nxcomp-3.1.0-4.tar.gz.delta
create mode 100644 nxcomp-3.1.0-4.tar.gz.id
create mode 100644 nxcomp-3.1.0-6.tar.gz.delta
create mode 100644 nxcomp-3.1.0-6.tar.gz.id
create mode 100644 nxcomp-3.2.0-6.tar.gz.delta
create mode 100644 nxcomp-3.2.0-6.tar.gz.id
create mode 100644 nxcomp-3.2.0-7.tar.gz.delta
create mode 100644 nxcomp-3.2.0-7.tar.gz.id
create mode 100644 nxcomp-3.3.0-3.tar.gz.delta
create mode 100644 nxcomp-3.3.0-3.tar.gz.id
create mode 100644 nxcomp-3.3.0-4.tar.gz.delta
create mode 100644 nxcomp-3.3.0-4.tar.gz.id
create mode 100644 nxcomp-3.4.0-1.tar.gz.delta
create mode 100644 nxcomp-3.4.0-1.tar.gz.id
create mode 100644 nxcomp-3.4.0-6.tar.gz.delta
create mode 100644 nxcomp-3.4.0-6.tar.gz.id
create mode 100644 nxcomp-3.4.0-7.tar.gz.delta
create mode 100644 nxcomp-3.4.0-7.tar.gz.id
create mode 100644 nxcomp-3.5.0-1.tar.gz.delta
create mode 100644 nxcomp-3.5.0-1.tar.gz.id
create mode 100644 nxcomp-3.5.0-2.tar.gz.delta
create mode 100644 nxcomp-3.5.0-2.tar.gz.id
create mode 100644 nxcompext-3.1.0-2.tar.gz.delta
create mode 100644 nxcompext-3.1.0-2.tar.gz.id
create mode 100644 nxcompext-3.2.0-1.tar.gz.delta
create mode 100644 nxcompext-3.2.0-1.tar.gz.id
create mode 100644 nxcompext-3.3.0-2.tar.gz.delta
create mode 100644 nxcompext-3.3.0-2.tar.gz.id
create mode 100644 nxcompext-3.3.0-3.tar.gz.delta
create mode 100644 nxcompext-3.3.0-3.tar.gz.id
create mode 100644 nxcompext-3.3.0-4.tar.gz.delta
create mode 100644 nxcompext-3.3.0-4.tar.gz.id
create mode 100644 nxcompext-3.4.0-1.tar.gz.delta
create mode 100644 nxcompext-3.4.0-1.tar.gz.id
create mode 100644 nxcompext-3.5.0-1.tar.gz.delta
create mode 100644 nxcompext-3.5.0-1.tar.gz.id
create mode 100644 nxcompshad-3.1.0-2.tar.gz.delta
create mode 100644 nxcompshad-3.1.0-2.tar.gz.id
create mode 100644 nxcompshad-3.2.0-1.tar.gz.delta
create mode 100644 nxcompshad-3.2.0-1.tar.gz.id
create mode 100644 nxcompshad-3.2.0-3.tar.gz.delta
create mode 100644 nxcompshad-3.2.0-3.tar.gz.id
create mode 100644 nxcompshad-3.3.0-2.tar.gz.delta
create mode 100644 nxcompshad-3.3.0-2.tar.gz.id
create mode 100644 nxcompshad-3.3.0-3.tar.gz.delta
create mode 100644 nxcompshad-3.3.0-3.tar.gz.id
create mode 100644 nxcompshad-3.4.0-1.tar.gz.delta
create mode 100644 nxcompshad-3.4.0-1.tar.gz.id
create mode 100644 nxcompshad-3.4.0-3.tar.gz.delta
create mode 100644 nxcompshad-3.4.0-3.tar.gz.id
create mode 100644 nxcompshad-3.5.0-2.tar.gz.delta
create mode 100644 nxcompshad-3.5.0-2.tar.gz.id
create mode 100644 nxproxy-3.0.0-4.tar.gz.delta
create mode 100644 nxproxy-3.0.0-4.tar.gz.id
create mode 100644 nxproxy-3.1.0-2.tar.gz.delta
create mode 100644 nxproxy-3.1.0-2.tar.gz.id
create mode 100644 nxproxy-3.2.0-1.tar.gz.delta
create mode 100644 nxproxy-3.2.0-1.tar.gz.id
create mode 100644 nxproxy-3.3.0-2.tar.gz.delta
create mode 100644 nxproxy-3.3.0-2.tar.gz.id
create mode 100644 nxproxy-3.4.0-2.tar.gz.delta
create mode 100644 nxproxy-3.4.0-2.tar.gz.id
create mode 100644 nxproxy-3.5.0-1.tar.gz.delta
create mode 100644 nxproxy-3.5.0-1.tar.gz.id
The diff of changes is:
diff --git a/nxagent-3.1.0-2.tar.gz.delta b/nxagent-3.1.0-2.tar.gz.delta
new file mode 100644
index 0000000..220ce33
Binary files /dev/null and b/nxagent-3.1.0-2.tar.gz.delta differ
diff --git a/nxagent-3.1.0-2.tar.gz.id b/nxagent-3.1.0-2.tar.gz.id
new file mode 100644
index 0000000..f364d4c
--- /dev/null
+++ b/nxagent-3.1.0-2.tar.gz.id
@@ -0,0 +1 @@
+5fb244da1d4c30727b02dd13359c46b0d6ae5a5d
diff --git a/nxagent-3.1.0-6.tar.gz.delta b/nxagent-3.1.0-6.tar.gz.delta
new file mode 100644
index 0000000..0e0e352
Binary files /dev/null and b/nxagent-3.1.0-6.tar.gz.delta differ
diff --git a/nxagent-3.1.0-6.tar.gz.id b/nxagent-3.1.0-6.tar.gz.id
new file mode 100644
index 0000000..0bc3efa
--- /dev/null
+++ b/nxagent-3.1.0-6.tar.gz.id
@@ -0,0 +1 @@
+936c0f771a5888f0182a11fcd238efe68779fab6
diff --git a/nxagent-3.1.0-7.tar.gz.delta b/nxagent-3.1.0-7.tar.gz.delta
new file mode 100644
index 0000000..077361e
Binary files /dev/null and b/nxagent-3.1.0-7.tar.gz.delta differ
diff --git a/nxagent-3.1.0-7.tar.gz.id b/nxagent-3.1.0-7.tar.gz.id
new file mode 100644
index 0000000..023a63c
--- /dev/null
+++ b/nxagent-3.1.0-7.tar.gz.id
@@ -0,0 +1 @@
+434591a33dbb1535d23c88ab00c4ee38226bfa79
diff --git a/nxagent-3.2.0-10.tar.gz.delta b/nxagent-3.2.0-10.tar.gz.delta
new file mode 100644
index 0000000..4d6e8f8
Binary files /dev/null and b/nxagent-3.2.0-10.tar.gz.delta differ
diff --git a/nxagent-3.2.0-10.tar.gz.id b/nxagent-3.2.0-10.tar.gz.id
new file mode 100644
index 0000000..fadf67a
--- /dev/null
+++ b/nxagent-3.2.0-10.tar.gz.id
@@ -0,0 +1 @@
+19c3f7ae917c5608ddeea6d641051ba7de827bbe
diff --git a/nxagent-3.2.0-5.tar.gz.delta b/nxagent-3.2.0-5.tar.gz.delta
new file mode 100644
index 0000000..7f954d1
Binary files /dev/null and b/nxagent-3.2.0-5.tar.gz.delta differ
diff --git a/nxagent-3.2.0-5.tar.gz.id b/nxagent-3.2.0-5.tar.gz.id
new file mode 100644
index 0000000..5ee87ed
--- /dev/null
+++ b/nxagent-3.2.0-5.tar.gz.id
@@ -0,0 +1 @@
+17ecc637f5ab48159b72ea2882b434c7ac2fe7d6
diff --git a/nxagent-3.2.0-6.tar.gz.delta b/nxagent-3.2.0-6.tar.gz.delta
new file mode 100644
index 0000000..e2a05d0
Binary files /dev/null and b/nxagent-3.2.0-6.tar.gz.delta differ
diff --git a/nxagent-3.2.0-6.tar.gz.id b/nxagent-3.2.0-6.tar.gz.id
new file mode 100644
index 0000000..43335b2
--- /dev/null
+++ b/nxagent-3.2.0-6.tar.gz.id
@@ -0,0 +1 @@
+978f724f4e0f01bbc5c869e1e5d1f87db4ac1af2
diff --git a/nxagent-3.2.0-7.tar.gz.delta b/nxagent-3.2.0-7.tar.gz.delta
new file mode 100644
index 0000000..e6f02a9
Binary files /dev/null and b/nxagent-3.2.0-7.tar.gz.delta differ
diff --git a/nxagent-3.2.0-7.tar.gz.id b/nxagent-3.2.0-7.tar.gz.id
new file mode 100644
index 0000000..c8e1b66
--- /dev/null
+++ b/nxagent-3.2.0-7.tar.gz.id
@@ -0,0 +1 @@
+2e8ca178bacc6ed3373b6dcc6e4e14b1950f08ba
diff --git a/nxagent-3.2.0-8.tar.gz.delta b/nxagent-3.2.0-8.tar.gz.delta
new file mode 100644
index 0000000..d0aedff
Binary files /dev/null and b/nxagent-3.2.0-8.tar.gz.delta differ
diff --git a/nxagent-3.2.0-8.tar.gz.id b/nxagent-3.2.0-8.tar.gz.id
new file mode 100644
index 0000000..8913977
--- /dev/null
+++ b/nxagent-3.2.0-8.tar.gz.id
@@ -0,0 +1 @@
+f9f25afe669e3b08b50d4b5be8ebb9a9d4865d4c
diff --git a/nxagent-3.3.0-10.tar.gz.delta b/nxagent-3.3.0-10.tar.gz.delta
new file mode 100644
index 0000000..124036b
Binary files /dev/null and b/nxagent-3.3.0-10.tar.gz.delta differ
diff --git a/nxagent-3.3.0-10.tar.gz.id b/nxagent-3.3.0-10.tar.gz.id
new file mode 100644
index 0000000..ad395ee
--- /dev/null
+++ b/nxagent-3.3.0-10.tar.gz.id
@@ -0,0 +1 @@
+f6e33912cb4c5be6d8a90c0436f784232b24b5c2
diff --git a/nxagent-3.3.0-13.tar.gz.delta b/nxagent-3.3.0-13.tar.gz.delta
new file mode 100644
index 0000000..a8bd17c
Binary files /dev/null and b/nxagent-3.3.0-13.tar.gz.delta differ
diff --git a/nxagent-3.3.0-13.tar.gz.id b/nxagent-3.3.0-13.tar.gz.id
new file mode 100644
index 0000000..dcf6e7c
--- /dev/null
+++ b/nxagent-3.3.0-13.tar.gz.id
@@ -0,0 +1 @@
+cb125028a6b882d70d0d8d896e0927acf22b5f87
diff --git a/nxagent-3.3.0-6.tar.gz.delta b/nxagent-3.3.0-6.tar.gz.delta
new file mode 100644
index 0000000..eeb1408
Binary files /dev/null and b/nxagent-3.3.0-6.tar.gz.delta differ
diff --git a/nxagent-3.3.0-6.tar.gz.id b/nxagent-3.3.0-6.tar.gz.id
new file mode 100644
index 0000000..9da1679
--- /dev/null
+++ b/nxagent-3.3.0-6.tar.gz.id
@@ -0,0 +1 @@
+bdb5279fd7493959a4dd7fde418dde9770e4c5c1
diff --git a/nxagent-3.3.0-9.tar.gz.delta b/nxagent-3.3.0-9.tar.gz.delta
new file mode 100644
index 0000000..05a8c37
Binary files /dev/null and b/nxagent-3.3.0-9.tar.gz.delta differ
diff --git a/nxagent-3.3.0-9.tar.gz.id b/nxagent-3.3.0-9.tar.gz.id
new file mode 100644
index 0000000..ab5fe73
--- /dev/null
+++ b/nxagent-3.3.0-9.tar.gz.id
@@ -0,0 +1 @@
+182b3f0f28972626ecec971907e85ab69af352c0
diff --git a/nxagent-3.4.0-11.tar.gz.delta b/nxagent-3.4.0-11.tar.gz.delta
new file mode 100644
index 0000000..bb4ae85
Binary files /dev/null and b/nxagent-3.4.0-11.tar.gz.delta differ
diff --git a/nxagent-3.4.0-11.tar.gz.id b/nxagent-3.4.0-11.tar.gz.id
new file mode 100644
index 0000000..325c24b
--- /dev/null
+++ b/nxagent-3.4.0-11.tar.gz.id
@@ -0,0 +1 @@
+22f5ca5fa40008c46ba5a1105d4fb05d4eb8090b
diff --git a/nxagent-3.4.0-3.tar.gz.delta b/nxagent-3.4.0-3.tar.gz.delta
new file mode 100644
index 0000000..867f024
Binary files /dev/null and b/nxagent-3.4.0-3.tar.gz.delta differ
diff --git a/nxagent-3.4.0-3.tar.gz.id b/nxagent-3.4.0-3.tar.gz.id
new file mode 100644
index 0000000..242d8b3
--- /dev/null
+++ b/nxagent-3.4.0-3.tar.gz.id
@@ -0,0 +1 @@
+96550b78f41768b3bbb1888fe400b9679d586faf
diff --git a/nxagent-3.4.0-5.tar.gz.delta b/nxagent-3.4.0-5.tar.gz.delta
new file mode 100644
index 0000000..ec7217f
Binary files /dev/null and b/nxagent-3.4.0-5.tar.gz.delta differ
diff --git a/nxagent-3.4.0-5.tar.gz.id b/nxagent-3.4.0-5.tar.gz.id
new file mode 100644
index 0000000..6fd15e7
--- /dev/null
+++ b/nxagent-3.4.0-5.tar.gz.id
@@ -0,0 +1 @@
+d06772bc5c9c70ab7793272087e1d13831143b63
diff --git a/nxagent-3.4.0-8.tar.gz.delta b/nxagent-3.4.0-8.tar.gz.delta
new file mode 100644
index 0000000..4c903e5
Binary files /dev/null and b/nxagent-3.4.0-8.tar.gz.delta differ
diff --git a/nxagent-3.4.0-8.tar.gz.id b/nxagent-3.4.0-8.tar.gz.id
new file mode 100644
index 0000000..f4ba129
--- /dev/null
+++ b/nxagent-3.4.0-8.tar.gz.id
@@ -0,0 +1 @@
+39df9598353705e889e156bcecd48ee5b490cbb6
diff --git a/nxagent-3.4.0-9.tar.gz.delta b/nxagent-3.4.0-9.tar.gz.delta
new file mode 100644
index 0000000..d007fa4
Binary files /dev/null and b/nxagent-3.4.0-9.tar.gz.delta differ
diff --git a/nxagent-3.4.0-9.tar.gz.id b/nxagent-3.4.0-9.tar.gz.id
new file mode 100644
index 0000000..b031fa7
--- /dev/null
+++ b/nxagent-3.4.0-9.tar.gz.id
@@ -0,0 +1 @@
+16ab900298a7bc531d797c04ae73d7b626ce6e08
diff --git a/nxagent-3.5.0-2.tar.gz.delta b/nxagent-3.5.0-2.tar.gz.delta
new file mode 100644
index 0000000..794b5cd
Binary files /dev/null and b/nxagent-3.5.0-2.tar.gz.delta differ
diff --git a/nxagent-3.5.0-2.tar.gz.id b/nxagent-3.5.0-2.tar.gz.id
new file mode 100644
index 0000000..ea2834f
--- /dev/null
+++ b/nxagent-3.5.0-2.tar.gz.id
@@ -0,0 +1 @@
+ccd1aaf5b2605b8dfc3e0d32775c85816f90c53a
diff --git a/nxagent-3.5.0-5.tar.gz.delta b/nxagent-3.5.0-5.tar.gz.delta
new file mode 100644
index 0000000..6bddbf3
Binary files /dev/null and b/nxagent-3.5.0-5.tar.gz.delta differ
diff --git a/nxagent-3.5.0-5.tar.gz.id b/nxagent-3.5.0-5.tar.gz.id
new file mode 100644
index 0000000..693c535
--- /dev/null
+++ b/nxagent-3.5.0-5.tar.gz.id
@@ -0,0 +1 @@
+faa014fc609eb5bb1153191be323951cf75e75a4
diff --git a/nxcomp-3.1.0-4.tar.gz.delta b/nxcomp-3.1.0-4.tar.gz.delta
new file mode 100644
index 0000000..f68bf9c
Binary files /dev/null and b/nxcomp-3.1.0-4.tar.gz.delta differ
diff --git a/nxcomp-3.1.0-4.tar.gz.id b/nxcomp-3.1.0-4.tar.gz.id
new file mode 100644
index 0000000..fee933d
--- /dev/null
+++ b/nxcomp-3.1.0-4.tar.gz.id
@@ -0,0 +1 @@
+28325f9fc4abf1e7830d507ec1ee1522bec48e3c
diff --git a/nxcomp-3.1.0-6.tar.gz.delta b/nxcomp-3.1.0-6.tar.gz.delta
new file mode 100644
index 0000000..216b019
Binary files /dev/null and b/nxcomp-3.1.0-6.tar.gz.delta differ
diff --git a/nxcomp-3.1.0-6.tar.gz.id b/nxcomp-3.1.0-6.tar.gz.id
new file mode 100644
index 0000000..f42be92
--- /dev/null
+++ b/nxcomp-3.1.0-6.tar.gz.id
@@ -0,0 +1 @@
+069578c62a52cea9b4405ae91afe1387dba28bc1
diff --git a/nxcomp-3.2.0-6.tar.gz.delta b/nxcomp-3.2.0-6.tar.gz.delta
new file mode 100644
index 0000000..1cf056b
Binary files /dev/null and b/nxcomp-3.2.0-6.tar.gz.delta differ
diff --git a/nxcomp-3.2.0-6.tar.gz.id b/nxcomp-3.2.0-6.tar.gz.id
new file mode 100644
index 0000000..05c96a1
--- /dev/null
+++ b/nxcomp-3.2.0-6.tar.gz.id
@@ -0,0 +1 @@
+cdcbbeb5df60c1b77567a1c5084971c2543f2824
diff --git a/nxcomp-3.2.0-7.tar.gz.delta b/nxcomp-3.2.0-7.tar.gz.delta
new file mode 100644
index 0000000..d8ee3d5
Binary files /dev/null and b/nxcomp-3.2.0-7.tar.gz.delta differ
diff --git a/nxcomp-3.2.0-7.tar.gz.id b/nxcomp-3.2.0-7.tar.gz.id
new file mode 100644
index 0000000..9e74bd9
--- /dev/null
+++ b/nxcomp-3.2.0-7.tar.gz.id
@@ -0,0 +1 @@
+255f45b828d41dfe7983ecf2791dfddc161d18bf
diff --git a/nxcomp-3.3.0-3.tar.gz.delta b/nxcomp-3.3.0-3.tar.gz.delta
new file mode 100644
index 0000000..30e79a0
Binary files /dev/null and b/nxcomp-3.3.0-3.tar.gz.delta differ
diff --git a/nxcomp-3.3.0-3.tar.gz.id b/nxcomp-3.3.0-3.tar.gz.id
new file mode 100644
index 0000000..cc82891
--- /dev/null
+++ b/nxcomp-3.3.0-3.tar.gz.id
@@ -0,0 +1 @@
+45b970bf5c892a36efa35b2503c8ed82b153f0f3
diff --git a/nxcomp-3.3.0-4.tar.gz.delta b/nxcomp-3.3.0-4.tar.gz.delta
new file mode 100644
index 0000000..8eff9a8
Binary files /dev/null and b/nxcomp-3.3.0-4.tar.gz.delta differ
diff --git a/nxcomp-3.3.0-4.tar.gz.id b/nxcomp-3.3.0-4.tar.gz.id
new file mode 100644
index 0000000..aee893d
--- /dev/null
+++ b/nxcomp-3.3.0-4.tar.gz.id
@@ -0,0 +1 @@
+aaa248f6e310ab8c82761a1ec8a71392a67e3f46
diff --git a/nxcomp-3.4.0-1.tar.gz.delta b/nxcomp-3.4.0-1.tar.gz.delta
new file mode 100644
index 0000000..ae96a96
Binary files /dev/null and b/nxcomp-3.4.0-1.tar.gz.delta differ
diff --git a/nxcomp-3.4.0-1.tar.gz.id b/nxcomp-3.4.0-1.tar.gz.id
new file mode 100644
index 0000000..7bd9444
--- /dev/null
+++ b/nxcomp-3.4.0-1.tar.gz.id
@@ -0,0 +1 @@
+a12274e9d70ac8afb699d455b8ddd2fcbbbf3793
diff --git a/nxcomp-3.4.0-6.tar.gz.delta b/nxcomp-3.4.0-6.tar.gz.delta
new file mode 100644
index 0000000..c84aa2e
Binary files /dev/null and b/nxcomp-3.4.0-6.tar.gz.delta differ
diff --git a/nxcomp-3.4.0-6.tar.gz.id b/nxcomp-3.4.0-6.tar.gz.id
new file mode 100644
index 0000000..507944d
--- /dev/null
+++ b/nxcomp-3.4.0-6.tar.gz.id
@@ -0,0 +1 @@
+93cf7ec4eceaf81caad13cdafb8d21411304f855
diff --git a/nxcomp-3.4.0-7.tar.gz.delta b/nxcomp-3.4.0-7.tar.gz.delta
new file mode 100644
index 0000000..2722563
Binary files /dev/null and b/nxcomp-3.4.0-7.tar.gz.delta differ
diff --git a/nxcomp-3.4.0-7.tar.gz.id b/nxcomp-3.4.0-7.tar.gz.id
new file mode 100644
index 0000000..426500a
--- /dev/null
+++ b/nxcomp-3.4.0-7.tar.gz.id
@@ -0,0 +1 @@
+c351c13e466c9ffe2d2306eb2c22b7e4f776fa4a
diff --git a/nxcomp-3.5.0-1.tar.gz.delta b/nxcomp-3.5.0-1.tar.gz.delta
new file mode 100644
index 0000000..5ed5886
Binary files /dev/null and b/nxcomp-3.5.0-1.tar.gz.delta differ
diff --git a/nxcomp-3.5.0-1.tar.gz.id b/nxcomp-3.5.0-1.tar.gz.id
new file mode 100644
index 0000000..320b0c3
--- /dev/null
+++ b/nxcomp-3.5.0-1.tar.gz.id
@@ -0,0 +1 @@
+13bf7e79986235c0c8f164cdb86507849173d6fb
diff --git a/nxcomp-3.5.0-2.tar.gz.delta b/nxcomp-3.5.0-2.tar.gz.delta
new file mode 100644
index 0000000..fe82a0b
Binary files /dev/null and b/nxcomp-3.5.0-2.tar.gz.delta differ
diff --git a/nxcomp-3.5.0-2.tar.gz.id b/nxcomp-3.5.0-2.tar.gz.id
new file mode 100644
index 0000000..13efb32
--- /dev/null
+++ b/nxcomp-3.5.0-2.tar.gz.id
@@ -0,0 +1 @@
+4572e0a55718d76d0c6211c57f5b972a46706782
diff --git a/nxcompext-3.1.0-2.tar.gz.delta b/nxcompext-3.1.0-2.tar.gz.delta
new file mode 100644
index 0000000..7b96686
Binary files /dev/null and b/nxcompext-3.1.0-2.tar.gz.delta differ
diff --git a/nxcompext-3.1.0-2.tar.gz.id b/nxcompext-3.1.0-2.tar.gz.id
new file mode 100644
index 0000000..c6e5598
--- /dev/null
+++ b/nxcompext-3.1.0-2.tar.gz.id
@@ -0,0 +1 @@
+396ab864af15c5de1d1b3cdb02819101a68e5611
diff --git a/nxcompext-3.2.0-1.tar.gz.delta b/nxcompext-3.2.0-1.tar.gz.delta
new file mode 100644
index 0000000..fe24d86
Binary files /dev/null and b/nxcompext-3.2.0-1.tar.gz.delta differ
diff --git a/nxcompext-3.2.0-1.tar.gz.id b/nxcompext-3.2.0-1.tar.gz.id
new file mode 100644
index 0000000..9be3129
--- /dev/null
+++ b/nxcompext-3.2.0-1.tar.gz.id
@@ -0,0 +1 @@
+2f3369a18ad4d5eaf33db2979e05ecd8ba48b145
diff --git a/nxcompext-3.3.0-2.tar.gz.delta b/nxcompext-3.3.0-2.tar.gz.delta
new file mode 100644
index 0000000..43ba2b9
Binary files /dev/null and b/nxcompext-3.3.0-2.tar.gz.delta differ
diff --git a/nxcompext-3.3.0-2.tar.gz.id b/nxcompext-3.3.0-2.tar.gz.id
new file mode 100644
index 0000000..bdebf26
--- /dev/null
+++ b/nxcompext-3.3.0-2.tar.gz.id
@@ -0,0 +1 @@
+a7edb8ad39bdcdc404c77c59e9733c0fae5dd58a
diff --git a/nxcompext-3.3.0-3.tar.gz.delta b/nxcompext-3.3.0-3.tar.gz.delta
new file mode 100644
index 0000000..dd93152
Binary files /dev/null and b/nxcompext-3.3.0-3.tar.gz.delta differ
diff --git a/nxcompext-3.3.0-3.tar.gz.id b/nxcompext-3.3.0-3.tar.gz.id
new file mode 100644
index 0000000..30b149b
--- /dev/null
+++ b/nxcompext-3.3.0-3.tar.gz.id
@@ -0,0 +1 @@
+4e320febd93fc3279e59eda10e0f669f51896f5b
diff --git a/nxcompext-3.3.0-4.tar.gz.delta b/nxcompext-3.3.0-4.tar.gz.delta
new file mode 100644
index 0000000..6db5b95
Binary files /dev/null and b/nxcompext-3.3.0-4.tar.gz.delta differ
diff --git a/nxcompext-3.3.0-4.tar.gz.id b/nxcompext-3.3.0-4.tar.gz.id
new file mode 100644
index 0000000..353e693
--- /dev/null
+++ b/nxcompext-3.3.0-4.tar.gz.id
@@ -0,0 +1 @@
+e76455649cfc901a654fe14a37fd1e74b5389d39
diff --git a/nxcompext-3.4.0-1.tar.gz.delta b/nxcompext-3.4.0-1.tar.gz.delta
new file mode 100644
index 0000000..a119948
Binary files /dev/null and b/nxcompext-3.4.0-1.tar.gz.delta differ
diff --git a/nxcompext-3.4.0-1.tar.gz.id b/nxcompext-3.4.0-1.tar.gz.id
new file mode 100644
index 0000000..bb1113a
--- /dev/null
+++ b/nxcompext-3.4.0-1.tar.gz.id
@@ -0,0 +1 @@
+31fd9c42ff12e610acc03ac0d81789d339270148
diff --git a/nxcompext-3.5.0-1.tar.gz.delta b/nxcompext-3.5.0-1.tar.gz.delta
new file mode 100644
index 0000000..9017392
Binary files /dev/null and b/nxcompext-3.5.0-1.tar.gz.delta differ
diff --git a/nxcompext-3.5.0-1.tar.gz.id b/nxcompext-3.5.0-1.tar.gz.id
new file mode 100644
index 0000000..223467b
--- /dev/null
+++ b/nxcompext-3.5.0-1.tar.gz.id
@@ -0,0 +1 @@
+e1c01769391548f679fd201672a7161df9438fe9
diff --git a/nxcompshad-3.1.0-2.tar.gz.delta b/nxcompshad-3.1.0-2.tar.gz.delta
new file mode 100644
index 0000000..79ba8de
Binary files /dev/null and b/nxcompshad-3.1.0-2.tar.gz.delta differ
diff --git a/nxcompshad-3.1.0-2.tar.gz.id b/nxcompshad-3.1.0-2.tar.gz.id
new file mode 100644
index 0000000..3653fb3
--- /dev/null
+++ b/nxcompshad-3.1.0-2.tar.gz.id
@@ -0,0 +1 @@
+93363e7b000b3f71f270276f80dbdfa7856886ea
diff --git a/nxcompshad-3.2.0-1.tar.gz.delta b/nxcompshad-3.2.0-1.tar.gz.delta
new file mode 100644
index 0000000..22a85f4
Binary files /dev/null and b/nxcompshad-3.2.0-1.tar.gz.delta differ
diff --git a/nxcompshad-3.2.0-1.tar.gz.id b/nxcompshad-3.2.0-1.tar.gz.id
new file mode 100644
index 0000000..1dc62dc
--- /dev/null
+++ b/nxcompshad-3.2.0-1.tar.gz.id
@@ -0,0 +1 @@
+d57f743ae4ca52f36fe2551f3a5efa7d41218f78
diff --git a/nxcompshad-3.2.0-3.tar.gz.delta b/nxcompshad-3.2.0-3.tar.gz.delta
new file mode 100644
index 0000000..6a0e8c3
Binary files /dev/null and b/nxcompshad-3.2.0-3.tar.gz.delta differ
diff --git a/nxcompshad-3.2.0-3.tar.gz.id b/nxcompshad-3.2.0-3.tar.gz.id
new file mode 100644
index 0000000..81cd164
--- /dev/null
+++ b/nxcompshad-3.2.0-3.tar.gz.id
@@ -0,0 +1 @@
+0a9e9a9c1b1d4dfb3adacb8206b83eacfd6b2123
diff --git a/nxcompshad-3.3.0-2.tar.gz.delta b/nxcompshad-3.3.0-2.tar.gz.delta
new file mode 100644
index 0000000..c362ed0
Binary files /dev/null and b/nxcompshad-3.3.0-2.tar.gz.delta differ
diff --git a/nxcompshad-3.3.0-2.tar.gz.id b/nxcompshad-3.3.0-2.tar.gz.id
new file mode 100644
index 0000000..e2fb885
--- /dev/null
+++ b/nxcompshad-3.3.0-2.tar.gz.id
@@ -0,0 +1 @@
+15aaaa5d374d9e95c904a2ae3ff1a1b713725c29
diff --git a/nxcompshad-3.3.0-3.tar.gz.delta b/nxcompshad-3.3.0-3.tar.gz.delta
new file mode 100644
index 0000000..7ce7532
Binary files /dev/null and b/nxcompshad-3.3.0-3.tar.gz.delta differ
diff --git a/nxcompshad-3.3.0-3.tar.gz.id b/nxcompshad-3.3.0-3.tar.gz.id
new file mode 100644
index 0000000..3ca41f9
--- /dev/null
+++ b/nxcompshad-3.3.0-3.tar.gz.id
@@ -0,0 +1 @@
+5e05706bc4fee304a1e7d3a343ded4f9cc18b0ec
diff --git a/nxcompshad-3.4.0-1.tar.gz.delta b/nxcompshad-3.4.0-1.tar.gz.delta
new file mode 100644
index 0000000..fa25e0f
Binary files /dev/null and b/nxcompshad-3.4.0-1.tar.gz.delta differ
diff --git a/nxcompshad-3.4.0-1.tar.gz.id b/nxcompshad-3.4.0-1.tar.gz.id
new file mode 100644
index 0000000..9c3f8d3
--- /dev/null
+++ b/nxcompshad-3.4.0-1.tar.gz.id
@@ -0,0 +1 @@
+7394b08b32ff0f9dc1dc99a50b490d451a1dd199
diff --git a/nxcompshad-3.4.0-3.tar.gz.delta b/nxcompshad-3.4.0-3.tar.gz.delta
new file mode 100644
index 0000000..68423f6
Binary files /dev/null and b/nxcompshad-3.4.0-3.tar.gz.delta differ
diff --git a/nxcompshad-3.4.0-3.tar.gz.id b/nxcompshad-3.4.0-3.tar.gz.id
new file mode 100644
index 0000000..e5f2d28
--- /dev/null
+++ b/nxcompshad-3.4.0-3.tar.gz.id
@@ -0,0 +1 @@
+99c2bb54c5ec6b0a73e7b09632d46109b0725e18
diff --git a/nxcompshad-3.5.0-2.tar.gz.delta b/nxcompshad-3.5.0-2.tar.gz.delta
new file mode 100644
index 0000000..8773f6a
Binary files /dev/null and b/nxcompshad-3.5.0-2.tar.gz.delta differ
diff --git a/nxcompshad-3.5.0-2.tar.gz.id b/nxcompshad-3.5.0-2.tar.gz.id
new file mode 100644
index 0000000..0907ceb
--- /dev/null
+++ b/nxcompshad-3.5.0-2.tar.gz.id
@@ -0,0 +1 @@
+2d3c1921ebb38dc1a7f66e4a976f4ad90cdfcb82
diff --git a/nxproxy-3.0.0-4.tar.gz.delta b/nxproxy-3.0.0-4.tar.gz.delta
new file mode 100644
index 0000000..d62fdca
Binary files /dev/null and b/nxproxy-3.0.0-4.tar.gz.delta differ
diff --git a/nxproxy-3.0.0-4.tar.gz.id b/nxproxy-3.0.0-4.tar.gz.id
new file mode 100644
index 0000000..d865381
--- /dev/null
+++ b/nxproxy-3.0.0-4.tar.gz.id
@@ -0,0 +1 @@
+9d8d1eef191ba63857bf9ae9d1276b46db1b3294
diff --git a/nxproxy-3.1.0-2.tar.gz.delta b/nxproxy-3.1.0-2.tar.gz.delta
new file mode 100644
index 0000000..9912f55
Binary files /dev/null and b/nxproxy-3.1.0-2.tar.gz.delta differ
diff --git a/nxproxy-3.1.0-2.tar.gz.id b/nxproxy-3.1.0-2.tar.gz.id
new file mode 100644
index 0000000..cf3473e
--- /dev/null
+++ b/nxproxy-3.1.0-2.tar.gz.id
@@ -0,0 +1 @@
+83d4a7fb7bce32978892049f03c6d9324b6fc9c7
diff --git a/nxproxy-3.2.0-1.tar.gz.delta b/nxproxy-3.2.0-1.tar.gz.delta
new file mode 100644
index 0000000..ea2acf4
Binary files /dev/null and b/nxproxy-3.2.0-1.tar.gz.delta differ
diff --git a/nxproxy-3.2.0-1.tar.gz.id b/nxproxy-3.2.0-1.tar.gz.id
new file mode 100644
index 0000000..0bf3c56
--- /dev/null
+++ b/nxproxy-3.2.0-1.tar.gz.id
@@ -0,0 +1 @@
+96eb57fb9edeafd0369042d94e6b61234703ca91
diff --git a/nxproxy-3.3.0-2.tar.gz.delta b/nxproxy-3.3.0-2.tar.gz.delta
new file mode 100644
index 0000000..003031a
Binary files /dev/null and b/nxproxy-3.3.0-2.tar.gz.delta differ
diff --git a/nxproxy-3.3.0-2.tar.gz.id b/nxproxy-3.3.0-2.tar.gz.id
new file mode 100644
index 0000000..1319310
--- /dev/null
+++ b/nxproxy-3.3.0-2.tar.gz.id
@@ -0,0 +1 @@
+6e8699df29804268b213071680b6d7f6979979ad
diff --git a/nxproxy-3.4.0-2.tar.gz.delta b/nxproxy-3.4.0-2.tar.gz.delta
new file mode 100644
index 0000000..fa639c6
Binary files /dev/null and b/nxproxy-3.4.0-2.tar.gz.delta differ
diff --git a/nxproxy-3.4.0-2.tar.gz.id b/nxproxy-3.4.0-2.tar.gz.id
new file mode 100644
index 0000000..c2ce401
--- /dev/null
+++ b/nxproxy-3.4.0-2.tar.gz.id
@@ -0,0 +1 @@
+f403c90b129c1adc76eb5d07021017c8f1e40c8e
diff --git a/nxproxy-3.5.0-1.tar.gz.delta b/nxproxy-3.5.0-1.tar.gz.delta
new file mode 100644
index 0000000..de06f75
Binary files /dev/null and b/nxproxy-3.5.0-1.tar.gz.delta differ
diff --git a/nxproxy-3.5.0-1.tar.gz.id b/nxproxy-3.5.0-1.tar.gz.id
new file mode 100644
index 0000000..d29eeef
--- /dev/null
+++ b/nxproxy-3.5.0-1.tar.gz.id
@@ -0,0 +1 @@
+06dad9508a9f73cd823d870e25a94f9cdae1cbc8
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).
1
0
The branch, build-main has been created
at 1098f511f85416cc723c64a602fac381d7d215ba (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
hooks/post-receive
--
x2goclient.git (X2Go Client)
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 "x2goclient.git" (X2Go Client).
1
0
27 Dec '11
The branch, master has been updated
via 1098f511f85416cc723c64a602fac381d7d215ba (commit)
from add6d927c6197d3c9963a0e91c858ef0cede40d9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1098f511f85416cc723c64a602fac381d7d215ba
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Tue Dec 27 16:18:24 2011 +0100
release 3.99.0.3
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 7bf6a49..460386e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x2goclient (3.99.0.3-0~x2go4) UNRELEASED; urgency=low
+x2goclient (3.99.0.3-0~x2go4) unstable; urgency=low
[ Mike Gabriel ]
* Rename icon title in /debian/menu file.
@@ -21,7 +21,7 @@ x2goclient (3.99.0.3-0~x2go4) UNRELEASED; urgency=low
in x2goagent needed)
- Add -lXpm in project file.
- -- Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Tue, 27 Dec 2011 11:49:29 +0100
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 27 Dec 2011 16:17:46 +0100
x2goclient (3.99.0.2-0~x2go1) unstable; urgency=low
hooks/post-receive
--
x2goclient.git (X2Go Client)
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 "x2goclient.git" (X2Go Client).
1
0
27 Dec '11
The branch, master has been updated
via add6d927c6197d3c9963a0e91c858ef0cede40d9 (commit)
from e21f0a417c83b3308821d7d1e06bbaed756c98a2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit add6d927c6197d3c9963a0e91c858ef0cede40d9
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Tue Dec 27 16:15:13 2011 +0100
changelog fix
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 3a55b29..7bf6a49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,7 +19,7 @@ x2goclient (3.99.0.3-0~x2go4) UNRELEASED; urgency=low
on one of the existing displays.
- Multi-display support: support for xinerama (temporarily disabled--support
in x2goagent needed)
- - add -lXpm in project file
+ - Add -lXpm in project file.
-- Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Tue, 27 Dec 2011 11:49:29 +0100
hooks/post-receive
--
x2goclient.git (X2Go Client)
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 "x2goclient.git" (X2Go Client).
1
0
27 Dec '11
The branch, master has been updated
via e21f0a417c83b3308821d7d1e06bbaed756c98a2 (commit)
from e3a8f0e81044aaa0d4ffacac742e80d6616c2b97 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e21f0a417c83b3308821d7d1e06bbaed756c98a2
Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de>
Date: Tue Dec 27 16:06:06 2011 +0100
add -lXpm in project file
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
x2goclient.pro | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2c701c8..3a55b29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ x2goclient (3.99.0.3-0~x2go4) UNRELEASED; urgency=low
on one of the existing displays.
- Multi-display support: support for xinerama (temporarily disabled--support
in x2goagent needed)
+ - add -lXpm in project file
-- Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Tue, 27 Dec 2011 11:49:29 +0100
diff --git a/x2goclient.pro b/x2goclient.pro
index d10dfcb..5246b79 100755
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -112,12 +112,12 @@ linux-g++ {
}
linux-g++-64 {
message(building $$TARGET with ldap and cups)
- LIBS += -lldap -lcups -lX11
+ LIBS += -lldap -lcups -lX11 -lXpm
}
x2go_linux_static {
message (linking all libs statically)
LIBS -= -lssh
- LIBS += -lssh_static -lssl
+ LIBS += -lssh_static -lssl -lXpm
QMAKE_LFLAGS = -Bstatic $$QMAKE_LFLAGS
}
hooks/post-receive
--
x2goclient.git (X2Go Client)
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 "x2goclient.git" (X2Go Client).
1
0
27 Dec '11
The branch, master has been updated
via e3a8f0e81044aaa0d4ffacac742e80d6616c2b97 (commit)
via e97d1993eec24ab7a8f426e04599a25d48bc6da8 (commit)
from 7488eba9969da7250612c7767434dbab92682525 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e3a8f0e81044aaa0d4ffacac742e80d6616c2b97
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Tue Dec 27 15:18:20 2011 +0100
Revert version number in version.h and x2goplugin.rc to 3.99.0.3.
commit e97d1993eec24ab7a8f426e04599a25d48bc6da8
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Tue Dec 27 15:16:04 2011 +0100
Add libxpm-dev as build-dependency.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 ++
debian/control | 1 +
version.h | 2 +-
x2goplugin.rc | 10 +++++-----
4 files changed, 9 insertions(+), 6 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2ed3909..2c701c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ x2goclient (3.99.0.3-0~x2go4) UNRELEASED; urgency=low
[ Mike Gabriel ]
* Rename icon title in /debian/menu file.
* Also split package dependencies for x2goplugin.
+ * Add libxpm-dev as build-dependency.
+ * Revert version number in version.h and x2goplugin.rc to 3.99.0.3.
[ Guido Günther ]
* Split package dependencies for SSH server/client.
diff --git a/debian/control b/debian/control
index 6289bf6..e522b31 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends:
libssh-dev (>= 0.4.7),
libcups2-dev,
libx11-dev,
+ libxpm-dev,
doxygen,
man2html-base | man2html
Standards-Version: 3.9.2
diff --git a/version.h b/version.h
index 6e5c5e0..d74ef6a 100644
--- a/version.h
+++ b/version.h
@@ -1 +1 @@
-#define VERSION "3.99.0.4"
+#define VERSION "3.99.0.3"
diff --git a/x2goplugin.rc b/x2goplugin.rc
index 75794ac..1079f6d 100644
--- a/x2goplugin.rc
+++ b/x2goplugin.rc
@@ -1,8 +1,8 @@
1 TYPELIB "x2goplugin.rc"
1 VERSIONINFO
- FILEVERSION 3,99,0,4
- PRODUCTVERSION 3,99,0,4
+ FILEVERSION 3,99,0,3
+ PRODUCTVERSION 3,99,0,3
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -21,13 +21,13 @@ BEGIN
VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0"
VALUE "FileExtents", "x2go\0"
VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0"
- VALUE "FileVersion", "3, 99, 0 ,4\0"
+ VALUE "FileVersion", "3, 99, 0 ,3\0"
VALUE "InternalName", "x2goplugin\0"
VALUE "LegalCopyright", "Copyright � 2010 Obviously Nice\0"
VALUE "MIMEType", "application/x2go\0"
VALUE "OriginalFilename", "npx2goplugin.dll\0"
- VALUE "ProductName", "X2GoClient Plug-in 3.99.0.4\0"
- VALUE "ProductVersion", "3, 99, 0, 4\0"
+ VALUE "ProductName", "X2GoClient Plug-in 3.99.0.3\0"
+ VALUE "ProductVersion", "3, 99, 0, 3\0"
END
END
BLOCK "VarFileInfo"
hooks/post-receive
--
x2goclient.git (X2Go Client)
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 "x2goclient.git" (X2Go Client).
1
0
27 Dec '11
The branch, build-main has been updated
via e665a2710772436abba5f998250e6ba84b7d58ff (commit)
via 7488eba9969da7250612c7767434dbab92682525 (commit)
via c357cafc82aae887c38aafa46288e3d3ed05050c (commit)
via 3cc2704301afd08ed3202af04e12e92c85578b04 (commit)
via 63121e5ae383ee304fdd93824fd9889d1975b330 (commit)
via 58676ee2db55c815abb3f578bc04c12a49d3a613 (commit)
via d5dcd78237f7eca7d7ba73e2ed0cdce1b6d89fc9 (commit)
via 14969ce19a2c10767a3759e3119ed40a6f990f6e (commit)
via a22d0649cb88fb83c833c3ba5fb1ee770888d3c0 (commit)
via d70895fcd1a0a69b9b382c624e49c8a28ed09e68 (commit)
via e1c182ae6ae9f2c9f0cafd358cd36237132ab225 (commit)
from f3e8850ff93d619ee8dff0251571193c760a0aea (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:
VERSION | 2 +-
debian/changelog | 29 +-
debian/control | 21 +-
debian/copyright | 2 +-
debian/menu | 2 +-
desktop/x2goclient.desktop | 2 +-
object_script.npx2goplugin.Debug | 58 ---
object_script.npx2goplugin.Release | 58 ---
object_script.x2goclient.Debug | 64 ---
object_script.x2goclient.Release | 64 ---
object_script.x2goplugin.Debug | 57 ---
object_script.x2goplugin.Release | 57 ---
onmainwindow.cpp | 502 ++++++++++----------
onmainwindow.h | 36 +-
onmainwindow_part2.cpp | 18 +-
onmainwindow_part3.cpp | 3 +-
onmainwindow_part4.cpp | 266 ++++++++++-
onmainwindow_privat.h | 2 +
sessionbutton.cpp | 116 +++--
sessionbutton.h | 109 +++--
sessionwidget.cpp | 12 +-
sessionwidget.h | 1 +
settingswidget.cpp | 925 ++++++++++++++++++++----------------
settingswidget.h | 94 ++--
sshmasterconnection.cpp | 39 ++-
sshmasterconnection.h | 36 ++-
version.h | 2 +-
wapi.cpp | 727 ++++++++++++++++-------------
wapi.h | 35 +-
x2goclient.pro | 6 +-
x2goplugin.rc | 10 +-
31 files changed, 1808 insertions(+), 1547 deletions(-)
delete mode 100644 object_script.npx2goplugin.Debug
delete mode 100644 object_script.npx2goplugin.Release
delete mode 100644 object_script.x2goclient.Debug
delete mode 100644 object_script.x2goclient.Release
delete mode 100644 object_script.x2goplugin.Debug
delete mode 100644 object_script.x2goplugin.Release
mode change 100644 => 100755 x2goclient.pro
The diff of changes is:
diff --git a/VERSION b/VERSION
index df56986..d2b4138 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.99.0.2
+3.99.0.3
diff --git a/debian/changelog b/debian/changelog
index faba982..334348b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,31 @@
-x2goclient (3.99.0.2-0~x2go1) unstable; urgency=low
+x2goclient (3.99.0.3-0~x2go1) unstable; urgency=low
[ Mike Gabriel ]
- * New upstream version (3.99.0.2):
- - Continue development...
+ * Rename icon title in /debian/menu file.
+ * Also split package dependencies for x2goplugin.
+
+ [ Guido Günther ]
+ * Split package dependencies for SSH server/client.
+
+ [ Oleksandr Shneyder ]
+ * New upstream version (3.99.0.3):
+ - LDAP: ssh port for every x2goserver can be specified in Server entry,
+ parameter "l"
+ - Change title of proxy window to session name
+ - Change icon of proxy window (only on Linux)
+ - Multi-display support: x2goclient can be configured to fit proxy window
+ on one of the existing displays.
+ - Multi-display support: support for xinerama (temporarily disabled--support
+ in x2goagent needed)
+
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 27 Dec 2011 15:06:16 +0100
+
+x2goclient (3.99.0.2-0~x2go1) unstable; urgency=low
[ Oleksandr Shneyder ]
- * QTcpSocket working not correct with some Antiviral software ( for example Avast) under windows. Fixing this by replacing it with Winsocks
- * Connectivity test dialog to use with a broker
+ * New upstream version (3.99.0.2):
+ - QTcpSocket working not correct with some Antiviral software ( for example Avast) under windows. Fixing this by replacing it with Winsocks
+ - Connectivity test dialog to use with a broker
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 25 Nov 2011 11:27:42 +0100
diff --git a/debian/control b/debian/control
index 155f5ad..6289bf6 100644
--- a/debian/control
+++ b/debian/control
@@ -23,13 +23,15 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
- ssh,
libssh-4 (>= 0.4.7),
+ openssh-client,
nxproxy
+Recommends:
+ openssh-server
Suggests:
pinentry-x2go
-Description: X2go Client application (Qt4)
- X2go is a serverbased computing environment with
+Description: X2Go Client application (Qt4)
+ X2Go is a serverbased computing environment with
- session resuming
- low bandwith support
- LDAP support
@@ -37,7 +39,7 @@ Description: X2go Client application (Qt4)
- audio support
- authentication by smartcard and USB stick
.
- x2goclient is a graphical client (Qt4) for the X2go system.
+ x2goclient is a graphical client (Qt4) for the X2Go system.
You can use it to connect to running sessions and start new sessions.
Package: x2goplugin
@@ -45,9 +47,14 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
+ openssh-client,
nxproxy
-Description: X2go Client (Qt4) as browser plugin
- X2go is a serverbased computing environment with
+Recommends:
+ openssh-server
+Suggests:
+ pinentry-x2go
+Description: X2Go Client (Qt4) as browser plugin
+ X2Go is a serverbased computing environment with
- session resuming
- low bandwith support
- LDAP support
@@ -55,7 +62,7 @@ Description: X2go Client (Qt4) as browser plugin
- audio support
- authentication by smartcard and USB stick
.
- x2goclient is a graphical client (qt4) for the x2go system.
+ x2goclient is a graphical client (qt4) for the X2Go system.
You can use it to connect to running sessions and start new sessions.
.
This package provides x2goclient as Mozilla plugin.
diff --git a/debian/copyright b/debian/copyright
index 47b11d5..a340aaf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
Upstream Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>
-Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/debian/menu b/debian/menu
index 2ce9d6c..128ca99 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,6 +1,6 @@
?package(x2goclient):\
needs="X11"\
section="Applications/Network/Communication"\
- title="X2GO Client (Qt)"\
+ title="X2Go Client (Qt)"\
icon="/usr/share/x2goclient/icons/x2goclient.xpm"\
command="/usr/bin/x2goclient"
diff --git a/desktop/x2goclient.desktop b/desktop/x2goclient.desktop
index fbf9efb..918a344 100644
--- a/desktop/x2goclient.desktop
+++ b/desktop/x2goclient.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
-Version=3.99.0.0
+Version=3.99.0.3
Type=Application
Name=X2Go Client
Exec=/usr/bin/x2goclient
diff --git a/object_script.npx2goplugin.Debug b/object_script.npx2goplugin.Debug
deleted file mode 100644
index 2e85c85..0000000
--- a/object_script.npx2goplugin.Debug
+++ /dev/null
@@ -1,58 +0,0 @@
-INPUT(
-./debug/sharewidget.o
-./debug/settingswidget.o
-./debug/configwidget.o
-./debug/sessionwidget.o
-./debug/connectionwidget.o
-./debug/configdialog.o
-./debug/editconnectiondialog.o
-./debug/exportdialog.o
-./debug/imgframe.o
-./debug/LDAPSession.o
-./debug/onmainwindow.o
-./debug/sessionbutton.o
-./debug/sessionmanagedialog.o
-./debug/sshmasterconnection.o
-./debug/sshprocess.o
-./debug/SVGFrame.o
-./debug/userbutton.o
-./debug/x2gologdebug.o
-./debug/printprocess.o
-./debug/cupsprint.o
-./debug/cupsprintwidget.o
-./debug/cupsprintersettingsdialog.o
-./debug/printwidget.o
-./debug/printercmddialog.o
-./debug/printdialog.o
-./debug/wapi.o
-./debug/clicklineedit.o
-./debug/httpbrokerclient.o
-./debug/ongetpass.o
-./debug/x2gosettings.o
-./debug/qtbrowserplugin.o
-./debug/qtbrowserplugin_win.o
-./debug/moc_configdialog.o
-./debug/moc_editconnectiondialog.o
-./debug/moc_exportdialog.o
-./debug/moc_imgframe.o
-./debug/moc_onmainwindow.o
-./debug/moc_sessionbutton.o
-./debug/moc_sessionmanagedialog.o
-./debug/moc_sshmasterconnection.o
-./debug/moc_sshprocess.o
-./debug/moc_SVGFrame.o
-./debug/moc_userbutton.o
-./debug/moc_printprocess.o
-./debug/moc_cupsprintwidget.o
-./debug/moc_cupsprintersettingsdialog.o
-./debug/moc_printwidget.o
-./debug/moc_printercmddialog.o
-./debug/moc_printdialog.o
-./debug/moc_sessionwidget.o
-./debug/moc_connectionwidget.o
-./debug/moc_settingswidget.o
-./debug/moc_sharewidget.o
-./debug/moc_clicklineedit.o
-./debug/moc_httpbrokerclient.o
-./debug/qrc_resources.o
-);
diff --git a/object_script.npx2goplugin.Release b/object_script.npx2goplugin.Release
deleted file mode 100644
index 68a5ff0..0000000
--- a/object_script.npx2goplugin.Release
+++ /dev/null
@@ -1,58 +0,0 @@
-INPUT(
-./release/sharewidget.o
-./release/settingswidget.o
-./release/configwidget.o
-./release/sessionwidget.o
-./release/connectionwidget.o
-./release/configdialog.o
-./release/editconnectiondialog.o
-./release/exportdialog.o
-./release/imgframe.o
-./release/LDAPSession.o
-./release/onmainwindow.o
-./release/sessionbutton.o
-./release/sessionmanagedialog.o
-./release/sshmasterconnection.o
-./release/sshprocess.o
-./release/SVGFrame.o
-./release/userbutton.o
-./release/x2gologdebug.o
-./release/printprocess.o
-./release/cupsprint.o
-./release/cupsprintwidget.o
-./release/cupsprintersettingsdialog.o
-./release/printwidget.o
-./release/printercmddialog.o
-./release/printdialog.o
-./release/wapi.o
-./release/clicklineedit.o
-./release/httpbrokerclient.o
-./release/ongetpass.o
-./release/x2gosettings.o
-./release/qtbrowserplugin.o
-./release/qtbrowserplugin_win.o
-./release/moc_configdialog.o
-./release/moc_editconnectiondialog.o
-./release/moc_exportdialog.o
-./release/moc_imgframe.o
-./release/moc_onmainwindow.o
-./release/moc_sessionbutton.o
-./release/moc_sessionmanagedialog.o
-./release/moc_sshmasterconnection.o
-./release/moc_sshprocess.o
-./release/moc_SVGFrame.o
-./release/moc_userbutton.o
-./release/moc_printprocess.o
-./release/moc_cupsprintwidget.o
-./release/moc_cupsprintersettingsdialog.o
-./release/moc_printwidget.o
-./release/moc_printercmddialog.o
-./release/moc_printdialog.o
-./release/moc_sessionwidget.o
-./release/moc_connectionwidget.o
-./release/moc_settingswidget.o
-./release/moc_sharewidget.o
-./release/moc_clicklineedit.o
-./release/moc_httpbrokerclient.o
-./release/qrc_resources.o
-);
diff --git a/object_script.x2goclient.Debug b/object_script.x2goclient.Debug
deleted file mode 100644
index 8c972be..0000000
--- a/object_script.x2goclient.Debug
+++ /dev/null
@@ -1,64 +0,0 @@
-INPUT(
-./debug\sharewidget.o
-./debug\settingswidget.o
-./debug\configwidget.o
-./debug\sessionwidget.o
-./debug\connectionwidget.o
-./debug\configdialog.o
-./debug\editconnectiondialog.o
-./debug\exportdialog.o
-./debug\imgframe.o
-./debug\LDAPSession.o
-./debug\onmainwindow.o
-./debug\onmainwindow_part2.o
-./debug\onmainwindow_part3.o
-./debug\onmainwindow_part4.o
-./debug\sessionbutton.o
-./debug\sessionmanagedialog.o
-./debug\sshmasterconnection.o
-./debug\sshprocess.o
-./debug\SVGFrame.o
-./debug\userbutton.o
-./debug\x2gologdebug.o
-./debug\printprocess.o
-./debug\cupsprint.o
-./debug\cupsprintwidget.o
-./debug\cupsprintersettingsdialog.o
-./debug\printwidget.o
-./debug\printercmddialog.o
-./debug\printdialog.o
-./debug\wapi.o
-./debug\clicklineedit.o
-./debug\httpbrokerclient.o
-./debug\ongetpass.o
-./debug\x2gosettings.o
-./debug\brokerpassdlg.o
-./debug\xsettingswidget.o
-./debug\x2goclient.o
-./debug\moc_configdialog.o
-./debug\moc_editconnectiondialog.o
-./debug\moc_exportdialog.o
-./debug\moc_imgframe.o
-./debug\moc_onmainwindow.o
-./debug\moc_sessionbutton.o
-./debug\moc_sessionmanagedialog.o
-./debug\moc_sshmasterconnection.o
-./debug\moc_sshprocess.o
-./debug\moc_SVGFrame.o
-./debug\moc_userbutton.o
-./debug\moc_printprocess.o
-./debug\moc_cupsprintwidget.o
-./debug\moc_cupsprintersettingsdialog.o
-./debug\moc_printwidget.o
-./debug\moc_printercmddialog.o
-./debug\moc_printdialog.o
-./debug\moc_sessionwidget.o
-./debug\moc_connectionwidget.o
-./debug\moc_settingswidget.o
-./debug\moc_sharewidget.o
-./debug\moc_clicklineedit.o
-./debug\moc_httpbrokerclient.o
-./debug\moc_brokerpassdlg.o
-./debug\moc_xsettingswidget.o
-./debug\qrc_resources.o
-);
diff --git a/object_script.x2goclient.Release b/object_script.x2goclient.Release
deleted file mode 100644
index 74e0753..0000000
--- a/object_script.x2goclient.Release
+++ /dev/null
@@ -1,64 +0,0 @@
-INPUT(
-./release\sharewidget.o
-./release\settingswidget.o
-./release\configwidget.o
-./release\sessionwidget.o
-./release\connectionwidget.o
-./release\configdialog.o
-./release\editconnectiondialog.o
-./release\exportdialog.o
-./release\imgframe.o
-./release\LDAPSession.o
-./release\onmainwindow.o
-./release\onmainwindow_part2.o
-./release\onmainwindow_part3.o
-./release\onmainwindow_part4.o
-./release\sessionbutton.o
-./release\sessionmanagedialog.o
-./release\sshmasterconnection.o
-./release\sshprocess.o
-./release\SVGFrame.o
-./release\userbutton.o
-./release\x2gologdebug.o
-./release\printprocess.o
-./release\cupsprint.o
-./release\cupsprintwidget.o
-./release\cupsprintersettingsdialog.o
-./release\printwidget.o
-./release\printercmddialog.o
-./release\printdialog.o
-./release\wapi.o
-./release\clicklineedit.o
-./release\httpbrokerclient.o
-./release\ongetpass.o
-./release\x2gosettings.o
-./release\brokerpassdlg.o
-./release\xsettingswidget.o
-./release\x2goclient.o
-./release\moc_configdialog.o
-./release\moc_editconnectiondialog.o
-./release\moc_exportdialog.o
-./release\moc_imgframe.o
-./release\moc_onmainwindow.o
-./release\moc_sessionbutton.o
-./release\moc_sessionmanagedialog.o
-./release\moc_sshmasterconnection.o
-./release\moc_sshprocess.o
-./release\moc_SVGFrame.o
-./release\moc_userbutton.o
-./release\moc_printprocess.o
-./release\moc_cupsprintwidget.o
-./release\moc_cupsprintersettingsdialog.o
-./release\moc_printwidget.o
-./release\moc_printercmddialog.o
-./release\moc_printdialog.o
-./release\moc_sessionwidget.o
-./release\moc_connectionwidget.o
-./release\moc_settingswidget.o
-./release\moc_sharewidget.o
-./release\moc_clicklineedit.o
-./release\moc_httpbrokerclient.o
-./release\moc_brokerpassdlg.o
-./release\moc_xsettingswidget.o
-./release\qrc_resources.o
-);
diff --git a/object_script.x2goplugin.Debug b/object_script.x2goplugin.Debug
deleted file mode 100644
index af4d381..0000000
--- a/object_script.x2goplugin.Debug
+++ /dev/null
@@ -1,57 +0,0 @@
-INPUT(
-./debug/sharewidget.o
-./debug/settingswidget.o
-./debug/configwidget.o
-./debug/sessionwidget.o
-./debug/connectionwidget.o
-./debug/configdialog.o
-./debug/editconnectiondialog.o
-./debug/exportdialog.o
-./debug/imgframe.o
-./debug/LDAPSession.o
-./debug/onmainwindow.o
-./debug/sessionbutton.o
-./debug/sessionmanagedialog.o
-./debug/sshmasterconnection.o
-./debug/sshprocess.o
-./debug/SVGFrame.o
-./debug/userbutton.o
-./debug/x2gologdebug.o
-./debug/printprocess.o
-./debug/cupsprint.o
-./debug/cupsprintwidget.o
-./debug/cupsprintersettingsdialog.o
-./debug/printwidget.o
-./debug/printercmddialog.o
-./debug/printdialog.o
-./debug/embedwidget.o
-./debug/wapi.o
-./debug/clicklineedit.o
-./debug/httpbrokerclient.o
-./debug/ongetpass.o
-./debug/x2gosettings.o
-./debug/moc_configdialog.o
-./debug/moc_editconnectiondialog.o
-./debug/moc_exportdialog.o
-./debug/moc_imgframe.o
-./debug/moc_onmainwindow.o
-./debug/moc_sessionbutton.o
-./debug/moc_sessionmanagedialog.o
-./debug/moc_sshmasterconnection.o
-./debug/moc_sshprocess.o
-./debug/moc_SVGFrame.o
-./debug/moc_userbutton.o
-./debug/moc_printprocess.o
-./debug/moc_cupsprintwidget.o
-./debug/moc_cupsprintersettingsdialog.o
-./debug/moc_printwidget.o
-./debug/moc_printercmddialog.o
-./debug/moc_printdialog.o
-./debug/moc_sessionwidget.o
-./debug/moc_connectionwidget.o
-./debug/moc_settingswidget.o
-./debug/moc_sharewidget.o
-./debug/moc_clicklineedit.o
-./debug/moc_httpbrokerclient.o
-./debug/qrc_resources.o
-);
diff --git a/object_script.x2goplugin.Release b/object_script.x2goplugin.Release
deleted file mode 100644
index 39406a3..0000000
--- a/object_script.x2goplugin.Release
+++ /dev/null
@@ -1,57 +0,0 @@
-INPUT(
-./release/sharewidget.o
-./release/settingswidget.o
-./release/configwidget.o
-./release/sessionwidget.o
-./release/connectionwidget.o
-./release/configdialog.o
-./release/editconnectiondialog.o
-./release/exportdialog.o
-./release/imgframe.o
-./release/LDAPSession.o
-./release/onmainwindow.o
-./release/sessionbutton.o
-./release/sessionmanagedialog.o
-./release/sshmasterconnection.o
-./release/sshprocess.o
-./release/SVGFrame.o
-./release/userbutton.o
-./release/x2gologdebug.o
-./release/printprocess.o
-./release/cupsprint.o
-./release/cupsprintwidget.o
-./release/cupsprintersettingsdialog.o
-./release/printwidget.o
-./release/printercmddialog.o
-./release/printdialog.o
-./release/embedwidget.o
-./release/wapi.o
-./release/clicklineedit.o
-./release/httpbrokerclient.o
-./release/ongetpass.o
-./release/x2gosettings.o
-./release/moc_configdialog.o
-./release/moc_editconnectiondialog.o
-./release/moc_exportdialog.o
-./release/moc_imgframe.o
-./release/moc_onmainwindow.o
-./release/moc_sessionbutton.o
-./release/moc_sessionmanagedialog.o
-./release/moc_sshmasterconnection.o
-./release/moc_sshprocess.o
-./release/moc_SVGFrame.o
-./release/moc_userbutton.o
-./release/moc_printprocess.o
-./release/moc_cupsprintwidget.o
-./release/moc_cupsprintersettingsdialog.o
-./release/moc_printwidget.o
-./release/moc_printercmddialog.o
-./release/moc_printdialog.o
-./release/moc_sessionwidget.o
-./release/moc_connectionwidget.o
-./release/moc_settingswidget.o
-./release/moc_sharewidget.o
-./release/moc_clicklineedit.o
-./release/moc_httpbrokerclient.o
-./release/qrc_resources.o
-);
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index ecafee0..81dce94 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -45,6 +45,9 @@ QString ONMainWindow::u3Device;
ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
{
+#ifdef Q_OS_LINUX
+ image=shape=0;
+#endif
x2goDebug<<"ONMainWindow constructor"<<endl;
setFocusPolicy ( Qt::StrongFocus );
installTranslator();
@@ -212,7 +215,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
homeDir=portableDataPath;
x2goDebug<<"running in \"portable\" mode\n"<<
"Data Dir is "<<portableDataPath;
- QTimer *timer = new QTimer(this);
+ QTimer *timer = new QTimer(this);
connect(timer, SIGNAL(timeout()), this, SLOT(slotCheckPortableDir()));
timer->start(1000);
}
@@ -266,10 +269,10 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
#ifndef Q_WS_HILDON
- if(BGFile.size())
- bgFrame=new SVGFrame ( ( QString ) BGFile,true,fr );
+ if (BGFile.size())
+ bgFrame=new SVGFrame ( ( QString ) BGFile,true,fr );
else
- bgFrame=new SVGFrame ( ( QString ) ":/svg/bg.svg",true,fr );
+ bgFrame=new SVGFrame ( ( QString ) ":/svg/bg.svg",true,fr );
#else
bgFrame=new SVGFrame ( ( QString ) ":/svg/bg_hildon.svg",true,fr );
#endif
@@ -324,18 +327,18 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
act_set=new QAction (
QIcon ( iconsPath ( "/32x32/edit_settings.png" ) ),
tr ( "&Settings ..." ),this );
-
- if(supportMenuFile!=QString::null)
+
+ if (supportMenuFile!=QString::null)
{
act_support=new QAction ( tr ( "Support ..." ),this );
connect ( act_support,SIGNAL ( triggered ( bool ) ),this,
- SLOT ( slotSupport() ) );
-
+ SLOT ( slotSupport() ) );
+
}
-
+
act_abclient=new QAction ( QIcon ( ":icons/32x32/x2goclient.png" ),
tr ( "About X2GO client" ),this );
-
+
@@ -378,6 +381,8 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
#endif
+
+
mainL->setSpacing ( 0 );
mainL->setMargin ( 0 );
mainL->insertWidget ( 0, bgFrame );
@@ -386,26 +391,32 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
connect ( fr,SIGNAL ( resized ( const QSize ) ),this,
SLOT ( slotResize ( const QSize ) ) );
slotResize ( fr->size() );
-
- if(brokerMode)
- {
- broker=new HttpBrokerClient ( this, &config );
- connect ( broker,SIGNAL ( haveSshKey ( QString ) ),this,
- SLOT ( slotStartSshAgent ( QString ) ) );
- connect ( broker,SIGNAL ( haveAgentInfo () ),this,
- SLOT ( slotStartNewBrokerSession () ) );
- connect ( broker,SIGNAL ( fatalHttpError() ),this,
- SLOT ( close() ) );
- connect ( broker,SIGNAL ( cmdReconnect() ),this,
- SLOT ( slotReconnectSession() ) );
- connect ( broker, SIGNAL ( authFailed()), this ,SLOT ( slotGetBrokerAuth()));
- connect ( broker, SIGNAL( sessionsLoaded()), this, SLOT (slotReadSessions()));
- connect ( broker, SIGNAL ( getSession(QString)), this, SLOT (slotGetBrokerSession(QString)));
- connect ( broker, SIGNAL ( passwordChanged(QString)), this, SLOT ( slotPassChanged(QString)));
-
+ if (brokerMode)
+ {
+ broker=new HttpBrokerClient ( this, &config );
+ connect ( broker,SIGNAL ( haveSshKey ( QString ) ),this,
+ SLOT ( slotStartSshAgent ( QString ) ) );
+ connect ( broker,SIGNAL ( haveAgentInfo () ),this,
+ SLOT ( slotStartNewBrokerSession () ) );
+ connect ( broker,SIGNAL ( fatalHttpError() ),this,
+ SLOT ( close() ) );
+ connect ( broker,SIGNAL ( cmdReconnect() ),this,
+ SLOT ( slotReconnectSession() ) );
+ connect ( broker, SIGNAL ( authFailed()), this ,SLOT ( slotGetBrokerAuth()));
+ connect ( broker, SIGNAL( sessionsLoaded()), this, SLOT (slotReadSessions()));
+ connect ( broker, SIGNAL ( getSession(QString)), this, SLOT (slotGetBrokerSession(QString)));
+ connect ( broker, SIGNAL ( passwordChanged(QString)), this, SLOT ( slotPassChanged(QString)));
}
-
+
+ proxyWinTimer=new QTimer ( this );
+ connect ( proxyWinTimer, SIGNAL ( timeout() ), this,
+ SLOT ( slotFindProxyWin() ) );
+
+ xineramaTimer=new QTimer (this);
+
+ connect( xineramaTimer, SIGNAL(timeout()), this, SLOT(slotConfigXinerama()));
+
x2goDebug<<"ONMainWindows constructor finished, home Directory is:"<<homeDir<<endl;
}
@@ -468,9 +479,6 @@ void ONMainWindow::initWidgetsEmbed()
#ifndef Q_OS_WIN
statusBar()->hide();
#endif
- proxyWinTimer=new QTimer ( this );
- connect ( proxyWinTimer, SIGNAL ( timeout() ), this,
- SLOT ( slotFindProxyWin() ) );
act_shareFolder=new QAction ( QIcon ( ":icons/32x32/file-open.png" ),
@@ -664,39 +672,39 @@ void ONMainWindow::initWidgetsNormal()
act_edit=new QAction ( QIcon ( iconsPath ( "/32x32/edit.png" ) ),
tr ( "Session management..." ),this );
act_edit->setShortcut ( tr ( "Ctrl+E" ) );
-
- if(noSessionEdit)
+
+ if (noSessionEdit)
{
- act_edit->setEnabled(false);
- act_new->setEnabled(false);
+ act_edit->setEnabled(false);
+ act_new->setEnabled(false);
}
act_sessicon=new QAction (
QIcon ( iconsPath ( "/32x32/create_file.png" ) ),
tr ( "&Create session icon on desktop..." ),
this );
- if(brokerMode)
- act_sessicon->setEnabled(false);
-
- if(changeBrokerPass)
- {
- act_changeBrokerPass=new QAction (
- QIcon ( iconsPath ( "/32x32/auth.png" ) ),
- tr ( "&Set broker password..." ),
- this );
- connect ( act_changeBrokerPass,SIGNAL ( triggered(bool)),this,
- SLOT ( slotChangeBrokerPass()) );
- act_changeBrokerPass->setEnabled(false);
+ if (brokerMode)
+ act_sessicon->setEnabled(false);
+
+ if (changeBrokerPass)
+ {
+ act_changeBrokerPass=new QAction (
+ QIcon ( iconsPath ( "/32x32/auth.png" ) ),
+ tr ( "&Set broker password..." ),
+ this );
+ connect ( act_changeBrokerPass,SIGNAL ( triggered(bool)),this,
+ SLOT ( slotChangeBrokerPass()) );
+ act_changeBrokerPass->setEnabled(false);
}
-
- if(connTest)
+
+ if (connTest)
{
- act_testCon=new QAction (
- QIcon ( iconsPath ( "/32x32/contest.png" ) ),
- tr ( "&Connectivity test..." ),
- this );
- connect ( act_testCon,SIGNAL ( triggered(bool)),this,
- SLOT ( slotTestConnection()) );
+ act_testCon=new QAction (
+ QIcon ( iconsPath ( "/32x32/contest.png" ) ),
+ tr ( "&Connectivity test..." ),
+ this );
+ connect ( act_testCon,SIGNAL ( triggered(bool)),this,
+ SLOT ( slotTestConnection()) );
}
@@ -720,7 +728,7 @@ void ONMainWindow::initWidgetsNormal()
SLOT ( trayQuit()) ) ;
connect ( act_tb,SIGNAL ( toggled ( bool ) ),this,
SLOT ( displayToolBar ( bool ) ) );
-
+
stb=addToolBar ( tr ( "Show toolbar" ) );
QShortcut* ex=new QShortcut ( QKeySequence ( tr ( "Ctrl+Q","exit" ) ),
@@ -731,45 +739,45 @@ void ONMainWindow::initWidgetsNormal()
{
QMenu* menu_sess=menuBar()->addMenu ( tr ( "&Session" ) );
QMenu* menu_opts=menuBar()->addMenu ( tr ( "&Options" ) );
- if(!brokerMode)
+ if (!brokerMode)
{
- menu_sess->addAction ( act_new );
- menu_sess->addAction ( act_edit );
+ menu_sess->addAction ( act_new );
+ menu_sess->addAction ( act_edit );
#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN)
- if ( !portable )
- menu_sess->addAction ( act_sessicon );
+ if ( !portable )
+ menu_sess->addAction ( act_sessicon );
#endif
- menu_sess->addSeparator();
- }
+ menu_sess->addSeparator();
+ }
menu_sess->addAction ( act_exit );
menu_opts->addAction ( act_set );
menu_opts->addAction ( act_tb );
- if(changeBrokerPass)
- menu_opts->addAction(act_changeBrokerPass);
- if(connTest)
- menu_opts->addAction(act_testCon);
+ if (changeBrokerPass)
+ menu_opts->addAction(act_changeBrokerPass);
+ if (connTest)
+ menu_opts->addAction(act_testCon);
QMenu* menu_help=menuBar()->addMenu ( tr ( "&Help" ) );
- if(supportMenuFile!=QString::null)
- menu_help->addAction ( act_support );
+ if (supportMenuFile!=QString::null)
+ menu_help->addAction ( act_support );
menu_help->addAction ( act_abclient );
menu_help->addAction ( act_abqt );
- if(!brokerMode)
- {
- stb->addAction ( act_new );
- stb->addAction ( act_edit );
+ if (!brokerMode)
+ {
+ stb->addAction ( act_new );
+ stb->addAction ( act_edit );
#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN)
- if ( !portable )
- stb->addAction ( act_sessicon );
+ if ( !portable )
+ stb->addAction ( act_sessicon );
#endif
- stb->addSeparator();
- }
+ stb->addSeparator();
+ }
stb->addAction ( act_set );
- if(changeBrokerPass)
- stb->addAction(act_changeBrokerPass);
- if(connTest)
- stb->addAction(act_testCon);
+ if (changeBrokerPass)
+ stb->addAction(act_changeBrokerPass);
+ if (connTest)
+ stb->addAction(act_testCon);
if ( !showToolBar )
stb->hide();
@@ -793,117 +801,107 @@ void ONMainWindow::initWidgetsNormal()
}
else
{
- if(!brokerMode)
- QTimer::singleShot ( 1, this, SLOT ( slotReadSessions() ) );
- else
- {
- QTimer::singleShot(1, this,SLOT(slotGetBrokerAuth()));
- }
- }
-/* QTimer* t=new QTimer ( this );
- connect ( t,SIGNAL ( timeout() ),this,SLOT ( slotRereadUsers() ) );
- t->start ( 20000 );
-*/
-#ifdef Q_OS_WIN
- proxyWinTimer=new QTimer ( this );
- connect ( proxyWinTimer, SIGNAL ( timeout() ), this,
- SLOT ( slotFindProxyWin() ) );
-#endif
-
+ if (!brokerMode)
+ QTimer::singleShot ( 1, this, SLOT ( slotReadSessions() ) );
+ else
+ {
+ QTimer::singleShot(1, this,SLOT(slotGetBrokerAuth()));
+ }
+ }
}
void ONMainWindow::slotPassChanged(const QString& result)
{
-
- if(result==QString::null)
- {
- QMessageBox::critical(this, tr("Error"),tr("Operation failed"));
- }
- else
- {
- QMessageBox::information(this, tr("Password changed"),tr("Password changed"));
- config.brokerPass=result;
- }
- setEnabled(true);
-
- slotClosePass();
- sessionStatusDlg->hide();
-
+
+ if (result==QString::null)
+ {
+ QMessageBox::critical(this, tr("Error"),tr("Operation failed"));
+ }
+ else
+ {
+ QMessageBox::information(this, tr("Password changed"),tr("Password changed"));
+ config.brokerPass=result;
+ }
+ setEnabled(true);
+
+ slotClosePass();
+ sessionStatusDlg->hide();
+
}
void ONMainWindow::slotTestConnection()
{
- ConTest test( broker, config.brokerurl, this);
- test.exec();
+ ConTest test( broker, config.brokerurl, this);
+ test.exec();
}
void ONMainWindow::slotChangeBrokerPass()
{
- x2goDebug<<"change broker pass";
- BrokerPassDlg passDlg;
- if(passDlg.exec()!=QDialog::Accepted)
- return;
- if(passDlg.oldPass()!=config.brokerPass)
- {
- QMessageBox::critical(this,tr("Error"),tr("Wrong password!"));
+ x2goDebug<<"change broker pass";
+ BrokerPassDlg passDlg;
+ if (passDlg.exec()!=QDialog::Accepted)
+ return;
+ if (passDlg.oldPass()!=config.brokerPass)
+ {
+ QMessageBox::critical(this,tr("Error"),tr("Wrong password!"));
+ return;
+ }
+ broker->changePassword(passDlg.newPass());
+ setStatStatus ( tr ( "Connecting to broker" ) );
+ stInfo->insertPlainText ( "broker url: "+config.brokerurl );
+ setEnabled ( false );
+ uname->hide();
+ u->hide();
return;
- }
- broker->changePassword(passDlg.newPass());
- setStatStatus ( tr ( "Connecting to broker" ) );
- stInfo->insertPlainText ( "broker url: "+config.brokerurl );
- setEnabled ( false );
- uname->hide();
- u->hide();
- return;
}
void ONMainWindow::slotCheckPortableDir()
{
- if(!QFile::exists(homeDir))
- {
- x2goDebug<<"portable dir not exists, close";
- close();
- }
+ if (!QFile::exists(homeDir))
+ {
+ x2goDebug<<"portable dir not exists, close";
+ close();
+ }
}
void ONMainWindow::slotGetBrokerAuth()
{
- pass->clear();
- login->clear();
- QString pixFile=":icons/128x128/x2gosession.png";
- if(SPixFile!=QString::null)
- pixFile=SPixFile;
- QPixmap pix(pixFile);
- if ( !miniMode )
- {
- fotoLabel->setPixmap (
- pix.scaled ( 64,64,
+ pass->clear();
+ login->clear();
+ QString pixFile=":icons/128x128/x2gosession.png";
+ if (SPixFile!=QString::null)
+ pixFile=SPixFile;
+ QPixmap pix(pixFile);
+ if ( !miniMode )
+ {
+ fotoLabel->setPixmap (
+ pix.scaled ( 64,64,
Qt::IgnoreAspectRatio,
Qt::SmoothTransformation ) );
- fotoLabel->setFixedSize ( 64,64 );
- }
- else
- {
- fotoLabel->setPixmap (
- pix.scaled ( 48,48,
+ fotoLabel->setFixedSize ( 64,64 );
+ }
+ else
+ {
+ fotoLabel->setPixmap (
+ pix.scaled ( 48,48,
Qt::IgnoreAspectRatio,
Qt::SmoothTransformation ) );
- fotoLabel->setFixedSize ( 48,48 );
- }
- users->hide();
- ln->hide();
- bgLay->insertStretch(3);
- QString text=tr("<b>Authentication</b>");
- /* if(config.brokerName.length()>0)
- text+=config.brokerName;
- else
- text+=config.brokerurl;*/
- nameLabel->setText ( text );
- slotShowPassForm();
- config.brokerAuthenticated=false;
+ fotoLabel->setFixedSize ( 48,48 );
+ }
+ users->hide();
+ ln->hide();
+ bgLay->insertStretch(3);
+ QString text=tr("<b>Authentication</b>");
+ /* if(config.brokerName.length()>0)
+ text+=config.brokerName;
+ else
+ text+=config.brokerurl;*/
+ nameLabel->setText ( text );
+ slotShowPassForm();
+ config.brokerAuthenticated=false;
}
@@ -1078,6 +1076,12 @@ void ONMainWindow::closeClient()
QVariant ( isMaximized() ) );
st.setting()->sync();
x2goDebug<<"done";
+#ifdef Q_OS_LINUX
+ if (image)
+ XFreePixmap(QX11Info::display(),image);
+ if (shape)
+ XFreePixmap(QX11Info::display(),shape);
+#endif
}
if ( nxproxy!=0l )
{
@@ -1099,18 +1103,18 @@ void ONMainWindow::closeClient()
sshConnection->wait ( 10000 );
x2goDebug<<"sshConnection is closed\n";
}
- if(useLdap)
+ if (useLdap)
{
- for(int i=0;i<serverSshConnections.count();++i)
- {
- if(serverSshConnections[i])
- {
- serverSshConnections[i]->disconnectSession();
- x2goDebug<<"waiting sshConnection to finish\n";
- serverSshConnections[i]->wait ( 10000 );
- x2goDebug<<"sshConnection is closed\n";
- }
- }
+ for (int i=0;i<serverSshConnections.count();++i)
+ {
+ if (serverSshConnections[i])
+ {
+ serverSshConnections[i]->disconnectSession();
+ x2goDebug<<"waiting sshConnection to finish\n";
+ serverSshConnections[i]->wait ( 10000 );
+ x2goDebug<<"sshConnection is closed\n";
+ }
+ }
}
/* if ( tunnel!=0l )
@@ -1440,10 +1444,10 @@ void ONMainWindow::slotSelectedFromList ( UserButton* user )
void ONMainWindow::slotClosePass()
{
- if(brokerMode)
+ if (brokerMode)
{
- if(!config.brokerAuthenticated)
- close();
+ if (!config.brokerAuthenticated)
+ close();
}
passForm->hide();
if ( !embedMode )
@@ -1460,11 +1464,11 @@ void ONMainWindow::slotClosePass()
}
else
{
- if(lastSession)
- {
- lastSession->show();
- uname->setText ( lastSession->name() );
- }
+ if (lastSession)
+ {
+ lastSession->show();
+ uname->setText ( lastSession->name() );
+ }
}
uname->setEnabled ( true );
u->setEnabled ( true );
@@ -1477,7 +1481,7 @@ void ONMainWindow::slotClosePass()
void ONMainWindow::slotPassEnter()
{
-
+
shadowSession=false;
#if defined ( Q_OS_WIN ) || defined (Q_OS_DARWIN )
QString disp=getXDisplay();
@@ -1503,6 +1507,7 @@ void ONMainWindow::slotPassEnter()
list<string> attr;
attr.push_back ( "cn" );
attr.push_back ( "serialNumber" );
+ attr.push_back ( "l" );
list<LDAPStringEntry> res;
QString searchBase="ou=Servers,ou=ON,"+ldapDn;
@@ -1541,11 +1546,17 @@ void ONMainWindow::slotPassEnter()
serv server;
server.name=LDAPSession::getStringAttrValues (
*it,"cn" ).front().c_str();
- if ( !isFirstServerSet )
+
+ QString sPort="22";
+ list<string> sL=LDAPSession::getStringAttrValues (
+ *it,"l" );
+ if ( sL.size() >0 )
{
- isFirstServerSet=true;
- firstServer=server.name;
+ sPort=sL.front().c_str();
}
+ x2goDebug<<server.name<<": ssh port is "<<sPort;
+
+
QString sFactor="1";
list<string> serialNumber=LDAPSession::getStringAttrValues (
*it,"serialNumber" );
@@ -1556,7 +1567,14 @@ void ONMainWindow::slotPassEnter()
x2goDebug<<server.name<<": factor is "<<sFactor;
server.factor=sFactor.toFloat();
server.sess=0;
+ server.sshPort=sPort;
server.connOk=true;
+ if ( !isFirstServerSet )
+ {
+ isFirstServerSet=true;
+ firstServer=server.name;
+ sshPort=server.sshPort;
+ }
x2goServers.append ( server );
}
if ( ld )
@@ -1575,9 +1593,9 @@ void ONMainWindow::slotPassEnter()
// QString host=ldapServer;
QString host=firstServer;
passwd=getCurrentPass();
- if(sshConnection)
- sshConnection->disconnectSession();
- sshConnection=startSshConnection ( host,sshPort,acceptRsa,user,passwd,true );
+ if (sshConnection)
+ sshConnection->disconnectSession();
+ sshConnection=startSshConnection ( host,sshPort,acceptRsa,user,passwd,true, false );
#endif
}
@@ -1900,45 +1918,45 @@ void ONMainWindow::slotCreateDesktopIcon ( SessionButton* bt )
void ONMainWindow::slotReadSessions()
{
-
+
users->show();
ln->show();
X2goSettings *st;
lastSession=0;
-
- if(brokerMode)
- {
- if(changeBrokerPass)
- act_changeBrokerPass->setEnabled(true);
- config.key=QString::null;
- config.user=QString::null;
- config.sessiondata=QString::null;
- for (int i=sessions.count()-1;i>=0;--i)
- {
- SessionButton* but=sessions.takeAt(i);
- if(but)
- delete but;
- }
-
- st=new X2goSettings(config.iniFile,QSettings::IniFormat);
- sessionStatusDlg->hide();
- selectSessionDlg->hide();
- setEnabled ( true );
- slotClosePass();
+
+ if (brokerMode)
+ {
+ if (changeBrokerPass)
+ act_changeBrokerPass->setEnabled(true);
+ config.key=QString::null;
+ config.user=QString::null;
+ config.sessiondata=QString::null;
+ for (int i=sessions.count()-1;i>=0;--i)
+ {
+ SessionButton* but=sessions.takeAt(i);
+ if (but)
+ delete but;
+ }
+
+ st=new X2goSettings(config.iniFile,QSettings::IniFormat);
+ sessionStatusDlg->hide();
+ selectSessionDlg->hide();
+ setEnabled ( true );
+ slotClosePass();
}
else
- st= new X2goSettings( "sessions" );
+ st= new X2goSettings( "sessions" );
QStringList slst=st->setting()->childGroups();
x2goDebug<<"read "<<slst.size()<<" sessions from config file";
- if(brokerMode && (slst.size()==0))
+ if (brokerMode && (slst.size()==0))
{
- QMessageBox::critical(this,tr("Error"),tr("X2Go sessions not found"));
- close();
+ QMessageBox::critical(this,tr("Error"),tr("X2Go sessions not found"));
+ close();
}
for ( int i=0;i<slst.size();++i )
- {
+ {
if ( slst[i]!="embedded" )
createBut ( slst[i] );
}
@@ -2058,7 +2076,7 @@ void ONMainWindow::placeButtons()
else
sessions[i]->move ( ( users->width()-260 ) /2,
i*155+i*20+5 );
- if(brokerMode)
+ if (brokerMode)
sessions[i]->move ( ( users->width()-360 ) /2,
i*150+i*25+5 );
sessions[i]->show();
@@ -2071,7 +2089,7 @@ void ONMainWindow::placeButtons()
else
uframe->setFixedHeight (
sessions.size() *155+ ( sessions.size()-1 ) *20 );
- if(brokerMode)
+ if (brokerMode)
uframe->setFixedHeight (
sessions.size() *150+ ( sessions.size()-1 ) *25 );
}
@@ -2357,6 +2375,7 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session )
QString server;
QString userName;
bool autologin=false;
+ bool krblogin=false;
QString sessIcon;
QPalette pal;
QString sessionName;
@@ -2368,15 +2387,15 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session )
sessionName=session->name();
QString sid=session->id();
- if(brokerMode)
+ if (brokerMode)
{
- broker->selectUserSession(session->id());
- setStatStatus ( tr ( "Connecting to broker" ) );
- stInfo->insertPlainText ( "broker url: "+config.brokerurl );
- setEnabled ( false );
- uname->hide();
- u->hide();
- return;
+ broker->selectUserSession(session->id());
+ setStatStatus ( tr ( "Connecting to broker" ) );
+ stInfo->insertPlainText ( "broker url: "+config.brokerurl );
+ setEnabled ( false );
+ uname->hide();
+ u->hide();
+ return;
}
X2goSettings st ( "sessions" );
@@ -2405,7 +2424,10 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session )
( QVariant ) QString::null ).toString();
autologin=st.setting()->value (
sid+"/autologin",
- ( QVariant ) QString::null ).toBool();
+ ( QVariant ) false ).toBool();
+ krblogin=st.setting()->value (
+ sid+"/krblogin",
+ ( QVariant ) false ).toBool();
#ifdef Q_OS_WIN
if ( portable &&
u3Device.length() >0 )
@@ -2508,7 +2530,7 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session )
x2goDebug<<"Have key, starting session"<<endl;
slotSessEnter();
}
- if ( cardReady ||/* useSshAgent ||*/ autologin )
+ if ( cardReady || autologin || krblogin )
{
nopass=true;
if ( cardReady )
@@ -2532,13 +2554,13 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session )
}
-SshMasterConnection* ONMainWindow::startSshConnection ( QString host, QString port, bool acceptUnknownHosts,
- QString login,
- QString password, bool autologin, bool getSrv)
+SshMasterConnection* ONMainWindow::startSshConnection ( QString host, QString port, bool acceptUnknownHosts,
+ QString login,
+ QString password, bool autologin, bool krbLogin, bool getSrv)
{
-
+
SshMasterConnection* con;
- x2goDebug<<"start new ssh connection"<<endl;
+ x2goDebug<<"start new ssh connection to server:"<<host<<":"<<port<<"krb: "<<krbLogin<<endl;
for ( int i=0;i<sshEnv.size();++i )
{
#ifndef Q_OS_WIN
@@ -2561,16 +2583,16 @@ SshMasterConnection* ONMainWindow::startSshConnection ( QString host, QString po
passForm->setEnabled ( false );
con=new SshMasterConnection ( host, port.toInt(),acceptUnknownHosts,
- login, password,currentKey, autologin, this );
- if(!getSrv)
- connect ( con, SIGNAL ( connectionOk(QString) ), this, SLOT ( slotSshConnectionOk() ) );
+ login, password,currentKey, autologin,krbLogin, this );
+ if (!getSrv)
+ connect ( con, SIGNAL ( connectionOk(QString) ), this, SLOT ( slotSshConnectionOk() ) );
else
- connect ( con, SIGNAL ( connectionOk(QString)), this, SLOT ( slotServSshConnectionOk(QString) ) );
-
+ connect ( con, SIGNAL ( connectionOk(QString)), this, SLOT ( slotServSshConnectionOk(QString) ) );
+
connect ( con, SIGNAL ( serverAuthError ( int,QString ) ),this,SLOT ( slotSshServerAuthError ( int,QString ) ) );
connect ( con, SIGNAL ( userAuthError ( QString ) ),this,SLOT ( slotSshUserAuthError ( QString ) ) );
- connect ( con, SIGNAL ( connectionError ( QString,QString ) ), this,
- SLOT ( slotSshConnectionError ( QString,QString ) ) );
+ connect ( con, SIGNAL ( connectionError ( QString,QString ) ), this,
+ SLOT ( slotSshConnectionError ( QString,QString ) ) );
con->start();
return con;
}
diff --git a/onmainwindow.h b/onmainwindow.h
index 0fe58f7..4a41d58 100644
--- a/onmainwindow.h
+++ b/onmainwindow.h
@@ -115,6 +115,7 @@ struct serv
{
return it.sess<it1.sess;
}
+ QString sshPort;
};
struct x2goSession
@@ -145,7 +146,7 @@ struct ConfigFile
QString brokerUserId;
QString brokerName;
bool brokerAuthenticated;
- QString iniFile;
+ QString iniFile;
QString server;
QString sshport;
QString proxy;
@@ -413,10 +414,10 @@ public:
}
bool sessionEditEnabled()
{
- return !noSessionEdit;
+ return !noSessionEdit;
}
-
-
+
+
SshMasterConnection* findServerSshConnection(QString host);
void showHelp();
@@ -576,6 +577,10 @@ private:
QTimer *agentCheckTimer;
QTimer *spoolTimer;
QTimer *proxyWinTimer;
+ QTimer *xineramaTimer;
+ short xinSizeInc;
+ QRect lastDisplayGeometry;
+ QList <QRect> xineramaScreens;
QStyle* widgetExtraStyle;
bool isPassShown;
bool xmodExecuted;
@@ -625,7 +630,7 @@ private:
bool ldapOnly;
bool isScDaemonOk;
bool parecTunnelOk;
-
+
bool startSessSound;
int startSessSndSystem;
@@ -644,7 +649,7 @@ private:
int ldapPort2;
QString ldapDn;
QString sessionCmd;
-
+
QString supportMenuFile;
QString BGFile;
QString SPixFile;
@@ -726,6 +731,11 @@ private:
QString xorgWidth;
QString xorgHeight;
int waitingForX;
+ QRect dispGeometry;
+#endif
+
+#ifdef Q_OS_LINUX
+ long image, shape;
#endif
// Tray icon stuff based on patch from Joachim Langenbach <joachim(a)falaba.de>
@@ -780,9 +790,12 @@ private:
void closeClient();
void continueNormalSession();
void continueLDAPSession();
- SshMasterConnection* startSshConnection ( QString host, QString port,
- bool acceptUnknownHosts, QString login,
- QString password, bool autologin, bool getSrv=false);
+ SshMasterConnection* startSshConnection ( QString host, QString port,
+ bool acceptUnknownHosts, QString login,
+ QString password, bool autologin, bool krbLogin, bool getSrv=false);
+ void setProxyWinTitle();
+ QRect proxyWinGeometry();
+
protected:
virtual void closeEvent ( QCloseEvent* event );
@@ -898,6 +911,7 @@ private slots:
private slots:
+ void slotSetProxyWinFullscreen();
void slotCheckPrintSpool();
void slotRereadUsers();
void slotExtTimer();
@@ -916,6 +930,8 @@ private slots:
void slotExecXmodmap();
void slotCreateSessionIcon();
void slotFindProxyWin();
+ void slotConfigXinerama();
+ void slotXineramaConfigured();
void slotAttachProxyWindow();
void slotEmbedIntoParentWindow();
void slotEmbedWindow();
@@ -933,7 +949,9 @@ private slots:
void slotReconnectSession();
void slotStartBroker();
void slotStartNewBrokerSession ();
+
private:
+ void resizeProxyWinOnDisplay(int display);
#ifdef Q_OS_LINUX
long X11FindWindow ( QString text, long rootWin=0 );
#endif
diff --git a/onmainwindow_part2.cpp b/onmainwindow_part2.cpp
index ac5ecd4..aa98603 100644
--- a/onmainwindow_part2.cpp
+++ b/onmainwindow_part2.cpp
@@ -226,6 +226,7 @@ bool ONMainWindow::startSession ( const QString& sid )
QString user;
QString host;
bool autologin=false;
+ bool krblogin=false;
user=getCurrentUname();
runRemoteCommand=true;
shadowSession=false;
@@ -247,7 +248,9 @@ bool ONMainWindow::startSession ( const QString& sid )
QString cmd=st.setting()->value ( sid+"/command",
( QVariant ) QString::null ).toString();
autologin=st.setting()->value ( sid+"/autologin",
- ( QVariant ) QString::null ).toBool();
+ ( QVariant ) false ).toBool();
+ krblogin=st.setting()->value ( sid+"/krblogin",
+ ( QVariant ) false ).toBool();
if ( cmd=="SHADOW" )
shadowSession=true;
}
@@ -273,7 +276,7 @@ bool ONMainWindow::startSession ( const QString& sid )
}
if(sshConnection)
sshConnection->disconnectSession();
- sshConnection=startSshConnection ( host,sshPort,acceptRsa,user,passwd,autologin );
+ sshConnection=startSshConnection ( host,sshPort,acceptRsa,user,passwd,autologin, krblogin );
return true;
}
@@ -1920,10 +1923,11 @@ void ONMainWindow::slotTunnelOk()
#endif //Q_OS_DARWIN
x2goDebug<<"starting nxproxy with: "<<proxyCmd<<endl;
nxproxy->start ( proxyCmd );
-
+//always search for proxyWin
+ proxyWinTimer->start ( 300 );
if ( embedMode )
{
- proxyWinTimer->start ( 300 );
+// proxyWinTimer->start ( 300 );
if ( !startEmbedded )
{
act_embedContol->setText (
@@ -1934,10 +1938,10 @@ void ONMainWindow::slotTunnelOk()
else
{
// #ifdef CFGCLIENT
- // if using XMing, we must find proxy win for case, that we should make it fullscreen
- if(useInternalX&& (internalX==XMING))
+// // if using XMing, we must find proxy win for case, that we should make it fullscreen
+ // if(useInternalX&& (internalX==XMING))
// #endif
- proxyWinTimer->start ( 300 );
+// proxyWinTimer->start ( 300 );
}
#endif
diff --git a/onmainwindow_part3.cpp b/onmainwindow_part3.cpp
index 8fc3122..abd29f5 100644
--- a/onmainwindow_part3.cpp
+++ b/onmainwindow_part3.cpp
@@ -824,7 +824,8 @@ void ONMainWindow::slotGetServers ( bool result, QString output,
for ( int j=0;j<x2goServers.size();++j )
{
QString host=x2goServers[j].name;
- serverSshConnections<<startSshConnection ( host,sshPort,acceptRsa,user,passwd,true,true);
+ sshPort=x2goServers[j].sshPort;
+ serverSshConnections<<startSshConnection ( host,sshPort,acceptRsa,user,passwd,true,false,true);
}
}
diff --git a/onmainwindow_part4.cpp b/onmainwindow_part4.cpp
index 76fd224..5d8eecd 100644
--- a/onmainwindow_part4.cpp
+++ b/onmainwindow_part4.cpp
@@ -246,32 +246,32 @@ bool ONMainWindow::isServerRunning ( int port )
char* localIP;
int iResult;
WSADATA wsaData;
-
+
struct in_addr addr = { 0 };
-
+
iResult = WSAStartup(MAKEWORD(2, 2), &wsaData);
- if (iResult != 0)
+ if (iResult != 0)
{
x2goDebug<<"WARNING: WSAStartup failed: "<< iResult<<endl;
return false;
}
-
+
addr.s_addr = inet_addr("127.0.0.1");
- if (addr.s_addr == INADDR_NONE)
+ if (addr.s_addr == INADDR_NONE)
{
- x2goDebug<< "WARNING: The IPv4 address entered must be a legal address\n";
- return false;
+ x2goDebug<< "WARNING: The IPv4 address entered must be a legal address\n";
+ return false;
}
-
+
localHost = gethostbyaddr((char*)&addr,4, AF_INET);
- if(!localHost)
+ if (!localHost)
{
- x2goDebug<<"WARNING: gethostbyaddr failed: "<<WSAGetLastError()<<endl;
- return false;
+ x2goDebug<<"WARNING: gethostbyaddr failed: "<<WSAGetLastError()<<endl;
+ return false;
}
x2goDebug<<"got localhost"<<endl;
-
+
localIP = inet_ntoa (*(struct in_addr *)*localHost->h_addr_list);
saServer.sin_family = AF_INET;
@@ -961,20 +961,254 @@ void ONMainWindow::startSshd()
#endif
}
+void ONMainWindow::setProxyWinTitle()
+{
+
+ QString title;
+
+ if (!useLdap)
+ title=lastSession->name();
+ else
+ title=getCurrentUname()+"@"+resumingSession.server;
+
+ QPixmap pixmap;
+
+ if (useLdap)
+ pixmap=lastUser->foto();
+ else
+ pixmap=*(lastSession->sessIcon());
+
+#ifdef Q_OS_LINUX
+
+ XStoreName(QX11Info::display(), proxyWinId, title.toLocal8Bit().data());
+
+ XWMHints* win_hints;
+
+
+ QByteArray bytes;
+ QBuffer buffer(&bytes);
+ buffer.open(QIODevice::WriteOnly);
+ pixmap.save(&buffer, "XPM");
+
+
+ int rez;
+
+ if (image)
+ XFreePixmap(QX11Info::display(),image);
+ if (shape)
+ XFreePixmap(QX11Info::display(),shape);
+
+
+ rez=XpmCreatePixmapFromBuffer(QX11Info::display(), proxyWinId, bytes.data(),
+ (Pixmap *) &image, (Pixmap *) &shape, NULL);
+ if (!rez)
+ {
+
+ win_hints = XAllocWMHints();
+ if (win_hints)
+ {
+ win_hints->flags = IconPixmapHint|IconMaskHint;
+ win_hints->icon_pixmap = image;
+ win_hints->icon_mask = shape;
+ XSetWMHints(QX11Info::display(), proxyWinId, win_hints);
+ XFree(win_hints);
+ }
+ }
+
+#endif
+#ifdef Q_OS_WIN
+ wapiSetWindowText((HWND)proxyWinId, title);
+// wapiSetWindowIcon((HWND)proxyWinId, pixmap);
+#endif
+}
+
+void ONMainWindow::slotSetProxyWinFullscreen()
+{
+
+#ifdef Q_OS_LINUX
+ XSync(QX11Info::display(),false);
+ XEvent event;
+ long emask = StructureNotifyMask | ResizeRedirectMask;
+ event.xclient.type = ClientMessage;
+ event.xclient.serial = 0;
+ event.xclient.send_event = True;
+ event.xclient.display = QX11Info::display();
+ event.xclient.window = proxyWinId;
+ event.xclient.message_type = XInternAtom(QX11Info::display(),"_NET_WM_STATE",False);
+ event.xclient.format = 32;
+ event.xclient.data.l[0] = 1;
+ event.xclient.data.l[1] = XInternAtom(QX11Info::display(),"_NET_WM_STATE_FULLSCREEN",False);
+ event.xclient.data.l[2] = 0;
+ event.xclient.data.l[3] = 0;
+ event.xclient.data.l[4] = 0;
+ Status st;
+ st=XSendEvent(QX11Info::display(), DefaultRootWindow(QX11Info::display()),
+ False, emask,&event);
+ XSync(QX11Info::display(),false);
+#endif
+#ifdef Q_OS_WIN
+ wapiSetFSWindow ( ( HWND ) proxyWinId,
+ dispGeometry );
+
+#endif
+}
+
+
+void ONMainWindow::resizeProxyWinOnDisplay(int disp)
+{
+ QRect geom=QApplication::desktop()->screenGeometry(disp-1);
+ x2goDebug<<"resizing proxy win to fit display "<<disp<<"("<<geom<<")"<<endl;
+#ifdef Q_OS_LINUX
+ XSync(QX11Info::display(),false);
+ XMoveWindow(QX11Info::display(), proxyWinId,geom.x(),geom.y());
+#endif
+#ifdef Q_OS_WIN
+ dispGeometry=geom;
+#endif
+ QTimer::singleShot(500, this, SLOT(slotSetProxyWinFullscreen()));
+}
+
+
+QRect ONMainWindow::proxyWinGeometry()
+{
+#ifdef Q_OS_WIN
+ QRect proxyRect;
+ if (!wapiWindowRectWithoutDecoration((HWND)proxyWinId,proxyRect))
+ return QRect();
+ return proxyRect;
+#endif
+#ifdef Q_OS_LINUX
+ QRect proxyRect;
+ Window root;
+ int x,y;
+ uint w,h,border,depth;
+ if (XGetGeometry(QX11Info::display(), proxyWinId, &root,&x,&y,&w,&h,&border,&depth))
+ {
+
+ int realx,realy;
+ Window child;
+ XTranslateCoordinates(QX11Info::display(), proxyWinId, root, 0, 0, &realx, &realy, &child);
+ proxyRect.setRect(realx, realy, w,h);
+ }
+ return proxyRect;
+#endif
+ return QRect();
+}
+
+void ONMainWindow::slotConfigXinerama()
+{
+ QRect newGeometry=proxyWinGeometry();
+ if (newGeometry.isNull())
+ {
+// x2goDebug<<"error getting window geometry (window closed?)\n";
+ xineramaTimer->stop();
+ return;
+ }
+ if (newGeometry==lastDisplayGeometry)
+ return;
+ lastDisplayGeometry=newGeometry;
+ x2goDebug<<"New proxy geometry: "<<lastDisplayGeometry<<endl;
+ QDesktopWidget* root=QApplication::desktop();
+ QList<QRect> newXineramaScreens;
+ for (int i=0; i< root->numScreens();++i)
+ {
+ QRect intersection=root->screenGeometry(i).intersected(lastDisplayGeometry);
+ if (!intersection.isNull())
+ {
+ x2goDebug<<"intersected with "<<i<<": "<<intersection<<endl;
+ intersection.moveLeft(intersection.x()-lastDisplayGeometry.x());
+ intersection.moveTop(intersection.y()-lastDisplayGeometry.y());
+ x2goDebug<<"xinerama screen: "<<intersection<<endl;
+ newXineramaScreens<<intersection;
+ }
+ }
+ if (xineramaScreens != newXineramaScreens)
+ {
+ xineramaScreens=newXineramaScreens;
+ x2goDebug<<"xinerama screen changed, new screens: "<<xineramaScreens<<endl;
+ SshProcess* proc=new SshProcess(sshConnection, this);
+ xineramaTimer->stop();
+ connect (proc, SIGNAL(sshFinished(bool,QString,SshProcess*)), this, SLOT(slotXineramaConfigured()));
+ QStringList screens;
+ foreach (QRect disp, xineramaScreens)
+ screens<<QString::number(disp.x())+" "+QString::number(disp.y())+" "+QString::number(disp.width())+
+ " "+QString::number(disp.height());
+ QString cmd="export DISPLAY=:"+resumingSession.display+";echo -e "+screens.join("\\\\n")+" > ~/.x2go/C-"+
+ resumingSession.sessionId+"/xinerama.conf";
+
+ x2goDebug<<cmd<<endl;
+ proc->startNormal(cmd);
+ }
+}
+
+void ONMainWindow::slotXineramaConfigured()
+{
+ if (xinSizeInc == -1)
+ xinSizeInc=1;
+ else
+ xinSizeInc=-1;
+#ifdef Q_OS_LINUX
+ XSync(QX11Info::display(),false);
+ XResizeWindow(QX11Info::display(), proxyWinId,
+ lastDisplayGeometry.width()+xinSizeInc,lastDisplayGeometry.height());
+ XSync(QX11Info::display(),false);
+ lastDisplayGeometry=proxyWinGeometry();
+#endif
+#ifdef Q_OS_WIN
+ QRect geom;
+ wapiWindowRect ( (HWND) proxyWinId, geom );
+ wapiMoveWindow( (HWND) proxyWinId, geom.x(), geom.y(), geom.width()+xinSizeInc, geom.height(),true);
+ lastDisplayGeometry=proxyWinGeometry();
+#endif
+ xineramaTimer->start(500);
+}
void ONMainWindow::slotFindProxyWin()
{
- x2goDebug<<"search proxy win: "<<"X2GO-"+resumingSession.sessionId;
#ifndef Q_OS_DARWIN
+ x2goDebug<<"search proxy win: "<<"X2GO-"+resumingSession.sessionId;
-//#ifdef CFGPLUGIN
proxyWinId=findWindow ( "X2GO-"+resumingSession.sessionId );
-//#endif
-
if ( proxyWinId )
{
x2goDebug<<"proxy win found:"<<proxyWinId;
+ setProxyWinTitle();
proxyWinTimer->stop();
+ if (!useLdap)
+ {
+ X2goSettings *st;
+ QString sid;
+ if ( !embedMode )
+ sid=lastSession->id();
+ else
+ sid="embedded";
+
+ if (brokerMode)
+ st=new X2goSettings(config.iniFile,QSettings::IniFormat);
+ else
+ st= new X2goSettings( "sessions" );
+ uint displays=QApplication::desktop()->numScreens();
+ if (st->setting()->value ( sid+"/xinerama",
+ ( QVariant ) false ).toBool())
+ {
+ x2goDebug<<"Starting xinerama timer\n";
+ lastDisplayGeometry=QRect();
+ xineramaScreens.clear();
+ xineramaTimer->start(500);
+ }
+ if (st->setting()->value ( sid+"/multidisp",
+ ( QVariant ) false ).toBool())
+ {
+ uint disp=st->setting()->value ( sid+"/display",
+ ( QVariant ) 1 ).toUInt();
+ if (disp>displays)
+ {
+ disp=1;
+ }
+ resizeProxyWinOnDisplay(disp);
+ return;
+ }
+ }
if ( embedMode )
{
if ( config.rootless )
diff --git a/onmainwindow_privat.h b/onmainwindow_privat.h
index a97e961..98cef6e 100644
--- a/onmainwindow_privat.h
+++ b/onmainwindow_privat.h
@@ -82,6 +82,8 @@
#if !defined Q_OS_WIN
#include <sys/mount.h>
#ifdef Q_OS_LINUX
+#include <X11/Xatom.h>
+#include <X11/xpm.h>
#include <linux/fs.h>
#endif // Q_OS_LINUX
#endif // !defined Q_OS_WIN
diff --git a/sessionbutton.cpp b/sessionbutton.cpp
index c5ec122..e4ad225 100644
--- a/sessionbutton.cpp
+++ b/sessionbutton.cpp
@@ -24,6 +24,8 @@
#include <QPushButton>
#include "onmainwindow.h"
#include "x2gologdebug.h"
+#include <QApplication>
+#include <QDesktopWidget>
SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id )
@@ -143,7 +145,7 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id )
if ( !miniMode )
{
sessName->move ( 80,34 );
- sessStatus->move(80,50);
+ sessStatus->move(80,50);
editBut->move ( 307,156 );
serverIcon->move ( 58,84 );
server->move ( 80,84 );
@@ -160,7 +162,7 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id )
{
editBut->move ( 218,113 );
sessName->move ( 64,11 );
- sessStatus->hide();
+ sessStatus->hide();
serverIcon->move ( 66,44 );
server->move ( 88,44 );
cmdIcon->move ( 66,68 );
@@ -172,13 +174,13 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id )
soundIcon->move ( 66,116 );
sound->move ( 86,116 );
}
-
- if(mw->brokerMode)
+
+ if (mw->brokerMode)
{
- icon->move(10,30);
- sessName->move(90,50);
- sessStatus->move(90,70);
- setFixedHeight(120);
+ icon->move(10,30);
+ sessName->move(90,50);
+ sessStatus->move(90,70);
+ setFixedHeight(120);
}
@@ -219,16 +221,16 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id )
sessMenu->hide();
sound->setEnabled(false);
}
- if(mw->brokerMode)
+ if (mw->brokerMode)
{
- cmd->hide();
- cmdIcon->hide();
- server->hide();
- serverIcon->hide();
- geom->hide();
- geomIcon->hide();
- sound->hide();
- soundIcon->hide();
+ cmd->hide();
+ cmdIcon->hide();
+ server->hide();
+ serverIcon->hide();
+ geom->hide();
+ geomIcon->hide();
+ sound->hide();
+ soundIcon->hide();
}
}
@@ -381,6 +383,11 @@ void SessionButton::redraw()
geomBox->clear();
geomBox->addItem ( tr ( "fullscreen" ) );
+ uint displays=QApplication::desktop()->numScreens();
+ for (uint i=0;i<displays;++i)
+ {
+ geomBox->addItem ( tr( "Display " )+QString::number(i+1));
+ }
#ifndef Q_WS_HILDON
geomBox->addItem ( "1440x900" );
geomBox->addItem ( "1280x1024" );
@@ -395,21 +402,42 @@ void SessionButton::redraw()
geom->setText ( tr ( "fullscreen" ) );
}
else
- {
+ if (st->setting()->value ( sid+"/multidisp",
+ ( QVariant ) false ).toBool())
+ {
+ uint disp=st->setting()->value ( sid+"/display",
+ ( QVariant ) 1 ).toUInt();
+ if (disp<=displays)
+ {
+ geom->setText( tr( "Display " )+QString::number(disp));
+ }
+ else
+ {
+ geom->setText( tr( "Display " )+QString::number(1));
+ }
+ for (int i=0;i<geomBox->count();++i)
+ if (geomBox->itemText(i)==geom->text())
+ {
+ geomBox->setCurrentIndex(i);
+ break;
+ }
+ }
+ else
+ {
#ifndef Q_WS_HILDON
- QString g=QString::number ( st->setting()->value (
- sid+"/width" ).toInt() );
- g+="x"+QString::number ( st->setting()->value (
- sid+"/height" ).toInt() );
- geom->setText ( g );
- if ( geomBox->findText ( g ) ==-1 )
- geomBox->addItem ( g );
- geomBox->setCurrentIndex ( geomBox->findText ( g ) );
+ QString g=QString::number ( st->setting()->value (
+ sid+"/width" ).toInt() );
+ g+="x"+QString::number ( st->setting()->value (
+ sid+"/height" ).toInt() );
+ geom->setText ( g );
+ if ( geomBox->findText ( g ) ==-1 )
+ geomBox->addItem ( g );
+ geomBox->setCurrentIndex ( geomBox->findText ( g ) );
#else
- geom->setText ( tr ( "window" ) );
- geomBox->setCurrentIndex ( 1 );
+ geom->setText ( tr ( "window" ) );
+ geomBox->setCurrentIndex ( 1 );
#endif
- }
+ }
snd=st->setting()->value ( sid+"/sound", ( QVariant ) true ).toBool();
@@ -633,19 +661,31 @@ void SessionButton::slot_geom_change ( const QString& new_g )
geom->setText ( new_g );
X2goSettings st ( "sessions" );
if ( new_g==tr ( "fullscreen" ) )
+ {
st.setting()->setValue ( sid+"/fullscreen", ( QVariant ) true );
+ st.setting()->setValue ( sid+"/multidisp", ( QVariant ) false );
+ }
else
- {
- QString new_geom=new_g;
+ if (new_g.indexOf(tr("Display "))==0)
+ {
+ QString g= new_g;
+ g.replace(tr("Display "),"");
+ st.setting()->setValue ( sid+"/multidisp", ( QVariant ) true );
+ st.setting()->setValue ( sid+"/display", ( QVariant ) g.toUInt());
+ st.setting()->setValue ( sid+"/fullscreen", ( QVariant ) false );
+ }
+ else
+ {
+ QString new_geom=new_g;
#ifdef Q_WS_HILDON
- new_geom="800x600";
+ new_geom="800x600";
#endif
- st.setting()->setValue ( sid+"/fullscreen",
- ( QVariant ) false );
- QStringList lst=new_geom.split ( 'x' );
- st.setting()->setValue ( sid+"/width", ( QVariant ) lst[0] );
- st.setting()->setValue ( sid+"/height", ( QVariant ) lst[1] );
- }
+ st.setting()->setValue ( sid+"/fullscreen", ( QVariant ) false );
+ st.setting()->setValue ( sid+"/multidisp", ( QVariant ) false );
+ QStringList lst=new_geom.split ( 'x' );
+ st.setting()->setValue ( sid+"/width", ( QVariant ) lst[0] );
+ st.setting()->setValue ( sid+"/height", ( QVariant ) lst[1] );
+ }
st.setting()->sync();
}
diff --git a/sessionbutton.h b/sessionbutton.h
index b39bdb5..cad3770 100644
--- a/sessionbutton.h
+++ b/sessionbutton.h
@@ -14,8 +14,8 @@
#include "SVGFrame.h"
#include <QPushButton>
+#include <QLabel>
class ONMainWindow;
-class QLabel;
class QComboBox;
class QPushButton;
@@ -24,58 +24,63 @@ class QPushButton;
*/
class SessionButton : public SVGFrame
{
- Q_OBJECT
- public:
- enum {KDE,GNOME,LXDE,RDP,XDMCP,SHADOW,OTHER,APPLICATION};
- SessionButton ( ONMainWindow* mw, QWidget* parent,QString id );
- ~SessionButton();
- QString id() { return sid; }
- void redraw();
- static bool lessThen ( const SessionButton* b1, const SessionButton* b2 );
- QString name();
- private:
- QString sid;
- QLabel* sessName;
- QLabel* sessStatus;
- QLabel* icon;
- QComboBox* cmdBox;
- QLabel* cmd;
- QLabel* serverIcon;
- QLabel* geomIcon;
- QLabel* cmdIcon;
- QLabel* server;
- QPushButton* editBut;
- QLabel* geom;
- QMenu* sessMenu;
- QComboBox* geomBox;
- QPushButton* sound;
- QLabel* soundIcon;
- ONMainWindow* par;
- QAction* act_edit;
- QAction* act_createIcon;
- QAction* act_remove;
- bool rootless;
- bool editable;
+ Q_OBJECT
+public:
+ enum {KDE,GNOME,LXDE,RDP,XDMCP,SHADOW,OTHER,APPLICATION};
+ SessionButton ( ONMainWindow* mw, QWidget* parent,QString id );
+ ~SessionButton();
+ QString id() {
+ return sid;
+ }
+ void redraw();
+ const QPixmap* sessIcon() {
+ return icon->pixmap();
+ }
+ static bool lessThen ( const SessionButton* b1, const SessionButton* b2 );
+ QString name();
+private:
+ QString sid;
+ QLabel* sessName;
+ QLabel* sessStatus;
+ QLabel* icon;
+ QComboBox* cmdBox;
+ QLabel* cmd;
+ QLabel* serverIcon;
+ QLabel* geomIcon;
+ QLabel* cmdIcon;
+ QLabel* server;
+ QPushButton* editBut;
+ QLabel* geom;
+ QMenu* sessMenu;
+ QComboBox* geomBox;
+ QPushButton* sound;
+ QLabel* soundIcon;
+ ONMainWindow* par;
+ QAction* act_edit;
+ QAction* act_createIcon;
+ QAction* act_remove;
+ bool rootless;
+ bool editable;
- private slots:
- void slotClicked();
- void slotEdit();
- void slot_soundClicked();
- void slot_cmd_change ( const QString& command );
- void slot_geom_change ( const QString& new_g );
- void slotRemove();
- void slotMenuHide();
- void slotShowMenu();
- void slotCreateSessionIcon();
- signals:
- void sessionSelected ( SessionButton* );
- void signal_edit ( SessionButton* );
- void signal_remove ( SessionButton* );
- void clicked();
- protected:
- virtual void mouseMoveEvent ( QMouseEvent * event );
- virtual void mousePressEvent ( QMouseEvent * event );
- virtual void mouseReleaseEvent ( QMouseEvent * event );
+private slots:
+ void slotClicked();
+ void slotEdit();
+ void slot_soundClicked();
+ void slot_cmd_change ( const QString& command );
+ void slot_geom_change ( const QString& new_g );
+ void slotRemove();
+ void slotMenuHide();
+ void slotShowMenu();
+ void slotCreateSessionIcon();
+signals:
+ void sessionSelected ( SessionButton* );
+ void signal_edit ( SessionButton* );
+ void signal_remove ( SessionButton* );
+ void clicked();
+protected:
+ virtual void mouseMoveEvent ( QMouseEvent * event );
+ virtual void mousePressEvent ( QMouseEvent * event );
+ virtual void mouseReleaseEvent ( QMouseEvent * event );
};
#endif
diff --git a/sessionwidget.cpp b/sessionwidget.cpp
index 9faae9a..4a9603c 100644
--- a/sessionwidget.cpp
+++ b/sessionwidget.cpp
@@ -105,7 +105,9 @@ SessionWidget::SessionWidget ( QString id, ONMainWindow * mw,
sgbLay->addLayout ( suLay );
sgbLay->addLayout ( keyLay );
cbAutoLogin=new QCheckBox(tr("Try auto login (ssh-agent or default ssh key)"),sgb);
+ cbKrbLogin=new QCheckBox(tr("Kerberos 5 (GSSAPI) authentication"),sgb);
sgbLay->addWidget(cbAutoLogin);
+ sgbLay->addWidget(cbKrbLogin);
#ifndef Q_WS_HILDON
QGroupBox *deskSess=new QGroupBox ( tr ( "&Session type" ),this );
@@ -178,6 +180,8 @@ SessionWidget::SessionWidget ( QString id, ONMainWindow * mw,
connect ( sessName,SIGNAL ( textChanged ( const QString & ) ),this,
SIGNAL ( nameChanged ( const QString & ) ) );
readConfig();
+ cbKrbLogin->setChecked(false);
+ cbKrbLogin->setVisible(false);
}
SessionWidget::~SessionWidget()
@@ -320,7 +324,10 @@ void SessionWidget::readConfig()
( QVariant ) QString::null ).toString() );
cbAutoLogin->setChecked(st.setting()->value (
sessionId+"/autologin",
- ( QVariant ) QString::null ).toBool());
+ ( QVariant ) false ).toBool());
+ cbKrbLogin->setChecked(st.setting()->value (
+ sessionId+"/krblogin",
+ ( QVariant ) false ).toBool());
sshPort->setValue (
st.setting()->value (
sessionId+"/sshport",
@@ -416,7 +423,9 @@ void SessionWidget::setDefaults()
cmdCombo->addItem ( "" );
cmdCombo->addItems ( mainWindow->transApplicationsNames() );
cbAutoLogin->setChecked(false);
+ cbKrbLogin->setChecked(false);
cmdCombo->lineEdit()->setText (
+
tr ( "Path to executable" ) );
cmdCombo->lineEdit()->selectAll();
slot_changeCmd ( 0 );
@@ -446,6 +455,7 @@ void SessionWidget::saveSettings()
st.setting()->setValue ( sessionId+"/sshport",
( QVariant ) sshPort->value() );
st.setting()->setValue(sessionId+"/autologin",( QVariant ) cbAutoLogin->isChecked());
+ st.setting()->setValue(sessionId+"/krblogin",( QVariant ) cbKrbLogin->isChecked());
QString command;
bool rootless=false;
diff --git a/sessionwidget.h b/sessionwidget.h
index 9cf8af0..27767d2 100644
--- a/sessionwidget.h
+++ b/sessionwidget.h
@@ -47,6 +47,7 @@ class SessionWidget : public ConfigWidget
QSpinBox* sshPort;
QLineEdit* key;
QCheckBox* cbAutoLogin;
+ QCheckBox* cbKrbLogin;
QString sessIcon;
QPushButton* icon;
QLineEdit* cmd;
diff --git a/settingswidget.cpp b/settingswidget.cpp
index 8adf148..86c5395 100644
--- a/settingswidget.cpp
+++ b/settingswidget.cpp
@@ -21,205 +21,258 @@
#include <QLabel>
#include "x2gosettings.h"
#include <QDir>
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QTimer>
+#include <QSplashScreen>
+#include "x2gologdebug.h"
+
SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw,
QWidget * parent, Qt::WindowFlags f )
- : ConfigWidget ( id,mw,parent,f )
+ : ConfigWidget ( id,mw,parent,f )
{
+ multiDisp=(QApplication::desktop()->screenCount()>1);
#ifdef Q_WS_HILDON
- QTabWidget* tabSettings=new QTabWidget ( this );
- QFrame* dgb=new QFrame();
- QFrame* kgb=new QFrame();
- QFrame* sbgr=new QFrame();
- tabSettings->addTab ( dgb, tr ( "&Display" ) );
- tabSettings->addTab ( kgb,tr ( "&Keyboard" ) );
- tabSettings->addTab ( sbgr,tr ( "Sound" ) );
+ QTabWidget* tabSettings=new QTabWidget ( this );
+ QFrame* dgb=new QFrame();
+ QFrame* kgb=new QFrame();
+ QFrame* sbgr=new QFrame();
+ tabSettings->addTab ( dgb, tr ( "&Display" ) );
+ tabSettings->addTab ( kgb,tr ( "&Keyboard" ) );
+ tabSettings->addTab ( sbgr,tr ( "Sound" ) );
#else
- QGroupBox *dgb=new QGroupBox ( tr ( "&Display" ),this );
- QGroupBox *kgb=new QGroupBox ( tr ( "&Keyboard" ),this );
- QGroupBox *sbgr=new QGroupBox ( tr ( "Sound" ),this );
+ QGroupBox *dgb=new QGroupBox ( tr ( "&Display" ),this );
+ QGroupBox *kgb=new QGroupBox ( tr ( "&Keyboard" ),this );
+ QGroupBox *sbgr=new QGroupBox ( tr ( "Sound" ),this );
#endif
- QVBoxLayout *dbLay = new QVBoxLayout ( dgb );
- QVBoxLayout *sndLay=new QVBoxLayout ( sbgr );
- QHBoxLayout* sLay=new QHBoxLayout ( );
- QVBoxLayout* sLay_sys=new QVBoxLayout ( );
- QVBoxLayout* sLay_opt=new QVBoxLayout ( );
- sLay->addLayout ( sLay_sys );
- sLay->addLayout ( sLay_opt );
- QVBoxLayout* setLay=new QVBoxLayout ( this );
- QButtonGroup* radio = new QButtonGroup ( dgb );
- fs=new QRadioButton ( tr ( "Fullscreen" ),dgb );
+ QVBoxLayout *dbLay = new QVBoxLayout ( dgb );
+ QVBoxLayout *sndLay=new QVBoxLayout ( sbgr );
+ QHBoxLayout* sLay=new QHBoxLayout ( );
+ QVBoxLayout* sLay_sys=new QVBoxLayout ( );
+ QVBoxLayout* sLay_opt=new QVBoxLayout ( );
+ sLay->addLayout ( sLay_sys );
+ sLay->addLayout ( sLay_opt );
+ QVBoxLayout* setLay=new QVBoxLayout ( this );
+ QButtonGroup* radio = new QButtonGroup ( dgb );
+ fs=new QRadioButton ( tr ( "Fullscreen" ),dgb );
#ifndef Q_WS_HILDON
- custom=new QRadioButton ( tr ( "Custom" ),dgb );
+ custom=new QRadioButton ( tr ( "Custom" ),dgb );
#else
- custom=new QRadioButton ( tr ( "Window" ),dgb );
+ custom=new QRadioButton ( tr ( "Window" ),dgb );
#endif
- radio->addButton ( fs );
- radio->addButton ( custom );
- radio->setExclusive ( true );
- width=new QSpinBox ( dgb );
- height=new QSpinBox ( dgb );
- cbSetDPI=new QCheckBox ( tr ( "Set display DPI" ),dgb );
-
- DPI=new QSpinBox ( dgb );
- DPI->setRange ( 1,1000 );
-
- QHBoxLayout *dgLay =new QHBoxLayout();
- QHBoxLayout *dwLay =new QHBoxLayout();
- QHBoxLayout *ddLay =new QHBoxLayout();
- ddLay->addWidget ( cbSetDPI );
- ddLay->addWidget ( DPI );
- ddLay->addStretch();
- ddLay->setSpacing ( 15 );
-
- dgLay->addWidget ( fs );
- dgLay->addStretch();
-
- dwLay->addWidget ( custom );
- dwLay->addSpacing ( 15 );
- dwLay->addWidget ( widthLabel=new QLabel ( tr ( "Width:" ),dgb ) );
- dwLay->addWidget ( width );
- width->setRange ( 0,10000 );
- dwLay->addWidget ( heightLabel=new QLabel ( tr ( "Height:" ),dgb ) );
- dwLay->addWidget ( height );
- height->setRange ( 0,10000 );
- dwLay->addStretch();
- dbLay->addLayout ( dgLay );
- dbLay->addLayout ( dwLay );
- QFrame* dhl=new QFrame ( dgb );
- dhl->setFrameStyle ( QFrame::HLine | QFrame::Sunken );
- dbLay->addWidget ( dhl );
- dbLay->addLayout ( ddLay );
+ display=new QRadioButton ( tr ( "Use whole display" ),dgb );
+
+ radio->addButton ( fs );
+ radio->addButton ( custom );
+ radio->setExclusive ( true );
+ radio->addButton(display);
+ width=new QSpinBox ( dgb );
+ height=new QSpinBox ( dgb );
+ cbSetDPI=new QCheckBox ( tr ( "Set display DPI" ),dgb );
+
+ DPI=new QSpinBox ( dgb );
+ DPI->setRange ( 1,1000 );
+
+ cbXinerama= new QCheckBox(tr( "Xinerama extension (support for two or more physical displays)"),dgb);
+
+ QHBoxLayout *dgLay =new QHBoxLayout();
+ QHBoxLayout *dwLay =new QHBoxLayout();
+ QHBoxLayout *ddLay =new QHBoxLayout();
+ QHBoxLayout *dispLay= new QHBoxLayout();
+ ddLay->addWidget ( cbSetDPI );
+ ddLay->addWidget ( DPI );
+ ddLay->addStretch();
+ ddLay->setSpacing ( 15 );
+
+ dgLay->addWidget ( fs );
+ dgLay->addStretch();
+
+ dwLay->addWidget ( custom );
+ dwLay->addSpacing ( 15 );
+ dwLay->addWidget ( widthLabel=new QLabel ( tr ( "Width:" ),dgb ) );
+ dwLay->addWidget ( width );
+ width->setRange ( 0,10000 );
+ dwLay->addWidget ( heightLabel=new QLabel ( tr ( "Height:" ),dgb ) );
+ dwLay->addWidget ( height );
+ height->setRange ( 0,10000 );
+ dwLay->addStretch();
+
+ dispLay->addWidget(display);
+ dispLay->addSpacing(15);
+ dispLay->addWidget(lDisplay=new QLabel(tr("&Display:"),dgb));
+ dispLay->addWidget(displayNumber=new QSpinBox(dgb));
+ pbIdentDisp=new QPushButton(tr("&Identify all displays"), dgb);
+ dispLay->addWidget(pbIdentDisp);
+ dispLay->addStretch();
+ lDisplay->setBuddy(displayNumber);
+
+ displayNumber->setMinimum(1);
+ displayNumber->setMaximum(QApplication::desktop()->screenCount());
+ if (!multiDisp)
+ {
+ displayNumber->hide();
+ lDisplay->hide();
+ pbIdentDisp->hide();
+ display->hide();
+ }
+ lDisplay->setEnabled ( false );
+ displayNumber->setEnabled ( false );
+
+
+ dbLay->addLayout ( dgLay );
+ dbLay->addLayout ( dwLay );
+ dbLay->addLayout(dispLay);
+ QFrame* dhl=new QFrame ( dgb );
+ dhl->setFrameStyle ( QFrame::HLine | QFrame::Sunken );
+ dbLay->addWidget ( dhl );
+ dbLay->addLayout ( ddLay );
+ dhl=new QFrame ( dgb );
+ dhl->setFrameStyle ( QFrame::HLine | QFrame::Sunken );
+ dbLay->addWidget ( dhl );
+ dbLay->addWidget ( cbXinerama );
#ifdef Q_WS_HILDON
- width->hide();
- height->hide();
- widthLabel->hide();
- heightLabel->hide();
+ width->hide();
+ height->hide();
+ widthLabel->hide();
+ heightLabel->hide();
#endif
- kbd=new QCheckBox ( tr ( "Keep current keyboard Settings" ),kgb );
- layout=new QLineEdit ( kgb );
- type=new QLineEdit ( kgb );
- QVBoxLayout *kbLay = new QVBoxLayout ( kgb );
-
- QVBoxLayout *klLay = new QVBoxLayout();
- QVBoxLayout *kwLay = new QVBoxLayout();
- QHBoxLayout *ksLay = new QHBoxLayout();
-
- klLay->addWidget ( layoutLabel= new QLabel (
- tr ( "Keyboard layout:" ),kgb ) );
- klLay->addWidget ( typeLabel= new QLabel (
- tr ( "Keyboard model:" ),kgb ) );
-
- kwLay->addWidget ( layout );
- kwLay->addWidget ( type );
-
- ksLay->addLayout ( klLay );
- ksLay->addLayout ( kwLay );
-
- kbLay->addWidget ( kbd );
- kbLay->addLayout ( ksLay );
-
- sound=new QCheckBox ( tr ( "Enable sound support" ),sbgr );
- QButtonGroup* sndsys=new QButtonGroup;
- pulse=new QRadioButton ( "PulseAudio",sbgr );
- arts=new QRadioButton ( "arts",sbgr );
- esd=new QRadioButton ( "esd",sbgr );
- sndsys->addButton ( pulse,PULSE );
- sndsys->addButton ( arts,ARTS );
- sndsys->addButton ( esd,ESD );
- sndsys->setExclusive ( true );
- rbStartSnd=new QRadioButton ( tr ( "Start sound daemon" ),sbgr );
- rbNotStartSnd=new QRadioButton (
- tr ( "Use running sound daemon" ),sbgr );
- cbSndSshTun=new QCheckBox (
- tr ( "Use SSH port forwarding to tunnel\n"
- "sound system connections through firewalls" ),sbgr );
- cbDefSndPort=new QCheckBox ( tr ( "Use default sound port" ),sbgr );
- sbSndPort=new QSpinBox ( sbgr );
- sbSndPort->setMinimum ( 1 );
- sbSndPort->setMaximum ( 99999999 );
-
-
- QHBoxLayout *sndPortLay = new QHBoxLayout();
- lSndPort=new QLabel ( tr ( "Sound port:" ),sbgr );
- sndPortLay->addWidget ( lSndPort );
- sndPortLay->addWidget ( sbSndPort );
-
- sLay_sys->addWidget ( pulse );
- sLay_sys->addWidget ( arts );
- sLay_sys->addWidget ( esd );
-
- sLay_opt->addWidget ( rbStartSnd );
- sLay_opt->addWidget ( rbNotStartSnd );
- sLay_opt->addWidget ( cbSndSshTun );
- QFrame* hl=new QFrame ( sbgr );
- hl->setFrameStyle ( QFrame::HLine | QFrame::Sunken );
- sLay_opt->addWidget ( hl );
- sLay_opt->addWidget ( cbDefSndPort );
- sLay_opt->addLayout ( sndPortLay );
- sndLay->addWidget ( sound );
- sndLay->addLayout ( sLay );
+ kbd=new QCheckBox ( tr ( "Keep current keyboard Settings" ),kgb );
+ layout=new QLineEdit ( kgb );
+ type=new QLineEdit ( kgb );
+ QVBoxLayout *kbLay = new QVBoxLayout ( kgb );
+
+ QVBoxLayout *klLay = new QVBoxLayout();
+ QVBoxLayout *kwLay = new QVBoxLayout();
+ QHBoxLayout *ksLay = new QHBoxLayout();
+
+ klLay->addWidget ( layoutLabel= new QLabel (
+ tr ( "Keyboard layout:" ),kgb ) );
+ klLay->addWidget ( typeLabel= new QLabel (
+ tr ( "Keyboard model:" ),kgb ) );
+
+ kwLay->addWidget ( layout );
+ kwLay->addWidget ( type );
+
+ ksLay->addLayout ( klLay );
+ ksLay->addLayout ( kwLay );
+
+ kbLay->addWidget ( kbd );
+ kbLay->addLayout ( ksLay );
+
+ sound=new QCheckBox ( tr ( "Enable sound support" ),sbgr );
+ QButtonGroup* sndsys=new QButtonGroup;
+ pulse=new QRadioButton ( "PulseAudio",sbgr );
+ arts=new QRadioButton ( "arts",sbgr );
+ esd=new QRadioButton ( "esd",sbgr );
+ sndsys->addButton ( pulse,PULSE );
+ sndsys->addButton ( arts,ARTS );
+ sndsys->addButton ( esd,ESD );
+ sndsys->setExclusive ( true );
+ rbStartSnd=new QRadioButton ( tr ( "Start sound daemon" ),sbgr );
+ rbNotStartSnd=new QRadioButton (
+ tr ( "Use running sound daemon" ),sbgr );
+ cbSndSshTun=new QCheckBox (
+ tr ( "Use SSH port forwarding to tunnel\n"
+ "sound system connections through firewalls" ),sbgr );
+ cbDefSndPort=new QCheckBox ( tr ( "Use default sound port" ),sbgr );
+ sbSndPort=new QSpinBox ( sbgr );
+ sbSndPort->setMinimum ( 1 );
+ sbSndPort->setMaximum ( 99999999 );
+
+
+ QHBoxLayout *sndPortLay = new QHBoxLayout();
+ lSndPort=new QLabel ( tr ( "Sound port:" ),sbgr );
+ sndPortLay->addWidget ( lSndPort );
+ sndPortLay->addWidget ( sbSndPort );
+
+ sLay_sys->addWidget ( pulse );
+ sLay_sys->addWidget ( arts );
+ sLay_sys->addWidget ( esd );
+
+ sLay_opt->addWidget ( rbStartSnd );
+ sLay_opt->addWidget ( rbNotStartSnd );
+ sLay_opt->addWidget ( cbSndSshTun );
+ QFrame* hl=new QFrame ( sbgr );
+ hl->setFrameStyle ( QFrame::HLine | QFrame::Sunken );
+ sLay_opt->addWidget ( hl );
+ sLay_opt->addWidget ( cbDefSndPort );
+ sLay_opt->addLayout ( sndPortLay );
+ sndLay->addWidget ( sound );
+ sndLay->addLayout ( sLay );
#ifdef Q_OS_WIN
- arts->hide();
- hl->hide();
- cbDefSndPort->hide();
- lSndPort->hide();
- sbSndPort->hide();
+ arts->hide();
+ hl->hide();
+ cbDefSndPort->hide();
+ lSndPort->hide();
+ sbSndPort->hide();
#endif
- cbClientPrint=new QCheckBox ( tr ( "Client side printing support" ),
- this );
+ cbClientPrint=new QCheckBox ( tr ( "Client side printing support" ),
+ this );
#ifdef Q_OS_DARWIN
- arts->hide();
- pulse->hide();
- esd->setChecked ( true );
+ arts->hide();
+ pulse->hide();
+ esd->setChecked ( true );
#endif
#ifndef Q_WS_HILDON
- setLay->addWidget ( dgb );
- setLay->addWidget ( kgb );
- setLay->addWidget ( sbgr );
+ setLay->addWidget ( dgb );
+ setLay->addWidget ( kgb );
+ setLay->addWidget ( sbgr );
#else
- setLay->addWidget ( tabSettings );
+ setLay->addWidget ( tabSettings );
// cbClientPrint->hide();
#endif
- setLay->addWidget ( cbClientPrint );
- setLay->addStretch();
-
- connect ( custom,SIGNAL ( toggled ( bool ) ),width,
- SLOT ( setEnabled ( bool ) ) );
- connect ( custom,SIGNAL ( toggled ( bool ) ),height,
- SLOT ( setEnabled ( bool ) ) );
- connect ( custom,SIGNAL ( toggled ( bool ) ),widthLabel,
- SLOT ( setEnabled ( bool ) ) );
- connect ( custom,SIGNAL ( toggled ( bool ) ),heightLabel,
- SLOT ( setEnabled ( bool ) ) );
- connect ( cbSetDPI,SIGNAL ( toggled ( bool ) ),DPI,
- SLOT ( setEnabled ( bool ) ) );
- connect ( kbd,SIGNAL ( toggled ( bool ) ),layout,
- SLOT ( setDisabled ( bool ) ) );
- connect ( kbd,SIGNAL ( toggled ( bool ) ),layoutLabel,
- SLOT ( setDisabled ( bool ) ) );
- connect ( kbd,SIGNAL ( toggled ( bool ) ),type,
- SLOT ( setDisabled ( bool ) ) );
- connect ( kbd,SIGNAL ( toggled ( bool ) ),typeLabel,
- SLOT ( setDisabled ( bool ) ) );
- connect ( sound,SIGNAL ( toggled ( bool ) ),this,
- SLOT ( slot_sndToggled ( bool ) ) );
- connect ( sndsys,SIGNAL ( buttonClicked ( int ) ),this,
- SLOT ( slot_sndSysSelected ( int ) ) );
- connect ( rbStartSnd,SIGNAL ( clicked ( ) ),this,
- SLOT ( slot_sndStartClicked() ) );
- connect ( rbNotStartSnd,SIGNAL ( clicked ( ) ),this,
- SLOT ( slot_sndStartClicked() ) );
- connect ( cbDefSndPort,SIGNAL ( toggled ( bool ) ),this,
- SLOT ( slot_sndDefPortChecked ( bool ) ) );
- kbd->setChecked ( true );
- custom->setChecked ( true );
- readConfig();
+ setLay->addWidget ( cbClientPrint );
+ setLay->addStretch();
+
+ connect ( custom,SIGNAL ( toggled ( bool ) ),width,
+ SLOT ( setEnabled ( bool ) ) );
+ connect ( custom,SIGNAL ( toggled ( bool ) ),height,
+ SLOT ( setEnabled ( bool ) ) );
+ connect ( custom,SIGNAL ( toggled ( bool ) ),widthLabel,
+ SLOT ( setEnabled ( bool ) ) );
+ connect ( custom,SIGNAL ( toggled ( bool ) ),heightLabel,
+ SLOT ( setEnabled ( bool ) ) );
+
+ connect ( display,SIGNAL ( toggled ( bool ) ),displayNumber,
+ SLOT ( setEnabled ( bool ) ) );
+ connect ( display,SIGNAL ( toggled ( bool ) ),lDisplay,
+ SLOT ( setEnabled ( bool ) ) );
+ connect(pbIdentDisp, SIGNAL(clicked()), this, SLOT (slot_identDisplays()));
+
+
+
+ connect ( cbSetDPI,SIGNAL ( toggled ( bool ) ),DPI,
+ SLOT ( setEnabled ( bool ) ) );
+ connect ( kbd,SIGNAL ( toggled ( bool ) ),layout,
+ SLOT ( setDisabled ( bool ) ) );
+ connect ( kbd,SIGNAL ( toggled ( bool ) ),layoutLabel,
+ SLOT ( setDisabled ( bool ) ) );
+ connect ( kbd,SIGNAL ( toggled ( bool ) ),type,
+ SLOT ( setDisabled ( bool ) ) );
+ connect ( kbd,SIGNAL ( toggled ( bool ) ),typeLabel,
+ SLOT ( setDisabled ( bool ) ) );
+ connect ( sound,SIGNAL ( toggled ( bool ) ),this,
+ SLOT ( slot_sndToggled ( bool ) ) );
+ connect ( sndsys,SIGNAL ( buttonClicked ( int ) ),this,
+ SLOT ( slot_sndSysSelected ( int ) ) );
+ connect ( rbStartSnd,SIGNAL ( clicked ( ) ),this,
+ SLOT ( slot_sndStartClicked() ) );
+ connect ( rbNotStartSnd,SIGNAL ( clicked ( ) ),this,
+ SLOT ( slot_sndStartClicked() ) );
+ connect ( cbDefSndPort,SIGNAL ( toggled ( bool ) ),this,
+ SLOT ( slot_sndDefPortChecked ( bool ) ) );
+ kbd->setChecked ( true );
+ custom->setChecked ( true );
+ readConfig();
+
+ cbXinerama->setVisible(false);
+ cbXinerama->setChecked(false);
}
@@ -227,268 +280,340 @@ SettingsWidget::~SettingsWidget()
{
}
+
+void SettingsWidget::slot_identDisplays()
+{
+ pbIdentDisp->setEnabled(false);
+ identWins.clear();
+ for (int i=0;i<QApplication::desktop()->screenCount();++i)
+ {
+ QMainWindow *mw=new QMainWindow(
+ this, Qt::FramelessWindowHint|Qt::X11BypassWindowManagerHint|Qt::WindowStaysOnTopHint);
+ mw->setFixedSize(150,200);
+ QLabel* fr=new QLabel(QString::number(i+1), mw);
+ QFont f=fr->font();
+ f.setBold(true);
+ f.setPointSize(56);
+ fr->setFont(f);
+ fr->setAlignment(Qt::AlignCenter);
+ mw->setCentralWidget(fr);
+ fr->setFrameStyle(QFrame::Box);
+ QRect geom=QApplication::desktop()->screenGeometry(i);
+ int x_pos=geom.width()/2-75;
+ int y_pos=geom.height()/2-100;
+ x_pos=565;
+ identWins<<mw;
+ mw ->move(geom.x()+x_pos, geom.y()+y_pos);
+ mw->show();
+ mw->raise();
+ }
+ QTimer::singleShot(1200,this, SLOT(slot_hideIdentWins()));
+}
+
+void SettingsWidget::slot_hideIdentWins()
+{
+ QMainWindow* mw;
+ foreach(mw,identWins)
+ {
+ mw->close();
+ }
+ pbIdentDisp->setEnabled(true);
+}
+
+
void SettingsWidget::slot_sndSysSelected ( int system )
{
- rbStartSnd->show();
- rbNotStartSnd->show();
- cbSndSshTun->hide();
- cbDefSndPort->setChecked ( true );
- cbDefSndPort->setEnabled ( true );
-
- switch ( system )
- {
- case PULSE:
- {
- rbStartSnd->hide();
- rbNotStartSnd->hide();
- cbSndSshTun->show();
- cbSndSshTun->setEnabled ( true );
- break;
- }
- case ARTS:
- {
- cbDefSndPort->setChecked ( false );
- cbDefSndPort->setEnabled ( false );
- sbSndPort->setValue ( 20221 );
- break;
- }
- case ESD:
- {
+ rbStartSnd->show();
+ rbNotStartSnd->show();
+ cbSndSshTun->hide();
+ cbDefSndPort->setChecked ( true );
+ cbDefSndPort->setEnabled ( true );
+
+ switch ( system )
+ {
+ case PULSE:
+ {
+ rbStartSnd->hide();
+ rbNotStartSnd->hide();
+ cbSndSshTun->show();
+ cbSndSshTun->setEnabled ( true );
+ break;
+ }
+ case ARTS:
+ {
+ cbDefSndPort->setChecked ( false );
+ cbDefSndPort->setEnabled ( false );
+ sbSndPort->setValue ( 20221 );
+ break;
+ }
+ case ESD:
+ {
#ifdef Q_OS_WIN
- rbStartSnd->hide();
- rbNotStartSnd->hide();
- cbSndSshTun->show();
- cbSndSshTun->setEnabled ( false );
- cbSndSshTun->setChecked ( true );
+ rbStartSnd->hide();
+ rbNotStartSnd->hide();
+ cbSndSshTun->show();
+ cbSndSshTun->setEnabled ( false );
+ cbSndSshTun->setChecked ( true );
#endif
- sbSndPort->setValue ( 16001 );
- break;
- }
- }
- slot_sndStartClicked();
+ sbSndPort->setValue ( 16001 );
+ break;
+ }
+ }
+ slot_sndStartClicked();
}
void SettingsWidget::slot_sndToggled ( bool val )
{
- arts->setEnabled ( val );
- pulse->setEnabled ( val );
- esd->setEnabled ( val );
-
- rbStartSnd->setEnabled ( val );
- rbNotStartSnd->setEnabled ( val );
-
- cbSndSshTun->setEnabled ( false );
- if ( pulse->isChecked() )
- cbSndSshTun->setEnabled ( val );
- lSndPort->setEnabled ( val );
- if ( !arts->isChecked() )
- cbDefSndPort->setEnabled ( val );
- sbSndPort->setEnabled ( val );
- if ( val )
- slot_sndStartClicked();
+ arts->setEnabled ( val );
+ pulse->setEnabled ( val );
+ esd->setEnabled ( val );
+
+ rbStartSnd->setEnabled ( val );
+ rbNotStartSnd->setEnabled ( val );
+
+ cbSndSshTun->setEnabled ( false );
+ if ( pulse->isChecked() )
+ cbSndSshTun->setEnabled ( val );
+ lSndPort->setEnabled ( val );
+ if ( !arts->isChecked() )
+ cbDefSndPort->setEnabled ( val );
+ sbSndPort->setEnabled ( val );
+ if ( val )
+ slot_sndStartClicked();
}
void SettingsWidget::slot_sndStartClicked()
{
- bool start=rbStartSnd->isChecked();
+ bool start=rbStartSnd->isChecked();
#ifdef Q_OS_WIN
- start=false;
+ start=false;
#endif
- if ( pulse->isChecked() )
- {
- lSndPort->setEnabled ( true );
- sbSndPort->setEnabled ( true );
- cbDefSndPort->setEnabled ( true );
- }
- else
- {
- lSndPort->setEnabled ( !start );
- sbSndPort->setEnabled ( !start );
- cbDefSndPort->setEnabled ( !start );
- }
- if ( arts->isChecked() )
- cbDefSndPort->setEnabled ( false );
- if ( ( !start && esd->isChecked() ) ||pulse->isChecked() )
- slot_sndDefPortChecked ( cbDefSndPort->isChecked() );
+ if ( pulse->isChecked() )
+ {
+ lSndPort->setEnabled ( true );
+ sbSndPort->setEnabled ( true );
+ cbDefSndPort->setEnabled ( true );
+ }
+ else
+ {
+ lSndPort->setEnabled ( !start );
+ sbSndPort->setEnabled ( !start );
+ cbDefSndPort->setEnabled ( !start );
+ }
+ if ( arts->isChecked() )
+ cbDefSndPort->setEnabled ( false );
+ if ( ( !start && esd->isChecked() ) ||pulse->isChecked() )
+ slot_sndDefPortChecked ( cbDefSndPort->isChecked() );
}
void SettingsWidget::slot_sndDefPortChecked ( bool val )
{
- sbSndPort->setEnabled ( !val );
- lSndPort->setEnabled ( !val );
- if ( val )
- {
- if ( pulse->isChecked() )
- sbSndPort->setValue ( 4713 );
- if ( arts->isChecked() )
- sbSndPort->setValue ( 20221 );
- if ( esd->isChecked() )
- sbSndPort->setValue ( 16001 );
- }
+ sbSndPort->setEnabled ( !val );
+ lSndPort->setEnabled ( !val );
+ if ( val )
+ {
+ if ( pulse->isChecked() )
+ sbSndPort->setValue ( 4713 );
+ if ( arts->isChecked() )
+ sbSndPort->setValue ( 20221 );
+ if ( esd->isChecked() )
+ sbSndPort->setValue ( 16001 );
+ }
}
void SettingsWidget::readConfig()
{
- X2goSettings st ( "sessions" );
-
- fs->setChecked (
- st.setting()->value ( sessionId+"/fullscreen",
- ( QVariant ) mainWindow->getDefaultFullscreen() ).toBool() );
-
- custom->setChecked ( ! st.setting()->value (
- sessionId+"/fullscreen",
- ( QVariant ) mainWindow->getDefaultFullscreen()
- ).toBool() );
-
-
- width->setValue (
- st.setting()->value ( sessionId+"/width",
- ( QVariant ) mainWindow->getDefaultWidth() ).toInt() );
- height->setValue (
- st.setting()->value ( sessionId+"/height",
- ( QVariant ) mainWindow->getDefaultHeight() ).toInt() );
-
- cbSetDPI->setChecked (
- st.setting()->value ( sessionId+"/setdpi",
- ( QVariant ) mainWindow->getDefaultSetDPI() ).toBool() );
- DPI->setEnabled ( cbSetDPI->isChecked() );
- DPI->setValue (
- st.setting()->value ( sessionId+"/dpi",
- ( QVariant ) mainWindow->getDefaultDPI() ).toUInt() );
-
- kbd->setChecked ( !st.setting()->value (
- sessionId+"/usekbd",
- ( QVariant ) mainWindow->getDefaultSetKbd()
- ).toBool() );
- layout->setText (
- st.setting()->value ( sessionId+"/layout",
- ( QVariant ) mainWindow->getDefaultLayout()
- ).toString() );
- type->setText (
- st.setting()->value ( sessionId+"/type",
- ( QVariant ) mainWindow->getDefaultKbdType()
- ).toString() );
- bool snd=st.setting()->value (
- sessionId+"/sound",
- ( QVariant ) mainWindow->getDefaultUseSound()
- ).toBool();
- QString sndsys=st.setting()->value ( sessionId+"/soundsystem",
- "pulse" ).toString();
- bool startServ=st.setting()->value ( sessionId+"/startsoundsystem",
- true ).toBool();
- bool sndInTun=st.setting()->value ( sessionId+"/soundtunnel",
- true ).toBool();
- bool defSndPort=st.setting()->value ( sessionId+"/defsndport",
- true ).toBool();
- int sndPort= st.setting()->value ( sessionId+"/sndport",4713 ).toInt();
- if ( startServ )
- rbStartSnd->setChecked ( true );
- else
- rbNotStartSnd->setChecked ( true );
-
- pulse->setChecked ( true );
- slot_sndSysSelected ( PULSE );
+ X2goSettings st ( "sessions" );
+
+ fs->setChecked (
+ st.setting()->value ( sessionId+"/fullscreen",
+ ( QVariant ) mainWindow->getDefaultFullscreen() ).toBool() );
+
+ custom->setChecked ( ! st.setting()->value (
+ sessionId+"/fullscreen",
+ ( QVariant ) mainWindow->getDefaultFullscreen()
+ ).toBool() );
+
+
+ width->setValue (
+ st.setting()->value ( sessionId+"/width",
+ ( QVariant ) mainWindow->getDefaultWidth() ).toInt() );
+ height->setValue (
+ st.setting()->value ( sessionId+"/height",
+ ( QVariant ) mainWindow->getDefaultHeight() ).toInt() );
+
+ if (multiDisp)
+ {
+ bool md=st.setting()->value ( sessionId+"/multidisp",
+ ( QVariant ) false).toBool();
+ if (md)
+ display->setChecked(true);
+ int disp=st.setting()->value ( sessionId+"/display",
+ ( QVariant ) 1).toUInt();
+ if (disp<= displayNumber->maximum())
+ displayNumber->setValue(disp);
+ else
+ displayNumber->setValue(1);
+ }
+
+ cbSetDPI->setChecked (
+ st.setting()->value ( sessionId+"/setdpi",
+ ( QVariant ) mainWindow->getDefaultSetDPI() ).toBool() );
+
+ cbXinerama->setChecked (
+ st.setting()->value ( sessionId+"/xinerama",
+ ( QVariant ) false).toBool());
+
+
+ DPI->setEnabled ( cbSetDPI->isChecked() );
+ DPI->setValue (
+ st.setting()->value ( sessionId+"/dpi",
+ ( QVariant ) mainWindow->getDefaultDPI() ).toUInt() );
+
+ kbd->setChecked ( !st.setting()->value (
+ sessionId+"/usekbd",
+ ( QVariant ) mainWindow->getDefaultSetKbd()
+ ).toBool() );
+ layout->setText (
+ st.setting()->value ( sessionId+"/layout",
+ ( QVariant ) mainWindow->getDefaultLayout()
+ ).toString() );
+ type->setText (
+ st.setting()->value ( sessionId+"/type",
+ ( QVariant ) mainWindow->getDefaultKbdType()
+ ).toString() );
+ bool snd=st.setting()->value (
+ sessionId+"/sound",
+ ( QVariant ) mainWindow->getDefaultUseSound()
+ ).toBool();
+ QString sndsys=st.setting()->value ( sessionId+"/soundsystem",
+ "pulse" ).toString();
+ bool startServ=st.setting()->value ( sessionId+"/startsoundsystem",
+ true ).toBool();
+ bool sndInTun=st.setting()->value ( sessionId+"/soundtunnel",
+ true ).toBool();
+ bool defSndPort=st.setting()->value ( sessionId+"/defsndport",
+ true ).toBool();
+ int sndPort= st.setting()->value ( sessionId+"/sndport",4713 ).toInt();
+ if ( startServ )
+ rbStartSnd->setChecked ( true );
+ else
+ rbNotStartSnd->setChecked ( true );
+
+ pulse->setChecked ( true );
+ slot_sndSysSelected ( PULSE );
#ifdef Q_OS_WIN
- if ( sndsys=="arts" )
- {
- sndsys="pulse";
- }
+ if ( sndsys=="arts" )
+ {
+ sndsys="pulse";
+ }
#endif
- if ( sndsys=="arts" )
- {
- arts->setChecked ( true );
- slot_sndSysSelected ( ARTS );
- }
+ if ( sndsys=="arts" )
+ {
+ arts->setChecked ( true );
+ slot_sndSysSelected ( ARTS );
+ }
#ifdef Q_OS_DARWIN
- sndsys="esd";
+ sndsys="esd";
#endif
- if ( sndsys=="esd" )
- {
- esd->setChecked ( true );
- slot_sndSysSelected ( ESD );
- }
- cbSndSshTun->setChecked ( sndInTun );
- sound->setChecked ( snd );
- if ( !defSndPort )
- sbSndPort->setValue ( sndPort );
- cbDefSndPort->setChecked ( defSndPort );
- if ( sndsys=="arts" )
- cbDefSndPort->setChecked ( false );
- slot_sndToggled ( snd );
- slot_sndStartClicked();
-
- cbClientPrint->setChecked ( st.setting()->value ( sessionId+"/print",
- true ).toBool() );
+ if ( sndsys=="esd" )
+ {
+ esd->setChecked ( true );
+ slot_sndSysSelected ( ESD );
+ }
+ cbSndSshTun->setChecked ( sndInTun );
+ sound->setChecked ( snd );
+ if ( !defSndPort )
+ sbSndPort->setValue ( sndPort );
+ cbDefSndPort->setChecked ( defSndPort );
+ if ( sndsys=="arts" )
+ cbDefSndPort->setChecked ( false );
+ slot_sndToggled ( snd );
+ slot_sndStartClicked();
+
+ cbClientPrint->setChecked ( st.setting()->value ( sessionId+"/print",
+ true ).toBool() );
}
void SettingsWidget::setDefaults()
{
- fs->setChecked ( false );
- custom->setChecked ( true );
- width->setValue ( 800 );
- height->setValue ( 600 );
-
- cbSetDPI->setChecked ( mainWindow->getDefaultSetDPI() );
- DPI->setValue ( mainWindow->getDefaultDPI() );
- DPI->setEnabled ( mainWindow->getDefaultSetDPI() );
-
- kbd->setChecked ( !mainWindow->getDefaultSetKbd() );
- layout->setText ( tr ( "us" ) );
- type->setText ( tr ( "pc105/us" ) );
- sound->setChecked ( true );
- pulse->setChecked ( true );
- slot_sndToggled ( true );
- slot_sndSysSelected ( PULSE );
- cbSndSshTun->setChecked ( true );
- rbStartSnd->setChecked ( true );
- cbClientPrint->setChecked ( true );
+ fs->setChecked ( false );
+ display->setChecked ( false );
+ lDisplay->setEnabled ( false );
+ displayNumber->setEnabled ( false );
+ custom->setChecked ( true );
+ width->setValue ( 800 );
+ height->setValue ( 600 );
+
+ cbSetDPI->setChecked ( mainWindow->getDefaultSetDPI() );
+ DPI->setValue ( mainWindow->getDefaultDPI() );
+ DPI->setEnabled ( mainWindow->getDefaultSetDPI() );
+
+ kbd->setChecked ( !mainWindow->getDefaultSetKbd() );
+ layout->setText ( tr ( "us" ) );
+ type->setText ( tr ( "pc105/us" ) );
+ sound->setChecked ( true );
+ pulse->setChecked ( true );
+ slot_sndToggled ( true );
+ slot_sndSysSelected ( PULSE );
+ cbSndSshTun->setChecked ( true );
+ rbStartSnd->setChecked ( true );
+ cbClientPrint->setChecked ( true );
+ cbXinerama->setChecked ( false );
}
void SettingsWidget::saveSettings()
{
- X2goSettings st ( "sessions" );
-
- st.setting()->setValue ( sessionId+"/fullscreen",
- ( QVariant ) fs->isChecked() );
- st.setting()->setValue ( sessionId+"/width",
- ( QVariant ) width->value() );
- st.setting()->setValue ( sessionId+"/height",
- ( QVariant ) height->value() );
- st.setting()->setValue ( sessionId+"/dpi",
- ( QVariant ) DPI->value() );
- st.setting()->setValue ( sessionId+"/setdpi",
- ( QVariant ) cbSetDPI->isChecked() );
- st.setting()->setValue ( sessionId+"/usekbd",
- ( QVariant ) !kbd->isChecked() );
- st.setting()->setValue ( sessionId+"/layout",
- ( QVariant ) layout->text() );
- st.setting()->setValue ( sessionId+"/type",
- ( QVariant ) type->text() );
- st.setting()->setValue ( sessionId+"/sound",
- ( QVariant ) sound->isChecked() );
- if ( arts->isChecked() )
- st.setting()->setValue ( sessionId+"/soundsystem",
- ( QVariant ) "arts" );
- if ( esd->isChecked() )
- st.setting()->setValue ( sessionId+"/soundsystem",
- ( QVariant ) "esd" );
- if ( pulse->isChecked() )
- st.setting()->setValue ( sessionId+"/soundsystem",
- ( QVariant ) "pulse" );
-
- st.setting()->setValue ( sessionId+"/startsoundsystem",
- ( QVariant ) rbStartSnd->isChecked() );
- st.setting()->setValue ( sessionId+"/soundtunnel",
- ( QVariant ) cbSndSshTun->isChecked() );
- st.setting()->setValue ( sessionId+"/defsndport",
- ( QVariant ) cbDefSndPort->isChecked() );
- st.setting()->setValue ( sessionId+"/sndport",
- ( QVariant ) sbSndPort->value() );
- st.setting()->setValue ( sessionId+"/print",
- ( QVariant ) cbClientPrint->isChecked() );
- st.setting()->sync();
+ X2goSettings st ( "sessions" );
+
+ st.setting()->setValue ( sessionId+"/fullscreen",
+ ( QVariant ) fs->isChecked() );
+ st.setting()->setValue ( sessionId+"/width",
+ ( QVariant ) width->value() );
+ st.setting()->setValue ( sessionId+"/multidisp",
+ ( QVariant ) display->isChecked() );
+ st.setting()->setValue ( sessionId+"/display",
+ ( QVariant ) displayNumber->value() );
+ st.setting()->setValue ( sessionId+"/height",
+ ( QVariant ) height->value() );
+ st.setting()->setValue ( sessionId+"/dpi",
+ ( QVariant ) DPI->value() );
+ st.setting()->setValue ( sessionId+"/setdpi",
+ ( QVariant ) cbSetDPI->isChecked() );
+ st.setting()->setValue ( sessionId+"/xinerama",
+ ( QVariant ) cbXinerama->isChecked() );
+
+ st.setting()->setValue ( sessionId+"/usekbd",
+ ( QVariant ) !kbd->isChecked() );
+ st.setting()->setValue ( sessionId+"/layout",
+ ( QVariant ) layout->text() );
+ st.setting()->setValue ( sessionId+"/type",
+ ( QVariant ) type->text() );
+ st.setting()->setValue ( sessionId+"/sound",
+ ( QVariant ) sound->isChecked() );
+ if ( arts->isChecked() )
+ st.setting()->setValue ( sessionId+"/soundsystem",
+ ( QVariant ) "arts" );
+ if ( esd->isChecked() )
+ st.setting()->setValue ( sessionId+"/soundsystem",
+ ( QVariant ) "esd" );
+ if ( pulse->isChecked() )
+ st.setting()->setValue ( sessionId+"/soundsystem",
+ ( QVariant ) "pulse" );
+
+ st.setting()->setValue ( sessionId+"/startsoundsystem",
+ ( QVariant ) rbStartSnd->isChecked() );
+ st.setting()->setValue ( sessionId+"/soundtunnel",
+ ( QVariant ) cbSndSshTun->isChecked() );
+ st.setting()->setValue ( sessionId+"/defsndport",
+ ( QVariant ) cbDefSndPort->isChecked() );
+ st.setting()->setValue ( sessionId+"/sndport",
+ ( QVariant ) sbSndPort->value() );
+ st.setting()->setValue ( sessionId+"/print",
+ ( QVariant ) cbClientPrint->isChecked() );
+ st.setting()->sync();
}
diff --git a/settingswidget.h b/settingswidget.h
index a52573b..8c5ebf8 100644
--- a/settingswidget.h
+++ b/settingswidget.h
@@ -23,49 +23,61 @@ class QCheckBox;
class QLineEdit;
class QSpinBox;
class QLabel;
+class QPushButton;
+class QMainWindow;
+
+
class SettingsWidget : public ConfigWidget
{
- Q_OBJECT
- public:
- SettingsWidget ( QString id, ONMainWindow * mw,
- QWidget * parent=0, Qt::WindowFlags f=0 );
- ~SettingsWidget();
- void setDefaults();
- void saveSettings();
- private slots:
- void slot_sndSysSelected ( int system );
- void slot_sndToggled ( bool val );
- void slot_sndStartClicked();
- void slot_sndDefPortChecked ( bool val );
- private:
- enum {PULSE,ARTS,ESD};
- QSpinBox* width;
- QSpinBox* height;
- QRadioButton* fs;
- QCheckBox* kbd;
- QLineEdit* layout;
- QLineEdit* type;
- QRadioButton* custom;
- QRadioButton* arts;
- QRadioButton* pulse;
- QRadioButton* esd;
- QCheckBox* sound;
- QRadioButton* rbStartSnd;
- QRadioButton* rbNotStartSnd;
- QCheckBox* cbSndSshTun;
- QCheckBox* cbClientPrint;
- QCheckBox* cbDefSndPort;
- QCheckBox* cbSetDPI;
- QLabel* lSndPort;
- QSpinBox* sbSndPort;
- QSpinBox* DPI;
- QLabel* widthLabel;
- QLabel* heightLabel;
- QLabel* layoutLabel;
- QLabel* typeLabel;
- private:
- void readConfig();
-
+ Q_OBJECT
+public:
+ SettingsWidget ( QString id, ONMainWindow * mw,
+ QWidget * parent=0, Qt::WindowFlags f=0 );
+ ~SettingsWidget();
+ void setDefaults();
+ void saveSettings();
+private slots:
+ void slot_sndSysSelected ( int system );
+ void slot_sndToggled ( bool val );
+ void slot_sndStartClicked();
+ void slot_sndDefPortChecked ( bool val );
+ void slot_identDisplays();
+ void slot_hideIdentWins();
+private:
+ enum {PULSE,ARTS,ESD};
+ QSpinBox* width;
+ QSpinBox* height;
+ QSpinBox* displayNumber;
+ QRadioButton* fs;
+ QCheckBox* kbd;
+ QLineEdit* layout;
+ QLineEdit* type;
+ QRadioButton* custom;
+ QRadioButton* display;
+ QRadioButton* arts;
+ QRadioButton* pulse;
+ QRadioButton* esd;
+ QCheckBox* sound;
+ QRadioButton* rbStartSnd;
+ QRadioButton* rbNotStartSnd;
+ QCheckBox* cbSndSshTun;
+ QCheckBox* cbClientPrint;
+ QCheckBox* cbDefSndPort;
+ QCheckBox* cbSetDPI;
+ QCheckBox* cbXinerama;
+ QLabel* lSndPort;
+ QSpinBox* sbSndPort;
+ QSpinBox* DPI;
+ QLabel* widthLabel;
+ QLabel* heightLabel;
+ QLabel* layoutLabel;
+ QLabel* typeLabel;
+ QLabel* lDisplay;
+ bool multiDisp;
+ QPushButton* pbIdentDisp;
+ QList <QMainWindow*> identWins;
+private:
+ void readConfig();
};
#endif
diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp
index 1f89963..ef08cd8 100644
--- a/sshmasterconnection.cpp
+++ b/sshmasterconnection.cpp
@@ -27,16 +27,18 @@
#ifndef Q_OS_WIN
#include <arpa/inet.h>
#endif
+#include <math.h>
#include "onmainwindow.h"
#undef DEBUG
-// #define DEBUG
+//#define DEBUG
static bool isLibSshInited=false;
+
SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUnknownServers, QString user,
- QString pass, QString key,bool autologin, QObject* parent ) : QThread ( parent )
+ QString pass, QString key,bool autologin, bool krblogin, QObject* parent ) : QThread ( parent )
{
this->host=host;
this->port=port;
@@ -47,12 +49,20 @@ SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUn
this->acceptUnknownServers=acceptUnknownServers;
reverseTunnel=false;
mainWnd=(ONMainWindow*) parent;
+ kerberos=krblogin;
+#ifdef DEBUG
+ if (kerberos)
+ x2goDebug<<"starting ssh connection with kerberos authentication"<<endl;
+ else
+ x2goDebug<<"starting ssh connection without kerberos authentication"<<endl;
+#endif
+kerberos=false;
}
SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUnknownServers, QString user,
QString pass, QString key, bool autologin,
- int remotePort, QString localHost, int localPort, SshProcess* creator,
- QObject* parent, ONMainWindow* mwd ) : QThread ( parent )
+ int remotePort, QString localHost, int localPort, SshProcess* creator,
+ QObject* parent, ONMainWindow* mwd ) : QThread ( parent )
{
this->host=host;
@@ -76,6 +86,7 @@ SshMasterConnection* SshMasterConnection::reverseTunnelConnection ( SshProcess*
SshMasterConnection* con=new SshMasterConnection ( host,port,acceptUnknownServers,user,pass,
key,autologin, remotePort,localHost,
localPort,creator,this, mainWnd);
+ con->kerberos=kerberos;
connect ( con,SIGNAL ( ioErr ( SshProcess*,QString,QString ) ),this,SIGNAL ( ioErr ( SshProcess*,QString,QString ) ) );
connect ( con,SIGNAL ( stdErr ( SshProcess*,QByteArray ) ),this,SIGNAL ( stdErr ( SshProcess*,QByteArray ) ) );
@@ -125,7 +136,7 @@ void SshMasterConnection::run()
quit();
return;
}
-#ifdef Q_OS_WIN
+#ifdef Q_OS_WIN
ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, (mainWnd->getHomeDirectory()+"/ssh").toAscii());
#endif
// ssh_options_set(my_ssh_session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity);
@@ -153,21 +164,26 @@ void SshMasterConnection::run()
}
ssh_options_set ( my_ssh_session, SSH_OPTIONS_USER, user.toAscii() );
-#ifdef Q_OS_WIN
+#ifdef Q_OS_WIN
ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, (mainWnd->getHomeDirectory()+"/ssh").toAscii());
-#endif
+
+#ifdef DEBUG
x2goDebug<<"setting SSH DIR to "<<mainWnd->getHomeDirectory()+"/ssh";
+#endif
+#endif
if ( userAuth() )
{
- #ifdef DEBUG
+#ifdef DEBUG
x2goDebug<<"user auth OK\n";
- #endif
+#endif
emit connectionOk(host);
}
else
{
- QString err=ssh_get_error ( my_ssh_session );
+ QString err;
+ if (!kerberos)
+ err=ssh_get_error ( my_ssh_session );
QString message=tr ( "Authentication failed" );
x2goDebug<<message<<" - "<<err;
emit userAuthError ( authErrors.join ( "\n" ) );
@@ -237,6 +253,8 @@ bool SshMasterConnection::sshConnect()
}
+
+
int SshMasterConnection::serverAuth ( QString& errorMsg )
{
#ifdef DEBUG
@@ -250,6 +268,7 @@ int SshMasterConnection::serverAuth ( QString& errorMsg )
state = ssh_is_server_known ( my_ssh_session );
hlen = ssh_get_pubkey_hash ( my_ssh_session, &hash );
+
if ( hlen < 0 )
return SSH_SERVER_ERROR;
diff --git a/sshmasterconnection.h b/sshmasterconnection.h
index 0de9a22..c5d79e1 100644
--- a/sshmasterconnection.h
+++ b/sshmasterconnection.h
@@ -56,7 +56,7 @@ class SshMasterConnection: public QThread
public:
void run();
SshMasterConnection(QString host, int port, bool acceptUnknownServers, QString user,
- QString pass, QString key,bool autologin, QObject* parent = 0);
+ QString pass, QString key, bool autologin, bool krblogin, QObject* parent = 0);
~SshMasterConnection();
static void finalizeLibSsh();
void addChannelConnection(SshProcess* creator, int sock, QString forwardHost,
@@ -66,16 +66,33 @@ public:
void disconnectSession();
void setAcceptUnknownServers(bool accept)
{
- acceptUnknownServers=accept;
+ acceptUnknownServers=accept;
}
- SshMasterConnection* reverseTunnelConnection(SshProcess* creator, int remotePort, QString localHost, int localPort);
- QString getHost(){return host;}
+ SshMasterConnection* reverseTunnelConnection(SshProcess* creator, int remotePort,
+ QString localHost, int localPort);
+ QString getHost()
+ {
+ return host;
+ }
+ QString getUser()
+ {
+ return user;
+ }
+ int getPort()
+ {
+ return port;
+ }
+ bool useKerberos()
+ {
+ return kerberos;
+ };
+
private:
SshMasterConnection(QString host, int port, bool acceptUnknownServers, QString user, QString pass, QString key,
bool autologin,
- int remotePort, QString localHost, int localPort, SshProcess* creator,
- QObject* parent, ONMainWindow* parWnd);
+ int remotePort, QString localHost, int localPort, SshProcess* creator,
+ QObject* parent, ONMainWindow* parWnd);
bool sshConnect();
bool userAuthWithPass();
bool userAuthAuto();
@@ -85,6 +102,9 @@ private:
void finalize(int arg1);
void copy();
int serverAuth(QString& errorMsg);
+#ifdef Q_OS_WIN
+ void parseKnownHosts();
+#endif
private:
ssh_session my_ssh_session;
@@ -108,8 +128,10 @@ private:
int reverseTunnelLocalPort;
bool acceptUnknownServers;
QString reverseTunnelLocalHost;
- SshProcess* reverseTunnelCreator;
+ SshProcess* reverseTunnelCreator;
ONMainWindow* mainWnd;
+ bool kerberos;
+ QString sshProcErrString;
signals:
void stdErr(SshProcess* caller, QByteArray data);
diff --git a/version.h b/version.h
index 373dbab..6e5c5e0 100644
--- a/version.h
+++ b/version.h
@@ -1 +1 @@
-#define VERSION "3.99.0.2"
+#define VERSION "3.99.0.4"
diff --git a/wapi.cpp b/wapi.cpp
index e565cc6..9af6085 100644
--- a/wapi.cpp
+++ b/wapi.cpp
@@ -13,415 +13,488 @@
long wapiSetFSWindow ( HWND hWnd, const QRect& desktopGeometry )
{
- long style=GetWindowLong ( hWnd,GWL_STYLE );
- SetWindowPos ( hWnd, HWND_TOP, desktopGeometry.x(),
- desktopGeometry.y(),
- desktopGeometry.width(),
- desktopGeometry.height(),
- SWP_FRAMECHANGED );
- SetWindowLong ( hWnd, GWL_STYLE,
- WS_VISIBLE | WS_SYSMENU |
- WS_CLIPCHILDREN | WS_CLIPSIBLINGS );
-
- SetWindowPos ( hWnd, HWND_TOP, desktopGeometry.x(),
- desktopGeometry.y(),
- desktopGeometry.width(),
- desktopGeometry.height(),
- SWP_FRAMECHANGED );
-
- SetForegroundWindow ( hWnd );
- return style;
+ long style=GetWindowLong ( hWnd,GWL_STYLE );
+ SetWindowPos ( hWnd, HWND_TOP, desktopGeometry.x(),
+ desktopGeometry.y(),
+ desktopGeometry.width(),
+ desktopGeometry.height(),
+ SWP_FRAMECHANGED );
+ SetWindowLong ( hWnd, GWL_STYLE,
+ WS_VISIBLE | WS_SYSMENU |
+ WS_CLIPCHILDREN | WS_CLIPSIBLINGS );
+
+ SetWindowPos ( hWnd, HWND_TOP, desktopGeometry.x(),
+ desktopGeometry.y(),
+ desktopGeometry.width(),
+ desktopGeometry.height(),
+ SWP_FRAMECHANGED );
+
+ SetForegroundWindow ( hWnd );
+ return style;
}
void wapiRestoreWindow( HWND hWnd, long style, const QRect& desktopGeometry )
{
- SetWindowLong ( hWnd, GWL_STYLE,style);
- SetWindowPos ( hWnd, HWND_TOP, desktopGeometry.x(),
- desktopGeometry.y(),
- desktopGeometry.width(),
- desktopGeometry.height(),
- SWP_FRAMECHANGED );
+ SetWindowLong ( hWnd, GWL_STYLE,style);
+ SetWindowPos ( hWnd, HWND_TOP, desktopGeometry.x(),
+ desktopGeometry.y(),
+ desktopGeometry.width(),
+ desktopGeometry.height(),
+ SWP_FRAMECHANGED );
}
void wapiHideFromTaskBar ( HWND wnd )
{
- ShowWindow ( wnd, SW_HIDE ) ;
- SetWindowLong ( wnd, GWL_EXSTYLE, GetWindowLong ( wnd, GWL_EXSTYLE ) &
- ~WS_EX_APPWINDOW );
- SetWindowLong ( wnd, GWL_EXSTYLE, GetWindowLong ( wnd, GWL_EXSTYLE ) |
- WS_EX_TOOLWINDOW );
- ShowWindow ( wnd, SW_SHOW ) ;
+ ShowWindow ( wnd, SW_HIDE ) ;
+ SetWindowLong ( wnd, GWL_EXSTYLE, GetWindowLong ( wnd, GWL_EXSTYLE ) &
+ ~WS_EX_APPWINDOW );
+ SetWindowLong ( wnd, GWL_EXSTYLE, GetWindowLong ( wnd, GWL_EXSTYLE ) |
+ WS_EX_TOOLWINDOW );
+ ShowWindow ( wnd, SW_SHOW ) ;
}
HWND wapiSetParent ( HWND child, HWND par )
{
- HWND wn=SetParent ( child,par );
- if ( par )
- SetWindowLong ( child, GWL_STYLE,
- GetWindowLong ( child, GWL_STYLE ) | WS_CHILD );
- else
- SetWindowLong (
- child, GWL_STYLE,
- GetWindowLong ( child, GWL_STYLE ) &~ WS_CHILD );
- SetWindowLong ( child, GWL_STYLE,
- GetWindowLong ( child, GWL_STYLE ) | WS_POPUP );
- return wn;
+ HWND wn=SetParent ( child,par );
+ if ( par )
+ SetWindowLong ( child, GWL_STYLE,
+ GetWindowLong ( child, GWL_STYLE ) | WS_CHILD );
+ else
+ SetWindowLong (
+ child, GWL_STYLE,
+ GetWindowLong ( child, GWL_STYLE ) &~ WS_CHILD );
+ SetWindowLong ( child, GWL_STYLE,
+ GetWindowLong ( child, GWL_STYLE ) | WS_POPUP );
+ return wn;
}
bool wapiClientRect ( HWND wnd, QRect& rect )
{
- RECT rcWindow;
- if ( GetClientRect ( wnd,&rcWindow ) )
- {
- rect.setCoords ( rcWindow.left,
- rcWindow.top,
- rcWindow.right,rcWindow.bottom );
- return true;
- }
- return false;
+ RECT rcWindow;
+ if ( GetClientRect ( wnd,&rcWindow ) )
+ {
+ rect.setCoords ( rcWindow.left,
+ rcWindow.top,
+ rcWindow.right,rcWindow.bottom );
+ return true;
+ }
+ return false;
+}
+
+bool wapiWindowRectWithoutDecoration ( HWND wnd, QRect& rect )
+{
+ RECT rcWindow;
+ if ( GetClientRect ( wnd,&rcWindow ) )
+ {
+ POINT pnt;
+ pnt.x=0;
+ pnt.y=0;
+ ClientToScreen(wnd,&pnt);
+ rect.setRect ( pnt.x,
+ pnt.y,
+ rcWindow.right-rcWindow.left,rcWindow.bottom-rcWindow.top );
+ return true;
+ }
+ return false;
}
+
bool wapiWindowRect ( HWND wnd, QRect& rect )
{
- RECT rcWindow;
- if ( GetWindowRect ( wnd,&rcWindow ) )
- {
- rect.setCoords ( rcWindow.left,
- rcWindow.top,
- rcWindow.right,rcWindow.bottom );
- return true;
- }
- return false;
+ RECT rcWindow;
+ if ( GetWindowRect ( wnd,&rcWindow ) )
+ {
+ rect.setCoords ( rcWindow.left,
+ rcWindow.top,
+ rcWindow.right,rcWindow.bottom );
+ return true;
+ }
+ return false;
}
bool wapiGetBorders ( HWND wnd, int& vBorder, int& hBorder, int& barHeight )
{
- WINDOWINFO wifo;
- wifo.cbSize=sizeof ( WINDOWINFO );
- if ( !GetWindowInfo ( wnd,&wifo ) )
- return false;
- vBorder=wifo.cxWindowBorders;
- hBorder=wifo.cyWindowBorders;
- TITLEBARINFO bifo;
- bifo.cbSize=sizeof ( TITLEBARINFO );
- if ( !GetTitleBarInfo ( wnd,&bifo ) )
- return false;
- barHeight=bifo.rcTitleBar.bottom-bifo.rcTitleBar.top;
-
- return true;
+ WINDOWINFO wifo;
+ wifo.cbSize=sizeof ( WINDOWINFO );
+ if ( !GetWindowInfo ( wnd,&wifo ) )
+ return false;
+ vBorder=wifo.cxWindowBorders;
+ hBorder=wifo.cyWindowBorders;
+ TITLEBARINFO bifo;
+ bifo.cbSize=sizeof ( TITLEBARINFO );
+ if ( !GetTitleBarInfo ( wnd,&bifo ) )
+ return false;
+ barHeight=bifo.rcTitleBar.bottom-bifo.rcTitleBar.top;
+
+ return true;
}
bool wapiShowWindow ( HWND wnd, wapiCmdShow nCmdShow )
{
- int cmd=WAPI_SHOWNORMAL;
- switch ( nCmdShow )
- {
- case WAPI_FORCEMINIMIZE:cmd=SW_FORCEMINIMIZE;break;
- case WAPI_HIDE:cmd=SW_HIDE;break;
- case WAPI_MAXIMIZE:cmd=SW_MAXIMIZE;break;
- case WAPI_MINIMIZE:cmd=SW_MINIMIZE;break;
- case WAPI_RESTORE:cmd=SW_RESTORE;break;
- case WAPI_SHOW:cmd=SW_SHOW;break;
- case WAPI_SHOWDEFAULT:cmd=SW_SHOWDEFAULT;break;
- case WAPI_SHOWMAXIMIZED:cmd=SW_SHOWMAXIMIZED;break;
- case WAPI_SHOWMINIMIZED:cmd=SW_SHOWMINIMIZED;break;
- case WAPI_SHOWMINNOACTIVE:cmd=SW_SHOWMINNOACTIVE;break;
- case WAPI_SHOWNA:cmd=SW_SHOWNA;break;
- case WAPI_SHOWNOACTIVATE:cmd=SW_SHOWNOACTIVATE;break;
- case WAPI_SHOWNORMAL:cmd=SW_SHOWNORMAL;break;
- }
-
- return ShowWindow ( wnd, cmd );
+ int cmd=WAPI_SHOWNORMAL;
+ switch ( nCmdShow )
+ {
+ case WAPI_FORCEMINIMIZE:
+ cmd=SW_FORCEMINIMIZE;
+ break;
+ case WAPI_HIDE:
+ cmd=SW_HIDE;
+ break;
+ case WAPI_MAXIMIZE:
+ cmd=SW_MAXIMIZE;
+ break;
+ case WAPI_MINIMIZE:
+ cmd=SW_MINIMIZE;
+ break;
+ case WAPI_RESTORE:
+ cmd=SW_RESTORE;
+ break;
+ case WAPI_SHOW:
+ cmd=SW_SHOW;
+ break;
+ case WAPI_SHOWDEFAULT:
+ cmd=SW_SHOWDEFAULT;
+ break;
+ case WAPI_SHOWMAXIMIZED:
+ cmd=SW_SHOWMAXIMIZED;
+ break;
+ case WAPI_SHOWMINIMIZED:
+ cmd=SW_SHOWMINIMIZED;
+ break;
+ case WAPI_SHOWMINNOACTIVE:
+ cmd=SW_SHOWMINNOACTIVE;
+ break;
+ case WAPI_SHOWNA:
+ cmd=SW_SHOWNA;
+ break;
+ case WAPI_SHOWNOACTIVATE:
+ cmd=SW_SHOWNOACTIVATE;
+ break;
+ case WAPI_SHOWNORMAL:
+ cmd=SW_SHOWNORMAL;
+ break;
+ }
+
+ return ShowWindow ( wnd, cmd );
}
bool wapiUpdateWindow ( HWND wnd )
{
- return RedrawWindow ( wnd,0,0,RDW_INVALIDATE );
+ return RedrawWindow ( wnd,0,0,RDW_INVALIDATE );
}
bool wapiMoveWindow ( HWND wnd, int x, int y, int width, int height,
bool repaint )
{
- return MoveWindow ( wnd, x, y, width, height, repaint );
+ return MoveWindow ( wnd, x, y, width, height, repaint );
}
HWND wapiFindWindow ( const ushort * className, const ushort * text )
{
- return FindWindowEx ( 0,0, ( LPCTSTR ) className, ( LPCTSTR ) text );
+ return FindWindowEx ( 0,0, ( LPCTSTR ) className, ( LPCTSTR ) text );
+}
+
+bool wapiSetWindowText( HWND wnd, const QString& text)
+{
+ return SetWindowText(wnd, (LPCTSTR)text.utf16() );
}
+void wapiSetWindowIcon ( HWND wnd, const QPixmap& icon)
+{
+ int iconx=GetSystemMetrics(SM_CXICON);
+ int icony=GetSystemMetrics(SM_CYICON);
+ int smallx=GetSystemMetrics(SM_CXSMICON);
+ int smally=GetSystemMetrics(SM_CXSMICON);
+
+ HICON largeIcon=0;
+ HICON smallIcon=0;
+
+ largeIcon=icon.scaled(iconx,icony, Qt::IgnoreAspectRatio,Qt::SmoothTransformation).toWinHICON ();
+ smallIcon=icon.scaled(smallx,smally, Qt::IgnoreAspectRatio,Qt::SmoothTransformation).toWinHICON ();
+
+ x2goDebug<<"large icon: "<<largeIcon<<iconx<<"x"<<icony<<endl;
+ x2goDebug<<"small icon: "<<smallIcon<<smallx<<"x"<<smally<<endl;
+ int rez=SetClassLong(wnd,GCL_HICON, (LONG)largeIcon);
+ if (!rez)
+ x2goDebug<<"ERROR: "<<GetLastError()<<endl;
+ rez=SetClassLong(wnd,GCL_HICONSM,(LONG)smallIcon);
+ if (!rez)
+ x2goDebug<<"ERROR: "<<GetLastError()<<endl;
+ /* ShowWindow(wnd, SW_HIDE);
+ ShowWindow(wnd, SW_SHOW);*/
+}
QString wapiShortFileName ( const QString& longName )
{
- long length = 0;
- TCHAR* buffer = NULL;
-
- length = GetShortPathName ( ( LPCTSTR ) longName.utf16(), NULL, 0 );
- if ( !length )
- {
- return QString::null;
- }
-
- buffer = new TCHAR[length];
- length = GetShortPathName ( ( LPCTSTR ) longName.utf16(),
- buffer,length );
- if ( !length )
- {
- delete []buffer;
- return QString::null;
- }
- QString spath=QString::fromUtf16 ( ( const ushort* ) buffer );
- delete []buffer;
- return spath;
+ long length = 0;
+ TCHAR* buffer = NULL;
+
+ length = GetShortPathName ( ( LPCTSTR ) longName.utf16(), NULL, 0 );
+ if ( !length )
+ {
+ return QString::null;
+ }
+
+ buffer = new TCHAR[length];
+ length = GetShortPathName ( ( LPCTSTR ) longName.utf16(),
+ buffer,length );
+ if ( !length )
+ {
+ delete []buffer;
+ return QString::null;
+ }
+ QString spath=QString::fromUtf16 ( ( const ushort* ) buffer );
+ delete []buffer;
+ return spath;
}
QString wapiGetDriveByLabel(const QString& label)
{
- int len=GetLogicalDriveStrings(0,0);
- if(len>0)
- {
- TCHAR* buf=new TCHAR[len+1];
- len=GetLogicalDriveStrings(len,buf);
- for(int i=0;i<len;i+=4)
- {
- QString drive=QString::fromUtf16 ( ( const ushort* ) buf+i );
- x2goDebug<<"drive:"<<drive;
- TCHAR vol[MAX_PATH+1];
- TCHAR fs[MAX_PATH+1];
- GetVolumeInformation(buf+i,vol,MAX_PATH,0,0,0,fs,MAX_PATH);
- QString volume=QString::fromUtf16 ( ( const ushort* ) vol );
- x2goDebug<<"vol:"<<volume<<
- "fs:"<<QString::fromUtf16 ( ( const ushort* ) fs );
- if(!volume.compare(label,Qt::CaseInsensitive))
- {
- x2goDebug<<"matched! ";
-
- delete []buf;
- return drive.replace(":\\","");
- }
+ int len=GetLogicalDriveStrings(0,0);
+ if (len>0)
+ {
+ TCHAR* buf=new TCHAR[len+1];
+ len=GetLogicalDriveStrings(len,buf);
+ for (int i=0;i<len;i+=4)
+ {
+ QString drive=QString::fromUtf16 ( ( const ushort* ) buf+i );
+ x2goDebug<<"drive:"<<drive;
+ TCHAR vol[MAX_PATH+1];
+ TCHAR fs[MAX_PATH+1];
+ GetVolumeInformation(buf+i,vol,MAX_PATH,0,0,0,fs,MAX_PATH);
+ QString volume=QString::fromUtf16 ( ( const ushort* ) vol );
+ x2goDebug<<"vol:"<<volume<<
+ "fs:"<<QString::fromUtf16 ( ( const ushort* ) fs );
+ if (!volume.compare(label,Qt::CaseInsensitive))
+ {
+ x2goDebug<<"matched! ";
+
+ delete []buf;
+ return drive.replace(":\\","");
+ }
+ }
+ delete []buf;
}
- delete []buf;
- }
-
- return label;
+
+ return label;
}
QString getNameFromSid ( PSID psid, QString* systemName )
{
- DWORD length=0;
- DWORD dlength=0;
- TCHAR* name=0;
- TCHAR* sysName=0;
- SID_NAME_USE eUse;
-
- LookupAccountSid ( 0,psid,
- name,&length,sysName,&dlength,&eUse );
- if ( !length )
- {
- return QString::null;
- }
-
- name=new TCHAR[length];
- sysName=new TCHAR[dlength];
-
- if ( ! LookupAccountSid ( 0,psid,
- name,&length,sysName,
- &dlength,&eUse ) )
- {
- delete []name;
- delete []sysName;
- return QString::null;
- }
-
- QString strName=QString::fromUtf16 (
- ( const ushort* ) name );
- if ( systemName )
- *systemName=QString::fromUtf16 (
- ( const ushort* ) sysName );
- delete []sysName;
- delete []name;
- return strName;
+ DWORD length=0;
+ DWORD dlength=0;
+ TCHAR* name=0;
+ TCHAR* sysName=0;
+ SID_NAME_USE eUse;
+
+ LookupAccountSid ( 0,psid,
+ name,&length,sysName,&dlength,&eUse );
+ if ( !length )
+ {
+ return QString::null;
+ }
+
+ name=new TCHAR[length];
+ sysName=new TCHAR[dlength];
+
+ if ( ! LookupAccountSid ( 0,psid,
+ name,&length,sysName,
+ &dlength,&eUse ) )
+ {
+ delete []name;
+ delete []sysName;
+ return QString::null;
+ }
+
+ QString strName=QString::fromUtf16 (
+ ( const ushort* ) name );
+ if ( systemName )
+ *systemName=QString::fromUtf16 (
+ ( const ushort* ) sysName );
+ delete []sysName;
+ delete []name;
+ return strName;
}
QString getStringFromSid ( PSID psid )
{
- LPTSTR stringSid;
- ConvertSidToStringSid ( psid,
- &stringSid );
- QString str=QString::fromUtf16 (
- ( const ushort* ) stringSid );
- LocalFree ( stringSid );
- return str;
+ LPTSTR stringSid;
+ ConvertSidToStringSid ( psid,
+ &stringSid );
+ QString str=QString::fromUtf16 (
+ ( const ushort* ) stringSid );
+ LocalFree ( stringSid );
+ return str;
}
bool wapiAccountInfo ( QString* retSid, QString* retUname,
QString* primaryGroupSID, QString* primaryGroupName,
QString* retSysName )
{
- HANDLE hToken;
- if ( !OpenProcessToken ( GetCurrentProcess(),
- TOKEN_QUERY, &hToken ) )
- {
- return false;
- }
- if ( primaryGroupSID || primaryGroupName )
- {
- PTOKEN_PRIMARY_GROUP pGroupInfo=0;
- DWORD dwResult=0;
- DWORD dwSize=0;
- if ( !GetTokenInformation ( hToken, TokenPrimaryGroup,
- NULL, dwSize, &dwSize ) )
- {
- dwResult = GetLastError();
- if ( dwResult != ERROR_INSUFFICIENT_BUFFER )
- {
- CloseHandle ( hToken );
- return false;
- }
- }
- pGroupInfo = ( PTOKEN_PRIMARY_GROUP ) GlobalAlloc ( GPTR,
- dwSize );
-
- if ( ! GetTokenInformation ( hToken, TokenPrimaryGroup,
- pGroupInfo,
- dwSize, &dwSize ) )
- {
- if ( pGroupInfo )
- GlobalFree ( pGroupInfo );
- CloseHandle ( hToken );
- return false;
- }
-
- if ( primaryGroupSID )
- {
- *primaryGroupSID=getStringFromSid (
- pGroupInfo->PrimaryGroup );
- }
- if ( primaryGroupName )
- {
- *primaryGroupName=getNameFromSid (
- pGroupInfo->PrimaryGroup,
- retSysName );
- }
-
- if ( pGroupInfo )
- GlobalFree ( pGroupInfo );
- }
- if ( retSid || retUname )
- {
- PTOKEN_USER pUserInfo=0;
- DWORD dwResult=0;
- DWORD dwSize=0;
-
- if ( !GetTokenInformation ( hToken, TokenUser,
- NULL, dwSize, &dwSize ) )
- {
- dwResult = GetLastError();
- if ( dwResult != ERROR_INSUFFICIENT_BUFFER )
- {
- CloseHandle ( hToken );
- return false;
- }
- }
- pUserInfo = ( PTOKEN_USER ) GlobalAlloc ( GPTR,
- dwSize );
-
- if ( ! GetTokenInformation ( hToken, TokenUser,
- pUserInfo,
- dwSize, &dwSize ) )
- {
- if ( pUserInfo )
- GlobalFree ( pUserInfo );
- CloseHandle ( hToken );
- return false;
- }
-
- if ( retSid )
- {
- *retSid=getStringFromSid (
- pUserInfo->User.Sid );
- }
- if ( retUname )
- {
- *retUname=getNameFromSid (
- pUserInfo->User.Sid,
- retSysName );
- }
- if ( pUserInfo )
- GlobalFree ( pUserInfo );
- }
- CloseHandle ( hToken );
- return true;
+ HANDLE hToken;
+ if ( !OpenProcessToken ( GetCurrentProcess(),
+ TOKEN_QUERY, &hToken ) )
+ {
+ return false;
+ }
+ if ( primaryGroupSID || primaryGroupName )
+ {
+ PTOKEN_PRIMARY_GROUP pGroupInfo=0;
+ DWORD dwResult=0;
+ DWORD dwSize=0;
+ if ( !GetTokenInformation ( hToken, TokenPrimaryGroup,
+ NULL, dwSize, &dwSize ) )
+ {
+ dwResult = GetLastError();
+ if ( dwResult != ERROR_INSUFFICIENT_BUFFER )
+ {
+ CloseHandle ( hToken );
+ return false;
+ }
+ }
+ pGroupInfo = ( PTOKEN_PRIMARY_GROUP ) GlobalAlloc ( GPTR,
+ dwSize );
+
+ if ( ! GetTokenInformation ( hToken, TokenPrimaryGroup,
+ pGroupInfo,
+ dwSize, &dwSize ) )
+ {
+ if ( pGroupInfo )
+ GlobalFree ( pGroupInfo );
+ CloseHandle ( hToken );
+ return false;
+ }
+
+ if ( primaryGroupSID )
+ {
+ *primaryGroupSID=getStringFromSid (
+ pGroupInfo->PrimaryGroup );
+ }
+ if ( primaryGroupName )
+ {
+ *primaryGroupName=getNameFromSid (
+ pGroupInfo->PrimaryGroup,
+ retSysName );
+ }
+
+ if ( pGroupInfo )
+ GlobalFree ( pGroupInfo );
+ }
+ if ( retSid || retUname )
+ {
+ PTOKEN_USER pUserInfo=0;
+ DWORD dwResult=0;
+ DWORD dwSize=0;
+
+ if ( !GetTokenInformation ( hToken, TokenUser,
+ NULL, dwSize, &dwSize ) )
+ {
+ dwResult = GetLastError();
+ if ( dwResult != ERROR_INSUFFICIENT_BUFFER )
+ {
+ CloseHandle ( hToken );
+ return false;
+ }
+ }
+ pUserInfo = ( PTOKEN_USER ) GlobalAlloc ( GPTR,
+ dwSize );
+
+ if ( ! GetTokenInformation ( hToken, TokenUser,
+ pUserInfo,
+ dwSize, &dwSize ) )
+ {
+ if ( pUserInfo )
+ GlobalFree ( pUserInfo );
+ CloseHandle ( hToken );
+ return false;
+ }
+
+ if ( retSid )
+ {
+ *retSid=getStringFromSid (
+ pUserInfo->User.Sid );
+ }
+ if ( retUname )
+ {
+ *retUname=getNameFromSid (
+ pUserInfo->User.Sid,
+ retSysName );
+ }
+ if ( pUserInfo )
+ GlobalFree ( pUserInfo );
+ }
+ CloseHandle ( hToken );
+ return true;
}
void wapiShellExecute ( const QString& operation, const QString& file,
const QString& parameters,
const QString& dir, HWND win )
{
- if ( parameters==QString::null )
- ShellExecute ( win, ( LPCTSTR ) ( operation.utf16() ),
- ( LPCTSTR ) ( file.utf16() ),0,
- ( LPCTSTR ) ( dir.utf16() ),SW_SHOWNORMAL );
- else
- ShellExecute ( win, ( LPCTSTR ) ( operation.utf16() ),
- ( LPCTSTR ) ( file.utf16() ),
- ( LPCTSTR ) ( parameters.utf16() ),
- ( LPCTSTR ) ( dir.utf16() ),SW_SHOWNORMAL );
+ if ( parameters==QString::null )
+ ShellExecute ( win, ( LPCTSTR ) ( operation.utf16() ),
+ ( LPCTSTR ) ( file.utf16() ),0,
+ ( LPCTSTR ) ( dir.utf16() ),SW_SHOWNORMAL );
+ else
+ ShellExecute ( win, ( LPCTSTR ) ( operation.utf16() ),
+ ( LPCTSTR ) ( file.utf16() ),
+ ( LPCTSTR ) ( parameters.utf16() ),
+ ( LPCTSTR ) ( dir.utf16() ),SW_SHOWNORMAL );
}
QString wapiGetDefaultPrinter()
{
- TCHAR *prName;
- DWORD length;
- GetDefaultPrinter ( 0,&length );
- if ( !length )
- return QString::null;
- prName=new TCHAR[length];
- GetDefaultPrinter ( prName,&length );
- if ( !length )
- {
- delete []prName;
- return QString::null;
- }
- QString printer=QString::fromUtf16 ( ( const ushort* ) prName );
- delete []prName;
- return printer;
+ TCHAR *prName;
+ DWORD length;
+ GetDefaultPrinter ( 0,&length );
+ if ( !length )
+ return QString::null;
+ prName=new TCHAR[length];
+ GetDefaultPrinter ( prName,&length );
+ if ( !length )
+ {
+ delete []prName;
+ return QString::null;
+ }
+ QString printer=QString::fromUtf16 ( ( const ushort* ) prName );
+ delete []prName;
+ return printer;
}
QStringList wapiGetLocalPrinters()
{
- QStringList printers;
- PRINTER_INFO_4 *info_array;
- DWORD sizeOfArray;
- DWORD bufSize=0;
- DWORD sizeNeeded=0;
- EnumPrinters ( PRINTER_ENUM_LOCAL,0,4,NULL,bufSize,
- &sizeNeeded,&sizeOfArray );
- if ( !sizeNeeded )
- {
- return printers;
- }
- info_array= ( PRINTER_INFO_4* ) new char[sizeNeeded];
- if ( !info_array )
- return printers;
- bufSize=sizeNeeded;
- EnumPrinters ( PRINTER_ENUM_LOCAL,0,4, ( LPBYTE ) info_array,bufSize,
- &sizeNeeded,&sizeOfArray );
- if ( !sizeNeeded || !sizeOfArray )
- {
- delete []info_array;
- return printers;
- }
- for ( uint i=0;i<sizeOfArray;++i )
- {
- printers<<QString::fromUtf16 (
- ( const ushort* ) ( info_array[i].pPrinterName ) );
- }
- delete []info_array;
- return printers;
+ QStringList printers;
+ PRINTER_INFO_4 *info_array;
+ DWORD sizeOfArray;
+ DWORD bufSize=0;
+ DWORD sizeNeeded=0;
+ EnumPrinters ( PRINTER_ENUM_LOCAL,0,4,NULL,bufSize,
+ &sizeNeeded,&sizeOfArray );
+ if ( !sizeNeeded )
+ {
+ return printers;
+ }
+ info_array= ( PRINTER_INFO_4* ) new char[sizeNeeded];
+ if ( !info_array )
+ return printers;
+ bufSize=sizeNeeded;
+ EnumPrinters ( PRINTER_ENUM_LOCAL,0,4, ( LPBYTE ) info_array,bufSize,
+ &sizeNeeded,&sizeOfArray );
+ if ( !sizeNeeded || !sizeOfArray )
+ {
+ delete []info_array;
+ return printers;
+ }
+ for ( uint i=0;i<sizeOfArray;++i )
+ {
+ printers<<QString::fromUtf16 (
+ ( const ushort* ) ( info_array[i].pPrinterName ) );
+ }
+ delete []info_array;
+ return printers;
}
#endif
diff --git a/wapi.h b/wapi.h
index ffdd392..e7ec667 100644
--- a/wapi.h
+++ b/wapi.h
@@ -6,34 +6,39 @@
#include <QPoint>
#include <QString>
#include <QStringList>
+#include <QPixmap>
+
enum wapiCmdShow
{
- WAPI_FORCEMINIMIZE,
- WAPI_HIDE,
- WAPI_MAXIMIZE,
- WAPI_MINIMIZE,
- WAPI_RESTORE,
- WAPI_SHOW,
- WAPI_SHOWDEFAULT,
- WAPI_SHOWMAXIMIZED,
- WAPI_SHOWMINIMIZED,
- WAPI_SHOWMINNOACTIVE,
- WAPI_SHOWNA,
- WAPI_SHOWNOACTIVATE,
- WAPI_SHOWNORMAL
+ WAPI_FORCEMINIMIZE,
+ WAPI_HIDE,
+ WAPI_MAXIMIZE,
+ WAPI_MINIMIZE,
+ WAPI_RESTORE,
+ WAPI_SHOW,
+ WAPI_SHOWDEFAULT,
+ WAPI_SHOWMAXIMIZED,
+ WAPI_SHOWMINIMIZED,
+ WAPI_SHOWMINNOACTIVE,
+ WAPI_SHOWNA,
+ WAPI_SHOWNOACTIVATE,
+ WAPI_SHOWNORMAL
};
enum wapiBtnEvent
{
- WAPI_LBUTTONUP,
- WAPI_LBUTTONDOWN
+ WAPI_LBUTTONUP,
+ WAPI_LBUTTONDOWN
};
HWND wapiSetParent ( HWND child, HWND par );
bool wapiClientRect ( HWND wnd, QRect& rect );
bool wapiWindowRect ( HWND wnd, QRect& rect );
+bool wapiWindowRectWithoutDecoration(HWND wnd, QRect& rect) ;
bool wapiShowWindow ( HWND wnd, wapiCmdShow nCmdShow );
bool wapiUpdateWindow ( HWND wnd );
+bool wapiSetWindowText ( HWND wnd, const QString& text);
+void wapiSetWindowIcon ( HWND wnd, const QPixmap& icon);
bool wapiMoveWindow ( HWND wnd, int x, int y, int width, int height,
bool repaint );
bool wapiGetBorders ( HWND wnd, int& vBorder, int& hBorder, int& barHeight );
diff --git a/x2goclient.pro b/x2goclient.pro
old mode 100644
new mode 100755
index a7deb90..d10dfcb
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -108,7 +108,7 @@ RESOURCES += resources.rcc
linux-g++ {
message(building $$TARGET with ldap and cups)
- LIBS += -lldap -lcups -lX11
+ LIBS += -lldap -lcups -lX11 -lXpm
}
linux-g++-64 {
message(building $$TARGET with ldap and cups)
@@ -127,8 +127,8 @@ macx {
}
win32-* {
message(building $$TARGET for windows without ldap and cups)
- LIBS += -lwinspool
- CONFIG += static
+ LIBS += -lwinspool -lws2_32
+ CONFIG += static release
}
QT += svg network
ICON =icons/x2go-mac.icns
diff --git a/x2goplugin.rc b/x2goplugin.rc
index c876831..75794ac 100644
--- a/x2goplugin.rc
+++ b/x2goplugin.rc
@@ -1,8 +1,8 @@
1 TYPELIB "x2goplugin.rc"
1 VERSIONINFO
- FILEVERSION 3,99,0,2
- PRODUCTVERSION 3,99,0,2
+ FILEVERSION 3,99,0,4
+ PRODUCTVERSION 3,99,0,4
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -21,13 +21,13 @@ BEGIN
VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0"
VALUE "FileExtents", "x2go\0"
VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0"
- VALUE "FileVersion", "3, 99, 0 ,2\0"
+ VALUE "FileVersion", "3, 99, 0 ,4\0"
VALUE "InternalName", "x2goplugin\0"
VALUE "LegalCopyright", "Copyright � 2010 Obviously Nice\0"
VALUE "MIMEType", "application/x2go\0"
VALUE "OriginalFilename", "npx2goplugin.dll\0"
- VALUE "ProductName", "X2GoClient Plug-in 3.99.0.2\0"
- VALUE "ProductVersion", "3, 99, 0, 1\0"
+ VALUE "ProductName", "X2GoClient Plug-in 3.99.0.4\0"
+ VALUE "ProductVersion", "3, 99, 0, 4\0"
END
END
BLOCK "VarFileInfo"
hooks/post-receive
--
x2goclient.git (X2Go Client)
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 "x2goclient.git" (X2Go Client).
1
0
27 Dec '11
The branch, master has been updated
via e665a2710772436abba5f998250e6ba84b7d58ff (commit)
from 7488eba9969da7250612c7767434dbab92682525 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e665a2710772436abba5f998250e6ba84b7d58ff
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Tue Dec 27 15:06:41 2011 +0100
release 3.99.0.3
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2ed3909..334348b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x2goclient (3.99.0.3-0~x2go4) UNRELEASED; urgency=low
+x2goclient (3.99.0.3-0~x2go1) unstable; urgency=low
[ Mike Gabriel ]
* Rename icon title in /debian/menu file.
@@ -18,7 +18,7 @@ x2goclient (3.99.0.3-0~x2go4) UNRELEASED; urgency=low
- Multi-display support: support for xinerama (temporarily disabled--support
in x2goagent needed)
- -- Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Tue, 27 Dec 2011 11:49:29 +0100
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 27 Dec 2011 15:06:16 +0100
x2goclient (3.99.0.2-0~x2go1) unstable; urgency=low
hooks/post-receive
--
x2goclient.git (X2Go Client)
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 "x2goclient.git" (X2Go Client).
1
0
27 Dec '11
The branch, master has been updated
via 7488eba9969da7250612c7767434dbab92682525 (commit)
from c357cafc82aae887c38aafa46288e3d3ed05050c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7488eba9969da7250612c7767434dbab92682525
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Tue Dec 27 15:04:30 2011 +0100
changelog format fix (2)
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 0a2d684..2ed3909 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ x2goclient (3.99.0.3-0~x2go4) UNRELEASED; urgency=low
* Split package dependencies for SSH server/client.
[ Oleksandr Shneyder ]
- * New upstream version (3.99.0.2):
+ * New upstream version (3.99.0.3):
- LDAP: ssh port for every x2goserver can be specified in Server entry,
parameter "l"
- Change title of proxy window to session name
hooks/post-receive
--
x2goclient.git (X2Go Client)
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 "x2goclient.git" (X2Go Client).
1
0