From 550293c1888fb7e0b820633c2ee2162e24ff19f5 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Fri, 14 Nov 2003 15:54:35 +0000 Subject: [PATCH 01/51] R6.6 is the Xorg base-line --- panoramiXext.h | 49 ++++++++++++++++ panoramiXproto.h | 144 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 193 insertions(+) create mode 100644 panoramiXext.h create mode 100644 panoramiXproto.h diff --git a/panoramiXext.h b/panoramiXext.h new file mode 100644 index 0000000..2dfc6d6 --- /dev/null +++ b/panoramiXext.h @@ -0,0 +1,49 @@ +/* $Xorg: panoramiXext.h,v 1.4 2000/08/18 04:05:45 coskrey Exp $ */ +/***************************************************************** +Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. +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. + +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 +DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, +BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation +shall not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from Digital +Equipment Corporation. +******************************************************************/ +/* + * PanoramiX definitions + */ + +/* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ + +#define PANORAMIX_MAJOR_VERSION 1 /* current version number */ +#define PANORAMIX_MINOR_VERSION 0 + +typedef struct { + Window window; /* PanoramiX window - may not exist */ + int screen; + int State; /* PanroamiXOff, PanoramiXOn */ + int width; /* width of this screen */ + int height; /* height of this screen */ + int ScreenCount; /* real physical number of screens */ + XID eventMask; /* selected events for this client */ +} XPanoramiXInfo; + +extern XPanoramiXInfo *XPanoramiXAllocInfo ( +#if NeedFunctionPrototypes + void +#endif +); diff --git a/panoramiXproto.h b/panoramiXproto.h new file mode 100644 index 0000000..0547a26 --- /dev/null +++ b/panoramiXproto.h @@ -0,0 +1,144 @@ +/* $Xorg: panoramiXproto.h,v 1.4 2000/08/18 04:05:45 coskrey Exp $ */ +/***************************************************************** +Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. +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. + +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 +DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, +BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation +shall not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from Digital +Equipment Corporation. +******************************************************************/ + +/* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ + +#ifndef _PANORAMIXPROTO_H_ +#define _PANORAMIXPROTO_H_ + +#define PANORAMIX_PROTOCOL_NAME "XINERAMA" + +#define X_PanoramiXQueryVersion 0 +#define X_PanoramiXGetState 1 +#define X_PanoramiXGetScreenCount 2 +#define X_PanoramiXGetScreenSize 3 + +typedef struct _PanoramiXQueryVersion { + CARD8 reqType; /* always PanoramiXReqCode */ + CARD8 panoramiXReqType; /* always X_PanoramiXQueryVersion */ + CARD16 length B16; + CARD8 clientMajor; + CARD8 clientMinor; + CARD16 unused B16; +} xPanoramiXQueryVersionReq; + +#define sz_xPanoramiXQueryVersionReq 8 + +typedef struct { + CARD8 type; /* must be X_Reply */ + CARD8 pad1; /* unused */ + CARD16 sequenceNumber B16; /* last sequence number */ + CARD32 length B32; /* 0 */ + CARD16 majorVersion B16; + CARD16 minorVersion B16; + CARD32 pad2 B32; /* unused */ + CARD32 pad3 B32; /* unused */ + CARD32 pad4 B32; /* unused */ + CARD32 pad5 B32; /* unused */ + CARD32 pad6 B32; /* unused */ +} xPanoramiXQueryVersionReply; + +#define sz_xPanoramiXQueryVersionReply 32 + + +typedef struct _PanoramiXGetState { + CARD8 reqType; /* always PanoramiXReqCode */ + CARD8 panoramiXReqType; /* always X_PanoramiXGetState */ + CARD16 length B16; + CARD32 window B32; +} xPanoramiXGetStateReq; +#define sz_xPanoramiXGetStateReq 8 + +typedef struct { + BYTE type; + BYTE state; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 window B32; + CARD32 pad1 B32; /* unused */ + CARD32 pad2 B32; /* unused */ + CARD32 pad3 B32; /* unused */ + CARD32 pad4 B32; /* unused */ + CARD32 pad5 B32; /* unused */ +} xPanoramiXGetStateReply; + +#define sz_panoramiXGetStateReply 32 + +typedef struct _PanoramiXGetScreenCount { + CARD8 reqType; /* always PanoramiXReqCode */ + CARD8 panoramiXReqType; /* always X_PanoramiXGetScreenCount */ + CARD16 length B16; + CARD32 window B32; +} xPanoramiXGetScreenCountReq; +#define sz_xPanoramiXGetScreenCountReq 8 + +typedef struct { + BYTE type; + BYTE ScreenCount; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 window B32; + CARD32 pad1 B32; /* unused */ + CARD32 pad2 B32; /* unused */ + CARD32 pad3 B32; /* unused */ + CARD32 pad4 B32; /* unused */ + CARD32 pad5 B32; /* unused */ +} xPanoramiXGetScreenCountReply; +#define sz_panoramiXGetScreenCountReply 32 + +typedef struct _PanoramiXGetScreenSize { + CARD8 reqType; /* always PanoramiXReqCode */ + CARD8 panoramiXReqType; /* always X_PanoramiXGetState */ + CARD16 length B16; + CARD32 window B32; + CARD32 screen B32; +} xPanoramiXGetScreenSizeReq; +#define sz_xPanoramiXGetScreenSizeReq 12 + +typedef struct { + BYTE type; + CARD8 pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 width B32; + CARD32 height B32; + CARD32 window B32; + CARD32 screen B32; + CARD32 pad2 B32; /* unused */ + CARD32 pad3 B32; /* unused */ +} xPanoramiXGetScreenSizeReply; +#define sz_panoramiXGetScreenSizeReply 32 + +/* define any errors specific to this extension */ + +/* If a client asks for ScreenCount when PanoramiX + is not in use */ + + +/* If a client asks for Screen Size of a screen when + PanoramiX is not in use */ + +#endif From 319abb7b20ca59f1ed311fd973650d281bd69229 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Fri, 14 Nov 2003 16:48:43 +0000 Subject: [PATCH 02/51] Initial revision --- Xinerama.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 Xinerama.h diff --git a/Xinerama.h b/Xinerama.h new file mode 100644 index 0000000..3c6af52 --- /dev/null +++ b/Xinerama.h @@ -0,0 +1,48 @@ +/* $XFree86: xc/include/extensions/Xinerama.h,v 3.3 2002/09/16 18:05:19 eich Exp $ */ + +#ifndef _Xinerama_h +#define _Xinerama_h + +typedef struct { + int screen_number; + short x_org; + short y_org; + short width; + short height; +} XineramaScreenInfo; + +_XFUNCPROTOBEGIN + +Bool XineramaQueryExtension ( + Display *dpy, + int *event_base, + int *error_base +); + +Status XineramaQueryVersion( + Display *dpy, + int *major, + int *minor +); + +Bool XineramaIsActive(Display *dpy); + + +/* + Returns the number of heads and a pointer to an array of + structures describing the position and size of the individual + heads. Returns NULL and number = 0 if Xinerama is not active. + + Returned array should be freed with XFree(). +*/ + +XineramaScreenInfo * +XineramaQueryScreens( + Display *dpy, + int *number +); + +_XFUNCPROTOEND + +#endif /* _Xinerama_h */ + From 0280e9a705e5ef149124700131e826f4706318dd Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Fri, 14 Nov 2003 16:48:43 +0000 Subject: [PATCH 03/51] XFree86 4.3.0.1 --- panoramiXext.h | 3 ++- panoramiXproto.h | 58 +++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 55 insertions(+), 6 deletions(-) diff --git a/panoramiXext.h b/panoramiXext.h index 2dfc6d6..29f157b 100644 --- a/panoramiXext.h +++ b/panoramiXext.h @@ -26,11 +26,12 @@ Equipment Corporation. /* * PanoramiX definitions */ +/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ #define PANORAMIX_MAJOR_VERSION 1 /* current version number */ -#define PANORAMIX_MINOR_VERSION 0 +#define PANORAMIX_MINOR_VERSION 1 typedef struct { Window window; /* PanoramiX window - may not exist */ diff --git a/panoramiXproto.h b/panoramiXproto.h index 0547a26..fe3826e 100644 --- a/panoramiXproto.h +++ b/panoramiXproto.h @@ -23,6 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ +/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ @@ -36,6 +37,9 @@ Equipment Corporation. #define X_PanoramiXGetScreenCount 2 #define X_PanoramiXGetScreenSize 3 +#define X_XineramaIsActive 4 +#define X_XineramaQueryScreens 5 + typedef struct _PanoramiXQueryVersion { CARD8 reqType; /* always PanoramiXReqCode */ CARD8 panoramiXReqType; /* always X_PanoramiXQueryVersion */ @@ -132,13 +136,57 @@ typedef struct { } xPanoramiXGetScreenSizeReply; #define sz_panoramiXGetScreenSizeReply 32 -/* define any errors specific to this extension */ +/************ Alternate protocol ******************/ -/* If a client asks for ScreenCount when PanoramiX - is not in use */ +typedef struct { + CARD8 reqType; + CARD8 panoramiXReqType; + CARD16 length B16; +} xXineramaIsActiveReq; +#define sz_xXineramaIsActiveReq 4 + +typedef struct { + BYTE type; + CARD8 pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 state B32; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; + CARD32 pad6 B32; +} xXineramaIsActiveReply; +#define sz_XineramaIsActiveReply 32 -/* If a client asks for Screen Size of a screen when - PanoramiX is not in use */ +typedef struct { + CARD8 reqType; + CARD8 panoramiXReqType; + CARD16 length B16; +} xXineramaQueryScreensReq; +#define sz_xXineramaQueryScreensReq 4 + +typedef struct { + BYTE type; + CARD8 pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 number B32; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; + CARD32 pad6 B32; +} xXineramaQueryScreensReply; +#define sz_XineramaQueryScreensReply 32 + +typedef struct { + INT16 x_org B16; + INT16 y_org B16; + CARD16 width B16; + CARD16 height B16; +} xXineramaScreenInfo; +#define sz_XineramaScreenInfo 8 #endif From cefe7009c777de6c98a7b4c342a7ea4a1f18c9ac Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Tue, 25 Nov 2003 19:28:02 +0000 Subject: [PATCH 04/51] XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks --- panoramiXext.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/panoramiXext.h b/panoramiXext.h index 29f157b..3342e38 100644 --- a/panoramiXext.h +++ b/panoramiXext.h @@ -26,7 +26,7 @@ Equipment Corporation. /* * PanoramiX definitions */ -/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */ +/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.7 2003/11/17 22:20:03 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ @@ -44,7 +44,5 @@ typedef struct { } XPanoramiXInfo; extern XPanoramiXInfo *XPanoramiXAllocInfo ( -#if NeedFunctionPrototypes void -#endif ); From 2ecaf6adfe8f312f320424a2d8e312316e71e142 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Fri, 19 Dec 2003 20:54:21 +0000 Subject: [PATCH 05/51] XFree86 4.3.99.902 (RC 2) --- Xinerama.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Xinerama.h b/Xinerama.h index 3c6af52..8ab9c8b 100644 --- a/Xinerama.h +++ b/Xinerama.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/Xinerama.h,v 3.3 2002/09/16 18:05:19 eich Exp $ */ +/* $XFree86: xc/include/extensions/Xinerama.h,v 3.4 2003/12/18 05:48:06 dawes Exp $ */ #ifndef _Xinerama_h #define _Xinerama_h @@ -21,8 +21,8 @@ Bool XineramaQueryExtension ( Status XineramaQueryVersion( Display *dpy, - int *major, - int *minor + int *major_versionp, + int *minor_versionp ); Bool XineramaIsActive(Display *dpy); From 3a23f49e5e0bcf6ac098053f223d82c5c7345ce2 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 26 Feb 2004 09:22:28 +0000 Subject: [PATCH 06/51] Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 --- Xinerama.h | 2 +- panoramiXext.h | 2 +- panoramiXproto.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Xinerama.h b/Xinerama.h index 8ab9c8b..7e02adf 100644 --- a/Xinerama.h +++ b/Xinerama.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/Xinerama.h,v 3.4 2003/12/18 05:48:06 dawes Exp $ */ +/* $XFree86$ */ #ifndef _Xinerama_h #define _Xinerama_h diff --git a/panoramiXext.h b/panoramiXext.h index 3342e38..365a6a7 100644 --- a/panoramiXext.h +++ b/panoramiXext.h @@ -26,7 +26,7 @@ Equipment Corporation. /* * PanoramiX definitions */ -/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.7 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86$ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ diff --git a/panoramiXproto.h b/panoramiXproto.h index fe3826e..1a52911 100644 --- a/panoramiXproto.h +++ b/panoramiXproto.h @@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */ +/* $XFree86$ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ From 2c683ef717bf72bd1529f5418202957dd5750add Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 26 Feb 2004 13:35:14 +0000 Subject: [PATCH 07/51] readding XFree86's cvs IDs --- Xinerama.h | 2 +- panoramiXext.h | 2 +- panoramiXproto.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Xinerama.h b/Xinerama.h index 7e02adf..8ab9c8b 100644 --- a/Xinerama.h +++ b/Xinerama.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/include/extensions/Xinerama.h,v 3.4 2003/12/18 05:48:06 dawes Exp $ */ #ifndef _Xinerama_h #define _Xinerama_h diff --git a/panoramiXext.h b/panoramiXext.h index 365a6a7..3342e38 100644 --- a/panoramiXext.h +++ b/panoramiXext.h @@ -26,7 +26,7 @@ Equipment Corporation. /* * PanoramiX definitions */ -/* $XFree86$ */ +/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.7 2003/11/17 22:20:03 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ diff --git a/panoramiXproto.h b/panoramiXproto.h index 1a52911..fe3826e 100644 --- a/panoramiXproto.h +++ b/panoramiXproto.h @@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86$ */ +/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ From c7345384f43565544530a301df0bdd8acddc4e9e Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Wed, 3 Mar 2004 12:10:54 +0000 Subject: [PATCH 08/51] Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 --- Xinerama.h | 2 +- panoramiXext.h | 2 +- panoramiXproto.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Xinerama.h b/Xinerama.h index 8ab9c8b..51e849e 100644 --- a/Xinerama.h +++ b/Xinerama.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/Xinerama.h,v 3.4 2003/12/18 05:48:06 dawes Exp $ */ +/* $XFree86: xc/include/extensions/Xinerama.h,v 3.3 2002/09/16 18:05:19 eich Exp $ */ #ifndef _Xinerama_h #define _Xinerama_h diff --git a/panoramiXext.h b/panoramiXext.h index 3342e38..ad2f7e4 100644 --- a/panoramiXext.h +++ b/panoramiXext.h @@ -26,7 +26,7 @@ Equipment Corporation. /* * PanoramiX definitions */ -/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.7 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ diff --git a/panoramiXproto.h b/panoramiXproto.h index fe3826e..6b27c56 100644 --- a/panoramiXproto.h +++ b/panoramiXproto.h @@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */ +/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.5 2000/03/01 01:04:21 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ From 93a7f9f29ea2630838fb5bf5852f15e282699e41 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Sun, 14 Mar 2004 08:31:36 +0000 Subject: [PATCH 09/51] Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 --- Xinerama.h | 2 +- panoramiXext.h | 2 +- panoramiXproto.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Xinerama.h b/Xinerama.h index 51e849e..8ab9c8b 100644 --- a/Xinerama.h +++ b/Xinerama.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/Xinerama.h,v 3.3 2002/09/16 18:05:19 eich Exp $ */ +/* $XFree86: xc/include/extensions/Xinerama.h,v 3.4 2003/12/18 05:48:06 dawes Exp $ */ #ifndef _Xinerama_h #define _Xinerama_h diff --git a/panoramiXext.h b/panoramiXext.h index ad2f7e4..3342e38 100644 --- a/panoramiXext.h +++ b/panoramiXext.h @@ -26,7 +26,7 @@ Equipment Corporation. /* * PanoramiX definitions */ -/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */ +/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.7 2003/11/17 22:20:03 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ diff --git a/panoramiXproto.h b/panoramiXproto.h index 6b27c56..fe3826e 100644 --- a/panoramiXproto.h +++ b/panoramiXproto.h @@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.5 2000/03/01 01:04:21 dawes Exp $ */ +/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ From 87a2015dff7b7dc2bef6cdc61bf1ff169eee45c1 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 23 Apr 2004 18:43:06 +0000 Subject: [PATCH 10/51] Merging XORG-CURRENT into trunk --- Xinerama.h | 28 +++++++++++++++++++++++++++- panoramiXext.h | 2 +- panoramiXproto.h | 2 +- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/Xinerama.h b/Xinerama.h index 8ab9c8b..2ab2d99 100644 --- a/Xinerama.h +++ b/Xinerama.h @@ -1,4 +1,30 @@ -/* $XFree86: xc/include/extensions/Xinerama.h,v 3.4 2003/12/18 05:48:06 dawes Exp $ */ +/* $XdotOrg$ */ +/* + +Copyright 2003 The Open Group + +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. + +*/ +/* $XFree86: xc/include/extensions/Xinerama.h,v 3.3 2002/09/16 18:05:19 eich Exp $ */ #ifndef _Xinerama_h #define _Xinerama_h diff --git a/panoramiXext.h b/panoramiXext.h index 3342e38..ad2f7e4 100644 --- a/panoramiXext.h +++ b/panoramiXext.h @@ -26,7 +26,7 @@ Equipment Corporation. /* * PanoramiX definitions */ -/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.7 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ diff --git a/panoramiXproto.h b/panoramiXproto.h index fe3826e..6b27c56 100644 --- a/panoramiXproto.h +++ b/panoramiXproto.h @@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */ +/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.5 2000/03/01 01:04:21 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ From b4e223f81287cf3f448266d8c7ac2ff5bb72e7a3 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Wed, 1 Dec 2004 19:03:46 +0000 Subject: [PATCH 11/51] Include X11/Xlib.h in Xinerama.h, since it uses libX11 functions (#1897). --- Xinerama.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Xinerama.h b/Xinerama.h index 2ab2d99..9ccc400 100644 --- a/Xinerama.h +++ b/Xinerama.h @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/include/extensions/Xinerama.h,v 1.2 2004/04/23 18:43:06 eich Exp $ */ /* Copyright 2003 The Open Group @@ -29,6 +29,8 @@ in this Software without prior written authorization from The Open Group. #ifndef _Xinerama_h #define _Xinerama_h +#include + typedef struct { int screen_number; short x_org; From 2cc4bdad59cbb32cc4d363b437ee0c4fa44b148b Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Fri, 6 May 2005 01:46:31 +0000 Subject: [PATCH 12/51] Initial build system files for proto module. --- Makefile.am | 10 ++++++++++ autogen.sh | 12 ++++++++++++ configure.ac | 6 ++++++ panoramixext.pc.in | 9 +++++++++ 4 files changed, 37 insertions(+) create mode 100644 Makefile.am create mode 100755 autogen.sh create mode 100644 configure.ac create mode 100644 panoramixext.pc.in diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..7c5da3e --- /dev/null +++ b/Makefile.am @@ -0,0 +1,10 @@ +panoramixdir = $(includedir)/X11/extensions +panoramix_HEADERS = \ + panoramiXext.h \ + panoramiXproto.h \ + Xinerama.h + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = panoramixext.pc + +EXTRA_DIST = autogen.sh panoramixext.pc.in diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..904cd67 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..44052fc --- /dev/null +++ b/configure.ac @@ -0,0 +1,6 @@ +AC_PREREQ([2.57]) +AC_INIT([PanoramixExt], [7.0], [xorg@lists.freedesktop.org]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) + +AC_OUTPUT([Makefile + panoramixext.pc]) diff --git a/panoramixext.pc.in b/panoramixext.pc.in new file mode 100644 index 0000000..abf897f --- /dev/null +++ b/panoramixext.pc.in @@ -0,0 +1,9 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: PanoramixExt +Description: Panoramix extension headers +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} From 2d1fbdb4b20e9c12cf7c6c1872d5fd888f39e390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Mon, 9 May 2005 18:20:05 +0000 Subject: [PATCH 13/51] Change all the protonames from Ext to Proto. --- Makefile.am | 4 ++-- configure.ac | 4 ++-- panoramixext.pc.in => xineramaproto.pc.in | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename panoramixext.pc.in => xineramaproto.pc.in (89%) diff --git a/Makefile.am b/Makefile.am index 7c5da3e..7c2950f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,6 @@ panoramix_HEADERS = \ Xinerama.h pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = panoramixext.pc +pkgconfig_DATA = panoramixproto.pc -EXTRA_DIST = autogen.sh panoramixext.pc.in +EXTRA_DIST = autogen.sh panoramixproto.pc.in diff --git a/configure.ac b/configure.ac index 44052fc..8d30e16 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.57]) -AC_INIT([PanoramixExt], [7.0], [xorg@lists.freedesktop.org]) +AC_INIT([PanoramixProto], [7.0], [xorg@lists.freedesktop.org]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_OUTPUT([Makefile - panoramixext.pc]) + panoramixproto.pc]) diff --git a/panoramixext.pc.in b/xineramaproto.pc.in similarity index 89% rename from panoramixext.pc.in rename to xineramaproto.pc.in index abf897f..ed67e99 100644 --- a/panoramixext.pc.in +++ b/xineramaproto.pc.in @@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: PanoramixExt +Name: PanoramixProto Description: Panoramix extension headers Version: @PACKAGE_VERSION@ Cflags: -I${includedir} From ff3b1c8f0b2eaf1010e2a1043585ceb232ba3e53 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Mon, 16 May 2005 08:24:15 +0000 Subject: [PATCH 14/51] Add COPYING file for Panoramix. --- COPYING | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..54284fc --- /dev/null +++ b/COPYING @@ -0,0 +1,45 @@ +Copyright 2003 The Open Group + +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. + + +Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. +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. + +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 +DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, +BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation +shall not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from Digital +Equipment Corporation. From ead21add6c28dc2ade81a9b244dfe626f20f785f Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 19 May 2005 00:10:18 +0000 Subject: [PATCH 15/51] Require automake 1.7 in AM_INIT_AUTOMAKE --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8d30e16..590c4ed 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.57]) AC_INIT([PanoramixProto], [7.0], [xorg@lists.freedesktop.org]) -AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_INIT_AUTOMAKE([1.7], [foreign dist-bzip2]) AC_OUTPUT([Makefile panoramixproto.pc]) From 501d5823392a3ef6004bca877cfb5e9b4c346fd5 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 19 May 2005 00:22:39 +0000 Subject: [PATCH 16/51] revert last change, didn't do right thing at all, sorry for the noise --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 590c4ed..8d30e16 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.57]) AC_INIT([PanoramixProto], [7.0], [xorg@lists.freedesktop.org]) -AM_INIT_AUTOMAKE([1.7], [foreign dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_OUTPUT([Makefile panoramixproto.pc]) From 51af7343cc12fec7d7d3e72efb613c9055aeeabc Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Sat, 21 May 2005 04:12:42 +0000 Subject: [PATCH 17/51] Set version to 1.1. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8d30e16..8a8ad09 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([PanoramixProto], [7.0], [xorg@lists.freedesktop.org]) +AC_INIT([PanoramixProto], [1.1], [xorg@lists.freedesktop.org]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_OUTPUT([Makefile From c39a81928f245fa204030249868a422b65fec5a5 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Fri, 29 Jul 2005 21:22:56 +0000 Subject: [PATCH 18/51] Various changes preparing packages for RC0: - Verify and update package version numbers as needed - Implement versioning scheme - Change bug address to point to bugzilla bug entry form - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to reenable it) - Fix makedepend to use pkgconfig and pass distcheck - Update build script to build macros first - Update modular Xorg version --- configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 8a8ad09..aa1b46e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,8 @@ AC_PREREQ([2.57]) -AC_INIT([PanoramixProto], [1.1], [xorg@lists.freedesktop.org]) +AC_INIT([PanoramixProto], [1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) - + +XORG_RELEASE_VERSION + AC_OUTPUT([Makefile panoramixproto.pc]) From 74337d4f81c9050cb69da8fb825ebe9411b36140 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 2 Aug 2005 19:19:39 +0000 Subject: [PATCH 19/51] Add basic .cvsignore files for proto modules. --- .cvsignore | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .cvsignore diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..b30599e --- /dev/null +++ b/.cvsignore @@ -0,0 +1,10 @@ +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +config.log +config.status +configure +install-sh +missing +panoramixproto.pc From aba421a2e74a326a0e4387d3173308735a6263fd Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 18 Aug 2005 23:38:59 +0000 Subject: [PATCH 20/51] Xinerama protocol module should be named Xinerama, not Panoramix --- Makefile.am | 8 ++++---- configure.ac | 4 ++-- xineramaproto.pc.in | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7c2950f..9320e38 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,10 @@ -panoramixdir = $(includedir)/X11/extensions -panoramix_HEADERS = \ +xineramadir = $(includedir)/X11/extensions +xinerama_HEADERS = \ panoramiXext.h \ panoramiXproto.h \ Xinerama.h pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = panoramixproto.pc +pkgconfig_DATA = xineramaproto.pc -EXTRA_DIST = autogen.sh panoramixproto.pc.in +EXTRA_DIST = autogen.sh xineramaproto.pc.in diff --git a/configure.ac b/configure.ac index aa1b46e..2beeba5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ([2.57]) -AC_INIT([PanoramixProto], [1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XineramaProto], [1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) XORG_RELEASE_VERSION AC_OUTPUT([Makefile - panoramixproto.pc]) + xineramaproto.pc]) diff --git a/xineramaproto.pc.in b/xineramaproto.pc.in index ed67e99..8d1074d 100644 --- a/xineramaproto.pc.in +++ b/xineramaproto.pc.in @@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: PanoramixProto -Description: Panoramix extension headers +Name: XineramaProto +Description: Xinerama extension headers Version: @PACKAGE_VERSION@ Cflags: -I${includedir} From 7244429847b2bbed9b785463ff9e7086c6b39a34 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 19 Aug 2005 00:13:46 +0000 Subject: [PATCH 21/51] More updates for Panoramix -> Xinerama rename --- .cvsignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cvsignore b/.cvsignore index b30599e..21cef1c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -7,4 +7,4 @@ config.status configure install-sh missing -panoramixproto.pc +xineramaproto.pc From a4319de7154a6f150dc32e45effd552681e877bb Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Wed, 19 Oct 2005 02:48:16 +0000 Subject: [PATCH 22/51] Update package version number for RC1 release. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 2beeba5..b1ab982 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XineramaProto], [1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XineramaProto], [1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) XORG_RELEASE_VERSION From 6f36b1384ae09505815d4867e2a26781c4335f4e Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Thu, 15 Dec 2005 00:24:40 +0000 Subject: [PATCH 23/51] Update package version number for final X11R7 release candidate. --- ChangeLog | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 ChangeLog diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..c722b51 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,4 @@ +2005-12-14 Kevin E. Martin + + * configure.ac: + Update package version number for final X11R7 release candidate. diff --git a/configure.ac b/configure.ac index b1ab982..a1749c0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XineramaProto], [1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XineramaProto], [1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) XORG_RELEASE_VERSION From edd1f8255923146a6d8723649baa0018a8ca8962 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 14 Jul 2006 18:56:52 -0700 Subject: [PATCH 24/51] renamed: .cvsignore -> .gitignore --- .cvsignore => .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .cvsignore => .gitignore (100%) diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore From b845eec55045df17af46fead628e4814af6c1945 Mon Sep 17 00:00:00 2001 From: James Cloos Date: Mon, 3 Sep 2007 05:54:33 -0400 Subject: [PATCH 25/51] Add *~ to .gitignore to skip patch/emacs droppings --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 21cef1c..fa6f681 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ configure install-sh missing xineramaproto.pc +*~ From 29a5de547f301b8b3af265d87889ba08ef3a5c8e Mon Sep 17 00:00:00 2001 From: James Cloos Date: Thu, 6 Dec 2007 16:39:15 -0500 Subject: [PATCH 26/51] Replace static ChangeLog with dist-hook to generate from git log --- ChangeLog | 4 ---- Makefile.am | 10 ++++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 ChangeLog diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index c722b51..0000000 --- a/ChangeLog +++ /dev/null @@ -1,4 +0,0 @@ -2005-12-14 Kevin E. Martin - - * configure.ac: - Update package version number for final X11R7 release candidate. diff --git a/Makefile.am b/Makefile.am index 9320e38..9254d26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,3 +8,13 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xineramaproto.pc EXTRA_DIST = autogen.sh xineramaproto.pc.in + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog From 47f0250dfcbc8edd3c0d0420f560e1316f5a444a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 19 May 2008 22:36:31 +0930 Subject: [PATCH 27/51] Nuke RCS tags. --- Xinerama.h | 2 -- panoramiXext.h | 2 -- panoramiXproto.h | 2 -- 3 files changed, 6 deletions(-) diff --git a/Xinerama.h b/Xinerama.h index 9ccc400..666f52a 100644 --- a/Xinerama.h +++ b/Xinerama.h @@ -1,4 +1,3 @@ -/* $XdotOrg: xc/include/extensions/Xinerama.h,v 1.2 2004/04/23 18:43:06 eich Exp $ */ /* Copyright 2003 The Open Group @@ -24,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/extensions/Xinerama.h,v 3.3 2002/09/16 18:05:19 eich Exp $ */ #ifndef _Xinerama_h #define _Xinerama_h diff --git a/panoramiXext.h b/panoramiXext.h index ad2f7e4..280efc5 100644 --- a/panoramiXext.h +++ b/panoramiXext.h @@ -1,4 +1,3 @@ -/* $Xorg: panoramiXext.h,v 1.4 2000/08/18 04:05:45 coskrey Exp $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. Permission is hereby granted, free of charge, to any person obtaining a copy @@ -26,7 +25,6 @@ Equipment Corporation. /* * PanoramiX definitions */ -/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ diff --git a/panoramiXproto.h b/panoramiXproto.h index 6b27c56..14aa6c5 100644 --- a/panoramiXproto.h +++ b/panoramiXproto.h @@ -1,4 +1,3 @@ -/* $Xorg: panoramiXproto.h,v 1.4 2000/08/18 04:05:45 coskrey Exp $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. Permission is hereby granted, free of charge, to any person obtaining a copy @@ -23,7 +22,6 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.5 2000/03/01 01:04:21 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ From e28d33b35a0a795aec7e3174b42a0f317c15a827 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 19 May 2008 22:40:07 +0930 Subject: [PATCH 28/51] Remove panoramiXext.h and Xinerama.h. Xlib headers and don't belong here. For furture amendmends to these files please refer to git://anongit.freedesktop.org/git/xorg/lib/libXinerama --- Makefile.am | 4 +-- Xinerama.h | 74 -------------------------------------------------- panoramiXext.h | 46 ------------------------------- 3 files changed, 1 insertion(+), 123 deletions(-) delete mode 100644 Xinerama.h delete mode 100644 panoramiXext.h diff --git a/Makefile.am b/Makefile.am index 9254d26..d00df00 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,6 @@ xineramadir = $(includedir)/X11/extensions xinerama_HEADERS = \ - panoramiXext.h \ - panoramiXproto.h \ - Xinerama.h + panoramiXproto.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xineramaproto.pc diff --git a/Xinerama.h b/Xinerama.h deleted file mode 100644 index 666f52a..0000000 --- a/Xinerama.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - -Copyright 2003 The Open Group - -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. - -*/ - -#ifndef _Xinerama_h -#define _Xinerama_h - -#include - -typedef struct { - int screen_number; - short x_org; - short y_org; - short width; - short height; -} XineramaScreenInfo; - -_XFUNCPROTOBEGIN - -Bool XineramaQueryExtension ( - Display *dpy, - int *event_base, - int *error_base -); - -Status XineramaQueryVersion( - Display *dpy, - int *major_versionp, - int *minor_versionp -); - -Bool XineramaIsActive(Display *dpy); - - -/* - Returns the number of heads and a pointer to an array of - structures describing the position and size of the individual - heads. Returns NULL and number = 0 if Xinerama is not active. - - Returned array should be freed with XFree(). -*/ - -XineramaScreenInfo * -XineramaQueryScreens( - Display *dpy, - int *number -); - -_XFUNCPROTOEND - -#endif /* _Xinerama_h */ - diff --git a/panoramiXext.h b/panoramiXext.h deleted file mode 100644 index 280efc5..0000000 --- a/panoramiXext.h +++ /dev/null @@ -1,46 +0,0 @@ -/***************************************************************** -Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. -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. - -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 -DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, -BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation -shall not be used in advertising or otherwise to promote the sale, use or other -dealings in this Software without prior written authorization from Digital -Equipment Corporation. -******************************************************************/ -/* - * PanoramiX definitions - */ - -/* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ - -#define PANORAMIX_MAJOR_VERSION 1 /* current version number */ -#define PANORAMIX_MINOR_VERSION 1 - -typedef struct { - Window window; /* PanoramiX window - may not exist */ - int screen; - int State; /* PanroamiXOff, PanoramiXOn */ - int width; /* width of this screen */ - int height; /* height of this screen */ - int ScreenCount; /* real physical number of screens */ - XID eventMask; /* selected events for this client */ -} XPanoramiXInfo; - -extern XPanoramiXInfo *XPanoramiXAllocInfo ( - void -); From b8b3878351a148e527df44ddf8886917f00d1a85 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Tue, 27 Jan 2009 20:06:28 -0200 Subject: [PATCH 29/51] Janitor: Correct make distcheck and dont distribute autogen.sh --- .gitignore | 3 +++ Makefile.am | 4 ++-- configure.ac | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fa6f681..c4bb570 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ install-sh missing xineramaproto.pc *~ +xineramaproto-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index d00df00..591a301 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ xinerama_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xineramaproto.pc -EXTRA_DIST = autogen.sh xineramaproto.pc.in +EXTRA_DIST = xineramaproto.pc.in EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog @@ -13,6 +13,6 @@ MAINTAINERCLEANFILES = ChangeLog .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index a1749c0..ee2d35b 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,11 @@ AC_PREREQ([2.57]) AC_INIT([XineramaProto], [1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +# Require xorg-macros: XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile xineramaproto.pc]) From 21477147613c28c968b5e1eb9d8aea7017dd399d Mon Sep 17 00:00:00 2001 From: Benjamin Close Date: Fri, 13 Feb 2009 14:46:11 +1030 Subject: [PATCH 30/51] The major/minor protocol versions exist in the proto headers not the lib/libXinerma userspace headers Signed-off-by: Benjamin Close Acked-by: Daniel Stone Acked-by: Peter Hutterer --- panoramiXproto.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/panoramiXproto.h b/panoramiXproto.h index 14aa6c5..6fd1a02 100644 --- a/panoramiXproto.h +++ b/panoramiXproto.h @@ -28,6 +28,9 @@ Equipment Corporation. #ifndef _PANORAMIXPROTO_H_ #define _PANORAMIXPROTO_H_ +#define PANORAMIX_MAJOR_VERSION 1 /* current version number */ +#define PANORAMIX_MINOR_VERSION 1 + #define PANORAMIX_PROTOCOL_NAME "XINERAMA" #define X_PanoramiXQueryVersion 0 From 419bcf5831b06a1ab9d01ef1188e53b1478e2860 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 27 Aug 2009 11:39:16 +1000 Subject: [PATCH 31/51] xineramaproto 1.1.99.1 Signed-off-by: Peter Hutterer --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ee2d35b..14c51ec 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XineramaProto], [1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XineramaProto], [1.1.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_CHANGELOG From 489b2bf3698a3c4537ff1a473f9f080d8219cf07 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 1 Oct 2009 20:34:09 +1000 Subject: [PATCH 32/51] Require macros 1.3 for XORG_DEFAULT_OPTIONS Signed-off-by: Peter Hutterer --- configure.ac | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 14c51ec..1c19b3c 100644 --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,10 @@ AC_PREREQ([2.57]) AC_INIT([XineramaProto], [1.1.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) -# Require xorg-macros: XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) -XORG_RELEASE_VERSION -XORG_CHANGELOG +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS AC_OUTPUT([Makefile xineramaproto.pc]) From 216c573fa004c1b7ae2bd273a340127515e329a7 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 1 Oct 2009 20:41:09 +1000 Subject: [PATCH 33/51] xineramaproto 1.2 Signed-off-by: Peter Hutterer --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1c19b3c..cba10f8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XineramaProto], [1.1.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XineramaProto], [1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_DEFAULT_OPTIONS From 832ad52e71bd0f7f78621d00de1a2e8e0837d323 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sat, 14 Nov 2009 18:26:47 -0500 Subject: [PATCH 34/51] .gitignore: use common defaults with custom section # 24239 Using common defaults will reduce errors and maintenance. Only the very small or inexistent custom section need periodic maintenance when the structure of the component changes. Do not edit defaults. --- .gitignore | 84 +++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 74 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index c4bb570..b20ff20 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,78 @@ +# +# X.Org module default exclusion patterns +# The next section if for module specific patterns +# +# Do not edit the following section +# GNU Build System (Autotools) +aclocal.m4 +autom4te.cache/ +autoscan.log +ChangeLog +compile +config.guess +config.h +config.h.in +config.log +config-ml.in +config.py +config.status +config.status.lineno +config.sub +configure +configure.scan +depcomp +.deps/ +INSTALL +install-sh +.libs/ +libtool +libtool.m4 +ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 Makefile Makefile.in -aclocal.m4 -autom4te.cache -config.log -config.status -configure -install-sh +mdate-sh missing -xineramaproto.pc +mkinstalldirs +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute *~ -xineramaproto-*.tar.* -ChangeLog -tags +*.[0-9] +*.[0-9]x +*.bak +*.bin +core +*.dll +*.exe +*-ISO*.bdf +*-JIS*.bdf +*-KOI8*.bdf +*.kld +*.ko +*.ko.cmd +*.lai +*.l[oa] +*.[oa] +*.obj +*.patch +*.so +*.pcf.gz +*.pdb +*.tar.bz2 +*.tar.gz +# +# Add & Override patterns for xineramaproto +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# From c4ab44362b2f6a919eb789e7f17df6a36db9a5c4 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 13:55:25 -0500 Subject: [PATCH 35/51] configure.ac: AM_MAINTAINER_MODE missing #24238 This turns off maintainer mode build rules in tarballs. Works in conjunction with autogen.sh --enable-maintainer-mode --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index cba10f8..6ac15b3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,7 @@ AC_PREREQ([2.57]) AC_INIT([XineramaProto], [1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE # Require xorg-macros: XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) From 832556b97daaba4a500b92484de878fb3d26b882 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 18:11:36 -0500 Subject: [PATCH 36/51] configure.ac: deploy the new XORG_DEFAULT_OPTIONS #24242 This macro aggregate a number of existing macros that sets commmon X.Org components configuration options. It shields the configuration file from future changes. --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6ac15b3..b4172eb 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,8 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE # Require xorg-macros: XORG_DEFAULT_OPTIONS -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.3) XORG_DEFAULT_OPTIONS From 5c15d5e22cdbb9ce16bc989729eabff2ee6ec6bd Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 18:31:29 -0500 Subject: [PATCH 37/51] Makefile.am: INSTALL file is missing or incorrect #24206 The standard GNU file on building/installing tarball is copied using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS Add INSTALL target --- Makefile.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 591a301..0787d11 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,9 +10,12 @@ EXTRA_DIST = xineramaproto.pc.in EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL From 714187d975e09664b2b949287bc8b8c3cc802f33 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 19:45:27 -0500 Subject: [PATCH 38/51] Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 ChangeLog filename is known to Automake and requires no further coding in the makefile. --- Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0787d11..7388efa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,9 +7,6 @@ pkgconfig_DATA = xineramaproto.pc EXTRA_DIST = xineramaproto.pc.in -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog - .PHONY: ChangeLog INSTALL INSTALL: From 1987cb77a792145d1ada7037530b637ff0a7be58 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Mon, 16 Nov 2009 11:13:30 -0500 Subject: [PATCH 39/51] README: file created or updated #24206 Contains a set of URLs to freedesktop.org. --- README | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 README diff --git a/README b/README new file mode 100644 index 0000000..44b5041 --- /dev/null +++ b/README @@ -0,0 +1,31 @@ + X Xinerama Extension + +This is an X extension that allows multiple physical screens controlled +by a single X server to appear as a single screen. + +Extension name: XINERAMA + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/proto/xineramaproto + + http://cgit.freedesktop.org/xorg/proto/xineramaproto + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + + From 51e0e392e34e543fadb873a1a1e15c01f96cc538 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 22 Nov 2009 19:24:48 -0500 Subject: [PATCH 40/51] Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES Now that the INSTALL file is generated. Allows running make maintainer-clean. --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index 7388efa..d087acc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,8 @@ pkgconfig_DATA = xineramaproto.pc EXTRA_DIST = xineramaproto.pc.in +MAINTAINERCLEANFILES = ChangeLog INSTALL + .PHONY: ChangeLog INSTALL INSTALL: From bbf13fdf9259886403347c4fd6f127bed0af4426 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 28 Mar 2010 19:00:31 -0400 Subject: [PATCH 41/51] config: remove the pkgconfig pc.in file from EXTRA_DIST Automake always includes it in the tarball. Signed-off-by: Gaetan Nadon --- Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index d087acc..92a4911 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,6 @@ xinerama_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xineramaproto.pc -EXTRA_DIST = xineramaproto.pc.in MAINTAINERCLEANFILES = ChangeLog INSTALL From b4af6b510f3f3f877b6eca5c9b6f8b2b7650f912 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 28 Mar 2010 19:25:52 -0400 Subject: [PATCH 42/51] config: update AC_PREREQ statement to 2.60 Unrelated to the previous patches, the new value simply reflects the reality that the minimum level for autoconf to configure all x.org modules is 2.60 dated June 2006. ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz Signed-off-by: Gaetan Nadon --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b4172eb..e17d255 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_PREREQ([2.57]) +AC_PREREQ([2.60]) AC_INIT([XineramaProto], [1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE From f548ea433c5ede2a9a4b896832e622e66dc7455e Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Wed, 5 Jan 2011 20:17:56 -0800 Subject: [PATCH 43/51] config: Add missing AC_CONFIG_SRCDIR Regroup AC statements under the Autoconf initialization section. Regroup AM statements under the Automake initialization section. Signed-off-by: Alan Coopersmith --- configure.ac | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configure.ac b/configure.ac index e17d255..d9f3253 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,12 @@ +dnl +dnl Process this file with autoconf to create configure. + +# Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([XineramaProto], [1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_CONFIG_SRCDIR([Makefile.am]) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE From 609550d777f2aa6ac0d31bf7c62699e97e8dc218 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Wed, 5 Jan 2011 20:18:46 -0800 Subject: [PATCH 44/51] xineramaproto 1.2.1 Signed-off-by: Alan Coopersmith --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index d9f3253..232b343 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,8 @@ dnl Process this file with autoconf to create configure. # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([XineramaProto], [1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XineramaProto], [1.2.1], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AC_CONFIG_SRCDIR([Makefile.am]) # Initialize Automake From f35bbf01ca1629c64a526904b1633f58e8ac40a2 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Wed, 5 Jan 2011 20:26:45 -0800 Subject: [PATCH 45/51] README: provide a bit more detail/clarification Signed-off-by: Alan Coopersmith --- README | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README b/README index 44b5041..5f677be 100644 --- a/README +++ b/README @@ -1,7 +1,13 @@ X Xinerama Extension -This is an X extension that allows multiple physical screens controlled -by a single X server to appear as a single screen. +Xinerama is an X extension that allows clients to query information +about multiple physical screens controlled by a single X server that +appear as a single screen to core X11 protocol operations. + +This extension provides a common network protocol for querying information +which may be provided by different underlying screen combination +technologies in the X server, such as the original Xinerama multiplexer, +or alternative implementations like Xrandr or TwinView. Extension name: XINERAMA From 023aecf6a0a2fd35d678939381b092818a836ae7 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 15 Jan 2013 14:01:10 -0500 Subject: [PATCH 46/51] configure: Remove AM_MAINTAINER_MODE Signed-off-by: Adam Jackson --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index 232b343..a8bd2d6 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,6 @@ AC_CONFIG_SRCDIR([Makefile.am]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Require xorg-macros: XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], From 4e77b45e0d6b42a448dab2ec316eeb5c490ecfed Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 4 Jan 2012 17:37:06 -0500 Subject: [PATCH 47/51] autogen.sh: Implement GNOME Build API http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Adam Jackson --- autogen.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index 904cd67..fc34bd5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,4 +9,6 @@ cd $srcdir autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure --enable-maintainer-mode "$@" +if test -z "$NOCONFIGURE"; then + $srcdir/configure "$@" +fi From 441b8d83713ef2480180de98f184222b17a245ac Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sat, 26 Oct 2013 09:42:05 -0400 Subject: [PATCH 48/51] config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES Fix Automake warning: AC_OUTPUT should be used without arguments. www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Files Signed-off-by: Gaetan Nadon --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a8bd2d6..e17e346 100644 --- a/configure.ac +++ b/configure.ac @@ -16,5 +16,6 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION(1.3) XORG_DEFAULT_OPTIONS -AC_OUTPUT([Makefile +AC_CONFIG_FILES([Makefile xineramaproto.pc]) +AC_OUTPUT From e673529755e38b027dbf53f6e812466d99f509f6 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 24 Jan 2017 10:32:07 +1000 Subject: [PATCH 49/51] autogen.sh: use exec instead of waiting for configure to finish Syncs the invocation of configure with the one from the server. Signed-off-by: Peter Hutterer --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index fc34bd5..fd9c59a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -10,5 +10,5 @@ autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? if test -z "$NOCONFIGURE"; then - $srcdir/configure "$@" + exec $srcdir/configure "$@" fi From e0d2f114db0035959011e04564178042b435cf11 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 9 Mar 2015 12:00:52 +0000 Subject: [PATCH 50/51] autogen.sh: use quoted string variables Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent fall-outs, when they contain space. Signed-off-by: Emil Velikov Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer --- autogen.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/autogen.sh b/autogen.sh index fd9c59a..0006de8 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,14 +1,14 @@ #! /bin/sh -srcdir=`dirname $0` +srcdir=`dirname "$0"` test -z "$srcdir" && srcdir=. ORIGDIR=`pwd` -cd $srcdir +cd "$srcdir" autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? +cd "$ORIGDIR" || exit $? if test -z "$NOCONFIGURE"; then - exec $srcdir/configure "$@" + exec "$srcdir"/configure "$@" fi From 6c277d5bb2924614eca922aafe1d8debfdb45586 Mon Sep 17 00:00:00 2001 From: Mihail Konev Date: Thu, 26 Jan 2017 13:52:49 +1000 Subject: [PATCH 51/51] autogen: add default patch prefix Signed-off-by: Mihail Konev --- autogen.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/autogen.sh b/autogen.sh index 0006de8..7e8c74e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,6 +9,9 @@ cd "$srcdir" autoreconf -v --install || exit 1 cd "$ORIGDIR" || exit $? +git config --local --get format.subjectPrefix >/dev/null 2>&1 || + git config --local format.subjectPrefix "PATCH xineramaproto" + if test -z "$NOCONFIGURE"; then exec "$srcdir"/configure "$@" fi