Commit 31f3794d authored by Benjamin Pracht's avatar Benjamin Pracht

* screensaver.c, configure.ac: use directly dbus to disable gnome-screensaver...

* screensaver.c, configure.ac: use directly dbus to disable gnome-screensaver if dbus is available upon compilation, instead of using system(gnome-screensaver-command
* interface.c: use the b_strict boolean when calling module_Need upon extra interface launching. This prevents vlc to try to launch a 2nd wx gui if the screensaver module isn't available.


parent d416f2c5
......@@ -817,6 +817,27 @@ then
)
fi
dnl Check for dbus
AC_ARG_ENABLE(dbus,
[ --enable-dbus Linux D-BUS message bus system (default enabled)])
if test "${enable_dbus}" != "no" -a "${SYS}" = "linux"
then
PKG_CHECK_MODULES(DBUS, dbus-1 >= 0.30,
[ AC_DEFINE( HAVE_DBUS_1, 1, [Define if you have the new D-BUS library API])
AC_DEFINE( HAVE_DBUS, 1, [Define if you have the D-BUS library] )
VLC_ADD_LDFLAGS([screensaver],[$DBUS_LIBS])
VLC_ADD_CFLAGS([screensaver],[$DBUS_CFLAGS])],
dnl older dbus
[ PKG_CHECK_MODULES( DBUS, dbus-1,
[AC_DEFINE(HAVE_DBUS, 1, [Define if you have the D-BUS library])
VLC_ADD_LDFLAGS([screensaver],[$DBUS_LIBS])
VLC_ADD_CFLAGS([screensaver],[$DBUS_CFLAGS])],
[AC_MSG_WARN(DBUS library not found)])
]
)
fi
dnl Build the gtk_main plugins?
NEED_GTK_MAIN=no
NEED_GNOME_MAIN=no
......
/*****************************************************************************
* screensaver.c : disable screen savers when VLC is playing
*****************************************************************************
* Copyright (C) 2003 the VideoLAN team
* Copyright (C) 2006 the VideoLAN team
* $Id$
*
* Authors: Sam Hocevar <sam@zoy.org>
* Benjamin Pracht <bigben AT videolan DOT org>
*
* 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
......@@ -31,19 +32,55 @@
#include <vlc/aout.h>
#include <vlc/vout.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
/* 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( _("X Screensaver disabler") );
set_capability( "interface", 0 );
set_callbacks( Activate, NULL );
set_callbacks( Activate, Deactivate );
vlc_module_end();
/*****************************************************************************
......@@ -55,9 +92,36 @@ 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 )
{
dbus_connection_disconnect( p_intf->p_sys->p_connection );
}
if( p_intf->p_sys )
{
free( p_intf->p_sys );
p_intf->p_sys = NULL;
}
#endif
}
/*****************************************************************************
* Run: main thread
*****************************************************************************
......@@ -68,6 +132,10 @@ 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 );
......@@ -84,8 +152,14 @@ static void Run( intf_thread_t *p_intf )
/* http://www.jwz.org/xscreensaver/faq.html#dvd */
system( "xscreensaver-command -deactivate >&- 2>&- &" );
system( "gnome-screensaver-command --poke >&- 2>&- &" );
/* If we have dbug support, let's communicate directly with gnome-screensaver
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 */
}
......@@ -94,3 +168,83 @@ static void Run( intf_thread_t *p_intf )
}
}
#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
screensaver_send_message_void( p_intf, p_connection, "Poke" );
}
# 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
......@@ -115,7 +115,7 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module,
}
/* Choose the best module */
p_intf->p_module = module_Need( p_intf, "interface", psz_module, 0 );
p_intf->p_module = module_Need( p_intf, "interface", psz_module, VLC_TRUE );
if( p_intf->p_module == NULL )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment