summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Höglund <fredrik@kde.org>2006-03-31 18:39:42 +0000
committerFredrik Höglund <fredrik@kde.org>2006-03-31 18:39:42 +0000
commitac0b03f75facc368da302fa2f500dcfeafc04e15 (patch)
treed4f57191a869b52cb35b05cbda91cdef58335b0d
parent2f091ac1252c833bf70639b718bb1ac738066016 (diff)
Update the package version number to 1.1.scrnsaverproto-1.1.0scrnsaver-1_1_0XORG-7_1XORG-7_0_99_901
Increase the minor version to 1. Add the ScreenSaverSuspend request. Add the prototype for XScreenSaverSuspend.
-rw-r--r--ChangeLog14
-rw-r--r--configure.ac2
-rw-r--r--saver.h2
-rw-r--r--saverproto.h10
-rw-r--r--scrnsaver.h5
5 files changed, 31 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c722b51..0acb57a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-03-31 Fredrik Höglund <fredrik@kde.org>
+
+ * configure.ac:
+ Update the package version number to 1.1.
+
+ * saver.h:
+ Increase the minor version to 1.
+
+ * saverproto.h:
+ Add the ScreenSaverSuspend request.
+
+ * scrnsaver.h:
+ Add the prototype for XScreenSaverSuspend.
+
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 440b1a3..10d7e1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([ScrnSaverProto], [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([ScrnSaverProto], [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
XORG_RELEASE_VERSION
diff --git a/saver.h b/saver.h
index ea35454..d253e4f 100644
--- a/saver.h
+++ b/saver.h
@@ -37,7 +37,7 @@ in this Software without prior written authorization from the X Consortium.
#define ScreenSaverCycleMask 0x00000002
#define ScreenSaverMajorVersion 1
-#define ScreenSaverMinorVersion 0
+#define ScreenSaverMinorVersion 1
#define ScreenSaverOff 0
#define ScreenSaverOn 1
diff --git a/saverproto.h b/saverproto.h
index 1a671af..9b8ed73 100644
--- a/saverproto.h
+++ b/saverproto.h
@@ -136,6 +136,16 @@ typedef struct _ScreenSaverUnsetAttributes {
} xScreenSaverUnsetAttributesReq;
#define sz_xScreenSaverUnsetAttributesReq 8
+#define X_ScreenSaverSuspend 5
+
+typedef struct _ScreenSaverSuspend {
+ CARD8 reqType;
+ CARD8 saverReqType;
+ CARD16 length B16;
+ Bool suspend B32;
+} xScreenSaverSuspendReq;
+#define sz_xScreenSaverSuspendReq 8
+
typedef struct _ScreenSaverNotify {
CARD8 type; /* always eventBase + ScreenSaverNotify */
BYTE state; /* off, on, cycle */
diff --git a/scrnsaver.h b/scrnsaver.h
index 2659edd..8e8c5d6 100644
--- a/scrnsaver.h
+++ b/scrnsaver.h
@@ -126,6 +126,11 @@ extern Status XScreenSaverGetRegistered (
Atom* /* type */
);
+extern void XScreenSaverSuspend (
+ Display* /* display */,
+ Bool /* suspend */
+);
+
_XFUNCPROTOEND
#endif /* _SCRNSAVER_H_ */