/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
#include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include <vlc/aout.h>
-#include <vlc/vout.h>
+#include <vlc_input.h>
+#include <vlc_interface.h>
+#include <vlc_aout.h>
+#include <vlc_vout.h>
+
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
#ifdef HAVE_DBUS
if( p_intf->p_sys->p_connection )
{
# ifdef HAVE_DBUS_2
- dbus_connection_close( p_intf->p_sys->p_connection );
+ dbus_connection_unref( p_intf->p_sys->p_connection );
# else
dbus_connection_disconnect( p_intf->p_sys->p_connection );
# endif
#endif
}
+/*****************************************************************************
+ * Execute: Spawns a process using execv()
+ *****************************************************************************/
+static void Execute( intf_thread_t *p_this, const char *const *ppsz_args )
+{
+ pid_t pid;
+ switch( pid = fork() )
+ {
+ case 0: /* we're the child */
+ /* We don't want output */
+ freopen( "/dev/null", "w", stdout );
+ freopen( "/dev/null", "w", stderr );
+ execv( ppsz_args[0] , (char *const *)ppsz_args );
+ /* If the file we want to execute doesn't exist we exit() */
+ exit( 1 );
+ break;
+ case -1: /* we're the error */
+ msg_Dbg( p_this, "Couldn't fork() while launching %s",
+ ppsz_args[0] );
+ break;
+ default: /* we're the parent */
+ /* Wait for the child to exit.
+ * We will not deadlock because we ran "/bin/sh &" */
+ while( waitpid( pid, NULL, 0 ) != pid);
+ break;
+ }
+}
/*****************************************************************************
* Run: main thread
*****************************************************************************/
static void Run( intf_thread_t *p_intf )
{
- int i_lastcall = 0;
-
#ifdef HAVE_DBUS
p_intf->p_sys->p_connection = dbus_init( p_intf );
#endif
- while( !p_intf->b_die )
+ vlc_object_lock( p_intf );
+ for(;;)
{
- msleep( INTF_IDLE_SLEEP*5 ); // 250ms
+ vlc_object_t *p_vout;
/* Check screensaver every 30 seconds */
- if( ++i_lastcall > 300 )
- {
- vlc_object_t *p_vout;
- p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
- /* If there is a video output, disable xscreensaver */
- if( p_vout )
- {
- vlc_object_release( p_vout );
+ if( vlc_object_timedwait( p_intf, mdate() + 30000000 ) < 0 )
+ break;
- /* http://www.jwz.org/xscreensaver/faq.html#dvd */
- system( "xscreensaver-command -deactivate >&- 2>&- &" );
+ p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
-/* If we have dbug support, let's communicate directly with gnome-screensaver
- else, run gnome-screensaver-command */
+ /* 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 */
#ifdef HAVE_DBUS
- poke_screensaver( p_intf, p_intf->p_sys->p_connection );
+ poke_screensaver( p_intf, p_intf->p_sys->p_connection );
#else
- system( "gnome-screensaver-command --poke >&- 2>&- &" );
+ 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 */
+ /* FIXME: add support for other screensavers */
+ }
+ vlc_object_release( p_input );
}
-
- i_lastcall = 0;
}
}
+ vlc_object_unlock( p_intf );
}
#ifdef HAVE_DBUS
# 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" );
}
# ifdef SCREENSAVER_DEBUG
else