diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:29:21 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:29:21 +0000 |
| commit | bcaeabdc8ca376c77a788333fd4b11f6c60ee941 (patch) | |
| tree | 2f8bda7149ad2d3d81666bbba24325f4a9f11dd9 | |
| parent | 444958cdf3fae56c7a82fa9086db33c095db511f (diff) | |
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGE
| -rw-r--r-- | man/Xss.man | 33 | ||||
| -rw-r--r-- | src/XScrnSaver.c | 2 |
2 files changed, 18 insertions, 17 deletions
diff --git a/man/Xss.man b/man/Xss.man index 7d4eb2b..11fbd51 100644 --- a/man/Xss.man +++ b/man/Xss.man @@ -1,5 +1,6 @@ .\" .\" $XFree86: xc/lib/Xss/Xss.man,v 1.1 2003/10/26 19:00:24 herrb Exp $ +.\" $XdotOrg: xc/lib/Xss/Xss.man,v 1.1.4.1.4.1 2004/03/04 17:46:59 eich Exp $ .\" .\" Copyright (C) 2003 The XFree86 Project, Inc. All Rights Reserved. .\" @@ -36,26 +37,26 @@ XScreenSaver \- X11 Screen Saver extension client library .nf .ta .5i 2i typedef struct { - Window window; /* screen saver window */ - int state; /* ScreenSaver{Off,On,Disabled} */ - int kind; /* ScreenSaver{Blanked,Internal,External} */ - unsigned long til_or_since; /* milliseconds */ - unsigned long idle; /* milliseconds */ - unsigned long event_mask; /* events */ + Window window; /\(** screen saver window */ + int state; /\(** ScreenSaver{Off,On,Disabled} */ + int kind; /\(** ScreenSaver{Blanked,Internal,External} */ + unsigned long til_or_since; /\(** milliseconds */ + unsigned long idle; /\(** milliseconds */ + unsigned long event_mask; /\(** events */ .br } XScreenSaverInfo; 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; /* ScreenSaver{Off,On,Cycle} */ - int kind; /* ScreenSaver{Blanked,Internal,External} */ - Bool forced; /* extents of new region */ - Time time; /* event timestamp */ + 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; /\(** ScreenSaver{Off,On,Cycle} */ + int kind; /\(** ScreenSaver{Blanked,Internal,External} */ + Bool forced; /\(** extents of new region */ + Time time; /\(** event timestamp */ .br } XScreenSaverNotifyEvent; .fi diff --git a/src/XScrnSaver.c b/src/XScrnSaver.c index 120d8b2..3727ae4 100644 --- a/src/XScrnSaver.c +++ b/src/XScrnSaver.c @@ -26,7 +26,7 @@ in this Software without prior written authorization from the X Consortium. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xss/XScrnSaver.c,v 3.2 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xss/XScrnSaver.c,v 3.1 2001/10/28 03:32:40 tsi Exp $ */ #define NEED_EVENTS #define NEED_REPLIES |