libxss: Changes to 'upstream-unstable'
.gitignore | 1
COPYING | 53 +++++++++++++++++----
Makefile.am | 8 +++
configure.ac | 10 +++
man/Makefile.am | 1
src/Makefile.am | 15 +++++
src/XScrnSaver.c | 138 ++++++++++++++++++++++++++++++-------------------------
7 files changed, 154 insertions(+), 72 deletions(-)
New commits:
commit e3af1209b9c1fdb032d01e00b300d57278b81189
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Mar 17 18:28:14 2008 -0700
Version bump: 1.1.3
diff --git a/configure.ac b/configure.ac
index 8ccfb7b..69cf670 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.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXScrnSaver)
+AC_INIT(libXScrnSaver, 1.1.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXScrnSaver)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit a9208d44e5123c2f688097c2833abba7e6bcfc71
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Mar 4 18:51:25 2008 -0300
libXScrnSaver ansification.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/src/XScrnSaver.c b/src/XScrnSaver.c
index d6ed0f4..8ccc44b 100644
--- a/src/XScrnSaver.c
+++ b/src/XScrnSaver.c
@@ -47,9 +47,23 @@ static /* const */ char *screen_saver_extension_name = ScreenSaverName;
#define ScreenSaverSimpleCheckExtension(dpy,i) \
XextSimpleCheckExtension (dpy, i, screen_saver_extension_name)
-static int close_display();
-static Bool wire_to_event();
-static Status event_to_wire();
+static int close_display(
+ Display * /* dpy */,
+ XExtCodes * /* codes */
+);
+
+static Bool wire_to_event(
+ Display * /* dpy */,
+ XEvent * /* re */,
+ xEvent * /* event */
+);
+
+static Status event_to_wire(
+ Display * /* dpy */,
+ XEvent * /* re */,
+ xEvent * /* event */
+);
+
static /* const */ XExtensionHooks screen_saver_extension_hooks = {
NULL, /* create_gc */
NULL, /* copy_gc */
@@ -72,10 +86,10 @@ static XEXT_GENERATE_FIND_DISPLAY (find_display, screen_saver_info,
static XEXT_GENERATE_CLOSE_DISPLAY (close_display, screen_saver_info)
-static Bool wire_to_event (dpy, re, event)
- Display *dpy;
- XEvent *re;
- xEvent *event;
+static Bool wire_to_event (
+ Display *dpy,
+ XEvent *re,
+ xEvent *event)
{
XExtDisplayInfo *info = find_display (dpy);
XScreenSaverNotifyEvent *se;
@@ -104,10 +118,10 @@ static Bool wire_to_event (dpy, re, event)
return False;
}
-static Status event_to_wire (dpy, re, event)
- Display *dpy;
- XEvent *re;
- xEvent *event;
+static Status event_to_wire (
+ Display *dpy,
+ XEvent *re,
+ xEvent *event)
{
XExtDisplayInfo *info = find_display (dpy);
XScreenSaverNotifyEvent *se;
@@ -140,9 +154,10 @@ static Status event_to_wire (dpy, re, event)
* *
****************************************************************************/
-Bool XScreenSaverQueryExtension (dpy, event_basep, error_basep)
- Display *dpy;
- int *event_basep, *error_basep;
+Bool XScreenSaverQueryExtension (
+ Display *dpy,
+ int *event_basep,
+ int *error_basep)
{
XExtDisplayInfo *info = find_display (dpy);
@@ -156,9 +171,10 @@ Bool XScreenSaverQueryExtension (dpy, event_basep, error_basep)
}
-Status XScreenSaverQueryVersion(dpy, major_versionp, minor_versionp)
- Display *dpy;
- int *major_versionp, *minor_versionp;
+Status XScreenSaverQueryVersion(
+ Display *dpy,
+ int *major_versionp,
+ int *minor_versionp)
{
XExtDisplayInfo *info = find_display (dpy);
xScreenSaverQueryVersionReply rep;
@@ -184,15 +200,15 @@ Status XScreenSaverQueryVersion(dpy, major_versionp, minor_versionp)
return 1;
}
-XScreenSaverInfo *XScreenSaverAllocInfo ()
+XScreenSaverInfo *XScreenSaverAllocInfo (void)
{
return (XScreenSaverInfo *) Xmalloc (sizeof (XScreenSaverInfo));
}
-Status XScreenSaverQueryInfo (dpy, drawable, saver_info)
- Display *dpy;
- Drawable drawable;
- XScreenSaverInfo *saver_info;
+Status XScreenSaverQueryInfo (
+ Display *dpy,
+ Drawable drawable,
+ XScreenSaverInfo *saver_info)
{
XExtDisplayInfo *info = find_display (dpy);
xScreenSaverQueryInfoReply rep;
@@ -221,10 +237,10 @@ Status XScreenSaverQueryInfo (dpy, drawable, saver_info)
return 1;
}
-void XScreenSaverSelectInput (dpy, drawable, mask)
- register Display *dpy;
- Drawable drawable;
- unsigned long mask;
+void XScreenSaverSelectInput (
+ register Display *dpy,
+ Drawable drawable,
+ unsigned long mask)
{
XExtDisplayInfo *info = find_display (dpy);
register xScreenSaverSelectInputReq *req;
@@ -242,11 +258,11 @@ void XScreenSaverSelectInput (dpy, drawable, mask)
}
static void
-XScreenSaverProcessWindowAttributes (dpy, req, valuemask, attributes)
- register Display *dpy;
- xChangeWindowAttributesReq *req;
- register unsigned long valuemask;
- register XSetWindowAttributes *attributes;
+XScreenSaverProcessWindowAttributes (
+ register Display *dpy,
+ xChangeWindowAttributesReq *req,
+ register unsigned long valuemask,
+ register XSetWindowAttributes *attributes)
{
unsigned long values[32];
register unsigned long *value = values;
@@ -304,21 +320,19 @@ XScreenSaverProcessWindowAttributes (dpy, req, valuemask, attributes)
}
-void XScreenSaverSetAttributes (dpy, drawable, x, y, width, height,
- border_width, depth, class, visual,
- valuemask, attributes)
- Display* dpy;
- 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;
+void XScreenSaverSetAttributes (
+ Display *dpy,
+ 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)
{
XExtDisplayInfo *info = find_display (dpy);
register xScreenSaverSetAttributesReq *req;
@@ -351,9 +365,9 @@ void XScreenSaverSetAttributes (dpy, drawable, x, y, width, height,
}
-void XScreenSaverUnsetAttributes (dpy, drawable)
- register Display *dpy;
- Drawable drawable;
+void XScreenSaverUnsetAttributes (
+ register Display *dpy,
+ Drawable drawable)
{
XExtDisplayInfo *info = find_display (dpy);
register xScreenSaverUnsetAttributesReq *req;
@@ -370,11 +384,11 @@ void XScreenSaverUnsetAttributes (dpy, drawable)
}
-Status XScreenSaverRegister (dpy, screen, xid, type)
- Display *dpy;
- int screen;
- XID xid;
- Atom type;
+Status XScreenSaverRegister (
+ Display *dpy,
+ int screen,
+ XID xid,
+ Atom type)
{
Atom prop;
unsigned long ul;
@@ -391,9 +405,9 @@ Status XScreenSaverRegister (dpy, screen, xid, type)
-Status XScreenSaverUnregister (dpy, screen)
- Display *dpy;
- int screen;
+Status XScreenSaverUnregister (
+ Display *dpy,
+ int screen)
{
Atom prop;
@@ -407,11 +421,11 @@ Status XScreenSaverUnregister (dpy, screen)
-Status XScreenSaverGetRegistered (dpy, screen, xid, type)
- Display *dpy;
- int screen;
- XID *xid;
- Atom *type;
+Status XScreenSaverGetRegistered (
+ Display *dpy,
+ int screen,
+ XID *xid,
+ Atom *type)
{
Atom actual_type = None;
int actual_format;
commit b805b9ebb2f981a507d16fc5524f573b8187e5f1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Mar 17 18:05:32 2008 -0700
Add hooks to check code with sparse/lint/etc.
diff --git a/Makefile.am b/Makefile.am
index 77a88c8..725a8e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,3 +34,9 @@ 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)
dist-hook: ChangeLog
+
+if LINT
+# Check source code with tools like lint & sparse
+lint:
+ (cd src && $(MAKE) $(MFLAGS) lint)
+endif LINT
diff --git a/configure.ac b/configure.ac
index ef80ce0..8ccfb7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,10 @@ 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)
+
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
@@ -38,6 +42,10 @@ PKG_CHECK_MODULES(XSCRNSAVER, x11 xext xextproto [scrnsaverproto >= 1.1])
AC_SUBST(XSCRNSAVER_CFLAGS)
AC_SUBST(XSCRNSAVER_LIBS)
+
+dnl Allow checking code with lint, sparse, etc.
+XORG_WITH_LINT
+XORG_LINT_LIBRARY([Xss])
XORG_CHECK_MALLOC_ZERO
XORG_MANPAGE_SECTIONS
diff --git a/src/Makefile.am b/src/Makefile.am
index 10f8eea..3430a27 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,4 +8,19 @@ libXss_la_LIBADD = $(XSCRNSAVER_LIBS)
libXss_la_LDFLAGS = -version-info 1:0:0 -no-undefined
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+lint:
+ $(LINT) $(ALL_LINT_FLAGS) $(libXss_la_SOURCES)
+endif LINT
+
+if MAKE_LINT_LIB
+lintlibdir = $(libdir)
+
+lintlib_DATA = $(LINTLIB)
+
+$(LINTLIB): $(libXss_la_SOURCES)
+ $(LINT) -y -oXss -x $(ALL_LINT_FLAGS) $(libXss_la_SOURCES)
+endif MAKE_LINT_LIB
commit ae5c253a13cbb408cb41e173bffb993ec6aa6310
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 9 00:21:17 2008 +0100
Makefile.am: nuke RCS Id
diff --git a/man/Makefile.am b/man/Makefile.am
index 2448746..5931f69 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit f641875615739ae6431e59b4fc47bb52fdce6381
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 15:51:14 2007 -0500
Add missing PHONY line for automatic ChangeLog generation
diff --git a/Makefile.am b/Makefile.am
index b964031..77a88c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,8 @@ EXTRA_DIST = xscrnsaver.pc.in autogen.sh ChangeLog
CLEANFILES = 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)
commit ec5ca1927558d686c4957f2ae8c8c50c722cd87b
Author: Daniel Drake <ddrake@brontes3d.com>
Date: Tue May 29 10:07:00 2007 -0800
Bug #11084: libXScrnSaver COPYING file
X.Org Bugzilla #11084 <https://bugs.freedesktop.org/show_bug.cgi?id=11084>
diff --git a/COPYING b/COPYING
index 7f33cbf..72196e4 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,49 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (c) 1992 X Consortium
-Please submit updated COPYING files to the Xorg bugzilla:
+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:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+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.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+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.
+
+
+Copyright (C) 2003 The XFree86 Project, Inc. All Rights Reserved.
+
+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 NON-INFRINGEMENT.
+IN NO EVENT SHALL THE XFREE86 PROJECT 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 XFree86 Project
+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 XFree86 Project.
commit 8eced0dc1e259777bcda00539c0c59a57fa4a49d
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:53:34 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index 70dfa2f..6be2dbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ missing
mkinstalldirs
stamp-h1
xscrnsaver.pc
+*~
Reply to: