Merge branch 'xscreensaver' of github:jrk-/X11

Graphics/X11/Types.hsc

@@ -434,6 +434,10 @@ module Graphics.X11.Types
         rrCrtcChangeNotifyMask,
         rrOutputChangeNotifyMask,
         rrOutputPropertyNotifyMask,
+#ifdef HAVE_X11_EXTENSIONS_SCRNSAVER_H
+        screenSaverCycleMask,
+        screenSaverNotifyMask,
+#endif
 
         -- ** Event types
         EventType,
@@ -476,6 +480,9 @@ module Graphics.X11.Types
         rrNotifyOutputChange,
         rrNotifyOutputProperty,
         lASTEvent,
+#ifdef HAVE_X11_EXTENSIONS_SCRNSAVER_H
+        screenSaverNotify,
+#endif
 
         -- ** Modifiers
         Modifier,
@@ -1285,6 +1292,10 @@ type EventMask                  = Mask
  , rrCrtcChangeNotifyMask       = RRCrtcChangeNotifyMask
  , rrOutputChangeNotifyMask     = RROutputChangeNotifyMask
  , rrOutputPropertyNotifyMask   = RROutputPropertyNotifyMask
+#ifdef HAVE_X11_EXTENSIONS_SCRNSAVER_H
+ , screenSaverCycleMask         = ScreenSaverCycleMask
+ , screenSaverNotifyMask        = ScreenSaverNotifyMask
+#endif
  }
 
 type EventType          = Word32
@@ -1328,6 +1339,9 @@ type EventType          = Word32
  , rrNotifyOutputChange = RRNotify_OutputChange
  , rrNotifyOutputProperty=RRNotify_OutputProperty
  , lASTEvent            = LASTEvent
+#ifdef HAVE_X11_EXTENSIONS_SCRNSAVER_H
+ , screenSaverNotify    = ScreenSaverNotify
+#endif
  }
 
 type Modifier           = CUInt

Graphics/X11/Xlib/Extras.hsc

@@ -16,6 +16,9 @@ module Graphics.X11.Xlib.Extras where
 import Data.Maybe
 import Data.Typeable ( Typeable )
 import Graphics.X11.Xrandr
+#ifdef HAVE_X11_EXTENSIONS_SCRNSAVER_H
+import Graphics.X11.XScreenSaver
+#endif
 import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Types
 import Foreign (Storable, Ptr, peek, poke, peekElemOff, pokeElemOff, peekByteOff, pokeByteOff, peekArray, throwIfNull, nullPtr, sizeOf, alignment, alloca, with, throwIf, Word8, Word16, #{type unsigned long}, Int32, plusPtr, castPtr, withArrayLen, setBit, testBit, allocaBytes, FunPtr)
@@ -281,7 +284,20 @@ data Event
         , ev_timestamp             :: !Time
         , ev_rr_state              :: !CInt
         }
-
+#ifdef HAVE_X11_EXTENSIONS_SCRNSAVER_H
+    | ScreenSaverNotifyEvent
+        { ev_event_type            :: !EventType
+        , ev_serial                :: !CULong
+        , ev_send_event            :: !Bool
+        , ev_event_display         :: Display
+        , ev_window                :: !Window
+        , ev_root                  :: !Window
+        , ev_ss_state              :: !XScreenSaverState
+        , ev_ss_kind               :: !XScreenSaverKind
+        , ev_forced                :: !Bool
+        , ev_time                  :: !Time
+        }
+#endif
     deriving ( Show, Typeable )
 
 eventTable :: [(EventType, String)]
@@ -320,6 +336,9 @@ eventTable =
     , (clientMessage        , "ClientMessage")
     , (mappingNotify        , "MappingNotify")
     , (lASTEvent            , "LASTEvent")
+#ifdef HAVE_X11_EXTENSIONS_SCRNSAVER_H
+    , (screenSaverNotify    , "ScreenSaverNotify")
+#endif
     ]
 
 eventName :: Event -> String
