From 5706005f72d79716fadaabdb6d560bfeb30ff6df Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Mon, 26 Feb 2018 02:44:10 +0100 Subject: Lift XFIXES to xorg-xserver-7.1/1.1.0 state (XFIXES 4.0) - non-functional changes only --- nx-X11/programs/Xserver/xfixes/cursor.c | 22 +++++++++++++++++++++- nx-X11/programs/Xserver/xfixes/region.c | 2 +- nx-X11/programs/Xserver/xfixes/saveset.c | 2 +- nx-X11/programs/Xserver/xfixes/select.c | 2 +- nx-X11/programs/Xserver/xfixes/xfixes.c | 22 +++++++++++++++++++++- nx-X11/programs/Xserver/xfixes/xfixes.h | 2 +- nx-X11/programs/Xserver/xfixes/xfixesint.h | 28 ++++++++++++++++++++++++---- 7 files changed, 70 insertions(+), 10 deletions(-) (limited to 'nx-X11/programs/Xserver') diff --git a/nx-X11/programs/Xserver/xfixes/cursor.c b/nx-X11/programs/Xserver/xfixes/cursor.c index e0705ed0a..d372b476e 100644 --- a/nx-X11/programs/Xserver/xfixes/cursor.c +++ b/nx-X11/programs/Xserver/xfixes/cursor.c @@ -1,5 +1,25 @@ /* - * $Id: cursor.c,v 1.6 2005/07/03 07:37:35 daniels Exp $ + * $Id$ + * + * Copyright © 2006 Sun Microsystems + * + * 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 Sun Microsystems not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Sun Microsystems makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL SUN MICROSYSTEMS 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. * * Copyright © 2002 Keith Packard * diff --git a/nx-X11/programs/Xserver/xfixes/region.c b/nx-X11/programs/Xserver/xfixes/region.c index 18b1d3ff4..4abe9083d 100644 --- a/nx-X11/programs/Xserver/xfixes/region.c +++ b/nx-X11/programs/Xserver/xfixes/region.c @@ -1,5 +1,5 @@ /* - * $Id: region.c,v 1.7 2005/07/03 07:37:35 daniels Exp $ + * $Id$ * * Copyright © 2003 Keith Packard * diff --git a/nx-X11/programs/Xserver/xfixes/saveset.c b/nx-X11/programs/Xserver/xfixes/saveset.c index 0a5b2b8da..a992ab306 100644 --- a/nx-X11/programs/Xserver/xfixes/saveset.c +++ b/nx-X11/programs/Xserver/xfixes/saveset.c @@ -1,5 +1,5 @@ /* - * $Id: saveset.c,v 1.6 2005/07/03 07:37:35 daniels Exp $ + * $Id$ * * Copyright © 2002 Keith Packard * diff --git a/nx-X11/programs/Xserver/xfixes/select.c b/nx-X11/programs/Xserver/xfixes/select.c index b21301d1c..98c71020d 100644 --- a/nx-X11/programs/Xserver/xfixes/select.c +++ b/nx-X11/programs/Xserver/xfixes/select.c @@ -1,5 +1,5 @@ /* - * $Id: select.c,v 1.6 2005/07/03 07:37:35 daniels Exp $ + * $Id$ * * Copyright © 2002 Keith Packard * diff --git a/nx-X11/programs/Xserver/xfixes/xfixes.c b/nx-X11/programs/Xserver/xfixes/xfixes.c index 3b5815167..c4977b634 100644 --- a/nx-X11/programs/Xserver/xfixes/xfixes.c +++ b/nx-X11/programs/Xserver/xfixes/xfixes.c @@ -1,5 +1,25 @@ /* - * $Id: xfixes.c,v 1.7 2005/07/03 07:37:35 daniels Exp $ + * $Id$ + * + * Copyright © 2006 Sun Microsystems + * + * 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 Sun Microsystems not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Sun Microsystems makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL SUN MICROSYSTEMS 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. * * Copyright © 2002 Keith Packard * diff --git a/nx-X11/programs/Xserver/xfixes/xfixes.h b/nx-X11/programs/Xserver/xfixes/xfixes.h index fcd941778..0f1e3b070 100644 --- a/nx-X11/programs/Xserver/xfixes/xfixes.h +++ b/nx-X11/programs/Xserver/xfixes/xfixes.h @@ -1,5 +1,5 @@ /* - * $Id: xfixes.h,v 1.6 2005/07/03 07:02:08 daniels Exp $ + * $Id$ * * Copyright © 2002 Keith Packard * diff --git a/nx-X11/programs/Xserver/xfixes/xfixesint.h b/nx-X11/programs/Xserver/xfixes/xfixesint.h index fcbc77b89..2e1ac143e 100644 --- a/nx-X11/programs/Xserver/xfixes/xfixesint.h +++ b/nx-X11/programs/Xserver/xfixes/xfixesint.h @@ -1,5 +1,25 @@ /* - * $Id: xfixesint.h,v 1.7 2005/07/03 08:53:54 daniels Exp $ + * $Id$ + * + * Copyright © 2006 Sun Microsystems + * + * 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 Sun Microsystems not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Sun Microsystems makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL SUN MICROSYSTEMS 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. * * Copyright © 2002 Keith Packard * @@ -62,10 +82,10 @@ XFixesExtensionInit(void); /* Save set */ int ProcXFixesChangeSaveSet(ClientPtr client); - + int SProcXFixesChangeSaveSet(ClientPtr client); - + /* Selection events */ int ProcXFixesSelectSelectionInput (ClientPtr client); @@ -82,7 +102,7 @@ XFixesSelectionInit (void); /* Cursor notification */ Bool XFixesCursorInit (void); - + int ProcXFixesSelectCursorInput (ClientPtr client); -- cgit v1.2.3