diff options
| -rw-r--r-- | debian/nx-x11proto-xinerama-dev.install.in | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/X11/include/Xinerama_nxagent.h | 74 | ||||
| -rw-r--r-- | nx-libs.spec | 12 |
3 files changed, 81 insertions, 7 deletions
diff --git a/debian/nx-x11proto-xinerama-dev.install.in b/debian/nx-x11proto-xinerama-dev.install.in new file mode 100644 index 000000000..2e1efbc63 --- /dev/null +++ b/debian/nx-x11proto-xinerama-dev.install.in @@ -0,0 +1,2 @@ +usr/include/*/nx-X11/extensions/panoramiXext.h +usr/include/*/nx-X11/extensions/panoramiXproto.h diff --git a/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xinerama_nxagent.h b/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xinerama_nxagent.h new file mode 100644 index 000000000..210c4b5e7 --- /dev/null +++ b/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xinerama_nxagent.h @@ -0,0 +1,74 @@ +/* + +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 <nx-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/nx-libs.spec b/nx-libs.spec index 01341a4ca..139a98cc8 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -63,8 +63,12 @@ BuildRequires: xorg-x11-util-devel BuildRequires: expat-devel BuildRequires: libpng-devel BuildRequires: libxml2-devel +BuildRequires: libX11-devel +BuildRequires: libXext-devel +BuildRequires: libXpm-devel BuildRequires: libXfont-devel BuildRequires: libXdmcp-devel +BuildRequires: libXdamage-devel BuildRequires: libXcomposite-devel BuildRequires: libXrandr-devel BuildRequires: libXfixes-devel @@ -552,7 +556,6 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %doc COPYING %doc nx-X11/README %dir %{_libdir}/nx -%dir %{_libdir}/nx/X11 %dir %{_datadir}/nx %{_datadir}/nx/SecurityPolicy @@ -623,7 +626,7 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %files -n libNX_Xrender-devel %defattr(-,root,root) %{_libdir}/libNX_Xrender.so -%{_includedir}/nx/X11/extensions/Xrender.h +%{_includedir}/nx-X11/extensions/Xrender.h %files -n libNX_Xrender1 %defattr(-,root,root) @@ -687,7 +690,6 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %{_includedir}/nx-X11/X10.h %dir %{_includedir}/nx-X11/extensions %{_includedir}/nx-X11/extensions/Xevie.h -%{_includedir}/nx-X11/extensions/Xinerama.h %{_includedir}/nx-X11/extensions/lbxbuf.h %{_includedir}/nx-X11/extensions/lbxbufstr.h %{_includedir}/nx-X11/extensions/lbxdeltastr.h @@ -778,10 +780,6 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %{_datadir}/pixmaps/nxagent.xpm %{_datadir}/nx/rgb %{_datadir}/man/man1/nxagent.1* -%dir %{_libdir}/nx/X11/Xinerama/ -%{_libdir}/nx/X11/Xinerama/libNX_X11.so.6 -%{_libdir}/nx/X11/Xinerama/libNX_Xext.so.6 -%{_libdir}/nx/X11/Xinerama/libXinerama.so.1* %files -n nxauth %defattr(-,root,root) |