@@ -804,6 +823,20 @@ getEvent p = do
                                 , ev_subtype       = subtype
                                 }
 
+#ifdef HAVE_X11_EXTENSIONS_SCRNSAVER_H
+          -----------------
+          -- ScreenSaverNotifyEvent:
+          -----------------
+          | type_ == screenSaverNotify -> do
+            return (ScreenSaverNotifyEvent type_ serial send_event display)
+                `ap` (#{peek XScreenSaverNotifyEvent, window     } p )
+                `ap` (#{peek XScreenSaverNotifyEvent, root       } p )
+                `ap` (#{peek XScreenSaverNotifyEvent, state      } p )
+                `ap` (#{peek XScreenSaverNotifyEvent, kind       } p )
+                `ap` (#{peek XScreenSaverNotifyEvent, forced     } p )
+                `ap` (#{peek XScreenSaverNotifyEvent, time       } p )
+#endif
+
           -- We don't handle this event specifically, so return the generic
           -- AnyEvent.
           | otherwise -> do

Makefile.nhc98

@@ -20,6 +20,7 @@ SRCS	= \
 	Graphics/X11/Xlib/Window.hs \
     Graphics.X11.Xlib.Extras \
     Graphics.X11.Xinerama \
+    Graphics.X11.XScreenSaver \
 	fdset.c \
     XUtils.c \
 	auxiliaries.c

X11.cabal

@@ -44,6 +44,7 @@ library
       Graphics.X11.Xlib.Extras,
       Graphics.X11.Xinerama
       Graphics.X11.Xrandr
+      Graphics.X11.XScreenSaver
       Graphics.X11.ExtraTypes,
       Graphics.X11.ExtraTypes.AP,
       Graphics.X11.ExtraTypes.DEC,

configure.ac

@@ -78,6 +78,26 @@ if ! test "$have_xrandr" = yes; then
     AC_MSG_ERROR([X11/extensions/Xrandr.h (from libXrandr) is required])
 fi
 
+AC_MSG_CHECKING([whether to build XScreenSaver])
+AC_ARG_WITH(xscreensaver,
+            AS_HELP_STRING([--without-xscreensaver], [do not build XScreenSaver support]),
+            [],
+            [with_xscreensaver=yes])
+AC_MSG_RESULT([$with_xscreensaver])
+
+if test "$with_xscreensaver" = yes; then
+    AC_CHECK_HEADERS([X11/extensions/scrnsaver.h], [have_xscreensaver=yes])
+    if test "$have_xscreensaver" = yes; then
+        EXTRA_LIBRARIES="extra-libraries: Xss"
+    else
+        EXTRA_LIBRARIES=""
+        echo "WARNING: XScreenSaver headers not found. Building without XScreenSaver support"
+    fi
+else
+    EXTRA_LIBRARIES=""
+    echo "WARNING: Building without XScreenSaver support per user request"
+fi
+
 AC_MSG_CHECKING([whether to include X.org keysyms])
 AC_ARG_WITH(xorg-keysym,
             AS_HELP_STRING([--without-xorg-keysym], [do not build X.org keysym support]),

include/HsXlib.h

@@ -20,6 +20,10 @@
 
 #include <X11/extensions/Xrandr.h>
 
+#ifdef HAVE_X11_EXTENSIONS_SCRNSAVER_H
+#include <X11/extensions/scrnsaver.h>
+#endif
+
 /* Xutil.h overrides some functions with macros.
  * In recent versions of X this can be turned off with
  *

include/XlibExtras.h

@@ -19,6 +19,10 @@
 
 #include <X11/extensions/Xrandr.h>
 
+#ifdef HAVE_X11_EXTENSIONS_SCRNSAVER_H
+#include <X11/extensions/scrnsaver.h>
+#endif
+
 /* Xutil.h overrides some functions with macros.
  * In recent versions of X this can be turned off with
  *      #define XUTIL_DEFINE_FUNCTIONS