From ff6126f44005388bbb2fc2fc2946891162abb3c0 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 4 Feb 2017 15:22:20 +0100 Subject: Xserver/randr: Regression fix introduced by c2b1f48. Re-introduce RegisterResourceName() calls after each CreateNewResourceType() call. Fixes ArcticaProject/nx-libs#309. --- nx-X11/programs/Xserver/randr/randr.c | 10 ++++++++++ nx-X11/programs/Xserver/randr/rrcrtc.c | 4 ++++ nx-X11/programs/Xserver/randr/rrmode.c | 3 +++ nx-X11/programs/Xserver/randr/rroutput.c | 4 ++++ nx-X11/programs/Xserver/randr/rrprovider.c | 4 ++++ 5 files changed, 25 insertions(+) diff --git a/nx-X11/programs/Xserver/randr/randr.c b/nx-X11/programs/Xserver/randr/randr.c index b29c3c888..e991af340 100644 --- a/nx-X11/programs/Xserver/randr/randr.c +++ b/nx-X11/programs/Xserver/randr/randr.c @@ -461,6 +461,11 @@ RRExtensionInit(void) ); if (!RRClientType) return; + +#ifdef NXAGENT_SERVER + RegisterResourceName(RRClientType, "RandRClient"); +#endif + RREventType = CreateNewResourceType(RRFreeEvents #ifndef NXAGENT_SERVER , "RandREvent" @@ -468,6 +473,11 @@ RRExtensionInit(void) ); if (!RREventType) return; + +#ifdef NXAGENT_SERVER + RegisterResourceName(RREventType, "RandREvent"); +#endif + extEntry = AddExtension(RANDR_NAME, RRNumberEvents, RRNumberErrors, ProcRRDispatch, SProcRRDispatch, NULL, StandardMinorOpcode); diff --git a/nx-X11/programs/Xserver/randr/rrcrtc.c b/nx-X11/programs/Xserver/randr/rrcrtc.c index 5ba66d5a6..59a3f446a 100644 --- a/nx-X11/programs/Xserver/randr/rrcrtc.c +++ b/nx-X11/programs/Xserver/randr/rrcrtc.c @@ -972,6 +972,10 @@ RRCrtcInit(void) if (!RRCrtcType) return FALSE; +#ifdef NXAGENT_SERVER + RegisterResourceName(RRCrtcType, "CRTC"); +#endif + return TRUE; } diff --git a/nx-X11/programs/Xserver/randr/rrmode.c b/nx-X11/programs/Xserver/randr/rrmode.c index a2bbec7d9..8f8d2d0aa 100644 --- a/nx-X11/programs/Xserver/randr/rrmode.c +++ b/nx-X11/programs/Xserver/randr/rrmode.c @@ -326,6 +326,9 @@ RRModeInit(void) if (!RRModeType) return FALSE; +#ifdef NXAGENT_SERVER + RegisterResourceName(RRModeType, "MODE"); +#endif return TRUE; } diff --git a/nx-X11/programs/Xserver/randr/rroutput.c b/nx-X11/programs/Xserver/randr/rroutput.c index 07fda36b5..e5f69e010 100644 --- a/nx-X11/programs/Xserver/randr/rroutput.c +++ b/nx-X11/programs/Xserver/randr/rroutput.c @@ -429,6 +429,10 @@ RROutputInit(void) if (!RROutputType) return FALSE; +#ifdef NXAGENT_SERVER + RegisterResourceName(RROutputType, "OUTPUT"); +#endif + return TRUE; } diff --git a/nx-X11/programs/Xserver/randr/rrprovider.c b/nx-X11/programs/Xserver/randr/rrprovider.c index fe99fa04d..ed2b1baca 100644 --- a/nx-X11/programs/Xserver/randr/rrprovider.c +++ b/nx-X11/programs/Xserver/randr/rrprovider.c @@ -440,6 +440,10 @@ RRProviderInit(void) if (!RRProviderType) return FALSE; +#ifdef NXAGENT_SERVER + RegisterResourceName(RRProviderType, "Provider"); +#endif + return TRUE; } -- cgit v1.2.3 From ce153d401e9f169956e6e324dc35d7484ee91b50 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 4 Feb 2017 15:41:18 +0100 Subject: debian/copyright{,.in}: Adopt from Debian's upload candidate, being DEP-5 compliant and up-to-date for 3.5.99.3. Fixes ArcticaProject/nx-libs#2. --- debian/copyright | 3792 ++++++++++++++++++++++++++++++++++++++++++++++++++- debian/copyright.in | 50 +- 2 files changed, 3770 insertions(+), 72 deletions(-) diff --git a/debian/copyright b/debian/copyright index 3b04eef26..975432d43 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,63 +1,3763 @@ -This package was created by Mike Gabriel on Thu Oct 10 22:53:56 CEST 2011 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: NXv3 (aka nx-libs) +Upstream-Contact: Mike Gabriel +Source: https://github.com/ArcticaProject/nx-libs/ -The software components were originally downloaded from http://www.nomachine.com/sources.php +Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h + nx-X11/programs/Xserver/hw/nxagent/screensaver + nx-X11/programs/Xserver/hw/nxagent/Atoms.c + nx-X11/programs/Xserver/hw/nxagent/Atoms.h + nx-X11/programs/Xserver/hw/nxagent/Binder.c + nx-X11/programs/Xserver/hw/nxagent/Binder.h + nx-X11/programs/Xserver/hw/nxagent/Client.c + nx-X11/programs/Xserver/hw/nxagent/Client.h + nx-X11/programs/Xserver/hw/nxagent/Clipboard.c + nx-X11/programs/Xserver/hw/nxagent/Clipboard.h + nx-X11/programs/Xserver/hw/nxagent/Composite.c + nx-X11/programs/Xserver/hw/nxagent/Composite.h + nx-X11/programs/Xserver/hw/nxagent/Dialog.c + nx-X11/programs/Xserver/hw/nxagent/Dialog.h + nx-X11/programs/Xserver/hw/nxagent/Drawable.c + nx-X11/programs/Xserver/hw/nxagent/Drawable.h + nx-X11/programs/Xserver/hw/nxagent/Error.c + nx-X11/programs/Xserver/hw/nxagent/Error.h + nx-X11/programs/Xserver/hw/nxagent/Events.c + nx-X11/programs/Xserver/hw/nxagent/Events.h + nx-X11/programs/Xserver/hw/nxagent/Extensions.c + nx-X11/programs/Xserver/hw/nxagent/Extensions.h + nx-X11/programs/Xserver/hw/nxagent/Handlers.c + nx-X11/programs/Xserver/hw/nxagent/Handlers.h + nx-X11/programs/Xserver/hw/nxagent/Holder.c + nx-X11/programs/Xserver/hw/nxagent/Holder.h + nx-X11/programs/Xserver/hw/nxagent/Icons.h + nx-X11/programs/Xserver/hw/nxagent/Image.c + nx-X11/programs/Xserver/hw/nxagent/Image.h + nx-X11/programs/Xserver/hw/nxagent/Keystroke.c + nx-X11/programs/Xserver/hw/nxagent/Keystroke.h + nx-X11/programs/Xserver/hw/nxagent/Literals.h + nx-X11/programs/Xserver/hw/nxagent/Millis.c + nx-X11/programs/Xserver/hw/nxagent/Millis.h + nx-X11/programs/Xserver/hw/nxagent/Options.c + nx-X11/programs/Xserver/hw/nxagent/Options.h + nx-X11/programs/Xserver/hw/nxagent/Pixels.c + nx-X11/programs/Xserver/hw/nxagent/Pixels.h + nx-X11/programs/Xserver/hw/nxagent/Pixmap.c + nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h + nx-X11/programs/Xserver/hw/nxagent/Reconnect.c + nx-X11/programs/Xserver/hw/nxagent/Reconnect.h + nx-X11/programs/Xserver/hw/nxagent/Render.c + nx-X11/programs/Xserver/hw/nxagent/Render.h + nx-X11/programs/Xserver/hw/nxagent/Rootless.c + nx-X11/programs/Xserver/hw/nxagent/Rootless.h + nx-X11/programs/Xserver/hw/nxagent/Splash.c + nx-X11/programs/Xserver/hw/nxagent/Splash.h + nx-X11/programs/Xserver/hw/nxagent/Split.c + nx-X11/programs/Xserver/hw/nxagent/Split.h + nx-X11/programs/Xserver/hw/nxagent/Trap.c + nx-X11/programs/Xserver/hw/nxagent/Trap.h + nx-X11/programs/Xserver/hw/nxagent/Utils.h + nx-X11/programs/Xserver/hw/nxagent/Window.c + nx-X11/programs/Xserver/hw/nxagent/Windows.h + nx-X11/programs/Xserver/hw/nxagent/compext/Alpha.c + nx-X11/programs/Xserver/hw/nxagent/compext/Alpha.h + nx-X11/programs/Xserver/hw/nxagent/compext/Bitmap.c + nx-X11/programs/Xserver/hw/nxagent/compext/Bitmap.h + nx-X11/programs/Xserver/hw/nxagent/compext/Clean.c + nx-X11/programs/Xserver/hw/nxagent/compext/Clean.h + nx-X11/programs/Xserver/hw/nxagent/compext/Colormap.c + nx-X11/programs/Xserver/hw/nxagent/compext/Colormap.h + nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c + nx-X11/programs/Xserver/hw/nxagent/compext/Compext.h + nx-X11/programs/Xserver/hw/nxagent/compext/Jpeg.c + nx-X11/programs/Xserver/hw/nxagent/compext/Jpeg.h + nx-X11/programs/Xserver/hw/nxagent/compext/Mask.c + nx-X11/programs/Xserver/hw/nxagent/compext/Mask.h + nx-X11/programs/Xserver/hw/nxagent/compext/Png.c + nx-X11/programs/Xserver/hw/nxagent/compext/Png.h + nx-X11/programs/Xserver/hw/nxagent/compext/Rgb.c + nx-X11/programs/Xserver/hw/nxagent/compext/Rgb.h + nx-X11/programs/Xserver/hw/nxagent/compext/Rle.c + nx-X11/programs/Xserver/hw/nxagent/compext/Rle.h + nx-X11/programs/Xserver/hw/nxagent/compext/Z.c + nx-X11/programs/Xserver/hw/nxagent/compext/Z.h + nxcompshad/Core.cpp + nxcompshad/Core.h + nxcompshad/Input.cpp + nxcompshad/Input.h + nxcompshad/Logger.cpp + nxcompshad/Logger.h + nxcompshad/Manager.cpp + nxcompshad/Manager.h + nxcompshad/Misc.h + nxcompshad/Poller.h + nxcompshad/Regions.h + nxcompshad/Shadow.cpp + nxcompshad/Shadow.h + nxcompshad/Updater.cpp + nxcompshad/Updater.h + nxcompshad/Win.cpp + nxcompshad/Win.h + nxcompshad/X11.cpp + nxcompshad/X11.h +Copyright: 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: GPL-2 -The software has been improved via various patches by the X2Go project. -The patches reside in the subfolder debian/patches/ of this source package. +Files: nxcomp/ActionCache.cpp + nxcomp/ActionCache.h + nxcomp/Agent.cpp + nxcomp/Agent.h + nxcomp/Alpha.cpp + nxcomp/Alpha.h + nxcomp/Auth.cpp + nxcomp/Auth.h + nxcomp/Bitmap.cpp + nxcomp/Bitmap.h + nxcomp/BlockCache.cpp + nxcomp/BlockCache.h + nxcomp/BlockCacheSet.cpp + nxcomp/BlockCacheSet.h + nxcomp/ChangeGC.cpp + nxcomp/ChangeGC.h + nxcomp/ChangeProperty.cpp + nxcomp/ChangeProperty.h + nxcomp/Channel.cpp + nxcomp/Channel.h + nxcomp/ChannelCache.cpp + nxcomp/ChannelCache.h + nxcomp/ChannelEndPoint.cpp + nxcomp/ChannelEndPoint.h + nxcomp/ChannelStore.h + nxcomp/CharCache.cpp + nxcomp/CharCache.h + nxcomp/Children.cpp + nxcomp/ClearArea.cpp + nxcomp/ClearArea.h + nxcomp/ClientCache.cpp + nxcomp/ClientCache.h + nxcomp/ClientChannel.cpp + nxcomp/ClientChannel.h + nxcomp/ClientProxy.cpp + nxcomp/ClientProxy.h + nxcomp/ClientReadBuffer.cpp + nxcomp/ClientReadBuffer.h + nxcomp/ClientStore.cpp + nxcomp/ClientStore.h + nxcomp/Colormap.cpp + nxcomp/Colormap.h + nxcomp/ConfigureWindow.cpp + nxcomp/ConfigureWindow.h + nxcomp/Control.cpp + nxcomp/Control.h + nxcomp/CopyArea.cpp + nxcomp/CopyArea.h + nxcomp/CreateGC.cpp + nxcomp/CreateGC.h + nxcomp/CreatePixmap.cpp + nxcomp/CreatePixmap.h + nxcomp/DecodeBuffer.cpp + nxcomp/DecodeBuffer.h + nxcomp/EncodeBuffer.cpp + nxcomp/EncodeBuffer.h + nxcomp/FillPoly.cpp + nxcomp/FillPoly.h + nxcomp/Fork.cpp + nxcomp/Fork.h + nxcomp/FreeCache.h + nxcomp/GenericChannel.cpp + nxcomp/GenericChannel.h + nxcomp/GenericReadBuffer.cpp + nxcomp/GenericReadBuffer.h + nxcomp/GenericReply.cpp + nxcomp/GenericReply.h + nxcomp/GenericRequest.cpp + nxcomp/GenericRequest.h + nxcomp/GetImage.cpp + nxcomp/GetImage.h + nxcomp/GetImageReply.cpp + nxcomp/GetImageReply.h + nxcomp/GetProperty.cpp + nxcomp/GetProperty.h + nxcomp/GetPropertyReply.cpp + nxcomp/GetPropertyReply.h + nxcomp/ImageText16.cpp + nxcomp/ImageText16.h + nxcomp/ImageText8.cpp + nxcomp/ImageText8.h + nxcomp/IntCache.cpp + nxcomp/IntCache.h + nxcomp/InternAtom.cpp + nxcomp/InternAtom.h + nxcomp/Jpeg.cpp + nxcomp/Jpeg.h + nxcomp/Keeper.cpp + nxcomp/Keeper.h + nxcomp/List.cpp + nxcomp/List.h + nxcomp/ListFontsReply.cpp + nxcomp/ListFontsReply.h + nxcomp/Loop.cpp + nxcomp/Message.cpp + nxcomp/Message.h + nxcomp/Misc.cpp + nxcomp/Misc.h + nxcomp/NX.h + nxcomp/NXalert.h + nxcomp/NXmitshm.h + nxcomp/NXpack.h + nxcomp/NXproto.h + nxcomp/NXrender.h + nxcomp/NXvars.h + nxcomp/OpcodeCache.h + nxcomp/OpcodeStore.cpp + nxcomp/OpcodeStore.h + nxcomp/Pack.c + nxcomp/Pgn.cpp + nxcomp/Pgn.h + nxcomp/Pipe.cpp + nxcomp/Pipe.h + nxcomp/PolyArc.cpp + nxcomp/PolyArc.h + nxcomp/PolyFillArc.cpp + nxcomp/PolyFillArc.h + nxcomp/PolyFillRectangle.cpp + nxcomp/PolyFillRectangle.h + nxcomp/PolyLine.cpp + nxcomp/PolyLine.h + nxcomp/PolyPoint.cpp + nxcomp/PolyPoint.h + nxcomp/PolySegment.cpp + nxcomp/PolySegment.h + nxcomp/PolyText16.cpp + nxcomp/PolyText16.h + nxcomp/PolyText8.cpp + nxcomp/PolyText8.h + nxcomp/Proxy.cpp + nxcomp/Proxy.h + nxcomp/ProxyReadBuffer.cpp + nxcomp/ProxyReadBuffer.h + nxcomp/PutImage.cpp + nxcomp/PutImage.h + nxcomp/PutPackedImage.cpp + nxcomp/PutPackedImage.h + nxcomp/QueryFontReply.cpp + nxcomp/QueryFontReply.h + nxcomp/ReadBuffer.cpp + nxcomp/ReadBuffer.h + nxcomp/RenderAddGlyphs.cpp + nxcomp/RenderAddGlyphs.h + nxcomp/RenderChangePicture.cpp + nxcomp/RenderChangePicture.h + nxcomp/RenderComposite.cpp + nxcomp/RenderComposite.h + nxcomp/RenderCompositeGlyphs.cpp + nxcomp/RenderCompositeGlyphs.h + nxcomp/RenderCreateGlyphSet.cpp + nxcomp/RenderCreateGlyphSet.h + nxcomp/RenderCreatePicture.cpp + nxcomp/RenderCreatePicture.h + nxcomp/RenderExtension.cpp + nxcomp/RenderExtension.h + nxcomp/RenderFillRectangles.cpp + nxcomp/RenderFillRectangles.h + nxcomp/RenderFreeGlyphSet.cpp + nxcomp/RenderFreeGlyphSet.h + nxcomp/RenderFreePicture.cpp + nxcomp/RenderFreePicture.h + nxcomp/RenderGenericRequest.cpp + nxcomp/RenderGenericRequest.h + nxcomp/RenderMinorExtensionHeaders.h + nxcomp/RenderMinorExtensionMethods.h + nxcomp/RenderMinorExtensionTags.h + nxcomp/RenderPictureClip.cpp + nxcomp/RenderPictureClip.h + nxcomp/RenderPictureFilter.cpp + nxcomp/RenderPictureFilter.h + nxcomp/RenderPictureTransform.cpp + nxcomp/RenderPictureTransform.h + nxcomp/RenderTrapezoids.cpp + nxcomp/RenderTrapezoids.h + nxcomp/RenderTriangles.cpp + nxcomp/RenderTriangles.h + nxcomp/Rgb.cpp + nxcomp/Rgb.h + nxcomp/Rle.cpp + nxcomp/Rle.h + nxcomp/SendEvent.cpp + nxcomp/SendEvent.h + nxcomp/SequenceQueue.cpp + nxcomp/SequenceQueue.h + nxcomp/ServerCache.cpp + nxcomp/ServerCache.h + nxcomp/ServerChannel.cpp + nxcomp/ServerChannel.h + nxcomp/ServerProxy.cpp + nxcomp/ServerProxy.h + nxcomp/ServerReadBuffer.cpp + nxcomp/ServerReadBuffer.h + nxcomp/ServerStore.cpp + nxcomp/ServerStore.h + nxcomp/SetClipRectangles.cpp + nxcomp/SetClipRectangles.h + nxcomp/SetUnpackAlpha.cpp + nxcomp/SetUnpackAlpha.h + nxcomp/SetUnpackColormap.cpp + nxcomp/SetUnpackColormap.h + nxcomp/SetUnpackGeometry.cpp + nxcomp/SetUnpackGeometry.h + nxcomp/ShapeExtension.cpp + nxcomp/ShapeExtension.h + nxcomp/Socket.cpp + nxcomp/Socket.h + nxcomp/Split.cpp + nxcomp/Split.h + nxcomp/StaticCompressor.cpp + nxcomp/StaticCompressor.h + nxcomp/Statistics.cpp + nxcomp/Statistics.h + nxcomp/Timestamp.cpp + nxcomp/Timestamp.h + nxcomp/TranslateCoords.cpp + nxcomp/TranslateCoords.h + nxcomp/Transport.cpp + nxcomp/Transport.h + nxcomp/Types.h + nxcomp/Unpack.cpp + nxcomp/Unpack.h + nxcomp/Vars.c + nxcomp/WriteBuffer.cpp + nxcomp/WriteBuffer.h + nxcomp/XidCache.cpp + nxcomp/XidCache.h + nxcomp/Z.cpp + nxcomp/Z.h +Copyright: 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: GPL-2 +Comment: + Parts of this software are derived from DXPC project. The DXPC version + that NXCOMP got forked from (most likely some DXPC version between + release 3.7.0 and release 3.8.0) "can be considered" (see + LICENSE.nxcomp) as BSD-2-clause, as quoted below: + . + Copyright (c) 1995,1996 Brian Pane + Copyright (c) 1996,1997 Zachary Vonler and Brian Pane + Copyright (c) 1999-2002 Kevin Vigor and Brian Pane + All rights reserved. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + DAMAGE. -Copyright (c) 2011-2014 X2Go Project, http://www.x2go.org. -Copyright (c) 2001-2011 NoMachine, http://www.nomachine.com/. +Files: nx-X11/extras/Mesa/include/GL/gl.h + nx-X11/extras/Mesa/include/GL/osmesa.h + nx-X11/extras/Mesa/include/GL/xmesa.h + nx-X11/extras/Mesa/src/mesa/array_cache/ac_context.c + nx-X11/extras/Mesa/src/mesa/array_cache/ac_context.h + nx-X11/extras/Mesa/src/mesa/array_cache/ac_import.c + nx-X11/extras/Mesa/src/mesa/array_cache/acache.h + nx-X11/extras/Mesa/src/mesa/drivers/common/driverfuncs.c + nx-X11/extras/Mesa/src/mesa/drivers/common/driverfuncs.h + nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_api.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_buffer.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_dd.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_line.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_tri.c + nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h + nx-X11/extras/Mesa/src/mesa/glapi/glapi.c + nx-X11/extras/Mesa/src/mesa/glapi/glapi.h + nx-X11/extras/Mesa/src/mesa/glapi/glthread.c + nx-X11/extras/Mesa/src/mesa/glapi/glthread.h + nx-X11/extras/Mesa/src/mesa/main/accum.c + nx-X11/extras/Mesa/src/mesa/main/accum.h + nx-X11/extras/Mesa/src/mesa/main/api_arrayelt.c + nx-X11/extras/Mesa/src/mesa/main/api_arrayelt.h + nx-X11/extras/Mesa/src/mesa/main/api_eval.h + nx-X11/extras/Mesa/src/mesa/main/api_loopback.c + nx-X11/extras/Mesa/src/mesa/main/api_loopback.h + nx-X11/extras/Mesa/src/mesa/main/api_noop.c + nx-X11/extras/Mesa/src/mesa/main/api_noop.h + nx-X11/extras/Mesa/src/mesa/main/api_validate.c + nx-X11/extras/Mesa/src/mesa/main/api_validate.h + nx-X11/extras/Mesa/src/mesa/main/attrib.c + nx-X11/extras/Mesa/src/mesa/main/attrib.h + nx-X11/extras/Mesa/src/mesa/main/blend.c + nx-X11/extras/Mesa/src/mesa/main/blend.h + nx-X11/extras/Mesa/src/mesa/main/bufferobj.c + nx-X11/extras/Mesa/src/mesa/main/bufferobj.h + nx-X11/extras/Mesa/src/mesa/main/buffers.c + nx-X11/extras/Mesa/src/mesa/main/buffers.h + nx-X11/extras/Mesa/src/mesa/main/clip.c + nx-X11/extras/Mesa/src/mesa/main/clip.h + nx-X11/extras/Mesa/src/mesa/main/colormac.h + nx-X11/extras/Mesa/src/mesa/main/colortab.c + nx-X11/extras/Mesa/src/mesa/main/colortab.h + nx-X11/extras/Mesa/src/mesa/main/config.h + nx-X11/extras/Mesa/src/mesa/main/context.c + nx-X11/extras/Mesa/src/mesa/main/context.h + nx-X11/extras/Mesa/src/mesa/main/convolve.c + nx-X11/extras/Mesa/src/mesa/main/convolve.h + nx-X11/extras/Mesa/src/mesa/main/dd.h + nx-X11/extras/Mesa/src/mesa/main/debug.c + nx-X11/extras/Mesa/src/mesa/main/debug.h + nx-X11/extras/Mesa/src/mesa/main/depth.c + nx-X11/extras/Mesa/src/mesa/main/depth.h + nx-X11/extras/Mesa/src/mesa/main/dispatch.c + nx-X11/extras/Mesa/src/mesa/main/dlist.c + nx-X11/extras/Mesa/src/mesa/main/dlist.h + nx-X11/extras/Mesa/src/mesa/main/drawpix.c + nx-X11/extras/Mesa/src/mesa/main/drawpix.h + nx-X11/extras/Mesa/src/mesa/main/enable.c + nx-X11/extras/Mesa/src/mesa/main/enable.h + nx-X11/extras/Mesa/src/mesa/main/enums.c + nx-X11/extras/Mesa/src/mesa/main/enums.h + nx-X11/extras/Mesa/src/mesa/main/eval.c + nx-X11/extras/Mesa/src/mesa/main/eval.h + nx-X11/extras/Mesa/src/mesa/main/execmem.c + nx-X11/extras/Mesa/src/mesa/main/extensions.c + nx-X11/extras/Mesa/src/mesa/main/extensions.h + nx-X11/extras/Mesa/src/mesa/main/fbobject.c + nx-X11/extras/Mesa/src/mesa/main/fbobject.h + nx-X11/extras/Mesa/src/mesa/main/feedback.c + nx-X11/extras/Mesa/src/mesa/main/feedback.h + nx-X11/extras/Mesa/src/mesa/main/fog.c + nx-X11/extras/Mesa/src/mesa/main/fog.h + nx-X11/extras/Mesa/src/mesa/main/framebuffer.c + nx-X11/extras/Mesa/src/mesa/main/framebuffer.h + nx-X11/extras/Mesa/src/mesa/main/get.h + nx-X11/extras/Mesa/src/mesa/main/getstring.c + nx-X11/extras/Mesa/src/mesa/main/glheader.h + nx-X11/extras/Mesa/src/mesa/main/hash.c + nx-X11/extras/Mesa/src/mesa/main/hash.h + nx-X11/extras/Mesa/src/mesa/main/hint.c + nx-X11/extras/Mesa/src/mesa/main/hint.h + nx-X11/extras/Mesa/src/mesa/main/histogram.c + nx-X11/extras/Mesa/src/mesa/main/histogram.h + nx-X11/extras/Mesa/src/mesa/main/image.c + nx-X11/extras/Mesa/src/mesa/main/image.h + nx-X11/extras/Mesa/src/mesa/main/imports.c + nx-X11/extras/Mesa/src/mesa/main/imports.h + nx-X11/extras/Mesa/src/mesa/main/light.c + nx-X11/extras/Mesa/src/mesa/main/light.h + nx-X11/extras/Mesa/src/mesa/main/lines.c + nx-X11/extras/Mesa/src/mesa/main/lines.h + nx-X11/extras/Mesa/src/mesa/main/macros.h + nx-X11/extras/Mesa/src/mesa/main/matrix.c + nx-X11/extras/Mesa/src/mesa/main/matrix.h + nx-X11/extras/Mesa/src/mesa/main/mtypes.h + nx-X11/extras/Mesa/src/mesa/main/occlude.c + nx-X11/extras/Mesa/src/mesa/main/occlude.h + nx-X11/extras/Mesa/src/mesa/main/pixel.c + nx-X11/extras/Mesa/src/mesa/main/pixel.h + nx-X11/extras/Mesa/src/mesa/main/points.c + nx-X11/extras/Mesa/src/mesa/main/points.h + nx-X11/extras/Mesa/src/mesa/main/polygon.c + nx-X11/extras/Mesa/src/mesa/main/polygon.h + nx-X11/extras/Mesa/src/mesa/main/rastpos.c + nx-X11/extras/Mesa/src/mesa/main/rastpos.h + nx-X11/extras/Mesa/src/mesa/main/renderbuffer.c + nx-X11/extras/Mesa/src/mesa/main/renderbuffer.h + nx-X11/extras/Mesa/src/mesa/main/state.c + nx-X11/extras/Mesa/src/mesa/main/state.h + nx-X11/extras/Mesa/src/mesa/main/stencil.c + nx-X11/extras/Mesa/src/mesa/main/stencil.h + nx-X11/extras/Mesa/src/mesa/main/texcompress.c + nx-X11/extras/Mesa/src/mesa/main/texcompress.h + nx-X11/extras/Mesa/src/mesa/main/texcompress_fxt1.c + nx-X11/extras/Mesa/src/mesa/main/texcompress_s3tc.c + nx-X11/extras/Mesa/src/mesa/main/texenvprogram.h + nx-X11/extras/Mesa/src/mesa/main/texformat.c + nx-X11/extras/Mesa/src/mesa/main/texformat.h + nx-X11/extras/Mesa/src/mesa/main/texformat_tmp.h + nx-X11/extras/Mesa/src/mesa/main/teximage.c + nx-X11/extras/Mesa/src/mesa/main/teximage.h + nx-X11/extras/Mesa/src/mesa/main/texobj.c + nx-X11/extras/Mesa/src/mesa/main/texobj.h + nx-X11/extras/Mesa/src/mesa/main/texstate.c + nx-X11/extras/Mesa/src/mesa/main/texstate.h + nx-X11/extras/Mesa/src/mesa/main/texstore.c + nx-X11/extras/Mesa/src/mesa/main/texstore.h + nx-X11/extras/Mesa/src/mesa/main/varray.c + nx-X11/extras/Mesa/src/mesa/main/varray.h + nx-X11/extras/Mesa/src/mesa/main/version.h + nx-X11/extras/Mesa/src/mesa/main/vtxfmt.c + nx-X11/extras/Mesa/src/mesa/main/vtxfmt.h + nx-X11/extras/Mesa/src/mesa/main/vtxfmt_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_clip_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_copy_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_debug.h + nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c + nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c + nx-X11/extras/Mesa/src/mesa/math/m_debug_util.h + nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c + nx-X11/extras/Mesa/src/mesa/math/m_dotprod_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_eval.c + nx-X11/extras/Mesa/src/mesa/math/m_eval.h + nx-X11/extras/Mesa/src/mesa/math/m_matrix.c + nx-X11/extras/Mesa/src/mesa/math/m_matrix.h + nx-X11/extras/Mesa/src/mesa/math/m_norm_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_trans_tmp.h + nx-X11/extras/Mesa/src/mesa/math/m_translate.c + nx-X11/extras/Mesa/src/mesa/math/m_translate.h + nx-X11/extras/Mesa/src/mesa/math/m_vector.c + nx-X11/extras/Mesa/src/mesa/math/m_vector.h + nx-X11/extras/Mesa/src/mesa/math/m_xform.c + nx-X11/extras/Mesa/src/mesa/math/m_xform.h + nx-X11/extras/Mesa/src/mesa/math/m_xform_tmp.h + nx-X11/extras/Mesa/src/mesa/math/mathmod.h + nx-X11/extras/Mesa/src/mesa/shader/arbfragparse.c + nx-X11/extras/Mesa/src/mesa/shader/arbfragparse.h + nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c + nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.h + nx-X11/extras/Mesa/src/mesa/shader/arbprogram.c + nx-X11/extras/Mesa/src/mesa/shader/arbprogram.h + nx-X11/extras/Mesa/src/mesa/shader/arbvertparse.c + nx-X11/extras/Mesa/src/mesa/shader/arbvertparse.h + nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.c + nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar.h + nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_mesa.c + nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_mesa.h + nx-X11/extras/Mesa/src/mesa/shader/nvfragparse.c + nx-X11/extras/Mesa/src/mesa/shader/nvfragparse.h + nx-X11/extras/Mesa/src/mesa/shader/nvfragprog.h + nx-X11/extras/Mesa/src/mesa/shader/nvprogram.c + nx-X11/extras/Mesa/src/mesa/shader/nvprogram.h + nx-X11/extras/Mesa/src/mesa/shader/nvvertexec.c + nx-X11/extras/Mesa/src/mesa/shader/nvvertexec.h + nx-X11/extras/Mesa/src/mesa/shader/nvvertparse.c + nx-X11/extras/Mesa/src/mesa/shader/nvvertparse.h + nx-X11/extras/Mesa/src/mesa/shader/nvvertprog.h + nx-X11/extras/Mesa/src/mesa/shader/program.c + nx-X11/extras/Mesa/src/mesa/shader/program.h + nx-X11/extras/Mesa/src/mesa/shader/shaderobjects.c + nx-X11/extras/Mesa/src/mesa/shader/shaderobjects.h + nx-X11/extras/Mesa/src/mesa/shader/shaderobjects_3dlabs.c + nx-X11/extras/Mesa/src/mesa/shader/shaderobjects_3dlabs.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_assignment.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_assignment.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_conditional.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_conditional.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_constructor.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_constructor.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_typeinfo.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_assemble_typeinfo.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_compile.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_compile.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_execute.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_preprocess.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_preprocess.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_storage.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_storage.h + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.c + nx-X11/extras/Mesa/src/mesa/shader/slang/slang_utility.h + nx-X11/extras/Mesa/src/mesa/shader/slang/traverse_wrap.h + nx-X11/extras/Mesa/src/mesa/swrast/s_aaline.c + nx-X11/extras/Mesa/src/mesa/swrast/s_aaline.h + nx-X11/extras/Mesa/src/mesa/swrast/s_aalinetemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_aatriangle.c + nx-X11/extras/Mesa/src/mesa/swrast/s_aatriangle.h + nx-X11/extras/Mesa/src/mesa/swrast/s_aatritemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_accum.c + nx-X11/extras/Mesa/src/mesa/swrast/s_accum.h + nx-X11/extras/Mesa/src/mesa/swrast/s_alpha.c + nx-X11/extras/Mesa/src/mesa/swrast/s_alpha.h + nx-X11/extras/Mesa/src/mesa/swrast/s_bitmap.c + nx-X11/extras/Mesa/src/mesa/swrast/s_blend.c + nx-X11/extras/Mesa/src/mesa/swrast/s_blend.h + nx-X11/extras/Mesa/src/mesa/swrast/s_buffers.c + nx-X11/extras/Mesa/src/mesa/swrast/s_context.c + nx-X11/extras/Mesa/src/mesa/swrast/s_context.h + nx-X11/extras/Mesa/src/mesa/swrast/s_copypix.c + nx-X11/extras/Mesa/src/mesa/swrast/s_depth.c + nx-X11/extras/Mesa/src/mesa/swrast/s_depth.h + nx-X11/extras/Mesa/src/mesa/swrast/s_drawpix.c + nx-X11/extras/Mesa/src/mesa/swrast/s_drawpix.h + nx-X11/extras/Mesa/src/mesa/swrast/s_feedback.c + nx-X11/extras/Mesa/src/mesa/swrast/s_feedback.h + nx-X11/extras/Mesa/src/mesa/swrast/s_fog.c + nx-X11/extras/Mesa/src/mesa/swrast/s_fog.h + nx-X11/extras/Mesa/src/mesa/swrast/s_imaging.c + nx-X11/extras/Mesa/src/mesa/swrast/s_lines.c + nx-X11/extras/Mesa/src/mesa/swrast/s_lines.h + nx-X11/extras/Mesa/src/mesa/swrast/s_linetemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_logic.c + nx-X11/extras/Mesa/src/mesa/swrast/s_logic.h + nx-X11/extras/Mesa/src/mesa/swrast/s_masking.c + nx-X11/extras/Mesa/src/mesa/swrast/s_masking.h + nx-X11/extras/Mesa/src/mesa/swrast/s_nvfragprog.c + nx-X11/extras/Mesa/src/mesa/swrast/s_nvfragprog.h + nx-X11/extras/Mesa/src/mesa/swrast/s_pixeltex.c + nx-X11/extras/Mesa/src/mesa/swrast/s_pixeltex.h + nx-X11/extras/Mesa/src/mesa/swrast/s_points.c + nx-X11/extras/Mesa/src/mesa/swrast/s_points.h + nx-X11/extras/Mesa/src/mesa/swrast/s_pointtemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_readpix.c + nx-X11/extras/Mesa/src/mesa/swrast/s_span.c + nx-X11/extras/Mesa/src/mesa/swrast/s_span.h + nx-X11/extras/Mesa/src/mesa/swrast/s_spantemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_stencil.c + nx-X11/extras/Mesa/src/mesa/swrast/s_stencil.h + nx-X11/extras/Mesa/src/mesa/swrast/s_texstore.c + nx-X11/extras/Mesa/src/mesa/swrast/s_texture.c + nx-X11/extras/Mesa/src/mesa/swrast/s_texture.h + nx-X11/extras/Mesa/src/mesa/swrast/s_triangle.c + nx-X11/extras/Mesa/src/mesa/swrast/s_triangle.h + nx-X11/extras/Mesa/src/mesa/swrast/s_trispan.h + nx-X11/extras/Mesa/src/mesa/swrast/s_tritemp.h + nx-X11/extras/Mesa/src/mesa/swrast/s_zoom.c + nx-X11/extras/Mesa/src/mesa/swrast/s_zoom.h + nx-X11/extras/Mesa/src/mesa/swrast/swrast.h + nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_context.c + nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_context.h + nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_triangle.c + nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_triangle.h + nx-X11/extras/Mesa/src/mesa/swrast_setup/ss_tritmp.h + nx-X11/extras/Mesa/src/mesa/swrast_setup/swrast_setup.h + nx-X11/extras/Mesa/src/mesa/tnl/t_array_api.c + nx-X11/extras/Mesa/src/mesa/tnl/t_array_api.h + nx-X11/extras/Mesa/src/mesa/tnl/t_array_import.c + nx-X11/extras/Mesa/src/mesa/tnl/t_array_import.h + nx-X11/extras/Mesa/src/mesa/tnl/t_context.c + nx-X11/extras/Mesa/src/mesa/tnl/t_context.h + nx-X11/extras/Mesa/src/mesa/tnl/t_pipeline.c + nx-X11/extras/Mesa/src/mesa/tnl/t_pipeline.h + nx-X11/extras/Mesa/src/mesa/tnl/t_save_loopback.c + nx-X11/extras/Mesa/src/mesa/tnl/t_save_playback.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_arbprogram_sse.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_cliptmp.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_cull.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_fog.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_light.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_lighttmp.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_normals.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_points.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_program.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_render.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_rendertmp.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_texgen.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_texmat.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vb_vertex.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_eval.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_exec.c + nx-X11/extras/Mesa/src/mesa/tnl/tnl.h +Copyright: 1999-2001, Brian Paul + 1999-2002, Brian Paul + 1999-2003, Brian Paul + 1999-2004, Brian Paul + 1999-2005, Brian Paul + 2004-2005, Brian Paul + 2005, Brian Paul +License: Expat - 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 the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. +Files: nx-X11/include/XWDFile.h + nx-X11/include/Xalloca.h + nx-X11/include/Xauth.h + nx-X11/include/Xfuncproto.h + nx-X11/include/Xfuncs.h + nx-X11/include/Xos.h + nx-X11/include/Xos_r.h + nx-X11/include/Xosdefs.h + nx-X11/include/Xthreads.h + nx-X11/include/Xwindows.h + nx-X11/include/Xwinsock.h + nx-X11/include/extensions/bigreqstr.h + nx-X11/include/extensions/security.h + nx-X11/include/extensions/securstr.h + nx-X11/include/extensions/xcmiscstr.h + nx-X11/include/extensions/xtestconst.h + nx-X11/include/extensions/xteststr.h + nx-X11/lib/X11/AllCells.c + nx-X11/lib/X11/AllPlanes.c + nx-X11/lib/X11/AllowEv.c + nx-X11/lib/X11/AuDispose.c + nx-X11/lib/X11/AuFileName.c + nx-X11/lib/X11/AuGetBest.c + nx-X11/lib/X11/AuRead.c + nx-X11/lib/X11/AutoRep.c + nx-X11/lib/X11/Backgnd.c + nx-X11/lib/X11/BdrWidth.c + nx-X11/lib/X11/Bell.c + nx-X11/lib/X11/Border.c + nx-X11/lib/X11/ChAccCon.c + nx-X11/lib/X11/ChActPGb.c + nx-X11/lib/X11/ChClMode.c + nx-X11/lib/X11/ChCmap.c + nx-X11/lib/X11/ChGC.c + nx-X11/lib/X11/ChKeyCon.c + nx-X11/lib/X11/ChPntCon.c + nx-X11/lib/X11/ChProp.c + nx-X11/lib/X11/ChSaveSet.c + nx-X11/lib/X11/ChWAttrs.c + nx-X11/lib/X11/ChWindow.c + nx-X11/lib/X11/ChkIfEv.c + nx-X11/lib/X11/ChkMaskEv.c + nx-X11/lib/X11/ChkTypEv.c + nx-X11/lib/X11/ChkTypWEv.c + nx-X11/lib/X11/ChkWinEv.c + nx-X11/lib/X11/CirWin.c + nx-X11/lib/X11/CirWinDn.c + nx-X11/lib/X11/CirWinUp.c + nx-X11/lib/X11/ClDisplay.c + nx-X11/lib/X11/Clear.c + nx-X11/lib/X11/ClearArea.c + nx-X11/lib/X11/ConfWind.c + nx-X11/lib/X11/ConvSel.c + nx-X11/lib/X11/CopyArea.c + nx-X11/lib/X11/CopyCmap.c + nx-X11/lib/X11/CopyGC.c + nx-X11/lib/X11/CopyPlane.c + nx-X11/lib/X11/CrBFData.c + nx-X11/lib/X11/CrCmap.c + nx-X11/lib/X11/CrCursor.c + nx-X11/lib/X11/CrGC.c + nx-X11/lib/X11/CrGlCur.c + nx-X11/lib/X11/CrPFBData.c + nx-X11/lib/X11/CrPixmap.c + nx-X11/lib/X11/CrWindow.c + nx-X11/lib/X11/Cursor.c + nx-X11/lib/X11/DefCursor.c + nx-X11/lib/X11/DelProp.c + nx-X11/lib/X11/Depths.c + nx-X11/lib/X11/DestSubs.c + nx-X11/lib/X11/DestWind.c + nx-X11/lib/X11/DisName.c + nx-X11/lib/X11/DrArc.c + nx-X11/lib/X11/DrArcs.c + nx-X11/lib/X11/DrLine.c + nx-X11/lib/X11/DrLines.c + nx-X11/lib/X11/DrPoint.c + nx-X11/lib/X11/DrPoints.c + nx-X11/lib/X11/DrRect.c + nx-X11/lib/X11/DrRects.c + nx-X11/lib/X11/DrSegs.c + nx-X11/lib/X11/ErrHndlr.c + nx-X11/lib/X11/EvToWire.c + nx-X11/lib/X11/FSSaver.c + nx-X11/lib/X11/FetchName.c + nx-X11/lib/X11/FillArc.c + nx-X11/lib/X11/FillArcs.c + nx-X11/lib/X11/FillPoly.c + nx-X11/lib/X11/FillRct.c + nx-X11/lib/X11/FillRcts.c + nx-X11/lib/X11/Flush.c + nx-X11/lib/X11/FontInfo.c + nx-X11/lib/X11/FontNames.c + nx-X11/lib/X11/FreeCmap.c + nx-X11/lib/X11/FreeCols.c + nx-X11/lib/X11/FreeCurs.c + nx-X11/lib/X11/FreeEData.c + nx-X11/lib/X11/FreeGC.c + nx-X11/lib/X11/FreePix.c + nx-X11/lib/X11/GCMisc.c + nx-X11/lib/X11/Geom.c + nx-X11/lib/X11/GetAtomNm.c + nx-X11/lib/X11/GetColor.c + nx-X11/lib/X11/GetFPath.c + nx-X11/lib/X11/GetFProp.c + nx-X11/lib/X11/GetGCVals.c + nx-X11/lib/X11/GetGeom.c + nx-X11/lib/X11/GetHColor.c + nx-X11/lib/X11/GetIFocus.c + nx-X11/lib/X11/GetImage.c + nx-X11/lib/X11/GetKCnt.c + nx-X11/lib/X11/GetMoEv.c + nx-X11/lib/X11/GetPCnt.c + nx-X11/lib/X11/GetPntMap.c + nx-X11/lib/X11/GetProp.c + nx-X11/lib/X11/GetRGBCMap.c + nx-X11/lib/X11/GetSOwner.c + nx-X11/lib/X11/GetSSaver.c + nx-X11/lib/X11/GetWAttrs.c + nx-X11/lib/X11/GrButton.c + nx-X11/lib/X11/GrKey.c + nx-X11/lib/X11/GrKeybd.c + nx-X11/lib/X11/GrPointer.c + nx-X11/lib/X11/GrServer.c + nx-X11/lib/X11/IfEvent.c + nx-X11/lib/X11/ImText.c + nx-X11/lib/X11/ImText16.c + nx-X11/lib/X11/ImUtil.c + nx-X11/lib/X11/InitExt.c + nx-X11/lib/X11/InsCmap.c + nx-X11/lib/X11/IntAtom.c + nx-X11/lib/X11/KeyBind.c + nx-X11/lib/X11/KeysymStr.c + nx-X11/lib/X11/KillCl.c + nx-X11/lib/X11/LiICmaps.c + nx-X11/lib/X11/LiProps.c + nx-X11/lib/X11/ListExt.c + nx-X11/lib/X11/LoadFont.c + nx-X11/lib/X11/LockDis.c + nx-X11/lib/X11/LookupCol.c + nx-X11/lib/X11/LowerWin.c + nx-X11/lib/X11/Macros.c + nx-X11/lib/X11/MapRaised.c + nx-X11/lib/X11/MapSubs.c + nx-X11/lib/X11/MapWindow.c + nx-X11/lib/X11/MaskEvent.c + nx-X11/lib/X11/Misc.c + nx-X11/lib/X11/ModMap.c + nx-X11/lib/X11/MoveWin.c + nx-X11/lib/X11/NextEvent.c + nx-X11/lib/X11/ParseCol.c + nx-X11/lib/X11/ParseGeom.c + nx-X11/lib/X11/PeekEvent.c + nx-X11/lib/X11/PeekIfEv.c + nx-X11/lib/X11/Pending.c + nx-X11/lib/X11/PixFormats.c + nx-X11/lib/X11/PmapBgnd.c + nx-X11/lib/X11/PmapBord.c + nx-X11/lib/X11/PolyTxt.c + nx-X11/lib/X11/PolyTxt16.c + nx-X11/lib/X11/PropAlloc.c + nx-X11/lib/X11/PutBEvent.c + nx-X11/lib/X11/PutImage.c + nx-X11/lib/X11/QuBest.c + nx-X11/lib/X11/QuColor.c + nx-X11/lib/X11/QuColors.c + nx-X11/lib/X11/QuCurShp.c + nx-X11/lib/X11/QuExt.c + nx-X11/lib/X11/QuKeybd.c + nx-X11/lib/X11/QuPntr.c + nx-X11/lib/X11/QuStipShp.c + nx-X11/lib/X11/QuTextE16.c + nx-X11/lib/X11/QuTextExt.c + nx-X11/lib/X11/QuTileShp.c + nx-X11/lib/X11/QuTree.c + nx-X11/lib/X11/RaiseWin.c + nx-X11/lib/X11/RdBitF.c + nx-X11/lib/X11/RecolorC.c + nx-X11/lib/X11/ReconfWM.c + nx-X11/lib/X11/ReconfWin.c + nx-X11/lib/X11/RepWindow.c + nx-X11/lib/X11/RestackWs.c + nx-X11/lib/X11/RotProp.c + nx-X11/lib/X11/ScrResStr.c + nx-X11/lib/X11/SelInput.c + nx-X11/lib/X11/SendEvent.c + nx-X11/lib/X11/SetBack.c + nx-X11/lib/X11/SetCRects.c + nx-X11/lib/X11/SetClMask.c + nx-X11/lib/X11/SetClOrig.c + nx-X11/lib/X11/SetDashes.c + nx-X11/lib/X11/SetFPath.c + nx-X11/lib/X11/SetFont.c + nx-X11/lib/X11/SetFore.c + nx-X11/lib/X11/SetFunc.c + nx-X11/lib/X11/SetIFocus.c + nx-X11/lib/X11/SetLStyle.c + nx-X11/lib/X11/SetPMask.c + nx-X11/lib/X11/SetPntMap.c + nx-X11/lib/X11/SetRGBCMap.c + nx-X11/lib/X11/SetSOwner.c + nx-X11/lib/X11/SetSSaver.c + nx-X11/lib/X11/SetState.c + nx-X11/lib/X11/SetStip.c + nx-X11/lib/X11/SetTSOrig.c + nx-X11/lib/X11/SetTile.c + nx-X11/lib/X11/StBytes.c + nx-X11/lib/X11/StColor.c + nx-X11/lib/X11/StColors.c + nx-X11/lib/X11/StNColor.c + nx-X11/lib/X11/StName.c + nx-X11/lib/X11/StrKeysym.c + nx-X11/lib/X11/StrToText.c + nx-X11/lib/X11/Sync.c + nx-X11/lib/X11/Synchro.c + nx-X11/lib/X11/Text.c + nx-X11/lib/X11/Text16.c + nx-X11/lib/X11/TextToStr.c + nx-X11/lib/X11/TrCoords.c + nx-X11/lib/X11/UndefCurs.c + nx-X11/lib/X11/UngrabBut.c + nx-X11/lib/X11/UngrabKbd.c + nx-X11/lib/X11/UngrabKey.c + nx-X11/lib/X11/UngrabPtr.c + nx-X11/lib/X11/UngrabSvr.c + nx-X11/lib/X11/UninsCmap.c + nx-X11/lib/X11/UnldFont.c + nx-X11/lib/X11/UnmapSubs.c + nx-X11/lib/X11/UnmapWin.c + nx-X11/lib/X11/VisUtil.c + nx-X11/lib/X11/WMGeom.c + nx-X11/lib/X11/WarpPtr.c + nx-X11/lib/X11/WinEvent.c + nx-X11/lib/X11/Window.c + nx-X11/lib/X11/WrBitF.c + nx-X11/lib/X11/XKBBind.c + nx-X11/lib/X11/XKBCvt.c + nx-X11/lib/X11/Xlib.h + nx-X11/lib/X11/Xlocale.h + nx-X11/lib/X11/cmsMath.c + nx-X11/lib/X11/cursorfont.h + nx-X11/lib/X11/evtomask.c + nx-X11/lib/X11/globals.c + nx-X11/lib/X11/locking.c + nx-X11/lib/X11/locking.h + nx-X11/lib/X11/mbWMProps.c + nx-X11/lib/X11/util/makekeys.c + nx-X11/programs/Xserver/Xext/bigreq.c + nx-X11/programs/Xserver/Xext/shape.c + nx-X11/programs/Xserver/Xext/shm.c + nx-X11/programs/Xserver/Xext/sleepuntil.c + nx-X11/programs/Xserver/Xext/xcmisc.c + nx-X11/programs/Xserver/Xext/xtest.c + nx-X11/programs/Xserver/Xi/queryst.c + nx-X11/programs/Xserver/dix/ffs.c + nx-X11/programs/Xserver/dix/pixmap.c + nx-X11/programs/Xserver/dix/privates.c + nx-X11/programs/Xserver/dix/xpstubs.c + nx-X11/programs/Xserver/hw/nxagent/X11/include/Xinerama_nxagent.h + nx-X11/programs/Xserver/include/closestr.h + nx-X11/programs/Xserver/include/opaque.h + nx-X11/programs/Xserver/include/validate.h + nx-X11/programs/Xserver/mi/cbrt.c + nx-X11/programs/Xserver/mi/mibstorest.h + nx-X11/programs/Xserver/mi/miclipn.c + nx-X11/programs/Xserver/mi/midispcur.c + nx-X11/programs/Xserver/mi/mieq.c + nx-X11/programs/Xserver/mi/mifillarc.c + nx-X11/programs/Xserver/mi/mifillarc.h + nx-X11/programs/Xserver/mi/migc.c + nx-X11/programs/Xserver/mi/migc.h + nx-X11/programs/Xserver/mi/miline.h + nx-X11/programs/Xserver/mi/mipointer.c + nx-X11/programs/Xserver/mi/mipointer.h + nx-X11/programs/Xserver/mi/mipointrst.h + nx-X11/programs/Xserver/mi/mipoly.h + nx-X11/programs/Xserver/mi/miscanfill.h + nx-X11/programs/Xserver/mi/miscrinit.c + nx-X11/programs/Xserver/mi/misprite.c + nx-X11/programs/Xserver/mi/misprite.h + nx-X11/programs/Xserver/mi/mispritest.h + nx-X11/programs/Xserver/mi/mivalidate.h + nx-X11/programs/Xserver/mi/miwideline.c + nx-X11/programs/Xserver/mi/miwideline.h + nx-X11/programs/Xserver/mi/mizerarc.c + nx-X11/programs/Xserver/mi/mizerarc.h + nx-X11/programs/Xserver/os/mitauth.c + nx-X11/programs/Xserver/os/rpcauth.c + nx-X11/programs/Xserver/os/secauth.c + nx-X11/programs/Xserver/os/xdmauth.c + nx-X11/programs/Xserver/record/record.c + nx-X11/programs/Xserver/record/set.c + nx-X11/programs/Xserver/record/set.h + nxcompshad/X11/include/XTest_nxcompshad.h +Copyright: 1985, 1987, 1990, 1998, The Open Group + 1985, 1987, 1994, 1998, The Open Group + 1985, 1987, 1998, The Open Group + 1985, 1990, 1998, The Open Group + 1985, 1998, The Open Group + 1985-1986, 1998, The Open Group + 1985-1987, 1991, 1998, The Open Group + 1985-1987, 1998, The Open Group + 1985-1987,1998, The Open Group + 1986, 1990, 1998, The Open Group + 1986, 1998, The Open Group + 1986,1998, The Open Group + 1986-1987, 1998, The Open Group + 1987, 1998, The Open Group + 1988, 1998, The Open Group + 1988-1989, 1998, The Open Group + 1989, 1991, 1998, The Open Group + 1989, 1998, The Open Group + 1990, 1998, The Open Group + 1991, 1998, The Open Group + 1992, 1998, The Open Group + 1993, 1998, The Open Group + 1993-1994, 1998, The Open Group + 1994, 1998, The Open Group + 1995, 1998, The Open Group + 1996, 1998, The Open Group + 1998, 1998, The Open Group + 2003, The Open Group +License: MIT~OpenGroup - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. +Files: make-changelog.sh + regenerate-symbol-docs.sh + bin/nxagent.in + bin/nxproxy.in +Copyright: 2012, Mike Gabriel + 2016, Mike Gabriel +License: GPL-2+ +Comment: + See https://github.com/ArcticaProject/nx-libs/commit/9c0d528 for + make-changelog.sh and regenerate-symbol-docs.sh. + . + FIXME: Drop this comment for 3.5.99.4. - You should have received a copy of the GNU General Public License along with - this program; if not, write to the Free Software Foundation, Inc., 51 - Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +Files: replace.sh +Copyright: 2013, Jan Engelhardt +License: GPL-2+ +Comment: + See https://github.com/ArcticaProject/nx-libs/commit/9c0d528. + . + FIXME: Drop this comment for 3.5.99.4. -Parts of this software are derived from DXPC project. These copyright -notices apply to original DXPC code: +Files: nx-X11/extras/Mesa/src/mesa/main/get.c + nx-X11/extras/Mesa/src/mesa/main/texrender.c + nx-X11/extras/Mesa/src/mesa/main/texrender.h + nx-X11/extras/Mesa/src/mesa/shader/arbprogram_syn.h + nx-X11/extras/Mesa/src/mesa/shader/grammar/grammar_syn.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin_gc.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_common_builtin_gc_bin.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core_gc.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_core_gc_bin.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_fragment_builtin_gc.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_fragment_builtin_gc_bin.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_shader_syn.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_version_syn.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin_gc.h + nx-X11/extras/Mesa/src/mesa/shader/slang/library/slang_vertex_builtin_gc_bin.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_x86_gcc.S +Copyright: *No copyright* +License: Expat +Comment: + Missing license headers. Assuming same license as used for other Mesa + files. - Redistribution and use in source and binary forms are permitted provided - that the above copyright notice and this paragraph are duplicated in all - such forms. +Files: nx-X11/include/XF86keysym.h + nx-X11/include/Xatom.h + nx-X11/include/Xw32defs.h + nx-X11/include/extensions/XvMC.h + nx-X11/include/extensions/XvMCproto.h +Copyright: *No copyright* +License: MIT~OpenGroup +Comment: + Missing license headers. Assuming same license found in other nx-X11 + proto header code files. - THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF - MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. +Files: etc/rgb + nx-X11/lib/X11/Cmap.h + nx-X11/lib/X11/Cr.h + nx-X11/lib/X11/Cv.h + nx-X11/lib/X11/ImUtil.h + nx-X11/lib/X11/Key.h + nx-X11/lib/X11/XErrorDB + nx-X11/lib/X11/Xcms.txt + nx-X11/lib/X11/Xintatom.h + nx-X11/lib/X11/Xintconn.h + nx-X11/lib/X11/XlibConf.h + nx-X11/lib/X11/Xresinternal.h + nx-X11/lib/X11/imKStoUCS.c + nx-X11/lib/X11/lcUniConv/8bit_tab_to_h.c + nx-X11/lib/X11/lcUniConv/armscii_8.h + nx-X11/lib/X11/lcUniConv/ascii.h + nx-X11/lib/X11/lcUniConv/big5.h + nx-X11/lib/X11/lcUniConv/big5_emacs.h + nx-X11/lib/X11/lcUniConv/big5hkscs.h + nx-X11/lib/X11/lcUniConv/cjk_tab_to_h.c + nx-X11/lib/X11/lcUniConv/cp1133.h + nx-X11/lib/X11/lcUniConv/cp1251.h + nx-X11/lib/X11/lcUniConv/cp1255.h + nx-X11/lib/X11/lcUniConv/cp1256.h + nx-X11/lib/X11/lcUniConv/gb2312.h + nx-X11/lib/X11/lcUniConv/gbk.h + nx-X11/lib/X11/lcUniConv/georgian_academy.h + nx-X11/lib/X11/lcUniConv/georgian_ps.h + nx-X11/lib/X11/lcUniConv/iso8859_1.h + nx-X11/lib/X11/lcUniConv/iso8859_10.h + nx-X11/lib/X11/lcUniConv/iso8859_11.h + nx-X11/lib/X11/lcUniConv/iso8859_13.h + nx-X11/lib/X11/lcUniConv/iso8859_14.h + nx-X11/lib/X11/lcUniConv/iso8859_15.h + nx-X11/lib/X11/lcUniConv/iso8859_16.h + nx-X11/lib/X11/lcUniConv/iso8859_2.h + nx-X11/lib/X11/lcUniConv/iso8859_3.h + nx-X11/lib/X11/lcUniConv/iso8859_4.h + nx-X11/lib/X11/lcUniConv/iso8859_5.h + nx-X11/lib/X11/lcUniConv/iso8859_6.h + nx-X11/lib/X11/lcUniConv/iso8859_7.h + nx-X11/lib/X11/lcUniConv/iso8859_8.h + nx-X11/lib/X11/lcUniConv/iso8859_9.h + nx-X11/lib/X11/lcUniConv/iso8859_9e.h + nx-X11/lib/X11/lcUniConv/jisx0201.h + nx-X11/lib/X11/lcUniConv/jisx0208.h + nx-X11/lib/X11/lcUniConv/jisx0212.h + nx-X11/lib/X11/lcUniConv/koi8_c.h + nx-X11/lib/X11/lcUniConv/koi8_r.h + nx-X11/lib/X11/lcUniConv/koi8_u.h + nx-X11/lib/X11/lcUniConv/ksc5601.h + nx-X11/lib/X11/lcUniConv/mulelao.h + nx-X11/lib/X11/lcUniConv/tatar_cyr.h + nx-X11/lib/X11/lcUniConv/tcvn.h + nx-X11/lib/X11/lcUniConv/tis620.h + nx-X11/lib/X11/lcUniConv/ucs2be.h + nx-X11/lib/X11/lcUniConv/utf8.h + nx-X11/lib/X11/lcUniConv/viscii.h +Copyright: *No copyright* +License: MIT~OpenGroup +Comment: + Missing license headers. Assuming same license found in other libNX_X11 + code files. - Copyright (c) 1995,1996 Brian Pane - Copyright (c) 1996,1997 Zachary Vonler and Brian Pane - Copyright (c) 1999 Kevin Vigor and Brian Pane - Copyright (c) 2000,2001 Gian Filippo Pinzari and Brian Pane +Files: nx-X11/Imakefile + nx-X11/config/Imakefile + nx-X11/config/cf/Imake.cf + nx-X11/config/cf/Imake.rules + nx-X11/config/cf/Imake.tmpl + nx-X11/config/cf/Imakefile + nx-X11/config/cf/Library.tmpl + nx-X11/config/cf/README + nx-X11/config/cf/Server.tmpl + nx-X11/config/cf/ServerLib.tmpl + nx-X11/config/cf/Threads.tmpl + nx-X11/config/cf/X11.rules + nx-X11/config/cf/X11.tmpl + nx-X11/config/cf/cross.def + nx-X11/config/cf/cross.rules + nx-X11/config/cf/host.def + nx-X11/config/cf/linux.cf + nx-X11/config/cf/lnxLib.rules + nx-X11/config/cf/lnxLib.tmpl + nx-X11/config/cf/noop.rules + nx-X11/config/cf/nxversion.def.in + nx-X11/config/cf/site.def + nx-X11/config/cf/xf86.rules + nx-X11/config/cf/xorg.cf + nx-X11/config/cf/xorg.tmpl + nx-X11/config/cf/xorgsite.def + nx-X11/config/cf/xorgversion.def + nx-X11/include/GL/Imakefile + nx-X11/include/Imakefile + nx-X11/include/extensions/Imakefile + nx-X11/lib/Imakefile + nx-X11/lib/X11/Imakefile + nx-X11/lib/xtrans/Imakefile + nx-X11/programs/Imakefile + nx-X11/programs/Xserver/Xi/Imakefile + nx-X11/programs/Xserver/composite/Imakefile + nx-X11/programs/Xserver/damageext/Imakefile + nx-X11/programs/Xserver/dbe/Imakefile + nx-X11/programs/Xserver/dix/Imakefile + nx-X11/programs/Xserver/dix/buildatoms + nx-X11/programs/Xserver/fb/Imakefile + nx-X11/programs/Xserver/GL/Imakefile + nx-X11/programs/Xserver/hw/nxagent/Imakefile + nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile + nx-X11/programs/Xserver/GL/glx/Imakefile + nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile + nx-X11/programs/Xserver/GL/mesa/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc + nx-X11/programs/Xserver/GL/mesa/Imakefile + nx-X11/programs/Xserver/GL/mesa/X/Imakefile + nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile + nx-X11/programs/Xserver/GL/mesa/main/Imakefile + nx-X11/programs/Xserver/GL/mesa/math/Imakefile + nx-X11/programs/Xserver/GL/mesa/shader/Imakefile + nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile + nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile + nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile + nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile + nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile + nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile + nx-X11/programs/Xserver/Imakefile + nx-X11/programs/Xserver/Xext/Imakefile + nx-X11/programs/Xserver/include/Imakefile + nx-X11/programs/Xserver/mi/Imakefile + nx-X11/programs/Xserver/miext/cw/Imakefile + nx-X11/programs/Xserver/miext/damage/Imakefile + nx-X11/programs/Xserver/os/Imakefile + nx-X11/programs/Xserver/randr/Imakefile + nx-X11/programs/Xserver/record/Imakefile + nx-X11/programs/Xserver/render/Imakefile + nx-X11/programs/Xserver/xfixes/Imakefile + nx-X11/programs/Xserver/xkb/Imakefile +Copyright: *No copyright* +License: MIT~OpenGroup +Comment: + Missing license headers. Assuming same license as used for imake (see + xutils-dev bin:package). -The files MD5.[ch] are copyright (C) 1999, 2000, 2002 Aladdin Enterprises. +Files: nx-X11/programs/Xserver/Xext/dpmsproc.h + nx-X11/programs/Xserver/Xext/panoramiXh.h + nx-X11/programs/Xserver/Xext/panoramiXsrv.h + nx-X11/programs/Xserver/Xext/xvdisp.h + nx-X11/programs/Xserver/Xext/xvmc.c + nx-X11/programs/Xserver/Xext/xvmcext.h + nx-X11/programs/Xserver/dix/initatoms.c + nx-X11/programs/Xserver/include/globals.h + nx-X11/programs/Xserver/mi/micmap.h + nx-X11/programs/Xserver/mi/mioverlay.c + nx-X11/programs/Xserver/mi/mioverlay.h + nx-X11/programs/Xserver/os/xstrans.c + nx-X11/programs/Xserver/xkb/ddxPrivate.c + nx-X11/programs/Xserver/xkb/xkb.h + nx-X11/programs/Xserver/xkb/xkbDflts.h + nx-X11/x-indent-all.sh + nx-X11/x-indent.sh +Copyright: *No copyright* +License: MIT~OpenGroup +Comment: + Missing license headers. Assuming same license as found in the majority + of other Xserver code files. - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. +Files: nx-X11/include/DECkeysym.h + nx-X11/include/HPkeysym.h + nx-X11/include/X.h + nx-X11/include/Xmd.h + nx-X11/include/Xproto.h + nx-X11/include/Xprotostr.h + nx-X11/include/extensions/sync.h + nx-X11/include/extensions/syncstr.h + nx-X11/include/keysym.h + nx-X11/include/keysymdef.h + nx-X11/lib/X11/ErrDes.c + nx-X11/lib/X11/GetDflt.c + nx-X11/lib/X11/GetHints.c + nx-X11/lib/X11/GetStCmap.c + nx-X11/lib/X11/GetWMCMapW.c + nx-X11/lib/X11/GetWMProto.c + nx-X11/lib/X11/ParseCmd.c + nx-X11/lib/X11/PolyReg.c + nx-X11/lib/X11/Region.c + nx-X11/lib/X11/SetHints.c + nx-X11/lib/X11/SetStCmap.c + nx-X11/lib/X11/SetWMCMapW.c + nx-X11/lib/X11/SetWMProto.c + nx-X11/lib/X11/Xatomtype.h + nx-X11/lib/X11/XimThai.h + nx-X11/lib/X11/Xregion.h + nx-X11/lib/X11/Xresource.h + nx-X11/lib/X11/Xutil.h + nx-X11/lib/X11/imThaiFlt.c + nx-X11/lib/X11/pathmax.h + nx-X11/lib/X11/poly.h + nx-X11/programs/Xserver/Xext/sync.c + nx-X11/programs/Xserver/dix/atom.c + nx-X11/programs/Xserver/dix/colormap.c + nx-X11/programs/Xserver/dix/cursor.c + nx-X11/programs/Xserver/dix/devices.c + nx-X11/programs/Xserver/dix/extension.c + nx-X11/programs/Xserver/dix/gc.c + nx-X11/programs/Xserver/dix/globals.c + nx-X11/programs/Xserver/dix/glyphcurs.c + nx-X11/programs/Xserver/dix/grabs.c + nx-X11/programs/Xserver/dix/property.c + nx-X11/programs/Xserver/dix/swaprep.c + nx-X11/programs/Xserver/dix/swapreq.c + nx-X11/programs/Xserver/dix/tables.c + nx-X11/programs/Xserver/include/closure.h + nx-X11/programs/Xserver/include/colormap.h + nx-X11/programs/Xserver/include/colormapst.h + nx-X11/programs/Xserver/include/cursor.h + nx-X11/programs/Xserver/include/cursorstr.h + nx-X11/programs/Xserver/include/dix.h + nx-X11/programs/Xserver/include/extension.h + nx-X11/programs/Xserver/include/extnsionst.h + nx-X11/programs/Xserver/include/gc.h + nx-X11/programs/Xserver/include/gcstruct.h + nx-X11/programs/Xserver/include/input.h + nx-X11/programs/Xserver/include/inputstr.h + nx-X11/programs/Xserver/include/miscstruct.h + nx-X11/programs/Xserver/include/os.h + nx-X11/programs/Xserver/include/pixmap.h + nx-X11/programs/Xserver/include/pixmapstr.h + nx-X11/programs/Xserver/include/property.h + nx-X11/programs/Xserver/include/propertyst.h + nx-X11/programs/Xserver/include/region.h + nx-X11/programs/Xserver/include/regionstr.h + nx-X11/programs/Xserver/include/resource.h + nx-X11/programs/Xserver/include/rgb.h + nx-X11/programs/Xserver/include/screenint.h + nx-X11/programs/Xserver/include/scrnintstr.h + nx-X11/programs/Xserver/include/selection.h + nx-X11/programs/Xserver/include/servermd.h + nx-X11/programs/Xserver/include/site.h + nx-X11/programs/Xserver/include/window.h + nx-X11/programs/Xserver/include/windowstr.h + nx-X11/programs/Xserver/mi/mi.h + nx-X11/programs/Xserver/mi/miarc.c + nx-X11/programs/Xserver/mi/mibitblt.c + nx-X11/programs/Xserver/mi/micursor.c + nx-X11/programs/Xserver/mi/midash.c + nx-X11/programs/Xserver/mi/mifillrct.c + nx-X11/programs/Xserver/mi/mifpoly.h + nx-X11/programs/Xserver/mi/mifpolycon.c + nx-X11/programs/Xserver/mi/miglblt.c + nx-X11/programs/Xserver/mi/miinitext.c + nx-X11/programs/Xserver/mi/mipoly.c + nx-X11/programs/Xserver/mi/mipolycon.c + nx-X11/programs/Xserver/mi/mipolygen.c + nx-X11/programs/Xserver/mi/mipolypnt.c + nx-X11/programs/Xserver/mi/mipolyrect.c + nx-X11/programs/Xserver/mi/mipolyseg.c + nx-X11/programs/Xserver/mi/mipolytext.c + nx-X11/programs/Xserver/mi/mipolyutil.c + nx-X11/programs/Xserver/mi/mipushpxl.c + nx-X11/programs/Xserver/mi/mispans.c + nx-X11/programs/Xserver/mi/mispans.h + nx-X11/programs/Xserver/mi/mistruct.h + nx-X11/programs/Xserver/mi/miwindow.c + nx-X11/programs/Xserver/mi/mizerclip.c + nx-X11/programs/Xserver/mi/mizerline.c + nx-X11/programs/Xserver/os/connection.c + nx-X11/programs/Xserver/os/io.c + nx-X11/programs/Xserver/os/oscolor.c + nx-X11/programs/Xserver/os/osdep.h + nx-X11/programs/Xserver/os/osinit.c +Copyright: 1987, 1989, Digital Equipment Corporation, Maynard, Massachusetts + 1987, 1989, 1998, The Open Group + 1987, 1994, 1998, The Open Group + 1987, 1998, The Open Group + 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1987-1988, 1998, The Open Group + 1987-1988, Digital Equipment Corporation, Maynard, Massachusetts + 1988, 1998, The Open Group + 1988, Digital Equipment Corporation, Maynard, Massachusetts + 1989, 1998, The Open Group + 1989, Digital Equipment Corporation, Maynard, Massachusetts + 1991, 1993, Digital Equipment Corporation, Maynard, Massachusetts + 1991, 1993, 1998, The Open Group + 1991, 1993-1994, 1998, The Open Group + 1991,1993, Digital Equipment Corporation, Maynard, Massachusetts + 1993, 1998, The Open Group + 1993, Digital Equipment Corporation, Maynard, Massachusetts +License: MIT~OpenGroup +Comment: + Contributions by Digital Equipment Corporation, Maynard, Massachusetts + have been licensed under MIT~OldStyle. - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: +Files: nx-X11/include/extensions/composite.h + nx-X11/include/extensions/compositeproto.h + nx-X11/include/extensions/damageproto.h + nx-X11/include/extensions/damagewire.h + nx-X11/lib/X11/x11_trans.c + nx-X11/lib/X11/xim_trans.c + nx-X11/programs/Xserver/composite/compalloc.c + nx-X11/programs/Xserver/composite/compext.c + nx-X11/programs/Xserver/composite/compinit.c + nx-X11/programs/Xserver/composite/compint.h + nx-X11/programs/Xserver/composite/compwindow.c + nx-X11/programs/Xserver/damageext/damageext.c + nx-X11/programs/Xserver/damageext/damageext.h + nx-X11/programs/Xserver/damageext/damageextint.h + nx-X11/programs/Xserver/fb/fb.h + nx-X11/programs/Xserver/fb/fballpriv.c + nx-X11/programs/Xserver/fb/fbarc.c + nx-X11/programs/Xserver/fb/fbbits.c + nx-X11/programs/Xserver/fb/fbbits.h + nx-X11/programs/Xserver/fb/fbblt.c + nx-X11/programs/Xserver/fb/fbbltone.c + nx-X11/programs/Xserver/fb/fbbstore.c + nx-X11/programs/Xserver/fb/fbcopy.c + nx-X11/programs/Xserver/fb/fbedge.c + nx-X11/programs/Xserver/fb/fbedgeimp.h + nx-X11/programs/Xserver/fb/fbfill.c + nx-X11/programs/Xserver/fb/fbfillrect.c + nx-X11/programs/Xserver/fb/fbfillsp.c + nx-X11/programs/Xserver/fb/fbgc.c + nx-X11/programs/Xserver/fb/fbgetsp.c + nx-X11/programs/Xserver/fb/fbglyph.c + nx-X11/programs/Xserver/fb/fbimage.c + nx-X11/programs/Xserver/fb/fbline.c + nx-X11/programs/Xserver/fb/fbpixmap.c + nx-X11/programs/Xserver/fb/fbpoint.c + nx-X11/programs/Xserver/fb/fbpush.c + nx-X11/programs/Xserver/fb/fbrop.h + nx-X11/programs/Xserver/fb/fbscreen.c + nx-X11/programs/Xserver/fb/fbseg.c + nx-X11/programs/Xserver/fb/fbsetsp.c + nx-X11/programs/Xserver/fb/fbsolid.c + nx-X11/programs/Xserver/fb/fbstipple.c + nx-X11/programs/Xserver/fb/fbtile.c + nx-X11/programs/Xserver/fb/fbtrap.c + nx-X11/programs/Xserver/fb/fbutil.c + nx-X11/programs/Xserver/fb/fbwindow.c + nx-X11/programs/Xserver/miext/damage/damage.c + nx-X11/programs/Xserver/miext/damage/damage.h + nx-X11/programs/Xserver/miext/damage/damagestr.h + nx-X11/programs/Xserver/randr/rrdispatch.c + nx-X11/programs/Xserver/randr/rrinfo.c + nx-X11/programs/Xserver/randr/rrmonitor.c + nx-X11/programs/Xserver/randr/rrpointer.c + nx-X11/programs/Xserver/randr/rrproperty.c + nx-X11/programs/Xserver/randr/rrproviderproperty.c + nx-X11/programs/Xserver/randr/rrsdispatch.c + nx-X11/programs/Xserver/randr/rrtransform.c + nx-X11/programs/Xserver/randr/rrtransform.h + nx-X11/programs/Xserver/render/filter.c + nx-X11/programs/Xserver/render/matrix.c + nx-X11/programs/Xserver/render/mipict.c + nx-X11/programs/Xserver/render/renderedge.c + nx-X11/programs/Xserver/render/renderedge.h + nx-X11/programs/Xserver/xfixes/cursor.c + nx-X11/programs/Xserver/xfixes/region.c + nx-X11/programs/Xserver/xfixes/saveset.c + nx-X11/programs/Xserver/xfixes/select.c + nx-X11/programs/Xserver/xfixes/xfixes.c + nx-X11/programs/Xserver/xfixes/xfixes.h + nx-X11/programs/Xserver/xfixes/xfixesint.h + nxcompshad/X11/include/Xdamage_nxcompshad.h +Copyright: 1998, Keith Packard + 1999, Keith Packard + 2002, Keith Packard + 2003, Keith Packard + 2004, Keith Packard + 2006, Keith Packard + 2007, Keith Packard + 2014, Keith Packard +License: MIT~X11 - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. +Files: nx-X11/include/extensions/XKB.h + nx-X11/include/extensions/XKBconfig.h + nx-X11/include/extensions/XKBfile.h + nx-X11/include/extensions/XKBgeom.h + nx-X11/include/extensions/XKBproto.h + nx-X11/include/extensions/XKBrules.h + nx-X11/include/extensions/XKBsrv.h + nx-X11/include/extensions/XKBstr.h + nx-X11/include/extensions/XKM.h + nx-X11/include/extensions/XKMformat.h + nx-X11/lib/X11/XKB.c + nx-X11/lib/X11/XKBAlloc.c + nx-X11/lib/X11/XKBBell.c + nx-X11/lib/X11/XKBCompat.c + nx-X11/lib/X11/XKBCtrls.c + nx-X11/lib/X11/XKBExtDev.c + nx-X11/lib/X11/XKBGAlloc.c + nx-X11/lib/X11/XKBGeom.c + nx-X11/lib/X11/XKBGetByName.c + nx-X11/lib/X11/XKBGetMap.c + nx-X11/lib/X11/XKBList.c + nx-X11/lib/X11/XKBMAlloc.c + nx-X11/lib/X11/XKBMisc.c + nx-X11/lib/X11/XKBNames.c + nx-X11/lib/X11/XKBRdBuf.c + nx-X11/lib/X11/XKBSetGeom.c + nx-X11/lib/X11/XKBSetMap.c + nx-X11/lib/X11/XKBUse.c + nx-X11/lib/X11/XKBleds.c + nx-X11/lib/X11/XKBlib.h + nx-X11/lib/X11/XKBlibint.h + nx-X11/programs/Xserver/include/xkbfile.h + nx-X11/programs/Xserver/include/xkbrules.h + nx-X11/programs/Xserver/include/xkbsrv.h + nx-X11/programs/Xserver/include/xkbstr.h + nx-X11/programs/Xserver/xkb/XKBAlloc.c + nx-X11/programs/Xserver/xkb/XKBGAlloc.c + nx-X11/programs/Xserver/xkb/XKBMAlloc.c + nx-X11/programs/Xserver/xkb/XKBMisc.c + nx-X11/programs/Xserver/xkb/ddxBeep.c + nx-X11/programs/Xserver/xkb/ddxConfig.c + nx-X11/programs/Xserver/xkb/ddxCtrls.c + nx-X11/programs/Xserver/xkb/ddxDevBtn.c + nx-X11/programs/Xserver/xkb/ddxFakeBtn.c + nx-X11/programs/Xserver/xkb/ddxFakeMtn.c + nx-X11/programs/Xserver/xkb/ddxInit.c + nx-X11/programs/Xserver/xkb/ddxKeyClick.c + nx-X11/programs/Xserver/xkb/ddxKillSrv.c + nx-X11/programs/Xserver/xkb/ddxLEDs.c + nx-X11/programs/Xserver/xkb/ddxList.c + nx-X11/programs/Xserver/xkb/ddxLoad.c + nx-X11/programs/Xserver/xkb/ddxVT.c + nx-X11/programs/Xserver/xkb/maprules.c + nx-X11/programs/Xserver/xkb/xkb.c + nx-X11/programs/Xserver/xkb/xkbAccessX.c + nx-X11/programs/Xserver/xkb/xkbActions.c + nx-X11/programs/Xserver/xkb/xkbEvents.c + nx-X11/programs/Xserver/xkb/xkbInit.c + nx-X11/programs/Xserver/xkb/xkbLEDs.c + nx-X11/programs/Xserver/xkb/xkbPrKeyEv.c + nx-X11/programs/Xserver/xkb/xkbPrOtherEv.c + nx-X11/programs/Xserver/xkb/xkbSwap.c + nx-X11/programs/Xserver/xkb/xkbUtils.c + nx-X11/programs/Xserver/xkb/xkbconfig.c + nx-X11/programs/Xserver/xkb/xkberrs.c + nx-X11/programs/Xserver/xkb/xkbfmisc.c + nx-X11/programs/Xserver/xkb/xkbgeom.h + nx-X11/programs/Xserver/xkb/xkbout.c + nx-X11/programs/Xserver/xkb/xkbtext.c + nx-X11/programs/Xserver/xkb/xkmread.c +Copyright: 1993, Silicon Graphics Computer Systems, Inc + 1994, Silicon Graphics Computer Systems, Inc + 1995, Silicon Graphics Computer Systems, Inc + 1996, Silicon Graphics Computer Systems, Inc +License: MIT~X11 +Files: nx-X11/lib/X11/AddDIC.c + nx-X11/lib/X11/AddSF.c + nx-X11/lib/X11/CvColW.c + nx-X11/lib/X11/CvCols.c + nx-X11/lib/X11/IdOfPr.c + nx-X11/lib/X11/LRGB.c + nx-X11/lib/X11/Lab.c + nx-X11/lib/X11/LabGcC.c + nx-X11/lib/X11/LabGcL.c + nx-X11/lib/X11/LabGcLC.c + nx-X11/lib/X11/LabMnL.c + nx-X11/lib/X11/LabMxC.c + nx-X11/lib/X11/LabMxL.c + nx-X11/lib/X11/LabMxLC.c + nx-X11/lib/X11/LabWpAj.c + nx-X11/lib/X11/Luv.c + nx-X11/lib/X11/LuvGcC.c + nx-X11/lib/X11/LuvGcL.c + nx-X11/lib/X11/LuvGcLC.c + nx-X11/lib/X11/LuvMnL.c + nx-X11/lib/X11/LuvMxC.c + nx-X11/lib/X11/LuvMxL.c + nx-X11/lib/X11/LuvMxLC.c + nx-X11/lib/X11/LuvWpAj.c + nx-X11/lib/X11/OfCCC.c + nx-X11/lib/X11/PrOfId.c + nx-X11/lib/X11/QBlack.c + nx-X11/lib/X11/QBlue.c + nx-X11/lib/X11/QGreen.c + nx-X11/lib/X11/QRed.c + nx-X11/lib/X11/QWhite.c + nx-X11/lib/X11/QuCol.c + nx-X11/lib/X11/QuCols.c + nx-X11/lib/X11/SetCCC.c + nx-X11/lib/X11/SetGetCols.c + nx-X11/lib/X11/StCol.c + nx-X11/lib/X11/StCols.c + nx-X11/lib/X11/UNDEFINED.c + nx-X11/lib/X11/XRGB.c + nx-X11/lib/X11/XYZ.c + nx-X11/lib/X11/Xcms.h + nx-X11/lib/X11/Xcmsint.h + nx-X11/lib/X11/cmsAllCol.c + nx-X11/lib/X11/cmsAllNCol.c + nx-X11/lib/X11/cmsCmap.c + nx-X11/lib/X11/cmsColNm.c + nx-X11/lib/X11/cmsGlobls.c + nx-X11/lib/X11/cmsInt.c + nx-X11/lib/X11/cmsLkCol.c + nx-X11/lib/X11/cmsProp.c + nx-X11/lib/X11/cmsTrig.c + nx-X11/lib/X11/uvY.c + nx-X11/lib/X11/xyY.c +Copyright: 1990, 1991, Tektronix, Inc +License: MIT~Tektronix -The packaging for Debian is copyright 2011 Mike Gabriel and is released -under the GPL version 2. On Debian systems, the complete text of the GNU -General Public License can be found in `/usr/share/common-licenses/GPL-2'. +Files: nx-X11/lib/X11/HVC.c + nx-X11/lib/X11/HVCGcC.c + nx-X11/lib/X11/HVCGcV.c + nx-X11/lib/X11/HVCGcVC.c + nx-X11/lib/X11/HVCMnV.c + nx-X11/lib/X11/HVCMxC.c + nx-X11/lib/X11/HVCMxV.c + nx-X11/lib/X11/HVCMxVC.c + nx-X11/lib/X11/HVCMxVs.c + nx-X11/lib/X11/HVCWpAj.c +Copyright: 1990, 1991, Tektronix, Inc +License: MIT~Tektronix~3-clause +Files: nx-X11/extras/Mesa/include/GL/glext.h + nx-X11/extras/Mesa/include/GL/glxext.h + nx-X11/extras/Mesa/include/GL/internal/glcore.h + nx-X11/extras/Mesa/src/glx/x11/compsize.c + nx-X11/include/GL/glx.h + nx-X11/include/GL/glxmd.h + nx-X11/include/GL/glxproto.h + nx-X11/include/GL/glxtokens.h + nx-X11/programs/Xserver/GL/glx/g_disptab.c + nx-X11/programs/Xserver/GL/glx/g_disptab.h + nx-X11/programs/Xserver/GL/glx/g_disptab_EXT.c + nx-X11/programs/Xserver/GL/glx/g_disptab_EXT.h + nx-X11/programs/Xserver/GL/glx/g_render.c + nx-X11/programs/Xserver/GL/glx/g_renderswap.c + nx-X11/programs/Xserver/GL/glx/g_single.c + nx-X11/programs/Xserver/GL/glx/g_singleswap.c + nx-X11/programs/Xserver/GL/glx/global.c + nx-X11/programs/Xserver/GL/glx/glxbuf.c + nx-X11/programs/Xserver/GL/glx/glxbuf.h + nx-X11/programs/Xserver/GL/glx/glxcmds.c + nx-X11/programs/Xserver/GL/glx/glxcmdsswap.c + nx-X11/programs/Xserver/GL/glx/glxcontext.h + nx-X11/programs/Xserver/GL/glx/glxdrawable.h + nx-X11/programs/Xserver/GL/glx/glxerror.h + nx-X11/programs/Xserver/GL/glx/glxext.h + nx-X11/programs/Xserver/GL/glx/glxfb.c + nx-X11/programs/Xserver/GL/glx/glxfb.h + nx-X11/programs/Xserver/GL/glx/glximports.c + nx-X11/programs/Xserver/GL/glx/glximports.h + nx-X11/programs/Xserver/GL/glx/glxmem.c + nx-X11/programs/Xserver/GL/glx/glxmem.h + nx-X11/programs/Xserver/GL/glx/glxpix.c + nx-X11/programs/Xserver/GL/glx/glxpix.h + nx-X11/programs/Xserver/GL/glx/glxscreens.c + nx-X11/programs/Xserver/GL/glx/glxscreens.h + nx-X11/programs/Xserver/GL/glx/glxserver.h + nx-X11/programs/Xserver/GL/glx/glxutil.c + nx-X11/programs/Xserver/GL/glx/glxutil.h + nx-X11/programs/Xserver/GL/glx/impsize.h + nx-X11/programs/Xserver/GL/glx/render2.c + nx-X11/programs/Xserver/GL/glx/render2swap.c + nx-X11/programs/Xserver/GL/glx/renderpix.c + nx-X11/programs/Xserver/GL/glx/renderpixswap.c + nx-X11/programs/Xserver/GL/glx/rensize.c + nx-X11/programs/Xserver/GL/glx/rensizetab.c + nx-X11/programs/Xserver/GL/glx/single2.c + nx-X11/programs/Xserver/GL/glx/single2swap.c + nx-X11/programs/Xserver/GL/glx/singlepix.c + nx-X11/programs/Xserver/GL/glx/singlepixswap.c + nx-X11/programs/Xserver/GL/glx/singlesize.c + nx-X11/programs/Xserver/GL/glx/singlesize.h + nx-X11/programs/Xserver/GL/glx/unpack.h + nx-X11/programs/Xserver/GL/glx/xfont.c +Copyright: 1991-2000, Silicon Graphics, Inc + 1991-2004, Silicon Graphics, Inc +License: SGI-1.1 + +Files: nx-X11/programs/Xserver/Xext/xtest1dd.h + nx-X11/programs/Xserver/Xi/allowev.h + nx-X11/programs/Xserver/Xi/chgdctl.h + nx-X11/programs/Xserver/Xi/chgfctl.h + nx-X11/programs/Xserver/Xi/chgkbd.h + nx-X11/programs/Xserver/Xi/chgkmap.h + nx-X11/programs/Xserver/Xi/chgprop.h + nx-X11/programs/Xserver/Xi/chgptr.h + nx-X11/programs/Xserver/Xi/closedev.h + nx-X11/programs/Xserver/Xi/devbell.h + nx-X11/programs/Xserver/Xi/exglobals.h + nx-X11/programs/Xserver/Xi/getbmap.h + nx-X11/programs/Xserver/Xi/getdctl.h + nx-X11/programs/Xserver/Xi/getfctl.h + nx-X11/programs/Xserver/Xi/getfocus.h + nx-X11/programs/Xserver/Xi/getkmap.h + nx-X11/programs/Xserver/Xi/getmmap.h + nx-X11/programs/Xserver/Xi/getprop.h + nx-X11/programs/Xserver/Xi/getselev.h + nx-X11/programs/Xserver/Xi/getvers.h + nx-X11/programs/Xserver/Xi/grabdev.h + nx-X11/programs/Xserver/Xi/grabdevb.h + nx-X11/programs/Xserver/Xi/grabdevk.h + nx-X11/programs/Xserver/Xi/gtmotion.h + nx-X11/programs/Xserver/Xi/listdev.h + nx-X11/programs/Xserver/Xi/opendev.h + nx-X11/programs/Xserver/Xi/queryst.h + nx-X11/programs/Xserver/Xi/selectev.h + nx-X11/programs/Xserver/Xi/sendexev.h + nx-X11/programs/Xserver/Xi/setbmap.h + nx-X11/programs/Xserver/Xi/setdval.h + nx-X11/programs/Xserver/Xi/setfocus.h + nx-X11/programs/Xserver/Xi/setmmap.h + nx-X11/programs/Xserver/Xi/setmode.h + nx-X11/programs/Xserver/Xi/ungrdev.h + nx-X11/programs/Xserver/Xi/ungrdevb.h + nx-X11/programs/Xserver/Xi/ungrdevk.h + nx-X11/programs/Xserver/dix/dispatch.h + nx-X11/programs/Xserver/include/XIstubs.h + nx-X11/programs/Xserver/include/dixevents.h + nx-X11/programs/Xserver/include/dixgrabs.h + nx-X11/programs/Xserver/include/exevents.h + nx-X11/programs/Xserver/include/extinit.h + nx-X11/programs/Xserver/include/swaprep.h + nx-X11/programs/Xserver/include/swapreq.h +Copyright: 1996, Thomas E. Dickey +License: MIT~X11 + +Files: nx-X11/include/extensions/XI.h + nx-X11/include/extensions/XIproto.h + nx-X11/programs/Xserver/Xi/allowev.c + nx-X11/programs/Xserver/Xi/chgdctl.c + nx-X11/programs/Xserver/Xi/chgfctl.c + nx-X11/programs/Xserver/Xi/chgkbd.c + nx-X11/programs/Xserver/Xi/chgkmap.c + nx-X11/programs/Xserver/Xi/chgprop.c + nx-X11/programs/Xserver/Xi/chgptr.c + nx-X11/programs/Xserver/Xi/closedev.c + nx-X11/programs/Xserver/Xi/devbell.c + nx-X11/programs/Xserver/Xi/exevents.c + nx-X11/programs/Xserver/Xi/extinit.c + nx-X11/programs/Xserver/Xi/getbmap.c + nx-X11/programs/Xserver/Xi/getdctl.c + nx-X11/programs/Xserver/Xi/getfctl.c + nx-X11/programs/Xserver/Xi/getfocus.c + nx-X11/programs/Xserver/Xi/getkmap.c + nx-X11/programs/Xserver/Xi/getmmap.c + nx-X11/programs/Xserver/Xi/getprop.c + nx-X11/programs/Xserver/Xi/getselev.c + nx-X11/programs/Xserver/Xi/getvers.c + nx-X11/programs/Xserver/Xi/grabdev.c + nx-X11/programs/Xserver/Xi/grabdevb.c + nx-X11/programs/Xserver/Xi/grabdevk.c + nx-X11/programs/Xserver/Xi/gtmotion.c + nx-X11/programs/Xserver/Xi/listdev.c + nx-X11/programs/Xserver/Xi/opendev.c + nx-X11/programs/Xserver/Xi/selectev.c + nx-X11/programs/Xserver/Xi/sendexev.c + nx-X11/programs/Xserver/Xi/setbmap.c + nx-X11/programs/Xserver/Xi/setdval.c + nx-X11/programs/Xserver/Xi/setfocus.c + nx-X11/programs/Xserver/Xi/setmmap.c + nx-X11/programs/Xserver/Xi/setmode.c + nx-X11/programs/Xserver/Xi/stubs.c + nx-X11/programs/Xserver/Xi/ungrdev.c + nx-X11/programs/Xserver/Xi/ungrdevb.c + nx-X11/programs/Xserver/Xi/ungrdevk.c +Copyright: 1989, 1998, The Open Group + 1989, Hewlett-Packard Company, Palo Alto, California +License: MIT~OpenGroup +Comment: + The Hewlett-Packard Company, Palo Alto, California licensed + their work on these files under MIT~OldStyle. + +Files: nx-X11/programs/Xserver/hw/nxagent/Args.c + nx-X11/programs/Xserver/hw/nxagent/Args.h + nx-X11/programs/Xserver/hw/nxagent/Colormap.c + nx-X11/programs/Xserver/hw/nxagent/Colormap.h + nx-X11/programs/Xserver/hw/nxagent/Cursor.c + nx-X11/programs/Xserver/hw/nxagent/Cursor.h + nx-X11/programs/Xserver/hw/nxagent/Display.c + nx-X11/programs/Xserver/hw/nxagent/Display.h + nx-X11/programs/Xserver/hw/nxagent/Font.c + nx-X11/programs/Xserver/hw/nxagent/Font.h + nx-X11/programs/Xserver/hw/nxagent/GC.c + nx-X11/programs/Xserver/hw/nxagent/GCOps.c + nx-X11/programs/Xserver/hw/nxagent/GCOps.h + nx-X11/programs/Xserver/hw/nxagent/GCs.h + nx-X11/programs/Xserver/hw/nxagent/Init.c + nx-X11/programs/Xserver/hw/nxagent/Init.h + nx-X11/programs/Xserver/hw/nxagent/Keyboard.c + nx-X11/programs/Xserver/hw/nxagent/Keyboard.h + nx-X11/programs/Xserver/hw/nxagent/Pointer.c + nx-X11/programs/Xserver/hw/nxagent/Pointer.h + nx-X11/programs/Xserver/hw/nxagent/Screen.c + nx-X11/programs/Xserver/hw/nxagent/Screen.h + nx-X11/programs/Xserver/hw/nxagent/TestExt.c + nx-X11/programs/Xserver/hw/nxagent/Visual.c + nx-X11/programs/Xserver/hw/nxagent/Visual.h +Copyright: 1993, Davor Matic + 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: GPL-2 +Comment: + The code in these files was derived from Xnest. As the code changes + done by NoMachine are immense, GPL-2 is listed as these files' primary + license. + . + Xnest was originally published under the following license: + . + Copyright 1993 by Davor Matic + . + Permission to use, copy, modify, distribute, and sell this software + and its documentation for any purpose is hereby granted without fee, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation. Davor Matic makes no representations about + the suitability of this software for any purpose. It is provided "as + is" without express or implied warranty. + +Files: nx-X11/include/extensions/render.h + nx-X11/include/extensions/renderproto.h + nx-X11/programs/Xserver/fb/fb24_32.c + nx-X11/programs/Xserver/fb/fboverlay.c + nx-X11/programs/Xserver/fb/fboverlay.h + nx-X11/programs/Xserver/fb/fbpict.c + nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrender_nxagent.h + nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrenderint_nxagent.h + nx-X11/programs/Xserver/render/glyph.c + nx-X11/programs/Xserver/render/glyphstr.h + nx-X11/programs/Xserver/render/miglyph.c + nx-X11/programs/Xserver/render/mipict.h + nx-X11/programs/Xserver/render/picture.c + nx-X11/programs/Xserver/render/picture.h + nx-X11/programs/Xserver/render/picturestr.h + nx-X11/programs/Xserver/render/render.c +Copyright: 2000, SuSE, Inc +License: MIT~X11 + +Files: nx-X11/lib/X11/OCWrap.c + nx-X11/lib/X11/OMWrap.c + nx-X11/lib/X11/XlcPubI.h + nx-X11/lib/X11/lcCharSet.c + nx-X11/lib/X11/lcConv.c + nx-X11/lib/X11/lcDefConv.c + nx-X11/lib/X11/lcPrTxt.c + nx-X11/lib/X11/lcPubWrap.c + nx-X11/lib/X11/lcPublic.c + nx-X11/lib/X11/lcRM.c + nx-X11/lib/X11/lcStd.c + nx-X11/lib/X11/lcTxtPr.c + nx-X11/lib/X11/lcUtil.c + nx-X11/lib/X11/omImText.c + nx-X11/lib/X11/omTextExt.c + nx-X11/lib/X11/omTextPer.c +Copyright: 1992-1993, TOSHIBA Corp +License: MIT~X11 + +Files: nx-X11/include/extensions/dpms.h + nx-X11/include/extensions/dpmsstr.h + nx-X11/include/extensions/panoramiXext.h + nx-X11/include/extensions/panoramiXproto.h + nx-X11/programs/Xserver/Xext/dpms.c + nx-X11/programs/Xserver/Xext/dpmsstubs.c + nx-X11/programs/Xserver/Xext/panoramiX.c + nx-X11/programs/Xserver/Xext/panoramiX.h + nx-X11/programs/Xserver/Xext/panoramiXSwap.c + nx-X11/programs/Xserver/Xext/panoramiXprocs.c + nx-X11/programs/Xserver/dix/dixfonts.c + nx-X11/programs/Xserver/randr/panoramiXproto.h +Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1991, 1997, Digital Equipment Corporation, Maynard, Massachusetts + 1996, Digital Equipment Corporation, Maynard, Massachusetts +License: Expat~NoAdvert + +Files: nx-X11/lib/X11/XimImSw.h + nx-X11/lib/X11/XimProto.h + nx-X11/lib/X11/imDefFlt.c + nx-X11/lib/X11/imDefLkup.c + nx-X11/lib/X11/imDispch.c + nx-X11/lib/X11/imExten.c + nx-X11/lib/X11/imInt.c + nx-X11/lib/X11/imLcGIc.c + nx-X11/lib/X11/imLcIc.c + nx-X11/lib/X11/imLcSIc.c + nx-X11/lib/X11/imRmAttr.c +Copyright: 1990-1994, FUJITSU LIMITED + 1992-1993, FUJITSU LIMITED + 1992-1994, FUJITSU LIMITED + 1993-1994, FUJITSU LIMITED +License: MIT~X11 + +Files: nx-X11/lib/X11/XlcGeneric.h + nx-X11/lib/X11/XlcPublic.h + nx-X11/lib/X11/XomGeneric.h + nx-X11/lib/X11/lcCT.c + nx-X11/lib/X11/lcGenConv.c + nx-X11/lib/X11/lcGeneric.c + nx-X11/lib/X11/omDefault.c + nx-X11/lib/X11/omGeneric.c + nx-X11/lib/X11/omText.c + nx-X11/lib/X11/omTextEsc.c + nx-X11/lib/X11/omXChar.c +Copyright: 1992-1993, TOSHIBA Corp + 1995, FUJITSU LIMITED +License: MIT~X11 + +Files: nx-X11/include/extensions/Xv.h + nx-X11/include/extensions/Xvproto.h + nx-X11/lib/X11/imEvToWire.c + nx-X11/programs/Xserver/Xext/xvdisp.c + nx-X11/programs/Xserver/Xext/xvdix.h + nx-X11/programs/Xserver/Xext/xvmain.c + nx-X11/programs/Xserver/include/dixfont.h + nx-X11/programs/Xserver/include/dixfontstr.h + nx-X11/programs/Xserver/include/dixstruct.h +Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1991, Digital Equipment Corporation, Maynard, Massachusetts + 1993, Digital Equipment Corporation, Maynard, Massachusetts +License: MIT~OldStyle + +Files: nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c + nx-X11/programs/Xserver/hw/nxagent/NXevents.c + nx-X11/programs/Xserver/hw/nxagent/NXextension.c + nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c + nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c + nx-X11/programs/Xserver/hw/nxagent/NXproperty.c + nx-X11/programs/Xserver/hw/nxagent/NXresource.c + nx-X11/programs/Xserver/hw/nxagent/NXwindow.c + nx-X11/programs/Xserver/os/WaitFor.c +Copyright: 1987, 1989, Digital Equipment Corporation, Maynard, Massachusetts + 1987, 1989, 1998, The Open Group + 1987, 1998, The Open Group + 1987, Digital Equipment Corporation, Maynard, Massachusetts + 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~OpenGroup +Comment: + Only a few lines in these files have been added by NoMachine + when first implementing the nxagent DDX. Those lines (ifdef'ed + with NXAGENT_SERVER) must be considered as strictly GPL-2 + licensed additions. + +Files: nx-X11/include/extensions/xfixesproto.h + nx-X11/include/extensions/xfixeswire.h + nx-X11/programs/Xserver/fb/fbcompose.c + nx-X11/programs/Xserver/fb/fbpict.h + nx-X11/programs/Xserver/render/animcur.c + nx-X11/programs/Xserver/render/miindex.c + nx-X11/programs/Xserver/render/mirect.c + nx-X11/programs/Xserver/render/mitrap.c + nx-X11/programs/Xserver/render/mitri.c +Copyright: 2000, Keith Packard, member of The XFree86 Project, Inc + 2001, Keith Packard, member of The XFree86 Project, Inc + 2002, Keith Packard, member of The XFree86 Project, Inc +License: MIT~X11 + +Files: nx-X11/include/Sunkeysym.h + nx-X11/lib/X11/Host.c + nx-X11/lib/X11/LiHosts.c + nx-X11/lib/X11/XDefaultIMIF.c + nx-X11/lib/X11/XDefaultOMIF.c + nx-X11/lib/X11/XlcDL.c + nx-X11/lib/X11/XlcSL.c + nx-X11/lib/X11/lcInit.c +Copyright: 1985-1987, 1991, 1998, The Open Group + 1986, 1998, The Open Group + 1991, 1998, The Open Group + 1991, Oracle and/or its affiliates. + 2000, Oracle and/or its affiliates. + 2004, Oracle and/or its affiliates. +License: MIT~OpenGroup +Comment: + Contributions by Oracle and/or its affiliates (from 1991, 2000, 2004) + have to be considered as licensed under Expat. + +Files: nx-X11/lib/X11/ConnDis.c + nx-X11/lib/X11/OpenDis.c + nx-X11/lib/X11/XlibAsync.c + nx-X11/lib/X11/XlibInt.c + nx-X11/lib/X11/Xlibint.h + nx-X11/programs/Xserver/Xext/security.c + nx-X11/programs/Xserver/Xext/SecurityPolicy + nx-X11/programs/Xserver/hw/nxagent/NXshm.c + nx-X11/programs/Xserver/os/auth.c +Copyright: 1984-1985, 1987, 1989, 1998, The Open Group + 1985-1986, 1998, The Open Group + 1985-1987, 1998, The Open Group + 1988, 1998, The Open Group + 1989, 1998, The Open Group + 1992, 1998, The Open Group + 1996, 1998, The Open Group + 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~OpenGroup +Comment: + Modifications by NoMachine have to be considered as strictly GPL-2 + licensed. + . + Missing copyright information in SecurityPolicy. Assuming same + situation as for Xext/security.c. + +Files: nx-X11/lib/X11/XimTrInt.h + nx-X11/lib/X11/XimTrX.h + nx-X11/lib/X11/XimTrans.h + nx-X11/lib/X11/imDefIc.c + nx-X11/lib/X11/imTrX.c + nx-X11/lib/X11/imTrans.c + nx-X11/lib/X11/imTransR.c +Copyright: 1991-1992, Oracle and/or its affiliates. + 1992, Oracle and/or its affiliates. + 1992-1994, FUJITSU LIMITED + 1993-1994, FUJITSU LIMITED +License: Expat +Comment: + The original work on these files by Oracle and/or its + affiliates have been licensed under Expat. Later + contributions by FUJITSU LIMITED have been licensed + under MIT~X11. + +Files: nx-X11/programs/Xserver/hw/nxagent/NXglyph.c + nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphRef.h + nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphSet.h + nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c + nx-X11/programs/Xserver/hw/nxagent/NXpicture.c + nx-X11/programs/Xserver/hw/nxagent/NXpicturestr_PictSolidFill.h + nx-X11/programs/Xserver/hw/nxagent/NXrender.c +Copyright: 2000, SuSE, Inc + 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~X11 +Comment: + Adaptations required for the nxagent DDX done by NoMachine + need to be considered as strictly GPL-2 licensed additions. + +Files: nx-X11/programs/Xserver/dix/dispatch.c + nx-X11/programs/Xserver/dix/events.c + nx-X11/programs/Xserver/dix/main.c + nx-X11/programs/Xserver/dix/resource.c + nx-X11/programs/Xserver/dix/window.c + nx-X11/programs/Xserver/mi/miexpose.c +Copyright: 1987, 1989, Digital Equipment Corporation, Maynard, Massachusetts + 1987, 1989, 1998, The Open Group + 1987, 1998, The Open Group + 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1991, 1997, Digital Equipment Corporation, Maynard, Massachusetts +License: MIT~OpenGroup +Comment: + Contributions by Digital Equipment Corporation, Maynard, Massachusetts + have been licensed under MIT~OldStyle. + +Files: nx-X11/include/extensions/Xdbeproto.h + nx-X11/programs/Xserver/dbe/dbe.c + nx-X11/programs/Xserver/dbe/dbestruct.h + nx-X11/programs/Xserver/dbe/midbe.c + nx-X11/programs/Xserver/dbe/midbe.h + nx-X11/programs/Xserver/dbe/midbestr.h +Copyright: 1994-1995, Hewlett-Packard Company +License: Expat~NoAdvert + +Files: nx-X11/extras/Mesa/include/GL/xmesa_xf86.h + nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c + nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c + nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.h + nx-X11/programs/Xserver/GL/mesa/X/xf86glxint.h +Copyright: 1998-1999, Precision Insight, Inc., Cedar Park, Texas +License: Expat + +Files: nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.c + nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_generic.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_x86.c +Copyright: 2002, Tungsten Graphics Inc., Cedar Park, Texas + 2004, Tungsten Graphics Inc., Cedar Park, Texas +License: Expat + +Files: nx-X11/lib/xtrans/Xtrans.c + nx-X11/lib/xtrans/Xtrans.h + nx-X11/lib/xtrans/Xtransint.h + nx-X11/lib/xtrans/Xtranslcl.c + nx-X11/lib/xtrans/Xtransutil.c + nx-X11/lib/xtrans/transport.c +Copyright: 1993-1994, 1998, The Open Group + 1993-1994, NCR Corporation - Dayton, Ohio, USA +License: MIT~OpenGroup +Comment: + The NCR Corporation licensed their work on these files under + the following license: + . + Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA + . + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, provided + that the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the name NCR not be used in advertising + or publicity pertaining to distribution of the software without specific, + written prior permission. NCR makes no representations about the + suitability of this software for any purpose. It is provided "as is" + without express or implied warranty. + . + NCR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN + NO EVENT SHALL NCR BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +Files: nx-X11/lib/X11/XimintL.h + nx-X11/lib/X11/imImSw.c + nx-X11/lib/X11/imLcIm.c + nx-X11/lib/X11/imThaiIc.c + nx-X11/lib/X11/imThaiIm.c +Copyright: 1991-1994, FUJITSU LIMITED + 1992-1993, FUJITSU LIMITED + 1992-1994, FUJITSU LIMITED + 1993, Digital Equipment Corporation +License: MIT~X11 + +Files: nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vertex.h + nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_generic.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vertex_sse.c +Copyright: 2003, Tungsten Graphics, inc +License: Expat + +Files: nx-X11/include/extensions/saver.h + nx-X11/include/extensions/saverproto.h + nx-X11/include/extensions/scrnsaver.h + nx-X11/programs/Xserver/Xext/saver.c +Copyright: 1992, X Consortium +License: Expat~NoAdvert + +Files: nx-X11/programs/Xserver/miext/cw/cw.c + nx-X11/programs/Xserver/miext/cw/cw.h + nx-X11/programs/Xserver/miext/cw/cw_ops.c + nx-X11/programs/Xserver/miext/cw/cw_render.c +Copyright: 2004, Eric Anholt +License: MIT~X11 + +Files: nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h + nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h + nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h +Copyright: 1999-2001, Brian Paul + 1999-2003, Brian Paul + IBM Corporation 2004 +License: Expat + +Files: nx-X11/extras/Mesa/src/mesa/shader/atifragshader.c + nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.c + nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.h +Copyright: 1999-2003, David Airlie + 2004, David Airlie +License: Expat + +Files: nx-X11/lib/X11/FreeEventData.c + nx-X11/lib/X11/GetEventData.c + nx-X11/programs/Xserver/include/protocol-versions.h +Copyright: 2009, Red Hat, Inc +License: Expat + +Files: nx-X11/include/extensions/xf86bigfont.h + nx-X11/include/extensions/xf86bigfproto.h + nx-X11/programs/Xserver/Xext/xf86bigfont.c +Copyright: 1999-2000, Bruno Haible + 1999-2000, The XFree86 Project, Inc +License: MIT~X11 +Comment: + Assuming license as found in other files contributed + by Bruno Haible. Possibly needs clarification at X.org + upstream. + +Files: nx-X11/lib/X11/Context.c + nx-X11/lib/X11/Quarks.c + nx-X11/lib/X11/Xrm.c +Copyright: 1987-1988, 1990, Digital Equipment Corporation, Maynard + 1987-1988, 1990, 1994, 1998, The Open Group + 1987-1988, 1990, 1998, The Open Group +License: MIT~OldStyle +Comment: + Contributions on these files by the OpenGroup have to be considered + as licensed under MIT~OpenGroup. + +Files: nx-X11/lib/X11/TextExt.c + nx-X11/lib/X11/TextExt16.c + nx-X11/lib/X11/lcDynamic.c +Copyright: 1989, 1998, The Open Group + 1995, FUJITSU LIMITED + 1996, 1998, The Open Group +License: MIT~OpenGroup + +Files: nx-X11/include/extensions/xtestext1.h + nx-X11/programs/Xserver/Xext/xtest1dd.c + nx-X11/programs/Xserver/Xext/xtest1di.c +Copyright: 1986-1988, 1998, The Open Group + 1986-1988, Hewlett-Packard Corporation +License: MIT~OpenGroup +Comment: + Contributions by Hewlett-Packard Corporation have been licensed + under the following license: + . + Permission to use, copy, modify, and distribute this + software and its documentation for any purpose and without + fee is hereby granted, provided that the above copyright + notice appear in all copies and that both that copyright + notice and this permission notice appear in supporting + documentation, and that the name of Hewlett-Packard not be used in + advertising or publicity pertaining to distribution of the + software without specific, written prior permission. + . + Hewlett-Packard makes no representations about the + suitability of this software for any purpose. It is provided + "as is" without express or implied warranty. + . + As additional note, we find: + . + This software is not subject to any license of the American + Telephone and Telegraph Company or of the Regents of the + University of California. + +Files: nx-X11/programs/Xserver/hw/nxagent/NXdamage.c + nx-X11/programs/Xserver/randr/rrmode.c + nx-X11/programs/Xserver/randr/rrscreen.c +Copyright: 2001, 2011, NoMachine (http://www.nomachine.com) + 2003, Keith Packard + 2006, Keith Packard + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~X11 +Comment: + Modifications by NoMachine have to be considered as strictly + GPL-2 licensed. + +Files: nx-X11/programs/Xserver/include/bstore.h + nx-X11/programs/Xserver/include/bstorestr.h + nx-X11/programs/Xserver/mi/mibstore.h +Copyright: 1987, the Regents of the University of California +License: MIT~VeryOldStyle~UniOfCalifornia + +Files: nx-X11/programs/Xserver/dix/region.c + nx-X11/programs/Xserver/mi/mivaltree.c +Copyright: 1987-1989, 1998, The Open Group + 1987-1989, Digital Equipment Corporation, Maynard, Massachusetts + 1991, 1997, Digital Equipment Corporation, Maynard, Massachusetts +License: MIT~OpenGroup +Comment: + Contributions by Digital Equipment Corporation, Maynard, Massachusetts + have been licensed under MIT~OldStyle. + +Files: nx-X11/lib/X11/XimintP.h + nx-X11/lib/X11/imDefIm.c +Copyright: 1990-1992, Oracle and/or its affiliates. + 1991-1992, Oracle and/or its affiliates. + 1992-1994, FUJITSU LIMITED + 1993-1994, Sony Corporation +License: Expat +Comment: + Original work from Oracle and/or its affiliates have been licensed + as Expat. Later contributions by FUJITSU LIMITED and Sony Corporation + have been licensed under MIT~X11. + +Files: nx-X11/extras/Mesa/src/glx/x11/indirect_size.c + nx-X11/extras/Mesa/src/glx/x11/indirect_size.h + nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c + nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.h +Copyright: 2003, IBM Corporation + IBM Corporation 2004 +License: Expat + +Files: nx-X11/programs/Xserver/composite/compoverlay.c + nx-X11/programs/Xserver/hw/nxagent/X11/include/Xcomposite_nxagent.h +Copyright: 2003, Keith Packard + 2006, Oracle and/or its affiliates. +License: MIT~X11 +Comment: + Original work by Keith Packard has been licensed under MIT~X11. Later + contributions by Oracle and/or its affiliates have been licensed + under Expat. + +Files: nx-X11/programs/Xserver/Xext/sleepuntil.h + nx-X11/programs/Xserver/mi/micoord.h +Copyright: 2000, The XFree86 Project, Inc. + 2001, The XFree86 Project, Inc. +License: Expat~NoAdvert + +Files: nx-X11/extras/Mesa/src/mesa/tnl/t_vp_build.c + nx-X11/extras/Mesa/src/mesa/tnl/t_vp_build.h +Copyright: 2005, Tungsten Graphics +License: Expat + +Files: nx-X11/programs/Xserver/os/strlcat.c + nx-X11/programs/Xserver/os/strlcpy.c +Copyright: 1998, Todd C. Miller +License: MIT~ISC + +Files: nx-X11/lib/X11/lcUTF8.c + nx-X11/lib/X11/lcUTF8Load.c +Copyright: 1993, SunSoft, Inc + 1999-2000, Bruno Haible +License: MIT~X11 + +Files: nx-X11/include/extensions/randrproto.h + nx-X11/programs/Xserver/randr/randrstr.h +Copyright: 2000, Compaq Computer Corporation + 2002, Hewlett-Packard Company + 2006, Intel Corporation + 2008, Red Hat, Inc +License: MIT~X11 + +Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h + nxcompshad/X11/include/Xrandr_nxcompshad.h +Copyright: 2000, Compaq Computer Corporation, Inc + 2002, Hewlett-Packard Company, Inc + 2006, Intel Corporation + 2008, Red Hat, Inc +License: MIT~X11 + +Files: nx-X11/programs/Xserver/os/log.c + nx-X11/programs/Xserver/os/utils.c +Copyright: 1987, 1998, The Open Group + 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1994, Quarterdeck Office Systems + 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~OpenGroup +Comment: + Modifications by NoMachine have to be considered as strictly + GPL-2 licensed. + +Files: nx-X11/lib/X11/GetNrmHint.c + nx-X11/lib/X11/SetNrmHint.c +Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1987-1988, 1998, The Open Group + 1988, Wyse Technology, Inc., San Jose, Ca +License: MIT~OpenGroup +Comment: + Contributions by Digital Equipment Corporation, Maynard, Massachusetts + and Wyse have been licensed under MIT~OldStyle. + +Files: nx-X11/lib/X11/imLcFlt.c + nx-X11/lib/X11/imLcLkup.c +Copyright: 1992, 1994, FUJITSU LIMITED + 1992, Fuji Xerox Co., Ltd +License: MIT~X11 + +Files: nx-X11/lib/X11/Ximint.h + nx-X11/lib/X11/imRm.c +Copyright: 1990-1994, FUJITSU LIMITED + 1992-1994, FUJITSU LIMITED + 1993-1994, Sony Corporation + 1994, Sony Corporation +License: MIT~X11 + +Files: nx-X11/lib/X11/Xaixlcint.h + nx-X11/lib/X11/lcFile.c +Copyright: 1993, IBM Corporation +License: MIT~OldStyle + +Files: nx-X11/include/extensions/record.h + nx-X11/include/extensions/recordstr.h +Copyright: 1995, Network Computing Devices +License: MIT~OldStyle + +Files: nx-X11/lib/X11/FilterEv.c + nx-X11/lib/X11/RegstFlt.c +Copyright: 1990-1991, 1998, The Open Group + 1990-1991, OMRON Corporation + 1991, 1998, The Open Group +License: MIT~X11 +Comment: + Contributions by The Open Group have been licensed + under MIT~OpenGroup. + +Files: nx-X11/include/GL/glxint.h + nx-X11/programs/Xserver/GL/glx/glxext.c +Copyright: 1991-1999 Silicon Graphics, Inc. +License: GLX-1.0 + +Files: nx-X11/programs/Xserver/fb/fbcmap.c + nx-X11/programs/Xserver/mi/micmap.c +Copyright: 1987, Sun Microsystems, Inc. Mountain View, CA. +License: MIT~OldStyle +Comment: + Copyright attributions of Sun Microsystems, Inc. now belong + to Oracle. + +Files: nx-X11/lib/X11/GetTxtProp.c + nx-X11/lib/X11/Iconify.c + nx-X11/lib/X11/SetTxtProp.c + nx-X11/lib/X11/Withdraw.c +Copyright: 1988, 1998, The Open Group + 1988, Wyse Technology, Inc., San Jose, Ca +License: MIT~OldStyle +Comment: + Contributions by The Open Group have been licensed + under MIT~OpenGroup. + +Files: nx-X11/lib/X11/mbWrap.c + nx-X11/lib/X11/wcWrap.c +Copyright: 1991, 1998, The Open Group + 1991, the Open Software Foundation +License: MIT~OldStyle +Comment: + Contributions by The Open Group have been licensed + under MIT~OpenGroup. + +Files: nx-X11/lib/X11/FSWrap.c + nx-X11/lib/X11/lcWrap.c +Copyright: 1991, 1998, The Open Group + 1991, the Open Software Foundation + 1993, the TOSHIBA Corp +License: MIT~OpenGroup +Comment: + Contributions by OSF and TOSHIBA have been licensed under + MIT~X11. + +Files: nx-X11/include/extensions/XResproto.h + nx-X11/programs/Xserver/Xext/xres.c +Copyright: 2002, XFree86 Inc +License: XFree86 + +Files: nxcomp/MD5.c + nxcomp/MD5.h +Copyright: 1999, 2002, Aladdin Enterprises. + 1999-2000, 2002, Aladdin Enterprises. +License: Zlib + +Files: nx-X11/lib/X11/utlist.h +Copyright: 2007-2009, Troy D. Hanson +License: BSD-1-clause + +Files: nx-X11/programs/Xserver/os/xprintf.c +Copyright: 2004, Alexander Gottwald +License: Expat + +Files: nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h +Copyright: 1999-2001, Brian Paul + IBM Corporation 2004, +License: Expat + +Files: nx-X11/extras/Mesa/src/mesa/main/simple_list.h +Copyright: 1997, Keith Whitwell + 1999-2001, Brian Paul +License: Expat + +Files: nx-X11/lib/X11/UIThrStubs.c +Copyright: 1995, David E. Wexelblat. +License: Expat~NoAdvert + +Files: nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c +Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1991, 1997, Digital Equipment Corporation, Maynard, Massachusetts + 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: Expat~NoAdvert +Comment: + The original code has been licensed under MIT~OldStyle. + . + Later contributions got licensed under Expat~NoAdvert. + . + Some few modifications introduced by NoMachine have to be considered as + strictly GPL-2 licensed. + +Files: nx-X11/programs/Xserver/os/access.c +Copyright: 1987, 1998, The Open Group + 1987, Digital Equipment Corporation, Maynard, Massachusetts + 2004, Sun Microsystems, Inc +License: Expat~NoAdvert +Comment: + Contributions by Digital Equipment Corporation, Maynard, Massachusetts + have been licensed under MIT~OldStyle. + +Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h +Copyright: 1989-1995, GROUPE BULL +License: Expat~NoAdvert + +Files: nx-X11/extras/Mesa/src/mesa/glapi/dispatch.h +Copyright: 2005, IBM Corporation +License: Expat + +Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/Xfixes_nxagent.h +Copyright: 2002, Keith Packard, member of The XFree86 Project, Inc + 2006, Oracle and/or its affiliates. + 2011, Red Hat, Inc +License: MIT~X11 +Comment: + Original work by Keith Packard has been licensed under MIT~X11. + . + Later contributions by Oracle and/or its affiliates and Red Hat, Inc. + have been licensed under Expat. + +Files: nx-X11/extras/Mesa/src/mesa/main/mm.h +Copyright: 1999, Keith Whitwell +License: Expat + +Files: nx-X11/lib/xtrans/Xtranssock.c +Copyright: 1993-1994, 1998, The Open Group + 2001, 2011, NoMachine (http://www.nomachine.com) + 2002, Oracle and/or its affiliates. + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~OpenGroup +Comment: + Original code from The Open Group has been licensed under + MIT~OpenGroup. + . + Contributions by NCR Corporation has been licensed under + MIT~OldStyle. + . + Contributions by Oracle and/or its affiliates have been + licensed under Expat. + . + Modifications from NoMachine for making xtrans work + over the NX protocol, have to be considered as strictly + GPL-2 licensed. + +Files: nx-X11/programs/Xserver/hw/nxagent/os2Stub.c +Copyright: 1996, Sebastien Marineau + 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: Expat~NoAdvert +Comment: + No NX specific changes can be found in this file. GPL-2 + license in file header does not apply. + . + Note from upstream side: This file will be removed in + nx-libs 3.5.99.4. + +Files: nx-X11/programs/Xserver/hw/nxagent/Agent.h +Copyright: 1995, X Consortium + 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: Expat~NoAdvert +Comment: + Modifications by NoMachine have to be considered as + strictly GPL-2 license. + +Files: nx-X11/programs/Xserver/composite/compositeext.h +Copyright: 2009, NVIDIA Corporation +License: Expat + +Files: nx-X11/lib/X11/os2Stubs.c +Copyright: 1996, Sebastien Marineau and Holger Veit +License: Expat~NoAdvert +Comment: + Note from upstream side: This file will be removed in + nx-libs 3.5.99.4. + +Files: nx-X11/extras/Mesa/src/mesa/main/texenvprogram.c +Copyright: 2003, Tungsten Graphics, Inc., Cedar Park, Texas +License: Expat + + +Files: nx-X11/extras/Mesa/src/mesa/main/mm.c +Copyright: 1999, Wittawat Yamwong +License: Expat + +Files: nxcomp/Version.c +Copyright: 2015, Qindel Formacion y Servicios SL. +License: GPL-2 + +Files: version.sh +Copyright: 2015, Mihai Moldovan + 2015, Mike Gabriel +License: GPL-2+ + +Files: roll-tarballs.sh +Copyright: 2011-2016, Mike Gabriel + 2012, Reinhard Tartler +License: GPL-3+ + +Files: nx-X11/programs/Xserver/dix/dixutils.c +Copyright: 1987, 1998, The Open Group + 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1988,1991, Adobe Systems Incorporated. +License: MIT~OpenGroup +Comment: + Contributions by Digital Equipment Corporation, Maynard, Massachusetts + have been licensed under MIT~OldStyle. + . + Contributions by Adobe Systems Inc. have been licensed under MIT~Adobe. + +Files: nx-X11/lib/X11/utf8WMProps.c +Copyright: 1991, 1998, The Open Group + 2000, Bruno Haible +License: MIT~OpenGroup +Comment: + Contributions by Bruno Haible have been licensed under MIT~X11. + +Files: nx-X11/lib/X11/utf8Wrap.c +Copyright: 1991, 1998, The Open Group + 1991, the Open Software Foundation + 2000, Bruno Haible +License: MIT~OpenGroup +Comment: + Contributions by Bruno Haible have been licensed under MIT~X11. + . + Contributions by OSF have been licensed under MIT~OldStyle. + +Files: nx-X11/include/extensions/randr.h +Copyright: 2000, Compaq Computer Corporation + 2002, Hewlett Packard Company + 2006, Intel Corporation + 2008, Red Hat, Inc +License: MIT~X11 + +Files: nx-X11/programs/Xserver/randr/randr.c +Copyright: 2000, Compaq Computer Corporation + 2001, 2011, NoMachine (http://www.nomachine.com) + 2002, Hewlett-Packard Company + 2006, Intel Corporation + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~X11 +Comment: + Modifications by NoMachine have to be considered as strictly + GPL-2 licensed. + +Files: nx-X11/programs/Xserver/include/misc.h +Copyright: 1987, 1998, The Open Group + 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1992-1993, Data General Corporation; + 1992-1993, OMRON Corporation +License: MIT~OpenGroup +Comment: + Contributions by The Open Group have been licensed under MIT~OpenGroup. + . + Contributions by Digital Equipment Corporation, Maynard, Massachusetts have + been licensed under MIT~OldStyle. + . + Contributions by Data General Corporation and OMRON Corporation have been + licnsed under MIT~X11. + +Files: nx-X11/extras/Mesa/src/mesa/shader/atifragshader.h +Copyright: 2004, David Airlie +License: Expat +Comment: + Missing license in header, assuming same license as found + in other Mesa files with same copyright holder. + +Files: nx-X11/lib/X11/imCallbk.c +Copyright: 1993, Digital Equipment Corporation, Maynard, Massachusetts + 1994, FUJITSU LIMITED + 1994, Sony Corporation +License: MIT~OldStyle + +Files: nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c +Copyright: 1991, Digital Equipment Corporation, Maynard, Massachusetts + 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~OldStyle +Comment: + Modifications by NoMachine have to be considered as strictly GPL-2 + licensed. + +Files: nx-X11/lib/X11/WMProps.c +Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts + 1987-1988, 1993, 1998, The Open Group + 1988, Wyse Technology, Inc., San Jose, Ca. +License: MIT~OpenGroup +Comment: + Contributions by Digital Equipment Corporation, Maynard, Massachusetts + and Wyse have been licensed under MIT~OldStyle. + +Files: nx-X11/lib/X11/imConv.c +Copyright: 1991-1992, Fuji Xerox Co.,Ltd + 1993-1994, FUJITSU LIMITED +License: MIT~X11 + +Files: nx-X11/lib/X11/lcDB.c +Copyright: 1995, FUJITSU LIMITED + 1993, IBM Corporation +License: MIT~OldStyle + +Files: nx-X11/lib/X11/imLcPrs.c +Copyright: 1992, Fuji Xerox Co., Ltd + 1992, Oki Technosystems Laboratory, Inc +License: MIT~X11 + +Files: nx-X11/lib/X11/Xprivate.h +Copyright: 2008, Jamey Sharp, Josh Triplett +License: MIT~X11 +Comment: + Assuming MIT~X11 from "MIT, see COPYING file" in file header. + +Files: nx-X11/programs/Xserver/randr/rrcrtc.c +Copyright: 2001, 2011, NoMachine (http://www.nomachine.com) + 2006, Keith Packard + 2008-2014, Oleksandr Shneyder + 2010, Red Hat, Inc + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~X11 +Comment: + Modifications by NoMachine have to be considered as strictly GPL-2 + licensed. + +Files: nx-X11/programs/Xserver/randr/rrxinerama.c +Copyright: 2001, 2011, NoMachine (http://www.nomachine.com) + 2001-2005, Thomas Winischhofer, Vienna, Austria + 2006, Keith Packard + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~X11 +Comment: + Modifications by NoMachine have to be considered as strictly GPL-2 + licensed. + +Files: nx-X11/programs/Xserver/randr/rroutput.c +Copyright: 2006, Keith Packard + 2008, Red Hat, Inc +License: MIT~X11 +Comment: + Modifications by NoMachine have to be considered as strictly GPL-2 + licensed. + +Files: nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c +Copyright: 2001, 2011, NoMachine (http://www.nomachine.com) + 2002, Keith Packard, member of The XFree86 Project, Inc + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~X11 +Comment: + Modifications by NoMachine have to be considered as strictly GPL-2 + licensed. + +Files: nx-X11/include/Xarch.h +Copyright: 1997, Metro Link Incorporated +License: MIT~X11 + +Files: nx-X11/programs/Xserver/hw/nxagent/NXglxext.c +Copyright: 1991-1999 Silicon Graphics, Inc. + 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: GLX-1.0 +Comment: + Modifications by NoMachine have to be considered as strictly GPL-2 + licensed. + +Files: nx-X11/programs/Xserver/os/xdmcp.c +Copyright: 1989, Network Computing Devices, Inc., Mountain View, California +License: MIT~VeryOldStyle~NCD + +Files: nxproxy/Main.c +Copyright: 2001, 2011, NoMachine, http://www.nomachine.com/. +License: GPL-2 + +Files: nx-X11/lib/X11/Xlcint.h +Copyright: 1990-1991, OMRON Corporation, NTT Software Corporation + 1991, 1998, The Open Group + 1991, the Open Software Foundation + 1993, the TOSHIBA Corp + 1993-1994, Sony Corporation + 1993-1994, the FUJITSU LIMITED +License: MIT~X11 +Comment: + Contributions by The Open Group have been licensed under MIT~OpenGroup. + . + Contributions by the other copyright holders have been licensed under + MIT~X11. + +Files: nx-X11/lib/X11/SetLocale.c +Copyright: 1987,1998, The Open Group + 1990-1991, OMRON Corporation, NTT Software Corporation +License: MIT~X11 +Comment: + Contributions by The Open Group have been licensed under MIT~OpenGroup. + . + Contributions by the other copyright holders have been licensed under + MIT~X11. + +Files: nx-X11/lib/X11/ICWrap.c +Copyright: 1990-1991, OMRON Corporation, NTT Software Corporation + 1991, 1998, The Open Group + 1991, the Open Software Foundation + 1993, the FUJITSU LIMITED +License: MIT~X11 +Comment: + Contributions by The Open Group have been licensed under MIT~OpenGroup. + . + Contributions by the other copyright holders have been licensed under + MIT~X11. + +Files: nx-X11/programs/Xserver/randr/rrprovider.c +Copyright: 2012, Red Hat Inc +License: MIT~X11 + +Files: nx-X11/programs/Xserver/mi/mibank.c +Copyright: 1990,91,92,93 Thomas Roell, Germany + 1991,92,93 SGCS (Snitily Graphics Consulting Services), USA + 1997-2004, Marc Aurele La France (TSI @ UQV), tsi@xfree86.org +License: MIT~X11 + +Files: nx-X11/lib/X11/imInsClbk.c +Copyright: 1993-1994, Sony Corporation +License: MIT~OldStyle + +Files: nx-X11/lib/X11/CCC.c +Copyright: 1990, 1991, Tektronix, Inc + 1994, 1998, The Open Group +License: MIT~Tektronix +Comment: + Contributions by The Open Group have been licensed under MIT~OpenGroup. + . + Contributions by Tektronix, Inc. have been licensed under MIT~Tektronix. + +Files: nx-X11/lib/X11/Font.c +Copyright: 1986, 1998, The Open Group + 2000, The XFree86 Project, Inc +License: MIT~OpenGroup + +Files: nx-X11/lib/X11/IMWrap.c +Copyright: 1991, 1998, The Open Group + 1991, the Open Software Foundation + 1993-1994, the Sony Corporation +License: MIT~X11 +Comment: + Contributions by The Open Group have been licensed under MIT~OpenGroup. + . + Contributions by the other copyright holders have been licensed under + MIT~X11. + +Files: nx-X11/programs/Xserver/mi/mibstore.c +Copyright: 1987, 1998, The Open Group + 1987, the Regents of the University of California +License: MIT~OpenGroup +Comment: + Contributions by The Open Group have been licensed under MIT~OpenGroup. + . + Contributions by the Regents of the University of California have been + licensed under MIT~VeryOldStyle~UniOfCalifornia. + +Files: nx-X11/include/Xdefs.h +Copyright: 1999, The XFree86 Project Inc +License: XFree86 + +Files: nx-X11/programs/Xserver/mi/mibank.h +Copyright: 1997-2004, Marc Aurele La France (TSI @ UQV), tsi@xfree86.org +License: MIT~X11 + +Files: fix-patch-whitespace + nx-X11/programs/Xserver/fix-miregion + nx-X11/programs/Xserver/fix-miregion-private + nx-X11/programs/Xserver/fix-region +Copyright: 2010, Keith Packard +License: MIT~X11 +Comment: + Copyright holder taken from author field in Git commit (at X.org's + xserver.git). + . + Missing license header (also at X.org). Assuming MIT~X11. + +Files: testscripts/run-nxproxy2nxagent-on-localhost + testscripts/run-nxproxy2nxagent-over-network + testscripts/run-nxproxy2nxagent-over-sockets + testscripts/run-nxproxy2nxproxy + testscripts/run-nxproxy2nxproxy-over-sockets + testscripts/slave-agent + testscripts/slave-client +Copyright: 2001, 2011, NoMachine (http://www.nomachine.com/) + 2015-2016, Mike Gabriel +License: GPL-2 + +Files: testscripts/slave-agent + testscripts/slave-client +Copyright: 2015-2016, Qindel Group (http://www.qindel.com) +License: GPL-2 + +Files: ChangeLog + Makefile + VERSION + doc/README.NX-development + doc/libNX_X11/symbols/libNX_X11::symbol-usage_internally.txt + doc/libNX_X11/symbols/libNX_X11::symbol-usage_nxagent.txt + doc/libNX_X11/symbols/libNX_X11::symbol-usage_nxcompext.txt + doc/libNX_X11/symbols/libNX_X11::symbols.txt + doc/nxagent/README.keystrokes + doc/nxcomp/DXPC_re-licensed_debug_784565.mbox + doc/nxcomp/README.on-retroactive-DXPC-license + doc/nxcomp/nxcomp-3.6-drops-compat-code-3.4.x-testing.pdf + doc/nxcompext/symbols/nxcompext::symbol-usage_internally.txt + doc/nxcompext/symbols/nxcompext::symbol-usage_nxagent.txt + doc/nxcompext/symbols/nxcompext::symbols.txt + doc/nxproxy/README-VALGRIND + etc/keystrokes.cfg + etc/nxagent.keyboard + nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 + nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm + nx-X11/programs/Xserver/hw/nxagent/nxmissing.xpm + nx-X11/programs/Xserver/hw/nxagent/x2go.xpm + nx-X11/Makefile + nxcomp/Makefile.in + nxcomp/VERSION + nxcomp/configure.in + nxcomp/nxcomp.pc.in + nxcompshad/Makefile.in + nxcompshad/VERSION + nxcompshad/configure.in + nxcompshad/nxcompshad.pc.in + nxproxy/Makefile.in + nxproxy/VERSION + nxproxy/configure.in + nxproxy/man/nxproxy.1 +Copyright: 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: GPL-2 +Comment: + No explicit license information in individual files. Assuming + copyright holders as found in LICENSE file. + +Files: nx-X11/include/Xpoll.h.in +Copyright: 1994, 1998, The Open Group + 2005, Daniel Stone + 2001, 2011, NoMachine (http://www.nomachine.com) + 2008-2014, Oleksandr Shneyder + 2011-2016, Mike Gabriel */ + 2014-2016, Mihai Moldovan + 2014-2016, Ulrich Sibiller + 2015-2016, Qindel Group (http://www.qindel.com) +License: MIT~OpenGroup +Comment: + Contributions by NoMachine have to be considered as strictly GPL-2 + licensed. + . + Contributions by Daniel Stone have been licensed under MIT~X11. + +Files: nxcomp/mkinstalldirs + nxproxy/mkinstalldirs +Copyright: *No copyright* +License: public-domain + +Files: nxcomp/install-sh + nxcompshad/install-sh + nxproxy/install-sh +Copyright: 1994, X Consortium +License: Expat~NoAdvert +Comment: + Missing license headers. License and copyright information obtained from + later versions of this file as found in automake-1.14. + . + FIXME: This comment will be obsolete for 3.5.99.4. + +Files: debian/* +Copyright: 2011-2016, Mike Gabriel + 2011-2013, Reinhard Tartler + 2015-2016, Mihai Moldovan +License: GPL-2 or GPL-2+ or GPL-3+ or Expat or Expat~NoAdvert or MIT~OpenGroup or MIT~X11 or MIT~Tektronix or MIT~Tektronix~3-clause or MIT~OldStyle or MIT~Adobe or MIT~VeryOldStyle~UniOfCalifornia or MIT~VeryOldStyle~NCD or MIT~ISC or SGI-1.1 or GLX-1.0 or Zlib or XFree86 or BSD-1-clause + +License: GPL-2 + 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 the Free + Software Foundation; version 2 of the License. + . + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + . + You should have received a copy of the GNU General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 51 + Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + . + On Debian systems, the complete text of the GNU General Public License + version 2 can be found in `/usr/share/common-licenses/GPL-2'. + +License: GPL-2+ + 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 the Free + Software Foundation; either version 2 of the License, or (at your option) + any later version. + . + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + . + You should have received a copy of the GNU General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 51 + Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + . + On Debian systems, the complete text of the GNU General Public License + version 2 can be found in `/usr/share/common-licenses/GPL-2'. + +License: GPL-3+ + 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 the Free + Software Foundation; either version 3 of the License, or (at your option) + any later version. + . + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + . + You should have received a copy of the GNU General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 51 + Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + . + On Debian systems, the complete text of the GNU General Public License + version 3 can be found in `/usr/share/common-licenses/GPL-3'. + +License: Expat + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +License: Expat~NoAdvert + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + Except as contained in this notice, the name(s) of the above copyright + holders shall not be used in advertising or otherwise to promote the sale, + use or other dealings in this Software without prior written authorization. + +License: MIT~OpenGroup + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation. + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + Except as contained in this notice, the name of The Open Group shall not be + used in advertising or otherwise to promote the sale, use or other dealings + in this Software without prior written authorization from The Open Group. + +License: MIT~X11 + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that copyright + notice and this permission notice appear in supporting documentation, and + that the name of the copyright holders not be used in advertising or + publicity pertaining to distribution of the software without specific, + written prior permission. The copyright holders make no representations + about the suitability of this software for any purpose. It is provided "as + is" without express or implied warranty. + . + THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + OF THIS SOFTWARE. + +License: MIT~Tektronix + Permission is hereby granted to use, copy, modify, sell, and otherwise + distribute this software and its documentation for any purpose and + without fee, provided that this copyright, permission, and disclaimer + notice is reproduced in all copies of this software and in supporting + documentation. TekColor is a trademark of Tektronix, Inc. + . + Tektronix makes no representation about the suitability of this software + for any purpose. It is provided "as is" and with all faults. + . + TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE, + INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE. IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY + SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF + CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE. + +License: MIT~Tektronix~3-clause + Permission is hereby granted to use, copy, modify, sell, and otherwise + distribute this software and its documentation for any purpose and + without fee, provided that this copyright, permission, and disclaimer + notice is reproduced in all copies of this software and in supporting + documentation. TekColor is a trademark of Tektronix, Inc. + . + Tektronix makes no representation about the suitability of this software + for any purpose. It is provided "as is" and with all faults. + . + TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE, + INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOqSE. IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY + SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER IN AN ACTION OF + CONTRACT, NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE. + +License: MIT~OldStyle + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the name of the copyright holder(s) + not be used in advertising or publicity pertaining to distribution of + the software without specific, written prior permission. + . + THE COPYRIGHT HOLDER(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY + SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF + CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +License: MIT~Adobe + Permission to use, copy, modify, distribute, and sublicense this software and its + documentation for any purpose and without fee is hereby granted, provided that + the above copyright notices appear in all copies and that both those copyright + notices and this permission notice appear in supporting documentation and that + the name of Adobe Systems Incorporated not be used in advertising or publicity + pertaining to distribution of the software without specific, written prior + permission. No trademark license to use the Adobe trademarks is hereby + granted. If the Adobe trademark "Display PostScript"(tm) is used to describe + this software, its functionality or for any other purpose, such use shall be + limited to a statement that this software works in conjunction with the Display + PostScript system. Proper trademark attribution to reflect Adobe's ownership + of the trademark shall be given whenever any such reference to the Display + PostScript system is made. + . + ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR ANY + PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY. ADOBE + DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED + WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON- + INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL ADOBE BE LIABLE TO YOU + OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY + DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,NEGLIGENCE, STRICT + LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. ADOBE WILL NOT PROVIDE ANY TRAINING OR OTHER + SUPPORT FOR THE SOFTWARE. + . + Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems + Incorporated which may be registered in certain jurisdictions. + +License: MIT~VeryOldStyle~UniOfCalifornia + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, provided + that the above copyright notice appear in all copies. The University of + California makes no representations about the suitability of this software + for any purpose. It is provided "as is" without express or implied + warranty. + . + [The University of California makes no representations about the suitability + of this software for any purpose. It is provided "as is" without express or + implied warranty.] + +License: MIT~VeryOldStyle~NCD + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, provided + that the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the name of N.C.D. not be used in advertising or + publicity pertaining to distribution of the software without specific, + written prior permission. N.C.D. makes no representations about the + suitability of this software for any purpose. It is provided "as is" + without express or implied warranty. + +License: MIT~ISC + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + . + THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL + WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE + FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +License: SGI-1.1 + SGI FREE SOFTWARE LICENSE B (Version 1.1 [02/22/2000]) + . + 1. Definitions. + . + 1.1. "Additional Notice Provisions" means such additional provisions as + appear in the Notice in Original Code under the heading "Additional + Notice Provisions." + . + 1.2. "Covered Code" means the Original Code or Modifications, or any + combination thereof. + . + 1.3. "Hardware" means any physical device that accepts input, processes + input, stores the results of processing, and/or provides output. + . + 1.4. "Larger Work" means a work that combines Covered Code or portions + thereof with code not governed by the terms of this License. + . + 1.5. "Licensable" means having the right to grant, to the maximum extent + possible, whether at the time of the initial grant or subsequently + acquired, any and all of the rights conveyed herein. + . + 1.6. "License" means this document. + . + 1.7. "Licensed Patents" means patent claims Licensable by SGI that are + infringed by the use or sale of Original Code or any Modifications + provided by SGI, or any combination thereof. + . + 1.8. "Modifications" means any addition to or deletion from the substance or + structure of the Original Code or any previous Modifications. When + Covered Code is released as a series of files, a Modification is: + . + A. Any addition to the contents of a file containing Original Code and/or + addition to or deletion from the contents of a file containing previous + Modifications. + . + B. Any new file that contains any part of the Original Code or previous + Modifications. + . + 1.9. "Notice" means any notice in Original Code or Covered Code, as required + by and in compliance with this License. + . + 1.10. "Original Code" means source code of computer software code that is + described in the source code Notice required by Exhibit A as Original + Code, and updates and error corrections specifically thereto. + . + 1.11. "Recipient" means an individual or a legal entity exercising rights + under, and complying with all of the terms of, this License or a future + version of this License issued under Section 8. For legal entities, + "Recipient" includes any entity that controls, is controlled by, or is + under common control with Recipient. For purposes of this definition, + "control" of an entity means (a) the power, direct or indirect, to + direct or manage such entity, or (b) ownership of fifty percent (50%) or + more of the outstanding shares or beneficial ownership of such entity. + . + 1.12. "Recipient Patents" means patent claims Licensable by a Recipient that + are infringed by the use or sale of Original Code or any Modifications + provided by SGI, or any combination thereof. + . + 1.13. "SGI" means Silicon Graphics, Inc. + . + 1.14. "SGI Patents" means patent claims Licensable by SGI other than the + Licensed Patents. + . + 2. License Grant and Restrictions. + . + 2.1. SGI License Grant. Subject to the terms of this License and any + third party intellectual property claims, for the duration of + intellectual property protections inherent in the Original Code, SGI + hereby grants Recipient a worldwide, royalty-free, non-exclusive + license, to do the following: (i) under copyrights Licensable by SGI, to + reproduce, distribute, create derivative works from, and, to the extent + applicable, display and perform the Original Code and/or any + Modifications provided by SGI alone and/or as part of a Larger Work; and + (ii) under any Licensable Patents, to make, have made, use, sell, offer + for sale, import and/or otherwise transfer the Original Code and/or any + Modifications provided by SGI. Recipient accepts the terms and + conditions of this License by undertaking any of the aforementioned + actions. The patent license shall apply to the Covered Code if, at the + time any related Modification is added, such addition of the + Modification causes such combination to be covered by the Licensed + Patents. The patent license in Section 2.1(ii) shall not apply to any + other combinations that include the Modification. No patent license is + provided under SGI Patents for infringements of SGI Patents by + Modifications not provided by SGI or combinations of Original Code and + Modifications not provided by SGI. + . + 2.2. Recipient License Grant. Subject to the terms of this License and + any third party intellectual property claims, Recipient hereby grants + SGI and any other Recipients a worldwide, royalty-free, non-exclusive + license, under any Recipient Patents, to make, have made, use, sell, + offer for sale, import and/or otherwise transfer the Original Code + and/or any Modifications provided by SGI. + . + 2.3. No License For Hardware Implementations. The licenses granted in + Section 2.1 and 2.2 are not applicable to implementation in Hardware of + the algorithms embodied in the Original Code or any Modifications + provided by SGI . + . + 3. Redistributions. + . + 3.1. Retention of Notice/Copy of License. The Notice set forth in + Exhibit A, below, must be conspicuously retained or included in any and + all redistributions of Covered Code. For distributions of the Covered + Code in source code form, the Notice must appear in every file that can + include a text comments field; in executable form, the Notice and a copy + of this License must appear in related documentation or collateral where + the Recipient’s rights relating to Covered Code are described. Any + Additional Notice Provisions which actually appears in the Original Code + must also be retained or included in any and all redistributions of + Covered Code. + . + 3.2. Alternative License. Provided that Recipient is in compliance with + the terms of this License, Recipient may, so long as without derogation + of any of SGI’s rights in and to the Original Code, distribute the + source code and/or executable version(s) of Covered Code under (1) this + License; (2) a license identical to this License but for only such + changes as are necessary in order to clarify Recipient’s role as + licensor of Modifications; and/or (3) a license of Recipient’s choosing, + containing terms different from this License, provided that the license + terms include this Section 3 and Sections 4, 6, 7, 10, 12, and 13, which + terms may not be modified or superseded by any other terms of such + license. If Recipient elects to use any license other than this License, + Recipient must make it absolutely clear that any of its terms which + differ from this License are offered by Recipient alone, and not by SGI. + It is emphasized that this License is a limited license, and, regardless + of the license form employed by Recipient in accordance with this + Section 3.2, Recipient may relicense only such rights, in Original Code + and Modifications by SGI, as it has actually been granted by SGI in this + License. + . + 3.3. Indemnity. Recipient hereby agrees to indemnify SGI for any + liability incurred by SGI as a result of any such alternative license + terms Recipient offers. + . + 4. Termination. This License and the rights granted hereunder will + terminate automatically if Recipient breaches any term herein and fails + to cure such breach within 30 days thereof. Any sublicense to the + Covered Code that is properly granted shall survive any termination of + this License, absent termination by the terms of such sublicense. + Provisions that, by their nature, must remain in effect beyond the + termination of this License, shall survive. + . + 5. No Trademark Or Other Rights. This License does not grant any + rights to: (i) any software apart from the Covered Code, nor shall any + other rights or licenses not expressly granted hereunder arise by + implication, estoppel or otherwise with respect to the Covered Code; + (ii) any trade name, trademark or service mark whatsoever, including + without limitation any related right for purposes of endorsement or + promotion of products derived from the Covered Code, without prior + written permission of SGI; or (iii) any title to or ownership of the + Original Code, which shall at all times remains with SGI. All rights in + the Original Code not expressly granted under this License are reserved. + . + 6. Compliance with Laws; Non-Infringement. There are various worldwide + laws, regulations, and executive orders applicable to dispositions of + Covered Code, including without limitation export, re-export, and import + control laws, regulations, and executive orders, of the U.S. government + and other countries, and Recipient is reminded it is obliged to obey + such laws, regulations, and executive orders. Recipient may not + distribute Covered Code that (i) in any way infringes (directly or + contributorily) any intellectual property rights of any kind of any + other person or entity or (ii) breaches any representation or warranty, + express, implied or statutory, to which, under any applicable law, it + might be deemed to have been subject. + . + 7. Claims of Infringement. If Recipient learns of any third party claim + that any disposition of Covered Code and/or functionality wholly or + partially infringes the third party's intellectual property rights, + Recipient will promptly notify SGI of such claim. + . + 8. Versions of the License. SGI may publish revised and/or new versions of + the License from time to time, each with a distinguishing version + number. Once Covered Code has been published under a particular version + of the License, Recipient may, for the duration of the license, continue + to use it under the terms of that version, or choose to use such Covered + Code under the terms of any subsequent version published by SGI. Subject + to the provisions of Sections 3 and 4 of this License, only SGI may + modify the terms applicable to Covered Code created under this License. + . + 9. DISCLAIMER OF WARRANTY. COVERED CODE IS PROVIDED "AS IS." ALL EXPRESS + AND IMPLIED WARRANTIES AND CONDITIONS ARE DISCLAIMED, INCLUDING, WITHOUT + LIMITATION, ANY IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, + SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE, AND + NON-INFRINGEMENT. SGI ASSUMES NO RISK AS TO THE QUALITY AND PERFORMANCE + OF THE SOFTWARE. SHOULD THE SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, SGI + ASSUMES NO COST OR LIABILITY FOR SERVICING, REPAIR OR CORRECTION. THIS + DISCLAIMER OF WARRANTY IS AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT SUBJECT TO THIS + DISCLAIMER. + . + 10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES NOR LEGAL THEORY, + WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT + LIABILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE + LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL + DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS + OF GOODWILL, WORK STOPPAGE, LOSS OF DATA, COMPUTER FAILURE OR + MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF + SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. + THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR + PERSONAL INJURY RESULTING FROM SGI's NEGLIGENCE TO THE EXTENT APPLICABLE + LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT + EXCLUSION AND LIMITATION MAY NOT APPLY TO RECIPIENT. + . + 11. Indemnity. Recipient shall be solely responsible for damages + arising, directly or indirectly, out of its utilization of rights under + this License. Recipient will defend, indemnify and hold harmless Silicon + Graphics, Inc. from and against any loss, liability, damages, costs or + expenses (including the payment of reasonable attorneys fees) arising + out of Recipient's use, modification, reproduction and distribution of + the Covered Code or out of any representation or warranty made by + Recipient. + . + 12. U.S. Government End Users. The Covered Code is a "commercial item" + consisting of "commercial computer software" as such terms are defined + in title 48 of the Code of Federal Regulations and all U.S. Government + End Users acquire only the rights set forth in this License and are + subject to the terms of this License. + . + 13. Miscellaneous. This License represents the complete agreement + concerning the its subject matter. If any provision of this License is + held to be unenforceable, such provision shall be reformed so as to + achieve as nearly as possible the same legal and economic effect as the + original provision and the remainder of this License will remain in + effect. This License shall be governed by and construed in accordance + with the laws of the United States and the State of California as + applied to agreements entered into and to be performed entirely within + California between California residents. Any litigation relating to this + License shall be subject to the exclusive jurisdiction of the Federal + Courts of the Northern District of California (or, absent subject matter + jurisdiction in such courts, the courts of the State of California), + with venue lying exclusively in Santa Clara County, California, with the + losing party responsible for costs, including without limitation, court + costs and reasonable attorneys fees and expenses. The application of the + United Nations Convention on Contracts for the International Sale of + Goods is expressly excluded. Any law or regulation that provides that + the language of a contract shall be construed against the drafter shall + not apply to this License. + . + Exhibit A + . + License Applicability. Except to the extent portions of this file are + made subject to an alternative license as permitted in the SGI Free + Software License B, Version 1.1 (the "License"), the contents of this + file are subject only to the provisions of the License. You may not use + this file except in compliance with the License. You may obtain a copy + of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 + Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: + . + http://oss.sgi.com/projects/FreeB + . + Note that, as provided in the License, the Software is distributed on an + "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS + DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND + CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A + PARTICULAR PURPOSE, AND NON-INFRINGEMENT. + . + Original Code. The Original Code is: [name of software, version number, + and release date], developed by Silicon Graphics, Inc. The Original Code + is Copyright (c) [dates of first publication, as appearing in the Notice + in the Original Code] Silicon Graphics, Inc. Copyright in any portions + created by third parties is as indicated elsewhere herein. All Rights + Reserved. + . + Additional Notice Provisions: [such additional provisions, if any, as + appear in the Notice in the Original Code under the heading "Additional + Notice Provisions"] + +License: GLX-1.0 + GLX PUBLIC LICENSE (Version 1.0 (2/11/99)) ("License") + . + Subject to any third party claims, Silicon Graphics, Inc. ("SGI") hereby + grants permission to Recipient (defined below), under Recipient's + copyrights in the Original Software (defined below), to use, copy, + modify, merge, publish, distribute, sublicense and/or sell copies of + Subject Software (defined below), and to permit persons to whom the + Subject Software is furnished in accordance with this License to do the + same, subject to all of the following terms and conditions, which + Recipient accepts by engaging in any such use, copying, modifying, + merging, publishing, distributing, sublicensing or selling: + . + 1. Definitions. + . + (a) "Original Software" means source code of computer software code + which is described in Exhibit A as Original Software. + . + (b) "Modifications" means any addition to or deletion from the + substance or structure of either the Original Software or any + previous Modifications. When Subject Software is released as a + series of files, a Modification means (i) any addition to or + deletion from the contents of a file containing Original Software or + previous Modifications and (ii) any new file that contains any part + of the Original Code or previous Modifications. + . + (c) "Subject Software" means the Original Software or Modifications + or the combination of the Original Software and Modifications, or + portions of any of the foregoing. + . + (d) "Recipient" means an individual or a legal entity exercising + rights under, and complying with all of the terms of, this License. + For legal entities, "Recipient" includes any entity which controls, + is controlled by, or is under common control with Recipient. For + purposes of this definition, "control" of an entity means (a) the + power, direct or indirect, to direct or manage such entity, or (b) + ownership of fifty percent (50%) or more of the outstanding shares + or beneficial ownership of such entity. + . + 2. Redistribution of Source Code Subject to These Terms. Redistributions + of Subject Software in source code form must retain the notice set forth + in Exhibit A, below, in every file. A copy of this License must be + included in any documentation for such Subject Software where the + recipients' rights relating to Subject Software are described. Recipient + may distribute the source code version of Subject Software under a + license of Recipient's choice, which may contain terms different from + this License, provided that (i) Recipient is in compliance with the + terms of this License, and (ii) the license terms include this Section 2 + and Sections 3, 4, 7, 8, 10, 12 and 13 of this License, which terms may + not be modified or superseded by any other terms of such license. If + Recipient distributes the source code version under a different license + Recipient must make it absolutely clear that any terms which differ from + this License are offered by Recipient alone, not by SGI. Recipient + hereby agrees to indemnify SGI for any liability incurred by SGI as a + result of any such terms Recipient offers. + . + 3. Redistribution in Executable Form. The notice set forth in Exhibit A + must be conspicuously included in any notice in an executable version of + Subject Software, related documentation or collateral in which Recipient + describes the user's rights relating to the Subject Software. Recipient + may distribute the executable version of Subject Software under a + license of Recipient's choice, which may contain terms different from + this License, provided that (i) Recipient is in compliance with the + terms of this License, and (ii) the license terms include this Section 3 + and Sections 4, 7, 8, 10, 12 and 13 of this License, which terms may not + be modified or superseded by any other terms of such license. If + Recipient distributes the executable version under a different license + Recipient must make it absolutely clear that any terms which differ from + this License are offered by Recipient alone, not by SGI. Recipient + hereby agrees to indemnify SGI for any liability incurred by SGI as a + result of any such terms Recipient offers. + . + 4. Termination. This License and the rights granted hereunder will + terminate automatically if Recipient fails to comply with terms herein + and fails to cure such breach within 30 days of the breach. Any + sublicense to the Subject Software which is properly granted shall + survive any termination of this License absent termination by the terms + of such sublicense. Provisions which, by their nature, must remain in + effect beyond the termination of this License shall survive. + . + 5. No Trademark Rights. This License does not grant any rights to use + any trade name, trademark or service mark whatsoever. No trade name, + trademark or service mark of SGI may be used to endorse or promote + products derived from the Subject Software without prior written + permission of SGI. + . + 6. No Other Rights. This License does not grant any rights with respect + to the OpenGL API or to any software or hardware implementation thereof + or to any other software whatsoever, nor shall any other rights or + licenses not expressly granted hereunder arise by implication, estoppel + or otherwise with respect to the Subject Software. Title to and + ownership of the Original Software at all times remains with SGI. All + rights in the Original Software not expressly granted under this License + are reserved. + . + 7. Compliance with Laws; Non-Infringement. Recipient shall comply with + all applicable laws and regulations in connection with use and + distribution of the Subject Software, including but not limited to, all + export and import control laws and regulations of the U.S. government + and other countries. Recipient may not distribute Subject Software that + (i) in any way infringes (directly or contributorily) the rights + (including patent, copyright, trade secret, trademark or other + intellectual property rights of any kind) of any other person or entity + or (ii) breaches any representation or warranty, express, implied or + statutory, which under any applicable law it might be deemed to have + been distributed. + . + 8. Claims of Infringement. If Recipient at any time has knowledge of any + one or more third party claims that reproduction, modification, use, + distribution, import or sale of Subject Software (including particular + functionality or code incorporated in Subject Software) infringes the + third party's intellectual property rights, Recipient must place in a + well-identified web page bearing the title "LEGAL" a description of each + such claim and a description of the party making each such claim in + sufficient detail that a user of the Subject Software will know whom to + contact regarding the claim. Also, upon gaining such knowledge of any + such claim, Recipient must conspicuously include the URL for such web + page in the Exhibit A notice required under Sections 2 and 3, above, and + in the text of any related documentation, license agreement or + collateral in which Recipient describes end user's rights relating to + the Subject Software. If Recipient obtains such knowledge after it makes + Subject Software available to any other person or entity, Recipient + shall take other steps (such as notifying appropriate mailing lists or + newsgroups) reasonably calculated to inform those who received the + Subject Software that new knowledge has been obtained. + . + 9. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" + BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, + INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS + FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON- + INFRINGING. SGI ASSUMES NO RISK AS TO THE QUALITY AND PERFORMANCE OF THE + SOFTWARE. SHOULD ANY SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, SGI + ASSUMES NO COST OR LIABILITY FOR ANY SERVICING, REPAIR OR CORRECTION. + THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS + LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT + UNDER THIS DISCLAIMER. + . + 10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL + THEORY, WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR + STRICT LIABILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR + BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR + CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, + DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, LOSS OF DATA, COMPUTER + FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR + LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY + OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO + LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SGI's NEGLIGENCE + TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME + JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR + CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO + RECIPIENT. + . + 11. Indemnity. Recipient shall be solely responsible for damages + arising, directly or indirectly, out of its utilization of rights under + this License. Recipient will defend, indemnify and hold harmless Silicon + Graphics, Inc. from and against any loss, liability, damages, costs or + expenses (including the payment of reasonable attorneys fees) arising + out of Recipient's use, modification, reproduction and distribution of + the Subject Software or out of any representation or warranty made by + Recipient. + . + 12. U.S. Government End Users. The Subject Software is a "commercial + item" consisting of "commercial computer software" as such terms are + defined in title 48 of the Code of Federal Regulations and all U.S. + Government End Users acquire only the rights set forth in this License + and are subject to the terms of this License. + . + 13. Miscellaneous. This License represents the complete agreement + concerning subject matter hereof. If any provision of this License is + held to be unenforceable, such provision shall be reformed so as to + achieve as nearly as possible the same economic effect as the original + provision and the remainder of this License will remain in effect. This + License shall be governed by and construed in accordance with the laws + of the United States and the State of California as applied to + agreements entered into and to be performed entirely within California + between California residents. Any litigation relating to this License + shall be subject to the exclusive jurisdiction of the Federal Courts of + the Northern District of California (or, absent subject matter + jurisdiction in such courts, the courts of the State of California), + with venue lying exclusively in Santa Clara County, California, with the + losing party responsible for costs, including without limitation, court + costs and reasonable attorneys fees and expenses. The application of the + United Nations Convention on Contracts for the International Sale of + Goods is expressly excluded. Any law or regulation which provides that + the language of a contract shall be construed against the drafter shall + not apply to this License. + . + Exhibit A + . + The contents of this file are subject to Sections 2, 3, 4, 7, 8, 10, 12 + and 13 of the GLX Public License Version 1.0 (the "License"). You may + not use this file except in compliance with those sections of the + License. You may obtain a copy of the License at Silicon Graphics, Inc., + attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043 + or at http://www.sgi.com/software/opensource/glx/license.html. + . + Software distributed under the License is distributed on an "AS IS" + basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY + IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR + PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific + language governing rights and limitations under the License. + . + The Original Software is GLX version 1.2 source code, released February, + 1999. The developer of the Original Software is Silicon Graphics, Inc. + Those portions of the Subject Software created by Silicon Graphics, Inc. + are Copyright (c) 1991-1999 Silicon Graphics, Inc. All Rights Reserved. + +License: XFree86 + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + Except as contained in this notice, the name of The XFree86 Project + Inc. shall not be used in advertising or otherwise to promote the + sale, use or other dealings in this Software without prior written + authorization from The XFree86 Project Inc.. + +License: Zlib + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + . + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + . + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + +License: BSD-1-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: public-domain + No license required for any purpose; the work is not subject to + copyright in any jurisdiction. diff --git a/debian/copyright.in b/debian/copyright.in index 4e828ccc9..92955a4a4 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -1484,7 +1484,6 @@ Files: nx-X11/extras/Mesa/include/GL/glext.h nx-X11/programs/Xserver/GL/glx/singlesize.h nx-X11/programs/Xserver/GL/glx/unpack.h nx-X11/programs/Xserver/GL/glx/xfont.c - nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h Copyright: 1991-2000, Silicon Graphics, Inc 1991-2004, Silicon Graphics, Inc License: UNKNOWN @@ -1862,16 +1861,6 @@ Copyright: 1994-1995, Hewlett-Packard Company License: Expat FIXME -Files: nx-X11/extras/Mesa/include/GL/xmesa_xf86.h - nx-X11/programs/Xserver/GL/include/GL/xf86glx.h - nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c - nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c - nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.h - nx-X11/programs/Xserver/GL/mesa/X/xf86glxint.h -Copyright: 1998-1999, Precision Insight, Inc., Cedar Park, Texas -License: Expat - FIXME - Files: nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.c nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.h nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.c @@ -1894,6 +1883,15 @@ Copyright: 1993-1994, 1998 The Open Group License: UNKNOWN FIXME +Files: nx-X11/extras/Mesa/include/GL/xmesa_xf86.h + nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c + nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c + nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.h + nx-X11/programs/Xserver/GL/mesa/X/xf86glxint.h +Copyright: 1998-1999, Precision Insight, Inc., Cedar Park, Texas +License: Expat + FIXME + Files: nx-X11/lib/X11/XimintL.h nx-X11/lib/X11/imImSw.c nx-X11/lib/X11/imLcIm.c @@ -1930,15 +1928,6 @@ Copyright: 2004, Eric Anholt License: UNKNOWN FIXME -Files: nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h - nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h - nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h -Copyright: 1999-2001, Brian Paul - 1999-2003, Brian Paul - IBM Corporation 2004 -License: Expat - FIXME - Files: nx-X11/extras/Mesa/src/mesa/shader/atifragshader.c nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.c nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.h @@ -2010,6 +1999,21 @@ Copyright: 1987, the Regents of the University of California License: UNKNOWN FIXME +Files: nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h + nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h +Copyright: 1999-2001, Brian Paul + 1999-2003, Brian Paul + IBM Corporation 2004 +License: Expat + FIXME + +Files: nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h + nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h +Copyright: 1999-2001, Brian Paul + IBM Corporation 2004, +License: Expat + FIXME + Files: nx-X11/programs/Xserver/dix/region.c nx-X11/programs/Xserver/mi/mivaltree.c Copyright: 1987-1989, 1998 The Open Group @@ -2214,12 +2218,6 @@ Copyright: 2004, Alexander Gottwald License: Expat FIXME -Files: nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h -Copyright: 1999-2001, Brian Paul - IBM Corporation 2004, -License: Expat - FIXME - Files: nx-X11/extras/Mesa/src/mesa/main/simple_list.h Copyright: 1997, Keith Whitwell 1999-2001, Brian Paul -- cgit v1.2.3 From da82328b2c3e19df546a875c62a5d7e8731a764e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 5 Feb 2017 19:16:54 +0000 Subject: nx-X11/config/cf/X11.tmpl: Fix DefaultRGBDatabase path to $(USRDATADIR)/rgb (not $(LIBDIR)/rgb). --- nx-X11/config/cf/X11.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index b2f3c001e..fe94e1f4d 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -313,7 +313,7 @@ XORGRELSTRING = XorgManVersionString # define DefaultFSFontPath DefaultFontPath #endif #ifndef DefaultRGBDatabase -#define DefaultRGBDatabase $(LIBDIR)/rgb +#define DefaultRGBDatabase $(USRDATADIR)/rgb #endif #ifndef UseRgbTxt #define UseRgbTxt NO /* default is to compile with dbm */ -- cgit v1.2.3 From baf7a926716192cdaea7a52b76bb61decf5cda0d Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 8 Feb 2017 21:13:38 +0100 Subject: Screen.c: Ensure that an output is unused before destroying it Fixes ArcticaProject/nx-libs#293 --- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 42 +++++++++++++++++++---------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 0e0cd0b21..2f6381696 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -3741,6 +3741,27 @@ int nxagentChangeScreenConfig(int screen, int width, int height, int mmWidth, in return r; } +/* + Destroy an output after removing it from any crtc that might reference it + */ +void nxagentDropOutput(RROutputPtr o) { + RRCrtcPtr c = o->crtc; + if (c) { + for (int i = 0; i < c->numOutputs; i++) { + if (c->outputs[i] == o) { +#ifdef DEBUG + fprintf(stderr, "nxagentDropOutput: output [%s] is in use by crtc [%p], removing it from there\n", o->name, c); +#endif + RRCrtcSet(c, NULL, 0, 0, RR_Rotate_0, 0, NULL); + } + } + } +#ifdef DEBUG + fprintf(stderr, "nxagentDropOutput: destroying output [%s]\n", o->name); +#endif + RROutputDestroy(o); +} + int nxagentAdjustRandRXinerama(ScreenPtr pScreen) { rrScrPrivPtr pScrPriv; @@ -3858,6 +3879,8 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen) #ifdef DEBUG fprintf(stderr, "nxagentAdjustRandRXinerama: destroying crtc\n"); #endif + /* first reset the crtc to free possible outputs, then destroy the crtc */ + RRCrtcSet(pScrPriv->crtcs[pScrPriv->numCrtcs - 1], NULL, 0, 0, RR_Rotate_0, 0, NULL); RRCrtcDestroy(pScrPriv->crtcs[pScrPriv->numCrtcs - 1]); } else @@ -3886,22 +3909,13 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen) } /* delete superfluous non-NX outputs */ - for (i = pScrPriv->numOutputs - 1; i >= 0; i--) { - if (strncmp(pScrPriv->outputs[i]->name, "NX", 2)) { - #ifdef DEBUG - fprintf(stderr, "nxagentAdjustRandRXinerama: destroying output [%s]\n", pScrPriv->outputs[i]->name); - #endif - RROutputDestroy(pScrPriv->outputs[i]); - } - } + for (i = pScrPriv->numOutputs - 1; i >= 0; i--) + if (strncmp(pScrPriv->outputs[i]->name, "NX", 2)) + nxagentDropOutput(pScrPriv->outputs[i]); /* at this stage only NX outputs are left - we delete the superfluous ones */ - for (i = pScrPriv->numOutputs - 1; i >= number; i--) { - #ifdef DEBUG - fprintf(stderr, "nxagentAdjustRandRXinerama: destroying nx output [%s]\n", pScrPriv->outputs[i]->name); - #endif - RROutputDestroy(pScrPriv->outputs[i]); - } + for (i = pScrPriv->numOutputs - 1; i >= number; i--) + nxagentDropOutput(pScrPriv->outputs[i]); /* add and init outputs */ for (i = 0; i < number; i++) { -- cgit v1.2.3 From f22e873e6f141b98bfc57a5443c11a9d6b8645c3 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 8 Feb 2017 21:43:45 +0100 Subject: Screen.c: clean up superfluous whitespace --- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 2f6381696..3039f4139 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -3812,7 +3812,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen) */ if (number == 0) { #ifdef DEBUG - fprintf(stderr, "nxagentAdjustRandRXinerama: faking xinerama\n" ); + fprintf(stderr, "nxagentAdjustRandRXinerama: faking xinerama\n"); #endif number = 1; @@ -3934,7 +3934,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen) output = pScrPriv->outputs[i]; } #ifdef DEBUG - fprintf(stderr, "nxagentAdjustRandRXinerama: adjusting output [%s]\n", pScrPriv->outputs[i]->name); + fprintf(stderr, "nxagentAdjustRandRXinerama: adjusting output [%s]\n", pScrPriv->outputs[i]->name); #endif RROutputSetCrtcs(output, &(pScrPriv->crtcs[i]), 1); /* FIXME: Isn't there a function for setting this? */ @@ -3945,7 +3945,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen) RROutputSetPhysicalSize(output, 0, 0); } - for (i = 0; i < pScrPriv->numOutputs; i++ ) { + for (i = 0; i < pScrPriv->numOutputs; i++) { Bool disable_output = FALSE; RRModePtr mymode, prevmode; int new_x, new_y; @@ -4089,7 +4089,6 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen) /* throw away the mode if otherwise unused. We do not need it anymore. We call FreeResource() to ensure the system will not try to free it again on shutdown */ - if (prevmode && prevmode->refcnt == 1) { #ifdef DEBUG fprintf(stderr, "nxagentAdjustRandRXinerama: destroying prevmode [%s]\n", prevmode->name); -- cgit v1.2.3 From 0f9a11a94b5fb52b5f1f9c79a93c54fc6396cab8 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 18:41:52 +0100 Subject: drop platform support: unifdef __UNIXOS2__. Fixes ArcticaProject/nx-libs#271. --- nx-X11/config/cf/Imake.cf | 7 - nx-X11/config/cf/Imake.tmpl | 2 +- nx-X11/config/cf/xorg.cf | 2 +- nx-X11/extras/Mesa/include/GL/glxext.h | 2 +- nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c | 5 - nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c | 5 - nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c | 5 - nx-X11/include/Xos.h | 8 +- nx-X11/include/Xosdefs.h | 5 - nx-X11/lib/X11/CrGlCur.c | 4 - nx-X11/lib/X11/GetDflt.c | 11 - nx-X11/lib/X11/Imakefile | 12 +- nx-X11/lib/X11/RdBitF.c | 3 - nx-X11/lib/X11/SetLocale.c | 4 +- nx-X11/lib/X11/WMProps.c | 8 - nx-X11/lib/X11/WrBitF.c | 3 - nx-X11/lib/X11/XKBCvt.c | 4 - nx-X11/lib/X11/Xlib.h | 4 - nx-X11/lib/X11/XlibInt.c | 19 - nx-X11/lib/X11/Xlibint.h | 6 - nx-X11/lib/X11/Xrm.c | 17 +- nx-X11/lib/X11/cmsColNm.c | 3 - nx-X11/lib/X11/lcDB.c | 13 - nx-X11/lib/X11/lcFile.c | 65 +--- nx-X11/lib/X11/os2Stubs.c | 428 ----------------------- nx-X11/programs/Xserver/Imakefile | 2 +- nx-X11/programs/Xserver/Xext/security.c | 20 -- nx-X11/programs/Xserver/hw/nxagent/Imakefile | 7 - nx-X11/programs/Xserver/hw/nxagent/os2Stub.c | 410 ---------------------- nx-X11/programs/Xserver/include/os.h | 2 +- nx-X11/programs/Xserver/include/servermd.h | 2 - nx-X11/programs/Xserver/os/WaitFor.c | 3 - nx-X11/programs/Xserver/os/access.c | 7 - nx-X11/programs/Xserver/os/connection.c | 29 +- nx-X11/programs/Xserver/os/io.c | 6 +- nx-X11/programs/Xserver/os/log.c | 3 - nx-X11/programs/Xserver/os/oscolor.c | 11 - nx-X11/programs/Xserver/os/osdep.h | 2 +- nx-X11/programs/Xserver/os/osinit.c | 2 +- nx-X11/programs/Xserver/os/utils.c | 26 +- nx-X11/programs/Xserver/xkb/ddxConfig.c | 3 - nx-X11/programs/Xserver/xkb/ddxLoad.c | 36 +- nx-X11/programs/Xserver/xkb/xkbInit.c | 2 +- 43 files changed, 24 insertions(+), 1194 deletions(-) delete mode 100644 nx-X11/lib/X11/os2Stubs.c delete mode 100644 nx-X11/programs/Xserver/hw/nxagent/os2Stub.c diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf index 8decfdc3c..54c7d0aee 100644 --- a/nx-X11/config/cf/Imake.cf +++ b/nx-X11/config/cf/Imake.cf @@ -1117,13 +1117,6 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686 #endif #endif -#ifdef emxos2 -#define MacroIncludeFile -#define MacroFile os2.cf -#define OS2Architecture -#define i386Architecture -#endif /* emxos2 */ - #if defined(__QNX__) && !defined(__QNXNTO__) #define MacroIncludeFile #define MacroFile QNX4.cf diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index 5c8effee5..1488c9a32 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -466,7 +466,7 @@ XCOMM the platform-specific parameters - edit site.def to change #define HasBasename YES #endif #ifndef HasGetopt -# if !defined(Win32Architecture) && !defined(OS2Architecture) +# if !defined(Win32Architecture) # define HasGetopt YES # else # define HasGetopt NO diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index fb0dbfd08..63ea21264 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -513,7 +513,7 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # if SystemV || SystemV4 || \ (defined(LinuxArchitecture) && !defined(Mc68020Architecture)) || \ defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || \ - defined(OS2Architecture) || defined(GNUMachArchitecture) || \ + defined(GNUMachArchitecture) || \ (defined(KFreeBSDArchitecture) && defined(i386Architecture)) # define BuildScanpci YES # else diff --git a/nx-X11/extras/Mesa/include/GL/glxext.h b/nx-X11/extras/Mesa/include/GL/glxext.h index 589d1ef36..0f5321a6c 100644 --- a/nx-X11/extras/Mesa/include/GL/glxext.h +++ b/nx-X11/extras/Mesa/include/GL/glxext.h @@ -340,7 +340,7 @@ typedef long int int64_t; typedef long long int int64_t; #endif /* __arch64__ */ #endif /* __STDC__ */ -#elif defined(__UNIXOS2__) || defined(__SOL64__) +#elif defined(__SOL64__) typedef long int int32_t; typedef long long int int64_t; #elif defined( __VMS ) diff --git a/nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c b/nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c index ae8108b88..da482a2dd 100644 --- a/nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c +++ b/nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c @@ -36,11 +36,6 @@ #include "m_debug.h" #include "m_debug_util.h" -#ifdef __UNIXOS2__ -/* The linker doesn't like empty files */ -static char dummy; -#endif - #ifdef DEBUG /* This code only used for debugging */ static clip_func *clip_tab[2] = { diff --git a/nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c b/nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c index e40399855..4eac6f6dc 100644 --- a/nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c +++ b/nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c @@ -38,11 +38,6 @@ #include "m_debug_util.h" -#ifdef __UNIXOS2__ -/* The linker doesn't like empty files */ -static char dummy; -#endif - #ifdef DEBUG /* This code only used for debugging */ diff --git a/nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c b/nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c index d8250f246..84e11fe34 100644 --- a/nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c +++ b/nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c @@ -37,11 +37,6 @@ #include "m_debug.h" #include "m_debug_util.h" -#ifdef __UNIXOS2__ -/* The linker doesn't like empty files */ -static char dummy; -#endif - #ifdef DEBUG /* This code only used for debugging */ diff --git a/nx-X11/include/Xos.h b/nx-X11/include/Xos.h index e79cec662..10b3a225f 100644 --- a/nx-X11/include/Xos.h +++ b/nx-X11/include/Xos.h @@ -246,12 +246,6 @@ typedef unsigned long fd_mask; #endif #endif /* XPG4 else */ -#ifdef __UNIXOS2__ -typedef unsigned long fd_mask; -#include -#define MAX_PATH _POSIX_PATH_MAX -#endif - #ifdef __GNU__ #define PATH_MAX 4096 #define MAXPATHLEN 4096 @@ -269,7 +263,7 @@ typedef unsigned long fd_mask; #define NGROUPS 16 #endif -#if defined(ISC) || defined(__UNIXOS2__) || \ +#if defined(ISC) || \ (defined(__linux__) && !defined(__GLIBC__)) || \ (defined(__QNX__) && !defined(UNIXCONN)) /* diff --git a/nx-X11/include/Xosdefs.h b/nx-X11/include/Xosdefs.h index 3b151199e..ae676f9ff 100644 --- a/nx-X11/include/Xosdefs.h +++ b/nx-X11/include/Xosdefs.h @@ -127,11 +127,6 @@ in this Software without prior written authorization from The Open Group. #define X_NOT_STDC_ENV #endif -#ifdef __UNIXOS2__ -#define USGISH -#define NULL_NOT_ZERO -#endif - #ifdef __DARWIN__ #define NULL_NOT_ZERO #endif diff --git a/nx-X11/lib/X11/CrGlCur.c b/nx-X11/lib/X11/CrGlCur.c index 460660f81..11c047097 100644 --- a/nx-X11/lib/X11/CrGlCur.c +++ b/nx-X11/lib/X11/CrGlCur.c @@ -31,10 +31,6 @@ in this Software without prior written authorization from The Open Group. #ifdef USE_DYNAMIC_XCURSOR -#ifdef __UNIXOS2__ -#define RTLD_LAZY 1 -#define LIBXCURSOR "Xcursor.dll" -#endif #include #include #if defined(hpux) diff --git a/nx-X11/lib/X11/GetDflt.c b/nx-X11/lib/X11/GetDflt.c index f2098dff3..c2cc1da47 100644 --- a/nx-X11/lib/X11/GetDflt.c +++ b/nx-X11/lib/X11/GetDflt.c @@ -184,10 +184,6 @@ XGetDefault( #ifdef WIN32 char *progname2; #endif -#ifdef __UNIXOS2__ - char *progname2; - char *dotpos; -#endif /* * strip path off of program name (XXX - this is OS specific) @@ -198,13 +194,6 @@ XGetDefault( if (progname2 && (!progname || progname < progname2)) progname = progname2; #endif -#ifdef __UNIXOS2__ /* Very similar to WIN32 */ - progname2 = strrchr (prog, '\\'); - if (progname2 && (!progname || progname < progname2)) - progname = progname2; - dotpos = strrchr (prog, '.'); - if (dotpos && (dotpos>progname2)) *dotpos='\0'; -#endif /* We take out the .exe suffix */ if (progname) progname++; diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index b3fc07adf..69b96314a 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -806,7 +806,7 @@ SRCS3 = \ LockDis.c \ x11_trans.c \ xim_trans.c \ - $(XKBSRCS) $(LCSRCS) $(MISCSRCS) + $(XKBSRCS) $(LCSRCS) OBJS3 = \ Lab.o \ @@ -889,7 +889,7 @@ OBJS3 = \ LockDis.o \ x11_trans.o \ xim_trans.o \ - $(XKBOBJS) $(LCOBJS) $(MISCOBJS) + $(XKBOBJS) $(LCOBJS) SHAREDLCDEPSYMSRCS = XlcDL.c XlcSL.c @@ -1036,14 +1036,6 @@ SHAREDLCOBJS = \ $(SHAREDLCDEPOBJS) \ $(SHAREDI18NSTATICOBJS) -#ifdef OS2Architecture -MISCSRCS = os2Stubs.c -#endif - -#ifdef OS2Architecture -MISCOBJS = os2Stubs.o -#endif - OBJS = $(OBJS1) $(OBJS2) $(OBJS3) EXTRAUNSHAREDOBJS = $(STATICLCOBJS) diff --git a/nx-X11/lib/X11/RdBitF.c b/nx-X11/lib/X11/RdBitF.c index c2316ae0c..319a0ee0b 100644 --- a/nx-X11/lib/X11/RdBitF.c +++ b/nx-X11/lib/X11/RdBitF.c @@ -129,9 +129,6 @@ XReadBitmapFileData ( int hx = -1; /* x hotspot */ int hy = -1; /* y hotspot */ -#ifdef __UNIXOS2__ - filename = __XOS2RedirRoot(filename); -#endif if (!(fstream = fopen(filename, "r"))) return BitmapOpenFailed; diff --git a/nx-X11/lib/X11/SetLocale.c b/nx-X11/lib/X11/SetLocale.c index f4d2aca21..e14fdaef6 100644 --- a/nx-X11/lib/X11/SetLocale.c +++ b/nx-X11/lib/X11/SetLocale.c @@ -99,7 +99,7 @@ _XlcMapOSLocaleName( char *osname, char *siname) { -#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32) || defined(__UNIXOS2__) || defined(linux) +#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32) || defined(linux) # ifdef hpux # ifndef _LastCategory /* HPUX 9 and earlier */ @@ -116,7 +116,7 @@ _XlcMapOSLocaleName( # define STARTCHAR '\001' # define ENDCHAR '\001' # else -# if defined(WIN32) || defined(__UNIXOS2__) +# if defined(WIN32) # define SKIPCOUNT 1 # define STARTCHAR '=' # define ENDCHAR ';' diff --git a/nx-X11/lib/X11/WMProps.c b/nx-X11/lib/X11/WMProps.c index 249072936..e77f7ba56 100644 --- a/nx-X11/lib/X11/WMProps.c +++ b/nx-X11/lib/X11/WMProps.c @@ -122,14 +122,6 @@ void XSetWMProperties ( * systems will have to change this. */ char *cp = strrchr (argv[0], '/'); -#ifdef __UNIXOS2__ - char *os2_cp = strrchr (argv[0],'\\'); - char *dot_cp = strrchr (argv[0],'.'); - if (os2_cp && (os2_cp > cp)) { - if(dot_cp && (dot_cp > os2_cp)) *dot_cp = '\0'; - cp=os2_cp; - } -#endif tmp.res_name = (cp ? cp + 1 : argv[0]); } tmp.res_class = classHints->res_class; diff --git a/nx-X11/lib/X11/WrBitF.c b/nx-X11/lib/X11/WrBitF.c index 0b27d5adf..47b47208f 100644 --- a/nx-X11/lib/X11/WrBitF.c +++ b/nx-X11/lib/X11/WrBitF.c @@ -105,9 +105,6 @@ XWriteBitmapFile( else name++; -#ifdef __UNIXOS2__ - filename = (char*)__XOS2RedirRoot(filename); -#endif if (!(stream = fopen(filename, "w"))) return(BitmapOpenFailed); diff --git a/nx-X11/lib/X11/XKBCvt.c b/nx-X11/lib/X11/XKBCvt.c index f4df3fcfc..ded0a3e3a 100644 --- a/nx-X11/lib/X11/XKBCvt.c +++ b/nx-X11/lib/X11/XKBCvt.c @@ -279,11 +279,7 @@ _XkbGetCharset(void) else { struct stat sbuf; FILE *file; -#ifndef __UNIXOS2__ char *cf = CHARSET_FILE; -#else - char *cf = __XOS2RedirRoot(CHARSET_FILE); -#endif #ifndef S_ISREG # define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG) diff --git a/nx-X11/lib/X11/Xlib.h b/nx-X11/lib/X11/Xlib.h index 1ac1ef181..b68a09f2b 100644 --- a/nx-X11/lib/X11/Xlib.h +++ b/nx-X11/lib/X11/Xlib.h @@ -51,13 +51,9 @@ in this Software without prior written authorization from The Open Group. #ifndef X_WCHAR #include #else -#ifdef __UNIXOS2__ -#include -#else /* replace this with #include or typedef appropriate for your system */ typedef unsigned long wchar_t; #endif -#endif extern int diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c index 42b928fd5..bae224ee1 100644 --- a/nx-X11/lib/X11/XlibInt.c +++ b/nx-X11/lib/X11/XlibInt.c @@ -169,14 +169,9 @@ extern int _X11TransSocketCongestionChange(XtransConnInfo, int *); #define ECHECK(err) (WSAGetLastError() == err) #define ESET(val) WSASetLastError(val) #else -#ifdef __UNIXOS2__ -#define ECHECK(err) (errno == err) -#define ESET(val) -#else #define ECHECK(err) (errno == err) #define ESET(val) errno = val #endif -#endif #if defined(LOCALCONN) || defined(LACHMAN) #ifdef EMSGSIZE @@ -190,14 +185,6 @@ extern int _X11TransSocketCongestionChange(XtransConnInfo, int *); #endif #endif -#ifdef __UNIXOS2__ -#if !USE_XCB -#define select(n,r,w,x,t) os2ClientSelect(n,r,w,x,t) -#endif /* !USE_XCB */ -#include -#define MAX_PATH _POSIX_PATH_MAX -#endif - #if !USE_XCB #define STARTITERATE(tpvar,type,start,endcond) \ @@ -4054,10 +4041,6 @@ static int AccessFile (path, pathbuf, len_pathbuf, pathret) /* try the places set in the environment */ drive = getenv ("_XBASEDRIVE"); -#ifdef __UNIXOS2__ - if (!drive) - drive = getenv ("X11ROOT"); -#endif if (!drive) drive = "C:"; len = strlen (drive) + strlen (path); @@ -4070,7 +4053,6 @@ static int AccessFile (path, pathbuf, len_pathbuf, pathret) return 1; } -#ifndef __UNIXOS2__ /* one last place to look */ drive = getenv ("HOMEDRIVE"); if (drive) { @@ -4105,7 +4087,6 @@ static int AccessFile (path, pathbuf, len_pathbuf, pathret) } } } -#endif return 0; } diff --git a/nx-X11/lib/X11/Xlibint.h b/nx-X11/lib/X11/Xlibint.h index 932ed745e..c138d6360 100644 --- a/nx-X11/lib/X11/Xlibint.h +++ b/nx-X11/lib/X11/Xlibint.h @@ -1249,12 +1249,6 @@ struct _XConnWatchInfo { /* info from XAddConnectionWatch */ struct _XConnWatchInfo *next; }; -#ifdef __UNIXOS2__ -extern char* __XOS2RedirRoot( - char* -); -#endif - extern int _XTextHeight( XFontStruct* /* font_struct */, _Xconst char* /* string */, diff --git a/nx-X11/lib/X11/Xrm.c b/nx-X11/lib/X11/Xrm.c index 3b90346d8..e3587d021 100644 --- a/nx-X11/lib/X11/Xrm.c +++ b/nx-X11/lib/X11/Xrm.c @@ -305,7 +305,7 @@ typedef unsigned char XrmBits; static XrmBits const xrmtypes[256] = { EOS,0,0,0,0,0,0,0, 0,SPACE,EOL,0,0, -#if defined(WIN32) || defined(__UNIXOS2__) +#if defined(WIN32) EOL, /* treat CR the same as LF, just in case */ #else 0, @@ -1575,10 +1575,6 @@ ReadInFile(_Xconst char *filename) register int fd, size; char * filebuf; -#ifdef __UNIXOS2__ - filename = __XOS2RedirRoot(filename); -#endif - /* * MS-Windows and OS/2 note: Default open mode includes O_TEXT */ @@ -1610,17 +1606,6 @@ ReadInFile(_Xconst char *filename) } size = read (fd, filebuf, size); -#ifdef __UNIXOS2__ - { /* kill CRLF */ - int i,k; - for (i=k=0; i= (BUFSIZ - 5))){ diff --git a/nx-X11/lib/X11/lcDB.c b/nx-X11/lib/X11/lcDB.c index 1111ec955..cc14bed72 100644 --- a/nx-X11/lib/X11/lcDB.c +++ b/nx-X11/lib/X11/lcDB.c @@ -344,15 +344,6 @@ read_line( cur += len; str[cur] = '\0'; -#ifdef __UNIXOS2__ /* Take out carriage returns under OS/2 */ - if (cur>1) { - if (str[cur-2] == '\r' && str[cur-1] == '\n') { - str[cur-2] = '\n'; - str[cur-1] = '\0'; - cur--; - } - } -#endif if (!quoted && cur > 1 && str[cur - 2] == SYM_BACKSLASH && (str[cur - 1] == SYM_NEWLINE || str[cur-1] == SYM_CR)) { /* the line is ended backslash followed by newline. @@ -1286,11 +1277,7 @@ _XlcCreateLocaleDataBase( if (name == NULL) return (XPointer)NULL; -#ifndef __UNIXOS2__ name_q = XrmStringToQuark(name); -#else - name_q = XrmStringToQuark((char*)__XOS2RedirRoot(name)); -#endif for (list = _db_list; list; list = list->next) { if (name_q == list->name_q) { list->ref_count++; diff --git a/nx-X11/lib/X11/lcFile.c b/nx-X11/lib/X11/lcFile.c index eeb6ce312..cf03a90a7 100644 --- a/nx-X11/lib/X11/lcFile.c +++ b/nx-X11/lib/X11/lcFile.c @@ -36,9 +36,6 @@ /************************************************************************/ -#ifdef __UNIXOS2__ -# define seteuid setuid -#endif #define iscomment(ch) ((ch) == '#' || (ch) == '\0') #if defined(WIN32) #define isreadable(f) (_XAccessFile(f)) @@ -46,11 +43,7 @@ #define isreadable(f) ((access((f), R_OK) != -1) ? 1 : 0) #endif -#ifndef __UNIXOS2__ #define LC_PATHDELIM ':' -#else -#define LC_PATHDELIM ';' -#endif #define XLC_BUFSIZE 256 @@ -92,40 +85,7 @@ parse_line( return argc; } -#ifdef __UNIXOS2__ - -/* fg021216: entries in locale files are separated by colons while under - OS/2, path entries are separated by semicolon, so we need two functions */ - -static int -parse_line1( - char *line, - char **argv, - int argsize) -{ - int argc = 0; - char *p = line; - - while (argc < argsize) { - while (isspace(*p)) { - ++p; - } - if (*p == '\0') { - break; - } - argv[argc++] = p; - while (*p != ';' && *p != '\n' && *p != '\0') { - ++p; - } - if (*p == '\0') { - break; - } - *p++ = '\0'; - } - - return argc; -} -#elif defined(WIN32) +#if defined(WIN32) /* this is parse_line but skips drive letters at the beginning of the entry */ static int @@ -160,7 +120,7 @@ parse_line1( return argc; } -#endif /* __UNIXOS2__ */ +#endif /* WIN32 */ /* Splits a colon separated list of directories, and returns the constituent paths (without trailing slash). At most argsize constituents are stored @@ -174,7 +134,7 @@ _XlcParsePath( char *p = path; int n, i; -#if !defined(__UNIXOS2__) && !defined(WIN32) +#if !defined(WIN32) n = parse_line(path, argv, argsize); #else n = parse_line1(path, argv, argsize); @@ -265,11 +225,7 @@ xlocaledir( #endif /* NO_XLOCALEDIR */ if (len < buf_len) -#ifndef __UNIXOS2__ strncpy(p, XLOCALEDIR, buf_len - len); -#else - strncpy(p,__XOS2RedirRoot(XLOCALEDIR), buf_len - len); -#endif buf[buf_len-1] = '\0'; } @@ -343,11 +299,7 @@ xlocalelibdir( #endif /* NO_XLOCALEDIR */ if (len < buf_len) -#ifndef __UNIXOS2__ strncpy(p, XLOCALELIBDIR, buf_len - len); -#else - strncpy(p,__XOS2RedirRoot(XLOCALELIBDIR), buf_len - len); -#endif buf[buf_len-1] = '\0'; } @@ -374,17 +326,6 @@ resolve_name( char *p = buf; int n; char *args[2], *from, *to; -#ifdef __UNIXOS2__ /* Take out CR under OS/2 */ - int len; - - len = strlen(p); - if (len > 1) { - if (*(p+len-2) == '\r' && *(p+len-1) == '\n') { - *(p+len-2) = '\n'; - *(p+len-1) = '\0'; - } - } -#endif while (isspace(*p)) { ++p; } diff --git a/nx-X11/lib/X11/os2Stubs.c b/nx-X11/lib/X11/os2Stubs.c deleted file mode 100644 index 5ffc4824c..000000000 --- a/nx-X11/lib/X11/os2Stubs.c +++ /dev/null @@ -1,428 +0,0 @@ -/* - * (c) Copyright 1996 by Sebastien Marineau and Holger Veit - * - * - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * HOLGER VEIT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF - * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - * Except as contained in this notice, the name of Sebastien Marineau or Holger Veit - * shall not be used in advertising or otherwise to promote the sale, use or other - * dealings in this Software without prior written authorization from Holger Veit or - * Sebastien Marineau. - * - */ - - -/* A few OS/2 functions needed in the X11 lib. Mainly, the file path redirection - * functions and the "optimized" select() for the clients */ - -#define I_NEED_OS2_H -#ifdef HAVE_CONFIG_H -#include -#endif -#include -#include -#include -#define INCL_DOSSEMAPHORES -#define INCL_DOSNPIPES -#define INCL_DOSMISC -#define INCL_DOSMODULEMGR -#undef BOOL -#undef BYTE -#include -#include -#include - -char *__XOS2RedirRoot(char *fname) -{ - /* This adds a further redirection by allowing the ProjectRoot - * to be prepended by the content of the envvar X11ROOT. - * This is for the purpose to move the whole X11 stuff to a different - * disk drive. - * The feature was added despite various environment variables - * because not all file opens respect them. - */ - static char redirname[300]; /* enough for long filenames */ - char *root; - - /* if name does not start with /, assume it is not root-based */ - if (fname==0 || !(fname[0]=='/' || fname[0]=='\\')) - return fname; - - root = (char*)getenv("X11ROOT"); - if (root==0 || - (fname[1]==':' && isalpha(fname[0])) || - (strlen(fname)+strlen(root)+2) > 300) - return fname; - sprintf(redirname,"%s%s",root,fname); - return redirname; -} - -char *__XOS2RedirRoot1(char *format, char *arg1, char *arg2, char *arg3) -{ - /* this first constructs a name from a format and up to three - * components, then adds a path - */ - char buf[300]; - sprintf(buf,format,arg1,arg2,arg3); - return __XOS2RedirRoot(buf); -} - -/* This below implements select() for the calls in this file. It has been */ -/* somewhat optimized for improved performance, but assumes a few */ -/* things so it cannot be used as a general select. If both pipes and */ -/* sockets are present, this may call the emx select */ - - -HEV hPipeSem; -HMODULE hmod_so32dll; -static int (*os2_tcp_select)(int*,int,int,int,long); -ULONG os2_get_sys_millis(); -extern int _files[]; - -#define MAX_TCP 256 -/* These lifted from sys/emx.h. Change if that changes there! */ -#define F_SOCKET 0x10000000 -#define F_PIPE 0x20000000 - -struct select_data -{ - fd_set read_copy; - fd_set write_copy; - BOOL have_read; - BOOL have_write; - int tcp_select_mask[MAX_TCP]; - int tcp_emx_handles[MAX_TCP]; - int tcp_select_copy[MAX_TCP]; - int socket_nread; - int socket_nwrite; - int socket_ntotal; - int pipe_ntotal; - int pipe_have_write; - int max_fds; -}; - -int os2ClientSelect(int nfds, fd_set *readfds, fd_set *writefds, - fd_set *exceptfds, struct timeval *timeout) -{ -static BOOL FirstTime=TRUE; -static haveTCPIP=TRUE; -ULONG timeout_ms; -ULONG postCount, start_millis,now_millis; -char faildata[16]; -struct select_data sd; -BOOL any_ready; -int np,ns, i,ready_handles,n; -APIRET rc; - -sd.have_read=FALSE; sd.have_write=FALSE; -sd.socket_nread=0; sd.socket_nwrite=0; sd.socket_ntotal=0; -sd.max_fds=31; ready_handles=0; any_ready=FALSE; -sd.pipe_ntotal=0; sd.pipe_have_write=FALSE; - -if(FirstTime){ - /* First load the so32dll.dll module and get a pointer to the SELECT fn */ - - if((rc=DosLoadModule(faildata,sizeof(faildata),"SO32DLL",&hmod_so32dll))!=0){ - fprintf(stderr, "Could not load module so32dll.dll, rc = %d. Error note %s\n",rc,faildata); - haveTCPIP=FALSE; - } - if((rc = DosQueryProcAddr(hmod_so32dll, 0, "SELECT", (PPFN)&os2_tcp_select))!=0){ - fprintf(stderr, "Could not query address of SELECT, rc = %d.\n",rc); - haveTCPIP=FALSE; - } - /* Call these a first time to set the semaphore */ - rc = DosCreateEventSem(NULL, &hPipeSem, DC_SEM_SHARED, FALSE); - if(rc) { - fprintf(stderr, "Could not create event semaphore, rc=%d\n",rc); - return(-1); - } - rc = DosResetEventSem(hPipeSem, &postCount); - FirstTime = FALSE; -} - -/* Set up the time delay structs */ - - if(timeout!=NULL) { - timeout_ms=timeout->tv_sec*1000+timeout->tv_usec/1000; - } - else { timeout_ms=1000000; } /* This should be large enough... */ - if(timeout_ms>0) start_millis=os2_get_sys_millis(); - -/* Copy the masks */ - {FD_ZERO(&sd.read_copy);} - {FD_ZERO(&sd.write_copy);} - if(readfds!=NULL){ XFD_COPYSET(readfds,&sd.read_copy); sd.have_read=TRUE;} - if(writefds!=NULL) {XFD_COPYSET(writefds,&sd.write_copy);sd.have_write=TRUE;} - -/* And zero the original masks */ - if(sd.have_read){ FD_ZERO(readfds);} - if(sd.have_write) {FD_ZERO(writefds);} - if(exceptfds != NULL) {FD_ZERO(exceptfds);} - -/* Now we parse the fd_sets passed to select and separate pipe/sockets */ - n = os2_parse_select(&sd,nfds); - if(n == -1) { - errno = EBADF; - return (-1); - } - -/* Now we have three cases: either we have sockets, pipes, or both */ -/* We handle all three cases differently to optimize things */ - -/* Case 1: only pipes! */ - if((sd.pipe_ntotal >0) && (!sd.socket_ntotal)){ - np = os2_check_pipes(&sd,readfds,writefds); - if(np > 0){ - return (np); - } - else if (np == -1) { return(-1); } - while(!any_ready){ - rc = DosWaitEventSem(hPipeSem, timeout_ms); - if(rc == 640) { - return(0); - } - if((rc != 0) && (rc != 95)) {errno= EBADF; return(-1);} - np = os2_check_pipes(&sd,readfds,writefds); - if (np > 0){ - return(np); - } - else if (np < 0){ return(-1); } - } - } - -/* Case 2: only sockets. Just let the os/2 tcp select do the work */ - if((sd.socket_ntotal > 0) && (!sd.pipe_ntotal)){ - ns = os2_check_sockets(&sd, readfds, writefds, timeout_ms); - return (ns); - } - -/* Case 3: combination of both */ - if((sd.socket_ntotal > 0) && (sd.pipe_ntotal)){ - np = os2_check_pipes(&sd,readfds,writefds); - if(np > 0){ - any_ready=TRUE; - ready_handles += np; - } - else if (np == -1) { return(-1); } - - ns = os2_check_sockets(&sd,readfds,writefds, 0); - if(ns>0){ - ready_handles+=ns; - any_ready = TRUE; - } - else if (ns == -1) {return(-1);} - - while (!any_ready && timeout_ms){ - - rc = DosWaitEventSem(hPipeSem, 10L); - if(rc == 0){ - np = os2_check_pipes(&sd,readfds,writefds); - if(np > 0){ - ready_handles+=np; - any_ready = TRUE; - } - else if (np == -1) { - return(-1); } - } - - ns = os2_check_sockets(&sd,readfds,writefds,exceptfds, 0); - if(ns>0){ - ready_handles+=ns; - any_ready = TRUE; - } - else if (ns == -1) {return(-1);} - - if (i%8 == 0) { - now_millis = os2_get_sys_millis(); - if((now_millis-start_millis) > timeout_ms) timeout_ms = 0; - } - i++; - } - } - -return(ready_handles); -} - - -ULONG os2_get_sys_millis() -{ - APIRET rc; - ULONG milli; - - rc = DosQuerySysInfo(14, 14, &milli, sizeof(milli)); - if(rc) { - fprintf(stderr,"Bad return code querying the millisecond counter! rc=%d\n",rc); - return(0); - } - return(milli); -} - -int os2_parse_select(sd,nfds) -struct select_data *sd; -int nfds; -{ - int i; - APIRET rc; -/* First we determine up to which descriptor we need to check. */ -/* No need to check up to 256 if we don't have to (and usually we dont...)*/ -/* Note: stuff here is hardcoded for fd_sets which are int[8] as in EMX!!! */ - - if(nfds > sd->max_fds){ - for(i=0;i<((FD_SETSIZE+31)/32);i++){ - if(sd->read_copy.fds_bits[i] || - sd->write_copy.fds_bits[i]) - sd->max_fds=(i*32) +32; - } - } - else { sd->max_fds = nfds; } -/* Check if result is greater than specified in select() call */ - if(sd->max_fds > nfds) sd->max_fds = nfds; - - if (sd->have_read) - { - for (i = 0; i < sd->max_fds; ++i) { - if (FD_ISSET (i, &sd->read_copy)){ - if(_files[i] & F_SOCKET) - { - sd->tcp_select_mask[sd->socket_ntotal]=_getsockhandle(i); - sd->tcp_emx_handles[sd->socket_ntotal]=i; - sd->socket_ntotal++; sd->socket_nread++; - } - else if (_files[i] & F_PIPE) - { - sd -> pipe_ntotal++; - rc = DosSetNPipeSem((HPIPE)i, (HSEM) hPipeSem, i); - if(rc) { fprintf(stderr,"Error SETNPIPE rc = %d\n",rc); return -1;} - } - } - } - } - - if (sd->have_write) - { - for (i = 0; i < sd->max_fds; ++i) { - if (FD_ISSET (i, &sd->write_copy)){ - if(_files[i] & F_SOCKET) - { - sd->tcp_select_mask[sd->socket_ntotal]=_getsockhandle(i); - sd->tcp_emx_handles[sd->socket_ntotal]=i; - sd->socket_ntotal++; sd->socket_nwrite++; - } - else if (_files[i] & F_PIPE) - { - sd -> pipe_ntotal++; - rc = DosSetNPipeSem((HPIPE)i, (HSEM) hPipeSem, i); - if(rc) { fprintf(stderr,"Error SETNPIPE rc = %d\n",rc); return -1;} - sd -> pipe_have_write=TRUE; - } - } - } - } - - -return(sd->socket_ntotal); -} - - -int os2_check_sockets(sd,readfds,writefds) -struct select_data *sd; -fd_set *readfds,*writefds; -{ - int e,i; - int j,n; - memcpy(sd->tcp_select_copy,sd->tcp_select_mask, - sd->socket_ntotal*sizeof(int)); - - e = os2_tcp_select(sd->tcp_select_copy,sd->socket_nread, - sd->socket_nwrite, 0, 0); - - if(e == 0) return(e); -/* We have something ready? */ - if(e>0){ - j = 0; n = 0; - for (i = 0; i < sd->socket_nread; ++i, ++j) - if (sd->tcp_select_copy[j] != -1) - { - FD_SET (sd->tcp_emx_handles[j], readfds); - n ++; - } - for (i = 0; i < sd->socket_nwrite; ++i, ++j) - if (sd->tcp_select_copy[j] != -1) - { - FD_SET (sd->tcp_emx_handles[j], writefds); - n ++; - } - errno = 0; - - return n; - } - if(e<0){ - /*Error -- TODO */ - fprintf(stderr,"Error in server select! e=%d\n",e); - errno = EBADF; - return (-1); - } - } - -/* Check to see if anything is ready on pipes */ - -int os2_check_pipes(sd,readfds,writefds) -struct select_data *sd; -fd_set *readfds,*writefds; -{ -int i,e; -ULONG ulPostCount; -PIPESEMSTATE pipeSemState[128]; -APIRET rc; - e = 0; - rc = DosResetEventSem(hPipeSem,&ulPostCount); - rc = DosQueryNPipeSemState((HSEM) hPipeSem, (PPIPESEMSTATE)&pipeSemState, - sizeof(pipeSemState)); - if(rc) fprintf(stderr,"SELECT: rc from QueryNPipeSem: %d\n",rc); - i=0; - while (pipeSemState[i].fStatus != 0) { - /*fprintf(stderr,"SELECT: sem entry, stat=%d, flag=%d, key=%d,avail=%d\n", - pipeSemState[i].fStatus,pipeSemState[i].fFlag,pipeSemState[i].usKey, - pipeSemState[i].usAvail); */ - if((pipeSemState[i].fStatus == 1) && - (FD_ISSET(pipeSemState[i].usKey,&sd->read_copy))){ - FD_SET(pipeSemState[i].usKey,readfds); - e++; - } - else if((pipeSemState[i].fStatus == 2) && - (FD_ISSET(pipeSemState[i].usKey,&sd->write_copy))){ - FD_SET(pipeSemState[i].usKey,writefds); - e++; - } - else if( (pipeSemState[i].fStatus == 3) && - ( (FD_ISSET(pipeSemState[i].usKey,&sd->read_copy)) || - (FD_ISSET(pipeSemState[i].usKey,&sd->write_copy)) )){ - errno = EBADF; - return (-1); - } - i++; - } /* endwhile */ - /*fprintf(stderr,"Done listing pipe sem entries, total %d entries, total ready entries %d\n",i,e);*/ -errno = 0; -return(e); -} - - - diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 8efbcf14a..9a7462c7a 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -523,7 +523,7 @@ SUBDIRS = $(STDDIRS) \ $(IPLANDIRS) $(ILBMDIR) \ $(DDXDIRS) $(FBSUBDIR) $(KDRIVEDIRS) $(MIEXTDIRS) -#if defined(ServerToInstall) && !defined(OS2Architecture) +#if defined(ServerToInstall) install:: -(cd $(DESTDIR)$(BINDIR); $(RM) X; $(LN) ServerToInstall X) #endif diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c index 6883db5f8..3a638460e 100644 --- a/nx-X11/programs/Xserver/Xext/security.c +++ b/nx-X11/programs/Xserver/Xext/security.c @@ -1481,11 +1481,7 @@ SecurityFreePropertyAccessList(void) } } /* SecurityFreePropertyAccessList */ -#ifndef __UNIXOS2__ #define SecurityIsWhitespace(c) ( (c == ' ') || (c == '\t') || (c == '\n') ) -#else -#define SecurityIsWhitespace(c) ( (c == ' ') || (c == '\t') || (c == '\n') || (c == '\r') ) -#endif static char * SecuritySkipWhitespace( @@ -1774,8 +1770,6 @@ SecurityLoadPropertyAccessList(void) #endif -#ifndef __UNIXOS2__ - #ifdef NXAGENT_SERVER f = Fopen(_NXGetPolicyFilePath(SecurityPolicyFile), "r"); @@ -1786,20 +1780,6 @@ SecurityLoadPropertyAccessList(void) #endif -#else - -#ifdef NXAGENT_SERVER - - f = Fopen((char*)__XOS2RedirRoot( _NXGetPolicyFilePath(SecurityPolicyFile)), "r"); - -#else - - f = Fopen((char*)__XOS2RedirRoot(SecurityPolicyFile), "r"); - -#endif - -#endif - if (!f) { #ifdef NXAGENT_SERVER diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile index 7dbcce896..f849c3e5a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile +++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile @@ -6,11 +6,6 @@ NULL = SUBDIRS = compext \ $(NULL) -#ifdef OS2Architecture -SRCS1 = os2Stub.c -OBJS1 = os2Stub.o -#endif - SRCS = \ NXwindow.c \ NXevents.c \ @@ -71,7 +66,6 @@ SRCS = \ stubs.c \ xpstubs.c \ miinitext.c \ - $(SRCS1) \ $(NULL) OBJS = \ @@ -134,7 +128,6 @@ OBJS = \ stubs.o \ xpstubs.o \ miinitext.o \ - $(OBJS1) \ $(NULL) VFBINCLUDES = \ diff --git a/nx-X11/programs/Xserver/hw/nxagent/os2Stub.c b/nx-X11/programs/Xserver/hw/nxagent/os2Stub.c deleted file mode 100644 index 226140dc5..000000000 --- a/nx-X11/programs/Xserver/hw/nxagent/os2Stub.c +++ /dev/null @@ -1,410 +0,0 @@ -/**************************************************************************/ -/* */ -/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */ -/* Copyright (c) 2008-2014 Oleksandr Shneyder */ -/* Copyright (c) 2011-2016 Mike Gabriel */ -/* Copyright (c) 2014-2016 Mihai Moldovan */ -/* Copyright (c) 2014-2016 Ulrich Sibiller */ -/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */ -/* */ -/* NXAGENT, NX protocol compression and NX extensions to this software */ -/* are copyright of the aforementioned persons and companies. */ -/* */ -/* Redistribution and use of the present software is allowed according */ -/* to terms specified in the file LICENSE which comes in the source */ -/* distribution. */ -/* */ -/* All rights reserved. */ -/* */ -/* NOTE: This software has received contributions from various other */ -/* contributors, only the core maintainers and supporters are listed as */ -/* copyright holders. Please contact us, if you feel you should be listed */ -/* as copyright holder, as well. */ -/* */ -/**************************************************************************/ - -/* - * (c) Copyright 1996 by Sebastien Marineau - * - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * HOLGER VEIT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF - * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - * Except as contained in this notice, the name of Sebastien Marineau shall not be - * used in advertising or otherwise to promote the sale, use or other dealings - * in this Software without prior written authorization from Sebastien Marineau. - * - */ - -/* This below implements select() for calls in nxagent. It has been */ -/* somewhat optimized for improved performance, but assumes a few */ -/* things so it cannot be used as a general select. */ - -#define I_NEED_OS2_H -#include "Xpoll.h" -#include -#include -#include -#include -#define INCL_DOSSEMAPHORES -#define INCL_DOSNPIPES -#define INCL_DOSMISC -#define INCL_DOSMODULEMGR -#undef BOOL -#undef BYTE -#include - -HEV hPipeSem; -HMODULE hmod_so32dll; -static int (*os2_tcp_select)(int*,int,int,int,long); -ULONG os2_get_sys_millis(); -extern int _files[]; - -#define MAX_TCP 256 -/* These lifted from sys/emx.h. Change if that changes there! */ -#define F_SOCKET 0x10000000 -#define F_PIPE 0x20000000 - -struct select_data -{ - fd_set read_copy; - fd_set write_copy; - BOOL have_read; - BOOL have_write; - int tcp_select_mask[MAX_TCP]; - int tcp_emx_handles[MAX_TCP]; - int tcp_select_copy[MAX_TCP]; - int socket_nread; - int socket_nwrite; - int socket_ntotal; - int pipe_ntotal; - int pipe_have_write; - int max_fds; -}; - -int os2PseudoSelect(int nfds, fd_set *readfds, fd_set *writefds, - fd_set *exceptfds, struct timeval *timeout) -{ -static BOOL FirstTime=TRUE; -static haveTCPIP=TRUE; -ULONG timeout_ms; -ULONG postCount, start_millis,now_millis; -char faildata[16]; -struct select_data sd; -BOOL any_ready; -int np,ns, i,ready_handles,n; -APIRET rc; - -sd.have_read=FALSE; sd.have_write=FALSE; -sd.socket_nread=0; sd.socket_nwrite=0; sd.socket_ntotal=0; -sd.max_fds=31; ready_handles=0; any_ready=FALSE; -sd.pipe_ntotal=0; sd.pipe_have_write=FALSE; - -if(FirstTime){ - /* First load the so32dll.dll module and get a pointer to the SELECT function */ - - if((rc=DosLoadModule(faildata,sizeof(faildata),"SO32DLL",&hmod_so32dll))!=0){ - fprintf(stderr, "Could not load module so32dll.dll, rc = %d. Error note %s\n",rc,faildata); - haveTCPIP=FALSE; - } - if((rc = DosQueryProcAddr(hmod_so32dll, 0, "SELECT", (PPFN)&os2_tcp_select))!=0){ - fprintf(stderr, "Could not query address of SELECT, rc = %d.\n",rc); - haveTCPIP=FALSE; - } - /* Call these a first time to set the semaphore */ - /* rc = DosCreateEventSem(NULL, &hPipeSem, DC_SEM_SHARED, FALSE); - if(rc) { - fprintf(stderr, "Could not create event semaphore, rc=%d\n",rc); - return(-1); - } - rc = DosResetEventSem(hPipeSem, &postCount); */ /* Done in xtrans code for servers*/ - -fprintf(stderr, "Client select() done first-time stuff, sem handle %d.\n",hPipeSem); - - FirstTime = FALSE; -} - -/* Set up the time delay structs */ - - if(timeout!=NULL) { - timeout_ms=timeout->tv_sec*1000+timeout->tv_usec/1000; - } - else { timeout_ms=1000000; } /* This should be large enough... */ - if(timeout_ms>0) start_millis=os2_get_sys_millis(); - -/* Copy the masks */ - {FD_ZERO(&sd.read_copy);} - {FD_ZERO(&sd.write_copy);} - if(readfds!=NULL){ XFD_COPYSET(readfds,&sd.read_copy); sd.have_read=TRUE;} - if(writefds!=NULL) {XFD_COPYSET(writefds,&sd.write_copy);sd.have_write=TRUE;} - -/* And zero the original masks */ - if(sd.have_read){ FD_ZERO(readfds);} - if(sd.have_write) {FD_ZERO(writefds);} - if(exceptfds != NULL) {FD_ZERO(exceptfds);} - -/* Now we parse the fd_sets passed to select and separate pipe/sockets */ - n = os2_parse_select(&sd,nfds); - if(n == -1) { - errno = EBADF; - return (-1); - } - -/* Now we have three cases: either we have sockets, pipes, or both */ -/* We handle all three cases differently to optimize things */ - -/* Case 1: only pipes! */ - if((sd.pipe_ntotal >0) && (!sd.socket_ntotal)){ - np = os2_check_pipes(&sd,readfds,writefds); - if(np > 0){ - return (np); - } - else if (np == -1) { return(-1); } - while(!any_ready){ - rc = DosWaitEventSem(hPipeSem, timeout_ms); - /* if(rc) fprintf(stderr,"Sem-wait timeout, rc = %d\n",rc); */ - if(rc == 640) { - return(0); - } - if((rc != 0) && (rc != 95)) {errno= EBADF; return(-1);} - np = os2_check_pipes(&sd,readfds,writefds); - if (np > 0){ - return(np); - } - else if (np < 0){ return(-1); } - } - } - -/* Case 2: only sockets. Just let the os/2 tcp select do the work */ - if((sd.socket_ntotal > 0) && (!sd.pipe_ntotal)){ - ns = os2_check_sockets(&sd, readfds, writefds, timeout_ms); - return (ns); - } - -/* Case 3: combination of both */ - if((sd.socket_ntotal > 0) && (sd.pipe_ntotal)){ - np = os2_check_pipes(&sd,readfds,writefds); - if(np > 0){ - any_ready=TRUE; - ready_handles += np; - } - else if (np == -1) { return(-1); } - - ns = os2_check_sockets(&sd,readfds,writefds, 0); - if(ns>0){ - ready_handles+=ns; - any_ready = TRUE; - } - else if (ns == -1) {return(-1);} - - while (!any_ready && timeout_ms){ - - rc = DosWaitEventSem(hPipeSem, 10L); - if(rc == 0){ - np = os2_check_pipes(&sd,readfds,writefds); - if(np > 0){ - ready_handles+=np; - any_ready = TRUE; - } - else if (np == -1) { - return(-1); } - } - - ns = os2_check_sockets(&sd,readfds,writefds,exceptfds, 0); - if(ns>0){ - ready_handles+=ns; - any_ready = TRUE; - } - else if (ns == -1) {return(-1);} - - if (i%8 == 0) { - now_millis = os2_get_sys_millis(); - if((now_millis-start_millis) > timeout_ms) timeout_ms = 0; - } - i++; - } - } - -return(ready_handles); -} - - -ULONG os2_get_sys_millis() -{ - APIRET rc; - ULONG milli; - - rc = DosQuerySysInfo(14, 14, &milli, sizeof(milli)); - if(rc) { - fprintf(stderr,"Bad return code querying the millisecond counter! rc=%d\n",rc); - return(0); - } - return(milli); -} - -int os2_parse_select(sd,nfds) -struct select_data *sd; -int nfds; -{ - int i; - APIRET rc; -/* First we determine up to which descriptor we need to check. */ -/* No need to check up to 256 if we don't have to (and usually we dont...)*/ -/* Note: stuff here is hardcoded for fd_sets which are int[8] as in EMX! */ - - if(nfds > sd->max_fds){ - for(i=0;i<((FD_SETSIZE+31)/32);i++){ - if(sd->read_copy.fds_bits[i] || - sd->write_copy.fds_bits[i]) - sd->max_fds=(i*32) +32; - } - } - else { sd->max_fds = nfds; } -/* Check if result is greater than specified in select() call */ - if(sd->max_fds > nfds) sd->max_fds = nfds; - - if (sd->have_read) - { - for (i = 0; i < sd->max_fds; ++i) { - if (FD_ISSET (i, &sd->read_copy)){ - if(_files[i] & F_SOCKET) - { - sd->tcp_select_mask[sd->socket_ntotal]=_getsockhandle(i); - sd->tcp_emx_handles[sd->socket_ntotal]=i; - sd->socket_ntotal++; sd->socket_nread++; - } - else if (_files[i] & F_PIPE) - { - sd -> pipe_ntotal++; - /* rc = DosSetNPipeSem((HPIPE)i, (HSEM) hPipeSem, i); - if(rc) { fprintf(stderr,"Error SETNPIPE rc = %d\n",rc); return -1;} */ - } - } - } - } - - if (sd->have_write) - { - for (i = 0; i < sd->max_fds; ++i) { - if (FD_ISSET (i, &sd->write_copy)){ - if(_files[i] & F_SOCKET) - { - sd->tcp_select_mask[sd->socket_ntotal]=_getsockhandle(i); - sd->tcp_emx_handles[sd->socket_ntotal]=i; - sd->socket_ntotal++; sd->socket_nwrite++; - } - else if (_files[i] & F_PIPE) - { - sd -> pipe_ntotal++; - /* rc = DosSetNPipeSem((HPIPE)i, (HSEM) hPipeSem, i); - if(rc) { fprintf(stderr,"Error SETNPIPE rc = %d\n",rc); return -1;} */ - sd -> pipe_have_write=TRUE; - } - } - } - } - - -return(sd->socket_ntotal); -} - - -int os2_check_sockets(sd,readfds,writefds) -struct select_data *sd; -fd_set *readfds,*writefds; -{ - int e,i; - int j,n; - memcpy(sd->tcp_select_copy,sd->tcp_select_mask, - sd->socket_ntotal*sizeof(int)); - - e = os2_tcp_select(sd->tcp_select_copy,sd->socket_nread, - sd->socket_nwrite, 0, 0); - - if(e == 0) return(e); -/* We have something ready? */ - if(e>0){ - j = 0; n = 0; - for (i = 0; i < sd->socket_nread; ++i, ++j) - if (sd->tcp_select_copy[j] != -1) - { - FD_SET (sd->tcp_emx_handles[j], readfds); - n ++; - } - for (i = 0; i < sd->socket_nwrite; ++i, ++j) - if (sd->tcp_select_copy[j] != -1) - { - FD_SET (sd->tcp_emx_handles[j], writefds); - n ++; - } - errno = 0; - - return n; - } - if(e<0){ - /*Error -- TODO. EBADF is a good choice for now. */ - fprintf(stderr,"Error in server select! e=%d\n",e); - errno = EBADF; - return (-1); - } - } - -/* Check to see if anything is ready on pipes */ - -int os2_check_pipes(sd,readfds,writefds) -struct select_data *sd; -fd_set *readfds,*writefds; -{ -int i,e; -ULONG ulPostCount; -PIPESEMSTATE pipeSemState[128]; -APIRET rc; - e = 0; - rc = DosResetEventSem(hPipeSem,&ulPostCount); - rc = DosQueryNPipeSemState((HSEM) hPipeSem, (PPIPESEMSTATE)&pipeSemState, - sizeof(pipeSemState)); - if(rc) fprintf(stderr,"SELECT: rc from QueryNPipeSem: %d\n",rc); - i=0; - while (pipeSemState[i].fStatus != 0) { - /*fprintf(stderr,"SELECT: sem entry, stat=%d, flag=%d, key=%d,avail=%d\n", - pipeSemState[i].fStatus,pipeSemState[i].fFlag,pipeSemState[i].usKey, - pipeSemState[i].usAvail); */ - if((pipeSemState[i].fStatus == 1) && - (FD_ISSET(pipeSemState[i].usKey,&sd->read_copy))){ - FD_SET(pipeSemState[i].usKey,readfds); - e++; - } - else if((pipeSemState[i].fStatus == 2) && - (FD_ISSET(pipeSemState[i].usKey,&sd->write_copy))){ - FD_SET(pipeSemState[i].usKey,writefds); - e++; - } - else if( (pipeSemState[i].fStatus == 3) && - ( (FD_ISSET(pipeSemState[i].usKey,&sd->read_copy)) || - (FD_ISSET(pipeSemState[i].usKey,&sd->write_copy)) )){ - errno = EBADF; - /* fprintf(stderr,"Pipe has closed down, fd=%d\n",pipeSemState[i].usKey); */ - return (-1); - } - i++; - } /* endwhile */ - /*fprintf(stderr,"Done listing pipe sem entries, total %d entries, total ready entries %d\n" i,e);*/ -errno = 0; -return(e); -} - diff --git a/nx-X11/programs/Xserver/include/os.h b/nx-X11/programs/Xserver/include/os.h index 268513bfd..881abfccb 100644 --- a/nx-X11/programs/Xserver/include/os.h +++ b/nx-X11/programs/Xserver/include/os.h @@ -263,7 +263,7 @@ void OsBlockSignals (void); void OsReleaseSignals (void); -#if !defined(WIN32) && !defined(__UNIXOS2__) +#if !defined(WIN32) extern int System(char *); extern void * Popen(char *, char *); extern int Pclose(void *); diff --git a/nx-X11/programs/Xserver/include/servermd.h b/nx-X11/programs/Xserver/include/servermd.h index 27b5a8fb9..76f28e9ed 100644 --- a/nx-X11/programs/Xserver/include/servermd.h +++ b/nx-X11/programs/Xserver/include/servermd.h @@ -327,8 +327,6 @@ SOFTWARE. #if (defined(SVR4) && defined(i386)) || \ defined(__alpha__) || defined(__alpha) || \ defined(__i386__) || defined(__i386) || \ - defined(__UNIXOS2__) || \ - defined(__OS2ELF__) || \ defined(__QNX__) || \ defined(__s390x__) || defined(__s390__) diff --git a/nx-X11/programs/Xserver/os/WaitFor.c b/nx-X11/programs/Xserver/os/WaitFor.c index 2858637fa..899b1de0b 100644 --- a/nx-X11/programs/Xserver/os/WaitFor.c +++ b/nx-X11/programs/Xserver/os/WaitFor.c @@ -91,9 +91,6 @@ SOFTWARE. #include #include "misc.h" -#ifdef __UNIXOS2__ -#define select(n,r,w,x,t) os2PseudoSelect(n,r,w,x,t) -#endif #include "osdep.h" #include #include "dixstruct.h" diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c index 5735fd556..c775952e2 100644 --- a/nx-X11/programs/Xserver/os/access.c +++ b/nx-X11/programs/Xserver/os/access.c @@ -1139,9 +1139,6 @@ ResetHosts (char *display) if (fnamelen > sizeof(fname)) FatalError("Display name `%s' is too long\n", display); sprintf(fname, ETC_HOST_PREFIX "%s" ETC_HOST_SUFFIX, display); -#ifdef __UNIXOS2__ - strcpy(fname, (char*)__XOS2RedirRoot(fname)); -#endif /* __UNIXOS2__ */ if ((fd = fopen (fname, "r")) != 0) { @@ -1152,10 +1149,6 @@ ResetHosts (char *display) continue; if ((ptr = strchr(ohostname, '\n')) != 0) *ptr = 0; -#ifdef __UNIXOS2__ - if ((ptr = strchr(ohostname, '\r')) != 0) - *ptr = 0; -#endif hostlen = strlen(ohostname) + 1; for (i = 0; i < hostlen; i++) lhostname[i] = tolower(ohostname[i]); diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c index 9681ced38..e38e94c67 100644 --- a/nx-X11/programs/Xserver/os/connection.c +++ b/nx-X11/programs/Xserver/os/connection.c @@ -107,11 +107,6 @@ SOFTWARE. #include #endif -#ifdef __UNIXOS2__ -#define select(n,r,w,x,t) os2PseudoSelect(n,r,w,x,t) -extern __const__ int _nfiles; -#endif - #if defined(TCPCONN) # include # include @@ -124,21 +119,17 @@ extern __const__ int _nfiles; # ifdef CSRG_BASED # include # endif -# ifndef __UNIXOS2__ -# include -# endif +# include # endif # endif # include #endif -#if !defined(__UNIXOS2__) #ifndef Lynx #include #else #include #endif -#endif #endif /* WIN32 */ #include "misc.h" #include "osdep.h" @@ -173,9 +164,6 @@ Bool AnyClientsWriteBlocked; /* true if some client blocked on write */ Bool RunFromSmartParent; /* send SIGUSR1 to parent process */ Bool PartialNetwork; /* continue even if unable to bind all addrs */ static Pid_t ParentProcess; -#ifdef __UNIXOS2__ -Pid_t GetPPID(Pid_t pid); -#endif static Bool debug_conns = FALSE; @@ -314,8 +302,6 @@ InitConnectionLimits(void) #ifndef __CYGWIN__ -#ifndef __UNIXOS2__ - #if !defined(XNO_SYSCONF) && defined(_SC_OPEN_MAX) lastfdesc = sysconf(_SC_OPEN_MAX) - 1; #endif @@ -330,10 +316,6 @@ InitConnectionLimits(void) lastfdesc = _NFILE - 1; #endif -#else /* __UNIXOS2__ */ - lastfdesc = _nfiles - 1; -#endif - #endif /* __CYGWIN__ */ /* This is the fallback */ @@ -449,15 +431,6 @@ CreateWellKnownSockets(void) RunFromSmartParent = TRUE; OsSignal(SIGUSR1, handler); ParentProcess = getppid (); -#ifdef __UNIXOS2__ - /* - * fg030505: under OS/2, xinit is not the parent process but - * the "grant parent" process of the server because execvpe() - * presents us an additional process number; - * GetPPID(pid) is part of libemxfix - */ - ParentProcess = GetPPID (ParentProcess); -#endif /* __UNIXOS2__ */ if (RunFromSmartParent) { if (ParentProcess > 1) { kill (ParentProcess, SIGUSR1); diff --git a/nx-X11/programs/Xserver/os/io.c b/nx-X11/programs/Xserver/os/io.c index d184a981c..8439a3edd 100644 --- a/nx-X11/programs/Xserver/os/io.c +++ b/nx-X11/programs/Xserver/os/io.c @@ -70,7 +70,7 @@ SOFTWARE. #include #include #include -#if !defined(__UNIXOS2__) && !defined(WIN32) +#if !defined(WIN32) #ifndef Lynx #include #else @@ -92,7 +92,6 @@ CallbackListPtr FlushCallback; /* check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX * systems are broken and return EWOULDBLOCK when they should return EAGAIN */ -#ifndef __UNIXOS2__ #ifndef WIN32 #if defined(EAGAIN) && defined(EWOULDBLOCK) #define ETEST(err) (err == EAGAIN || err == EWOULDBLOCK) @@ -106,9 +105,6 @@ CallbackListPtr FlushCallback; #else /* WIN32 The socket errorcodes differ from the normal errors*/ #define ETEST(err) (err == EAGAIN || err == WSAEWOULDBLOCK) #endif -#else /* __UNIXOS2__ Writing to full pipes may return ENOSPC */ -#define ETEST(err) (err == EAGAIN || err == EWOULDBLOCK || err == ENOSPC) -#endif Bool CriticalOutputPending; int timesThisConnection = 0; diff --git a/nx-X11/programs/Xserver/os/log.c b/nx-X11/programs/Xserver/os/log.c index e964896d7..d82f545a0 100644 --- a/nx-X11/programs/Xserver/os/log.c +++ b/nx-X11/programs/Xserver/os/log.c @@ -214,9 +214,6 @@ LogInit(const char *fname, const char *backup) sprintf(suffix, backup, display); sprintf(oldLog, "%s%s", logFileName, suffix); free(suffix); -#ifdef __UNIXOS2__ - remove(oldLog); -#endif if (rename(logFileName, oldLog) == -1) { FatalError("Cannot move old log file (\"%s\" to \"%s\"\n", logFileName, oldLog); diff --git a/nx-X11/programs/Xserver/os/oscolor.c b/nx-X11/programs/Xserver/os/oscolor.c index 32f8a4b23..88b243d65 100644 --- a/nx-X11/programs/Xserver/os/oscolor.c +++ b/nx-X11/programs/Xserver/os/oscolor.c @@ -397,7 +397,6 @@ OsInitColors(void) if (!was_here) { -#ifndef __UNIXOS2__ #ifdef NX_TRANS_SOCKET /* * Add the trailing '.txt' if a @@ -417,12 +416,6 @@ OsInitColors(void) path = (char*)ALLOCATE_LOCAL(strlen(rgbPath) +5); strcpy(path, rgbPath); strcat(path, ".txt"); -#endif -#else - char *tmp = (char*)__XOS2RedirRoot(rgbPath); - path = (char*)ALLOCATE_LOCAL(strlen(tmp) +5); - strcpy(path, tmp); - strcat(path, ".txt"); #endif if (!(rgb = fopen(path, "r"))) { @@ -438,11 +431,7 @@ OsInitColors(void) while(fgets(line, sizeof(line), rgb)) { lineno++; -#ifndef __UNIXOS2__ if (sscanf(line,"%d %d %d %[^\n]\n", &red, &green, &blue, name) == 4) -#else - if (sscanf(line,"%d %d %d %[^\n\r]\n", &red, &green, &blue, name) == 4) -#endif { if (red >= 0 && red <= 0xff && green >= 0 && green <= 0xff && diff --git a/nx-X11/programs/Xserver/os/osdep.h b/nx-X11/programs/Xserver/os/osdep.h index 9ad267a36..3215b017e 100644 --- a/nx-X11/programs/Xserver/os/osdep.h +++ b/nx-X11/programs/Xserver/os/osdep.h @@ -91,7 +91,7 @@ SOFTWARE. #if defined(NOFILE) && !defined(NOFILES_MAX) #define OPEN_MAX NOFILE #else -#if !defined(__UNIXOS2__) && !defined(WIN32) +#if !defined(WIN32) #define OPEN_MAX NOFILES_MAX #else #define OPEN_MAX 256 diff --git a/nx-X11/programs/Xserver/os/osinit.c b/nx-X11/programs/Xserver/os/osinit.c index 5f097f89a..81429a462 100644 --- a/nx-X11/programs/Xserver/os/osinit.c +++ b/nx-X11/programs/Xserver/os/osinit.c @@ -133,7 +133,7 @@ OsInit(void) dup2 (fileno (err), 2); fclose (err); } -#if defined(SYSV) || defined(SVR4) || defined(__UNIXOS2__) || defined(WIN32) || defined(__CYGWIN__) +#if defined(SYSV) || defined(SVR4) || defined(WIN32) || defined(__CYGWIN__) { static char buf[BUFSIZ]; setvbuf (stderr, buf, _IOLBF, BUFSIZ); diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 9584dadd3..fca5ae2fd 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -318,9 +318,7 @@ OsSignal(sig, handler) * server at a time. This keeps the servers from stomping on each other * if the user forgets to give them different display numbers. */ -#ifndef __UNIXOS2__ #define LOCK_DIR "/tmp" -#endif #define LOCK_TMP_PREFIX "/.tX" #define LOCK_PREFIX "/.X" #define LOCK_SUFFIX "-lock" @@ -330,10 +328,6 @@ OsSignal(sig, handler) #include #endif -#ifdef __UNIXOS2__ -#define link rename -#endif - #ifndef PATH_MAX #ifndef Lynx #include @@ -372,14 +366,7 @@ LockServer(void) /* * Path names */ -#ifndef __UNIXOS2__ tmppath = LOCK_DIR; -#else - /* OS/2 uses TMP directory, must also prepare for 8.3 names */ - tmppath = getenv("TMP"); - if (!tmppath) - FatalError("No TMP dir found\n"); -#endif sprintf(port, "%d", atoi(display)); len = strlen(LOCK_PREFIX) > strlen(LOCK_TMP_PREFIX) ? strlen(LOCK_PREFIX) : @@ -422,12 +409,10 @@ LockServer(void) if (write(lfd, pid_str, 11) != 11) FatalError("Could not write pid to lock file in %s\n", tmp); -#ifndef __UNIXOS2__ #ifndef USE_CHMOD (void) fchmod(lfd, 0444); #else (void) chmod(tmp, 0444); -#endif #endif (void) close(lfd); @@ -507,9 +492,6 @@ UnlockServer(void) if (!StillLocking){ -#ifdef __UNIXOS2__ - (void) chmod(LockFile,S_IREAD|S_IWRITE); -#endif /* __UNIXOS2__ */ (void) unlink(LockFile); } } @@ -928,7 +910,7 @@ ProcessCommandLine(int argc, char *argv[]) #ifdef SERVER_LOCK else if ( strcmp ( argv[i], "-nolock") == 0) { -#if !defined(WIN32) && !defined(__UNIXOS2__) && !defined(__CYGWIN__) +#if !defined(WIN32) && !defined(__CYGWIN__) if (getuid() != 0) ErrorF("Warning: the -nolock option can only be used by root\n"); else @@ -1260,7 +1242,7 @@ ExpandCommandLine(int *pargc, char ***pargv) { int i; -#if !defined(WIN32) && !defined(__UNIXOS2__) && !defined(__CYGWIN__) +#if !defined(WIN32) && !defined(__CYGWIN__) if (getuid() != geteuid()) return; #endif @@ -1609,7 +1591,7 @@ OsReleaseSignals (void) #endif } -#if !defined(WIN32) && !defined(__UNIXOS2__) +#if !defined(WIN32) /* * "safer" versions of system(3), popen(3) and pclose(3) which give up * all privs before running a command. @@ -1964,7 +1946,7 @@ Fclose(void * iop) #endif } -#endif /* !WIN32 && !__UNIXOS2__ */ +#endif /* !WIN32 */ /* diff --git a/nx-X11/programs/Xserver/xkb/ddxConfig.c b/nx-X11/programs/Xserver/xkb/ddxConfig.c index 1ecabd108..2fd5e7610 100644 --- a/nx-X11/programs/Xserver/xkb/ddxConfig.c +++ b/nx-X11/programs/Xserver/xkb/ddxConfig.c @@ -128,9 +128,6 @@ XkbConfigRtrnPtr rtrn; sprintf(buf,"X%s-config%s%s",display,(dName[0]?".":""),dName); } #endif -#ifdef __UNIXOS2__ - strcpy(buf,(char*)__XOS2RedirRoot(buf)); -#endif #ifdef DEBUG ErrorF("Looking for keyboard configuration in %s...",buf); #endif diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c index 53bae44df..89f777d58 100644 --- a/nx-X11/programs/Xserver/xkb/ddxLoad.c +++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c @@ -82,7 +82,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\"" #define POST_ERROR_MSG2 "\"End of messages from xkbcomp\"" -#if defined(__UNIXOS2__) || defined(WIN32) +#if defined(WIN32) #define PATHSEPARATOR "\\" #else #define PATHSEPARATOR "/" @@ -558,8 +558,6 @@ char *cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile; #endif -#ifndef __UNIXOS2__ - #ifdef NXAGENT_SERVER char *xkbbasedir = _NXGetXkbBasePath(XkbBaseDirectory); char *xkbbindir = _NXGetXkbCompPath(XkbBinDirectory); @@ -568,23 +566,6 @@ char *cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile; char *xkbbindir = XkbBinDirectory; #endif -#else - /* relocate the basedir and replace the slashes with backslashes */ -#ifdef NXAGENT_SERVER - char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbBasePath(XkbBaseDirectory)); - char *xkbbindir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBinDirectory)); -#else - char *xkbbasedir = (char*)__XOS2RedirRoot(XkbBaseDirectory); - char *xkbbindir = (char*)__XOS2RedirRoot(XkbBinDirectory); -#endif - int i; - - for (i=0; i10)?10:(int)xkbDebugFlags)), @@ -675,7 +656,6 @@ char tmpname[PATH_MAX]; for xkbcomp. xkbcomp does not read from stdin. */ char *xkmfile = tmpname; #endif -#ifndef __UNIXOS2__ #ifdef NXAGENT_SERVER char *xkbbasedir = _NXGetXkbBasePath(XkbBaseDirectory); char *xkbbindir = _NXGetXkbCompPath(XkbBinDirectory); @@ -683,20 +663,6 @@ char tmpname[PATH_MAX]; char *xkbbasedir = XkbBaseDirectory; char *xkbbindir = XkbBinDirectory; #endif -#else - int i; -#ifdef NXAGENT_SERVER - char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbBasePath(XkbBaseDirectory)); - char *xkbbindir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBinDirectory)); -#else - char *xkbbasedir = (char*)__XOS2RedirRoot(XkbBaseDirectory); - char *xkbbindir = (char*)__XOS2RedirRoot(XkbBinDirectory); -#endif - for (i=0; i Date: Tue, 15 Nov 2016 19:20:13 +0100 Subject: drop platform support: unifdef Lynx. Fixes ArcticaProject/nx-libs#272. --- nx-X11/config/cf/Imake.cf | 28 ---------------------------- nx-X11/config/cf/xorg.cf | 2 +- nx-X11/include/Xarch.h | 16 +--------------- nx-X11/include/Xos.h | 2 +- nx-X11/include/Xos_r.h | 21 +++------------------ nx-X11/lib/X11/ConnDis.c | 4 ---- nx-X11/lib/X11/ImUtil.c | 4 ---- nx-X11/lib/X11/PutImage.c | 4 ---- nx-X11/lib/X11/lcDefConv.c | 2 +- nx-X11/lib/X11/lcGenConv.c | 2 +- nx-X11/programs/Xserver/Imakefile | 5 ++--- nx-X11/programs/Xserver/Xext/shm.c | 5 ----- nx-X11/programs/Xserver/Xext/sync.c | 2 +- nx-X11/programs/Xserver/Xext/xvmc.c | 5 ----- nx-X11/programs/Xserver/include/servermd.h | 5 ----- nx-X11/programs/Xserver/os/access.c | 8 -------- nx-X11/programs/Xserver/os/connection.c | 8 -------- nx-X11/programs/Xserver/os/io.c | 4 ---- nx-X11/programs/Xserver/os/osinit.c | 4 ++-- nx-X11/programs/Xserver/os/utils.c | 6 +----- nx-X11/programs/Xserver/os/xdmcp.c | 4 ---- nx-X11/programs/Xserver/xkb/xkbAccessX.c | 2 +- 22 files changed, 15 insertions(+), 128 deletions(-) diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf index 54c7d0aee..69c3a0670 100644 --- a/nx-X11/config/cf/Imake.cf +++ b/nx-X11/config/cf/Imake.cf @@ -1006,34 +1006,6 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686 # endif #endif /* linux || __GLIBC__ */ -#if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc)) -# define MacroIncludeFile -# define MacroFile lynx.cf -# define LynxOSArchitecture -# undef __Lynx__ -# undef Lynx -# undef lynx -# if defined(i386) || defined(__i386__) || defined(__x86__) -# define i386Architecture -# undef i386 -# undef __i386__ -# undef __x86__ -# endif -# ifdef __powerpc__ -# define PpcArchitecture -# undef __powerpc__ -# endif -# if defined(sparc) || defined(__sparc__) -# define SparcArchitecture -# undef sparc -# undef __sparc__ -# endif -/* for compatibility with 3.3.x */ -# ifdef PpcArchitecture -# define PowerPCArchitecture -# endif -#endif /* LynxOS AT/PPC/microSPARC */ - #ifdef __uxp__ # define MacroIncludeFile # define MacroFile fujitsu.cf diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index 63ea21264..fbec1b0d1 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -512,7 +512,7 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 #ifndef BuildScanpci # if SystemV || SystemV4 || \ (defined(LinuxArchitecture) && !defined(Mc68020Architecture)) || \ - defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || \ + defined(i386BsdArchitecture) || \ defined(GNUMachArchitecture) || \ (defined(KFreeBSDArchitecture) && defined(i386Architecture)) # define BuildScanpci YES diff --git a/nx-X11/include/Xarch.h b/nx-X11/include/Xarch.h index 94a673d1f..d68b0493a 100644 --- a/nx-X11/include/Xarch.h +++ b/nx-X11/include/Xarch.h @@ -73,13 +73,6 @@ #if !defined(BYTE_ORDER) && defined(__BYTE_ORDER) #define BYTE_ORDER __BYTE_ORDER #endif -#elif defined(Lynx) -#if 0 -/* LynxOS 2.4.0 has wrong defines in bsd/ip.h */ -#include -#include -#include -#endif #endif #ifndef BYTE_ORDER @@ -98,14 +91,7 @@ #endif #endif -#ifdef Lynx -#if defined(i386) || defined(__i386__) || defined(__x86__) -#define BYTE_ORDER LITTLE_ENDIAN -#else -#define BYTE_ORDER BIG_ENDIAN -#endif -#endif -#if (defined(sun) && defined(SVR4)) && !defined(Lynx) +#if (defined(sun) && defined(SVR4)) #include #ifdef _LITTLE_ENDIAN #define BYTE_ORDER LITTLE_ENDIAN diff --git a/nx-X11/include/Xos.h b/nx-X11/include/Xos.h index 10b3a225f..8a7fface1 100644 --- a/nx-X11/include/Xos.h +++ b/nx-X11/include/Xos.h @@ -219,7 +219,7 @@ struct timeval { (t)->tv_sec = _gtodtmp.time; \ (t)->tv_usec = _gtodtmp.millitm * 1000; \ } -#elif defined(_SEQUENT_) || defined(Lynx) +#elif defined(_SEQUENT_) #include #elif defined (__QNX__) typedef unsigned long fd_mask; diff --git a/nx-X11/include/Xos_r.h b/nx-X11/include/Xos_r.h index bafbefcb3..44a3690ba 100644 --- a/nx-X11/include/Xos_r.h +++ b/nx-X11/include/Xos_r.h @@ -197,14 +197,6 @@ extern void XtProcessUnlock( # undef _POSIX_THREAD_SAFE_FUNCTIONS #endif -/* - * LynxOS 3.1 defines _POSIX_THREAD_SAFE_FUNCTIONS but - * getpwuid_r has different semantics than defined by POSIX - */ -#if defined(Lynx) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) -# undef _POSIX_THREAD_SAFE_FUNCTIONS -#endif - /***** wrappers *****/ @@ -334,18 +326,11 @@ typedef struct { struct passwd pws; char pwbuf[X_LINE_MAX]; } _Xgetpwparams; -# if defined(_POSIX_REENTRANT_FUNCTIONS) || !defined(SVR4) || defined(Lynx) -# ifndef Lynx -# define _XGetpwuid(u,p) \ +# if defined(_POSIX_REENTRANT_FUNCTIONS) || !defined(SVR4) +# define _XGetpwuid(u,p) \ ((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws) -# define _XGetpwnam(u,p) \ +# define _XGetpwnam(u,p) \ ((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws) -# else /* Lynx */ -# define _XGetpwuid(u,p) \ -((getpwuid_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws) -# define _XGetpwnam(u,p) \ -((getpwnam_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws) -# endif # else /* SVR4 */ # define _XGetpwuid(u,p) \ ((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == NULL) ? NULL : &(p).pws) diff --git a/nx-X11/lib/X11/ConnDis.c b/nx-X11/lib/X11/ConnDis.c index 660b67645..dfc0227fe 100644 --- a/nx-X11/lib/X11/ConnDis.c +++ b/nx-X11/lib/X11/ConnDis.c @@ -67,12 +67,8 @@ in this Software without prior written authorization from The Open Group. #include #if !defined(WIN32) -#ifndef Lynx #include #else -#include -#endif -#else #include #endif diff --git a/nx-X11/lib/X11/ImUtil.c b/nx-X11/lib/X11/ImUtil.c index b0d421680..79ba80ecc 100644 --- a/nx-X11/lib/X11/ImUtil.c +++ b/nx-X11/lib/X11/ImUtil.c @@ -238,10 +238,6 @@ static void _putbits( * */ -#if defined(Lynx) && defined(ROUNDUP) -#undef ROUNDUP -#endif - #define ROUNDUP(nbytes, pad) ((((nbytes) + ((pad)-1)) / (pad)) * ((pad)>>3)) #define XYNORMALIZE(bp, img) \ diff --git a/nx-X11/lib/X11/PutImage.c b/nx-X11/lib/X11/PutImage.c index de085bcde..daf172cf0 100644 --- a/nx-X11/lib/X11/PutImage.c +++ b/nx-X11/lib/X11/PutImage.c @@ -39,10 +39,6 @@ in this Software without prior written authorization from The Open Group. #define RConst const #endif -#if defined(Lynx) && defined(ROUNDUP) -#undef ROUNDUP -#endif - /* assumes pad is a power of 2 */ #define ROUNDUP(nbytes, pad) (((nbytes) + ((pad) - 1)) & ~(long)((pad) - 1)) diff --git a/nx-X11/lib/X11/lcDefConv.c b/nx-X11/lib/X11/lcDefConv.c index 51ad2f8e7..2096d871b 100644 --- a/nx-X11/lib/X11/lcDefConv.c +++ b/nx-X11/lib/X11/lcDefConv.c @@ -44,7 +44,7 @@ #define MB_LEN_MAX 6 #endif -#if !defined(Lynx_22) && !defined(X_LOCALE) +#if !defined(X_LOCALE) #define STDCVT #endif diff --git a/nx-X11/lib/X11/lcGenConv.c b/nx-X11/lib/X11/lcGenConv.c index eede76807..799f49a30 100644 --- a/nx-X11/lib/X11/lcGenConv.c +++ b/nx-X11/lib/X11/lcGenConv.c @@ -53,7 +53,7 @@ #include "XlcGeneric.h" #include -#if !defined(Lynx_22) && !defined(X_LOCALE) +#if !defined(X_LOCALE) #define STDCVT #endif diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 9a7462c7a..d13b6b79d 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -248,8 +248,7 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \ hw/nxagent/NXmiexpose.o \ hw/nxagent/NXresource.o \ hw/nxagent/NXdamage.o -#elif !defined(LynxOSArchitecture) && \ - !defined(Win32Architecture) && \ +#elif !defined(Win32Architecture) && \ !defined(QNX4Architecture) NXAGENTOBJS = hw/nxagent/miinitext.o \ hw/nxagent/NXwindow.o \ @@ -516,7 +515,7 @@ ServerTarget(NXWin,$(NXWINDIRS),$(NXWINOBJS), \ MIEXTDIRS = $(SHADOWDIR) $(LAYERDIR) $(ROOTLESSDIR) $(MIDAMAGEDIR) IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR) -DDXDIRS = $(DECWSDDXDIR) $(SUNDDXDIR) $(LYNXDDXDIR) \ +DDXDIRS = $(DECWSDDXDIR) $(SUNDDXDIR) \ $(HPDDXDIR) $(XFREE86DDXDIR) \ $(NXAGENTDDXDIR) $(NXWINDDXDIR) SUBDIRS = $(STDDIRS) \ diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c index c70f52b6a..dc8bbf97b 100644 --- a/nx-X11/programs/Xserver/Xext/shm.c +++ b/nx-X11/programs/Xserver/Xext/shm.c @@ -34,13 +34,8 @@ in this Software without prior written authorization from The Open Group. #endif #include -#ifndef Lynx #include #include -#else -#include -#include -#endif #include #include #include diff --git a/nx-X11/programs/Xserver/Xext/sync.c b/nx-X11/programs/Xserver/Xext/sync.c index 4f24d5b54..e1580b3a3 100644 --- a/nx-X11/programs/Xserver/Xext/sync.c +++ b/nx-X11/programs/Xserver/Xext/sync.c @@ -71,7 +71,7 @@ PERFORMANCE OF THIS SOFTWARE. #include "protocol-versions.h" #include -#if !defined(WIN32) && !defined(Lynx) +#if !defined(WIN32) #include #endif diff --git a/nx-X11/programs/Xserver/Xext/xvmc.c b/nx-X11/programs/Xserver/Xext/xvmc.c index 710101d07..0a43baa22 100644 --- a/nx-X11/programs/Xserver/Xext/xvmc.c +++ b/nx-X11/programs/Xserver/Xext/xvmc.c @@ -22,14 +22,9 @@ #include "xvmcext.h" #ifdef HAS_XVMCSHM -#ifndef Lynx #include #include #include -#else -#include -#include -#endif /* Lynx */ #endif /* HAS_XVMCSHM */ diff --git a/nx-X11/programs/Xserver/include/servermd.h b/nx-X11/programs/Xserver/include/servermd.h index 76f28e9ed..4f2dc27f8 100644 --- a/nx-X11/programs/Xserver/include/servermd.h +++ b/nx-X11/programs/Xserver/include/servermd.h @@ -128,11 +128,6 @@ SOFTWARE. #define BITMAP_BIT_ORDER MSBFirst #define GLYPHPADBYTES 4 -/* XXX Should this be for Lynx only? */ -#ifdef Lynx -#define BITMAP_SCANLINE_UNIT 8 -#endif - #endif /* PowerPC */ #if defined(__sh__) diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c index c775952e2..286e978ba 100644 --- a/nx-X11/programs/Xserver/os/access.c +++ b/nx-X11/programs/Xserver/os/access.c @@ -76,11 +76,7 @@ SOFTWARE. #include #include #ifndef WIN32 -#ifndef Lynx #include -#else -#include -#endif #include #include @@ -173,11 +169,7 @@ SOFTWARE. #endif /* WIN32 */ #ifndef PATH_MAX -#ifndef Lynx #include -#else -#include -#endif #ifndef PATH_MAX #ifdef MAXPATHLEN #define PATH_MAX MAXPATHLEN diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c index e38e94c67..41234e231 100644 --- a/nx-X11/programs/Xserver/os/connection.c +++ b/nx-X11/programs/Xserver/os/connection.c @@ -80,11 +80,7 @@ SOFTWARE. #include #ifndef WIN32 -#if defined(Lynx) -#include -#else #include -#endif #ifdef hpux #include @@ -125,11 +121,7 @@ SOFTWARE. # include #endif -#ifndef Lynx #include -#else -#include -#endif #endif /* WIN32 */ #include "misc.h" #include "osdep.h" diff --git a/nx-X11/programs/Xserver/os/io.c b/nx-X11/programs/Xserver/os/io.c index 8439a3edd..3771d40fb 100644 --- a/nx-X11/programs/Xserver/os/io.c +++ b/nx-X11/programs/Xserver/os/io.c @@ -71,11 +71,7 @@ SOFTWARE. #include #include #if !defined(WIN32) -#ifndef Lynx #include -#else -#include -#endif #endif #include #include diff --git a/nx-X11/programs/Xserver/os/osinit.c b/nx-X11/programs/Xserver/os/osinit.c index 81429a462..025fd104c 100644 --- a/nx-X11/programs/Xserver/os/osinit.c +++ b/nx-X11/programs/Xserver/os/osinit.c @@ -67,11 +67,11 @@ SOFTWARE. #endif #endif -#if defined(Lynx) || defined(__SCO__) +#if defined(__SCO__) #include #endif -#if !defined(SYSV) && !defined(WIN32) && !defined(Lynx) && !defined(QNX4) +#if !defined(SYSV) && !defined(WIN32) && !defined(QNX4) #include #endif diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index fca5ae2fd..5070eea8d 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -113,7 +113,7 @@ OR PERFORMANCE OF THIS SOFTWARE. #ifndef WIN32 #include #endif -#if !defined(SYSV) && !defined(WIN32) && !defined(Lynx) && !defined(QNX4) +#if !defined(SYSV) && !defined(WIN32) && !defined(QNX4) #include #endif #include @@ -329,11 +329,7 @@ OsSignal(sig, handler) #endif #ifndef PATH_MAX -#ifndef Lynx #include -#else -#include -#endif #ifndef PATH_MAX #ifdef MAXPATHLEN #define PATH_MAX MAXPATHLEN diff --git a/nx-X11/programs/Xserver/os/xdmcp.c b/nx-X11/programs/Xserver/os/xdmcp.c index 5daf1cbbf..31f013296 100644 --- a/nx-X11/programs/Xserver/os/xdmcp.c +++ b/nx-X11/programs/Xserver/os/xdmcp.c @@ -28,12 +28,8 @@ #include #if !defined(WIN32) -#ifndef Lynx #include #include -#else -#include -#endif #include #include #endif diff --git a/nx-X11/programs/Xserver/xkb/xkbAccessX.c b/nx-X11/programs/Xserver/xkb/xkbAccessX.c index 307673db7..27e56c05a 100644 --- a/nx-X11/programs/Xserver/xkb/xkbAccessX.c +++ b/nx-X11/programs/Xserver/xkb/xkbAccessX.c @@ -38,7 +38,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include "inputstr.h" #include -#if !defined(WIN32) && !defined(Lynx) +#if !defined(WIN32) #include #endif -- cgit v1.2.3 From f6dcf2feb8e0f48811852de7f4148cbf7336db08 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 20:59:35 +0100 Subject: drop platform support: unifdef hpux and __hppa__. Fixes ArcticaProject/nx-libs#273. --- nx-X11/config/cf/Imake.cf | 19 ----------- nx-X11/config/cf/Imake.tmpl | 2 -- nx-X11/config/cf/linux.cf | 21 ------------ nx-X11/config/cf/xorg.cf | 2 +- nx-X11/extras/Mesa/src/mesa/main/imports.h | 1 - nx-X11/include/Xmd.h | 1 - nx-X11/include/Xos_r.h | 4 +-- nx-X11/include/Xpoll.h.in | 20 ++---------- nx-X11/lib/X11/AuGetBest.c | 35 -------------------- nx-X11/lib/X11/CrGlCur.c | 31 ------------------ nx-X11/lib/X11/SetLocale.c | 17 +++------- nx-X11/lib/X11/XlcDL.c | 52 +----------------------------- nx-X11/lib/X11/XlibInt.c | 2 +- nx-X11/programs/Xserver/include/servermd.h | 8 ----- nx-X11/programs/Xserver/os/access.c | 8 ++--- nx-X11/programs/Xserver/os/connection.c | 10 ++---- nx-X11/programs/Xserver/os/osdep.h | 2 +- 17 files changed, 19 insertions(+), 216 deletions(-) diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf index 69c3a0670..98655ec56 100644 --- a/nx-X11/config/cf/Imake.cf +++ b/nx-X11/config/cf/Imake.cf @@ -184,12 +184,6 @@ # undef __vax__ # define VaxArchitecture # endif -# ifdef __hppa__ -# ifndef HPArchitecture -# define HPArchitecture -# endif -# undef __hppa__ -# endif /* __hppa__ */ #endif /* OpenBSD */ /* Systems based on kernel of OpenBSD */ @@ -374,13 +368,6 @@ # define SunArchitecture #endif /* sun */ -#ifdef hpux -# define MacroIncludeFile -# define MacroFile hp.cf -# undef hpux -# define HPArchitecture -#endif /* hpux */ - #ifdef __SCO__ # define MacroIncludeFile # define MacroFile sco5.cf @@ -947,12 +934,6 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686 # undef MIPSEL # undef _MIPSEL # endif -# ifdef __hppa__ -# ifndef HPArchitecture -# define HPArchitecture -# endif -# undef __hppa__ -# endif /* __hppa__ */ # ifdef __sh__ # ifndef SuperHArchitecture # define SuperHArchitecture diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index 1488c9a32..e8e1fb09b 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -515,8 +515,6 @@ XCOMM the platform-specific parameters - edit site.def to change #define ByteOrder X_BIG_ENDIAN #elif defined(PpcArchitecture) || defined(Ppc64Architecture) #define ByteOrder X_BIG_ENDIAN -#elif defined(HPArchitecture) -#define ByteOrder X_BIG_ENDIAN #elif defined(SuperHArchitecture) #define ByteOrder X_LITTLE_ENDIAN #elif defined(SuperHebArchitecture) diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf index c6ae58474..1a3f6bc5b 100644 --- a/nx-X11/config/cf/linux.cf +++ b/nx-X11/config/cf/linux.cf @@ -535,13 +535,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define LdCmd CcCmd -nostdlib -Wl,"-m alpha" # define AsmDefines -DUSE_GAS -U__ELF__ # endif /* AlphaArchitecture */ -# ifdef HPArchitecture -# define CcCmd gcc -# define CplusplusCmd g++ -# define AsCmd CcCmd -c -x assembler -# define LdCmd CcCmd -nostdlib -# define AsmDefines -DUSE_GAS -U__ELF__ -# endif /* HPArchitecture */ # ifdef i386Architecture # define CcCmd gcc -b i486-linuxaout # define CplusplusCmd g++ -b i486-linuxaout @@ -580,13 +573,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define AsmDefines -D__ELF__ # define CplusplusCmd c++ -b alpha-linux # endif /* AlphaArchitecture */ -# ifdef HPArchitecture -# define CcCmd gcc -# define CplusplusCmd g++ -# define AsCmd CcCmd -c -x assembler -# define LdCmd CcCmd -nostdlib -# define AsmDefines -D__ELF__ -# endif /* HPArchitecture */ # ifdef i386Architecture # define CcCmd gcc -b i486-linux # define AsCmd CcCmd -c -x assembler @@ -708,13 +694,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif /* Arm64Achitecture */ -#ifdef HPArchitecture -# define OptimizedCDebugFlags -O2 GccAliasingArgs -# define LinuxMachineDefines -D__hppa__ -# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -#endif - #ifdef i386Architecture # ifndef OptimizedCDebugFlags # define OptimizedCDebugFlags DefaultGcc2i386Opt diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index fbec1b0d1..2b71b90ec 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -244,7 +244,7 @@ NX_VERSION_CURRENT_STRING = nxVersionString defined(Sparc64Architecture) || defined(MipsArchitecture) || \ defined(AlphaArchitecture) || defined(PpcArchitecture) || \ defined(Mc68020Architecture) || defined(Arm32Architecture) || \ - defined(HPArchitecture) || defined(SuperHArchitecture) + defined(SuperHArchitecture) # ifndef XorgServer # define XorgServer YES # endif diff --git a/nx-X11/extras/Mesa/src/mesa/main/imports.h b/nx-X11/extras/Mesa/src/mesa/main/imports.h index 7c7a90a74..fd9c362ee 100644 --- a/nx-X11/extras/Mesa/src/mesa/main/imports.h +++ b/nx-X11/extras/Mesa/src/mesa/main/imports.h @@ -202,7 +202,6 @@ typedef union { GLfloat f; GLint i; } fi_type; defined(__s390x__) || defined(__powerpc__) || \ defined(__amd64__) || \ defined(ia64) || defined(__ia64__) || \ - defined(__hppa__) || defined(hpux) || \ defined(__mips) || defined(_MIPS_ARCH) || \ defined(__arm__) || \ defined(__sh__) || \ diff --git a/nx-X11/include/Xmd.h b/nx-X11/include/Xmd.h index 83d22a47f..a1e165d4d 100644 --- a/nx-X11/include/Xmd.h +++ b/nx-X11/include/Xmd.h @@ -58,7 +58,6 @@ SOFTWARE. defined(__ia64__) || defined(ia64) || \ defined(__sparc64__) || \ defined(__s390x__) || \ - (defined(__hppa__) && defined(__LP64__)) || \ defined(__amd64__) || defined(amd64) || \ defined(__powerpc64__) || \ (defined(sgi) && (_MIPS_SZLONG == 64)) diff --git a/nx-X11/include/Xos_r.h b/nx-X11/include/Xos_r.h index 44a3690ba..138efd704 100644 --- a/nx-X11/include/Xos_r.h +++ b/nx-X11/include/Xos_r.h @@ -927,8 +927,8 @@ typedef struct { (_Xos_processUnlock), \ (p).result ) -#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && (defined(__osf__) || defined(hpV4)) -/* Returns (int)0 on success. OSF/1 v3.2, HP/UX 10 +#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && (defined(__osf__) +/* Returns (int)0 on success. OSF/1 v3.2 * * extern int asctime_r(const struct tm *timeptr, char *buffer, int buflen); * extern int ctime_r(const time_t *timer, char *buffer, int buflen); diff --git a/nx-X11/include/Xpoll.h.in b/nx-X11/include/Xpoll.h.in index 47a0341e2..4d720a742 100644 --- a/nx-X11/include/Xpoll.h.in +++ b/nx-X11/include/Xpoll.h.in @@ -149,27 +149,11 @@ typedef struct fd_set { extern int _XSelect(int maxfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout); -#ifndef hpux /* and perhaps old BSD ??? */ -# define Select(n,r,w,e,t) _XSelect(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t) -#else -# ifndef _XPG4_EXTENDED /* HPUX 9.x and earlier */ -# define Select(n,r,w,e,t) _XSelect(n,(int*)r,(int*)w,(int*)e,(struct timeval*)t) -# else -# define Select(n,r,w,e,t) _XSelect(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t) -# endif -#endif +#define Select(n,r,w,e,t) _XSelect(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t) #else /* #ifdef NX_TRANS_SOCKET */ -#ifndef hpux /* and perhaps old BSD ??? */ -# define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t) -#else -# ifndef _XPG4_EXTENDED /* HPUX 9.x and earlier */ -# define Select(n,r,w,e,t) select(n,(int*)r,(int*)w,(int*)e,(struct timeval*)t) -# else -# define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t) -# endif -#endif +#define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t) #endif /* #ifdef NX_TRANS_SOCKET */ diff --git a/nx-X11/lib/X11/AuGetBest.c b/nx-X11/lib/X11/AuGetBest.c index fce9ddead..2518805cc 100644 --- a/nx-X11/lib/X11/AuGetBest.c +++ b/nx-X11/lib/X11/AuGetBest.c @@ -33,11 +33,6 @@ in this Software without prior written authorization from The Open Group. #ifdef XTHREADS #include #endif -#ifdef hpux -#define X_INCLUDE_NETDB_H -#define XOS_USE_NO_LOCKING -#include -#endif static int binaryEqual (_Xconst char *a, _Xconst char *b, int len) @@ -74,10 +69,6 @@ XauGetBestAuthByAddr ( Xauth *best; int best_type; int type; -#ifdef hpux - char *fully_qual_address; - unsigned short fully_qual_address_length; -#endif auth_name = XauFileName (); if (!auth_name) @@ -88,26 +79,6 @@ XauGetBestAuthByAddr ( if (!auth_file) return 0; -#ifdef hpux - if (family == FamilyLocal) { -#ifdef XTHREADS_NEEDS_BYNAMEPARAMS - _Xgethostbynameparams hparams; -#endif - struct hostent *hostp; - - /* make sure we try fully-qualified hostname */ - if ((hostp = _XGethostbyname(address,hparams)) != NULL) { - fully_qual_address = hostp->h_name; - fully_qual_address_length = strlen(fully_qual_address); - } - else - { - fully_qual_address = NULL; - fully_qual_address_length = 0; - } - } -#endif /* hpux */ - best = 0; best_type = types_length; for (;;) { @@ -131,12 +102,6 @@ XauGetBestAuthByAddr ( (entry->family == family && ((address_length == entry->address_length && binaryEqual (entry->address, address, (int)address_length)) -#ifdef hpux - || (family == FamilyLocal && - fully_qual_address_length == entry->address_length && - binaryEqual (entry->address, fully_qual_address, - (int) fully_qual_address_length)) -#endif ))) && (number_length == 0 || entry->number_length == 0 || (number_length == entry->number_length && diff --git a/nx-X11/lib/X11/CrGlCur.c b/nx-X11/lib/X11/CrGlCur.c index 11c047097..88133b7f4 100644 --- a/nx-X11/lib/X11/CrGlCur.c +++ b/nx-X11/lib/X11/CrGlCur.c @@ -33,22 +33,14 @@ in this Software without prior written authorization from The Open Group. #include #include -#if defined(hpux) -#include -#else #include -#endif #include "Cr.h" #ifdef __CYGWIN__ #define LIBXCURSOR "cygXcursor-1.dll" #endif -#if defined(hpux) -typedef shl_t XModuleType; -#else typedef void *XModuleType; -#endif #ifndef LIBXCURSOR #define LIBXCURSOR "libXcursor.so.1" @@ -64,11 +56,7 @@ open_library (void) XModuleType module; for (;;) { -#if defined(hpux) - module = shl_load(library, BIND_DEFERRED, 0L); -#else module = dlopen(library, RTLD_LAZY); -#endif if (module) return module; dot = strrchr (library, '.'); @@ -84,28 +72,9 @@ fetch_symbol (XModuleType module, const char *under_symbol) { void *result = NULL; const char *symbol = under_symbol + 1; -#if defined(hpux) - int getsyms_cnt, i; - struct shl_symbol *symbols; - - getsyms_cnt = shl_getsymbols(module, TYPE_PROCEDURE, - EXPORT_SYMBOLS, malloc, &symbols); - - for(i=0; i 0) { - free(symbols); - } -#else result = dlsym (module, symbol); if (!result) result = dlsym (module, under_symbol); -#endif return result; } diff --git a/nx-X11/lib/X11/SetLocale.c b/nx-X11/lib/X11/SetLocale.c index e14fdaef6..832976ee3 100644 --- a/nx-X11/lib/X11/SetLocale.c +++ b/nx-X11/lib/X11/SetLocale.c @@ -99,18 +99,10 @@ _XlcMapOSLocaleName( char *osname, char *siname) { -#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32) || defined(linux) -# ifdef hpux -# ifndef _LastCategory - /* HPUX 9 and earlier */ -# define SKIPCOUNT 2 -# define STARTCHAR ':' -# define ENDCHAR ';' -# else - /* HPUX 10 */ -# define ENDCHAR ' ' -# endif -# else + +/* FIXME: correct indentation levels after ancient platform clean-up */ + +#if defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32) || defined(linux) # ifdef ultrix # define SKIPCOUNT 2 # define STARTCHAR '\001' @@ -138,7 +130,6 @@ _XlcMapOSLocaleName( # endif # endif # endif -# endif char *start; char *end; diff --git a/nx-X11/lib/X11/XlcDL.c b/nx-X11/lib/X11/XlcDL.c index bc71900a0..032bcf51c 100644 --- a/nx-X11/lib/X11/XlcDL.c +++ b/nx-X11/lib/X11/XlcDL.c @@ -63,11 +63,7 @@ Sun Microsystems, Inc. or its licensors is granted. #ifdef HAVE_CONFIG_H # include #else -# if defined(hpux) -# define HAVE_DL_H -# else -# define HAVE_DLFCN_H -# endif +# define HAVE_DLFCN_H #endif #include @@ -106,11 +102,7 @@ typedef struct { char *im_unregister; int dl_release; unsigned int refcount; -#if defined(hpux) - shl_t dl_module; -#else void *dl_module; -#endif } XI18NObjectsListRec, *XI18NObjectsList; #define OBJECT_INIT_LEN 8 @@ -156,7 +148,6 @@ strdup_with_underscore(const char *symbol) return result; } -#ifndef hpux static void * try_both_dlsym (void *handle, char *name) { @@ -174,7 +165,6 @@ try_both_dlsym (void *handle, char *name) } return ret; } -#endif static void resolve_object(char *path, const char *lc_name) @@ -301,11 +291,7 @@ open_object( path = __lc_path(object->dl_name, lc_dir); if (!path) return False; -#if defined(hpux) - object->dl_module = shl_load(path, BIND_DEFERRED, 0L); -#else object->dl_module = dlopen(path, RTLD_LAZY); -#endif Xfree(path); if (!object->dl_module) @@ -322,31 +308,11 @@ fetch_symbol( char *symbol) { void *result = NULL; -#if defined(hpux) - int getsyms_cnt, i; - struct shl_symbol *symbols; -#endif if (symbol == NULL) return NULL; -#if defined(hpux) - getsyms_cnt = shl_getsymbols(object->dl_module, TYPE_PROCEDURE, - EXPORT_SYMBOLS, malloc, &symbols); - - for(i=0; i 0) { - free(symbols); - } -#else result = try_both_dlsym(object->dl_module, symbol); -#endif return result; } @@ -357,11 +323,7 @@ close_object(XI18NObjectsList object) object->refcount--; if (object->refcount == 0) { -#if defined(hpux) - shl_unload(object->dl_module); -#else dlclose(object->dl_module); -#endif object->dl_module = NULL; } } @@ -466,10 +428,6 @@ _XDynamicRegisterIMInstantiateCallback( Bool ret_flag = False; int count; XI18NObjectsList objects_list = xi18n_objects_list; -#if defined(hpux) - int getsyms_cnt, i; - struct shl_symbol *symbols; -#endif lc_name = lcd->core->name; @@ -514,10 +472,6 @@ _XDynamicUnRegisterIMInstantiateCallback( Bool ret_flag = False; int count; XI18NObjectsList objects_list = xi18n_objects_list; -#if defined(hpux) - int getsyms_cnt, i; - struct shl_symbol *symbols; -#endif lc_name = lcd->core->name; if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return False; @@ -570,10 +524,6 @@ _XDynamicOpenOM(XLCd lcd, Display *display, XrmDatabase rdb, char *lc_name; dynamicIOpenProcp om_openOM = (dynamicIOpenProcp)NULL; XI18NObjectsList objects_list = xi18n_objects_list; -#if defined(hpux) - int getsyms_cnt, i; - struct shl_symbol *symbols; -#endif lc_name = lcd->core->name; diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c index bae224ee1..bece819cf 100644 --- a/nx-X11/lib/X11/XlibInt.c +++ b/nx-X11/lib/X11/XlibInt.c @@ -3891,7 +3891,7 @@ _XData32( * and so, you may be better off using gethostname (if it exists). */ -#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(SVR4) +#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(SVR4) #define NEED_UTSNAME #include #else diff --git a/nx-X11/programs/Xserver/include/servermd.h b/nx-X11/programs/Xserver/include/servermd.h index 4f2dc27f8..5d26c3f7d 100644 --- a/nx-X11/programs/Xserver/include/servermd.h +++ b/nx-X11/programs/Xserver/include/servermd.h @@ -114,14 +114,6 @@ SOFTWARE. #endif /* __aarch64__ */ -#if defined (hpux) || defined __hppa__ - -#define IMAGE_BYTE_ORDER MSBFirst -#define BITMAP_BIT_ORDER MSBFirst -#define GLYPHPADBYTES 4 /* to make fb work */ - -#endif /* hpux || __hppa__ */ - #if defined(__powerpc__) || defined(__ppc__) #define IMAGE_BYTE_ORDER MSBFirst diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c index 286e978ba..de81c5141 100644 --- a/nx-X11/programs/Xserver/os/access.c +++ b/nx-X11/programs/Xserver/os/access.c @@ -105,7 +105,7 @@ SOFTWARE. #endif -#if defined(hpux) || defined(QNX4) +#if defined(QNX4) # include # ifdef HAS_IFREQ # include @@ -127,7 +127,7 @@ SOFTWARE. #else /*!__GNU__*/ # include #endif /*__GNU__ */ -#endif /* hpux */ +#endif /* QNX4 */ #ifdef SVR4 #include @@ -513,7 +513,7 @@ DefineSelf (int fd) #else /* WINTCP */ -#if !defined(SIOCGIFCONF) || (defined (hpux) && ! defined (HAS_IFREQ)) || defined(QNX4) +#if !defined(SIOCGIFCONF) || defined(QNX4) void DefineSelf (int fd) { @@ -1047,7 +1047,7 @@ DefineSelf (int fd) } } } -#endif /* hpux && !HAS_IFREQ */ +#endif /* SIOCGIFCONF || QNX4 */ #endif /* WINTCP */ #ifdef XDMCP diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c index 41234e231..60bcc6bb8 100644 --- a/nx-X11/programs/Xserver/os/connection.c +++ b/nx-X11/programs/Xserver/os/connection.c @@ -82,11 +82,6 @@ SOFTWARE. #ifndef WIN32 #include -#ifdef hpux -#include -#include -#endif - #if defined(DGUX) #include #include @@ -106,7 +101,9 @@ SOFTWARE. #if defined(TCPCONN) # include # include -# if !defined(hpux) + +/* FIXME: correct indentation levels after ancient platform support clean-up */ + # ifdef apollo # ifndef NO_TCP_H # include @@ -117,7 +114,6 @@ SOFTWARE. # endif # include # endif -# endif # include #endif diff --git a/nx-X11/programs/Xserver/os/osdep.h b/nx-X11/programs/Xserver/os/osdep.h index 3215b017e..6f38a2180 100644 --- a/nx-X11/programs/Xserver/os/osdep.h +++ b/nx-X11/programs/Xserver/os/osdep.h @@ -117,7 +117,7 @@ SOFTWARE. /* MAXSELECT is the number of fds that select() can handle */ #define MAXSELECT (sizeof(fd_set) * NBBY) -#if !defined(hpux) && !defined(SVR4) && !defined(SYSV) +#if !defined(SVR4) && !defined(SYSV) #define HAS_GETDTABLESIZE #endif -- cgit v1.2.3 From cc1350acecb23325096427d1c4947bf8a787304d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 21:20:22 +0100 Subject: drop platform support: unifdef AIXV3, AIXV4 (and AIXrt, AIX386). Fixes ArcticaProject/nx-libs#274. --- nx-X11/config/cf/Imake.cf | 6 +--- nx-X11/config/cf/site.def | 2 +- nx-X11/include/Xmd.h | 2 +- nx-X11/include/Xos_r.h | 13 ++++---- nx-X11/include/Xpoll.h.in | 16 +++------ nx-X11/lib/X11/SetLocale.c | 4 +-- nx-X11/lib/X11/Xaixlcint.h | 53 ------------------------------ nx-X11/lib/X11/XlibInt.c | 2 +- nx-X11/lib/xtrans/Xtrans.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Init.c | 5 --- nx-X11/programs/Xserver/include/servermd.h | 9 ----- nx-X11/programs/Xserver/os/connection.c | 4 --- nx-X11/programs/Xserver/os/utils.c | 20 ----------- nx-X11/programs/Xserver/xkb/ddxLoad.c | 2 +- nx-X11/programs/Xserver/xkb/xkbAccessX.c | 4 --- 15 files changed, 19 insertions(+), 125 deletions(-) delete mode 100644 nx-X11/lib/X11/Xaixlcint.h diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf index 98655ec56..ed4191be6 100644 --- a/nx-X11/config/cf/Imake.cf +++ b/nx-X11/config/cf/Imake.cf @@ -529,7 +529,7 @@ # define StellarArchitecture #endif /* stellar */ -#if defined(ibm) || defined(_IBMR2) || defined(ibm032) || defined(aix) +#if defined(ibm) || defined(_IBMR2) || defined(ibm032) # define MacroIncludeFile # define MacroFile ibm.cf # ifdef ibm @@ -544,10 +544,6 @@ # undef ibm032 # define RtArchitecture # endif -# ifdef aix -# undef aix -# define AIXArchitecture -# endif # ifdef _IBMR2 # undef _IBMR2 # if (DefaultOSMajorVersion < 5) diff --git a/nx-X11/config/cf/site.def b/nx-X11/config/cf/site.def index f5e769278..da4c13793 100644 --- a/nx-X11/config/cf/site.def +++ b/nx-X11/config/cf/site.def @@ -46,7 +46,7 @@ * the two following macros need to be defined directly (where "X11" is * really whatever the TopLevelProject macro is defined to be). */ -# if defined(AIXArchitecture) || defined(SVR4Architecture) || \ +# if defined(SVR4Architecture) || \ defined(SCOArchitecture) || defined(Win32Architecture) || \ defined(UXPArchitecture) || defined(SunArchitecture) || \ defined(DynixPtxArchitecture) || defined(i386IscArchitecture) diff --git a/nx-X11/include/Xmd.h b/nx-X11/include/Xmd.h index a1e165d4d..8b3af78f6 100644 --- a/nx-X11/include/Xmd.h +++ b/nx-X11/include/Xmd.h @@ -100,7 +100,7 @@ typedef long INT32; #endif typedef short INT16; -#if defined(__STDC__) || defined(sgi) || defined(AIXV3) +#if defined(__STDC__) || defined(sgi) typedef signed char INT8; #else typedef char INT8; diff --git a/nx-X11/include/Xos_r.h b/nx-X11/include/Xos_r.h index 138efd704..65dba4b0f 100644 --- a/nx-X11/include/Xos_r.h +++ b/nx-X11/include/Xos_r.h @@ -320,7 +320,7 @@ static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p) (p).pwp ) #elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(__APPLE__) && !defined(__DARWIN__) -/* SVR4 threads, AIX 4.2.0 and earlier and OSF/1 3.2 and earlier pthreads */ +/* SVR4 threads and OSF/1 3.2 and earlier pthreads */ # define X_NEEDS_PWPARAMS typedef struct { struct passwd pws; @@ -467,7 +467,7 @@ typedef struct { */ # ifdef _POSIX_REENTRANT_FUNCTIONS # ifndef _POSIX_THREAD_SAFE_FUNCTIONS -# if defined(AIXV3) || defined(AIXV4) || defined(__osf__) +# if defined(__osf__) # define X_POSIX_THREAD_SAFE_FUNCTIONS 1 # endif # endif @@ -604,9 +604,8 @@ typedef struct { # endif } _Xreaddirparams; -# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) || defined(AIXV3) || \ - defined(AIXV4) || defined(__APPLE__) || defined(__DARWIN__) -/* AIX defines the draft POSIX symbol, but uses the final API. */ +# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) || \ + defined(__APPLE__) || defined(__DARWIN__) /* POSIX final API, returns (int)0 on success. */ # if defined(__osf__) /* OSF/1 V4.0 doesn't declare _Preaddir_r, breaking under C++. */ @@ -972,7 +971,7 @@ typedef struct tm _Xltimeparams; # define _XLocaltime(t,p) localtime_r((t),&(p)) #else /* defined(_POSIX_THREAD_SAFE_FUNCTIONS) */ -/* POSIX final API. OSF/1 v4.0, AIX, etc. +/* POSIX final API. OSF/1 v4.0, etc. * * extern char *asctime_r(const struct tm *timeptr, char *buffer); * extern char *ctime_r(const time_t *timer, char *buffer); @@ -1093,7 +1092,7 @@ typedef struct { #define _XGetgrnam(n,p) getgrnam_r((n), &(p).grp, (p).buf, sizeof((p).buf)) #elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) -/* Non-POSIX API. HP/UX 10, AIX 4. +/* Non-POSIX API. HP/UX 10. * * extern int getgrgid_r(gid_t, struct group *, char *, int); * extern int getgrnam_r(const char *, struct group *, char *, int); diff --git a/nx-X11/include/Xpoll.h.in b/nx-X11/include/Xpoll.h.in index 4d720a742..c487e0af2 100644 --- a/nx-X11/include/Xpoll.h.in +++ b/nx-X11/include/Xpoll.h.in @@ -80,22 +80,16 @@ from The Open Group. * 'the branch below is the fallthrough for halfway modern systems', and include * , so we get the FD_* macros. */ #if !defined(DGUX) -# if (defined(SVR4) || defined(AIXV3)) && !defined(FD_SETSIZE) +# if defined(SVR4) && !defined(FD_SETSIZE) # include # ifdef luna # include # endif -# else /* not SVR4/AIXv3 */ -# if defined(AIXV4) /* AIX 4.2 fubar-ed , so try really hard. */ -# if !defined(NFDBITS) -# include -# endif -# else /* the branch below is the fallthrough for halfway modern systems */ -# ifdef __QNX__ /* Make sure we get 256 bit select masks */ -# define FD_SETSIZE 256 -# endif -# include +# else /* not SVR4 */ +# ifdef __QNX__ /* Make sure we get 256 bit select masks */ +# define FD_SETSIZE 256 # endif +# include # endif #else /* DGUX -- No sys/select in Intel DG/ux */ # include diff --git a/nx-X11/lib/X11/SetLocale.c b/nx-X11/lib/X11/SetLocale.c index 832976ee3..4ceed03a9 100644 --- a/nx-X11/lib/X11/SetLocale.c +++ b/nx-X11/lib/X11/SetLocale.c @@ -102,7 +102,7 @@ _XlcMapOSLocaleName( /* FIXME: correct indentation levels after ancient platform clean-up */ -#if defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32) || defined(linux) +#if defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(ultrix) || defined(WIN32) || defined(linux) # ifdef ultrix # define SKIPCOUNT 2 # define STARTCHAR '\001' @@ -114,7 +114,7 @@ _XlcMapOSLocaleName( # define ENDCHAR ';' # define WHITEFILL # else -# if defined(__osf__) || (defined(AIXV3) && !defined(AIXV4)) +# if defined(__osf__) # define STARTCHAR ' ' # define ENDCHAR ' ' # else diff --git a/nx-X11/lib/X11/Xaixlcint.h b/nx-X11/lib/X11/Xaixlcint.h deleted file mode 100644 index 446ba2581..000000000 --- a/nx-X11/lib/X11/Xaixlcint.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * - * Copyright IBM Corporation 1993 - * - * All Rights Reserved - * - * License to use, copy, modify, and distribute this software and its - * documentation for any purpose and without fee is hereby granted, - * provided that the above copyright notice appear in all copies and that - * both that copyright notice and this permission notice appear in - * supporting documentation, and that the name of IBM not be - * used in advertising or publicity pertaining to distribution of the - * software without specific, written prior permission. - * - * IBM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING - * ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS, AND - * NONINFRINGEMENT OF THIRD PARTY RIGHTS, IN NO EVENT SHALL - * IBM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR - * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, - * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, - * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - * -*/ -/************************************************************************/ -/* Xaixlcint.h */ -/*----------------------------------------------------------------------*/ -/* This file contains Xlcint.h extension for AIX. */ -/************************************************************************/ -#ifndef _Xaixlcint_h -#define _Xaixlcint_h - -#include "Xlcint.h" -#include - -#define _LC_LDX 11 -#define _LC_LDX_R6 (_LC_LDX+1) -#define _LC_VERSION_R5 5 -#define _LC_VERSION_R6 6 - -typedef struct _LC_core_ldx_t { - _LC_object_t lc_object_header; - XLCd (*default_loader)(); - Bool sticky; -} _XlcCoreObjRec, *_XlcCoreObj; - -#if _LC_VERSION < 0x40000000 -#define __type_id type_id -#define __magic magic -#define __version version -#endif - -#endif /*_Xaixlcint_h*/ diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c index bece819cf..acf766465 100644 --- a/nx-X11/lib/X11/XlibInt.c +++ b/nx-X11/lib/X11/XlibInt.c @@ -3891,7 +3891,7 @@ _XData32( * and so, you may be better off using gethostname (if it exists). */ -#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(SVR4) +#if (defined(_POSIX_SOURCE) && !defined(__QNX__)) || defined(SVR4) #define NEED_UTSNAME #include #else diff --git a/nx-X11/lib/xtrans/Xtrans.c b/nx-X11/lib/xtrans/Xtrans.c index 637c419a2..328a970b1 100644 --- a/nx-X11/lib/xtrans/Xtrans.c +++ b/nx-X11/lib/xtrans/Xtrans.c @@ -669,7 +669,7 @@ TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg) #else ret = fcntl (fd, F_SETFL, ret | O_NDELAY); #endif -#endif /* AIXV3 || uniosu */ +#endif /* WIN32 */ #endif /* FIOSNBIO */ #endif /* O_NONBLOCK */ break; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c index c492378a0..218766e06 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c @@ -536,11 +536,6 @@ void OsVendorEndRedirectErrorFFunction() nxagentEndRedirectToClientsLog(); } -/* this is just to get the server to link on AIX */ -#ifdef AIXV3 -int SelectWaitTime = 10000; /* usec */ -#endif - ServerGrabInfoRec nxagentGrabServerInfo; static void nxagentGrabServerCallback(CallbackListPtr *callbacks, void *data, diff --git a/nx-X11/programs/Xserver/include/servermd.h b/nx-X11/programs/Xserver/include/servermd.h index 5d26c3f7d..78d7c5672 100644 --- a/nx-X11/programs/Xserver/include/servermd.h +++ b/nx-X11/programs/Xserver/include/servermd.h @@ -159,15 +159,6 @@ SOFTWARE. #endif /* sun && !(i386 && SVR4) */ - -#if defined(AIXV3) - -#define IMAGE_BYTE_ORDER MSBFirst /* Values for the RISC/6000 */ -#define BITMAP_BIT_ORDER MSBFirst -#define GLYPHPADBYTES 4 - -#endif /* AIXV3 */ - #if defined(ibm032) || defined (ibm) #ifdef i386 diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c index 60bcc6bb8..f2172e0ad 100644 --- a/nx-X11/programs/Xserver/os/connection.c +++ b/nx-X11/programs/Xserver/os/connection.c @@ -94,10 +94,6 @@ SOFTWARE. #endif -#ifdef AIXV3 -#include -#endif - #if defined(TCPCONN) # include # include diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 5070eea8d..a6a42261c 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -264,11 +264,6 @@ int auditTrailLevel = 1; Bool Must_have_memory = FALSE; -#ifdef AIXV3 -int SyncOn = 0; -extern int SelectWaitTime; -#endif - #if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED) #define HAS_SAVED_IDS_AND_SETEUID #endif @@ -571,7 +566,6 @@ AdjustWaitForDelay (void * waitTime, unsigned long newdelay) void UseMsg(void) { -#if !defined(AIXrt) && !defined(AIX386) ErrorF("use: X [:] [option]\n"); ErrorF("-a # mouse acceleration (pixels)\n"); ErrorF("-ac disable access control restrictions\n"); @@ -664,7 +658,6 @@ void UseMsg(void) #ifdef XDMCP XdmcpUseMsg(); #endif -#endif /* !AIXrt && ! AIX386 */ #ifdef XKB XkbUseMsg(); #endif @@ -1062,19 +1055,6 @@ ProcessCommandLine(int argc, char *argv[]) i = skip - 1; } #endif -#ifdef AIXV3 - else if ( strcmp( argv[i], "-timeout") == 0) - { - if(++i < argc) - SelectWaitTime = atoi(argv[i]); - else - UseMsg(); - } - else if ( strcmp( argv[i], "-sync") == 0) - { - SyncOn++; - } -#endif #ifdef SMART_SCHEDULE else if ( strcmp( argv[i], "-dumbSched") == 0) { diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c index 89f777d58..d7b2314c3 100644 --- a/nx-X11/programs/Xserver/xkb/ddxLoad.c +++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c @@ -53,7 +53,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include "xkb.h" -#if defined(CSRG_BASED) || defined(linux) || defined(__sgi) || defined(AIXV3) || defined(__osf__) || defined(__GNU__) +#if defined(CSRG_BASED) || defined(linux) || defined(__sgi) || defined(__osf__) || defined(__GNU__) #include #endif diff --git a/nx-X11/programs/Xserver/xkb/xkbAccessX.c b/nx-X11/programs/Xserver/xkb/xkbAccessX.c index 27e56c05a..a358c6293 100644 --- a/nx-X11/programs/Xserver/xkb/xkbAccessX.c +++ b/nx-X11/programs/Xserver/xkb/xkbAccessX.c @@ -360,9 +360,7 @@ XkbControlsPtr ctrls; if (keybd->kbdfeed->ctrl.autoRepeat && ((xkbi->slowKey != xkbi->mouseKey) || (!xkbi->mouseKeysAccel)) && (ctrls->enabled_ctrls&XkbRepeatKeysMask)) { -#ifndef AIXV3 if (BitIsOn(keybd->kbdfeed->ctrl.autoRepeats,xkbi->slowKey)) -#endif { xkbi->repeatKey = xkbi->slowKey; xkbi->repeatKeyTimer= TimerSet(xkbi->repeatKeyTimer, @@ -529,9 +527,7 @@ KeySym * sym = XkbKeySymsPtr(xkbi->desc,key); if ((keybd->kbdfeed->ctrl.autoRepeat) && ((ctrls->enabled_ctrls&(XkbSlowKeysMask|XkbRepeatKeysMask))== XkbRepeatKeysMask)) { -#ifndef AIXV3 if (BitIsOn(keybd->kbdfeed->ctrl.autoRepeats,key)) -#endif { #ifdef DEBUG if (xkbDebugFlags&0x10) -- cgit v1.2.3 From 0a9f9a9511d80defd4835c9d19476e324bbd674d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 21:32:46 +0100 Subject: drop platform support: unifdef __osf__. Fixes ArcticaProject/nx-libs#288. --- nx-X11/config/cf/Imake.cf | 16 -------- nx-X11/config/cf/Imake.tmpl | 6 +-- nx-X11/include/Xos_r.h | 71 +++------------------------------- nx-X11/lib/X11/SetLocale.c | 7 +--- nx-X11/lib/xtrans/Xtranssock.c | 2 +- nx-X11/programs/Xserver/xkb/ddxBeep.c | 29 -------------- nx-X11/programs/Xserver/xkb/ddxLoad.c | 2 +- nx-X11/programs/Xserver/xkb/xkbInit.c | 2 +- nx-X11/programs/Xserver/xkb/xkbUtils.c | 4 -- 9 files changed, 12 insertions(+), 127 deletions(-) diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf index ed4191be6..5ff2ee16b 100644 --- a/nx-X11/config/cf/Imake.cf +++ b/nx-X11/config/cf/Imake.cf @@ -703,22 +703,6 @@ # define ConvexArchitecture #endif /* _convex_ */ -#ifdef __osf__ -# define MacroIncludeFile -# define MacroFile osf1.cf -# define OSF1Architecture -# undef __osf__ -# ifdef __mips__ -# undef __mips__ -# define MipsArchitecture -# define MipselArchitecture -# endif -# ifdef __alpha -# undef __alpha -# define AlphaArchitecture -# endif -#endif /* __osf__ */ - #ifdef Oki # define MacroIncludeFile # define MacroFile Oki.cf diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index e8e1fb09b..93b659a0d 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -1516,21 +1516,21 @@ TCLIBDIR = TclLibDir #define LibManSuffix 3 /* use just one tab or cpp will die */ #endif #ifndef FileManSuffix -#if SystemV || SystemV4 || defined(OSF1Architecture) +#if SystemV || SystemV4 #define FileManSuffix 4 /* use just one tab or cpp will die */ #else #define FileManSuffix 5 /* use just one tab or cpp will die */ #endif #endif #ifndef MiscManSuffix -#if SystemV || SystemV4 || defined(OSF1Architecture) +#if SystemV || SystemV4 #define MiscManSuffix 5 /* use just one tab or cpp will die */ #else #define MiscManSuffix 7 /* use just one tab or cpp will die */ #endif #endif #ifndef DriverManSuffix -#if SystemV || SystemV4 || defined(OSF1Architecture) +#if SystemV || SystemV4 #define DriverManSuffix 7 /* use just one tab or cpp will die */ #else #define DriverManSuffix 4 /* use just one tab or cpp will die */ diff --git a/nx-X11/include/Xos_r.h b/nx-X11/include/Xos_r.h index 65dba4b0f..51269226c 100644 --- a/nx-X11/include/Xos_r.h +++ b/nx-X11/include/Xos_r.h @@ -37,9 +37,8 @@ in this Software without prior written authorization from The Open Group. * * If you are on a platform that defines XTHREADS but does not have * MT-safe system API (e.g. UnixWare) you must define _Xos_processLock - * and _Xos_processUnlock macros before including this header. If - * you are on OSF/1 V3.2 and plan to use readdir(), you must also define - * _Xos_isThreadsInitialized. For convenience XOS_USE_XLIB_LOCKING or + * and _Xos_processUnlock macros before including this header. + * For convenience XOS_USE_XLIB_LOCKING or * XOS_USE_XT_LOCKING may be defined to obtain either Xlib-only or * Xt-based versions of these macros. These macros won't result in * truly thread-safe calls, but they are better than nothing. If you @@ -320,7 +319,7 @@ static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p) (p).pwp ) #elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(__APPLE__) && !defined(__DARWIN__) -/* SVR4 threads and OSF/1 3.2 and earlier pthreads */ +/* SVR4 threads */ # define X_NEEDS_PWPARAMS typedef struct { struct passwd pws; @@ -340,11 +339,6 @@ typedef struct { #else /* _POSIX_THREAD_SAFE_FUNCTIONS */ /* Digital UNIX 4.0, but not (beta) T4.0-1 */ -# if defined(__osf__) -/* OSF/1 V4.0 doesn't declare the _P routines, breaking under C++. */ -extern int _Pgetpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **); -extern int _Pgetpwnam_r(const char *, struct passwd *, char *, size_t, struct passwd **); -# endif # define X_NEEDS_PWPARAMS typedef struct { struct passwd pws; @@ -467,9 +461,7 @@ typedef struct { */ # ifdef _POSIX_REENTRANT_FUNCTIONS # ifndef _POSIX_THREAD_SAFE_FUNCTIONS -# if defined(__osf__) -# define X_POSIX_THREAD_SAFE_FUNCTIONS 1 -# endif +# define X_POSIX_THREAD_SAFE_FUNCTIONS 1 # endif # endif # ifdef _POSIX_THREAD_SAFE_FUNCTIONS @@ -607,28 +599,8 @@ typedef struct { # if defined(_POSIX_THREAD_SAFE_FUNCTIONS) || \ defined(__APPLE__) || defined(__DARWIN__) /* POSIX final API, returns (int)0 on success. */ -# if defined(__osf__) -/* OSF/1 V4.0 doesn't declare _Preaddir_r, breaking under C++. */ -extern int _Preaddir_r(DIR *, struct dirent *, struct dirent **); -# endif # define _XReaddir(d,p) \ (readdir_r((d), &((p).dir_entry), &((p).result)) ? NULL : (p).result) -# elif defined(_POSIX_REENTRANT_FUNCTIONS) && defined(__osf__) -/* - * OSF/1 V3.2 readdir_r() will SEGV if the main program is not - * explicitly linked with -lc_r. The library REQUIREDLIBS don't help. - * Assume that if threads have been initialized we're linked properly. - */ -# define _XReaddir(d,p) \ - ( (_Xos_isThreadInitialized) ? \ - (readdir_r((d), &((p).dir_entry)) ? NULL : &((p).dir_entry)) : \ - ((_Xos_processLock), \ - (((p).result = readdir((d))) ? \ - (memcpy(&((p).dir_entry), (p).result, (p).result->d_reclen), \ - ((p).result = &(p).dir_entry), 0) : \ - 0), \ - (_Xos_processUnlock), \ - (p).result) ) # elif defined(_POSIX_REENTRANT_FUNCTIONS) /* POSIX draft API, returns (int)0 on success. */ # define _XReaddir(d,p) \ @@ -926,28 +898,6 @@ typedef struct { (_Xos_processUnlock), \ (p).result ) -#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && (defined(__osf__) -/* Returns (int)0 on success. OSF/1 v3.2 - * - * extern int asctime_r(const struct tm *timeptr, char *buffer, int buflen); - * extern int ctime_r(const time_t *timer, char *buffer, int buflen); - * extern int gmtime_r(const time_t *timer, struct tm *result); - * extern int localtime_r(const time_t *timer, struct tm *result); - */ -# ifdef TIMELEN -typedef char _Xatimeparams[TIMELEN]; -typedef char _Xctimeparams[TIMELEN]; -# else -typedef char _Xatimeparams[26]; -typedef char _Xctimeparams[26]; -# endif -typedef struct tm _Xgtimeparams; -typedef struct tm _Xltimeparams; -# define _XAsctime(t,p) (asctime_r((t),(p),sizeof((p))) ? NULL : (p)) -# define _XCtime(t,p) (ctime_r((t),(p),sizeof((p))) ? NULL : (p)) -# define _XGmtime(t,p) (gmtime_r((t),&(p)) ? NULL : &(p)) -# define _XLocaltime(t,p) (localtime_r((t),&(p)) ? NULL : &(p)) - #elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(sun) /* Returns NULL on failure. Solaris 2.5 * @@ -978,12 +928,6 @@ typedef struct tm _Xltimeparams; * extern struct tm *gmtime_r(const time_t *timer, struct tm *result); * extern struct tm *localtime_r(const time_t *timer, struct tm *result); */ -# if defined(__osf__) -/* OSF/1 V4.0 doesn't declare the _P routines, breaking under C++. */ -extern char *_Pasctime_r(const struct tm *, char *); -extern char *_Pctime_r(const time_t *, char *); -extern struct tm *_Plocaltime_r(const time_t *, struct tm *); -# endif # ifdef TIMELEN typedef char _Xatimeparams[TIMELEN]; typedef char _Xctimeparams[TIMELEN]; @@ -1078,7 +1022,7 @@ typedef struct { (_Xos_processUnlock), \ (p).pgrp ) -#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && (defined(sun) || defined(__osf__)) +#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(sun) /* Non-POSIX API. Solaris, DEC v3.2. * * extern struct group *getgrgid_r(gid_t, struct group *, char *, int); @@ -1112,11 +1056,6 @@ typedef struct { * int getgrgid_r(gid_t, struct group *, char *, size_t, struct group **); * int getgrnam_r(const char *, struct group *, char *, size_t, struct group **); */ -# if defined(__osf__) -/* OSF/1 V4.0 doesn't declare the _P routines, breaking under C++. */ -extern int _Pgetgrgid_r(gid_t, struct group *, char *, size_t, struct group **); -extern int _Pgetgrnam_r(const char *, struct group *, char *, size_t, struct group **); -# endif typedef struct { struct group grp; char buf[X_LINE_MAX]; /* Should be sysconf(_SC_GETGR_R_SIZE_MAX)? */ diff --git a/nx-X11/lib/X11/SetLocale.c b/nx-X11/lib/X11/SetLocale.c index 4ceed03a9..4f39f1fcf 100644 --- a/nx-X11/lib/X11/SetLocale.c +++ b/nx-X11/lib/X11/SetLocale.c @@ -102,7 +102,7 @@ _XlcMapOSLocaleName( /* FIXME: correct indentation levels after ancient platform clean-up */ -#if defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(ultrix) || defined(WIN32) || defined(linux) +#if defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(ultrix) || defined(WIN32) || defined(linux) # ifdef ultrix # define SKIPCOUNT 2 # define STARTCHAR '\001' @@ -114,10 +114,6 @@ _XlcMapOSLocaleName( # define ENDCHAR ';' # define WHITEFILL # else -# if defined(__osf__) -# define STARTCHAR ' ' -# define ENDCHAR ' ' -# else # if defined(linux) # define STARTSTR "LC_CTYPE=" # define ENDCHAR ';' @@ -127,7 +123,6 @@ _XlcMapOSLocaleName( # define ENDCHAR '/' # endif # endif -# endif # endif # endif diff --git a/nx-X11/lib/xtrans/Xtranssock.c b/nx-X11/lib/xtrans/Xtranssock.c index 1a76c406d..dff217e9d 100644 --- a/nx-X11/lib/xtrans/Xtranssock.c +++ b/nx-X11/lib/xtrans/Xtranssock.c @@ -136,7 +136,7 @@ from the copyright holders. #ifndef NO_TCP_H #if defined(linux) || defined(__GLIBC__) #include -#endif /* osf */ +#endif /* linux || __GLIBC__ */ #if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) #include #include diff --git a/nx-X11/programs/Xserver/xkb/ddxBeep.c b/nx-X11/programs/Xserver/xkb/ddxBeep.c index e4427ba26..fa4af7456 100644 --- a/nx-X11/programs/Xserver/xkb/ddxBeep.c +++ b/nx-X11/programs/Xserver/xkb/ddxBeep.c @@ -38,12 +38,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include -#if (defined(__osf__) && defined(__alpha)) -#include -#include -#include -#endif - /*#define FALLING_TONE 1*/ /*#define RISING_TONE 1*/ #define FALLING_TONE 10 @@ -115,31 +109,8 @@ _XkbDDXBeepInitAtoms(void) stickyLock= MAKE_ATOM(STICKY_LOCK); stickyUnlock= MAKE_ATOM(STICKY_UNLOCK); bounceReject= MAKE_ATOM(BOUNCE_REJECT); -#if (defined(__osf__) && defined(__alpha)) - /* [[[ WDW - Some bells do not allow for pitch changes. - * Maybe this could become part of the keymap? ]]] - */ - { - char keyboard[8]; - - /* Find the class of keyboard being used. - */ - keyboard[0] = '\0'; - if (-1 == getsysinfo(GSI_KEYBOARD, - keyboard, sizeof(keyboard), - 0, NULL)) - keyboard[0] = '\0'; - - if ((strcmp(keyboard,"LK201") == 0) || - (strcmp(keyboard,"LK401") == 0) || - (strcmp(keyboard,"LK421") == 0) || - (strcmp(keyboard,"LK443") == 0)) - doesPitch = 0; - } -#else #if defined(sun) doesPitch = 0; -#endif #endif return; } diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c index d7b2314c3..ef32a4642 100644 --- a/nx-X11/programs/Xserver/xkb/ddxLoad.c +++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c @@ -53,7 +53,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include "xkb.h" -#if defined(CSRG_BASED) || defined(linux) || defined(__sgi) || defined(__osf__) || defined(__GNU__) +#if defined(CSRG_BASED) || defined(linux) || defined(__sgi) || defined(__GNU__) #include #endif diff --git a/nx-X11/programs/Xserver/xkb/xkbInit.c b/nx-X11/programs/Xserver/xkb/xkbInit.c index 42e6812d7..10260bf83 100644 --- a/nx-X11/programs/Xserver/xkb/xkbInit.c +++ b/nx-X11/programs/Xserver/xkb/xkbInit.c @@ -61,7 +61,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define PHYS_LEDS 0x7f #define LED_COMPOSE 8 #else -#if defined(ultrix) || defined(__osf__) || defined(__alpha) || defined(__alpha__) +#if defined(ultrix) || defined(__alpha) || defined(__alpha__) #define LED_COMPOSE 2 #define LED_CAPS 3 #define LED_SCROLL 4 diff --git a/nx-X11/programs/Xserver/xkb/xkbUtils.c b/nx-X11/programs/Xserver/xkb/xkbUtils.c index b6a845c18..f4b7db3c6 100644 --- a/nx-X11/programs/Xserver/xkb/xkbUtils.c +++ b/nx-X11/programs/Xserver/xkb/xkbUtils.c @@ -51,12 +51,8 @@ int XkbDisableLockActions = 0; /***====================================================================***/ #ifndef RETURN_SHOULD_REPEAT -#if (defined(__osf__) && defined(__alpha)) -#define RETURN_SHOULD_REPEAT 1 -#else #define RETURN_SHOULD_REPEAT 0 #endif -#endif /***====================================================================***/ -- cgit v1.2.3 From 29401f29b3e818a74eab7334046bbb37173edffc Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 21:41:57 +0100 Subject: drop platform support: unifdef DGUX. Relates to ArcticaProject/nx-libs#275. --- nx-X11/config/cf/Imake.cf | 11 +---------- nx-X11/include/Xpoll.h.in | 25 ++++++++++--------------- nx-X11/programs/Xserver/os/access.c | 20 +++----------------- nx-X11/programs/Xserver/os/connection.c | 12 ------------ nx-X11/programs/Xserver/os/rpcauth.c | 5 ----- nx-X11/programs/Xserver/os/utils.c | 10 ---------- nx-X11/programs/Xserver/os/xdmcp.c | 5 ----- 7 files changed, 14 insertions(+), 74 deletions(-) diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf index 5ff2ee16b..086d9d0eb 100644 --- a/nx-X11/config/cf/Imake.cf +++ b/nx-X11/config/cf/Imake.cf @@ -592,7 +592,7 @@ # endif #endif /* MOTOROLA */ -#if defined(SVR4) && !defined(DGUX) +#if defined(SVR4) # ifdef i386 # define i386Architecture # undef i386 @@ -685,15 +685,6 @@ # endif /* ! SVR4 */ #endif /* SYSV386 */ -#ifdef DGUX -# define i386Architecture -# define SVR4Architecture -# define MacroIncludeFile -# define MacroFile DGUX.cf -# undef DGUX -# define DguxArchitecture -#endif /* DGUX */ - #ifdef __convex__ # define MacroIncludeFile # define MacroFile convex.cf diff --git a/nx-X11/include/Xpoll.h.in b/nx-X11/include/Xpoll.h.in index c487e0af2..3ad5d0669 100644 --- a/nx-X11/include/Xpoll.h.in +++ b/nx-X11/include/Xpoll.h.in @@ -79,22 +79,17 @@ from The Open Group. /* Below is the monster branch from hell. Basically, most systems will drop to * 'the branch below is the fallthrough for halfway modern systems', and include * , so we get the FD_* macros. */ -#if !defined(DGUX) -# if defined(SVR4) && !defined(FD_SETSIZE) -# include -# ifdef luna -# include -# endif -# else /* not SVR4 */ -# ifdef __QNX__ /* Make sure we get 256 bit select masks */ -# define FD_SETSIZE 256 -# endif -# include + +#if defined(SVR4) && !defined(FD_SETSIZE) +# include +# ifdef luna +# include +# endif +#else /* not SVR4 */ +# ifdef __QNX__ /* Make sure we get 256 bit select masks */ +# define FD_SETSIZE 256 # endif -#else /* DGUX -- No sys/select in Intel DG/ux */ -# include -# include -# include +# include #endif #include diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c index de81c5141..e45645cda 100644 --- a/nx-X11/programs/Xserver/os/access.c +++ b/nx-X11/programs/Xserver/os/access.c @@ -91,20 +91,6 @@ SOFTWARE. # endif #endif -#if defined(DGUX) -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#endif - - #if defined(QNX4) # include # ifdef HAS_IFREQ @@ -307,7 +293,7 @@ AccessUsingXdmcp (void) } -#if ((defined(SVR4) && !defined(DGUX) && !defined(SCO325) && !defined(sun) && !defined(NCR)) || defined(ISC)) && !defined(__sgi) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF) +#if ((defined(SVR4) && !defined(SCO325) && !defined(sun) && !defined(NCR)) || defined(ISC)) && !defined(__sgi) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF) /* Deal with different SIOCGIFCONF ioctl semantics on these OSs */ @@ -356,9 +342,9 @@ ifioctl (int fd, int cmd, char *arg) #endif return(ret); } -#else /* Case DGUX, sun, SCO325 NCR and others */ +#else /* Case sun, SCO325 NCR and others */ #define ifioctl ioctl -#endif /* ((SVR4 && !DGUX !sun !SCO325 !NCR) || ISC) && SIOCGIFCONF */ +#endif /* ((SVR4 && !sun !SCO325 !NCR) || ISC) && SIOCGIFCONF */ /* * DefineSelf (fd): diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c index f2172e0ad..458daab54 100644 --- a/nx-X11/programs/Xserver/os/connection.c +++ b/nx-X11/programs/Xserver/os/connection.c @@ -82,18 +82,6 @@ SOFTWARE. #ifndef WIN32 #include -#if defined(DGUX) -#include -#include -#include -#include -#include -#include -#include -#include -#endif - - #if defined(TCPCONN) # include # include diff --git a/nx-X11/programs/Xserver/os/rpcauth.c b/nx-X11/programs/Xserver/os/rpcauth.c index 2a6874f4a..678bedf6c 100644 --- a/nx-X11/programs/Xserver/os/rpcauth.c +++ b/nx-X11/programs/Xserver/os/rpcauth.c @@ -51,11 +51,6 @@ from The Open Group. extern bool_t xdr_opaque_auth(XDR *, struct opaque_auth *); #endif -#if defined(DGUX) -#include -#include -#endif /* DGUX */ - #ifdef ultrix #include #include diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index a6a42261c..540de2835 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -124,11 +124,6 @@ OR PERFORMANCE OF THIS SOFTWARE. #include #include -#if defined(DGUX) -#include -#include -#endif - #include /* for malloc() */ #if defined(TCPCONN) @@ -318,11 +313,6 @@ OsSignal(sig, handler) #define LOCK_PREFIX "/.X" #define LOCK_SUFFIX "-lock" -#if defined(DGUX) -#include -#include -#endif - #ifndef PATH_MAX #include #ifndef PATH_MAX diff --git a/nx-X11/programs/Xserver/os/xdmcp.c b/nx-X11/programs/Xserver/os/xdmcp.c index 31f013296..83e234b43 100644 --- a/nx-X11/programs/Xserver/os/xdmcp.c +++ b/nx-X11/programs/Xserver/os/xdmcp.c @@ -45,11 +45,6 @@ #include "dixstruct.h" #include "opaque.h" -#if defined(DGUX) -#include -#include -#endif - #ifndef NX_TRANS_SOCKET -- cgit v1.2.3 From 5c3776d251ec0fb9cddf1d0ac641754582dbc4d7 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 21:51:55 +0100 Subject: drop platform support: unifdef QNX. Relates to ArcticaProject/nx-libs#275. --- nx-X11/config/cf/Imake.cf | 31 ------------------------------ nx-X11/include/Xalloca.h | 2 -- nx-X11/include/Xarch.h | 12 ------------ nx-X11/include/Xos.h | 10 +--------- nx-X11/include/Xpoll.h.in | 3 --- nx-X11/lib/X11/Imakefile | 4 ---- nx-X11/lib/X11/XlibInt.c | 2 +- nx-X11/programs/Xserver/Imakefile | 3 +-- nx-X11/programs/Xserver/include/servermd.h | 1 - nx-X11/programs/Xserver/mi/miarc.c | 2 +- nx-X11/programs/Xserver/mi/miinitext.c | 4 ---- nx-X11/programs/Xserver/os/access.c | 24 ++--------------------- nx-X11/programs/Xserver/os/osdep.h | 3 --- nx-X11/programs/Xserver/os/osinit.c | 2 +- nx-X11/programs/Xserver/os/utils.c | 5 +---- nx-X11/programs/Xserver/xkb/xkbAccessX.c | 3 --- 16 files changed, 8 insertions(+), 103 deletions(-) diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf index 086d9d0eb..2387e8067 100644 --- a/nx-X11/config/cf/Imake.cf +++ b/nx-X11/config/cf/Imake.cf @@ -1041,37 +1041,6 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686 #endif #endif -#if defined(__QNX__) && !defined(__QNXNTO__) -#define MacroIncludeFile -#define MacroFile QNX4.cf -#define QNX4Architecture -#define i386Architecture -#endif /* QNX4 */ - -#ifdef __QNXNTO__ -#define MacroIncludeFile -#define MacroFile nto.cf -#define NTOArchitecture -# ifdef PPC -# define PPCArchitecture -# undef PPC -# endif -# ifdef MIPS -# define mipsArchitecture -# undef MIPS -# endif -# ifdef i386 -# define i386Architecture -# undef i386 -# endif /* i386 */ -# ifdef __i386__ -# ifndef i386Architecture -# define i386Architecture -# endif -# undef __i386__ -# endif /* __i386__ */ -#endif /* QNX/Neutrino */ - #ifdef SparcArchitecture # if defined(__sparc_v9) || defined(__arch64__) # define Sparc64Architecture diff --git a/nx-X11/include/Xalloca.h b/nx-X11/include/Xalloca.h index 1ec112619..348a7bc2d 100644 --- a/nx-X11/include/Xalloca.h +++ b/nx-X11/include/Xalloca.h @@ -110,14 +110,12 @@ from The Open Group. */ /* alloca might be a macro taking one arg (hi, Sun!), so give it one. */ # ifndef __sgi /* IRIX 5/6 has definition */ -# ifndef __QNX__ # define __Xnullarg /* as nothing */ # ifndef X_NOT_STDC_ENV extern void *alloca(__Xnullarg); # else extern char *alloca(__Xnullarg); # endif -# endif /* __QNX__ */ # endif /* __sgi */ # define ALLOCATE_LOCAL(size) alloca((int)(size)) # endif /* who does alloca */ diff --git a/nx-X11/include/Xarch.h b/nx-X11/include/Xarch.h index d68b0493a..aa92b43f4 100644 --- a/nx-X11/include/Xarch.h +++ b/nx-X11/include/Xarch.h @@ -79,18 +79,6 @@ #define LITTLE_ENDIAN 1234 #define BIG_ENDIAN 4321 -#if defined(__QNX__) && !defined(__QNXNTO__) -#define BYTE_ORDER LITTLE_ENDIAN -#endif - -#if defined(__QNXNTO__) -#if defined(i386) || defined(__i386__) || defined(__x86__) -#define BYTE_ORDER LITTLE_ENDIAN -#else -#define BYTE_ORDER BIG_ENDIAN -#endif -#endif - #if (defined(sun) && defined(SVR4)) #include #ifdef _LITTLE_ENDIAN diff --git a/nx-X11/include/Xos.h b/nx-X11/include/Xos.h index 8a7fface1..353965c1c 100644 --- a/nx-X11/include/Xos.h +++ b/nx-X11/include/Xos.h @@ -221,13 +221,6 @@ struct timeval { } #elif defined(_SEQUENT_) #include -#elif defined (__QNX__) -typedef unsigned long fd_mask; -/* Make sure we get 256 bit select masks */ -#define FD_SETSIZE 256 -#include -#include -#include #else #include #include @@ -264,8 +257,7 @@ typedef unsigned long fd_mask; #endif #if defined(ISC) || \ - (defined(__linux__) && !defined(__GLIBC__)) || \ - (defined(__QNX__) && !defined(UNIXCONN)) + (defined(__linux__) && !defined(__GLIBC__)) /* * Some OS's may not have this */ diff --git a/nx-X11/include/Xpoll.h.in b/nx-X11/include/Xpoll.h.in index 3ad5d0669..db8c565d9 100644 --- a/nx-X11/include/Xpoll.h.in +++ b/nx-X11/include/Xpoll.h.in @@ -86,9 +86,6 @@ from The Open Group. # include # endif #else /* not SVR4 */ -# ifdef __QNX__ /* Make sure we get 256 bit select masks */ -# define FD_SETSIZE 256 -# endif # include #endif diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index 69b96314a..061f2e33e 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -1078,10 +1078,6 @@ InstallNonExecFile(Xcms.txt,$(LIBDIR)) InstallNonExecFile(XErrorDB,$(LIBDIR)) InstallLintLibrary(X11,$(LINTLIBDIR)) -#ifdef QNX4Architecture -LOCAL_LDFLAGS=-F -#endif - MAKEKEYS = ./makekeys KEYSYMDEFS = $(XINCLUDESRC)/keysymdef.h $(XINCLUDESRC)/XF86keysym.h $(XINCLUDESRC)/Sunkeysym.h $(XINCLUDESRC)/DECkeysym.h $(XINCLUDESRC)/HPkeysym.h diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c index acf766465..912c52989 100644 --- a/nx-X11/lib/X11/XlibInt.c +++ b/nx-X11/lib/X11/XlibInt.c @@ -3891,7 +3891,7 @@ _XData32( * and so, you may be better off using gethostname (if it exists). */ -#if (defined(_POSIX_SOURCE) && !defined(__QNX__)) || defined(SVR4) +#if defined(_POSIX_SOURCE) || defined(SVR4) #define NEED_UTSNAME #include #else diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index d13b6b79d..ddce93127 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -248,8 +248,7 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \ hw/nxagent/NXmiexpose.o \ hw/nxagent/NXresource.o \ hw/nxagent/NXdamage.o -#elif !defined(Win32Architecture) && \ - !defined(QNX4Architecture) +#elif !defined(Win32Architecture) NXAGENTOBJS = hw/nxagent/miinitext.o \ hw/nxagent/NXwindow.o \ hw/nxagent/NXevents.o \ diff --git a/nx-X11/programs/Xserver/include/servermd.h b/nx-X11/programs/Xserver/include/servermd.h index 78d7c5672..7e4412e15 100644 --- a/nx-X11/programs/Xserver/include/servermd.h +++ b/nx-X11/programs/Xserver/include/servermd.h @@ -305,7 +305,6 @@ SOFTWARE. #if (defined(SVR4) && defined(i386)) || \ defined(__alpha__) || defined(__alpha) || \ defined(__i386__) || defined(__i386) || \ - defined(__QNX__) || \ defined(__s390x__) || defined(__s390__) #ifndef IMAGE_BYTE_ORDER diff --git a/nx-X11/programs/Xserver/mi/miarc.c b/nx-X11/programs/Xserver/mi/miarc.c index c812673eb..ee493bc2c 100644 --- a/nx-X11/programs/Xserver/mi/miarc.c +++ b/nx-X11/programs/Xserver/mi/miarc.c @@ -51,7 +51,7 @@ SOFTWARE. #include #endif -#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \ +#if defined(_XOPEN_SOURCE) \ || (defined(sun) && defined(__SVR4)) #include #else diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c index fc64937d7..6f6d67841 100644 --- a/nx-X11/programs/Xserver/mi/miinitext.c +++ b/nx-X11/programs/Xserver/mi/miinitext.c @@ -66,10 +66,6 @@ SOFTWARE. #include "extension.h" #include "micmap.h" -#if defined(QNX4) /* sleaze for Watcom on QNX4 ... */ -#undef GLXEXT -#endif - extern Bool noTestExtensions; #ifdef BIGREQS diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c index e45645cda..c04e9c7a0 100644 --- a/nx-X11/programs/Xserver/os/access.c +++ b/nx-X11/programs/Xserver/os/access.c @@ -91,12 +91,6 @@ SOFTWARE. # endif #endif -#if defined(QNX4) -# include -# ifdef HAS_IFREQ -# include -# endif -#else #if defined(SVR4) || (defined(SYSV) && defined(i386)) || defined(__GNU__) # include #endif @@ -113,7 +107,6 @@ SOFTWARE. #else /*!__GNU__*/ # include #endif /*__GNU__ */ -#endif /* QNX4 */ #ifdef SVR4 #include @@ -499,7 +492,7 @@ DefineSelf (int fd) #else /* WINTCP */ -#if !defined(SIOCGIFCONF) || defined(QNX4) +#if !defined(SIOCGIFCONF) void DefineSelf (int fd) { @@ -542,19 +535,11 @@ DefineSelf (int fd) * uname() lets me access to the whole string (it smashes release, you * see), whereas gethostname() kindly truncates it for me. */ -#ifndef QNX4 #ifndef WIN32 uname(&name); #else gethostname(name.nodename, sizeof(name.nodename)); #endif -#else - /* QNX4's uname returns node number in name.nodename, not the hostname - have to overwrite it */ - char hname[1024]; - gethostname(hname, 1024); - name.nodename = hname; -#endif hp = _XGethostbyname(name.nodename, hparams); if (hp != NULL) @@ -663,14 +648,9 @@ DefineLocalHost: p->ifr_addr.sa_len - sizeof (p->ifr_addr) : 0)) #define ifraddr_size(a) (a.sa_len) #else -#ifdef QNX4 -#define ifr_size(p) (p->ifr_addr.sa_len + IFNAMSIZ) -#define ifraddr_size(a) (a.sa_len) -#else #define ifr_size(p) (sizeof (ifr_type)) #define ifraddr_size(a) (sizeof (a)) #endif -#endif #if defined(DEF_SELF_DEBUG) || (defined(IPv6) && defined(AF_INET6)) #include @@ -1033,7 +1013,7 @@ DefineSelf (int fd) } } } -#endif /* SIOCGIFCONF || QNX4 */ +#endif /* !SIOCGIFCONF */ #endif /* WINTCP */ #ifdef XDMCP diff --git a/nx-X11/programs/Xserver/os/osdep.h b/nx-X11/programs/Xserver/os/osdep.h index 6f38a2180..3babab3e1 100644 --- a/nx-X11/programs/Xserver/os/osdep.h +++ b/nx-X11/programs/Xserver/os/osdep.h @@ -79,9 +79,6 @@ SOFTWARE. #endif /* X_NOT_POSIX */ #endif -#ifdef __QNX__ -#define NOFILES_MAX 256 -#endif #ifndef OPEN_MAX #ifdef SVR4 #define OPEN_MAX 256 diff --git a/nx-X11/programs/Xserver/os/osinit.c b/nx-X11/programs/Xserver/os/osinit.c index 025fd104c..7aa961a56 100644 --- a/nx-X11/programs/Xserver/os/osinit.c +++ b/nx-X11/programs/Xserver/os/osinit.c @@ -71,7 +71,7 @@ SOFTWARE. #include #endif -#if !defined(SYSV) && !defined(WIN32) && !defined(QNX4) +#if !defined(SYSV) && !defined(WIN32) #include #endif diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 540de2835..6e5482fc1 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -113,7 +113,7 @@ OR PERFORMANCE OF THIS SOFTWARE. #ifndef WIN32 #include #endif -#if !defined(SYSV) && !defined(WIN32) && !defined(QNX4) +#if !defined(SYSV) && !defined(WIN32) #include #endif #include @@ -2007,9 +2007,6 @@ CheckUserParameters(int argc, char **argv, char **envp) enum BadCode bad = NotBad; int i = 0, j; char *a, *e = NULL; -#if defined(__QNX__) && !defined(__QNXNTO__) - char cmd_name[64]; -#endif #if CHECK_EUID if (geteuid() == 0 && getuid() != geteuid()) diff --git a/nx-X11/programs/Xserver/xkb/xkbAccessX.c b/nx-X11/programs/Xserver/xkb/xkbAccessX.c index a358c6293..4069ac209 100644 --- a/nx-X11/programs/Xserver/xkb/xkbAccessX.c +++ b/nx-X11/programs/Xserver/xkb/xkbAccessX.c @@ -30,9 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include -#ifdef __QNX__ -#include -#endif #include #include #include -- cgit v1.2.3 From 8c1a21b4568f50a1fbbe014ee744d7130754d2ed Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 22:03:39 +0100 Subject: drop platform support: unifdef sgi. Relates to ArcticaProject/nx-libs#275. --- nx-X11/config/cf/Imake.cf | 18 ------------------ nx-X11/include/Xalloca.h | 2 -- nx-X11/include/Xarch.h | 2 +- nx-X11/include/Xmd.h | 5 ++--- nx-X11/include/Xos.h | 2 -- nx-X11/include/Xthreads.h | 2 +- nx-X11/lib/X11/SetLocale.c | 2 +- nx-X11/lib/X11/UIThrStubs.c | 2 +- nx-X11/lib/X11/XKB.c | 4 ---- nx-X11/lib/X11/XKBCvt.c | 4 ---- nx-X11/lib/X11/Xlibint.h | 3 --- nx-X11/programs/Xserver/Imakefile | 2 +- nx-X11/programs/Xserver/dix/devices.c | 6 ------ nx-X11/programs/Xserver/fb/fb.h | 3 +-- nx-X11/programs/Xserver/hw/nxagent/Args.c | 6 ------ nx-X11/programs/Xserver/include/servermd.h | 10 +--------- nx-X11/programs/Xserver/mi/micoord.h | 2 +- nx-X11/programs/Xserver/os/access.c | 2 +- nx-X11/programs/Xserver/os/osdep.h | 2 -- nx-X11/programs/Xserver/os/utils.c | 7 ------- nx-X11/programs/Xserver/render/picture.h | 3 +-- nx-X11/programs/Xserver/xkb/Imakefile | 6 +----- nx-X11/programs/Xserver/xkb/ddxLoad.c | 2 +- nx-X11/programs/Xserver/xkb/xkbInit.c | 8 -------- 24 files changed, 14 insertions(+), 91 deletions(-) diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf index 2387e8067..32f3e321b 100644 --- a/nx-X11/config/cf/Imake.cf +++ b/nx-X11/config/cf/Imake.cf @@ -504,24 +504,6 @@ # define MacIIArchitecture #endif /* macII */ -#ifdef sgi -# define MacroIncludeFile -# define MacroFile sgi.cf -# undef sgi -# define SGIArchitecture -# undef mips -# undef __mips -# define MipsArchitecture -# ifdef _SVR4 -# undef _SVR4 -# define SVR4Architecture -# endif -# ifdef _SYSTYPE_SVR4 -# undef _SYSTYPE_SVR4 -# define SVR4Architecture -# endif -#endif /* sgi */ - #ifdef stellar # define MacroIncludeFile # define MacroFile stellar.cf diff --git a/nx-X11/include/Xalloca.h b/nx-X11/include/Xalloca.h index 348a7bc2d..ef1bf7b96 100644 --- a/nx-X11/include/Xalloca.h +++ b/nx-X11/include/Xalloca.h @@ -109,14 +109,12 @@ from The Open Group. * decide that you don't want to use alloca, you might want to fix it here. */ /* alloca might be a macro taking one arg (hi, Sun!), so give it one. */ -# ifndef __sgi /* IRIX 5/6 has definition */ # define __Xnullarg /* as nothing */ # ifndef X_NOT_STDC_ENV extern void *alloca(__Xnullarg); # else extern char *alloca(__Xnullarg); # endif -# endif /* __sgi */ # define ALLOCATE_LOCAL(size) alloca((int)(size)) # endif /* who does alloca */ # endif /* NCR */ diff --git a/nx-X11/include/Xarch.h b/nx-X11/include/Xarch.h index aa92b43f4..222da2e1f 100644 --- a/nx-X11/include/Xarch.h +++ b/nx-X11/include/Xarch.h @@ -40,7 +40,7 @@ #else #ifdef SVR4 -#if defined(NCR) || defined(Mips) || defined(__sgi) +#if defined(NCR) || defined(Mips) #include #else #if !defined(sun) diff --git a/nx-X11/include/Xmd.h b/nx-X11/include/Xmd.h index 8b3af78f6..50159edd3 100644 --- a/nx-X11/include/Xmd.h +++ b/nx-X11/include/Xmd.h @@ -59,8 +59,7 @@ SOFTWARE. defined(__sparc64__) || \ defined(__s390x__) || \ defined(__amd64__) || defined(amd64) || \ - defined(__powerpc64__) || \ - (defined(sgi) && (_MIPS_SZLONG == 64)) + defined(__powerpc64__) #define LONG64 /* 32/64-bit architecture */ #endif @@ -100,7 +99,7 @@ typedef long INT32; #endif typedef short INT16; -#if defined(__STDC__) || defined(sgi) +#if defined(__STDC__) typedef signed char INT8; #else typedef char INT8; diff --git a/nx-X11/include/Xos.h b/nx-X11/include/Xos.h index 353965c1c..b664337c5 100644 --- a/nx-X11/include/Xos.h +++ b/nx-X11/include/Xos.h @@ -57,11 +57,9 @@ in this Software without prior written authorization from The Open Group. #endif #endif /* USG */ -#ifndef sgi #if defined(__SCO__) || defined(__UNIXWARE__) #include #endif -#endif #ifdef _SEQUENT_ /* diff --git a/nx-X11/include/Xthreads.h b/nx-X11/include/Xthreads.h index 77267bea1..06649106d 100644 --- a/nx-X11/include/Xthreads.h +++ b/nx-X11/include/Xthreads.h @@ -56,7 +56,7 @@ typedef struct mutex xmutex_rec; #define xcondition_broadcast(cv) condition_broadcast(cv) #define xcondition_set_name(cv,str) condition_set_name(cv,str) #else /* !CTHREADS */ -#if defined(SVR4) && !defined(__sgi) && !defined(_SEQUENT_) +#if defined(SVR4) && !defined(_SEQUENT_) #include #include typedef thread_t xthread_t; diff --git a/nx-X11/lib/X11/SetLocale.c b/nx-X11/lib/X11/SetLocale.c index 4f39f1fcf..3bbfd3ee6 100644 --- a/nx-X11/lib/X11/SetLocale.c +++ b/nx-X11/lib/X11/SetLocale.c @@ -102,7 +102,7 @@ _XlcMapOSLocaleName( /* FIXME: correct indentation levels after ancient platform clean-up */ -#if defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(ultrix) || defined(WIN32) || defined(linux) +#if defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(ultrix) || defined(WIN32) || defined(linux) # ifdef ultrix # define SKIPCOUNT 2 # define STARTCHAR '\001' diff --git a/nx-X11/lib/X11/UIThrStubs.c b/nx-X11/lib/X11/UIThrStubs.c index 8f4ea076b..0c913d41f 100644 --- a/nx-X11/lib/X11/UIThrStubs.c +++ b/nx-X11/lib/X11/UIThrStubs.c @@ -66,7 +66,7 @@ typedef cthread_t xthread_t; #pragma weak condition_signal = _Xthr_zero_stub_ #pragma weak condition_broadcast = _Xthr_zero_stub_ #else /* !CTHREADS */ -#if defined(SVR4) && !defined(__sgi) +#if defined(SVR4) #include typedef thread_t xthread_t; #pragma weak thr_self = _Xthr_self_stub_ diff --git a/nx-X11/lib/X11/XKB.c b/nx-X11/lib/X11/XKB.c index 7ecd39706..6df9c3ebc 100644 --- a/nx-X11/lib/X11/XKB.c +++ b/nx-X11/lib/X11/XKB.c @@ -373,11 +373,7 @@ XkbGetXlibControls(Display *dpy) unsigned int XkbXlibControlsImplemented(void) { -#ifdef __sgi - return XkbLC_AllControls; -#else return XkbLC_AllControls & ~XkbLC_AllComposeControls; -#endif } Bool diff --git a/nx-X11/lib/X11/XKBCvt.c b/nx-X11/lib/X11/XKBCvt.c index ded0a3e3a..c42c3af1c 100644 --- a/nx-X11/lib/X11/XKBCvt.c +++ b/nx-X11/lib/X11/XKBCvt.c @@ -50,10 +50,6 @@ from The Open Group. #include #include -#ifdef __sgi_not_xconsortium -#define XKB_EXTEND_LOOKUP_STRING -#endif - static int _XkbHandleSpecialSym(KeySym keysym, char *buffer, int nbytes, int *extra_rtrn) { diff --git a/nx-X11/lib/X11/Xlibint.h b/nx-X11/lib/X11/Xlibint.h index c138d6360..b325182e3 100644 --- a/nx-X11/lib/X11/Xlibint.h +++ b/nx-X11/lib/X11/Xlibint.h @@ -248,9 +248,6 @@ typedef struct _XSQEvent #endif #include -#ifdef __sgi -#define _SGI_MP_SOURCE /* turn this on to get MP safe errno */ -#endif #include #define _XBCOPYFUNC _Xbcopy #include diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index ddce93127..fe70d007a 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -160,7 +160,7 @@ INSTPGMFLAGS = #if HasPam && HasPamMisc PAMLIBS = PamLibraries PamMiscLibraries #endif -#if !(SystemV4 || defined(SGIArchitecture) || UseRgbTxt) +#if !(SystemV4 || UseRgbTxt) DBMLIBS = DBMLibrary #endif SYSLIBS = $(ZLIB) MathLibrary $(DBMLIBS) $(USB) \ diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c index 69cdc82e1..ad1788277 100644 --- a/nx-X11/programs/Xserver/dix/devices.c +++ b/nx-X11/programs/Xserver/dix/devices.c @@ -662,13 +662,7 @@ InitPtrFeedbackClassDeviceStruct(DeviceIntPtr dev, PtrCtrlProcPtr controlProc) if (!feedc) return FALSE; feedc->CtrlProc = controlProc; -#ifdef sgi - feedc->ctrl.num = 1; - feedc->ctrl.den = 1; - feedc->ctrl.threshold = 1; -#else feedc->ctrl = defaultPointerControl; -#endif feedc->ctrl.id = 0; if ( (feedc->next = dev->ptrfeed) ) feedc->ctrl.id = dev->ptrfeed->ctrl.id + 1; diff --git a/nx-X11/programs/Xserver/fb/fb.h b/nx-X11/programs/Xserver/fb/fb.h index 7c33562b4..58aa8561b 100644 --- a/nx-X11/programs/Xserver/fb/fb.h +++ b/nx-X11/programs/Xserver/fb/fb.h @@ -104,8 +104,7 @@ typedef unsigned __int64 FbBits; defined(__sparc64__) || defined(_LP64) || \ defined(__s390x__) || \ defined(amd64) || defined (__amd64__) || \ - defined (__powerpc64__) || \ - (defined(sgi) && (_MIPS_SZLONG == 64)) + defined (__powerpc64__) typedef unsigned long FbBits; # else typedef unsigned long long FbBits; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index 4dbb003f2..46e01c737 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -587,12 +587,6 @@ int ddxProcessArgument(int argc, char *argv[], int i) if(++i < argc) { - #ifdef sgi - - userdefinedfontpath = 1; - - #endif - #ifdef TEST fprintf(stderr, "ddxProcessArgument: User defined font path [%s].\n", argv[i]); #endif diff --git a/nx-X11/programs/Xserver/include/servermd.h b/nx-X11/programs/Xserver/include/servermd.h index 7e4412e15..04cd97bb8 100644 --- a/nx-X11/programs/Xserver/include/servermd.h +++ b/nx-X11/programs/Xserver/include/servermd.h @@ -192,7 +192,7 @@ SOFTWARE. #endif /* macII */ -#if (defined(mips) || defined(__mips)) && !defined(sgi) +#if (defined(mips) || defined(__mips)) #if defined(MIPSEL) || defined(__MIPSEL__) # define IMAGE_BYTE_ORDER LSBFirst /* Values for the PMAX only */ @@ -344,14 +344,6 @@ SOFTWARE. #endif /* linux/m68k */ -#ifdef sgi - -#define IMAGE_BYTE_ORDER MSBFirst -#define BITMAP_BIT_ORDER MSBFirst -#define GLYPHPADBYTES 4 - -#endif - /* linux on the Compaq Itsy */ #if defined(linux) && defined(__arm__) #define IMAGE_BYTE_ORDER LSBFirst diff --git a/nx-X11/programs/Xserver/mi/micoord.h b/nx-X11/programs/Xserver/mi/micoord.h index b3d725b73..3e45cfede 100644 --- a/nx-X11/programs/Xserver/mi/micoord.h +++ b/nx-X11/programs/Xserver/mi/micoord.h @@ -43,7 +43,7 @@ * forcing as to use div instead of shift. Let's be explicit. */ -#if defined(mips) || defined(sgi) || \ +#if defined(mips) || \ defined(sparc) || defined(__sparc64__) || \ defined(__alpha) || defined(__alpha__) || \ defined(__i386__) || defined(i386) || \ diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c index c04e9c7a0..d3a18efbe 100644 --- a/nx-X11/programs/Xserver/os/access.c +++ b/nx-X11/programs/Xserver/os/access.c @@ -286,7 +286,7 @@ AccessUsingXdmcp (void) } -#if ((defined(SVR4) && !defined(SCO325) && !defined(sun) && !defined(NCR)) || defined(ISC)) && !defined(__sgi) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF) +#if ((defined(SVR4) && !defined(SCO325) && !defined(sun) && !defined(NCR)) || defined(ISC)) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF) /* Deal with different SIOCGIFCONF ioctl semantics on these OSs */ diff --git a/nx-X11/programs/Xserver/os/osdep.h b/nx-X11/programs/Xserver/os/osdep.h index 3babab3e1..f0e8b707b 100644 --- a/nx-X11/programs/Xserver/os/osdep.h +++ b/nx-X11/programs/Xserver/os/osdep.h @@ -61,7 +61,6 @@ SOFTWARE. #include -#ifndef sgi /* SGI defines OPEN_MAX in a useless way */ #ifndef X_NOT_POSIX #ifdef _POSIX_SOURCE #include @@ -77,7 +76,6 @@ SOFTWARE. #undef _POSIX_ #endif #endif /* X_NOT_POSIX */ -#endif #ifndef OPEN_MAX #ifdef SVR4 diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 6e5482fc1..5f7542a2d 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -269,10 +269,6 @@ long Memory_fail = 0; #include /* for random() */ #endif -#ifdef sgi -int userdefinedfontpath = 0; -#endif /* sgi */ - char *dev_tty_from_init = NULL; /* since we need to parse it anyway */ extern char dispatchExceptionAtReset; @@ -831,9 +827,6 @@ ProcessCommandLine(int argc, char *argv[]) { if(++i < argc) { -#ifdef sgi - userdefinedfontpath = 1; -#endif /* sgi */ defaultFontPath = argv[i]; } else diff --git a/nx-X11/programs/Xserver/render/picture.h b/nx-X11/programs/Xserver/render/picture.h index b09d9aac2..6f3f2d832 100644 --- a/nx-X11/programs/Xserver/render/picture.h +++ b/nx-X11/programs/Xserver/render/picture.h @@ -173,8 +173,7 @@ typedef __int64 xFixed_32_32; defined(ia64) || defined(__ia64__) || \ defined(__sparc64__) || \ defined(__s390x__) || \ - defined(amd64) || defined (__amd64__) || \ - (defined(sgi) && (_MIPS_SZLONG == 64)) + defined(amd64) || defined (__amd64__) typedef long xFixed_32_32; # else # if defined(__GNUC__) && \ diff --git a/nx-X11/programs/Xserver/xkb/Imakefile b/nx-X11/programs/Xserver/xkb/Imakefile index 07d715301..89e042212 100644 --- a/nx-X11/programs/Xserver/xkb/Imakefile +++ b/nx-X11/programs/Xserver/xkb/Imakefile @@ -1,10 +1,6 @@ #define SGIHyperOpt #include -#ifdef SGIArchitecture -EXTRA_ALLOC_DEFINES = -DFORCE_ALLOCA -#endif - #if BuildXInputExt XKBXI_SRCS = xkbPrOtherEv.c XKBXI_OBJS = xkbPrOtherEv.o @@ -48,7 +44,7 @@ XF86INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) `pkg-config --cflags-only-I pixman-1` LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln -DEFINES = $(EXTRA_ALLOC_DEFINES) $(XKB_DDXDEFS) $(NX_DEFINES) +DEFINES = $(XKB_DDXDEFS) $(NX_DEFINES) XKB_DEFINES = -DXKB_BASE_DIRECTORY=\"$(LIBDIR)/xkb\" $(XKB_DISABLE) NormalLibraryObjectRule() diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c index ef32a4642..4934d266c 100644 --- a/nx-X11/programs/Xserver/xkb/ddxLoad.c +++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c @@ -53,7 +53,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include "xkb.h" -#if defined(CSRG_BASED) || defined(linux) || defined(__sgi) || defined(__GNU__) +#if defined(CSRG_BASED) || defined(linux) || defined(__GNU__) #include #endif diff --git a/nx-X11/programs/Xserver/xkb/xkbInit.c b/nx-X11/programs/Xserver/xkb/xkbInit.c index 10260bf83..1f4bc34b4 100644 --- a/nx-X11/programs/Xserver/xkb/xkbInit.c +++ b/nx-X11/programs/Xserver/xkb/xkbInit.c @@ -54,13 +54,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define CREATE_ATOM(s) MakeAtom(s,sizeof(s)-1,1) -#ifdef sgi -#define LED_CAPS 5 -#define LED_NUM 6 -#define LED_SCROLL 7 -#define PHYS_LEDS 0x7f -#define LED_COMPOSE 8 -#else #if defined(ultrix) || defined(__alpha) || defined(__alpha__) #define LED_COMPOSE 2 #define LED_CAPS 3 @@ -81,7 +74,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define PHYS_LEDS 0x07 #endif #endif -#endif #define MAX_TOC 16 typedef struct _SrvXkmInfo { -- cgit v1.2.3 From bf1b3c6cfa5317c1ccc0befeb09541ddb5143fbe Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Sat, 4 Feb 2017 16:25:13 +0100 Subject: dix: remove staggeringly broken vendor workarounds Backported from X.org: From f93d10ce9bb4a6de83b561f44fb7b046def16234 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Mon, 6 Nov 2006 18:33:45 +0200 Subject: dix: remove staggeringly broken vendor workarounds Backported-to-NX-by: Mike Gabriel --- nx-X11/programs/Xserver/dix/events.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/nx-X11/programs/Xserver/dix/events.c b/nx-X11/programs/Xserver/dix/events.c index 166d2e85e..abbde67d5 100644 --- a/nx-X11/programs/Xserver/dix/events.c +++ b/nx-X11/programs/Xserver/dix/events.c @@ -2986,12 +2986,7 @@ EventSelectForWindow(register WindowPtr pWin, register ClientPtr client, Mask ma if (wClient (pWin) == client) { check = pWin->eventMask; -#ifdef SGIMISC - pWin->eventMask = - (mask & ~SGIMiscSpecialDestroyMask) | (pWin->eventMask & SGIMiscSpecialDestroyMask); -#else pWin->eventMask = mask; -#endif } else { @@ -3000,9 +2995,6 @@ EventSelectForWindow(register WindowPtr pWin, register ClientPtr client, Mask ma if (SameClient(others, client)) { check = others->mask; -#ifdef SGIMISC - mask = (mask & ~SGIMiscSpecialDestroyMask) | (others->mask & SGIMiscSpecialDestroyMask); -#endif if (mask == 0) { FreeResource(others->resource, RT_NONE); -- cgit v1.2.3 From af11c31233290984fa2eaf085d0d709b04879a68 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 8 Feb 2017 11:06:17 +0100 Subject: nx-X11/include/Xos_r.h: Drop one _POSIX_REENTRANT_FUNCTIONS macro block, where offenders AIXV3, AIXV4 and __osf__ are gone now. --- nx-X11/include/Xos_r.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nx-X11/include/Xos_r.h b/nx-X11/include/Xos_r.h index 51269226c..ee0a77bfa 100644 --- a/nx-X11/include/Xos_r.h +++ b/nx-X11/include/Xos_r.h @@ -459,11 +459,6 @@ typedef struct { * POSIX does not specify _r equivalents for API, but some * vendors provide them anyway. Use them only when explicitly asked. */ -# ifdef _POSIX_REENTRANT_FUNCTIONS -# ifndef _POSIX_THREAD_SAFE_FUNCTIONS -# define X_POSIX_THREAD_SAFE_FUNCTIONS 1 -# endif -# endif # ifdef _POSIX_THREAD_SAFE_FUNCTIONS # define X_POSIX_THREAD_SAFE_FUNCTIONS 1 # endif -- cgit v1.2.3 From 1e1f1246bb8edc343320f91b8f5edd024bf801b6 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 4 Feb 2017 18:52:04 +0100 Subject: Makefile: Align variable names USRLIBDIR, SHLIBDIR (and NX_DIR) with nx-X11 internal naming schemes (and use /usr//nx/X11 rather than /usr//nx-X11). --- Makefile | 17 +++++++++-------- bin/nxagent.in | 6 +++--- bin/nxproxy.in | 4 ++-- debian/nxagent.install | 2 +- nx-libs.spec | 4 ++-- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index d31c7d3f5..5bdf23b35 100644 --- a/Makefile +++ b/Makefile @@ -13,9 +13,10 @@ ETCDIR_NX ?= /etc/nxagent PREFIX ?= /usr/local BINDIR ?= $(PREFIX)/bin LIBDIR ?= $(PREFIX)/lib -USRLIBDIR ?= $(LIBDIR) +SHLIBDIR ?= $(LIBDIR) +NXLIBDIR ?= $(SHLIBDIR)/nx +USRLIBDIR ?= $(NXLIBDIR)/X11 INCLUDEDIR ?= $(PREFIX)/include -NXLIBDIR ?= $(LIBDIR)/nx CONFIGURE ?= ./configure NX_VERSION_MAJOR=$(shell ./version.sh 1) @@ -143,13 +144,13 @@ install-full: cp -a "$$(string_rep "$$libpath" "$$libfile" "$$link")" "$$(string_rep "$$libdir" exports .build-exports)"; \ done; + $(INSTALL_DIR) $(DESTDIR)$(SHLIBDIR) + $(COPY_SYMLINK) nx-X11/.build-exports/lib/libNX_X11.so $(DESTDIR)$(SHLIBDIR)/ + $(COPY_SYMLINK) nx-X11/.build-exports/lib/libNX_X11.so.6 $(DESTDIR)$(SHLIBDIR)/ + $(COPY_DEREFERENCED) nx-X11/.build-exports/lib/libNX_X11.so.6.2 $(DESTDIR)$(SHLIBDIR)/ $(INSTALL_DIR) $(DESTDIR)$(USRLIBDIR) - $(COPY_SYMLINK) nx-X11/.build-exports/lib/libNX_X11.so $(DESTDIR)$(USRLIBDIR)/ - $(COPY_SYMLINK) nx-X11/.build-exports/lib/libNX_X11.so.6 $(DESTDIR)$(USRLIBDIR)/ - $(COPY_DEREFERENCED) nx-X11/.build-exports/lib/libNX_X11.so.6.2 $(DESTDIR)$(USRLIBDIR)/ - $(INSTALL_DIR) $(DESTDIR)$(USRLIBDIR)/nx-X11 - $(INSTALL_SYMLINK) ../libNX_X11.so.6 $(DESTDIR)$(USRLIBDIR)/nx-X11/libX11.so.6 - $(INSTALL_SYMLINK) ../libNX_X11.so.6.2 $(DESTDIR)$(USRLIBDIR)/nx-X11/libX11.so.6.2 + $(INSTALL_SYMLINK) ../../libNX_X11.so.6 $(DESTDIR)$(USRLIBDIR)/libX11.so.6 + $(INSTALL_SYMLINK) ../../libNX_X11.so.6.2 $(DESTDIR)$(USRLIBDIR)/libX11.so.6.2 . replace.sh; set -x; find nx-X11/.build-exports/include/{nx*,GL} -type d | \ while read dirname; do \ diff --git a/bin/nxagent.in b/bin/nxagent.in index 86603d549..b3e87aab1 100644 --- a/bin/nxagent.in +++ b/bin/nxagent.in @@ -15,11 +15,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/. -NX_LIBS=@@NXLIBDIR@@ +NX_LIBDIR=@@NXLIBDIR@@ # make sure nxagent starts properly with pam_tmpdir.so being in use NX_TEMP=${NX_TEMP:-/tmp} export NX_TEMP -export LD_LIBRARY_PATH=@@NXLIBDIR@@-X11/ +export LD_LIBRARY_PATH=@@NX_LIBDIR@@/X11/ -exec $NX_LIBS/bin/${NXAPP:-"nxagent"} "$@" +exec $NX_LIBDIR/bin/${NXAPP:-"nxagent"} "$@" diff --git a/bin/nxproxy.in b/bin/nxproxy.in index d21388d18..0866d25ac 100644 --- a/bin/nxproxy.in +++ b/bin/nxproxy.in @@ -15,10 +15,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/. -NX_LIBS=@@NXLIBDIR@@ +NX_LIBDIR=@@NXLIBDIR@@ # make sure nxagent starts properly with pam_tmpdir.so being in use NX_TEMP=${NX_TEMP:-/tmp} export NX_TEMP -exec $NX_LIBS/bin/${NXAPP:="nxproxy"} "$@" +exec $NX_LIBDIR/bin/${NXAPP:="nxproxy"} "$@" diff --git a/debian/nxagent.install b/debian/nxagent.install index 75e72fcde..5f6a9de35 100644 --- a/debian/nxagent.install +++ b/debian/nxagent.install @@ -4,7 +4,7 @@ usr/share/nx/rgb usr/share/nx/VERSION.nxagent usr/share/man/man1/nxagent.1* usr/lib/*/nx/bin/nxagent -usr/lib/*/nx-X11/ +usr/lib/*/nx/X11/ usr/bin/nxagent usr/share/pixmaps/nxagent.xpm etc/nxagent/nxagent.keyboard diff --git a/nx-libs.spec b/nx-libs.spec index 8fb25bf07..0eae1b482 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -515,8 +515,8 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %{_bindir}/nxagent %dir %{_libdir}/nx/bin %{_libdir}/nx/bin/nxagent -%dir %{_libdir}/nx-X11 -%{_libdir}/nx-X11/libX11.so* +%dir %{_libdir}/nx/X11 +%{_libdir}/nx/X11/libX11.so* %{_datadir}/pixmaps/nxagent.xpm %dir %{_datadir}/nx %{_datadir}/nx/rgb -- cgit v1.2.3 From cfb097af06d0f8c195d78c33e1cbea7cb0c4eb38 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 4 Feb 2017 18:52:56 +0100 Subject: nx-libs.spec: Don't manually override SHLIBDIR via the .spec file. The default in the main Makefile should work fine. --- nx-libs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx-libs.spec b/nx-libs.spec index 0eae1b482..4779885da 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -346,7 +346,7 @@ chmod a+x my_configure; export SHLIBGLOBALSFLAGS="%{__global_ldflags}" export LOCAL_LDFLAGS="%{__global_ldflags}" export CDEBUGFLAGS="%{__global_cppflags} %{__global_cflags}" -make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" PREFIX=%{_prefix} LIBDIR=%{_libdir} SHLIBDIR=%{_libdir} +make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" PREFIX=%{_prefix} LIBDIR=%{_libdir} %install make install \ -- cgit v1.2.3 From 5d3c4dda7d6ca619ca9893de98b596d48a89281a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 4 Feb 2017 18:53:25 +0100 Subject: debian/rules: Don't manually override SHLIBDIR via the dh_auto_build call. The default in the main Makefile should work fine. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index d30574c07..180de6984 100755 --- a/debian/rules +++ b/debian/rules @@ -51,7 +51,7 @@ override_dh_auto_install: override_dh_auto_build: - PREFIX=/usr dh_auto_build --parallel -- CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS='$(filter-out -pie,$(LDFLAGS))' SHLIBDIR="$(LIBDIR)" + PREFIX=/usr dh_auto_build --parallel -- CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS='$(filter-out -pie,$(LDFLAGS))' override_dh_strip: dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg -- cgit v1.2.3 From 14e4005b2cf6438769e56e21584894c7acc31871 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 4 Feb 2017 18:54:21 +0100 Subject: Makefile: Actively set/override USRLIBDIR and SHLIBDIR when calling Xserver's make process. SHLIBDIR -> Points to the system's official library folder. USRLIBDIR -> In NX, this variable (amongst others) is used to set the executables RPATH (if enabled), so pointing this to SHLIBDIR/nx-X11. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5bdf23b35..14b92219f 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,7 @@ build-full: cd nxcompshad && autoconf && (${CONFIGURE}) && ${MAKE} - cd nx-X11 && ${MAKE} World + cd nx-X11 && ${MAKE} World USRLIBDIR=$(USRLIBDIR) SHLIBDIR=$(SHLIBDIR) cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE} -- cgit v1.2.3 From 6777fac084ebe133b846f8b9228c732dd0a2bec2 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 8 Feb 2017 15:03:58 +0100 Subject: Makefile: Allow longer names for variables that we want to allow distro maintainers to override. --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 14b92219f..2f6acd235 100644 --- a/Makefile +++ b/Makefile @@ -9,15 +9,15 @@ COPY_DEREFERENCED=cp -RH RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -ETCDIR_NX ?= /etc/nxagent -PREFIX ?= /usr/local -BINDIR ?= $(PREFIX)/bin -LIBDIR ?= $(PREFIX)/lib -SHLIBDIR ?= $(LIBDIR) -NXLIBDIR ?= $(SHLIBDIR)/nx -USRLIBDIR ?= $(NXLIBDIR)/X11 -INCLUDEDIR ?= $(PREFIX)/include -CONFIGURE ?= ./configure +ETCDIR_NX ?= /etc/nxagent +PREFIX ?= /usr/local +BINDIR ?= $(PREFIX)/bin +LIBDIR ?= $(PREFIX)/lib +SHLIBDIR ?= $(LIBDIR) +NXLIBDIR ?= $(SHLIBDIR)/nx +USRLIBDIR ?= $(NXLIBDIR)/X11 +INCLUDEDIR ?= $(PREFIX)/include +CONFIGURE ?= ./configure NX_VERSION_MAJOR=$(shell ./version.sh 1) NX_VERSION_MINOR=$(shell ./version.sh 2) -- cgit v1.2.3 From 0a7ef09c8ad90e0898b6ee2c56f9a27efb1b461a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 4 Feb 2017 19:00:00 +0100 Subject: Load libNX_X11 / faked libX11 via RPATH setting rather than fidgeting with LD_LIBRARY_PATH in the nxagent wrapper script. Fixes ArcticaProject/nx-libs#225. --- bin/nxagent.in | 1 - nx-X11/config/cf/Imake.tmpl | 4 ++-- nx-X11/config/cf/X11.rules | 4 ++-- nx-X11/config/cf/lnxLib.rules | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/bin/nxagent.in b/bin/nxagent.in index b3e87aab1..3a9dfc649 100644 --- a/bin/nxagent.in +++ b/bin/nxagent.in @@ -20,6 +20,5 @@ NX_LIBDIR=@@NXLIBDIR@@ # make sure nxagent starts properly with pam_tmpdir.so being in use NX_TEMP=${NX_TEMP:-/tmp} export NX_TEMP -export LD_LIBRARY_PATH=@@NX_LIBDIR@@/X11/ exec $NX_LIBDIR/bin/${NXAPP:-"nxagent"} "$@" diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index 93b659a0d..ba97b3b4c 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -723,12 +723,12 @@ TCLIBDIR = TclLibDir #ifndef UsrLibDir #ifdef ProjectRoot -#define UsrLibDir Concat4(ProjectRoot,/,LibDirName,/nx) +#define UsrLibDir Concat4(ProjectRoot,/,LibDirName,/nx/X11) #ifndef AlternateUsrLibDir #define AlternateUsrLibDir YES #endif #else -#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx) +#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx/X11) #ifndef AlternateUsrLibDir #define AlternateUsrLibDir NO #endif diff --git a/nx-X11/config/cf/X11.rules b/nx-X11/config/cf/X11.rules index 0f6a67ed4..af3473c3a 100644 --- a/nx-X11/config/cf/X11.rules +++ b/nx-X11/config/cf/X11.rules @@ -39,9 +39,9 @@ #endif #ifdef X11ProjectRoot -# define XUsrLibDirPath $(USRLIBDIR)/nx:$(XPROJECTROOT) +# define XUsrLibDirPath $(USRLIBDIR):$(XPROJECTROOT) #else -# define XUsrLibDirPath $(USRLIBDIR)/nx +# define XUsrLibDirPath $(USRLIBDIR) #endif #ifdef UsrLibDirPath # undef UsrLibDirPath diff --git a/nx-X11/config/cf/lnxLib.rules b/nx-X11/config/cf/lnxLib.rules index 166e896f1..e415db8f1 100644 --- a/nx-X11/config/cf/lnxLib.rules +++ b/nx-X11/config/cf/lnxLib.rules @@ -9,7 +9,7 @@ #endif #ifndef UseRpath -#define UseRpath NO +#define UseRpath YES #endif #if UseElfFormat -- cgit v1.2.3 From d16caa78ab2a0602c3b6d5575f8ebb07b0483185 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 4 Feb 2017 19:02:16 +0100 Subject: debian/patches: Update 016_nx-X11_install-location.debian.patch. Adapt path to recent upstream changes. --- debian/patches/016_nx-X11_install-location.debian.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch index ee5bb66cf..d8a63a6c0 100644 --- a/debian/patches/016_nx-X11_install-location.debian.patch +++ b/debian/patches/016_nx-X11_install-location.debian.patch @@ -6,16 +6,16 @@ Author: Mike Gabriel Last-Update: 2012-12-31 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl -@@ -749,7 +749,7 @@ +@@ -730,7 +730,7 @@ #define AlternateUsrLibDir YES #endif #else --#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx) -+#define UsrLibDir Concat4(/usr,/,LibDirName,/nx) +-#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx/X11) ++#define UsrLibDir Concat4(/usr,/,LibDirName,/nx/X11) #ifndef AlternateUsrLibDir #define AlternateUsrLibDir NO #endif -@@ -767,7 +767,7 @@ +@@ -748,7 +748,7 @@ #define AlternateUsrDataDir YES #endif #else @@ -26,7 +26,7 @@ Last-Update: 2012-12-31 #endif --- a/nx-X11/config/cf/site.def +++ b/nx-X11/config/cf/site.def -@@ -72,7 +72,7 @@ +@@ -69,7 +69,7 @@ #ifdef AfterVendorCF #ifndef ProjectRoot -- cgit v1.2.3 From 29fee5b46a5a6aa2084731465f80fd238a7a6d8a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 8 Feb 2017 16:31:00 +0100 Subject: debian/patches: Update comment header of 016_nx-X11_install-location.debian.patch. --- debian/patches/016_nx-X11_install-location.debian.patch | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch index d8a63a6c0..c758a3cfe 100644 --- a/debian/patches/016_nx-X11_install-location.debian.patch +++ b/debian/patches/016_nx-X11_install-location.debian.patch @@ -1,9 +1,17 @@ Description: FHS adaptation for Debian packaging - On Debian, NX libraries and binaries are installed to - /usr/lib/nx. +Abstract: + On Debian, binaries are installed to /usr//nx. + . + Also, a fake-libX11 library symlink is placed into + /usr//nx/X11. + . + The given paths will be overridden by the Debian packaging + and modified into multi-arch paths. + Forwarded: not-needed Author: Mike Gabriel -Last-Update: 2012-12-31 +Last-Update: 2017-02-08 + --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -730,7 +730,7 @@ -- cgit v1.2.3 From f781b8e4c6137bb6428bfaf37aa364bb5b9ae4cf Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 8 Feb 2017 16:33:40 +0100 Subject: Makefile: Fix flawed uninstall-* targets. Spotted by Ionic while reviewing the nxagent RPATH changeset. Thanks! --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2f6acd235..e78f45c1b 100644 --- a/Makefile +++ b/Makefile @@ -186,14 +186,14 @@ uninstall-lite: $(RM_DIR) $(DESTDIR)$(NXLIBDIR)/bin/ $(RM_FILE) $(DESTDIR)$(PREFIX)/share/man/man1/*.1 $(RM_FILE) $(DESTDIR)$(PREFIX)/share/nx/VERSION.nxproxy - $(RM_DIR) $(DESTDIR)$(NXLIBDIR)/share/nx/ + $(RM_DIR) $(DESTDIR)$(PREFIX)/share/nx/ uninstall-full: for f in nxagent; do \ $(RM_FILE) $(DESTDIR)$(BINDIR)/$$f; done $(RM_FILE) $(DESTDIR)$(PREFIX)/share/nx/VERSION.nxagent - $(RM_DIR) $(DESTDIR)$(NXLIBDIR)/share/nx/ + $(RM_DIR) $(DESTDIR)$(PREFIX)/share/nx/ if test -d nx-X11; then \ if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \ -- cgit v1.2.3 From e70448087a05c123f916ff82f468e6d5fc57d714 Mon Sep 17 00:00:00 2001 From: Mathieu Bérard Date: Thu, 9 Feb 2017 14:05:32 +0100 Subject: The smart scheduler is not optional. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backported from X.org: commit 9f9268821b13038556fbc029df54ab0e9b2aa77f Author: Mathieu Bérard Date: Mon Aug 11 13:52:38 2008 -0400 The smart scheduler is not optional. Backported-to-NX-by: Mike Gabriel --- nx-X11/config/cf/xorg.cf | 11 -------- nx-X11/programs/Xserver/damageext/damageext.c | 2 -- nx-X11/programs/Xserver/dix/dispatch.c | 17 ------------ nx-X11/programs/Xserver/dix/events.c | 2 -- nx-X11/programs/Xserver/hw/nxagent/Args.c | 20 -------------- nx-X11/programs/Xserver/hw/nxagent/Display.c | 35 ------------------------ nx-X11/programs/Xserver/hw/nxagent/Display.h | 4 --- nx-X11/programs/Xserver/hw/nxagent/Handlers.c | 36 ------------------------- nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 12 --------- nx-X11/programs/Xserver/include/dixstruct.h | 5 ---- nx-X11/programs/Xserver/os/WaitFor.c | 14 ---------- nx-X11/programs/Xserver/os/io.c | 6 ----- nx-X11/programs/Xserver/os/osinit.c | 4 --- nx-X11/programs/Xserver/os/utils.c | 9 ------- 14 files changed, 177 deletions(-) diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index 2b71b90ec..513f78a43 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -568,23 +568,12 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # endif #endif -#ifndef UseSmartScheduler -#define UseSmartScheduler YES -#endif - -#if UseSmartScheduler -#define SmartScheduleDefines -DSMART_SCHEDULE -#else -#define SmartScheduleDefines /**/ -#endif - /* Server defines required for all OSs */ #ifndef XFree86ServerDefines # define XFree86ServerDefines -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH \ XFree86XvDefines \ -DXFree86Server \ XFree86XvMCDefines \ - SmartScheduleDefines \ DebugDefines XFree86XResDefines \ -DX_BYTE_ORDER=$(X_BYTE_ORDER) \ VersionDefines diff --git a/nx-X11/programs/Xserver/damageext/damageext.c b/nx-X11/programs/Xserver/damageext/damageext.c index 602825449..38a624be7 100644 --- a/nx-X11/programs/Xserver/damageext/damageext.c +++ b/nx-X11/programs/Xserver/damageext/damageext.c @@ -84,9 +84,7 @@ DamageExtNotify (DamageExtPtr pDamageExt, BoxPtr pBoxes, int nBoxes) if (pDamageClient->critical > 0) { SetCriticalOutputPending (); -#ifdef SMART_SCHEDULE pClient->smart_priority = SMART_MAX_PRIORITY; -#endif } } diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c index d098afdc8..2c7550371 100644 --- a/nx-X11/programs/Xserver/dix/dispatch.c +++ b/nx-X11/programs/Xserver/dix/dispatch.c @@ -243,8 +243,6 @@ FlushClientCaches(XID id) } } } -#ifdef SMART_SCHEDULE - #undef SMART_DEBUG #define SMART_SCHEDULE_DEFAULT_INTERVAL 20 /* ms */ @@ -345,7 +343,6 @@ SmartScheduleClient (int *clientReady, int nready) } return best; } -#endif #ifndef NXAGENT_SERVER #define MAJOROP ((xReq *)client->requestBuffer)->reqType @@ -358,9 +355,7 @@ Dispatch(void) register ClientPtr client; register int nready; register HWEventQueuePtr* icheck = checkForInput; -#ifdef SMART_SCHEDULE long start_tick; -#endif nextFreeClientID = 1; InitSelections(); @@ -380,13 +375,11 @@ Dispatch(void) nready = WaitForSomething(clientReady); -#ifdef SMART_SCHEDULE if (nready && !SmartScheduleDisable) { clientReady[0] = SmartScheduleClient (clientReady, nready); nready = 1; } -#endif /***************** * Handle events in round robin fashion, doing input between * each round @@ -409,9 +402,7 @@ Dispatch(void) isItTimeToYield = FALSE; requestingClient = client; -#ifdef SMART_SCHEDULE start_tick = SmartScheduleTime; -#endif while (!isItTimeToYield) { if (*icheck[0] != *icheck[1]) @@ -419,7 +410,6 @@ Dispatch(void) ProcessInputEvents(); FlushIfCriticalOutputPending(); } -#ifdef SMART_SCHEDULE if (!SmartScheduleDisable && (SmartScheduleTime - start_tick) >= SmartScheduleSlice) { @@ -428,7 +418,6 @@ Dispatch(void) client->smart_priority--; break; } -#endif /* now, finally, deal with client requests */ result = ReadRequestFromClient(client); @@ -466,11 +455,9 @@ Dispatch(void) #endif } FlushAllOutput(); -#ifdef SMART_SCHEDULE client = clients[clientReady[nready]]; if (client) client->smart_stop_tick = SmartScheduleTime; -#endif requestingClient = NULL; } dispatchException &= ~DE_PRIORITYCHANGE; @@ -3593,9 +3580,7 @@ CloseDownClient(register ClientPtr client) if (client->index < nextFreeClientID) nextFreeClientID = client->index; clients[client->index] = NullClient; -#ifdef SMART_SCHEDULE SmartLastClient = NullClient; -#endif free(client); while (!clients[currentMaxClients-1]) @@ -3684,12 +3669,10 @@ void InitClient(ClientPtr client, int i, void * ospriv) client->authId = 0; #endif client->fontResFunc = NULL; -#ifdef SMART_SCHEDULE client->smart_priority = 0; client->smart_start_tick = SmartScheduleTime; client->smart_stop_tick = SmartScheduleTime; client->smart_check_tick = SmartScheduleTime; -#endif } extern int clientPrivateLen; diff --git a/nx-X11/programs/Xserver/dix/events.c b/nx-X11/programs/Xserver/dix/events.c index abbde67d5..fa8bfc92d 100644 --- a/nx-X11/programs/Xserver/dix/events.c +++ b/nx-X11/programs/Xserver/dix/events.c @@ -1542,10 +1542,8 @@ TryClientEvents (ClientPtr client, xEvent *pEvents, int count, Mask mask, #endif if (BitIsOn(criticalEvents, type)) { -#ifdef SMART_SCHEDULE if (client->smart_priority < SMART_MAX_PRIORITY) client->smart_priority++; -#endif SetCriticalOutputPending(); } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index 46e01c737..3844fe046 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -2538,26 +2538,10 @@ void nxagentSetBufferSize() void nxagentSetScheduler() { - #ifdef DISABLE_SMART_SCHEDULE - - #ifdef SMART_SCHEDULE - - #ifdef TEST - fprintf(stderr, "nxagentSetScheduler: Disabling the smart scheduler.\n"); - #endif - - nxagentDisableTimer(); - - #endif - - #else /* #ifdef DISABLE_SMART_SCHEDULE */ - /* * The smart scheduler is the default. */ - #ifdef SMART_SCHEDULE - if (nxagentOption(Shadow) == 1) { #ifdef TEST @@ -2566,10 +2550,6 @@ void nxagentSetScheduler() nxagentDisableTimer(); } - - #endif - - #endif /* #ifdef DISABLE_SMART_SCHEDULE */ } void nxagentSetCoalescence() diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c index d8e6aa7e3..eaee84855 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c @@ -597,8 +597,6 @@ Display *nxagentInternalOpenDisplay(char *display) int result; - #ifdef SMART_SCHEDULE - /* * Stop the smart schedule timer since * it uses SIGALRM as we do. @@ -606,8 +604,6 @@ Display *nxagentInternalOpenDisplay(char *display) nxagentStopTimer(); - #endif - /* * Install the handler rejecting a possible * loopback connection. @@ -678,16 +674,12 @@ static void nxagentDisplayBlockHandler(Display *display, int reason) * for the remote display. */ - #ifdef SMART_SCHEDULE - #ifdef DEBUG fprintf(stderr, "nxagentDisplayBlockHandler: BLOCK! Stopping the smart schedule timer.\n"); #endif nxagentStopTimer(); - #endif - if (reason == NXBlockRead) { #ifdef DEBUG @@ -702,13 +694,9 @@ static void nxagentDisplayBlockHandler(Display *display, int reason) nxagentBlocking = 1; - #ifdef SMART_SCHEDULE - if (SmartScheduleDisable == 1) { - #endif - /* * Let the dispatch attend the next * client. @@ -723,12 +711,8 @@ static void nxagentDisplayBlockHandler(Display *display, int reason) nxagentDispatch.in = nxagentBytesIn; nxagentDispatch.out = nxagentBytesOut; - #ifdef SMART_SCHEDULE - } - #endif - /* * Give a chance to the next client. */ @@ -1022,12 +1006,8 @@ void nxagentInstallSignalHandlers() * Reset the SIGALRM to the default. */ - #ifdef SMART_SCHEDULE - nxagentStopTimer(); - #endif - newAction.sa_handler = SIG_DFL; sigfillset(&newAction.sa_mask); @@ -1040,8 +1020,6 @@ void nxagentInstallSignalHandlers() FatalError("Can't set the handler for alarm signal."); } - #ifdef SMART_SCHEDULE - /* * Let the smart schedule set the SIGALRM * handler again. @@ -1049,8 +1027,6 @@ void nxagentInstallSignalHandlers() nxagentInitTimer(); - #endif - /* * Install our own handler for the SIGHUP. */ @@ -1146,12 +1122,8 @@ void nxagentResetSignalHandlers() * Reset the SIGALRM to the default. */ - #ifdef SMART_SCHEDULE - nxagentStopTimer(); - #endif - newAction.sa_handler = SIG_DFL; sigfillset(&newAction.sa_mask); @@ -1164,8 +1136,6 @@ void nxagentResetSignalHandlers() FatalError("Can't set the handler for alarm signal."); } - #ifdef SMART_SCHEDULE - /* * Let the smart schedule set the SIGALRM * handler again. @@ -1173,7 +1143,6 @@ void nxagentResetSignalHandlers() nxagentInitTimer(); - #endif } void nxagentOpenDisplay(int argc, char *argv[]) @@ -2969,16 +2938,12 @@ void nxagentWaitDisplay() * Disable the smart scheduler's interrupts. */ - #ifdef SMART_SCHEDULE - #ifdef DEBUG fprintf(stderr, "nxagentWaitDisplay: Stopping the smart schedule timer.\n"); #endif nxagentStopTimer(); - #endif - if (nxagentDisplay != NULL) { #ifdef TEST diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.h b/nx-X11/programs/Xserver/hw/nxagent/Display.h index fe8ae1d43..75da371d8 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.h @@ -116,8 +116,6 @@ Bool nxagentReconnectDisplay(void *p0); * Deal with the smart scheduler. */ -#ifdef SMART_SCHEDULE - #define nxagentInitTimer() \ \ SmartScheduleInit(); @@ -149,8 +147,6 @@ Bool nxagentReconnectDisplay(void *p0); \ SmartScheduleDisable = 1; -#endif /* #ifdef SMART_SCHEDULE */ - /* * File descriptor currently used by * Xlib for the agent display. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c index 1721be9fb..8e80a1524 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c @@ -564,16 +564,12 @@ void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask) * the client is scheduled in. */ - #ifdef SMART_SCHEDULE - #ifdef DEBUG fprintf(stderr, "nxagentBlockHandler: Stopping the smart schedule timer.\n"); #endif nxagentStopTimer(); - #endif - nxagentPrintGeometry(); #ifdef BLOCKS @@ -601,13 +597,9 @@ void nxagentWakeupHandler(void * data, int count, void * mask) nxagentHandleConnectionStates(); } - #ifdef SMART_SCHEDULE - if (SmartScheduleDisable == 1) { - #endif - #ifdef DEBUG fprintf(stderr, "nxagentWakeupHandler: Resetting the dispatch state after wakeup.\n"); #endif @@ -617,12 +609,8 @@ void nxagentWakeupHandler(void * data, int count, void * mask) nxagentDispatch.in = nxagentBytesIn; nxagentDispatch.out = nxagentBytesOut; - #ifdef SMART_SCHEDULE - } - #endif - /* * Can become true during the dispatch loop. */ @@ -897,13 +885,9 @@ void nxagentShadowWakeupHandler(void * data, int count, void * mask) nxagentHandleConnectionStates(); } - #ifdef SMART_SCHEDULE - if (SmartScheduleDisable == 1) { - #endif - #ifdef DEBUG fprintf(stderr, "nxagentShadowWakeupHandler: Resetting the dispatch state after wakeup.\n"); #endif @@ -913,12 +897,8 @@ void nxagentShadowWakeupHandler(void * data, int count, void * mask) nxagentDispatch.in = nxagentBytesIn; nxagentDispatch.out = nxagentBytesOut; - #ifdef SMART_SCHEDULE - } - #endif - /* * Can become true during the dispatch loop. */ @@ -1095,13 +1075,9 @@ void nxagentDispatchHandler(ClientPtr client, int in, int out) #endif } - #ifdef SMART_SCHEDULE - if (SmartScheduleDisable == 1) { - #endif - /* * Pay attention to the next client if this * client produced enough output. @@ -1131,12 +1107,8 @@ void nxagentDispatchHandler(ClientPtr client, int in, int out) } #endif - #ifdef SMART_SCHEDULE - } - #endif - return; } else if (in > 0) @@ -1178,13 +1150,9 @@ void nxagentDispatchHandler(ClientPtr client, int in, int out) * the inner dispatch loop forever. */ - #ifdef SMART_SCHEDULE - if (SmartScheduleDisable == 1) { - #endif - if (client -> index != nxagentDispatch.client) { #ifdef DEBUG @@ -1230,12 +1198,8 @@ void nxagentDispatchHandler(ClientPtr client, int in, int out) #endif } - #ifdef SMART_SCHEDULE - } - #endif - } /* diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c index 452fe8c43..8fc6cf5fd 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c @@ -241,9 +241,7 @@ Dispatch(void) register ClientPtr client; register int nready; register HWEventQueuePtr* icheck = checkForInput; -#ifdef SMART_SCHEDULE long start_tick; -#endif unsigned long currentDispatch = 0; @@ -389,13 +387,11 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio #endif -#ifdef SMART_SCHEDULE if (nready && !SmartScheduleDisable) { clientReady[0] = SmartScheduleClient (clientReady, nready); nready = 1; } -#endif /***************** * Handle events in round robin fashion, doing input between * each round @@ -418,9 +414,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio isItTimeToYield = FALSE; requestingClient = client; -#ifdef SMART_SCHEDULE start_tick = SmartScheduleTime; -#endif while (!isItTimeToYield) { if (*icheck[0] != *icheck[1]) @@ -428,7 +422,6 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio ProcessInputEvents(); FlushIfCriticalOutputPending(); } -#ifdef SMART_SCHEDULE if (!SmartScheduleDisable && (SmartScheduleTime - start_tick) >= SmartScheduleSlice) { @@ -437,7 +430,6 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio client->smart_priority--; break; } -#endif /* now, finally, deal with client requests */ #ifdef TEST @@ -535,11 +527,9 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio #endif } FlushAllOutput(); -#ifdef SMART_SCHEDULE client = clients[clientReady[nready]]; if (client) client->smart_stop_tick = SmartScheduleTime; -#endif requestingClient = NULL; } dispatchException &= ~DE_PRIORITYCHANGE; @@ -1318,9 +1308,7 @@ CloseDownClient(register ClientPtr client) if (client->index < nextFreeClientID) nextFreeClientID = client->index; clients[client->index] = NullClient; -#ifdef SMART_SCHEDULE SmartLastClient = NullClient; -#endif free(client); while (!clients[currentMaxClients-1]) diff --git a/nx-X11/programs/Xserver/include/dixstruct.h b/nx-X11/programs/Xserver/include/dixstruct.h index 5019dea4a..ca50c7ca7 100644 --- a/nx-X11/programs/Xserver/include/dixstruct.h +++ b/nx-X11/programs/Xserver/include/dixstruct.h @@ -141,15 +141,12 @@ typedef struct _Client { struct _FontResolution * (*fontResFunc) ( /* no need for font.h */ ClientPtr /* pClient */, int * /* num */); -#ifdef SMART_SCHEDULE int smart_priority; long smart_start_tick; long smart_stop_tick; long smart_check_tick; -#endif } ClientRec; -#ifdef SMART_SCHEDULE /* * Scheduling interface */ @@ -170,8 +167,6 @@ extern Bool SmartScheduleStopTimer(void); extern Bool SmartScheduleInit(void); -#endif - /* This prototype is used pervasively in Xext, dix */ #define DISPATCH_PROC(func) int func(ClientPtr /* client */) diff --git a/nx-X11/programs/Xserver/os/WaitFor.c b/nx-X11/programs/Xserver/os/WaitFor.c index 899b1de0b..0ecca8b7a 100644 --- a/nx-X11/programs/Xserver/os/WaitFor.c +++ b/nx-X11/programs/Xserver/os/WaitFor.c @@ -190,9 +190,7 @@ WaitForSomething(int *pClientsReady) int nready; fd_set devicesReadable; CARD32 now = 0; -#ifdef SMART_SCHEDULE Bool someReady = FALSE; -#endif #if defined(NX_TRANS_SOCKET) && defined(NX_TRANS_DEBUG) fprintf(stderr, "WaitForSomething: Got called.\n"); @@ -215,7 +213,6 @@ WaitForSomething(int *pClientsReady) ProcessWorkQueue(); if (XFD_ANYSET (&ClientsWithInput)) { -#ifdef SMART_SCHEDULE if (!SmartScheduleDisable) { someReady = TRUE; @@ -224,13 +221,11 @@ WaitForSomething(int *pClientsReady) wt = &waittime; } else -#endif { XFD_COPYSET (&ClientsWithInput, &clientsReadable); break; } } -#ifdef SMART_SCHEDULE if (someReady) { XFD_COPYSET(&AllSockets, &LastSelectMask); @@ -238,7 +233,6 @@ WaitForSomething(int *pClientsReady) } else { -#endif wt = NULL; if (timers) { @@ -252,10 +246,8 @@ WaitForSomething(int *pClientsReady) wt = &waittime; } XFD_COPYSET(&AllSockets, &LastSelectMask); -#ifdef SMART_SCHEDULE } SmartScheduleIdle = TRUE; -#endif BlockHandler((void *)&wt, (void *)&LastSelectMask); if (NewOutputPending) FlushAllOutput(); @@ -394,7 +386,6 @@ WaitForSomething(int *pClientsReady) i = XTestProcessInputAction (i, &waittime); } #endif /* XTESTEXT1 */ -#ifdef SMART_SCHEDULE if (i >= 0) { SmartScheduleIdle = FALSE; @@ -402,7 +393,6 @@ WaitForSomething(int *pClientsReady) if (SmartScheduleTimerStopped) (void) SmartScheduleStartTimer (); } -#endif if (i <= 0) /* An error or timeout occurred */ { #if defined(NX_TRANS_SOCKET) && defined(NX_TRANS_DEBUG) @@ -442,7 +432,6 @@ WaitForSomething(int *pClientsReady) selecterr); } } -#ifdef SMART_SCHEDULE else if (someReady) { /* @@ -452,7 +441,6 @@ WaitForSomething(int *pClientsReady) XFD_COPYSET(&ClientsWithInput, &clientsReadable); break; } -#endif #if defined(NX_TRANS_SOCKET) if (*checkForInput[0] != *checkForInput[1]) { @@ -499,10 +487,8 @@ WaitForSomething(int *pClientsReady) return 0; } } -#ifdef SMART_SCHEDULE if (someReady) XFD_ORSET(&LastSelectMask, &ClientsWithInput, &LastSelectMask); -#endif if (AnyClientsWriteBlocked && XFD_ANYSET (&clientsWritable)) { NewOutputPending = TRUE; diff --git a/nx-X11/programs/Xserver/os/io.c b/nx-X11/programs/Xserver/os/io.c index 3771d40fb..87739cfb1 100644 --- a/nx-X11/programs/Xserver/os/io.c +++ b/nx-X11/programs/Xserver/os/io.c @@ -430,11 +430,9 @@ ReadRequestFromClient(ClientPtr client) FD_SET(fd, &ClientsWithInput); else { -#ifdef SMART_SCHEDULE if (!SmartScheduleDisable) FD_CLR(fd, &ClientsWithInput); else -#endif YieldControlNoInput(); } } @@ -442,16 +440,12 @@ ReadRequestFromClient(ClientPtr client) { if (!gotnow) AvailableInput = oc; -#ifdef SMART_SCHEDULE if (!SmartScheduleDisable) FD_CLR(fd, &ClientsWithInput); else -#endif YieldControlNoInput(); } -#ifdef SMART_SCHEDULE if (SmartScheduleDisable) -#endif if (++timesThisConnection >= MAX_TIMES_PER) YieldControl(); #ifdef BIGREQS diff --git a/nx-X11/programs/Xserver/os/osinit.c b/nx-X11/programs/Xserver/os/osinit.c index 7aa961a56..59b567356 100644 --- a/nx-X11/programs/Xserver/os/osinit.c +++ b/nx-X11/programs/Xserver/os/osinit.c @@ -55,9 +55,7 @@ SOFTWARE. #include "osdep.h" #include -#ifdef SMART_SCHEDULE #include "dixstruct.h" -#endif #ifndef PATH_MAX #ifdef MAXPATHLEN @@ -216,11 +214,9 @@ OsInit(void) * log file name if logging to a file is desired. */ LogInit(NULL, NULL); -#ifdef SMART_SCHEDULE if (!SmartScheduleDisable) if (!SmartScheduleInit ()) SmartScheduleDisable = TRUE; -#endif OsInitAllocator(); if (!OsDelayInitColors) OsInitColors(); } diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 5f7542a2d..204494d63 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -134,9 +134,7 @@ OR PERFORMANCE OF THIS SOFTWARE. #include "opaque.h" -#ifdef SMART_SCHEDULE #include "dixstruct.h" -#endif #ifdef XKB #include "xkbsrv.h" @@ -635,10 +633,8 @@ void UseMsg(void) ErrorF("+rrxinerama Enable XINERAMA (via RandR) extension (default)\n"); ErrorF("-rrxinerama Disable XINERAMA (via RandR) extension\n"); #endif -#ifdef SMART_SCHEDULE ErrorF("-dumbSched Disable smart scheduling, enable old behavior\n"); ErrorF("-schedInterval int Set scheduler interval in msec\n"); -#endif ErrorF("+extension name Enable extension\n"); ErrorF("-extension name Disable extension\n"); #ifdef XDMCP @@ -1038,7 +1034,6 @@ ProcessCommandLine(int argc, char *argv[]) i = skip - 1; } #endif -#ifdef SMART_SCHEDULE else if ( strcmp( argv[i], "-dumbSched") == 0) { SmartScheduleDisable = TRUE; @@ -1062,7 +1057,6 @@ ProcessCommandLine(int argc, char *argv[]) else UseMsg(); } -#endif #ifdef RENDER else if ( strcmp( argv[i], "-render" ) == 0) { @@ -1367,8 +1361,6 @@ XNFstrdup(const char *s) return ret; } -#ifdef SMART_SCHEDULE - unsigned long SmartScheduleIdleCount; Bool SmartScheduleIdle; Bool SmartScheduleTimerStopped; @@ -1494,7 +1486,6 @@ SmartScheduleInit (void) return FALSE; #endif } -#endif #ifdef SIG_BLOCK static sigset_t PreviousSignalMask; -- cgit v1.2.3 From efc0dae0519aa0ef1fabea6a64919475fd916347 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 17 Feb 2017 12:43:06 +0000 Subject: Switch from using libNX_X11's deprecated XKeycodeToKeysym() function to using XGetKeyboardMapping(). Fixes ArcticaProject/nx-libs#229. --- nx-X11/programs/Xserver/hw/nxagent/Events.c | 21 ++++++++++++++++---- nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | 27 +++++++++++++++++++------- 2 files changed, 37 insertions(+), 11 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index 371780a92..efe745718 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -934,7 +934,7 @@ void nxagentDispatchEvents(PredicateFuncPtr predicate) { enum HandleEventResult result; - KeySym keysym; + XlibKeySym *keysym; #ifdef TEST fprintf(stderr, "nxagentDispatchEvents: Going to handle new KeyPress event.\n"); @@ -1101,12 +1101,17 @@ void nxagentDispatchEvents(PredicateFuncPtr predicate) * sive delay. */ - keysym = XKeycodeToKeysym(nxagentDisplay, X.xkey.keycode, 0); + int keysyms_per_keycode_return; + keysym = XGetKeyboardMapping(nxagentDisplay, + X.xkey.keycode, + 1, + &keysyms_per_keycode_return); - if (nxagentMonitoredDuplicate(keysym) == 1) + if (nxagentMonitoredDuplicate(keysym[0]) == 1) { nxagentRemoveDuplicatedKeys(&X); } + free(keysym); if (nxagentOption(ViewOnly) == 0 && nxagentOption(Shadow) == 1 && result == doNothing) { @@ -4638,8 +4643,16 @@ void nxagentDumpInputDevicesState(void) { if (val & (mask << k)) { + int keysyms_per_keycode_return; + XlibKeySym *keysym = XGetKeyboardMapping(nxagentDisplay, + i * 8 + k, + 1, + &keysyms_per_keycode_return); + + fprintf(stderr, "\n\t[%d] [%s]", i * 8 + k, - XKeysymToString(XKeycodeToKeysym(nxagentDisplay, i * 8 + k, 0))); + XKeysymToString(keysym[0])); + free(keysym); } } } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c index 8dc1a0b85..6237b9dac 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c @@ -406,7 +406,13 @@ free(filename); static enum nxagentSpecialKeystroke find_keystroke(XKeyEvent *X) { - KeySym keysym = XKeycodeToKeysym(nxagentDisplay, X->keycode, 0); + int keysyms_per_keycode_return; + XlibKeySym *keysym = XGetKeyboardMapping(nxagentDisplay, + X->keycode, + 1, + &keysyms_per_keycode_return); + + struct nxagentSpecialKeystrokeMap *cur = map; if (! nxagentKeystrokeFileParsed) @@ -418,19 +424,20 @@ static enum nxagentSpecialKeystroke find_keystroke(XKeyEvent *X) enum nxagentSpecialKeystroke ret = KEYSTROKE_NOTHING; while (cur->stroke != KEYSTROKE_END_MARKER) { - if (cur->keysym == keysym && modifier_matches(cur->modifierMask, cur->modifierAltMeta, X->state)) { + if (cur->keysym == keysym[0] && modifier_matches(cur->modifierMask, cur->modifierAltMeta, X->state)) { + + free(keysym); return cur->stroke; } cur++; } + free(keysym); return ret; } int nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result) { - KeySym sym; - int index = 0; enum nxagentSpecialKeystroke stroke = find_keystroke(X); *result = doNothing; @@ -440,17 +447,23 @@ int nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result) * Do we need a cache ? */ - sym = XKeycodeToKeysym(nxagentDisplay, X -> keycode, index); + int keysyms_per_keycode_return; + XlibKeySym *sym = XGetKeyboardMapping(nxagentDisplay, + X->keycode, + 1, + &keysyms_per_keycode_return); - if (sym == XK_VoidSymbol || sym == NoSymbol) + if (sym[0] == XK_VoidSymbol || sym[0] == NoSymbol) { + free(sym); return 0; } #ifdef TEST fprintf(stderr, "nxagentCheckSpecialKeystroke: got code %x - state %x - sym %lx\n", - X -> keycode, X -> state, sym); + X -> keycode, X -> state, sym[0]); #endif + free(sym); /* * Check special keys. -- cgit v1.2.3 From 52c3c80d75081b91ff27cb8ab37ca943980d424d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 15 Feb 2017 09:59:00 +0100 Subject: Naming change: Security*Access -> Dix*Access Backported from X.org: commit 6c46645cfc1afda8aeabfe0ed4d9342673b702f1 Author: Eamon Walsh Date: Thu Dec 14 14:45:42 2006 -0500 Naming change: Security*Access -> Dix*Access Backported-to-NX-by: Mike Gabriel --- nx-X11/programs/Xserver/Xext/panoramiXprocs.c | 172 ++++++++++++------------ nx-X11/programs/Xserver/Xext/saver.c | 10 +- nx-X11/programs/Xserver/Xext/security.c | 10 +- nx-X11/programs/Xserver/Xext/shape.c | 22 +-- nx-X11/programs/Xserver/Xext/shm.c | 6 +- nx-X11/programs/Xserver/Xext/sync.c | 16 +-- nx-X11/programs/Xserver/Xext/xf86bigfont.c | 4 +- nx-X11/programs/Xserver/Xext/xvdisp.c | 30 ++--- nx-X11/programs/Xserver/composite/compwindow.c | 2 +- nx-X11/programs/Xserver/damageext/damageext.c | 10 +- nx-X11/programs/Xserver/dbe/dbe.c | 12 +- nx-X11/programs/Xserver/dix/colormap.c | 4 +- nx-X11/programs/Xserver/dix/cursor.c | 4 +- nx-X11/programs/Xserver/dix/dispatch.c | 116 ++++++++-------- nx-X11/programs/Xserver/dix/dixfonts.c | 8 +- nx-X11/programs/Xserver/dix/dixutils.c | 6 +- nx-X11/programs/Xserver/dix/events.c | 38 +++--- nx-X11/programs/Xserver/dix/gc.c | 8 +- nx-X11/programs/Xserver/dix/property.c | 20 +-- nx-X11/programs/Xserver/dix/resource.c | 4 +- nx-X11/programs/Xserver/dix/window.c | 10 +- nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 16 +-- nx-X11/programs/Xserver/hw/nxagent/NXevents.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | 10 +- nx-X11/programs/Xserver/hw/nxagent/NXrender.c | 48 +++---- nx-X11/programs/Xserver/hw/nxagent/NXwindow.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Rootless.c | 10 +- nx-X11/programs/Xserver/include/dix.h | 10 +- nx-X11/programs/Xserver/include/resource.h | 8 +- nx-X11/programs/Xserver/randr/randrstr.h | 8 +- nx-X11/programs/Xserver/randr/rrdispatch.c | 2 +- nx-X11/programs/Xserver/randr/rrmode.c | 2 +- nx-X11/programs/Xserver/randr/rrmonitor.c | 6 +- nx-X11/programs/Xserver/randr/rroutput.c | 4 +- nx-X11/programs/Xserver/randr/rrprovider.c | 2 +- nx-X11/programs/Xserver/randr/rrscreen.c | 10 +- nx-X11/programs/Xserver/randr/rrxinerama.c | 6 +- nx-X11/programs/Xserver/render/picture.c | 4 +- nx-X11/programs/Xserver/render/render.c | 122 ++++++++--------- nx-X11/programs/Xserver/xfixes/cursor.c | 12 +- nx-X11/programs/Xserver/xfixes/region.c | 46 +++---- nx-X11/programs/Xserver/xfixes/saveset.c | 2 +- nx-X11/programs/Xserver/xfixes/select.c | 2 +- 43 files changed, 421 insertions(+), 425 deletions(-) diff --git a/nx-X11/programs/Xserver/Xext/panoramiXprocs.c b/nx-X11/programs/Xserver/Xext/panoramiXprocs.c index 9da3328f8..906fdd137 100644 --- a/nx-X11/programs/Xserver/Xext/panoramiXprocs.c +++ b/nx-X11/programs/Xserver/Xext/panoramiXprocs.c @@ -89,7 +89,7 @@ int PanoramiXCreateWindow(ClientPtr client) return BadLength; if (!(parent = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->parent, XRT_WINDOW, SecurityWriteAccess))) + client, stuff->parent, XRT_WINDOW, DixWriteAccess))) return BadWindow; if(stuff->class == CopyFromParent) @@ -103,7 +103,7 @@ int PanoramiXCreateWindow(ClientPtr client) tmp = *((CARD32 *) &stuff[1] + pback_offset); if ((tmp != None) && (tmp != ParentRelative)) { if(!(backPix = (PanoramiXRes*) SecurityLookupIDByType( - client, tmp, XRT_PIXMAP, SecurityReadAccess))) + client, tmp, XRT_PIXMAP, DixReadAccess))) return BadPixmap; } } @@ -112,7 +112,7 @@ int PanoramiXCreateWindow(ClientPtr client) tmp = *((CARD32 *) &stuff[1] + pbord_offset); if (tmp != CopyFromParent) { if(!(bordPix = (PanoramiXRes*) SecurityLookupIDByType( - client, tmp, XRT_PIXMAP, SecurityReadAccess))) + client, tmp, XRT_PIXMAP, DixReadAccess))) return BadPixmap; } } @@ -121,7 +121,7 @@ int PanoramiXCreateWindow(ClientPtr client) tmp = *((CARD32 *) &stuff[1] + cmap_offset); if ((tmp != CopyFromParent) && (tmp != None)) { if(!(cmap = (PanoramiXRes*) SecurityLookupIDByType( - client, tmp, XRT_COLORMAP, SecurityReadAccess))) + client, tmp, XRT_COLORMAP, DixReadAccess))) return BadColor; } } @@ -190,7 +190,7 @@ int PanoramiXChangeWindowAttributes(ClientPtr client) return BadLength; if (!(win = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->window, XRT_WINDOW, SecurityWriteAccess))) + client, stuff->window, XRT_WINDOW, DixWriteAccess))) return BadWindow; if((win->u.win.class == InputOnly) && @@ -202,7 +202,7 @@ int PanoramiXChangeWindowAttributes(ClientPtr client) tmp = *((CARD32 *) &stuff[1] + pback_offset); if ((tmp != None) && (tmp != ParentRelative)) { if(!(backPix = (PanoramiXRes*) SecurityLookupIDByType( - client, tmp, XRT_PIXMAP, SecurityReadAccess))) + client, tmp, XRT_PIXMAP, DixReadAccess))) return BadPixmap; } } @@ -211,7 +211,7 @@ int PanoramiXChangeWindowAttributes(ClientPtr client) tmp = *((CARD32 *) &stuff[1] + pbord_offset); if (tmp != CopyFromParent) { if(!(bordPix = (PanoramiXRes*) SecurityLookupIDByType( - client, tmp, XRT_PIXMAP, SecurityReadAccess))) + client, tmp, XRT_PIXMAP, DixReadAccess))) return BadPixmap; } } @@ -220,7 +220,7 @@ int PanoramiXChangeWindowAttributes(ClientPtr client) tmp = *((CARD32 *) &stuff[1] + cmap_offset); if ((tmp != CopyFromParent) && (tmp != None)) { if(!(cmap = (PanoramiXRes*) SecurityLookupIDByType( - client, tmp, XRT_COLORMAP, SecurityReadAccess))) + client, tmp, XRT_COLORMAP, DixReadAccess))) return BadColor; } } @@ -249,7 +249,7 @@ int PanoramiXDestroyWindow(ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); if(!(win = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->id, XRT_WINDOW, SecurityDestroyAccess))) + client, stuff->id, XRT_WINDOW, DixDestroyAccess))) return BadWindow; FOR_NSCREENS_BACKWARD(j) { @@ -274,7 +274,7 @@ int PanoramiXDestroySubwindows(ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); if(!(win = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->id, XRT_WINDOW, SecurityDestroyAccess))) + client, stuff->id, XRT_WINDOW, DixDestroyAccess))) return BadWindow; FOR_NSCREENS_BACKWARD(j) { @@ -299,7 +299,7 @@ int PanoramiXChangeSaveSet(ClientPtr client) REQUEST_SIZE_MATCH(xChangeSaveSetReq); if(!(win = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->window, XRT_WINDOW, SecurityReadAccess))) + client, stuff->window, XRT_WINDOW, DixReadAccess))) return BadWindow; FOR_NSCREENS_BACKWARD(j) { @@ -323,11 +323,11 @@ int PanoramiXReparentWindow(ClientPtr client) REQUEST_SIZE_MATCH(xReparentWindowReq); if(!(win = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->window, XRT_WINDOW, SecurityWriteAccess))) + client, stuff->window, XRT_WINDOW, DixWriteAccess))) return BadWindow; if(!(parent = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->parent, XRT_WINDOW, SecurityWriteAccess))) + client, stuff->parent, XRT_WINDOW, DixWriteAccess))) return BadWindow; x = stuff->x; @@ -358,7 +358,7 @@ int PanoramiXMapWindow(ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); if(!(win = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->id, XRT_WINDOW, SecurityReadAccess))) + client, stuff->id, XRT_WINDOW, DixReadAccess))) return BadWindow; FOR_NSCREENS_FORWARD(j) { @@ -380,7 +380,7 @@ int PanoramiXMapSubwindows(ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); if(!(win = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->id, XRT_WINDOW, SecurityReadAccess))) + client, stuff->id, XRT_WINDOW, DixReadAccess))) return BadWindow; FOR_NSCREENS_FORWARD(j) { @@ -402,7 +402,7 @@ int PanoramiXUnmapWindow(ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); if(!(win = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->id, XRT_WINDOW, SecurityReadAccess))) + client, stuff->id, XRT_WINDOW, DixReadAccess))) return BadWindow; FOR_NSCREENS_FORWARD(j) { @@ -424,7 +424,7 @@ int PanoramiXUnmapSubwindows(ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); if(!(win = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->id, XRT_WINDOW, SecurityReadAccess))) + client, stuff->id, XRT_WINDOW, DixReadAccess))) return BadWindow; FOR_NSCREENS_FORWARD(j) { @@ -455,11 +455,11 @@ int PanoramiXConfigureWindow(ClientPtr client) /* because we need the parent */ if (!(pWin = (WindowPtr)SecurityLookupIDByType( - client, stuff->window, RT_WINDOW, SecurityWriteAccess))) + client, stuff->window, RT_WINDOW, DixWriteAccess))) return BadWindow; if (!(win = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->window, XRT_WINDOW, SecurityWriteAccess))) + client, stuff->window, XRT_WINDOW, DixWriteAccess))) return BadWindow; if ((Mask)stuff->mask & CWSibling) { @@ -467,7 +467,7 @@ int PanoramiXConfigureWindow(ClientPtr client) sib_offset = Ones((Mask)stuff->mask & (CWSibling - 1)); if ((tmp = *((CARD32 *) &stuff[1] + sib_offset))) { if(!(sib = (PanoramiXRes*) SecurityLookupIDByType( - client, tmp, XRT_WINDOW, SecurityReadAccess))) + client, tmp, XRT_WINDOW, DixReadAccess))) return BadWindow; } } @@ -512,7 +512,7 @@ int PanoramiXCirculateWindow(ClientPtr client) REQUEST_SIZE_MATCH(xCirculateWindowReq); if(!(win = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->window, XRT_WINDOW, SecurityWriteAccess))) + client, stuff->window, XRT_WINDOW, DixWriteAccess))) return BadWindow; FOR_NSCREENS_FORWARD(j) { @@ -577,11 +577,11 @@ int PanoramiXTranslateCoords(ClientPtr client) REQUEST_SIZE_MATCH(xTranslateCoordsReq); pWin = (WindowPtr)SecurityLookupWindow(stuff->srcWid, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return(BadWindow); pDst = (WindowPtr)SecurityLookupWindow(stuff->dstWid, client, - SecurityReadAccess); + DixReadAccess); if (!pDst) return(BadWindow); rep.type = X_Reply; @@ -653,7 +653,7 @@ int PanoramiXCreatePixmap(ClientPtr client) client->errorValue = stuff->pid; if(!(refDraw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityReadAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixReadAccess))) return BadDrawable; if(!(newPix = (PanoramiXRes *) malloc(sizeof(PanoramiXRes)))) @@ -692,7 +692,7 @@ int PanoramiXFreePixmap(ClientPtr client) client->errorValue = stuff->id; if(!(pix = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->id, XRT_PIXMAP, SecurityDestroyAccess))) + client, stuff->id, XRT_PIXMAP, DixDestroyAccess))) return BadPixmap; FOR_NSCREENS_BACKWARD(j) { @@ -728,14 +728,14 @@ int PanoramiXCreateGC(ClientPtr client) return BadLength; if (!(refDraw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityReadAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixReadAccess))) return BadDrawable; if ((Mask)stuff->mask & GCTile) { tile_offset = Ones((Mask)stuff->mask & (GCTile - 1)); if ((tmp = *((CARD32 *) &stuff[1] + tile_offset))) { if(!(tile = (PanoramiXRes*) SecurityLookupIDByType( - client, tmp, XRT_PIXMAP, SecurityReadAccess))) + client, tmp, XRT_PIXMAP, DixReadAccess))) return BadPixmap; } } @@ -743,7 +743,7 @@ int PanoramiXCreateGC(ClientPtr client) stip_offset = Ones((Mask)stuff->mask & (GCStipple - 1)); if ((tmp = *((CARD32 *) &stuff[1] + stip_offset))) { if(!(stip = (PanoramiXRes*) SecurityLookupIDByType( - client, tmp, XRT_PIXMAP, SecurityReadAccess))) + client, tmp, XRT_PIXMAP, DixReadAccess))) return BadPixmap; } } @@ -751,7 +751,7 @@ int PanoramiXCreateGC(ClientPtr client) clip_offset = Ones((Mask)stuff->mask & (GCClipMask - 1)); if ((tmp = *((CARD32 *) &stuff[1] + clip_offset))) { if(!(clip = (PanoramiXRes*) SecurityLookupIDByType( - client, tmp, XRT_PIXMAP, SecurityReadAccess))) + client, tmp, XRT_PIXMAP, DixReadAccess))) return BadPixmap; } } @@ -803,14 +803,14 @@ int PanoramiXChangeGC(ClientPtr client) return BadLength; if (!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityReadAccess))) + client, stuff->gc, XRT_GC, DixReadAccess))) return BadGC; if ((Mask)stuff->mask & GCTile) { tile_offset = Ones((Mask)stuff->mask & (GCTile - 1)); if ((tmp = *((CARD32 *) &stuff[1] + tile_offset))) { if(!(tile = (PanoramiXRes*) SecurityLookupIDByType( - client, tmp, XRT_PIXMAP, SecurityReadAccess))) + client, tmp, XRT_PIXMAP, DixReadAccess))) return BadPixmap; } } @@ -818,7 +818,7 @@ int PanoramiXChangeGC(ClientPtr client) stip_offset = Ones((Mask)stuff->mask & (GCStipple - 1)); if ((tmp = *((CARD32 *) &stuff[1] + stip_offset))) { if(!(stip = (PanoramiXRes*) SecurityLookupIDByType( - client, tmp, XRT_PIXMAP, SecurityReadAccess))) + client, tmp, XRT_PIXMAP, DixReadAccess))) return BadPixmap; } } @@ -826,7 +826,7 @@ int PanoramiXChangeGC(ClientPtr client) clip_offset = Ones((Mask)stuff->mask & (GCClipMask - 1)); if ((tmp = *((CARD32 *) &stuff[1] + clip_offset))) { if(!(clip = (PanoramiXRes*) SecurityLookupIDByType( - client, tmp, XRT_PIXMAP, SecurityReadAccess))) + client, tmp, XRT_PIXMAP, DixReadAccess))) return BadPixmap; } } @@ -857,11 +857,11 @@ int PanoramiXCopyGC(ClientPtr client) REQUEST_SIZE_MATCH(xCopyGCReq); if(!(srcGC = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->srcGC, XRT_GC, SecurityReadAccess))) + client, stuff->srcGC, XRT_GC, DixReadAccess))) return BadGC; if(!(dstGC = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->dstGC, XRT_GC, SecurityWriteAccess))) + client, stuff->dstGC, XRT_GC, DixWriteAccess))) return BadGC; FOR_NSCREENS(j) { @@ -884,7 +884,7 @@ int PanoramiXSetDashes(ClientPtr client) REQUEST_FIXED_SIZE(xSetDashesReq, stuff->nDashes); if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityWriteAccess))) + client, stuff->gc, XRT_GC, DixWriteAccess))) return BadGC; FOR_NSCREENS_BACKWARD(j) { @@ -906,7 +906,7 @@ int PanoramiXSetClipRectangles(ClientPtr client) REQUEST_AT_LEAST_SIZE(xSetClipRectanglesReq); if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityWriteAccess))) + client, stuff->gc, XRT_GC, DixWriteAccess))) return BadGC; FOR_NSCREENS_BACKWARD(j) { @@ -928,7 +928,7 @@ int PanoramiXFreeGC(ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->id, XRT_GC, SecurityDestroyAccess))) + client, stuff->id, XRT_GC, DixDestroyAccess))) return BadGC; FOR_NSCREENS_BACKWARD(j) { @@ -954,7 +954,7 @@ int PanoramiXClearToBackground(ClientPtr client) REQUEST_SIZE_MATCH(xClearAreaReq); if(!(win = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->window, XRT_WINDOW, SecurityWriteAccess))) + client, stuff->window, XRT_WINDOW, DixWriteAccess))) return BadWindow; x = stuff->x; @@ -996,13 +996,13 @@ int PanoramiXCopyArea(ClientPtr client) REQUEST_SIZE_MATCH(xCopyAreaReq); if(!(src = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->srcDrawable, XRC_DRAWABLE, SecurityReadAccess))) + client, stuff->srcDrawable, XRC_DRAWABLE, DixReadAccess))) return BadDrawable; srcShared = IS_SHARED_PIXMAP(src); if(!(dst = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->dstDrawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->dstDrawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; dstShared = IS_SHARED_PIXMAP(dst); @@ -1011,7 +1011,7 @@ int PanoramiXCopyArea(ClientPtr client) return (* SavedProcVector[X_CopyArea])(client); if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityReadAccess))) + client, stuff->gc, XRT_GC, DixReadAccess))) return BadGC; if((dst->type == XRT_WINDOW) && dst->u.win.root) @@ -1080,7 +1080,7 @@ int PanoramiXCopyArea(ClientPtr client) VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pDst, pGC, client); if (stuff->dstDrawable != stuff->srcDrawable) { SECURITY_VERIFY_DRAWABLE(pSrc, stuff->srcDrawable, client, - SecurityReadAccess); + DixReadAccess); if ((pDst->pScreen != pSrc->pScreen) || (pDst->depth != pSrc->depth)) { client->errorValue = stuff->dstDrawable; @@ -1144,13 +1144,13 @@ int PanoramiXCopyPlane(ClientPtr client) REQUEST_SIZE_MATCH(xCopyPlaneReq); if(!(src = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->srcDrawable, XRC_DRAWABLE, SecurityReadAccess))) + client, stuff->srcDrawable, XRC_DRAWABLE, DixReadAccess))) return BadDrawable; srcShared = IS_SHARED_PIXMAP(src); if(!(dst = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->dstDrawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->dstDrawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; dstShared = IS_SHARED_PIXMAP(dst); @@ -1159,7 +1159,7 @@ int PanoramiXCopyPlane(ClientPtr client) return (* SavedProcVector[X_CopyPlane])(client); if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityReadAccess))) + client, stuff->gc, XRT_GC, DixReadAccess))) return BadGC; if((dst->type == XRT_WINDOW) && dst->u.win.root) @@ -1186,7 +1186,7 @@ int PanoramiXCopyPlane(ClientPtr client) VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pdstDraw, pGC, client); if (stuff->dstDrawable != stuff->srcDrawable) { SECURITY_VERIFY_DRAWABLE(psrcDraw, stuff->srcDrawable, client, - SecurityReadAccess); + DixReadAccess); if (pdstDraw->pScreen != psrcDraw->pScreen) { client->errorValue = stuff->dstDrawable; return (BadMatch); @@ -1244,14 +1244,14 @@ int PanoramiXPolyPoint(ClientPtr client) REQUEST_AT_LEAST_SIZE(xPolyPointReq); if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; if(IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_PolyPoint])(client); if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityReadAccess))) + client, stuff->gc, XRT_GC, DixReadAccess))) return BadGC; isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; @@ -1302,14 +1302,14 @@ int PanoramiXPolyLine(ClientPtr client) REQUEST_AT_LEAST_SIZE(xPolyLineReq); if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; if(IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_PolyLine])(client); if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityReadAccess))) + client, stuff->gc, XRT_GC, DixReadAccess))) return BadGC; isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; @@ -1360,14 +1360,14 @@ int PanoramiXPolySegment(ClientPtr client) REQUEST_AT_LEAST_SIZE(xPolySegmentReq); if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; if(IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_PolySegment])(client); if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityReadAccess))) + client, stuff->gc, XRT_GC, DixReadAccess))) return BadGC; isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; @@ -1422,14 +1422,14 @@ int PanoramiXPolyRectangle(ClientPtr client) if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; if(IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_PolyRectangle])(client); if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityReadAccess))) + client, stuff->gc, XRT_GC, DixReadAccess))) return BadGC; isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; @@ -1482,14 +1482,14 @@ int PanoramiXPolyArc(ClientPtr client) REQUEST_AT_LEAST_SIZE(xPolyArcReq); if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; if(IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_PolyArc])(client); if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityReadAccess))) + client, stuff->gc, XRT_GC, DixReadAccess))) return BadGC; isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; @@ -1540,14 +1540,14 @@ int PanoramiXFillPoly(ClientPtr client) REQUEST_AT_LEAST_SIZE(xFillPolyReq); if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; if(IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_FillPoly])(client); if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityReadAccess))) + client, stuff->gc, XRT_GC, DixReadAccess))) return BadGC; isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; @@ -1599,14 +1599,14 @@ int PanoramiXPolyFillRectangle(ClientPtr client) REQUEST_AT_LEAST_SIZE(xPolyFillRectangleReq); if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; if(IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_PolyFillRectangle])(client); if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityReadAccess))) + client, stuff->gc, XRT_GC, DixReadAccess))) return BadGC; isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; @@ -1658,14 +1658,14 @@ int PanoramiXPolyFillArc(ClientPtr client) REQUEST_AT_LEAST_SIZE(xPolyFillArcReq); if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; if(IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_PolyFillArc])(client); if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityReadAccess))) + client, stuff->gc, XRT_GC, DixReadAccess))) return BadGC; isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; @@ -1716,14 +1716,14 @@ int PanoramiXPutImage(ClientPtr client) REQUEST_AT_LEAST_SIZE(xPutImageReq); if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; if(IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_PutImage])(client); if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityReadAccess))) + client, stuff->gc, XRT_GC, DixReadAccess))) return BadGC; isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; @@ -1767,7 +1767,7 @@ int PanoramiXGetImage(ClientPtr client) } if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; if(draw->type == XRT_PIXMAP) @@ -1907,14 +1907,14 @@ PanoramiXPolyText8(ClientPtr client) REQUEST_AT_LEAST_SIZE(xPolyTextReq); if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; if(IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_PolyText8])(client); if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityReadAccess))) + client, stuff->gc, XRT_GC, DixReadAccess))) return BadGC; isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; @@ -1946,14 +1946,14 @@ PanoramiXPolyText16(ClientPtr client) REQUEST_AT_LEAST_SIZE(xPolyTextReq); if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; if(IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_PolyText16])(client); if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityReadAccess))) + client, stuff->gc, XRT_GC, DixReadAccess))) return BadGC; isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; @@ -1985,14 +1985,14 @@ int PanoramiXImageText8(ClientPtr client) REQUEST_FIXED_SIZE(xImageTextReq, stuff->nChars); if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; if(IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_ImageText8])(client); if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityReadAccess))) + client, stuff->gc, XRT_GC, DixReadAccess))) return BadGC; isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; @@ -2024,14 +2024,14 @@ int PanoramiXImageText16(ClientPtr client) REQUEST_FIXED_SIZE(xImageTextReq, stuff->nChars << 1); if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; if(IS_SHARED_PIXMAP(draw)) return (*SavedProcVector[X_ImageText16])(client); if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityReadAccess))) + client, stuff->gc, XRT_GC, DixReadAccess))) return BadGC; isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; @@ -2062,7 +2062,7 @@ int PanoramiXCreateColormap(ClientPtr client) REQUEST_SIZE_MATCH(xCreateColormapReq); if(!(win = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->window, XRT_WINDOW, SecurityReadAccess))) + client, stuff->window, XRT_WINDOW, DixReadAccess))) return BadWindow; if(!stuff->visual || (stuff->visual > 255)) @@ -2105,7 +2105,7 @@ int PanoramiXFreeColormap(ClientPtr client) client->errorValue = stuff->id; if(!(cmap = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->id, XRT_COLORMAP, SecurityDestroyAccess))) + client, stuff->id, XRT_COLORMAP, DixDestroyAccess))) return BadColor; FOR_NSCREENS_BACKWARD(j) { @@ -2134,7 +2134,7 @@ PanoramiXCopyColormapAndFree(ClientPtr client) if(!(cmap = (PanoramiXRes *)SecurityLookupIDByType( client, stuff->srcCmap, XRT_COLORMAP, - SecurityReadAccess | SecurityWriteAccess))) + DixReadAccess | DixWriteAccess))) return BadColor; if(!(newCmap = (PanoramiXRes *) malloc(sizeof(PanoramiXRes)))) @@ -2172,7 +2172,7 @@ int PanoramiXInstallColormap(ClientPtr client) client->errorValue = stuff->id; if(!(cmap = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->id, XRT_COLORMAP, SecurityReadAccess))) + client, stuff->id, XRT_COLORMAP, DixReadAccess))) return BadColor; FOR_NSCREENS_BACKWARD(j){ @@ -2195,7 +2195,7 @@ int PanoramiXUninstallColormap(ClientPtr client) client->errorValue = stuff->id; if(!(cmap = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->id, XRT_COLORMAP, SecurityReadAccess))) + client, stuff->id, XRT_COLORMAP, DixReadAccess))) return BadColor; FOR_NSCREENS_BACKWARD(j) { @@ -2218,7 +2218,7 @@ int PanoramiXAllocColor(ClientPtr client) client->errorValue = stuff->cmap; if(!(cmap = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->cmap, XRT_COLORMAP, SecurityWriteAccess))) + client, stuff->cmap, XRT_COLORMAP, DixWriteAccess))) return BadColor; FOR_NSCREENS_BACKWARD(j){ @@ -2241,7 +2241,7 @@ int PanoramiXAllocNamedColor(ClientPtr client) client->errorValue = stuff->cmap; if(!(cmap = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->cmap, XRT_COLORMAP, SecurityWriteAccess))) + client, stuff->cmap, XRT_COLORMAP, DixWriteAccess))) return BadColor; FOR_NSCREENS_BACKWARD(j){ @@ -2264,7 +2264,7 @@ int PanoramiXAllocColorCells(ClientPtr client) client->errorValue = stuff->cmap; if(!(cmap = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->cmap, XRT_COLORMAP, SecurityWriteAccess))) + client, stuff->cmap, XRT_COLORMAP, DixWriteAccess))) return BadColor; FOR_NSCREENS_BACKWARD(j){ @@ -2287,7 +2287,7 @@ int PanoramiXAllocColorPlanes(ClientPtr client) client->errorValue = stuff->cmap; if(!(cmap = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->cmap, XRT_COLORMAP, SecurityWriteAccess))) + client, stuff->cmap, XRT_COLORMAP, DixWriteAccess))) return BadColor; FOR_NSCREENS_BACKWARD(j){ @@ -2311,7 +2311,7 @@ int PanoramiXFreeColors(ClientPtr client) client->errorValue = stuff->cmap; if(!(cmap = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->cmap, XRT_COLORMAP, SecurityWriteAccess))) + client, stuff->cmap, XRT_COLORMAP, DixWriteAccess))) return BadColor; FOR_NSCREENS_BACKWARD(j) { @@ -2333,7 +2333,7 @@ int PanoramiXStoreColors(ClientPtr client) client->errorValue = stuff->cmap; if(!(cmap = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->cmap, XRT_COLORMAP, SecurityWriteAccess))) + client, stuff->cmap, XRT_COLORMAP, DixWriteAccess))) return BadColor; FOR_NSCREENS_BACKWARD(j){ @@ -2356,7 +2356,7 @@ int PanoramiXStoreNamedColor(ClientPtr client) client->errorValue = stuff->cmap; if(!(cmap = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->cmap, XRT_COLORMAP, SecurityWriteAccess))) + client, stuff->cmap, XRT_COLORMAP, DixWriteAccess))) return BadColor; FOR_NSCREENS_BACKWARD(j){ diff --git a/nx-X11/programs/Xserver/Xext/saver.c b/nx-X11/programs/Xserver/Xext/saver.c index 3e4fd8a95..06a967eb4 100644 --- a/nx-X11/programs/Xserver/Xext/saver.c +++ b/nx-X11/programs/Xserver/Xext/saver.c @@ -1199,7 +1199,7 @@ ProcScreenSaverSetAttributes (ClientPtr client) REQUEST_AT_LEAST_SIZE (xScreenSaverSetAttributesReq); if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; len = stuff->length - (sizeof(xScreenSaverSetAttributesReq) >> 2); @@ -1211,7 +1211,7 @@ ProcScreenSaverSetAttributes (ClientPtr client) tmp = *((CARD32 *) &stuff[1] + pback_offset); if ((tmp != None) && (tmp != ParentRelative)) { if(!(backPix = (PanoramiXRes*) SecurityLookupIDByType( - client, tmp, XRT_PIXMAP, SecurityReadAccess))) + client, tmp, XRT_PIXMAP, DixReadAccess))) return BadPixmap; } } @@ -1221,7 +1221,7 @@ ProcScreenSaverSetAttributes (ClientPtr client) tmp = *((CARD32 *) &stuff[1] + pbord_offset); if (tmp != CopyFromParent) { if(!(bordPix = (PanoramiXRes*) SecurityLookupIDByType( - client, tmp, XRT_PIXMAP, SecurityReadAccess))) + client, tmp, XRT_PIXMAP, DixReadAccess))) return BadPixmap; } } @@ -1231,7 +1231,7 @@ ProcScreenSaverSetAttributes (ClientPtr client) tmp = *((CARD32 *) &stuff[1] + cmap_offset); if ((tmp != CopyFromParent) && (tmp != None)) { if(!(cmap = (PanoramiXRes*) SecurityLookupIDByType( - client, tmp, XRT_COLORMAP, SecurityReadAccess))) + client, tmp, XRT_COLORMAP, DixReadAccess))) return BadColor; } } @@ -1271,7 +1271,7 @@ ProcScreenSaverUnsetAttributes (ClientPtr client) int i; if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; for(i = PanoramiXNumScreens - 1; i > 0; i--) { diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c index 3a638460e..55a805aea 100644 --- a/nx-X11/programs/Xserver/Xext/security.c +++ b/nx-X11/programs/Xserver/Xext/security.c @@ -750,7 +750,7 @@ ProcSecurityRevokeAuthorization( REQUEST_SIZE_MATCH(xSecurityRevokeAuthorizationReq); pAuth = (SecurityAuthorizationPtr)SecurityLookupIDByType(client, - stuff->authId, SecurityAuthorizationResType, SecurityDestroyAccess); + stuff->authId, SecurityAuthorizationResType, DixDestroyAccess); if (!pAuth) return SecurityErrorBase + XSecurityBadAuthorization; @@ -1115,7 +1115,7 @@ SecurityCheckResourceIDAccess( int cid = CLIENT_ID(id); int reqtype = ((xReq *)client->requestBuffer)->reqType; - if (SecurityUnknownAccess == access_mode) + if (DixUnknownAccess == access_mode) return rval; /* for compatibility, we have to allow access */ switch (reqtype) @@ -2051,11 +2051,11 @@ SecurityCheckPropertyAccess(client, pWin, propertyName, access_mode) * executed a continue, which will skip the follwing code. */ action = SecurityAllowOperation; - if (access_mode & SecurityReadAccess) + if (access_mode & DixReadAccess) action = max(action, pacl->readAction); - if (access_mode & SecurityWriteAccess) + if (access_mode & DixWriteAccess) action = max(action, pacl->writeAction); - if (access_mode & SecurityDestroyAccess) + if (access_mode & DixDestroyAccess) action = max(action, pacl->destroyAction); break; } /* end for each pacl */ diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c index de597dead..cd29ec721 100644 --- a/nx-X11/programs/Xserver/Xext/shape.c +++ b/nx-X11/programs/Xserver/Xext/shape.c @@ -385,7 +385,7 @@ ProcPanoramiXShapeRectangles( REQUEST_AT_LEAST_SIZE (xShapeRectanglesReq); if(!(win = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->dest, XRT_WINDOW, SecurityWriteAccess))) + client, stuff->dest, XRT_WINDOW, DixWriteAccess))) return BadWindow; FOR_NSCREENS(j) { @@ -417,7 +417,7 @@ ProcShapeMask (client) REQUEST_SIZE_MATCH (xShapeMaskReq); UpdateCurrentTime(); - pWin = SecurityLookupWindow (stuff->dest, client, SecurityWriteAccess); + pWin = SecurityLookupWindow (stuff->dest, client, DixWriteAccess); if (!pWin) return BadWindow; switch (stuff->destKind) { @@ -439,7 +439,7 @@ ProcShapeMask (client) srcRgn = 0; else { pPixmap = (PixmapPtr) SecurityLookupIDByType(client, stuff->src, - RT_PIXMAP, SecurityReadAccess); + RT_PIXMAP, DixReadAccess); if (!pPixmap) return BadPixmap; if (pPixmap->drawable.pScreen != pScreen || @@ -483,12 +483,12 @@ ProcPanoramiXShapeMask( REQUEST_SIZE_MATCH (xShapeMaskReq); if(!(win = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->dest, XRT_WINDOW, SecurityWriteAccess))) + client, stuff->dest, XRT_WINDOW, DixWriteAccess))) return BadWindow; if(stuff->src != None) { if(!(pmap = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->src, XRT_PIXMAP, SecurityReadAccess))) + client, stuff->src, XRT_PIXMAP, DixReadAccess))) return BadPixmap; } else pmap = NULL; @@ -611,11 +611,11 @@ ProcPanoramiXShapeCombine( REQUEST_AT_LEAST_SIZE (xShapeCombineReq); if(!(win = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->dest, XRT_WINDOW, SecurityWriteAccess))) + client, stuff->dest, XRT_WINDOW, DixWriteAccess))) return BadWindow; if(!(win2 = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->src, XRT_WINDOW, SecurityReadAccess))) + client, stuff->src, XRT_WINDOW, DixReadAccess))) return BadWindow; FOR_NSCREENS(j) { @@ -683,7 +683,7 @@ ProcPanoramiXShapeOffset( REQUEST_AT_LEAST_SIZE (xShapeOffsetReq); if(!(win = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->dest, XRT_WINDOW, SecurityWriteAccess))) + client, stuff->dest, XRT_WINDOW, DixWriteAccess))) return BadWindow; FOR_NSCREENS(j) { @@ -817,11 +817,11 @@ ProcShapeSelectInput (client) XID clientResource; REQUEST_SIZE_MATCH (xShapeSelectInputReq); - pWin = SecurityLookupWindow (stuff->window, client, SecurityWriteAccess); + pWin = SecurityLookupWindow (stuff->window, client, DixWriteAccess); if (!pWin) return BadWindow; pHead = (ShapeEventPtr *)SecurityLookupIDByType(client, - pWin->drawable.id, EventType, SecurityWriteAccess); + pWin->drawable.id, EventType, DixWriteAccess); switch (stuff->enable) { case xTrue: if (pHead) { @@ -988,7 +988,7 @@ ProcShapeInputSelected (client) if (!pWin) return BadWindow; pHead = (ShapeEventPtr *) SecurityLookupIDByType(client, - pWin->drawable.id, EventType, SecurityReadAccess); + pWin->drawable.id, EventType, DixReadAccess); enabled = xFalse; if (pHead) { for (pShapeEvent = *pHead; diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c index dc8bbf97b..e3fa3a24e 100644 --- a/nx-X11/programs/Xserver/Xext/shm.c +++ b/nx-X11/programs/Xserver/Xext/shm.c @@ -568,11 +568,11 @@ ProcPanoramiXShmPutImage(register ClientPtr client) REQUEST_SIZE_MATCH(xShmPutImageReq); if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityReadAccess))) + client, stuff->gc, XRT_GC, DixReadAccess))) return BadGC; isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; @@ -618,7 +618,7 @@ ProcPanoramiXShmGetImage(ClientPtr client) } if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; if (draw->type == XRT_PIXMAP) diff --git a/nx-X11/programs/Xserver/Xext/sync.c b/nx-X11/programs/Xserver/Xext/sync.c index e1580b3a3..8cf6af562 100644 --- a/nx-X11/programs/Xserver/Xext/sync.c +++ b/nx-X11/programs/Xserver/Xext/sync.c @@ -425,7 +425,7 @@ SyncInitTrigger(client, pTrigger, counter, changes) if (counter == None) pCounter = NULL; else if (!(pCounter = (SyncCounter *)SecurityLookupIDByType( - client, counter, RTCounter, SecurityReadAccess))) + client, counter, RTCounter, DixReadAccess))) { client->errorValue = counter; return SyncErrorBase + XSyncBadCounter; @@ -1527,7 +1527,7 @@ ProcSyncSetCounter(client) REQUEST_SIZE_MATCH(xSyncSetCounterReq); pCounter = (SyncCounter *)SecurityLookupIDByType(client, stuff->cid, - RTCounter, SecurityWriteAccess); + RTCounter, DixWriteAccess); if (pCounter == NULL) { client->errorValue = stuff->cid; @@ -1560,7 +1560,7 @@ ProcSyncChangeCounter(client) REQUEST_SIZE_MATCH(xSyncChangeCounterReq); pCounter = (SyncCounter *) SecurityLookupIDByType(client, stuff->cid, - RTCounter, SecurityWriteAccess); + RTCounter, DixWriteAccess); if (pCounter == NULL) { client->errorValue = stuff->cid; @@ -1598,7 +1598,7 @@ ProcSyncDestroyCounter(client) REQUEST_SIZE_MATCH(xSyncDestroyCounterReq); pCounter = (SyncCounter *)SecurityLookupIDByType(client, stuff->counter, - RTCounter, SecurityDestroyAccess); + RTCounter, DixDestroyAccess); if (pCounter == NULL) { client->errorValue = stuff->counter; @@ -1744,7 +1744,7 @@ ProcSyncQueryCounter(client) REQUEST_SIZE_MATCH(xSyncQueryCounterReq); pCounter = (SyncCounter *)SecurityLookupIDByType(client, stuff->counter, - RTCounter, SecurityReadAccess); + RTCounter, DixReadAccess); if (pCounter == NULL) { client->errorValue = stuff->counter; @@ -1872,7 +1872,7 @@ ProcSyncChangeAlarm(client) REQUEST_AT_LEAST_SIZE(xSyncChangeAlarmReq); if (!(pAlarm = (SyncAlarm *)SecurityLookupIDByType(client, stuff->alarm, - RTAlarm, SecurityWriteAccess))) + RTAlarm, DixWriteAccess))) { client->errorValue = stuff->alarm; return SyncErrorBase + XSyncBadAlarm; @@ -1913,7 +1913,7 @@ ProcSyncQueryAlarm(client) REQUEST_SIZE_MATCH(xSyncQueryAlarmReq); pAlarm = (SyncAlarm *)SecurityLookupIDByType(client, stuff->alarm, - RTAlarm, SecurityReadAccess); + RTAlarm, DixReadAccess); if (!pAlarm) { client->errorValue = stuff->alarm; @@ -1972,7 +1972,7 @@ ProcSyncDestroyAlarm(client) REQUEST_SIZE_MATCH(xSyncDestroyAlarmReq); if (!((SyncAlarm *)SecurityLookupIDByType(client, stuff->alarm, - RTAlarm, SecurityDestroyAccess))) + RTAlarm, DixDestroyAccess))) { client->errorValue = stuff->alarm; return SyncErrorBase + XSyncBadAlarm; diff --git a/nx-X11/programs/Xserver/Xext/xf86bigfont.c b/nx-X11/programs/Xserver/Xext/xf86bigfont.c index 67a09f77b..6ec47c4f4 100644 --- a/nx-X11/programs/Xserver/Xext/xf86bigfont.c +++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c @@ -443,11 +443,11 @@ ProcXF86BigfontQueryFont( #endif client->errorValue = stuff->id; /* EITHER font or gc */ pFont = (FontPtr)SecurityLookupIDByType(client, stuff->id, RT_FONT, - SecurityReadAccess); + DixReadAccess); if (!pFont) { /* can't use VERIFY_GC because it might return BadGC */ GC *pGC = (GC *) SecurityLookupIDByType(client, stuff->id, RT_GC, - SecurityReadAccess); + DixReadAccess); if (!pGC) { client->errorValue = stuff->id; return BadFont; /* procotol spec says only error is BadFont */ diff --git a/nx-X11/programs/Xserver/Xext/xvdisp.c b/nx-X11/programs/Xserver/Xext/xvdisp.c index 34f4537f2..b33bfa493 100644 --- a/nx-X11/programs/Xserver/Xext/xvdisp.c +++ b/nx-X11/programs/Xserver/Xext/xvdisp.c @@ -1854,11 +1854,11 @@ XineramaXvStopVideo(ClientPtr client) REQUEST_SIZE_MATCH(xvStopVideoReq); if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; if(!(port = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->port, XvXRTPort, SecurityReadAccess))) + client, stuff->port, XvXRTPort, DixReadAccess))) return _XvBadPort; FOR_NSCREENS_BACKWARD(i) { @@ -1882,7 +1882,7 @@ XineramaXvSetPortAttribute(ClientPtr client) REQUEST_SIZE_MATCH(xvSetPortAttributeReq); if(!(port = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->port, XvXRTPort, SecurityReadAccess))) + client, stuff->port, XvXRTPort, DixReadAccess))) return _XvBadPort; FOR_NSCREENS_BACKWARD(i) { @@ -1908,15 +1908,15 @@ XineramaXvShmPutImage(ClientPtr client) REQUEST_SIZE_MATCH(xvShmPutImageReq); if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityReadAccess))) + client, stuff->gc, XRT_GC, DixReadAccess))) return BadGC; if(!(port = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->port, XvXRTPort, SecurityReadAccess))) + client, stuff->port, XvXRTPort, DixReadAccess))) return _XvBadPort; isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; @@ -1955,15 +1955,15 @@ XineramaXvPutImage(ClientPtr client) REQUEST_AT_LEAST_SIZE(xvPutImageReq); if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityReadAccess))) + client, stuff->gc, XRT_GC, DixReadAccess))) return BadGC; if(!(port = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->port, XvXRTPort, SecurityReadAccess))) + client, stuff->port, XvXRTPort, DixReadAccess))) return _XvBadPort; isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; @@ -2000,15 +2000,15 @@ XineramaXvPutVideo(ClientPtr client) REQUEST_AT_LEAST_SIZE(xvPutVideoReq); if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityReadAccess))) + client, stuff->gc, XRT_GC, DixReadAccess))) return BadGC; if(!(port = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->port, XvXRTPort, SecurityReadAccess))) + client, stuff->port, XvXRTPort, DixReadAccess))) return _XvBadPort; isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; @@ -2045,15 +2045,15 @@ XineramaXvPutStill(ClientPtr client) REQUEST_AT_LEAST_SIZE(xvPutImageReq); if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; if(!(gc = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->gc, XRT_GC, SecurityReadAccess))) + client, stuff->gc, XRT_GC, DixReadAccess))) return BadGC; if(!(port = (PanoramiXRes *)SecurityLookupIDByType( - client, stuff->port, XvXRTPort, SecurityReadAccess))) + client, stuff->port, XvXRTPort, DixReadAccess))) return _XvBadPort; isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root; diff --git a/nx-X11/programs/Xserver/composite/compwindow.c b/nx-X11/programs/Xserver/composite/compwindow.c index 799aad023..e9bb39827 100644 --- a/nx-X11/programs/Xserver/composite/compwindow.c +++ b/nx-X11/programs/Xserver/composite/compwindow.c @@ -83,7 +83,7 @@ compRepaintBorder (ClientPtr pClient, void * closure) dixLookupWindow(&pWindow, (XID) (intptr_t) closure, pClient, DixWriteAccess); #else - pWindow = SecurityLookupWindow((XID) (intptr_t) closure, pClient, SecurityWriteAccess); + pWindow = SecurityLookupWindow((XID) (intptr_t) closure, pClient, DixWriteAccess); int rc = pWindow ? Success : BadWindow; #endif diff --git a/nx-X11/programs/Xserver/damageext/damageext.c b/nx-X11/programs/Xserver/damageext/damageext.c index 38a624be7..6ade82f84 100644 --- a/nx-X11/programs/Xserver/damageext/damageext.c +++ b/nx-X11/programs/Xserver/damageext/damageext.c @@ -175,7 +175,7 @@ ProcDamageCreate (ClientPtr client) REQUEST_SIZE_MATCH(xDamageCreateReq); LEGAL_NEW_RESOURCE(stuff->damage, client); SECURITY_VERIFY_DRAWABLE (pDrawable, stuff->drawable, client, - SecurityReadAccess); + DixReadAccess); switch (stuff->level) { case XDamageReportRawRectangles: level = DamageReportRawRegion; @@ -233,7 +233,7 @@ ProcDamageDestroy (ClientPtr client) DamageExtPtr pDamageExt; REQUEST_SIZE_MATCH(xDamageDestroyReq); - VERIFY_DAMAGEEXT(pDamageExt, stuff->damage, client, SecurityWriteAccess); + VERIFY_DAMAGEEXT(pDamageExt, stuff->damage, client, DixWriteAccess); FreeResource (stuff->damage, RT_NONE); return (client->noClientException); } @@ -247,9 +247,9 @@ ProcDamageSubtract (ClientPtr client) RegionPtr pParts; REQUEST_SIZE_MATCH(xDamageSubtractReq); - VERIFY_DAMAGEEXT(pDamageExt, stuff->damage, client, SecurityWriteAccess); - VERIFY_REGION_OR_NONE(pRepair, stuff->repair, client, SecurityWriteAccess); - VERIFY_REGION_OR_NONE(pParts, stuff->parts, client, SecurityWriteAccess); + VERIFY_DAMAGEEXT(pDamageExt, stuff->damage, client, DixWriteAccess); + VERIFY_REGION_OR_NONE(pRepair, stuff->repair, client, DixWriteAccess); + VERIFY_REGION_OR_NONE(pParts, stuff->parts, client, DixWriteAccess); if (pDamageExt->level != DamageReportRawRegion) { diff --git a/nx-X11/programs/Xserver/dbe/dbe.c b/nx-X11/programs/Xserver/dbe/dbe.c index d0487ba63..95740871a 100644 --- a/nx-X11/programs/Xserver/dbe/dbe.c +++ b/nx-X11/programs/Xserver/dbe/dbe.c @@ -420,7 +420,7 @@ ProcDbeAllocateBackBufferName(client) /* The window must be valid. */ if (!(pWin = SecurityLookupWindow(stuff->window, client, - SecurityWriteAccess))) + DixWriteAccess))) { return(BadWindow); } @@ -648,9 +648,9 @@ ProcDbeDeallocateBackBufferName(client) /* Buffer name must be valid */ if (!(pDbeWindowPriv = (DbeWindowPrivPtr)SecurityLookupIDByType(client, - stuff->buffer, dbeWindowPrivResType, SecurityDestroyAccess)) || + stuff->buffer, dbeWindowPrivResType, DixDestroyAccess)) || !(SecurityLookupIDByType(client, stuff->buffer, dbeDrawableResType, - SecurityDestroyAccess))) + DixDestroyAccess))) { client->errorValue = stuff->buffer; return(dbeErrorBase + DbeBadBuffer); @@ -751,7 +751,7 @@ ProcDbeSwapBuffers(client) /* Each window must be a valid window - BadWindow. */ if (!(pWin = SecurityLookupWindow(dbeSwapInfo[i].window, client, - SecurityWriteAccess))) + DixWriteAccess))) { free(swapInfo); return(BadWindow); @@ -916,7 +916,7 @@ ProcDbeGetVisualInfo(client) for (i = 0; i < stuff->n; i++) { if (!(pDrawables[i] = (DrawablePtr)SecurityLookupDrawable( - drawables[i], client, SecurityReadAccess))) + drawables[i], client, DixReadAccess))) { free(pDrawables); return(BadDrawable); @@ -1072,7 +1072,7 @@ ProcDbeGetBackBufferAttributes(client) REQUEST_SIZE_MATCH(xDbeGetBackBufferAttributesReq); if (!(pDbeWindowPriv = (DbeWindowPrivPtr)SecurityLookupIDByType(client, - stuff->buffer, dbeWindowPrivResType, SecurityReadAccess))) + stuff->buffer, dbeWindowPrivResType, DixReadAccess))) { rep.attributes = None; } diff --git a/nx-X11/programs/Xserver/dix/colormap.c b/nx-X11/programs/Xserver/dix/colormap.c index b8361a9cf..8b0e1e421 100644 --- a/nx-X11/programs/Xserver/dix/colormap.c +++ b/nx-X11/programs/Xserver/dix/colormap.c @@ -892,7 +892,7 @@ AllocColor (ColormapPtr pmap, { ColormapPtr prootmap = (ColormapPtr) SecurityLookupIDByType (clients[client], pmap->pScreen->defColormap, - RT_COLORMAP, SecurityReadAccess); + RT_COLORMAP, DixReadAccess); if (pmap->class == prootmap->class) FindColorInRootCmap (prootmap, prootmap->red, entries, &rgb, @@ -909,7 +909,7 @@ AllocColor (ColormapPtr pmap, { ColormapPtr prootmap = (ColormapPtr) SecurityLookupIDByType (clients[client], pmap->pScreen->defColormap, - RT_COLORMAP, SecurityReadAccess); + RT_COLORMAP, DixReadAccess); if (pmap->class == prootmap->class) { diff --git a/nx-X11/programs/Xserver/dix/cursor.c b/nx-X11/programs/Xserver/dix/cursor.c index 093464298..a1bf6a7ed 100644 --- a/nx-X11/programs/Xserver/dix/cursor.c +++ b/nx-X11/programs/Xserver/dix/cursor.c @@ -262,9 +262,9 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar, GlyphSharePtr pShare; sourcefont = (FontPtr) SecurityLookupIDByType(client, source, RT_FONT, - SecurityReadAccess); + DixReadAccess); maskfont = (FontPtr) SecurityLookupIDByType(client, mask, RT_FONT, - SecurityReadAccess); + DixReadAccess); if (!sourcefont) { diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c index 2c7550371..02d5170fb 100644 --- a/nx-X11/programs/Xserver/dix/dispatch.c +++ b/nx-X11/programs/Xserver/dix/dispatch.c @@ -491,7 +491,7 @@ ProcCreateWindow(ClientPtr client) LEGAL_NEW_RESOURCE(stuff->wid, client); if (!(pParent = (WindowPtr)SecurityLookupWindow(stuff->parent, client, - SecurityWriteAccess))) + DixWriteAccess))) return BadWindow; len = client->req_len - (sizeof(xCreateWindowReq) >> 2); if (Ones(stuff->mask) != len) @@ -532,7 +532,7 @@ ProcChangeWindowAttributes(register ClientPtr client) REQUEST_AT_LEAST_SIZE(xChangeWindowAttributesReq); pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client, - SecurityWriteAccess); + DixWriteAccess); if (!pWin) return(BadWindow); len = client->req_len - (sizeof(xChangeWindowAttributesReq) >> 2); @@ -557,7 +557,7 @@ ProcGetWindowAttributes(register ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); pWin = (WindowPtr)SecurityLookupWindow(stuff->id, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return(BadWindow); memset(&wa, 0, sizeof(xGetWindowAttributesReply)); @@ -574,7 +574,7 @@ ProcDestroyWindow(register ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); pWin = (WindowPtr)SecurityLookupWindow(stuff->id, client, - SecurityDestroyAccess); + DixDestroyAccess); if (!pWin) return(BadWindow); if (pWin->parent) @@ -590,7 +590,7 @@ ProcDestroySubwindows(register ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); pWin = (WindowPtr)SecurityLookupWindow(stuff->id, client, - SecurityDestroyAccess); + DixDestroyAccess); if (!pWin) return(BadWindow); DestroySubwindows(pWin, client); @@ -606,7 +606,7 @@ ProcChangeSaveSet(register ClientPtr client) REQUEST_SIZE_MATCH(xChangeSaveSetReq); pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return(BadWindow); if (client->clientAsMask == (CLIENT_BITS(pWin->drawable.id))) @@ -636,11 +636,11 @@ ProcReparentWindow(register ClientPtr client) REQUEST_SIZE_MATCH(xReparentWindowReq); pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client, - SecurityWriteAccess); + DixWriteAccess); if (!pWin) return(BadWindow); pParent = (WindowPtr)SecurityLookupWindow(stuff->parent, client, - SecurityWriteAccess); + DixWriteAccess); if (!pParent) return(BadWindow); if (SAME_SCREENS(pWin->drawable, pParent->drawable)) @@ -671,7 +671,7 @@ ProcMapWindow(register ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); pWin = (WindowPtr)SecurityLookupWindow(stuff->id, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return(BadWindow); MapWindow(pWin, client); @@ -687,7 +687,7 @@ ProcMapSubwindows(register ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); pWin = (WindowPtr)SecurityLookupWindow( stuff->id, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return(BadWindow); MapSubwindows(pWin, client); @@ -703,7 +703,7 @@ ProcUnmapWindow(register ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); pWin = (WindowPtr)SecurityLookupWindow( stuff->id, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return(BadWindow); UnmapWindow(pWin, FALSE); @@ -719,7 +719,7 @@ ProcUnmapSubwindows(register ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); pWin = (WindowPtr)SecurityLookupWindow( stuff->id, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return(BadWindow); UnmapSubwindows(pWin); @@ -736,7 +736,7 @@ ProcConfigureWindow(register ClientPtr client) REQUEST_AT_LEAST_SIZE(xConfigureWindowReq); pWin = (WindowPtr)SecurityLookupWindow( stuff->window, client, - SecurityWriteAccess); + DixWriteAccess); if (!pWin) return(BadWindow); len = client->req_len - (sizeof(xConfigureWindowReq) >> 2); @@ -764,7 +764,7 @@ ProcCirculateWindow(register ClientPtr client) return BadValue; } pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client, - SecurityWriteAccess); + DixWriteAccess); if (!pWin) return(BadWindow); CirculateWindow(pWin, (int)stuff->direction, client); @@ -778,7 +778,7 @@ GetGeometry(register ClientPtr client, xGetGeometryReply *rep) REQUEST(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq); - SECURITY_VERIFY_GEOMETRABLE (pDraw, stuff->id, client, SecurityReadAccess); + SECURITY_VERIFY_GEOMETRABLE (pDraw, stuff->id, client, DixReadAccess); memset(rep, 0, sizeof(xGetGeometryReply)); rep->type = X_Reply; rep->length = 0; @@ -839,7 +839,7 @@ ProcQueryTree(register ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); pWin = (WindowPtr)SecurityLookupWindow(stuff->id, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return(BadWindow); memset(&reply, 0, sizeof(xQueryTreeReply)); @@ -957,7 +957,7 @@ ProcSetSelectionOwner(register ClientPtr client) if (stuff->window != None) { pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return(BadWindow); } @@ -1079,7 +1079,7 @@ ProcConvertSelection(register ClientPtr client) REQUEST_SIZE_MATCH(xConvertSelectionReq); pWin = (WindowPtr)SecurityLookupWindow(stuff->requestor, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return(BadWindow); @@ -1098,7 +1098,7 @@ ProcConvertSelection(register ClientPtr client) #ifdef XCSECURITY && (!client->CheckAccess || (* client->CheckAccess)(client, CurrentSelections[i].window, - RT_WINDOW, SecurityReadAccess, + RT_WINDOW, DixReadAccess, CurrentSelections[i].pWin)) #endif ) @@ -1208,11 +1208,11 @@ ProcTranslateCoords(register ClientPtr client) REQUEST_SIZE_MATCH(xTranslateCoordsReq); pWin = (WindowPtr)SecurityLookupWindow(stuff->srcWid, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return(BadWindow); pDst = (WindowPtr)SecurityLookupWindow(stuff->dstWid, client, - SecurityReadAccess); + DixReadAccess); if (!pDst) return(BadWindow); memset(&rep, 0, sizeof(xTranslateCoordsReply)); @@ -1305,7 +1305,7 @@ ProcCloseFont(register ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); pFont = (FontPtr)SecurityLookupIDByType(client, stuff->id, RT_FONT, - SecurityDestroyAccess); + DixDestroyAccess); if ( pFont != (FontPtr)NULL) /* id was valid */ { FreeResource(stuff->id, RT_NONE); @@ -1331,12 +1331,12 @@ ProcQueryFont(register ClientPtr client) client->errorValue = stuff->id; /* EITHER font or gc */ pFont = (FontPtr)SecurityLookupIDByType(client, stuff->id, RT_FONT, - SecurityReadAccess); + DixReadAccess); if (!pFont) { /* can't use VERIFY_GC because it might return BadGC */ pGC = (GC *) SecurityLookupIDByType(client, stuff->id, RT_GC, - SecurityReadAccess); + DixReadAccess); if (!pGC) { client->errorValue = stuff->id; @@ -1394,11 +1394,11 @@ ProcQueryTextExtents(register ClientPtr client) REQUEST_AT_LEAST_SIZE(xQueryTextExtentsReq); pFont = (FontPtr)SecurityLookupIDByType(client, stuff->fid, RT_FONT, - SecurityReadAccess); + DixReadAccess); if (!pFont) { pGC = (GC *)SecurityLookupIDByType(client, stuff->fid, RT_GC, - SecurityReadAccess); + DixReadAccess); if (!pGC) { client->errorValue = stuff->fid; @@ -1479,7 +1479,7 @@ ProcCreatePixmap(register ClientPtr client) client->errorValue = stuff->pid; LEGAL_NEW_RESOURCE(stuff->pid, client); SECURITY_VERIFY_GEOMETRABLE (pDraw, stuff->drawable, client, - SecurityReadAccess); + DixReadAccess); if (!stuff->width || !stuff->height) { client->errorValue = 0; @@ -1535,7 +1535,7 @@ ProcFreePixmap(register ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); pMap = (PixmapPtr)SecurityLookupIDByType(client, stuff->id, RT_PIXMAP, - SecurityDestroyAccess); + DixDestroyAccess); if (pMap) { FreeResource(stuff->id, RT_NONE); @@ -1562,7 +1562,7 @@ ProcCreateGC(register ClientPtr client) client->errorValue = stuff->gc; LEGAL_NEW_RESOURCE(stuff->gc, client); SECURITY_VERIFY_DRAWABLE (pDraw, stuff->drawable, client, - SecurityReadAccess); + DixReadAccess); len = client->req_len - (sizeof(xCreateGCReq) >> 2); if (len != Ones(stuff->mask)) return BadLength; @@ -1584,7 +1584,7 @@ ProcChangeGC(register ClientPtr client) unsigned len; REQUEST_AT_LEAST_SIZE(xChangeGCReq); - SECURITY_VERIFY_GC(pGC, stuff->gc, client, SecurityWriteAccess); + SECURITY_VERIFY_GC(pGC, stuff->gc, client, DixWriteAccess); len = client->req_len - (sizeof(xChangeGCReq) >> 2); if (len != Ones(stuff->mask)) return BadLength; @@ -1608,8 +1608,8 @@ ProcCopyGC(register ClientPtr client) REQUEST(xCopyGCReq); REQUEST_SIZE_MATCH(xCopyGCReq); - SECURITY_VERIFY_GC( pGC, stuff->srcGC, client, SecurityReadAccess); - SECURITY_VERIFY_GC( dstGC, stuff->dstGC, client, SecurityWriteAccess); + SECURITY_VERIFY_GC( pGC, stuff->srcGC, client, DixReadAccess); + SECURITY_VERIFY_GC( dstGC, stuff->dstGC, client, DixWriteAccess); if ((dstGC->pScreen != pGC->pScreen) || (dstGC->depth != pGC->depth)) return (BadMatch); result = CopyGC(pGC, dstGC, stuff->mask); @@ -1636,7 +1636,7 @@ ProcSetDashes(register ClientPtr client) return BadValue; } - SECURITY_VERIFY_GC(pGC,stuff->gc, client, SecurityWriteAccess); + SECURITY_VERIFY_GC(pGC,stuff->gc, client, DixWriteAccess); result = SetDashes(pGC, stuff->dashOffset, stuff->nDashes, (unsigned char *)&stuff[1]); @@ -1664,7 +1664,7 @@ ProcSetClipRectangles(register ClientPtr client) client->errorValue = stuff->ordering; return BadValue; } - SECURITY_VERIFY_GC(pGC,stuff->gc, client, SecurityWriteAccess); + SECURITY_VERIFY_GC(pGC,stuff->gc, client, DixWriteAccess); nr = (client->req_len << 2) - sizeof(xSetClipRectanglesReq); if (nr & 4) @@ -1685,7 +1685,7 @@ ProcFreeGC(register ClientPtr client) REQUEST(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq); - SECURITY_VERIFY_GC(pGC, stuff->id, client, SecurityDestroyAccess); + SECURITY_VERIFY_GC(pGC, stuff->id, client, DixDestroyAccess); FreeResource(stuff->id, RT_NONE); return(client->noClientException); } @@ -1698,7 +1698,7 @@ ProcClearToBackground(register ClientPtr client) REQUEST_SIZE_MATCH(xClearAreaReq); pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client, - SecurityWriteAccess); + DixWriteAccess); if (!pWin) return(BadWindow); if (pWin->drawable.class == InputOnly) @@ -1732,7 +1732,7 @@ ProcCopyArea(register ClientPtr client) if (stuff->dstDrawable != stuff->srcDrawable) { SECURITY_VERIFY_DRAWABLE(pSrc, stuff->srcDrawable, client, - SecurityReadAccess); + DixReadAccess); if ((pDst->pScreen != pSrc->pScreen) || (pDst->depth != pSrc->depth)) { client->errorValue = stuff->dstDrawable; @@ -1772,7 +1772,7 @@ ProcCopyPlane(register ClientPtr client) if (stuff->dstDrawable != stuff->srcDrawable) { SECURITY_VERIFY_DRAWABLE(psrcDraw, stuff->srcDrawable, client, - SecurityReadAccess); + DixReadAccess); if (pdstDraw->pScreen != psrcDraw->pScreen) { client->errorValue = stuff->dstDrawable; @@ -2115,7 +2115,7 @@ DoGetImage(register ClientPtr client, int format, Drawable drawable, client->errorValue = format; return(BadValue); } - SECURITY_VERIFY_DRAWABLE(pDraw, drawable, client, SecurityReadAccess); + SECURITY_VERIFY_DRAWABLE(pDraw, drawable, client, DixReadAccess); memset(&xgi, 0, sizeof(xGetImageReply)); if(pDraw->type == DRAWABLE_WINDOW) @@ -2447,7 +2447,7 @@ ProcCreateColormap(register ClientPtr client) mid = stuff->mid; LEGAL_NEW_RESOURCE(mid, client); pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return(BadWindow); @@ -2477,7 +2477,7 @@ ProcFreeColormap(register ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); pmap = (ColormapPtr )SecurityLookupIDByType(client, stuff->id, RT_COLORMAP, - SecurityDestroyAccess); + DixDestroyAccess); if (pmap) { /* Freeing a default colormap is a no-op */ @@ -2505,7 +2505,7 @@ ProcCopyColormapAndFree(register ClientPtr client) mid = stuff->mid; LEGAL_NEW_RESOURCE(mid, client); if( (pSrcMap = (ColormapPtr )SecurityLookupIDByType(client, stuff->srcCmap, - RT_COLORMAP, SecurityReadAccess|SecurityWriteAccess)) ) + RT_COLORMAP, DixReadAccess|DixWriteAccess)) ) { result = CopyColormapAndFree(mid, pSrcMap, client->index); if (client->noClientException != Success) @@ -2528,7 +2528,7 @@ ProcInstallColormap(register ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); pcmp = (ColormapPtr)SecurityLookupIDByType(client, stuff->id, - RT_COLORMAP, SecurityReadAccess); + RT_COLORMAP, DixReadAccess); if (pcmp) { (*(pcmp->pScreen->InstallColormap)) (pcmp); @@ -2549,7 +2549,7 @@ ProcUninstallColormap(register ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); pcmp = (ColormapPtr)SecurityLookupIDByType(client, stuff->id, - RT_COLORMAP, SecurityReadAccess); + RT_COLORMAP, DixReadAccess); if (pcmp) { if(pcmp->mid != pcmp->pScreen->defColormap) @@ -2573,7 +2573,7 @@ ProcListInstalledColormaps(register ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); pWin = (WindowPtr)SecurityLookupWindow(stuff->id, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return(BadWindow); @@ -2608,7 +2608,7 @@ ProcAllocColor (register ClientPtr client) REQUEST_SIZE_MATCH(xAllocColorReq); pmap = (ColormapPtr)SecurityLookupIDByType(client, stuff->cmap, - RT_COLORMAP, SecurityWriteAccess); + RT_COLORMAP, DixWriteAccess); if (pmap) { acr.type = X_Reply; @@ -2648,7 +2648,7 @@ ProcAllocNamedColor (register ClientPtr client) REQUEST_FIXED_SIZE(xAllocNamedColorReq, stuff->nbytes); pcmp = (ColormapPtr)SecurityLookupIDByType(client, stuff->cmap, - RT_COLORMAP, SecurityWriteAccess); + RT_COLORMAP, DixWriteAccess); if (pcmp) { int retval; @@ -2700,7 +2700,7 @@ ProcAllocColorCells (register ClientPtr client) REQUEST_SIZE_MATCH(xAllocColorCellsReq); pcmp = (ColormapPtr)SecurityLookupIDByType(client, stuff->cmap, - RT_COLORMAP, SecurityWriteAccess); + RT_COLORMAP, DixWriteAccess); if (pcmp) { xAllocColorCellsReply accr; @@ -2766,7 +2766,7 @@ ProcAllocColorPlanes(register ClientPtr client) REQUEST_SIZE_MATCH(xAllocColorPlanesReq); pcmp = (ColormapPtr)SecurityLookupIDByType(client, stuff->cmap, - RT_COLORMAP, SecurityWriteAccess); + RT_COLORMAP, DixWriteAccess); if (pcmp) { xAllocColorPlanesReply acpr; @@ -2830,7 +2830,7 @@ ProcFreeColors(register ClientPtr client) REQUEST_AT_LEAST_SIZE(xFreeColorsReq); pcmp = (ColormapPtr)SecurityLookupIDByType(client, stuff->cmap, - RT_COLORMAP, SecurityWriteAccess); + RT_COLORMAP, DixWriteAccess); if (pcmp) { int count; @@ -2865,7 +2865,7 @@ ProcStoreColors (ClientPtr client) REQUEST_AT_LEAST_SIZE(xStoreColorsReq); pcmp = (ColormapPtr)SecurityLookupIDByType(client, stuff->cmap, - RT_COLORMAP, SecurityWriteAccess); + RT_COLORMAP, DixWriteAccess); if (pcmp) { int count; @@ -2899,7 +2899,7 @@ ProcStoreNamedColor (register ClientPtr client) REQUEST_FIXED_SIZE(xStoreNamedColorReq, stuff->nbytes); pcmp = (ColormapPtr)SecurityLookupIDByType(client, stuff->cmap, - RT_COLORMAP, SecurityWriteAccess); + RT_COLORMAP, DixWriteAccess); if (pcmp) { xColorItem def; @@ -2933,7 +2933,7 @@ ProcQueryColors(register ClientPtr client) REQUEST_AT_LEAST_SIZE(xQueryColorsReq); pcmp = (ColormapPtr)SecurityLookupIDByType(client, stuff->cmap, - RT_COLORMAP, SecurityReadAccess); + RT_COLORMAP, DixReadAccess); if (pcmp) { int count, retval; @@ -2987,7 +2987,7 @@ ProcLookupColor(register ClientPtr client) REQUEST_FIXED_SIZE(xLookupColorReq, stuff->nbytes); pcmp = (ColormapPtr)SecurityLookupIDByType(client, stuff->cmap, - RT_COLORMAP, SecurityReadAccess); + RT_COLORMAP, DixReadAccess); if (pcmp) { xLookupColorReply lcr; @@ -3037,9 +3037,9 @@ ProcCreateCursor (register ClientPtr client) LEGAL_NEW_RESOURCE(stuff->cid, client); src = (PixmapPtr)SecurityLookupIDByType(client, stuff->source, - RT_PIXMAP, SecurityReadAccess); + RT_PIXMAP, DixReadAccess); msk = (PixmapPtr)SecurityLookupIDByType(client, stuff->mask, - RT_PIXMAP, SecurityReadAccess); + RT_PIXMAP, DixReadAccess); if ( src == (PixmapPtr)NULL) { client->errorValue = stuff->source; @@ -3139,7 +3139,7 @@ ProcFreeCursor (register ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); pCursor = (CursorPtr)SecurityLookupIDByType(client, stuff->id, - RT_CURSOR, SecurityDestroyAccess); + RT_CURSOR, DixDestroyAccess); if (pCursor) { FreeResource(stuff->id, RT_NONE); @@ -3169,7 +3169,7 @@ ProcQueryBestSize (register ClientPtr client) return(BadValue); } SECURITY_VERIFY_GEOMETRABLE (pDraw, stuff->drawable, client, - SecurityReadAccess); + DixReadAccess); if (stuff->class != CursorShape && pDraw->type == UNDRAWABLE_WINDOW) return (BadMatch); pScreen = pDraw->pScreen; diff --git a/nx-X11/programs/Xserver/dix/dixfonts.c b/nx-X11/programs/Xserver/dix/dixfonts.c index aa90b8769..f7d047c2d 100644 --- a/nx-X11/programs/Xserver/dix/dixfonts.c +++ b/nx-X11/programs/Xserver/dix/dixfonts.c @@ -1197,7 +1197,7 @@ doPolyText(ClientPtr client, register PTclosurePtr c) if (c->slept && c->pDraw && c->pDraw != (DrawablePtr)SecurityLookupIDByClass(client, c->did, - RC_DRAWABLE, SecurityWriteAccess)) + RC_DRAWABLE, DixWriteAccess)) { /* Our drawable has disappeared. Treat like client died... ask the FPE code to clean up after client and avoid further @@ -1227,7 +1227,7 @@ doPolyText(ClientPtr client, register PTclosurePtr c) | ((Font)*(c->pElt+2)) << 16 | ((Font)*(c->pElt+1)) << 24; pFont = (FontPtr)SecurityLookupIDByType(client, fid, RT_FONT, - SecurityReadAccess); + DixReadAccess); if (!pFont) { client->errorValue = fid; @@ -1489,7 +1489,7 @@ doImageText(ClientPtr client, register ITclosurePtr c) if (c->slept && c->pDraw && c->pDraw != (DrawablePtr)SecurityLookupIDByClass(client, c->did, - RC_DRAWABLE, SecurityWriteAccess)) + RC_DRAWABLE, DixWriteAccess)) { /* Our drawable has disappeared. Treat like client died... ask the FPE code to clean up after client. */ @@ -2044,7 +2044,7 @@ FontPtr find_old_font(XID id) { return (FontPtr) SecurityLookupIDByType(NullClient, id, RT_NONE, - SecurityUnknownAccess); + DixUnknownAccess); } Font diff --git a/nx-X11/programs/Xserver/dix/dixutils.c b/nx-X11/programs/Xserver/dix/dixutils.c index bd7439d89..bf925f748 100644 --- a/nx-X11/programs/Xserver/dix/dixutils.c +++ b/nx-X11/programs/Xserver/dix/dixutils.c @@ -260,13 +260,13 @@ SecurityLookupDrawable(XID rid, ClientPtr client, Mask access_mode) WindowPtr LookupWindow(XID rid, ClientPtr client) { - return SecurityLookupWindow(rid, client, SecurityUnknownAccess); + return SecurityLookupWindow(rid, client, DixUnknownAccess); } void * LookupDrawable(XID rid, ClientPtr client) { - return SecurityLookupDrawable(rid, client, SecurityUnknownAccess); + return SecurityLookupDrawable(rid, client, DixUnknownAccess); } #else /* not XCSECURITY */ @@ -317,7 +317,7 @@ ClientPtr LookupClient(XID rid, ClientPtr client) { void * pRes = (void *)SecurityLookupIDByClass(client, rid, RC_ANY, - SecurityReadAccess); + DixReadAccess); int clientIndex = CLIENT_ID(rid); if (clientIndex && pRes && clients[clientIndex] && !(rid & SERVER_BIT)) diff --git a/nx-X11/programs/Xserver/dix/events.c b/nx-X11/programs/Xserver/dix/events.c index fa8bfc92d..fde3e91dd 100644 --- a/nx-X11/programs/Xserver/dix/events.c +++ b/nx-X11/programs/Xserver/dix/events.c @@ -2201,7 +2201,7 @@ XineramaWarpPointer(ClientPtr client) if (stuff->dstWid != None) { - dest = SecurityLookupWindow(stuff->dstWid, client, SecurityReadAccess); + dest = SecurityLookupWindow(stuff->dstWid, client, DixReadAccess); if (!dest) return BadWindow; } @@ -2214,7 +2214,7 @@ XineramaWarpPointer(ClientPtr client) XID winID = stuff->srcWid; WindowPtr source; - source = SecurityLookupWindow(winID, client, SecurityReadAccess); + source = SecurityLookupWindow(winID, client, DixReadAccess); if (!source) return BadWindow; winX = source->drawable.x; @@ -2281,7 +2281,7 @@ ProcWarpPointer(ClientPtr client) if (stuff->dstWid != None) { - dest = SecurityLookupWindow(stuff->dstWid, client, SecurityReadAccess); + dest = SecurityLookupWindow(stuff->dstWid, client, DixReadAccess); if (!dest) return BadWindow; } @@ -2294,7 +2294,7 @@ ProcWarpPointer(ClientPtr client) XID winID = stuff->srcWid; WindowPtr source; - source = SecurityLookupWindow(winID, client, SecurityReadAccess); + source = SecurityLookupWindow(winID, client, DixReadAccess); if (!source) return BadWindow; winX = source->drawable.x; @@ -3469,7 +3469,7 @@ SetInputFocus( else if ((focusID == FollowKeyboard) && followOK) focusWin = inputInfo.keyboard->focus->win; else if (!(focusWin = SecurityLookupWindow(focusID, client, - SecurityReadAccess))) + DixReadAccess))) return BadWindow; else { @@ -3590,7 +3590,7 @@ ProcGrabPointer(ClientPtr client) client->errorValue = stuff->eventMask; return BadValue; } - pWin = SecurityLookupWindow(stuff->grabWindow, client, SecurityReadAccess); + pWin = SecurityLookupWindow(stuff->grabWindow, client, DixReadAccess); if (!pWin) return BadWindow; if (stuff->confineTo == None) @@ -3598,7 +3598,7 @@ ProcGrabPointer(ClientPtr client) else { confineTo = SecurityLookupWindow(stuff->confineTo, client, - SecurityReadAccess); + DixReadAccess); if (!confineTo) return BadWindow; } @@ -3607,7 +3607,7 @@ ProcGrabPointer(ClientPtr client) else { cursor = (CursorPtr)SecurityLookupIDByType(client, stuff->cursor, - RT_CURSOR, SecurityReadAccess); + RT_CURSOR, DixReadAccess); if (!cursor) { client->errorValue = stuff->cursor; @@ -3682,7 +3682,7 @@ ProcChangeActivePointerGrab(ClientPtr client) else { newCursor = (CursorPtr)SecurityLookupIDByType(client, stuff->cursor, - RT_CURSOR, SecurityReadAccess); + RT_CURSOR, DixReadAccess); if (!newCursor) { client->errorValue = stuff->cursor; @@ -3752,7 +3752,7 @@ GrabDevice(register ClientPtr client, register DeviceIntPtr dev, client->errorValue = ownerEvents; return BadValue; } - pWin = SecurityLookupWindow(grabWindow, client, SecurityReadAccess); + pWin = SecurityLookupWindow(grabWindow, client, DixReadAccess); if (!pWin) return BadWindow; time = ClientTimeToServerTime(ctime); @@ -3842,7 +3842,7 @@ ProcQueryPointer(ClientPtr client) DeviceIntPtr mouse = inputInfo.pointer; REQUEST_SIZE_MATCH(xResourceReq); - pWin = SecurityLookupWindow(stuff->id, client, SecurityReadAccess); + pWin = SecurityLookupWindow(stuff->id, client, DixReadAccess); if (!pWin) return BadWindow; if (mouse->valuator->motionHintWindow) @@ -4009,7 +4009,7 @@ ProcSendEvent(ClientPtr client) } else pWin = SecurityLookupWindow(stuff->destination, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return BadWindow; if ((stuff->propagate != xFalse) && (stuff->propagate != xTrue)) @@ -4048,7 +4048,7 @@ ProcUngrabKey(ClientPtr client) DeviceIntPtr keybd = inputInfo.keyboard; REQUEST_SIZE_MATCH(xUngrabKeyReq); - pWin = SecurityLookupWindow(stuff->grabWindow, client, SecurityReadAccess); + pWin = SecurityLookupWindow(stuff->grabWindow, client, DixReadAccess); if (!pWin) return BadWindow; @@ -4119,7 +4119,7 @@ ProcGrabKey(ClientPtr client) client->errorValue = stuff->modifiers; return BadValue; } - pWin = SecurityLookupWindow(stuff->grabWindow, client, SecurityReadAccess); + pWin = SecurityLookupWindow(stuff->grabWindow, client, DixReadAccess); if (!pWin) return BadWindow; @@ -4171,14 +4171,14 @@ ProcGrabButton(ClientPtr client) client->errorValue = stuff->eventMask; return BadValue; } - pWin = SecurityLookupWindow(stuff->grabWindow, client, SecurityReadAccess); + pWin = SecurityLookupWindow(stuff->grabWindow, client, DixReadAccess); if (!pWin) return BadWindow; if (stuff->confineTo == None) confineTo = NullWindow; else { confineTo = SecurityLookupWindow(stuff->confineTo, client, - SecurityReadAccess); + DixReadAccess); if (!confineTo) return BadWindow; } @@ -4187,7 +4187,7 @@ ProcGrabButton(ClientPtr client) else { cursor = (CursorPtr)SecurityLookupIDByType(client, stuff->cursor, - RT_CURSOR, SecurityReadAccess); + RT_CURSOR, DixReadAccess); if (!cursor) { client->errorValue = stuff->cursor; @@ -4222,7 +4222,7 @@ ProcUngrabButton(ClientPtr client) client->errorValue = stuff->modifiers; return BadValue; } - pWin = SecurityLookupWindow(stuff->grabWindow, client, SecurityReadAccess); + pWin = SecurityLookupWindow(stuff->grabWindow, client, DixReadAccess); if (!pWin) return BadWindow; tempGrab.resource = client->clientAsMask; @@ -4376,7 +4376,7 @@ ProcRecolorCursor(ClientPtr client) REQUEST_SIZE_MATCH(xRecolorCursorReq); pCursor = (CursorPtr)SecurityLookupIDByType(client, stuff->cursor, - RT_CURSOR, SecurityWriteAccess); + RT_CURSOR, DixWriteAccess); if ( !pCursor) { client->errorValue = stuff->cursor; diff --git a/nx-X11/programs/Xserver/dix/gc.c b/nx-X11/programs/Xserver/dix/gc.c index 29f14de43..b3a4edf4d 100644 --- a/nx-X11/programs/Xserver/dix/gc.c +++ b/nx-X11/programs/Xserver/dix/gc.c @@ -271,7 +271,7 @@ dixChangeGC(ClientPtr client, register GC *pGC, register BITS32 mask, CARD32 *pC { NEXTVAL(XID, newpix); pPixmap = (PixmapPtr)SecurityLookupIDByType(client, - newpix, RT_PIXMAP, SecurityReadAccess); + newpix, RT_PIXMAP, DixReadAccess); } if (pPixmap) { @@ -307,7 +307,7 @@ dixChangeGC(ClientPtr client, register GC *pGC, register BITS32 mask, CARD32 *pC { NEXTVAL(XID, newstipple) pPixmap = (PixmapPtr)SecurityLookupIDByType(client, - newstipple, RT_PIXMAP, SecurityReadAccess); + newstipple, RT_PIXMAP, DixReadAccess); } if (pPixmap) { @@ -349,7 +349,7 @@ dixChangeGC(ClientPtr client, register GC *pGC, register BITS32 mask, CARD32 *pC { NEXTVAL(XID, newfont) pFont = (FontPtr)SecurityLookupIDByType(client, newfont, - RT_FONT, SecurityReadAccess); + RT_FONT, DixReadAccess); } if (pFont) { @@ -416,7 +416,7 @@ dixChangeGC(ClientPtr client, register GC *pGC, register BITS32 mask, CARD32 *pC } else pPixmap = (PixmapPtr)SecurityLookupIDByType(client, - pid, RT_PIXMAP, SecurityReadAccess); + pid, RT_PIXMAP, DixReadAccess); } if (pPixmap) diff --git a/nx-X11/programs/Xserver/dix/property.c b/nx-X11/programs/Xserver/dix/property.c index 2e5569367..f5713cf5e 100644 --- a/nx-X11/programs/Xserver/dix/property.c +++ b/nx-X11/programs/Xserver/dix/property.c @@ -106,7 +106,7 @@ ProcRotateProperties(ClientPtr client) REQUEST_FIXED_SIZE(xRotatePropertiesReq, stuff->nAtoms << 2); UpdateCurrentTime(); pWin = (WindowPtr) SecurityLookupWindow(stuff->window, client, - SecurityWriteAccess); + DixWriteAccess); if (!pWin) return(BadWindow); if (!stuff->nAtoms) @@ -119,7 +119,7 @@ ProcRotateProperties(ClientPtr client) { #ifdef XCSECURITY char action = SecurityCheckPropertyAccess(client, pWin, atoms[i], - SecurityReadAccess|SecurityWriteAccess); + DixReadAccess|DixWriteAccess); #endif if (!ValidAtom(atoms[i]) #ifdef XCSECURITY @@ -219,7 +219,7 @@ ProcChangeProperty(ClientPtr client) REQUEST_FIXED_SIZE(xChangePropertyReq, totalSize); pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client, - SecurityWriteAccess); + DixWriteAccess); if (!pWin) return(BadWindow); if (!ValidAtom(stuff->property)) @@ -235,7 +235,7 @@ ProcChangeProperty(ClientPtr client) #ifdef XCSECURITY switch (SecurityCheckPropertyAccess(client, pWin, stuff->property, - SecurityWriteAccess)) + DixWriteAccess)) { case SecurityErrorOperation: client->errorValue = stuff->property; @@ -469,7 +469,7 @@ ProcGetProperty(ClientPtr client) if (stuff->delete) UpdateCurrentTime(); pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return BadWindow; @@ -507,10 +507,10 @@ ProcGetProperty(ClientPtr client) #ifdef XCSECURITY { - Mask access_mode = SecurityReadAccess; + Mask access_mode = DixReadAccess; if (stuff->delete) - access_mode |= SecurityDestroyAccess; + access_mode |= DixDestroyAccess; switch(SecurityCheckPropertyAccess(client, pWin, stuff->property, access_mode)) { @@ -614,7 +614,7 @@ ProcListProperties(ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); pWin = (WindowPtr)SecurityLookupWindow(stuff->id, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return(BadWindow); @@ -659,7 +659,7 @@ ProcDeleteProperty(register ClientPtr client) REQUEST_SIZE_MATCH(xDeletePropertyReq); UpdateCurrentTime(); pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client, - SecurityWriteAccess); + DixWriteAccess); if (!pWin) return(BadWindow); if (!ValidAtom(stuff->property)) @@ -670,7 +670,7 @@ ProcDeleteProperty(register ClientPtr client) #ifdef XCSECURITY switch(SecurityCheckPropertyAccess(client, pWin, stuff->property, - SecurityDestroyAccess)) + DixDestroyAccess)) { case SecurityErrorOperation: client->errorValue = stuff->property; diff --git a/nx-X11/programs/Xserver/dix/resource.c b/nx-X11/programs/Xserver/dix/resource.c index ca7da1601..d22b0cdd0 100644 --- a/nx-X11/programs/Xserver/dix/resource.c +++ b/nx-X11/programs/Xserver/dix/resource.c @@ -878,14 +878,14 @@ void * LookupIDByType(XID id, RESTYPE rtype) { return SecurityLookupIDByType(NullClient, id, rtype, - SecurityUnknownAccess); + DixUnknownAccess); } void * LookupIDByClass(XID id, RESTYPE classes) { return SecurityLookupIDByClass(NullClient, id, classes, - SecurityUnknownAccess); + DixUnknownAccess); } #else /* not XCSECURITY */ diff --git a/nx-X11/programs/Xserver/dix/window.c b/nx-X11/programs/Xserver/dix/window.c index 1239ab9f7..a7346e778 100644 --- a/nx-X11/programs/Xserver/dix/window.c +++ b/nx-X11/programs/Xserver/dix/window.c @@ -1028,7 +1028,7 @@ ChangeWindowAttributes(register WindowPtr pWin, Mask vmask, XID *vlist, ClientPt else { pPixmap = (PixmapPtr)SecurityLookupIDByType(client, pixID, - RT_PIXMAP, SecurityReadAccess); + RT_PIXMAP, DixReadAccess); if (pPixmap != (PixmapPtr) NULL) { if ((pPixmap->drawable.depth != pWin->drawable.depth) || @@ -1089,7 +1089,7 @@ ChangeWindowAttributes(register WindowPtr pWin, Mask vmask, XID *vlist, ClientPt else { pPixmap = (PixmapPtr)SecurityLookupIDByType(client, pixID, - RT_PIXMAP, SecurityReadAccess); + RT_PIXMAP, DixReadAccess); if (pPixmap) { if ((pPixmap->drawable.depth != pWin->drawable.depth) || @@ -1302,7 +1302,7 @@ ChangeWindowAttributes(register WindowPtr pWin, Mask vmask, XID *vlist, ClientPt goto PatchUp; } pCmap = (ColormapPtr)SecurityLookupIDByType(client, cmap, - RT_COLORMAP, SecurityReadAccess); + RT_COLORMAP, DixReadAccess); if (!pCmap) { error = BadColor; @@ -1378,7 +1378,7 @@ ChangeWindowAttributes(register WindowPtr pWin, Mask vmask, XID *vlist, ClientPt else { pCursor = (CursorPtr)SecurityLookupIDByType(client, cursorID, - RT_CURSOR, SecurityReadAccess); + RT_CURSOR, DixReadAccess); if (!pCursor) { error = BadCursor; @@ -2252,7 +2252,7 @@ ConfigureWindow(register WindowPtr pWin, register Mask mask, XID *vlist, ClientP sibwid = (Window ) *pVlist; pVlist++; pSib = (WindowPtr )SecurityLookupIDByType(client, sibwid, - RT_WINDOW, SecurityReadAccess); + RT_WINDOW, DixReadAccess); if (!pSib) { client->errorValue = sibwid; diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c index 8fc6cf5fd..a46434bf1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c @@ -586,7 +586,7 @@ ProcReparentWindow(register ClientPtr client) REQUEST_SIZE_MATCH(xReparentWindowReq); pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client, - SecurityWriteAccess); + DixWriteAccess); if (!pWin) return(BadWindow); @@ -596,7 +596,7 @@ ProcReparentWindow(register ClientPtr client) } pParent = (WindowPtr)SecurityLookupWindow(stuff->parent, client, - SecurityWriteAccess); + DixWriteAccess); if (!pParent) return(BadWindow); if (SAME_SCREENS(pWin->drawable, pParent->drawable)) @@ -630,7 +630,7 @@ ProcQueryTree(register ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); pWin = (WindowPtr)SecurityLookupWindow(stuff->id, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return(BadWindow); memset(&reply, 0, sizeof(xQueryTreeReply)); @@ -698,7 +698,7 @@ ProcSetSelectionOwner(register ClientPtr client) if (stuff->window != None) { pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return(BadWindow); } @@ -797,7 +797,7 @@ ProcConvertSelection(register ClientPtr client) REQUEST_SIZE_MATCH(xConvertSelectionReq); pWin = (WindowPtr)SecurityLookupWindow(stuff->requestor, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return(BadWindow); @@ -837,7 +837,7 @@ ProcConvertSelection(register ClientPtr client) #ifdef XCSECURITY && (!client->CheckAccess || (* client->CheckAccess)(client, CurrentSelections[i].window, - RT_WINDOW, SecurityReadAccess, + RT_WINDOW, DixReadAccess, CurrentSelections[i].pWin)) #endif ) @@ -918,7 +918,7 @@ ProcCloseFont(register ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); pFont = (FontPtr)SecurityLookupIDByType(client, stuff->id, RT_FONT, - SecurityDestroyAccess); + DixDestroyAccess); if (pFont != (FontPtr)NULL) { #ifdef NXAGENT_SERVER @@ -1015,7 +1015,7 @@ ProcFreePixmap(register ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); pMap = (PixmapPtr)SecurityLookupIDByType(client, stuff->id, RT_PIXMAP, - SecurityDestroyAccess); + DixDestroyAccess); if (pMap) { #ifdef NXAGENT_SERVER diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c index f507e5f71..43cb806e7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c @@ -583,7 +583,7 @@ ProcSendEvent(ClientPtr client) } else pWin = SecurityLookupWindow(stuff->destination, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return BadWindow; if ((stuff->propagate != xFalse) && (stuff->propagate != xTrue)) diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c index 881d2e2d0..28fdd19f5 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c @@ -131,7 +131,7 @@ ProcChangeProperty(ClientPtr client) if (pWin == NULL) #endif pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client, - SecurityWriteAccess); + DixWriteAccess); if (!pWin) return(BadWindow); if (!ValidAtom(stuff->property)) @@ -147,7 +147,7 @@ ProcChangeProperty(ClientPtr client) #ifdef XCSECURITY switch (SecurityCheckPropertyAccess(client, pWin, stuff->property, - SecurityWriteAccess)) + DixWriteAccess)) { case SecurityErrorOperation: client->errorValue = stuff->property; @@ -348,7 +348,7 @@ ProcGetProperty(ClientPtr client) if (stuff->delete) UpdateCurrentTime(); pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return BadWindow; @@ -439,10 +439,10 @@ ProcGetProperty(ClientPtr client) #ifdef XCSECURITY { - Mask access_mode = SecurityReadAccess; + Mask access_mode = DixReadAccess; if (stuff->delete) - access_mode |= SecurityDestroyAccess; + access_mode |= DixDestroyAccess; switch(SecurityCheckPropertyAccess(client, pWin, stuff->property, access_mode)) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c index b8c5cdbd2..8d55516fb 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c @@ -385,11 +385,11 @@ ProcRenderCreatePicture (ClientPtr client) LEGAL_NEW_RESOURCE(stuff->pid, client); SECURITY_VERIFY_DRAWABLE(pDrawable, stuff->drawable, client, - SecurityWriteAccess); + DixWriteAccess); pFormat = (PictFormatPtr) SecurityLookupIDByType (client, stuff->format, PictFormatType, - SecurityReadAccess); + DixReadAccess); if (!pFormat) { client->errorValue = stuff->format; @@ -426,7 +426,7 @@ ProcRenderChangePicture (ClientPtr client) int error; REQUEST_AT_LEAST_SIZE(xRenderChangePictureReq); - VERIFY_PICTURE (pPicture, stuff->picture, client, SecurityWriteAccess, + VERIFY_PICTURE (pPicture, stuff->picture, client, DixWriteAccess, RenderErrBase + BadPicture); len = client->req_len - (sizeof(xRenderChangePictureReq) >> 2); @@ -450,7 +450,7 @@ ProcRenderSetPictureClipRectangles (ClientPtr client) int result; REQUEST_AT_LEAST_SIZE(xRenderSetPictureClipRectanglesReq); - VERIFY_PICTURE (pPicture, stuff->picture, client, SecurityWriteAccess, + VERIFY_PICTURE (pPicture, stuff->picture, client, DixWriteAccess, RenderErrBase + BadPicture); if (!pPicture->pDrawable) return BadDrawable; @@ -558,13 +558,13 @@ ProcRenderComposite (ClientPtr client) client->errorValue = stuff->op; return BadValue; } - VERIFY_PICTURE (pDst, stuff->dst, client, SecurityWriteAccess, + VERIFY_PICTURE (pDst, stuff->dst, client, DixWriteAccess, RenderErrBase + BadPicture); if (!pDst->pDrawable) return BadDrawable; - VERIFY_PICTURE (pSrc, stuff->src, client, SecurityReadAccess, + VERIFY_PICTURE (pSrc, stuff->src, client, DixReadAccess, RenderErrBase + BadPicture); - VERIFY_ALPHA (pMask, stuff->mask, client, SecurityReadAccess, + VERIFY_ALPHA (pMask, stuff->mask, client, DixReadAccess, RenderErrBase + BadPicture); if ((pSrc->pDrawable && pSrc->pDrawable->pScreen != pDst->pDrawable->pScreen) || @@ -687,9 +687,9 @@ ProcRenderTrapezoids (ClientPtr client) client->errorValue = stuff->op; return BadValue; } - VERIFY_PICTURE (pSrc, stuff->src, client, SecurityReadAccess, + VERIFY_PICTURE (pSrc, stuff->src, client, DixReadAccess, RenderErrBase + BadPicture); - VERIFY_PICTURE (pDst, stuff->dst, client, SecurityWriteAccess, + VERIFY_PICTURE (pDst, stuff->dst, client, DixWriteAccess, RenderErrBase + BadPicture); if (!pDst->pDrawable) return BadDrawable; @@ -700,7 +700,7 @@ ProcRenderTrapezoids (ClientPtr client) pFormat = (PictFormatPtr) SecurityLookupIDByType (client, stuff->maskFormat, PictFormatType, - SecurityReadAccess); + DixReadAccess); if (!pFormat) { client->errorValue = stuff->maskFormat; @@ -758,7 +758,7 @@ ProcRenderCreateGlyphSet (ClientPtr client) format = (PictFormatPtr) SecurityLookupIDByType (client, stuff->format, PictFormatType, - SecurityReadAccess); + DixReadAccess); if (!format) { client->errorValue = stuff->format; @@ -809,7 +809,7 @@ ProcRenderReferenceGlyphSet (ClientPtr client) glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client, stuff->existing, GlyphSetType, - SecurityWriteAccess); + DixWriteAccess); if (!glyphSet) { client->errorValue = stuff->existing; @@ -834,7 +834,7 @@ ProcRenderFreeGlyphSet (ClientPtr client) glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client, stuff->glyphset, GlyphSetType, - SecurityDestroyAccess); + DixDestroyAccess); if (!glyphSet) { client->errorValue = stuff->glyphset; @@ -860,7 +860,7 @@ ProcRenderFreeGlyphs (ClientPtr client) glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client, stuff->glyphset, GlyphSetType, - SecurityWriteAccess); + DixWriteAccess); if (!glyphSet) { client->errorValue = stuff->glyphset; @@ -928,9 +928,9 @@ ProcRenderCompositeGlyphs (ClientPtr client) client->errorValue = stuff->op; return BadValue; } - VERIFY_PICTURE (pSrc, stuff->src, client, SecurityReadAccess, + VERIFY_PICTURE (pSrc, stuff->src, client, DixReadAccess, RenderErrBase + BadPicture); - VERIFY_PICTURE (pDst, stuff->dst, client, SecurityWriteAccess, + VERIFY_PICTURE (pDst, stuff->dst, client, DixWriteAccess, RenderErrBase + BadPicture); if (!pDst->pDrawable) return BadDrawable; @@ -941,7 +941,7 @@ ProcRenderCompositeGlyphs (ClientPtr client) pFormat = (PictFormatPtr) SecurityLookupIDByType (client, stuff->maskFormat, PictFormatType, - SecurityReadAccess); + DixReadAccess); if (!pFormat) { client->errorValue = stuff->maskFormat; @@ -954,7 +954,7 @@ ProcRenderCompositeGlyphs (ClientPtr client) glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client, stuff->glyphset, GlyphSetType, - SecurityReadAccess); + DixReadAccess); if (!glyphSet) { client->errorValue = stuff->glyphset; @@ -1027,7 +1027,7 @@ ProcRenderCompositeGlyphs (ClientPtr client) glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client, gs, GlyphSetType, - SecurityReadAccess); + DixReadAccess); if (!glyphSet) { client->errorValue = gs; @@ -1163,7 +1163,7 @@ ProcRenderFillRectangles (ClientPtr client) client->errorValue = stuff->op; return BadValue; } - VERIFY_PICTURE (pDst, stuff->dst, client, SecurityWriteAccess, + VERIFY_PICTURE (pDst, stuff->dst, client, DixWriteAccess, RenderErrBase + BadPicture); if (!pDst->pDrawable) return BadDrawable; @@ -1212,7 +1212,7 @@ ProcRenderCreateCursor (ClientPtr client) REQUEST_SIZE_MATCH (xRenderCreateCursorReq); LEGAL_NEW_RESOURCE(stuff->cid, client); - VERIFY_PICTURE (pSrc, stuff->src, client, SecurityReadAccess, + VERIFY_PICTURE (pSrc, stuff->src, client, DixReadAccess, RenderErrBase + BadPicture); if (!pSrc->pDrawable) return BadDrawable; @@ -1430,7 +1430,7 @@ ProcRenderSetPictureTransform (ClientPtr client) int result; REQUEST_SIZE_MATCH(xRenderSetPictureTransformReq); - VERIFY_PICTURE (pPicture, stuff->picture, client, SecurityWriteAccess, + VERIFY_PICTURE (pPicture, stuff->picture, client, DixWriteAccess, RenderErrBase + BadPicture); result = SetPictureTransform (pPicture, (PictTransform *) &stuff->transform); @@ -1453,7 +1453,7 @@ ProcRenderSetPictureFilter (ClientPtr client) char *name; REQUEST_AT_LEAST_SIZE (xRenderSetPictureFilterReq); - VERIFY_PICTURE (pPicture, stuff->picture, client, SecurityWriteAccess, + VERIFY_PICTURE (pPicture, stuff->picture, client, DixWriteAccess, RenderErrBase + BadPicture); name = (char *) (stuff + 1); params = (xFixed *) (name + ((stuff->nbytes + 3) & ~3)); @@ -1490,7 +1490,7 @@ ProcRenderCreateAnimCursor (ClientPtr client) for (i = 0; i < ncursor; i++) { cursors[i] = (CursorPtr)SecurityLookupIDByType(client, elt->cursor, - RT_CURSOR, SecurityReadAccess); + RT_CURSOR, DixReadAccess); if (!cursors[i]) { free (cursors); diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c index 7cb29bde5..adff36569 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c @@ -503,7 +503,7 @@ ConfigureWindow(register WindowPtr pWin, register Mask mask, XID *vlist, ClientP sibwid = (Window ) *pVlist; pVlist++; pSib = (WindowPtr )SecurityLookupIDByType(client, sibwid, - RT_WINDOW, SecurityReadAccess); + RT_WINDOW, DixReadAccess); if (!pSib) { client->errorValue = sibwid; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c index bb961e5a8..bb19b3458 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c @@ -540,7 +540,7 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value) if ((wmHints.flags & IconPixmapHint) && (wmHints.icon_pixmap != None)) { PixmapPtr icon = (PixmapPtr)SecurityLookupIDByType(pClient, wmHints.icon_pixmap, - RT_PIXMAP, SecurityDestroyAccess); + RT_PIXMAP, DixDestroyAccess); if (icon) { @@ -567,7 +567,7 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value) if ((wmHints.flags & IconWindowHint) && (wmHints.icon_window != None)) { WindowPtr icon = (WindowPtr)SecurityLookupWindow(wmHints.icon_window, pClient, - SecurityDestroyAccess); + DixDestroyAccess); if (icon) { @@ -589,7 +589,7 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value) if ((wmHints.flags & IconMaskHint) && (wmHints.icon_mask != None)) { PixmapPtr icon = (PixmapPtr)SecurityLookupIDByType(pClient, wmHints.icon_mask, - RT_PIXMAP, SecurityDestroyAccess); + RT_PIXMAP, DixDestroyAccess); if (icon) { @@ -611,7 +611,7 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value) if ((wmHints.flags & WindowGroupHint) && (wmHints.window_group != None)) { WindowPtr window = (WindowPtr)SecurityLookupWindow(wmHints.window_group, pClient, - SecurityDestroyAccess); + DixDestroyAccess); if (window) { @@ -695,7 +695,7 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value) for (i = 0; i < nUnits; i++) { pWindow = (WindowPtr)SecurityLookupWindow(input[i], pClient, - SecurityDestroyAccess); + DixDestroyAccess); if ((input[i] != None) && pWindow) { wind[i] = nxagentWindow(pWindow); diff --git a/nx-X11/programs/Xserver/include/dix.h b/nx-X11/programs/Xserver/include/dix.h index 4b9c7749c..0b08b46a9 100644 --- a/nx-X11/programs/Xserver/include/dix.h +++ b/nx-X11/programs/Xserver/include/dix.h @@ -138,13 +138,13 @@ SOFTWARE. } #define VERIFY_DRAWABLE(pDraw, did, client)\ - SECURITY_VERIFY_DRAWABLE(pDraw, did, client, SecurityUnknownAccess) + SECURITY_VERIFY_DRAWABLE(pDraw, did, client, DixUnknownAccess) #define VERIFY_GEOMETRABLE(pDraw, did, client)\ - SECURITY_VERIFY_GEOMETRABLE(pDraw, did, client, SecurityUnknownAccess) + SECURITY_VERIFY_GEOMETRABLE(pDraw, did, client, DixUnknownAccess) #define VERIFY_GC(pGC, rid, client)\ - SECURITY_VERIFY_GC(pGC, rid, client, SecurityUnknownAccess) + SECURITY_VERIFY_GC(pGC, rid, client, DixUnknownAccess) #else /* not XCSECURITY */ @@ -255,8 +255,8 @@ SOFTWARE. if ((stuff->gc == INVALID) || (client->lastGCID != stuff->gc) ||\ (client->lastDrawableID != drawID))\ {\ - SECURITY_VERIFY_GEOMETRABLE(pDraw, drawID, client, SecurityWriteAccess);\ - SECURITY_VERIFY_GC(pGC, stuff->gc, client, SecurityReadAccess);\ + SECURITY_VERIFY_GEOMETRABLE(pDraw, drawID, client, DixWriteAccess);\ + SECURITY_VERIFY_GC(pGC, stuff->gc, client, DixReadAccess);\ if ((pGC->depth != pDraw->depth) ||\ (pGC->pScreen != pDraw->pScreen))\ return (BadMatch);\ diff --git a/nx-X11/programs/Xserver/include/resource.h b/nx-X11/programs/Xserver/include/resource.h index 5e169e093..164e7ccfc 100644 --- a/nx-X11/programs/Xserver/include/resource.h +++ b/nx-X11/programs/Xserver/include/resource.h @@ -220,10 +220,10 @@ extern void * LookupClientResourceComplex( * simultaneously. */ -#define SecurityUnknownAccess 0 /* don't know intentions */ -#define SecurityReadAccess (1<<0) /* inspecting the object */ -#define SecurityWriteAccess (1<<1) /* changing the object */ -#define SecurityDestroyAccess (1<<2) /* destroying the object */ +#define DixUnknownAccess 0 /* don't know intentions */ +#define DixReadAccess (1<<0) /* inspecting the object */ +#define DixWriteAccess (1<<1) /* changing the object */ +#define DixDestroyAccess (1<<2) /* destroying the object */ #ifdef XCSECURITY diff --git a/nx-X11/programs/Xserver/randr/randrstr.h b/nx-X11/programs/Xserver/randr/randrstr.h index 459a47383..4b497f82d 100644 --- a/nx-X11/programs/Xserver/randr/randrstr.h +++ b/nx-X11/programs/Xserver/randr/randrstr.h @@ -443,12 +443,8 @@ extern _X_EXPORT RESTYPE RRCrtcType, RRModeType, RROutputType, RRProviderType; (SecurityLookupIDByType (client, id, \ RRProviderType, a))) -#define DixUnknownAccess SecurityUnknownAccess -#define DixReadAccess SecurityReadAccess -#define DixWriteAccess SecurityWriteAccess -#define DixSetAttrAccess SecurityWriteAccess -#define DixUseAccess SecurityWriteAccess -#define DixDestroyAccess SecurityDestroyAccess +#define DixSetAttrAccess DixWriteAccess +#define DixUseAccess DixWriteAccess #endif diff --git a/nx-X11/programs/Xserver/randr/rrdispatch.c b/nx-X11/programs/Xserver/randr/rrdispatch.c index 14f74d771..68d3b97e6 100644 --- a/nx-X11/programs/Xserver/randr/rrdispatch.c +++ b/nx-X11/programs/Xserver/randr/rrdispatch.c @@ -87,7 +87,7 @@ ProcRRSelectInput(ClientPtr client) #ifndef NXAGENT_SERVER rc = dixLookupWindow(&pWin, stuff->window, client, DixReceiveAccess); #else - pWin = SecurityLookupWindow(stuff->window, client, SecurityWriteAccess); + pWin = SecurityLookupWindow(stuff->window, client, DixWriteAccess); rc = pWin ? Success : BadWindow; #endif if (rc != Success) diff --git a/nx-X11/programs/Xserver/randr/rrmode.c b/nx-X11/programs/Xserver/randr/rrmode.c index 8f8d2d0aa..876ebea42 100644 --- a/nx-X11/programs/Xserver/randr/rrmode.c +++ b/nx-X11/programs/Xserver/randr/rrmode.c @@ -360,7 +360,7 @@ ProcRRCreateMode(ClientPtr client) #ifndef NXAGENT_SERVER rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); #else - pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess); + pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess); rc = pWin ? Success : BadWindow; #endif if (rc != Success) diff --git a/nx-X11/programs/Xserver/randr/rrmonitor.c b/nx-X11/programs/Xserver/randr/rrmonitor.c index 8829caf2f..13b061c35 100644 --- a/nx-X11/programs/Xserver/randr/rrmonitor.c +++ b/nx-X11/programs/Xserver/randr/rrmonitor.c @@ -636,7 +636,7 @@ ProcRRGetMonitors(ClientPtr client) #ifndef NXAGENT_SERVER r = dixLookupWindow(&window, stuff->window, client, DixGetAttrAccess); #else - window = SecurityLookupWindow(stuff->window, client, SecurityReadAccess); + window = SecurityLookupWindow(stuff->window, client, DixReadAccess); r = window ? Success : BadWindow; #endif @@ -723,7 +723,7 @@ ProcRRSetMonitor(ClientPtr client) #ifndef NXAGENT_SERVER r = dixLookupWindow(&window, stuff->window, client, DixGetAttrAccess); #else - window = SecurityLookupWindow(stuff->window, client, SecurityReadAccess); + window = SecurityLookupWindow(stuff->window, client, DixReadAccess); r = window ? Success : BadWindow; #endif @@ -772,7 +772,7 @@ ProcRRDeleteMonitor(ClientPtr client) #ifndef NXAGENT_SERVER r = dixLookupWindow(&window, stuff->window, client, DixGetAttrAccess); #else - window = SecurityLookupWindow(stuff->window, client, SecurityReadAccess); + window = SecurityLookupWindow(stuff->window, client, DixReadAccess); r = window ? Success : BadWindow; #endif diff --git a/nx-X11/programs/Xserver/randr/rroutput.c b/nx-X11/programs/Xserver/randr/rroutput.c index e5f69e010..c4da7d534 100644 --- a/nx-X11/programs/Xserver/randr/rroutput.c +++ b/nx-X11/programs/Xserver/randr/rroutput.c @@ -587,7 +587,7 @@ ProcRRSetOutputPrimary(ClientPtr client) #ifndef NXAGENT_SERVER ret = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); #else - pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess); + pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess); ret = pWin ? Success : BadWindow; #endif @@ -645,7 +645,7 @@ ProcRRGetOutputPrimary(ClientPtr client) #ifndef NXAGENT_SERVER rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); #else - pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess); + pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess); rc = pWin ? Success : BadWindow; #endif diff --git a/nx-X11/programs/Xserver/randr/rrprovider.c b/nx-X11/programs/Xserver/randr/rrprovider.c index ed2b1baca..0ac9474c6 100644 --- a/nx-X11/programs/Xserver/randr/rrprovider.c +++ b/nx-X11/programs/Xserver/randr/rrprovider.c @@ -69,7 +69,7 @@ ProcRRGetProviders(ClientPtr client) #ifndef NXAGENT_SERVER rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); #else - pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess); + pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess); rc = pWin ? Success : BadWindow; #endif diff --git a/nx-X11/programs/Xserver/randr/rrscreen.c b/nx-X11/programs/Xserver/randr/rrscreen.c index bdb8b6dd3..1a30b29d4 100644 --- a/nx-X11/programs/Xserver/randr/rrscreen.c +++ b/nx-X11/programs/Xserver/randr/rrscreen.c @@ -222,7 +222,7 @@ ProcRRGetScreenSizeRange(ClientPtr client) #ifndef NXAGENT_SERVER rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); #else - pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess); + pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess); rc = pWin ? Success : BadWindow; #endif @@ -276,7 +276,7 @@ ProcRRSetScreenSize(ClientPtr client) #ifndef NXAGENT_SERVER rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); #else - pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess); + pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess); rc = pWin ? Success : BadWindow; #endif if (rc != Success) @@ -532,7 +532,7 @@ rrGetScreenResources(ClientPtr client, Bool query) #ifndef NXAGENT_SERVER rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); #else - pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess); + pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess); rc = pWin ? Success : BadWindow; #endif if (rc != Success) @@ -806,7 +806,7 @@ ProcRRGetScreenInfo(ClientPtr client) #ifndef NXAGENT_SERVER rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); #else - pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess); + pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess); rc = pWin ? Success : BadWindow; #endif @@ -980,7 +980,7 @@ ProcRRSetScreenConfig(ClientPtr client) rc = dixLookupDrawable(&pDraw, stuff->drawable, client, 0, DixWriteAccess); #else /* !defined(NXAGENT_SERVER) */ pDraw = - SecurityLookupDrawable(stuff->drawable, client, SecurityWriteAccess); + SecurityLookupDrawable(stuff->drawable, client, DixWriteAccess); rc = pDraw ? Success : BadDrawable; #endif /* !defined(NXAGENT_SERVER) */ diff --git a/nx-X11/programs/Xserver/randr/rrxinerama.c b/nx-X11/programs/Xserver/randr/rrxinerama.c index 5c80e52db..d863897a7 100644 --- a/nx-X11/programs/Xserver/randr/rrxinerama.c +++ b/nx-X11/programs/Xserver/randr/rrxinerama.c @@ -150,7 +150,7 @@ ProcRRXineramaGetState(ClientPtr client) #ifndef NXAGENT_SERVER rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); #else - pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess); + pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess); rc = pWin ? Success : BadWindow; #endif @@ -205,7 +205,7 @@ ProcRRXineramaGetScreenCount(ClientPtr client) #ifndef NXAGENT_SERVER rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); #else - pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess); + pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess); rc = pWin ? Success : BadWindow; #endif if (rc != Success) @@ -240,7 +240,7 @@ ProcRRXineramaGetScreenSize(ClientPtr client) #ifndef NXAGENT_SERVER rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); #else - pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess); + pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess); rc = pWin ? Success : BadWindow; #endif diff --git a/nx-X11/programs/Xserver/render/picture.c b/nx-X11/programs/Xserver/render/picture.c index 4a1cd98f5..862ae0031 100644 --- a/nx-X11/programs/Xserver/render/picture.c +++ b/nx-X11/programs/Xserver/render/picture.c @@ -1210,7 +1210,7 @@ ChangePicture (PicturePtr pPicture, pAlpha = (PicturePtr) SecurityLookupIDByType(client, pid, PictureType, - SecurityWriteAccess|SecurityReadAccess); + DixWriteAccess|DixReadAccess); if (!pAlpha) { client->errorValue = pid; @@ -1271,7 +1271,7 @@ ChangePicture (PicturePtr pPicture, pPixmap = (PixmapPtr)SecurityLookupIDByType(client, pid, RT_PIXMAP, - SecurityReadAccess); + DixReadAccess); if (!pPixmap) { client->errorValue = pid; diff --git a/nx-X11/programs/Xserver/render/render.c b/nx-X11/programs/Xserver/render/render.c index 774dcc8ec..abc26b5d9 100644 --- a/nx-X11/programs/Xserver/render/render.c +++ b/nx-X11/programs/Xserver/render/render.c @@ -567,7 +567,7 @@ ProcRenderQueryPictIndexValues (ClientPtr client) pFormat = (PictFormatPtr) SecurityLookupIDByType (client, stuff->format, PictFormatType, - SecurityReadAccess); + DixReadAccess); if (!pFormat) { @@ -636,11 +636,11 @@ ProcRenderCreatePicture (ClientPtr client) LEGAL_NEW_RESOURCE(stuff->pid, client); SECURITY_VERIFY_DRAWABLE(pDrawable, stuff->drawable, client, - SecurityWriteAccess); + DixWriteAccess); pFormat = (PictFormatPtr) SecurityLookupIDByType (client, stuff->format, PictFormatType, - SecurityReadAccess); + DixReadAccess); if (!pFormat) { client->errorValue = stuff->format; @@ -674,7 +674,7 @@ ProcRenderChangePicture (ClientPtr client) int len; REQUEST_AT_LEAST_SIZE(xRenderChangePictureReq); - VERIFY_PICTURE (pPicture, stuff->picture, client, SecurityWriteAccess, + VERIFY_PICTURE (pPicture, stuff->picture, client, DixWriteAccess, RenderErrBase + BadPicture); len = client->req_len - (sizeof(xRenderChangePictureReq) >> 2); @@ -694,7 +694,7 @@ ProcRenderSetPictureClipRectangles (ClientPtr client) int result; REQUEST_AT_LEAST_SIZE(xRenderSetPictureClipRectanglesReq); - VERIFY_PICTURE (pPicture, stuff->picture, client, SecurityWriteAccess, + VERIFY_PICTURE (pPicture, stuff->picture, client, DixWriteAccess, RenderErrBase + BadPicture); if (!pPicture->pDrawable) return BadDrawable; @@ -721,7 +721,7 @@ ProcRenderFreePicture (ClientPtr client) REQUEST_SIZE_MATCH(xRenderFreePictureReq); - VERIFY_PICTURE (pPicture, stuff->picture, client, SecurityDestroyAccess, + VERIFY_PICTURE (pPicture, stuff->picture, client, DixDestroyAccess, RenderErrBase + BadPicture); FreeResource (stuff->picture, RT_NONE); return(client->noClientException); @@ -752,13 +752,13 @@ ProcRenderComposite (ClientPtr client) client->errorValue = stuff->op; return BadValue; } - VERIFY_PICTURE (pDst, stuff->dst, client, SecurityWriteAccess, + VERIFY_PICTURE (pDst, stuff->dst, client, DixWriteAccess, RenderErrBase + BadPicture); if (!pDst->pDrawable) return BadDrawable; - VERIFY_PICTURE (pSrc, stuff->src, client, SecurityReadAccess, + VERIFY_PICTURE (pSrc, stuff->src, client, DixReadAccess, RenderErrBase + BadPicture); - VERIFY_ALPHA (pMask, stuff->mask, client, SecurityReadAccess, + VERIFY_ALPHA (pMask, stuff->mask, client, DixReadAccess, RenderErrBase + BadPicture); if ((pSrc->pDrawable && pSrc->pDrawable->pScreen != pDst->pDrawable->pScreen) || (pMask && pMask->pDrawable && pSrc->pDrawable->pScreen != pMask->pDrawable->pScreen)) @@ -800,9 +800,9 @@ ProcRenderTrapezoids (ClientPtr client) client->errorValue = stuff->op; return BadValue; } - VERIFY_PICTURE (pSrc, stuff->src, client, SecurityReadAccess, + VERIFY_PICTURE (pSrc, stuff->src, client, DixReadAccess, RenderErrBase + BadPicture); - VERIFY_PICTURE (pDst, stuff->dst, client, SecurityWriteAccess, + VERIFY_PICTURE (pDst, stuff->dst, client, DixWriteAccess, RenderErrBase + BadPicture); if (!pDst->pDrawable) return BadDrawable; @@ -813,7 +813,7 @@ ProcRenderTrapezoids (ClientPtr client) pFormat = (PictFormatPtr) SecurityLookupIDByType (client, stuff->maskFormat, PictFormatType, - SecurityReadAccess); + DixReadAccess); if (!pFormat) { client->errorValue = stuff->maskFormat; @@ -848,9 +848,9 @@ ProcRenderTriangles (ClientPtr client) client->errorValue = stuff->op; return BadValue; } - VERIFY_PICTURE (pSrc, stuff->src, client, SecurityReadAccess, + VERIFY_PICTURE (pSrc, stuff->src, client, DixReadAccess, RenderErrBase + BadPicture); - VERIFY_PICTURE (pDst, stuff->dst, client, SecurityWriteAccess, + VERIFY_PICTURE (pDst, stuff->dst, client, DixWriteAccess, RenderErrBase + BadPicture); if (!pDst->pDrawable) return BadDrawable; @@ -861,7 +861,7 @@ ProcRenderTriangles (ClientPtr client) pFormat = (PictFormatPtr) SecurityLookupIDByType (client, stuff->maskFormat, PictFormatType, - SecurityReadAccess); + DixReadAccess); if (!pFormat) { client->errorValue = stuff->maskFormat; @@ -895,9 +895,9 @@ ProcRenderTriStrip (ClientPtr client) client->errorValue = stuff->op; return BadValue; } - VERIFY_PICTURE (pSrc, stuff->src, client, SecurityReadAccess, + VERIFY_PICTURE (pSrc, stuff->src, client, DixReadAccess, RenderErrBase + BadPicture); - VERIFY_PICTURE (pDst, stuff->dst, client, SecurityWriteAccess, + VERIFY_PICTURE (pDst, stuff->dst, client, DixWriteAccess, RenderErrBase + BadPicture); if (!pDst->pDrawable) return BadDrawable; @@ -908,7 +908,7 @@ ProcRenderTriStrip (ClientPtr client) pFormat = (PictFormatPtr) SecurityLookupIDByType (client, stuff->maskFormat, PictFormatType, - SecurityReadAccess); + DixReadAccess); if (!pFormat) { client->errorValue = stuff->maskFormat; @@ -942,9 +942,9 @@ ProcRenderTriFan (ClientPtr client) client->errorValue = stuff->op; return BadValue; } - VERIFY_PICTURE (pSrc, stuff->src, client, SecurityReadAccess, + VERIFY_PICTURE (pSrc, stuff->src, client, DixReadAccess, RenderErrBase + BadPicture); - VERIFY_PICTURE (pDst, stuff->dst, client, SecurityWriteAccess, + VERIFY_PICTURE (pDst, stuff->dst, client, DixWriteAccess, RenderErrBase + BadPicture); if (!pDst->pDrawable) return BadDrawable; @@ -955,7 +955,7 @@ ProcRenderTriFan (ClientPtr client) pFormat = (PictFormatPtr) SecurityLookupIDByType (client, stuff->maskFormat, PictFormatType, - SecurityReadAccess); + DixReadAccess); if (!pFormat) { client->errorValue = stuff->maskFormat; @@ -1008,7 +1008,7 @@ ProcRenderCreateGlyphSet (ClientPtr client) format = (PictFormatPtr) SecurityLookupIDByType (client, stuff->format, PictFormatType, - SecurityReadAccess); + DixReadAccess); if (!format) { client->errorValue = stuff->format; @@ -1056,7 +1056,7 @@ ProcRenderReferenceGlyphSet (ClientPtr client) glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client, stuff->existing, GlyphSetType, - SecurityWriteAccess); + DixWriteAccess); if (!glyphSet) { client->errorValue = stuff->existing; @@ -1083,7 +1083,7 @@ ProcRenderFreeGlyphSet (ClientPtr client) glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client, stuff->glyphset, GlyphSetType, - SecurityDestroyAccess); + DixDestroyAccess); if (!glyphSet) { client->errorValue = stuff->glyphset; @@ -1118,7 +1118,7 @@ ProcRenderAddGlyphs (ClientPtr client) glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client, stuff->glyphset, GlyphSetType, - SecurityWriteAccess); + DixWriteAccess); if (!glyphSet) { client->errorValue = stuff->glyphset; @@ -1223,7 +1223,7 @@ ProcRenderFreeGlyphs (ClientPtr client) glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client, stuff->glyphset, GlyphSetType, - SecurityWriteAccess); + DixWriteAccess); if (!glyphSet) { client->errorValue = stuff->glyphset; @@ -1278,9 +1278,9 @@ ProcRenderCompositeGlyphs (ClientPtr client) client->errorValue = stuff->op; return BadValue; } - VERIFY_PICTURE (pSrc, stuff->src, client, SecurityReadAccess, + VERIFY_PICTURE (pSrc, stuff->src, client, DixReadAccess, RenderErrBase + BadPicture); - VERIFY_PICTURE (pDst, stuff->dst, client, SecurityWriteAccess, + VERIFY_PICTURE (pDst, stuff->dst, client, DixWriteAccess, RenderErrBase + BadPicture); if (!pDst->pDrawable) return BadDrawable; @@ -1291,7 +1291,7 @@ ProcRenderCompositeGlyphs (ClientPtr client) pFormat = (PictFormatPtr) SecurityLookupIDByType (client, stuff->maskFormat, PictFormatType, - SecurityReadAccess); + DixReadAccess); if (!pFormat) { client->errorValue = stuff->maskFormat; @@ -1304,7 +1304,7 @@ ProcRenderCompositeGlyphs (ClientPtr client) glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client, stuff->glyphset, GlyphSetType, - SecurityReadAccess); + DixReadAccess); if (!glyphSet) { client->errorValue = stuff->glyphset; @@ -1366,7 +1366,7 @@ ProcRenderCompositeGlyphs (ClientPtr client) glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client, gs, GlyphSetType, - SecurityReadAccess); + DixReadAccess); if (!glyphSet) { client->errorValue = gs; @@ -1447,7 +1447,7 @@ ProcRenderFillRectangles (ClientPtr client) client->errorValue = stuff->op; return BadValue; } - VERIFY_PICTURE (pDst, stuff->dst, client, SecurityWriteAccess, + VERIFY_PICTURE (pDst, stuff->dst, client, DixWriteAccess, RenderErrBase + BadPicture); if (!pDst->pDrawable) return BadDrawable; @@ -1515,7 +1515,7 @@ ProcRenderCreateCursor (ClientPtr client) REQUEST_SIZE_MATCH (xRenderCreateCursorReq); LEGAL_NEW_RESOURCE(stuff->cid, client); - VERIFY_PICTURE (pSrc, stuff->src, client, SecurityReadAccess, + VERIFY_PICTURE (pSrc, stuff->src, client, DixReadAccess, RenderErrBase + BadPicture); if (!pSrc->pDrawable) return BadDrawable; @@ -1699,7 +1699,7 @@ ProcRenderSetPictureTransform (ClientPtr client) int result; REQUEST_SIZE_MATCH(xRenderSetPictureTransformReq); - VERIFY_PICTURE (pPicture, stuff->picture, client, SecurityWriteAccess, + VERIFY_PICTURE (pPicture, stuff->picture, client, DixWriteAccess, RenderErrBase + BadPicture); result = SetPictureTransform (pPicture, (PictTransform *) &stuff->transform); if (client->noClientException != Success) @@ -1726,7 +1726,7 @@ ProcRenderQueryFilters (ClientPtr client) char *names; REQUEST_SIZE_MATCH(xRenderQueryFiltersReq); - SECURITY_VERIFY_DRAWABLE(pDrawable, stuff->drawable, client, SecurityReadAccess); + SECURITY_VERIFY_DRAWABLE(pDrawable, stuff->drawable, client, DixReadAccess); pScreen = pDrawable->pScreen; nbytesName = 0; @@ -1828,7 +1828,7 @@ ProcRenderSetPictureFilter (ClientPtr client) char *name; REQUEST_AT_LEAST_SIZE (xRenderSetPictureFilterReq); - VERIFY_PICTURE (pPicture, stuff->picture, client, SecurityWriteAccess, + VERIFY_PICTURE (pPicture, stuff->picture, client, DixWriteAccess, RenderErrBase + BadPicture); name = (char *) (stuff + 1); params = (xFixed *) (name + ((stuff->nbytes + 3) & ~3)); @@ -1862,7 +1862,7 @@ ProcRenderCreateAnimCursor (ClientPtr client) for (i = 0; i < ncursor; i++) { cursors[i] = (CursorPtr)SecurityLookupIDByType(client, elt->cursor, - RT_CURSOR, SecurityReadAccess); + RT_CURSOR, DixReadAccess); if (!cursors[i]) { free (cursors); @@ -1891,7 +1891,7 @@ ProcRenderAddTraps (ClientPtr client) REQUEST(xRenderAddTrapsReq); REQUEST_AT_LEAST_SIZE(xRenderAddTrapsReq); - VERIFY_PICTURE (pPicture, stuff->picture, client, SecurityWriteAccess, + VERIFY_PICTURE (pPicture, stuff->picture, client, DixWriteAccess, RenderErrBase + BadPicture); if (!pPicture->pDrawable) return BadDrawable; @@ -2644,7 +2644,7 @@ PanoramiXRenderCreatePicture (ClientPtr client) REQUEST_AT_LEAST_SIZE(xRenderCreatePictureReq); if(!(refDraw = (PanoramiXRes *)SecurityLookupIDByClass( - client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess))) + client, stuff->drawable, XRC_DRAWABLE, DixWriteAccess))) return BadDrawable; if(!(newPict = (PanoramiXRes *) malloc(sizeof(PanoramiXRes)))) return BadAlloc; @@ -2686,7 +2686,7 @@ PanoramiXRenderChangePicture (ClientPtr client) REQUEST_AT_LEAST_SIZE(xChangeWindowAttributesReq); - VERIFY_XIN_PICTURE(pict, stuff->picture, client, SecurityWriteAccess, + VERIFY_XIN_PICTURE(pict, stuff->picture, client, DixWriteAccess, RenderErrBase + BadPicture); FOR_NSCREENS_BACKWARD(j) { @@ -2707,7 +2707,7 @@ PanoramiXRenderSetPictureClipRectangles (ClientPtr client) REQUEST_AT_LEAST_SIZE(xRenderSetPictureClipRectanglesReq); - VERIFY_XIN_PICTURE(pict, stuff->picture, client, SecurityWriteAccess, + VERIFY_XIN_PICTURE(pict, stuff->picture, client, DixWriteAccess, RenderErrBase + BadPicture); FOR_NSCREENS_BACKWARD(j) { @@ -2728,7 +2728,7 @@ PanoramiXRenderSetPictureTransform (ClientPtr client) REQUEST_AT_LEAST_SIZE(xRenderSetPictureTransformReq); - VERIFY_XIN_PICTURE(pict, stuff->picture, client, SecurityWriteAccess, + VERIFY_XIN_PICTURE(pict, stuff->picture, client, DixWriteAccess, RenderErrBase + BadPicture); FOR_NSCREENS_BACKWARD(j) { @@ -2749,7 +2749,7 @@ PanoramiXRenderSetPictureFilter (ClientPtr client) REQUEST_AT_LEAST_SIZE(xRenderSetPictureFilterReq); - VERIFY_XIN_PICTURE(pict, stuff->picture, client, SecurityWriteAccess, + VERIFY_XIN_PICTURE(pict, stuff->picture, client, DixWriteAccess, RenderErrBase + BadPicture); FOR_NSCREENS_BACKWARD(j) { @@ -2772,7 +2772,7 @@ PanoramiXRenderFreePicture (ClientPtr client) client->errorValue = stuff->picture; - VERIFY_XIN_PICTURE(pict, stuff->picture, client, SecurityDestroyAccess, + VERIFY_XIN_PICTURE(pict, stuff->picture, client, DixDestroyAccess, RenderErrBase + BadPicture); @@ -2798,11 +2798,11 @@ PanoramiXRenderComposite (ClientPtr client) REQUEST_SIZE_MATCH(xRenderCompositeReq); - VERIFY_XIN_PICTURE (src, stuff->src, client, SecurityReadAccess, + VERIFY_XIN_PICTURE (src, stuff->src, client, DixReadAccess, RenderErrBase + BadPicture); - VERIFY_XIN_ALPHA (msk, stuff->mask, client, SecurityReadAccess, + VERIFY_XIN_ALPHA (msk, stuff->mask, client, DixReadAccess, RenderErrBase + BadPicture); - VERIFY_XIN_PICTURE (dst, stuff->dst, client, SecurityWriteAccess, + VERIFY_XIN_PICTURE (dst, stuff->dst, client, DixWriteAccess, RenderErrBase + BadPicture); orig = *stuff; @@ -2846,9 +2846,9 @@ PanoramiXRenderCompositeGlyphs (ClientPtr client) INT16 xSrc, ySrc; REQUEST_AT_LEAST_SIZE(xRenderCompositeGlyphsReq); - VERIFY_XIN_PICTURE (src, stuff->src, client, SecurityReadAccess, + VERIFY_XIN_PICTURE (src, stuff->src, client, DixReadAccess, RenderErrBase + BadPicture); - VERIFY_XIN_PICTURE (dst, stuff->dst, client, SecurityWriteAccess, + VERIFY_XIN_PICTURE (dst, stuff->dst, client, DixWriteAccess, RenderErrBase + BadPicture); if (client->req_len << 2 >= (sizeof (xRenderCompositeGlyphsReq) + @@ -2889,7 +2889,7 @@ PanoramiXRenderFillRectangles (ClientPtr client) int extra_len; REQUEST_AT_LEAST_SIZE (xRenderFillRectanglesReq); - VERIFY_XIN_PICTURE (dst, stuff->dst, client, SecurityWriteAccess, + VERIFY_XIN_PICTURE (dst, stuff->dst, client, DixWriteAccess, RenderErrBase + BadPicture); extra_len = (client->req_len << 2) - sizeof (xRenderFillRectanglesReq); if (extra_len && @@ -2936,9 +2936,9 @@ PanoramiXRenderTrapezoids(ClientPtr client) REQUEST_AT_LEAST_SIZE (xRenderTrapezoidsReq); - VERIFY_XIN_PICTURE (src, stuff->src, client, SecurityReadAccess, + VERIFY_XIN_PICTURE (src, stuff->src, client, DixReadAccess, RenderErrBase + BadPicture); - VERIFY_XIN_PICTURE (dst, stuff->dst, client, SecurityWriteAccess, + VERIFY_XIN_PICTURE (dst, stuff->dst, client, DixWriteAccess, RenderErrBase + BadPicture); extra_len = (client->req_len << 2) - sizeof (xRenderTrapezoidsReq); @@ -2998,9 +2998,9 @@ PanoramiXRenderTriangles(ClientPtr client) REQUEST_AT_LEAST_SIZE (xRenderTrianglesReq); - VERIFY_XIN_PICTURE (src, stuff->src, client, SecurityReadAccess, + VERIFY_XIN_PICTURE (src, stuff->src, client, DixReadAccess, RenderErrBase + BadPicture); - VERIFY_XIN_PICTURE (dst, stuff->dst, client, SecurityWriteAccess, + VERIFY_XIN_PICTURE (dst, stuff->dst, client, DixWriteAccess, RenderErrBase + BadPicture); extra_len = (client->req_len << 2) - sizeof (xRenderTrianglesReq); @@ -3056,9 +3056,9 @@ PanoramiXRenderTriStrip(ClientPtr client) REQUEST_AT_LEAST_SIZE (xRenderTriStripReq); - VERIFY_XIN_PICTURE (src, stuff->src, client, SecurityReadAccess, + VERIFY_XIN_PICTURE (src, stuff->src, client, DixReadAccess, RenderErrBase + BadPicture); - VERIFY_XIN_PICTURE (dst, stuff->dst, client, SecurityWriteAccess, + VERIFY_XIN_PICTURE (dst, stuff->dst, client, DixWriteAccess, RenderErrBase + BadPicture); extra_len = (client->req_len << 2) - sizeof (xRenderTriStripReq); @@ -3110,9 +3110,9 @@ PanoramiXRenderTriFan(ClientPtr client) REQUEST_AT_LEAST_SIZE (xRenderTriFanReq); - VERIFY_XIN_PICTURE (src, stuff->src, client, SecurityReadAccess, + VERIFY_XIN_PICTURE (src, stuff->src, client, DixReadAccess, RenderErrBase + BadPicture); - VERIFY_XIN_PICTURE (dst, stuff->dst, client, SecurityWriteAccess, + VERIFY_XIN_PICTURE (dst, stuff->dst, client, DixWriteAccess, RenderErrBase + BadPicture); extra_len = (client->req_len << 2) - sizeof (xRenderTriFanReq); @@ -3166,7 +3166,7 @@ PanoramiXRenderColorTrapezoids(ClientPtr client) REQUEST_AT_LEAST_SIZE (xRenderColorTrapezoidsReq); - VERIFY_XIN_PICTURE (dst, stuff->dst, client, SecurityWriteAccess, + VERIFY_XIN_PICTURE (dst, stuff->dst, client, DixWriteAccess, RenderErrBase + BadPicture); extra_len = (client->req_len << 2) - sizeof (xRenderColorTrapezoidsReq); @@ -3210,7 +3210,7 @@ PanoramiXRenderColorTriangles(ClientPtr client) REQUEST_AT_LEAST_SIZE (xRenderColorTrianglesReq); - VERIFY_XIN_PICTURE (dst, stuff->dst, client, SecurityWriteAccess, + VERIFY_XIN_PICTURE (dst, stuff->dst, client, DixWriteAccess, RenderErrBase + BadPicture); extra_len = (client->req_len << 2) - sizeof (xRenderColorTrianglesReq); @@ -3256,7 +3256,7 @@ PanoramiXRenderAddTraps (ClientPtr client) INT16 x_off, y_off; REQUEST_AT_LEAST_SIZE (xRenderAddTrapsReq); - VERIFY_XIN_PICTURE (picture, stuff->picture, client, SecurityWriteAccess, + VERIFY_XIN_PICTURE (picture, stuff->picture, client, DixWriteAccess, RenderErrBase + BadPicture); extra_len = (client->req_len << 2) - sizeof (xRenderAddTrapsReq); if (extra_len && diff --git a/nx-X11/programs/Xserver/xfixes/cursor.c b/nx-X11/programs/Xserver/xfixes/cursor.c index 61822aab7..67f46f55e 100644 --- a/nx-X11/programs/Xserver/xfixes/cursor.c +++ b/nx-X11/programs/Xserver/xfixes/cursor.c @@ -193,7 +193,7 @@ ProcXFixesSelectCursorInput (ClientPtr client) REQUEST_SIZE_MATCH (xXFixesSelectCursorInputReq); pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return(BadWindow); if (stuff->eventMask & ~CursorAllEvents) @@ -362,7 +362,7 @@ ProcXFixesSetCursorName (ClientPtr client) Atom atom; REQUEST_AT_LEAST_SIZE(xXFixesSetCursorNameReq); - VERIFY_CURSOR(pCursor, stuff->cursor, client, SecurityWriteAccess); + VERIFY_CURSOR(pCursor, stuff->cursor, client, DixWriteAccess); tchar = (char *) &stuff[1]; atom = MakeAtom (tchar, stuff->nbytes, TRUE); if (atom == BAD_RESOURCE) @@ -394,7 +394,7 @@ ProcXFixesGetCursorName (ClientPtr client) int len; REQUEST_SIZE_MATCH(xXFixesGetCursorNameReq); - VERIFY_CURSOR(pCursor, stuff->cursor, client, SecurityReadAccess); + VERIFY_CURSOR(pCursor, stuff->cursor, client, DixReadAccess); if (pCursor->name) str = NameForAtom (pCursor->name); else @@ -619,8 +619,8 @@ ProcXFixesChangeCursor (ClientPtr client) REQUEST(xXFixesChangeCursorReq); REQUEST_SIZE_MATCH(xXFixesChangeCursorReq); - VERIFY_CURSOR (pSource, stuff->source, client, SecurityReadAccess); - VERIFY_CURSOR (pDestination, stuff->destination, client, SecurityWriteAccess); + VERIFY_CURSOR (pSource, stuff->source, client, DixReadAccess); + VERIFY_CURSOR (pDestination, stuff->destination, client, DixWriteAccess); ReplaceCursor (pSource, TestForCursor, (void *) pDestination); return (client->noClientException); @@ -653,7 +653,7 @@ ProcXFixesChangeCursorByName (ClientPtr client) REQUEST(xXFixesChangeCursorByNameReq); REQUEST_FIXED_SIZE(xXFixesChangeCursorByNameReq, stuff->nbytes); - VERIFY_CURSOR(pSource, stuff->source, client, SecurityReadAccess); + VERIFY_CURSOR(pSource, stuff->source, client, DixReadAccess); tchar = (char *) &stuff[1]; name = MakeAtom (tchar, stuff->nbytes, FALSE); if (name) diff --git a/nx-X11/programs/Xserver/xfixes/region.c b/nx-X11/programs/Xserver/xfixes/region.c index 6759b4bfe..31d19b5ff 100644 --- a/nx-X11/programs/Xserver/xfixes/region.c +++ b/nx-X11/programs/Xserver/xfixes/region.c @@ -117,7 +117,7 @@ ProcXFixesCreateRegionFromBitmap (ClientPtr client) pPixmap = (PixmapPtr) SecurityLookupIDByType (client, stuff->bitmap, RT_PIXMAP, - SecurityReadAccess); + DixReadAccess); if (!pPixmap) { client->errorValue = stuff->bitmap; @@ -222,7 +222,7 @@ ProcXFixesCreateRegionFromGC (ClientPtr client) REQUEST_SIZE_MATCH (xXFixesCreateRegionFromGCReq); LEGAL_NEW_RESOURCE (stuff->region, client); - SECURITY_VERIFY_GC(pGC, stuff->gc, client, SecurityReadAccess); + SECURITY_VERIFY_GC(pGC, stuff->gc, client, DixReadAccess); switch (pGC->clientClipType) { case CT_PIXMAP: @@ -269,7 +269,7 @@ ProcXFixesCreateRegionFromPicture (ClientPtr client) REQUEST_SIZE_MATCH (xXFixesCreateRegionFromPictureReq); LEGAL_NEW_RESOURCE (stuff->region, client); - VERIFY_PICTURE(pPicture, stuff->picture, client, SecurityReadAccess, + VERIFY_PICTURE(pPicture, stuff->picture, client, DixReadAccess, RenderErrBase + BadPicture); switch (pPicture->clientClipType) { @@ -316,7 +316,7 @@ ProcXFixesDestroyRegion (ClientPtr client) RegionPtr pRegion; REQUEST_SIZE_MATCH(xXFixesDestroyRegionReq); - VERIFY_REGION(pRegion, stuff->region, client, SecurityWriteAccess); + VERIFY_REGION(pRegion, stuff->region, client, DixWriteAccess); FreeResource (stuff->region, RT_NONE); return(client->noClientException); } @@ -340,7 +340,7 @@ ProcXFixesSetRegion (ClientPtr client) REQUEST (xXFixesSetRegionReq); REQUEST_AT_LEAST_SIZE(xXFixesSetRegionReq); - VERIFY_REGION(pRegion, stuff->region, client, SecurityWriteAccess); + VERIFY_REGION(pRegion, stuff->region, client, DixWriteAccess); things = (client->req_len << 2) - sizeof (xXFixesCreateRegionReq); if (things & 4) @@ -377,8 +377,8 @@ ProcXFixesCopyRegion (ClientPtr client) RegionPtr pSource, pDestination; REQUEST (xXFixesCopyRegionReq); - VERIFY_REGION(pSource, stuff->source, client, SecurityReadAccess); - VERIFY_REGION(pDestination, stuff->destination, client, SecurityWriteAccess); + VERIFY_REGION(pSource, stuff->source, client, DixReadAccess); + VERIFY_REGION(pDestination, stuff->destination, client, DixWriteAccess); if (!RegionCopy(pDestination, pSource)) return BadAlloc; @@ -406,9 +406,9 @@ ProcXFixesCombineRegion (ClientPtr client) REQUEST (xXFixesCombineRegionReq); REQUEST_SIZE_MATCH (xXFixesCombineRegionReq); - VERIFY_REGION(pSource1, stuff->source1, client, SecurityReadAccess); - VERIFY_REGION(pSource2, stuff->source2, client, SecurityReadAccess); - VERIFY_REGION(pDestination, stuff->destination, client, SecurityWriteAccess); + VERIFY_REGION(pSource1, stuff->source1, client, DixReadAccess); + VERIFY_REGION(pSource2, stuff->source2, client, DixReadAccess); + VERIFY_REGION(pDestination, stuff->destination, client, DixWriteAccess); switch (stuff->xfixesReqType) { case X_XFixesUnionRegion: @@ -452,8 +452,8 @@ ProcXFixesInvertRegion (ClientPtr client) REQUEST(xXFixesInvertRegionReq); REQUEST_SIZE_MATCH(xXFixesInvertRegionReq); - VERIFY_REGION(pSource, stuff->source, client, SecurityReadAccess); - VERIFY_REGION(pDestination, stuff->destination, client, SecurityWriteAccess); + VERIFY_REGION(pSource, stuff->source, client, DixReadAccess); + VERIFY_REGION(pDestination, stuff->destination, client, DixWriteAccess); /* Compute bounds, limit to 16 bits */ bounds.x1 = stuff->x; @@ -499,7 +499,7 @@ ProcXFixesTranslateRegion (ClientPtr client) REQUEST(xXFixesTranslateRegionReq); REQUEST_SIZE_MATCH(xXFixesTranslateRegionReq); - VERIFY_REGION(pRegion, stuff->region, client, SecurityWriteAccess); + VERIFY_REGION(pRegion, stuff->region, client, DixWriteAccess); RegionTranslate(pRegion, stuff->dx, stuff->dy); return (client->noClientException); @@ -525,8 +525,8 @@ ProcXFixesRegionExtents (ClientPtr client) REQUEST(xXFixesRegionExtentsReq); REQUEST_SIZE_MATCH(xXFixesRegionExtentsReq); - VERIFY_REGION(pSource, stuff->source, client, SecurityReadAccess); - VERIFY_REGION(pDestination, stuff->destination, client, SecurityWriteAccess); + VERIFY_REGION(pSource, stuff->source, client, DixReadAccess); + VERIFY_REGION(pDestination, stuff->destination, client, DixWriteAccess); RegionReset(pDestination, RegionExtents(pSource)); @@ -557,7 +557,7 @@ ProcXFixesFetchRegion (ClientPtr client) REQUEST(xXFixesFetchRegionReq); REQUEST_SIZE_MATCH(xXFixesFetchRegionReq); - VERIFY_REGION(pRegion, stuff->region, client, SecurityReadAccess); + VERIFY_REGION(pRegion, stuff->region, client, DixReadAccess); pExtent = RegionExtents(pRegion); pBox = RegionRects (pRegion); @@ -618,8 +618,8 @@ ProcXFixesSetGCClipRegion (ClientPtr client) REQUEST(xXFixesSetGCClipRegionReq); REQUEST_SIZE_MATCH(xXFixesSetGCClipRegionReq); - SECURITY_VERIFY_GC(pGC, stuff->gc, client, SecurityWriteAccess); - VERIFY_REGION_OR_NONE (pRegion, stuff->region, client, SecurityReadAccess); + SECURITY_VERIFY_GC(pGC, stuff->gc, client, DixWriteAccess); + VERIFY_REGION_OR_NONE (pRegion, stuff->region, client, DixReadAccess); if (pRegion) { @@ -669,7 +669,7 @@ ProcXFixesSetWindowShapeRegion (ClientPtr client) client->errorValue = stuff->dest; return BadWindow; } - VERIFY_REGION_OR_NONE(pRegion, stuff->region, client, SecurityWriteAccess); + VERIFY_REGION_OR_NONE(pRegion, stuff->region, client, DixWriteAccess); pScreen = pWin->drawable.pScreen; switch (stuff->destKind) { case ShapeBounding: @@ -756,9 +756,9 @@ ProcXFixesSetPictureClipRegion (ClientPtr client) REQUEST(xXFixesSetPictureClipRegionReq); REQUEST_SIZE_MATCH (xXFixesSetPictureClipRegionReq); - VERIFY_PICTURE(pPicture, stuff->picture, client, SecurityWriteAccess, + VERIFY_PICTURE(pPicture, stuff->picture, client, DixWriteAccess, RenderErrBase + BadPicture); - VERIFY_REGION_OR_NONE(pRegion, stuff->region, client, SecurityReadAccess); + VERIFY_REGION_OR_NONE(pRegion, stuff->region, client, DixReadAccess); return SetPictureClipRegion (pPicture, stuff->xOrigin, stuff->yOrigin, pRegion); @@ -793,8 +793,8 @@ ProcXFixesExpandRegion (ClientPtr client) int i; REQUEST_SIZE_MATCH (xXFixesExpandRegionReq); - VERIFY_REGION(pSource, stuff->source, client, SecurityReadAccess); - VERIFY_REGION(pDestination, stuff->destination, client, SecurityWriteAccess); + VERIFY_REGION(pSource, stuff->source, client, DixReadAccess); + VERIFY_REGION(pDestination, stuff->destination, client, DixWriteAccess); nBoxes = RegionNumRects(pSource); pSrc = RegionRects(pSource); diff --git a/nx-X11/programs/Xserver/xfixes/saveset.c b/nx-X11/programs/Xserver/xfixes/saveset.c index a81c0ca1b..0a5b2b8da 100644 --- a/nx-X11/programs/Xserver/xfixes/saveset.c +++ b/nx-X11/programs/Xserver/xfixes/saveset.c @@ -38,7 +38,7 @@ ProcXFixesChangeSaveSet(ClientPtr client) REQUEST_SIZE_MATCH(xXFixesChangeSaveSetReq); pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return(BadWindow); if (client->clientAsMask == (CLIENT_BITS(pWin->drawable.id))) diff --git a/nx-X11/programs/Xserver/xfixes/select.c b/nx-X11/programs/Xserver/xfixes/select.c index 600abc660..b21301d1c 100644 --- a/nx-X11/programs/Xserver/xfixes/select.c +++ b/nx-X11/programs/Xserver/xfixes/select.c @@ -198,7 +198,7 @@ ProcXFixesSelectSelectionInput (ClientPtr client) REQUEST_SIZE_MATCH (xXFixesSelectSelectionInputReq); pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return(BadWindow); if (stuff->eventMask & ~SelectionAllEvents) -- cgit v1.2.3 From 1d24554ff5754e294c03da0a3c5a53af8736ee2b Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 19 Feb 2017 00:06:54 +0100 Subject: dix: fix incomplete commit The following commit turned out to be incomplete. This commit makes it complete by removing client->lastDrawable/lastGC everywhere thus fixing ArcticaProject/nx-libs#306 and #322 commit e6f2f6427122dc4bc802acebf26f8cec16cd2f62 Author: Mike Gabriel Date: Mon Jun 20 16:45:38 2016 +0200 dix: remove caching of drawables and graphics contexts. The security checks simply bypass the cached values so they are unused. Backported from X.org: commit 9a183d7ba50e31afa133cc03aee7991517a283ea Author: Eamon Walsh Date: Tue Aug 14 11:39:26 2007 -0400 dix: remove caching of drawables and graphics contexts. The security checks simply bypass the cached values so they are unused. Backport to nx-libs: Mike Gabriel --- nx-X11/programs/Xserver/dbe/dbe.c | 2 +- nx-X11/programs/Xserver/dix/dispatch.c | 42 +-------------------------- nx-X11/programs/Xserver/dix/dixutils.c | 45 +++-------------------------- nx-X11/programs/Xserver/include/dix.h | 38 ++---------------------- nx-X11/programs/Xserver/include/dixstruct.h | 4 --- nx-X11/programs/Xserver/include/resource.h | 6 ++-- 6 files changed, 12 insertions(+), 125 deletions(-) diff --git a/nx-X11/programs/Xserver/dbe/dbe.c b/nx-X11/programs/Xserver/dbe/dbe.c index 95740871a..85a22219f 100644 --- a/nx-X11/programs/Xserver/dbe/dbe.c +++ b/nx-X11/programs/Xserver/dbe/dbe.c @@ -1842,7 +1842,7 @@ DbeExtensionInit() /* Create the resource types. */ dbeDrawableResType = - CreateNewResourceType(DbeDrawableDelete) | RC_CACHED | RC_DRAWABLE; + CreateNewResourceType(DbeDrawableDelete) | RC_DRAWABLE; dbeWindowPrivResType = CreateNewResourceType(DbeWindowPrivDelete); diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c index 02d5170fb..044ba1c4b 100644 --- a/nx-X11/programs/Xserver/dix/dispatch.c +++ b/nx-X11/programs/Xserver/dix/dispatch.c @@ -216,33 +216,6 @@ InitSelections() } #endif /* NXAGENT_SERVER */ -void -FlushClientCaches(XID id) -{ - int i; - register ClientPtr client; - - client = clients[CLIENT_ID(id)]; - if (client == NullClient) - return ; - for (i=0; ilastDrawableID == id) - { - client->lastDrawableID = screenInfo.screens[0]->root->drawable.id; - client->lastDrawable = (DrawablePtr)screenInfo.screens[0]->root; - } - else if (client->lastGCID == id) - { - client->lastGCID = INVALID; - client->lastGC = (GCPtr)NULL; - } - } - } -} #undef SMART_DEBUG #define SMART_SCHEDULE_DEFAULT_INTERVAL 20 /* ms */ @@ -3629,20 +3602,7 @@ void InitClient(ClientPtr client, int i, void * ospriv) client->sequence = 0; client->clientAsMask = ((Mask)i) << CLIENTOFFSET; client->clientGone = FALSE; - if (i) - { - client->closeDownMode = DestroyAll; - client->lastDrawable = (DrawablePtr)screenInfo.screens[0]->root; - client->lastDrawableID = screenInfo.screens[0]->root->drawable.id; - } - else - { - client->closeDownMode = RetainPermanent; - client->lastDrawable = (DrawablePtr)NULL; - client->lastDrawableID = INVALID; - } - client->lastGC = (GCPtr) NULL; - client->lastGCID = INVALID; + client->closeDownMode = i ? DestroyAll : RetainPermanent; client->numSaved = 0; client->saveSet = (SaveSetElt *)NULL; client->noClientException = Success; diff --git a/nx-X11/programs/Xserver/dix/dixutils.c b/nx-X11/programs/Xserver/dix/dixutils.c index bf925f748..3ccc90d71 100644 --- a/nx-X11/programs/Xserver/dix/dixutils.c +++ b/nx-X11/programs/Xserver/dix/dixutils.c @@ -210,27 +210,10 @@ CompareISOLatin1Lowered(unsigned char *s1, int s1len, WindowPtr SecurityLookupWindow(XID rid, ClientPtr client, Mask access_mode) { - WindowPtr pWin; - client->errorValue = rid; if(rid == INVALID) return NULL; - if (client->trustLevel != XSecurityClientTrusted) - return (WindowPtr)SecurityLookupIDByType(client, rid, RT_WINDOW, access_mode); - if (client->lastDrawableID == rid) - { - if (client->lastDrawable->type == DRAWABLE_WINDOW) - return ((WindowPtr) client->lastDrawable); - return (WindowPtr) NULL; - } - pWin = (WindowPtr)SecurityLookupIDByType(client, rid, RT_WINDOW, access_mode); - if (pWin && pWin->drawable.type == DRAWABLE_WINDOW) { - client->lastDrawable = (DrawablePtr) pWin; - client->lastDrawableID = rid; - client->lastGCID = INVALID; - client->lastGC = (GCPtr)NULL; - } - return pWin; + return (WindowPtr)SecurityLookupIDByType(client, rid, RT_WINDOW, access_mode); } @@ -241,15 +224,10 @@ SecurityLookupDrawable(XID rid, ClientPtr client, Mask access_mode) if(rid == INVALID) return (void *) NULL; - if (client->trustLevel != XSecurityClientTrusted) - return (DrawablePtr)SecurityLookupIDByClass(client, rid, RC_DRAWABLE, - access_mode); - if (client->lastDrawableID == rid) - return ((void *) client->lastDrawable); pDraw = (DrawablePtr)SecurityLookupIDByClass(client, rid, RC_DRAWABLE, access_mode); - if (pDraw && (pDraw->type != UNDRAWABLE_WINDOW)) - return (void *)pDraw; + if ((client->trustLevel != XSecurityClientTrusted) || (pDraw && (pDraw->type != UNDRAWABLE_WINDOW))) + return (void *)pDraw; return (void *)NULL; } @@ -279,20 +257,7 @@ LookupWindow(XID rid, ClientPtr client) client->errorValue = rid; if(rid == INVALID) return NULL; - if (client->lastDrawableID == rid) - { - if (client->lastDrawable->type == DRAWABLE_WINDOW) - return ((WindowPtr) client->lastDrawable); - return (WindowPtr) NULL; - } - pWin = (WindowPtr)LookupIDByType(rid, RT_WINDOW); - if (pWin && pWin->drawable.type == DRAWABLE_WINDOW) { - client->lastDrawable = (DrawablePtr) pWin; - client->lastDrawableID = rid; - client->lastGCID = INVALID; - client->lastGC = (GCPtr)NULL; - } - return pWin; + return (WindowPtr)LookupIDByType(rid, RT_WINDOW); } @@ -303,8 +268,6 @@ LookupDrawable(XID rid, ClientPtr client) if(rid == INVALID) return (void *) NULL; - if (client->lastDrawableID == rid) - return ((void *) client->lastDrawable); pDraw = (DrawablePtr)LookupIDByClass(rid, RC_DRAWABLE); if (pDraw && (pDraw->type != UNDRAWABLE_WINDOW)) return (void *)pDraw; diff --git a/nx-X11/programs/Xserver/include/dix.h b/nx-X11/programs/Xserver/include/dix.h index 0b08b46a9..58f6c6eb0 100644 --- a/nx-X11/programs/Xserver/include/dix.h +++ b/nx-X11/programs/Xserver/include/dix.h @@ -91,15 +91,11 @@ SOFTWARE. /* XXX if you are using this macro, you are probably not generating Match * errors where appropriate */ #define LOOKUP_DRAWABLE(did, client)\ - ((client->lastDrawableID == did) ? \ - client->lastDrawable : (DrawablePtr)LookupDrawable(did, client)) + ((DrawablePtr)LookupDrawable(did, client)) #ifdef XCSECURITY #define SECURITY_VERIFY_DRAWABLE(pDraw, did, client, mode)\ - if (client->lastDrawableID == did && !client->trustLevel)\ - pDraw = client->lastDrawable;\ - else \ {\ pDraw = (DrawablePtr) SecurityLookupIDByClass(client, did, \ RC_DRAWABLE, mode);\ @@ -113,9 +109,6 @@ SOFTWARE. } #define SECURITY_VERIFY_GEOMETRABLE(pDraw, did, client, mode)\ - if (client->lastDrawableID == did && !client->trustLevel)\ - pDraw = client->lastDrawable;\ - else \ {\ pDraw = (DrawablePtr) SecurityLookupIDByClass(client, did, \ RC_DRAWABLE, mode);\ @@ -127,10 +120,7 @@ SOFTWARE. } #define SECURITY_VERIFY_GC(pGC, rid, client, mode)\ - if (client->lastGCID == rid && !client->trustLevel)\ - pGC = client->lastGC;\ - else\ - pGC = (GC *) SecurityLookupIDByType(client, rid, RT_GC, mode);\ + pGC = (GC *) SecurityLookupIDByType(client, rid, RT_GC, mode);\ if (!pGC)\ {\ client->errorValue = rid;\ @@ -149,9 +139,6 @@ SOFTWARE. #else /* not XCSECURITY */ #define VERIFY_DRAWABLE(pDraw, did, client)\ - if (client->lastDrawableID == did)\ - pDraw = client->lastDrawable;\ - else \ {\ pDraw = (DrawablePtr) LookupIDByClass(did, RC_DRAWABLE);\ if (!pDraw) \ @@ -164,9 +151,6 @@ SOFTWARE. } #define VERIFY_GEOMETRABLE(pDraw, did, client)\ - if (client->lastDrawableID == did)\ - pDraw = client->lastDrawable;\ - else \ {\ pDraw = (DrawablePtr) LookupIDByClass(did, RC_DRAWABLE);\ if (!pDraw) \ @@ -177,10 +161,7 @@ SOFTWARE. } #define VERIFY_GC(pGC, rid, client)\ - if (client->lastGCID == rid)\ - pGC = client->lastGC;\ - else\ - pGC = (GC *)LookupIDByType(rid, RT_GC);\ + pGC = (GC *)LookupIDByType(rid, RT_GC);\ if (!pGC)\ {\ client->errorValue = rid;\ @@ -252,23 +233,12 @@ SOFTWARE. #endif /* NEED_DBE_BUF_BITS */ #define VALIDATE_DRAWABLE_AND_GC(drawID, pDraw, pGC, client)\ - if ((stuff->gc == INVALID) || (client->lastGCID != stuff->gc) ||\ - (client->lastDrawableID != drawID))\ {\ SECURITY_VERIFY_GEOMETRABLE(pDraw, drawID, client, DixWriteAccess);\ SECURITY_VERIFY_GC(pGC, stuff->gc, client, DixReadAccess);\ if ((pGC->depth != pDraw->depth) ||\ (pGC->pScreen != pDraw->pScreen))\ return (BadMatch);\ - client->lastDrawable = pDraw;\ - client->lastDrawableID = drawID;\ - client->lastGC = pGC;\ - client->lastGCID = stuff->gc;\ - }\ - else\ - {\ - pGC = client->lastGC;\ - pDraw = client->lastDrawable;\ }\ SET_DBE_DSTBUF(pDraw, drawID);\ if (pGC->serialNumber != pDraw->serialNumber)\ @@ -325,8 +295,6 @@ extern void UpdateCurrentTimeIf(void); extern void InitSelections(void); -extern void FlushClientCaches(XID /*id*/); - extern int dixDestroyPixmap( void * /*value*/, XID /*pid*/); diff --git a/nx-X11/programs/Xserver/include/dixstruct.h b/nx-X11/programs/Xserver/include/dixstruct.h index ca50c7ca7..3c97e5bb7 100644 --- a/nx-X11/programs/Xserver/include/dixstruct.h +++ b/nx-X11/programs/Xserver/include/dixstruct.h @@ -101,10 +101,6 @@ typedef struct _Client { int clientGone; int noClientException; /* this client died or needs to be * killed */ - DrawablePtr lastDrawable; - Drawable lastDrawableID; - GCPtr lastGC; - GContext lastGCID; SaveSetElt *saveSet; int numSaved; void *screenPrivate[MAXSCREENS]; diff --git a/nx-X11/programs/Xserver/include/resource.h b/nx-X11/programs/Xserver/include/resource.h index 164e7ccfc..30ae624fb 100644 --- a/nx-X11/programs/Xserver/include/resource.h +++ b/nx-X11/programs/Xserver/include/resource.h @@ -71,9 +71,9 @@ typedef unsigned long RESTYPE; /* types for Resource routines */ -#define RT_WINDOW ((RESTYPE)1|RC_CACHED|RC_DRAWABLE) -#define RT_PIXMAP ((RESTYPE)2|RC_CACHED|RC_DRAWABLE) -#define RT_GC ((RESTYPE)3|RC_CACHED) +#define RT_WINDOW ((RESTYPE)1|RC_DRAWABLE) +#define RT_PIXMAP ((RESTYPE)2|RC_DRAWABLE) +#define RT_GC ((RESTYPE)3) #undef RT_FONT #undef RT_CURSOR #define RT_FONT ((RESTYPE)4) -- cgit v1.2.3 From 095ba65b0320be5ac864245c99da1a94f83d96eb Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 24 Feb 2017 22:22:47 +0000 Subject: release 3.5.99.4 --- ChangeLog | 4065 ++++++++++++---------- VERSION | 2 +- debian/changelog | 7 + nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 2 +- nx-libs.spec | 2 +- nxproxy/man/nxproxy.1 | 2 +- 6 files changed, 2165 insertions(+), 1915 deletions(-) diff --git a/ChangeLog b/ChangeLog index 284c5f690..afcecb41a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,82 +1,326 @@ -2016-12-19 15:03:09 +0100 Mike Gabriel (f2c07b8) +2017-02-24 22:22:47 +0000 Mike Gabriel (73cc94686) - * release 3.5.99.3 (HEAD, 3.6.x) + * release 3.5.99.4 (HEAD -> 3.6.x) -2016-12-14 13:32:23 +0100 Mike Gabriel (8be276d) +2017-02-24 12:23:51 +0100 Mihai Moldovan (31426a3d2) - * Merge branch 'theqvd-fix-loopback-bind' into 3.6.x (origin/HEAD, + * Merge branch 'uli42-fix_#306_#322' into 3.6.x (origin/HEAD, origin/3.6.x) -2016-12-13 12:00:43 +0100 Vadim Troshchinskiy (920f423) +2017-02-19 00:06:54 +0100 Ulrich Sibiller (3d8575c21) + + * dix: fix incomplete commit + +2017-02-20 10:33:52 +0100 Mihai Moldovan (3c322ffbb) + + * Merge branch 'sunweaver-pr/security-acl-naming-change' into 3.6.x + +2017-02-15 09:59:00 +0100 Mike Gabriel (104a3e9e2) + + * Naming change: Security*Access -> Dix*Access + (gh-sunweaver/pr/security-acl-naming-change, + pr/security-acl-naming-change) + +2017-02-20 10:21:01 +0100 Mike Gabriel (c79f2d289) + + * Merge branch + 'sunweaver-pr/use-xgetkeyboardMapping-instead-of-deprecated-xkeycodetokeysym' + into 3.6.x + +2017-02-17 12:43:06 +0000 Mike Gabriel (38ac74d6f) + + * Switch from using libNX_X11's deprecated XKeycodeToKeysym() + function to using XGetKeyboardMapping(). + (gh-sunweaver/pr/use-xgetkeyboardMapping-instead-of-deprecated-xkeycodetokeysym, + sunweaver-pr/use-xgetkeyboardMapping-instead-of-deprecated-xkeycodetokeysym, + pr/use-xgetkeyboardMapping-instead-of-deprecated-xkeycodetokeysym) + +2017-02-18 10:24:21 +0100 Mihai Moldovan (73ec915bc) + + * Merge branch 'sunweaver-pr/smart-scheduler-is-not-optional' into + 3.6.x + +2017-02-09 14:05:32 +0100 Mathieu Bérard (6884e6a5b) + + * The smart scheduler is not optional. + (gh-sunweaver/pr/smart-scheduler-is-not-optional, + pr/smart-scheduler-is-not-optional) + +2017-02-10 00:47:32 +0100 Mihai Moldovan (0a7df0770) + + * Merge branch 'sunweaver-pr/use-rpath-for-nxagent' into 3.6.x + +2017-02-08 16:33:40 +0100 Mike Gabriel (99c130f15) + + * Makefile: Fix flawed uninstall-* targets. Spotted by Ionic while + reviewing the nxagent RPATH changeset. Thanks! + (gh-sunweaver/pr/use-rpath-for-nxagent, + pr/use-rpath-for-nxagent) + +2017-02-08 16:31:00 +0100 Mike Gabriel (52760b6e8) + + * debian/patches: Update comment header of + 016_nx-X11_install-location.debian.patch. + +2017-02-04 19:02:16 +0100 Mike Gabriel (a474b9f93) + + * debian/patches: Update 016_nx-X11_install-location.debian.patch. + Adapt path to recent upstream changes. + +2017-02-04 19:00:00 +0100 Mike Gabriel (ba620a054) + + * Load libNX_X11 / faked libX11 via RPATH setting rather than + fidgeting with LD_LIBRARY_PATH in the nxagent wrapper + script. + +2017-02-08 15:03:58 +0100 Mike Gabriel (9d1da072c) + + * Makefile: Allow longer names for variables that we want to allow + distro maintainers to override. + +2017-02-04 18:54:21 +0100 Mike Gabriel (4c4d3dfba) + + * Makefile: Actively set/override USRLIBDIR and SHLIBDIR when calling + Xserver's make process. + +2017-02-04 18:53:25 +0100 Mike Gabriel (4a01be659) + + * debian/rules: Don't manually override SHLIBDIR via the + dh_auto_build call. The default in the main Makefile + should work fine. + +2017-02-04 18:52:56 +0100 Mike Gabriel (0ae1fd5d3) + + * nx-libs.spec: Don't manually override SHLIBDIR via the .spec file. + The default in the main Makefile should work fine. + +2017-02-04 18:52:04 +0100 Mike Gabriel (c45cab1ba) + + * Makefile: Align variable names USRLIBDIR, SHLIBDIR (and NX_DIR) + with nx-X11 internal naming schemes (and use + /usr//nx/X11 rather than /usr//nx-X11). + +2017-02-09 22:01:31 +0100 Mihai Moldovan (0a314adfa) + + * Merge branch 'sunweaver-pr/drop-support-for-ancient-platforms' into + 3.6.x + +2017-02-08 11:06:17 +0100 Mike Gabriel (029bae127) + + * nx-X11/include/Xos_r.h: Drop one _POSIX_REENTRANT_FUNCTIONS macro + block, where offenders AIXV3, AIXV4 and __osf__ are gone + now. (gh-sunweaver/pr/drop-support-for-ancient-platforms, + pr/drop-support-for-ancient-platforms) + +2017-02-04 16:25:13 +0100 Daniel Stone (7dae94814) + + * dix: remove staggeringly broken vendor workarounds + +2016-11-15 22:03:39 +0100 Mike Gabriel (2d45d8d80) + + * drop platform support: unifdef sgi. + +2016-11-15 21:51:55 +0100 Mike Gabriel (c6250a864) + + * drop platform support: unifdef QNX. + +2016-11-15 21:41:57 +0100 Mike Gabriel (754e48ac0) + + * drop platform support: unifdef DGUX. + +2016-11-15 21:32:46 +0100 Mike Gabriel (a9c30796d) + + * drop platform support: unifdef __osf__. + +2016-11-15 21:20:22 +0100 Mike Gabriel (4b178918b) + + * drop platform support: unifdef AIXV3, AIXV4 (and AIXrt, AIX386). + +2016-11-15 20:59:35 +0100 Mike Gabriel (184c5d778) + + * drop platform support: unifdef hpux and __hppa__. + +2016-11-15 19:20:13 +0100 Mike Gabriel (ace255eda) + + * drop platform support: unifdef Lynx. + +2016-11-15 18:41:52 +0100 Mike Gabriel (d12f95241) + + * drop platform support: unifdef __UNIXOS2__. + +2017-02-08 22:34:53 +0100 Mike Gabriel (86a6a340f) + + * Merge branch 'uli42-pr/fix_#293' into 3.6.x + +2017-02-08 21:43:45 +0100 Ulrich Sibiller (3790a28fe) + + * Screen.c: clean up superfluous whitespace + (gh-sunweaver/uli42-pr/fix_#293, uli42-pr/fix_#293) + +2017-02-08 21:13:38 +0100 Ulrich Sibiller (184c07e24) + + * Screen.c: Ensure that an output is unused before destroying it + +2017-02-06 21:57:50 +0100 Mihai Moldovan (083051f66) + + * Merge branch 'sunweaver-pr/fix-DefaultRGBDatabase-path' into 3.6.x + +2017-02-05 19:16:54 +0000 Mike Gabriel (34889920c) + + * nx-X11/config/cf/X11.tmpl: Fix DefaultRGBDatabase path to + $(USRDATADIR)/rgb (not $(LIBDIR)/rgb). + (gh-sunweaver/pr/fix-DefaultRGBDatabase-path, + pr/fix-DefaultRGBDatabase-path) + +2017-02-04 15:41:18 +0100 Mike Gabriel (d6f475f67) + + * debian/copyright{,.in}: Adopt from Debian's upload candidate, being + DEP-5 compliant and up-to-date for 3.5.99.3. + +2017-02-03 14:58:06 +0100 Mike Gabriel (1cd73ccb7) + + * Makefile: Don't create superfluous symlink for libX11.so -> + ../libNX_X11.so. The libNX_X11.so is only required at + build time, so need to use it for faking libX11.so in + nxagent. + +2017-02-03 14:40:19 +0100 Mike Gabriel (b0d28c8a6) + + * debian/changelog: Cosmetic fix, restoring correct version number + for 3.5.99.2 release stanza. + +2017-01-12 10:23:02 +0100 Mike Gabriel (93447eb2b) + + * Merge branch 'opoplawski-symlink' into 3.6.x + (gh-sunweaver/pr/no-extra-mode-freeing-in-nxagentAdjustRandRXinerama) + +2017-01-05 16:43:17 -0700 Orion Poplawski (f92820948) + + * Be consistent with macros (opoplawski-symlink) + +2017-01-05 16:35:34 -0700 Orion Poplawski (c392bc0a8) + + * Use Obsoletes instead of Conflicts. Drop unneeded %{?_isa} + versions + +2017-01-12 10:21:51 +0100 Mike Gabriel (42b136811) + + * Merge branch 'opoplawski-fedora' into 3.6.x + +2017-01-11 15:19:24 -0700 Orion Poplawski (c9ab60e89) + + * Install missing libNX_X11.so.6 symlink - fixes gh-287 + +2017-01-05 16:43:17 -0700 Orion Poplawski (bdcc867e2) + + * Be consistent with macros (opoplawski-fedora) + +2017-01-05 16:35:34 -0700 Orion Poplawski (13f3bdc00) + + * Use Obsoletes instead of Conflicts. Drop unneeded %{?_isa} + versions + +2016-12-22 20:12:53 +0100 Mike Gabriel (7d845e7f4) + + * hw/nxagent/Init.c: Amend artifact in license header. + +2016-12-22 15:30:07 +0100 Mike Gabriel (9c0d52807) + + * helper scripts: Add license headers to files. + +2016-12-20 10:33:48 +0100 Mike Gabriel (b425f071e) + + * nxcomp: Fix artifacts in copyright headers. + +2016-12-20 10:27:07 +0100 Mike Gabriel (8a8ec60cc) + + * nxcompext: Drop folder with .gitignore file. nxcompext has been + moved into nxagent DDX. + +2016-12-20 09:04:11 +0100 Mike Gabriel (02546c560) + + * roll-tarballs.sh: Adapt to recent changes in nx-libs, keep legacy + support for older 3.6.x and 3.5.x releases. + +2016-12-19 15:03:09 +0100 Mike Gabriel (9acd13e50) + + * release 3.5.99.3 (tag: 3.5.99.3, origin/release-builds/3.6.x, + release-builds/3.6.x) + +2016-12-14 13:32:23 +0100 Mike Gabriel (8be276d27) + + * Merge branch 'theqvd-fix-loopback-bind' into 3.6.x + +2016-12-13 12:00:43 +0100 Vadim Troshchinskiy (920f423a5) * Make nxagent only bind to loopback when requested (theqvd-fix-loopback-bind) -2016-12-14 10:57:39 +0100 Mike Gabriel (e466a93) +2016-12-14 10:57:39 +0100 Mike Gabriel (e466a9387) * Merge branch 'theqvd-fix-accept-host-message' into 3.6.x -2016-12-13 12:19:09 +0100 Vadim Troshchinskiy (7718886) +2016-12-13 12:19:09 +0100 Vadim Troshchinskiy (77188865e) * Fix reversed logic in acceptHost setting (theqvd-fix-accept-host-message) -2016-12-10 21:49:10 +0100 Mike Gabriel (2b8f592) +2016-12-10 21:49:10 +0100 Mike Gabriel (2b8f59261) * Merge branch 'uli42-pr/improve_xinerama_debug' into 3.6.x -2016-12-07 21:50:40 +0100 Ulrich Sibiller (6f3fb52) +2016-12-07 21:50:40 +0100 Ulrich Sibiller (6f3fb5248) * Screen.c: more debug output formatting improvements (uli42-pr/improve_xinerama_debug) -2016-12-07 21:17:26 +0100 Ulrich Sibiller (e143098) +2016-12-07 21:17:26 +0100 Ulrich Sibiller (e14309892) * Screen.c: fix uninitalized variable -2016-12-07 21:15:59 +0100 Ulrich Sibiller (ce76009) +2016-12-07 21:15:59 +0100 Ulrich Sibiller (ce76009d2) * Screen.c: fix compile warnings in DEBUG mode -2016-12-07 21:42:03 +0100 Ulrich Sibiller (6882b08) +2016-12-07 21:42:03 +0100 Ulrich Sibiller (6882b08d8) * Screen.c: fix formatting -2016-12-07 20:18:09 +0100 Ulrich Sibiller (c806956) +2016-12-07 20:18:09 +0100 Ulrich Sibiller (c806956c2) * Screen.c: improve debugging output -2016-12-05 10:26:28 +0000 Mike Gabriel (5bdb2fc) +2016-12-05 10:26:28 +0000 Mike Gabriel (5bdb2fcdf) * debian/control: B-D alternatively on libxfont1-dev or libxfont-dev. Fix FTBFS on Debian stretch which has libxfont2-dev as default now. -2016-12-04 21:45:33 +0100 Mike Gabriel (c893ad6) +2016-12-04 21:45:33 +0100 Mike Gabriel (c893ad65c) * Merge branch 'sunweaver-pr/drop-glx-ansic' into 3.6.x -2016-11-02 20:30:07 +0100 Mike Gabriel (4e33fd4) +2016-11-02 20:30:07 +0100 Mike Gabriel (4e33fd4be) * Mesa: Convert some files with MSDOS EOL style to Unix EOL style. (gh-sunweaver/pr/drop-glx-ansic, sunweaver-pr/drop-glx-ansic, pr/drop-glx-ansic) -2016-11-01 21:30:22 +0100 Kristian Høgsberg (4146d1a) +2016-11-01 21:30:22 +0100 Kristian Høgsberg (4146d1aa7) * Drop xf86glx.h, so we can finally drop Xserver/GL/include/ entirely. -2016-10-31 15:06:37 +0100 Kristian Høgsberg (cee997d) +2016-10-31 15:06:37 +0100 Kristian Høgsberg (cee997dac) * Drop glx_ansic.h wrapper and call malloc, realloc, free and str-funcs directly. -2016-12-04 21:14:24 +0100 Mike Gabriel (b38d5b9) +2016-12-04 21:14:24 +0100 Mike Gabriel (b38d5b97d) * Merge branch 'sunweaver-pr/extmod-xfree86loader-cleanup' into 3.6.x -2016-10-29 11:28:02 +0200 Eric Anholt (508d2de) +2016-10-29 11:28:02 +0200 Eric Anholt (508d2deae) * Remove libcwrapper usage from xorg server modules. The libcwrapper is not used in nxagent. @@ -84,3044 +328,3043 @@ sunweaver-pr/extmod-xfree86loader-cleanup, pr/extmod-xfree86loader-cleanup) -2016-12-04 21:09:52 +0100 Mike Gabriel (62f8e50) +2016-12-04 21:09:52 +0100 Mike Gabriel (62f8e50e7) * Merge branch 'uli42-pr/compilation_fixes_and_debug_improvements' into 3.6.x -2016-12-03 23:31:26 +0100 Ulrich Sibiller (b0106e7) +2016-12-03 23:31:26 +0100 Ulrich Sibiller (b0106e75a) * slightly improve rrxinerama debug output -2016-12-03 23:06:32 +0100 Ulrich Sibiller (c5e06d4) +2016-12-03 23:06:32 +0100 Ulrich Sibiller (c5e06d408) * Fix compilation warnings -2016-11-30 08:13:54 +0100 Mike Gabriel (a0a429c) +2016-11-30 08:13:54 +0100 Mike Gabriel (a0a429cc7) * Update auto-generated debian/copyright.in. -2016-11-18 00:07:19 +0100 Mike Gabriel (cb8af80) +2016-11-18 00:07:19 +0100 Mike Gabriel (cb8af80ae) * .gitignore: Don't ignore myself. -2016-11-18 00:06:30 +0100 Mike Gabriel (edeca4a) +2016-11-18 00:06:30 +0100 Mike Gabriel (edeca4aff) * Merge branch 'uli42-pr/gitignore' into 3.6.x -2016-11-03 23:53:46 +0100 Ulrich Sibiller (7993d28) +2016-11-03 23:53:46 +0100 Ulrich Sibiller (7993d28f1) * add .gitignore files -2016-11-17 20:49:53 +0100 Mike Gabriel (1f60704) +2016-11-17 20:49:53 +0100 Mike Gabriel (1f6070437) * Merge branch 'uli42-pr/remove_xlibi18n' into 3.6.x -2016-11-04 00:25:25 +0100 Ulrich Sibiller (de4eca1) +2016-11-04 00:25:25 +0100 Ulrich Sibiller (de4eca171) * LibX11: drop unused xlibi18n -2016-11-15 17:06:18 +0100 Mike Gabriel (cb8bcbe) +2016-11-15 17:06:18 +0100 Mike Gabriel (cb8bcbec8) * Merge branch 'sunweaver-pr/testscripts-file-headers' into 3.6.x -2016-11-07 12:32:09 +0100 Mike Gabriel (00725f1) +2016-11-07 12:32:09 +0100 Mike Gabriel (00725f16a) * testscripts: Use non-NoMachine file headers for our testscripts. (gh-sunweaver/pr/testscripts-file-headers, pr/testscripts-file-headers) -2016-11-15 17:02:11 +0100 Mike Gabriel (91d0672) +2016-11-15 17:02:11 +0100 Mike Gabriel (91d06723b) * New helper script: regenerate-symbol-docs.sh. Plus update symbols usage of libNX_X11 and nxcompext in nxagent, nxcompext and libNX_X11. -2016-11-15 16:42:39 +0100 Mike Gabriel (8c5a1b0) +2016-11-15 16:42:39 +0100 Mike Gabriel (8c5a1b071) * Merge branch 'sunweaver-pr/move-nxcompext-into-Xserver' into 3.6.x -2016-11-09 16:45:47 +0100 Mike Gabriel (9ad0aae) +2016-11-09 16:45:47 +0100 Mike Gabriel (9ad0aae5d) * Xserver/Imakefile: Some whitespace fixes. (gh-sunweaver/pr/move-nxcompext-into-Xserver) -2016-11-03 00:19:26 +0100 Mike Gabriel (80b5de3) +2016-11-03 00:19:26 +0100 Mike Gabriel (80b5de3f5) * nxcompext: Move code into Xserver subtree, as nxcompext requires Xserver includes at build time. -2016-11-03 08:30:49 +0100 Mike Gabriel (cae394b) +2016-11-03 08:30:49 +0100 Mike Gabriel (cae394b45) * Xserver/hw/nxagent/Imakefile: Introduce the NULL variable. -2016-11-08 08:00:44 +0100 Mihai Moldovan (b1d3f2c) +2016-11-08 08:00:44 +0100 Mihai Moldovan (b1d3f2ca5) * Merge branch 'uli42-pr/keyboard_fixes' into arctica-3.6.x -2016-10-27 01:00:23 +0200 Ulrich Sibiller (2f2ade6) +2016-10-27 01:00:23 +0200 Ulrich Sibiller (2f2ade61a) * Keyboard.c: evdev is only existing on Linux -2006-10-02 20:58:33 +0300 Daniel Stone (926e90a) +2006-10-02 20:58:33 +0300 Daniel Stone (926e90abc) * xkb: remove the world's most staggeringly broken vendor workaround -2016-10-26 11:01:57 +0200 Ulrich Sibiller (08ed062) +2016-10-26 11:01:57 +0200 Ulrich Sibiller (08ed062c4) * Keyboard.c: move variable to inner scope -2016-10-26 10:39:37 +0200 Ulrich Sibiller (d37f9f3) +2016-10-26 10:39:37 +0200 Ulrich Sibiller (d37f9f311) * Reconnect.c: simplify code by using strndup -2016-10-25 23:40:13 +0200 Ulrich Sibiller (e52799d) +2016-10-25 23:40:13 +0200 Ulrich Sibiller (e52799d5c) * Keyboard.c: replace malloc/strcpy by str(n)dup -2016-10-25 22:59:35 +0200 Ulrich Sibiller (718c5b9) +2016-10-25 22:59:35 +0200 Ulrich Sibiller (718c5b9f1) * Keyboard.c: more whitespace/formatting fixes -2016-10-25 22:53:39 +0200 Ulrich Sibiller (b5cc3c9) +2016-10-25 22:53:39 +0200 Ulrich Sibiller (b5cc3c94e) * Keyboard.c: improve keyboard file creation -2016-10-25 22:53:07 +0200 Ulrich Sibiller (52848b7) +2016-10-25 22:53:07 +0200 Ulrich Sibiller (52848b785) * Keyboard.c: use NULL instead of 0 -2016-10-25 22:52:43 +0200 Ulrich Sibiller (3ea601b) +2016-10-25 22:52:43 +0200 Ulrich Sibiller (3ea601bcb) * Keyboard.c: remove superfluous whitespace -2016-10-25 21:50:11 +0200 Ulrich Sibiller (2901aca) +2016-10-25 21:50:11 +0200 Ulrich Sibiller (2901aca36) * Keyboard.c: Fix wrong error msg prefix -2016-10-25 21:41:11 +0200 Ulrich Sibiller (2f7f39b) +2016-10-25 21:41:11 +0200 Ulrich Sibiller (2f7f39b49) * Keyboard.c: Fix and simplify keyboard config file handling -2016-10-25 21:40:10 +0200 Ulrich Sibiller (8793e36) +2016-10-25 21:40:10 +0200 Ulrich Sibiller (8793e362b) * Improve DEBUG/TEST output regarding keyboard stuff -2016-10-25 21:39:24 +0200 Ulrich Sibiller (e3ac55b) +2016-10-25 21:39:24 +0200 Ulrich Sibiller (e3ac55bc2) * Drop unused define NXAGENT_KEYMAP_DIR_FILE -2016-11-05 05:20:31 +0000 Mihai Moldovan (7b79e8d) +2016-11-05 05:20:31 +0000 Mihai Moldovan (7b79e8d83) * Makefile: fix up a9b145d4. -2016-11-05 05:18:06 +0000 Mihai Moldovan (c7e0193) +2016-11-05 05:18:06 +0000 Mihai Moldovan (c7e01938d) * nx-X11/lib/X11/Imakefile: essentially revert 5a90a63. -2016-11-04 14:19:07 +0100 Vadim Troshchinskiy (e5091e0) +2016-11-04 14:19:07 +0100 Vadim Troshchinskiy (e5091e002) * Added sample slave agent and test script -2016-11-03 22:51:56 +0100 Mihai Moldovan (53d304e) +2016-11-03 22:51:56 +0100 Mihai Moldovan (53d304ef7) * Merge branch 'sunweaver-pr/drop-fbmmx' into arctica-3.6.x -2016-10-29 14:23:58 +0200 Mike Gabriel (f5c5cb1) +2016-10-29 14:23:58 +0200 Mike Gabriel (f5c5cb10f) * Xserver/fb: Drop fbmmx.[ch] files and code passages wrapped-in by USE_MMX macro. (gh-sunweaver/pr/drop-fbmmx) -2016-10-29 14:23:25 +0200 Mike Gabriel (89e1457) +2016-10-29 14:23:25 +0200 Mike Gabriel (89e1457d1) * Xserver/fb/Imakefile: Introduce NULL variable. -2016-11-03 09:36:23 +0100 Mike Gabriel (d12b775) +2016-11-03 09:36:23 +0100 Mike Gabriel (d12b77543) * Merge branch 'uli42-pr/libX11_xtrans_silence_compiler_warnings' into 3.6.x -2016-11-02 23:57:43 +0100 Ulrich Sibiller (47fab08) +2016-11-02 23:57:43 +0100 Ulrich Sibiller (47fab08aa) * xtrans: fix const warnings for SocketConnectConnInfo -2016-11-02 23:55:23 +0100 Ulrich Sibiller (882c034) +2016-11-02 23:55:23 +0100 Ulrich Sibiller (882c034c3) * xtrans: silence compiler warning regarding is_numeric -2016-11-02 23:37:30 +0100 Ulrich Sibiller (90612d2) +2016-11-02 23:37:30 +0100 Ulrich Sibiller (90612d25c) * libX11 + Xserver: fix missing define warning -2016-11-02 23:36:50 +0100 Ulrich Sibiller (2631603) +2016-11-02 23:36:50 +0100 Ulrich Sibiller (2631603b6) * xtrans: Fix compile warning -2016-11-02 23:14:52 +0100 Ulrich Sibiller (5d06f46) +2016-11-02 23:14:52 +0100 Ulrich Sibiller (5d06f46e5) * xtrans: fix compilation warnings because of missing XTRANS_SEND_FDS -2016-11-02 19:59:23 +0100 Mike Gabriel (8dc0d18) +2016-11-02 19:59:23 +0100 Mike Gabriel (8dc0d18c1) * debian/libnx-x11-6.symbols: Update after upgrade of xtrans library files. -2016-11-02 19:50:24 +0100 Mike Gabriel (107e72b) +2016-11-02 19:50:24 +0100 Mike Gabriel (107e72b03) * Merge branch 'uli42-pr/upgrade_xtrans' into 3.6.x -2016-11-02 11:48:23 +0100 Ulrich Sibiller (6a186b9) +2016-11-02 11:48:23 +0100 Ulrich Sibiller (6a186b921) * Whitespace fixes -2016-10-31 02:29:18 +0100 Ulrich Sibiller (e65b106) +2016-10-31 02:29:18 +0100 Ulrich Sibiller (e65b106a8) * Xtrans: update to Xorg/xtrans upstream (1.3.5+) -2016-10-13 21:53:17 +0200 Ulrich Sibiller (793d587) +2016-10-13 21:53:17 +0200 Ulrich Sibiller (793d587b4) * Remove __UNIXOS2__ references -2016-05-18 12:38:02 -0400 Adam Jackson (603fe25) +2016-05-18 12:38:02 -0400 Adam Jackson (603fe2554) * remove CLTS code -2016-10-13 19:08:37 +0200 Ulrich Sibiller (247e1f7) +2016-10-13 19:08:37 +0200 Ulrich Sibiller (247e1f72e) * use %p in format strings -2016-10-13 00:51:03 +0200 Ulrich Sibiller (c3f43e8) +2016-10-13 00:51:03 +0200 Ulrich Sibiller (c3f43e832) * replace PRMSG by prmsg -2016-10-13 00:35:04 +0200 Ulrich Sibiller (c4b775f) +2016-10-13 00:35:04 +0200 Ulrich Sibiller (c4b775f6d) * align license headers with Xorg/xtrans upstream -2016-10-13 00:31:51 +0200 Ulrich Sibiller (6957b3d) +2016-10-13 00:31:51 +0200 Ulrich Sibiller (6957b3daa) * move helper functions to file end -2008-02-10 19:04:40 -0800 Jeremy Huddleston (f686bc3) +2008-02-10 19:04:40 -0800 Jeremy Huddleston (f686bc3eb) * Fixed #ifdef checks that were using i386 to use __i386__ -2016-10-13 00:16:30 +0200 Ulrich Sibiller (64d5186) +2016-10-13 00:16:30 +0200 Ulrich Sibiller (64d51869f) * whitespace cleanup -2008-08-07 10:32:11 -0400 Adam Jackson (e5b4532) +2008-08-07 10:32:11 -0400 Adam Jackson (e5b4532ab) * Drastically simplify TRANS_OPEN_MAX. -2016-10-12 22:28:41 +0200 Ulrich Sibiller (0ca6e59) +2016-10-12 22:28:41 +0200 Ulrich Sibiller (0ca6e5999) * undef __QNX__ -2016-10-12 22:27:34 +0200 Ulrich Sibiller (4ab02b2) +2016-10-12 22:27:34 +0200 Ulrich Sibiller (4ab02b27c) * undef Lynx -2016-10-12 22:47:36 +0200 Ulrich Sibiller (89cea60) +2016-10-12 22:47:36 +0200 Ulrich Sibiller (89cea600a) * undef AIXV3 -2016-10-12 22:44:21 +0200 Ulrich Sibiller (eb4ee6c) +2016-10-12 22:44:21 +0200 Ulrich Sibiller (eb4ee6c32) * undef hpux -2016-10-12 22:24:09 +0200 Ulrich Sibiller (175a341) +2016-10-12 22:24:09 +0200 Ulrich Sibiller (175a3416e) * undef __UNIXOS2__ -2016-10-12 22:05:26 +0200 Ulrich Sibiller (97d651f) +2016-10-12 22:05:26 +0200 Ulrich Sibiller (97d651fcf) * Remove OS2PIPECONN transport -2016-10-12 21:33:00 +0200 Ulrich Sibiller (0cbc892) +2016-10-12 21:33:00 +0200 Ulrich Sibiller (0cbc89221) * Remove unused TLI ("STREAMSCONN") code -2016-10-12 21:06:36 +0200 Ulrich Sibiller (b5bfd3a) +2016-10-12 21:06:36 +0200 Ulrich Sibiller (b5bfd3a49) * remove DECnet support -2016-11-02 19:38:08 +0100 Mike Gabriel (a9b145d) +2016-11-02 19:38:08 +0100 Mike Gabriel (a9b145d46) * Makefile: Make sure libNX_X11.so.6.2 does not get installed as symlink but as actual file. (Follow-up for 5a90a63). -2016-11-02 17:54:24 +0100 Mike Gabriel (1d1d1fc) +2016-11-02 17:54:24 +0100 Mike Gabriel (1d1d1fc21) * Merge branch 'pr/unused_files' into 3.6.x -2016-10-30 19:05:56 +0100 Ulrich Sibiller (7d88404) +2016-10-30 19:05:56 +0100 Ulrich Sibiller (7d884049b) * remove unused mkks.sh (pr/unused_files) -2016-10-30 19:02:36 +0100 Ulrich Sibiller (bac5ce7) +2016-10-30 19:02:36 +0100 Ulrich Sibiller (bac5ce7b5) * remove unused jump_* files from libX11 -2016-10-30 18:54:04 +0100 Ulrich Sibiller (331497b) +2016-10-30 18:54:04 +0100 Ulrich Sibiller (331497b88) * drop unused xtest1.frags -2016-10-30 18:48:31 +0100 Ulrich Sibiller (6b9ce7d) +2016-10-30 18:48:31 +0100 Ulrich Sibiller (6b9ce7da4) * remove unused fb24_32.h -2016-10-30 18:47:04 +0100 Ulrich Sibiller (a29a2b6) +2016-10-30 18:47:04 +0100 Ulrich Sibiller (a29a2b656) * remove unused registry.h -2016-10-30 18:43:38 +0100 Ulrich Sibiller (89f9212) +2016-10-30 18:43:38 +0100 Ulrich Sibiller (89f9212ef) * remove unused XInput.h -2016-10-30 18:40:10 +0100 Ulrich Sibiller (881979b) +2016-10-30 18:40:10 +0100 Ulrich Sibiller (881979bd1) * Remove unused Xv and XvMC headers -2016-10-30 18:01:11 +0100 Ulrich Sibiller (ba87cf4) +2016-10-30 18:01:11 +0100 Ulrich Sibiller (ba87cf406) * drop unused glu.h -2016-10-30 17:58:59 +0100 Ulrich Sibiller (903d5ce) +2016-10-30 17:58:59 +0100 Ulrich Sibiller (903d5ce8a) * drop ap_keysym.h -2016-10-30 17:55:53 +0100 Ulrich Sibiller (1832ab6) +2016-10-30 17:55:53 +0100 Ulrich Sibiller (1832ab62f) * remove unused registry file -2016-10-30 17:54:46 +0100 Ulrich Sibiller (b7daac2) +2016-10-30 17:54:46 +0100 Ulrich Sibiller (b7daac272) * remove *-def.cpp -2016-10-29 23:26:05 +0200 Ulrich Sibiller (4271b9e) +2016-10-29 23:26:05 +0200 Ulrich Sibiller (4271b9ebd) * nxcomp: remove unused Utils.cpp -2016-10-29 22:52:53 +0200 Ulrich Sibiller (96c9aaf) +2016-10-29 22:52:53 +0200 Ulrich Sibiller (96c9aafd6) * Imake: drop DoLoadableServer, MakeDllModules and IHaveModules -2016-10-29 11:18:41 +0200 Mike Gabriel (8dab7c2) +2016-10-29 11:18:41 +0200 Mike Gabriel (8dab7c21d) * Remove extmod from nx-X11/programs/Xserver/Xext/. -2016-11-02 17:53:15 +0100 Mike Gabriel (6eb8d3e) +2016-11-02 17:53:15 +0100 Mike Gabriel (6eb8d3ec6) * Merge branch 'uli42-pr/add_libX11_links' into 3.6.x -2016-10-28 23:38:17 +0200 Ulrich Sibiller (5a90a63) +2016-10-28 23:38:17 +0200 Ulrich Sibiller (5a90a638f) * libX11/Imakefile: handle libX11 links -2016-10-28 23:37:17 +0200 Ulrich Sibiller (f1d420b) +2016-10-28 23:37:17 +0200 Ulrich Sibiller (f1d420baa) * libX11/Imakefile: add missing dependencies on ks_tables.h -2016-10-31 12:44:52 +0100 Mike Gabriel (4c59a3c) +2016-10-31 12:44:52 +0100 Mike Gabriel (4c59a3c58) * Merge branch 'sunweaver-pr/clean-up-old-vcs-comments' into 3.6.x -2016-10-29 15:30:20 +0200 Mike Gabriel (fcf61d3) +2016-10-29 15:30:20 +0200 Mike Gabriel (fcf61d341) * Imakefile cleanup: Delete all ancient Vcs comments stemming from SVN times of X.org and XFree86. -2016-10-30 23:52:44 +0100 Mike Gabriel (6b3080d) +2016-10-30 23:52:44 +0100 Mike Gabriel (6b3080d54) * Merge branch 'sunweaver-pr/drop-mfb-maskbits-h' into 3.6.x -2016-10-30 21:36:53 +0100 Mike Gabriel (b99c787) +2016-10-30 21:36:53 +0100 Mike Gabriel (b99c78721) * Xserver/Imakefile: Drop references to already removed afb code. (gh-sunweaver/pr/drop-mfb-maskbits-h) -2016-10-30 21:36:03 +0100 Mike Gabriel (65e25bd) +2016-10-30 21:36:03 +0100 Mike Gabriel (65e25bd47) * Xserver/Imakefile: Drop all references to building already removed cfb* implementations. -2016-10-30 20:16:53 +0100 Adam Jackson (cc03502) +2016-10-30 20:16:53 +0100 Adam Jackson (cc0350202) * Death to mfb (removing last remnants from NX code). -2016-10-30 18:31:54 +0100 Adam Jackson (3c0e426) +2016-10-30 18:31:54 +0100 Adam Jackson (3c0e426f0) * Disinfect mi/ of mfb. -2016-10-30 14:32:04 +0100 Mike Gabriel (23c66f4) +2016-10-30 14:32:04 +0100 Mike Gabriel (23c66f400) * Merge branch 'sunweaver-pr/drop-nxlibint-h' into 3.6.x -2016-10-30 13:11:38 +0100 Mike Gabriel (1ddbe39) +2016-10-30 13:11:38 +0100 Mike Gabriel (1ddbe39ad) * nxcompext: Drop (nowadays) no-op file NXlibint.h. (gh-sunweaver/pr/drop-nxlibint-h) -2016-10-30 14:25:57 +0100 Mike Gabriel (23ad270) +2016-10-30 14:25:57 +0100 Mike Gabriel (23ad270b5) * Merge branch 'uli42-misc_fixes' into 3.6.x -2016-10-30 13:46:11 +0100 Ulrich Sibiller (1694701) +2016-10-30 13:46:11 +0100 Ulrich Sibiller (16947012d) * nxagent.keyboard: add quotes -2016-10-30 13:45:33 +0100 Ulrich Sibiller (903cc06) +2016-10-30 13:45:33 +0100 Ulrich Sibiller (903cc0657) * Imakefile: remove references to non-existing subdirs -2016-10-30 02:32:35 +0200 Ulrich Sibiller (162a627) +2016-10-30 02:32:35 +0200 Ulrich Sibiller (162a627c4) * saver.c: fix unused variable warnings -2016-10-29 10:32:51 +0200 Mike Gabriel (a375d17) +2016-10-29 10:32:51 +0200 Mike Gabriel (a375d178f) * Merge branch 'sunweaver-pr/build-includes-robustness' into 3.6.x -2016-10-28 15:19:10 +0200 Mike Gabriel (2f2a5a9) +2016-10-28 15:19:10 +0200 Mike Gabriel (2f2a5a920) * Imake.rules: Make BuildIncludes{,Top}() more robust in case people attempt providing path names instead of file names via srclist. (gh-sunweaver/pr/build-includes-robustness) -2016-10-29 10:30:27 +0200 Mike Gabriel (ecd335f) +2016-10-29 10:30:27 +0200 Mike Gabriel (ecd335fa6) * Merge branch 'uli42-pr/remove_xf86' into 3.6.x -2016-10-28 01:05:03 +0200 Ulrich Sibiller (4aeed7a) +2016-10-28 01:05:03 +0200 Ulrich Sibiller (4aeed7ad9) * remove hw/xfree86 altogether -2016-10-28 00:30:25 +0200 Ulrich Sibiller (6c7f9cd) +2016-10-28 00:30:25 +0200 Ulrich Sibiller (6c7f9cdaa) * remove xf86Version.h and xf86Date.h -2016-10-28 14:51:52 +0200 Mike Gabriel (4cdcd91) +2016-10-28 14:51:52 +0200 Mike Gabriel (4cdcd9145) * debian/patches: Rebase 102_xserver-xext_set-securitypolicy-path.debian.patch. (pr/harmonize-xkb-defaults) -2016-10-28 14:48:25 +0200 Mike Gabriel (c9da511) +2016-10-28 14:48:25 +0200 Mike Gabriel (c9da511cf) * Merge branch 'theqvd-slave-channel' into 3.6.x -2016-10-24 13:27:52 +0200 Vadim Troshchinskiy (c7eac1f) +2016-10-24 13:27:52 +0200 Vadim Troshchinskiy (c7eac1f95) * Add description of NX_SLAVE_CMD to man and help (theqvd-slave-channel) -2016-10-18 09:19:28 +0200 Vadim Troshchinskiy (30af52e) +2016-10-18 09:19:28 +0200 Vadim Troshchinskiy (30af52eb3) * Slave channel implementation -2016-10-28 05:42:02 +0200 Mihai Moldovan (a5de791) +2016-10-28 05:42:02 +0200 Mihai Moldovan (a5de79181) * Merge branch 'uli42-pr/backup_memleak' into arctica-3.6.x -2016-10-25 21:30:15 +0200 Emilio Pozuelo Monfort (8d1126e) +2016-10-25 21:30:15 +0200 Emilio Pozuelo Monfort (8d1126e97) * Plug a memory leak -2016-10-20 22:56:41 +0200 Mike Gabriel (5d4a7e0) +2016-10-20 22:56:41 +0200 Mike Gabriel (5d4a7e071) * debian/rules: Re-enable (+pie) hardening flags again when building .deb packages. -2016-10-20 10:31:24 +0200 Mike Gabriel (61b8d44) +2016-10-20 10:31:24 +0200 Mike Gabriel (61b8d44f1) * Merge branch 'uli42-pr/fix_compile_warnings' into 3.6.x -2016-10-20 00:15:20 +0200 Ulrich Sibiller (50eb5e4) +2016-10-20 00:15:20 +0200 Ulrich Sibiller (50eb5e4a9) * sendexev.c: Fix return of unitialized variable -2011-05-24 18:33:17 +0200 Cyril Brulebois (151e0b1) +2011-05-24 18:33:17 +0200 Cyril Brulebois (151e0b16d) * xfixes: Remove unused variable. -2006-02-14 08:11:41 +0000 Benjamin Herrenschmidt (c266216) +2006-02-14 08:11:41 +0000 Benjamin Herrenschmidt (c26621610) * Remove useless line of code that contained a bug and triggered a gcc warning. This variable will be overriden before being used anyway. (Bugzilla #5595) -2009-01-11 08:25:17 +0100 Julien Cristau (4f99f85) +2009-01-11 08:25:17 +0100 Julien Cristau (4f99f854c) * dix: fix cast from pointer to integer -2014-12-09 09:30:57 -0800 Keith Packard (e3e4062) +2014-12-09 09:30:57 -0800 Keith Packard (e3e4062c3) * dbe: Call to DDX SwapBuffers requires address of int, not unsigned int [CVE-2014-8097 pt. 2] -2016-10-19 21:58:06 +0200 Ulrich Sibiller (01eaab8) +2016-10-19 21:58:06 +0200 Ulrich Sibiller (01eaab831) * LRGB.c: Fix label defined but not used -2016-06-04 17:19:59 +0200 walter harms (ddc5ed4) +2016-06-04 17:19:59 +0200 walter harms (ddc5ed4c9) * Fixes: warning: variable 'req' set but not,used -2016-04-26 16:31:27 +0200 walter harms (21405f6) +2016-04-26 16:31:27 +0200 walter harms (21405f62b) * fix: warning: pointer targets in passing argument 2 of '_XSend' differ in signedness [-Wpointer-sign] -2016-04-26 16:34:11 +0200 walter harms (3f9ebf3) +2016-04-26 16:34:11 +0200 walter harms (3f9ebf33d) * no need to check args for Xfree() -2016-04-26 16:23:46 +0200 walter harms (897b8b2) +2016-04-26 16:23:46 +0200 walter harms (897b8b28b) * remove stray extern -2016-10-16 02:15:13 +0200 Ulrich Sibiller (2c59fbe) +2016-10-16 02:15:13 +0200 Ulrich Sibiller (2c59fbe30) * Fix warnings in XlibInt.c -2016-10-16 00:41:11 +0200 Ulrich Sibiller (0a28292) +2016-10-16 00:41:11 +0200 Ulrich Sibiller (0a28292ec) * xkb.c: fix 'assignment makes integer from pointer without a cast' -2016-10-16 00:19:47 +0200 Ulrich Sibiller (057ddde) +2016-10-16 00:19:47 +0200 Ulrich Sibiller (057ddde08) * xkmread.c: use _X_UNUSED to avoid compiler warning when result is not needed -2016-10-16 00:07:21 +0200 Ulrich Sibiller (33b5911) +2016-10-16 00:07:21 +0200 Ulrich Sibiller (33b5911f2) * xcmisc.c: remove HAVE_STDINT -2016-10-16 00:02:41 +0200 Ulrich Sibiller (c180a21) +2016-10-16 00:02:41 +0200 Ulrich Sibiller (c180a2147) * security.c: fix compiler warnings -2016-10-15 23:01:59 +0200 Ulrich Sibiller (185fbda) +2016-10-15 23:01:59 +0200 Ulrich Sibiller (185fbdaf9) * Loop.cpp: Fix output of SetCore() -2016-10-15 22:02:06 +0200 Ulrich Sibiller (d238db3) +2016-10-15 22:02:06 +0200 Ulrich Sibiller (d238db344) * Window.c: Fix function assignment warning -2016-10-15 21:45:30 +0200 Ulrich Sibiller (81a7c6c) +2016-10-15 21:45:30 +0200 Ulrich Sibiller (81a7c6cf4) * Display.c: remove unused variable -2016-10-15 21:42:54 +0200 Ulrich Sibiller (54b7561) +2016-10-15 21:42:54 +0200 Ulrich Sibiller (54b7561f9) * Colormap.c: add cast to avoid warning -2016-10-15 21:41:03 +0200 Ulrich Sibiller (3c5621c) +2016-10-15 21:41:03 +0200 Ulrich Sibiller (3c5621c37) * Args.c: fix string format warning -2016-10-15 18:21:48 +0200 Ulrich Sibiller (e3c9bc3) +2016-10-15 18:21:48 +0200 Ulrich Sibiller (e3c9bc392) * imLcIm.c: Fix unused variables -2016-10-15 18:03:18 +0200 Ulrich Sibiller (babaf67) +2016-10-15 18:03:18 +0200 Ulrich Sibiller (babaf67c9) * Pending.c: Fix compilation warning -2016-10-15 17:51:11 +0200 Ulrich Sibiller (ae8ec6b) +2016-10-15 17:51:11 +0200 Ulrich Sibiller (ae8ec6b14) * Fix libX11 implicit declaration warnings -2016-10-20 10:08:14 +0200 Mike Gabriel (da01dc8) +2016-10-20 10:08:14 +0200 Mike Gabriel (da01dc8da) * Drop nx-X11/lib/X11/libX11.elist. Not needed for anything nowadays. Probably never was needed in nx-X11. -2016-10-20 09:58:37 +0200 Mike Gabriel (44c76ca) +2016-10-20 09:58:37 +0200 Mike Gabriel (44c76cacf) * debian/libnx-x11-6.symbols: Update symbols list. -2016-10-20 09:52:45 +0200 Mike Gabriel (a559592) +2016-10-20 09:52:45 +0200 Mike Gabriel (a559592dc) * XKeysymDB: ... got removed. -2016-10-19 22:15:01 +0200 Mike Gabriel (70ac75f) +2016-10-19 22:15:01 +0200 Mike Gabriel (70ac75f4a) * Merge branch 'uli42-pr/libX11_further_backports' into 3.6.x -2016-09-25 21:25:25 +0200 Tobias Stoeckmann (70e9d34) +2016-09-25 21:25:25 +0200 Tobias Stoeckmann (70e9d346f) * Validation of server responses in XGetImage() -2016-09-25 21:22:57 +0200 Tobias Stoeckmann (b17557f) +2016-09-25 21:22:57 +0200 Tobias Stoeckmann (b17557f9f) * The validation of server responses avoids out of boundary accesses. -2016-02-06 14:18:32 -0800 Alan Coopersmith (68e3ee6) +2016-02-06 14:18:32 -0800 Alan Coopersmith (68e3ee67c) * xcms: use size_t for pointer offsets passed to strncmp -2016-02-06 13:32:44 -0800 Alan Coopersmith (8d8d5cf) +2016-02-06 13:32:44 -0800 Alan Coopersmith (8d8d5cfd8) * xcms: use unsigned indexes when looping through unsigned values -2016-02-06 13:01:25 -0800 Alan Coopersmith (327d2cc) +2016-02-06 13:01:25 -0800 Alan Coopersmith (327d2cc60) * xcms: use size_t for strlen/sizeof values instead of converting to int & back -2015-03-26 07:52:58 +0100 Dominik Muth (de40477) +2015-03-26 07:52:58 +0100 Dominik Muth (de4047722) * Xlib.h: Fix macros imitating C functions. -2016-01-21 11:54:19 +0100 Olivier Fourdan (a3759f3) +2016-01-21 11:54:19 +0100 Olivier Fourdan (a3759f323) * XKB: fix XkbGetKeyboardByName with Xming server -2015-12-19 18:03:41 -0800 Alan Coopersmith (50192b7) +2015-12-19 18:03:41 -0800 Alan Coopersmith (50192b720) * lcPubWrap: replace malloc(strlen) + strcpy with strdup -2015-12-19 10:21:04 -0800 Alan Coopersmith (7a1fc17) +2015-12-19 10:21:04 -0800 Alan Coopersmith (7a1fc1759) * XlcDL.c: reduce code duplication -2015-12-19 10:19:25 -0800 Alan Coopersmith (c9ebd12) +2015-12-19 10:19:25 -0800 Alan Coopersmith (c9ebd122f) * XlcDL.c: replace strcpy+strcat sequences with snprintf -2015-12-19 10:05:42 -0800 Alan Coopersmith (2874fd1) +2015-12-19 10:05:42 -0800 Alan Coopersmith (2874fd14b) * XDefaultOMIF: Remove comments referring to ancient Sun bug ids -2015-12-19 10:00:22 -0800 Alan Coopersmith (d980be3) +2015-12-19 10:00:22 -0800 Alan Coopersmith (d980be3c2) * XDefaultOMIF: additional code simplification -2015-12-19 09:46:31 -0800 Alan Coopersmith (c00196d) +2015-12-19 09:46:31 -0800 Alan Coopersmith (c00196d2d) * XDefaultOMIF: replace strlen+Xmalloc+strcpy with strdup -2015-12-19 09:20:55 -0800 Alan Coopersmith (f7254c6) +2015-12-19 09:20:55 -0800 Alan Coopersmith (f7254c69f) * Use strdup instead of Xmalloc+strcpy in _XDefaultOpenIM -2015-12-04 22:20:53 -0800 Alan Coopersmith (b912a40) +2015-12-04 22:20:53 -0800 Alan Coopersmith (b912a4042) * Delete #if 0 hunks of code -2015-12-03 23:38:07 -0800 Alan Coopersmith (9dec6c1) +2015-12-03 23:38:07 -0800 Alan Coopersmith (9dec6c18b) * Bug 93183: _XDefaultOpenIM memory leaks in out-of-memory error paths -2015-12-03 23:19:48 -0800 Alan Coopersmith (8d6d95d) +2015-12-03 23:19:48 -0800 Alan Coopersmith (8d6d95d74) * Bug 93184: read_EncodingInfo invalid free -2015-11-28 13:18:11 -0800 Alan Coopersmith (8339e68) +2015-11-28 13:18:11 -0800 Alan Coopersmith (8339e6803) * Remove unused definition of XCONN_CHECK_FREQ -2015-09-27 18:38:32 -0700 Alan Coopersmith (f857c70) +2015-09-27 18:38:32 -0700 Alan Coopersmith (f857c70f8) * Get rid of some extraneous ; at the end of C source lines -2015-07-19 10:22:45 +0200 Thomas Klausner (fc524dd) +2015-07-19 10:22:45 +0200 Thomas Klausner (fc524ddbb) * Do not return() after exit(). -2015-05-18 14:49:01 +0100 Ross Burton (1445735) +2015-05-18 14:49:01 +0100 Ross Burton (1445735ef) * Add missing NULL checks to ICWrap -2015-06-04 20:51:17 -0700 Alan Coopersmith (39dd37d) +2015-06-04 20:51:17 -0700 Alan Coopersmith (39dd37d57) * Replace Xmalloc+memset pairs with Xcalloc calls -2015-06-04 19:07:12 -0700 Bhavi Dhingra (a402ed0) +2015-06-04 19:07:12 -0700 Bhavi Dhingra (a402ed016) * omGeneric.c: Correct the parameter usage of sizeof -2015-05-19 12:30:22 +1000 Peter Hutterer (73f2d66) +2015-05-19 12:30:22 +1000 Peter Hutterer (73f2d66e0) * Fix three "use of uninitialized variable" coverity warnings -2015-05-18 07:55:17 +1000 Peter Hutterer (e144899) +2015-05-18 07:55:17 +1000 Peter Hutterer (e14489988) * Fix potential memory leak -2015-02-03 13:23:50 -0500 Ran Benita (8e3e7bb) +2015-02-03 13:23:50 -0500 Ran Benita (8e3e7bb77) * compose: fix the description of modifiers in compose sequences -2014-07-11 10:34:08 -0700 Alan Coopersmith (0f1fa85) +2014-07-11 10:34:08 -0700 Alan Coopersmith (0f1fa85fe) * Use C99 named initializers to fill in events passed to XSendEvent -2014-07-06 11:13:49 -0700 Alan Coopersmith (f20f91e) +2014-07-06 11:13:49 -0700 Alan Coopersmith (f20f91ee8) * Fix validation of ctrls parameter to XkbGetPerClientControls() -2014-07-06 10:54:57 -0700 Alan Coopersmith (37b8d68) +2014-07-06 10:54:57 -0700 Alan Coopersmith (37b8d6883) * Fix map->num_types check in XkbAddKeyType() -2014-06-07 12:03:17 +0200 walter harms (aa7053b) +2014-06-07 12:03:17 +0200 walter harms (aa7053b3e) * lcDefConv.c: fix use before check -2014-06-07 11:54:34 +0200 walter harms (dd6dc2d) +2014-06-07 11:54:34 +0200 walter harms (dd6dc2ddf) * rm redundant null checks -2014-06-07 15:17:27 +0200 walter harms (a982607) +2014-06-07 15:17:27 +0200 walter harms (a98260726) * libX11: rm redundante NULL checks -2014-06-06 22:53:05 +0200 walter harms (1ff6961) +2014-06-06 22:53:05 +0200 walter harms (1ff696123) * Remove more redundant null checks before Xfree() -2014-06-05 18:37:40 +0200 walter harms (fc26b97) +2014-06-05 18:37:40 +0200 walter harms (fc26b97ea) * Remove redundant null checks before free -2014-06-04 17:12:31 +0200 walter harms (191d157) +2014-06-04 17:12:31 +0200 walter harms (191d1575f) * libX11/lcUTF8.c fix: dereferenced before check -2014-06-04 17:10:20 +0200 walter harms (861fe5a) +2014-06-04 17:10:20 +0200 walter harms (861fe5aee) * libX11/XKBNames.c fix: dereferenced before check -2014-06-04 17:08:12 +0200 walter harms (e7528f5) +2014-06-04 17:08:12 +0200 walter harms (e7528f581) * libX11/lcGenConv.c fix: dereferenced before check -2014-05-09 18:21:05 -0400 Owen W. Taylor (afc7138) +2014-05-09 18:21:05 -0400 Owen W. Taylor (afc7138f9) * Fix XNextRequest() after direct usage of XCB -2014-02-11 13:26:16 +0200 Ran Benita (88d4965) +2014-02-11 13:26:16 +0200 Ran Benita (88d496598) * Remove dead USE_OWN_COMPOSE-protected code -2014-02-06 13:48:08 -0800 Alan Coopersmith (3e8df1a) +2014-02-06 13:48:08 -0800 Alan Coopersmith (3e8df1a2e) * Fix typos in Xrm.c comments -2013-12-26 09:26:13 -0800 Alan Coopersmith (101419b) +2013-12-26 09:26:13 -0800 Alan Coopersmith (101419b10) * _XkbReadGeomOverlay: check for NULL first, then use pointer -2013-12-26 09:22:49 -0800 Alan Coopersmith (1b0df5d) +2013-12-26 09:22:49 -0800 Alan Coopersmith (1b0df5da6) * XkbSelectEventDetails: remove unnecessary assignments -2010-10-07 18:46:08 +0100 Jon TURNEY (4fad46e) +2010-10-07 18:46:08 +0100 Jon TURNEY (4fad46e9c) * Don't try so hard to find a matching font with the given encoding -2013-12-02 21:51:27 -0800 Alan Coopersmith (f45ac4a) +2013-12-02 21:51:27 -0800 Alan Coopersmith (f45ac4ae3) * unifdef -UISC -2013-11-16 20:21:54 -0800 Alan Coopersmith (35dc478) +2013-11-16 20:21:54 -0800 Alan Coopersmith (35dc4784b) * Drop X_LOCALE fallback for OS'es without setlocale() -2013-08-24 17:27:43 -0700 Alan Coopersmith (f04e1a6) +2013-08-24 17:27:43 -0700 Alan Coopersmith (f04e1a6d1) * Bug 68413 - [Bisected]Error in `xterm': realloc(): invalid next size -2013-08-16 21:04:02 -0700 Alan Coopersmith (ba86b7a) +2013-08-16 21:04:02 -0700 Alan Coopersmith (ba86b7a2e) * Stop checking for HAVE_DIX_CONFIG_H on the client side -2013-08-16 18:27:28 -0700 Alan Coopersmith (2824899) +2013-08-16 18:27:28 -0700 Alan Coopersmith (2824899d2) * Rearrange some variable declarations & initializations in XKB -2013-08-11 13:29:33 -0700 Alan Coopersmith (3c5880e) +2013-08-11 13:29:33 -0700 Alan Coopersmith (3c5880e72) * Reindent XKB code to X.Org standard style -2013-08-16 18:14:14 -0700 Alan Coopersmith (3cd8225) +2013-08-16 18:14:14 -0700 Alan Coopersmith (3cd822526) * Fix overflow checks in _XkbReadKeySyms when key_sym_map is already created -2013-08-11 17:02:21 -0700 Alan Coopersmith (c22524d) +2013-08-11 17:02:21 -0700 Alan Coopersmith (c22524d30) * Remove long unused udcInf.c -2013-08-11 00:07:33 -0700 Alan Coopersmith (2625618) +2013-08-11 00:07:33 -0700 Alan Coopersmith (26256188b) * Remove unnecessary casts of pointers to (char *) in calls to Xfree() -2013-08-10 23:57:55 -0700 Alan Coopersmith (d33cf04) +2013-08-10 23:57:55 -0700 Alan Coopersmith (d33cf0446) * Don't cast sizeof() results to unsigned when passing to Xmalloc/Xcalloc -2013-08-10 23:51:08 -0700 Alan Coopersmith (c161df4) +2013-08-10 23:51:08 -0700 Alan Coopersmith (c161df4fe) * Remove even more casts of return values from Xmalloc/Xrealloc -2013-08-10 23:05:13 -0700 Alan Coopersmith (5d6cda4) +2013-08-10 23:05:13 -0700 Alan Coopersmith (5d6cda4f6) * xlibi18n: fix argsize argument to _XlcParsePath -2013-08-10 22:32:42 -0700 Alan Coopersmith (069c1f4) +2013-08-10 22:32:42 -0700 Alan Coopersmith (069c1f4d5) * i18n modules: Fix some const cast warnings -2013-08-10 22:21:54 -0700 Alan Coopersmith (d8358c6) +2013-08-10 22:21:54 -0700 Alan Coopersmith (d8358c6ef) * xlibi18n: Fix a bunch of const cast warnings -2013-08-10 22:18:00 -0700 Alan Coopersmith (e667b90) +2013-08-10 22:18:00 -0700 Alan Coopersmith (e667b9054) * Fix const handling in XSetLocaleModifiers -2013-08-10 21:46:37 -0700 Alan Coopersmith (d2671c2) +2013-08-10 21:46:37 -0700 Alan Coopersmith (d2671c285) * Constify lc_name argument to _XlcLocaleDirName() & _XlcLocaleLibDirName() -2013-08-10 13:37:53 -0700 Alan Coopersmith (22377a7) +2013-08-10 13:37:53 -0700 Alan Coopersmith (22377a799) * init_om: remove unneeded extra copy of string to local buffer -2013-08-10 12:34:53 -0700 Alan Coopersmith (9259131) +2013-08-10 12:34:53 -0700 Alan Coopersmith (92591316d) * Delete unused XKB_INSURE_SIZE macro from XKBlibint.h -2013-08-10 12:19:17 -0700 Alan Coopersmith (be32fbb) +2013-08-10 12:19:17 -0700 Alan Coopersmith (be32fbb31) * miRegionOp(): ensure region size is not updated if realloc fails -2013-08-10 12:19:17 -0700 Alan Coopersmith (ad51fbd) +2013-08-10 12:19:17 -0700 Alan Coopersmith (ad51fbdb4) * miRegionCopy(): handle realloc failure better -2013-08-10 11:27:22 -0700 Alan Coopersmith (105cd47) +2013-08-10 11:27:22 -0700 Alan Coopersmith (105cd4711) * Avoid memory leak/corruption if realloc fails in Xregion.h:MEMCHECK macro -2013-08-10 12:07:51 -0700 Alan Coopersmith (180991c) +2013-08-10 12:07:51 -0700 Alan Coopersmith (180991ce2) * Avoid memory leak/corruption if realloc fails in imLcPrs.c:parseline() -2013-08-10 12:30:39 -0700 Alan Coopersmith (7156a20) +2013-08-10 12:30:39 -0700 Alan Coopersmith (7156a20bc) * lcDB.c: ensure buffer size is updated correctly if realloc fails -2013-08-10 11:07:47 -0700 Alan Coopersmith (0574a55) +2013-08-10 11:07:47 -0700 Alan Coopersmith (0574a55eb) * Avoid memory leak/corruption if realloc fails in XlcDL.c:resolve_object() -2013-08-09 23:33:03 -0700 Alan Coopersmith (a6d9409) +2013-08-09 23:33:03 -0700 Alan Coopersmith (a6d9409b0) * omGeneric.c: convert sprintf calls to snprintf -2013-08-09 23:30:30 -0700 Alan Coopersmith (d03ab1d) +2013-08-09 23:30:30 -0700 Alan Coopersmith (d03ab1de0) * ximcp/imRm.c: convert sprintf calls to snprintf -2013-08-09 23:02:12 -0700 Alan Coopersmith (a1b0fdb) +2013-08-09 23:02:12 -0700 Alan Coopersmith (a1b0fdb2c) * xlibi18n: convert sprintf calls to snprintf -2013-08-09 23:02:12 -0700 Alan Coopersmith (bde3d8b) +2013-08-09 23:02:12 -0700 Alan Coopersmith (bde3d8b14) * lcfile: skip over any null entries in args list -2013-08-09 22:00:09 -0700 Alan Coopersmith (7bca345) +2013-08-09 22:00:09 -0700 Alan Coopersmith (7bca34528) * Fix file leak on malloc error in XlcDL.c:resolve_object() -2012-12-18 15:28:05 +0000 ISHIKAWA,chiaki (ce482d4) +2012-12-18 15:28:05 +0000 ISHIKAWA,chiaki (ce482d4fd) * Fix bogus timestamp generated by XIM -2011-06-16 17:28:39 +0200 Egbert Eich (ed53aca) +2011-06-16 17:28:39 +0200 Egbert Eich (ed53aca1d) * XIM: Fix race on focus change: set 'FABRICATED' only when keyev filters in place. -2013-07-27 01:03:18 -0700 Alan Coopersmith (adcf389) +2013-07-27 01:03:18 -0700 Alan Coopersmith (adcf3894a) * omGeneric: remove space between struct name & member name -2013-07-23 22:11:34 -0700 Alan Coopersmith (6d64c41) +2013-07-23 22:11:34 -0700 Alan Coopersmith (6d64c4164) * XSetModifierMapping: Use Data instead of GetReqExtra -2013-06-09 11:13:42 -0700 Kees Cook (ea82396) +2013-06-09 11:13:42 -0700 Kees Cook (ea8239650) * libX11: check size of GetReqExtra after XFlush -2013-06-25 22:35:29 +0200 Thomas Klausner (39c6e5a) +2013-06-25 22:35:29 +0200 Thomas Klausner (39c6e5aa8) * Tighten out-of-range comparisons. -2013-06-25 18:34:32 +0200 Thomas Klausner (ac3d262) +2013-06-25 18:34:32 +0200 Thomas Klausner (ac3d26251) * Fix out-of-range comparison in _XF86BigfontQueryFont -2013-06-25 18:33:56 +0200 Thomas Klausner (61fdf93) +2013-06-25 18:33:56 +0200 Thomas Klausner (61fdf93ef) * Check for symbol existence with #ifdef, not #if -2013-06-25 18:31:32 +0200 Thomas Klausner (d122d75) +2013-06-25 18:31:32 +0200 Thomas Klausner (d122d7545) * Stop truncating source to destination length if it is larger. -2013-06-24 23:02:05 -0700 Alan Coopersmith (88edf80) +2013-06-24 23:02:05 -0700 Alan Coopersmith (88edf8083) * Require ANSI C89 pre-processor, drop pre-C89 token pasting support -2016-10-08 00:20:48 +0200 Ulrich Sibiller (7f98ab0) +2016-10-08 00:20:48 +0200 Ulrich Sibiller (7f98ab03b) * update Xfuncproto.h -2016-10-07 23:46:05 +0200 Ulrich Sibiller (e2e45b2) +2016-10-07 23:46:05 +0200 Ulrich Sibiller (e2e45b2b3) * Align files with upstream libX11-1.6.0 -2012-12-16 17:44:42 -0800 Alan Coopersmith (878040b) +2012-12-16 17:44:42 -0800 Alan Coopersmith (878040bf0) * Tell clang not to report -Wpadded warnings on public headers we can't fix -2010-09-08 10:44:23 -0400 Adam Jackson (9b5f99c) +2010-09-08 10:44:23 -0400 Adam Jackson (9b5f99c37) * Zero buffer data in BufAlloc() -2011-01-31 14:02:10 +0200 Erkki Seppälä (13fe4d4) +2011-01-31 14:02:10 +0200 Erkki Seppälä (13fe4d475) * GetProp: Zero-initialized error so its resourceID field is initialized -2013-03-01 18:37:37 -0800 Alan Coopersmith (7992a98) +2013-03-01 18:37:37 -0800 Alan Coopersmith (7992a9873) * integer overflow in ReadInFile() in Xrm.c [CVE-2013-1981 7/13] -2011-01-31 14:01:58 +0200 Erkki Seppälä (78b0ca2) +2011-01-31 14:01:58 +0200 Erkki Seppälä (78b0ca2fe) * ximcp/imRmAttr: Handle leaking colormap_ret -2011-02-21 15:56:54 +0100 Samuel Thibault (b00312f) +2011-02-21 15:56:54 +0100 Samuel Thibault (b00312f5d) * Fix status reporting for braille patterns -2016-10-07 22:16:24 +0200 Ulrich Sibiller (a2fded2) +2016-10-07 22:16:24 +0200 Ulrich Sibiller (a2fded2e3) * Revert incomplete "Fix status reporting for braille patterns" -2010-09-03 23:11:53 -0700 Alan Coopersmith (bd43a06) +2010-09-03 23:11:53 -0700 Alan Coopersmith (bd43a0640) * Sun's copyrights are now owned by Oracle -2016-10-07 21:16:39 +0200 Ulrich Sibiller (5dbcf19) +2016-10-07 21:16:39 +0200 Ulrich Sibiller (5dbcf1987) * Assume size_t is always available, since it was defined in C89 -2016-10-07 21:00:20 +0200 Ulrich Sibiller (1078f97) +2016-10-07 21:00:20 +0200 Ulrich Sibiller (1078f9770) * rename xf86bigfstr.h to xf86bigfproto.h -2013-06-02 11:49:54 -0700 Thomas Klausner (e03d8c2) +2013-06-02 11:49:54 -0700 Thomas Klausner (e03d8c215) * cmsMath.c: Add missing stdio header for printf(3) in DEBUG build. -2013-05-17 15:26:21 -0700 Niveditha Rau (26f7239) +2013-05-17 15:26:21 -0700 Niveditha Rau (26f7239a0) * Make sure internal headers include required headers -2013-05-16 23:05:36 -0700 Alan Coopersmith (71fb99c) +2013-05-16 23:05:36 -0700 Alan Coopersmith (71fb99cb4) * Free fs->properties in XF86BigfontQueryFont overflow error path -2013-05-23 20:39:46 +0200 Julien Cristau (78ed233) +2013-05-23 20:39:46 +0200 Julien Cristau (78ed23330) * xkb: fix off-by-one in _XkbReadGetNamesReply and _XkbReadVirtualModMap -2016-10-06 23:34:06 +0200 Ulrich Sibiller (082e831) +2016-10-06 23:34:06 +0200 Ulrich Sibiller (082e83130) * Revert "Add a couple fixups for the security patches" -2013-03-07 23:46:05 -0800 Alan Coopersmith (e15023b) +2013-03-07 23:46:05 -0800 Alan Coopersmith (e15023b2a) * Remove more unnecessary casts from Xmalloc/calloc calls -2013-03-16 18:30:56 -0700 Alan Coopersmith (47d0ea1) +2013-03-16 18:30:56 -0700 Alan Coopersmith (47d0ea1ba) * Move big request comment in XOpenDisplay to the right place -2013-03-08 22:33:28 -0800 Alan Coopersmith (4988e9b) +2013-03-08 22:33:28 -0800 Alan Coopersmith (4988e9bd9) * Fix very weird indenting in nx-X11/lib/X11/GetFProp.c -2013-03-08 15:37:33 -0800 Alan Coopersmith (001aeb5) +2013-03-08 15:37:33 -0800 Alan Coopersmith (001aeb55b) * XAllocClassHint: Assume calloc sets pointers in allocated memory to NULL -2013-03-08 17:13:09 -0800 Alan Coopersmith (7ddc5b9) +2013-03-08 17:13:09 -0800 Alan Coopersmith (7ddc5b90f) * _xudc_code_to_glyph: check for NULL pointer *before* writing to it, not after -2013-03-01 18:10:27 -0800 Alan Coopersmith (e18ccaa) +2013-03-01 18:10:27 -0800 Alan Coopersmith (e18ccaaae) * Assume size_t is always available, since it was defined in C89 -2013-03-01 18:09:07 -0800 Alan Coopersmith (2393e1a) +2013-03-01 18:09:07 -0800 Alan Coopersmith (2393e1acd) * unifdef XKB_IN_SERVER -2013-02-16 10:42:23 -0800 Alan Coopersmith (d31b81c) +2013-02-16 10:42:23 -0800 Alan Coopersmith (d31b81c10) * Convert more sprintf calls to snprintf -2013-02-15 23:43:12 -0800 Alan Coopersmith (d43f4c3) +2013-02-15 23:43:12 -0800 Alan Coopersmith (d43f4c398) * XKeysymToString: move variable declarations to the scope of their usage -2013-02-15 23:34:40 -0800 Alan Coopersmith (5e0584c) +2013-02-15 23:34:40 -0800 Alan Coopersmith (5e0584c43) * Preserve constness in casting arguments through the Data*() routines -2013-02-15 23:25:38 -0800 Alan Coopersmith (d91c145) +2013-02-15 23:25:38 -0800 Alan Coopersmith (d91c145a4) * XStringToKeysym: preserve constness when casting off unsignedness for strcmp -2013-02-15 23:14:40 -0800 Alan Coopersmith (6417045) +2013-02-15 23:14:40 -0800 Alan Coopersmith (641704516) * XRebindKeysym: Drop unnecessary const-removing cast -2013-02-15 22:45:19 -0800 Alan Coopersmith (5608b67) +2013-02-15 22:45:19 -0800 Alan Coopersmith (5608b67f2) * cmsColNm.c: maintain constness of arguments to qsort helper function -2012-12-26 22:57:39 -0800 Alan Coopersmith (19275f9) +2012-12-26 22:57:39 -0800 Alan Coopersmith (19275f9e1) * Remove unused DECnet ("DNETCONN") code from Xlib -2012-12-26 22:56:38 -0800 Alan Coopersmith (acceb2c) +2012-12-26 22:56:38 -0800 Alan Coopersmith (acceb2cf6) * Remove unused TLI ("STREAMSCONN") code from Xlib -2011-05-20 18:25:24 +0200 Egbert Eich (53e2e92) +2011-05-20 18:25:24 +0200 Egbert Eich (53e2e92e3) * Don't hard code path to Xcms.txt file. -2012-10-22 13:54:11 -0500 Yaakov Selkowitz (11d6dac) +2012-10-22 13:54:11 -0500 Yaakov Selkowitz (11d6dac92) * XIM: remove Private and Public macros -2012-06-29 23:08:04 -0700 Alan Coopersmith (97b9864) +2012-06-29 23:08:04 -0700 Alan Coopersmith (97b9864ea) * Convert XCreate{Pix,Bit}map...Data to use C99 designated initializers -2012-06-29 22:57:13 -0700 Alan Coopersmith (7a8721b) +2012-06-29 22:57:13 -0700 Alan Coopersmith (7a8721b8a) * XCreate{Pix,Bit}map...Data: Free pixmap in error path if XCreateGC fails -2010-12-22 15:14:05 +0000 Philipp Reh (c868061) +2010-12-22 15:14:05 +0000 Philipp Reh (c86806148) * Events: Store event cookie when dequeuing event -2011-05-03 09:32:53 -0700 Jeremy Huddleston (5062342) +2011-05-03 09:32:53 -0700 Jeremy Huddleston (5062342d4) * clang analyzer: Don't warn about Xmalloc(0) -2011-05-08 09:08:07 -0700 Jeremy Huddleston (c19cda6) +2011-05-08 09:08:07 -0700 Jeremy Huddleston (c19cda6d6) * Silence clang static analysis warnings for SetReqLen -2011-05-17 20:49:59 -0700 Alan Coopersmith (c300a43) +2011-05-17 20:49:59 -0700 Alan Coopersmith (c300a430d) * Fix man page and comment references to use XFreeModifiermap (lowercase map) -2011-10-10 14:09:17 -0700 Jeremy Huddleston (f3bbb81) +2011-10-10 14:09:17 -0700 Jeremy Huddleston (f3bbb81c4) * Mark XKeycodeToKeysym as _X_DEPRECATED -2011-10-10 16:40:52 +0200 Bodo Graumann (cc4d526) +2011-10-10 16:40:52 +0200 Bodo Graumann (cc4d5260e) * libX11: Fixing modifier key range in Xutil.h (Bug #21910) -2011-10-27 13:24:10 +1000 Peter Hutterer (3bf3507) +2011-10-27 13:24:10 +1000 Peter Hutterer (3bf350742) * Switch GetEmptyReq and GetResReq to call _XGetRequest -2011-10-14 14:51:06 +1000 Peter Hutterer (3597915) +2011-10-14 14:51:06 +1000 Peter Hutterer (3597915f6) * include: Add GetReqSized() for request buffers of specific size -2011-10-27 13:53:22 +1000 Peter Hutterer (3155b9b) +2011-10-27 13:53:22 +1000 Peter Hutterer (3155b9bb2) * Use GetReqSized for GetReq and GetReqExtra -2011-01-31 14:01:59 +0200 Erkki Seppälä (79cb50e) +2011-01-31 14:01:59 +0200 Erkki Seppälä (79cb50e4c) * ximcp/imRmAttr: Handle leaking missing_list -2011-01-31 14:02:01 +0200 Erkki Seppälä (44e4720) +2011-01-31 14:02:01 +0200 Erkki Seppälä (44e472068) * ximcp/imRm: Handle leaking colormap_ret -2011-01-31 14:02:14 +0200 Erkki Seppälä (89dc7cc) +2011-01-31 14:02:14 +0200 Erkki Seppälä (89dc7ccfb) * ximcp/imTrX: Handle failing XGetWindowProperty -2011-01-31 14:02:15 +0200 Erkki Seppälä (8142209) +2011-01-31 14:02:15 +0200 Erkki Seppälä (81422098f) * ximcp/imLckup: Handle negative return value from _Xlcwctomb -2011-01-31 14:02:13 +0200 Ander Conselvan de Oliveira (a8598e0) +2011-01-31 14:02:13 +0200 Ander Conselvan de Oliveira (a8598e062) * lc/def/lcDefConv: Use Xcalloc to avoid use of uninitialized memory -2011-02-21 15:56:54 +0100 Samuel Thibault (93a4f5c) +2011-02-21 15:56:54 +0100 Samuel Thibault (93a4f5c47) * Fix status reporting for braille patterns -2011-02-21 21:54:17 +0100 Samuel Thibault (2cca621) +2011-02-21 21:54:17 +0100 Samuel Thibault (2cca621e3) * Make the Local XIM request key releases for braille -2011-01-10 16:22:45 +0200 Erkki Seppälä (e481512) +2011-01-10 16:22:45 +0200 Erkki Seppälä (e4815126b) * im/ximcp: release modifiermap before returning -2011-04-12 20:50:42 -0700 Alan Coopersmith (018d938) +2011-04-12 20:50:42 -0700 Alan Coopersmith (018d938aa) * Fix "attrinute" typo in comments in ximcp -2011-03-24 16:24:29 +0200 Ander Conselvan de Oliveira (4aa79f1) +2011-03-24 16:24:29 +0200 Ander Conselvan de Oliveira (4aa79f1f1) * Fix leaks in _XimEncodingNegotiation error paths. -2011-03-24 19:36:56 +0200 Ander Conselvan de Oliveira (3720ed7) +2011-03-24 19:36:56 +0200 Ander Conselvan de Oliveira (3720ed7bf) * Fix memory leaks on _XimProtoCreateIC error paths. -2011-03-24 19:48:44 +0200 Ander Conselvan de Oliveira (b7cc762) +2011-03-24 19:48:44 +0200 Ander Conselvan de Oliveira (b7cc762ba) * Fix memory leaks on _XimWriteCachedDefaultTree error paths. -2011-03-24 19:52:05 +0200 Ander Conselvan de Oliveira (7024f3d) +2011-03-24 19:52:05 +0200 Ander Conselvan de Oliveira (7024f3d90) * Fix memory leak on _XimCommitRecv error path. -2011-03-24 19:55:33 +0200 Ander Conselvan de Oliveira (60840dc) +2011-03-24 19:55:33 +0200 Ander Conselvan de Oliveira (60840dc31) * Fix memory leaks on _XimCbDispatch error path. -2011-03-24 20:40:41 +0200 Ander Conselvan de Oliveira (9fa1e98) +2011-03-24 20:40:41 +0200 Ander Conselvan de Oliveira (9fa1e98dd) * om: Fix memory leak on read_EncodingInfo error path. -2011-03-25 16:06:15 +0200 Ander Conselvan de Oliveira (748cf89) +2011-03-25 16:06:15 +0200 Ander Conselvan de Oliveira (748cf8946) * om: Fix potential memory leak in init_om. -2011-03-25 14:47:35 +0200 Ander Conselvan de Oliveira (6fe8d44) +2011-03-25 14:47:35 +0200 Ander Conselvan de Oliveira (6fe8d44ca) * om: Fix memory leaks on get_font_name error paths. -2011-10-09 02:26:45 -0700 Jeremy Huddleston (73a2898) +2011-10-09 02:26:45 -0700 Jeremy Huddleston (73a2898af) * Fix potential uninitialized variable access in _XimMakeICAttrIDList -2011-10-09 17:56:45 +0200 Yann Droneaud (bec22fe) +2011-10-09 17:56:45 +0200 Yann Droneaud (bec22fe97) * Return name instead of value in XGetIMValues() and XSetIMValues() -2011-10-11 17:27:59 +0200 Yann Droneaud (cded330) +2011-10-11 17:27:59 +0200 Yann Droneaud (cded3305d) * Return name instead of False in XSetICValues() -2011-10-14 17:39:21 -0700 Xue Wei (8d1e059) +2011-10-14 17:39:21 -0700 Xue Wei (8d1e05940) * mbtocs should not truncate input -2011-10-14 17:53:00 -0700 Alan Coopersmith (2f49f62) +2011-10-14 17:53:00 -0700 Alan Coopersmith (2f49f62a8) * Fix "nomal" -> "normal" typo in several comments -2011-11-08 20:18:09 +0000 Andreas Wettstein (4ef2779) +2011-11-08 20:18:09 +0000 Andreas Wettstein (4ef27790b) * XIM: Allow modifier releases in compose sequences (#26705) -2011-02-21 17:27:38 +0100 Samuel Thibault (b8b885d) +2011-02-21 17:27:38 +0100 Samuel Thibault (b8b885daf) * Match braille patterns with compose tree -2012-04-30 16:36:47 +1000 Peter Hutterer (79a5330) +2012-04-30 16:36:47 +1000 Peter Hutterer (79a5330db) * Typo fix -2012-03-15 22:03:21 -0700 Alan Coopersmith (4c7f0af) +2012-03-15 22:03:21 -0700 Alan Coopersmith (4c7f0af73) * Remove "register" qualifier that annoys Solaris Studio compiler -2012-03-04 02:00:13 -0800 Keith Packard (3d37513) +2012-03-04 02:00:13 -0800 Keith Packard (3d37513eb) * Block for other threads in _XUserLockDisplay -2011-02-20 17:09:43 +0200 Marko Myllynen (e8e91b6) +2011-02-20 17:09:43 +0200 Marko Myllynen (e8e91b69e) * Provide translation from XK_permille (ad5) to Unicode (U2030) -2012-01-01 21:04:52 +0000 Ryan Pavlik (fd71577) +2012-01-01 21:04:52 +0000 Ryan Pavlik (fd7157723) * Use pthreads on MinGW also -2011-12-14 02:17:55 -0500 Kusanagi Kouichi (5eb1147) +2011-12-14 02:17:55 -0500 Kusanagi Kouichi (5eb1147cc) * XQueryColors: Split a request into multiple requests if necessary -2011-11-29 23:56:57 -0800 Alan Coopersmith (30d4454) +2011-11-29 23:56:57 -0800 Alan Coopersmith (30d4454e3) * Reject negative string counts in copy_string_list -2011-11-09 21:00:36 -0800 Alan Coopersmith (0f08982) +2011-11-09 21:00:36 -0800 Alan Coopersmith (0f089824e) * XlcSL.c: convert old-style function definitions to ANSI C89 style -2011-10-17 09:45:15 +1000 Peter Hutterer (02dad70) +2011-10-17 09:45:15 +1000 Peter Hutterer (02dad70a8) * Add _XGetRequest as substitute for GetReq/GetReqExtra -2011-10-13 07:58:02 +0900 Choe Hwanjin (1871ff0) +2011-10-13 07:58:02 +0900 Choe Hwanjin (1871ff031) * XIM: Make Xim handle NEED_SYNC_REPLY flag -2011-05-04 15:34:31 -0700 Jeremy Huddleston (7efa7da) +2011-05-04 15:34:31 -0700 Jeremy Huddleston (7efa7da59) * XKB: XkbComputeSectionBounds: Check correct bounds in default switch-case -2011-05-04 11:35:31 -0700 Jeremy Huddleston (1d806a5) +2011-05-04 11:35:31 -0700 Jeremy Huddleston (1d806a555) * Dead code removal -2011-04-21 16:21:04 -0700 Alan Coopersmith (8127b17) +2011-04-21 16:21:04 -0700 Alan Coopersmith (8127b17dc) * Delete special case code to append "/sparcv9" to i18n module path -2011-04-12 22:30:45 -0700 Alan Coopersmith (dde00b2) +2011-04-12 22:30:45 -0700 Alan Coopersmith (dde00b2f6) * Convert malloc(strlen()); strcpy() sets to strdup -2011-04-12 21:27:45 -0700 Alan Coopersmith (7d7224d) +2011-04-12 21:27:45 -0700 Alan Coopersmith (7d7224d85) * Replace Xmalloc+bzero pairs with Xcalloc calls -2011-03-24 19:42:36 +0200 Ander Conselvan de Oliveira (369c956) +2011-03-24 19:42:36 +0200 Ander Conselvan de Oliveira (369c95668) * Fix memory leaks on _XimGetAttributeID error paths. -2011-03-30 15:06:10 +0300 Ander Conselvan de Oliveira (f50e651) +2011-03-30 15:06:10 +0300 Ander Conselvan de Oliveira (f50e651e8) * xcms: Fix memory leaks on LINEAR_RGB_InitSCCData error path. -2011-03-30 15:19:28 +0300 Ander Conselvan de Oliveira (fefb909) +2011-03-30 15:19:28 +0300 Ander Conselvan de Oliveira (fefb909a0) * xcms: Fix error on LINEAR_RGB_InitSCCData error path. -2011-03-24 14:17:44 +0200 Ander Conselvan de Oliveira (dce8150) +2011-03-24 14:17:44 +0200 Ander Conselvan de Oliveira (dce81504f) * FSWrap: fix potential leak in copy_string_list -2011-03-23 14:36:22 +0200 Ander Conselvan de Oliveira (0f71486) +2011-03-23 14:36:22 +0200 Ander Conselvan de Oliveira (0f7148695) * Fix memory leak with broken bitmap files in XReadBitmapFileData -2011-03-21 14:49:37 +0000 Harshula Jayasuriya (417e041) +2011-03-21 14:49:37 +0000 Harshula Jayasuriya (417e04111) * Add #define XK_SINHALA -2011-01-18 15:58:20 +0200 Erkki Seppälä (29ad23b) +2011-01-18 15:58:20 +0200 Erkki Seppälä (29ad23b98) * xkb: XkbPropertyPtr determined allocation success from wrong variables -2011-01-10 16:37:22 +0200 Erkki Seppälä (bbeee4f) +2011-01-10 16:37:22 +0200 Erkki Seppälä (bbeee4fd1) * keyBind: Use Xcalloc to initialize allocated _XKeytrans -2011-02-11 14:49:17 -0800 Alan Coopersmith (2618bd3) +2011-02-11 14:49:17 -0800 Alan Coopersmith (2618bd3fc) * Clean up memory when first XCreateRegion succeeds and second fails -2011-02-03 17:08:57 +0200 Erkki Seppälä (07fae91) +2011-02-03 17:08:57 +0200 Erkki Seppälä (07fae919a) * cmsProp: don't deal with uninitialized values, fail instead -2011-01-31 14:02:07 +0200 Ander Conselvan de Oliveira (ae4e753) +2011-01-31 14:02:07 +0200 Ander Conselvan de Oliveira (ae4e7538e) * xcms/LRGB: don't double-free property_return -2011-02-02 08:58:45 -0800 Alan Coopersmith (26270ab) +2011-02-02 08:58:45 -0800 Alan Coopersmith (26270ab1c) * Xrm.c: ReadInFile: refactor fstat error handling -2011-02-02 08:56:00 -0800 Alan Coopersmith (563318a) +2011-02-02 08:56:00 -0800 Alan Coopersmith (563318af9) * Expand GetSizeOfFile() macro at the one place it's called -2011-01-31 14:01:57 +0200 Erkki Seppälä (20470a8) +2011-01-31 14:01:57 +0200 Erkki Seppälä (20470a83e) * XlibInt: Use strncpy+zero termination instead of strcpy to enforce buffer size -2011-01-31 14:02:16 +0200 Erkki Seppälä (7576f5f) +2011-01-31 14:02:16 +0200 Erkki Seppälä (7576f5f15) * xlibi18n/lcFile: Removed superfluous check for NULL target_dir -2011-01-31 14:02:12 +0200 Ander Conselvan de Oliveira (698270c) +2011-01-31 14:02:12 +0200 Ander Conselvan de Oliveira (698270c47) * XlibInt: info_list->watch_data was reallocated, but result was discarded -2011-02-01 11:07:25 +0200 Ander Conselvan de Oliveira (7482afc) +2011-02-01 11:07:25 +0200 Ander Conselvan de Oliveira (7482afcaa) * xcms/LRGB: Add a label for freeing property_return. -2011-01-31 14:02:08 +0200 Ander Conselvan de Oliveira (8f5a564) +2011-01-31 14:02:08 +0200 Ander Conselvan de Oliveira (8f5a56474) * xcms/LRGB: Fix potential resource leak. -2011-01-31 14:02:05 +0200 Erkki Seppälä (afd1d4e) +2011-01-31 14:02:05 +0200 Erkki Seppälä (afd1d4eb5) * Xrm: NEWTABLE had a memory leak after a memory allocation error -2011-01-31 14:02:03 +0200 Erkki Seppälä (1ac1b69) +2011-01-31 14:02:03 +0200 Erkki Seppälä (1ac1b691d) * ImUtil: Handle a memory leak in one early return branch -2011-01-31 14:01:56 +0200 Erkki Seppälä (52d2c35) +2011-01-31 14:01:56 +0200 Erkki Seppälä (52d2c3558) * xlibi18n/lcGeneric: Initialize uninitialized local variable -2011-01-31 14:01:54 +0200 Erkki Seppälä (865043e) +2011-01-31 14:01:54 +0200 Erkki Seppälä (865043ea0) * xcmx/cmxColNm: Removed unused assignments to pBuf (in two functions) -2011-02-01 12:30:56 +0200 Alan Coopersmith (54550eb) +2011-02-01 12:30:56 +0200 Alan Coopersmith (54550ebb2) * XDefaultOMIF.c: Fix memory leaks in get_font_name -2011-01-18 12:49:48 +0200 Erkki Seppälä (b7694b0) +2011-01-18 12:49:48 +0200 Erkki Seppälä (b7694b0b5) * Comparing array against NULL is not useful "&xkb->server->vmods != NULL" -2011-01-12 15:51:11 +0200 Erkki Seppälä (3147ddb) +2011-01-12 15:51:11 +0200 Erkki Seppälä (3147ddbf4) * Variable "entry" tracked as NULL was dereferenced. -2011-01-27 09:54:00 +0200 Erkki Seppälä (e175587) +2011-01-27 09:54:00 +0200 Erkki Seppälä (e17558786) * Dereferencing possibly NULL "str" in call to function "memcpy" (Deref assumed on the basis of 'nonnull' parameter attribute.) -2011-01-10 16:17:47 +0200 Erkki Seppälä (8aacb3f) +2011-01-10 16:17:47 +0200 Erkki Seppälä (8aacb3fab) * Using freed pointer "e" -2011-01-03 12:25:28 -0500 Pauli Nieminen (1a72bc4) +2011-01-03 12:25:28 -0500 Pauli Nieminen (1a72bc414) * Initialize event type -2010-06-04 13:20:17 -0700 Alan Coopersmith (8ff5261) +2010-06-04 13:20:17 -0700 Alan Coopersmith (8ff526111) * LINEAR_RGB_InitSCCData: When malloc fails, don't try to free unallocated bits -2010-07-09 18:13:13 +0100 Daniel Stone (93b55ee) +2010-07-09 18:13:13 +0100 Daniel Stone (93b55eeec) * XStringToKeysym: Cope with 0x1234cafe-style input -2010-07-08 16:49:51 +0100 Daniel Stone (b414bc2) +2010-07-08 16:49:51 +0100 Daniel Stone (b414bc2c6) * XStringToKeysym: Check strdup() return value -2010-06-15 18:49:43 +0100 Daniel Stone (c1b175d) +2010-06-15 18:49:43 +0100 Daniel Stone (c1b175d3d) * Delete now-redundant XKeysymDB -2010-06-15 18:47:37 +0100 Daniel Stone (f0b87f3) +2010-06-15 18:47:37 +0100 Daniel Stone (f0b87f3de) * XStringToKeysym: Special case for XF86 keysyms -2016-10-14 16:49:08 +0200 Mike Gabriel (6c303d9) +2016-10-14 16:49:08 +0200 Mike Gabriel (6c303d9e4) * debian/rules: Don't use -pie -fPIE at build time for 3.5.99.2 as it causes nxagent to segfault. Investigating the reasons - behind it is in process... (origin/release-builds/3.6.x, - release-builds/3.6.x) + behind it is in process... -2016-10-14 02:31:38 +0000 Mihai Moldovan (75e0808) +2016-10-14 02:31:38 +0000 Mihai Moldovan (75e080800) * nx-X11/programs/Xserver/GL/glx/Imakefile: typo fix, leading to glcontextmodes.c not being compiled. -2016-10-13 14:10:28 +0200 Mike Gabriel (29e2934) +2016-10-13 14:10:28 +0200 Mike Gabriel (29e29342e) * release 3.5.99.2 (tag: 3.5.99.2) -2016-10-13 15:05:37 +0200 Mike Gabriel (64aa45a) +2016-10-13 15:05:37 +0200 Mike Gabriel (64aa45a61) * debian/*.triggers: Call ldconfig via a trigger for all shared libraries. -2016-10-13 15:05:31 +0200 Mike Gabriel (440c675) +2016-10-13 15:05:31 +0200 Mike Gabriel (440c675c2) * debian/rules: Don't modify/create post{inst,rm} scripts during dh_makeshlibs. This avoids adding ldconfig calls to such scripts. -2016-10-13 14:45:37 +0200 Mike Gabriel (bd25086) +2016-10-13 14:45:37 +0200 Mike Gabriel (bd25086c3) * hw/nxagent/{Clipboard|Events}.c: Typo fix in error messages. -2016-10-13 14:44:27 +0200 Mike Gabriel (d2fb76d) +2016-10-13 14:44:27 +0200 Mike Gabriel (d2fb76d8b) * nxcomp/{Client|}Proxy.cpp: Typo fix in error messages. -2016-10-13 14:17:55 +0200 Mike Gabriel (0006fc0) +2016-10-13 14:17:55 +0200 Mike Gabriel (0006fc04b) * debian/libnx-x11-6.symbols: Update symbols for new backports in libNX_X11 API. -2016-10-07 21:19:07 +0200 Ulrich Sibiller (97c2697) +2016-10-07 21:19:07 +0200 Ulrich Sibiller (97c26978b) * Pending.c: conditionally include stdio.h -2016-10-10 01:00:38 +0200 Ulrich Sibiller (0bf52dc) +2016-10-10 01:00:38 +0200 Ulrich Sibiller (0bf52dc99) * nxcomp: Fix typo in usage message. -2016-10-13 14:02:51 +0200 Mike Gabriel (133c91f) +2016-10-13 14:02:51 +0200 Mike Gabriel (133c91f73) * Merge branch 'uli42-pr/libX11_debian_backports' into 3.6.x -2013-05-21 21:54:55 +0200 Julien Cristau (a9f623f) +2013-05-21 21:54:55 +0200 Julien Cristau (a9f623f0a) * Add a couple fixups for the security patches -2013-05-08 19:33:09 +0200 Matthieu Herrb (838108c) +2013-05-08 19:33:09 +0200 Matthieu Herrb (838108c29) * XListFontsWithInfo: Re-decrement flist[0] before calling free() on it. -2013-03-31 12:22:35 -0700 Alan Coopersmith (dc749a4) +2013-03-31 12:22:35 -0700 Alan Coopersmith (dc749a457) * _XkbReadGetMapReply: reject maxKeyCodes smaller than the minKeyCode -2013-03-16 10:03:13 -0700 Alan Coopersmith (37f8d3e) +2013-03-16 10:03:13 -0700 Alan Coopersmith (37f8d3eb8) * Use calloc in XOpenDisplay to initialize structs containing pointers -2013-03-02 12:39:58 -0800 Alan Coopersmith (e386187) +2013-03-02 12:39:58 -0800 Alan Coopersmith (e386187e9) * Unbounded recursion in _XimParseStringFile() when parsing include files [CVE-2013-2004 2/2] -2013-03-02 12:01:39 -0800 Alan Coopersmith (bddfee4) +2013-03-02 12:01:39 -0800 Alan Coopersmith (bddfee4a9) * Unbounded recursion in GetDatabase() when parsing include files [CVE-2013-2004 1/2] -2013-03-02 15:08:21 -0800 Alan Coopersmith (dbc1171) +2013-03-02 15:08:21 -0800 Alan Coopersmith (dbc117193) * Avoid overflows in XListExtensions() [CVE-2013-1997 15/15] -2013-03-02 15:08:21 -0800 Alan Coopersmith (77edd88) +2013-03-02 15:08:21 -0800 Alan Coopersmith (77edd88e1) * Avoid overflows in XGetFontPath() [CVE-2013-1997 14/15] -2013-03-02 15:08:21 -0800 Alan Coopersmith (f6c5069) +2013-03-02 15:08:21 -0800 Alan Coopersmith (f6c5069ac) * Avoid overflows in XListFonts() [CVE-2013-1997 13/15] -2013-03-02 11:25:25 -0800 Alan Coopersmith (0284afb) +2013-03-02 11:25:25 -0800 Alan Coopersmith (0284afb80) * unvalidated length in _XimXGetReadData() [CVE-2013-1997 12/15] -2013-03-02 11:11:08 -0800 Alan Coopersmith (0bf09b4) +2013-03-02 11:11:08 -0800 Alan Coopersmith (0bf09b4bb) * unvalidated index/length in _XkbReadGetNamesReply() [CVE-2013-1997 11/15] -2013-03-02 11:01:04 -0800 Alan Coopersmith (e6d8856) +2013-03-02 11:01:04 -0800 Alan Coopersmith (e6d8856ef) * unvalidated index in _XkbReadVirtualModMap() [CVE-2013-1997 10/15] -2013-03-02 11:04:44 -0800 Alan Coopersmith (e27df80) +2013-03-02 11:04:44 -0800 Alan Coopersmith (e27df8070) * unvalidated index in _XkbReadExplicitComponents() [CVE-2013-1997 9/15] -2013-03-02 10:51:51 -0800 Alan Coopersmith (7564bf7) +2013-03-02 10:51:51 -0800 Alan Coopersmith (7564bf7ef) * unvalidated index in _XkbReadModifierMap() [CVE-2013-1997 8/15] -2013-03-02 10:39:21 -0800 Alan Coopersmith (8f2c050) +2013-03-02 10:39:21 -0800 Alan Coopersmith (8f2c05082) * unvalidated index in _XkbReadKeyBehaviors() [CVE-2013-1997 7/15] -2013-03-02 09:40:22 -0800 Alan Coopersmith (4c19cd0) +2013-03-02 09:40:22 -0800 Alan Coopersmith (4c19cd0c7) * unvalidated index in _XkbReadKeyActions() [CVE-2013-1997 6/15] -2013-03-02 09:28:33 -0800 Alan Coopersmith (5dae1d3) +2013-03-02 09:28:33 -0800 Alan Coopersmith (5dae1d3f4) * unvalidated index in _XkbReadKeySyms() [CVE-2013-1997 5/15] -2013-03-02 09:18:26 -0800 Alan Coopersmith (e6fbdea) +2013-03-02 09:18:26 -0800 Alan Coopersmith (e6fbdea84) * unvalidated indexes in _XkbReadGetGeometryReply() [CVE-2013-1997 4/15] -2013-03-02 09:12:47 -0800 Alan Coopersmith (0445730) +2013-03-02 09:12:47 -0800 Alan Coopersmith (0445730b1) * unvalidated indexes in _XkbReadGeomShapes() [CVE-2013-1997 3/15] -2013-03-01 22:49:01 -0800 Alan Coopersmith (b069526) +2013-03-01 22:49:01 -0800 Alan Coopersmith (b06952603) * unvalidated index in _XkbReadGetDeviceInfoReply() [CVE-2013-1997 2/15] -2013-03-01 19:30:09 -0800 Alan Coopersmith (2a1fbb1) +2013-03-01 19:30:09 -0800 Alan Coopersmith (2a1fbb181) * unvalidated lengths in XAllocColorCells() [CVE-2013-1997 1/15] -2013-03-09 11:04:37 -0800 Alan Coopersmith (e03f392) +2013-03-09 11:04:37 -0800 Alan Coopersmith (e03f3922a) * Make XGetWindowProperty() always initialize returned values -2013-03-02 13:03:55 -0800 Alan Coopersmith (b207105) +2013-03-02 13:03:55 -0800 Alan Coopersmith (b20710586) * Move repeated #ifdef magic to find PATH_MAX into a common header -2013-03-02 16:56:16 -0800 Alan Coopersmith (05b72b8) +2013-03-02 16:56:16 -0800 Alan Coopersmith (05b72b8da) * Convert more _XEatData callers to _XEatDataWords -2013-03-02 15:08:21 -0800 Alan Coopersmith (306ca00) +2013-03-02 15:08:21 -0800 Alan Coopersmith (306ca006a) * integer overflow in XGetModifierMapping() [CVE-2013-1981 13/13] -2013-03-02 15:08:21 -0800 Alan Coopersmith (748af52) +2013-03-02 15:08:21 -0800 Alan Coopersmith (748af521e) * integer overflow in XGetPointerMapping() & XGetKeyboardMapping() [CVE-2013-1981 12/13] -2013-03-02 15:08:21 -0800 Alan Coopersmith (9501bce) +2013-03-02 15:08:21 -0800 Alan Coopersmith (9501bce22) * integer overflow in XGetImage() [CVE-2013-1981 11/13] -2013-03-08 22:25:35 -0800 Alan Coopersmith (361d367) +2013-03-08 22:25:35 -0800 Alan Coopersmith (361d36770) * integer overflow in XGetWindowProperty() [CVE-2013-1981 10/13] -2013-03-02 13:18:48 -0800 Alan Coopersmith (2517230) +2013-03-02 13:18:48 -0800 Alan Coopersmith (25172302a) * integer overflows in TransFileName() [CVE-2013-1981 9/13] -2013-03-01 18:37:37 -0800 Alan Coopersmith (8468165) +2013-03-01 18:37:37 -0800 Alan Coopersmith (8468165ae) * integer truncation in _XimParseStringFile() [CVE-2013-1981 8/13] -2013-03-01 18:37:37 -0800 Alan Coopersmith (00d7a2e) +2013-03-01 18:37:37 -0800 Alan Coopersmith (00d7a2e5b) * integer overflow in ReadInFile() in Xrm.c [CVE-2013-1981 7/13] -2013-03-02 11:44:19 -0800 Alan Coopersmith (0349af1) +2013-03-02 11:44:19 -0800 Alan Coopersmith (0349af114) * Integer overflows in stringSectionSize() cause buffer overflow in ReadColornameDB() [CVE-2013-1981 6/13] -2013-03-01 22:49:01 -0800 Alan Coopersmith (8673bf0) +2013-03-01 22:49:01 -0800 Alan Coopersmith (8673bf071) * integer overflow in XListHosts() [CVE-2013-1981 5/13] -2013-03-01 22:49:01 -0800 Alan Coopersmith (7d18bbe) +2013-03-01 22:49:01 -0800 Alan Coopersmith (7d18bbe93) * integer overflow in XGetMotionEvents() [CVE-2013-1981 4/13] -2013-03-01 22:49:01 -0800 Alan Coopersmith (2977955) +2013-03-01 22:49:01 -0800 Alan Coopersmith (29779559c) * integer overflow in XListFontsWithInfo() [CVE-2013-1981 3/13] -2013-03-01 21:05:27 -0800 Alan Coopersmith (dda0c65) +2013-03-01 21:05:27 -0800 Alan Coopersmith (dda0c652f) * integer overflow in _XF86BigfontQueryFont() [CVE-2013-1981 2/13] -2013-03-01 21:05:27 -0800 Alan Coopersmith (de2d3cb) +2013-03-01 21:05:27 -0800 Alan Coopersmith (de2d3cb6b) * integer overflow in _XQueryFont() on 32-bit platforms [CVE-2013-1981 1/13] -2013-01-22 10:03:00 -0500 Nickolai Zeldovich (e8ada07) +2013-01-22 10:03:00 -0500 Nickolai Zeldovich (e8ada07fa) * XListFontsWithInfo: avoid accessing realloc'ed memory -2011-02-11 14:20:24 -0800 Alan Coopersmith (290f94a) +2011-02-11 14:20:24 -0800 Alan Coopersmith (290f94aea) * ximcp: Prevent memory leak & double free if multiple %L in string -2011-01-31 14:02:06 +0200 Erkki Seppälä (9361547) +2011-01-31 14:02:06 +0200 Erkki Seppälä (936154728) * Xrm: Handle the extremely unlikely situation of fstat failing -2016-10-12 08:32:04 +0200 Mike Gabriel (051d521) +2016-10-12 08:32:04 +0200 Mike Gabriel (051d521f6) * Merge branch 'uli42-pr/upgrade_libX11' into 3.6.x -2016-10-09 17:49:20 +0200 Ulrich Sibiller (b8de7bf) +2016-10-09 17:49:20 +0200 Ulrich Sibiller (b8de7bf65) * Use both __APPLE__ and __DARWIN__ defines -2015-04-15 10:16:18 +0200 Karl Tomlinson (0186533) +2015-04-15 10:16:18 +0200 Karl Tomlinson (01865335b) * MakeBigReq: don't move the last word, already handled by Data32 (X.Org CVE-2013-7439). -2013-04-19 14:30:40 -0700 Alan Coopersmith (670b8ef) +2013-04-19 14:30:40 -0700 Alan Coopersmith (670b8ef64) * Give GNU & Solaris Studio compilers hints about XEatData branches -2011-12-13 19:58:30 -0800 Alan Coopersmith (6165daf) +2011-12-13 19:58:30 -0800 Alan Coopersmith (6165dafda) * makekeys: move buf declaration from global to main to silence gcc -Wshadow -2011-09-22 18:44:13 -0400 Derek Buitenhuis (62e5b0f) +2011-09-22 18:44:13 -0400 Derek Buitenhuis (62e5b0ff8) * makekeys: Fix build/target word size mismatch when cross-compiling -2016-08-27 03:24:22 +0200 Ulrich Sibiller (0bcb4bb) +2016-08-27 03:24:22 +0200 Ulrich Sibiller (0bcb4bba2) * adapt Imakefile to call makekeys correctly after update -2010-06-15 18:48:48 +0100 Daniel Stone (c98265a) +2010-06-15 18:48:48 +0100 Daniel Stone (c98265ab4) * makekeys: Scan vendor keysyms as well as core -2009-03-17 15:42:19 -0700 Alan Coopersmith (7032799) +2009-03-17 15:42:19 -0700 Alan Coopersmith (70327993a) * When makekeys fails to find a good hash, print error instead of divide-by-zero -2008-10-25 09:13:08 -0400 James Cloos (f573654) +2008-10-25 09:13:08 -0400 James Cloos (f57365400) * Increase size of working arrays in the makekeys utility program. -2016-08-27 02:24:46 +0200 Ulrich Sibiller (9a3096a) +2016-08-27 02:24:46 +0200 Ulrich Sibiller (9a3096a2a) * Update keysym includes -2016-08-27 02:13:27 +0200 Ulrich Sibiller (1baa27d) +2016-08-27 02:13:27 +0200 Ulrich Sibiller (1baa27d09) * update files from modules dir of libX11 1.3.4 -2016-08-27 02:13:02 +0200 Ulrich Sibiller (da3e7fd) +2016-08-27 02:13:02 +0200 Ulrich Sibiller (da3e7fd28) * Xutil.h: Fix wrong include path -2016-08-27 01:44:41 +0200 Ulrich Sibiller (d3ae0b2) +2016-08-27 01:44:41 +0200 Ulrich Sibiller (d3ae0b2c9) * replace {x11,xim}trans.c links by libX11 1.3.4 solution -2016-08-27 01:22:46 +0200 Ulrich Sibiller (385dc2b) +2016-08-27 01:22:46 +0200 Ulrich Sibiller (385dc2b07) * update xlibi18n files to libX11 1.3.4 -2016-08-27 01:00:43 +0200 Ulrich Sibiller (e868fbb) +2016-08-27 01:00:43 +0200 Ulrich Sibiller (e868fbbfd) * update xcms files to libX11 1.3.4 -2016-08-27 00:37:53 +0200 Ulrich Sibiller (2749290) +2016-08-27 00:37:53 +0200 Ulrich Sibiller (274929053) * Update some missing files to libX11 1.3.4 -2016-08-27 00:31:05 +0200 Ulrich Sibiller (8a5f30f) +2016-08-27 00:31:05 +0200 Ulrich Sibiller (8a5f30fb1) * Add (Free|Get)EventData.c from libX11 1.3.4 -2016-08-27 00:16:07 +0200 Ulrich Sibiller (efa70b0) +2016-08-27 00:16:07 +0200 Ulrich Sibiller (efa70b0cf) * remove more NEED_REPLIES/EVENTS -2016-08-27 00:24:37 +0200 Ulrich Sibiller (0079db6) +2016-08-27 00:24:37 +0200 Ulrich Sibiller (0079db696) * Purge more remaining VCS refs -2016-08-27 00:04:03 +0200 Ulrich Sibiller (af1f7ce) +2016-08-27 00:04:03 +0200 Ulrich Sibiller (af1f7cee0) * Lift XKB*.c to libX11 1.3.4 -2016-08-25 21:43:53 +0200 Ulrich Sibiller (3e75c81) +2016-08-25 21:43:53 +0200 Ulrich Sibiller (3e75c816d) * XlibInt.c: shorten one ifdef -2016-08-24 16:52:58 +0200 Ulrich Sibiller (a497ebf) +2016-08-24 16:52:58 +0200 Ulrich Sibiller (a497ebf88) * update X.h and Xproto.h because of GenericEvent -2016-08-03 19:19:58 +0200 Ulrich Sibiller (2265215) +2016-08-03 19:19:58 +0200 Ulrich Sibiller (22652155f) * set USE_XCB define to 0 to prevent compiler complaints -2016-08-02 01:06:35 +0200 Ulrich Sibiller (e51b961) +2016-08-02 01:06:35 +0200 Ulrich Sibiller (e51b961a7) * Remove CRAY support -2016-08-02 01:23:54 +0200 Ulrich Sibiller (35270a3) +2016-08-02 01:23:54 +0200 Ulrich Sibiller (35270a3d9) * adapt include files to libX11 1.3.4 -2016-08-02 00:51:13 +0200 Ulrich Sibiller (7b0bdde) +2016-08-02 00:51:13 +0200 Ulrich Sibiller (7b0bdde5c) * update makekeys.c to libX11 1.3.4 (+ fix) -2016-08-01 23:54:34 +0200 Ulrich Sibiller (b4571a8) +2016-08-01 23:54:34 +0200 Ulrich Sibiller (b4571a8ff) * update lcUniConv subdir to libX11 1.3.4 -2016-07-29 00:44:38 +0200 Ulrich Sibiller (687d44b) +2016-07-29 00:44:38 +0200 Ulrich Sibiller (687d44b6e) * update src files *[ch] to libX11 1.3.4 -2016-07-26 23:19:36 +0200 Ulrich Sibiller (ea24f0b) +2016-07-26 23:19:36 +0200 Ulrich Sibiller (ea24f0b0e) * add XLOCALELIBDIR -2016-07-26 23:18:33 +0200 Ulrich Sibiller (ef5565f) +2016-07-26 23:18:33 +0200 Ulrich Sibiller (ef5565f8e) * improve header guards -2016-07-26 00:34:34 +0200 Ulrich Sibiller (5930731) +2016-07-26 00:34:34 +0200 Ulrich Sibiller (593073142) * update all files with NX relevant changes to libX11 1.3.4 -2016-08-24 16:41:42 +0200 Ulrich Sibiller (a053df0) +2016-08-24 16:41:42 +0200 Ulrich Sibiller (a053df0a7) * fix wrong include in XlibInt.c -2016-10-08 21:31:17 +0200 Mike Gabriel (6dce607) +2016-10-08 21:31:17 +0200 Mike Gabriel (6dce607ba) * Merge branch 'uli42-pr/decouple-xserver' into 3.6.x -2016-10-08 00:40:36 +0200 Ulrich Sibiller (b062272) +2016-10-08 00:40:36 +0200 Ulrich Sibiller (b0622729a) * xserver: add missing xkbfile.h -2016-10-07 13:12:39 +0200 Vadim Troshchinskiyddd (f55852c) +2016-10-07 13:12:39 +0200 Vadim Troshchinskiyddd (f55852c2e) * Fix nxproxy hostname parsing. -2016-10-07 13:58:57 +0200 Vadim Troshchinskiy (85f5fdf) +2016-10-07 13:58:57 +0200 Vadim Troshchinskiy (85f5fdfd2) * Check if unixPath is NULL before accessing it; this fixes crashing of nxagent when TEST is enabled. -2016-10-07 21:38:18 +0200 Mike Gabriel (3039a34) +2016-10-07 21:38:18 +0200 Mike Gabriel (3039a34cb) * Merge branch 'uli42-pr/decouple-xserver' into 3.6.x -2016-10-04 21:24:56 +0200 Ulrich Sibiller (736a233) +2016-10-04 21:24:56 +0200 Ulrich Sibiller (736a2333e) * xserver: adapt xkbsrc includes syntax to match upstream -2015-02-17 14:40:27 +1000 Dave Airlie (a2a7482) +2015-02-17 14:40:27 +1000 Dave Airlie (a2a7482f2) * os/access: fix regression in server interpreted auth -2014-10-22 14:24:55 -0700 Keith Packard (a116296) +2014-10-22 14:24:55 -0700 Keith Packard (a11629656) * os: Eliminate uninitialized value warnings from access.c -2014-12-09 09:31:00 -0800 Keith Packard (057cdaf) +2014-12-09 09:31:00 -0800 Keith Packard (057cdafdc) * dix: GetHosts bounds check using wrong pointer value [CVE-2014-8092 pt. 6] -2008-06-13 21:59:09 -0400 Eamon Walsh (da5da20) +2008-06-13 21:59:09 -0400 Eamon Walsh (da5da2091) * Fix multiple warnings in os/xdmauth.c. -2016-09-26 23:00:04 +0200 Ulrich Sibiller (b60f66b) +2016-09-26 23:00:04 +0200 Ulrich Sibiller (b60f66bb9) * replace transport.c link by xstrans.c -2016-09-26 22:20:45 +0200 Ulrich Sibiller (2a5364d) +2016-09-26 22:20:45 +0200 Ulrich Sibiller (2a5364d5f) * xserver: drop XKBSRV_NEED_FILE_FUNCS -2016-09-26 21:32:05 +0200 Ulrich Sibiller (7c5d836) +2016-09-26 21:32:05 +0200 Ulrich Sibiller (7c5d836c2) * xserver: remove define XKB_IN_SERVER -2016-09-26 21:12:23 +0200 Ulrich Sibiller (2fdb1ad) +2016-09-26 21:12:23 +0200 Ulrich Sibiller (2fdb1add0) * xserver: use own copy of XKBgeom.h header -2016-09-26 21:09:36 +0200 Ulrich Sibiller (2c31ce2) +2016-09-26 21:09:36 +0200 Ulrich Sibiller (2c31ce2f2) * xserver: use own copy of XKBrules.h header -2016-09-26 21:05:32 +0200 Ulrich Sibiller (e601843) +2016-09-26 21:05:32 +0200 Ulrich Sibiller (e60184393) * xserver: use own copy of XKBrules.h header -2016-09-26 21:03:02 +0200 Ulrich Sibiller (3b88190) +2016-09-26 21:03:02 +0200 Ulrich Sibiller (3b8819087) * xserver: use own copy of XKBstr.h header -2016-09-26 20:43:23 +0200 Ulrich Sibiller (3739a9b) +2016-09-26 20:43:23 +0200 Ulrich Sibiller (3739a9b30) * xserver: use own copy of XKBsrv.h header -2016-09-21 20:54:53 +0200 Ulrich Sibiller (f0c0ff4) +2016-09-21 20:54:53 +0200 Ulrich Sibiller (f0c0ff41b) * copy files from libX11 to xserver dir -2016-10-06 13:04:25 +0200 Mike Gabriel (168c063) +2016-10-06 13:04:25 +0200 Mike Gabriel (168c063dc) * run-nxproxy2nxagent-over-network: Improve comment that describes script usage. Fix commented-out NX_HOST assignment. -2016-10-06 12:59:52 +0200 Mike Gabriel (834f13f) +2016-10-06 12:59:52 +0200 Mike Gabriel (834f13fa1) * testscripts: Rename run-nxagent and run-nxagent-over-sockets. -2016-10-06 12:59:25 +0200 Mike Gabriel (cd0da09) +2016-10-06 12:59:25 +0200 Mike Gabriel (cd0da096a) * run-nxproxy2nxagent-over-network: New test script that tests nxproxy/nxagent connectivity between networked hosts. -2016-10-01 20:22:18 +0200 Mike Gabriel (3e59f16) +2016-10-01 20:22:18 +0200 Mike Gabriel (3e59f165f) * Merge branch 'sunweaver-pr/update-X11s-XKeysymDB' into 3.6.x -2011-03-22 11:28:56 +1000 Peter Hutterer (5dcf0d5) +2011-03-22 11:28:56 +1000 Peter Hutterer (5dcf0d573) * Add XF86TouchpadOn and XF86TouchpadOff to keysymdb (gh-sunweaver/pr/update-X11s-XKeysymDB) -2016-08-25 00:52:51 +0200 Mike Gabriel (34cb7b5) +2016-08-25 00:52:51 +0200 Mike Gabriel (34cb7b558) * lib/X11/XKeysymDB: Update to last version found in X.org (between 1.3.5 and 1.3.6). -2016-10-01 20:20:18 +0200 Mike Gabriel (5d52d21) +2016-10-01 20:20:18 +0200 Mike Gabriel (5d52d21bc) * Merge branch 'sunweaver-pr/use-gccmakedep' into 3.6.x -2016-10-01 12:04:54 +0200 Mike Gabriel (b160371) +2016-10-01 12:04:54 +0200 Mike Gabriel (b1603713e) * Imake.tmpl: Use gccmakedep instead of makedepend. (gh-sunweaver/pr/use-gccmakedep) -2016-10-01 20:16:39 +0200 Mike Gabriel (e3ea748) +2016-10-01 20:16:39 +0200 Mike Gabriel (e3ea74823) * Merge branch 'sunweaver-pr/fix-protoheader-mess' into 3.6.x -2016-10-01 11:28:50 +0200 Mike Gabriel (3698cf2) +2016-10-01 11:28:50 +0200 Mike Gabriel (3698cf27b) * include/extensions/damageproto.h: Use nx-X11's xfixesproto.h and damagewire.h instead of X.org's. (gh-sunweaver/pr/fix-protoheader-mess, pr/fix-protoheader-mess) -2016-10-01 11:25:29 +0200 Mike Gabriel (9acfa3b) +2016-10-01 11:25:29 +0200 Mike Gabriel (9acfa3b28) * randrproto: It was discovered that nx-libs shipped two different version of randr.h and randrproto.h. This commit leaves the newer file versions in the package and let's the build process use those everywhere. -2016-10-01 11:00:01 +0200 Mike Gabriel (f4f0b44) +2016-10-01 11:00:01 +0200 Mike Gabriel (f4f0b4490) * nx-X11: Enable -Wpedantic as default CFLAG. This is to detect redefined typedefs when building nxagent. -2016-10-01 10:53:37 +0200 Mike Gabriel (b50b0af) +2016-10-01 10:53:37 +0200 Mike Gabriel (b50b0af97) * hw/nxagent/X11/include/Xrandr_nxagent.h: Reduce injected libXrandr(_nxagent) header file, so that it only contains the XRRScreenChangeNotifyEvent typedef. -2016-09-29 20:58:15 +0200 Ulrich Sibiller (4858052) +2016-09-29 20:58:15 +0200 Ulrich Sibiller (485805235) * nx-libs.spec: Fix warning because of double reference to nxproxy.1.gz. -2016-09-29 20:28:59 +0200 Ulrich Sibiller (ce31b9c) +2016-09-29 20:28:59 +0200 Ulrich Sibiller (ce31b9c97) * Fix FTBFS with gcc 4.4 -2016-10-01 10:29:48 +0200 Mike Gabriel (a788c68) +2016-10-01 10:29:48 +0200 Mike Gabriel (a788c6856) * Makefile: Adapt install target to the new situation where we fake X11 headers in .build-export. This fixes FTBFS during file installation into .deb and .rpm packages. -2016-09-29 08:40:05 -0400 Mike DePaulo (5c2a8cd) +2016-09-29 08:40:05 -0400 Mike DePaulo (5c2a8cdc9) * Merge pull request #203 from mikedep333/issue-202 -2016-09-25 08:28:29 -0400 Mike DePaulo (cf435b3) +2016-09-25 08:28:29 -0400 Mike DePaulo (cf435b3bc) * nx-libs.spec: Add BuildRequires: imake -2016-09-24 23:59:02 +0200 Mike Gabriel (049bf68) +2016-09-24 23:59:02 +0200 Mike Gabriel (049bf681e) * Merge branch 'uli42-pr/improve_include_path_handling' into 3.6.x -2016-09-24 23:44:09 +0200 Ulrich Sibiller (97a5cec) +2016-09-24 23:44:09 +0200 Ulrich Sibiller (97a5cec70) * Revert "Fix wrong include" -2016-09-24 23:43:01 +0200 Ulrich Sibiller (c061022) +2016-09-24 23:43:01 +0200 Ulrich Sibiller (c061022a9) * whitespace cleanup -2016-09-24 23:41:55 +0200 Ulrich Sibiller (35e8c02) +2016-09-24 23:41:55 +0200 Ulrich Sibiller (35e8c02d9) * ensure that headers references use nx-X11 files if existing -2016-09-22 08:41:24 +0200 Mike Gabriel (a906bf0) +2016-09-22 08:41:24 +0200 Mike Gabriel (a906bf0f2) * Merge branch 'uli42-remove-misc' into 3.6.x -2016-09-21 18:37:10 +0200 Ulrich Sibiller (09d5e07) +2016-09-21 18:37:10 +0200 Ulrich Sibiller (09d5e073a) * remove misc dir -2016-09-21 18:28:22 +0200 Ulrich Sibiller (8d4d2bc) +2016-09-21 18:28:22 +0200 Ulrich Sibiller (8d4d2bc20) * move xkblib to xserver -2016-09-13 15:45:03 +0200 Mike Gabriel (43f135b) +2016-09-13 15:45:03 +0200 Mike Gabriel (43f135be0) * release 3.5.99.1 (tag: 3.5.99.1) -2016-08-26 12:49:28 +0200 Mike Gabriel (60e88a0) +2016-08-26 12:49:28 +0200 Mike Gabriel (60e88a0b1) * nxcomp/Loop.cpp: We have PrintVersionInfo(), why not use it? Use endl instead of \n for EOLs when streaming application's preamble to stderr. -2016-08-26 12:40:49 +0200 Mike Gabriel (01ebcfa) +2016-08-26 12:40:49 +0200 Mike Gabriel (01ebcfa35) * nxcomp/Loop.cpp: Mention DXPC copyright holders on application (i.e. nxproxy) start-up. -2016-08-24 16:29:46 +0200 Mike Gabriel (efa309a) +2016-08-24 16:29:46 +0200 Mike Gabriel (efa309add) * nxcomp/Loop.cpp: We have GetCopyrightInfo() in Misc.cpp, so why not use it? Also: point to ArcticaProject/nx-libs namespace on Github for further information. -2016-08-24 16:17:24 +0200 Mike Gabriel (3520015) +2016-08-24 16:17:24 +0200 Mike Gabriel (3520015b4) * hw/nxagent/Init.c: Fix copy+paste flaw when re-arranging copyright information as display by nxagent. -2016-08-24 16:13:52 +0200 Mike Gabriel (e201160) +2016-08-24 16:13:52 +0200 Mike Gabriel (e2011608f) * nxcomp/Misc.cpp: Display new list of copyright holders when launching nxproxy / nxagent. -2016-08-24 16:11:04 +0200 Mike Gabriel (8fc2e80) +2016-08-24 16:11:04 +0200 Mike Gabriel (8fc2e80bc) * nxcomp/*.c: Update copyright headers, use new list of copyright holders like for the .cpp files. -2016-08-24 16:08:41 +0200 Mike Gabriel (ed5d920) +2016-08-24 16:08:41 +0200 Mike Gabriel (ed5d920f6) * nxcomp/Loop.cpp: Refer to Github namespace of Arctica Project as location to search for software updates. -2016-08-24 15:59:36 +0200 Mike Gabriel (0ea971b) +2016-08-24 15:59:36 +0200 Mike Gabriel (0ea971b9e) * Merge branch 'uli42-fix_x2go_952' into 3.6.x -2016-08-21 13:12:23 +0200 Ulrich Sibiller (2d450e3) +2016-08-21 13:12:23 +0200 Ulrich Sibiller (2d450e383) * Fix pasting the clipboard directly after session start. -2016-07-28 13:21:29 +0200 Mike Gabriel (46fef31) +2016-07-28 13:21:29 +0200 Mike Gabriel (46fef3150) * nxagent.1 man page: Some layout fixes for string options with well-defined expected selections of values. -2016-07-28 13:20:38 +0200 Mike Gabriel (e9a3734) +2016-07-28 13:20:38 +0200 Mike Gabriel (e9a3734ae) * hw/nxagent/Display.c: Fix comment where the meaning of the "bypass" reconnectchecks parameter value is explained. -2016-07-28 12:59:37 +0200 Mike Gabriel (bff3305) +2016-07-28 12:59:37 +0200 Mike Gabriel (bff330577) * nxagent.1 man page: Add explanation about the new reconnectchecks nx/nx option. -2016-07-28 12:16:23 +0200 Mike Gabriel (aadf317) +2016-07-28 12:16:23 +0200 Mike Gabriel (aadf3175c) * hw/nxagent/Args.c: Follow-up fix for PR #183: expect reconnectchecks=bypass instead of =none. -2016-07-28 12:14:22 +0200 Mike Gabriel (443b527) +2016-07-28 12:14:22 +0200 Mike Gabriel (443b52723) * Merge branch 'Ionic-feature/reconnect-checks' into 3.6.x -2016-07-03 23:52:43 +0000 Mihai Moldovan (64a83d1) +2016-07-03 23:52:43 +0000 Mihai Moldovan (64a83d1e0) * nx-X11/programs/Xserver/hw/nxagent/Display.c: add FIXME comment to nxagentCheckForColormapsCompatibility(). (Ionic-feature/reconnect-checks) -2016-07-03 23:52:06 +0000 Mihai Moldovan (5ec7e48) +2016-07-03 23:52:06 +0000 Mihai Moldovan (5ec7e48ac) * nx-X11/programs/Xserver/hw/nxagent/Display.c: add FIXME comment to nxagentInitAndCheckVisuals(). -2016-07-09 03:28:27 +0000 Mihai Moldovan (e61c8c8) +2016-07-09 03:28:27 +0000 Mihai Moldovan (e61c8c85c) * nx-X11/programs/Xserver/hw/nxagent/Display.c: split up nxagentCheckForPixmapFormatsCompatibility() and nxagentInitPixmapFormats(). -2016-06-29 02:13:03 +0000 Mihai Moldovan (6618271) +2016-06-29 02:13:03 +0000 Mihai Moldovan (661827149) * nx-X11/programs/Xserver/hw/nxagent/Display.c: use new ReconnectTolerance nxagentOption value in nxagentCheckForPixmapFormatsCompatibility() and modify behavior based on this value. -2016-06-28 23:54:17 +0000 Mihai Moldovan (bb9b50b) +2016-06-28 23:54:17 +0000 Mihai Moldovan (bb9b50bfc) * nx-X11/programs/Xserver/hw/nxagent/Display.c: use new ReconnectTolerance nxagentOption value in nxagentCheckForDepthsCompatibility() and modify behavior based on this value. -2016-06-28 23:51:14 +0000 Mihai Moldovan (6effea5) +2016-06-28 23:51:14 +0000 Mihai Moldovan (6effea543) * nx-X11/programs/Xserver/hw/nxagent/Display.c: use new ReconnectTolerance nxagentOption in nxagentCheckForDefaultDepthCompatibility() and modify behavior based on this value. -2016-07-02 21:49:10 +0000 Mihai Moldovan (29be5cc) +2016-07-02 21:49:10 +0000 Mihai Moldovan (29be5cc07) * {nx-X11/programs/Xserver/hw/nxagent/{Args.c,Options.{c,h}},nxcomp/{Loop,Misc}.cpp}: add tolerancechecks parameter as an nx/nx option and ReconnectTolerance as an nxagentOption. -2016-07-27 13:05:27 +0200 Mike Gabriel (e1c85ca) +2016-07-27 13:05:27 +0200 Mike Gabriel (e1c85caac) * Merge branch 'uli42-3.6.x' into 3.6.x -2016-07-26 23:25:26 +0200 Ulrich Sibiller (9a4bb50) +2016-07-26 23:25:26 +0200 Ulrich Sibiller (9a4bb50af) * Fix wrong include -2016-07-06 10:38:25 +0200 Mike Gabriel (470611e) +2016-07-06 10:38:25 +0200 Mike Gabriel (470611e02) * release 3.5.99.0 (tag: 3.5.99.0) -2016-07-06 10:02:37 +0200 Mike Gabriel (961fa2a) +2016-07-06 10:02:37 +0200 Mike Gabriel (961fa2a0e) * README.md: Add build howto for openSUSE based RPMs. -2016-07-06 10:02:16 +0200 Mike Gabriel (b41369f) +2016-07-06 10:02:16 +0200 Mike Gabriel (b41369f27) * README.md: Status update of listed 3.6.x features. -2016-07-06 08:29:38 +0200 Mike Gabriel (98922f7) +2016-07-06 08:29:38 +0200 Mike Gabriel (98922f7b1) * make-changelog.sh: Ship simple script for updating the upstream ChangeLog file from Git history. -2016-07-06 01:14:56 +0200 Mike Gabriel (9b50e00) +2016-07-06 01:14:56 +0200 Mike Gabriel (9b50e0088) * Merge branch 'sunweaver-pr/update-license-files' into 3.6.x -2016-07-05 16:32:57 +0200 Mike Gabriel (6144b61) +2016-07-05 16:32:57 +0200 Mike Gabriel (6144b615d) * VCS info lines: Remove ancient X.org / XFree86 VCS info line from code files. -2016-07-05 16:22:51 +0200 Mike Gabriel (51c3d42) +2016-07-05 16:22:51 +0200 Mike Gabriel (51c3d42f3) * Per-file copyright notices: Update copyright information in file headers that NoMachine placed there own copyright statement in. -2016-07-05 13:44:32 +0200 Mike Gabriel (3c79d5c) +2016-07-05 13:44:32 +0200 Mike Gabriel (3c79d5cf4) * LICENSE files: Update copyright holders, FSF address and various other minor things. -2016-07-06 00:40:36 +0200 Mike Gabriel (5cbc936) +2016-07-06 00:40:36 +0200 Mike Gabriel (5cbc93678) * nxproxy.1 man page: Another rendering flaw fixed. -2016-07-06 00:25:06 +0200 Mike Gabriel (8ec78a0) +2016-07-06 00:25:06 +0200 Mike Gabriel (8ec78a0c3) * debian/*.doc-base: Add .doc-base files for bin:packages containing documentation. -2016-07-06 00:07:11 +0200 Ulrich Sibiller (196d38f) +2016-07-06 00:07:11 +0200 Ulrich Sibiller (196d38f96) * Xserver/dix/events.c: Drop unused i variable from TryClientEvents. -2016-07-06 00:04:05 +0200 Mike Gabriel (0369bf5) +2016-07-06 00:04:05 +0200 Mike Gabriel (0369bf5e9) * nxproxy.1 man page: Fix a typo + a rendering error. Detected by lintian. -2016-07-05 23:47:49 +0200 Mike Gabriel (67f937c) +2016-07-05 23:47:49 +0200 Mike Gabriel (67f937c4a) * debian/rules: Enable -fPIE / -pie hardening support for nxagent and nxproxy. -2016-07-05 22:56:01 +0200 Ulrich Sibiller (d7655e1) +2016-07-05 22:56:01 +0200 Ulrich Sibiller (d7655e15a) * Merge pull request #180 from uli42/pr/remove_need_events_replies -2016-07-04 21:11:21 +0200 Ulrich Sibiller (fa65199) +2016-07-04 21:11:21 +0200 Ulrich Sibiller (fa6519947) * remove unreferenced NEED_EVENTS/NEED_REPLIES -2016-07-05 22:23:27 +0200 Mike Gabriel (ff0d46e) +2016-07-05 22:23:27 +0200 Mike Gabriel (ff0d46e0b) * bin/nxauth: Remove deprecated wrapper script "nxauth". -2016-07-05 22:18:40 +0200 Mike Gabriel (f397f3a) +2016-07-05 22:18:40 +0200 Mike Gabriel (f397f3a42) * debian/nxagent.docs: whitespace only -2016-07-05 22:17:51 +0200 Mike Gabriel (754d33d) +2016-07-05 22:17:51 +0200 Mike Gabriel (754d33d81) * README.keystrokes: Move from base folder to doc/nxagent/. -2016-07-05 21:58:42 +0200 Mike Gabriel (a39c5c1) +2016-07-05 21:58:42 +0200 Mike Gabriel (a39c5c155) * nx-libs.spec: Adapt RPM packaging to doc files having been moved around. -2016-07-05 21:57:45 +0200 Mike Gabriel (cd9a6b9) +2016-07-05 21:57:45 +0200 Mike Gabriel (cd9a6b9dd) * debian/libxcomp3.docs: Install libxcomp3 documentation files into bin:package. -2016-07-05 21:48:27 +0200 Mike Gabriel (3ec3f61) +2016-07-05 21:48:27 +0200 Mike Gabriel (3ec3f6162) * debian/nxproxy.docs: Fix FTBFS due to missing documentation files (moved out of the way with recent commits). -2016-07-05 21:47:28 +0200 Mike Gabriel (2555bd5) +2016-07-05 21:47:28 +0200 Mike Gabriel (2555bd5ac) * documentation: Move README-VALGRIND out of doc/_attic_/ folder to doc/nxproxy/. -2016-07-05 13:34:26 +0200 Mike Gabriel (381706a) +2016-07-05 13:34:26 +0200 Mike Gabriel (381706aa2) * Merge branch 'sunweaver-pr/no-more-type-casting-in-writetoclient' into 3.6.x -2016-07-04 00:28:47 +0200 Alan Coopersmith (f6a1bda) +2016-07-04 00:28:47 +0200 Alan Coopersmith (f6a1bda2d) * Remove unneccesary casts from WriteToClient calls -2016-07-04 00:21:45 +0200 Kristian Høgsberg (ff81a52) +2016-07-04 00:21:45 +0200 Kristian Høgsberg (ff81a5269) * Make WriteToClient take a const void * like any decent IO write function. -2016-07-05 13:25:48 +0200 Mike Gabriel (06a9785) +2016-07-05 13:25:48 +0200 Mike Gabriel (06a97857a) * nxcomp/Misc.cpp: The clipboard nx/nx option is a string option, not int. -2016-07-05 13:25:17 +0200 Mike Gabriel (7e18fdf) +2016-07-05 13:25:17 +0200 Mike Gabriel (7e18fdf6e) * Xserver.man: Drop original and old Xserver man page. Relevant parts have now been added to nxagent.1 man page. -2016-07-05 13:24:16 +0200 Mike Gabriel (ebb2026) +2016-07-05 13:24:16 +0200 Mike Gabriel (ebb2026a7) * man pages: Greatly improve man pages nxagent.1 and nxproxy.1. -2016-07-05 10:47:55 +0200 Mike Gabriel (ee02822) +2016-07-05 10:47:55 +0200 Mike Gabriel (ee0282207) * File permission fixes: No executable bit on Imakefile files, *.c and *.h files. -2016-07-05 10:41:55 +0200 Mike Gabriel (5214930) +2016-07-05 10:41:55 +0200 Mike Gabriel (5214930a1) * X2Go remnants: Drop x2goagent.1 man page. Shipped in X2Go Server sources nowadays. -2016-07-05 10:41:24 +0200 Mike Gabriel (4017939) +2016-07-05 10:41:24 +0200 Mike Gabriel (40179398d) * nxcomp licensing: Move README.on-retroactive-DXPC-license to doc/nxcomp/ folder. -2016-07-05 10:40:11 +0200 Mike Gabriel (b38f010) +2016-07-05 10:40:11 +0200 Mike Gabriel (b38f01092) * NoMachine documentation files: Move to doc/_attic_/ folder. -2016-07-05 10:33:08 +0200 Mike Gabriel (d38ccd1) +2016-07-05 10:33:08 +0200 Mike Gabriel (d38ccd197) * LICENSE files: Have a main LICENSE file and one for nxcomp in the project's base folder. -2016-07-05 10:28:40 +0200 Mike Gabriel (cc4fdf6) +2016-07-05 10:28:40 +0200 Mike Gabriel (cc4fdf6f0) * X.org 6.9 documentation files: Move into doc/_attic_/. -2016-07-05 10:26:34 +0200 Mike Gabriel (4ad2943) +2016-07-05 10:26:34 +0200 Mike Gabriel (4ad29435c) * Drop multiple COPYING files contaning the GPL-2 license text. -2016-07-05 10:16:00 +0200 Mike Gabriel (d14cc53) +2016-07-05 10:16:00 +0200 Mike Gabriel (d14cc5361) * doc/_attic_/: Introduce an "_attic_" folder. Move diffs between NoMachine's nx-X11 3.5 and X.org 6.9 here. -2016-07-05 10:15:12 +0200 Mike Gabriel (74a52dd) +2016-07-05 10:15:12 +0200 Mike Gabriel (74a52dd35) * doc/ folder: Have one sub-folder per nx-libs component. -2016-07-05 10:11:19 +0200 Mike Gabriel (74edd6e) +2016-07-05 10:11:19 +0200 Mike Gabriel (74edd6e73) * test scripts: Move to top folder "testscripts/" in source tree. -2016-07-05 10:08:03 +0200 Mike Gabriel (aa42107) +2016-07-05 10:08:03 +0200 Mike Gabriel (aa4210715) * Merge branch 'sunweaver-pr/rpm-packaging-updates' into 3.6.x -2016-07-05 09:54:47 +0200 Mike Gabriel (058ae3e) +2016-07-05 09:54:47 +0200 Mike Gabriel (058ae3e76) * nx-libs.spec: Add Conflicts: fields for removed shared library bin:packages. -2016-07-04 16:34:38 +0200 Mike Gabriel (1910142) +2016-07-04 16:34:38 +0200 Mike Gabriel (1910142cf) * nx-libs.spec: Let libNX_X11-6 and libNX_X11-devel conflict with deprecated libXau6 and libXau-devel. -2016-07-04 16:31:18 +0200 Mike Gabriel (6dded30) +2016-07-04 16:31:18 +0200 Mike Gabriel (6dded30a7) * nx-libs.spec: Let nxagent conflict with nxauth, which is not provided anymore. -2016-07-04 16:27:34 +0200 Mike Gabriel (59eab0a) +2016-07-04 16:27:34 +0200 Mike Gabriel (59eab0a82) * nx-libs.spec: Add correct Obsoletes:/Provides: fields for lib* bin:packages. -2016-07-04 15:32:58 +0200 Mike Gabriel (5c65e9b) +2016-07-04 15:32:58 +0200 Mike Gabriel (5c65e9b40) * nx-libs.spec: Fix various issues since last testing the RPM builds of nx-libs: -2016-07-05 09:46:45 +0200 Mike Gabriel (a1a7b1a) +2016-07-05 09:46:45 +0200 Mike Gabriel (a1a7b1aab) * debian/control: Add some hard and exact-versioned dependencies for our bin:packages. Assure that no old share lib packages with the same set of symbols remain on the system when upgrading. -2016-07-05 09:10:28 +0200 Mike Gabriel (bf08b99) +2016-07-05 09:10:28 +0200 Mike Gabriel (bf08b9960) * Merge branch 'sunweaver-pr/writeeventstoclients-no-sequencenumber' into 3.6.x -2016-07-03 22:52:13 +0200 Jamey Sharp (cb0089b) +2016-07-03 22:52:13 +0200 Jamey Sharp (cb0089bad) * Set event sequence number in WriteEventsToClient instead of at callers. -2016-07-03 22:06:43 +0200 Jamey Sharp (9ea8871) +2016-07-03 22:06:43 +0200 Jamey Sharp (9ea88717d) * Make WriteEventsToClient/WriteToClient no-op on fake or dead clients. -2016-07-05 08:34:17 +0200 Mike Gabriel (320a8cc) +2016-07-05 08:34:17 +0200 Mike Gabriel (320a8cc0c) * Merge branch 'sunweaver-pr/silencing-compiler-warnings' into 3.6.x -2016-07-05 08:16:09 +0200 Tomas Carnecky (b15fc63) +2016-07-05 08:16:09 +0200 Tomas Carnecky (b15fc63f4) * Replace INITARGS with void -2016-06-29 15:07:16 +0200 Mike Gabriel (f0af82c) +2016-06-29 15:07:16 +0200 Mike Gabriel (f0af82cbb) * nx-X11/lib/X11/XKBMisc.c: Avoid warning about maybe non-assigned variables (mask, newMask). -2016-06-29 15:02:00 +0200 Daniel Stone (d60297e) +2016-06-29 15:02:00 +0200 Daniel Stone (d60297e41) * Remove INITARGS braindamage, change to void; add XkbExtensionInit prototype to xkb.h. Explicitly initialise nTypes in xkb.c. -2016-06-29 14:58:47 +0200 Keith Packard (ecaf4df) +2016-06-29 14:58:47 +0200 Keith Packard (ecaf4df7f) * Xserver/Xext/xres.c: Drop unused REQUEST macro call (for xXResQueryVersionReq). -2016-06-29 14:28:49 +0200 Mike Gabriel (8949935) +2016-06-29 14:28:49 +0200 Mike Gabriel (894993501) * Xserver: Post-REGION-macros-to-inline-funcs clean-up. -2016-06-29 14:17:53 +0200 Mike Gabriel (8df1a67) +2016-06-29 14:17:53 +0200 Mike Gabriel (8df1a67b6) * Xserver/mi/mizerarc.c: Initialize oddPtrs as NULL before using it (in miZeroPolyArc). -2016-06-29 14:14:15 +0200 Mike Gabriel (c08d030) +2016-06-29 14:14:15 +0200 Mike Gabriel (c08d0308d) * Xserver/mi/miarc.c: Initialize dashRemaining with 0 before using it. -2016-06-29 14:09:52 +0200 Mike Gabriel (a8fd16c) +2016-06-29 14:09:52 +0200 Mike Gabriel (a8fd16ce6) * Xserver/os/xdmauth.c: Avoid compiler warnings due to -Wswitch being enabled. Use if statement rather than switch. -2016-06-29 14:05:12 +0200 Mike Gabriel (141316a) +2016-06-29 14:05:12 +0200 Mike Gabriel (141316af0) * Xserver/os/log.c: Make sure strlcpy is defined in log.c. Immitate what is done in X.org. -2016-06-29 13:57:05 +0200 Adam Jackson (f46af7d) +2016-06-29 13:57:05 +0200 Adam Jackson (f46af7de8) * Restore compression of duplicate log file entries. -2016-06-29 13:45:20 +0200 Keith Packard (b5cceb7) +2016-06-29 13:45:20 +0200 Keith Packard (b5cceb740) * os: Make sure that writing our pid to the lock file actually worked -2016-06-29 13:35:06 +0200 Mike Gabriel (bad0e8b) +2016-06-29 13:35:06 +0200 Mike Gabriel (bad0e8bdd) * Xserver/os/connection.c: Drop unused variable 'restore_trans_conn' from ClientAuthorized(). -2016-06-29 13:33:51 +0200 Mike Gabriel (00ebfaf) +2016-06-29 13:33:51 +0200 Mike Gabriel (00ebfaf53) * Xserver/os/connection.c: Only define XSERV_t, TRANS_SERVER and TRANS_REOPEN if not yet defined. -2016-06-29 13:30:08 +0200 Mike Gabriel (b34b47e) +2016-06-29 13:30:08 +0200 Mike Gabriel (b34b47ed5) * nx-X11/lib/X11/imTrX.c: Fix warning ‘len’ may be used uninitialized in this function (_XimRead). -2016-06-29 13:28:23 +0200 Mike Gabriel (eddd487) +2016-06-29 13:28:23 +0200 Mike Gabriel (eddd4876b) * nx-X11/lib/X11/imInsClbk.c: Fix warning 'right-hand operand of comma expression has no effect' in _XimFilterPropertyNotify. -2016-06-29 13:24:38 +0200 Mike Gabriel (3569ac1) +2016-06-29 13:24:38 +0200 Mike Gabriel (3569ac171) * nx-X11/lib/X11/lcFile.c: Drop conditional always evaluating as True. -2016-06-29 13:20:30 +0200 Mike Gabriel (365fa4f) +2016-06-29 13:20:30 +0200 Mike Gabriel (365fa4f3e) * nx-X11/lib/X11/XKBMisc.c: Drop conditional always evaluating as True. -2016-06-29 13:17:04 +0200 Mike Gabriel (ed61433) +2016-06-29 13:17:04 +0200 Mike Gabriel (ed61433e1) * nx-X11/lib/X11/LiHosts.c: Drop unused variable (in XListHosts). -2016-06-29 13:10:08 +0200 Mike Gabriel (5e2e760) +2016-06-29 13:10:08 +0200 Mike Gabriel (5e2e760d3) * Avoid 'siAddr' maybe being used uninitialized in XAddHost and XRemoveHost. -2016-06-29 12:53:21 +0200 Mike Gabriel (35dbbd7) +2016-06-29 12:53:21 +0200 Mike Gabriel (35dbbd7e4) * hw/nxagent/Exrensions.c: Post-RandR 1.5 update fix. Properly set rrProvider hook functions to NULL. -2016-06-29 12:50:14 +0200 Mike Gabriel (e02bdf9) +2016-06-29 12:50:14 +0200 Mike Gabriel (e02bdf929) * hw/nxagent/Args.c: Fix fprintf placeholder (%u -> %lu). -2016-06-29 12:45:45 +0200 Adam Jackson (7e21611) +2016-06-29 12:45:45 +0200 Adam Jackson (7e21611db) * Remove fbpseudocolor -2016-06-29 12:37:22 +0200 Cyril Brulebois (3a54da8) +2016-06-29 12:37:22 +0200 Cyril Brulebois (3a54da8bc) * fb: Mark some variables as unused. -2016-06-29 12:38:31 +0200 Jeremy Huddleston (b91099b) +2016-06-29 12:38:31 +0200 Jeremy Huddleston (b91099b97) * Add _X_UNUSED attribute to designate unused variables and silence warnings -2016-06-29 12:18:52 +0200 Mike Gabriel (cef6d72) +2016-06-29 12:18:52 +0200 Mike Gabriel (cef6d723c) * Xserver/composite/compint.h: Disable debugging in Copmosite extension. -2016-06-29 12:07:26 +0200 Mike Gabriel (f364bac) +2016-06-29 12:07:26 +0200 Mike Gabriel (f364bacf8) * Xserver/xfixes/region.c: Don't declare and set PictureScreenPtr ps (in ProcXFixesSetPictureClipRegion). Variable is not used. -2016-07-05 08:09:24 +0200 Mike Gabriel (854f3fa) +2016-07-05 08:09:24 +0200 Mike Gabriel (854f3fa49) * Merge branch 'sunweaver-pr/proxy-to-proxy-over-unix-socket' into 3.6.x -2016-06-15 16:44:28 +0200 Mike Gabriel (5a22f2e) +2016-06-15 16:44:28 +0200 Mike Gabriel (5a22f2ec1) * test scripts: Add test scripts for testing Unix file socket support (i.e. proxy2proxy and proxy2agent sessions via Unix file sockets). -2016-06-15 10:29:12 +0200 Mike Gabriel (c6e9565) +2016-06-15 10:29:12 +0200 Mike Gabriel (c6e956512) * nxcomp/Loop.cpp: Add Unix file socket support for proxy <-> proxy connection. -2015-06-02 14:55:40 +0200 Salvador Fandino (b23dcd1) +2015-06-02 14:55:40 +0200 Salvador Fandino (b23dcd101) * merge code paths depending on acceptHost being "" -2015-06-02 15:35:50 +0200 Salvador Fandino (f706d77) +2015-06-02 15:35:50 +0200 Salvador Fandino (f706d774b) * remove now unused function ParseListenOption -2015-06-02 13:25:34 +0200 Salvador Fandino (c92a102) +2015-06-02 13:25:34 +0200 Salvador Fandino (c92a102ba) * rewrite WaitForRemote to build on top of ListenConnectionTCP -2015-06-02 12:54:15 +0200 Salvador Fandino (28736a8) +2015-06-02 12:54:15 +0200 Salvador Fandino (28736a888) * remove unused listenHost parameter -2015-06-02 12:34:20 +0200 Salvador Fandino (d6edd7c) +2015-06-02 12:34:20 +0200 Salvador Fandino (d6edd7c97) * Remove work around for OS/X that was doing nothing -2015-06-02 12:30:49 +0200 Salvador Fandino (d2e8551) +2015-06-02 12:30:49 +0200 Salvador Fandino (d2e8551ef) * Simplify ParseListenOption -2015-06-02 10:31:53 +0200 Salvador Fandino (5ea2d90) +2015-06-02 10:31:53 +0200 Salvador Fandino (5ea2d901b) * rewrite SetupUnixSocket to use ListenConnectionUnix -2015-06-01 17:52:33 +0200 Salvador Fandino (c5a2cf8) +2015-06-01 17:52:33 +0200 Salvador Fandino (c5a2cf82f) * Rework SetupTcpSocket to use ListenConnectionTCP -2016-07-04 22:55:23 +0200 Mike Gabriel (e0edae0) +2016-07-04 22:55:23 +0200 Mike Gabriel (e0edae04d) * Merge branch 'sunweaver-pr/xerrordb-from-xorg' into 3.6.x -2016-06-28 20:30:42 +0200 Mike Gabriel (1bd2463) +2016-06-28 20:30:42 +0200 Mike Gabriel (1bd2463a2) * libNX_X11 data files: Install libNX_X11 related data files. -2016-07-04 16:37:55 +0200 Mike Gabriel (27b0b57) +2016-07-04 16:37:55 +0200 Mike Gabriel (27b0b5723) * Merge branch 'sunweaver-pr/type-safe-swapping' into 3.6.x -2016-06-29 01:36:31 +0200 Mike Gabriel (286d832) +2016-06-29 01:36:31 +0200 Mike Gabriel (286d83260) * Use internal temp variable for swap macros. Make swaps/swapl type safe (introducing wrong_size check at build time). -2016-06-15 16:46:10 +0200 Mike Gabriel (d1d859d) +2016-06-15 16:46:10 +0200 Mike Gabriel (d1d859dfd) * test scripts: Update copyright headers. -2016-06-15 16:42:25 +0200 Mike Gabriel (b767ca5) +2016-06-15 16:42:25 +0200 Mike Gabriel (b767ca5c3) * test scripts: Rename run-nxproxy2nxproxy-test -> run-nxproxy2nxproxy. -2016-07-02 14:11:38 +0200 Mike Gabriel (1dbd3c8) +2016-07-02 14:11:38 +0200 Mike Gabriel (1dbd3c888) * Merge branch 'sunweaver-pr/backport-Xorg-memory-handling' into 3.6.x -2016-06-27 12:53:03 +0200 Mike Gabriel (e858082) +2016-06-27 12:53:03 +0200 Mike Gabriel (e85808245) * debian/patches: Refresh patches after changes in upstream code. -2016-06-28 16:55:26 +0200 Mike Gabriel (40e3984) +2016-06-28 16:55:26 +0200 Mike Gabriel (40e398409) * nx-X11/include/extensions/XKBsrv.h: Different memory handling when built with Xserver and with Xlib. -2016-06-27 12:12:31 +0200 Mike Gabriel (f779b2e) +2016-06-27 12:12:31 +0200 Mike Gabriel (f779b2e3c) * os: Remove deprecated malloc/free wrappers, clean {X,XNF}{alloc,calloc,realloc,free,strdup} from pre-C89 baggage -2016-06-27 11:51:31 +0200 Mike Gabriel (ce40aec) +2016-06-27 11:51:31 +0200 Mike Gabriel (ce40aec08) * nx-X11/programs/Xserver: Drop {X,x}calloc() macros, use calloc() instead. -2016-06-26 02:08:32 +0200 Mike Gabriel (74a5450) +2016-06-26 02:08:32 +0200 Mike Gabriel (74a5450bc) * nx-X11/programs/Xserver: Drop {X,x}realloc() macros, use realloc() instead. -2016-06-26 01:51:18 +0200 Mike Gabriel (2646fc2) +2016-06-26 01:51:18 +0200 Mike Gabriel (2646fc254) * nx-X11/programs/Xserver: Drop {X,x}alloc() macros, use malloc() instead. -2016-06-26 01:38:22 +0200 Mike Gabriel (acf8714) +2016-06-26 01:38:22 +0200 Mike Gabriel (acf87144d) * nx-X11/programs/Xserver: Drop {X,x}free() macros, use free() instead. -2016-07-02 13:53:16 +0200 Mike Gabriel (279d371) +2016-07-02 13:53:16 +0200 Mike Gabriel (279d37127) * Merge branch 'sunweaver-pr/protocols-version-h' into 3.6.x -2016-06-28 12:07:10 +0200 Mike Gabriel (487870f) +2016-06-28 12:07:10 +0200 Mike Gabriel (487870fff) * Xserver/include/protocol-versions.h: Switch to having an Xserver-specific header file containing all use protocol versions. -2016-06-28 12:06:50 +0200 Mike Gabriel (a08e232) +2016-06-28 12:06:50 +0200 Mike Gabriel (a08e2323e) * Xserver Imakefiles: Make sure NXAGENT_SERVER is defined for all extensions. -2016-07-01 16:08:55 +0200 Mike Gabriel (dd5f5b5) +2016-07-01 16:08:55 +0200 Mike Gabriel (dd5f5b56b) * Merge branch 'sunweaver-pr/ld-loading-libX11-hack' into 3.6.x -2016-06-30 23:50:12 +0200 Mike Gabriel (5934d03) +2016-06-30 23:50:12 +0200 Mike Gabriel (5934d03ef) * Rework nxagent and nxproxy wrapper scripts. -2016-07-01 16:00:04 +0200 Mike Gabriel (da7261c) +2016-07-01 16:00:04 +0200 Mike Gabriel (da7261cfe) * Merge branch 'uli42-pr/drop_libNX_Xext' into 3.6.x -2016-07-01 13:54:11 +0200 Ulrich Sibiller (1cd7e35) +2016-07-01 13:54:11 +0200 Ulrich Sibiller (1cd7e35cb) * finally drop libNX_Xext -2016-07-01 13:54:10 +0200 Ulrich Sibiller (e78c5bc) +2016-07-01 13:54:10 +0200 Ulrich Sibiller (e78c5bc3c) * remove shm code from libNX_Xext -2016-07-01 00:55:53 +0200 Ulrich Sibiller (232c7ad) +2016-07-01 00:55:53 +0200 Ulrich Sibiller (232c7ad91) * avoid conflicts when mixing own includes with upstream includes -2016-07-01 00:05:30 +0200 Ulrich Sibiller (e77e37f) +2016-07-01 00:05:30 +0200 Ulrich Sibiller (e77e37ff0) * remove XShape code from libNX_Xext -2016-07-01 15:48:55 +0200 Mike Gabriel (2f19f2f) +2016-07-01 15:48:55 +0200 Mike Gabriel (2f19f2f66) * Merge branch 'sunweaver-pr/libXau-cleanup' into 3.6.x -2016-06-23 10:46:48 +0200 Mike Gabriel (2045452) +2016-06-23 10:46:48 +0200 Mike Gabriel (204545286) * nxagent Xserver: Drop Kerberos code. Not used in nxagent. -2016-06-23 10:31:42 +0200 Mike Gabriel (26bf48b) +2016-06-23 10:31:42 +0200 Mike Gabriel (26bf48bab) * library-cleanup: Don't build libNX_Xau anymore. Use system's libXau shared library. -2016-06-23 10:27:37 +0200 Mike Gabriel (b214c73) +2016-06-23 10:27:37 +0200 Mike Gabriel (b214c73b5) * nxauth: Drop nxauth tool completely, xauth can be successfully used with nxagent / nxproxy instead. -2016-07-01 14:02:52 +0200 Mike Gabriel (a3a2952) +2016-07-01 14:02:52 +0200 Mike Gabriel (a3a295288) * Merge branch 'sunweaver-pr/debian-packaging-updates' into 3.6.x -2016-07-01 00:00:29 +0200 Mike Gabriel (12ca29b) +2016-07-01 00:00:29 +0200 Mike Gabriel (12ca29bf5) * debian/*.dirs: Don't create directories in the Debian package. All handled well by the upstream Makefile. -2016-06-23 21:33:23 +0200 Mike Gabriel (2d016f8) +2016-06-23 21:33:23 +0200 Mike Gabriel (2d016f826) * roll-tarball.sh: Move out of debian/ folder into project's base folder. -2016-06-23 21:28:42 +0200 Mike Gabriel (82a8d59) +2016-06-23 21:28:42 +0200 Mike Gabriel (82a8d595d) * debian/libxcompext3.symbols: Add symbols file for libXcompext3. -2016-06-23 21:13:20 +0200 Mike Gabriel (ba5f32c) +2016-06-23 21:13:20 +0200 Mike Gabriel (ba5f32cda) * nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c: Fix typo (grammer -> grammar). -2016-06-23 21:09:19 +0200 Mike Gabriel (7d66941) +2016-06-23 21:09:19 +0200 Mike Gabriel (7d66941ae) * debian/rules: Use buildflags.mk from dpkg-dev. Enable bindnow hardening flag. -2016-06-23 21:08:47 +0200 Mike Gabriel (56f776c) +2016-06-23 21:08:47 +0200 Mike Gabriel (56f776ced) * debian/control: Versioned B-D: dpkg-dev (>= 1.16.1.1). -2016-06-23 15:45:33 +0200 Mike Gabriel (2a2d7f0) +2016-06-23 15:45:33 +0200 Mike Gabriel (2a2d7f0e2) * debian/control: Remove all Pre-Depends: fields from all bin:pkgs. -2016-06-22 12:14:00 +0200 Mike Gabriel (9663b1c) +2016-06-22 12:14:00 +0200 Mike Gabriel (9663b1ce2) * debian/control: Bump Standards: to 3.9.8. (Various changes were needed). -2016-06-22 12:13:23 +0200 Mike Gabriel (87ce9b4) +2016-06-22 12:13:23 +0200 Mike Gabriel (87ce9b4b0) * debian/{control,compat}: Bump to DH compat level 9. -2016-06-22 12:08:49 +0200 Mike Gabriel (2e1ec61) +2016-06-22 12:08:49 +0200 Mike Gabriel (2e1ec6181) * debian/control: Use my DD address in Uploaders: field. -2016-06-22 12:08:35 +0200 Mike Gabriel (24ff7db) +2016-06-22 12:08:35 +0200 Mike Gabriel (24ff7db2b) * debian/changelog: Suppress warnings from lintian about -0 revision in version string. -2016-06-22 10:26:15 +0200 Mike Gabriel (b4d7b99) +2016-06-22 10:26:15 +0200 Mike Gabriel (b4d7b9989) * debian/control: Drop various not-used-anymore libNX_* related packages. Add B:/R: to libnx-x11-{6,dev,6-dbg) to uninstall those package when upgrading to nx-libs 3.6.x. -2016-06-22 10:12:33 +0200 Mike Gabriel (6b423ee) +2016-06-22 10:12:33 +0200 Mike Gabriel (6b423eefd) * roll-tarball.sh: Don't ship doc/X11-symbols/ in the lite (proxy-only) tarball derived from the nx-libs code tree. -2016-06-22 10:10:49 +0200 Mike Gabriel (908b930) +2016-06-22 10:10:49 +0200 Mike Gabriel (908b930c9) * debian/rules: Don't attempt at removing $(CURDIR)/.preserve/. Not needed anymore since we removed the CODE-REDUCTION_* hacks from debian/rules. -2016-06-22 10:09:17 +0200 Mike Gabriel (593e15c) +2016-06-22 10:09:17 +0200 Mike Gabriel (593e15ca1) * debian/*: Drop non-multi-arch support (i.e. Debian squeeze, Ubuntu 10.04 and earlier). -2016-06-22 10:04:16 +0200 Mike Gabriel (3983b11) +2016-06-22 10:04:16 +0200 Mike Gabriel (3983b111a) * debian/*: Drop not-use-anymore CODE-REDUCTION_* files. -2016-07-01 13:46:26 +0200 Mike Gabriel (8307d4f) +2016-07-01 13:46:26 +0200 Mike Gabriel (8307d4f33) * Merge branch 'sunweaver-pr/define-default-source-not-bsd+svid-source' into 3.6.x -2016-06-23 20:52:27 +0200 Mike Gabriel (da4410c) +2016-06-23 20:52:27 +0200 Mike Gabriel (da4410cce) * build flags: Use -D_DEFAULT_SOURCE instead of deprecated -D_BSD_SOURCE and -D_SVID_SOURCE. -2016-07-01 13:13:48 +0200 Mike Gabriel (4b3081c) +2016-07-01 13:13:48 +0200 Mike Gabriel (4b3081c48) * Merge branch 'sunweaver-pr/drop-really-old-X10-API-code' into 3.6.x -2016-06-23 09:58:54 +0200 Mike Gabriel (f0bf303) +2016-06-23 09:58:54 +0200 Mike Gabriel (f0bf303c8) * nx-X11/lib/X10: Drop really ancient X10 API code. Not used within nxagent. -2016-07-01 13:10:06 +0200 Mike Gabriel (b666a37) +2016-07-01 13:10:06 +0200 Mike Gabriel (b666a3776) * Merge branch 'sunweaver-pr/properly-apply-optflags-at-buildtime' into 3.6.x -2016-06-23 14:27:15 +0200 Mike Gabriel (d650a0b) +2016-06-23 14:27:15 +0200 Mike Gabriel (d650a0b47) * OPTFLAGS: Properly propagate build option flags to nxcomp{,ext,shad} and the nx-X11 build scripts. -2016-06-23 09:58:54 +0200 Mike Gabriel (4693c32) +2016-06-23 09:58:54 +0200 Mike Gabriel (4693c3203) * nx-X11/lib/X10: Drop really ancient X10 API code. Not used within nxagent. -2016-06-23 14:27:15 +0200 Mike Gabriel (a1e9abc) +2016-06-23 14:27:15 +0200 Mike Gabriel (a1e9abc78) * OPTFLAGS: Properly propagate build option flags to nxcomp{,ext,shad} and the nx-X11 build scripts. -2016-06-30 22:41:00 +0200 Mike Gabriel (4cbfc5f) +2016-06-30 22:41:00 +0200 Mike Gabriel (4cbfc5f98) * debian/libnx-x11-6.symbols: Update symbols (added: _XEatDataWords@Base 3.5.99.0, _XGetRequest@Base 3.5.99.0). -2016-06-30 15:41:03 +0200 Mike Gabriel (ba10cef) +2016-06-30 15:41:03 +0200 Mike Gabriel (ba10ceffc) * Merge branch 'sunweaver-pr/drop-embedded-imake-and-makedepend' into 3.6.x -2016-06-22 13:22:06 +0200 Mike Gabriel (298744e) +2016-06-22 13:22:06 +0200 Mike Gabriel (298744e94) * nx-X11/Makefile: Drop build support for World.Win32 and World.OS2. Not our target platforms. -2016-06-22 12:41:50 +0200 Mike Gabriel (2f3d394) +2016-06-22 12:41:50 +0200 Mike Gabriel (2f3d394e8) * nx-X11/config/{imake,makedepend}: Use system-wide available imake and makedepend tools. -2016-06-30 00:26:37 +0200 Mike Gabriel (5b36f64) +2016-06-30 00:26:37 +0200 Mike Gabriel (5b36f6443) * Merge branch 'sunweaver-pr/backport-xgetrequest-and-xeatdatawords' into 3.6.x -2016-06-29 21:44:08 +0200 Ulrich Sibiller (bd2650c) +2016-06-29 21:44:08 +0200 Ulrich Sibiller (bd2650ca0) * Port _XEatDataWords -2016-06-29 21:25:24 +0200 Ulrich Sibiller (36d0fac) +2016-06-29 21:25:24 +0200 Ulrich Sibiller (36d0fac77) * Backport of _XGetRequest() -2016-06-29 11:21:09 +0200 Mike Gabriel (3314c24) +2016-06-29 11:21:09 +0200 Mike Gabriel (3314c24a7) * Merge branch 'sunweaver-pr/drop-x2goagent' into 3.6.x -2016-06-22 08:16:35 +0200 Mike Gabriel (c355dc9) +2016-06-22 08:16:35 +0200 Mike Gabriel (c355dc91d) * Makefile,debian/*,nx-libs.spec,: Drop references to X2Go Project, esp. drop x2goagent. -2016-06-29 11:13:34 +0200 Mike Gabriel (b9fb7a0) +2016-06-29 11:13:34 +0200 Mike Gabriel (b9fb7a05a) * Merge branch 'sunweaver-pr/libnx-xext-drop-unused-extensions' into 3.6.x -2016-06-28 12:20:00 +0000 Mike Gabriel (f051b7a) +2016-06-28 12:20:00 +0000 Mike Gabriel (f051b7a2d) * libNX_Xext: Drop unused extensions: DPMS, XTestExt1, XSync, XSecurity. -2016-06-28 12:13:27 +0000 Mike Gabriel (e9857d5) +2016-06-28 12:13:27 +0000 Mike Gabriel (e9857d5ea) * nx-X11/lib/Xext/Imakefile: Serialize parameters and make Imakefile changes more trackable. -2016-06-28 12:05:01 +0000 Mike Gabriel (d595125) +2016-06-28 12:05:01 +0000 Mike Gabriel (d595125a1) * fix wrong bin:package for Xext proto headers: Move dpmsstr.h and securstr.h from Xext devel package into proto header package. -2016-06-28 11:43:06 +0000 Mike Gabriel (3ded4a2) +2016-06-28 11:43:06 +0000 Mike Gabriel (3ded4a2d6) * Fix linking order hack in nxagent. -2016-06-15 16:42:58 +0200 Mike Gabriel (b83a148) +2016-06-15 16:42:58 +0200 Mike Gabriel (b83a14843) * test scripts: Add run-nxagent test script. -2016-06-25 01:35:40 +0200 Mihai Moldovan (975511c) +2016-06-25 01:35:40 +0200 Mihai Moldovan (975511c87) * Merge branch 'sunweaver-pr/hw-nxagent-drop-duplicate-Xserver-code_disable-Xserver-code-and-include-in-nxagent' into arctica-3.6.x -2016-05-02 12:14:14 +0200 Mike Gabriel (a5befd4) +2016-05-02 12:14:14 +0200 Mike Gabriel (a5befd4e2) * hw/nxagent: Drop code referring to the following removed Xserver extensions: XAPPGROUP, LBX, XEVIE. -2016-05-02 11:29:53 +0200 Mike Gabriel (3bdcd17) +2016-05-02 11:29:53 +0200 Mike Gabriel (3bdcd1727) * hw/nxagent/NX*.c: Amend re-introduced nxagent warnings by fixing the corresponding code section in files included from "somewhere" in nx-X11/programs/Xserver/. -2016-05-01 23:02:20 +0200 Mike Gabriel (a5c7b24) +2016-05-01 23:02:20 +0200 Mike Gabriel (a5c7b248e) * hw/nxagent/NXdixfonts.c: Shrink file, drop duplicate code that can identically be found in dix/dixfonts.c. Also remove NX'ish code from dix/dixfonts.c. -2016-05-01 21:58:22 +0200 Mike Gabriel (2ba5008) +2016-05-01 21:58:22 +0200 Mike Gabriel (2ba500864) * hw/nxagent/NXdispatch.c: Shrink file, drop duplicate code that can identically be found in dix/dispatch.c. -2016-04-26 05:59:56 +0200 Mike Gabriel (a434613) +2016-04-26 05:59:56 +0200 Mike Gabriel (a43461335) * hw/nxagent/NXproperty.c: Shrink file, drop duplicate code that can identically be found in dix/property.c. -2016-04-11 14:53:15 +0200 Mike Gabriel (c6f86b3) +2016-04-11 14:53:15 +0200 Mike Gabriel (c6f86b3b2) * hw/nxagent/NXshm.c: Shrink file, drop duplicate code that can identically be found in Xext/shm.c. -2016-04-10 01:57:57 +0200 Mike Gabriel (51e4ed0) +2016-04-10 01:57:57 +0200 Mike Gabriel (51e4ed0fc) * hw/nxagent/NXxvdisp.c: Shrink file, drop duplicate code that can identically be found in Xext/xvdisp.c. -2016-04-18 13:02:34 +0200 Mike Gabriel (add8819) +2016-04-18 13:02:34 +0200 Mike Gabriel (add881931) * hw/nxagent/NXevents.c: Shrink file, drop duplicate code that can identically be found in dix/events.c. -2016-04-18 08:19:05 +0200 Mike Gabriel (0571ece) +2016-04-18 08:19:05 +0200 Mike Gabriel (0571ece6a) * hw/nxagent/NXglyph.c: Shrink file, drop duplicate code that can identically be found in render/glyph.c. -2016-04-18 08:10:08 +0200 Mike Gabriel (12130a4) +2016-04-18 08:10:08 +0200 Mike Gabriel (12130a4d9) * hw/nxagent/NXglyphcurs.c: Shrink file, drop duplicate code that can identically be found in dix/glyphcurs.c. -2016-04-13 15:29:32 +0200 Mike Gabriel (a648558) +2016-04-13 15:29:32 +0200 Mike Gabriel (a64855879) * hw/nxagent/NXrender.c: Shrink file, drop duplicate code that can identically be found in render/render.c. -2016-04-13 15:28:33 +0200 Mike Gabriel (778e83a) +2016-04-13 15:28:33 +0200 Mike Gabriel (778e83a3c) * hw/nxagent/NX{glyphstr,picturestr}.h: Don't ship the complete header files in nxagent's code base. Rather replace structures we need modified only. -2016-04-13 11:33:33 +0200 Mike Gabriel (de03d62) +2016-04-13 11:33:33 +0200 Mike Gabriel (de03d6227) * NXrenderint.h: Move into subfolder X11/include/ and rename to Xrender_nxagent.h. (Like we have done with all other non-public Xlib related header files that are required for building nxagent. -2016-04-11 16:37:00 +0200 Mike Gabriel (ab6bb89) +2016-04-11 16:37:00 +0200 Mike Gabriel (ab6bb890e) * hw/nxagent/NXresource.c: Shrink file, drop duplicate code that can identically be found in dix/resource.c. -2016-04-11 13:46:36 +0200 Mike Gabriel (1384776) +2016-04-11 13:46:36 +0200 Mike Gabriel (1384776fd) * Xserver/dix/window.c: Don't reintroduce build warnings with previous commit due to now-unnecessary assignements of pScreen pointers. -2016-04-11 13:41:11 +0200 Mike Gabriel (4690d6b) +2016-04-11 13:41:11 +0200 Mike Gabriel (4690d6b71) * hw/nxagent/NXwindow.c: Shrink file, drop duplicate code that can identically be found in dix/window.c. -2016-04-10 02:45:24 +0200 Mike Gabriel (e60f281) +2016-04-10 02:45:24 +0200 Mike Gabriel (e60f281aa) * hw/nxagent/NXglxext.c: Shrink file, drop duplicate code that can identically be found in GL/glx/glxext.c. -2016-04-10 02:37:19 +0200 Mike Gabriel (b4e2ec7) +2016-04-10 02:37:19 +0200 Mike Gabriel (b4e2ec709) * Xserver/GL/glx/Imakefile: Serialize parameters and make Imakefile changes more trackable. -2016-04-09 00:36:40 +0200 Mike Gabriel (0c29f81) +2016-04-09 00:36:40 +0200 Mike Gabriel (0c29f81f1) * hw/nxagent/NXpicture.c: Shrink file, drop duplicate code that can identically be found in render/picture.c. -2016-04-08 13:53:36 +0200 Mike Gabriel (809fed6) +2016-04-08 13:53:36 +0200 Mike Gabriel (809fed649) * hw/nxagent/NXmiexpose.c: Shrink file, drop duplicate code that can identically be found in mi/miexpose.c. -2016-04-08 13:52:59 +0200 Mike Gabriel (69ac981) +2016-04-08 13:52:59 +0200 Mike Gabriel (69ac98165) * hw/nxagent/Pixmaps.h: Make RESTYPE well-defined by adding resource.h to includes. -2016-04-08 10:01:30 +0200 Mike Gabriel (5088a6d) +2016-04-08 10:01:30 +0200 Mike Gabriel (5088a6d13) * Xserver/mi/Imakefile: Serialize parameters and make Imakefile changes more trackable. -2016-04-08 09:45:32 +0200 Mike Gabriel (ae1a218) +2016-04-08 09:45:32 +0200 Mike Gabriel (ae1a218d1) * hw/nxagent/NXmiglyph.c: Shrink file, drop code that can be identically found in render/miglyph.c. -2016-04-08 09:38:20 +0200 Mike Gabriel (500544f) +2016-04-08 09:38:20 +0200 Mike Gabriel (500544f82) * hw/nxagent/NXmitrap.c: Shrink file, drop duplicate code that can identically be found in render/mitrap.c. -2016-04-08 09:26:12 +0200 Mike Gabriel (8fab4af) +2016-04-08 09:26:12 +0200 Mike Gabriel (8fab4afbb) * hw/nxagent/NXmiwindow.c: Drop complete file. -2016-04-07 12:22:51 +0200 Mike Gabriel (148f750) +2016-04-07 12:22:51 +0200 Mike Gabriel (148f75067) * hw/nxagent/NXdamage.c: Shrink file, drop duplicate code that can identically be found in miext/damage/damage.c. -2016-04-07 09:36:18 +0200 Mike Gabriel (fd31518) +2016-04-07 09:36:18 +0200 Mike Gabriel (fd31518f4) * NXcomposite.h: Move fake header file NXcomposite.h to hw/nxagent/X11/include/ and drop all symbols that are not explicitly used by nxagent. -2016-04-07 00:54:44 +0200 Mike Gabriel (28acdaf) +2016-04-07 00:54:44 +0200 Mike Gabriel (28acdaff7) * Xserver/hw/nxagent: Drop NXcompositeext.h, it is a duplicate of nx-X11/include/extensions/composite.h. -2016-04-06 23:31:52 +0200 Mike Gabriel (ca1e857) +2016-04-06 23:31:52 +0200 Mike Gabriel (ca1e85710) * hw/nxagent/NXextension.c: Shrink file, drop duplicate code that is indentically found in dix/extension.c. -2016-04-06 23:18:07 +0200 Mike Gabriel (5d16046) +2016-04-06 23:18:07 +0200 Mike Gabriel (5d1604616) * Xserver/dix/Imakefile: Serialize parameters and make Imakefile changes more trackable. -2016-06-25 00:38:01 +0200 Mike Gabriel (9df1536) +2016-06-25 00:38:01 +0200 Mike Gabriel (9df153668) * Merge branch 'uli42-pr/run_xinerama_without_debug_output' into 3.6.x -2016-06-24 21:22:01 +0200 Ulrich Sibiller (b7d7ff3) +2016-06-24 21:22:01 +0200 Ulrich Sibiller (b7d7ff3e4) * libX11: Extend Event functions to handle IOErrors -2016-06-25 00:31:35 +0200 Ulrich Sibiller (e079b0b) +2016-06-25 00:31:35 +0200 Ulrich Sibiller (e079b0b35) * Screen.c: fix RRGetInfo call -2016-06-25 00:31:05 +0200 Ulrich Sibiller (cec31e2) +2016-06-25 00:31:05 +0200 Ulrich Sibiller (cec31e2f0) * Xinerama: undef debug/test flags -2016-06-25 00:17:10 +0200 Mike Gabriel (9c1275f) +2016-06-25 00:17:10 +0200 Mike Gabriel (9c1275f58) * Merge branch 'uli42-pr/fix-crash-in-XPeekEvent' into 3.6.x -2016-06-24 21:22:01 +0200 Ulrich Sibiller (5ee04c2) +2016-06-24 21:22:01 +0200 Ulrich Sibiller (5ee04c24c) * libX11: Extend Event functions to handle IOErrors -2016-06-21 04:12:07 +0200 Mike Gabriel (17f3e3b) +2016-06-21 04:12:07 +0200 Mike Gabriel (17f3e3bc5) * Merge branch 'sunweaver-pr/xrandr-extension-upgrade-1.5' into 3.6.x -2016-06-20 17:21:33 +0200 Mike Gabriel (4c8fc6b) +2016-06-20 17:21:33 +0200 Mike Gabriel (4c8fc6be8) * debian/patches: Update 102_xserver-xext_set-securitypolicy-path.debian.patch. -2016-06-20 11:10:06 +0200 Mike Gabriel (c2b1f48) +2016-06-20 11:10:06 +0200 Mike Gabriel (c2b1f489d) * Backport RANDR proto version 1.5 to nx-X11's Xserver. -2016-06-20 15:53:20 +0200 Mike Gabriel (2e5b989) +2016-06-20 15:53:20 +0200 Mike Gabriel (2e5b98986) * Move matrix operations from X server to pixman 0.13.2. Required code de-duplication in nxagent. (Will be fixed by ArcticaProject/nx-libs#120 later on). -2016-06-20 15:51:55 +0200 Mike Gabriel (36e17bd) +2016-06-20 15:51:55 +0200 Mike Gabriel (36e17bdc6) * [render] Split out filter finding from filter setting. Required code de-duplication in nxagent. (Will be fixed by ArcticaProject/nx-libs#120 later on). -2016-06-20 15:50:05 +0200 Mike Gabriel (3f4e503) +2016-06-20 15:50:05 +0200 Mike Gabriel (3f4e503d6) * nx-libs.spec, debian/control: versioned B-R / B-D: pixman-1 (>= 0.13.2). -2016-06-20 15:43:35 +0200 Mike Gabriel (f9dbc64) +2016-06-20 15:43:35 +0200 Mike Gabriel (f9dbc64f0) * Move matrix operations from X server to pixman 0.13.2, handle RandR transform matrices in floating point. -2016-06-20 15:36:52 +0200 Mike Gabriel (6859815) +2016-06-20 15:36:52 +0200 Mike Gabriel (6859815ec) * Call pScreen->ConstrainCursorHarder from the position update path -2016-06-20 15:29:28 +0200 Mike Gabriel (a60c22f) +2016-06-20 15:29:28 +0200 Mike Gabriel (a60c22f45) * dix/randr: add a hooks into screen to (a) replace scanout pixmap and (b) for additional cursor confinement -2016-06-20 13:25:23 +0200 Mike Gabriel (19ebd77) +2016-06-20 13:25:23 +0200 Mike Gabriel (19ebd7722) * include: add version_compare helper function -2016-06-20 13:19:08 +0200 Mike Gabriel (21c3d20) +2016-06-20 13:19:08 +0200 Mike Gabriel (21c3d20fb) * [render] Split out filter finding from filter setting. -2016-06-20 12:21:39 +0200 Mike Gabriel (e383881) +2016-06-20 12:21:39 +0200 Mike Gabriel (e38388174) * debian/patches-pending-evaluation: Adapt fix-icon-and-clipboard.patch to removal of the WindowTable array. -2016-06-20 16:51:59 +0200 Mike Gabriel (8c7d7be) +2016-06-20 16:51:59 +0200 Mike Gabriel (8c7d7bed9) * hw/nxagent/NXresource.c: remove caching of drawables and graphics contexts. The security checks simply bypass the cached @@ -3129,2590 +3372,2590 @@ nxagent. (Will be fixed by ArcticaProject/nx-libs#120 later on). -2016-06-20 16:45:38 +0200 Mike Gabriel (e6f2f64) +2016-06-20 16:45:38 +0200 Mike Gabriel (e6f2f6427) * dix: remove caching of drawables and graphics contexts. The security checks simply bypass the cached values so they are unused. -2016-06-20 16:47:28 +0200 Mike Gabriel (2745986) +2016-06-20 16:47:28 +0200 Mike Gabriel (274598651) * Xserver/dix/events.c: Don't declare and assign unused pScreen. -2016-06-20 12:18:53 +0200 Mike Gabriel (c61bb8c) +2016-06-20 12:18:53 +0200 Mike Gabriel (c61bb8cc5) * Move each screen's root-window pointer into ScreenRec. -2016-06-20 11:16:08 +0200 Mike Gabriel (590862d) +2016-06-20 11:16:08 +0200 Mike Gabriel (590862d39) * Centralize declaration of ConnectionInfo. -2016-06-20 11:21:46 +0200 Mike Gabriel (560fd4e) +2016-06-20 11:21:46 +0200 Mike Gabriel (560fd4e5f) * nxagent/hw/NXextension.c: Allow CloseDownProc to be NULL. Required code de-duplication in nxagent. (Will be fixed by ArcticaProject/nx-libs#120 later on). -2016-06-20 11:12:11 +0200 Mike Gabriel (4aec113) +2016-06-20 11:12:11 +0200 Mike Gabriel (4aec11346) * Allow CloseDownProc to be NULL. -2016-06-07 10:26:58 +0200 Mike Gabriel (e440ea7) +2016-06-07 10:26:58 +0200 Mike Gabriel (e440ea768) * randr extension: Convert to Xorg coding style. -2016-06-07 10:26:12 +0200 Mike Gabriel (7f7c96c) +2016-06-07 10:26:12 +0200 Mike Gabriel (7f7c96c7c) * Copy x-indent.sh and x-indent-all.sh from xorg/util/modular. -2016-06-07 10:14:50 +0200 Mike Gabriel (b943cfe) +2016-06-07 10:14:50 +0200 Mike Gabriel (b943cfe2a) * Drop trailing whitespaces (randr extension) -2016-05-31 16:12:15 +0200 Adam Jackson (e2b0f27) +2016-05-31 16:12:15 +0200 Adam Jackson (e2b0f279e) * randr: Remove mirandr -2016-05-31 16:11:40 +0200 Mike Gabriel (6343fa6) +2016-05-31 16:11:40 +0200 Mike Gabriel (6343fa664) * Xserver/randr/Imakefile: Serialize parameters and make Imakefile changes more trackable. -2016-06-21 03:56:29 +0200 Mike Gabriel (3db9a75) +2016-06-21 03:56:29 +0200 Mike Gabriel (3db9a757f) * hw/nxagent/Handlers.c: Regression fix since 6051dec. Close unclosed '#ifdef TEST'. -2016-06-18 19:50:10 +0200 Mike Gabriel (9de3d26) +2016-06-18 19:50:10 +0200 Mike Gabriel (9de3d26ef) * hw/nxagent/Options.h: Grammar fix in comment. -2016-06-10 01:05:58 +0200 Mike Gabriel (d130494) +2016-06-10 01:05:58 +0200 Mike Gabriel (d13049403) * Properly enable/disable Xinerama support in nxagent via cmdline options provider in Xserver/os/utils.c. -2016-06-09 16:24:10 +0200 Mike Gabriel (059f031) +2016-06-09 16:24:10 +0200 Mike Gabriel (059f03188) * noRRXineramaExtension: Make Boolean configurable via new cmdline switch (+|-rrxinerama). -2016-06-17 01:45:40 +0000 Mihai Moldovan (4d6d3c5) +2016-06-17 01:45:40 +0000 Mihai Moldovan (4d6d3c567) * {nx-X11/programs/Xserver/hw/nxagent/{{Args,Handlers,Image,Options}.c,Options.h},nxcomp/{Loop,Misc}.cpp}: add configurable sleep delay if session is suspended. -2016-06-13 01:56:07 +0200 Mike Gabriel (04d2fe3) +2016-06-13 01:56:07 +0200 Mike Gabriel (04d2fe3ae) * nxagentReversePointerMap: Don't assume Xevent.xbutton.button is always greater than zero. We have seen Xevent.xbutton.button being set to AnyButton (equaling 0). -2016-05-27 15:52:50 +0000 Mihai Moldovan (129cc6a) +2016-05-27 15:52:50 +0000 Mihai Moldovan (129cc6afd) * nx-X11/programs/Xserver/hw/nxagent/Handlers.h: fix stack smashing related to different data type sizes between Xserver and Xlib. -2016-06-21 03:56:29 +0200 Mike Gabriel (9013a24) +2016-06-21 03:56:29 +0200 Mike Gabriel (9013a24da) * hw/nxagent/Handlers.c: Regression fix since 6051dec. Close unclosed '#ifdef TEST'. -2016-06-18 19:50:10 +0200 Mike Gabriel (d5cc12c) +2016-06-18 19:50:10 +0200 Mike Gabriel (d5cc12c2a) * hw/nxagent/Options.h: Grammar fix in comment. -2016-06-18 19:46:28 +0200 Mike Gabriel (c31ae1e) +2016-06-18 19:46:28 +0200 Mike Gabriel (c31ae1eed) * Merge branch 'sunweaver-pr/rrxinerama-vs-panoramix-with-disable-support' into 3.6.x -2016-06-10 01:05:58 +0200 Mike Gabriel (4b4a6a3) +2016-06-10 01:05:58 +0200 Mike Gabriel (4b4a6a35c) * Properly enable/disable Xinerama support in nxagent via cmdline options provider in Xserver/os/utils.c. -2016-06-09 16:24:10 +0200 Mike Gabriel (3f8aa38) +2016-06-09 16:24:10 +0200 Mike Gabriel (3f8aa38fe) * noRRXineramaExtension: Make Boolean configurable via new cmdline switch (+|-rrxinerama). -2016-06-18 09:27:39 +0200 Mike Gabriel (2dd1a1f) +2016-06-18 09:27:39 +0200 Mike Gabriel (2dd1a1fe6) * Merge branch 'Ionic-feature/configurablesleep' into 3.6.x -2016-06-17 01:45:40 +0000 Mihai Moldovan (6051dec) +2016-06-17 01:45:40 +0000 Mihai Moldovan (6051dec4a) * {nx-X11/programs/Xserver/hw/nxagent/{{Args,Handlers,Image,Options}.c,Options.h},nxcomp/{Loop,Misc}.cpp}: add configurable sleep delay if session is suspended. -2016-06-15 00:39:04 +0200 Mike Gabriel (3dea5a8) +2016-06-15 00:39:04 +0200 Mike Gabriel (3dea5a88c) * Merge branch 'sunweaver-pr/nxagentReversePointerMapping-negative-index' into 3.6.x -2016-06-13 01:56:07 +0200 Mike Gabriel (5e17d05) +2016-06-13 01:56:07 +0200 Mike Gabriel (5e17d05aa) * nxagentReversePointerMap: Don't assume Xevent.xbutton.button is always greater than zero. We have seen Xevent.xbutton.button being set to AnyButton (equaling 0). (gh-sunweaver/pr/nxagentReversePointerMapping-negative-index) -2016-06-13 21:07:38 +0200 Mike Gabriel (61d0fbe) +2016-06-13 21:07:38 +0200 Mike Gabriel (61d0fbea7) * Merge branch 'Ionic-bugfix/Xserver-Xlib-type-mismatch' into 3.6.x -2016-05-27 15:52:50 +0000 Mihai Moldovan (639a2c3) +2016-05-27 15:52:50 +0000 Mihai Moldovan (639a2c36f) * nx-X11/programs/Xserver/hw/nxagent/Handlers.h: fix stack smashing related to different data type sizes between Xserver and Xlib. -2016-06-13 13:13:55 +0200 Mike Gabriel (35613d1) +2016-06-13 13:13:55 +0200 Mike Gabriel (35613d1dc) * Merge branch 'sunweaver-pr/nxcomp+ext+shad-system-wide-headers' into 3.6.x -2016-04-06 22:09:31 +0200 Mike Gabriel (f5eff9b) +2016-04-06 22:09:31 +0200 Mike Gabriel (f5eff9bc0) * nx-X11/programs/Xserver: Include nxcomp{,ext,shad} headers like one would do with system-wide shared libraries. (gh-sunweaver/pr/nxcomp+ext+shad-system-wide-headers) -2016-04-05 14:29:02 +0200 Mike Gabriel (2f706cb) +2016-04-05 14:29:02 +0200 Mike Gabriel (2f706cbeb) * nxcomp/Makefile.in: Only install MD5.h, NX.h, NXalert.h, NXpack.h, NXproto.h and NXvars.h as publicly available header files. -2016-04-05 14:20:24 +0200 Mike Gabriel (f55249d) +2016-04-05 14:20:24 +0200 Mike Gabriel (f55249dc6) * nxcomshad/Makefile.in: Only install Shadow.h as publicly available header file. -2016-06-09 16:26:51 +0200 Mike Gabriel (734da21) +2016-06-09 16:26:51 +0200 Mike Gabriel (734da2139) * hw/nxagent/Args.c: Fix syntax errors for builds using -UPANORAMIX. -2016-06-03 14:58:02 +0200 Mike Gabriel (4998e62) +2016-06-03 14:58:02 +0200 Mike Gabriel (4998e62c4) * nx-X11/programs/Xserver/Imakefile: Don't overlink nxagent. Linking against libXrandr and libXtst is not necessary for nxagent. -2016-06-03 14:42:54 +0200 Mike Gabriel (15440ca) +2016-06-03 14:42:54 +0200 Mike Gabriel (15440cad7) * nx-X11/config/cf/lnxLib.tmpl requires post-library removal cleanup: Drop references to dropped X11 extension client libraries. -2016-06-01 21:57:36 +0200 Mihai Moldovan (3d54338) +2016-06-01 21:57:36 +0200 Mihai Moldovan (3d5433833) * Merge branch 'sunweaver-pr/xserver-drop-outdated-xext-extensions' into arctica-3.6.x -2016-04-26 23:44:55 +0200 Mike Gabriel (b214532) +2016-04-26 23:44:55 +0200 Mike Gabriel (b2145323c) * XTRAP: Drop all Xserver code blocks that relate to removed XTRAP extension. (gh-sunweaver/pr/xserver-drop-outdated-xext-extensions) -2016-04-19 12:04:57 +0200 Mike Gabriel (8c1d16d) +2016-04-19 12:04:57 +0200 Mike Gabriel (8c1d16dae) * XFreeXDGA: Drop all Xserver code blocks that relate to removed XFreeXDGA extension. -2016-04-19 12:02:12 +0200 Mike Gabriel (2ff2c92) +2016-04-19 12:02:12 +0200 Mike Gabriel (2ff2c92bb) * XF86MISC: Drop all Xserver code blocks that relate to removed XF86MISC extension. -2016-04-19 11:58:37 +0200 Mike Gabriel (004f8f8) +2016-04-19 11:58:37 +0200 Mike Gabriel (004f8f896) * MITMISC: Drop all Xserver code blocks that relate to removed MITMISC extension. -2016-04-19 11:56:20 +0200 Mike Gabriel (e142314) +2016-04-19 11:56:20 +0200 Mike Gabriel (e14231443) * XF86VIDMODE: Drop all Xserver code blocks that relate to removed XF86VIDMODE extension. -2016-04-19 11:53:59 +0200 Mike Gabriel (74a1e4e) +2016-04-19 11:53:59 +0200 Mike Gabriel (74a1e4e83) * MULTIBUFFER: Drop all Xserver code blocks that relate to removed MULTIBUFFER extension. -2016-04-19 11:52:13 +0200 Mike Gabriel (2f0d2d3) +2016-04-19 11:52:13 +0200 Mike Gabriel (2f0d2d388) * LBX: Drop all Xserver code blocks that relate to removed LBX extension. -2016-04-19 11:36:27 +0200 Mike Gabriel (e80842c) +2016-04-19 11:36:27 +0200 Mike Gabriel (e80842cc4) * EVI: Drop all Xserver code blocks that relate to removed EVI extension. -2016-04-19 11:34:20 +0200 Mike Gabriel (25ffbbb) +2016-04-19 11:34:20 +0200 Mike Gabriel (25ffbbb22) * FONTCACHE: Drop all Xserver code blocks that relate to removed FONTCACHE extension. -2016-04-19 11:02:14 +0200 Mike Gabriel (3aedac1) +2016-04-19 11:02:14 +0200 Mike Gabriel (3aedac174) * XEVIE: Drop all Xserver code blocks that relate to removed XEVIE extension. -2016-04-19 11:31:48 +0200 Mike Gabriel (cd39f13) +2016-04-19 11:31:48 +0200 Mike Gabriel (cd39f1393) * XFree86DGA: Drop all Xserver code blocks that relate to removed XFree86DGA extension. -2016-04-19 11:07:49 +0200 Mike Gabriel (a25c0de) +2016-04-19 11:07:49 +0200 Mike Gabriel (a25c0de09) * TOGCUP: Drop all Xserver code blocks that relate to removed TOGCUP extension. -2016-04-19 11:05:41 +0200 Mike Gabriel (683415d) +2016-04-19 11:05:41 +0200 Mike Gabriel (683415dfe) * XAPPGROUP: Drop all Xserver code blocks that relate to removed XAPPGROUP extension. -2016-03-01 20:55:27 +0000 Mike Gabriel (9bc6ff2) +2016-03-01 20:55:27 +0000 Mike Gabriel (9bc6ff269) * Drop X11 extensions not shipped with recent X.Org server versions anymore: -2016-05-31 12:44:02 +0200 Nito Martinez (c646808) +2016-05-31 12:44:02 +0200 Nito Martinez (c646808bc) * Fix debugging function for Loop.cpp. getDebugSpec was replaced by << operand in ChannelEndPoint.{h|cpp}, fixes #130 -2016-05-31 12:12:39 +0200 Mike Gabriel (e3051f7) +2016-05-31 12:12:39 +0200 Mike Gabriel (e3051f7a7) * Merge branch 'nitomartinez-3.6.x' into 3.6.x (origin/3713346f) -2016-05-30 16:10:32 +0000 Mihai Moldovan (36c3613) +2016-05-30 16:10:32 +0000 Mihai Moldovan (36c3613a7) * nx-X11/programs/Xserver/{hw/nxagent/NX,render/}picture.c: add and use new function ReduceCompositeOp(). -2016-04-09 19:41:48 +0000 Mihai Moldovan (62aac69) +2016-04-09 19:41:48 +0000 Mihai Moldovan (62aac6950) * nx-X11/programs/Xserver/composite/Imakefile: add new file to SRCS and OBJS and define -DNXAGENT_SERVER while building the Composite extension to disable some code that depends upon a newer X.Org architecture. -2016-04-09 19:40:24 +0000 Mihai Moldovan (7d2dd2a) +2016-04-09 19:40:24 +0000 Mihai Moldovan (7d2dd2aac) * misc nx-X11/{programs/Xserver/composite,include/extensions}: update to Composite 0.4 - with changes where neccessary and rough edges. -2016-04-09 19:38:12 +0000 Mihai Moldovan (fe3fa5e) +2016-04-09 19:38:12 +0000 Mihai Moldovan (fe3fa5ef3) * nx-X11/programs/Xserver/{dix/{colormap.c,window.c},hw/nxagent/NXwindow.c,include/{colormap,window{,str}}.h}: backport features needed for Composite 0.4. -2016-05-31 12:09:23 +0200 Mike Gabriel (4a9c1b9) +2016-05-31 12:09:23 +0200 Mike Gabriel (4a9c1b946) * Merge branch 'Ionic-feature/composite-update' into 3.6.x -2016-05-31 11:23:40 +0200 Nito Martinez (035995a) +2016-05-31 11:23:40 +0200 Nito Martinez (035995a8c) * display version number in nxcomp log, fixes #127 -2016-05-30 16:10:32 +0000 Mihai Moldovan (cad9f4e) +2016-05-30 16:10:32 +0000 Mihai Moldovan (cad9f4ef8) * nx-X11/programs/Xserver/{hw/nxagent/NX,render/}picture.c: add and use new function ReduceCompositeOp(). -2016-04-09 19:41:48 +0000 Mihai Moldovan (dd9eb3a) +2016-04-09 19:41:48 +0000 Mihai Moldovan (dd9eb3adf) * nx-X11/programs/Xserver/composite/Imakefile: add new file to SRCS and OBJS and define -DNXAGENT_SERVER while building the Composite extension to disable some code that depends upon a newer X.Org architecture. -2016-04-09 19:40:24 +0000 Mihai Moldovan (be824bc) +2016-04-09 19:40:24 +0000 Mihai Moldovan (be824bc8d) * misc nx-X11/{programs/Xserver/composite,include/extensions}: update to Composite 0.4 - with changes where neccessary and rough edges. -2016-04-09 19:38:12 +0000 Mihai Moldovan (f7cff02) +2016-04-09 19:38:12 +0000 Mihai Moldovan (f7cff021e) * nx-X11/programs/Xserver/{dix/{colormap.c,window.c},hw/nxagent/NXwindow.c,include/{colormap,window{,str}}.h}: backport features needed for Composite 0.4. -2016-05-13 06:19:21 +0200 Mihai Moldovan (aba2a53) +2016-05-13 06:19:21 +0200 Mihai Moldovan (aba2a534f) * Merge branch 'sunweaver-pr/nxagent-no-compiler-warnings' into arctica-3.6.x -2016-05-03 19:42:46 +0200 Mike Gabriel (52dc496) +2016-05-03 19:42:46 +0200 Mike Gabriel (52dc49607) * hw/nxagent/Display.c: Avoid incompatible pointer type. (gh-sunweaver/pr/nxagent-no-compiler-warnings) -2016-05-03 19:28:48 +0200 Mike Gabriel (a0e5589) +2016-05-03 19:28:48 +0200 Mike Gabriel (a0e5589ed) * hw/nxagent/Display.c: Define Pixmap from XlibPixmap before including Icons.h (which includes hw/nxagent/X11/include/xpm_nxagent.h). -2016-05-03 17:49:54 +0200 Mike Gabriel (e79fe3b) +2016-05-03 17:49:54 +0200 Mike Gabriel (e79fe3b9a) * hw/nxagent/Holder.c: Define Pixmap from XlibPixmap before including hw/nxagent/X11/include/xpm_nxagent.h. -2016-04-19 10:43:40 +0200 Mihai Moldovan (b91135b) +2016-04-19 10:43:40 +0200 Mihai Moldovan (b91135b0c) * hw/nxagent/Events.c: Avoid '#endif #ifdef DEBUG' blocks. -2016-03-22 01:11:55 +0100 Mike Gabriel (c2de5f1) +2016-03-22 01:11:55 +0100 Mike Gabriel (c2de5f198) * hw/nxagent/NXmiexpose.c: Initialize all items of the newValues[] array. -2016-03-21 22:49:25 +0100 Mike Gabriel (0210232) +2016-03-21 22:49:25 +0100 Mike Gabriel (021023202) * hw/nxagent/Keystroke.c: Fix warning: pointer type mismatch in conditional expression. -2016-03-21 22:37:38 +0100 Mike Gabriel (0005979) +2016-03-21 22:37:38 +0100 Mike Gabriel (00059798d) * hw/nxagent/Window.c: Initialize tmp_mask and attributes.event_mask with NoEventMask. -2016-03-21 22:22:07 +0100 Mike Gabriel (7251ef4) +2016-03-21 22:22:07 +0100 Mike Gabriel (7251ef492) * hw/nxagent/Colormap.c: Don't declare and assign flexibility variable if not used later on. -2016-03-21 16:36:38 +0100 Mike Gabriel (634484b) +2016-03-21 16:36:38 +0100 Mike Gabriel (634484bb3) * hw/nxagent/GCOps.c: Don't declare and assign oldDstxyValue if not used later on. -2016-03-21 16:36:15 +0100 Mike Gabriel (e8042c9) +2016-03-21 16:36:15 +0100 Mike Gabriel (e8042c9ff) * hw/nxagent/GC.c: Don't declare and assign flexibility variable if not used later on. -2016-03-21 16:32:41 +0100 Mike Gabriel (7876d1f) +2016-03-21 16:32:41 +0100 Mike Gabriel (7876d1f28) * hw/nxagent/Events.c: Only declare and assign message_data and box variables if compiled with -DTEST / -DDEBUG (plus drop commented out code). -2016-03-21 16:31:49 +0100 Mike Gabriel (30cd3a6) +2016-03-21 16:31:49 +0100 Mike Gabriel (30cd3a6c2) * hw/nxagent/Display.c: Don't declare and assign packMethod / packQuality if not used later on. -2016-03-21 16:14:00 +0100 Mike Gabriel (ab196f3) +2016-03-21 16:14:00 +0100 Mike Gabriel (ab196f3a1) * hw/nxagent/NXrender.c: Don't declare and assign the colors variable, if not used later on. -2016-03-21 16:11:46 +0100 Mike Gabriel (ce8fb1f) +2016-03-21 16:11:46 +0100 Mike Gabriel (ce8fb1f93) * HAVE_STDINT_H: Always include . -2016-05-02 15:38:30 +0200 Mike Gabriel (e3e4516) +2016-05-02 15:38:30 +0200 Mike Gabriel (e3e451629) * hw/nxagent/NXdixfonts.c: Fix implicit declaration for register_fpe_functions(). -2016-03-21 15:54:24 +0100 Mike Gabriel (fb832b0) +2016-03-21 15:54:24 +0100 Mike Gabriel (fb832b01e) * Adapt API for MakeAtom() and CopyISOLatin1Lowered to latest changes in X.org. -2016-03-21 14:18:42 +0100 Mike Gabriel (5e6b72d) +2016-03-21 14:18:42 +0100 Mike Gabriel (5e6b72dc7) * hw/nxagent/NXdixfonts.c: Don't include . No symbol needed from that header file. -2016-03-21 11:55:31 +0100 Mike Gabriel (23d3821) +2016-03-21 11:55:31 +0100 Mike Gabriel (23d3821f0) * hw/nxagent/NXpicture.c: Don't declare anything in empty function nxagentReconnectPictFormat. -2016-03-21 11:54:55 +0100 Mike Gabriel (292d88d) +2016-03-21 11:54:55 +0100 Mike Gabriel (292d88d07) * hw/nxagent/NXglyphcurs.c: Don't declare and set gcval, if not being used later on. -2016-03-21 09:48:11 +0100 Mike Gabriel (182569b) +2016-03-21 09:48:11 +0100 Mike Gabriel (182569bf6) * hw/nxagent/Keyboard.c: The ret variable is only used later on when compiled with -DTEST. -2016-03-21 09:47:29 +0100 Mike Gabriel (66f8895) +2016-03-21 09:47:29 +0100 Mike Gabriel (66f889542) * hw/nxagent/Handlers.c: Don't declare and assign result variable if not used later on. -2016-03-21 09:43:02 +0100 Mike Gabriel (fc39317) +2016-03-21 09:43:02 +0100 Mike Gabriel (fc393174c) * hw/nxagent/Keyboard.c: Don't declare and set XkbDescPtr xkb if not used later on. -2016-03-21 09:41:16 +0100 Mike Gabriel (eb68218) +2016-03-21 09:41:16 +0100 Mike Gabriel (eb682184c) * hw/nxagent/*.c: Drop various declarations of unused ScreenPtr pScreen. -2016-03-18 16:46:34 +0100 Mike Gabriel (b5b7a2d) +2016-03-18 16:46:34 +0100 Mike Gabriel (b5b7a2d26) * hw/nxagent/Screen.c: Cast proper types before handing values over to fprintf(). -2016-03-18 16:45:59 +0100 Mike Gabriel (ab50f84) +2016-03-18 16:45:59 +0100 Mike Gabriel (ab50f84b5) * hw/nxagent/Screen.c: Drop various unused variables. -2016-03-18 16:35:43 +0100 Mike Gabriel (ef287b5) +2016-03-18 16:35:43 +0100 Mike Gabriel (ef287b54f) * hw/nxagent/Screen.h: Provide prototype for nxagentAdjustRandRXinerama(). Avoid implicit-declaration compiler warning. -2016-03-18 16:34:43 +0100 Mike Gabriel (72386e1) +2016-03-18 16:34:43 +0100 Mike Gabriel (72386e171) * hw/nxagent/Screen.c: Correctly use already defined MIN/MAX macros. -2016-03-18 16:27:09 +0100 Mike Gabriel (7d3d47f) +2016-03-18 16:27:09 +0100 Mike Gabriel (7d3d47f1f) * hw/nxagent/Window.c: Don't declare "XWindowChanges changes;" and later not use it. -2016-03-18 16:17:30 +0100 Mike Gabriel (5ea2457) +2016-03-18 16:17:30 +0100 Mike Gabriel (5ea2457ef) * hw/nxagent/Pixmap.c: pBool pointer is only required when compiled in -DTEST mode. -2016-03-18 16:15:29 +0100 Mike Gabriel (08d3848) +2016-03-18 16:15:29 +0100 Mike Gabriel (08d384841) * hw/nxagent/Extension.c: Don't declare pRandRScrPriv without using it later on. -2016-03-18 16:08:45 +0100 Mike Gabriel (802f581) +2016-03-18 16:08:45 +0100 Mike Gabriel (802f58163) * hw/nxagent/Rootless.c: Type cast type Atom to type long unsigned int before handing it over to %lu in fprintf(). -2016-03-18 16:06:59 +0100 Mike Gabriel (c206a0c) +2016-03-18 16:06:59 +0100 Mike Gabriel (c206a0c69) * hw/nxagent/Splash.c: Drop unused variable declaration "XPoint m[12];". -2016-03-18 16:05:01 +0100 Mike Gabriel (5bbdbfc) +2016-03-18 16:05:01 +0100 Mike Gabriel (5bbdbfce2) * hw/nxagent/Clipboard.c: The result variable is only needed when combiled with -DDEBUG. -2016-03-18 15:59:58 +0100 Mike Gabriel (f3f0a6b) +2016-03-18 15:59:58 +0100 Mike Gabriel (f3f0a6b4b) * hw/nxagent/Drawable.c: RegionNumRects returns int, not long int anymore. -2016-03-18 13:06:30 +0100 Mike Gabriel (1202046) +2016-03-18 13:06:30 +0100 Mike Gabriel (120204631) * Add REGION_ macros for source compatibility with existing drivers. -2016-03-18 13:05:05 +0100 Mike Gabriel (b0e69fe) +2016-03-18 13:05:05 +0100 Mike Gabriel (b0e69fe35) * Change region implementation names to eliminate the 'mi' prefix -2016-03-18 04:49:09 +0100 Keith Packard (2881365) +2016-03-18 04:49:09 +0100 Keith Packard (288136514) * Move mi/miregion.c to dix/region.c -2016-03-18 05:13:43 +0100 Mike Gabriel (d9e7f6a) +2016-03-18 05:13:43 +0100 Mike Gabriel (d9e7f6ae4) * pixman-devel: Build against shared library pkg-config(pixman-1). -2016-03-18 05:11:40 +0100 Mike Gabriel (4a8d6ec) +2016-03-18 05:11:40 +0100 Mike Gabriel (4a8d6eca3) * Change region implementation from macros to inline functions. -2016-03-16 11:11:43 +0100 Mike Gabriel (63f1fff) +2016-03-16 11:11:43 +0100 Mike Gabriel (63f1fff8f) * Rename region macros to eliminate screen argument -2016-03-04 16:12:12 +0100 Mike Gabriel (28ba877) +2016-03-04 16:12:12 +0100 Mike Gabriel (28ba87780) * gcc: Build using -std=c99 instead of -ansi. -2016-03-16 11:08:49 +0100 Mike Gabriel (101c895) +2016-03-16 11:08:49 +0100 Mike Gabriel (101c895e6) * fix-patch-whitepspace: Copy script from X.Org's xserver Git repo. -2016-03-16 08:05:01 +0100 Mike Gabriel (eaa19eb) +2016-03-16 08:05:01 +0100 Mike Gabriel (eaa19eb55) * NXwindow.c: Don't set w and h, not used later on. -2016-03-22 14:23:12 +0100 Mike Gabriel (6c6b6b9) +2016-03-22 14:23:12 +0100 Mike Gabriel (6c6b6b962) * lib/Imakefile: Drop $(XINERAMADIR) from nx-X11/lib/Imakefile. (gh-sunweaver/3.6.x) -2016-04-27 14:00:57 +0200 Mike Gabriel (2137ee7) +2016-04-27 14:00:57 +0200 Mike Gabriel (2137ee7e2) * Merge branch 'sunweaver-pr/nxcomp-unix-sockets-for-channels' into 3.6.x -2016-04-20 16:22:56 +0200 Salvador Fandino (3713346) +2016-04-20 16:22:56 +0200 Salvador Fandino (3713346f3) * Provide support for channel endpoints being UNIX file sockets in addition to being TCP/IP sockets. (gh-sunweaver/pr/nxcomp-unix-sockets-for-channels) -2016-04-27 13:56:55 +0200 Mike Gabriel (b326eda) +2016-04-27 13:56:55 +0200 Mike Gabriel (b326eda73) * nxcomp: Rephrase comment in previous commit. -2016-04-27 13:54:56 +0200 Mike Gabriel (416fc18) +2016-04-27 13:54:56 +0200 Mike Gabriel (416fc186b) * Merge branch 'fcarvajaldev-3.6.x-nxcomp-amend-compiler-warnings' into 3.6.x -2016-04-25 12:53:00 +0200 Fernando Carvajal (a436cba) +2016-04-25 12:53:00 +0200 Fernando Carvajal (a436cba04) * Clean up compiler warnings in nxcomp -2016-04-26 22:35:00 +0200 Mihai Moldovan (12104a2) +2016-04-26 22:35:00 +0200 Mihai Moldovan (12104a232) * Merge branch 'sunweaver-pr/libxrender-cleanup' into arctica-3.6.x -2015-06-25 05:37:03 +0200 Mike Gabriel (ebcb6a6) +2015-06-25 05:37:03 +0200 Mike Gabriel (ebcb6a6e1) * library-cleanup: Don't build libNX_Xrender anymore. Use system's libXrender shared library. (gh-sunweaver/pr/libxrender-cleanup) -2016-04-20 16:16:40 +0200 Mike Gabriel (5729783) +2016-04-20 16:16:40 +0200 Mike Gabriel (5729783db) * Merge branch 'theqvd-fix-for-112' into 3.6.x -2016-04-20 15:46:16 +0200 Salvador Fandino (7d05395) +2016-04-20 15:46:16 +0200 Salvador Fandino (7d053959f) * Fix copyright notice in nxcomp/Version.c -2016-04-19 10:47:43 +0200 Mike Gabriel (03b6521) +2016-04-19 10:47:43 +0200 Mike Gabriel (03b652112) * Merge branch 'fcarvajaldev-3.6.x-remove-old-proto-compat' into 3.6.x -2016-04-15 09:49:09 +0200 Fernando Carvajal (5c49524) +2016-04-15 09:49:09 +0200 Fernando Carvajal (5c4952410) * Remove TextCompressor class and files from nxcomp -2016-04-14 17:10:07 +0200 Fernando Carvajal (00464ae) +2016-04-14 17:10:07 +0200 Fernando Carvajal (00464aea0) * Add testing doc for nxcomp drop-old-proto-compat -2016-04-12 16:03:37 +0200 Fernando Carvajal (1346481) +2016-04-12 16:03:37 +0200 Fernando Carvajal (134648169) * Remove obsolete compatibility files from nxcomp -2016-04-12 11:52:22 +0200 Fernando Carvajal (a9be6f5) +2016-04-12 11:52:22 +0200 Fernando Carvajal (a9be6f591) * Remove compatibility code for nxcomp before 3.5.0 -2016-03-22 20:03:42 +0100 Mike Gabriel (2ffe52c) +2016-03-22 20:03:42 +0100 Mike Gabriel (2ffe52c5e) * nxcomp: Properly define NX*Version(void) prototypes in NX.h. -2016-03-17 16:46:13 +0100 Mike Gabriel (af923fb) +2016-03-17 16:46:13 +0100 Mike Gabriel (af923fba3) * debian/patches/401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch: Move into debian/patches-pending-evaluation/. -2016-03-15 10:49:25 +0100 Mike Gabriel (1568148) +2016-03-15 10:49:25 +0100 Mike Gabriel (156814860) * doc: Collect data on what libX11 symbols are used by nx-X11, nx-Xserver and nxagent. -2016-03-02 09:33:13 +0100 Nito Martinez (b8c5f67) +2016-03-02 09:33:13 +0100 Nito Martinez (b8c5f677c) * Rename file for windows environments, Fixes #96 -2016-02-26 08:14:28 +0100 Mike Gabriel (abd6cf1) +2016-02-26 08:14:28 +0100 Mike Gabriel (abd6cf1bd) * rename original NX patches, so that we can see the patched file's name in the patch file name. -2016-01-19 05:59:51 +0100 Mike Gabriel (2eb85d1) +2016-01-19 05:59:51 +0100 Mike Gabriel (2eb85d140) * README.md: Update open / completed tasks regarding 3.6.x and 3.7.x releases. -2016-01-19 04:55:01 +0100 Mike Gabriel (e3539ec) +2016-01-19 04:55:01 +0100 Mike Gabriel (e3539ec58) * README.md: Update release dates for 3.6.x and 3.7.x (as earlier discussed with Salve from TheQVD). -2016-01-19 04:50:57 +0100 Mike Gabriel (125f031) +2016-01-19 04:50:57 +0100 Mike Gabriel (125f03110) * Merge branch 'mikedep333-README.md' into 3.6.x -2016-01-18 22:37:46 -0500 Mike DePaulo (0239ba7) +2016-01-18 22:37:46 -0500 Mike DePaulo (0239ba72b) * README.md: Add debuild instructions -2016-01-18 21:49:03 -0500 Mike DePaulo (474e9c0) +2016-01-18 21:49:03 -0500 Mike DePaulo (474e9c0ba) * README.md: Update signature -2016-01-09 22:26:34 +0100 Mike Gabriel (72801f6) +2016-01-09 22:26:34 +0100 Mike Gabriel (72801f6d5) * Merge pull request #68 from mikedep333/mock-build-instructions -2016-01-02 07:30:02 +0100 Mike Gabriel (e794be3) +2016-01-02 07:30:02 +0100 Mike Gabriel (e794be341) * debian/nx-x11proto-xinerama-dev.install.in: Install PANORAMIX extension header files into its own nx-x11proto bin:package. (more Xinerama clean-up, fix FTBFS during dh_install). -2016-01-01 12:27:14 -0500 Mike DePaulo (b7657cf) +2016-01-01 12:27:14 -0500 Mike DePaulo (b7657cfba) * nx-libs.spec: FTBFS Fixes (more libNX_Xinerama cleanup) -2016-01-01 12:01:43 -0500 Mike DePaulo (0428db4) +2016-01-01 12:01:43 -0500 Mike DePaulo (0428db4db) * nx-libs.spec: Misc FTBFS fixes for %files due to recent library changes -2016-01-01 11:32:25 -0500 Mike DePaulo (7f5480d) +2016-01-01 11:32:25 -0500 Mike DePaulo (7f5480dd7) * Fedora/EPEL: Add the implicit build dependencies also -2016-01-01 11:21:47 -0500 Mike DePaulo (1330c41) +2016-01-01 11:21:47 -0500 Mike DePaulo (1330c4125) * Fedora/EPEL: Fix FTBFS due to missing libXpm -2016-01-01 16:26:50 +0100 Mike Gabriel (3ba3165) +2016-01-01 16:26:50 +0100 Mike Gabriel (3ba31659e) * Fix c4a3889. Add forgotten file nx-X11/programs/Xserver/Xinerama_nxagent.h. -2016-01-01 16:08:05 +0100 Mike Gabriel (12b4a0e) +2016-01-01 16:08:05 +0100 Mike Gabriel (12b4a0e7a) * nx-libs.spec: Re-add erroneously removed (during rebasing) BR libXdamage-devel. -2016-01-01 09:52:26 -0500 Mike DePaulo (daace15) +2016-01-01 09:52:26 -0500 Mike DePaulo (daace15e2) * Add instructions for building using Mock under Fedora/EPEL -2015-12-30 19:25:08 +0100 Mike Gabriel (fa497ac) +2015-12-30 19:25:08 +0100 Mike Gabriel (fa497ac95) * nxcomp: Make nxcomp/nxproxy aware of nxagent's xinerama option in the $DISPLAY variable. -2015-05-23 09:28:57 -0400 Mike DePaulo (6da41e6) +2015-05-23 09:28:57 -0400 Mike DePaulo (6da41e6f6) * Complete changes from commit 0d56c45 in NXpicturestr.h (i.e. add a missing comment). (Fixes ArcticaProject/nx-libs#38). -2015-12-30 00:06:58 +0100 Mike Gabriel (1391c0a) +2015-12-30 00:06:58 +0100 Mike Gabriel (1391c0ad7) * Merge branch 'sunweaver-pr/xinerama-xrandr' into 3.6.x -2015-10-08 22:25:09 +0200 Ulrich Sibiller (c4a3889) +2015-10-08 22:25:09 +0200 Ulrich Sibiller (c4a388937) * Xinerama: do not cut off at outer edges (gh-sunweaver/pr/xinerama-xrandr) -2015-10-07 20:45:14 +0200 Mike Gabriel (4ba8df8) +2015-10-07 20:45:14 +0200 Mike Gabriel (4ba8df855) * Xserver globals.h: Make PanoramiXExtensionDisabledHack globally available. -2015-10-07 20:44:19 +0200 Mike Gabriel (d49b062) +2015-10-07 20:44:19 +0200 Mike Gabriel (d49b0625e) * Xserver help: Document -disablexineramaextension cmdline option. -2015-10-07 21:33:55 +0200 Mike Gabriel (522cf00) +2015-10-07 21:33:55 +0200 Mike Gabriel (522cf0089) * X2Go Agent: Add x2goagent.features file that informs X2Go clients about the new RandR based Xinerama feature. -2015-10-07 20:51:12 +0200 Mike Gabriel (0297567) +2015-10-07 20:51:12 +0200 Mike Gabriel (0297567cd) * Provide support for re-enabling Xinerama on session resumptions. -2015-10-07 17:24:01 +0200 Mike Gabriel (f40792c) +2015-10-07 17:24:01 +0200 Mike Gabriel (f40792c43) * Initialize XRandR based Xinerama extension properly when session is started with "-geometry fullscreen". -2015-10-07 17:23:13 +0200 Mike Gabriel (e7e2f16) +2015-10-07 17:23:13 +0200 Mike Gabriel (e7e2f164b) * Only declare nxagentRandRCrtcSet if RANDR_12_INTERFACE is defined. -2015-10-07 15:17:59 +0200 Mike Gabriel (f1eafea) +2015-10-07 15:17:59 +0200 Mike Gabriel (f1eafeaa4) * Screen.c: Rename NX_USE_MODE_PREFIX to NXAGENT_RANDR_MODE_PREFIX, fix unclosed comment. -2015-10-06 22:53:16 +0200 Ulrich Sibiller (9b87a38) +2015-10-06 22:53:16 +0200 Ulrich Sibiller (9b87a384e) * Screen.c: restructure xinerama code, much shorter now -2015-10-06 22:32:12 +0200 Ulrich Sibiller (359f48d) +2015-10-06 22:32:12 +0200 Ulrich Sibiller (359f48dd7) * Screen.c: Fix freeing of unsued modes -2015-10-06 22:30:39 +0200 Ulrich Sibiller (76a2034) +2015-10-06 22:30:39 +0200 Ulrich Sibiller (76a203410) * Screen.c: improve comments and DEBUG output -2015-10-06 22:27:10 +0200 Ulrich Sibiller (8b0e2af) +2015-10-06 22:27:10 +0200 Ulrich Sibiller (8b0e2af36) * rrmode.c: add debug output -2015-05-02 21:53:25 +0200 Ulrich Sibiller (c6482d2) +2015-05-02 21:53:25 +0200 Ulrich Sibiller (c6482d24f) * Reimplement xinerama via randr in nxagent (not libNX_Xinerama). (Fixes ArcticaProject/nx-libs#23). -2015-05-05 10:24:24 +0200 Mike Gabriel (2d776b1) +2015-05-05 10:24:24 +0200 Mike Gabriel (2d776b14f) * library clean-up: Don't build libNX_Xinerama anymore. Use system's libXinerama shared library. (Fixes ArcticaProject/nx-libs#49). -2015-12-29 22:34:04 +0100 Mike Gabriel (e4763fb) +2015-12-29 22:34:04 +0100 Mike Gabriel (e4763fb48) * debian/rules: Don't strips symbols from not-build-anymore libNX_Xtst.so. -2015-06-21 18:12:11 +0200 Mike Gabriel (bd592c2) +2015-06-21 18:12:11 +0200 Mike Gabriel (bd592c2e7) * library clean-up: Don't build libNX_Xtst anymore. Use system's libXtst shared library. (Fixes ArcticaProject/nx-libs#32). -2015-12-29 17:34:36 +0100 Mike Gabriel (b768e81) +2015-12-29 17:34:36 +0100 Mike Gabriel (b768e8124) * Fix for too overall Xdamage and Xrandr client lib removal: Bring back the nx-x11proto-{randr,damage} header files and use those at compile time. -2015-12-29 17:27:47 +0100 Mike Gabriel (9618380) +2015-12-29 17:27:47 +0100 Mike Gabriel (9618380bd) * X11/nx-X11 clear-up: More places where we need to explicitly distinguish between X11 and nx-X11 namespace regarding header include paths. -2015-12-29 17:28:54 +0100 Mike Gabriel (eafc94f) +2015-12-29 17:28:54 +0100 Mike Gabriel (eafc94f16) * nx-X11/lib/X11/Marcos.c: white-space cleanup (EOL blanks). -2015-12-28 22:32:52 +0100 Mike Gabriel (b7f1556) +2015-12-28 22:32:52 +0100 Mike Gabriel (b7f155654) * pointer typedef in Xdefs.h: also catch Xdefs.h include in include/misc.h, make undoing the FIXME more obvious. -2015-12-28 21:33:30 +0100 Mike Gabriel (7eab400) +2015-12-28 21:33:30 +0100 Mike Gabriel (7eab400ab) * libray clean (Xfixes): Provide a fake libXfixes.h header from latest X.Org, that includes headers from our Xlib version. This avoids FTBFS caused by type redefinitions and should really be a temporary measure. -2015-12-28 21:31:58 +0100 Mike Gabriel (f63641b) +2015-12-28 21:31:58 +0100 Mike Gabriel (f63641b13) * Xrandr_nxagent.h: When faking Xrandr.h, we better include our own Xfuncproto.h. -2015-12-28 20:47:49 +0100 Mike Gabriel (cc43e2b) +2015-12-28 20:47:49 +0100 Mike Gabriel (cc43e2bf6) * nxcompshad/X11/include/Xdamage_nxcompshad.h: Update FIXME statement. Work-around needs to persist until libX11 from X.Org gets used by nxagent. -2015-12-28 19:09:42 +0100 Mike Gabriel (6217812) +2015-12-28 19:09:42 +0100 Mike Gabriel (6217812c8) * library clean-up: Don't build libNX_Xfixes anymore. Use system's libXfixes shared library. -2015-12-28 19:55:38 +0100 Mike Gabriel (27e06a5) +2015-12-28 19:55:38 +0100 Mike Gabriel (27e06a5e2) * library clean-up: Don't build libNX_Xcomposite anymore. Use system's libXcomposite shared library. -2015-12-28 15:53:09 +0100 Mike Gabriel (96e1f86) +2015-12-28 15:53:09 +0100 Mike Gabriel (96e1f867d) * pointer typedef in Xdefs.h: Define pointer type for building against older Xlib versions that still expect the pointer type to exist (e.g. Ubuntu <= 14.04, Debian <= 7.0). -2015-12-28 13:17:21 +0100 Mike Gabriel (ca0f639) +2015-12-28 13:17:21 +0100 Mike Gabriel (ca0f639a4) * Merge branch 'sunweaver-pr/NX-include-path' into 3.6.x -2015-07-08 16:16:40 +0200 Mike Gabriel (433d818) +2015-07-08 16:16:40 +0200 Mike Gabriel (433d81865) * Clear header file namespace separation ( vs. ). -2015-12-28 13:08:47 +0100 Mike Gabriel (f58006d) +2015-12-28 13:08:47 +0100 Mike Gabriel (f58006d93) * Merge branch 'sunweaver-pr/dixfont-fix' into 3.6.x -2015-06-23 15:04:16 +0200 Mike Gabriel (aea7106) +2015-06-23 15:04:16 +0200 Mike Gabriel (aea71067d) * On realloc failure, free font_path_string instead of leaking it -2015-12-28 13:03:52 +0100 Mike Gabriel (edce252) +2015-12-28 13:03:52 +0100 Mike Gabriel (edce25213) * Merge branch 'sunweaver-pr/change-pointer-into-void' into 3.6.x -2015-06-22 09:36:08 +0200 Keith Packard (68dd0b5) +2015-06-22 09:36:08 +0200 Keith Packard (68dd0b52e) * Replace 'pointer' type with 'void *' -2015-10-07 17:28:27 +0200 Mike Gabriel (e9f4422) +2015-10-07 17:28:27 +0200 Mike Gabriel (e9f44221b) * Drop all references to printver.c. Not provided in source tree anymore. -2015-10-06 17:12:16 +0200 Mike Gabriel (e0b8f3e) +2015-10-06 17:12:16 +0200 Mike Gabriel (e0b8f3eef) * Re-add -sync option back to nxagent to allow synchronous debugging of the nxagent DDX. -2015-09-28 09:57:12 +0200 Mike Gabriel (81d92cd) +2015-09-28 09:57:12 +0200 Mike Gabriel (81d92cd0f) * Xinerama symlinking: Create / remove folder containing Xinerama sylinks on installation/upgrade and removal. -2015-09-28 08:15:52 +0200 Mike Gabriel (45983d1) +2015-09-28 08:15:52 +0200 Mike Gabriel (45983d130) * Xinerama symlinking: Attach Xinerama symlinking to nxagent bin:package (and not libnx-xinerama1). -2015-09-28 08:10:59 +0200 Mike Gabriel (0382b40) +2015-09-28 08:10:59 +0200 Mike Gabriel (0382b4018) * debian/changelog: Drop unnecessary "~build1" from version string -2015-09-28 07:59:12 +0200 Mike Gabriel (ca990cf) +2015-09-28 07:59:12 +0200 Mike Gabriel (ca990cf0a) * Merge pull request #64 from uli42/pr/add_pkgconfig -2015-09-28 07:53:57 +0200 Mike Gabriel (f9653af) +2015-09-28 07:53:57 +0200 Mike Gabriel (f9653af3b) * Merge branch 'uli42-pr/backported_fixes' into 3.6.x -2015-09-23 12:15:06 +0200 Mike Gabriel (3a022e3) +2015-09-23 12:15:06 +0200 Mike Gabriel (3a022e35c) * debian/libnx-xinerama1.postinst.in: Enforce symlink creation for Xinerama support. -2015-09-22 15:02:22 +0200 Mike Gabriel (899f865) +2015-09-22 15:02:22 +0200 Mike Gabriel (899f865cf) * Revert "debian/libnx-xinerama1.*: fix faulty logic when creating symlinks." -2015-07-17 18:13:00 +0200 Mihai Moldovan (9b126b8) +2015-07-17 18:13:00 +0200 Mihai Moldovan (9b126b852) * nx-libs.spec: add xkeyboard-config to nxagent's Requires. -2015-07-17 17:57:24 +0200 Mihai Moldovan (3a1226e) +2015-07-17 17:57:24 +0200 Mihai Moldovan (3a1226ea6) * debian/control: add xkb-data to nxagent's Recommends. -2015-07-17 17:48:44 +0200 Mihai Moldovan (2aa8535) +2015-07-17 17:48:44 +0200 Mihai Moldovan (2aa853530) * debian/roll-tarballs.sh: more quotes, more curly braces, replace cd with pushd and pop. -2015-07-15 09:30:29 +0200 Mike Gabriel (c36501b) +2015-07-15 09:30:29 +0200 Mike Gabriel (c36501b53) * roll-tarball.sh: more quotes (follow-up for previous commit), drop debug code -2015-07-14 20:39:58 +0200 Mike Gabriel (99a7271) +2015-07-14 20:39:58 +0200 Mike Gabriel (99a7271e3) * roll-tarball.sh: Make sure symlinked files are included in tarballs. -2015-07-14 15:14:55 +0200 Mike Gabriel (0897c06) +2015-07-14 15:14:55 +0200 Mike Gabriel (0897c062e) * nx-libs.spec: Install nxcomp{,ext,shad}.pc into the corresponding development packages. -2015-07-14 14:46:42 +0200 Mike Gabriel (2cc1792) +2015-07-14 14:46:42 +0200 Mike Gabriel (2cc179223) * debian/libxcomp{,ext,shad}-dev.install.in: Install nxcomp{,ext,shad}.pc file into the corresponding development packages. -2015-07-14 14:43:34 +0200 Mike Gabriel (eb5f07c) +2015-07-14 14:43:34 +0200 Mike Gabriel (eb5f07ccd) * nxcomp{,ext,shad}/Makefile.in: Create pkgconfigdir before putting files in it. -2015-07-14 01:39:17 +0200 Mike Gabriel (bc35168) +2015-07-14 01:39:17 +0200 Mike Gabriel (bc35168fb) * nxcomp{,shad,ext}: Remove nxcomp*.pc file on clean and distclean. -2015-07-14 01:26:33 +0200 Mike Gabriel (eee7cb4) +2015-07-14 01:26:33 +0200 Mike Gabriel (eee7cb4fb) * Makefile: Also remove nxversion.def on distclean. -2015-07-12 01:52:29 +0200 Ulrich Sibiller (708cf86) +2015-07-12 01:52:29 +0200 Ulrich Sibiller (708cf86a5) * Add pkg-config support to nxcomp, nxcompext and nxcompshad -2015-07-04 06:46:29 +0200 Mihai Moldovan (8c0a616) +2015-07-04 06:46:29 +0200 Mihai Moldovan (8c0a6161d) * debian/changelog: sync with master/3.5.0.x branch. -2015-06-29 03:40:58 +0200 Mihai Moldovan (34670f8) +2015-06-29 03:40:58 +0200 Mihai Moldovan (34670f8ab) * debian/changelog: sync with master/3.5.0.x branch. -2015-06-28 01:50:00 -0400 Mike DePaulo (a1dfd14) +2015-06-28 01:50:00 -0400 Mike DePaulo (a1dfd145d) * Correct nxproxy manpage also: --help -> -help -2015-06-28 01:33:49 -0400 Mike DePaulo (d8132cb) +2015-06-28 01:33:49 -0400 Mike DePaulo (d8132cbfe) * Correct manpages: --help -> -help -2015-06-23 16:24:56 +0200 Mike Gabriel (5720842) +2015-06-23 16:24:56 +0200 Mike Gabriel (5720842b6) * library clean-up: No autotools cruft in nx-libs. -2015-06-25 05:04:12 +0200 Mike Gabriel (8365e22) +2015-06-25 05:04:12 +0200 Mike Gabriel (8365e22bb) * doc/examples/run-nxproxy2nxproxy-test: Create NX_COOKIE dynamically using the mcookie tool. -2015-05-28 14:52:24 +0200 Mike Gabriel (7dc2633) +2015-05-28 14:52:24 +0200 Mike Gabriel (7dc263333) * COPYING: Replace content with GPL-2 license text, because that is the overall (i.e., strictest) license we have to deal with in nx-libs. -2015-05-28 14:50:05 +0200 Mike Gabriel (c68dad5) +2015-05-28 14:50:05 +0200 Mike Gabriel (c68dad542) * debian/roll-tarball.sh: Auto-generate ChangeLog from Git history. -2015-05-28 14:49:40 +0200 Mike Gabriel (ce53377) +2015-05-28 14:49:40 +0200 Mike Gabriel (ce5337799) * debian/roll-tarball.sh: Rename README.md to README.NX-Development before moving it into doc/ folder. -2015-05-28 14:33:08 +0200 Mike Gabriel (122fd23) +2015-05-28 14:33:08 +0200 Mike Gabriel (122fd234c) * debian/roll-tarball.sh: Prevent several files/folders from ending up in nx-libs-lite tarball. -2015-05-28 13:33:43 +0200 Mike Gabriel (2d50be9) +2015-05-28 13:33:43 +0200 Mike Gabriel (2d50be9da) * debian/roll-tarball.sh: Support tarring up the HEAD of the current branch. -2015-05-28 13:29:27 +0200 Mike Gabriel (51a679a) +2015-05-28 13:29:27 +0200 Mike Gabriel (51a679ac2) * debian/roll-tarball.sh: Allow patch files names having a dash next to the four digits (i.e., 1234-.). -2015-06-23 16:09:50 +0200 Emanuele Giaquinta (931d24c) +2015-06-23 16:09:50 +0200 Emanuele Giaquinta (931d24cc2) * Fix alpha premultiplication in XRenderParseColor. -2015-05-27 12:34:12 +0200 Mike Gabriel (6deaaf5) +2015-05-27 12:34:12 +0200 Mike Gabriel (6deaaf50f) * library clean-up: Drop libXx86{misc,vm,dga} libraries. Not needed by nx-libs. -2015-05-27 10:20:29 +0200 Mike Gabriel (fe0065c) +2015-05-27 10:20:29 +0200 Mike Gabriel (fe0065c55) * library clean-up: Drop nx-X11/lib/Xxf86rush and references to libglide{2,3}. Unused in nx-libs. -2015-05-27 09:48:26 +0200 Mike Gabriel (018c512) +2015-05-27 09:48:26 +0200 Mike Gabriel (018c51293) * nx-X11/config/cf: Drop build-logic for all hardware drivers. -2015-05-27 08:38:11 +0200 Mike Gabriel (17334df) +2015-05-27 08:38:11 +0200 Mike Gabriel (17334df9b) * nx-X11/config/cf: Drop unnecessary xf86site.def, xf86.tmpl, xfree86.cf. -2015-05-27 08:26:40 +0200 Mike Gabriel (8dd6d2f) +2015-05-27 08:26:40 +0200 Mike Gabriel (8dd6d2fe7) * nx-X11/config/cf/Imakefile: Don't list non-present-anymore imake configuration files. -2015-06-20 17:47:39 +0200 Mike Gabriel (32b4439) +2015-06-20 17:47:39 +0200 Mike Gabriel (32b44398a) * libgl clean-up, fix-up commit -2015-06-20 17:35:00 +0200 Mike DePaulo (d7108d2) +2015-06-20 17:35:00 +0200 Mike DePaulo (d7108d206) * README.md: typo fix -2015-06-20 11:34:04 +0200 Henning Heinold (2699d60) +2015-06-20 11:34:04 +0200 Henning Heinold (2699d60f6) * remove libxkbui, looks like it is not used anywhere -2015-06-19 23:58:49 +0200 Mike Gabriel (f1778d0) +2015-06-19 23:58:49 +0200 Mike Gabriel (f1778d0c2) * debian/control: Add Breaks:/Replaces: for qvd-libxcomp3 and qvd-nxproxy. -2015-05-27 08:10:38 +0200 Mike Gabriel (858b9bc) +2015-05-27 08:10:38 +0200 Mike Gabriel (858b9bc2a) * imake clean-up: Enforce build of Mesa GLX extension. Drop all other GLX build methods (built-in DRI drivers, etc.). -2015-05-26 16:44:49 +0200 Mike Gabriel (0887e3a) +2015-05-26 16:44:49 +0200 Mike Gabriel (0887e3ad5) * Drop unused / untested Xserver GLX extension support / build logic. -2015-05-26 16:22:40 +0200 Mike Gabriel (d877b46) +2015-05-26 16:22:40 +0200 Mike Gabriel (d877b46dd) * Drop nx-X11/lib/GL and move Imakefile.inc include files into Xserver code tree. -2015-06-16 22:43:21 +0200 Mihai Moldovan (8f41384) +2015-06-16 22:43:21 +0200 Mihai Moldovan (8f4138457) * nxcomp/Loop.cpp: tiny whitespace fix. No functional change. -2015-05-20 15:47:45 +0200 Vadim Troshchinskiy (8d9e8f7) +2015-05-20 15:47:45 +0200 Vadim Troshchinskiy (8d9e8f70b) * Fix negotiation in stage 10 error -2015-09-26 00:28:14 +0200 Ulrich Sibiller (1fe33b7) +2015-09-26 00:28:14 +0200 Ulrich Sibiller (1fe33b710) * use xfree instead of free for xalloced data -2015-09-23 12:15:06 +0200 Mike Gabriel (da6b89f) +2015-09-23 12:15:06 +0200 Mike Gabriel (da6b89f7e) * debian/libnx-xinerama1.postinst.in: Enforce symlink creation for Xinerama support. -2015-09-22 15:02:22 +0200 Mike Gabriel (4db753e) +2015-09-22 15:02:22 +0200 Mike Gabriel (4db753eb7) * Revert "debian/libnx-xinerama1.*: fix faulty logic when creating symlinks." -2015-08-26 01:06:28 +0200 Ulrich Sibiller (f8772b6) +2015-08-26 01:06:28 +0200 Ulrich Sibiller (f8772b6fc) * adapt pkgconfigdir in nxcompshad -2015-08-26 01:02:34 +0200 Ulrich Sibiller (96a1c5e) +2015-08-26 01:02:34 +0200 Ulrich Sibiller (96a1c5edf) * Fix "Makefile.in seems to ignore the --datarootdir setting" warning -2015-08-26 00:29:14 +0200 Ulrich Sibiller (6615de8) +2015-08-26 00:29:14 +0200 Ulrich Sibiller (6615de8dd) * create pkgcnfig dir before copying anything -2015-07-17 18:13:00 +0200 Mihai Moldovan (edeb4e1) +2015-07-17 18:13:00 +0200 Mihai Moldovan (edeb4e196) * nx-libs.spec: add xkeyboard-config to nxagent's Requires. -2015-07-17 17:57:24 +0200 Mihai Moldovan (813d0cf) +2015-07-17 17:57:24 +0200 Mihai Moldovan (813d0cf13) * debian/control: add xkb-data to nxagent's Recommends. -2015-07-17 17:48:44 +0200 Mihai Moldovan (0606ec8) +2015-07-17 17:48:44 +0200 Mihai Moldovan (0606ec814) * debian/roll-tarballs.sh: more quotes, more curly braces, replace cd with pushd and pop. -2015-07-15 09:30:29 +0200 Mike Gabriel (01ad7da) +2015-07-15 09:30:29 +0200 Mike Gabriel (01ad7dad4) * roll-tarball.sh: more quotes (follow-up for previous commit), drop debug code -2015-07-14 20:39:58 +0200 Mike Gabriel (c2761fb) +2015-07-14 20:39:58 +0200 Mike Gabriel (c2761fb7c) * roll-tarball.sh: Make sure symlinked files are included in tarballs. -2015-07-14 15:14:55 +0200 Mike Gabriel (c1d502e) +2015-07-14 15:14:55 +0200 Mike Gabriel (c1d502e1c) * nx-libs.spec: Install nxcomp{,ext,shad}.pc into the corresponding development packages. -2015-07-14 14:46:42 +0200 Mike Gabriel (931050c) +2015-07-14 14:46:42 +0200 Mike Gabriel (931050cbe) * debian/libxcomp{,ext,shad}-dev.install.in: Install nxcomp{,ext,shad}.pc file into the corresponding development packages. -2015-07-14 14:43:34 +0200 Mike Gabriel (ee0ed87) +2015-07-14 14:43:34 +0200 Mike Gabriel (ee0ed871a) * nxcomp{,ext,shad}/Makefile.in: Create pkgconfigdir before putting files in it. -2015-07-14 01:39:17 +0200 Mike Gabriel (39ae817) +2015-07-14 01:39:17 +0200 Mike Gabriel (39ae81788) * nxcomp{,shad,ext}: Remove nxcomp*.pc file on clean and distclean. -2015-07-14 01:26:33 +0200 Mike Gabriel (5eecadb) +2015-07-14 01:26:33 +0200 Mike Gabriel (5eecadb53) * Makefile: Also remove nxversion.def on distclean. -2015-07-14 00:04:01 +0200 Mike Gabriel (e5fbb11) +2015-07-14 00:04:01 +0200 Mike Gabriel (e5fbb11b2) * Merge branch 'uli42-pr/add_pkgconfig' into 3.6.x -2015-07-12 01:52:29 +0200 Ulrich Sibiller (00cec49) +2015-07-12 01:52:29 +0200 Ulrich Sibiller (00cec4924) * Add pkg-config support to nxcomp, nxcompext and nxcompshad -2015-07-04 06:46:29 +0200 Mihai Moldovan (f4c07c0) +2015-07-04 06:46:29 +0200 Mihai Moldovan (f4c07c077) * debian/changelog: sync with master/3.5.0.x branch. -2015-07-03 17:07:30 +0200 Mihai Moldovan (ca19c34) +2015-07-03 17:07:30 +0200 Mihai Moldovan (ca19c342c) * Merge branch 'uli42-pr/backported_fixes' into arctica-3.6.x -2009-02-13 10:23:28 +0100 Peter Åstrand (d088698) +2009-02-13 10:23:28 +0100 Peter Åstrand (d08869832) * Backport: xserver: Avoid sending uninitialized padding data over the network -2015-06-29 04:13:59 +0200 Mihai Moldovan (61013ec) +2015-06-29 04:13:59 +0200 Mihai Moldovan (61013ec4f) * Merge branch 'sunweaver-pr/no-autotools-cruft' into arctica-3.6.x -2015-06-29 03:40:58 +0200 Mihai Moldovan (fa0286e) +2015-06-29 03:40:58 +0200 Mihai Moldovan (fa0286ed6) * debian/changelog: sync with master/3.5.0.x branch. -2015-06-28 01:50:00 -0400 Mike DePaulo (779d546) +2015-06-28 01:50:00 -0400 Mike DePaulo (779d54645) * Correct nxproxy manpage also: --help -> -help -2015-06-28 01:33:49 -0400 Mike DePaulo (12acd90) +2015-06-28 01:33:49 -0400 Mike DePaulo (12acd909b) * Correct manpages: --help -> -help -2015-06-23 16:24:56 +0200 Mike Gabriel (a28be4a) +2015-06-23 16:24:56 +0200 Mike Gabriel (a28be4aa9) * library clean-up: No autotools cruft in nx-libs. -2015-06-25 05:04:12 +0200 Mike Gabriel (e7f3187) +2015-06-25 05:04:12 +0200 Mike Gabriel (e7f3187ee) * doc/examples/run-nxproxy2nxproxy-test: Create NX_COOKIE dynamically using the mcookie tool. -2015-06-23 16:39:33 +0200 Mihai Moldovan (32bbe01) +2015-06-23 16:39:33 +0200 Mihai Moldovan (32bbe01dd) * Merge branch 'sunweaver-pr/roll-tarball-fixes' into arctica-3.6.x -2015-05-28 14:52:24 +0200 Mike Gabriel (5af9863) +2015-05-28 14:52:24 +0200 Mike Gabriel (5af9863e7) * COPYING: Replace content with GPL-2 license text, because that is the overall (i.e., strictest) license we have to deal with in nx-libs. -2015-05-28 14:50:05 +0200 Mike Gabriel (438f3df) +2015-05-28 14:50:05 +0200 Mike Gabriel (438f3df14) * debian/roll-tarball.sh: Auto-generate ChangeLog from Git history. -2015-05-28 14:49:40 +0200 Mike Gabriel (7e1effb) +2015-05-28 14:49:40 +0200 Mike Gabriel (7e1effbe7) * debian/roll-tarball.sh: Rename README.md to README.NX-Development before moving it into doc/ folder. -2015-05-28 14:33:08 +0200 Mike Gabriel (47afc48) +2015-05-28 14:33:08 +0200 Mike Gabriel (47afc48ea) * debian/roll-tarball.sh: Prevent several files/folders from ending up in nx-libs-lite tarball. -2015-05-28 13:33:43 +0200 Mike Gabriel (895ee3b) +2015-05-28 13:33:43 +0200 Mike Gabriel (895ee3b3b) * debian/roll-tarball.sh: Support tarring up the HEAD of the current branch. -2015-05-28 13:29:27 +0200 Mike Gabriel (701471e) +2015-05-28 13:29:27 +0200 Mike Gabriel (701471e8e) * debian/roll-tarball.sh: Allow patch files names having a dash next to the four digits (i.e., 1234-.). -2015-06-23 16:14:41 +0200 Mike Gabriel (ce9ea54) +2015-06-23 16:14:41 +0200 Mike Gabriel (ce9ea5448) * Merge branch 'pr/anti-aliasing-rgba-crash' into 3.6.x -2015-06-23 16:09:50 +0200 Emanuele Giaquinta (ffc87da) +2015-06-23 16:09:50 +0200 Emanuele Giaquinta (ffc87da60) * Fix alpha premultiplication in XRenderParseColor. -2015-06-23 02:30:02 +0200 Mihai Moldovan (8cf9283) +2015-06-23 02:30:02 +0200 Mihai Moldovan (8cf9283bd) * Merge branch 'sunweaver-pr/libXx86FOO-cleanup' into arctica-3.6.x -2015-05-27 12:34:12 +0200 Mike Gabriel (06d389a) +2015-05-27 12:34:12 +0200 Mike Gabriel (06d389a0c) * library clean-up: Drop libXx86{misc,vm,dga} libraries. Not needed by nx-libs. (gh-sunweaver/pr/libXx86FOO-cleanup) -2015-06-22 03:38:46 +0200 Mihai Moldovan (e7dfbd5) +2015-06-22 03:38:46 +0200 Mihai Moldovan (e7dfbd511) * Merge branch 'sunweaver-pr/libxf86rush-cleanup' into arctica-3.6.x -2015-05-27 10:20:29 +0200 Mike Gabriel (5365f90) +2015-05-27 10:20:29 +0200 Mike Gabriel (5365f9059) * library clean-up: Drop nx-X11/lib/Xxf86rush and references to libglide{2,3}. Unused in nx-libs. (gh-sunweaver/pr/libxf86rush-cleanup) -2015-06-21 10:50:31 +0200 Mihai Moldovan (fb2a4e4) +2015-06-21 10:50:31 +0200 Mihai Moldovan (fb2a4e4c5) * Merge branch 'sunweaver-pr/hw-driver-cleanup' into arctica-3.6.x -2015-05-27 09:48:26 +0200 Mike Gabriel (26091f4) +2015-05-27 09:48:26 +0200 Mike Gabriel (26091f4bd) * nx-X11/config/cf: Drop build-logic for all hardware drivers. (gh-sunweaver/pr/hw-driver-cleanup) -2015-05-27 08:38:11 +0200 Mike Gabriel (ae443bd) +2015-05-27 08:38:11 +0200 Mike Gabriel (ae443bd5b) * nx-X11/config/cf: Drop unnecessary xf86site.def, xf86.tmpl, xfree86.cf. -2015-05-27 08:26:40 +0200 Mike Gabriel (c0662d6) +2015-05-27 08:26:40 +0200 Mike Gabriel (c0662d6de) * nx-X11/config/cf/Imakefile: Don't list non-present-anymore imake configuration files. -2015-06-20 17:47:39 +0200 Mike Gabriel (cc92f77) +2015-06-20 17:47:39 +0200 Mike Gabriel (cc92f77e9) * libgl clean-up, fix-up commit -2015-06-20 17:35:00 +0200 Mike DePaulo (88ab5a3) +2015-06-20 17:35:00 +0200 Mike DePaulo (88ab5a34f) * README.md: typo fix -2015-06-20 14:39:56 +0200 Mike Gabriel (905c74d) +2015-06-20 14:39:56 +0200 Mike Gabriel (905c74da3) * Merge pull request #52 from woglinde/3.6.x -2015-06-20 11:34:04 +0200 Henning Heinold (a287e9d) +2015-06-20 11:34:04 +0200 Henning Heinold (a287e9dbe) * remove libxkbui, looks like it is not used anywhere -2015-06-19 23:58:49 +0200 Mike Gabriel (4674a4a) +2015-06-19 23:58:49 +0200 Mike Gabriel (4674a4ae4) * debian/control: Add Breaks:/Replaces: for qvd-libxcomp3 and qvd-nxproxy. -2015-06-16 23:58:50 +0200 Mihai Moldovan (51b60ea) +2015-06-16 23:58:50 +0200 Mihai Moldovan (51b60ea7a) * Merge branch 'sunweaver-pr/libglx-cleanup' into arctica-3.6.x -2015-05-27 08:10:38 +0200 Mike Gabriel (5cd80d2) +2015-05-27 08:10:38 +0200 Mike Gabriel (5cd80d272) * imake clean-up: Enforce build of Mesa GLX extension. Drop all other GLX build methods (built-in DRI drivers, etc.). (gh-sunweaver/pr/libglx-cleanup) -2015-05-26 16:44:49 +0200 Mike Gabriel (73fa899) +2015-05-26 16:44:49 +0200 Mike Gabriel (73fa89991) * Drop unused / untested Xserver GLX extension support / build logic. -2015-05-26 16:22:40 +0200 Mike Gabriel (cb4a2d7) +2015-05-26 16:22:40 +0200 Mike Gabriel (cb4a2d732) * Drop nx-X11/lib/GL and move Imakefile.inc include files into Xserver code tree. -2015-06-16 22:43:21 +0200 Mihai Moldovan (5a64974) +2015-06-16 22:43:21 +0200 Mihai Moldovan (5a64974cc) * nxcomp/Loop.cpp: tiny whitespace fix. No functional change. -2015-06-16 10:41:12 +0200 Mike Gabriel (d8f3aa4) +2015-06-16 10:41:12 +0200 Mike Gabriel (d8f3aa414) * Merge pull request #28 from theqvd/3.6.x -2009-05-28 14:43:27 -0700 Keith Packard (cf660f4) +2009-05-28 14:43:27 -0700 Keith Packard (cf660f485) * Backport: Make RANDR 'set' timestamps follow client specified time. Bug 21987. -2012-06-21 18:42:46 -0700 Keith Packard (9dbd747) +2012-06-21 18:42:46 -0700 Keith Packard (9dbd74793) * Backport: randr: Clean up compiler warnings about unused and shadowing variables -2012-06-29 13:33:58 -0700 Aaron Plattner (9e2ac01) +2012-06-29 13:33:58 -0700 Aaron Plattner (9e2ac01a4) * Backport: randr: Fix REQUEST vs. REQUEST_SIZE_MATCH mismatch -2012-07-09 19:12:42 -0700 Alan Coopersmith (bd5754f) +2012-07-09 19:12:42 -0700 Alan Coopersmith (bd5754f94) * Backport: ProcRRGetScreenInfo: swap configTimestamp as well -2012-07-14 11:21:15 -0700 Alan Coopersmith (0fc4193) +2012-07-14 11:21:15 -0700 Alan Coopersmith (0fc419314) * Backport: RRModeCreate: plug memory leak of newModes if AddResource fails -2009-05-22 09:54:38 +0200 Julien Cristau (faddfbe) +2009-05-22 09:54:38 +0200 Julien Cristau (faddfbec6) * Backport: randr: fix server crash in RRGetScreenInfo -2010-12-17 16:09:35 +0200 Tiago Vignatti (da678db) +2010-12-17 16:09:35 +0200 Tiago Vignatti (da678db0e) * Backport: randr: check for virtual size limits before set crtc -2009-09-17 18:14:37 -0700 Keith Packard (2aeb767) +2009-09-17 18:14:37 -0700 Keith Packard (2aeb76719) * Backport: Free randr crtc and output pointer arrays -2008-09-10 13:11:09 +0800 Keith Packard (f454761) +2008-09-10 13:11:09 +0800 Keith Packard (f45476100) * Backport: Drop a reference to user mode after create -2012-07-09 19:12:42 -0700 Jaroslav Šmíd (8fd0b52) +2012-07-09 19:12:42 -0700 Jaroslav Šmíd (8fd0b52f2) * Backport: Bug 51375: Xorg doesn't set status for RRGetOutputInfo -2015-06-02 21:54:12 +0200 Mihai Moldovan (b5d7827) +2015-06-02 21:54:12 +0200 Mihai Moldovan (b5d78278d) * Merge branch 'sunweaver-pr/libxres-cleanup' into arctica-3.6.x -2015-06-02 21:12:05 +0200 Mihai Moldovan (167d09e) +2015-06-02 21:12:05 +0200 Mihai Moldovan (167d09ed7) * debian/changelog: sync with master/3.5.0.x branch. -2015-05-26 12:30:48 +0200 Mike Gabriel (6a74e67) +2015-05-26 12:30:48 +0200 Mike Gabriel (6a74e671a) * library clean-up: Don't compile (i.e., remove) libNX_Xres.a anymore. It is not used anywhere. (gh-sunweaver/pr/libxres-cleanup) -2015-05-31 17:21:10 +0200 Mike Gabriel (01b142d) +2015-05-31 17:21:10 +0200 Mike Gabriel (01b142ddf) * Update README.md: Move more release goals to 3.6.x. -2015-05-31 17:15:24 +0200 Mike Gabriel (dddffb7) +2015-05-31 17:15:24 +0200 Mike Gabriel (dddffb760) * Merge pull request #46 from ArcticaProject/pr/Xext-cve-fixes -2015-05-31 16:50:39 +0200 Mike Gabriel (11b2643) +2015-05-31 16:50:39 +0200 Mike Gabriel (11b26436b) * Merge pull request #45 from ArcticaProject/pr/dix-cve-fixes -2014-01-26 19:23:17 -0800 Alan Coopersmith (d1ca211) +2014-01-26 19:23:17 -0800 Alan Coopersmith (d1ca2119a) * Xv: unvalidated lengths in XVideo extension swapped procs [CVE-2014-8099] (origin/pr/Xext-cve-fixes) -2015-05-01 13:09:24 +0200 Keith Packard (2db01a9) +2015-05-01 13:09:24 +0200 Keith Packard (2db01a9a2) * dix: Allow zero-height PutImage requests (fix for X.Org's CVE-2015-3418). (origin/pr/dix-cve-fixes) -2014-01-22 21:11:16 -0800 Alan Coopersmith (8623faa) +2014-01-22 21:11:16 -0800 Alan Coopersmith (8623faa42) * dix: integer overflow in ProcPutImage() [CVE-2014-8092 1/4] -2015-02-08 20:01:27 -0500 Mike DePaulo (c2298e0) +2015-02-08 20:01:27 -0500 Mike DePaulo (c2298e075) * Avoid use-after-free in dix/dixfonts.c: doImageText() [CVE-2013-4396] from xorg/Xserver http://lists.x.org/archives/xorg-announce/2013-October/002332.html -2015-05-29 11:15:19 +0200 Mike Gabriel (4ed85e8) +2015-05-29 11:15:19 +0200 Mike Gabriel (4ed85e8ef) * nxcomp/README.on-retroactive-DXPC-license: Some layout and interpunctuation fixes. -2015-05-28 22:36:59 +0200 Mihai Moldovan (5bc91ad) +2015-05-28 22:36:59 +0200 Mihai Moldovan (5bc91ad49) * nxcomp/Misc.cpp: fix build failure introduced in 1f44331574bdbe4069d13e4c26df18094b49e658. -2015-05-26 16:51:38 +0200 Mihai Moldovan (beb08f9) +2015-05-26 16:51:38 +0200 Mihai Moldovan (beb08f96c) * Merge branch 'sunweaver-pr/DXPC-re-license-retroactively' into arctica-3.6.x -2015-05-26 10:31:46 +0200 Mike Gabriel (e364fde) +2015-05-26 10:31:46 +0200 Mike Gabriel (e364fde72) * Merge pull request #36 from ArcticaProject/pr/render-cve-fixes -2015-05-21 12:25:13 +0200 Mike Gabriel (1f44331) +2015-05-21 12:25:13 +0200 Mike Gabriel (1f4433157) * Document retroactive re-licensing of the original DXPC code (closes #30). -2015-05-25 23:23:22 +0200 Mihai Moldovan (230852e) +2015-05-25 23:23:22 +0200 Mihai Moldovan (230852e0e) * Merge branch 'sunweaver-pr/libxrandr-cleanup' into arctica-3.6.x -2014-01-26 19:51:29 -0800 Alan Coopersmith (a0c90ad) +2014-01-26 19:51:29 -0800 Alan Coopersmith (a0c90ad34) * render: unvalidated lengths in Render extn. swapped procs [CVE-2014-8100 2/2] (origin/pr/render-cve-fixes) -2014-10-28 10:30:04 +0100 Julien Cristau (e469cff) +2014-10-28 10:30:04 +0100 Julien Cristau (e469cff02) * render: check request size before reading it [CVE-2014-8100 1/2] -2015-05-22 00:58:38 +0200 Mihai Moldovan (608ee99) +2015-05-22 00:58:38 +0200 Mihai Moldovan (608ee9928) * README.md: replace simple link with a text link, capitalization. -2015-05-22 00:43:53 +0200 Mihai Moldovan (7846638) +2015-05-22 00:43:53 +0200 Mihai Moldovan (7846638a8) * Merge branch 'nitomartinez-qindel-readme' into arctica-3.6.x -2015-05-21 21:43:30 +0200 Nito Martinez (900b0cc) +2015-05-21 21:43:30 +0200 Nito Martinez (900b0cc2d) * Update the Qindel Company name (Qindel is without u ;-)) -2015-05-20 15:47:45 +0200 Vadim Troshchinskiy (f982cbc) +2015-05-20 15:47:45 +0200 Vadim Troshchinskiy (f982cbc85) * Fix negotiation in stage 10 error -2015-05-20 11:30:05 +0200 Mike Gabriel (a6185ab) +2015-05-20 11:30:05 +0200 Mike Gabriel (a6185abd9) * hw/nxagent clean-up: Drop NXrandr.{c|h} client lib copy-of-code from nxagent hardware driver. -2015-05-01 15:57:02 +0200 Mike Gabriel (e9dcab6) +2015-05-01 15:57:02 +0200 Mike Gabriel (e9dcab679) * library clean-up: Don't build libNX_Xrandr anymore. Use system's libXrandr shared library. -2015-05-16 15:54:37 +0200 Mike Gabriel (24903c9) +2015-05-16 15:54:37 +0200 Mike Gabriel (24903c921) * README.md: mark the iOS support for nxproxy/nxcomp as completed. -2015-05-16 15:15:41 +0200 Mike Gabriel (657acf9) +2015-05-16 15:15:41 +0200 Mike Gabriel (657acf98a) * Merge pull request #26 from nitomartinez/fix_developer_debugging -2015-05-16 15:12:19 +0200 Mike Gabriel (91ac79e) +2015-05-16 15:12:19 +0200 Mike Gabriel (91ac79ecc) * Merge pull request #25 from nitomartinez/nxtranscleanup_for_reconnect -2015-05-15 22:40:05 +0200 Nito Martinez (cf4ed91) +2015-05-15 22:40:05 +0200 Nito Martinez (cf4ed917e) * This patch is some code fixes to debug some debuging macro usage in the NX code. -2015-05-15 17:06:00 +0200 Mihai Moldovan (ab96962) +2015-05-15 17:06:00 +0200 Mihai Moldovan (ab96962b1) * README.md: reword a few sections, whitespace fixes. -2015-05-15 16:34:27 +0200 Mike Gabriel (8512c70) +2015-05-15 16:34:27 +0200 Mike Gabriel (8512c700a) * README.md: grammar fix -2015-05-15 16:33:20 +0200 Mike Gabriel (d733515) +2015-05-15 16:33:20 +0200 Mike Gabriel (d73351532) * README.md: phase 2 release series will be 3.7.0.x -2015-05-15 16:26:58 +0200 Mike Gabriel (50c3f56) +2015-05-15 16:26:58 +0200 Mike Gabriel (50c3f5628) * update README.md with newest plans for nx-libs 3.6.x -2015-05-15 15:20:52 +0200 Nito Martinez (4fefe35) +2015-05-15 15:20:52 +0200 Nito Martinez (4fefe352c) * This patch allows to cleanup the nxcomp resources to allow for a second connection inside the same process, instead of a new process as is the nxproxy case. -2015-05-12 06:07:45 +0200 Mihai Moldovan (f729583) +2015-05-12 06:07:45 +0200 Mihai Moldovan (f7295831a) * Merge branch 'sunweaver-pr/libxdamage-cleanup' into arctica-3.6.x -2015-05-05 01:23:04 +0200 Mihai Moldovan (027f593) +2015-05-05 01:23:04 +0200 Mihai Moldovan (027f593fc) * debian/changelog: merge with master branch. -2015-05-05 01:22:41 +0200 Mihai Moldovan (998527c) +2015-05-05 01:22:41 +0200 Mihai Moldovan (998527ce5) * debian/changelog: add entry for last change. -2015-05-05 01:22:18 +0200 Mihai Moldovan (b77b26f) +2015-05-05 01:22:18 +0200 Mihai Moldovan (b77b26f4a) * debian/libnx-xinerama1.*: fix faulty logic when creating symlinks. -2015-05-05 01:23:04 +0200 Mihai Moldovan (b573cbb) +2015-05-05 01:23:04 +0200 Mihai Moldovan (b573cbba9) * debian/changelog: merge with master branch. -2015-05-05 01:22:41 +0200 Mihai Moldovan (fca264f) +2015-05-05 01:22:41 +0200 Mihai Moldovan (fca264fd0) * debian/changelog: add entry for last change. -2015-05-05 01:22:18 +0200 Mihai Moldovan (06f36d0) +2015-05-05 01:22:18 +0200 Mihai Moldovan (06f36d0f0) * debian/libnx-xinerama1.*: fix faulty logic when creating symlinks. -2015-05-01 16:16:30 -0400 Mike DePaulo (c9d81fc) +2015-05-01 16:16:30 -0400 Mike DePaulo (c9d81fc38) * Merge pull request #20 from sunweaver/pr/fix-CVE-2015-3418 -2015-04-27 16:08:06 +0200 Mike Gabriel (06aa416) +2015-04-27 16:08:06 +0200 Mike Gabriel (06aa41671) * library clean-up: Don't build libNX_Xdamage anymore. Use system's libXdamage shared library. (Fixes ArcticaProject/nx-libs#6, X2GoBTS#826). -2015-05-01 13:09:24 +0200 Keith Packard (dba779d) +2015-05-01 13:09:24 +0200 Keith Packard (dba779d9f) * dix: Allow zero-height PutImage requests (fix for X.Org's CVE-2015-3418). -2015-04-30 15:51:48 +0200 Mihai Moldovan (7ccbb07) +2015-04-30 15:51:48 +0200 Mihai Moldovan (7ccbb073f) * debian/changelog: sync with 3.5.0.x branch. -2015-04-30 15:14:24 +0200 Mihai Moldovan (e6e323a) +2015-04-30 15:14:24 +0200 Mihai Moldovan (e6e323a22) * nx-libs.spec: actually create libXinerama.so.1 symlink during build phase. -2015-04-30 14:43:04 +0200 Mihai Moldovan (e595613) +2015-04-30 14:43:04 +0200 Mihai Moldovan (e59561387) * debian/changelog: correctly sync with 3.5.0.x branch. Add latest entries. -2015-04-30 14:25:25 +0200 Mihai Moldovan (a9bc7bd) +2015-04-30 14:25:25 +0200 Mihai Moldovan (a9bc7bdb6) * debian/libnx-xinerama1.*: move Xinerama dir back to nx-x11-common. Only delete known files. Fixes RPM build failures. -2015-04-29 08:04:44 +0200 Mike Gabriel (7a6b40a) +2015-04-29 08:04:44 +0200 Mike Gabriel (7a6b40a11) * Merge pull request #19 from ArcticaProject/PR-ionic/libXinerama_symlink_to_libnx-xinerama1 -2015-04-28 23:00:43 +0200 Mihai Moldovan (83983e9) +2015-04-28 23:00:43 +0200 Mihai Moldovan (83983e944) * libnx-xinerama1: also create libXinerama symlink in postinst (and remove in prerm.) -2015-04-28 05:15:19 +0200 Mihai Moldovan (7b7ba94) +2015-04-28 05:15:19 +0200 Mihai Moldovan (7b7ba9441) * Merge branch 'sunweaver-pr/imake-cleanup-nonpresent-buildlogic' into arctica-3.6.x -2015-04-22 00:37:47 +0200 Mike Gabriel (662a895) +2015-04-22 00:37:47 +0200 Mike Gabriel (662a89545) * imake cleanup: Drop references to X11 build-logic that is not present in nx-X11. -2015-04-21 10:57:56 +0200 Mike Gabriel (c189f6e) +2015-04-21 10:57:56 +0200 Mike Gabriel (c189f6efc) * imake cleanup: Break up multiple vars into invidual lines to ease further work on patches / pull requests. -2015-04-27 16:10:26 +0200 Mike Gabriel (cbf4e4d) +2015-04-27 16:10:26 +0200 Mike Gabriel (cbf4e4dbe) * COPYING: Add Arctica Project to copyright holders. -2015-04-27 02:56:07 +0200 Mihai Moldovan (99ef17f) +2015-04-27 02:56:07 +0200 Mihai Moldovan (99ef17f90) * debian/changelog: merge with 3.5.0.x branch. -2015-04-27 02:45:10 +0200 Mihai Moldovan (f717a7e) +2015-04-27 02:45:10 +0200 Mihai Moldovan (f717a7e81) * README.keystrokes: remove accidentally copied Dokuwiki syntax. -2015-04-27 02:02:15 +0200 Mihai Moldovan (380a4df) +2015-04-27 02:02:15 +0200 Mihai Moldovan (380a4df0f) * etc/keystrokes.cfg: fix whitespace errors. -2015-04-27 02:00:43 +0200 Mihai Moldovan (a430b4a) +2015-04-27 02:00:43 +0200 Mihai Moldovan (a430b4a87) * README.keystrokes: add documentation for branding behavior. -2015-04-27 01:59:53 +0200 Mihai Moldovan (1c0f42d) +2015-04-27 01:59:53 +0200 Mihai Moldovan (1c0f42d30) * README.keystrokes: copy actions documentation from the wiki. -2015-04-26 23:49:06 +0200 Mihai Moldovan (347e973) +2015-04-26 23:49:06 +0200 Mihai Moldovan (347e97335) * debian/roll-tarballs.sh: don't escape last newline of a multiline command. -2015-04-26 23:48:02 +0200 Mihai Moldovan (21a556b) +2015-04-26 23:48:02 +0200 Mihai Moldovan (21a556b37) * debian/roll-tarballs.sh: use more curly braces. -2015-04-26 23:47:33 +0200 Mihai Moldovan (cf91819) +2015-04-26 23:47:33 +0200 Mihai Moldovan (cf9181918) * debian/roll-tarballs.sh: convert tabs to spaces. -2015-04-26 23:45:42 +0200 Mihai Moldovan (e68c366) +2015-04-26 23:45:42 +0200 Mihai Moldovan (e68c36625) * debian/roll-tarballs.sh: use more quotes. -2015-04-26 16:35:14 +0200 Mike Gabriel (f2fd794) +2015-04-26 16:35:14 +0200 Mike Gabriel (f2fd79416) * libXcompshad underlinking problem: Fix undefined reference to 'XShmQueryVersion', 'XShmDetach', 'XShmCreateImage', 'XShmAttach', and 'XShmGetImage'. -2015-04-26 16:11:57 +0200 Mike Gabriel (4a3a473) +2015-04-26 16:11:57 +0200 Mike Gabriel (4a3a4737f) * Fix underlinking issues for libNX_X{composite,damage,fixes}. -2015-04-26 15:41:46 +0200 Mike Gabriel (305ac78) +2015-04-26 15:41:46 +0200 Mike Gabriel (305ac7889) * libX11 underlinking problem: Fix undefined reference to 'XdmcpWrap' (by linking against X.Org'x libXdmcp). -2015-04-26 15:12:39 +0200 Mike Gabriel (f46b432) +2015-04-26 15:12:39 +0200 Mike Gabriel (f46b43261) * libX11 underlinking problem: Fix undefined reference to 'dlopen' and 'dlsym'. (Fixes: X2GoBTS#853). -2015-04-23 13:29:10 +0200 Mihai Moldovan (2b159e1) +2015-04-23 13:29:10 +0200 Mihai Moldovan (2b159e18d) * Merge branch 'sunweaver-pr/xbitmaps-cleanup' into arctica-3.6.x -2015-04-21 10:42:47 +0200 Mike Gabriel (e69b7d1) +2015-04-21 10:42:47 +0200 Mike Gabriel (e69b7d1ec) * xbitmaps cleanup: The headers are not required at build time for NX. -2015-04-22 22:48:54 +0200 Mihai Moldovan (825af18) +2015-04-22 22:48:54 +0200 Mihai Moldovan (825af1835) * Merge branch 'sunweaver-pr/libxdmcp-cleanup' into arctica-3.6.x -2015-04-05 18:07:53 +0200 Mike Gabriel (49fc383) +2015-04-05 18:07:53 +0200 Mike Gabriel (49fc383a4) * library clean-up: Don't build libNX_Xdmcp anymore. Use system's libXdmcp shared library. -2015-04-22 22:41:14 +0200 Mike Gabriel (a5bb888) +2015-04-22 22:41:14 +0200 Mike Gabriel (a5bb88824) * nx-libs.spec: Drop packaging of libNX_Xpm*, in RPM packages there is no such concept for transitional/dummy packages as know from Debian/Ubuntu. -2015-04-22 22:39:14 +0200 Mike Gabriel (294d912) +2015-04-22 22:39:14 +0200 Mike Gabriel (294d91223) * debian/control: Typo fix (Meas -> Mesa). -2015-04-22 08:38:21 +0200 Mihai Moldovan (b964406) +2015-04-22 08:38:21 +0200 Mihai Moldovan (b964406ba) * Merge branch 'sunweaver-pr/libxfont-cleanup' into arctica-3.6.x -2015-04-14 09:24:55 +0200 Mike Gabriel (70b77a0) +2015-04-14 09:24:55 +0200 Mike Gabriel (70b77a0fc) * library clean-up: Don't build and link libXfont.a anymore. Use system's libXfont shared library and link dynamically. (origin/pr/libxfont-cleanup) -2015-04-21 15:28:25 +0200 Mike Gabriel (a77ca87) +2015-04-21 15:28:25 +0200 Mike Gabriel (a77ca871c) * fix for Xcursor clean-up (422fe90) -2015-04-17 00:12:52 +0200 Mike Gabriel (a20e77b) +2015-04-17 00:12:52 +0200 Mike Gabriel (a20e77b7c) * imake cleanup (nx-X11/programs/Xserver/Imakefile): Drop build rules for XF86Server and XorgServer. -2015-04-16 18:30:39 -0400 Mike DePaulo (8b15775) +2015-04-16 18:30:39 -0400 Mike DePaulo (8b1577599) * Merge pull request #12 from sunweaver/pr/arch-cleanup.CRAY -2015-04-16 22:12:45 +0200 Mihai Moldovan (0d92171) +2015-04-16 22:12:45 +0200 Mihai Moldovan (0d9217127) * Merge branch 'sunweaver-pr/xcursor-cleanup' into arctica-3.6.x -2015-04-08 21:52:51 +0200 Mike Gabriel (422fe90) +2015-04-08 21:52:51 +0200 Mike Gabriel (422fe9071) * library clean-up: Drop nx-X11/lib/Xcursor. Not used at build time. -2015-04-16 18:03:18 +0200 Mihai Moldovan (cfc0202) +2015-04-16 18:03:18 +0200 Mihai Moldovan (cfc0202b4) * Merge branch 'sunweaver-pr/nxupgradeagent-cleanup' into arctica-3.6.x -2015-04-14 09:42:35 +0200 Mike Gabriel (a5f71f0) +2015-04-14 09:42:35 +0200 Mike Gabriel (a5f71f084) * NXAGENT_UPGRADE code cleanup: -2015-04-15 10:16:18 +0200 Karl Tomlinson (ac9fbaa) +2015-04-15 10:16:18 +0200 Karl Tomlinson (ac9fbaabd) * MakeBigReq: don't move the last word, already handled by Data32 (X.Org CVE-2013-7439). -2015-04-15 09:58:01 +0200 Mike Gabriel (bad6779) +2015-04-15 09:58:01 +0200 Mike Gabriel (bad677992) * old-arch cleanup: Drop CRAY support (i.e., drop code related to CRAY, _CRAY, WORD64, WORD64ALIGN, MUSTCOPY, UNSIGNEDBITFIELDS definitions). -2015-04-15 12:37:30 +0200 Mike Gabriel (fad840c) +2015-04-15 12:37:30 +0200 Mike Gabriel (fad840cfe) * test script: doc/examples/run-nxproxy2nxproxy-test -2015-04-13 15:48:07 +0200 Mike Gabriel (097562b) +2015-04-13 15:48:07 +0200 Mike Gabriel (097562b8b) * drop: nx-X11/config/util/ (not needed at build time). -2015-04-13 15:39:36 +0200 Mike Gabriel (a8dad09) +2015-04-13 15:39:36 +0200 Mike Gabriel (a8dad09a5) * imake clean-up: nx-X11/config/Imakefile (drop BuildDPSLibrary related build-logic). -2015-04-11 17:38:02 +0200 Mike Gabriel (2f4d7db) +2015-04-11 17:38:02 +0200 Mike Gabriel (2f4d7dbb4) * fix for libXpm4-cleanup -2015-04-05 22:31:33 +0200 Mike Gabriel (d97b0ca) +2015-04-05 22:31:33 +0200 Mike Gabriel (d97b0ca93) * fix for ebe00df38f264ef71dac3c73d416a74685c8cbd2 (removal of DmxLibrary) -2015-04-05 20:58:58 +0200 Mihai Moldovan (bb23f7a) +2015-04-05 20:58:58 +0200 Mihai Moldovan (bb23f7a3d) * Merge branch 'feature/other-Xserver-cleanup' into arctica-3.6.x -2015-03-04 14:08:50 +0100 Mike Gabriel (d280fa1) +2015-03-04 14:08:50 +0100 Mike Gabriel (d280fa15e) * imake clean: Remove (probably incomplete) support for NXZaurusXServer, NXiPAQXServer. -2015-03-04 13:56:53 +0100 Mike Gabriel (6db94c3) +2015-03-04 13:56:53 +0100 Mike Gabriel (6db94c3e1) * imake cleanup: nx-X11/programs/Xserver/Imakefile (drop non-provided Xserver variants) -2015-03-04 13:43:54 +0100 Mike Gabriel (05d2083) +2015-03-04 13:43:54 +0100 Mike Gabriel (05d208351) * imake cleanup: nx-X11/programs/Imakefile (reduce to minimal). -2015-03-04 13:34:21 +0100 Mike Gabriel (78ac439) +2015-03-04 13:34:21 +0100 Mike Gabriel (78ac4396a) * imake cleanup: Drop all references to BuildFontServer. -2015-03-04 13:29:02 +0100 Mike Gabriel (f5f2804) +2015-03-04 13:29:02 +0100 Mike Gabriel (f5f280417) * imake cleanup: Drop all references to XprtServer and BuildXprint*. -2015-03-04 08:35:50 +0100 Mike Gabriel (ebe00df) +2015-03-04 08:35:50 +0100 Mike Gabriel (ebe00df38) * imake cleanup: Drop all references to XdmxServer and BuildXdmx*. -2015-03-03 12:30:51 +0100 Mike Gabriel (b1fc73a) +2015-03-03 12:30:51 +0100 Mike Gabriel (b1fc73ad4) * imake cleanup: Drop all references to XVirtualFramebufferServer. -2015-03-03 12:13:59 +0100 Mike Gabriel (6471f66) +2015-03-03 12:13:59 +0100 Mike Gabriel (6471f66c9) * imake cleanup: Drop all references to XNestServer. -2015-03-03 12:09:06 +0100 Mike Gabriel (9c46d3d) +2015-03-03 12:09:06 +0100 Mike Gabriel (9c46d3ddb) * imake cleanup: Drop all references to XWinServer. -2015-03-29 08:03:13 +0200 Mihai Moldovan (8ed8a43) +2015-03-29 08:03:13 +0200 Mihai Moldovan (8ed8a43d2) * nx-X11: add more NULL guards to TEST and DEBUG sections of Render.c. -2015-03-29 08:02:43 +0200 Mihai Moldovan (ab4e5bf) +2015-03-29 08:02:43 +0200 Mihai Moldovan (ab4e5bf66) * debian/changelog: sync with 3.5.0.x branch. -2015-03-29 04:53:52 +0200 Mihai Moldovan (f1ab3f2) +2015-03-29 04:53:52 +0200 Mihai Moldovan (f1ab3f27b) * nx-X11: fix typo in previous commit. -2015-03-29 04:26:10 +0200 Mihai Moldovan (0d56c45) +2015-03-29 04:26:10 +0200 Mihai Moldovan (0d56c45a7) * nx-X11: handle source pictures (those without a Drawable surface) gracefully. -2015-03-26 00:41:45 +0100 Mihai Moldovan (68be7d1) +2015-03-26 00:41:45 +0100 Mihai Moldovan (68be7d1c8) * debian/changelog: sync with 3.5.0.x branch. -2015-03-26 00:32:27 +0100 Mihai Moldovan (d86ce9c) +2015-03-26 00:32:27 +0100 Mihai Moldovan (d86ce9c7a) * nxcomp{,ext,shad}: only use the first three numbers in the full version for current_version on OS X. ld(1) on 10.6 fails otherwise. -2015-03-17 18:28:15 +0100 Mihai Moldovan (fcb2cb5) +2015-03-17 18:28:15 +0100 Mihai Moldovan (fcb2cb5e0) * nx-libs.spec: add overlooked Obsolete: statement to libNX_Xfixes3. -2015-03-17 18:26:26 +0100 Mihai Moldovan (8a260b9) +2015-03-17 18:26:26 +0100 Mihai Moldovan (8a260b94f) * nx-libs.spec: Versioned libXcomp* should obsolete unversioned libXcomp*, not libNX_Xcomp*. -2015-03-16 03:29:16 +0100 Mihai Moldovan (d8de592) +2015-03-16 03:29:16 +0100 Mihai Moldovan (d8de5928e) * nx{comp{,ext,shad},proxy}: try really hard to find makedepend. Do not fail if it is not available. -2015-03-15 17:29:50 +0100 Clemens Lang (638e31c) +2015-03-15 17:29:50 +0100 Clemens Lang (638e31c2f) * nxcomp{,ext,shad}: use the correct library naming scheme on OS X. It differs from other UNIX-based systems. -2015-03-15 17:26:24 +0100 Clemens Lang (ad7e12e) +2015-03-15 17:26:24 +0100 Clemens Lang (ad7e12ed3) * nxcomp{,shad}: fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle. -2015-03-15 17:22:38 +0100 Clemens Lang (5464a6d) +2015-03-15 17:22:38 +0100 Clemens Lang (5464a6dba) * nx{comp{,ext,shad},proxy}: use path discovery for finding makedepend. Remove old cruft. -2015-03-15 01:13:56 +0100 Mihai Moldovan (c460e09) +2015-03-15 01:13:56 +0100 Mihai Moldovan (c460e090b) * debian/changelog: fix wrong signature. -2015-03-15 01:10:31 +0100 Mihai Moldovan (98e56c1) +2015-03-15 01:10:31 +0100 Mihai Moldovan (98e56c125) * debian/changelog: merge with 3.5.0.x release branch. -2015-03-13 15:14:07 +0100 Mike Gabriel (7d22541) +2015-03-13 15:14:07 +0100 Mike Gabriel (7d2254185) * README.md: Fix typo, update date. -2015-03-13 15:13:00 +0100 Mike Gabriel (286d891) +2015-03-13 15:13:00 +0100 Mike Gabriel (286d8917c) * README.md markdown fixup -2015-03-13 15:08:10 +0100 Mike Gabriel (2922ec5) +2015-03-13 15:08:10 +0100 Mike Gabriel (2922ec512) * README.md: Add 3.6.x release goals. -2015-03-05 12:24:42 +0100 Mike Gabriel (18e186b) +2015-03-05 12:24:42 +0100 Mike Gabriel (18e186b51) * Makefile: clean-up auto-generated nxversion.def in clean rule (not in build rule). -2015-03-03 12:34:48 +0100 Mike Gabriel (1a4d0c7) +2015-03-03 12:34:48 +0100 Mike Gabriel (1a4d0c7c5) * nx-X11/**: Drop non-imake Makefile* files. -2015-03-03 12:01:01 +0100 Mike Gabriel (f11393a) +2015-03-03 12:01:01 +0100 Mike Gabriel (f11393a05) * nx-X11/config/cf/X11.tmpl: Fix imake warning ("UseInstalledOnCrossCompile" is not defined). -2015-03-04 08:09:34 +0100 Mike Gabriel (897e2e2) +2015-03-04 08:09:34 +0100 Mike Gabriel (897e2e2de) * Merge pull request #4 from sunweaver/feature/libxpm-cleanup -2015-02-27 00:14:10 +0100 Mike Gabriel (1d71c9e) +2015-02-27 00:14:10 +0100 Mike Gabriel (1d71c9ebd) * library clean-up: Don't build libNX_Xpm anymore. Use system's libXpm shared library. -2015-02-18 08:14:09 -0500 Mike DePaulo (46318a5) +2015-02-18 08:14:09 -0500 Mike DePaulo (46318a51e) * Drop unused .cvsignore files -2015-02-18 07:51:55 -0500 Mike DePaulo (c29c331) +2015-02-18 07:51:55 -0500 Mike DePaulo (c29c331ce) * Update changelog for the CVE-2015-0255 commit and its 3 prereq commits -2015-02-18 08:01:54 +0100 Mike Gabriel (ec018a7) +2015-02-18 08:01:54 +0100 Mike Gabriel (ec018a79c) * Fix symlink to renamed README.md. -2015-02-18 06:18:03 +0100 Mike Gabriel (f7e109e) +2015-02-18 06:18:03 +0100 Mike Gabriel (f7e109e5c) * README.md: Mention the TheQVD project as collaborator on NX. -2015-02-18 05:06:41 +0100 Mike Gabriel (5c24a09) +2015-02-18 05:06:41 +0100 Mike Gabriel (5c24a09a1) * rename README.txt to README.md -2015-02-18 05:05:27 +0100 Mike Gabriel (04af6fe) +2015-02-18 05:05:27 +0100 Mike Gabriel (04af6fefb) * switch symlink and real file -2015-02-18 05:03:57 +0100 Mike Gabriel (f29801f) +2015-02-18 05:03:57 +0100 Mike Gabriel (f29801f37) * Add README.txt symlink to README.NX-development (to have it shown on the Github summary page). -2015-01-16 08:44:45 +0100 Olivier Fourdan (d725844) +2015-01-16 08:44:45 +0100 Olivier Fourdan (d7258444a) * xkb: Check strings length against request size -2015-01-16 20:08:59 +0100 Olivier Fourdan (9308c79) +2015-01-16 20:08:59 +0100 Olivier Fourdan (9308c79ba) * xkb: Don't swap XkbSetGeometry data in the input buffer -2009-06-29 13:09:57 +1000 Peter Hutterer (3937db1) +2009-06-29 13:09:57 +1000 Peter Hutterer (3937db18a) * include: introduce byte counting functions. -2006-04-07 16:07:50 +0000 Daniel Stone (d6ce946) +2006-04-07 16:07:50 +0000 Daniel Stone (d6ce946f9) * Coverity #844, #845, #846: Fix memory leaks. -2015-02-17 09:28:03 +0100 Mike Gabriel (c910bf7) +2015-02-17 09:28:03 +0100 Mike Gabriel (c910bf7cd) * Merge pull request #3 from sunweaver/feature/nxagent-version-v2 -2015-02-16 15:11:02 +0100 Mike Gabriel (203d971) +2015-02-16 15:11:02 +0100 Mike Gabriel (203d97147) * Make nxagent process aware of its current NX'ish version. -2015-02-16 15:10:43 +0100 Mike Gabriel (eb49d40) +2015-02-16 15:10:43 +0100 Mike Gabriel (eb49d408c) * nx-X11/programs/Xserver/hw/nxagent/: Drop unused VERSION file. -2011-08-21 18:51:53 +0200 Joerg Sonnenberger (65deb86) +2011-08-21 18:51:53 +0200 Joerg Sonnenberger (65deb86f8) * Do proper input validation to fix for CVE-2011-2895. -2015-02-16 10:29:14 +0100 Mike Gabriel (18e337d) +2015-02-16 10:29:14 +0100 Mike Gabriel (18e337ddf) * Revert "Do proper input validation to fix for CVE-2011-2895." -2015-02-16 06:24:38 +0100 Mike Gabriel (26cfe93) +2015-02-16 06:24:38 +0100 Mike Gabriel (26cfe931f) * fix 3.5.0.29 changelog entry -2015-02-16 06:19:54 +0100 Mike Gabriel (1f3222f) +2015-02-16 06:19:54 +0100 Mike Gabriel (1f3222fa0) * debian/changelog: fix too-long lines -2015-02-16 05:51:02 +0100 Mike Gabriel (db12538) +2015-02-16 05:51:02 +0100 Mike Gabriel (db12538dd) * Makefile.nx-libs: Fix uninstall-lite rule. The nxproxy and nxcomp uninstallation has to be in uninstall-lite, not in uninstall-full. -2015-02-16 05:45:17 +0100 Mike Gabriel (892c08d) +2015-02-16 05:45:17 +0100 Mike Gabriel (892c08ddc) * Make install-lite rule in Makefile.nx-libs more predictable and not rely on nxproxy/Makefile.in. -2015-02-14 21:55:30 +0100 Mike Gabriel (f29cc29) +2015-02-14 21:55:30 +0100 Mike Gabriel (f29cc29fd) * Install "%{_libdir}/nx/bin" into nxproxy package. -2015-02-14 21:53:00 +0100 Mike Gabriel (7424308) +2015-02-14 21:53:00 +0100 Mike Gabriel (742430826) * nx-libs.spec: Typo fix in comment. -2015-02-14 17:07:21 -0500 Mike DePaulo (e4d9701) +2015-02-14 17:07:21 -0500 Mike DePaulo (e4d97018b) * Fix FTBFS due to the nxproxy executable already existing under /usr/lib/nx/bin/nx -2011-08-21 18:51:53 +0200 Joerg Sonnenberger (6acafc9) +2011-08-21 18:51:53 +0200 Joerg Sonnenberger (6acafc933) * Do proper input validation to fix for CVE-2011-2895. -2015-02-16 06:03:48 +0100 Mihai Moldovan (b04f119) +2015-02-16 06:03:48 +0100 Mihai Moldovan (b04f11915) * nx-X11/lib/font/fc/fserve.c: initialize remaining bufleft variables. -2014-01-06 23:30:14 -0800 Alan Coopersmith (b6b5b14) +2014-01-06 23:30:14 -0800 Alan Coopersmith (b6b5b14e4) * dix: integer overflow in GetHosts() [CVE-2014-8092 2/4] -2015-02-16 05:55:23 +0100 Mihai Moldovan (03a2922) +2015-02-16 05:55:23 +0100 Mihai Moldovan (03a2922d9) * Revert "dix: integer overflow in GetHosts() [CVE-2014-8092 2/4]" -2015-02-08 21:03:33 -0500 Mike DePaulo (31322c2) +2015-02-08 21:03:33 -0500 Mike DePaulo (31322c2bd) * CVE-2014-0210: unvalidated length in _fs_recv_conn_setup() from xorg/lib/libXfont commit 891e084b26837162b12f841060086a105edde86d -2015-02-16 05:52:09 +0100 Mihai Moldovan (c0d0e37) +2015-02-16 05:52:09 +0100 Mihai Moldovan (c0d0e373d) * Revert "CVE-2014-0210: unvalidated length in _fs_recv_conn_setup() from xorg/lib/libXfont commit 891e084b26837162b12f841060086a105edde86d" -2015-02-08 22:08:09 -0500 Mike DePaulo (e29bbd5) +2015-02-08 22:08:09 -0500 Mike DePaulo (e29bbd5bf) * CVE-2014-0210: unvalidated length fields in fs_read_query_info() from xorg/lib/libXfont commit 491291cabf78efdeec8f18b09e14726a9030cc8f -2015-02-16 05:26:40 +0100 Mihai Moldovan (5fc2f57) +2015-02-16 05:26:40 +0100 Mihai Moldovan (5fc2f57fb) * Revert "CVE-2014-0210: unvalidated length fields in fs_read_query_info() from xorg/lib/libXfont commit 491291cabf78efdeec8f18b09e14726a9030cc8f" -2014-11-10 12:13:48 -0500 Adam Jackson (1ea1cd8) +2014-11-10 12:13:48 -0500 Adam Jackson (1ea1cd8c4) * glx: Pass remaining request length into ->varsize (v2) [CVE-2014-8098 8/8] (V3) -2014-11-10 12:13:43 -0500 Adam Jackson (9c558f9) +2014-11-10 12:13:43 -0500 Adam Jackson (9c558f9ca) * glx: Length checking for RenderLarge requests (v2) [CVE-2014-8098 3/8] (v3) -2014-11-10 12:13:47 -0500 Adam Jackson (8931066) +2014-11-10 12:13:47 -0500 Adam Jackson (893106607) * glx: Length checking for non-generated single requests (v2) [CVE-2014-8098 7/8] -2014-11-10 12:13:44 -0500 Adam Jackson (ad29acd) +2014-11-10 12:13:44 -0500 Adam Jackson (ad29acd76) * glx: Top-level length checking for swapped VendorPrivate requests [CVE-2014-8098 4/8] -2014-11-10 12:13:42 -0500 Adam Jackson (ddb1235) +2014-11-10 12:13:42 -0500 Adam Jackson (ddb1235bc) * glx: Integer overflow protection for non-generated render requests (v3) [CVE-2014-8093 5/6] -2014-11-10 12:13:41 -0500 Julien Cristau (78b38a8) +2014-11-10 12:13:41 -0500 Julien Cristau (78b38a8a3) * glx: Length checking for GLXRender requests (v2) [CVE-2014-8098 2/8] (v3) -2014-11-10 12:13:40 -0500 Adam Jackson (1a9f231) +2014-11-10 12:13:40 -0500 Adam Jackson (1a9f23118) * glx: Add safe_{add,mul,pad} (v3) [CVE-2014-8093 4/6] (v4) -2014-11-10 12:13:38 -0500 Adam Jackson (d0fcbc8) +2014-11-10 12:13:38 -0500 Adam Jackson (d0fcbc8a6) * glx: Additional paranoia in __glXGetAnswerBuffer / __GLX_GET_ANSWER_BUFFER (v2) [CVE-2014-8093 3/6] -2014-11-10 12:13:37 -0500 Adam Jackson (cdf0c3e) +2014-11-10 12:13:37 -0500 Adam Jackson (cdf0c3e65) * glx: Be more strict about rejecting invalid image sizes [CVE-2014-8093 2/6] -2014-11-10 12:13:36 -0500 Adam Jackson (5c43bb2) +2014-11-10 12:13:36 -0500 Adam Jackson (5c43bb248) * glx: Be more paranoid about variable-length requests [CVE-2014-8093 1/6] (v2) -2014-01-26 19:38:09 -0800 Alan Coopersmith (cea4467) +2014-01-26 19:38:09 -0800 Alan Coopersmith (cea44678d) * randr: unvalidated lengths in RandR extension swapped procs [CVE-2014-8101] -2014-01-26 20:02:20 -0800 Alan Coopersmith (c12a473) +2014-01-26 20:02:20 -0800 Alan Coopersmith (c12a473f2) * xfixes: unvalidated length in SProcXFixesSelectSelectionInput [CVE-2014-8102] -2014-01-26 19:51:29 -0800 Alan Coopersmith (9c3842a) +2014-01-26 19:51:29 -0800 Alan Coopersmith (9c3842a4f) * render: unvalidated lengths in Render extn. swapped procs [CVE-2014-8100 2/2] -2014-10-28 10:30:04 +0100 Julien Cristau (6c82064) +2014-10-28 10:30:04 +0100 Julien Cristau (6c820648b) * render: check request size before reading it [CVE-2014-8100 1/2] -2014-01-26 19:23:17 -0800 Alan Coopersmith (2abde56) +2014-01-26 19:23:17 -0800 Alan Coopersmith (2abde565d) * Xv: unvalidated lengths in XVideo extension swapped procs [CVE-2014-8099] -2014-01-26 17:18:54 -0800 Alan Coopersmith (0d53194) +2014-01-26 17:18:54 -0800 Alan Coopersmith (0d53194f7) * xcmisc: unvalidated length in SProcXCMiscGetXIDList() [CVE-2014-8096] -2014-01-26 10:54:41 -0800 Alan Coopersmith (fde1375) +2014-01-26 10:54:41 -0800 Alan Coopersmith (fde1375e3) * Xi: unvalidated lengths in Xinput extension [CVE-2014-8095] -2014-01-22 23:12:04 -0800 Alan Coopersmith (985ca32) +2014-01-22 23:12:04 -0800 Alan Coopersmith (985ca320f) * dbe: unvalidated lengths in DbeSwapBuffers calls [CVE-2014-8097] -2014-01-22 23:44:46 -0800 Alan Coopersmith (82d7279) +2014-01-22 23:44:46 -0800 Alan Coopersmith (82d7279eb) * dix: integer overflow in REQUEST_FIXED_SIZE() [CVE-2014-8092 4/4] -2014-01-22 22:37:15 -0800 Alan Coopersmith (ed1e13a) +2014-01-22 22:37:15 -0800 Alan Coopersmith (ed1e13a1f) * dix: integer overflow in RegionSizeof() [CVE-2014-8092 3/4] -2014-01-06 23:30:14 -0800 Alan Coopersmith (d4c7698) +2014-01-06 23:30:14 -0800 Alan Coopersmith (d4c76981f) * dix: integer overflow in GetHosts() [CVE-2014-8092 2/4] -2014-01-22 21:11:16 -0800 Alan Coopersmith (c1225fe) +2014-01-22 21:11:16 -0800 Alan Coopersmith (c1225fe64) * dix: integer overflow in ProcPutImage() [CVE-2014-8092 1/4] -2014-01-17 18:54:03 -0800 Alan Coopersmith (37e7fb1) +2014-01-17 18:54:03 -0800 Alan Coopersmith (37e7fb1f6) * unchecked malloc may allow unauthed client to crash Xserver [CVE-2014-8091] -2015-02-08 22:38:32 -0500 Mike DePaulo (b65259b) +2015-02-08 22:38:32 -0500 Mike DePaulo (b65259bf3) * CVE-2014-0210: unvalidated length fields in fs_read_list_info() from xorg/lib/libXfont commit d338f81df1e188eb16e1d6aeea7f4800f89c1218 -2015-02-08 22:35:21 -0500 Mike DePaulo (ef439da) +2015-02-08 22:35:21 -0500 Mike DePaulo (ef439da38) * CVE-2014-0210: unvalidated length fields in fs_read_list() from xorg/lib/libXfont commit 5fa73ac18474be3032ee7af9c6e29deab163ea39 -2015-02-08 22:27:47 -0500 Mike DePaulo (ece5149) +2015-02-08 22:27:47 -0500 Mike DePaulo (ece51493f) * CVE-2014-0210: unvalidated length fields in fs_read_glyphs() from xorg/lib/libXfont commit 520683652564c2a4e42328ae23eef9bb63271565 -2015-02-08 22:26:16 -0500 Mike DePaulo (d2b96c5) +2015-02-08 22:26:16 -0500 Mike DePaulo (d2b96c5d5) * CVE-2014-0210: unvalidated length fields in fs_read_extent_info() from xorg/lib/libXfont commit a3f21421537620fc4e1f844a594a4bcd9f7e2bd8 -2015-02-08 22:23:51 -0500 Mike DePaulo (a0bed4d) +2015-02-08 22:23:51 -0500 Mike DePaulo (a0bed4d9f) * CVE-2014-0211: integer overflow in fs_alloc_glyphs() from xorg/lib/libXfont commit a42f707f8a62973f5e8bbcd08afb10a79e9cee33 -2015-02-08 22:19:01 -0500 Mike DePaulo (bb7abd9) +2015-02-08 22:19:01 -0500 Mike DePaulo (bb7abd9da) * CVE-2014-0211: integer overflow in fs_read_extent_info() from xorg/lib/libXfont commit c578408c1fd4db09e4e3173f8a9e65c81cc187c1 -2015-02-08 22:08:09 -0500 Mike DePaulo (c6aebf9) +2015-02-08 22:08:09 -0500 Mike DePaulo (c6aebf928) * CVE-2014-0210: unvalidated length fields in fs_read_query_info() from xorg/lib/libXfont commit 491291cabf78efdeec8f18b09e14726a9030cc8f -2015-02-08 21:43:42 -0500 Mike DePaulo (2d724c1) +2015-02-08 21:43:42 -0500 Mike DePaulo (2d724c1a0) * CVE-2014-0211: Integer overflow in fs_get_reply/_fs_start_read from xorg/lib/libXfont commit 0f1a5d372c143f91a602bdf10c917d7eabaee09b -2015-02-08 21:39:55 -0500 Mike DePaulo (50e80a0) +2015-02-08 21:39:55 -0500 Mike DePaulo (50e80a06c) * CVE-2014-0210: unvalidated lengths when reading replies from font server from xorg/lib/libXfont commit cbb64aef35960b2882be721f4b8fbaa0fb649d12 -2015-02-08 21:33:30 -0500 Mike DePaulo (a2c7cd9) +2015-02-08 21:33:30 -0500 Mike DePaulo (a2c7cd9fe) * Don't crash when we receive an FS_Error from the font server (Guillem Jover). from xorg/lib/libXfont commit bfb8a71f4f7e5c5ed4278cb3ee271bf9990d276d -2015-02-08 21:03:33 -0500 Mike DePaulo (94c6de0) +2015-02-08 21:03:33 -0500 Mike DePaulo (94c6de064) * CVE-2014-0210: unvalidated length in _fs_recv_conn_setup() from xorg/lib/libXfont commit 891e084b26837162b12f841060086a105edde86d -2015-02-08 20:53:14 -0500 Mike DePaulo (36f1dae) +2015-02-08 20:53:14 -0500 Mike DePaulo (36f1dae74) * CVE-2014-0209: integer overflow of realloc() size in lexAlias() from xorg/lib/libXfont commit 05c8020a49416dd8b7510cbba45ce4f3fc81a7dc -2015-02-08 20:28:30 -0500 Mike DePaulo (f53f247) +2015-02-08 20:28:30 -0500 Mike DePaulo (f53f2474d) * CVE-2014-0209: integer overflow of realloc() size in FontFileAddEntry() from xorg/lib/libXfont commit 2f5e57317339c526e6eaee1010b0e2ab8089c42e -2015-02-08 20:12:25 -0500 Mike DePaulo (ac66943) +2015-02-08 20:12:25 -0500 Mike DePaulo (ac6694378) * CVE-2013-6462: unlimited sscanf overflows stack buffer in bdfReadCharacters() from xorg/lib/libXfont http://lists.x.org/archives/xorg-announce/2014-January/002389.html -2015-02-08 20:01:27 -0500 Mike DePaulo (72790a5) +2015-02-08 20:01:27 -0500 Mike DePaulo (72790a558) * Avoid use-after-free in dix/dixfonts.c: doImageText() [CVE-2013-4396] from xorg/Xserver http://lists.x.org/archives/xorg-announce/2013-October/002332.html -2015-02-08 19:16:38 -0500 Mike DePaulo (df4a3b7) +2015-02-08 19:16:38 -0500 Mike DePaulo (df4a3b727) * Fix CVE-2011-4028: File disclosure vulnerability. upstream xorg/xserver commit 6ba44b91e37622ef8c146d8f2ac92d708a18ed34 -2015-02-08 19:15:20 -0500 Mike DePaulo (af55da1) +2015-02-08 19:15:20 -0500 Mike DePaulo (af55da1e9) * LZW decompress: fix for CVE-2011-2895 From xorg/lib/Xfont commit d11ee5886e9d9ec610051a206b135a4cdc1e09a0 -2015-02-14 15:58:11 +0100 Mike Gabriel (902dc51) +2015-02-14 15:58:11 +0100 Mike Gabriel (902dc519d) * Move COPYING.full+lite as COPYING to / -2015-02-14 15:52:29 +0100 Mike Gabriel (9000c00) +2015-02-14 15:52:29 +0100 Mike Gabriel (9000c00dc) * Move all config files from $(srcbase)/debian/ into $(srcbase)/etc/ folder. -2015-02-14 15:29:25 +0100 Mike Gabriel (53329e6) +2015-02-14 15:29:25 +0100 Mike Gabriel (53329e609) * Provide wrapper scripts for launch NX components in $(src)/bin/. -2015-02-14 15:23:59 +0100 Mike Gabriel (1a824cf) +2015-02-14 15:23:59 +0100 Mike Gabriel (1a824cfb5) * Prepare for maintaing upstream changes in upstream ChangeLog. -2015-02-14 15:14:23 +0100 Mike Gabriel (ce53123) +2015-02-14 15:14:23 +0100 Mike Gabriel (ce531230f) * VERSION file: master VERSION file is in base folder, symlinked from nx*/VERSION and hw/nxagent/VERSION. -2015-02-14 15:08:07 +0100 Mike Gabriel (ea8ca04) +2015-02-14 15:08:07 +0100 Mike Gabriel (ea8ca04a7) * Move Makefile (and auxiliary file replace.sh) into base folder. Adapt packaging these scripts: -2015-02-14 14:50:20 +0100 Mike Gabriel (ebf71e0) +2015-02-14 14:50:20 +0100 Mike Gabriel (ebf71e0a4) * Add README.keystrokes file. Fix for commit e91277d02bf1288909daed3b0de8f876f6403acf. -2015-02-14 14:43:13 +0100 Mike Gabriel (8234505) +2015-02-14 14:43:13 +0100 Mike Gabriel (823450515) * nxcomp: Add Version.c file. Fix for commit d4d3fe0e6e77a58e68defc5895a589a681d7d092. -2015-02-14 14:28:35 +0100 Mike Gabriel (2d4a61d) +2015-02-14 14:28:35 +0100 Mike Gabriel (2d4a61d3c) * Version bump, continuing NX 3.x development.. Targetting NX 3.6.x some time. -2015-02-14 14:23:10 +0100 Mike Gabriel (e54e896) +2015-02-14 14:23:10 +0100 Mike Gabriel (e54e896a6) * Use proper quoting on build flag vars (they may contain spaces). -2015-02-14 14:21:52 +0100 Mike Gabriel (db3c6a6) +2015-02-14 14:21:52 +0100 Mike Gabriel (db3c6a6d2) * Revert "Fix build when LDFLAGS (etc) contains spaces." -2015-02-13 14:14:26 +0100 Mike Gabriel (1e5ee57) +2015-02-13 14:14:26 +0100 Mike Gabriel (1e5ee575d) * nx-X11 vs. X.Org 6.9 patches for further studying / documentation -2015-02-13 13:57:39 +0100 Oleksandr Shneyder (1fd8551) +2015-02-13 13:57:39 +0100 Oleksandr Shneyder (1fd8551f1) * Unbrand NX Agent Startup Screen / Brand X2Go Agent Startup Screen (999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch). -2015-02-13 13:43:54 +0100 Mike Gabriel (23fb617) +2015-02-13 13:43:54 +0100 Mike Gabriel (23fb61755) * Fix several typos in nxcomp. -2015-02-13 13:41:31 +0100 Mihai Moldovan (6e66247) +2015-02-13 13:41:31 +0100 Mihai Moldovan (6e6624731) * Several fixes for building debug versions of NX (990_fix-DEBUG-and-TEST-builds.full.patch). -2015-02-13 13:38:39 +0100 Mike Gabriel (a8fb7d4) +2015-02-13 13:38:39 +0100 Mike Gabriel (a8fb7d4f5) * Detection for Mac OS X's launchd service on Mac OS X 10.10 and beyond (607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch). -2015-02-13 13:37:33 +0100 Orion Poplawski (31cdd87) +2015-02-13 13:37:33 +0100 Orion Poplawski (31cdd874c) * Provide build support for aarch64 architecture (606_nx-X11_build-on-aarch64.full.patch). -2015-02-13 13:35:40 +0100 Clemens Lang (ab8d127) +2015-02-13 13:35:40 +0100 Clemens Lang (ab8d1276f) * In Types.h, don't use STL internals on libc++ (605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch). -2015-02-13 13:34:16 +0100 Mirraz Mirraz (96d5e74) +2015-02-13 13:34:16 +0100 Mirraz Mirraz (96d5e74a3) * Handle some serious compilation warnings (603_nx-X11_compilation_warnings.full.patch). -2015-02-13 13:32:17 +0100 Orion Poplawski (415b20b) +2015-02-13 13:32:17 +0100 Orion Poplawski (415b20b6f) * Be compliant with POS36-C: Observe correct revocation order while relinquishing privileges (602_nx-X11_initgroups.full.patch). -2015-02-13 13:30:31 +0100 Orion Poplawski (456f887) +2015-02-13 13:30:31 +0100 Orion Poplawski (456f887d9) * Do not build bundled libraries (601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch). -2015-02-13 13:27:42 +0100 Jan Engelhardt (c4a8556) +2015-02-13 13:27:42 +0100 Jan Engelhardt (c4a8556c4) * Unique Library Names Patch (600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch). -2015-02-13 13:26:27 +0100 Nito Martinez (d4d3fe0) +2015-02-13 13:26:27 +0100 Nito Martinez (d4d3fe0e6) * Allow version 4-digit version comparison/handshake (400_nxcomp-version.full+lite.patch). -2015-02-13 13:06:53 +0100 Horst Schirmeier (fea8fb5) +2015-02-13 13:06:53 +0100 Horst Schirmeier (fea8fb5ae) * Adapt paths of keystrokes.cfg if nxagent runs as x2goagent (321_nxagent_x2go-specific-keystroke-config.full.patch). -2015-02-13 09:52:21 +0100 Alexander Wuerstlein (e91277d) +2015-02-13 09:52:21 +0100 Alexander Wuerstlein (e91277d02) * Make nxagent-specific keyboard bindings configurable (320_nxagent_configurable-keystrokes.full.patch). -2015-02-13 09:49:52 +0100 Mike Gabriel (4dc1bd0) +2015-02-13 09:49:52 +0100 Mike Gabriel (4dc1bd004) * Test for xkb/rules/base instead of xkb/keymap.dir for setting XkbBaseDir (302_nx-X11_xkbbasedir-detection.full.patch). -2015-02-03 05:11:09 +0100 Mike Gabriel (a43c495) +2015-02-03 05:11:09 +0100 Mike Gabriel (a43c49594) * update changelog -2015-02-01 22:27:06 +0100 Ulrich Sibiller (08114b1) +2015-02-01 22:27:06 +0100 Ulrich Sibiller (08114b1e4) * Fix patch rollout in tarball -2015-02-12 10:07:40 +0100 Mike Gabriel (fa8fb72) +2015-02-12 10:07:40 +0100 Mike Gabriel (fa8fb7288) * changelog: add 3.5.0.x entry for commit 4436e97 -2015-02-12 09:59:57 +0100 Mike Gabriel (d569145) +2015-02-12 09:59:57 +0100 Mike Gabriel (d569145e6) * Makefile.nx-libs: Run make install for nxproxy first, then create the wrapper script. -2015-02-12 09:59:12 +0100 Mike Gabriel (a7cc4ed) +2015-02-12 09:59:12 +0100 Mike Gabriel (a7cc4edef) * Remove upstream nx-libs ChangeLog during override_dh_clean. -2015-02-11 19:02:57 -0500 Mike DePaulo (4436e97) +2015-02-11 19:02:57 -0500 Mike DePaulo (4436e9790) * Fix build when LDFLAGS (etc) contains spaces. -2015-02-10 21:47:31 +0100 Jan Engelhardt (6fc37fa) +2015-02-10 21:47:31 +0100 Jan Engelhardt (6fc37fa76) * Use shared libraries (301_nx-X11_use-shared-libs.full.patch). -2015-02-10 21:45:19 +0100 Oleksandr Shneyder (1e99734) +2015-02-10 21:45:19 +0100 Oleksandr Shneyder (1e99734ec) * Set WM_CLASS to X2GoAgent/NXAgent (300_nxagent_set-wm-class.full.patch). -2015-02-10 21:11:27 +0100 Mike Gabriel (1be1c4a) +2015-02-10 21:11:27 +0100 Mike Gabriel (1be1c4a21) * Force NX proxy to bind to loopback devices only (loopback option) (220_nxproxy_bind-loopback-only.full+lite.patch). -2015-02-10 19:47:58 +0100 Nito Martinez (79f218b) +2015-02-10 19:47:58 +0100 Nito Martinez (79f218b56) * Fix FTBFS of nxproxy/nxcomp on Android (212_nxcomp_build-on-Android.full+lite.patch). -2015-02-10 19:46:04 +0100 Oleksandr Shneyder (46c2aeb) +2015-02-10 19:46:04 +0100 Oleksandr Shneyder (46c2aebca) * Set default pack and link options to avoid damage of session (211_nxcomp_set_default_options.full+lite.patch). -2015-02-10 19:43:41 +0100 Oleksandr Shneyder (8c1b852) +2015-02-10 19:43:41 +0100 Oleksandr Shneyder (8c1b852ab) * Save session state in file. -2015-02-10 19:38:45 +0100 Mike Gabriel (4a6ccd5) +2015-02-10 19:38:45 +0100 Mike Gabriel (4a6ccd503) * Add x2goagent man page (209_x2goagent_add-man-page.full.patch). -2015-02-10 19:36:57 +0100 Ulrich Sibiller (57a58c7) +2015-02-10 19:36:57 +0100 Ulrich Sibiller (57a58c73c) * Fix XFIXES selection handling (copy and paste via middle mouse button) (207_nxagent_fix-xfixes-selection.full.patch). -2015-02-10 19:33:51 +0100 Mike Gabriel (4ef611e) +2015-02-10 19:33:51 +0100 Mike Gabriel (4ef611eea) * Add -clipboard cmdline option to nxagent (206_nxagent_clipboard-as-nxoption.full.patch). -2015-02-10 19:32:12 +0100 Oleksandr Shneyder (35aab85) +2015-02-10 19:32:12 +0100 Oleksandr Shneyder (35aab85c7) * Fix refresh errors on Win2012 RDP connections with speed=ADS (205_nxagent_refresh-adsl.full.patch). -2015-02-10 19:29:53 +0100 Oleksandr Shneyder (db87055) +2015-02-10 19:29:53 +0100 Oleksandr Shneyder (db8705564) * Fix repainting of SolidFill pictures with libcairo > 1.12.x (204_nxagent_repaint-solidpict.full.patch). -2015-02-10 19:26:42 +0100 Oleksandr Shneyder (4f5dc80) +2015-02-10 19:26:42 +0100 Oleksandr Shneyder (4f5dc807a) * Add -norootlessexit cmdline option to nxagent (203_nxagent_disable-rootless-exit.full.patch). -2015-02-10 19:23:16 +0100 Oleksandr Shneyder (d26930d) +2015-02-10 19:23:16 +0100 Oleksandr Shneyder (d26930d59) * Enable Xinerama support for NX (202_nx-X11_enable-xinerama.full.patch). -2015-02-10 19:21:35 +0100 Oleksandr Shneyder (6aa18cc) +2015-02-10 19:21:35 +0100 Oleksandr Shneyder (6aa18cc28) * X2Go icon when run with x2goagent flavour (201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch). -2015-02-10 19:19:25 +0100 Oleksandr Shneyder (1681f11) +2015-02-10 19:19:25 +0100 Oleksandr Shneyder (1681f1110) * Detect nxagent/x2goagent flavour (200_nxagent_check-binary-x2go-flavour.full.patch). -2015-02-10 19:17:58 +0100 Mike Gabriel (4712239) +2015-02-10 19:17:58 +0100 Mike Gabriel (471223907) * Avoid large pixmaps (110_nxagent_createpixmap-bounds-check.full.patch). -2015-02-10 19:14:04 +0100 Mike Gabriel (223f554) +2015-02-10 19:14:04 +0100 Mike Gabriel (223f5548b) * Wine Close Delay (108_nxagent_wine-close-delay.full.patch). -2015-02-10 19:04:00 +0100 Mike Gabriel (658d07e) +2015-02-10 19:04:00 +0100 Mike Gabriel (658d07e93) * Prevent sending COMPOUND_TEXT (107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch). -2015-02-10 19:00:06 +0100 Mike Gabriel (9674c43) +2015-02-10 19:00:06 +0100 Mike Gabriel (9674c4346) * UTF-8 Clipboard copying (106_nxagent_utf8-copy-clipboard.full.patch). -2015-02-10 18:56:59 +0100 Marcelo Boveto Shima (c91fe98) +2015-02-10 18:56:59 +0100 Marcelo Boveto Shima (c91fe980b) * Export remote keyboard configuration to session directory (105_nxagent_export-remote-keyboard-config.full.patch) -2015-02-10 18:54:29 +0100 Mike Gabriel (c106ad8) +2015-02-10 18:54:29 +0100 Mike Gabriel (c106ad8e8) * FHS path fix for keyboard config file (103_nxagent_set-X0-config-path.full.patch). -2015-02-10 18:52:39 +0100 Marcelo Boveto Shima (057999e) +2015-02-10 18:52:39 +0100 Marcelo Boveto Shima (057999efa) * FHS path fix for SecurityPolicy file (102_xserver-xext_set-securitypolicy-path.full.patch). -2015-02-10 18:48:39 +0100 Marcelo Boveto Shima (ceb7050) +2015-02-10 18:48:39 +0100 Marcelo Boveto Shima (ceb70505c) * FHS path fix for rgb file This patch is needed on Debian only, not reporting this path addition to upstream. -2015-02-10 18:41:08 +0100 Mihai Moldovan (2d68cac) +2015-02-10 18:41:08 +0100 Mihai Moldovan (2d68caca7) * Create Windows and fix drawing issues on Big Endian 64bit systems (057_nx-X11_sanitize-eventmasks.full.patch). -2015-02-09 15:58:22 +0100 Orion Poplawski (4dac57f) +2015-02-09 15:58:22 +0100 Orion Poplawski (4dac57f3d) * Fix -Werror=format-security errors (056_nx-X11_Werror-format-security.full.patch). -2015-02-09 15:51:26 +0100 Orion Poplawski (95dbaa6) +2015-02-09 15:51:26 +0100 Orion Poplawski (95dbaa614) * Fix FTBFS when compiled with -Werror=format-security (055_nx-X11_imake-Werror-format-security.full.patch). -2015-02-09 15:49:51 +0100 Orion Poplawski (0b711de) +2015-02-09 15:49:51 +0100 Orion Poplawski (0b711de48) * Fix FTBFS on ppc64 architecture (054_nx-X11_ppc64-ftbfs.full.patch). -2015-02-09 15:47:44 +0100 Orion Poplawski (9ea734b) +2015-02-09 15:47:44 +0100 Orion Poplawski (9ea734b21) * Avoid building libXcomp.so.1 (which is identical to libXcomp.so.3), (053_nx-X11_no-xcomp1-install-target.full.patch). -2015-02-09 15:45:33 +0100 Mihai Moldovan (e736fff) +2015-02-09 15:45:33 +0100 Mihai Moldovan (e736fff09) * Fix nxauth location on Mac OS X 10 (052_nxcomp_macos10-nxauth-location.full+lite.patch) -2015-02-09 15:41:35 +0100 Mihai Moldovan (9054786) +2015-02-09 15:41:35 +0100 Mihai Moldovan (905478694) * workaround for Mac OS X 10.5 (051_nxcomp_macos105-fdisset.full+lite.patch( -2015-02-09 15:38:59 +0100 Jan Engelhardt (6101bd9) +2015-02-09 15:38:59 +0100 Jan Engelhardt (6101bd956) * Description: Enable parallel make (031_nx-X11_parallel-make.full.patch). -2015-02-09 15:34:02 +0100 Jan Engelhardt (9f4b494) +2015-02-09 15:34:02 +0100 Jan Engelhardt (9f4b494fa) * Allow to pass in configure args (030_nx-X11_configure-args.full.patch). -2015-02-09 15:31:46 +0100 Mihai Moldovan (bd10fe5) +2015-02-09 15:31:46 +0100 Mihai Moldovan (bd10fe591) * Fix BIGENDIAN issue in nxcomp (relevant on PPC64 arch) (029_nxcomp_ppc64.full+lite.patch) -2015-02-09 15:29:53 +0100 Mike Gabriel (f661907) +2015-02-09 15:29:53 +0100 Mike Gabriel (f6619070b) * Support abstract local sockets for Linux systems (028_nx-X11_abstract-kernel-sockets.full.patch). -2015-02-09 15:27:46 +0100 Mike Gabriel (aaf4a59) +2015-02-09 15:27:46 +0100 Mike Gabriel (aaf4a59e4) * Add X11 abstract socket support to nxcomp/nxproxy (027_nxcomp_abstract-X11-socket.full+lite.patch). -2015-02-09 15:22:07 +0100 Orion Poplawski (3384aba) +2015-02-09 15:22:07 +0100 Orion Poplawski (3384aba38) * Honour compiler/linker option flags. -2015-02-09 15:19:12 +0100 Gabriel Marcano (78efa8b) +2015-02-09 15:19:12 +0100 Gabriel Marcano (78efa8bf9) * Fix FTBFS against libjpeg9a (025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch). -2015-02-09 15:16:30 +0100 Mike Gabriel (236ee4f) +2015-02-09 15:16:30 +0100 Mike Gabriel (236ee4ffa) * nxcomp*, nxproxy: Fix clean-up of source tree via Makefile.in templates. -2015-02-09 15:12:11 +0100 Mike Gabriel (9b72eea) +2015-02-09 15:12:11 +0100 Mike Gabriel (9b72eeaa2) * FHS adaptation for Debian packaging (016_nx-X11_install-location.full.patch). From tarball, @@ -5722,42 +5965,42 @@ debian/rules. This should be merged into the NX build logic finally. -2015-02-09 08:37:40 -0500 Mike DePaulo (519bcac) +2015-02-09 08:37:40 -0500 Mike DePaulo (519bcac93) * Fix RPM spec syntax error -2015-02-09 14:26:02 +0100 Mike Gabriel (4bc550e) +2015-02-09 14:26:02 +0100 Mike Gabriel (4bc550e86) * nxcomp*,nxproxy: Add clean rules to Makefile.in templates. -2015-02-09 14:23:12 +0100 Mike Gabriel (27ddd16) +2015-02-09 14:23:12 +0100 Mike Gabriel (27ddd1695) * Work on man pages. -2015-02-09 14:20:22 +0100 Mike Gabriel (a0b2fd8) +2015-02-09 14:20:22 +0100 Mike Gabriel (a0b2fd836) * sa_restorer vs. memset (008_nxcomp_sa-restorer.full+lite.patch). Use memset instead of setting sa_restorer to NULL. -2015-02-09 14:18:50 +0100 Mike Gabriel (a720908) +2015-02-09 14:18:50 +0100 Mike Gabriel (a720908a6) * Remove .gch files during cleanup (007_nxcompshad_clean-gch-files.full.patch). When building nxcompshad .gch files get created. On cleanup these should be removed. -2015-02-09 14:16:10 +0100 Mike Gabriel (f27e742) +2015-02-09 14:16:10 +0100 Mike Gabriel (f27e7424f) * Fix building against libpng 1.5 (006_nxcomp_libpng15.full+lite.patch). From the libpng homepage... -2015-02-09 11:57:55 +0100 Marcelo Boveto Shima (48c8281) +2015-02-09 11:57:55 +0100 Marcelo Boveto Shima (48c828107) * Description: gcc43 fix (005_nxcomp_gcc43.full+lite.patch) Use builtin includes to build with gcc43. -2015-02-09 11:56:14 +0100 Mike Gabriel (dd20ab5) +2015-02-09 11:56:14 +0100 Mike Gabriel (dd20ab5e6) * Description: Fix build on Debian (004_nx-X11_fix-nxcompshad-build.full.patch) By an @@ -5765,12 +6008,12 @@ nx-X11, nxcomp, nxcompshad and nxcompext with dpkg-buildpackage and debuild. -2015-02-09 11:53:47 +0100 Marcelo Boveto Shima (b3496d0) +2015-02-09 11:53:47 +0100 Marcelo Boveto Shima (b3496d0a7) * gcc43 fix (003_nxcompshad_gcc43.full.patch) Use builtin includes to build with gcc43. -2015-02-09 11:46:07 +0100 Mike Gabriel (3b4a915) +2015-02-09 11:46:07 +0100 Mike Gabriel (3b4a91598) * Build nxcompshad against nx-X11 (002_nxcompshad_build-against-nx-x11-only.full.patch). @@ -5778,477 +6021,477 @@ Furthermore /usr/X11R6/lib is an outdated path on current Debian systems. -2015-02-09 11:44:17 +0100 Mike Gabriel (7a1bd6b) +2015-02-09 11:44:17 +0100 Mike Gabriel (7a1bd6b29) * Provide README.NX-development file. Drop README.NX-redistribution file. -2015-02-09 10:46:10 +0100 Mike Gabriel (abbe938) +2015-02-09 10:46:10 +0100 Mike Gabriel (abbe93861) * fix long-line in changelog -2015-02-09 10:37:17 +0100 Mike Gabriel (eb55dc8) +2015-02-09 10:37:17 +0100 Mike Gabriel (eb55dc8fd) * Drop not-used-anymore NX source tree clean-up code. Source tree has been cleaned up natively. -2015-02-09 10:32:49 +0100 Mike Gabriel (939492d) +2015-02-09 10:32:49 +0100 Mike Gabriel (939492d83) * Revert "Add patch 700_nx-X11_mesa-initialize-server-support-correctly.full.patch. Initialize server_support array with correct size. Fix Mesa upstream bugzilla bug #7353. (Fixes: #776)." -2015-02-03 04:59:13 +0100 Mike Gabriel (4db6f0f) +2015-02-03 04:59:13 +0100 Mike Gabriel (4db6f0fdb) * Add patch 700_nx-X11_mesa-initialize-server-support-correctly.full.patch. Initialize server_support array with correct size. Fix Mesa upstream bugzilla bug #7353. (Fixes: #776). -2015-02-02 15:31:35 +0100 Mike Gabriel (231ffa8) +2015-02-02 15:31:35 +0100 Mike Gabriel (231ffa85e) * Update 991_fix-hr-typos.full.patch. Don't patch files that get removed by the NX code reduction effort. -2015-02-02 15:29:45 +0100 Mike Gabriel (91dc4b5) +2015-02-02 15:29:45 +0100 Mike Gabriel (91dc4b509) * Drop 604_nx-X11_recent-freetype-API.full.patch. Not used in current build process. -2015-02-02 15:26:51 +0100 Mike Gabriel (237d748) +2015-02-02 15:26:51 +0100 Mike Gabriel (237d7487f) * Update 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. Don't patch files matter to the NX code reduction efforts. -2015-02-02 15:25:43 +0100 Mike Gabriel (0c42e33) +2015-02-02 15:25:43 +0100 Mike Gabriel (0c42e33b4) * Update 031_nx-X11_parallel-make.full.patch. Don't patch .original files in NX code tree. -2015-02-02 15:24:31 +0100 Mike Gabriel (42f3b14) +2015-02-02 15:24:31 +0100 Mike Gabriel (42f3b1442) * Drop patches: 017_nx-X11_update-autotools-helper-files.full.patch, 018_nx-X11_update-libtool-ltmain-script.full.patch, 019_nx-X11_expat-build-against-system-libxmltok.full.patch. They patch files that are not used at build time. -2015-02-02 15:20:12 +0100 Mike Gabriel (86f96b0) +2015-02-02 15:20:12 +0100 Mike Gabriel (86f96b065) * empty CODE-REDUCTION_* files (maybe usable later for futher code reduction efforts -2015-02-02 15:04:01 +0100 Mike Gabriel (e399356) +2015-02-02 15:04:01 +0100 Mike Gabriel (e399356ed) * drop .original files from the current code base -2015-02-02 15:02:49 +0100 Mike Gabriel (b16b9e4) +2015-02-02 15:02:49 +0100 Mike Gabriel (b16b9e465) * massive reduction of unneeded files -2015-02-02 14:47:22 +0100 Mike Gabriel (0d5a83e) +2015-02-02 14:47:22 +0100 Mike Gabriel (0d5a83e98) * On SLE 11.x: libX* packages are prefixed with "xorg-x11-". -2015-01-29 13:04:46 +0100 Mike Gabriel (dc74950) +2015-01-29 13:04:46 +0100 Mike Gabriel (dc7495063) * Assure that BuildRoot: is set. -2015-01-29 12:48:05 +0100 Mike Gabriel (d9a4836) +2015-01-29 12:48:05 +0100 Mike Gabriel (d9a48367e) * nx-libs.spec: Set PREFIX=%{_prefix} USRLIBDIR=%{_libdir} SHLIBDIR=%{_libdir} at build time. -2015-01-29 12:40:22 +0100 Mike Gabriel (804584c) +2015-01-29 12:40:22 +0100 Mike Gabriel (804584cb1) * Don't fail if removing *.a files fails due to the files being non-present. -2015-01-29 12:12:15 +0100 Mike Gabriel (0b9fce2) +2015-01-29 12:12:15 +0100 Mike Gabriel (0b9fce27b) * Makefile.nx-libs: fix faulty path to nxproxy.1 man page -2015-01-29 12:05:23 +0100 Mike Gabriel (5e85638) +2015-01-29 12:05:23 +0100 Mike Gabriel (5e8563876) * nx-libs.spec: several dependency fixes... -2015-01-29 11:53:16 +0100 Mike Gabriel (a161173) +2015-01-29 11:53:16 +0100 Mike Gabriel (a161173d1) * Make libNX_X11-6 and libXinerama1 compliant to Shared Library Policy. -2015-01-29 11:49:37 +0100 Mike Gabriel (76c5291) +2015-01-29 11:49:37 +0100 Mike Gabriel (76c529124) * nx-libs.spec: Install man pages into bin:packages. -2015-01-29 11:49:28 +0100 Mike Gabriel (9a901a9) +2015-01-29 11:49:28 +0100 Mike Gabriel (9a901a9f6) * Makefile.nx-libs: Install man pages via main Makefile. -2015-01-29 11:46:31 +0100 Mike Gabriel (7e0de4d) +2015-01-29 11:46:31 +0100 Mike Gabriel (7e0de4df1) * nx-libs.spec: Mention NX technology in every package description. -2015-01-29 09:46:34 +0100 Mike Gabriel (10d670c) +2015-01-29 09:46:34 +0100 Mike Gabriel (10d670c0c) * Support .symbols for 64bit and 32bit alike. -2015-01-28 23:18:58 +0100 Mike Gabriel (cde624f) +2015-01-28 23:18:58 +0100 Mike Gabriel (cde624f45) * Use SONAME based library package naming scheme. -2015-01-28 23:17:45 +0100 Mike Gabriel (5a74175) +2015-01-28 23:17:45 +0100 Mike Gabriel (5a74175cd) * Revert "Use SONAME based library package naming scheme." -2015-01-28 23:14:49 +0100 Mike Gabriel (1e5c83e) +2015-01-28 23:14:49 +0100 Mike Gabriel (1e5c83e8b) * Use SONAME based library package naming scheme. -2015-01-28 23:06:25 +0100 Mike Gabriel (6d54eba) +2015-01-28 23:06:25 +0100 Mike Gabriel (6d54eba6c) * debian/control: don't use 1 person plural in LONG_DESCRIPTION -2015-01-28 23:01:59 +0100 Mike Gabriel (d306c90) +2015-01-28 23:01:59 +0100 Mike Gabriel (d306c9004) * nx-libs.spec: Make %{_libdir}/nx{,/X11} owned by libNX_X11 bin:package -2015-01-28 22:54:40 +0100 Mike Gabriel (752dac2) +2015-01-28 22:54:40 +0100 Mike Gabriel (752dac2b5) * CODE-REDUCTION_PRESERVE-NEEDED: keep cross.def and cross.rules -2015-01-28 22:52:34 +0100 Mike Gabriel (f992999) +2015-01-28 22:52:34 +0100 Mike Gabriel (f99299998) * debian/control: fix several packaging issues since the re-packaging started -2015-01-28 22:52:01 +0100 Mike Gabriel (1d7eb36) +2015-01-28 22:52:01 +0100 Mike Gabriel (1d7eb36d3) * Add Description: and Author: fields to various patch headers. -2015-01-28 22:32:09 +0100 Mike Gabriel (89b285f) +2015-01-28 22:32:09 +0100 Mike Gabriel (89b285f2a) * nx-libs.spec: Non-packaged files detected: nxagent.xpm, /usr/share/nx/rgb in bin:package nxagent -2015-01-28 22:31:16 +0100 Mike Gabriel (06212f5) +2015-01-28 22:31:16 +0100 Mike Gabriel (06212f51f) * latest tarball size: 41MiB -2015-01-28 22:24:24 +0100 Mike Gabriel (ce1078e) +2015-01-28 22:24:24 +0100 Mike Gabriel (ce1078e87) * Makefile.nx-libs: Don't allow symlinks to point into buildroot. -2015-01-28 22:21:22 +0100 Mike Gabriel (279b741) +2015-01-28 22:21:22 +0100 Mike Gabriel (279b74158) * Add 991_fix-hr-typos.full+lite.patch and 991_fix-hr-typos.full.patch. Fix several typos in upstream code detected by lintian. -2015-01-28 22:08:16 +0100 Mike Gabriel (3de4659) +2015-01-28 22:08:16 +0100 Mike Gabriel (3de46599f) * debian/libnx-xinerama1.dirs: no non-multi-arch dir in multi-arch packages -2015-01-28 21:56:13 +0100 Mike Gabriel (2a548a0) +2015-01-28 21:56:13 +0100 Mike Gabriel (2a548a079) * Provide CDBS-generated debian/copyright.in file. -2015-01-28 21:52:17 +0100 Mike Gabriel (79c0bac) +2015-01-28 21:52:17 +0100 Mike Gabriel (79c0bac99) * enable official changelog -2015-01-28 21:50:33 +0100 Mike Gabriel (94d5bb3) +2015-01-28 21:50:33 +0100 Mike Gabriel (94d5bb3c1) * debian/control: dummy packages don't have the substvar -2015-01-28 21:47:56 +0100 Mike Gabriel (e2cc535) +2015-01-28 21:47:56 +0100 Mike Gabriel (e2cc535c7) * nx-libs.spec: NX libs are installed in %{_libdir} -2015-01-28 21:43:27 +0100 Mike Gabriel (1d39845) +2015-01-28 21:43:27 +0100 Mike Gabriel (1d39845b3) * Add debian/*.symbols files for shared nx-X11 libraries. -2015-01-28 21:42:15 +0100 Mike Gabriel (dd79903) +2015-01-28 21:42:15 +0100 Mike Gabriel (dd79903cd) * nx-libs.spec: fix permission setting on outdated path -2015-01-28 21:31:37 +0100 Mike Gabriel (801dc1f) +2015-01-28 21:31:37 +0100 Mike Gabriel (801dc1fe8) * fix typos in CODE-REDUCTION scripts -2015-01-28 21:28:04 +0100 Mike Gabriel (912d62b) +2015-01-28 21:28:04 +0100 Mike Gabriel (912d62ba5) * Install upstream ChangeLogs into bin:packages. -2015-01-28 21:26:40 +0100 Mike Gabriel (f72fb34) +2015-01-28 21:26:40 +0100 Mike Gabriel (f72fb34eb) * silence lintian warning about licence file being a symlink -2015-01-28 20:42:34 +0100 Mike Gabriel (72ecc24) +2015-01-28 20:42:34 +0100 Mike Gabriel (72ecc24e6) * CODE-REDUCTION_PRESERVE-SYMLINKED: fix Mesa builds on 32bit intel arch -2015-01-28 20:41:56 +0100 Mike Gabriel (1b458e3) +2015-01-28 20:41:56 +0100 Mike Gabriel (1b458e32e) * CODE-REDUCTION_CLEANUP-UNUSED: remove DPS include files, remove XTrap shared lib -2015-01-28 19:51:32 +0100 Mike Gabriel (62d4f6a) +2015-01-28 19:51:32 +0100 Mike Gabriel (62d4f6a06) * CODE-REDUCTION_CLEANUP-BACKUPFILES: fine-tune dropped file -2015-01-28 19:49:11 +0100 Mike Gabriel (4fae286) +2015-01-28 19:49:11 +0100 Mike Gabriel (4fae286b8) * CODE-REDUCTION_CLEANUP-UNUSED: remove faulty path -2015-01-28 19:39:16 +0100 Mike Gabriel (8b05e19) +2015-01-28 19:39:16 +0100 Mike Gabriel (8b05e1918) * Update .spec file to meet changes in tarball size reduction and restructuring. -2015-01-28 18:21:44 +0100 Mike Gabriel (3c7c3b7) +2015-01-28 18:21:44 +0100 Mike Gabriel (3c7c3b7f4) * Support hardened builds for nxagent and libNX_*.so files. -2015-01-28 18:21:17 +0100 Mike Gabriel (f0f1df2) +2015-01-28 18:21:17 +0100 Mike Gabriel (f0f1df262) * more code reduction and adaptation of patch 600_....patch -2015-01-28 15:11:12 +0100 Mike Gabriel (350fb90) +2015-01-28 15:11:12 +0100 Mike Gabriel (350fb90d6) * remove more unused code from nx-X11/lib/ -2015-01-28 15:04:50 +0100 Mike Gabriel (151bca3) +2015-01-28 15:04:50 +0100 Mike Gabriel (151bca3a1) * Update 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. Don't patch files that get removed during code reduction. -2015-01-28 14:58:17 +0100 Mike Gabriel (2a40158) +2015-01-28 14:58:17 +0100 Mike Gabriel (2a4015865) * Support hardened builds for nxcomp* libraries. -2015-01-28 14:57:42 +0100 Mike Gabriel (8b432c7) +2015-01-28 14:57:42 +0100 Mike Gabriel (8b432c7a5) * debian/changelog: whitespace fix -2015-01-28 15:10:54 +0100 Mike Gabriel (f18608d) +2015-01-28 15:10:54 +0100 Mike Gabriel (f18608de2) * rebase with unify -2015-01-28 12:58:30 +0100 Mike Gabriel (5565184) +2015-01-28 12:58:30 +0100 Mike Gabriel (5565184a6) * Unify source tree reduction (debian/rules vs. roll-tarball.sh) via file/folder lists in text files named debian/CODE-REDUCTION_*. -2015-01-28 11:44:04 +0100 Mike Gabriel (22f0208) +2015-01-28 11:44:04 +0100 Mike Gabriel (22f0208cb) * re-arrange changelog, work-in missing entries for previous commits -2015-01-28 11:31:41 +0100 Mike Gabriel (1002761) +2015-01-28 11:31:41 +0100 Mike Gabriel (100276175) * debian/roll-tarball.sh: Install etc/ files into etc/ subfolder (rgb, nxagent.keyboard, x2goagent.keyboard). -2015-01-28 11:34:05 +0100 Mike Gabriel (a7a4246) +2015-01-28 11:34:05 +0100 Mike Gabriel (a7a4246f4) * debian/rules: Correctly link config files (etc/rgb, etc/nxagent.keyboard, etc/x2goagent.keyboard) before dh_auto_build. -2015-01-28 11:25:02 +0100 Mike Gabriel (0956f0c) +2015-01-28 11:25:02 +0100 Mike Gabriel (0956f0c7d) * Provide support for separate .keyboard files for nxagent/x2goagent. -2015-01-28 11:24:34 +0100 Mike Gabriel (04307b2) +2015-01-28 11:24:34 +0100 Mike Gabriel (04307b247) * Allow sysadmins to manipulate nxagent's / x2goagent's rgb file by placing it into /etc/nxagent or /etc/x2go. -2015-01-28 11:29:52 +0100 Mike Gabriel (78c016e) +2015-01-28 11:29:52 +0100 Mike Gabriel (78c016e77) * Extend 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Allow separate .keyboard files for x2goagent and nxagent. -2015-01-28 11:28:38 +0100 Mike Gabriel (fc2dcc9) +2015-01-28 11:28:38 +0100 Mike Gabriel (fc2dcc9c3) * Extend 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Let rgb file shipped with x2goagent supersede rgb file shipped with nxagent. FIXME: a better approach would be to decide at runtime if to use /etc/x2go/rgb or /etc/nxagent/rgb. -2015-01-28 11:21:02 +0100 Mike Gabriel (bb70adf) +2015-01-28 11:21:02 +0100 Mike Gabriel (bb70adf75) * Modify 101_nxagent_set-rgb-path.full.patch. Allow configurable rgb files. -2015-01-28 11:13:45 +0100 Mike Gabriel (7357f8c) +2015-01-28 11:13:45 +0100 Mike Gabriel (7357f8c0e) * Base Debian packaging 100% on Makefile install. -2015-01-27 13:56:36 +0100 Mike Gabriel (b3d32ec) +2015-01-27 13:56:36 +0100 Mike Gabriel (b3d32ec56) * Fully rework the way nx-libs gets packaged for Debian/Ubuntu. -2015-01-22 15:50:30 +0100 Mike Gabriel (a3087ee) +2015-01-22 15:50:30 +0100 Mike Gabriel (a3087eec9) * fix for last commit -2015-01-22 15:43:36 +0100 Mike Gabriel (caa9e8c) +2015-01-22 15:43:36 +0100 Mike Gabriel (caa9e8c9a) * Header files need not be removed anymore. They don't get installed via Makefile.nx-libs anymore. -2015-01-22 15:17:47 +0100 Mike Gabriel (c5ceb16) +2015-01-22 15:17:47 +0100 Mike Gabriel (c5ceb16a5) * Makefile.nx-libs: Don't install Mesa header files into DESTDIR anymore. -2015-01-22 13:48:18 +0100 Mike Gabriel (30ade9c) +2015-01-22 13:48:18 +0100 Mike Gabriel (30ade9cb7) * More source tree size reduction by analyzing what exactly of the Mesa source code in nx-X11/extras/ is used and what not. -2015-01-22 11:47:31 +0100 Mike Gabriel (4c73b97) +2015-01-22 11:47:31 +0100 Mike Gabriel (4c73b97cf) * debian/control: Turn libnx-*-dev packages into dummy packages. Shipping development files for nx-X11 makes no sense. No other programme build against nx-X11's header files except nxagent itself. -2015-01-22 11:00:15 +0100 Mike Gabriel (8de5a89) +2015-01-22 11:00:15 +0100 Mike Gabriel (8de5a897a) * Drop more unused folders from tarball release / before .deb package build. -2015-01-22 10:16:50 +0100 Mike Gabriel (3cfe4bf) +2015-01-22 10:16:50 +0100 Mike Gabriel (3cfe4bfa3) * Drop nx-X11/programs/Xserver/hw/xfree86 except of four files symlinked to other locations in the source tree at build time. -2015-01-22 06:19:42 +0100 Mike Gabriel (b590ce3) +2015-01-22 06:19:42 +0100 Mike Gabriel (b590ce38c) * Stop shipping unused / very old xterm code. -2015-01-22 06:12:10 +0100 Mike Gabriel (be832e8) +2015-01-22 06:12:10 +0100 Mike Gabriel (be832e8e1) * Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in roll-tarball.sh and in debian/rules alike. -2015-01-22 06:10:11 +0100 Mike Gabriel (040962d) +2015-01-22 06:10:11 +0100 Mike Gabriel (040962da7) * Fix removal of unused code (that part of the code that we know of so far). (The debian/rules file is a Makefile and Makefiles don't understand shell globbing with curly braces). -2015-01-22 06:06:37 +0100 Mike Gabriel (694523e) +2015-01-22 06:06:37 +0100 Mike Gabriel (694523eee) * debian/rules: Backup nxcomp/VERSION file from NoMachine before replacing it with a symlink to debian/VERSION. Recreate the original file when cleaning up. -2015-01-19 10:32:03 +0100 Mike Gabriel (24986dd) +2015-01-19 10:32:03 +0100 Mike Gabriel (24986dd2e) * Update 320_nxagent_configurable-keystrokes.full.patch. Fix patch header referring to keystrokes.cfg (plural), not keystroke.cfg. -2015-01-19 10:28:59 +0100 Horst Schirmeier (4e5a115) +2015-01-19 10:28:59 +0100 Horst Schirmeier (4e5a11596) * Add 321_nxagent_x2go-specific-keystroke-config.full.patch. If nxagent is launched as x2goagent, use X2Go-specific paths for the keystrokes.cfg file. (Fixes: #744). -2015-01-13 12:17:58 +0100 Mike Gabriel (6ca1073) +2015-01-13 12:17:58 +0100 Mike Gabriel (6ca1073ea) * give credits to Horst Schirmeier for solving #741 -2015-01-13 06:05:32 +0100 Mike Gabriel (0648d56) +2015-01-13 06:05:32 +0100 Mike Gabriel (0648d56a9) * grammar fix in changelog -2015-01-13 05:36:24 +0100 Mike Gabriel (c09580a) +2015-01-13 05:36:24 +0100 Mike Gabriel (c09580a52) * Update 320_nxagent_configurable-keystrokes.full.patch. Fix a typo that prevented the /etc/nxagent/keystrokes.cfg file to be parsed. (Fixes: #741). -2015-01-09 04:51:03 +0100 Mihai Moldovan (3fb038d) +2015-01-09 04:51:03 +0100 Mihai Moldovan (3fb038d6c) * debian/changelog: add entry for last change. -2015-01-09 03:46:38 +0100 Mihai Moldovan (7750a7e) +2015-01-09 03:46:38 +0100 Mihai Moldovan (7750a7eaf) * common: change X2go -> X2Go. -2014-12-03 15:28:59 +0100 Mike Gabriel (3fa67b6) +2014-12-03 15:28:59 +0100 Mike Gabriel (3fa67b673) * fix for last commit(2) -2014-12-03 15:23:14 +0100 Mike Gabriel (8b36b79) +2014-12-03 15:23:14 +0100 Mike Gabriel (8b36b798e) * fix for last commit -2014-12-03 15:19:03 +0100 Mike Gabriel (992ec61) +2014-12-03 15:19:03 +0100 Mike Gabriel (992ec61a1) * nx-libs.spec: The gpg-offline bin:package is not available in our SLE repo. We can do without. -2014-12-03 15:09:54 +0100 Mike Gabriel (e44f1ae) +2014-12-03 15:09:54 +0100 Mike Gabriel (e44f1aec8) * DISABLED:401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch. -2014-11-13 23:29:07 +0100 Paul Szabo (b2ac5aa) +2014-11-13 23:29:07 +0100 Paul Szabo (b2ac5aaf1) * Add 401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch. Enable support for the X11 big requests extension and the generic events extension. -2014-11-13 21:59:11 +0100 Mike Gabriel (ec61d2e) +2014-11-13 21:59:11 +0100 Mike Gabriel (ec61d2e72) * Continue development... -2014-11-13 21:39:59 +0100 Mike Gabriel (c697894) +2014-11-13 21:39:59 +0100 Mike Gabriel (c69789464) * release 3.5.0.28 (tag: redist-server/3.5.0.28, tag: redist-client/3.5.0.28) -2014-11-13 21:38:32 +0100 Mike Gabriel (0f5dbb9) +2014-11-13 21:38:32 +0100 Mike Gabriel (0f5dbb95c) * Revert "Add 401_nxcomp_big-requests.full+lite.patch. Support usage of the BIG-REQUESTS X11 extension on the server-side. (See Debian bug #766299)." -2014-11-13 21:38:24 +0100 Mike Gabriel (6f59493) +2014-11-13 21:38:24 +0100 Mike Gabriel (6f59493da) * Revert "401_nxcomp_bigrequests.full+lite.patch: PATCH DISABLED FOR NOW, IT CAUSES NXPROXY CRASHES EVERY 1-2 minutes." -2014-11-05 10:07:39 +0100 Ulrich Sibiller (d1f0401) +2014-11-05 10:07:39 +0100 Ulrich Sibiller (d1f040121) * Add 207_nxagent_fix-xfixes-selection.full.patch. Fix selection handling when XFIXES is enabled. (Fixes: #585) -2014-10-25 23:02:16 +0200 Mike Gabriel (d505944) +2014-10-25 23:02:16 +0200 Mike Gabriel (d505944e0) * 401_nxcomp_bigrequests.full+lite.patch: PATCH DISABLED FOR NOW, IT CAUSES NXPROXY CRASHES EVERY 1-2 minutes. -2014-10-25 22:11:45 +0200 Mike Gabriel (c69c2e2) +2014-10-25 22:11:45 +0200 Mike Gabriel (c69c2e2ea) * Add 401_nxcomp_big-requests.full+lite.patch. Support usage of the BIG-REQUESTS X11 extension on the server-side. (See Debian bug #766299). -2014-10-19 00:19:38 +0200 Mike Gabriel (429dbe7) +2014-10-19 00:19:38 +0200 Mike Gabriel (429dbe708) * Rename 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch @@ -6257,182 +6500,182 @@ It is an nxcomp patch that needs to be applied in the nx-libs-lite _and_ the nx-libs-full tarball release. -2014-10-18 23:04:25 +0200 Mike Gabriel (b0727a0) +2014-10-18 23:04:25 +0200 Mike Gabriel (b0727a02f) * Add 607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch. Fix check for launchd socket path in $DISPLAY on recent Mac OS X systems. -2014-10-14 19:17:11 +0200 Mike Gabriel (efe4d1f) +2014-10-14 19:17:11 +0200 Mike Gabriel (efe4d1f73) * nx-libs.spec: Fix more rpmlint warnings. -2014-10-13 15:47:05 +0200 Mike Gabriel (aa7a0c8) +2014-10-13 15:47:05 +0200 Mike Gabriel (aa7a0c834) * nx-libs.spec: Fix SUSE-specific R for libXext(6). -2014-10-13 14:54:11 +0200 Mike Gabriel (33f69da) +2014-10-13 14:54:11 +0200 Mike Gabriel (33f69da55) * nx-libs.spec: typo fix -2014-10-13 14:28:04 +0200 Mike Gabriel (370e56e) +2014-10-13 14:28:04 +0200 Mike Gabriel (370e56ec4) * nx-libs.spec: minor dep fix -2014-10-13 14:26:57 +0200 Mike Gabriel (44b7138) +2014-10-13 14:26:57 +0200 Mike Gabriel (44b7138b3) * nx-libs.spec: Fix Xinerama deps for SUSE builds. -2014-10-13 13:49:42 +0200 Mike Gabriel (ef4a6c8) +2014-10-13 13:49:42 +0200 Mike Gabriel (ef4a6c845) * nx-libs.spec: Do not conflict with nx... This will break our own neck. -2014-10-13 13:29:18 +0200 Mike Gabriel (aeb9b43) +2014-10-13 13:29:18 +0200 Mike Gabriel (aeb9b430c) * nx-libs.spec: fix nx-libs builds in mock -2014-10-13 11:48:15 +0200 Mike Gabriel (61c21fc) +2014-10-13 11:48:15 +0200 Mike Gabriel (61c21fce0) * nx-libs.spec: fix for last commit -2014-10-13 11:42:00 +0200 Mike Gabriel (d86c1be) +2014-10-13 11:42:00 +0200 Mike Gabriel (d86c1be2c) * Fix Xinerama symlink installation into RPM bin:package libNX_Xinerama. (Fixes: #269). -2014-10-13 11:27:50 +0200 Mike Gabriel (827cbcc) +2014-10-13 11:27:50 +0200 Mike Gabriel (827cbcc04) * Make sure all package directories are owned by one of the built bin:packages. -2014-10-13 11:27:23 +0200 Mike Gabriel (26e55cf) +2014-10-13 11:27:23 +0200 Mike Gabriel (26e55cf81) * fix last changelog entry -2014-10-13 11:19:14 +0200 Mike Gabriel (52ac26b) +2014-10-13 11:19:14 +0200 Mike Gabriel (52ac26bec) * nx-libs.spec: Fix for last commit. -2014-10-13 11:01:57 +0200 Mike Gabriel (0387e38) +2014-10-13 11:01:57 +0200 Mike Gabriel (0387e383d) * nx-libs.spec: SUSE hack for linking to files in libX11-6 and libXext6. -2014-10-13 10:36:53 +0200 Mike Gabriel (1bc6c85) +2014-10-13 10:36:53 +0200 Mike Gabriel (1bc6c85e5) * nx-libs.spec: follow up for last commits -2014-10-13 10:33:12 +0200 Mike Gabriel (894199e) +2014-10-13 10:33:12 +0200 Mike Gabriel (894199e60) * nx-libs.spec: follow up for last commits -2014-10-13 10:29:51 +0200 Mike Gabriel (b96e120) +2014-10-13 10:29:51 +0200 Mike Gabriel (b96e120f1) * nx-libs.spec: follow-up commit for last commit -2014-10-13 10:20:34 +0200 Mike Gabriel (5e4ae04) +2014-10-13 10:20:34 +0200 Mike Gabriel (5e4ae04ef) * Additionally adapt to building on openSUSE/SLES. -2014-10-11 10:13:33 +0200 Mike Gabriel (45c592c) +2014-10-11 10:13:33 +0200 Mike Gabriel (45c592cf4) * Update 027_nxcomp_abstract-X11-socket.full+lite: Add patch header (Description: and Author: field). -2014-10-02 13:52:00 +0200 Mike Gabriel (bddc7e0) +2014-10-02 13:52:00 +0200 Mike Gabriel (bddc7e0ba) * debian/rules: fix nxcomp/VERSION symlink creation at build-time -2014-10-02 13:32:13 +0200 Mike Gabriel (0cac9ef) +2014-10-02 13:32:13 +0200 Mike Gabriel (0cac9efd4) * debian/rules: No such option for dh_auto_build: --with quilt." -2014-10-02 12:34:22 +0200 Mike Gabriel (0277e08) +2014-10-02 12:34:22 +0200 Mike Gabriel (0277e0857) * nx-libs.spec: Adapt installation of debian/VERSION as VERSION.x2goagent and nxcomp/VERSION to latest changes introduced by 400_nxcomp-version.full+lite.patch. -2014-10-02 12:30:20 +0200 Mike Gabriel (8d0798e) +2014-10-02 12:30:20 +0200 Mike Gabriel (8d0798ec7) * fix symlink creation -2014-10-02 11:53:47 +0200 Mike Gabriel (5a82f59) +2014-10-02 11:53:47 +0200 Mike Gabriel (5a82f5994) * debian/libnx-x11.postinst: Don't use dpkg-architecture (bin:package dpkg-dev) in postinst script. Instead prep a libnx-x11.postinst script at build time. (Fixes: #621). -2014-10-02 10:40:55 +0200 Nito Martinez (61d047d) +2014-10-02 10:40:55 +0200 Nito Martinez (61d047d63) * Add 400_nxcomp-version.full+lite.patch. Allow 4-digit version comparison during NX session handshake. (Fixes: #610). -2014-08-20 13:02:53 +0200 Mike Gabriel (c9bc8ac) +2014-08-20 13:02:53 +0200 Mike Gabriel (c9bc8accc) * Add 025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch. Fix FTBFS when built against libjpeg9a. Thanks to Gabriel Marcano for sending this in. -2014-07-09 19:04:25 +0200 Mike Gabriel (0e3b414) +2014-07-09 19:04:25 +0200 Mike Gabriel (0e3b414ea) * Provide COPYING file in tarball. Update debian/copyright. -2014-06-30 15:06:06 +0200 Mike Gabriel (340ec14) +2014-06-30 15:06:06 +0200 Mike Gabriel (340ec14a4) * Continue development... -2014-06-30 14:53:48 +0200 Mike Gabriel (aeb5e8a) +2014-06-30 14:53:48 +0200 Mike Gabriel (aeb5e8ad5) * release 3.5.0.27 (tag: redist-server/3.5.0.27, tag: redist-client/3.5.0.27) -2014-06-30 14:53:09 +0200 Mike Gabriel (77c3e15) +2014-06-30 14:53:09 +0200 Mike Gabriel (77c3e1550) * Split up patch 210 (for correct creation nx-libs, nx-libs-lite tarballs): -2014-06-30 14:43:02 +0200 Mike Gabriel (035de82) +2014-06-30 14:43:02 +0200 Mike Gabriel (035de8281) * release 3.5.0.26 (tag: redist-server/3.5.0.26, tag: redist-client/3.5.0.26) -2014-06-30 14:42:40 +0200 Mike Gabriel (9c7bf9d) +2014-06-30 14:42:40 +0200 Mike Gabriel (9c7bf9da2) * Fix patch names... -2014-06-30 14:25:25 +0200 Mike Gabriel (c927045) +2014-06-30 14:25:25 +0200 Mike Gabriel (c92704558) * Continue development... -2014-06-30 14:14:35 +0200 Mike Gabriel (752a80c) +2014-06-30 14:14:35 +0200 Mike Gabriel (752a80cee) * release 3.5.0.25 (tag: redist-server/3.5.0.25, tag: redist-client/3.5.0.25) -2014-06-29 15:34:25 +0200 Mike Gabriel (2a31f67) +2014-06-29 15:34:25 +0200 Mike Gabriel (2a31f67c7) * changelog fix -2014-06-29 15:11:31 +0200 Mike Gabriel (cf029b6) +2014-06-29 15:11:31 +0200 Mike Gabriel (cf029b619) * Add 212_nxcomp_build-on-Android.patch. Fix FTBFS of nxproxy/nxcomp when build against the Android system. (Fixes: #339). -2014-06-27 17:40:00 +0200 Mike Gabriel (fa886df) +2014-06-27 17:40:00 +0200 Mike Gabriel (fa886dff8) * update patch name in changelog -2014-06-27 17:39:00 +0200 Mike Gabriel (e474a3f) +2014-06-27 17:39:00 +0200 Mike Gabriel (e474a3f35) * update changelog, update patches -2014-06-27 10:52:52 +0200 Oleksandr Shneyder (92a0f58) +2014-06-27 10:52:52 +0200 Oleksandr Shneyder (92a0f58e8) * Rename Patches 210 and 211. Update series file. -2014-06-27 02:01:15 +0200 Mike Gabriel (0cf283d) +2014-06-27 02:01:15 +0200 Mike Gabriel (0cf283dca) * Add 206_nxagent_clipboard-as-nxoption.full.patch. Make the clipboard option configurable in nxagent via NX options as @@ -6441,13 +6684,13 @@ option. Possible values are both or 1, client, server, none or 0. -2014-06-25 11:43:44 +0200 Oleksandr Shneyder (c62b813) +2014-06-25 11:43:44 +0200 Oleksandr Shneyder (c62b81304) * Add 211_nxcomp_set_default_options.patch. Set default arguments for options 'link' and 'pack' to avoid session damage by resuming with incorrect options file. -2014-06-25 10:02:02 +0200 Oleksandr Shneyder (9f6eb6f) +2014-06-25 10:02:02 +0200 Oleksandr Shneyder (9f6eb6f79) * Add 210_nxagent_nxcomp_save_session_state.patch. Save session state in path specified by "state" option in agent options file. @@ -6455,7 +6698,7 @@ Session states are: STARTING, RUNNING, SUSPENDING, SUSPENDED, RESUMING, TERMINATING, TERMINATED. -2014-06-25 09:59:35 +0200 Oleksandr Shneyder (480a055) +2014-06-25 09:59:35 +0200 Oleksandr Shneyder (480a05519) * Revert "Add 210_nxagent_nxcomp_save_session_state.patch. Save session state in path specified by "state" option in agent @@ -6463,7 +6706,7 @@ be saved. Session states are: STARTING, RUNNING, SUSPENDING, SUSPENDED, RESUMING, TERMINATING, TERMINATED." -2014-06-25 09:57:42 +0200 Oleksandr Shneyder (fcd9b71) +2014-06-25 09:57:42 +0200 Oleksandr Shneyder (fcd9b71bc) * Add 210_nxagent_nxcomp_save_session_state.patch. Save session state in path specified by "state" option in agent options file. @@ -6471,49 +6714,49 @@ Session states are: STARTING, RUNNING, SUSPENDING, SUSPENDED, RESUMING, TERMINATING, TERMINATED. -2014-06-22 09:16:45 +0200 Mike Gabriel (7154096) +2014-06-22 09:16:45 +0200 Mike Gabriel (7154096b7) * fix changelog entry for patch 057 -2014-06-22 09:16:02 +0200 Mike Gabriel (c00d269) +2014-06-22 09:16:02 +0200 Mike Gabriel (c00d26974) * fix Description: in patch 057 -2014-06-22 09:14:35 +0200 Mike Gabriel (ead0f65) +2014-06-22 09:14:35 +0200 Mike Gabriel (ead0f653f) * Rename patches to match our naming scheme: -2014-06-22 09:07:56 +0200 Mike Gabriel (53a0a47) +2014-06-22 09:07:56 +0200 Mike Gabriel (53a0a47b8) * renmae patch 057 -2014-06-21 23:40:09 +0200 Mike Gabriel (d8c9f89) +2014-06-21 23:40:09 +0200 Mike Gabriel (d8c9f89b1) * update description for patch 057_nx-X11-bigendian-ppc64-no-session-window.full.patch as proposed by the patch author -2014-06-21 23:20:33 +0200 Mike Gabriel (eca0ee9) +2014-06-21 23:20:33 +0200 Mike Gabriel (eca0ee98c) * Update patches, to make them apply cleanly after above changes: -2014-06-21 23:17:41 +0200 Mike Gabriel (8be0a04) +2014-06-21 23:17:41 +0200 Mike Gabriel (8be0a0472) * fix 057, rebase -2014-06-21 23:04:16 +0200 Mihai Moldovan (abbe7e8) +2014-06-21 23:04:16 +0200 Mihai Moldovan (abbe7e840) * Add 990_fix-DEBUG-and-TEST-builds.full.patch. Fix debug builds (e.g. when globally setting -DDEBUG and -DTEST at build time). -2014-06-21 22:39:10 +0200 Mihai Moldovan (3446d14) +2014-06-21 22:39:10 +0200 Mihai Moldovan (3446d14ea) * Improve 028_nx-X11_abstract-kernel-sockets.full.patch. Make it more Big Endian robust by assigning correct types for socklen_t objects. -2014-06-21 22:35:47 +0200 Mihai Moldovan (afcc7a9) +2014-06-21 22:35:47 +0200 Mihai Moldovan (afcc7a93d) * Improve 105_nxagent_export-remote-keyboard-config.full.patch. Don't print out nonsensical information, if there really was no @@ -6522,235 +6765,235 @@ keyboard file. Only print an error message if SessionPath *really* is not defined. -2014-06-21 22:29:44 +0200 Mihai Moldovan (cfb1990) +2014-06-21 22:29:44 +0200 Mihai Moldovan (cfb1990d4) * Add 057_nx-X11-bigendian-ppc64-no-session-window.patch. Fix failures in session windows coming up on Big Endian systems like PPC64. (Fixes: #516). -2014-06-15 01:03:15 +0200 Mike Gabriel (359c458) +2014-06-15 01:03:15 +0200 Mike Gabriel (359c458f1) * update last committed patch, fix EOL style -2014-06-15 00:49:26 +0200 Mike Gabriel (ecd6d4e) +2014-06-15 00:49:26 +0200 Mike Gabriel (ecd6d4e85) * giving credits to Mihai for digging out patch 029_nxcomp_ppc64.full+lite.patch -2014-06-15 00:33:28 +0200 Mike Gabriel (36f4e34) +2014-06-15 00:33:28 +0200 Mike Gabriel (36f4e34b2) * Add 029_nxcomp_ppc64.full+lite.patch. Fix sockaddr handling on Big Endian systems (like PPC64). (Fixes: #515). -2014-06-13 01:55:49 +0200 Mike Gabriel (75987a7) +2014-06-13 01:55:49 +0200 Mike Gabriel (75987a76f) * Add 302_nx-X11_xkbbasedir-detection.patch. For detecting XkbBaseDir test for xkb/rules/base instead of testing for deprecated file xkb/keymap.dir. (Fixes: #40). -2014-06-11 16:37:37 +0200 Mike Gabriel (e30d46d) +2014-06-11 16:37:37 +0200 Mike Gabriel (e30d46d85) * Make 016_nx-X11_install-location.debian.patch cleanly apply again. -2014-06-11 16:35:13 +0200 Mike Gabriel (656f29c) +2014-06-11 16:35:13 +0200 Mike Gabriel (656f29cc6) * Add 028_nx-X11_abstract-kernel-sockets.full.patch. Provide abstract local socket support for Linux based systems. This patch pulls in abstract socket relevant code from xtrans 1.2.7. -2014-06-11 14:48:08 +0200 Mike Gabriel (9268d27) +2014-06-11 14:48:08 +0200 Mike Gabriel (9268d270e) * Wrap too-long-line in changelog. -2014-06-11 12:25:52 +0200 Mike Gabriel (065dcc9) +2014-06-11 12:25:52 +0200 Mike Gabriel (065dcc903) * fix patch name -2014-06-11 10:43:14 +0200 Mike Gabriel (5a07d00) +2014-06-11 10:43:14 +0200 Mike Gabriel (5a07d00e0) * Make 220_nxproxy-bind-loopback-only.full+lite.patch cleanly apply after having added 027_nxcomp_abstract-X11-socket.patch. -2014-06-11 10:42:04 +0200 Mike Gabriel (57fb5bb) +2014-06-11 10:42:04 +0200 Mike Gabriel (57fb5bb57) * Add 027_nxcomp_abstract-X11-socket.patch. In proxy mode server let NX proxy attempt connecting to the abstract X11 socket first, and only fallback to the file system socket, if the abstract socket is not available. (Fixes: #505). -2014-05-09 12:57:23 +0200 Mike Gabriel (eb36421) +2014-05-09 12:57:23 +0200 Mike Gabriel (eb3642101) * Add 606_nx-X11_build-on-aarch64.full.patch. Build on aarch64 architectures. (Fixes: #490). -2014-05-07 09:59:08 +0200 Mike Gabriel (21ba6e2) +2014-05-07 09:59:08 +0200 Mike Gabriel (21ba6e22c) * Continue development... -2014-05-07 09:56:12 +0200 Mike Gabriel (460a3cb) +2014-05-07 09:56:12 +0200 Mike Gabriel (460a3cb39) * release 3.5.0.24 (tag: redist-server/3.5.0.24, tag: redist-client/3.5.0.24) -2014-05-07 09:55:40 +0200 Mike Gabriel (c6f84a4) +2014-05-07 09:55:40 +0200 Mike Gabriel (c6f84a448) * Configurable keystrokes: Don't ignore first XML element in keystrokes.cfg anymore. (Fixes: #488). -2014-05-07 09:38:04 +0200 Mike Gabriel (7e55c36) +2014-05-07 09:38:04 +0200 Mike Gabriel (7e55c36f4) * Update 320_nxagent_configurable-keystrokes.full.patch: The keystrokes config file's default name now is keystrokes.cfg (plural). -2014-05-07 09:24:45 +0200 Mike Gabriel (a481c13) +2014-05-07 09:24:45 +0200 Mike Gabriel (a481c137a) * Debian lintian: Fix: nx-libs source: not-binnmuable-all-depends-any x2goagent -> nxagent. -2014-05-07 09:08:13 +0200 Mike Gabriel (440fd40) +2014-05-07 09:08:13 +0200 Mike Gabriel (440fd40c5) * Make sure, patch 056_nx-X11-Werror-format-security.full.patch gets included into rolled tarball (by renaming *.patch to *.full.patch). -2014-05-07 09:04:55 +0200 Mike Gabriel (a8be15e) +2014-05-07 09:04:55 +0200 Mike Gabriel (a8be15e1d) * Clean debian/patches/series: Remove commented out patches. -2014-05-06 18:34:53 +0200 Mike Gabriel (43ee510) +2014-05-06 18:34:53 +0200 Mike Gabriel (43ee5101c) * Continue development... -2014-05-06 18:06:05 +0200 Mike Gabriel (085bfbd) +2014-05-06 18:06:05 +0200 Mike Gabriel (085bfbd25) * release 3.5.0.23 (tag: redist-server/3.5.0.23, tag: redist-client/3.5.0.23) -2014-05-06 17:59:42 +0200 Mike Gabriel (f0aa665) +2014-05-06 17:59:42 +0200 Mike Gabriel (f0aa66536) * fix changelog -2014-05-06 13:27:49 +0200 Oleksandr Shneyder (a544b9d) +2014-05-06 13:27:49 +0200 Oleksandr Shneyder (a544b9d4c) * nxagent: add patch to fix refresh error on RDP connections to Windows 2012 if speed=ADSL. -2014-03-29 21:22:59 +0100 Mike Gabriel (4bbcbe5) +2014-03-29 21:22:59 +0100 Mike Gabriel (4bbcbe505) * Add patch: 056_nx-X11-Werror-format-security.patch. Fix more -Werror=format-security errors that only show up on ARM builds. (Fixes: #423). -2014-01-28 23:47:15 +0100 Mike Gabriel (d999822) +2014-01-28 23:47:15 +0100 Mike Gabriel (d999822bf) * nx-libs.spec: Build our imake against xorg-x11-proto-devel. -2014-01-28 23:45:10 +0100 Mike Gabriel (d95e47f) +2014-01-28 23:45:10 +0100 Mike Gabriel (d95e47f3b) * debian/control: Build our imake against x11proto-core-dev headers. -2014-01-28 19:48:21 +0100 Mike Gabriel (faa289a) +2014-01-28 19:48:21 +0100 Mike Gabriel (faa289a82) * nx-libs.spec: Sync nx-libs.spec in Fedora with upstream's nx-libs.spec file. (Fixes: #393). -2014-01-28 19:41:15 +0100 Mike Gabriel (fc91d4d) +2014-01-28 19:41:15 +0100 Mike Gabriel (fc91d4d04) * Add patch: 055_nx-X11_imake-Werror-format-security.full.patch. Fix FTBFS of imake on current Fedora rawhide (21) which uses the compiler option -Werror=format-security for all builds. (Fixes: #412). -2014-01-28 19:40:45 +0100 Mike Gabriel (d5f2bbb) +2014-01-28 19:40:45 +0100 Mike Gabriel (d5f2bbb3d) * fix patch 054_nx-X11_ppc64-ftbfs.full.patch -2014-01-28 19:32:53 +0100 Mike Gabriel (54f3975) +2014-01-28 19:32:53 +0100 Mike Gabriel (54f39758c) * Add patch: 054_nx-X11_ppc64-ftbfs.full.patch. Fix FTBFS on ppc64 architecture. (Fixes: #411). -2014-01-04 22:03:44 +0100 Mike Gabriel (e8a69d2) +2014-01-04 22:03:44 +0100 Mike Gabriel (e8a69d261) * Continue development... -2014-01-04 22:02:09 +0100 Mike Gabriel (80d10df) +2014-01-04 22:02:09 +0100 Mike Gabriel (80d10df87) * release hotfix build -2014-01-04 22:01:16 +0100 Mike Gabriel (0d07f3e) +2014-01-04 22:01:16 +0100 Mike Gabriel (0d07f3e8b) * Update version in VERSION.x2goagent. -2014-01-04 21:39:35 +0100 Mike Gabriel (626b5db) +2014-01-04 21:39:35 +0100 Mike Gabriel (626b5dbae) * release 3.5.0.22 (tag: redist-server/3.5.0.22, tag: redist-client/3.5.0.22) -2013-12-17 21:03:26 +0100 Mike Gabriel (1d074b1) +2013-12-17 21:03:26 +0100 Mike Gabriel (1d074b1ae) * nx-libs.spec: fix symlink creation for Xinerama (missing subfolder) -2013-12-17 17:16:47 +0100 Mike Gabriel (edbd95b) +2013-12-17 17:16:47 +0100 Mike Gabriel (edbd95b90) * attempt to correct symlink creation for Xinerama support -2013-12-17 12:32:34 +0100 Mike Gabriel (36cdfdc) +2013-12-17 12:32:34 +0100 Mike Gabriel (36cdfdcb5) * Make sure all nx-libs components depend on the very same version. -2013-12-17 12:09:54 +0100 Mike Gabriel (a96a43f) +2013-12-17 12:09:54 +0100 Mike Gabriel (a96a43f14) * Enable Xinerama support for RPM packages. (Fixes: #370). -2013-12-17 11:50:25 +0100 Mike Gabriel (ded2017) +2013-12-17 11:50:25 +0100 Mike Gabriel (ded201707) * Drop symlinking libNX_xrandr for setting a custom LD_LIBRARY_PATH. Not in use anymore and not recommended at all to have that. -2013-12-08 12:05:46 +0100 Mike Gabriel (a6ab07d) +2013-12-08 12:05:46 +0100 Mike Gabriel (a6ab07de8) * Clear (Fedora package) changelog. -2013-12-13 18:48:59 +0100 Mike Gabriel (501112b) +2013-12-13 18:48:59 +0100 Mike Gabriel (501112b2a) * nx-libs.spec: x2goagent does not depend on x2goserver (rather vice versa) -2013-12-13 18:24:09 +0100 Mike Gabriel (3fbb9ca) +2013-12-13 18:24:09 +0100 Mike Gabriel (3fbb9ca30) * nx-libs.spec: fix spellings in package descriptions -2013-12-08 01:19:44 +0100 Mike Gabriel (19033a1) +2013-12-08 01:19:44 +0100 Mike Gabriel (19033a157) * make sure our RPM package version is lower than a package version from EPEL -2013-12-08 00:27:53 +0100 Mike Gabriel (ce11917) +2013-12-08 00:27:53 +0100 Mike Gabriel (ce11917ad) * typo fix -2013-12-08 00:07:14 +0100 Mike Gabriel (703a67a) +2013-12-08 00:07:14 +0100 Mike Gabriel (703a67ac7) * compensate missing %buildroot macro in EPEL5 -2013-12-07 23:04:18 +0100 Mike Gabriel (51afd69) +2013-12-07 23:04:18 +0100 Mike Gabriel (51afd69b2) * The RPM macro for the linker flags does not exist on EPEL. Thus, hardcode __global_ldflags macro for EPEL builds. -2013-12-07 22:11:17 +0100 Mike Gabriel (1ac043b) +2013-12-07 22:11:17 +0100 Mike Gabriel (1ac043b94) * debian/rules: Remove bundled libraries from source tree before building the package. -2013-12-06 15:42:26 +0100 Mike Gabriel (1061630) +2013-12-06 15:42:26 +0100 Mike Gabriel (1061630f1) * adapt spec file to last commit -2013-12-06 15:39:59 +0100 Mike Gabriel (523d505) +2013-12-06 15:39:59 +0100 Mike Gabriel (523d50529) * Improve patch: 601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch. @@ -6758,81 +7001,81 @@ to Orion Paplowski!!! Also adapt roll-tarball.sh do dropping more bundled libraries. -2013-12-06 15:20:15 +0100 Mike Gabriel (40aa275) +2013-12-06 15:20:15 +0100 Mike Gabriel (40aa275cd) * Add patch: 302_nx-X11_do-not-build-bundled-libs.full.patch. Rename patch: 302_nxagent_configurable-keystrokes.full.patch. -2013-12-06 15:06:42 +0100 Mike Gabriel (e3da345) +2013-12-06 15:06:42 +0100 Mike Gabriel (e3da34510) * prep source tree after unpacking tarball, bring files from debian/ folder in place before building the RPM package -2013-12-06 14:54:38 +0100 Mike Gabriel (21cde6e) +2013-12-06 14:54:38 +0100 Mike Gabriel (21cde6e42) * nx-libs.spec: Use local tarball, don't expect ,,-full'' in tarball name. -2013-12-06 14:50:59 +0100 Mike Gabriel (2fceb10) +2013-12-06 14:50:59 +0100 Mike Gabriel (2fceb10d2) * nx-libs.specs: remove duplication of file contents -2013-12-06 13:55:53 +0100 Mike Gabriel (8c78f32) +2013-12-06 13:55:53 +0100 Mike Gabriel (8c78f3204) * Ship nx-libs.spec (RPM package definitions) in upstream project. (Thanks to the Fedora package maintainers). File differs from the Fedora file already. -2013-12-06 13:54:42 +0100 Mike Gabriel (b413799) +2013-12-06 13:54:42 +0100 Mike Gabriel (b413799fb) * Refresh patch: 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. -2013-12-03 21:33:08 +0100 Mike Gabriel (08312e2) +2013-12-03 21:33:08 +0100 Mike Gabriel (08312e2e1) * Add patch 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch. Fix FTBFS of nx-libs-lite on Mac OS X Mavericks. (Fixes: #337). -2013-12-03 15:08:30 +0100 Mike Gabriel (2382d88) +2013-12-03 15:08:30 +0100 Mike Gabriel (2382d8835) * Add patch 604_nx-X11_recent-freetype-API.full.patch. Fix FTBFS against recent (>= 2.5.0) libfreetype6 API. -2013-11-30 21:55:36 +0100 Mike Gabriel (8cd7d82) +2013-11-30 21:55:36 +0100 Mike Gabriel (8cd7d82d7) * debian/control: Add libfreetype6-dev to Build-Depends: field. -2013-11-29 12:37:48 +0100 Mike Gabriel (c50b2a9) +2013-11-29 12:37:48 +0100 Mike Gabriel (c50b2a90e) * change versioning scheme -2013-11-27 14:54:44 +0100 Mike Gabriel (ca414e1) +2013-11-27 14:54:44 +0100 Mike Gabriel (ca414e175) * debian/source/format: Switch to format 1.0. -2013-09-30 21:00:41 +0200 Mike Gabriel (2ef4ab4) +2013-09-30 21:00:41 +0200 Mike Gabriel (2ef4ab414) * Add patch: 603_nx-X11_compilation_warnings.full.patch. Fix 3 evident bugs: one implicit function declaration issue and two array index out of bounds issues. (Fixes: #314). -2013-08-30 16:20:29 +0200 Mike Gabriel (b29654d) +2013-08-30 16:20:29 +0200 Mike Gabriel (b29654d54) * Continue development... -2013-08-30 16:18:40 +0200 Mike Gabriel (b2a3143) +2013-08-30 16:18:40 +0200 Mike Gabriel (b2a3143f8) * release 3.5.0.21 (tag: redist-server/3.5.0.21, tag: redist-client/3.5.0.21) -2013-08-29 22:58:19 +0200 Mike Gabriel (13f2b57) +2013-08-29 22:58:19 +0200 Mike Gabriel (13f2b57d4) * Fix keystrokes.cfg, use Ctrl+Alt+ instead of just Ctrl+. (Adds to fixing #223). -2013-08-29 22:24:26 +0200 Mike Gabriel (0946b43) +2013-08-29 22:24:26 +0200 Mike Gabriel (0946b4375) * Add patch: 602_nx-X11_initgroups.full.patch. Fix calling setuid and setgid without setgroups or initgroups. There is a high @@ -6841,641 +7084,641 @@ Seek POS36-C on the web for details about the problem. (Fixes: #293). -2013-08-29 20:48:09 +0200 Mike Gabriel (e46b434) +2013-08-29 20:48:09 +0200 Mike Gabriel (e46b43443) * fix underscore in name of patch 601_... -2013-07-19 19:27:09 +0200 Mike Gabriel (2a41a2c) +2013-07-19 19:27:09 +0200 Mike Gabriel (2a41a2ca5) * /debian/nx-libs-dev.install: Remove unrelated files from -dev package. -2013-07-19 19:26:37 +0200 Mike Gabriel (19ef7a2) +2013-07-19 19:26:37 +0200 Mike Gabriel (19ef7a2ca) * /debian/control: Add B-Ds: libfontconfig1-dev, libfontenc-dev. -2013-07-19 19:25:05 +0200 Orion Poplawski (9113131) +2013-07-19 19:25:05 +0200 Orion Poplawski (9113131a7) * Change build options so that bundled libraries are not used anymore at build time. Remove bundled libraries from rolled tarballs, as well. (Fixes: #116, #238). -2013-05-29 19:02:02 +0200 Mike Gabriel (d90c457) +2013-05-29 19:02:02 +0200 Mike Gabriel (d90c457c4) * Use a keystrokes.cfg that reflects the normally hard-coded defaults of a vanilla nxagent. (Fixes: #223). -2013-05-11 20:40:57 +0200 Mike Gabriel (ead1e82) +2013-05-11 20:40:57 +0200 Mike Gabriel (ead1e823a) * * Tarball roller script: + Only install keystrokes.cfg when in full mode. + Only install nxproxy wrapper when in lite mode. -2013-05-08 14:21:49 +0200 Mike Gabriel (4c462f2) +2013-05-08 14:21:49 +0200 Mike Gabriel (4c462f28d) * addition to last commit -2013-05-07 20:20:43 +0200 Mike Gabriel (dafbbf2) +2013-05-07 20:20:43 +0200 Mike Gabriel (dafbbf21a) * For vanilla nxagent move keystrokes.cfg from /etc/nx to /etc/nxagent. -2013-05-07 20:03:27 +0200 Mike Gabriel (995b70c) +2013-05-07 20:03:27 +0200 Mike Gabriel (995b70cdc) * /debian/rules: clean etc/keystrokes.cfg symlink -2013-05-07 20:00:51 +0200 Mike Gabriel (ee35c3f) +2013-05-07 20:00:51 +0200 Mike Gabriel (ee35c3ff9) * fix broker symlink -2013-05-06 23:09:35 +0200 Mike Gabriel (e0fb697) +2013-05-06 23:09:35 +0200 Mike Gabriel (e0fb697e9) * Set NXAGENT_KEYSTROKEFILE to /etc/x2go/keystrokes.cfg for wrapper x2goagent. -2013-05-06 22:44:32 +0200 Mike Gabriel (fc118b4) +2013-05-06 22:44:32 +0200 Mike Gabriel (fc118b4bb) * add forgotten file: debian/keystrokes.cfg -2013-05-06 22:38:51 +0200 Mike Gabriel (d8a55d2) +2013-05-06 22:38:51 +0200 Mike Gabriel (d8a55d2c6) * Provide a default keystrokes.cfg in /etc/nx (for nxagent) and /etc/x2go (for x2goagent). (Fixes: #199). -2013-03-28 21:09:09 +0100 Mike Gabriel (dc5faf7) +2013-03-28 21:09:09 +0100 Mike Gabriel (dc5faf7af) * increment version in VERSION.x2goagent -2013-03-28 21:07:59 +0100 Mike Gabriel (121f7ca) +2013-03-28 21:07:59 +0100 Mike Gabriel (121f7ca9d) * Continue development... -2013-03-28 20:43:53 +0100 Mike Gabriel (225445d) +2013-03-28 20:43:53 +0100 Mike Gabriel (225445db3) * release 3.5.0.20 (tag: redist-server/3.5.0.20, tag: redist-client/3.5.0.20) -2013-03-28 20:43:14 +0100 Mike Gabriel (ef0c6b4) +2013-03-28 20:43:14 +0100 Mike Gabriel (ef0c6b4b8) * add bug closure for #156 -2013-03-28 15:27:57 +0100 Mike Gabriel (bd2eb48) +2013-03-28 15:27:57 +0100 Mike Gabriel (bd2eb481a) * Fix faulty symlink path. Make sure that x2goagent symlink does not point to absolute path somewhere within the build environment. -2013-03-28 09:12:07 +0100 Mike Gabriel (5ff8e62) +2013-03-28 09:12:07 +0100 Mike Gabriel (5ff8e62d1) * Continue development... -2013-03-28 08:59:14 +0100 Mike Gabriel (436d067) +2013-03-28 08:59:14 +0100 Mike Gabriel (436d06739) * release 3.5.0.19 (tag: redist-server/3.5.0.19, tag: redist-client/3.5.0.19) -2013-03-28 08:58:35 +0100 Mike Gabriel (db7feaf) +2013-03-28 08:58:35 +0100 Mike Gabriel (db7feaf98) * Revert "release 3.5.0.19" -2013-03-28 08:55:23 +0100 Mike Gabriel (e77bf36) +2013-03-28 08:55:23 +0100 Mike Gabriel (e77bf36d9) * release 3.5.0.19 -2013-03-28 08:55:00 +0100 Mike Gabriel (d16188f) +2013-03-28 08:55:00 +0100 Mike Gabriel (d16188f08) * fix my mail address in changelog -2013-03-28 08:43:52 +0100 Mike Gabriel (478015e) +2013-03-28 08:43:52 +0100 Mike Gabriel (478015eb1) * increment version in VERSION.x2goagent -2013-03-28 08:42:56 +0100 Mike Gabriel (a40d4b7) +2013-03-28 08:42:56 +0100 Mike Gabriel (a40d4b7b1) * Fix FTBFS for .deb packages after including fix for #145. -2013-03-23 00:43:17 +0100 Mike Gabriel (1af59b3) +2013-03-23 00:43:17 +0100 Mike Gabriel (1af59b317) * Add Jan's reasoning for using string_rep() instead of bash based string substitutions as comment to /debian/Makefile.replaces.sh. -2013-03-22 23:40:44 +0100 Mike Gabriel (1b4092e) +2013-03-22 23:40:44 +0100 Mike Gabriel (1b4092e0f) * release 3.5.0.18 (tag: redist-server/3.5.0.18, tag: redist-client/3.5.0.18) -2013-03-22 23:35:40 +0100 Mike Gabriel (f81df1a) +2013-03-22 23:35:40 +0100 Mike Gabriel (f81df1a69) * Main Makefile: Use absolute symlink when linking from $(X2GOLIBDIR) into $(NXLIBDIR) (i.e. linking x2goagent -> nxagent). (Fixes: #143). -2013-03-22 22:33:40 +0100 Mike Gabriel (8f151d7) +2013-03-22 22:33:40 +0100 Mike Gabriel (8f151d797) * Work-in patch from Jan Engehardt for working around different improper bash implementations of string-in-string replacing. (Fixes: #145). -2013-02-12 08:32:30 +0100 Orion Poplawski (258902b) +2013-02-12 08:32:30 +0100 Orion Poplawski (258902bec) * Avoid building of libxcomp1 (which actually is identical to libxcomp3, just with a wrong name). (Fixes: #104). -2013-02-12 08:13:37 +0100 Orion Poplawski (d439556) +2013-02-12 08:13:37 +0100 Orion Poplawski (d439556ff) * Fix wrong symlink direction of libNX_* files. (Fixes: #107). -2013-01-21 10:35:47 +0100 Mike Gabriel (cf521a4) +2013-01-21 10:35:47 +0100 Mike Gabriel (cf521a4b6) * increment VERSION.x2goagent -2013-01-08 00:39:32 +0100 Mike Gabriel (c8a5fdd) +2013-01-08 00:39:32 +0100 Mike Gabriel (c8a5fddf1) * replaces Closes: by Fixes: statements in changelog -2013-01-07 10:45:58 +0100 Mike Gabriel (b121300) +2013-01-07 10:45:58 +0100 Mike Gabriel (b121300fd) * Remove duplicate install of nxproxy from main Makefile. Spotted by Jan Engelhard. -2013-01-04 13:27:41 +0100 Mike Gabriel (39e8422) +2013-01-04 13:27:41 +0100 Mike Gabriel (39e84229d) * Continue development... -2013-01-04 13:24:18 +0100 Mike Gabriel (69c809a) +2013-01-04 13:24:18 +0100 Mike Gabriel (69c809af9) * release 3.5.0.17 (tag: redist-server/3.5.0.17, tag: redist-client/3.5.0.17) -2013-01-03 08:03:46 +0100 Mike Gabriel (1d76694) +2013-01-03 08:03:46 +0100 Mike Gabriel (1d7669458) * let nx-x11-dbg depend on libnx-x11 and nxagent -2013-01-03 08:02:57 +0100 Mike Gabriel (abc2ce3) +2013-01-03 08:02:57 +0100 Mike Gabriel (abc2ce3f8) * fix multiple binaries-have-file-conflicts lintian issue -2013-01-02 17:41:04 +0100 Mike Gabriel (1737171) +2013-01-02 17:41:04 +0100 Mike Gabriel (17371711f) * add misc:Depends to nx-x11-dbg -2013-01-02 17:40:49 +0100 Mike Gabriel (62f66b0) +2013-01-02 17:40:49 +0100 Mike Gabriel (62f66b02a) * fix multiple binaries-have-file-conflicts lintian issue -2013-01-02 15:55:33 +0100 Mike Gabriel (bfe6f43) +2013-01-02 15:55:33 +0100 Mike Gabriel (bfe6f4349) * Continue Reinhard's work on top-level install/uninstall. Esp. integrate debian/post-nx-build.sh into main Makefile. Make value of CONFIGURE variable traversable through the Makefile tree. -2013-01-02 14:58:22 +0100 Mike Gabriel (36a2247) +2013-01-02 14:58:22 +0100 Mike Gabriel (36a2247e0) * fix lintian: missing-separator-between-items in x2goagent depends field between nxagent (>= ${source:Version}) and ${misc:Depends} -2012-12-15 14:45:26 +0100 Reinhard Tartler (300bafb) +2012-12-15 14:45:26 +0100 Reinhard Tartler (300bafb1a) * integrate install and uninstall rules into the top-level Makefile -2012-12-15 14:58:58 +0100 Reinhard Tartler (978aaa0) +2012-12-15 14:58:58 +0100 Reinhard Tartler (978aaa0a4) * integrate nx*/x2go* shell wrappers into debian/wrappers -2012-12-16 11:40:09 +0100 Reinhard Tartler (918e2b1) +2012-12-16 11:40:09 +0100 Reinhard Tartler (918e2b10d) * Use Fixes instead of Closes syntax -2012-12-15 15:05:33 +0100 Reinhard Tartler (352751e) +2012-12-15 15:05:33 +0100 Reinhard Tartler (352751ef9) * simplify clean rule in debian/rules -2012-12-16 00:00:09 +0100 Mike Gabriel (f2011a7) +2012-12-16 00:00:09 +0100 Mike Gabriel (f2011a718) * add closure for #87 -2012-12-15 14:29:41 +0100 Reinhard Tartler (08d568a) +2012-12-15 14:29:41 +0100 Reinhard Tartler (08d568a2c) * reenable parallel builds -2012-12-15 14:29:25 +0100 Reinhard Tartler (d123923) +2012-12-15 14:29:25 +0100 Reinhard Tartler (d123923a5) * update 031_nx-X11_parallel-make.full.patch. -2012-12-13 13:11:40 +0100 Mike Gabriel (0ef5ea2) +2012-12-13 13:11:40 +0100 Mike Gabriel (0ef5ea2eb) * add changelog entries for Reinhard's previous commits -2012-12-13 12:19:20 +0100 Reinhard Tartler (682c807) +2012-12-13 12:19:20 +0100 Reinhard Tartler (682c80705) * fix installation of libxcompext -2012-12-12 12:48:34 +0100 Reinhard Tartler (e559c75) +2012-12-12 12:48:34 +0100 Reinhard Tartler (e559c7522) * delete nxproxy/configure -2012-12-12 12:47:54 +0100 Reinhard Tartler (9a3737b) +2012-12-12 12:47:54 +0100 Reinhard Tartler (9a3737b14) * drop debian/patches/025_nxproxy_no-configure-file.full+lite.patch -2012-12-12 15:20:44 +0100 Reinhard Tartler (b09b686) +2012-12-12 15:20:44 +0100 Reinhard Tartler (b09b686cf) * add rewritten roll-tarballs.sh script -2012-12-12 12:45:41 +0100 Reinhard Tartler (d139e5d) +2012-12-12 12:45:41 +0100 Reinhard Tartler (d139e5d3d) * drop debian/patches/001_add-main-makefile.full+lite.patch -2012-12-12 12:42:03 +0100 Reinhard Tartler (a12ad50) +2012-12-12 12:42:03 +0100 Reinhard Tartler (a12ad5050) * integrate debian/pre-build-nx.sh into debian/rules -2012-12-12 12:27:00 +0100 Reinhard Tartler (3970fab) +2012-12-12 12:27:00 +0100 Reinhard Tartler (3970fabc5) * Rely on shlibs files instead of hard coding library dependencies -2012-12-12 12:31:51 +0100 Reinhard Tartler (263523d) +2012-12-12 12:31:51 +0100 Reinhard Tartler (263523d7b) * disable parallel builds -2012-12-12 10:07:52 +0100 Reinhard Tartler (6b505a4) +2012-12-12 10:07:52 +0100 Reinhard Tartler (6b505a48a) * remove unnecessary build-conflict on xbitmaps -2012-12-12 10:30:57 +0100 Reinhard Tartler (d634c16) +2012-12-12 10:30:57 +0100 Reinhard Tartler (d634c16aa) * make xfonts-base a recommends -2012-12-12 13:23:37 +0100 Mike Gabriel (3727d73) +2012-12-12 13:23:37 +0100 Mike Gabriel (3727d736b) * add (forgotten) files belong to last commit -2012-12-12 13:20:39 +0100 Orion Poplawski (923b7c7) +2012-12-12 13:20:39 +0100 Orion Poplawski (923b7c7eb) * Add patches: 026_nxcomp*_honour-optflags.full*.patch. (Closes upstream issue #84). -2012-12-12 13:06:25 +0100 Mike Gabriel (016959d) +2012-12-12 13:06:25 +0100 Mike Gabriel (016959d11) * changelog cleanup -2012-12-12 13:05:56 +0100 Mike Gabriel (2410103) +2012-12-12 13:05:56 +0100 Mike Gabriel (241010302) * exchange X2Go by NX -2012-12-08 18:25:28 +0100 Reinhard Tartler (19685c5) +2012-12-08 18:25:28 +0100 Reinhard Tartler (19685c566) * install debug symbols for all packages in a new binary package 'nx-x11-dbg' -2012-12-06 09:07:09 +0100 Alexander Wuerstlein (26901cc) +2012-12-06 09:07:09 +0100 Alexander Wuerstlein (26901cc52) * Follow-up commit for 302_nxagent_configurable-keystrokes.full.patch, fixes FTBFS problem with the first version of that patch. -2012-12-04 15:28:00 +0100 Mike Gabriel (fe598a1) +2012-12-04 15:28:00 +0100 Mike Gabriel (fe598a1e5) * changelog entry for having added libxml2-dev to build dependencies -2012-12-04 15:27:00 +0100 Mike Gabriel (0def009) +2012-12-04 15:27:00 +0100 Mike Gabriel (0def0092f) * control file: add some kommata at EOLs, fix dependency of x2goagent on nxagent -2012-12-04 15:24:25 +0100 Mike Gabriel (6c9bd88) +2012-12-04 15:24:25 +0100 Mike Gabriel (6c9bd8865) * Add pkg-config to build dependencies. -2012-12-04 14:55:01 +0100 Mike Gabriel (2093e70) +2012-12-04 14:55:01 +0100 Mike Gabriel (2093e705a) * Add README.keystrokes to doc section of bin:package nxagent. -2012-12-04 14:54:30 +0100 Mike Gabriel (cf5ac17) +2012-12-04 14:54:30 +0100 Mike Gabriel (cf5ac17d6) * whitespace fix -2012-12-04 13:50:47 +0100 Mike Gabriel (2a112c1) +2012-12-04 13:50:47 +0100 Mike Gabriel (2a112c1c3) * add bug closure for X2Go BTS issue #74 -2012-12-04 13:49:18 +0100 Mike Gabriel (5938c38) +2012-12-04 13:49:18 +0100 Mike Gabriel (5938c38ae) * re-add renamed patch file -2012-12-04 13:48:12 +0100 Mike Gabriel (0a91caa) +2012-12-04 13:48:12 +0100 Mike Gabriel (0a91caa98) * Add patch: 302_nxagent_configurable-keystrokes.full.patch, replaces the... (fixing patch application, fixing up follow-up patches, cleaning up patch-system). -2012-12-04 13:31:01 +0100 Alexander Wuerstlein (34f232c) +2012-12-04 13:31:01 +0100 Alexander Wuerstlein (34f232c14) * Add patch: 210_nxagent_configurable-keystrokes.full.patch, replaces the hardcoded nxagent keybindings by a configurable table of keybindings. -2012-11-12 08:45:46 +0100 Mike Gabriel (5a640ef) +2012-11-12 08:45:46 +0100 Mike Gabriel (5a640efd1) * Fix /bin/Makefile. Add $(DESTDIR) to every install path. -2012-11-07 21:14:41 +0100 Mike Gabriel (9e8a279) +2012-11-07 21:14:41 +0100 Mike Gabriel (9e8a2792f) * Continue development... -2012-11-07 21:08:06 +0100 Mike Gabriel (3fd3096) +2012-11-07 21:08:06 +0100 Mike Gabriel (3fd30962b) * release 3.5.0.16 (tag: redist-server/3.5.0.16, tag: redist-client/3.5.0.16) -2012-11-07 21:07:43 +0100 Mike Gabriel (9568a16) +2012-11-07 21:07:43 +0100 Mike Gabriel (9568a1655) * Bump Debian Standards to 3.9.3 (no changes needed). Update Home page and Vcs information. -2012-11-07 21:05:47 +0100 Mike Gabriel (232f1a4) +2012-11-07 21:05:47 +0100 Mike Gabriel (232f1a46e) * Bump Debian Standards to 3.9.3 (no changes needed). -2012-11-07 20:36:04 +0100 Mike Gabriel (b246e9f) +2012-11-07 20:36:04 +0100 Mike Gabriel (b246e9f75) * Dropping empty override rules for quilt patch from /debian/rules. -2012-10-20 22:56:14 +0200 Mike Gabriel (45b9bb8) +2012-10-20 22:56:14 +0200 Mike Gabriel (45b9bb839) * Modify patch: 001_add-main-makefile.full+lite.patch. Add uninstall routine. -2012-10-20 22:27:26 +0200 Mike Gabriel (f801d40) +2012-10-20 22:27:26 +0200 Mike Gabriel (f801d405d) * Fix wrapper scripts: make sure all NX executables can be launched if NX gets installed via the tarball installation method. -2012-10-20 17:58:04 +0200 Mike Gabriel (d397710) +2012-10-20 17:58:04 +0200 Mike Gabriel (d39771037) * Modify patch: 001_add-main-makefile.full+lite.patch. Install nx* and x2goagent wrapper scripts during make install. -2012-10-20 09:33:11 +0200 Mike Gabriel (30d311a) +2012-10-20 09:33:11 +0200 Mike Gabriel (30d311a68) * Add patch: 025_nxproxy_no-configure-file.full+lite.patch. Remove unneeded build file from NoMachine's nxproxy sources. -2012-10-20 08:15:35 +0200 Mike Gabriel (380d239) +2012-10-20 08:15:35 +0200 Mike Gabriel (380d23968) * Add patches: 024_fix-make-clean.full.patch, 024_fix-make-clean.full+lite.patch. Fix clean-up of build tree after make build has run. -2012-10-20 08:05:53 +0200 Mike Gabriel (1e3d692) +2012-10-20 08:05:53 +0200 Mike Gabriel (1e3d69216) * drop build file from nx-libs tree -2012-10-19 09:56:26 +0200 Mike Gabriel (11980c7) +2012-10-19 09:56:26 +0200 Mike Gabriel (11980c79b) * Drop patch 032, fix other patches so that installation via make install installs NX components to /usr/local/lib/nx and /usr/local/include/nx. -2012-10-05 14:37:20 +0200 Mike Gabriel (fbb3ba9) +2012-10-05 14:37:20 +0200 Mike Gabriel (fbb3ba912) * Modify patch: 032_no-x11r6.full.patch. Install nx-X11 to /usr/local/lib/nx. Add patch: 032_no-x11r6.debian.patch. Use /usr/lib/nx for nx-X11 on Debian. -2012-10-05 14:26:48 +0200 Mike Gabriel (cd631e0) +2012-10-05 14:26:48 +0200 Mike Gabriel (cd631e0bc) * Fix patch file names concerning component nx-X11. -2012-09-28 15:18:07 +0200 Mike Gabriel (e3ba4bd) +2012-09-28 15:18:07 +0200 Mike Gabriel (e3ba4bdc6) * Fix installation of header files in Debian package. -2012-09-21 10:07:07 +0200 Mike Gabriel (21b09b8) +2012-09-21 10:07:07 +0200 Mike Gabriel (21b09b85b) * Continue development... -2012-09-21 10:03:00 +0200 Mike Gabriel (51412cd) +2012-09-21 10:03:00 +0200 Mike Gabriel (51412cd02) * release 3.5.0.15 (tag: redist-server/3.5.0.15, tag: redist-client/3.5.0.15) -2012-09-20 22:13:12 +0200 Mike Gabriel (9f1868d) +2012-09-20 22:13:12 +0200 Mike Gabriel (9f1868def) * mark issue #16 as closed by last added patch -2012-09-20 22:12:00 +0200 Mike Gabriel (dc30db8) +2012-09-20 22:12:00 +0200 Mike Gabriel (dc30db8a1) * fix patch name -2012-09-20 21:27:59 +0200 Oleksandr Shneyder (f6adfd1) +2012-09-20 21:27:59 +0200 Oleksandr Shneyder (f6adfd1fa) * Add patch: 204-nxagent_repaint-solidpict.full.patch. Fixes repainting of SolidFill pictures by nxagent/x2goagent on reconnects. -2012-09-17 18:50:50 +0200 Mike Gabriel (b8db519) +2012-09-17 18:50:50 +0200 Mike Gabriel (b8db5192d) * Add patch: 220_nxproxy-bind-loopback-only.full+lite.patch, adds loopback option to nxproxy options and forces nxproxy to bind to loopback devices only. -2012-09-17 16:50:15 +0200 Mike Gabriel (b9a7a1b) +2012-09-17 16:50:15 +0200 Mike Gabriel (b9a7a1b4f) * Add patch: 220_nxproxy-bind-loopback-only.patch, adds loopback option to nxproxy options and forces nxproxy to bind to loopback devices only. -2012-09-15 21:01:51 +0200 Mike Gabriel (f830090) +2012-09-15 21:01:51 +0200 Mike Gabriel (f83009075) * remove Priorty: extra from -dev package -2012-09-15 20:39:50 +0200 Mike Gabriel (78dc96a) +2012-09-15 20:39:50 +0200 Mike Gabriel (78dc96a39) * /debian/control: Maintainer change in package: X2Go Developers . Priority: optional. -2012-09-14 16:48:43 +0200 Mike Gabriel (2d63528) +2012-09-14 16:48:43 +0200 Mike Gabriel (2d6352839) * remove weird remainders of configure files... -2012-09-14 16:47:20 +0200 Mike Gabriel (b8605d4) +2012-09-14 16:47:20 +0200 Mike Gabriel (b8605d4d6) * Link libNX_Xrandr to a separate location where we can provide it as libXrandr. -2012-09-04 12:50:38 +0200 Mike Gabriel (189bfbe) +2012-09-04 12:50:38 +0200 Mike Gabriel (189bfbe14) * Make sure the NX_TEMP envvar gets set in all wrapper script for all nx* executables -2012-09-04 12:47:27 +0200 Mike Gabriel (8d2827b) +2012-09-04 12:47:27 +0200 Mike Gabriel (8d2827b2a) * Refresh patch 200_nxagent_check-binary-x2go-flavour.full.patch -2012-07-13 16:36:27 +0200 Mike Gabriel (3fdfd51) +2012-07-13 16:36:27 +0200 Mike Gabriel (3fdfd5142) * Add VERSION.x2goagent to package x2goagent package so x2goversion command lists up x2goagent in the list of X2Go server-side packages. -2012-06-28 22:22:00 +0200 Mike Gabriel (b42268b) +2012-06-28 22:22:00 +0200 Mike Gabriel (b42268b13) * Improve 020_add-nxagent-wrapper.full.patch: Properly set NX_TEMP, make sure nxagent launches even with pam_tmpdir.so being in use. -2012-06-28 22:20:57 +0200 Mike Gabriel (7b3d592) +2012-06-28 22:20:57 +0200 Mike Gabriel (7b3d592e6) * debian/changelog -2012-06-28 14:55:16 +0200 Mike Gabriel (6af3d3b) +2012-06-28 14:55:16 +0200 Mike Gabriel (6af3d3b80) * Continue development... -2012-06-28 14:52:41 +0200 Mike Gabriel (1363751) +2012-06-28 14:52:41 +0200 Mike Gabriel (136375188) * release 3.5.0.14 (tag: redist-server/3.5.0.14) -2012-06-28 12:31:01 +0200 Mike Gabriel (b65b83b) +2012-06-28 12:31:01 +0200 Mike Gabriel (b65b83ba4) * Drop patch: 109_nxagent_locale-utf8-compound-text.patch, the patch causes Qt applications to be rendered without window decorations when running in rootless window mode. -2012-06-04 08:19:19 +0200 Mike Gabriel (dd7b5eb) +2012-06-04 08:19:19 +0200 Mike Gabriel (dd7b5eb3c) * Add patch: 052_nxcomp_macos10-nxauth-location.full+lite.patch, change nxauth search location on Mac OS X to $NX_SYSTEM/nxauth to facilitate application bundle building. -2012-05-22 00:57:21 +0200 Mike Gabriel (e2e7008) +2012-05-22 00:57:21 +0200 Mike Gabriel (e2e7008b3) * New upstream release of nxagent (3.5.0-9). -2012-05-22 00:50:51 +0200 Mike Gabriel (fdaa240) +2012-05-22 00:50:51 +0200 Mike Gabriel (fdaa24043) * Merge branch 'nxagent' -2012-05-22 00:49:10 +0200 Mike Gabriel (222a4a2) +2012-05-22 00:49:10 +0200 Mike Gabriel (222a4a222) * Imported nxagent-3.5.0-9.tar.gz (origin/nxagent, gh-sunweaver/nxagent) -2012-05-11 23:57:35 +0200 Mike Gabriel (fe72988) +2012-05-11 23:57:35 +0200 Mike Gabriel (fe72988fb) * Continue development... -2012-05-11 23:52:39 +0200 Mike Gabriel (789c758) +2012-05-11 23:52:39 +0200 Mike Gabriel (789c75851) * release 3.5.0.13 (tag: redist-server/3.5.0.13) -2012-05-11 23:51:09 +0200 Mike Gabriel (3511e87) +2012-05-11 23:51:09 +0200 Mike Gabriel (3511e8791) * add patch header for 120_nxagent_libcairo-null-source-drawables.full.patch -2012-05-11 12:48:36 +0200 Mike Gabriel (45311f7) +2012-05-11 12:48:36 +0200 Mike Gabriel (45311f783) * Add patch: 120_nxagent_libcairo-null-source-drawables.full.patch, solves crashes of GTK applications based on libcairo 1.12.1+. -2012-03-17 17:22:51 +0100 Mike Gabriel (4372dfa) +2012-03-17 17:22:51 +0100 Mike Gabriel (4372dfa53) * Let nxagent Debian package depend on xfonts-base. -2012-03-17 17:21:50 +0100 Mike Gabriel (fc87c4f) +2012-03-17 17:21:50 +0100 Mike Gabriel (fc87c4fbb) * Revert "Let nxagent Debian package depend on xfonts-base." -2012-03-17 17:20:49 +0100 Mike Gabriel (ab04ba2) +2012-03-17 17:20:49 +0100 Mike Gabriel (ab04ba217) * Let nxagent Debian package depend on xfonts-base. -2012-03-07 21:01:44 +0100 Mike Gabriel (30110dd) +2012-03-07 21:01:44 +0100 Mike Gabriel (30110dd4a) * Continue development... -2012-03-07 20:51:27 +0100 Mike Gabriel (1b1a26a) +2012-03-07 20:51:27 +0100 Mike Gabriel (1b1a26ae6) * release 3.5.0.12 (tag: redist-server/3.5.0.12, tag: redist-client/3.5.0.12) -2012-03-01 22:31:35 +0100 Mike Gabriel (4f7c8d0) +2012-03-01 22:31:35 +0100 Mike Gabriel (4f7c8d079) * Re-introduce proper Xinerama support on non-multiarch systems. -2012-03-01 22:27:26 +0100 Mike Gabriel (95929b8) +2012-03-01 22:27:26 +0100 Mike Gabriel (95929b8a5) * no bashisms in package scripts -2012-03-01 22:26:38 +0100 Mike Gabriel (9b17e8a) +2012-03-01 22:26:38 +0100 Mike Gabriel (9b17e8a96) * changelog cleanup: fixing too-long-line -2012-03-01 22:13:32 +0100 Mike Gabriel (fb27493) +2012-03-01 22:13:32 +0100 Mike Gabriel (fb274937d) * Provide temporary workaround for installation on Debian 64bit with multiarch support (via libnx-x11.postinst and .prerm). -2012-03-01 22:06:08 +0100 Mike Gabriel (055436f) +2012-03-01 22:06:08 +0100 Mike Gabriel (055436f48) * fix wrong lib-name in libnx-x11.postinst -2012-03-01 21:53:28 +0100 Mike Gabriel (3776a6f) +2012-03-01 21:53:28 +0100 Mike Gabriel (3776a6f41) * typofix in libnx-x11.postinst -2012-03-01 21:12:54 +0100 Mike Gabriel (a71cebf) +2012-03-01 21:12:54 +0100 Mike Gabriel (a71cebf04) * Provide temporary workaround for installation on Debian 64bit with multiarch support. -2012-03-01 20:43:53 +0100 Mihai Moldovan (22d41ae) +2012-03-01 20:43:53 +0100 Mihai Moldovan (22d41ae20) * Update patch: 005_nxcomp_gcc43.full+lite.patch, fix faulty path to nxcomp/Split.cpp. -2012-03-01 20:39:37 +0100 Mike Gabriel (7e5c04b) +2012-03-01 20:39:37 +0100 Mike Gabriel (7e5c04b5d) * Pass address of fd_set structs on the stack to the FD_ISSET macro/function, instead of the struct itself. -2012-02-29 15:56:49 +0100 Mihai Moldovan (655173f) +2012-02-29 15:56:49 +0100 Mihai Moldovan (655173ff2) * Add patch: 051_nxcomp_macos105-fdisset.full+lite.patch, work around issue in Mac OS X 10.5 SDK. -2012-02-28 13:44:25 +0100 Oleksandr Shneyder (be86627) +2012-02-28 13:44:25 +0100 Oleksandr Shneyder (be86627ad) * Create patch: 203_nxagent_disable-rootless-exit.full.patch -2012-02-22 22:49:06 +0100 Mike Gabriel (0586f0d) +2012-02-22 22:49:06 +0100 Mike Gabriel (0586f0d6e) * Update patch: 001_add-main-makefile.full+lite.patch, adapt patch from packaging. Test for Makefiles in subfolders before calling them. Fixes build failure during ,,make distclean'' calls. -2012-02-22 15:05:55 +0100 Mike Gabriel (a8bf2dd) +2012-02-22 15:05:55 +0100 Mike Gabriel (a8bf2dd81) * Continue development... -2012-02-22 14:41:26 +0100 Mike Gabriel (50690ea) +2012-02-22 14:41:26 +0100 Mike Gabriel (50690ea17) * release 3.5.0.11 (tag: redist-server/3.5.0.11, tag: redist-client/3.5.0.11) -2012-02-20 10:00:00 +0100 Mike Gabriel (fde6a88) +2012-02-20 10:00:00 +0100 Mike Gabriel (fde6a88a8) * Fine-tune symlinking of libXinerama. -2012-02-18 02:28:53 +0100 Mike Gabriel (ec47c22) +2012-02-18 02:28:53 +0100 Mike Gabriel (ec47c22c2) * Fix Xinerama support in Debian package libnx-x11 when NX gets built with patch @@ -7483,20 +7726,20 @@ Still on the todo list: fix the nx-X11 installation via Makefile. -2012-02-16 19:38:48 +0100 Mike Gabriel (7a6cf42) +2012-02-16 19:38:48 +0100 Mike Gabriel (7a6cf42d4) * another last patch with .diff suffix -2012-02-16 19:35:28 +0100 Mike Gabriel (e63819e) +2012-02-16 19:35:28 +0100 Mike Gabriel (e63819e64) * Fix faulty patch name suffix (has to be .patch, not .diff). -2012-02-16 19:31:08 +0100 Mike Gabriel (78fba02) +2012-02-16 19:31:08 +0100 Mike Gabriel (78fba0271) * Apply patches for the Debian package as the last patches in the series. -2012-02-15 09:42:35 +0100 Mike Gabriel (c26e4bd) +2012-02-15 09:42:35 +0100 Mike Gabriel (c26e4bd82) * Update patches: 012_nxcomp..., 013_nxcompext_..., 014_nxcompshad_.... Also make use of $(LIBFULL) in @@ -7505,320 +7748,320 @@ version name change requested in that patch has been rejected for NX (redistributed). -2012-02-15 08:50:48 +0100 Mike Gabriel (b99168f) +2012-02-15 08:50:48 +0100 Mike Gabriel (b99168fc3) * changelog cleanup, fix long-line-wraps -2012-02-15 08:49:49 +0100 Jan Engelhardt (07f9dfa) +2012-02-15 08:49:49 +0100 Jan Engelhardt (07f9dfa05) * Add patch 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch, use unique library names for nx-X11 based X11 libraries. -2012-02-15 08:10:21 +0100 Mike Gabriel (548d50b) +2012-02-15 08:10:21 +0100 Mike Gabriel (548d50ba5) * changelog cleanup, typo fix -2012-02-15 08:09:41 +0100 Jan Engelhardt (3deee8f) +2012-02-15 08:09:41 +0100 Jan Engelhardt (3deee8f94) * Add patch 032_nx-X11_no-x11r6-project-root. We must not overlap with any existing files, therefore, both /usr/X11R6 and /usr are excluded possibilities for ProjectRoot. Use %_libexecdir/somename, since that is still allowed by FHS. -2012-02-14 23:34:51 +0100 Mike Gabriel (9282c00) +2012-02-14 23:34:51 +0100 Mike Gabriel (9282c00e2) * Update patch: 001_add-main-makefile.full+lite.patch, fix missing $(CONFIGURE) variable. -2012-02-14 23:03:45 +0100 Mike Gabriel (6a96ae4) +2012-02-14 23:03:45 +0100 Mike Gabriel (6a96ae450) * Make patch headers DEP5 compliant (030_nx-X11_... and 031_nx-X11_...). -2012-02-14 22:59:50 +0100 Jan Engelhardt (8d6d0a9) +2012-02-14 22:59:50 +0100 Jan Engelhardt (8d6d0a921) * Add patch: 301_nx-X11_use-shared-libs.full.diff, use shared libraries from distribution rather then libs included in source tree. -2012-02-14 22:42:48 +0100 Mike Gabriel (01e97f0) +2012-02-14 22:42:48 +0100 Mike Gabriel (01e97f0f8) * Rename patches 030_nx-X11_... and 031_nx-X11_..., the tarball roll script currently requires ,,full'' or ,,full+lite'' in the file name. -2012-02-14 22:40:15 +0100 Mike Gabriel (c621c22) +2012-02-14 22:40:15 +0100 Mike Gabriel (c621c22f8) * Merge honor-ac-dirs.patch from Jan Engelhardt (OpenSUSE) with already existing Makefile patches (012_nxcomp..., 013_nxcompext_..., 014_nxcompshad_...). -2012-02-14 22:30:26 +0100 Mike Gabriel (4d6e1c4) +2012-02-14 22:30:26 +0100 Mike Gabriel (4d6e1c4fb) * Enable parallel build for Debian package. -2012-02-14 08:47:19 +0100 Jan Engelhardt (ba589d1) +2012-02-14 08:47:19 +0100 Jan Engelhardt (ba589d1fd) * Add patch: 031_nx-X11_parallel-make.diff, enable parallel make. -2012-02-14 08:39:32 +0100 Mike Gabriel (b4b4e20) +2012-02-14 08:39:32 +0100 Mike Gabriel (b4b4e209b) * Update patch: 001_add-main-makefile.full+lite.patch, use curly braces for macros. -2012-02-14 08:33:42 +0100 Jan Engelhardt (280d875) +2012-02-14 08:33:42 +0100 Jan Engelhardt (280d8751c) * Add patch: 030_nx-X11_configure-args.diff. Allow passing of configure args. -2012-02-14 08:27:52 +0100 Mike Gabriel (165206e) +2012-02-14 08:27:52 +0100 Mike Gabriel (165206eb2) * changelog fix, long-line-wrap -2012-02-14 08:26:50 +0100 Jan Engelhardt (448a1db) +2012-02-14 08:26:50 +0100 Jan Engelhardt (448a1db30) * Update patch: 001_add-main-makefile.full+lite.patch, allow passing of configure args. -2012-02-12 12:40:01 +0100 Mike Gabriel (b087877) +2012-02-12 12:40:01 +0100 Mike Gabriel (b087877b2) * Xinerama path has to be put into debian/rules, that dpkg-shlibs can find the libXinerama files. -2012-02-12 01:03:38 +0100 Mike Gabriel (4feedb2) +2012-02-12 01:03:38 +0100 Mike Gabriel (4feedb214) * fix for intra-dependency lintian fix -2012-02-12 00:37:51 +0100 Mike Gabriel (278f941) +2012-02-12 00:37:51 +0100 Mike Gabriel (278f94136) * fix libXinerama removal -2012-02-11 23:39:16 +0100 Mike Gabriel (4473c3a) +2012-02-11 23:39:16 +0100 Mike Gabriel (4473c3ab9) * Do not install libXinerama directly into /usr/lib/nx. Recommended method is installing to /usr/lib/nx/Xinerama, so that you can enable/disable usage of the Xinerama extension. -2012-02-11 23:06:58 +0100 Mike Gabriel (ec72377) +2012-02-11 23:06:58 +0100 Mike Gabriel (ec7237798) * Revert "Add patch: 111_nxcomp_byerace.full+lite.patch. Work around race condition in qtnx and libnxcl." -2012-02-08 08:52:18 +0100 Mike Gabriel (4eae840) +2012-02-08 08:52:18 +0100 Mike Gabriel (4eae840bd) * Add patch: 111_nxcomp_byerace.full+lite.patch. Work around race condition in qtnx and libnxcl. -2012-02-07 21:00:44 +0100 Mike Gabriel (54792fe) +2012-02-07 21:00:44 +0100 Mike Gabriel (54792fe29) * another fix for the main Makefile -2012-02-07 16:39:58 +0100 Mike Gabriel (7f7cb5d) +2012-02-07 16:39:58 +0100 Mike Gabriel (7f7cb5d87) * more simplification of the main Makefile -2012-02-07 16:19:36 +0100 Mike Gabriel (eb5ef91) +2012-02-07 16:19:36 +0100 Mike Gabriel (eb5ef91b6) * simplify main Makefile a little... -2012-02-07 16:10:34 +0100 Mike Gabriel (00b266b) +2012-02-07 16:10:34 +0100 Mike Gabriel (00b266b82) * Use ,,$(MAKE) -C'' in main Makefile for calling Makefiles in subdirectories, make build stanza work for nx-libs-full and nx-libs-lite. -2012-02-07 15:23:45 +0100 Mike Gabriel (f4ef296) +2012-02-07 15:23:45 +0100 Mike Gabriel (f4ef2967b) * Use ,,make -C'' in main Makefile for calling Makefiles in subdirectories. -2012-02-07 13:48:36 +0100 Mike Gabriel (a751baa) +2012-02-07 13:48:36 +0100 Mike Gabriel (a751baaab) * Continue development... -2012-02-07 13:44:21 +0100 Mike Gabriel (419d505) +2012-02-07 13:44:21 +0100 Mike Gabriel (419d505c9) * release 3.5.0.10 (tag: redist-server/3.5.0.10, tag: redist-client/3.5.0.10) -2012-02-07 13:37:16 +0100 Mike Gabriel (28acb2e) +2012-02-07 13:37:16 +0100 Mike Gabriel (28acb2ea1) * changelog fix (revision was missing) -2012-02-07 13:09:02 +0100 Mike Gabriel (2f8b190) +2012-02-07 13:09:02 +0100 Mike Gabriel (2f8b190c8) * Reintroduce patch: 008_nxcomp_sa_restorer.full+lite.patch, now in a version found on etersoft.ru, fixes build on ia64 architecture. -2012-02-06 12:15:13 +0100 Mike Gabriel (6ae5c16) +2012-02-06 12:15:13 +0100 Mike Gabriel (6ae5c16b8) * cleanup patch -2012-02-06 12:12:20 +0100 Mike Gabriel (e326dd7) +2012-02-06 12:12:20 +0100 Mike Gabriel (e326dd760) * Add patch: 006_nxcomp_libpng15.full+lite.patch, fix build against libpng 1.5.x. -2012-02-01 14:48:55 +0100 Mike Gabriel (dbbbbc5) +2012-02-01 14:48:55 +0100 Mike Gabriel (dbbbbc5ff) * Continue development... -2012-02-01 14:40:41 +0100 Mike Gabriel (220c985) +2012-02-01 14:40:41 +0100 Mike Gabriel (220c985d3) * release NX re-distributed 3.5.0.9 (tag: redist-server/3.5.0.9) -2012-02-01 14:38:14 +0100 Mike Gabriel (8ba08fa) +2012-02-01 14:38:14 +0100 Mike Gabriel (8ba08fa2e) * Providing pending patches in source tree. -2012-01-30 13:45:07 +0100 Oleksandr Shneyder (2d226a6) +2012-01-30 13:45:07 +0100 Oleksandr Shneyder (2d226a609) * Update patch: 202_nx-x11_enable-xinerama.full.patch, disable Xinerama extension if NX_XINERAMA_CONF not exists. -2012-01-30 13:18:30 +0100 Oleksandr Shneyder (3467d6b) +2012-01-30 13:18:30 +0100 Oleksandr Shneyder (3467d6b76) * Revert "Update patch: 202_nx-x11_enable-xinerama.full.patch disable Xinerama extension if NX_XINERAMA_CONF not exists" -2012-01-30 13:18:12 +0100 Oleksandr Shneyder (3c0e43a) +2012-01-30 13:18:12 +0100 Oleksandr Shneyder (3c0e43a41) * Revert "changelog cleanup: add interpunctation." -2012-01-30 13:12:26 +0100 Mike Gabriel (d4d85ca) +2012-01-30 13:12:26 +0100 Mike Gabriel (d4d85ca86) * changelog cleanup: add interpunctation. -2012-01-30 13:05:01 +0100 Oleksandr Shneyder (f17b598) +2012-01-30 13:05:01 +0100 Oleksandr Shneyder (f17b59824) * Update patch: 202_nx-x11_enable-xinerama.full.patch disable Xinerama extension if NX_XINERAMA_CONF not exists -2012-01-28 08:58:43 +0100 Reinhard Tartler (36ca664) +2012-01-28 08:58:43 +0100 Reinhard Tartler (36ca6646b) * fix typos in nxproxy manpage -2012-01-23 00:05:29 +0100 Mike Gabriel (1046233) +2012-01-23 00:05:29 +0100 Mike Gabriel (104623396) * version increment, continue development... -2012-01-22 23:42:43 +0100 Mike Gabriel (f4379f6) +2012-01-22 23:42:43 +0100 Mike Gabriel (f4379f608) * release NX re-distributed 3.5.0.8 (tag: redist-server/3.5.0.8) -2012-01-22 23:02:50 +0100 Mike Gabriel (cf5a598) +2012-01-22 23:02:50 +0100 Mike Gabriel (cf5a5980c) * Fix patch: 109_nxagent_locale-utf8-compound-text.patch, fix crashes reported from Stefan Baur. Thanks for reporting and testing!!! -2012-01-22 22:47:30 +0100 Mike Gabriel (5027f1e) +2012-01-22 22:47:30 +0100 Mike Gabriel (5027f1e8b) * Add folder /debian/patches-pending-evaluation with two newly discovered patches from git.etersoft.ru (AltLinux packaging repository for NX). -2012-01-18 20:09:39 +0100 Mike Gabriel (a05b560) +2012-01-18 20:09:39 +0100 Mike Gabriel (a05b56038) * Package x2goagent is an ,,all'' package, not ,,any''. -2012-01-16 22:57:29 +0100 Mike Gabriel (8b013ce) +2012-01-16 22:57:29 +0100 Mike Gabriel (8b013ce80) * Update patch: 001_add-main-makefile.full+lite.patch, only build, install, clean etc. NX subprojects if the folder exists. -2012-01-16 22:29:05 +0100 Mike Gabriel (e9241fe) +2012-01-16 22:29:05 +0100 Mike Gabriel (e9241fe8c) * Reorganize patch names, to reflect patch inclusion into lite+full or full-only ,,NX (redistributed)'' tarball. -2012-01-16 11:28:26 +0100 Mike Gabriel (d7ecf72) +2012-01-16 11:28:26 +0100 Mike Gabriel (d7ecf7214) * release NX re-distributed 3.5.0.7 (tag: redist-server/3.5.0.7) -2012-01-16 10:54:19 +0100 Mike Gabriel (1bd66f1) +2012-01-16 10:54:19 +0100 Mike Gabriel (1bd66f19c) * Drop patch: 011_nxcomp_sa-restorer.patch. -2012-01-13 13:22:13 +0100 Mike Gabriel (28b2a3a) +2012-01-13 13:22:13 +0100 Mike Gabriel (28b2a3a93) * release NX re-distributed 3.5.0.6 (tag: redist-server/3.5.0.6) -2012-01-13 13:09:43 +0100 Mike Gabriel (8d655bc) +2012-01-13 13:09:43 +0100 Mike Gabriel (8d655bc1a) * Install libXinerama into libnx-x11 package. Header files into libnx-x11-dev. -2012-01-13 12:45:15 +0100 Mike Gabriel (d086c36) +2012-01-13 12:45:15 +0100 Mike Gabriel (d086c3699) * fix for lintian-overrids (debian-revision-should-not-be-zero), package: libxcomp-dev -2012-01-13 11:34:21 +0100 Mike Gabriel (55ee602) +2012-01-13 11:34:21 +0100 Mike Gabriel (55ee602bb) * Silence lintian on debian-revision-should-not-be-zero. As this is no Debian packaging repository, but ,,NX (redistributed)'', we will always release with rev no. set to ,,0''. -2012-01-13 11:29:10 +0100 Mike Gabriel (e32a559) +2012-01-13 11:29:10 +0100 Mike Gabriel (e32a5590f) * Add patch header/copyright to: 202_nx-x11_enable-xinerama.patch. -2012-01-13 11:28:17 +0100 Mike Gabriel (2be056d) +2012-01-13 11:28:17 +0100 Mike Gabriel (2be056d38) * Fix lintian issue: missing-separator-between-items for x2goagent package. Drop dependency on libnx-x11 as we already depend on nxagent and fix description synopsis of x2goagent package. -2012-01-13 10:29:47 +0100 Mike Gabriel (fa996b5) +2012-01-13 10:29:47 +0100 Mike Gabriel (fa996b5bc) * Add patch: 202_nx-x11_enable-xinerama.patch. -2012-01-13 00:38:30 +0100 Mike Gabriel (fdf0d1c) +2012-01-13 00:38:30 +0100 Mike Gabriel (fdf0d1ccf) * release NX re-distributed 3.5.0.5 (tag: redist-server/3.5.0.5) -2012-01-13 00:36:28 +0100 Mike Gabriel (a295d73) +2012-01-13 00:36:28 +0100 Mike Gabriel (a295d73f6) * Fix wrapper script patches for nxagent, x2goagent, nxauth, nxproxy. -2012-01-12 23:05:32 +0100 Mike Gabriel (8199a5d) +2012-01-12 23:05:32 +0100 Mike Gabriel (8199a5d2a) * release NX re-distributed 3.5.0.4 (tag: redist-server/3.5.0.4) -2012-01-12 23:04:03 +0100 Mike Gabriel (96cd432) +2012-01-12 23:04:03 +0100 Mike Gabriel (96cd4325b) * Update/fix patch: 999_nxagent_unbrand-nxagent-brand-x2goagent.patch. -2012-01-12 13:09:00 +0100 Mike Gabriel (e40208d) +2012-01-12 13:09:00 +0100 Mike Gabriel (e40208d7c) * release NX re-distributed 3.5.0.3 (tag: redist-server/3.5.0.3) -2012-01-12 13:03:59 +0100 Mike Gabriel (86dc688) +2012-01-12 13:03:59 +0100 Mike Gabriel (86dc68806) * set version to 3.5.0.3-0 -2012-01-12 13:02:36 +0100 Mike Gabriel (1bbc9cc) +2012-01-12 13:02:36 +0100 Mike Gabriel (1bbc9cc9e) * changelog cleanup -2012-01-12 13:01:47 +0100 Mike Gabriel (496f31a) +2012-01-12 13:01:47 +0100 Mike Gabriel (496f31a51) * Fix RGB color pallette (gray X2GO logo to be more accurate) for agent splash screen. -2012-01-12 13:01:04 +0100 Mike Gabriel (df8dc83) +2012-01-12 13:01:04 +0100 Mike Gabriel (df8dc83d1) * two more patches belonging to last commit: 016a_debian_nx-X11_install-location.patch, 102a_debian_xserver-xext_set-securitypolicy-path.patch -2012-01-12 13:00:23 +0100 Mike Gabriel (760c5c0) +2012-01-12 13:00:23 +0100 Mike Gabriel (760c5c07c) * Provide patches that are tarball / distro aware. Either NX (redistributed) has been installed to /usr/local/lib/nx @@ -7826,45 +8069,45 @@ is installed to /usr/lib/nx. Other installation paths are currently not supported. -2012-01-12 12:15:14 +0100 Mike Gabriel (d6fee9a) +2012-01-12 12:15:14 +0100 Mike Gabriel (d6fee9a41) * Modify patch: 101_nxagent_set-rgb-path.patch, add path to RGB file if NX (redistributed) is installed via tarball under /usr/local. -2012-01-11 17:37:45 +0100 Mike Gabriel (8f76198) +2012-01-11 17:37:45 +0100 Mike Gabriel (8f76198c5) * Add binary package: x2goagent, includes man page patch: 209_x2goagent-add-man-page.patch -2012-01-11 17:34:18 +0100 Mike Gabriel (0d3a820) +2012-01-11 17:34:18 +0100 Mike Gabriel (0d3a820b3) * Revert "Drop patch: 101_nxagent_set-rgb-path.path, add patch: 202_nxagent_set-rgb-path-x2go-flavour-aware.patch." -2012-01-11 17:25:08 +0100 Mike Gabriel (d9d49b5) +2012-01-11 17:25:08 +0100 Mike Gabriel (d9d49b5d8) * Drop patch: 101_nxagent_set-rgb-path.path, add patch: 202_nxagent_set-rgb-path-x2go-flavour-aware.patch. -2012-01-11 17:03:23 +0100 Mike Gabriel (43de8b9) +2012-01-11 17:03:23 +0100 Mike Gabriel (43de8b972) * Add patch: 209_x2goagent-add-man-page.patch. -2012-01-11 16:41:26 +0100 Mike Gabriel (fdfed53) +2012-01-11 16:41:26 +0100 Mike Gabriel (fdfed536c) * Add patch: 023_add-x2goagent-wrapper.patch. -2012-01-11 16:38:36 +0100 Mike Gabriel (9d99eeb) +2012-01-11 16:38:36 +0100 Mike Gabriel (9d99eeb53) * remove copy+paste cruft from debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.patch -2012-01-11 16:38:10 +0100 Mike Gabriel (6ae3d7e) +2012-01-11 16:38:10 +0100 Mike Gabriel (6ae3d7efc) * add EOL at EOF -2012-01-11 16:17:51 +0100 Mike Gabriel (405bc8f) +2012-01-11 16:17:51 +0100 Mike Gabriel (405bc8f25) * Add X2Go agent / NX agent flavouring via patch system: - 200_nxagent_check-binary-x2go-flavour.patch - @@ -7872,42 +8115,42 @@ 300_nxagent_set-wm-class.patch - 999_nxagent_unbrand-nxagent-brand-x2goagent.patch -2012-01-11 16:15:38 +0100 Mike Gabriel (19f2487) +2012-01-11 16:15:38 +0100 Mike Gabriel (19f248733) * Drop NX agent unbrand patch from FreeNX. -2012-01-11 15:31:11 +0100 Mike Gabriel (3744795) +2012-01-11 15:31:11 +0100 Mike Gabriel (3744795d3) * Rename nxagent-unbrand patch, so that is the last patch to be applied (999_). -2012-01-10 14:39:07 +0100 Mike Gabriel (eaea40d) +2012-01-10 14:39:07 +0100 Mike Gabriel (eaea40dec) * release NX re-distributed 3.5.0.2 (tag: redist-server/3.5.0.2) -2012-01-10 14:37:25 +0100 Mike Gabriel (e669607) +2012-01-10 14:37:25 +0100 Mike Gabriel (e669607f9) * Update folder name where applied patches end up in the tarball release. -2012-01-10 14:34:27 +0100 Mike Gabriel (eac87da) +2012-01-10 14:34:27 +0100 Mike Gabriel (eac87da64) * Re-add binary wrapper scripts to the patch system as we want to provide them in the tarball. -2012-01-10 12:06:00 +0100 Mike Gabriel (c84ad97) +2012-01-10 12:06:00 +0100 Mike Gabriel (c84ad97a7) * release NX re-distributed 3.5.0.1 (tag: redist-server/3.5.0.1) -2012-01-10 12:05:44 +0100 Mike Gabriel (ca0994c) +2012-01-10 12:05:44 +0100 Mike Gabriel (ca0994c84) * Increment version to stay in sync with client-only branch. -2012-01-10 11:39:35 +0100 Mike Gabriel (d97802a) +2012-01-10 11:39:35 +0100 Mike Gabriel (d97802ad7) * release NX re-distributed 3.5.0.0 (tag: redist-server/3.5.0.0) -2012-01-10 11:14:36 +0100 Mike Gabriel (281b04f) +2012-01-10 11:14:36 +0100 Mike Gabriel (281b04f70) * Add patches: 009_add-nxagent-man-page.patch, 009_add-nxproxy-man-page.patch. Reintroduce man page @@ -7915,169 +8158,169 @@ their way into the NX-redistribution tarball created from this source project. -2012-01-10 10:50:01 +0100 Mike Gabriel (71cc495) +2012-01-10 10:50:01 +0100 Mike Gabriel (71cc495aa) * Fix dh_installman for nxproxy. -2012-01-10 10:12:50 +0100 Mike Gabriel (e685cc8) +2012-01-10 10:12:50 +0100 Mike Gabriel (e685cc890) * switch NX-redistribution version to 3.5.0.0 -2012-01-10 10:07:56 +0100 Mike Gabriel (736356e) +2012-01-10 10:07:56 +0100 Mike Gabriel (736356ea7) * Add patch: 000_add-NX-redistribution-README.patch. -2011-12-31 19:28:56 +0100 Mike Gabriel (c9c1f8b) +2011-12-31 19:28:56 +0100 Mike Gabriel (c9c1f8b91) * Remove branding from descriptions in control file. -2011-12-31 18:55:05 +0100 Mike Gabriel (c9bf030) +2011-12-31 18:55:05 +0100 Mike Gabriel (c9bf030aa) * Call dh_clean again. This got lost somewhere on the way. -2011-12-31 18:32:01 +0100 Mike Gabriel (e292f23) +2011-12-31 18:32:01 +0100 Mike Gabriel (e292f23ac) * forgot to add patch file: 005_nxcomp_gcc43.patch -2011-12-31 18:31:40 +0100 Mike Gabriel (91ae4d4) +2011-12-31 18:31:40 +0100 Mike Gabriel (91ae4d4e4) * Fix line hunks: 011_nxcomp_sa-restorer.patch. -2011-12-31 18:29:56 +0100 Mike Gabriel (b494b52) +2011-12-31 18:29:56 +0100 Mike Gabriel (b494b5287) * Revert "Fix linking of doc folders for nxcomp*-dev." -2011-12-31 17:12:52 +0100 Mike Gabriel (2fe05f6) +2011-12-31 17:12:52 +0100 Mike Gabriel (2fe05f6ad) * patches/series cleanup -2011-12-31 17:12:20 +0100 Mike Gabriel (6f30998) +2011-12-31 17:12:20 +0100 Mike Gabriel (6f30998ad) * Add/insert patch: 005_nxcomp_gcc43.patch. -2011-12-31 17:04:48 +0100 Mike Gabriel (448872e) +2011-12-31 17:04:48 +0100 Mike Gabriel (448872e70) * Add patch: 011_nxcomp_sa-restorer.patch. -2011-12-31 16:27:58 +0100 Mike Gabriel (82e5023) +2011-12-31 16:27:58 +0100 Mike Gabriel (82e5023ed) * Transfer patch: 009_nxproxy_add-man-page.patch into man page file in /debian/man. -2011-12-31 16:24:02 +0100 Mike Gabriel (608bbb6) +2011-12-31 16:24:02 +0100 Mike Gabriel (608bbb6d9) * Fix linking of doc folders for nxcomp*-dev. -2011-12-31 16:22:46 +0100 Mike Gabriel (eb069a4) +2011-12-31 16:22:46 +0100 Mike Gabriel (eb069a4e6) * grammar fix in pre-build-nx.sh -2011-12-31 03:18:07 +0100 Mike Gabriel (85e87ab) +2011-12-31 03:18:07 +0100 Mike Gabriel (85e87ab6c) * Add patch headers to all patch files, report most patches upstream. Waiting for feedback and quotable URLs from NoMachine. -2011-12-31 03:16:59 +0100 Mike Gabriel (24261f0) +2011-12-31 03:16:59 +0100 Mike Gabriel (24261f05e) * Remove patch: 104_nxagent_enable_debug.patch, as it breaks package build. -2011-12-31 02:57:25 +0100 Mike Gabriel (a24c4b2) +2011-12-31 02:57:25 +0100 Mike Gabriel (a24c4b2e7) * also forgotten: scripts for last two commits -2011-12-31 01:41:34 +0100 Mike Gabriel (0db1194) +2011-12-31 01:41:34 +0100 Mike Gabriel (0db119427) * changelog: forgot to ship with last commit -2011-12-31 01:39:39 +0100 Mike Gabriel (9237464) +2011-12-31 01:39:39 +0100 Mike Gabriel (92374647e) * * Remove patches and put as executable scripts into /debian/bin/ - 005_add-nxagent-wrapper.patch. - 008_add-nxproxy-wrapper.patch. - 011_add-nxauth-wrapper.patch. -2011-12-31 01:27:13 +0100 Mike Gabriel (383f8ee) +2011-12-31 01:27:13 +0100 Mike Gabriel (383f8eece) * Remove patch 006_remove-configure-files.patch. Implemented via /debian/rules. -2011-12-31 01:03:16 +0100 Mike Gabriel (faa3dee) +2011-12-31 01:03:16 +0100 Mike Gabriel (faa3dee7e) * Make package descriptions in /debian/control more explanatory. -2011-12-31 00:29:09 +0100 Mike Gabriel (a193a0a) +2011-12-31 00:29:09 +0100 Mike Gabriel (a193a0a0a) * Remove *-dbg packages from /debian/control file. -2011-12-31 00:26:16 +0100 Mike Gabriel (caa6dd5) +2011-12-31 00:26:16 +0100 Mike Gabriel (caa6dd5f1) * Add more upstream source information to README.source. -2011-12-30 23:46:45 +0100 Mike Gabriel (c2cdc1d) +2011-12-30 23:46:45 +0100 Mike Gabriel (c2cdc1da3) * Set homepage of NoMachine upstream site (using http://www.nomachine.com/sources.php). -2011-12-30 19:21:24 +0100 Mike Gabriel (7fabca5) +2011-12-30 19:21:24 +0100 Mike Gabriel (7fabca589) * Set homepage of X2Go upstream project (using http://wiki.x2go.org). Packaging Vcs has been relocated to Alioth. -2011-12-30 15:34:02 +0100 Mike Gabriel (f1c239c) +2011-12-30 15:34:02 +0100 Mike Gabriel (f1c239c07) * changelog fix for latest changelog line -2011-12-30 15:32:37 +0100 Mike Gabriel (e20dc39) +2011-12-30 15:32:37 +0100 Mike Gabriel (e20dc398f) * control file: fixing Breaks/Replaces statements -2011-12-30 15:29:39 +0100 Mike Gabriel (28a112c) +2011-12-30 15:29:39 +0100 Mike Gabriel (28a112c7a) * changelog fix: typo -2011-12-30 15:29:01 +0100 Mike Gabriel (74e810a) +2011-12-30 15:29:01 +0100 Mike Gabriel (74e810a31) * changelog fix: wrap long line -2011-12-30 15:28:23 +0100 Mike Gabriel (d6fa23c) +2011-12-30 15:28:23 +0100 Mike Gabriel (d6fa23c86) * Break/conflict with nxlibs and nxlibs-dev (packages provided by freenx-team on Launchpad). -2011-12-30 15:25:30 +0100 Mike Gabriel (290fded) +2011-12-30 15:25:30 +0100 Mike Gabriel (290fdeddf) * Make `breaks-without-version' lintian overrides needless. -2011-12-30 15:20:02 +0100 Mike Gabriel (f917768) +2011-12-30 15:20:02 +0100 Mike Gabriel (f9177685a) * changelog modification: use Debianic revision numbers -2011-12-30 15:16:59 +0100 Mike Gabriel (5287efc) +2011-12-30 15:16:59 +0100 Mike Gabriel (5287efc44) * X2Go Packaging Team becomes maintainer, Mike Gabriel + Reinhard Tartler become uploaders. -2011-12-29 21:38:51 +0100 Mike Gabriel (7d9e154) +2011-12-29 21:38:51 +0100 Mike Gabriel (7d9e1544f) * Fix LD_LIBRARY_PATH export in wrapper scripts/patches. -2011-12-29 16:33:57 +0100 Mike Gabriel (0e3b58b) +2011-12-29 16:33:57 +0100 Mike Gabriel (0e3b58b7f) * Add patch: 019_nx-x11_expat-build-against-system-libxmltok.patch, fixes lintian error: embedded-library: expat. Build-depend on libxmltok1-dev. -2011-12-29 16:28:19 +0100 Mike Gabriel (93b716f) +2011-12-29 16:28:19 +0100 Mike Gabriel (93b716f78) * Disable patch: 006_remove-configure-files.patch, remove configure files from within /debian/rules. -2011-12-29 14:45:18 +0100 Mike Gabriel (21a85ff) +2011-12-29 14:45:18 +0100 Mike Gabriel (21a85ffbe) * Make sure upstream changelog file names are in lower case. -2011-12-29 14:34:35 +0100 Mike Gabriel (5dea6a3) +2011-12-29 14:34:35 +0100 Mike Gabriel (5dea6a378) * * Override lintian warnings - libnx-x11: postinst-has-useless-call-to-ldconfig - libnx-x11: @@ -8086,92 +8329,92 @@ touch any directory controlled by /etc/ld.so.conf, amongst others see BTS issue #205142). -2011-12-29 13:51:47 +0100 Mike Gabriel (3b7914d) +2011-12-29 13:51:47 +0100 Mike Gabriel (3b7914dd7) * Add upstream CHANGELOG files to all .deb packages of this source package. -2011-12-29 13:50:34 +0100 Mike Gabriel (e1f46f9) +2011-12-29 13:50:34 +0100 Mike Gabriel (e1f46f911) * explicitly name all source version from upstream used for initial package release. -2011-12-29 13:27:14 +0100 Mike Gabriel (d57ff77) +2011-12-29 13:27:14 +0100 Mike Gabriel (d57ff7754) * Update patch: 017_nx-x11_update-autotools-helper-files.patch. Add lintian override to source.lintian-overrides: ancient-autotools-helper-file as we handle autotools helper file updates via patch system. -2011-12-29 13:22:26 +0100 Mike Gabriel (776fa97) +2011-12-29 13:22:26 +0100 Mike Gabriel (776fa97cb) * changelog fix: wrap long lines -2011-12-29 13:08:43 +0100 Mike Gabriel (fafea09) +2011-12-29 13:08:43 +0100 Mike Gabriel (fafea0918) * Add patch: 018_nx-x11_update-libtool-ltmain-script.patch. Silence lintian warning ancient-libtool via lintian override as we patch in a new version of ltmain.sh by this patch. -2011-12-29 13:06:55 +0100 Mike Gabriel (a8d1eab) +2011-12-29 13:06:55 +0100 Mike Gabriel (a8d1eab2c) * Add lintian-override: outdated-autotools-helper-file to source.lintian-overrides as we patch-update the outdated helper files before building binaries. -2011-12-29 12:29:24 +0100 Mike Gabriel (184c63e) +2011-12-29 12:29:24 +0100 Mike Gabriel (184c63e7b) * Add README.source file, fixes lintian warning: patch-system-but-no-source-readme. -2011-12-29 12:24:49 +0100 Mike Gabriel (b3eac91) +2011-12-29 12:24:49 +0100 Mike Gabriel (b3eac91c9) * Add patch: 017_nx-x11_update-autotools-helper-files.patch. -2011-12-29 12:17:22 +0100 Mike Gabriel (e68f15a) +2011-12-29 12:17:22 +0100 Mike Gabriel (e68f15a9d) * changelog fix: wrap long line -2011-12-29 11:59:40 +0100 Mike Gabriel (da0bfe6) +2011-12-29 11:59:40 +0100 Mike Gabriel (da0bfe6ea) * Disable patch: 104_nxagent_enable_debug.patch for now as it let's the build fail. -2011-12-29 11:54:02 +0100 Mike Gabriel (3d575c4) +2011-12-29 11:54:02 +0100 Mike Gabriel (3d575c45c) * add possible-new-upstream-release-without-new-version lintian override for *-dev packages, as well -2011-12-29 11:37:35 +0100 Mike Gabriel (b97f5a7) +2011-12-29 11:37:35 +0100 Mike Gabriel (b97f5a78b) * wrap long lines in /debian/changelog -2011-12-29 11:01:23 +0100 Mike Gabriel (dda2c7c) +2011-12-29 11:01:23 +0100 Mike Gabriel (dda2c7cd6) * Rename patch: 008_nxproxy_add-nx-proxy-wrapper.patch to 008_nxproxy_add-nxproxy-wrapper.patch. Add patch from FreeNX patchset: 110_nxagent_createpixmap-bounds-check.patch. -2011-12-29 10:44:39 +0100 Mike Gabriel (c93ae96) +2011-12-29 10:44:39 +0100 Mike Gabriel (c93ae9697) * Install nxagent.xpm icon to /usr/share/pixmaps. -2011-12-29 10:42:42 +0100 Mike Gabriel (43c04db) +2011-12-29 10:42:42 +0100 Mike Gabriel (43c04dbfd) * Rework FreeNX patches to be applicable to latest NX sources. -2011-12-29 10:25:45 +0100 Mike Gabriel (9f22660) +2011-12-29 10:25:45 +0100 Mike Gabriel (9f226601f) * Adapt path names in FreeNX patches to meet requirements for source tree of this package. -2011-12-29 10:03:08 +0100 Mike Gabriel (4cffd99) +2011-12-29 10:03:08 +0100 Mike Gabriel (4cffd99f2) * fix debian/patches/series file to reflect new patch naming scheme... -2011-12-29 09:57:30 +0100 Mike Gabriel (89fea92) +2011-12-29 09:57:30 +0100 Mike Gabriel (89fea9279) * Add FreeNX patches for nxagent (some with other names compared to FreeNX): - 101_nxagent_set-rgb-path.patch - @@ -8185,563 +8428,563 @@ 109_nxagent_locale-utf8-compound-text.patch - 200_nxagent_unbrand-agent.patch -2011-12-29 09:47:29 +0100 Mike Gabriel (dd287a5) +2011-12-29 09:47:29 +0100 Mike Gabriel (dd287a5c8) * Add man page for nxagent. Fix lintian warning: binary-without-manpage. -2011-12-29 09:42:45 +0100 Mike Gabriel (1f87c87) +2011-12-29 09:42:45 +0100 Mike Gabriel (1f87c87a1) * forgot to commit changelog for last two commits (adding of watch files, change of patch file naming scheme) -2011-12-28 23:18:58 +0100 Mike Gabriel (3c2fe1a) +2011-12-28 23:18:58 +0100 Mike Gabriel (3c2fe1ace) * Change naming scheme of patch files. -2011-12-28 23:15:54 +0100 Mike Gabriel (082c8ae) +2011-12-28 23:15:54 +0100 Mike Gabriel (082c8ae3a) * Add individual watch files for NX components in this source package. -2011-12-28 19:25:43 +0100 Mike Gabriel (13b60f7) +2011-12-28 19:25:43 +0100 Mike Gabriel (13b60f760) * Add lintian-overrides for every package. Override lintian warning: possible-new-upstream-release-without-new-version as there will be new upstream releases of NX subprojects that will not require a version increment of the Debian package. -2011-12-28 19:07:03 +0100 Mike Gabriel (c853e1e) +2011-12-28 19:07:03 +0100 Mike Gabriel (c853e1eb8) * changelog update: new upstream release of nxagent 3.5.0-7 -2011-12-28 18:48:50 +0100 Mike Gabriel (82ab807) +2011-12-28 18:48:50 +0100 Mike Gabriel (82ab807fd) * Merge branch 'nxagent' -2011-12-28 18:46:39 +0100 Mike Gabriel (c29053f) +2011-12-28 18:46:39 +0100 Mike Gabriel (c29053f82) * Imported nxagent-3.5.0-7.tar.gz (tag: nxagent/3.5.0-7) -2011-12-06 14:48:04 +0100 Mike Gabriel (aa16655) +2011-12-06 14:48:04 +0100 Mike Gabriel (aa1665506) * fix for patch 016_nx-x11-install.patch (2) -2011-12-06 14:44:40 +0100 Mike Gabriel (37c5f0e) +2011-12-06 14:44:40 +0100 Mike Gabriel (37c5f0ee8) * fix for patch 016_nx-x11-install.patch -2011-12-05 09:51:35 +0100 Mike Gabriel (3132e1d) +2011-12-05 09:51:35 +0100 Mike Gabriel (3132e1d02) * Add patch 016_nx-x11-install.patch, to allow installation of nx-X11 from Makefile (via make install). -2011-12-05 09:50:16 +0100 Mike Gabriel (4c66f3d) +2011-12-05 09:50:16 +0100 Mike Gabriel (4c66f3d5c) * forgot to add file (015_nxproxy-makefile-uninstall.patch) -2011-12-05 09:42:05 +0100 Mike Gabriel (a2d7774) +2011-12-05 09:42:05 +0100 Mike Gabriel (a2d77744d) * Add install/uninstall stanza to main Makefile (via patch 001_add-main-makefile.patch). -2011-12-05 09:39:08 +0100 Mike Gabriel (f4fac45) +2011-12-05 09:39:08 +0100 Mike Gabriel (f4fac4535) * Add patch: 015_nxproxy-makefile-uninstall.patch. -2011-12-05 09:35:03 +0100 Mike Gabriel (8eb3ea7) +2011-12-05 09:35:03 +0100 Mike Gabriel (8eb3ea78b) * Add patches: 012, 013, 014 - Makefile uninstall stanza patches for nxcomp, nxcompext, nxcompshad. -2011-12-02 11:54:03 +0100 Mike Gabriel (9852dfa) +2011-12-02 11:54:03 +0100 Mike Gabriel (9852dfad0) * fix EOF of pre-build-nx.sh script -2011-11-20 18:12:44 +0100 Mike Gabriel (23dcaef) +2011-11-20 18:12:44 +0100 Mike Gabriel (23dcaefb6) * missing control file changes to build nxauth -2011-11-20 18:07:06 +0100 Mike Gabriel (a690310) +2011-11-20 18:07:06 +0100 Mike Gabriel (a6903100a) * Add lintian overrides for libxcomp*: breaks-without-version. -2011-11-20 18:01:52 +0100 Mike Gabriel (7402df3) +2011-11-20 18:01:52 +0100 Mike Gabriel (7402df3ba) * fix ext. description of nxagent in control file -2011-11-20 17:06:41 +0100 Mike Gabriel (b555775) +2011-11-20 17:06:41 +0100 Mike Gabriel (b55577524) * fix patch 001 -2011-11-20 16:51:27 +0100 Mike Gabriel (5814d15) +2011-11-20 16:51:27 +0100 Mike Gabriel (5814d15bb) * Build nxauth package. -2011-11-20 16:46:36 +0100 Mike Gabriel (4fef9e4) +2011-11-20 16:46:36 +0100 Mike Gabriel (4fef9e4a4) * add forgotten patch files for patch 010 and 011 -2011-11-20 16:45:16 +0100 Mike Gabriel (7b5552f) +2011-11-20 16:45:16 +0100 Mike Gabriel (7b5552f70) * Add patch: 011_add-nxauth-wrapper.patch. -2011-11-20 16:42:28 +0100 Mike Gabriel (369972d) +2011-11-20 16:42:28 +0100 Mike Gabriel (369972db3) * Add patch: 010_nxauth-fix-binary-name-in-man-page.patch. -2011-11-20 16:18:39 +0100 Mike Gabriel (e6fa2ca) +2011-11-20 16:18:39 +0100 Mike Gabriel (e6fa2ca31) * Fix of nxproxy build in main Makefile (modifies 001_add-main-makefile.patch). -2011-11-20 16:15:36 +0100 Mike Gabriel (b3d3ea7) +2011-11-20 16:15:36 +0100 Mike Gabriel (b3d3ea7d8) * main Makefile does not need x-bits set -2011-11-20 15:51:32 +0100 Mike Gabriel (379f32a) +2011-11-20 15:51:32 +0100 Mike Gabriel (379f32a5e) * Add nxproxy man page to nxproxy package. -2011-11-20 15:50:20 +0100 Mike Gabriel (5336186) +2011-11-20 15:50:20 +0100 Mike Gabriel (5336186cf) * Add patch: 009_nxproxy-add-man-page.patch. -2011-11-20 15:41:55 +0100 Mike Gabriel (ed08056) +2011-11-20 15:41:55 +0100 Mike Gabriel (ed08056fd) * fix permission of nxproxy wrapper -2011-11-20 15:40:39 +0100 Mike Gabriel (a84dd07) +2011-11-20 15:40:39 +0100 Mike Gabriel (a84dd07bb) * rename 005_add-nxagent-wrapper.patch -2011-11-20 15:39:31 +0100 Mike Gabriel (5ea24ed) +2011-11-20 15:39:31 +0100 Mike Gabriel (5ea24ed1e) * Add patch: 008_add-nxproxy-wrapper.patch. Build nxproxy package. -2011-11-20 15:36:37 +0100 Mike Gabriel (867c3b9) +2011-11-20 15:36:37 +0100 Mike Gabriel (867c3b978) * Add autoconf as build dependency. -2011-11-20 15:27:49 +0100 Mike Gabriel (63bdc1f) +2011-11-20 15:27:49 +0100 Mike Gabriel (63bdc1f87) * Remove unknown option --with from dh_auto_clean. -2011-11-20 15:26:17 +0100 Mike Gabriel (c0fb3c3) +2011-11-20 15:26:17 +0100 Mike Gabriel (c0fb3c34b) * remove build cruft from nxproxy, adapt patch set 006 -2011-11-20 15:03:19 +0100 Mike Gabriel (41c5c25) +2011-11-20 15:03:19 +0100 Mike Gabriel (41c5c2537) * fix distclean for patch 001_add-main-makefile.patch -2011-11-20 14:56:16 +0100 Mike Gabriel (b026a80) +2011-11-20 14:56:16 +0100 Mike Gabriel (b026a8005) * Add patch: 007_nxcompshad-clean-gch-files.patch. -2011-11-20 14:49:53 +0100 Mike Gabriel (d93577c) +2011-11-20 14:49:53 +0100 Mike Gabriel (d93577c58) * Add patch: 006_remove-configure-files.patch. -2011-11-20 14:43:34 +0100 Mike Gabriel (5489d46) +2011-11-20 14:43:34 +0100 Mike Gabriel (5489d4648) * Disable build of *-dbg packages. -2011-11-19 18:15:36 +0100 Mike Gabriel (70ccae4) +2011-11-19 18:15:36 +0100 Mike Gabriel (70ccae44a) * Fix for lintian issue: extended-description-line-too-long (nxagent). -2011-11-19 18:09:05 +0100 Mike Gabriel (3add2cb) +2011-11-19 18:09:05 +0100 Mike Gabriel (3add2cba4) * Fix for lintian issue: missing-build-dependency quilt (>= 0.46-7~). -2011-11-19 17:54:22 +0100 Mike Gabriel (687e07b) +2011-11-19 17:54:22 +0100 Mike Gabriel (687e07b0c) * chown has to be chmod... stupid error... -2011-11-19 17:50:14 +0100 Mike Gabriel (7fb19af) +2011-11-19 17:50:14 +0100 Mike Gabriel (7fb19af29) * add chown a+x for nxagent wrapper script -2011-11-19 17:49:48 +0100 Mike Gabriel (9da5689) +2011-11-19 17:49:48 +0100 Mike Gabriel (9da568986) * add newline at EOF -2011-11-19 17:44:07 +0100 Mike Gabriel (5a7e3cc) +2011-11-19 17:44:07 +0100 Mike Gabriel (5a7e3cc13) * Add patch: 005_add_nxagent_wrapper.patch. -2011-11-19 17:40:48 +0100 Mike Gabriel (e603345) +2011-11-19 17:40:48 +0100 Mike Gabriel (e60334546) * changelog maintenance -2011-11-19 17:40:33 +0100 Mike Gabriel (1234d1b) +2011-11-19 17:40:33 +0100 Mike Gabriel (1234d1b89) * Add patch: 004_nx-x11-fix-nxcompshad-build.patch. -2011-11-19 17:36:45 +0100 Mike Gabriel (85be77c) +2011-11-19 17:36:45 +0100 Mike Gabriel (85be77cb3) * Add patch: 003_nxcompshad-gcc43.patch -2011-11-19 17:30:04 +0100 Mike Gabriel (f7e6c45) +2011-11-19 17:30:04 +0100 Mike Gabriel (f7e6c45a5) * Add patch: 002_nxcompshad-build-against-nx-x11-only.patch -2011-11-19 17:08:40 +0100 Mike Gabriel (954557e) +2011-11-19 17:08:40 +0100 Mike Gabriel (954557e90) * Add main Makefile via patch: 001_add-main-makefile.patch. -2011-11-19 16:43:25 +0100 Mike Gabriel (4076b41) +2011-11-19 16:43:25 +0100 Mike Gabriel (4076b4132) * Add quilt as build dependency. -2011-11-19 16:10:28 +0100 Mike Gabriel (d031104) +2011-11-19 16:10:28 +0100 Mike Gabriel (d03110473) * add /debian folder -2011-11-19 15:59:43 +0100 Mike Gabriel (65f882e) +2011-11-19 15:59:43 +0100 Mike Gabriel (65f882e05) * Merge branch 'nxproxy' -2011-11-19 15:59:38 +0100 Mike Gabriel (9bfca1c) +2011-11-19 15:59:38 +0100 Mike Gabriel (9bfca1c2d) * Merge branch 'nxcompshad' -2011-11-19 15:59:26 +0100 Mike Gabriel (5e502cb) +2011-11-19 15:59:26 +0100 Mike Gabriel (5e502cbb1) * Merge branch 'nxcompext' -2011-11-19 15:59:16 +0100 Mike Gabriel (a48361b) +2011-11-19 15:59:16 +0100 Mike Gabriel (a48361b11) * Merge branch 'nxcomp' -2011-11-13 09:53:38 +0100 Reinhard Tartler (6dc46fa) +2011-11-13 09:53:38 +0100 Reinhard Tartler (6dc46faed) * Imported nxproxy-3.5.0-1.tar.gz (tag: nxproxy/3.5.0-1, origin/nxproxy, gh-sunweaver/nxproxy) -2011-11-13 09:53:38 +0100 Reinhard Tartler (d83d9f6) +2011-11-13 09:53:38 +0100 Reinhard Tartler (d83d9f6be) * Imported nxproxy-3.4.0-2.tar.gz (tag: nxproxy/3.4.0-2) -2011-11-13 09:53:38 +0100 Reinhard Tartler (7b07a64) +2011-11-13 09:53:38 +0100 Reinhard Tartler (7b07a64ea) * Imported nxproxy-3.3.0-2.tar.gz (tag: nxproxy/3.3.0-2) -2011-11-13 09:53:38 +0100 Reinhard Tartler (131e675) +2011-11-13 09:53:38 +0100 Reinhard Tartler (131e675bd) * Imported nxproxy-3.2.0-1.tar.gz (tag: nxproxy/3.2.0-1) -2011-11-13 09:53:38 +0100 Reinhard Tartler (d588e1f) +2011-11-13 09:53:38 +0100 Reinhard Tartler (d588e1f09) * Imported nxproxy-3.1.0-2.tar.gz (tag: nxproxy/3.1.0-2) -2011-11-13 09:53:38 +0100 Reinhard Tartler (35472e3) +2011-11-13 09:53:38 +0100 Reinhard Tartler (35472e348) * Imported nxproxy-3.0.0-4.tar.gz (tag: nxproxy/3.0.0-4) -2011-11-13 09:53:12 +0100 Reinhard Tartler (bf85c6e) +2011-11-13 09:53:12 +0100 Reinhard Tartler (bf85c6e69) * Imported nxcompshad-3.5.0-2.tar.gz (tag: nxcompshad/3.5.0-2, origin/nxcompshad, gh-sunweaver/nxcompshad) -2011-11-13 09:53:12 +0100 Reinhard Tartler (c70adf7) +2011-11-13 09:53:12 +0100 Reinhard Tartler (c70adf725) * Imported nxcompshad-3.4.0-3.tar.gz (tag: nxcompshad/3.4.0-3) -2011-11-13 09:53:12 +0100 Reinhard Tartler (2208f4f) +2011-11-13 09:53:12 +0100 Reinhard Tartler (2208f4f9e) * Imported nxcompshad-3.4.0-1.tar.gz (tag: nxcompshad/3.4.0-1) -2011-11-13 09:53:12 +0100 Reinhard Tartler (3d8e85c) +2011-11-13 09:53:12 +0100 Reinhard Tartler (3d8e85c47) * Imported nxcompshad-3.3.0-3.tar.gz (tag: nxcompshad/3.3.0-3) -2011-11-13 09:53:12 +0100 Reinhard Tartler (3b44046) +2011-11-13 09:53:12 +0100 Reinhard Tartler (3b4404668) * Imported nxcompshad-3.3.0-2.tar.gz (tag: nxcompshad/3.3.0-2) -2011-11-13 09:53:12 +0100 Reinhard Tartler (9f70213) +2011-11-13 09:53:12 +0100 Reinhard Tartler (9f7021392) * Imported nxcompshad-3.2.0-3.tar.gz (tag: nxcompshad/3.2.0-3) -2011-11-13 09:53:12 +0100 Reinhard Tartler (c7dc0c3) +2011-11-13 09:53:12 +0100 Reinhard Tartler (c7dc0c3cd) * Imported nxcompshad-3.2.0-1.tar.gz (tag: nxcompshad/3.2.0-1) -2011-11-13 09:53:12 +0100 Reinhard Tartler (8fa612d) +2011-11-13 09:53:12 +0100 Reinhard Tartler (8fa612d1a) * Imported nxcompshad-3.1.0-2.tar.gz (tag: nxcompshad/3.1.0-2) -2011-11-13 09:52:38 +0100 Reinhard Tartler (88dace9) +2011-11-13 09:52:38 +0100 Reinhard Tartler (88dace9a9) * Imported nxcompext-3.5.0-1.tar.gz (tag: nxcompext/3.5.0-1, origin/nxcompext, gh-sunweaver/nxcompext) -2011-11-13 09:52:38 +0100 Reinhard Tartler (9573b56) +2011-11-13 09:52:38 +0100 Reinhard Tartler (9573b5669) * Imported nxcompext-3.4.0-1.tar.gz (tag: nxcompext/3.4.0-1) -2011-11-13 09:52:38 +0100 Reinhard Tartler (9ea0691) +2011-11-13 09:52:38 +0100 Reinhard Tartler (9ea069139) * Imported nxcompext-3.3.0-4.tar.gz (tag: nxcompext/3.3.0-4) -2011-11-13 09:52:38 +0100 Reinhard Tartler (f2f6dab) +2011-11-13 09:52:38 +0100 Reinhard Tartler (f2f6dab87) * Imported nxcompext-3.3.0-3.tar.gz (tag: nxcompext/3.3.0-3) -2011-11-13 09:52:37 +0100 Reinhard Tartler (abf03fd) +2011-11-13 09:52:37 +0100 Reinhard Tartler (abf03fd2c) * Imported nxcompext-3.3.0-2.tar.gz (tag: nxcompext/3.3.0-2) -2011-11-13 09:52:37 +0100 Reinhard Tartler (4ad13f4) +2011-11-13 09:52:37 +0100 Reinhard Tartler (4ad13f4ef) * Imported nxcompext-3.2.0-1.tar.gz (tag: nxcompext/3.2.0-1) -2011-11-13 09:52:37 +0100 Reinhard Tartler (42e72ef) +2011-11-13 09:52:37 +0100 Reinhard Tartler (42e72ef5f) * Imported nxcompext-3.1.0-2.tar.gz (tag: nxcompext/3.1.0-2) -2011-11-13 09:27:53 +0100 Reinhard Tartler (232dfc4) +2011-11-13 09:27:53 +0100 Reinhard Tartler (232dfc41d) * Imported nxcomp-3.5.0-2.tar.gz (tag: nxcomp/3.5.0-2, origin/nxcomp, gh-sunweaver/nxcomp) -2011-11-13 09:27:53 +0100 Reinhard Tartler (233de71) +2011-11-13 09:27:53 +0100 Reinhard Tartler (233de71fc) * Imported nxcomp-3.5.0-1.tar.gz (tag: nxcomp/3.5.0-1) -2011-11-13 09:27:53 +0100 Reinhard Tartler (7c9e193) +2011-11-13 09:27:53 +0100 Reinhard Tartler (7c9e193ae) * Imported nxcomp-3.4.0-7.tar.gz (tag: nxcomp/3.4.0-7) -2011-11-13 09:27:53 +0100 Reinhard Tartler (4779616) +2011-11-13 09:27:53 +0100 Reinhard Tartler (477961678) * Imported nxcomp-3.4.0-6.tar.gz (tag: nxcomp/3.4.0-6) -2011-11-13 09:27:52 +0100 Reinhard Tartler (799bf67) +2011-11-13 09:27:52 +0100 Reinhard Tartler (799bf672a) * Imported nxcomp-3.4.0-1.tar.gz (tag: nxcomp/3.4.0-1) -2011-11-13 09:27:52 +0100 Reinhard Tartler (ca416e7) +2011-11-13 09:27:52 +0100 Reinhard Tartler (ca416e797) * Imported nxcomp-3.3.0-4.tar.gz (tag: nxcomp/3.3.0-4) -2011-11-13 09:27:52 +0100 Reinhard Tartler (95ce6b7) +2011-11-13 09:27:52 +0100 Reinhard Tartler (95ce6b74b) * Imported nxcomp-3.3.0-3.tar.gz (tag: nxcomp/3.3.0-3) -2011-11-13 09:27:52 +0100 Reinhard Tartler (920705c) +2011-11-13 09:27:52 +0100 Reinhard Tartler (920705cf7) * Imported nxcomp-3.2.0-7.tar.gz (tag: nxcomp/3.2.0-7) -2011-11-13 09:27:52 +0100 Reinhard Tartler (92239da) +2011-11-13 09:27:52 +0100 Reinhard Tartler (92239dafb) * Imported nxcomp-3.2.0-6.tar.gz (tag: nxcomp/3.2.0-6) -2011-11-13 09:27:52 +0100 Reinhard Tartler (d7a8d67) +2011-11-13 09:27:52 +0100 Reinhard Tartler (d7a8d67d7) * Imported nxcomp-3.1.0-6.tar.gz (tag: nxcomp/3.1.0-6) -2011-11-13 09:27:51 +0100 Reinhard Tartler (3e92412) +2011-11-13 09:27:51 +0100 Reinhard Tartler (3e924126b) * Imported nxcomp-3.1.0-4.tar.gz (tag: nxcomp/3.1.0-4) -2011-10-10 18:03:17 +0200 Reinhard Tartler (9997e13) +2011-10-10 18:03:17 +0200 Reinhard Tartler (9997e13bb) * Merge branch 'nx-X11' -2011-10-10 18:02:52 +0200 Reinhard Tartler (5b4ca0f) +2011-10-10 18:02:52 +0200 Reinhard Tartler (5b4ca0f93) * Merge branch 'nxagent' -2011-10-10 18:02:41 +0200 Reinhard Tartler (e29a112) +2011-10-10 18:02:41 +0200 Reinhard Tartler (e29a11209) * Merge branch 'nxauth' -2011-10-10 17:59:01 +0200 Reinhard Tartler (e01b917) +2011-10-10 17:59:01 +0200 Reinhard Tartler (e01b9177b) * Imported nxagent-3.5.0-5.tar.gz (tag: nxagent/3.5.0-5) -2011-10-10 17:59:00 +0200 Reinhard Tartler (39b738a) +2011-10-10 17:59:00 +0200 Reinhard Tartler (39b738a67) * Imported nxagent-3.5.0-2.tar.gz (tag: nxagent/3.5.0-2) -2011-10-10 17:59:00 +0200 Reinhard Tartler (e6db7e9) +2011-10-10 17:59:00 +0200 Reinhard Tartler (e6db7e936) * Imported nxagent-3.4.0-9.tar.gz (tag: nxagent/3.4.0-9) -2011-10-10 17:58:59 +0200 Reinhard Tartler (b7494f0) +2011-10-10 17:58:59 +0200 Reinhard Tartler (b7494f082) * Imported nxagent-3.4.0-8.tar.gz (tag: nxagent/3.4.0-8) -2011-10-10 17:58:59 +0200 Reinhard Tartler (c078024) +2011-10-10 17:58:59 +0200 Reinhard Tartler (c07802401) * Imported nxagent-3.4.0-5.tar.gz (tag: nxagent/3.4.0-5) -2011-10-10 17:58:58 +0200 Reinhard Tartler (d30ef03) +2011-10-10 17:58:58 +0200 Reinhard Tartler (d30ef0340) * Imported nxagent-3.4.0-3.tar.gz (tag: nxagent/3.4.0-3) -2011-10-10 17:58:57 +0200 Reinhard Tartler (25af86c) +2011-10-10 17:58:57 +0200 Reinhard Tartler (25af86cd3) * Imported nxagent-3.4.0-16.tar.gz (tag: nxagent/3.4.0-16) -2011-10-10 17:58:57 +0200 Reinhard Tartler (e9132da) +2011-10-10 17:58:57 +0200 Reinhard Tartler (e9132da09) * Imported nxagent-3.4.0-11.tar.gz (tag: nxagent/3.4.0-11) -2011-10-10 17:58:56 +0200 Reinhard Tartler (6f5e20b) +2011-10-10 17:58:56 +0200 Reinhard Tartler (6f5e20bc4) * Imported nxagent-3.3.0-9.tar.gz (tag: nxagent/3.3.0-9) -2011-10-10 17:58:56 +0200 Reinhard Tartler (45b970f) +2011-10-10 17:58:56 +0200 Reinhard Tartler (45b970f25) * Imported nxagent-3.3.0-6.tar.gz (tag: nxagent/3.3.0-6) -2011-10-10 17:58:56 +0200 Reinhard Tartler (2291444) +2011-10-10 17:58:56 +0200 Reinhard Tartler (229144470) * Imported nxagent-3.3.0-18.tar.gz (tag: nxagent/3.3.0-18) -2011-10-10 17:58:56 +0200 Reinhard Tartler (fc05e5e) +2011-10-10 17:58:56 +0200 Reinhard Tartler (fc05e5e04) * Imported nxagent-3.3.0-13.tar.gz (tag: nxagent/3.3.0-13) -2011-10-10 17:58:55 +0200 Reinhard Tartler (1a74e03) +2011-10-10 17:58:55 +0200 Reinhard Tartler (1a74e0323) * Imported nxagent-3.3.0-10.tar.gz (tag: nxagent/3.3.0-10) -2011-10-10 17:58:55 +0200 Reinhard Tartler (97fe765) +2011-10-10 17:58:55 +0200 Reinhard Tartler (97fe7650e) * Imported nxagent-3.2.0-8.tar.gz (tag: nxagent/3.2.0-8) -2011-10-10 17:58:55 +0200 Reinhard Tartler (c4e7705) +2011-10-10 17:58:55 +0200 Reinhard Tartler (c4e7705d2) * Imported nxagent-3.2.0-7.tar.gz (tag: nxagent/3.2.0-7) -2011-10-10 17:58:55 +0200 Reinhard Tartler (c998323) +2011-10-10 17:58:55 +0200 Reinhard Tartler (c9983230f) * Imported nxagent-3.2.0-6.tar.gz (tag: nxagent/3.2.0-6) -2011-10-10 17:58:55 +0200 Reinhard Tartler (b791640) +2011-10-10 17:58:55 +0200 Reinhard Tartler (b79164001) * Imported nxagent-3.2.0-5.tar.gz (tag: nxagent/3.2.0-5) -2011-10-10 17:58:31 +0200 Reinhard Tartler (1c25e92) +2011-10-10 17:58:31 +0200 Reinhard Tartler (1c25e92b9) * Imported nxagent-3.2.0-10.tar.gz (tag: nxagent/3.2.0-10) -2011-10-10 17:58:31 +0200 Reinhard Tartler (266b555) +2011-10-10 17:58:31 +0200 Reinhard Tartler (266b55549) * Imported nxagent-3.1.0-7.tar.gz (tag: nxagent/3.1.0-7) -2011-10-10 17:58:31 +0200 Reinhard Tartler (3e7c669) +2011-10-10 17:58:31 +0200 Reinhard Tartler (3e7c6697a) * Imported nxagent-3.1.0-6.tar.gz (tag: nxagent/3.1.0-6) -2011-10-10 17:58:30 +0200 Reinhard Tartler (9e33710) +2011-10-10 17:58:30 +0200 Reinhard Tartler (9e3371021) * Imported nxagent-3.1.0-2.tar.gz (tag: nxagent/3.1.0-2) -2011-10-10 17:57:25 +0200 Reinhard Tartler (edddbe8) +2011-10-10 17:57:25 +0200 Reinhard Tartler (edddbe876) * creating nxagent -2011-10-10 17:51:57 +0200 Reinhard Tartler (caf1bc4) +2011-10-10 17:51:57 +0200 Reinhard Tartler (caf1bc41f) * Imported nxauth-3.5.0-1.tar.gz (tag: nxauth/3.5.0-1) -2011-10-10 17:51:57 +0200 Reinhard Tartler (fea16d7) +2011-10-10 17:51:57 +0200 Reinhard Tartler (fea16d7bb) * Imported nxauth-3.4.0-3.tar.gz (tag: nxauth/3.4.0-3) -2011-10-10 17:51:57 +0200 Reinhard Tartler (d90fd5d) +2011-10-10 17:51:57 +0200 Reinhard Tartler (d90fd5d13) * Imported nxauth-3.4.0-2.tar.gz (tag: nxauth/3.4.0-2) -2011-10-10 17:51:57 +0200 Reinhard Tartler (7881dac) +2011-10-10 17:51:57 +0200 Reinhard Tartler (7881dac52) * Imported nxauth-3.4.0-1.tar.gz (tag: nxauth/3.4.0-1) -2011-10-10 17:51:57 +0200 Reinhard Tartler (c76c078) +2011-10-10 17:51:57 +0200 Reinhard Tartler (c76c07835) * Imported nxauth-3.3.0-1.tar.gz (tag: nxauth/3.3.0-1) -2011-10-10 17:51:57 +0200 Reinhard Tartler (76b9f2d) +2011-10-10 17:51:57 +0200 Reinhard Tartler (76b9f2d91) * Imported nxauth-3.2.0-1.tar.gz (tag: nxauth/3.2.0-1) -2011-10-10 17:51:57 +0200 Reinhard Tartler (9610c1e) +2011-10-10 17:51:57 +0200 Reinhard Tartler (9610c1e72) * Imported nxauth-3.1.0-1.tar.gz (tag: nxauth/3.1.0-1) -2011-10-10 17:47:59 +0200 Reinhard Tartler (15cee47) +2011-10-10 17:47:59 +0200 Reinhard Tartler (15cee47a4) * Imported nx-X11-3.5.0-2.tar.gz (tag: nx-X11/3.5.0-2, origin/nx-X11, gh-sunweaver/nx-X11) -2011-10-10 17:47:52 +0200 Reinhard Tartler (964f539) +2011-10-10 17:47:52 +0200 Reinhard Tartler (964f53964) * Imported nx-X11-3.5.0-1.tar.gz (tag: nx-X11/3.5.0-1) -2011-10-10 17:47:50 +0200 Reinhard Tartler (17bae6b) +2011-10-10 17:47:50 +0200 Reinhard Tartler (17bae6bff) * Imported nx-X11-3.4.0-4.tar.gz (tag: nx-X11/3.4.0-4) -2011-10-10 17:47:47 +0200 Reinhard Tartler (4fceb19) +2011-10-10 17:47:47 +0200 Reinhard Tartler (4fceb197e) * Imported nx-X11-3.4.0-3.tar.gz (tag: nx-X11/3.4.0-3) -2011-10-10 17:47:45 +0200 Reinhard Tartler (3daf6d4) +2011-10-10 17:47:45 +0200 Reinhard Tartler (3daf6d446) * Imported nx-X11-3.4.0-1.tar.gz (tag: nx-X11/3.4.0-1) -2011-10-10 17:47:42 +0200 Reinhard Tartler (5036ffb) +2011-10-10 17:47:42 +0200 Reinhard Tartler (5036ffbe6) * Imported nx-X11-3.3.0-7.tar.gz (tag: nx-X11/3.3.0-7) -2011-10-10 17:47:40 +0200 Reinhard Tartler (bd433c6) +2011-10-10 17:47:40 +0200 Reinhard Tartler (bd433c648) * Imported nx-X11-3.3.0-6.tar.gz (tag: nx-X11/3.3.0-6) -2011-10-10 17:47:37 +0200 Reinhard Tartler (55a9311) +2011-10-10 17:47:37 +0200 Reinhard Tartler (55a9311fb) * Imported nx-X11-3.3.0-5.tar.gz (tag: nx-X11/3.3.0-5) -2011-10-10 17:47:35 +0200 Reinhard Tartler (aefdef6) +2011-10-10 17:47:35 +0200 Reinhard Tartler (aefdef62f) * Imported nx-X11-3.3.0-4.tar.gz (tag: nx-X11/3.3.0-4) -2011-10-10 17:47:32 +0200 Reinhard Tartler (01ed757) +2011-10-10 17:47:32 +0200 Reinhard Tartler (01ed75712) * Imported nx-X11-3.3.0-3.tar.gz (tag: nx-X11/3.3.0-3) -2011-10-10 17:47:30 +0200 Reinhard Tartler (30463b0) +2011-10-10 17:47:30 +0200 Reinhard Tartler (30463b084) * Imported nx-X11-3.2.0-2.tar.gz (tag: nx-X11/3.2.0-2) -2011-10-10 17:47:28 +0200 Reinhard Tartler (713da22) +2011-10-10 17:47:28 +0200 Reinhard Tartler (713da2260) * Imported nx-X11-3.2.0-1.tar.gz (tag: nx-X11/3.2.0-1) -2011-10-10 17:46:43 +0200 Reinhard Tartler (3d1c57d) +2011-10-10 17:46:43 +0200 Reinhard Tartler (3d1c57d5e) * Imported nx-X11-3.1.0-4.tar.gz (tag: nx-X11/3.1.0-4) -2011-10-10 17:46:25 +0200 Reinhard Tartler (844a409) +2011-10-10 17:46:25 +0200 Reinhard Tartler (844a4094f) * Imported nx-X11-3.1.0-3.tar.gz (tag: nx-X11/3.1.0-3) -2011-10-10 17:43:39 +0200 Reinhard Tartler (f4092ab) +2011-10-10 17:43:39 +0200 Reinhard Tartler (f4092abdf) * Imported nx-X11-3.1.0-1.tar.gz (tag: nx-X11/3.1.0-1) -2011-10-10 17:22:20 +0200 Reinhard Tartler (e5c70da) +2011-10-10 17:22:20 +0200 Reinhard Tartler (e5c70dac0) * creating nxauth -2011-10-10 15:28:54 +0200 Reinhard Tartler (a840692) +2011-10-10 15:28:54 +0200 Reinhard Tartler (a840692ed) * creating nx-X11 diff --git a/VERSION b/VERSION index 3c2645490..f1a1688ce 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.5.99.3 +3.5.99.4 diff --git a/debian/changelog b/debian/changelog index 4223ebb3d..9e2dd7ae8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nx-libs (2:3.5.99.4-0.1) unstable; urgency=medium + + * Upstream-provided Debian package for nx-libs. + See upstream ChangeLog for recent changes. + + -- Mike Gabriel Fri, 24 Feb 2017 22:19:27 +0000 + nx-libs (2:3.5.99.3-0.1) unstable; urgency=medium * Upstream-provided Debian package for nx-libs. diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index 769367c54..af5fc88f8 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -24,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .ds q \N'34' -.TH NXAGENT 1 3.6.x +.TH nxagent 1 "Feb 2017" "Version 3.6.x" "NX Agent (Xserver)" .SH NAME nxagent \- nx-X11 Agent (nested Xserver optimized for remote computing) .SH SYNOPSIS diff --git a/nx-libs.spec b/nx-libs.spec index 4779885da..2e3d08466 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: nx-libs -Version: 3.5.99.3 +Version: 3.5.99.4 Release: 0.0build1%{?dist} Summary: NX X11 protocol compression libraries diff --git a/nxproxy/man/nxproxy.1 b/nxproxy/man/nxproxy.1 index 3cf95c992..dd14afa12 100644 --- a/nxproxy/man/nxproxy.1 +++ b/nxproxy/man/nxproxy.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH nxproxy 1 "June 2016" "Version 3.6.x" "NX Proxy" +.TH nxproxy 1 "Feb 2017" "Version 3.6.x" "NX Proxy" .SH NAME nxproxy \- NX Proxy Tool .SH SYNOPSIS -- cgit v1.2.3 From 7e99ae37541b48b61fe81230c5920b1a355cf67f Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 6 Feb 2017 15:19:47 +0100 Subject: Xserver/os/oscolor.c: Follow X.org in dropping the rgb.txt file entirely. Content of that file is now hard-coded. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adopting an exact copy of os/oscolor.c from X.org leads to this compiler warning: ``` oscolor.c:844:1: warning: string length ‘7614’ is greater than the length ‘4095’ ISO C99 compilers are required to support [-Woverlength-strings] }; ^ ``` This will be address later in coordination with X.org. Note: there is a tiny change in oscolor.c as we ship it. The original X.org file includes which seems unneeded. We drop that one line from oscolor.c. Fixes ArcticaProject/nx-libs#259. --- Makefile | 2 - etc/rgb | 754 ----------- nx-X11/config/cf/Imake.tmpl | 13 - nx-X11/config/cf/README | 4 - nx-X11/config/cf/X11.tmpl | 6 - nx-X11/config/cf/host.def | 1 - nx-X11/config/cf/xorg.cf | 4 - nx-X11/programs/Xserver/Imakefile | 5 +- nx-X11/programs/Xserver/dix/Imakefile | 8 +- nx-X11/programs/Xserver/dix/globals.c | 1 - nx-X11/programs/Xserver/include/globals.h | 1 - nx-X11/programs/Xserver/include/os.h | 1 - nx-X11/programs/Xserver/include/site.h | 12 +- nx-X11/programs/Xserver/os/Imakefile | 12 +- nx-X11/programs/Xserver/os/oscolor.c | 2037 +++++++++++++++++++++++------ nx-X11/programs/Xserver/os/osinit.c | 3 - nx-X11/programs/Xserver/os/utils.c | 8 - 17 files changed, 1617 insertions(+), 1255 deletions(-) delete mode 100644 etc/rgb diff --git a/Makefile b/Makefile index e78f45c1b..4784f6d65 100644 --- a/Makefile +++ b/Makefile @@ -161,13 +161,11 @@ install-full: $(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_NX) $(INSTALL_FILE) etc/keystrokes.cfg $(DESTDIR)/$(ETCDIR_NX)/ - $(INSTALL_FILE) etc/rgb $(DESTDIR)$(ETCDIR_NX)/ $(INSTALL_FILE) etc/nxagent.keyboard $(DESTDIR)$(ETCDIR_NX)/ $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/nx $(INSTALL_FILE) nx-X11/lib/X11/XErrorDB $(DESTDIR)$(PREFIX)/share/nx/ $(INSTALL_FILE) nx-X11/lib/X11/Xcms.txt $(DESTDIR)$(PREFIX)/share/nx/ - $(INSTALL_SYMLINK) $(ETCDIR_NX)/rgb $(DESTDIR)$(PREFIX)/share/nx/rgb $(INSTALL_FILE) VERSION $(DESTDIR)$(PREFIX)/share/nx/VERSION.nxagent $(INSTALL_FILE) VERSION $(DESTDIR)$(PREFIX)/share/nx/VERSION.nxproxy diff --git a/etc/rgb b/etc/rgb deleted file mode 100644 index b9e56c602..000000000 --- a/etc/rgb +++ /dev/null @@ -1,754 +0,0 @@ -! $Xorg: rgb.txt,v 1.3 2000/08/17 19:54:00 cpqbld Exp $ -255 250 250 snow -248 248 255 ghost white -248 248 255 GhostWhite -245 245 245 white smoke -245 245 245 WhiteSmoke -220 220 220 gainsboro -255 250 240 floral white -255 250 240 FloralWhite -253 245 230 old lace -253 245 230 OldLace -250 240 230 linen -250 235 215 antique white -250 235 215 AntiqueWhite -255 239 213 papaya whip -255 239 213 PapayaWhip -255 235 205 blanched almond -255 235 205 BlanchedAlmond -255 228 196 bisque -255 218 185 peach puff -255 218 185 PeachPuff -255 222 173 navajo white -255 222 173 NavajoWhite -255 228 181 moccasin -255 248 220 cornsilk -255 255 240 ivory -255 250 205 lemon chiffon -255 250 205 LemonChiffon -255 245 238 seashell -240 255 240 honeydew -245 255 250 mint cream -245 255 250 MintCream -240 255 255 azure -240 248 255 alice blue -240 248 255 AliceBlue -230 230 250 lavender -255 240 245 lavender blush -255 240 245 LavenderBlush -255 228 225 misty rose -255 228 225 MistyRose -255 255 255 white - 0 0 0 black - 47 79 79 dark slate gray - 47 79 79 DarkSlateGray - 47 79 79 dark slate grey - 47 79 79 DarkSlateGrey -105 105 105 dim gray -105 105 105 DimGray -105 105 105 dim grey -105 105 105 DimGrey -112 128 144 slate gray -112 128 144 SlateGray -112 128 144 slate grey -112 128 144 SlateGrey -119 136 153 light slate gray -119 136 153 LightSlateGray -119 136 153 light slate grey -119 136 153 LightSlateGrey -190 190 190 gray -190 190 190 grey -211 211 211 light grey -211 211 211 LightGrey -211 211 211 light gray -211 211 211 LightGray - 25 25 112 midnight blue - 25 25 112 MidnightBlue - 0 0 128 navy - 0 0 128 navy blue - 0 0 128 NavyBlue -100 149 237 cornflower blue -100 149 237 CornflowerBlue - 72 61 139 dark slate blue - 72 61 139 DarkSlateBlue -106 90 205 slate blue -106 90 205 SlateBlue -123 104 238 medium slate blue -123 104 238 MediumSlateBlue -132 112 255 light slate blue -132 112 255 LightSlateBlue - 0 0 205 medium blue - 0 0 205 MediumBlue - 65 105 225 royal blue - 65 105 225 RoyalBlue - 0 0 255 blue - 30 144 255 dodger blue - 30 144 255 DodgerBlue - 0 191 255 deep sky blue - 0 191 255 DeepSkyBlue -135 206 235 sky blue -135 206 235 SkyBlue -135 206 250 light sky blue -135 206 250 LightSkyBlue - 70 130 180 steel blue - 70 130 180 SteelBlue -176 196 222 light steel blue -176 196 222 LightSteelBlue -173 216 230 light blue -173 216 230 LightBlue -176 224 230 powder blue -176 224 230 PowderBlue -175 238 238 pale turquoise -175 238 238 PaleTurquoise - 0 206 209 dark turquoise - 0 206 209 DarkTurquoise - 72 209 204 medium turquoise - 72 209 204 MediumTurquoise - 64 224 208 turquoise - 0 255 255 cyan -224 255 255 light cyan -224 255 255 LightCyan - 95 158 160 cadet blue - 95 158 160 CadetBlue -102 205 170 medium aquamarine -102 205 170 MediumAquamarine -127 255 212 aquamarine - 0 100 0 dark green - 0 100 0 DarkGreen - 85 107 47 dark olive green - 85 107 47 DarkOliveGreen -143 188 143 dark sea green -143 188 143 DarkSeaGreen - 46 139 87 sea green - 46 139 87 SeaGreen - 60 179 113 medium sea green - 60 179 113 MediumSeaGreen - 32 178 170 light sea green - 32 178 170 LightSeaGreen -152 251 152 pale green -152 251 152 PaleGreen - 0 255 127 spring green - 0 255 127 SpringGreen -124 252 0 lawn green -124 252 0 LawnGreen - 0 255 0 green -127 255 0 chartreuse - 0 250 154 medium spring green - 0 250 154 MediumSpringGreen -173 255 47 green yellow -173 255 47 GreenYellow - 50 205 50 lime green - 50 205 50 LimeGreen -154 205 50 yellow green -154 205 50 YellowGreen - 34 139 34 forest green - 34 139 34 ForestGreen -107 142 35 olive drab -107 142 35 OliveDrab -189 183 107 dark khaki -189 183 107 DarkKhaki -240 230 140 khaki -238 232 170 pale goldenrod -238 232 170 PaleGoldenrod -250 250 210 light goldenrod yellow -250 250 210 LightGoldenrodYellow -255 255 224 light yellow -255 255 224 LightYellow -255 255 0 yellow -255 215 0 gold -238 221 130 light goldenrod -238 221 130 LightGoldenrod -218 165 32 goldenrod -184 134 11 dark goldenrod -184 134 11 DarkGoldenrod -188 143 143 rosy brown -188 143 143 RosyBrown -205 92 92 indian red -205 92 92 IndianRed -139 69 19 saddle brown -139 69 19 SaddleBrown -160 82 45 sienna -205 133 63 peru -222 184 135 burlywood -245 245 220 beige -245 222 179 wheat -244 164 96 sandy brown -244 164 96 SandyBrown -210 180 140 tan -210 105 30 chocolate -178 34 34 firebrick -165 42 42 brown -233 150 122 dark salmon -233 150 122 DarkSalmon -250 128 114 salmon -255 160 122 light salmon -255 160 122 LightSalmon -255 165 0 orange -255 140 0 dark orange -255 140 0 DarkOrange -255 127 80 coral -240 128 128 light coral -240 128 128 LightCoral -255 99 71 tomato -255 69 0 orange red -255 69 0 OrangeRed -255 0 0 red -255 105 180 hot pink -255 105 180 HotPink -255 20 147 deep pink -255 20 147 DeepPink -255 192 203 pink -255 182 193 light pink -255 182 193 LightPink -219 112 147 pale violet red -219 112 147 PaleVioletRed -176 48 96 maroon -199 21 133 medium violet red -199 21 133 MediumVioletRed -208 32 144 violet red -208 32 144 VioletRed -255 0 255 magenta -238 130 238 violet -221 160 221 plum -218 112 214 orchid -186 85 211 medium orchid -186 85 211 MediumOrchid -153 50 204 dark orchid -153 50 204 DarkOrchid -148 0 211 dark violet -148 0 211 DarkViolet -138 43 226 blue violet -138 43 226 BlueViolet -160 32 240 purple -147 112 219 medium purple -147 112 219 MediumPurple -216 191 216 thistle -255 250 250 snow1 -238 233 233 snow2 -205 201 201 snow3 -139 137 137 snow4 -255 245 238 seashell1 -238 229 222 seashell2 -205 197 191 seashell3 -139 134 130 seashell4 -255 239 219 AntiqueWhite1 -238 223 204 AntiqueWhite2 -205 192 176 AntiqueWhite3 -139 131 120 AntiqueWhite4 -255 228 196 bisque1 -238 213 183 bisque2 -205 183 158 bisque3 -139 125 107 bisque4 -255 218 185 PeachPuff1 -238 203 173 PeachPuff2 -205 175 149 PeachPuff3 -139 119 101 PeachPuff4 -255 222 173 NavajoWhite1 -238 207 161 NavajoWhite2 -205 179 139 NavajoWhite3 -139 121 94 NavajoWhite4 -255 250 205 LemonChiffon1 -238 233 191 LemonChiffon2 -205 201 165 LemonChiffon3 -139 137 112 LemonChiffon4 -255 248 220 cornsilk1 -238 232 205 cornsilk2 -205 200 177 cornsilk3 -139 136 120 cornsilk4 -255 255 240 ivory1 -238 238 224 ivory2 -205 205 193 ivory3 -139 139 131 ivory4 -240 255 240 honeydew1 -224 238 224 honeydew2 -193 205 193 honeydew3 -131 139 131 honeydew4 -255 240 245 LavenderBlush1 -238 224 229 LavenderBlush2 -205 193 197 LavenderBlush3 -139 131 134 LavenderBlush4 -255 228 225 MistyRose1 -238 213 210 MistyRose2 -205 183 181 MistyRose3 -139 125 123 MistyRose4 -240 255 255 azure1 -224 238 238 azure2 -193 205 205 azure3 -131 139 139 azure4 -131 111 255 SlateBlue1 -122 103 238 SlateBlue2 -105 89 205 SlateBlue3 - 71 60 139 SlateBlue4 - 72 118 255 RoyalBlue1 - 67 110 238 RoyalBlue2 - 58 95 205 RoyalBlue3 - 39 64 139 RoyalBlue4 - 0 0 255 blue1 - 0 0 238 blue2 - 0 0 205 blue3 - 0 0 139 blue4 - 30 144 255 DodgerBlue1 - 28 134 238 DodgerBlue2 - 24 116 205 DodgerBlue3 - 16 78 139 DodgerBlue4 - 99 184 255 SteelBlue1 - 92 172 238 SteelBlue2 - 79 148 205 SteelBlue3 - 54 100 139 SteelBlue4 - 0 191 255 DeepSkyBlue1 - 0 178 238 DeepSkyBlue2 - 0 154 205 DeepSkyBlue3 - 0 104 139 DeepSkyBlue4 -135 206 255 SkyBlue1 -126 192 238 SkyBlue2 -108 166 205 SkyBlue3 - 74 112 139 SkyBlue4 -176 226 255 LightSkyBlue1 -164 211 238 LightSkyBlue2 -141 182 205 LightSkyBlue3 - 96 123 139 LightSkyBlue4 -198 226 255 SlateGray1 -185 211 238 SlateGray2 -159 182 205 SlateGray3 -108 123 139 SlateGray4 -202 225 255 LightSteelBlue1 -188 210 238 LightSteelBlue2 -162 181 205 LightSteelBlue3 -110 123 139 LightSteelBlue4 -191 239 255 LightBlue1 -178 223 238 LightBlue2 -154 192 205 LightBlue3 -104 131 139 LightBlue4 -224 255 255 LightCyan1 -209 238 238 LightCyan2 -180 205 205 LightCyan3 -122 139 139 LightCyan4 -187 255 255 PaleTurquoise1 -174 238 238 PaleTurquoise2 -150 205 205 PaleTurquoise3 -102 139 139 PaleTurquoise4 -152 245 255 CadetBlue1 -142 229 238 CadetBlue2 -122 197 205 CadetBlue3 - 83 134 139 CadetBlue4 - 0 245 255 turquoise1 - 0 229 238 turquoise2 - 0 197 205 turquoise3 - 0 134 139 turquoise4 - 0 255 255 cyan1 - 0 238 238 cyan2 - 0 205 205 cyan3 - 0 139 139 cyan4 -151 255 255 DarkSlateGray1 -141 238 238 DarkSlateGray2 -121 205 205 DarkSlateGray3 - 82 139 139 DarkSlateGray4 -127 255 212 aquamarine1 -118 238 198 aquamarine2 -102 205 170 aquamarine3 - 69 139 116 aquamarine4 -193 255 193 DarkSeaGreen1 -180 238 180 DarkSeaGreen2 -155 205 155 DarkSeaGreen3 -105 139 105 DarkSeaGreen4 - 84 255 159 SeaGreen1 - 78 238 148 SeaGreen2 - 67 205 128 SeaGreen3 - 46 139 87 SeaGreen4 -154 255 154 PaleGreen1 -144 238 144 PaleGreen2 -124 205 124 PaleGreen3 - 84 139 84 PaleGreen4 - 0 255 127 SpringGreen1 - 0 238 118 SpringGreen2 - 0 205 102 SpringGreen3 - 0 139 69 SpringGreen4 - 0 255 0 green1 - 0 238 0 green2 - 0 205 0 green3 - 0 139 0 green4 -127 255 0 chartreuse1 -118 238 0 chartreuse2 -102 205 0 chartreuse3 - 69 139 0 chartreuse4 -192 255 62 OliveDrab1 -179 238 58 OliveDrab2 -154 205 50 OliveDrab3 -105 139 34 OliveDrab4 -202 255 112 DarkOliveGreen1 -188 238 104 DarkOliveGreen2 -162 205 90 DarkOliveGreen3 -110 139 61 DarkOliveGreen4 -255 246 143 khaki1 -238 230 133 khaki2 -205 198 115 khaki3 -139 134 78 khaki4 -255 236 139 LightGoldenrod1 -238 220 130 LightGoldenrod2 -205 190 112 LightGoldenrod3 -139 129 76 LightGoldenrod4 -255 255 224 LightYellow1 -238 238 209 LightYellow2 -205 205 180 LightYellow3 -139 139 122 LightYellow4 -255 255 0 yellow1 -238 238 0 yellow2 -205 205 0 yellow3 -139 139 0 yellow4 -255 215 0 gold1 -238 201 0 gold2 -205 173 0 gold3 -139 117 0 gold4 -255 193 37 goldenrod1 -238 180 34 goldenrod2 -205 155 29 goldenrod3 -139 105 20 goldenrod4 -255 185 15 DarkGoldenrod1 -238 173 14 DarkGoldenrod2 -205 149 12 DarkGoldenrod3 -139 101 8 DarkGoldenrod4 -255 193 193 RosyBrown1 -238 180 180 RosyBrown2 -205 155 155 RosyBrown3 -139 105 105 RosyBrown4 -255 106 106 IndianRed1 -238 99 99 IndianRed2 -205 85 85 IndianRed3 -139 58 58 IndianRed4 -255 130 71 sienna1 -238 121 66 sienna2 -205 104 57 sienna3 -139 71 38 sienna4 -255 211 155 burlywood1 -238 197 145 burlywood2 -205 170 125 burlywood3 -139 115 85 burlywood4 -255 231 186 wheat1 -238 216 174 wheat2 -205 186 150 wheat3 -139 126 102 wheat4 -255 165 79 tan1 -238 154 73 tan2 -205 133 63 tan3 -139 90 43 tan4 -255 127 36 chocolate1 -238 118 33 chocolate2 -205 102 29 chocolate3 -139 69 19 chocolate4 -255 48 48 firebrick1 -238 44 44 firebrick2 -205 38 38 firebrick3 -139 26 26 firebrick4 -255 64 64 brown1 -238 59 59 brown2 -205 51 51 brown3 -139 35 35 brown4 -255 140 105 salmon1 -238 130 98 salmon2 -205 112 84 salmon3 -139 76 57 salmon4 -255 160 122 LightSalmon1 -238 149 114 LightSalmon2 -205 129 98 LightSalmon3 -139 87 66 LightSalmon4 -255 165 0 orange1 -238 154 0 orange2 -205 133 0 orange3 -139 90 0 orange4 -255 127 0 DarkOrange1 -238 118 0 DarkOrange2 -205 102 0 DarkOrange3 -139 69 0 DarkOrange4 -255 114 86 coral1 -238 106 80 coral2 -205 91 69 coral3 -139 62 47 coral4 -255 99 71 tomato1 -238 92 66 tomato2 -205 79 57 tomato3 -139 54 38 tomato4 -255 69 0 OrangeRed1 -238 64 0 OrangeRed2 -205 55 0 OrangeRed3 -139 37 0 OrangeRed4 -255 0 0 red1 -238 0 0 red2 -205 0 0 red3 -139 0 0 red4 -215 7 81 DebianRed -255 20 147 DeepPink1 -238 18 137 DeepPink2 -205 16 118 DeepPink3 -139 10 80 DeepPink4 -255 110 180 HotPink1 -238 106 167 HotPink2 -205 96 144 HotPink3 -139 58 98 HotPink4 -255 181 197 pink1 -238 169 184 pink2 -205 145 158 pink3 -139 99 108 pink4 -255 174 185 LightPink1 -238 162 173 LightPink2 -205 140 149 LightPink3 -139 95 101 LightPink4 -255 130 171 PaleVioletRed1 -238 121 159 PaleVioletRed2 -205 104 137 PaleVioletRed3 -139 71 93 PaleVioletRed4 -255 52 179 maroon1 -238 48 167 maroon2 -205 41 144 maroon3 -139 28 98 maroon4 -255 62 150 VioletRed1 -238 58 140 VioletRed2 -205 50 120 VioletRed3 -139 34 82 VioletRed4 -255 0 255 magenta1 -238 0 238 magenta2 -205 0 205 magenta3 -139 0 139 magenta4 -255 131 250 orchid1 -238 122 233 orchid2 -205 105 201 orchid3 -139 71 137 orchid4 -255 187 255 plum1 -238 174 238 plum2 -205 150 205 plum3 -139 102 139 plum4 -224 102 255 MediumOrchid1 -209 95 238 MediumOrchid2 -180 82 205 MediumOrchid3 -122 55 139 MediumOrchid4 -191 62 255 DarkOrchid1 -178 58 238 DarkOrchid2 -154 50 205 DarkOrchid3 -104 34 139 DarkOrchid4 -155 48 255 purple1 -145 44 238 purple2 -125 38 205 purple3 - 85 26 139 purple4 -171 130 255 MediumPurple1 -159 121 238 MediumPurple2 -137 104 205 MediumPurple3 - 93 71 139 MediumPurple4 -255 225 255 thistle1 -238 210 238 thistle2 -205 181 205 thistle3 -139 123 139 thistle4 - 0 0 0 gray0 - 0 0 0 grey0 - 3 3 3 gray1 - 3 3 3 grey1 - 5 5 5 gray2 - 5 5 5 grey2 - 8 8 8 gray3 - 8 8 8 grey3 - 10 10 10 gray4 - 10 10 10 grey4 - 13 13 13 gray5 - 13 13 13 grey5 - 15 15 15 gray6 - 15 15 15 grey6 - 18 18 18 gray7 - 18 18 18 grey7 - 20 20 20 gray8 - 20 20 20 grey8 - 23 23 23 gray9 - 23 23 23 grey9 - 26 26 26 gray10 - 26 26 26 grey10 - 28 28 28 gray11 - 28 28 28 grey11 - 31 31 31 gray12 - 31 31 31 grey12 - 33 33 33 gray13 - 33 33 33 grey13 - 36 36 36 gray14 - 36 36 36 grey14 - 38 38 38 gray15 - 38 38 38 grey15 - 41 41 41 gray16 - 41 41 41 grey16 - 43 43 43 gray17 - 43 43 43 grey17 - 46 46 46 gray18 - 46 46 46 grey18 - 48 48 48 gray19 - 48 48 48 grey19 - 51 51 51 gray20 - 51 51 51 grey20 - 54 54 54 gray21 - 54 54 54 grey21 - 56 56 56 gray22 - 56 56 56 grey22 - 59 59 59 gray23 - 59 59 59 grey23 - 61 61 61 gray24 - 61 61 61 grey24 - 64 64 64 gray25 - 64 64 64 grey25 - 66 66 66 gray26 - 66 66 66 grey26 - 69 69 69 gray27 - 69 69 69 grey27 - 71 71 71 gray28 - 71 71 71 grey28 - 74 74 74 gray29 - 74 74 74 grey29 - 77 77 77 gray30 - 77 77 77 grey30 - 79 79 79 gray31 - 79 79 79 grey31 - 82 82 82 gray32 - 82 82 82 grey32 - 84 84 84 gray33 - 84 84 84 grey33 - 87 87 87 gray34 - 87 87 87 grey34 - 89 89 89 gray35 - 89 89 89 grey35 - 92 92 92 gray36 - 92 92 92 grey36 - 94 94 94 gray37 - 94 94 94 grey37 - 97 97 97 gray38 - 97 97 97 grey38 - 99 99 99 gray39 - 99 99 99 grey39 -102 102 102 gray40 -102 102 102 grey40 -105 105 105 gray41 -105 105 105 grey41 -107 107 107 gray42 -107 107 107 grey42 -110 110 110 gray43 -110 110 110 grey43 -112 112 112 gray44 -112 112 112 grey44 -115 115 115 gray45 -115 115 115 grey45 -117 117 117 gray46 -117 117 117 grey46 -120 120 120 gray47 -120 120 120 grey47 -122 122 122 gray48 -122 122 122 grey48 -125 125 125 gray49 -125 125 125 grey49 -127 127 127 gray50 -127 127 127 grey50 -130 130 130 gray51 -130 130 130 grey51 -133 133 133 gray52 -133 133 133 grey52 -135 135 135 gray53 -135 135 135 grey53 -138 138 138 gray54 -138 138 138 grey54 -140 140 140 gray55 -140 140 140 grey55 -143 143 143 gray56 -143 143 143 grey56 -145 145 145 gray57 -145 145 145 grey57 -148 148 148 gray58 -148 148 148 grey58 -150 150 150 gray59 -150 150 150 grey59 -153 153 153 gray60 -153 153 153 grey60 -156 156 156 gray61 -156 156 156 grey61 -158 158 158 gray62 -158 158 158 grey62 -161 161 161 gray63 -161 161 161 grey63 -163 163 163 gray64 -163 163 163 grey64 -166 166 166 gray65 -166 166 166 grey65 -168 168 168 gray66 -168 168 168 grey66 -171 171 171 gray67 -171 171 171 grey67 -173 173 173 gray68 -173 173 173 grey68 -176 176 176 gray69 -176 176 176 grey69 -179 179 179 gray70 -179 179 179 grey70 -181 181 181 gray71 -181 181 181 grey71 -184 184 184 gray72 -184 184 184 grey72 -186 186 186 gray73 -186 186 186 grey73 -189 189 189 gray74 -189 189 189 grey74 -191 191 191 gray75 -191 191 191 grey75 -194 194 194 gray76 -194 194 194 grey76 -196 196 196 gray77 -196 196 196 grey77 -199 199 199 gray78 -199 199 199 grey78 -201 201 201 gray79 -201 201 201 grey79 -204 204 204 gray80 -204 204 204 grey80 -207 207 207 gray81 -207 207 207 grey81 -209 209 209 gray82 -209 209 209 grey82 -212 212 212 gray83 -212 212 212 grey83 -214 214 214 gray84 -214 214 214 grey84 -217 217 217 gray85 -217 217 217 grey85 -219 219 219 gray86 -219 219 219 grey86 -222 222 222 gray87 -222 222 222 grey87 -224 224 224 gray88 -224 224 224 grey88 -227 227 227 gray89 -227 227 227 grey89 -229 229 229 gray90 -229 229 229 grey90 -232 232 232 gray91 -232 232 232 grey91 -235 235 235 gray92 -235 235 235 grey92 -237 237 237 gray93 -237 237 237 grey93 -240 240 240 gray94 -240 240 240 grey94 -242 242 242 gray95 -242 242 242 grey95 -245 245 245 gray96 -245 245 245 grey96 -247 247 247 gray97 -247 247 247 grey97 -250 250 250 gray98 -250 250 250 grey98 -252 252 252 gray99 -252 252 252 grey99 -255 255 255 gray100 -255 255 255 grey100 -169 169 169 dark grey -169 169 169 DarkGrey -169 169 169 dark gray -169 169 169 DarkGray -0 0 139 dark blue -0 0 139 DarkBlue -0 139 139 dark cyan -0 139 139 DarkCyan -139 0 139 dark magenta -139 0 139 DarkMagenta -139 0 0 dark red -139 0 0 DarkRed -144 238 144 light green -144 238 144 LightGreen diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index ba97b3b4c..879b55a3b 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -539,9 +539,6 @@ X_BYTE_ORDER = ByteOrder #ifndef HasMktemp #define HasMktemp NO /* if you have the mktemp command */ #endif -#ifndef HasNdbm -#define HasNdbm NO -#endif #ifndef HasSecureRPC #define HasSecureRPC NO /* if you have Secure RPC */ #endif @@ -1286,13 +1283,6 @@ TCLIBDIR = TclLibDir #ifndef ToolkitStringsABIOptions #define ToolkitStringsABIOptions /**/ #endif -#ifndef NdbmDefines -#if HasNdbm -#define NdbmDefines -DNDBM -#else -#define NdbmDefines /**/ -#endif -#endif #ifndef HasLdRunPath #define HasLdRunPath NO #endif @@ -1317,9 +1307,6 @@ TCLIBDIR = TclLibDir #ifndef MathLibrary #define MathLibrary -lm #endif -#ifndef DBMLibrary -#define DBMLibrary -ldbm -#endif #ifndef DlLibrary #define DlLibrary -ldl #endif diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README index 9cb2ff91e..863c66a82 100644 --- a/nx-X11/config/cf/README +++ b/nx-X11/config/cf/README @@ -65,7 +65,6 @@ Imake.tmpl provides defaults for the following variables: HasLibCrypt boolean for system has libcrypt HasMotif boolean for system has Motif HasMotif2 boolean for system has Motif2 or OpenMotif - HasNdbm boolean for system has ndbm routines HasPoll use poll() syscall? HasPurify boolean for system has Purify HasPutenv boolean for libc has putenv() @@ -114,7 +113,6 @@ Imake.tmpl provides defaults for the following variables: MkCookieCmd command to generate an xauth cookie MsMacros macro flag for TroffCmd, normally "-ms" MvCmd command to rename a file - NdbmDefines -D's to turn on use of ndbm routines NeedConstPrototoypes whether const is supported NeedFunctionPrototypes whether or not to force function prototypes NeedNestedPrototypes whether nested prototypes are supported @@ -176,7 +174,6 @@ X11.tmpl provides defaults for the following variables: DebugLibX11 build libX11_d.a DefaultCursorTheme name of default cursor theme DefaultFontPath default server font path - DefaultRGBDatabase default server rgb color database DefaultSystemPath default system xdm PATH environment variable DefaultSystemShell default /bin/sh DefaultUserPath default user xdm PATH environment variable @@ -220,7 +217,6 @@ X11.tmpl provides defaults for the following variables: ShmDefines MIT-SHM define TwmDir directory in which to install twm config files UseCCMakeDepend boolean for using alternate makedepend script - UseRgbTxt use rgb.txt file as is instead of DBM-compiled VarDirectory directory in /var for logs, etc., and config VendorHasX11R6_3libXext don't need Security & AppGroup in xrx plug-in XAppLoadDir directory in which to install app defaults diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index fe94e1f4d..54f94355d 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -312,12 +312,6 @@ XORGRELSTRING = XorgManVersionString #ifndef DefaultFSFontPath # define DefaultFSFontPath DefaultFontPath #endif -#ifndef DefaultRGBDatabase -#define DefaultRGBDatabase $(USRDATADIR)/rgb -#endif -#ifndef UseRgbTxt -#define UseRgbTxt NO /* default is to compile with dbm */ -#endif #ifndef UseMemLeak #define UseMemLeak NO #endif diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index e9dba5958..ffcf4c0de 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -165,7 +165,6 @@ #if defined(cygwinArchitecture) #define DefaultFontPath /mnt/NX/fonts/base/,/mnt/NX/fonts/misc/,/mnt/NX/fonts/Speedo/,/mnt/NX/fonts/Type1/,/mnt/NX/fonts/75dpi/,/mnt/NX/fonts/100dpi/,/mnt/NX/fonts/TTF/ -#define DefaultRGBDatabase /mnt/NX/fonts/rgb #endif /* #if defined(cygwinArchitecture) */ /* diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index 513f78a43..ddc501978 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -660,10 +660,6 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese # define OtherIConfigFiles $(IRULESRC)/xf86.rules #endif -#ifndef UseRgbTxt -# define UseRgbTxt YES -#endif - #ifndef ManSuffix # define ManSuffix 1 #endif diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index fe70d007a..a18f04108 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -160,10 +160,7 @@ INSTPGMFLAGS = #if HasPam && HasPamMisc PAMLIBS = PamLibraries PamMiscLibraries #endif -#if !(SystemV4 || UseRgbTxt) - DBMLIBS = DBMLibrary -#endif - SYSLIBS = $(ZLIB) MathLibrary $(DBMLIBS) $(USB) \ + SYSLIBS = $(ZLIB) MathLibrary $(USB) \ $(PAMLIBS) $(EXTRASYSLIBS) #if !HasCbrt CBRT = mi/LibraryTargetName(cbrt) diff --git a/nx-X11/programs/Xserver/dix/Imakefile b/nx-X11/programs/Xserver/dix/Imakefile index 7acd1b45c..1024de965 100644 --- a/nx-X11/programs/Xserver/dix/Imakefile +++ b/nx-X11/programs/Xserver/dix/Imakefile @@ -91,7 +91,6 @@ OBJS = \ * .macros files or site.def in the directory util/imake.includes/: * * DefaultFontPath COMPILEDDEFAULTFONTPATH - * DefaultRGBDatabase RGB_DB * * The sample util/imake.includes/Imake.tmpl will provide generic defaults. * The values in site.h are simply a last line of defense and should not be @@ -103,11 +102,6 @@ DEFAULTFONTPATH = DefaultFontPath SITE_FONT_PATH = -DCOMPILEDDEFAULTFONTPATH=\"$(DEFAULTFONTPATH)\" #endif -#ifdef DefaultRGBDatabase -DEFAULTRGBDATABASE = DefaultRGBDatabase - SITE_RGB_DB = -DRGB_DB=\"$(DEFAULTRGBDATABASE)\" -#endif - #ifdef DefaultDisplayClass DEFAULTDISPLAYCLASS = DefaultDisplayClass SITE_DISPLAY_CLASS = -DCOMPILEDDISPLAYCLASS=\"$(DEFAULTDISPLAYCLASS)\" @@ -129,7 +123,7 @@ VENDORRELEASE = XVendorRelease #endif #endif -SITE_DEFINES = $(SITE_FONT_PATH) $(SITE_RGB_DB) $(SITE_DISPLAY_CLASS) +SITE_DEFINES = $(SITE_FONT_PATH) $(SITE_DISPLAY_CLASS) VENDOR_DEFINES = $(VENDOR_STRING) $(VENDOR_RELEASE) $(QUARTZ_DEFINES) diff --git a/nx-X11/programs/Xserver/dix/globals.c b/nx-X11/programs/Xserver/dix/globals.c index 5a2819e50..a0af50fa8 100644 --- a/nx-X11/programs/Xserver/dix/globals.c +++ b/nx-X11/programs/Xserver/dix/globals.c @@ -130,7 +130,6 @@ int logoScreenSaver = DEFAULT_LOGO_SCREEN_SAVER; char *defaultFontPath = COMPILEDDEFAULTFONTPATH; char *defaultTextFont = COMPILEDDEFAULTFONT; char *defaultCursorFont = COMPILEDCURSORFONT; -char *rgbPath = RGB_DB; char *defaultDisplayClass = COMPILEDDISPLAYCLASS; FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in every compilation of dix code */ diff --git a/nx-X11/programs/Xserver/include/globals.h b/nx-X11/programs/Xserver/include/globals.h index 6bc31d8e7..1c4d73e64 100644 --- a/nx-X11/programs/Xserver/include/globals.h +++ b/nx-X11/programs/Xserver/include/globals.h @@ -12,7 +12,6 @@ extern CARD32 ScreenSaverTime; extern CARD32 ScreenSaverInterval; extern char *defaultFontPath; -extern char *rgbPath; extern int monitorResolution; extern Bool loadableFonts; extern int defaultColorVisualClass; diff --git a/nx-X11/programs/Xserver/include/os.h b/nx-X11/programs/Xserver/include/os.h index 881abfccb..a53f0d4c8 100644 --- a/nx-X11/programs/Xserver/include/os.h +++ b/nx-X11/programs/Xserver/include/os.h @@ -94,7 +94,6 @@ typedef struct _NewClientRec *NewClientPtr; #define SIGVAL void #endif -extern Bool OsDelayInitColors; extern void (*OsVendorVErrorFProc)(const char *, va_list args); extern int WaitForSomething( diff --git a/nx-X11/programs/Xserver/include/site.h b/nx-X11/programs/Xserver/include/site.h index 5b9f25815..c8dfe69a6 100644 --- a/nx-X11/programs/Xserver/include/site.h +++ b/nx-X11/programs/Xserver/include/site.h @@ -65,19 +65,15 @@ SOFTWARE. #endif /* - * The following constants are provided solely as a last line of defense. The - * normal build ALWAYS overrides them using a special rule given in - * server/dix/Imakefile. If you want to change either of these constants, - * you should set the DefaultFontPath or DefaultRGBDatabase configuration - * parameters. + * The following constant is provided solely as a last line of defense. The + * normal build ALWAYS overrides it using a special rule given in + * server/dix/Imakefile. If you want to change this constant, you should set + * the DefaultFontPath configuration parameter. * DO NOT CHANGE THESE VALUES OR THE DIX IMAKEFILE! */ #ifndef COMPILEDDEFAULTFONTPATH #define COMPILEDDEFAULTFONTPATH "/usr/lib/X11/fonts/misc/" #endif -#ifndef RGB_DB -#define RGB_DB "/usr/lib/X11/rgb" -#endif /* * The following constants contain default values for all of the variables diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile index d381ac272..26d9c6dff 100644 --- a/nx-X11/programs/Xserver/os/Imakefile +++ b/nx-X11/programs/Xserver/os/Imakefile @@ -125,10 +125,6 @@ BOOTSTRAPCFLAGS = #if UseMemLeak MEM_DEFINES = -DMEMBUG #endif -#if UseRgbTxt - RGB_DEFINES = -DUSE_RGB_TXT -#endif - DBM_DEFINES = NdbmDefines ADM_DEFINES = -DADMPATH=\"$(ADMDIR)/X\%smsgs\" XDMCP_DEFINES = ServerXdmcpDefines ERROR_DEFINES = ServerErrorDefines @@ -139,14 +135,14 @@ BOOTSTRAPCFLAGS = DEFINES = $(CONNECTION_FLAGS) $(MEM_DEFINES) \ $(XDMAUTHDEFS) $(RPCDEFS) $(SIGNAL_DEFINES) $(OS_DEFINES) \ - $(RGB_DEFINES) $(GETPEER_DEFINES) \ + $(GETPEER_DEFINES) \ $(RANDOM_DEFINES) $(BUGMSG) $(XTRANS_FAILDEFINES) \ $(XTRANS_DEFINES) $(NX_DEFINES) INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \ -I$(SERVERSRC)/Xext -I$(SERVERSRC)/render \ -I$(TOP)/lib/Xau $(NX_INCLUDES) \ `pkg-config --cflags-only-I pixman-1` - DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \ + DEPEND_DEFINES = $(XDMCP_DEFINES) $(EXT_DEFINES) \ $(TRANS_INCLUDES) $(CONNECTION_FLAGS) $(GETPEER_DEFINES) \ DependDefines LINTLIBS = ../dix/llib-ldix.ln @@ -182,9 +178,7 @@ SpecialCObjectRule(utils,$(ICONFIGFILES),$(XDMCP_DEFINES) $(EXT_DEFINES) $(ERROR #if defined(SparcArchitecture) && HasGcc && !HasGcc2 oscolor.o: oscolor.c $(ICONFIGFILES) $(RM) $@ - cc -c $(DBM_DEFINES) $(CDEBUGFLAGS) $(ALLDEFINES) $*.c -#else -SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES)) + cc -c $(CDEBUGFLAGS) $(ALLDEFINES) $*.c #endif #if !HasSnprintf diff --git a/nx-X11/programs/Xserver/os/oscolor.c b/nx-X11/programs/Xserver/os/oscolor.c index 88b243d65..70940653f 100644 --- a/nx-X11/programs/Xserver/os/oscolor.c +++ b/nx-X11/programs/Xserver/os/oscolor.c @@ -22,18 +22,17 @@ Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. - Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -45,438 +44,1618 @@ SOFTWARE. ******************************************************************/ -#ifdef NX_TRANS_SOCKET - -#include -#include -#include - -/* FIXME: we need more intelligent code (like provided by the nxagentX2go - * var in hw/nxagent/Init.h) to detect our current runtime mode (running - * as x2goagent, running as nxagent) - */ -static char* nxAltRgbPaths[] = {"/etc/x2go/rgb", \ - "/usr/share/x2go/rgb", \ - "/usr/local/share/x2go/rgb", \ - "/etc/nxagent/rgb", \ - "/usr/share/nx/rgb", \ - "/usr/local/share/nx/rgb", \ - "/usr/NX/share/rgb", \ - "/usr/share/X11/rgb", \ - "/etc/X11/rgb"}; -static char _NXRgbPath[1024]; - -#endif - #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifndef USE_RGB_TXT - -#ifdef NDBM -#include -#else -#ifdef SVR4 -#include -#else -#include -#endif -#endif -#include "rgb.h" #include "os.h" -#include "opaque.h" - -/* Note that we are assuming there is only one database for all the screens. */ - -#ifdef NDBM -DBM *rgb_dbm = (DBM *)NULL; -#else -int rgb_dbm = 0; -#endif - -extern void CopyISOLatin1Lowered( - char * /*dest*/, - const char * /*source*/, - int /*length*/); - -int -OsInitColors(void) -{ - if (!rgb_dbm) - { -#ifdef NDBM - rgb_dbm = dbm_open(rgbPath, 0, 0); -#else - if (dbminit(rgbPath) == 0) - rgb_dbm = 1; -#endif - if (!rgb_dbm) { - ErrorF( "Couldn't open RGB_DB '%s'\n", rgbPath ); - return FALSE; - } - } - return TRUE; -} - -/*ARGSUSED*/ -int -OsLookupColor(int screen, char *name, unsigned int len, - unsigned short *pred, unsigned short *pgreen, unsigned short *pblue) -{ - datum dbent; - RGB rgb; - char buf[64]; - char *lowername; - - if(!rgb_dbm) - return(0); - - /* we use malloc here so that we can compile with cc without alloca - * when otherwise using gcc */ - if (len < sizeof(buf)) - lowername = buf; - else if (!(lowername = (char *)malloc(len + 1))) - return(0); - CopyISOLatin1Lowered ((unsigned char *) lowername, (unsigned char *) name, - (int)len); - - dbent.dptr = lowername; - dbent.dsize = len; -#ifdef NDBM - dbent = dbm_fetch(rgb_dbm, dbent); -#else - dbent = fetch (dbent); -#endif - - if (len >= sizeof(buf)) - free(lowername); - - if(dbent.dptr) - { - memmove((char *) &rgb, dbent.dptr, sizeof (RGB)); - *pred = rgb.red; - *pgreen = rgb.green; - *pblue = rgb.blue; - return (1); - } - return(0); -} - -#else /* USE_RGB_TXT */ - - -/* - * The dbm routines are a porting hassle. This implementation will do - * the same thing by reading the rgb.txt file directly, which is much - * more portable. - */ - -#include -#include "os.h" -#include "opaque.h" - -#define HASHSIZE 511 - -typedef struct _dbEntry * dbEntryPtr; -typedef struct _dbEntry { - dbEntryPtr link; - unsigned short red; - unsigned short green; - unsigned short blue; - char name[1]; /* some compilers complain if [0] */ -} dbEntry; - - -extern void CopyISOLatin1Lowered( - char * /*dest*/, - const char * /*source*/, - int /*length*/); - -static dbEntryPtr hashTab[HASHSIZE]; - -#ifdef NX_TRANS_SOCKET - -static int NXVerifyRgbPath(char *path) -{ - int size; - char *rgbPath; - struct stat rgbFileStat; - - /* - * Check if rgb file is present. - */ - - size = strlen(path) + strlen(".txt") + 1; - - rgbPath = (char *) ALLOCATE_LOCAL(size + 1); - - strcpy(rgbPath, path); - - #ifdef NX_TRANS_TEST - fprintf(stderr, "NXVerifyRgbPath: Looking for [%s] file.\n", - rgbPath); - #endif - - if (stat(rgbPath, &rgbFileStat) != 0) - { - - #ifdef NX_TRANS_TEST - fprintf(stderr, "NXVerifyRgbPath: Can't find the rgb file [%s].\n", - rgbPath); - #endif - - strcat(rgbPath, ".txt"); - - #ifdef NX_TRANS_TEST - fprintf(stderr, "NXVerifyRgbPath: Looking for [%s] file.\n", - rgbPath); - #endif - - if (stat(rgbPath, &rgbFileStat) != 0) - { - - #ifdef NX_TRANS_TEST - fprintf(stderr, "NXVerifyRgbPath: Can't find the rgb file [%s].\n", - rgbPath); - #endif - - DEALLOCATE_LOCAL(rgbPath); - - return 0; - } - } - - #ifdef NX_TRANS_TEST - fprintf(stderr, "NXVerifyRgbPath: rgb path [%s] is valid.\n", - path); - #endif - - DEALLOCATE_LOCAL(rgbPath); - - return 1; -} - -static const char *_NXGetRgbPath(const char *path) -{ - const char *systemEnv; - char rgbPath[1024]; - int numAltRgbPaths; - int i; - - /* - * Check the environment only once. - */ - - if (*_NXRgbPath != '\0') - { - return _NXRgbPath; - } - - systemEnv = getenv("NX_SYSTEM"); - - if (systemEnv != NULL && *systemEnv != '\0') - { - if (strlen(systemEnv) + strlen("/share/rgb") + 1 > 1024) - { - - #ifdef NX_TRANS_TEST - fprintf(stderr, "_NXGetRgbPath: WARNING! Maximum length of rgb file path exceeded.\n"); - #endif - - goto _NXGetRgbPathError; - } - - strcpy(rgbPath, systemEnv); - strcat(rgbPath, "/share/rgb"); - - if (NXVerifyRgbPath(rgbPath) == 1) - { - strcpy(_NXRgbPath, systemEnv); - strcat(_NXRgbPath, "/share/rgb"); - - #ifdef NX_TRANS_TEST - fprintf(stderr, "_NXGetRgbPath: Using rgb file path [%s].\n", - _NXRgbPath); - #endif - - return _NXRgbPath; - } - } - - numAltRgbPaths = sizeof(nxAltRgbPaths) / sizeof(*nxAltRgbPaths); - - for (i = 0; i < numAltRgbPaths; i++) - { - if (NXVerifyRgbPath(nxAltRgbPaths[i]) == 1) - { - if (strlen(nxAltRgbPaths[i]) + 1 > 1024) - { - #ifdef NX_TRANS_TEST - fprintf(stderr, "_NXGetRgbPath: WARNING! Maximum length of rgb file path exceeded.\n"); - #endif - - goto _NXGetRgbPathError; - } - - strcpy(_NXRgbPath, nxAltRgbPaths[i]); - - #ifdef NX_TRANS_TEST - fprintf(stderr, "_NXGetRgbPath: Using rgb file path [%s].\n", - _NXRgbPath); - #endif - - return _NXRgbPath; - } - } - -_NXGetRgbPathError: - - strcpy(_NXRgbPath, path); - - #ifdef NX_TRANS_TEST - fprintf(stderr, "_NXGetRgbPath: Using default rgb file path [%s].\n", - _NXRgbPath); - #endif - - return _NXRgbPath; -} - -#endif - -static dbEntryPtr -lookup(char *name, int len, Bool create) -{ - unsigned int h = 0, g; - dbEntryPtr entry, *prev = NULL; - char *str = name; - - if (!(name = (char*)ALLOCATE_LOCAL(len +1))) return NULL; - CopyISOLatin1Lowered(name, str, len); - name[len] = '\0'; - - for(str = name; *str; str++) { - h = (h << 4) + *str; - if ((g = h) & 0xf0000000) h ^= (g >> 24); - h &= g; - } - h %= HASHSIZE; - - if ( (entry = hashTab[h]) ) - { - for( ; entry; prev = (dbEntryPtr*)entry, entry = entry->link ) - if (! strcmp(name, entry->name) ) break; - } - else - prev = &(hashTab[h]); - - if (!entry && create && (entry = (dbEntryPtr)malloc(sizeof(dbEntry) +len))) - { - *prev = entry; - entry->link = NULL; - strcpy( entry->name, name ); - } - - DEALLOCATE_LOCAL(name); - - return entry; -} +typedef struct _builtinColor { + unsigned char red; + unsigned char green; + unsigned char blue; + unsigned short name; +} BuiltinColor; + +static const char BuiltinColorNames[] = { + "alice blue\0" + "AliceBlue\0" + "antique white\0" + "AntiqueWhite\0" + "AntiqueWhite1\0" + "AntiqueWhite2\0" + "AntiqueWhite3\0" + "AntiqueWhite4\0" + "aqua\0" + "aquamarine\0" + "aquamarine1\0" + "aquamarine2\0" + "aquamarine3\0" + "aquamarine4\0" + "azure\0" + "azure1\0" + "azure2\0" + "azure3\0" + "azure4\0" + "beige\0" + "bisque\0" + "bisque1\0" + "bisque2\0" + "bisque3\0" + "bisque4\0" + "black\0" + "blanched almond\0" + "BlanchedAlmond\0" + "blue\0" + "blue violet\0" + "blue1\0" + "blue2\0" + "blue3\0" + "blue4\0" + "BlueViolet\0" + "brown\0" + "brown1\0" + "brown2\0" + "brown3\0" + "brown4\0" + "burlywood\0" + "burlywood1\0" + "burlywood2\0" + "burlywood3\0" + "burlywood4\0" + "cadet blue\0" + "CadetBlue\0" + "CadetBlue1\0" + "CadetBlue2\0" + "CadetBlue3\0" + "CadetBlue4\0" + "chartreuse\0" + "chartreuse1\0" + "chartreuse2\0" + "chartreuse3\0" + "chartreuse4\0" + "chocolate\0" + "chocolate1\0" + "chocolate2\0" + "chocolate3\0" + "chocolate4\0" + "coral\0" + "coral1\0" + "coral2\0" + "coral3\0" + "coral4\0" + "cornflower blue\0" + "CornflowerBlue\0" + "cornsilk\0" + "cornsilk1\0" + "cornsilk2\0" + "cornsilk3\0" + "cornsilk4\0" + "crimson\0" + "cyan\0" + "cyan1\0" + "cyan2\0" + "cyan3\0" + "cyan4\0" + "dark blue\0" + "dark cyan\0" + "dark goldenrod\0" + "dark gray\0" + "dark green\0" + "dark grey\0" + "dark khaki\0" + "dark magenta\0" + "dark olive green\0" + "dark orange\0" + "dark orchid\0" + "dark red\0" + "dark salmon\0" + "dark sea green\0" + "dark slate blue\0" + "dark slate gray\0" + "dark slate grey\0" + "dark turquoise\0" + "dark violet\0" + "DarkBlue\0" + "DarkCyan\0" + "DarkGoldenrod\0" + "DarkGoldenrod1\0" + "DarkGoldenrod2\0" + "DarkGoldenrod3\0" + "DarkGoldenrod4\0" + "DarkGray\0" + "DarkGreen\0" + "DarkGrey\0" + "DarkKhaki\0" + "DarkMagenta\0" + "DarkOliveGreen\0" + "DarkOliveGreen1\0" + "DarkOliveGreen2\0" + "DarkOliveGreen3\0" + "DarkOliveGreen4\0" + "DarkOrange\0" + "DarkOrange1\0" + "DarkOrange2\0" + "DarkOrange3\0" + "DarkOrange4\0" + "DarkOrchid\0" + "DarkOrchid1\0" + "DarkOrchid2\0" + "DarkOrchid3\0" + "DarkOrchid4\0" + "DarkRed\0" + "DarkSalmon\0" + "DarkSeaGreen\0" + "DarkSeaGreen1\0" + "DarkSeaGreen2\0" + "DarkSeaGreen3\0" + "DarkSeaGreen4\0" + "DarkSlateBlue\0" + "DarkSlateGray\0" + "DarkSlateGray1\0" + "DarkSlateGray2\0" + "DarkSlateGray3\0" + "DarkSlateGray4\0" + "DarkSlateGrey\0" + "DarkTurquoise\0" + "DarkViolet\0" + "deep pink\0" + "deep sky blue\0" + "DeepPink\0" + "DeepPink1\0" + "DeepPink2\0" + "DeepPink3\0" + "DeepPink4\0" + "DeepSkyBlue\0" + "DeepSkyBlue1\0" + "DeepSkyBlue2\0" + "DeepSkyBlue3\0" + "DeepSkyBlue4\0" + "dim gray\0" + "dim grey\0" + "DimGray\0" + "DimGrey\0" + "dodger blue\0" + "DodgerBlue\0" + "DodgerBlue1\0" + "DodgerBlue2\0" + "DodgerBlue3\0" + "DodgerBlue4\0" + "firebrick\0" + "firebrick1\0" + "firebrick2\0" + "firebrick3\0" + "firebrick4\0" + "floral white\0" + "FloralWhite\0" + "forest green\0" + "ForestGreen\0" + "fuchsia\0" + "gainsboro\0" + "ghost white\0" + "GhostWhite\0" + "gold\0" + "gold1\0" + "gold2\0" + "gold3\0" + "gold4\0" + "goldenrod\0" + "goldenrod1\0" + "goldenrod2\0" + "goldenrod3\0" + "goldenrod4\0" + "gray\0" + "gray0\0" + "gray1\0" + "gray10\0" + "gray100\0" + "gray11\0" + "gray12\0" + "gray13\0" + "gray14\0" + "gray15\0" + "gray16\0" + "gray17\0" + "gray18\0" + "gray19\0" + "gray2\0" + "gray20\0" + "gray21\0" + "gray22\0" + "gray23\0" + "gray24\0" + "gray25\0" + "gray26\0" + "gray27\0" + "gray28\0" + "gray29\0" + "gray3\0" + "gray30\0" + "gray31\0" + "gray32\0" + "gray33\0" + "gray34\0" + "gray35\0" + "gray36\0" + "gray37\0" + "gray38\0" + "gray39\0" + "gray4\0" + "gray40\0" + "gray41\0" + "gray42\0" + "gray43\0" + "gray44\0" + "gray45\0" + "gray46\0" + "gray47\0" + "gray48\0" + "gray49\0" + "gray5\0" + "gray50\0" + "gray51\0" + "gray52\0" + "gray53\0" + "gray54\0" + "gray55\0" + "gray56\0" + "gray57\0" + "gray58\0" + "gray59\0" + "gray6\0" + "gray60\0" + "gray61\0" + "gray62\0" + "gray63\0" + "gray64\0" + "gray65\0" + "gray66\0" + "gray67\0" + "gray68\0" + "gray69\0" + "gray7\0" + "gray70\0" + "gray71\0" + "gray72\0" + "gray73\0" + "gray74\0" + "gray75\0" + "gray76\0" + "gray77\0" + "gray78\0" + "gray79\0" + "gray8\0" + "gray80\0" + "gray81\0" + "gray82\0" + "gray83\0" + "gray84\0" + "gray85\0" + "gray86\0" + "gray87\0" + "gray88\0" + "gray89\0" + "gray9\0" + "gray90\0" + "gray91\0" + "gray92\0" + "gray93\0" + "gray94\0" + "gray95\0" + "gray96\0" + "gray97\0" + "gray98\0" + "gray99\0" + "green\0" + "green yellow\0" + "green1\0" + "green2\0" + "green3\0" + "green4\0" + "GreenYellow\0" + "grey\0" + "grey0\0" + "grey1\0" + "grey10\0" + "grey100\0" + "grey11\0" + "grey12\0" + "grey13\0" + "grey14\0" + "grey15\0" + "grey16\0" + "grey17\0" + "grey18\0" + "grey19\0" + "grey2\0" + "grey20\0" + "grey21\0" + "grey22\0" + "grey23\0" + "grey24\0" + "grey25\0" + "grey26\0" + "grey27\0" + "grey28\0" + "grey29\0" + "grey3\0" + "grey30\0" + "grey31\0" + "grey32\0" + "grey33\0" + "grey34\0" + "grey35\0" + "grey36\0" + "grey37\0" + "grey38\0" + "grey39\0" + "grey4\0" + "grey40\0" + "grey41\0" + "grey42\0" + "grey43\0" + "grey44\0" + "grey45\0" + "grey46\0" + "grey47\0" + "grey48\0" + "grey49\0" + "grey5\0" + "grey50\0" + "grey51\0" + "grey52\0" + "grey53\0" + "grey54\0" + "grey55\0" + "grey56\0" + "grey57\0" + "grey58\0" + "grey59\0" + "grey6\0" + "grey60\0" + "grey61\0" + "grey62\0" + "grey63\0" + "grey64\0" + "grey65\0" + "grey66\0" + "grey67\0" + "grey68\0" + "grey69\0" + "grey7\0" + "grey70\0" + "grey71\0" + "grey72\0" + "grey73\0" + "grey74\0" + "grey75\0" + "grey76\0" + "grey77\0" + "grey78\0" + "grey79\0" + "grey8\0" + "grey80\0" + "grey81\0" + "grey82\0" + "grey83\0" + "grey84\0" + "grey85\0" + "grey86\0" + "grey87\0" + "grey88\0" + "grey89\0" + "grey9\0" + "grey90\0" + "grey91\0" + "grey92\0" + "grey93\0" + "grey94\0" + "grey95\0" + "grey96\0" + "grey97\0" + "grey98\0" + "grey99\0" + "honeydew\0" + "honeydew1\0" + "honeydew2\0" + "honeydew3\0" + "honeydew4\0" + "hot pink\0" + "HotPink\0" + "HotPink1\0" + "HotPink2\0" + "HotPink3\0" + "HotPink4\0" + "indian red\0" + "IndianRed\0" + "IndianRed1\0" + "IndianRed2\0" + "IndianRed3\0" + "IndianRed4\0" + "indigo\0" + "ivory\0" + "ivory1\0" + "ivory2\0" + "ivory3\0" + "ivory4\0" + "khaki\0" + "khaki1\0" + "khaki2\0" + "khaki3\0" + "khaki4\0" + "lavender\0" + "lavender blush\0" + "LavenderBlush\0" + "LavenderBlush1\0" + "LavenderBlush2\0" + "LavenderBlush3\0" + "LavenderBlush4\0" + "lawn green\0" + "LawnGreen\0" + "lemon chiffon\0" + "LemonChiffon\0" + "LemonChiffon1\0" + "LemonChiffon2\0" + "LemonChiffon3\0" + "LemonChiffon4\0" + "light blue\0" + "light coral\0" + "light cyan\0" + "light goldenrod\0" + "light goldenrod yellow\0" + "light gray\0" + "light green\0" + "light grey\0" + "light pink\0" + "light salmon\0" + "light sea green\0" + "light sky blue\0" + "light slate blue\0" + "light slate gray\0" + "light slate grey\0" + "light steel blue\0" + "light yellow\0" + "LightBlue\0" + "LightBlue1\0" + "LightBlue2\0" + "LightBlue3\0" + "LightBlue4\0" + "LightCoral\0" + "LightCyan\0" + "LightCyan1\0" + "LightCyan2\0" + "LightCyan3\0" + "LightCyan4\0" + "LightGoldenrod\0" + "LightGoldenrod1\0" + "LightGoldenrod2\0" + "LightGoldenrod3\0" + "LightGoldenrod4\0" + "LightGoldenrodYellow\0" + "LightGray\0" + "LightGreen\0" + "LightGrey\0" + "LightPink\0" + "LightPink1\0" + "LightPink2\0" + "LightPink3\0" + "LightPink4\0" + "LightSalmon\0" + "LightSalmon1\0" + "LightSalmon2\0" + "LightSalmon3\0" + "LightSalmon4\0" + "LightSeaGreen\0" + "LightSkyBlue\0" + "LightSkyBlue1\0" + "LightSkyBlue2\0" + "LightSkyBlue3\0" + "LightSkyBlue4\0" + "LightSlateBlue\0" + "LightSlateGray\0" + "LightSlateGrey\0" + "LightSteelBlue\0" + "LightSteelBlue1\0" + "LightSteelBlue2\0" + "LightSteelBlue3\0" + "LightSteelBlue4\0" + "LightYellow\0" + "LightYellow1\0" + "LightYellow2\0" + "LightYellow3\0" + "LightYellow4\0" + "lime\0" + "lime green\0" + "LimeGreen\0" + "linen\0" + "magenta\0" + "magenta1\0" + "magenta2\0" + "magenta3\0" + "magenta4\0" + "maroon\0" + "maroon1\0" + "maroon2\0" + "maroon3\0" + "maroon4\0" + "medium aquamarine\0" + "medium blue\0" + "medium orchid\0" + "medium purple\0" + "medium sea green\0" + "medium slate blue\0" + "medium spring green\0" + "medium turquoise\0" + "medium violet red\0" + "MediumAquamarine\0" + "MediumBlue\0" + "MediumOrchid\0" + "MediumOrchid1\0" + "MediumOrchid2\0" + "MediumOrchid3\0" + "MediumOrchid4\0" + "MediumPurple\0" + "MediumPurple1\0" + "MediumPurple2\0" + "MediumPurple3\0" + "MediumPurple4\0" + "MediumSeaGreen\0" + "MediumSlateBlue\0" + "MediumSpringGreen\0" + "MediumTurquoise\0" + "MediumVioletRed\0" + "midnight blue\0" + "MidnightBlue\0" + "mint cream\0" + "MintCream\0" + "misty rose\0" + "MistyRose\0" + "MistyRose1\0" + "MistyRose2\0" + "MistyRose3\0" + "MistyRose4\0" + "moccasin\0" + "navajo white\0" + "NavajoWhite\0" + "NavajoWhite1\0" + "NavajoWhite2\0" + "NavajoWhite3\0" + "NavajoWhite4\0" + "navy\0" + "navy blue\0" + "NavyBlue\0" + "old lace\0" + "OldLace\0" + "olive\0" + "olive drab\0" + "OliveDrab\0" + "OliveDrab1\0" + "OliveDrab2\0" + "OliveDrab3\0" + "OliveDrab4\0" + "orange\0" + "orange red\0" + "orange1\0" + "orange2\0" + "orange3\0" + "orange4\0" + "OrangeRed\0" + "OrangeRed1\0" + "OrangeRed2\0" + "OrangeRed3\0" + "OrangeRed4\0" + "orchid\0" + "orchid1\0" + "orchid2\0" + "orchid3\0" + "orchid4\0" + "pale goldenrod\0" + "pale green\0" + "pale turquoise\0" + "pale violet red\0" + "PaleGoldenrod\0" + "PaleGreen\0" + "PaleGreen1\0" + "PaleGreen2\0" + "PaleGreen3\0" + "PaleGreen4\0" + "PaleTurquoise\0" + "PaleTurquoise1\0" + "PaleTurquoise2\0" + "PaleTurquoise3\0" + "PaleTurquoise4\0" + "PaleVioletRed\0" + "PaleVioletRed1\0" + "PaleVioletRed2\0" + "PaleVioletRed3\0" + "PaleVioletRed4\0" + "papaya whip\0" + "PapayaWhip\0" + "peach puff\0" + "PeachPuff\0" + "PeachPuff1\0" + "PeachPuff2\0" + "PeachPuff3\0" + "PeachPuff4\0" + "peru\0" + "pink\0" + "pink1\0" + "pink2\0" + "pink3\0" + "pink4\0" + "plum\0" + "plum1\0" + "plum2\0" + "plum3\0" + "plum4\0" + "powder blue\0" + "PowderBlue\0" + "purple\0" + "purple1\0" + "purple2\0" + "purple3\0" + "purple4\0" + "rebecca purple\0" + "RebeccaPurple\0" + "red\0" + "red1\0" + "red2\0" + "red3\0" + "red4\0" + "rosy brown\0" + "RosyBrown\0" + "RosyBrown1\0" + "RosyBrown2\0" + "RosyBrown3\0" + "RosyBrown4\0" + "royal blue\0" + "RoyalBlue\0" + "RoyalBlue1\0" + "RoyalBlue2\0" + "RoyalBlue3\0" + "RoyalBlue4\0" + "saddle brown\0" + "SaddleBrown\0" + "salmon\0" + "salmon1\0" + "salmon2\0" + "salmon3\0" + "salmon4\0" + "sandy brown\0" + "SandyBrown\0" + "sea green\0" + "SeaGreen\0" + "SeaGreen1\0" + "SeaGreen2\0" + "SeaGreen3\0" + "SeaGreen4\0" + "seashell\0" + "seashell1\0" + "seashell2\0" + "seashell3\0" + "seashell4\0" + "sienna\0" + "sienna1\0" + "sienna2\0" + "sienna3\0" + "sienna4\0" + "silver\0" + "sky blue\0" + "SkyBlue\0" + "SkyBlue1\0" + "SkyBlue2\0" + "SkyBlue3\0" + "SkyBlue4\0" + "slate blue\0" + "slate gray\0" + "slate grey\0" + "SlateBlue\0" + "SlateBlue1\0" + "SlateBlue2\0" + "SlateBlue3\0" + "SlateBlue4\0" + "SlateGray\0" + "SlateGray1\0" + "SlateGray2\0" + "SlateGray3\0" + "SlateGray4\0" + "SlateGrey\0" + "snow\0" + "snow1\0" + "snow2\0" + "snow3\0" + "snow4\0" + "spring green\0" + "SpringGreen\0" + "SpringGreen1\0" + "SpringGreen2\0" + "SpringGreen3\0" + "SpringGreen4\0" + "steel blue\0" + "SteelBlue\0" + "SteelBlue1\0" + "SteelBlue2\0" + "SteelBlue3\0" + "SteelBlue4\0" + "tan\0" + "tan1\0" + "tan2\0" + "tan3\0" + "tan4\0" + "teal\0" + "thistle\0" + "thistle1\0" + "thistle2\0" + "thistle3\0" + "thistle4\0" + "tomato\0" + "tomato1\0" + "tomato2\0" + "tomato3\0" + "tomato4\0" + "turquoise\0" + "turquoise1\0" + "turquoise2\0" + "turquoise3\0" + "turquoise4\0" + "violet\0" + "violet red\0" + "VioletRed\0" + "VioletRed1\0" + "VioletRed2\0" + "VioletRed3\0" + "VioletRed4\0" + "web gray\0" + "web green\0" + "web grey\0" + "web maroon\0" + "web purple\0" + "WebGray\0" + "WebGreen\0" + "WebGrey\0" + "WebMaroon\0" + "WebPurple\0" + "wheat\0" + "wheat1\0" + "wheat2\0" + "wheat3\0" + "wheat4\0" + "white\0" + "white smoke\0" + "WhiteSmoke\0" + "x11 gray\0" + "x11 green\0" + "x11 grey\0" + "x11 maroon\0" + "x11 purple\0" + "X11Gray\0" + "X11Green\0" + "X11Grey\0" + "X11Maroon\0" + "X11Purple\0" + "yellow\0" + "yellow green\0" + "yellow1\0" + "yellow2\0" + "yellow3\0" + "yellow4\0" + "YellowGreen\0" +}; + +static const BuiltinColor BuiltinColors[] = { + {240, 248, 255, 0}, /* alice blue */ + {240, 248, 255, 11}, /* AliceBlue */ + {250, 235, 215, 21}, /* antique white */ + {250, 235, 215, 35}, /* AntiqueWhite */ + {255, 239, 219, 48}, /* AntiqueWhite1 */ + {238, 223, 204, 62}, /* AntiqueWhite2 */ + {205, 192, 176, 76}, /* AntiqueWhite3 */ + {139, 131, 120, 90}, /* AntiqueWhite4 */ + {0, 255, 255, 104}, /* aqua */ + {127, 255, 212, 109}, /* aquamarine */ + {127, 255, 212, 120}, /* aquamarine1 */ + {118, 238, 198, 132}, /* aquamarine2 */ + {102, 205, 170, 144}, /* aquamarine3 */ + {69, 139, 116, 156}, /* aquamarine4 */ + {240, 255, 255, 168}, /* azure */ + {240, 255, 255, 174}, /* azure1 */ + {224, 238, 238, 181}, /* azure2 */ + {193, 205, 205, 188}, /* azure3 */ + {131, 139, 139, 195}, /* azure4 */ + {245, 245, 220, 202}, /* beige */ + {255, 228, 196, 208}, /* bisque */ + {255, 228, 196, 215}, /* bisque1 */ + {238, 213, 183, 223}, /* bisque2 */ + {205, 183, 158, 231}, /* bisque3 */ + {139, 125, 107, 239}, /* bisque4 */ + {0, 0, 0, 247}, /* black */ + {255, 235, 205, 253}, /* blanched almond */ + {255, 235, 205, 269}, /* BlanchedAlmond */ + {0, 0, 255, 284}, /* blue */ + {138, 43, 226, 289}, /* blue violet */ + {0, 0, 255, 301}, /* blue1 */ + {0, 0, 238, 307}, /* blue2 */ + {0, 0, 205, 313}, /* blue3 */ + {0, 0, 139, 319}, /* blue4 */ + {138, 43, 226, 325}, /* BlueViolet */ + {165, 42, 42, 336}, /* brown */ + {255, 64, 64, 342}, /* brown1 */ + {238, 59, 59, 349}, /* brown2 */ + {205, 51, 51, 356}, /* brown3 */ + {139, 35, 35, 363}, /* brown4 */ + {222, 184, 135, 370}, /* burlywood */ + {255, 211, 155, 380}, /* burlywood1 */ + {238, 197, 145, 391}, /* burlywood2 */ + {205, 170, 125, 402}, /* burlywood3 */ + {139, 115, 85, 413}, /* burlywood4 */ + {95, 158, 160, 424}, /* cadet blue */ + {95, 158, 160, 435}, /* CadetBlue */ + {152, 245, 255, 445}, /* CadetBlue1 */ + {142, 229, 238, 456}, /* CadetBlue2 */ + {122, 197, 205, 467}, /* CadetBlue3 */ + {83, 134, 139, 478}, /* CadetBlue4 */ + {127, 255, 0, 489}, /* chartreuse */ + {127, 255, 0, 500}, /* chartreuse1 */ + {118, 238, 0, 512}, /* chartreuse2 */ + {102, 205, 0, 524}, /* chartreuse3 */ + {69, 139, 0, 536}, /* chartreuse4 */ + {210, 105, 30, 548}, /* chocolate */ + {255, 127, 36, 558}, /* chocolate1 */ + {238, 118, 33, 569}, /* chocolate2 */ + {205, 102, 29, 580}, /* chocolate3 */ + {139, 69, 19, 591}, /* chocolate4 */ + {255, 127, 80, 602}, /* coral */ + {255, 114, 86, 608}, /* coral1 */ + {238, 106, 80, 615}, /* coral2 */ + {205, 91, 69, 622}, /* coral3 */ + {139, 62, 47, 629}, /* coral4 */ + {100, 149, 237, 636}, /* cornflower blue */ + {100, 149, 237, 652}, /* CornflowerBlue */ + {255, 248, 220, 667}, /* cornsilk */ + {255, 248, 220, 676}, /* cornsilk1 */ + {238, 232, 205, 686}, /* cornsilk2 */ + {205, 200, 177, 696}, /* cornsilk3 */ + {139, 136, 120, 706}, /* cornsilk4 */ + {220, 20, 60, 716}, /* crimson */ + {0, 255, 255, 724}, /* cyan */ + {0, 255, 255, 729}, /* cyan1 */ + {0, 238, 238, 735}, /* cyan2 */ + {0, 205, 205, 741}, /* cyan3 */ + {0, 139, 139, 747}, /* cyan4 */ + {0, 0, 139, 753}, /* dark blue */ + {0, 139, 139, 763}, /* dark cyan */ + {184, 134, 11, 773}, /* dark goldenrod */ + {169, 169, 169, 788}, /* dark gray */ + {0, 100, 0, 798}, /* dark green */ + {169, 169, 169, 809}, /* dark grey */ + {189, 183, 107, 819}, /* dark khaki */ + {139, 0, 139, 830}, /* dark magenta */ + {85, 107, 47, 843}, /* dark olive green */ + {255, 140, 0, 860}, /* dark orange */ + {153, 50, 204, 872}, /* dark orchid */ + {139, 0, 0, 884}, /* dark red */ + {233, 150, 122, 893}, /* dark salmon */ + {143, 188, 143, 905}, /* dark sea green */ + {72, 61, 139, 920}, /* dark slate blue */ + {47, 79, 79, 936}, /* dark slate gray */ + {47, 79, 79, 952}, /* dark slate grey */ + {0, 206, 209, 968}, /* dark turquoise */ + {148, 0, 211, 983}, /* dark violet */ + {0, 0, 139, 995}, /* DarkBlue */ + {0, 139, 139, 1004}, /* DarkCyan */ + {184, 134, 11, 1013}, /* DarkGoldenrod */ + {255, 185, 15, 1027}, /* DarkGoldenrod1 */ + {238, 173, 14, 1042}, /* DarkGoldenrod2 */ + {205, 149, 12, 1057}, /* DarkGoldenrod3 */ + {139, 101, 8, 1072}, /* DarkGoldenrod4 */ + {169, 169, 169, 1087}, /* DarkGray */ + {0, 100, 0, 1096}, /* DarkGreen */ + {169, 169, 169, 1106}, /* DarkGrey */ + {189, 183, 107, 1115}, /* DarkKhaki */ + {139, 0, 139, 1125}, /* DarkMagenta */ + {85, 107, 47, 1137}, /* DarkOliveGreen */ + {202, 255, 112, 1152}, /* DarkOliveGreen1 */ + {188, 238, 104, 1168}, /* DarkOliveGreen2 */ + {162, 205, 90, 1184}, /* DarkOliveGreen3 */ + {110, 139, 61, 1200}, /* DarkOliveGreen4 */ + {255, 140, 0, 1216}, /* DarkOrange */ + {255, 127, 0, 1227}, /* DarkOrange1 */ + {238, 118, 0, 1239}, /* DarkOrange2 */ + {205, 102, 0, 1251}, /* DarkOrange3 */ + {139, 69, 0, 1263}, /* DarkOrange4 */ + {153, 50, 204, 1275}, /* DarkOrchid */ + {191, 62, 255, 1286}, /* DarkOrchid1 */ + {178, 58, 238, 1298}, /* DarkOrchid2 */ + {154, 50, 205, 1310}, /* DarkOrchid3 */ + {104, 34, 139, 1322}, /* DarkOrchid4 */ + {139, 0, 0, 1334}, /* DarkRed */ + {233, 150, 122, 1342}, /* DarkSalmon */ + {143, 188, 143, 1353}, /* DarkSeaGreen */ + {193, 255, 193, 1366}, /* DarkSeaGreen1 */ + {180, 238, 180, 1380}, /* DarkSeaGreen2 */ + {155, 205, 155, 1394}, /* DarkSeaGreen3 */ + {105, 139, 105, 1408}, /* DarkSeaGreen4 */ + {72, 61, 139, 1422}, /* DarkSlateBlue */ + {47, 79, 79, 1436}, /* DarkSlateGray */ + {151, 255, 255, 1450}, /* DarkSlateGray1 */ + {141, 238, 238, 1465}, /* DarkSlateGray2 */ + {121, 205, 205, 1480}, /* DarkSlateGray3 */ + {82, 139, 139, 1495}, /* DarkSlateGray4 */ + {47, 79, 79, 1510}, /* DarkSlateGrey */ + {0, 206, 209, 1524}, /* DarkTurquoise */ + {148, 0, 211, 1538}, /* DarkViolet */ + {255, 20, 147, 1549}, /* deep pink */ + {0, 191, 255, 1559}, /* deep sky blue */ + {255, 20, 147, 1573}, /* DeepPink */ + {255, 20, 147, 1582}, /* DeepPink1 */ + {238, 18, 137, 1592}, /* DeepPink2 */ + {205, 16, 118, 1602}, /* DeepPink3 */ + {139, 10, 80, 1612}, /* DeepPink4 */ + {0, 191, 255, 1622}, /* DeepSkyBlue */ + {0, 191, 255, 1634}, /* DeepSkyBlue1 */ + {0, 178, 238, 1647}, /* DeepSkyBlue2 */ + {0, 154, 205, 1660}, /* DeepSkyBlue3 */ + {0, 104, 139, 1673}, /* DeepSkyBlue4 */ + {105, 105, 105, 1686}, /* dim gray */ + {105, 105, 105, 1695}, /* dim grey */ + {105, 105, 105, 1704}, /* DimGray */ + {105, 105, 105, 1712}, /* DimGrey */ + {30, 144, 255, 1720}, /* dodger blue */ + {30, 144, 255, 1732}, /* DodgerBlue */ + {30, 144, 255, 1743}, /* DodgerBlue1 */ + {28, 134, 238, 1755}, /* DodgerBlue2 */ + {24, 116, 205, 1767}, /* DodgerBlue3 */ + {16, 78, 139, 1779}, /* DodgerBlue4 */ + {178, 34, 34, 1791}, /* firebrick */ + {255, 48, 48, 1801}, /* firebrick1 */ + {238, 44, 44, 1812}, /* firebrick2 */ + {205, 38, 38, 1823}, /* firebrick3 */ + {139, 26, 26, 1834}, /* firebrick4 */ + {255, 250, 240, 1845}, /* floral white */ + {255, 250, 240, 1858}, /* FloralWhite */ + {34, 139, 34, 1870}, /* forest green */ + {34, 139, 34, 1883}, /* ForestGreen */ + {255, 0, 255, 1895}, /* fuchsia */ + {220, 220, 220, 1903}, /* gainsboro */ + {248, 248, 255, 1913}, /* ghost white */ + {248, 248, 255, 1925}, /* GhostWhite */ + {255, 215, 0, 1936}, /* gold */ + {255, 215, 0, 1941}, /* gold1 */ + {238, 201, 0, 1947}, /* gold2 */ + {205, 173, 0, 1953}, /* gold3 */ + {139, 117, 0, 1959}, /* gold4 */ + {218, 165, 32, 1965}, /* goldenrod */ + {255, 193, 37, 1975}, /* goldenrod1 */ + {238, 180, 34, 1986}, /* goldenrod2 */ + {205, 155, 29, 1997}, /* goldenrod3 */ + {139, 105, 20, 2008}, /* goldenrod4 */ + {190, 190, 190, 2019}, /* gray */ + {0, 0, 0, 2024}, /* gray0 */ + {3, 3, 3, 2030}, /* gray1 */ + {26, 26, 26, 2036}, /* gray10 */ + {255, 255, 255, 2043}, /* gray100 */ + {28, 28, 28, 2051}, /* gray11 */ + {31, 31, 31, 2058}, /* gray12 */ + {33, 33, 33, 2065}, /* gray13 */ + {36, 36, 36, 2072}, /* gray14 */ + {38, 38, 38, 2079}, /* gray15 */ + {41, 41, 41, 2086}, /* gray16 */ + {43, 43, 43, 2093}, /* gray17 */ + {46, 46, 46, 2100}, /* gray18 */ + {48, 48, 48, 2107}, /* gray19 */ + {5, 5, 5, 2114}, /* gray2 */ + {51, 51, 51, 2120}, /* gray20 */ + {54, 54, 54, 2127}, /* gray21 */ + {56, 56, 56, 2134}, /* gray22 */ + {59, 59, 59, 2141}, /* gray23 */ + {61, 61, 61, 2148}, /* gray24 */ + {64, 64, 64, 2155}, /* gray25 */ + {66, 66, 66, 2162}, /* gray26 */ + {69, 69, 69, 2169}, /* gray27 */ + {71, 71, 71, 2176}, /* gray28 */ + {74, 74, 74, 2183}, /* gray29 */ + {8, 8, 8, 2190}, /* gray3 */ + {77, 77, 77, 2196}, /* gray30 */ + {79, 79, 79, 2203}, /* gray31 */ + {82, 82, 82, 2210}, /* gray32 */ + {84, 84, 84, 2217}, /* gray33 */ + {87, 87, 87, 2224}, /* gray34 */ + {89, 89, 89, 2231}, /* gray35 */ + {92, 92, 92, 2238}, /* gray36 */ + {94, 94, 94, 2245}, /* gray37 */ + {97, 97, 97, 2252}, /* gray38 */ + {99, 99, 99, 2259}, /* gray39 */ + {10, 10, 10, 2266}, /* gray4 */ + {102, 102, 102, 2272}, /* gray40 */ + {105, 105, 105, 2279}, /* gray41 */ + {107, 107, 107, 2286}, /* gray42 */ + {110, 110, 110, 2293}, /* gray43 */ + {112, 112, 112, 2300}, /* gray44 */ + {115, 115, 115, 2307}, /* gray45 */ + {117, 117, 117, 2314}, /* gray46 */ + {120, 120, 120, 2321}, /* gray47 */ + {122, 122, 122, 2328}, /* gray48 */ + {125, 125, 125, 2335}, /* gray49 */ + {13, 13, 13, 2342}, /* gray5 */ + {127, 127, 127, 2348}, /* gray50 */ + {130, 130, 130, 2355}, /* gray51 */ + {133, 133, 133, 2362}, /* gray52 */ + {135, 135, 135, 2369}, /* gray53 */ + {138, 138, 138, 2376}, /* gray54 */ + {140, 140, 140, 2383}, /* gray55 */ + {143, 143, 143, 2390}, /* gray56 */ + {145, 145, 145, 2397}, /* gray57 */ + {148, 148, 148, 2404}, /* gray58 */ + {150, 150, 150, 2411}, /* gray59 */ + {15, 15, 15, 2418}, /* gray6 */ + {153, 153, 153, 2424}, /* gray60 */ + {156, 156, 156, 2431}, /* gray61 */ + {158, 158, 158, 2438}, /* gray62 */ + {161, 161, 161, 2445}, /* gray63 */ + {163, 163, 163, 2452}, /* gray64 */ + {166, 166, 166, 2459}, /* gray65 */ + {168, 168, 168, 2466}, /* gray66 */ + {171, 171, 171, 2473}, /* gray67 */ + {173, 173, 173, 2480}, /* gray68 */ + {176, 176, 176, 2487}, /* gray69 */ + {18, 18, 18, 2494}, /* gray7 */ + {179, 179, 179, 2500}, /* gray70 */ + {181, 181, 181, 2507}, /* gray71 */ + {184, 184, 184, 2514}, /* gray72 */ + {186, 186, 186, 2521}, /* gray73 */ + {189, 189, 189, 2528}, /* gray74 */ + {191, 191, 191, 2535}, /* gray75 */ + {194, 194, 194, 2542}, /* gray76 */ + {196, 196, 196, 2549}, /* gray77 */ + {199, 199, 199, 2556}, /* gray78 */ + {201, 201, 201, 2563}, /* gray79 */ + {20, 20, 20, 2570}, /* gray8 */ + {204, 204, 204, 2576}, /* gray80 */ + {207, 207, 207, 2583}, /* gray81 */ + {209, 209, 209, 2590}, /* gray82 */ + {212, 212, 212, 2597}, /* gray83 */ + {214, 214, 214, 2604}, /* gray84 */ + {217, 217, 217, 2611}, /* gray85 */ + {219, 219, 219, 2618}, /* gray86 */ + {222, 222, 222, 2625}, /* gray87 */ + {224, 224, 224, 2632}, /* gray88 */ + {227, 227, 227, 2639}, /* gray89 */ + {23, 23, 23, 2646}, /* gray9 */ + {229, 229, 229, 2652}, /* gray90 */ + {232, 232, 232, 2659}, /* gray91 */ + {235, 235, 235, 2666}, /* gray92 */ + {237, 237, 237, 2673}, /* gray93 */ + {240, 240, 240, 2680}, /* gray94 */ + {242, 242, 242, 2687}, /* gray95 */ + {245, 245, 245, 2694}, /* gray96 */ + {247, 247, 247, 2701}, /* gray97 */ + {250, 250, 250, 2708}, /* gray98 */ + {252, 252, 252, 2715}, /* gray99 */ + {0, 255, 0, 2722}, /* green */ + {173, 255, 47, 2728}, /* green yellow */ + {0, 255, 0, 2741}, /* green1 */ + {0, 238, 0, 2748}, /* green2 */ + {0, 205, 0, 2755}, /* green3 */ + {0, 139, 0, 2762}, /* green4 */ + {173, 255, 47, 2769}, /* GreenYellow */ + {190, 190, 190, 2781}, /* grey */ + {0, 0, 0, 2786}, /* grey0 */ + {3, 3, 3, 2792}, /* grey1 */ + {26, 26, 26, 2798}, /* grey10 */ + {255, 255, 255, 2805}, /* grey100 */ + {28, 28, 28, 2813}, /* grey11 */ + {31, 31, 31, 2820}, /* grey12 */ + {33, 33, 33, 2827}, /* grey13 */ + {36, 36, 36, 2834}, /* grey14 */ + {38, 38, 38, 2841}, /* grey15 */ + {41, 41, 41, 2848}, /* grey16 */ + {43, 43, 43, 2855}, /* grey17 */ + {46, 46, 46, 2862}, /* grey18 */ + {48, 48, 48, 2869}, /* grey19 */ + {5, 5, 5, 2876}, /* grey2 */ + {51, 51, 51, 2882}, /* grey20 */ + {54, 54, 54, 2889}, /* grey21 */ + {56, 56, 56, 2896}, /* grey22 */ + {59, 59, 59, 2903}, /* grey23 */ + {61, 61, 61, 2910}, /* grey24 */ + {64, 64, 64, 2917}, /* grey25 */ + {66, 66, 66, 2924}, /* grey26 */ + {69, 69, 69, 2931}, /* grey27 */ + {71, 71, 71, 2938}, /* grey28 */ + {74, 74, 74, 2945}, /* grey29 */ + {8, 8, 8, 2952}, /* grey3 */ + {77, 77, 77, 2958}, /* grey30 */ + {79, 79, 79, 2965}, /* grey31 */ + {82, 82, 82, 2972}, /* grey32 */ + {84, 84, 84, 2979}, /* grey33 */ + {87, 87, 87, 2986}, /* grey34 */ + {89, 89, 89, 2993}, /* grey35 */ + {92, 92, 92, 3000}, /* grey36 */ + {94, 94, 94, 3007}, /* grey37 */ + {97, 97, 97, 3014}, /* grey38 */ + {99, 99, 99, 3021}, /* grey39 */ + {10, 10, 10, 3028}, /* grey4 */ + {102, 102, 102, 3034}, /* grey40 */ + {105, 105, 105, 3041}, /* grey41 */ + {107, 107, 107, 3048}, /* grey42 */ + {110, 110, 110, 3055}, /* grey43 */ + {112, 112, 112, 3062}, /* grey44 */ + {115, 115, 115, 3069}, /* grey45 */ + {117, 117, 117, 3076}, /* grey46 */ + {120, 120, 120, 3083}, /* grey47 */ + {122, 122, 122, 3090}, /* grey48 */ + {125, 125, 125, 3097}, /* grey49 */ + {13, 13, 13, 3104}, /* grey5 */ + {127, 127, 127, 3110}, /* grey50 */ + {130, 130, 130, 3117}, /* grey51 */ + {133, 133, 133, 3124}, /* grey52 */ + {135, 135, 135, 3131}, /* grey53 */ + {138, 138, 138, 3138}, /* grey54 */ + {140, 140, 140, 3145}, /* grey55 */ + {143, 143, 143, 3152}, /* grey56 */ + {145, 145, 145, 3159}, /* grey57 */ + {148, 148, 148, 3166}, /* grey58 */ + {150, 150, 150, 3173}, /* grey59 */ + {15, 15, 15, 3180}, /* grey6 */ + {153, 153, 153, 3186}, /* grey60 */ + {156, 156, 156, 3193}, /* grey61 */ + {158, 158, 158, 3200}, /* grey62 */ + {161, 161, 161, 3207}, /* grey63 */ + {163, 163, 163, 3214}, /* grey64 */ + {166, 166, 166, 3221}, /* grey65 */ + {168, 168, 168, 3228}, /* grey66 */ + {171, 171, 171, 3235}, /* grey67 */ + {173, 173, 173, 3242}, /* grey68 */ + {176, 176, 176, 3249}, /* grey69 */ + {18, 18, 18, 3256}, /* grey7 */ + {179, 179, 179, 3262}, /* grey70 */ + {181, 181, 181, 3269}, /* grey71 */ + {184, 184, 184, 3276}, /* grey72 */ + {186, 186, 186, 3283}, /* grey73 */ + {189, 189, 189, 3290}, /* grey74 */ + {191, 191, 191, 3297}, /* grey75 */ + {194, 194, 194, 3304}, /* grey76 */ + {196, 196, 196, 3311}, /* grey77 */ + {199, 199, 199, 3318}, /* grey78 */ + {201, 201, 201, 3325}, /* grey79 */ + {20, 20, 20, 3332}, /* grey8 */ + {204, 204, 204, 3338}, /* grey80 */ + {207, 207, 207, 3345}, /* grey81 */ + {209, 209, 209, 3352}, /* grey82 */ + {212, 212, 212, 3359}, /* grey83 */ + {214, 214, 214, 3366}, /* grey84 */ + {217, 217, 217, 3373}, /* grey85 */ + {219, 219, 219, 3380}, /* grey86 */ + {222, 222, 222, 3387}, /* grey87 */ + {224, 224, 224, 3394}, /* grey88 */ + {227, 227, 227, 3401}, /* grey89 */ + {23, 23, 23, 3408}, /* grey9 */ + {229, 229, 229, 3414}, /* grey90 */ + {232, 232, 232, 3421}, /* grey91 */ + {235, 235, 235, 3428}, /* grey92 */ + {237, 237, 237, 3435}, /* grey93 */ + {240, 240, 240, 3442}, /* grey94 */ + {242, 242, 242, 3449}, /* grey95 */ + {245, 245, 245, 3456}, /* grey96 */ + {247, 247, 247, 3463}, /* grey97 */ + {250, 250, 250, 3470}, /* grey98 */ + {252, 252, 252, 3477}, /* grey99 */ + {240, 255, 240, 3484}, /* honeydew */ + {240, 255, 240, 3493}, /* honeydew1 */ + {224, 238, 224, 3503}, /* honeydew2 */ + {193, 205, 193, 3513}, /* honeydew3 */ + {131, 139, 131, 3523}, /* honeydew4 */ + {255, 105, 180, 3533}, /* hot pink */ + {255, 105, 180, 3542}, /* HotPink */ + {255, 110, 180, 3550}, /* HotPink1 */ + {238, 106, 167, 3559}, /* HotPink2 */ + {205, 96, 144, 3568}, /* HotPink3 */ + {139, 58, 98, 3577}, /* HotPink4 */ + {205, 92, 92, 3586}, /* indian red */ + {205, 92, 92, 3597}, /* IndianRed */ + {255, 106, 106, 3607}, /* IndianRed1 */ + {238, 99, 99, 3618}, /* IndianRed2 */ + {205, 85, 85, 3629}, /* IndianRed3 */ + {139, 58, 58, 3640}, /* IndianRed4 */ + {75, 0, 130, 3651}, /* indigo */ + {255, 255, 240, 3658}, /* ivory */ + {255, 255, 240, 3664}, /* ivory1 */ + {238, 238, 224, 3671}, /* ivory2 */ + {205, 205, 193, 3678}, /* ivory3 */ + {139, 139, 131, 3685}, /* ivory4 */ + {240, 230, 140, 3692}, /* khaki */ + {255, 246, 143, 3698}, /* khaki1 */ + {238, 230, 133, 3705}, /* khaki2 */ + {205, 198, 115, 3712}, /* khaki3 */ + {139, 134, 78, 3719}, /* khaki4 */ + {230, 230, 250, 3726}, /* lavender */ + {255, 240, 245, 3735}, /* lavender blush */ + {255, 240, 245, 3750}, /* LavenderBlush */ + {255, 240, 245, 3764}, /* LavenderBlush1 */ + {238, 224, 229, 3779}, /* LavenderBlush2 */ + {205, 193, 197, 3794}, /* LavenderBlush3 */ + {139, 131, 134, 3809}, /* LavenderBlush4 */ + {124, 252, 0, 3824}, /* lawn green */ + {124, 252, 0, 3835}, /* LawnGreen */ + {255, 250, 205, 3845}, /* lemon chiffon */ + {255, 250, 205, 3859}, /* LemonChiffon */ + {255, 250, 205, 3872}, /* LemonChiffon1 */ + {238, 233, 191, 3886}, /* LemonChiffon2 */ + {205, 201, 165, 3900}, /* LemonChiffon3 */ + {139, 137, 112, 3914}, /* LemonChiffon4 */ + {173, 216, 230, 3928}, /* light blue */ + {240, 128, 128, 3939}, /* light coral */ + {224, 255, 255, 3951}, /* light cyan */ + {238, 221, 130, 3962}, /* light goldenrod */ + {250, 250, 210, 3978}, /* light goldenrod yellow */ + {211, 211, 211, 4001}, /* light gray */ + {144, 238, 144, 4012}, /* light green */ + {211, 211, 211, 4024}, /* light grey */ + {255, 182, 193, 4035}, /* light pink */ + {255, 160, 122, 4046}, /* light salmon */ + {32, 178, 170, 4059}, /* light sea green */ + {135, 206, 250, 4075}, /* light sky blue */ + {132, 112, 255, 4090}, /* light slate blue */ + {119, 136, 153, 4107}, /* light slate gray */ + {119, 136, 153, 4124}, /* light slate grey */ + {176, 196, 222, 4141}, /* light steel blue */ + {255, 255, 224, 4158}, /* light yellow */ + {173, 216, 230, 4171}, /* LightBlue */ + {191, 239, 255, 4181}, /* LightBlue1 */ + {178, 223, 238, 4192}, /* LightBlue2 */ + {154, 192, 205, 4203}, /* LightBlue3 */ + {104, 131, 139, 4214}, /* LightBlue4 */ + {240, 128, 128, 4225}, /* LightCoral */ + {224, 255, 255, 4236}, /* LightCyan */ + {224, 255, 255, 4246}, /* LightCyan1 */ + {209, 238, 238, 4257}, /* LightCyan2 */ + {180, 205, 205, 4268}, /* LightCyan3 */ + {122, 139, 139, 4279}, /* LightCyan4 */ + {238, 221, 130, 4290}, /* LightGoldenrod */ + {255, 236, 139, 4305}, /* LightGoldenrod1 */ + {238, 220, 130, 4321}, /* LightGoldenrod2 */ + {205, 190, 112, 4337}, /* LightGoldenrod3 */ + {139, 129, 76, 4353}, /* LightGoldenrod4 */ + {250, 250, 210, 4369}, /* LightGoldenrodYellow */ + {211, 211, 211, 4390}, /* LightGray */ + {144, 238, 144, 4400}, /* LightGreen */ + {211, 211, 211, 4411}, /* LightGrey */ + {255, 182, 193, 4421}, /* LightPink */ + {255, 174, 185, 4431}, /* LightPink1 */ + {238, 162, 173, 4442}, /* LightPink2 */ + {205, 140, 149, 4453}, /* LightPink3 */ + {139, 95, 101, 4464}, /* LightPink4 */ + {255, 160, 122, 4475}, /* LightSalmon */ + {255, 160, 122, 4487}, /* LightSalmon1 */ + {238, 149, 114, 4500}, /* LightSalmon2 */ + {205, 129, 98, 4513}, /* LightSalmon3 */ + {139, 87, 66, 4526}, /* LightSalmon4 */ + {32, 178, 170, 4539}, /* LightSeaGreen */ + {135, 206, 250, 4553}, /* LightSkyBlue */ + {176, 226, 255, 4566}, /* LightSkyBlue1 */ + {164, 211, 238, 4580}, /* LightSkyBlue2 */ + {141, 182, 205, 4594}, /* LightSkyBlue3 */ + {96, 123, 139, 4608}, /* LightSkyBlue4 */ + {132, 112, 255, 4622}, /* LightSlateBlue */ + {119, 136, 153, 4637}, /* LightSlateGray */ + {119, 136, 153, 4652}, /* LightSlateGrey */ + {176, 196, 222, 4667}, /* LightSteelBlue */ + {202, 225, 255, 4682}, /* LightSteelBlue1 */ + {188, 210, 238, 4698}, /* LightSteelBlue2 */ + {162, 181, 205, 4714}, /* LightSteelBlue3 */ + {110, 123, 139, 4730}, /* LightSteelBlue4 */ + {255, 255, 224, 4746}, /* LightYellow */ + {255, 255, 224, 4758}, /* LightYellow1 */ + {238, 238, 209, 4771}, /* LightYellow2 */ + {205, 205, 180, 4784}, /* LightYellow3 */ + {139, 139, 122, 4797}, /* LightYellow4 */ + {0, 255, 0, 4810}, /* lime */ + {50, 205, 50, 4815}, /* lime green */ + {50, 205, 50, 4826}, /* LimeGreen */ + {250, 240, 230, 4836}, /* linen */ + {255, 0, 255, 4842}, /* magenta */ + {255, 0, 255, 4850}, /* magenta1 */ + {238, 0, 238, 4859}, /* magenta2 */ + {205, 0, 205, 4868}, /* magenta3 */ + {139, 0, 139, 4877}, /* magenta4 */ + {176, 48, 96, 4886}, /* maroon */ + {255, 52, 179, 4893}, /* maroon1 */ + {238, 48, 167, 4901}, /* maroon2 */ + {205, 41, 144, 4909}, /* maroon3 */ + {139, 28, 98, 4917}, /* maroon4 */ + {102, 205, 170, 4925}, /* medium aquamarine */ + {0, 0, 205, 4943}, /* medium blue */ + {186, 85, 211, 4955}, /* medium orchid */ + {147, 112, 219, 4969}, /* medium purple */ + {60, 179, 113, 4983}, /* medium sea green */ + {123, 104, 238, 5000}, /* medium slate blue */ + {0, 250, 154, 5018}, /* medium spring green */ + {72, 209, 204, 5038}, /* medium turquoise */ + {199, 21, 133, 5055}, /* medium violet red */ + {102, 205, 170, 5073}, /* MediumAquamarine */ + {0, 0, 205, 5090}, /* MediumBlue */ + {186, 85, 211, 5101}, /* MediumOrchid */ + {224, 102, 255, 5114}, /* MediumOrchid1 */ + {209, 95, 238, 5128}, /* MediumOrchid2 */ + {180, 82, 205, 5142}, /* MediumOrchid3 */ + {122, 55, 139, 5156}, /* MediumOrchid4 */ + {147, 112, 219, 5170}, /* MediumPurple */ + {171, 130, 255, 5183}, /* MediumPurple1 */ + {159, 121, 238, 5197}, /* MediumPurple2 */ + {137, 104, 205, 5211}, /* MediumPurple3 */ + {93, 71, 139, 5225}, /* MediumPurple4 */ + {60, 179, 113, 5239}, /* MediumSeaGreen */ + {123, 104, 238, 5254}, /* MediumSlateBlue */ + {0, 250, 154, 5270}, /* MediumSpringGreen */ + {72, 209, 204, 5288}, /* MediumTurquoise */ + {199, 21, 133, 5304}, /* MediumVioletRed */ + {25, 25, 112, 5320}, /* midnight blue */ + {25, 25, 112, 5334}, /* MidnightBlue */ + {245, 255, 250, 5347}, /* mint cream */ + {245, 255, 250, 5358}, /* MintCream */ + {255, 228, 225, 5368}, /* misty rose */ + {255, 228, 225, 5379}, /* MistyRose */ + {255, 228, 225, 5389}, /* MistyRose1 */ + {238, 213, 210, 5400}, /* MistyRose2 */ + {205, 183, 181, 5411}, /* MistyRose3 */ + {139, 125, 123, 5422}, /* MistyRose4 */ + {255, 228, 181, 5433}, /* moccasin */ + {255, 222, 173, 5442}, /* navajo white */ + {255, 222, 173, 5455}, /* NavajoWhite */ + {255, 222, 173, 5467}, /* NavajoWhite1 */ + {238, 207, 161, 5480}, /* NavajoWhite2 */ + {205, 179, 139, 5493}, /* NavajoWhite3 */ + {139, 121, 94, 5506}, /* NavajoWhite4 */ + {0, 0, 128, 5519}, /* navy */ + {0, 0, 128, 5524}, /* navy blue */ + {0, 0, 128, 5534}, /* NavyBlue */ + {253, 245, 230, 5543}, /* old lace */ + {253, 245, 230, 5552}, /* OldLace */ + {128, 128, 0, 5560}, /* olive */ + {107, 142, 35, 5566}, /* olive drab */ + {107, 142, 35, 5577}, /* OliveDrab */ + {192, 255, 62, 5587}, /* OliveDrab1 */ + {179, 238, 58, 5598}, /* OliveDrab2 */ + {154, 205, 50, 5609}, /* OliveDrab3 */ + {105, 139, 34, 5620}, /* OliveDrab4 */ + {255, 165, 0, 5631}, /* orange */ + {255, 69, 0, 5638}, /* orange red */ + {255, 165, 0, 5649}, /* orange1 */ + {238, 154, 0, 5657}, /* orange2 */ + {205, 133, 0, 5665}, /* orange3 */ + {139, 90, 0, 5673}, /* orange4 */ + {255, 69, 0, 5681}, /* OrangeRed */ + {255, 69, 0, 5691}, /* OrangeRed1 */ + {238, 64, 0, 5702}, /* OrangeRed2 */ + {205, 55, 0, 5713}, /* OrangeRed3 */ + {139, 37, 0, 5724}, /* OrangeRed4 */ + {218, 112, 214, 5735}, /* orchid */ + {255, 131, 250, 5742}, /* orchid1 */ + {238, 122, 233, 5750}, /* orchid2 */ + {205, 105, 201, 5758}, /* orchid3 */ + {139, 71, 137, 5766}, /* orchid4 */ + {238, 232, 170, 5774}, /* pale goldenrod */ + {152, 251, 152, 5789}, /* pale green */ + {175, 238, 238, 5800}, /* pale turquoise */ + {219, 112, 147, 5815}, /* pale violet red */ + {238, 232, 170, 5831}, /* PaleGoldenrod */ + {152, 251, 152, 5845}, /* PaleGreen */ + {154, 255, 154, 5855}, /* PaleGreen1 */ + {144, 238, 144, 5866}, /* PaleGreen2 */ + {124, 205, 124, 5877}, /* PaleGreen3 */ + {84, 139, 84, 5888}, /* PaleGreen4 */ + {175, 238, 238, 5899}, /* PaleTurquoise */ + {187, 255, 255, 5913}, /* PaleTurquoise1 */ + {174, 238, 238, 5928}, /* PaleTurquoise2 */ + {150, 205, 205, 5943}, /* PaleTurquoise3 */ + {102, 139, 139, 5958}, /* PaleTurquoise4 */ + {219, 112, 147, 5973}, /* PaleVioletRed */ + {255, 130, 171, 5987}, /* PaleVioletRed1 */ + {238, 121, 159, 6002}, /* PaleVioletRed2 */ + {205, 104, 137, 6017}, /* PaleVioletRed3 */ + {139, 71, 93, 6032}, /* PaleVioletRed4 */ + {255, 239, 213, 6047}, /* papaya whip */ + {255, 239, 213, 6059}, /* PapayaWhip */ + {255, 218, 185, 6070}, /* peach puff */ + {255, 218, 185, 6081}, /* PeachPuff */ + {255, 218, 185, 6091}, /* PeachPuff1 */ + {238, 203, 173, 6102}, /* PeachPuff2 */ + {205, 175, 149, 6113}, /* PeachPuff3 */ + {139, 119, 101, 6124}, /* PeachPuff4 */ + {205, 133, 63, 6135}, /* peru */ + {255, 192, 203, 6140}, /* pink */ + {255, 181, 197, 6145}, /* pink1 */ + {238, 169, 184, 6151}, /* pink2 */ + {205, 145, 158, 6157}, /* pink3 */ + {139, 99, 108, 6163}, /* pink4 */ + {221, 160, 221, 6169}, /* plum */ + {255, 187, 255, 6174}, /* plum1 */ + {238, 174, 238, 6180}, /* plum2 */ + {205, 150, 205, 6186}, /* plum3 */ + {139, 102, 139, 6192}, /* plum4 */ + {176, 224, 230, 6198}, /* powder blue */ + {176, 224, 230, 6210}, /* PowderBlue */ + {160, 32, 240, 6221}, /* purple */ + {155, 48, 255, 6228}, /* purple1 */ + {145, 44, 238, 6236}, /* purple2 */ + {125, 38, 205, 6244}, /* purple3 */ + {85, 26, 139, 6252}, /* purple4 */ + {102, 51, 153, 6260}, /* rebecca purple */ + {102, 51, 153, 6275}, /* RebeccaPurple */ + {255, 0, 0, 6289}, /* red */ + {255, 0, 0, 6293}, /* red1 */ + {238, 0, 0, 6298}, /* red2 */ + {205, 0, 0, 6303}, /* red3 */ + {139, 0, 0, 6308}, /* red4 */ + {188, 143, 143, 6313}, /* rosy brown */ + {188, 143, 143, 6324}, /* RosyBrown */ + {255, 193, 193, 6334}, /* RosyBrown1 */ + {238, 180, 180, 6345}, /* RosyBrown2 */ + {205, 155, 155, 6356}, /* RosyBrown3 */ + {139, 105, 105, 6367}, /* RosyBrown4 */ + {65, 105, 225, 6378}, /* royal blue */ + {65, 105, 225, 6389}, /* RoyalBlue */ + {72, 118, 255, 6399}, /* RoyalBlue1 */ + {67, 110, 238, 6410}, /* RoyalBlue2 */ + {58, 95, 205, 6421}, /* RoyalBlue3 */ + {39, 64, 139, 6432}, /* RoyalBlue4 */ + {139, 69, 19, 6443}, /* saddle brown */ + {139, 69, 19, 6456}, /* SaddleBrown */ + {250, 128, 114, 6468}, /* salmon */ + {255, 140, 105, 6475}, /* salmon1 */ + {238, 130, 98, 6483}, /* salmon2 */ + {205, 112, 84, 6491}, /* salmon3 */ + {139, 76, 57, 6499}, /* salmon4 */ + {244, 164, 96, 6507}, /* sandy brown */ + {244, 164, 96, 6519}, /* SandyBrown */ + {46, 139, 87, 6530}, /* sea green */ + {46, 139, 87, 6540}, /* SeaGreen */ + {84, 255, 159, 6549}, /* SeaGreen1 */ + {78, 238, 148, 6559}, /* SeaGreen2 */ + {67, 205, 128, 6569}, /* SeaGreen3 */ + {46, 139, 87, 6579}, /* SeaGreen4 */ + {255, 245, 238, 6589}, /* seashell */ + {255, 245, 238, 6598}, /* seashell1 */ + {238, 229, 222, 6608}, /* seashell2 */ + {205, 197, 191, 6618}, /* seashell3 */ + {139, 134, 130, 6628}, /* seashell4 */ + {160, 82, 45, 6638}, /* sienna */ + {255, 130, 71, 6645}, /* sienna1 */ + {238, 121, 66, 6653}, /* sienna2 */ + {205, 104, 57, 6661}, /* sienna3 */ + {139, 71, 38, 6669}, /* sienna4 */ + {192, 192, 192, 6677}, /* silver */ + {135, 206, 235, 6684}, /* sky blue */ + {135, 206, 235, 6693}, /* SkyBlue */ + {135, 206, 255, 6701}, /* SkyBlue1 */ + {126, 192, 238, 6710}, /* SkyBlue2 */ + {108, 166, 205, 6719}, /* SkyBlue3 */ + {74, 112, 139, 6728}, /* SkyBlue4 */ + {106, 90, 205, 6737}, /* slate blue */ + {112, 128, 144, 6748}, /* slate gray */ + {112, 128, 144, 6759}, /* slate grey */ + {106, 90, 205, 6770}, /* SlateBlue */ + {131, 111, 255, 6780}, /* SlateBlue1 */ + {122, 103, 238, 6791}, /* SlateBlue2 */ + {105, 89, 205, 6802}, /* SlateBlue3 */ + {71, 60, 139, 6813}, /* SlateBlue4 */ + {112, 128, 144, 6824}, /* SlateGray */ + {198, 226, 255, 6834}, /* SlateGray1 */ + {185, 211, 238, 6845}, /* SlateGray2 */ + {159, 182, 205, 6856}, /* SlateGray3 */ + {108, 123, 139, 6867}, /* SlateGray4 */ + {112, 128, 144, 6878}, /* SlateGrey */ + {255, 250, 250, 6888}, /* snow */ + {255, 250, 250, 6893}, /* snow1 */ + {238, 233, 233, 6899}, /* snow2 */ + {205, 201, 201, 6905}, /* snow3 */ + {139, 137, 137, 6911}, /* snow4 */ + {0, 255, 127, 6917}, /* spring green */ + {0, 255, 127, 6930}, /* SpringGreen */ + {0, 255, 127, 6942}, /* SpringGreen1 */ + {0, 238, 118, 6955}, /* SpringGreen2 */ + {0, 205, 102, 6968}, /* SpringGreen3 */ + {0, 139, 69, 6981}, /* SpringGreen4 */ + {70, 130, 180, 6994}, /* steel blue */ + {70, 130, 180, 7005}, /* SteelBlue */ + {99, 184, 255, 7015}, /* SteelBlue1 */ + {92, 172, 238, 7026}, /* SteelBlue2 */ + {79, 148, 205, 7037}, /* SteelBlue3 */ + {54, 100, 139, 7048}, /* SteelBlue4 */ + {210, 180, 140, 7059}, /* tan */ + {255, 165, 79, 7063}, /* tan1 */ + {238, 154, 73, 7068}, /* tan2 */ + {205, 133, 63, 7073}, /* tan3 */ + {139, 90, 43, 7078}, /* tan4 */ + {0, 128, 128, 7083}, /* teal */ + {216, 191, 216, 7088}, /* thistle */ + {255, 225, 255, 7096}, /* thistle1 */ + {238, 210, 238, 7105}, /* thistle2 */ + {205, 181, 205, 7114}, /* thistle3 */ + {139, 123, 139, 7123}, /* thistle4 */ + {255, 99, 71, 7132}, /* tomato */ + {255, 99, 71, 7139}, /* tomato1 */ + {238, 92, 66, 7147}, /* tomato2 */ + {205, 79, 57, 7155}, /* tomato3 */ + {139, 54, 38, 7163}, /* tomato4 */ + {64, 224, 208, 7171}, /* turquoise */ + {0, 245, 255, 7181}, /* turquoise1 */ + {0, 229, 238, 7192}, /* turquoise2 */ + {0, 197, 205, 7203}, /* turquoise3 */ + {0, 134, 139, 7214}, /* turquoise4 */ + {238, 130, 238, 7225}, /* violet */ + {208, 32, 144, 7232}, /* violet red */ + {208, 32, 144, 7243}, /* VioletRed */ + {255, 62, 150, 7253}, /* VioletRed1 */ + {238, 58, 140, 7264}, /* VioletRed2 */ + {205, 50, 120, 7275}, /* VioletRed3 */ + {139, 34, 82, 7286}, /* VioletRed4 */ + {128, 128, 128, 7297}, /* web gray */ + {0, 128, 0, 7306}, /* web green */ + {128, 128, 128, 7316}, /* web grey */ + {128, 0, 0, 7325}, /* web maroon */ + {128, 0, 128, 7336}, /* web purple */ + {128, 128, 128, 7347}, /* WebGray */ + {0, 128, 0, 7355}, /* WebGreen */ + {128, 128, 128, 7364}, /* WebGrey */ + {128, 0, 0, 7372}, /* WebMaroon */ + {128, 0, 128, 7382}, /* WebPurple */ + {245, 222, 179, 7392}, /* wheat */ + {255, 231, 186, 7398}, /* wheat1 */ + {238, 216, 174, 7405}, /* wheat2 */ + {205, 186, 150, 7412}, /* wheat3 */ + {139, 126, 102, 7419}, /* wheat4 */ + {255, 255, 255, 7426}, /* white */ + {245, 245, 245, 7432}, /* white smoke */ + {245, 245, 245, 7444}, /* WhiteSmoke */ + {190, 190, 190, 7455}, /* x11 gray */ + {0, 255, 0, 7464}, /* x11 green */ + {190, 190, 190, 7474}, /* x11 grey */ + {176, 48, 96, 7483}, /* x11 maroon */ + {160, 32, 240, 7494}, /* x11 purple */ + {190, 190, 190, 7505}, /* X11Gray */ + {0, 255, 0, 7513}, /* X11Green */ + {190, 190, 190, 7522}, /* X11Grey */ + {176, 48, 96, 7530}, /* X11Maroon */ + {160, 32, 240, 7540}, /* X11Purple */ + {255, 255, 0, 7550}, /* yellow */ + {154, 205, 50, 7557}, /* yellow green */ + {255, 255, 0, 7570}, /* yellow1 */ + {238, 238, 0, 7578}, /* yellow2 */ + {205, 205, 0, 7586}, /* yellow3 */ + {139, 139, 0, 7594}, /* yellow4 */ + {154, 205, 50, 7602}, /* YellowGreen */ +}; + +#define NUM_BUILTIN_COLORS (sizeof (BuiltinColors) / sizeof (BuiltinColors[0])) Bool -OsInitColors(void) +OsLookupColor(int screen, + char *name, + unsigned int len, + unsigned short *pred, + unsigned short *pgreen, unsigned short *pblue) { - FILE *rgb; - char *path; - char line[BUFSIZ]; - char name[BUFSIZ]; - int red, green, blue, lineno = 0; - dbEntryPtr entry; - - static Bool was_here = FALSE; - - if (!was_here) - { -#ifdef NX_TRANS_SOCKET - /* - * Add the trailing '.txt' if a - * 'rgb' file is not found. - */ - - struct stat statbuf; - - path = (char*)ALLOCATE_LOCAL(strlen(_NXGetRgbPath(rgbPath)) + 5); - strcpy(path, _NXGetRgbPath(rgbPath)); - - if (stat(path, &statbuf) != 0) - { - strcat(path, ".txt"); - } -#else - path = (char*)ALLOCATE_LOCAL(strlen(rgbPath) +5); - strcpy(path, rgbPath); - strcat(path, ".txt"); -#endif - if (!(rgb = fopen(path, "r"))) - { -#ifdef NX_TRANS_SOCKET - ErrorF( "Couldn't open RGB_DB '%s'\n", _NXGetRgbPath(rgbPath)); -#else - ErrorF( "Couldn't open RGB_DB '%s'\n", rgbPath ); -#endif - DEALLOCATE_LOCAL(path); - return FALSE; - } - - while(fgets(line, sizeof(line), rgb)) - { - lineno++; - if (sscanf(line,"%d %d %d %[^\n]\n", &red, &green, &blue, name) == 4) - { - if (red >= 0 && red <= 0xff && - green >= 0 && green <= 0xff && - blue >= 0 && blue <= 0xff) - { - if ((entry = lookup(name, strlen(name), TRUE))) - { - entry->red = (red * 65535) / 255; - entry->green = (green * 65535) / 255; - entry->blue = (blue * 65535) / 255; - } - } - else - ErrorF("Value out of range: %s:%d\n", path, lineno); - } - else if (*line && *line != '#' && *line != '!') - ErrorF("Syntax Error: %s:%d\n", path, lineno); - } - - fclose(rgb); - DEALLOCATE_LOCAL(path); - - was_here = TRUE; - } - - return TRUE; -} - - - -Bool -OsLookupColor(int screen, char *name, unsigned int len, - unsigned short *pred, unsigned short *pgreen, unsigned short *pblue) -{ - dbEntryPtr entry; - - if ((entry = lookup(name, len, FALSE))) - { - *pred = entry->red; - *pgreen = entry->green; - *pblue = entry->blue; - return TRUE; + const BuiltinColor *c; + int low, mid, high; + int r; + + low = 0; + high = NUM_BUILTIN_COLORS - 1; + while (high >= low) { + mid = (low + high) / 2; + c = &BuiltinColors[mid]; + r = strncasecmp(&BuiltinColorNames[c->name], name, len); + if (r == 0 && len == strlen(&BuiltinColorNames[c->name])) { + *pred = c->red * 0x101; + *pgreen = c->green * 0x101; + *pblue = c->blue * 0x101; + return TRUE; + } + if (r < 0) + low = mid + 1; + else + high = mid - 1; } - - return FALSE; + return FALSE; } - -#endif /* USE_RGB_TXT */ diff --git a/nx-X11/programs/Xserver/os/osinit.c b/nx-X11/programs/Xserver/os/osinit.c index 59b567356..adafa3cf4 100644 --- a/nx-X11/programs/Xserver/os/osinit.c +++ b/nx-X11/programs/Xserver/os/osinit.c @@ -88,8 +88,6 @@ int limitStackSpace = -1; int limitNoFile = -1; #endif -Bool OsDelayInitColors = FALSE; - void OsInit(void) { @@ -218,7 +216,6 @@ OsInit(void) if (!SmartScheduleInit ()) SmartScheduleDisable = TRUE; OsInitAllocator(); - if (!OsDelayInitColors) OsInitColors(); } void diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 204494d63..af793454f 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -565,7 +565,6 @@ void UseMsg(void) ErrorF("-c turns off key-click\n"); ErrorF("c # key-click volume (0-100)\n"); ErrorF("-cc int default color visual class\n"); - ErrorF("-co file color database file\n"); #ifdef COMMANDLINE_CHALLENGED_OPERATING_SYSTEMS ErrorF("-config file read options from file\n"); #endif @@ -771,13 +770,6 @@ ProcessCommandLine(int argc, char *argv[]) else UseMsg(); } - else if ( strcmp( argv[i], "-co") == 0) - { - if(++i < argc) - rgbPath = argv[i]; - else - UseMsg(); - } else if ( strcmp( argv[i], "-core") == 0) CoreDump = TRUE; else if ( strcmp( argv[i], "-dpi") == 0) -- cgit v1.2.3 From 41c79bfc6abb1f588026e7527e3f2d2d751a9f9c Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 6 Feb 2017 15:20:18 +0100 Subject: debian/nxagent.*: Drop conffile /etc/nxagent/rgb utilizing dpkg-maintscript-helper. --- debian/control | 2 ++ debian/nxagent.install | 2 -- debian/nxagent.postinst | 8 ++++++++ debian/nxagent.postrm | 8 ++++++++ debian/nxagent.preinst | 8 ++++++++ 5 files changed, 26 insertions(+), 2 deletions(-) create mode 100755 debian/nxagent.postinst create mode 100755 debian/nxagent.postrm create mode 100755 debian/nxagent.preinst diff --git a/debian/control b/debian/control index eb0d68904..a98f7f6f0 100644 --- a/debian/control +++ b/debian/control @@ -39,6 +39,8 @@ Vcs-Browser: https://github.com/ArcticaProject/nx-libs/ Package: nx-x11-common Architecture: all Multi-Arch: foreign +Pre-Depends: + dpkg (>= 1.15.7.2), Depends: ${misc:Depends}, Breaks: nxlibs (<= 3.5.1), diff --git a/debian/nxagent.install b/debian/nxagent.install index 5f6a9de35..34f5c3a76 100644 --- a/debian/nxagent.install +++ b/debian/nxagent.install @@ -1,6 +1,4 @@ etc/nxagent/keystrokes.cfg -etc/nxagent/rgb -usr/share/nx/rgb usr/share/nx/VERSION.nxagent usr/share/man/man1/nxagent.1* usr/lib/*/nx/bin/nxagent diff --git a/debian/nxagent.postinst b/debian/nxagent.postinst new file mode 100755 index 000000000..8ad000e9b --- /dev/null +++ b/debian/nxagent.postinst @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +dpkg-maintscript-helper rm_conffile \ + /etc/nxagent/rgb "2:3.5.99.4-999" nxagent -- "$@" + +#DEBHELPER# diff --git a/debian/nxagent.postrm b/debian/nxagent.postrm new file mode 100755 index 000000000..8ad000e9b --- /dev/null +++ b/debian/nxagent.postrm @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +dpkg-maintscript-helper rm_conffile \ + /etc/nxagent/rgb "2:3.5.99.4-999" nxagent -- "$@" + +#DEBHELPER# diff --git a/debian/nxagent.preinst b/debian/nxagent.preinst new file mode 100755 index 000000000..8ad000e9b --- /dev/null +++ b/debian/nxagent.preinst @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +dpkg-maintscript-helper rm_conffile \ + /etc/nxagent/rgb "2:3.5.99.4-999" nxagent -- "$@" + +#DEBHELPER# -- cgit v1.2.3 From 398e238ff7748ccdf0db2a9e4bf788a7aa303769 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 6 Feb 2017 14:30:03 +0100 Subject: nx-libs.spec: Drop non-shipped-anymore rgb(.txt) file from list of to-be-installed files. --- nx-libs.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/nx-libs.spec b/nx-libs.spec index 2e3d08466..7e3ca4796 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -510,7 +510,6 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %dir %{_sysconfdir}/nxagent %config(noreplace) %{_sysconfdir}/nxagent/keystrokes.cfg %config(noreplace) %{_sysconfdir}/nxagent/nxagent.keyboard -%config(noreplace) %{_sysconfdir}/nxagent/rgb %doc doc/nxagent/README.keystrokes %{_bindir}/nxagent %dir %{_libdir}/nx/bin @@ -519,7 +518,6 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %{_libdir}/nx/X11/libX11.so* %{_datadir}/pixmaps/nxagent.xpm %dir %{_datadir}/nx -%{_datadir}/nx/rgb %{_datadir}/nx/VERSION.nxagent %{_datadir}/man/man1/nxagent.1* -- cgit v1.2.3 From 628281ea90f04873bb4b7c9ad6dafc4ad4c467dc Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 6 Feb 2017 15:33:35 +0100 Subject: debian/patches: Update/rebase 016_nx-X11_install-location.debian.patch. --- debian/patches/016_nx-X11_install-location.debian.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch index c758a3cfe..c8458311d 100644 --- a/debian/patches/016_nx-X11_install-location.debian.patch +++ b/debian/patches/016_nx-X11_install-location.debian.patch @@ -14,7 +14,7 @@ Last-Update: 2017-02-08 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl -@@ -730,7 +730,7 @@ +@@ -725,7 +725,7 @@ #define AlternateUsrLibDir YES #endif #else @@ -23,7 +23,7 @@ Last-Update: 2017-02-08 #ifndef AlternateUsrLibDir #define AlternateUsrLibDir NO #endif -@@ -748,7 +748,7 @@ +@@ -743,7 +743,7 @@ #define AlternateUsrDataDir YES #endif #else -- cgit v1.2.3 From 2161edef03b58bff00c6239e09b61c3e6dd85235 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 5 Feb 2017 19:19:44 +0000 Subject: nx-X11/config/cf/X11.tmpl: Set a more appropriate font directory (recommended: /usr/{,local/}share/nx/fonts). Note for distribution maintainers: your normally want to symlink /usr/share/nx/fonts to /usr/share/fonts/X11 in your packaging. --- nx-X11/config/cf/X11.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index 54f94355d..d5527cdc7 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -856,10 +856,10 @@ FCHOWN_DEFINES = -DHAS_FCHOWN #define DocPdfDir $(DOCDIR)/PDF #endif #ifndef FontDir -#define FontDir $(LIBDIR)/fonts +#define FontDir $(USRDATADIR)/fonts #endif #ifndef FontEncDir -#define FontEncDir $(LIBDIR)/fonts/encodings +#define FontEncDir $(USRDATADIR)/fonts/encodings #endif #ifndef AdmDir #define AdmDir /usr/adm -- cgit v1.2.3 From b816d361f5c8761ef3ab269402bce506aece14b4 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 5 Feb 2017 19:54:40 +0000 Subject: Xserver/hw/nxagent/Font.c: Drop NXAGENT_ALTERNATE_FONT_PATH_4 (pointing to /usr/NX/share/fonts/base) entirely. --- nx-X11/programs/Xserver/hw/nxagent/Font.c | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c index 5b9c31106..1213443c9 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c @@ -73,7 +73,6 @@ is" without express or implied warranty. #define NXAGENT_ALTERNATE_FONT_DIR "/usr/share/X11/fonts" #define NXAGENT_ALTERNATE_FONT_DIR_2 "/usr/share/fonts/X11" #define NXAGENT_ALTERNATE_FONT_DIR_3 "/usr/share/fonts" -#define NXAGENT_ALTERNATE_FONT_DIR_4 "/usr/NX/share/fonts" #define NXAGENT_DEFAULT_FONT_PATH \ "/usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/Speedo/,\ @@ -99,9 +98,6 @@ is" without express or implied warranty. /usr/share/fonts/100dpi/,/usr/share/fonts/TTF/,\ /usr/NX/share/fonts/base" -#define NXAGENT_ALTERNATE_FONT_PATH_4 \ -"/usr/NX/share/fonts/base" - #undef NXAGENT_FONTCACHE_DEBUG #undef NXAGENT_RECONNECT_FONT_DEBUG #undef NXAGENT_FONTMATCH_DEBUG @@ -1574,32 +1570,6 @@ void nxagentVerifyDefaultFontPath(void) strcat(fontPath, NXAGENT_ALTERNATE_FONT_PATH_3); } - - if (stat(NXAGENT_ALTERNATE_FONT_DIR_4, &dirStat) == 0 && - S_ISDIR(dirStat.st_mode) != 0) - { - /* - * Let's use the "/usr/NX/share/fonts" path. - */ - - #ifdef TEST - fprintf(stderr, "nxagentVerifyDefaultFontPath: Assuming fonts in directory [%s].\n", - validateString(NXAGENT_ALTERNATE_FONT_DIR_4)); - #endif - - if (*fontPath != '\0') - { - fontPath = realloc(fontPath, strlen(fontPath) + strlen(NXAGENT_ALTERNATE_FONT_PATH_4) + 2); - strcat(fontPath, ","); - } - else - { - fontPath = realloc(fontPath, strlen(fontPath) + strlen(NXAGENT_ALTERNATE_FONT_PATH_4) + 1); - } - - strcat(fontPath, NXAGENT_ALTERNATE_FONT_PATH_4); - } - if (*fontPath == '\0') { #ifdef WARNING -- cgit v1.2.3 From b11dd91a8e6865f06b06cf5c3a736615829d08ad Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 5 Feb 2017 20:18:13 +0000 Subject: Xserver/hw/nxagent/Font.c: Change (alternative) default font path order to make font path search compliant with latest FHS for X11 fonts (though, prefer /usr/share/nx/fonts as default path). --- nx-X11/programs/Xserver/hw/nxagent/Font.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c index 1213443c9..b4f5c2274 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c @@ -69,15 +69,15 @@ is" without express or implied warranty. #undef TEST #undef DEBUG -#define NXAGENT_DEFAULT_FONT_DIR "/usr/X11R6/lib/X11/fonts" +#define NXAGENT_DEFAULT_FONT_DIR "/usr/share/nx/fonts" #define NXAGENT_ALTERNATE_FONT_DIR "/usr/share/X11/fonts" #define NXAGENT_ALTERNATE_FONT_DIR_2 "/usr/share/fonts/X11" -#define NXAGENT_ALTERNATE_FONT_DIR_3 "/usr/share/fonts" +#define NXAGENT_ALTERNATE_FONT_DIR_3 "/usr/X11R6/lib/X11/fonts" #define NXAGENT_DEFAULT_FONT_PATH \ -"/usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/Speedo/,\ -/usr/X11R6/lib/X11/fonts/Type1/,/usr/X11R6/lib/X11/fonts/75dpi/,\ -/usr/X11R6/lib/X11/fonts/100dpi/,/usr/X11R6/lib/X11/fonts/TTF/,\ +"/usr/share/nx/fonts/misc/,/usr/share/nx/fonts/Speedo/,\ +/usr/share/nx/fonts/Type1/,/usr/share/nx/fonts/75dpi/,\ +/usr/share/nx/fonts/100dpi/,/usr/share/nx/fonts/TTF/,\ /usr/NX/share/fonts/base" #define NXAGENT_ALTERNATE_FONT_PATH \ @@ -93,9 +93,9 @@ is" without express or implied warranty. /usr/NX/share/fonts/base" #define NXAGENT_ALTERNATE_FONT_PATH_3 \ -"/usr/share/fonts/misc/,/usr/share/fonts/Speedo/,\ -/usr/share/fonts/Type1/,/usr/share/fonts/75dpi/,\ -/usr/share/fonts/100dpi/,/usr/share/fonts/TTF/,\ +"/usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/Speedo/,\ +/usr/X11R6/lib/X11/fonts/Type1/,/usr/X11R6/lib/X11/fonts/75dpi/,\ +/usr/X11R6/lib/X11/fonts/100dpi/,/usr/X11R6/lib/X11/fonts/TTF/,\ /usr/NX/share/fonts/base" #undef NXAGENT_FONTCACHE_DEBUG @@ -1475,7 +1475,7 @@ void nxagentVerifyDefaultFontPath(void) S_ISDIR(dirStat.st_mode) != 0) { /* - * Let's use the old "/usr/X11R6/lib/X11/fonts" style. + * Let's use the old "/usr/share/nx/fonts" style. */ #ifdef TEST @@ -1550,7 +1550,7 @@ void nxagentVerifyDefaultFontPath(void) S_ISDIR(dirStat.st_mode) != 0) { /* - * Let's use the "/usr/share/fonts" path. + * Let's use the "/usr/X11R6/lib/X11/fonts" path. */ #ifdef TEST -- cgit v1.2.3 From 6537f7eceabece2ceb11872644254c22f87a46da Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 5 Feb 2017 20:19:49 +0000 Subject: Xserver/hw/nxagent/Font.c: Drop references to /usr/NX/share/fonts/base as default font path, entirely. --- nx-X11/programs/Xserver/hw/nxagent/Font.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c index b4f5c2274..c9b9e3f75 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c @@ -77,26 +77,22 @@ is" without express or implied warranty. #define NXAGENT_DEFAULT_FONT_PATH \ "/usr/share/nx/fonts/misc/,/usr/share/nx/fonts/Speedo/,\ /usr/share/nx/fonts/Type1/,/usr/share/nx/fonts/75dpi/,\ -/usr/share/nx/fonts/100dpi/,/usr/share/nx/fonts/TTF/,\ -/usr/NX/share/fonts/base" +/usr/share/nx/fonts/100dpi/,/usr/share/nx/fonts/TTF/" #define NXAGENT_ALTERNATE_FONT_PATH \ "/usr/share/X11/fonts/misc/,/usr/share/X11/fonts/Speedo/,\ /usr/share/X11/fonts/Type1/,/usr/share/X11/fonts/75dpi/,\ -/usr/share/X11/fonts/100dpi/,/usr/share/X11/fonts/TTF/,\ -/usr/NX/share/fonts/base" +/usr/share/X11/fonts/100dpi/,/usr/share/X11/fonts/TTF/" #define NXAGENT_ALTERNATE_FONT_PATH_2 \ "/usr/share/fonts/X11/misc/,/usr/share/fonts/X11/Speedo/,\ /usr/share/fonts/X11/Type1/,/usr/share/fonts/X11/75dpi/,\ -/usr/share/fonts/X11/100dpi/,/usr/share/fonts/X11/TTF/,\ -/usr/NX/share/fonts/base" +/usr/share/fonts/X11/100dpi/,/usr/share/fonts/X11/TTF/" #define NXAGENT_ALTERNATE_FONT_PATH_3 \ "/usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/Speedo/,\ /usr/X11R6/lib/X11/fonts/Type1/,/usr/X11R6/lib/X11/fonts/75dpi/,\ -/usr/X11R6/lib/X11/fonts/100dpi/,/usr/X11R6/lib/X11/fonts/TTF/,\ -/usr/NX/share/fonts/base" +/usr/X11R6/lib/X11/fonts/100dpi/,/usr/X11R6/lib/X11/fonts/TTF/" #undef NXAGENT_FONTCACHE_DEBUG #undef NXAGENT_RECONNECT_FONT_DEBUG -- cgit v1.2.3 From 7866430eda6a1158f79487bb9d4b8cc222812e91 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 5 Feb 2017 19:34:33 +0000 Subject: debian/nx-x11-common.{links,dirs}: Make sure /usr/share/fonts/X11 are reachable for nxagent (via placing a symlink to /usr/share/nx/fonts). --- debian/nx-x11-common.dirs | 2 ++ debian/nx-x11-common.links | 1 + 2 files changed, 3 insertions(+) create mode 100644 debian/nx-x11-common.dirs create mode 100644 debian/nx-x11-common.links diff --git a/debian/nx-x11-common.dirs b/debian/nx-x11-common.dirs new file mode 100644 index 000000000..07c657e09 --- /dev/null +++ b/debian/nx-x11-common.dirs @@ -0,0 +1,2 @@ +# we symlink to this dir, so make sure it exists +usr/share/fonts/X11 \ No newline at end of file diff --git a/debian/nx-x11-common.links b/debian/nx-x11-common.links new file mode 100644 index 000000000..1c181aa84 --- /dev/null +++ b/debian/nx-x11-common.links @@ -0,0 +1 @@ +usr/share/fonts/X11 usr/share/nx/fonts \ No newline at end of file -- cgit v1.2.3 From d8eac7ccea3dfd61bb2e3a4d0081217efbb89044 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 5 Feb 2017 21:04:46 +0000 Subject: Xserver/dix/main.c: ErrorF requires a string to end with an EOL char. --- nx-X11/programs/Xserver/dix/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx-X11/programs/Xserver/dix/main.c b/nx-X11/programs/Xserver/dix/main.c index 553ad6c03..7bd41d865 100644 --- a/nx-X11/programs/Xserver/dix/main.c +++ b/nx-X11/programs/Xserver/dix/main.c @@ -388,7 +388,7 @@ main(int argc, char *argv[], char *envp[]) SetFontPath(0, 0, (unsigned char *)defaultFontPath, &error); } else { if (SetDefaultFontPath(defaultFontPath) != Success) - ErrorF("failed to set default font path '%s'", + ErrorF("failed to set default font path '%s'\n", defaultFontPath); } if (!SetDefaultFont(defaultTextFont)) -- cgit v1.2.3 From d981d938dade2967e70322c0bf934efeeb1da716 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 5 Feb 2017 17:06:55 +0000 Subject: {dix/,hw/nxagent/NX}dixfont.{c,h}: Support using builtin-fonts. Makes dependency on X11's misc fonts package obsolete. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This backports a mixture of these X.org commits (only focusing on SetDefaultFontPath() function): commit 03e8bfa1d122f7dea905d48c93cfd54afd991dfd Author: Alan Coopersmith Date: Sat Nov 27 20:09:04 2010 -0800 Convert existing Xprintf style calls to asprintf style Signed-off-by: Alan Coopersmith Reviewed-by: Jeremy Huddleston Reviewed-by: Mikhail Gusarov commit 12e46e83733b47d2704e1509960192365102af46 Author: Tiago Vignatti Date: Fri Mar 25 22:07:31 2011 +0200 dix: fix memory leak in SetDefaultFontPath Signed-off-by: Tiago Vignatti Reviewed-by: Nicolas Peninguy Reviewed-by: Peter Hutterer commit 6592db6bb526f0c43b4c7b55859c629709e039b4 Author: Mikhail Gusarov Date: Fri Jun 4 16:58:58 2010 +0700 Get rid of xstrdup when argument is definitely non-NULL Replace xstrdup with strdup when either constant string is being duplicated or argument is guarded by conditionals and obviously can't be NULL Signed-off-by: Mikhail Gusarov Reviewed-by: Alan Coopersmith commit f56cbe1ef24415d0142b9a7d0ab0a031069ccb52 Author: Rémi Cardona Date: Mon Sep 14 17:09:59 2009 +0200 dix: append "built-ins" to the font path in SetDefaultFontPath 49b93df8a3002db7196aa3fc1fd8dca1c12a55d6 made the hard dependency on a "fixed" font go away but only Xorg could use the built-ins fonts by default. With this commit, all DDXs get "built-ins" appended to their FontPath, not just Xorg. Tested with Xorg, Xvfb and Xnest. Signed-off-by: Rémi Cardona Signed-off-by: Jon TURNEY Tested-by: Jon TURNEY Signed-off-by: Peter Hutterer commit 49b93df8a3002db7196aa3fc1fd8dca1c12a55d6 Author: Paulo Cesar Pereira de Andrade Date: Wed Jan 7 19:37:03 2009 -0200 Default to use standard bitmap fonts, with builtins as fallback The builtin-fonts configure option was removed, as it at best should have been a runtime option. Instead, now it always register all "font path element" backends, and adds built-ins fonts at the end of the default font path. This should be a more reasonable solution, to "correct" the most common Xorg FAQ (could not open default font 'fixed'), and also don't break by default applications that use only the standard/historical X Font rendering. Backported-to-NX-by: Mike Gabriel Fixes ArcticaProject/nx-libs#84. Fixes ArcticaProject/nx-libs#285. --- nx-X11/programs/Xserver/dix/dixfonts.c | 4 +++ nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c | 47 +++++++++++++++++++------ nx-X11/programs/Xserver/include/dixfont.h | 5 +++ 3 files changed, 45 insertions(+), 11 deletions(-) diff --git a/nx-X11/programs/Xserver/dix/dixfonts.c b/nx-X11/programs/Xserver/dix/dixfonts.c index f7d047c2d..bbce105e3 100644 --- a/nx-X11/programs/Xserver/dix/dixfonts.c +++ b/nx-X11/programs/Xserver/dix/dixfonts.c @@ -1925,7 +1925,11 @@ InitFonts () { patternCache = MakeFontPatternCache(); +#if defined(BUILTIN_FONTS) || defined(NXAGENT_SERVER) + BuiltinRegisterFpeFunctions(); +#else register_fpe_functions(); +#endif } int diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c index 294a5727d..b3d7cc9d7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c @@ -926,6 +926,9 @@ bail: int SetDefaultFontPath(char *path) { + char *temp_path, + *start, + *end; unsigned char *cp, *pp, *nump, @@ -936,20 +939,41 @@ SetDefaultFontPath(char *path) size = 0, bad; - /* get enough for string, plus values -- use up commas */ #ifdef NX_TRANS_SOCKET - len = strlen(_NXGetFontPath(path)) + 1; -#else - len = strlen(path) + 1; -#endif + path = (char *) _NXGetFontPath(path); +#endif /* NX_TRANS_SOCKET */ + + start = path; + + /* ensure temp_path contains "built-ins" */ + while (1) { + start = strstr(start, "built-ins"); + if (start == NULL) + break; + end = start + strlen("built-ins"); + if ((start == path || start[-1] == ',') && (!*end || *end == ',')) + break; + start = end; + } + if (!start) { + if (asprintf(&temp_path, "%s%sbuilt-ins", path, *path ? "," : "") + == -1) + temp_path = NULL; + } + else { + temp_path = strdup(path); + } + if (!temp_path) + return BadAlloc; + + /* get enough for string, plus values -- use up commas */ + len = strlen(temp_path) + 1; nump = cp = newpath = (unsigned char *) ALLOCATE_LOCAL(len); - if (!newpath) + if (!newpath) { + free(temp_path); return BadAlloc; -#ifdef NX_TRANS_SOCKET - pp = (unsigned char *) _NXGetFontPath(path); -#else - pp = (unsigned char *) path; -#endif + } + pp = (unsigned char *) temp_path; cp++; while (*pp) { if (*pp == ',') { @@ -968,6 +992,7 @@ SetDefaultFontPath(char *path) err = SetFontPathElements(num, newpath, &bad, TRUE); DEALLOCATE_LOCAL(newpath); + free(temp_path); return err; } diff --git a/nx-X11/programs/Xserver/include/dixfont.h b/nx-X11/programs/Xserver/include/dixfont.h index 6582be24c..1303d0e0f 100644 --- a/nx-X11/programs/Xserver/include/dixfont.h +++ b/nx-X11/programs/Xserver/include/dixfont.h @@ -150,4 +150,9 @@ extern void InitGlyphCaching(void); extern void SetGlyphCachingMode(int /*newmode*/); +/* + * libXfont/src/builtins/builtin.h + */ +extern _X_EXPORT void BuiltinRegisterFpeFunctions(void); + #endif /* DIXFONT_H */ -- cgit v1.2.3 From bd98ba2d7577584e650492bbcb4ea9dd0a3aa809 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 5 Feb 2017 21:35:33 +0000 Subject: For consistency, apply patch from previous commit (630a7c3) to the original Xserver/dix/dixfonts.c file, although the code is undef'ed when NXAGENT_SERVER is defined. --- nx-X11/programs/Xserver/dix/dixfonts.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/nx-X11/programs/Xserver/dix/dixfonts.c b/nx-X11/programs/Xserver/dix/dixfonts.c index bbce105e3..4ac9fa696 100644 --- a/nx-X11/programs/Xserver/dix/dixfonts.c +++ b/nx-X11/programs/Xserver/dix/dixfonts.c @@ -1824,6 +1824,9 @@ SetFontPath(ClientPtr client, int npaths, unsigned char *paths, int *error) int SetDefaultFontPath(char *path) { + char *temp_path, + *start, + *end; unsigned char *cp, *pp, *nump, @@ -1834,12 +1837,36 @@ SetDefaultFontPath(char *path) size = 0, bad; + /* ensure temp_path contains "built-ins" */ + start = path; + while (1) { + start = strstr(start, "built-ins"); + if (start == NULL) + break; + end = start + strlen("built-ins"); + if ((start == path || start[-1] == ',') && (!*end || *end == ',')) + break; + start = end; + } + if (!start) { + if (asprintf(&temp_path, "%s%sbuilt-ins", path, *path ? "," : "") + == -1) + temp_path = NULL; + } + else { + temp_path = strdup(path); + } + if (!temp_path) + return BadAlloc; + /* get enough for string, plus values -- use up commas */ - len = strlen(path) + 1; + len = strlen(temp_path) + 1; nump = cp = newpath = (unsigned char *) ALLOCATE_LOCAL(len); - if (!newpath) + if (!newpath) { + free(temp_path); return BadAlloc; - pp = (unsigned char *) path; + } + pp = (unsigned char *) temp_path; cp++; while (*pp) { if (*pp == ',') { @@ -1858,6 +1885,7 @@ SetDefaultFontPath(char *path) err = SetFontPathElements(num, newpath, &bad, TRUE); DEALLOCATE_LOCAL(newpath); + free(temp_path); return err; } -- cgit v1.2.3 From 7bf444621830b2ae7c2e8dcf846de5fc425b3d74 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 8 Feb 2017 13:57:42 +0100 Subject: nx-libs.spec: Handle fonts dir symlinking and install /usr/share/nx/fonts symlink into nxagent bin:pkg. This change probably needs more fine-tuning for the various other RPM distros and versions out there. Thanks to Orion Poplawski for providing a code snippet with a general approach of handling this. --- nx-libs.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/nx-libs.spec b/nx-libs.spec index 7e3ca4796..6fa4e8342 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -272,8 +272,9 @@ Obsoletes: nx < 3.5.0-19 Provides: nx = %{version}-%{release} Provides: nx%{?_isa} = %{version}-%{release} Obsoletes: nxauth < 3.5.99.1 -%if 0%{?suse_version} -Requires: xorg-x11-fonts-core +%if 0%{?fedora} || 0%{?rhel} +# For /usr/share/X11/fonts +Requires: xorg-x11-font-utils %endif %description -n nxagent @@ -357,6 +358,13 @@ make install \ INSTALL_FILE="install -pm0644" \ INSTALL_PROGRAM="install -pm0755" +# this needs to be adapted distribution-wise... +%if 0%{?suse_version} +ln -s ../fonts %{buildroot}%{_datadir}/nx/fonts +%elif 0%{?fedora} || 0%{?rhel} +ln -s ../X11/fonts %{buildroot}%{_datadir}/nx/fonts +%endif + # Remove static libs (they don't exist on SLES, so using -f here) rm -f %{buildroot}%{_libdir}/*.a @@ -520,6 +528,7 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %dir %{_datadir}/nx %{_datadir}/nx/VERSION.nxagent %{_datadir}/man/man1/nxagent.1* +%{_datadir}/nx/fonts %files -n nxproxy %defattr(-,root,root) -- cgit v1.2.3 From ec30a857eb0d67b232f8d43e63a6370023f4c4d0 Mon Sep 17 00:00:00 2001 From: Tiago Vignatti Date: Thu, 9 Feb 2017 08:55:07 +0100 Subject: dix: use one single function to register fpe fonts In NXAGENT_SERVER we can also fully rely on libXfont for handling fpe internals. Backported from X.org: commit 75536ee80595c79bba95a1fb6844126ee08486d4 Author: Tiago Vignatti Date: Wed Jun 23 15:18:03 2010 +0300 dix: use one single function to register fpe fonts X server doesn't need to understand fpe internals, so use register_fpe_functions from libXfont. It's required to get new version of libXfont, therefore adjust it to be passed to autoconf. Signed-off-by: Tiago Vignatti Reviewed-by: Mikhail Gusarov Reviewed-by: Alex Deucher Signed-off-by: Keith Packard Backported-to-NX-by: Mike Gabriel --- nx-X11/programs/Xserver/dix/dixfonts.c | 4 ---- nx-X11/programs/Xserver/include/dixfont.h | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/nx-X11/programs/Xserver/dix/dixfonts.c b/nx-X11/programs/Xserver/dix/dixfonts.c index 4ac9fa696..c8e5f6cf0 100644 --- a/nx-X11/programs/Xserver/dix/dixfonts.c +++ b/nx-X11/programs/Xserver/dix/dixfonts.c @@ -1953,11 +1953,7 @@ InitFonts () { patternCache = MakeFontPatternCache(); -#if defined(BUILTIN_FONTS) || defined(NXAGENT_SERVER) - BuiltinRegisterFpeFunctions(); -#else register_fpe_functions(); -#endif } int diff --git a/nx-X11/programs/Xserver/include/dixfont.h b/nx-X11/programs/Xserver/include/dixfont.h index 1303d0e0f..6149d2160 100644 --- a/nx-X11/programs/Xserver/include/dixfont.h +++ b/nx-X11/programs/Xserver/include/dixfont.h @@ -150,9 +150,6 @@ extern void InitGlyphCaching(void); extern void SetGlyphCachingMode(int /*newmode*/); -/* - * libXfont/src/builtins/builtin.h - */ -extern _X_EXPORT void BuiltinRegisterFpeFunctions(void); +extern void register_fpe_functions(void); #endif /* DIXFONT_H */ -- cgit v1.2.3 From 2556d40fb25eb8a6335095a0445b472b37907b85 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 9 Feb 2017 08:59:15 +0100 Subject: debian/control: Versioned B-D on libXfont (>= 1.4.2). --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index a98f7f6f0..c00550dc2 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: libxmltok1-dev, libxml2-dev, libxpm-dev, - libxfont1-dev | libxfont-dev, + libxfont1-dev | libxfont-dev (>= 1.4.2), libxdmcp-dev, libxdamage-dev, libxext-dev, -- cgit v1.2.3 From 2174721a0d8c42edee0c776e323432405e6948d2 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 9 Feb 2017 08:59:48 +0100 Subject: nx-libs.spec: Versioned BR on libXfont-devel (and alike) (>= 1.4.2). --- nx-libs.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nx-libs.spec b/nx-libs.spec index 6fa4e8342..2e5a6c017 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -34,7 +34,7 @@ BuildRequires: pkgconfig(pixman-1) >= 0.13.2 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xpm) -BuildRequires: pkgconfig(xfont) +BuildRequires: pkgconfig(xfont) >= 1.4.2 BuildRequires: pkgconfig(xdmcp) BuildRequires: pkgconfig(xdamage) BuildRequires: pkgconfig(xcomposite) @@ -50,7 +50,7 @@ BuildRequires: pixman-devel >= 0.13.2 BuildRequires: xorg-x11-libX11-devel BuildRequires: xorg-x11-libXext-devel BuildRequires: xorg-x11-libXpm-devel -BuildRequires: xorg-x11-libXfont-devel +BuildRequires: xorg-x11-libXfont-devel >= 1.4.2 BuildRequires: xorg-x11-libXdmcp-devel BuildRequires: xorg-x11-libXdamage-devel BuildRequires: xorg-x11-libXcomposite-devel @@ -70,7 +70,7 @@ BuildRequires: pixman-devel >= 0.13.2 BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXpm-devel -BuildRequires: libXfont-devel +BuildRequires: libXfont-devel >= 1.4.2 BuildRequires: libXdmcp-devel BuildRequires: libXdamage-devel BuildRequires: libXcomposite-devel -- cgit v1.2.3 From f90e92bca5aca690121feb769bf9bda04c8bddf3 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 14 Feb 2017 09:35:32 +0000 Subject: nx-libs.spec: Add BR for Fedora/RHEL builds: xorg-x11-font-utils. --- nx-libs.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/nx-libs.spec b/nx-libs.spec index 2e5a6c017..c95bc6131 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -78,6 +78,7 @@ BuildRequires: libXrandr-devel BuildRequires: libXfixes-devel BuildRequires: libXtst-devel BuildRequires: libXinerama-devel +BuildRequires: xorg-x11-font-utils %endif # For imake -- cgit v1.2.3 From bdc212b846b4196135a9468699aa40eef57a5d07 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 27 Feb 2017 11:20:38 +0100 Subject: nx-libs.spec: Add BR filesystem for SUSE builds (as it provides /usr/share/fonts). --- nx-libs.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nx-libs.spec b/nx-libs.spec index c95bc6131..7e25b7e81 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -26,6 +26,10 @@ BuildRequires: gpg-offline %endif %if 0%{?suse_version} BuildRequires: fdupes + +# This is what provides /usr/share/fonts on SUSE systems... +BuildRequires: filesystem + %if 0%{?suse_version} >= 1130 BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(libpng) -- cgit v1.2.3