summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2008-05-19 22:40:07 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2008-05-19 22:40:07 +0930
commite28d33b35a0a795aec7e3174b42a0f317c15a827 (patch)
tree96e86e9571edd40367d9f4d123951e8b945cbaa0
parent47f0250dfcbc8edd3c0d0420f560e1316f5a444a (diff)
downloadxorg-proto-xineramaproto-e28d33b35a0a795aec7e3174b42a0f317c15a827.tar.gz
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
-rw-r--r--Makefile.am4
-rw-r--r--Xinerama.h74
-rw-r--r--panoramiXext.h46
3 files changed, 1 insertions, 123 deletions
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 <X11/Xlib.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_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
-);