* 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_interface.h>
#include <vlc_aout.h>
#include <vlc_vout.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#ifdef HAVE_SIGNAL_H
+# include <signal.h>
+#endif
+
#ifdef HAVE_DBUS
-#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus.h>
#define GS_SERVICE "org.gnome.ScreenSaver"
#endif
-/* 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
-
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static void screensaver_send_message_void ( intf_thread_t *p_intf,
DBusConnection *p_connection,
const char *psz_name );
-static vlc_bool_t screensaver_is_running( DBusConnection *p_connection );
+static bool screensaver_is_running( DBusConnection *p_connection );
struct intf_sys_t
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("X Screensaver disabler") );
+ set_description( N_("X Screensaver disabler") );
set_capability( "interface", 0 );
set_callbacks( Activate, Deactivate );
vlc_module_end();
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;
- }
+ free( p_intf->p_sys );
+ p_intf->p_sys = NULL;
#endif
}
+/*****************************************************************************
+ * Execute: Spawns a process using execv()
+ *****************************************************************************/
+static void Execute( intf_thread_t *p_this, const char *const *ppsz_args )
+{
+ 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 */
+ 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( EXIT_FAILURE );
+ }
+ 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 )
{
- vlc_bool_t b_quit = VLC_FALSE;
+ mtime_t deadline = mdate();
+ vlc_object_lock( p_intf );
#ifdef HAVE_DBUS
p_intf->p_sys->p_connection = dbus_init( p_intf );
#endif
- while( !b_quit )
+ while( vlc_object_alive( p_intf ) )
{
- /* Check screensaver every 30 seconds */
- vlc_mutex_lock( &p_intf->object_lock );
- vlc_cond_timedwait( &p_intf->object_wait, &p_intf->object_lock,
- mdate() + 30000000 );
- b_quit = p_intf->b_die;
- vlc_mutex_unlock( &p_intf->object_lock );
-
vlc_object_t *p_vout;
+
+ if( vlc_object_timedwait( p_intf, deadline ) == 0 )
+ continue;
+
p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
/* If there is a video output, disable xscreensaver */
if( PLAYING_S == p_input->i_state )
{
/* http://www.jwz.org/xscreensaver/faq.html#dvd */
- system( "xscreensaver-command -deactivate >&- 2>&- &" );
+ 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
#ifdef HAVE_DBUS
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 */
}
vlc_object_release( p_input );
}
}
+
+ /* Check screensaver every 30 seconds */
+ deadline = mdate() + 30000000;
}
+ vlc_object_unlock( p_intf );
}
#ifdef HAVE_DBUS
dbus_message_unref( p_message );
}
-static vlc_bool_t screensaver_is_running( DBusConnection *p_connection )
+static bool screensaver_is_running( DBusConnection *p_connection )
{
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 );
projects / vlc / blobdiff