X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fmisc%2Fscreensaver.c;h=f252d66f808a586085667d94908c23a46b85c26f;hb=e0dd77082ac995491ac201b62973e74fb7e26d52;hp=aaed722b258498050669b4b743b02638f6458f70;hpb=a1e813777408263806ec177c14eedcfe871d6160;p=vlc diff --git a/modules/misc/screensaver.c b/modules/misc/screensaver.c index aaed722b25..f252d66f80 100644 --- a/modules/misc/screensaver.c +++ b/modules/misc/screensaver.c @@ -1,10 +1,11 @@ /***************************************************************************** * screensaver.c : disable screen savers when VLC is playing ***************************************************************************** - * Copyright (C) 2003 VideoLAN - * $Id: screensaver.c,v 1.2 2003/03/30 18:14:38 gbazin Exp $ + * Copyright (C) 2006 the VideoLAN team + * $Id$ * * Authors: Sam Hocevar + * Benjamin Pracht * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,32 +19,68 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include #include -#include -#include -#include +#include +#include +#include +#include + +#ifdef HAVE_DBUS + +#define DBUS_API_SUBJECT_TO_CHANGE +#include + +#define GS_SERVICE "org.gnome.ScreenSaver" +#define GS_PATH "/org/gnome/ScreenSaver" +#define GS_INTERFACE "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 int Activate ( vlc_object_t * ); +static void Deactivate ( vlc_object_t * ); + static void Run ( intf_thread_t *p_intf ); +#ifdef HAVE_DBUS + +static DBusConnection * dbus_init( intf_thread_t *p_intf ); +static void poke_screensaver( intf_thread_t *p_intf, + DBusConnection *p_connection ); +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 ); + + +struct intf_sys_t +{ + DBusConnection *p_connection; +}; + +#endif + /***************************************************************************** * Module descriptor *****************************************************************************/ vlc_module_begin(); - set_description( _("screensaver disabling helper") ); + set_description( _("X Screensaver disabler") ); set_capability( "interface", 0 ); - set_callbacks( Activate, NULL ); + set_callbacks( Activate, Deactivate ); vlc_module_end(); /***************************************************************************** @@ -55,9 +92,40 @@ static int Activate( vlc_object_t *p_this ) p_intf->pf_run = Run; +#ifdef HAVE_DBUS + p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) ); + if( !p_intf->p_sys ) return VLC_ENOMEM; +#endif + return VLC_SUCCESS; } +/***************************************************************************** + * Deactivate: uninitialize and cleanup + *****************************************************************************/ +static void Deactivate( vlc_object_t *p_this ) +{ +#ifdef HAVE_DBUS + intf_thread_t *p_intf = (intf_thread_t*)p_this; + + 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; + } +#endif +} + + /***************************************************************************** * Run: main thread ***************************************************************************** @@ -68,26 +136,130 @@ 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 ) { - msleep( 100000 ); + msleep( INTF_IDLE_SLEEP*5 ); // 250ms /* Check screensaver every 30 seconds */ - if( ++i_lastcall > 300 ) + if( ++i_lastcall > 120 ) { 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 ) { + input_thread_t *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 */ - /* http://www.jwz.org/xscreensaver/faq.html#dvd */ - system( "xscreensaver-command -deactivate >&- 2>&- &" ); + system( "xscreensaver-command -deactivate >&- 2>&- &" ); - /* FIXME: add support for other screensavers */ + /* 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 ); +#else + system( "gnome-screensaver-command --poke >&- 2>&- &" ); +#endif + /* FIXME: add support for other screensavers */ + } + vlc_object_release( p_input ); + } } + i_lastcall = 0; } } } +#ifdef HAVE_DBUS + +static DBusConnection * dbus_init( intf_thread_t *p_intf ) +{ + DBusError dbus_error; + + dbus_error_init (&dbus_error); + DBusConnection * p_connection = dbus_bus_get( DBUS_BUS_SESSION, &dbus_error ); + + if ( !p_connection ) + { + msg_Warn( p_intf, "failed to connect to the D-BUS daemon: %s", + dbus_error.message); + dbus_error_free( &dbus_error ); + return NULL; + } + + return p_connection; +} + +static void poke_screensaver( intf_thread_t *p_intf, + DBusConnection *p_connection ) +{ + if( screensaver_is_running( p_connection ) ) + { +# 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 + { + msg_Dbg( p_intf, "found no running gnome-screensaver instance" ); + } +# endif +} + +static void screensaver_send_message_void ( intf_thread_t *p_intf, + DBusConnection *p_connection, + 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 ); + if( p_message == NULL ) + { + msg_Err( p_intf, "DBUS initialization failed: message initialization" ); + return; + } + + if( !dbus_connection_send( p_connection, p_message, NULL ) ) + { + msg_Err( p_intf, "DBUS communication failed" ); + } + + dbus_connection_flush( p_connection ); + + dbus_message_unref( p_message ); +} + +static vlc_bool_t screensaver_is_running( DBusConnection *p_connection ) +{ + DBusError error; + vlc_bool_t b_return; + + if( !p_connection ) return VLC_FALSE; + + dbus_error_init( &error ); + b_return = dbus_bus_name_has_owner( p_connection, GS_SERVICE, &error ); + if( dbus_error_is_set( &error ) ) dbus_error_free (&error); + + return b_return; +} + +#endif +