* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_input.h>
+#include <vlc_playlist.h>
#include <vlc_interface.h>
-#include <vlc_aout.h>
-#include <vlc_vout.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
+#include <signal.h>
#ifdef HAVE_DBUS
-#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus.h>
#define GS_SERVICE "org.gnome.ScreenSaver"
#define GS_PATH "/org/gnome/ScreenSaver"
#define GS_INTERFACE "org.gnome.ScreenSaver"
-#endif
+#define FDS_SERVICE "org.freedesktop.ScreenSaver"
+#define FDS_PATH "/ScreenSaver"
+#define FDS_INTERFACE "org.freedesktop.ScreenSaver"
-/* this is for dbus < 0.3 */
-#ifndef HAVE_DBUS_1
-#define dbus_bus_name_has_owner(connection, name, err) dbus_bus_service_exists(connection, name, err)
#endif
/*****************************************************************************
static int Activate ( vlc_object_t * );
static void Deactivate ( vlc_object_t * );
-static void Run ( intf_thread_t *p_intf );
+static void Timer( void * );
#ifdef HAVE_DBUS
DBusConnection *p_connection );
static void screensaver_send_message_void ( intf_thread_t *p_intf,
DBusConnection *p_connection,
+ const char *psz_service,
+ const char *psz_path,
+ const char *psz_interface,
const char *psz_name );
-static vlc_bool_t screensaver_is_running( DBusConnection *p_connection );
-
+static bool screensaver_is_running( DBusConnection *p_connection, const char *psz_service );
+#endif
struct intf_sys_t
{
+#ifdef HAVE_DBUS
DBusConnection *p_connection;
+#endif
+ vlc_timer_t timer;
};
-#endif
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-vlc_module_begin();
- set_description( _("X Screensaver disabler") );
- set_capability( "interface", 0 );
- set_callbacks( Activate, Deactivate );
-vlc_module_end();
+vlc_module_begin ()
+ set_description( N_("X Screensaver disabler") )
+ set_capability( "interface", 0 )
+ set_callbacks( Activate, Deactivate )
+vlc_module_end ()
/*****************************************************************************
* Activate: initialize and create stuff
static int Activate( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t*)p_this;
+ intf_sys_t *p_sys;
- p_intf->pf_run = Run;
+ p_sys = p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
+
+ if( vlc_timer_create( &p_sys->timer, Timer, p_intf ) )
+ {
+ free( p_sys );
+ return VLC_ENOMEM;
+ }
+ vlc_timer_schedule( &p_sys->timer, false, 30*CLOCK_FREQ, 30*CLOCK_FREQ );
#ifdef HAVE_DBUS
- p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
- if( !p_intf->p_sys ) return VLC_ENOMEM;
+ p_sys->p_connection = dbus_init( p_intf );
#endif
-
return VLC_SUCCESS;
}
*****************************************************************************/
static void Deactivate( vlc_object_t *p_this )
{
-#ifdef HAVE_DBUS
intf_thread_t *p_intf = (intf_thread_t*)p_this;
+ intf_sys_t *p_sys = p_intf->p_sys;
- if( p_intf->p_sys->p_connection )
- {
-# ifdef HAVE_DBUS_2
- dbus_connection_unref( p_intf->p_sys->p_connection );
-# else
- dbus_connection_disconnect( p_intf->p_sys->p_connection );
-# endif
- }
-
- if( p_intf->p_sys )
- {
- free( p_intf->p_sys );
- p_intf->p_sys = NULL;
- }
+ vlc_timer_destroy( &p_sys->timer );
+#ifdef HAVE_DBUS
+ if( p_sys->p_connection )
+ dbus_connection_unref( p_sys->p_connection );
#endif
+
+ free( p_sys );
}
/*****************************************************************************
*****************************************************************************/
static void Execute( intf_thread_t *p_this, const char *const *ppsz_args )
{
- pid_t pid;
- switch( pid = fork() )
+ pid_t pid = fork();
+ switch( pid )
{
case 0: /* we're the child */
+ {
+ sigset_t set;
+ sigemptyset (&set);
+ pthread_sigmask (SIG_SETMASK, &set, NULL);
+
/* We don't want output */
- freopen( "/dev/null", "w", stdout );
- freopen( "/dev/null", "w" stderr );
- execv( ppsz_args[0] , (char *const *)ppsz_args );
+ if( ( freopen( "/dev/null", "w", stdout ) != NULL )
+ && ( freopen( "/dev/null", "w", stderr ) != NULL ) )
+ execv( ppsz_args[0] , (char *const *)ppsz_args );
/* If the file we want to execute doesn't exist we exit() */
- exit( 1 );
- break;
+ exit( EXIT_FAILURE );
+ }
case -1: /* we're the error */
msg_Dbg( p_this, "Couldn't fork() while launching %s",
ppsz_args[0] );
* This part of the module is in a separate thread so that we do not have
* too much system() overhead.
*****************************************************************************/
-static void Run( intf_thread_t *p_intf )
+static void Timer( void *data )
{
-#ifdef HAVE_DBUS
- p_intf->p_sys->p_connection = dbus_init( p_intf );
-#endif
-
- vlc_object_lock( p_intf );
- for(;;)
- {
- vlc_object_t *p_vout;
+ intf_thread_t *p_intf = data;
+ playlist_t *p_playlist = pl_Hold( p_intf );
+ input_thread_t *p_input = playlist_CurrentInput( p_playlist );
+ pl_Release( p_intf );
+ if( !p_input )
+ return;
- /* Check screensaver every 30 seconds */
- if( vlc_object_timedwait( p_intf, mdate() + 30000000 ) < 0 )
- break;
+ vlc_object_t *p_vout;
+ if( var_GetInteger( p_input, "state" ) == PLAYING_S )
+ p_vout = (vlc_object_t *)input_GetVout( p_input );
+ else
+ p_vout = NULL;
+ vlc_object_release( p_input );
+ if( !p_vout )
+ return;
+ vlc_object_release( p_vout );
- p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+ /* If there is a playing video output, disable xscreensaver */
+ /* http://www.jwz.org/xscreensaver/faq.html#dvd */
+ const char *const ppsz_xsargs[] = { "/bin/sh", "-c",
+ "xscreensaver-command -deactivate &", (char*)NULL };
+ Execute( p_intf, ppsz_xsargs );
- /* If there is a video output, disable xscreensaver */
- if( p_vout )
- {
- input_thread_t *p_input;
- p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT, FIND_PARENT );
- vlc_object_release( p_vout );
- if( p_input )
- {
- if( PLAYING_S == p_input->i_state )
- {
- /* http://www.jwz.org/xscreensaver/faq.html#dvd */
- const char *const ppsz_xsargs[] = { "/bin/sh", "-c",
- "xscreensaver-command -deactivate &", (char*)NULL };
- Execute( p_intf, ppsz_xsargs );
-
- /* If we have dbus support, let's communicate directly
- with gnome-screensave else, run
- gnome-screensaver-command */
+ /* If we have dbus support, let's communicate directly with
+ * gnome-screensave else, run gnome-screensaver-command */
#ifdef HAVE_DBUS
- poke_screensaver( p_intf, p_intf->p_sys->p_connection );
+ poke_screensaver( p_intf, p_intf->p_sys->p_connection );
#else
- const char *const ppsz_gsargs[] = { "/bin/sh", "-c",
- "gnome-screensaver-command --poke &", (char*)NULL };
- Execute( p_intf, ppsz_gsargs );
+ const char *const ppsz_gsargs[] = { "/bin/sh", "-c",
+ "gnome-screensaver-command --poke &", (char*)NULL };
+ Execute( p_intf, ppsz_gsargs );
#endif
- /* FIXME: add support for other screensavers */
- }
- vlc_object_release( p_input );
- }
- }
- }
- vlc_object_unlock( p_intf );
+ /* FIXME: add support for other screensavers */
}
#ifdef HAVE_DBUS
static void poke_screensaver( intf_thread_t *p_intf,
DBusConnection *p_connection )
{
- if( screensaver_is_running( p_connection ) )
+ if( screensaver_is_running( p_connection, GS_SERVICE ) )
{
# ifdef SCREENSAVER_DEBUG
msg_Dbg( p_intf, "found a running gnome-screensaver instance" );
# endif
/* gnome-screensaver changed it's D-Bus interface, so we need both */
- screensaver_send_message_void( p_intf, p_connection, "Poke" );
- screensaver_send_message_void( p_intf, p_connection,
- "SimulateUserActivity" );
+ screensaver_send_message_void( p_intf, p_connection, GS_SERVICE, GS_PATH,
+ GS_INTERFACE, "Poke" );
+ screensaver_send_message_void( p_intf, p_connection, GS_SERVICE, GS_PATH,
+ GS_INTERFACE, "SimulateUserActivity" );
+ }
+ else if( screensaver_is_running( p_connection, FDS_SERVICE ) )
+ {
+# ifdef SCREENSAVER_DEBUG
+ msg_Dbg( p_intf, "found a running freedesktop-screensaver instance" );
+# endif
+ screensaver_send_message_void( p_intf, p_connection, FDS_SERVICE, FDS_PATH,
+ FDS_INTERFACE, "SimulateUserActivity" );
}
# ifdef SCREENSAVER_DEBUG
else
{
- msg_Dbg( p_intf, "found no running gnome-screensaver instance" );
+ msg_Dbg( p_intf, "found no running (gnome|freedesktop)-screensaver instance" );
}
# endif
+
}
static void screensaver_send_message_void ( intf_thread_t *p_intf,
DBusConnection *p_connection,
+ const char *psz_service,
+ const char *psz_path,
+ const char *psz_interface,
const char *psz_name )
{
DBusMessage *p_message;
if( !p_connection || !psz_name ) return;
- p_message = dbus_message_new_method_call( GS_SERVICE, GS_PATH,
- GS_INTERFACE, psz_name );
+ p_message = dbus_message_new_method_call( psz_service, psz_path,
+ psz_interface, psz_name );
if( p_message == NULL )
{
msg_Err( p_intf, "DBUS initialization failed: message initialization" );
dbus_message_unref( p_message );
}
-static vlc_bool_t screensaver_is_running( DBusConnection *p_connection )
+static bool screensaver_is_running( DBusConnection *p_connection, const char *psz_service )
{
DBusError error;
- vlc_bool_t b_return;
+ bool b_return;
- if( !p_connection ) return VLC_FALSE;
+ if( !p_connection ) return false;
dbus_error_init( &error );
- b_return = dbus_bus_name_has_owner( p_connection, GS_SERVICE, &error );
+ b_return = dbus_bus_name_has_owner( p_connection, psz_service, &error );
if( dbus_error_is_set( &error ) ) dbus_error_free (&error);
return b_return;
projects / vlc / blobdiff