.gitignore | 9 ++
Makefile.am | 7 -
README | 25 ++++++
configure.ac | 14 ++-
include/X11/extensions/scrnsaver.h | 135 +++++++++++++++++++++++++++++++++++++
man/.gitignore | 3
man/Xss.man | 12 +--
src/.gitignore | 7 -
src/Makefile.am | 10 ++
src/XScrnSaver.c | 18 ++--
10 files changed, 204 insertions(+), 36 deletions(-)
New commits:
commit aa162e709338904604b3f945999956044bcbc7cb
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Tue Aug 25 18:47:04 2009 +1000
Bump to 1.2.0
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/configure.ac b/configure.ac
index 10cc798..9a27522 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(libXScrnSaver, 1.1.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXScrnSaver)
+AC_INIT(libXScrnSaver, 1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXScrnSaver)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit 1fd39b3fa18a3a315bf339f56a5fd9fb7a279f60
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Tue Aug 25 18:48:26 2009 +1000
Require scrnsaverproto 1.2 to avoid header file conflicts.
scrnsaverproto <= 1.1 provided screensaver.h.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/configure.ac b/configure.ac
index 3775c3a..10cc798 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ AC_PROG_LIBTOOL
XORG_CWARNFLAGS
# Check for dependencies
-PKG_CHECK_MODULES(XSCRNSAVER, x11 xext xextproto [scrnsaverproto >= 1.1])
+PKG_CHECK_MODULES(XSCRNSAVER, x11 xext xextproto [scrnsaverproto >= 1.2])
XSCRNSAVER_CFLAGS="$CWARNFLAGS $XSCRNSAVER_CFLAGS"
AC_SUBST(XSCRNSAVER_CFLAGS)
AC_SUBST(XSCRNSAVER_LIBS)
commit fb54ab90058f187f32c0679da35684accf8043c7
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Aug 20 23:31:47 2009 +0200
Fix man vs header mismatch
the manpage says the last member of XScreenSaverInfo is called
event_mask when in fact it is called eventMask in the header file.
Debian bug#542698 <http://bugs.debian.org/542698>
diff --git a/man/Xss.man b/man/Xss.man
index cde6b31..7b65d96 100644
--- a/man/Xss.man
+++ b/man/Xss.man
@@ -42,7 +42,7 @@ typedef struct {
int kind; /\(** ScreenSaver{Blanked,Internal,External}
*/
unsigned long til_or_since; /\(** milliseconds */
unsigned long idle; /\(** milliseconds */
- unsigned long event_mask; /\(** events */
+ unsigned long eventMask; /\(** events */
.br
} XScreenSaverInfo;
commit 486af8df83765525d8c77bfa42b56fb193950c8a
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Mon Feb 2 20:34:31 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
diff --git a/README b/README
index e69de29..9e96bde 100644
--- a/README
+++ b/README
@@ -0,0 +1,25 @@
+XScreenSaver - X11 Screen Saver extension client library
+
+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/lib/libXScrnSaver
+
+ http://cgit.freedesktop.org/xorg/lib/libXScrnSaver
+
+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
+
commit ed5bba86f67fdadeeaff584818d10864f3609e1a
Author: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
Date: Fri Jan 30 17:18:09 2009 -0200
Janitor: make distcheck, compiler warnings.
diff --git a/.gitignore b/.gitignore
index 6be2dbd..ac1a4df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
aclocal.m4
autom4te.cache
config.guess
@@ -19,3 +21,10 @@ mkinstalldirs
stamp-h1
xscrnsaver.pc
*~
+*.3
+*.o
+*.la
+*.lo
+libXScrnSaver-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 725a8e7..21196b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,14 +24,13 @@ SUBDIRS = src man
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xscrnsaver.pc
-EXTRA_DIST = xscrnsaver.pc.in autogen.sh ChangeLog
-
-CLEANFILES = ChangeLog
+EXTRA_DIST = xscrnsaver.pc.in 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)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 69cf670..3775c3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,17 +29,18 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or
later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.1)
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or
later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
+XORG_CWARNFLAGS
# Check for dependencies
PKG_CHECK_MODULES(XSCRNSAVER, x11 xext xextproto [scrnsaverproto >= 1.1])
-
+XSCRNSAVER_CFLAGS="$CWARNFLAGS $XSCRNSAVER_CFLAGS"
AC_SUBST(XSCRNSAVER_CFLAGS)
AC_SUBST(XSCRNSAVER_LIBS)
@@ -50,6 +51,7 @@ XORG_LINT_LIBRARY([Xss])
XORG_CHECK_MALLOC_ZERO
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
src/Makefile
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 2d0f344..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-*.3*
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index d0f3e44..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-libXScrnSaver.la
-*.la
-*.lo
-Makefile
-Makefile.in
diff --git a/src/XScrnSaver.c b/src/XScrnSaver.c
index 1e3fe70..0bbdc60 100644
--- a/src/XScrnSaver.c
+++ b/src/XScrnSaver.c
@@ -351,7 +351,7 @@ void XScreenSaverSetAttributes (
req->borderWidth = border_width;
req->c_class = class;
req->depth = depth;
- if (visual == CopyFromParent)
+ if (visual == (Visual *)CopyFromParent)
req->visualID = CopyFromParent;
else
req->visualID = visual->visualid;
commit f755643f48e780c6582132269ca8d5fb750c53bf
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Mon May 19 22:53:40 2008 +0930
Change AM_CFLAGS to pull in new header.
diff --git a/src/Makefile.am b/src/Makefile.am
index 61d8b0a..b0498be 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,9 @@
-AM_CFLAGS = $(XSCRNSAVER_CFLAGS) $(MALLOC_ZERO_CFLAGS)
+AM_CFLAGS = -I$(top_srcdir)/include \
+ -I$(top_srcdir)/include/X11 \
+ -I$(top_srcdir)/include/X11/extensions \
+ $(XSCRNSAVER_CFLAGS) \
+ $(MALLOC_ZERO_CFLAGS)
+
lib_LTLIBRARIES = libXss.la
libXss_la_SOURCES = \
commit 85762a27e0203aa380c4ed26dc08c7f1181d5210
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Mon May 19 20:11:56 2008 +0930
Add screensaver.h to includedir.
This header is a pure Xlib header and was moved here from the protocol
module.
The history of the file can be found in the protocol module.
git://anongit.freedesktop.org/git/xorg/proto/scrnsaverproto
diff --git a/include/X11/extensions/scrnsaver.h
b/include/X11/extensions/scrnsaver.h
new file mode 100644
index 0000000..72f92b8
--- /dev/null
+++ b/include/X11/extensions/scrnsaver.h
@@ -0,0 +1,135 @@
+/*
+ *
+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_ */
diff --git a/src/Makefile.am b/src/Makefile.am
index 3430a27..61d8b0a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,6 +8,9 @@ libXss_la_LIBADD = $(XSCRNSAVER_LIBS)
libXss_la_LDFLAGS = -version-info 1:0:0 -no-undefined
+libXScrnSaverincludedir = $(includedir)/X11/extensions
+libXScrnSaverinclude_HEADERS = $(top_srcdir)/include/X11/extensions/scrnsaver.h
+
if LINT
ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
commit ff9c27b08754c160256fe4d75cc4fbe07083f9d4
Author: Peter Hutterer <pe...@cs.unisa.edu.au>
Date: Mon May 19 18:49:26 2008 +0930
Rename parameters to clarify QueryVersion/QueryExtension.
These parameters are not treated as input. Rename them to make the
inner workings slightly more obvious.
X.Org Bug 14511 <http://bugs.freedesktop.org/show_bug.cgi?id=14511>
diff --git a/man/Xss.man b/man/Xss.man
index 615351d..cde6b31 100644
--- a/man/Xss.man
+++ b/man/Xss.man
@@ -62,10 +62,10 @@ typedef struct {
.fi
.HP
Bool XScreenSaverQueryExtension(Display *\fIdpy\fP,
-int *\fIevent_basep\fP, int *\fIerror_basep\fP\^);
+int *\fIevent_base_return\fP, int *\fIerror_base_return\fP\^);
.HP
-Status XScreenSaverQueryVersion(Display *\fIdpy\fP, int *\fImajor_versionp\fP,
-int *\fIminor_versionp\fP\^);
+Status XScreenSaverQueryVersion(Display *\fIdpy\fP,
+int *\fImajor_version_return\fP, int *\fIminor_version_return\fP\^);
.HP
XScreenSaverInfo *XScreenSaverAllocInfo(\^void\^);
.HP
@@ -153,9 +153,9 @@ returns
.B True
if the request succeeded; the values of the major and minor protocol
versions supported by the server are returned in
-.I major_versionp
+.I major_version_return
and
-.I minor_versionp .
+.I minor_version_return .
.PP
.B XScreenSaverAllocInfo
allocates and returns an \fBXScreenSaverInfo\fP structure
diff --git a/src/XScrnSaver.c b/src/XScrnSaver.c
index 8ccc44b..1e3fe70 100644
--- a/src/XScrnSaver.c
+++ b/src/XScrnSaver.c
@@ -156,14 +156,14 @@ static Status event_to_wire (
Bool XScreenSaverQueryExtension (
Display *dpy,
- int *event_basep,
- int *error_basep)
+ int *event_base_return,
+ int *error_base_return)
{
XExtDisplayInfo *info = find_display (dpy);
if (XextHasExtension(info)) {
- *event_basep = info->codes->first_event;
- *error_basep = info->codes->first_error;
+ *event_base_return = info->codes->first_event;
+ *error_base_return = info->codes->first_error;
return True;
} else {
return False;
@@ -173,8 +173,8 @@ Bool XScreenSaverQueryExtension (
Status XScreenSaverQueryVersion(
Display *dpy,
- int *major_versionp,
- int *minor_versionp)
+ int *major_version_return,
+ int *minor_version_return)
{
XExtDisplayInfo *info = find_display (dpy);
xScreenSaverQueryVersionReply rep;
@@ -193,8 +193,8 @@ Status XScreenSaverQueryVersion(
SyncHandle ();
return 0;
}
- *major_versionp = rep.majorVersion;
- *minor_versionp = rep.minorVersion;
+ *major_version_return = rep.majorVersion;
+ *minor_version_return = rep.minorVersion;
UnlockDisplay (dpy);
SyncHandle ();
return 1;
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
