From 1d4d8da23d02fdc88515c0b6fcacf8664b682c0a Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 18 Jan 2020 13:12:24 +0100 Subject: Drop unused Xalloca.h --- nx-libs.spec | 1 - 1 file changed, 1 deletion(-) (limited to 'nx-libs.spec') diff --git a/nx-libs.spec b/nx-libs.spec index 344a59a9f..fb1847a9e 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -554,7 +554,6 @@ rm -f %{buildroot}%{_datadir}/man/man1/nxdialog.1* %{_includedir}/nx-X11/X.h %{_includedir}/nx-X11/XF86keysym.h %{_includedir}/nx-X11/XWDFile.h -%{_includedir}/nx-X11/Xalloca.h %{_includedir}/nx-X11/Xarch.h %{_includedir}/nx-X11/Xatom.h %{_includedir}/nx-X11/Xdefs.h -- cgit v1.2.3 From 0943abfaf1ffce1315288b876e45232b31ff4747 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 18 Jan 2020 13:18:43 +0100 Subject: Drop unused XWDFile.h --- debian/copyright | 3 +- debian/copyright.in | 1 - debian/nx-x11proto-core-dev.install | 1 - nx-X11/include/Imakefile | 1 - nx-X11/include/XWDFile.h | 113 ------------------------------------ nx-libs.spec | 1 - 6 files changed, 1 insertion(+), 119 deletions(-) delete mode 100644 nx-X11/include/XWDFile.h (limited to 'nx-libs.spec') diff --git a/debian/copyright b/debian/copyright index 40773e173..63f1ad29e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -713,8 +713,7 @@ Copyright: 1999-2001, Brian Paul 2005, Brian Paul License: Expat -Files: nx-X11/include/XWDFile.h - nx-X11/include/Xauth.h +Files: nx-X11/include/Xauth.h nx-X11/include/Xfuncproto.h nx-X11/include/Xfuncs.h nx-X11/include/Xos.h diff --git a/debian/copyright.in b/debian/copyright.in index dd09390a4..a4484f91d 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -7,7 +7,6 @@ Disclaimer: Autogenerated by CDBS Files: nx-X11/include/DECkeysym.h nx-X11/include/HPkeysym.h nx-X11/include/X.h - nx-X11/include/XWDFile.h nx-X11/include/Xauth.h nx-X11/include/Xfuncproto.h nx-X11/include/Xfuncs.h diff --git a/debian/nx-x11proto-core-dev.install b/debian/nx-x11proto-core-dev.install index 32b0ac248..703b311e6 100644 --- a/debian/nx-x11proto-core-dev.install +++ b/debian/nx-x11proto-core-dev.install @@ -3,7 +3,6 @@ usr/include/*/nx-X11/HPkeysym.h usr/include/*/nx-X11/Sunkeysym.h usr/include/*/nx-X11/X.h usr/include/*/nx-X11/XF86keysym.h -usr/include/*/nx-X11/XWDFile.h usr/include/*/nx-X11/Xarch.h usr/include/*/nx-X11/Xatom.h usr/include/*/nx-X11/Xdefs.h diff --git a/nx-X11/include/Imakefile b/nx-X11/include/Imakefile index 5fdac47df..89a5833b1 100644 --- a/nx-X11/include/Imakefile +++ b/nx-X11/include/Imakefile @@ -23,7 +23,6 @@ HEADERS = \ Sunkeysym.h \ X.h \ XF86keysym.h \ - XWDFile.h \ Xarch.h \ Xatom.h \ Xdefs.h \ diff --git a/nx-X11/include/XWDFile.h b/nx-X11/include/XWDFile.h deleted file mode 100644 index b5c2349c5..000000000 --- a/nx-X11/include/XWDFile.h +++ /dev/null @@ -1,113 +0,0 @@ -/* - -Copyright 1985, 1986, 1998 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. - -*/ - -/* - * XWDFile.h MIT Project Athena, X Window system window raster - * image dumper, dump file format header file. - * - * Author: Tony Della Fera, DEC - * 27-Jun-85 - * - * Modifier: William F. Wyatt, SAO - * 18-Nov-86 - version 6 for saving/restoring color maps - */ - -#ifndef XWDFILE_H -#define XWDFILE_H - -#include - -#define XWD_FILE_VERSION 7 -#define sz_XWDheader 100 -#define sz_XWDColor 12 - -typedef CARD32 xwdval; /* for old broken programs */ - -/* Values in the file are most significant byte first. */ - -typedef struct _xwd_file_header { - /* header_size = SIZEOF(XWDheader) + length of null-terminated - * window name. */ - CARD32 header_size B32; - - CARD32 file_version B32; /* = XWD_FILE_VERSION above */ - CARD32 pixmap_format B32; /* ZPixmap or XYPixmap */ - CARD32 pixmap_depth B32; /* Pixmap depth */ - CARD32 pixmap_width B32; /* Pixmap width */ - CARD32 pixmap_height B32; /* Pixmap height */ - CARD32 xoffset B32; /* Bitmap x offset, normally 0 */ - CARD32 byte_order B32; /* of image data: MSBFirst, LSBFirst */ - - /* bitmap_unit applies to bitmaps (depth 1 format XY) only. - * It is the number of bits that each scanline is padded to. */ - CARD32 bitmap_unit B32; - - CARD32 bitmap_bit_order B32; /* bitmaps only: MSBFirst, LSBFirst */ - - /* bitmap_pad applies to pixmaps (non-bitmaps) only. - * It is the number of bits that each scanline is padded to. */ - CARD32 bitmap_pad B32; - - CARD32 bits_per_pixel B32; /* Bits per pixel */ - - /* bytes_per_line is pixmap_width padded to bitmap_unit (bitmaps) - * or bitmap_pad (pixmaps). It is the delta (in bytes) to get - * to the same x position on an adjacent row. */ - CARD32 bytes_per_line B32; - CARD32 visual_class B32; /* Class of colormap */ - CARD32 red_mask B32; /* Z red mask */ - CARD32 green_mask B32; /* Z green mask */ - CARD32 blue_mask B32; /* Z blue mask */ - CARD32 bits_per_rgb B32; /* Log2 of distinct color values */ - CARD32 colormap_entries B32; /* Number of entries in colormap; not used? */ - CARD32 ncolors B32; /* Number of XWDColor structures */ - CARD32 window_width B32; /* Window width */ - CARD32 window_height B32; /* Window height */ - CARD32 window_x B32; /* Window upper left X coordinate */ - CARD32 window_y B32; /* Window upper left Y coordinate */ - CARD32 window_bdrwidth B32; /* Window border width */ -} XWDFileHeader; - -/* Null-terminated window name follows the above structure. */ - -/* Next comes XWDColor structures, at offset XWDFileHeader.header_size in - * the file. XWDFileHeader.ncolors tells how many XWDColor structures - * there are. - */ - -typedef struct { - CARD32 pixel B32; - CARD16 red B16; - CARD16 green B16; - CARD16 blue B16; - CARD8 flags; - CARD8 pad; -} XWDColor; - -/* Last comes the image data in the format described by XWDFileHeader. */ - -#endif /* XWDFILE_H */ - diff --git a/nx-libs.spec b/nx-libs.spec index fb1847a9e..d933606cc 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -553,7 +553,6 @@ rm -f %{buildroot}%{_datadir}/man/man1/nxdialog.1* %{_includedir}/nx-X11/Sunkeysym.h %{_includedir}/nx-X11/X.h %{_includedir}/nx-X11/XF86keysym.h -%{_includedir}/nx-X11/XWDFile.h %{_includedir}/nx-X11/Xarch.h %{_includedir}/nx-X11/Xatom.h %{_includedir}/nx-X11/Xdefs.h -- cgit v1.2.3 From 37de96c617a8f93d190a9b7762bc16157a6bc92f Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 18 Jan 2020 13:32:48 +0100 Subject: Drop unused scrnsaver.h --- debian/copyright | 1 - debian/copyright.in | 1 - debian/nx-x11proto-scrnsaver-dev.install | 1 - nx-X11/include/extensions/Imakefile | 2 +- nx-X11/include/extensions/scrnsaver.h | 131 ------------------------------- nx-libs.spec | 1 - 6 files changed, 1 insertion(+), 136 deletions(-) delete mode 100644 nx-X11/include/extensions/scrnsaver.h (limited to 'nx-libs.spec') diff --git a/debian/copyright b/debian/copyright index 63f1ad29e..a67118810 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2184,7 +2184,6 @@ 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 diff --git a/debian/copyright.in b/debian/copyright.in index a4484f91d..7beee8a27 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -2113,7 +2113,6 @@ License: GENERATED FILE 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: MIT/X11 (BSD like) diff --git a/debian/nx-x11proto-scrnsaver-dev.install b/debian/nx-x11proto-scrnsaver-dev.install index 5a04b360b..1ce5992d0 100644 --- a/debian/nx-x11proto-scrnsaver-dev.install +++ b/debian/nx-x11proto-scrnsaver-dev.install @@ -1,3 +1,2 @@ usr/include/*/nx-X11/extensions/saver.h usr/include/*/nx-X11/extensions/saverproto.h -usr/include/*/nx-X11/extensions/scrnsaver.h diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile index 29f3b97fa..4c9a6e9e4 100644 --- a/nx-X11/include/extensions/Imakefile +++ b/nx-X11/include/extensions/Imakefile @@ -1,7 +1,7 @@ NULL = #if BuildScreenSaverExt -SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h +SCREENSAVERHEADERS = saver.h saverproto.h #endif #if BuildXF86BigfontExt diff --git a/nx-X11/include/extensions/scrnsaver.h b/nx-X11/include/extensions/scrnsaver.h deleted file mode 100644 index 38e5e24df..000000000 --- a/nx-X11/include/extensions/scrnsaver.h +++ /dev/null @@ -1,131 +0,0 @@ -/* - * $XConsortium: scrnsaver.h,v 1.6 94/04/17 20:59:34 keith Exp $ - * -Copyright (c) 1992 X Consortium - -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 THE -X CONSORTIUM 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 X Consortium 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 X Consortium. - * - * Author: Keith Packard, MIT X Consortium - */ -/* $XFree86$ */ - -#ifndef _SCRNSAVER_H_ -#define _SCRNSAVER_H_ - -#include -#include -#include - -typedef struct { - int type; /* of event */ - unsigned long serial; /* # of last request processed by server */ - Bool send_event; /* true if this came frome a SendEvent request */ - Display *display; /* Display the event was read from */ - Window window; /* screen saver window */ - Window root; /* root window of event screen */ - int state; /* ScreenSaverOff, ScreenSaverOn, ScreenSaverCycle*/ - int kind; /* ScreenSaverBlanked, ...Internal, ...External */ - Bool forced; /* extents of new region */ - Time time; /* event timestamp */ -} XScreenSaverNotifyEvent; - -typedef struct { - Window window; /* screen saver window - may not exist */ - int state; /* ScreenSaverOff, ScreenSaverOn, ScreenSaverDisabled*/ - int kind; /* ScreenSaverBlanked, ...Internal, ...External */ - unsigned long til_or_since; /* time til or since screen saver */ - unsigned long idle; /* total time since last user input */ - unsigned long eventMask; /* currently selected events for this client */ -} XScreenSaverInfo; - -_XFUNCPROTOBEGIN - -extern Bool XScreenSaverQueryExtension ( - Display* /* display */, - int* /* event_base */, - int* /* error_base */ -); - -extern Status XScreenSaverQueryVersion ( - Display* /* display */, - int* /* major_version */, - int* /* minor_version */ -); - -extern XScreenSaverInfo *XScreenSaverAllocInfo ( - void -); - -extern Status XScreenSaverQueryInfo ( - Display* /* display */, - Drawable /* drawable */, - XScreenSaverInfo* /* info */ -); - -extern void XScreenSaverSelectInput ( - Display* /* display */, - Drawable /* drawable */, - unsigned long /* eventMask */ -); - -extern void XScreenSaverSetAttributes ( - Display* /* display */, - Drawable /* drawable */, - int /* x */, - int /* y */, - unsigned int /* width */, - unsigned int /* height */, - unsigned int /* border_width */, - int /* depth */, - unsigned int /* class */, - Visual * /* visual */, - unsigned long /* valuemask */, - XSetWindowAttributes * /* attributes */ -); - -extern void XScreenSaverUnsetAttributes ( - Display* /* display */, - Drawable /* drawable */ -); - -extern Status XScreenSaverRegister ( - Display* /* display */, - int /* screen */, - XID /* xid */, - Atom /* type */ -); - -extern Status XScreenSaverUnregister ( - Display* /* display */, - int /* screen */ -); - -extern Status XScreenSaverGetRegistered ( - Display* /* display */, - int /* screen */, - XID* /* xid */, - Atom* /* type */ -); - -_XFUNCPROTOEND - -#endif /* _SCRNSAVER_H_ */ diff --git a/nx-libs.spec b/nx-libs.spec index d933606cc..55f448a9f 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -584,7 +584,6 @@ rm -f %{buildroot}%{_datadir}/man/man1/nxdialog.1* %{_includedir}/nx-X11/extensions/renderproto.h %{_includedir}/nx-X11/extensions/saver.h %{_includedir}/nx-X11/extensions/saverproto.h -%{_includedir}/nx-X11/extensions/scrnsaver.h %{_includedir}/nx-X11/extensions/security.h %{_includedir}/nx-X11/extensions/securstr.h %{_includedir}/nx-X11/extensions/shapeconst.h -- cgit v1.2.3