diff options
| -rw-r--r-- | proto/scrnsaverproto/ChangeLog | 191 | ||||
| -rw-r--r-- | proto/scrnsaverproto/Makefile | 4 | ||||
| -rw-r--r-- | proto/scrnsaverproto/Makefile.am | 15 | ||||
| -rw-r--r-- | proto/scrnsaverproto/autogen.sh | 12 | ||||
| -rw-r--r-- | proto/scrnsaverproto/configure.ac | 6 | ||||
| -rw-r--r-- | proto/scrnsaverproto/saver.h | 2 | ||||
| -rw-r--r-- | proto/scrnsaverproto/saverproto.h | 3 | ||||
| -rw-r--r-- | proto/scrnsaverproto/scrnsaver.h | 136 |
8 files changed, 198 insertions, 171 deletions
diff --git a/proto/scrnsaverproto/ChangeLog b/proto/scrnsaverproto/ChangeLog index 0acb57a69..0b68df419 100644 --- a/proto/scrnsaverproto/ChangeLog +++ b/proto/scrnsaverproto/ChangeLog @@ -1,18 +1,185 @@ -2006-03-31 Fredrik Höglund <fredrik@kde.org> +commit bcc25e87ba8e93c306b3cd00317a6f550c73f5cf +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Tue Aug 25 18:34:56 2009 +1000 - * configure.ac: - Update the package version number to 1.1. + scrnsaverproto 1.2.0 + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - * saver.h: - Increase the minor version to 1. +commit a2f5eaf51b26616746fddcd3a60c3b939d1a018a +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Tue Aug 25 18:34:36 2009 +1000 - * saverproto.h: - Add the ScreenSaverSuspend request. + Remove RCS tags + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - * scrnsaver.h: - Add the prototype for XScreenSaverSuspend. +commit 83974b2814eb18d9c86f41e39dfdafaf39759ced +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 20:06:28 2009 -0200 -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> + Janitor: Correct make distcheck and dont distribute autogen.sh - * configure.ac: - Update package version number for final X11R7 release candidate. +commit 88a1fe1ac27353b92836b9a21c5a1757bad64fad +Author: Peter Hutterer <peter@cs.unisa.edu.au> +Date: Mon May 19 20:08:12 2008 +0930 + + Remove scrnsaver.h. This is an xlib header, moved to libXScrnSaver. + + For future amendments to this file, look at + git://anongit.freedesktop.org/git/xorg/lib/libXScrnSaver + +commit c993e0c422a52bc5f56f7fba29af82f78f7680a5 +Author: Peter Hutterer <peter@cs.unisa.edu.au> +Date: Mon May 19 19:11:29 2008 +0930 + + Nuke RCS tags. + +commit 7e19b4a5ad470f1715046f56ea8149df851221e4 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:39:07 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 00aa1552d0c151402173ce9e4f612d84e4bbddcf +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:54:16 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 294d7788b9e4ee86d93992ea074b169bf2ede25e +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Fri Jul 14 18:56:32 2006 -0700 + + renamed: .cvsignore -> .gitignore + +commit ac0b03f75facc368da302fa2f500dcfeafc04e15 +Author: Fredrik Höglund <fredrik@kde.org> +Date: Fri Mar 31 18:39:42 2006 +0000 + + Update the package version number to 1.1. + Increase the minor version to 1. + Add the ScreenSaverSuspend request. + Add the prototype for XScreenSaverSuspend. + +commit 2f091ac1252c833bf70639b718bb1ac738066016 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:38 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 7bc2f8f300a7fac1f86d281459e74f2c3aafde07 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Oct 19 02:48:15 2005 +0000 + + Update package version number for RC1 release. + +commit ab3d7b78cfd25882ff74159931c9b1e5a7f1e762 +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Aug 2 19:19:39 2005 +0000 + + Add basic .cvsignore files for proto modules. + +commit 4a27d790b9e39c2bae6515ddc71cd7c710b9fd69 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:56 2005 +0000 + + 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 + +commit 6f818dc15a71a0af7e9cf5806677722f99227ebd +Author: Daniel Stone <daniel@fooishbar.org> +Date: Sat May 21 04:19:33 2005 +0000 + + Set version to 1.0. + +commit 450acca3dbce47f8fef56864235698715ba5122d +Author: Adam Jackson <ajax@nwnk.net> +Date: Thu May 19 00:22:40 2005 +0000 + + revert last change, didn't do right thing at all, sorry for the noise + +commit 15eaf97151b718e01eecac1aba75872e4c9d2ddc +Author: Adam Jackson <ajax@nwnk.net> +Date: Thu May 19 00:10:19 2005 +0000 + + Require automake 1.7 in AM_INIT_AUTOMAKE + +commit 771299cf2f6de82ac1bc58aaf4830cc514033569 +Author: Josh Triplett <josh@speakeasy.net> +Date: Tue May 17 20:41:15 2005 +0000 + + Add COPYING file for ScrnSaver. + +commit e455c03bb7e498e7eaaf8ad815fb60355fb1f72e +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Date: Mon May 9 18:20:06 2005 +0000 + + Change all the protonames from <extension>Ext to <extension>Proto. + +commit 22a2a1cdb0f6e05fa609fbd996c696aa509f1f83 +Author: Kevin E Martin <kem@kem.org> +Date: Fri May 6 01:46:31 2005 +0000 + + Initial build system files for proto module. + +commit df80fd315a3dedab112429d68c45adaf57e12c3d +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu Jan 27 05:36:16 2005 +0000 + + Include X11/Xlib.h in scrnsaver.h + +commit fd13bc250b337d0510975b49a2432b0fd9e3753c +Author: Egbert Eich <eich@suse.de> +Date: Fri Apr 23 18:43:06 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 30ce491906c32ed9137738cd97c13e2c346f4d48 +Author: Egbert Eich <eich@suse.de> +Date: Sun Mar 14 08:31:36 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 7e886322e57130ed3a2b4633cd93a9f6fe17c4c4 +Author: Egbert Eich <eich@suse.de> +Date: Wed Mar 3 12:10:54 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit bdcc80fa6a01bfdbaba23ed0ea265afbb3deff3c +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 13:35:14 2004 +0000 + + readding XFree86's cvs IDs + +commit 6229c02f2d40f995b5f0067fab1ae1c281b3c5f9 +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 09:22:28 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit 21e708cda17e86d513bbc8cd779fa5f35376b868 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Tue Nov 25 19:28:02 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit 78c91d731d4b9e708e5187f7051022a9ee50563a +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:43 2003 +0000 + + XFree86 4.3.0.1 + +commit 0c0b82a2143adfb443157badfe84093d8b74cc13 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:43 2003 +0000 + + Initial revision diff --git a/proto/scrnsaverproto/Makefile b/proto/scrnsaverproto/Makefile index b7de9c5d8..57bbc6da8 100644 --- a/proto/scrnsaverproto/Makefile +++ b/proto/scrnsaverproto/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2010/04/25 19:55:03 matthieu Exp $ HEADERS_SUBDIR= X11/extensions/ -HEADERS= saver.h saverproto.h scrnsaver.h +HEADERS= saver.h saverproto.h PKGCONFIG= scrnsaverproto.pc .include <bsd.xorg.mk> diff --git a/proto/scrnsaverproto/Makefile.am b/proto/scrnsaverproto/Makefile.am index aa737850a..cb098d13e 100644 --- a/proto/scrnsaverproto/Makefile.am +++ b/proto/scrnsaverproto/Makefile.am @@ -1,10 +1,19 @@ scrnsaverdir = $(includedir)/X11/extensions scrnsaver_HEADERS = \ saver.h \ - saverproto.h \ - scrnsaver.h + saverproto.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = scrnsaverproto.pc -EXTRA_DIST = autogen.sh scrnsaverproto.pc.in +EXTRA_DIST = scrnsaverproto.pc.in + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff --git a/proto/scrnsaverproto/autogen.sh b/proto/scrnsaverproto/autogen.sh deleted file mode 100644 index 904cd6746..000000000 --- a/proto/scrnsaverproto/autogen.sh +++ /dev/null @@ -1,12 +0,0 @@ -#! /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/proto/scrnsaverproto/configure.ac b/proto/scrnsaverproto/configure.ac index 10d7e1bc1..fff6f4003 100644 --- a/proto/scrnsaverproto/configure.ac +++ b/proto/scrnsaverproto/configure.ac @@ -1,8 +1,12 @@ AC_PREREQ([2.57]) -AC_INIT([ScrnSaverProto], [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([ScrnSaverProto], [1.2.0], [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 scrnsaverproto.pc]) diff --git a/proto/scrnsaverproto/saver.h b/proto/scrnsaverproto/saver.h index d253e4f79..e8da62560 100644 --- a/proto/scrnsaverproto/saver.h +++ b/proto/scrnsaverproto/saver.h @@ -1,6 +1,4 @@ /* - * $XConsortium: saver.h,v 1.5 94/04/17 20:59:33 rws Exp $ - * Copyright (c) 1992 X Consortium Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/proto/scrnsaverproto/saverproto.h b/proto/scrnsaverproto/saverproto.h index 9b8ed7333..7197084cc 100644 --- a/proto/scrnsaverproto/saverproto.h +++ b/proto/scrnsaverproto/saverproto.h @@ -1,6 +1,4 @@ /* - * $XConsortium: saverproto.h,v 1.5 94/04/17 20:59:33 keith Exp $ - * Copyright (c) 1992 X Consortium Permission is hereby granted, free of charge, to any person obtaining a copy @@ -26,7 +24,6 @@ in this Software without prior written authorization from the X Consortium. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86$ */ #ifndef _SAVERPROTO_H_ #define _SAVERPROTO_H_ diff --git a/proto/scrnsaverproto/scrnsaver.h b/proto/scrnsaverproto/scrnsaver.h deleted file mode 100644 index 8e8c5d6d1..000000000 --- a/proto/scrnsaverproto/scrnsaver.h +++ /dev/null @@ -1,136 +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 <X11/Xfuncproto.h> -#include <X11/Xlib.h> -#include <X11/extensions/saver.h> - -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 */ -); - -extern void XScreenSaverSuspend ( - Display* /* display */, - Bool /* suspend */ -); - -_XFUNCPROTOEND - -#endif /* _SCRNSAVER_H_ */ |