#include "control/libvlc_internal.h"
#include <vlc_input.h>
-#include "misc/modules.h"
-#include "misc/configuration.h"
+#include "modules/modules.h"
+#include "modules/configuration.h"
#include <errno.h> /* ENOMEM */
#include <stdio.h> /* sprintf() */
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-void LocaleInit( vlc_object_t * );
-void LocaleDeinit( void );
+#if defined (__APPLE__) || defined (WIN32)
static void SetLanguage ( char const * );
+#endif
static inline int LoadMessages (void);
static int GetFilenames ( libvlc_int_t *, int, char *[] );
static void Help ( libvlc_int_t *, char const *psz_help_name );
static void Usage ( libvlc_int_t *, char const *psz_module_name );
-static void ListModules ( libvlc_int_t * );
+static void ListModules ( libvlc_int_t *, vlc_bool_t );
static void Version ( void );
#ifdef WIN32
/*
* Support for gettext
*/
- SetLanguage( "" );
+#ifdef HAVE_LC_MESSAGES
+ setlocale( LC_MESSAGES, "" );
+#endif
+ setlocale( LC_CTYPE, "" );
LoadMessages ();
- /*
- * Global iconv, must be done after setlocale()
- * so that vlc_current_charset() works.
- */
- LocaleInit( (vlc_object_t *)p_libvlc );
-
/* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") );
module_InitBank( p_libvlc );
/* Hack: insert the help module here */
- p_help_module = vlc_object_create( p_libvlc, VLC_OBJECT_MODULE );
+ p_help_module = vlc_module_create( VLC_OBJECT(p_libvlc) );
if( p_help_module == NULL )
{
module_EndBank( p_libvlc );
/* Check for module list option */
else if( config_GetInt( p_libvlc, "list" ) )
{
- ListModules( p_libvlc );
+ ListModules( p_libvlc, VLC_FALSE );
+ b_exit = VLC_TRUE;
+ i_ret = VLC_EEXITSUCCESS;
+ }
+ else if( config_GetInt( p_libvlc, "list-verbose" ) )
+ {
+ ListModules( p_libvlc, VLC_TRUE );
b_exit = VLC_TRUE;
i_ret = VLC_EEXITSUCCESS;
}
}
}
/* we unreference the connection when we've finished with it */
- dbus_connection_unref( p_conn );
+ if( p_conn ) dbus_connection_unref( p_conn );
}
#endif
*/
VLC_AddIntf( 0, "hotkeys,none", VLC_FALSE, VLC_FALSE );
+#ifdef HAVE_DBUS_3
+ /* loads dbus control interface if in one-instance mode
+ * we do it only when playlist exists, because dbus module needs it */
+ if( config_GetInt( p_libvlc, "one-instance" ) )
+ VLC_AddIntf( 0, "dbus,none", VLC_FALSE, VLC_FALSE );
+#endif
+
/*
* If needed, load the Xscreensaver interface
* Currently, only for X
{
/* System specific cleaning code */
system_End( p_libvlc );
-
- /* Destroy global iconv */
- LocaleDeinit();
}
vlc_mutex_unlock( lockval.p_address );
var_Destroy( p_libvlc_global, "libvlc" );
return VLC_SUCCESS;
};
+#if defined (__APPLE__) || defined (WIN32)
/*****************************************************************************
* SetLanguage: set the interface language.
*****************************************************************************
* as well as the LC_CTYPE category for string sorting and possible wide
* character support.
*****************************************************************************/
-static void SetLanguage ( char const *psz_lang )
+static void SetLanguage ( const char *psz_lang )
{
- if (psz_lang == NULL)
- return;
-
-#if defined( ENABLE_NLS ) \
- && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
-
- if( !*psz_lang )
- {
-# if defined( HAVE_LC_MESSAGES )
- setlocale( LC_MESSAGES, "" );
-# endif
- setlocale( LC_CTYPE, "" );
- }
- else
- {
#ifdef __APPLE__
- /* I need that under Darwin, please check it doesn't disturb
- * other platforms. --Meuuh */
- setenv( "LANG", psz_lang, 1 );
-
-#elif defined( SYS_BEOS ) || defined( WIN32 )
- /* We set LC_ALL manually because it is the only way to set
- * the language at runtime under eg. Windows. Beware that this
- * makes the environment unconsistent when libvlc is unloaded and
- * should probably be moved to a safer place like vlc.c. */
- static char psz_lcall[20];
- snprintf( psz_lcall, 19, "LC_ALL=%s", psz_lang );
- psz_lcall[19] = '\0';
- putenv( psz_lcall );
-#endif
+ /* I need that under Darwin, please check it doesn't disturb
+ * other platforms. --Meuuh */
+ setenv( "LANG", psz_lang, 1 );
- setlocale( LC_ALL, psz_lang );
- }
+#else
+ /* We set LC_ALL manually because it is the only way to set
+ * the language at runtime under eg. Windows. Beware that this
+ * makes the environment unconsistent when libvlc is unloaded and
+ * should probably be moved to a safer place like vlc.c. */
+ static char psz_lcall[20];
+ snprintf( psz_lcall, 19, "LC_ALL=%s", psz_lang );
+ psz_lcall[19] = '\0';
+ putenv( psz_lcall );
#endif
+
+ setlocale( LC_ALL, psz_lang );
}
+#endif
static inline int LoadMessages (void)
#if !defined( __APPLE__ ) && !defined( WIN32 ) && !defined( SYS_BEOS )
static const char psz_path[] = LOCALEDIR;
#else
- char buf[1024];
- if (snprintf (buf, sizeof (buf), "%s/%s", libvlc_global.psz_vlcpath,
- "locale")) >= sizeof (buf)
+ char psz_path[1024];
+ if (snprintf (psz_path, sizeof (psz_path), "%s/%s",
+ libvlc_global.psz_vlcpath, "locale")
+ >= (int)sizeof (psz_path))
return -1;
- const char *psz_path = psz_tmp;
#endif
if (bindtextdomain (PACKAGE_NAME, psz_path) == NULL)
{
* and their input options */
for( i_opt = i_argc - 1; i_opt >= optind; i_opt-- )
{
- const char *psz_target;
i_options = 0;
/* Count the input options */
/* TODO: write an internal function of this one, to avoid
* unnecessary lookups. */
-#ifdef WIN32
- if( GetVersion() < 0x80000000 )
- {
- VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[i_opt],
- (char const **)( i_options ? &ppsz_argv[i_opt + 1] :
- NULL ), i_options,
- PLAYLIST_INSERT, 0 );
- }
- else
-#endif
- {
- /* FIXME: it's too late to call FromLocale here. We should
- convert ALL arguments to UTF8 before they get parsed */
-
- psz_target = FromLocale( ppsz_argv[ i_opt ] );
- VLC_AddTarget( p_vlc->i_object_id, psz_target,
+ VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[i_opt],
(char const **)( i_options ? &ppsz_argv[i_opt + 1] :
NULL ), i_options,
PLAYLIST_INSERT, 0 );
- LocaleFree( psz_target );
- }
}
return VLC_SUCCESS;
*
* The purpose of having bra and ket is that we might i18n them as well.
*/
+
+# define COL(x) "\033[" #x ";1m"
+# define RED COL(31)
+# define GREEN COL(32)
+# define YELLOW COL(33)
+# define BLUE COL(34)
+# define MAGENTA COL(35)
+# define CYAN COL(36)
+# define WHITE COL(37)
+# define GRAY "\033[0m"
+#define COLOR_FORMAT_STRING (WHITE" %s --%s"YELLOW"%s%s%s%s%s%s "GRAY)
+
#define LINE_START 8
#define PADDING_SPACES 25
#ifdef WIN32
vlc_list_t *p_list = NULL;
char psz_spaces_text[PADDING_SPACES+LINE_START+1];
char psz_spaces_longtext[LINE_START+3];
- char psz_format[sizeof(FORMAT_STRING)];
+ char psz_format[sizeof(COLOR_FORMAT_STRING)];
char psz_buffer[10000];
char psz_short[4];
int i_index;
int i_width = ConsoleWidth() - (PADDING_SPACES+LINE_START+1);
- vlc_bool_t b_advanced = config_GetInt( p_this, "advanced" );
- vlc_bool_t b_description;
+ int i_width_description = i_width + PADDING_SPACES - 1;
+ vlc_bool_t b_advanced = config_GetInt( p_this, "advanced" );
+ vlc_bool_t b_description = config_GetInt( p_this, "help-verbose" );
+ vlc_bool_t b_description_hack;
+ vlc_bool_t b_color = config_GetInt( p_this, "color" );
memset( psz_spaces_text, ' ', PADDING_SPACES+LINE_START );
psz_spaces_text[PADDING_SPACES+LINE_START] = '\0';
memset( psz_spaces_longtext, ' ', LINE_START+2 );
psz_spaces_longtext[LINE_START+2] = '\0';
- strcpy( psz_format, FORMAT_STRING );
+ if( b_color )
+ strcpy( psz_format, COLOR_FORMAT_STRING );
+ else
+ strcpy( psz_format, FORMAT_STRING );
/* List all modules */
p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ /* Ugly hack to make sure that the help options always come first
+ * (part 1) */
+ if( !psz_module_name )
+ Usage( p_this, "help" );
+
/* Enumerate the config for each module */
for( i_index = 0; i_index < p_list->i_count; i_index++ )
{
if( psz_module_name && strcmp( psz_module_name,
p_parser->psz_object_name ) )
{
- continue;
+ const char **pp_shortcut = p_parser->pp_shortcuts;
+ while( *pp_shortcut )
+ {
+ if( !strcmp( psz_module_name, *pp_shortcut ) )
+ break;
+ pp_shortcut ++;
+ }
+ if( !*pp_shortcut )
+ continue;
}
/* Ignore modules without config options */
continue;
}
+ b_help_module = !strcmp( "help", p_parser->psz_object_name );
+ /* Ugly hack to make sure that the help options always come first
+ * (part 2) */
+ if( !psz_module_name && b_help_module )
+ continue;
+
/* Ignore modules with only advanced config options if requested */
if( !b_advanced )
{
/* Print name of module */
if( strcmp( "main", p_parser->psz_object_name ) )
- utf8_fprintf( stdout, "\n %s\n", p_parser->psz_longname );
-
- b_help_module = !strcmp( "help", p_parser->psz_object_name );
+ {
+ if( b_color )
+ utf8_fprintf( stdout, "\n " GREEN "%s" GRAY "\n",
+ p_parser->psz_longname );
+ else
+ utf8_fprintf( stdout, "\n %s\n", p_parser->psz_longname );
+ }
+ if( p_parser->psz_help )
+ {
+ if( b_color )
+ utf8_fprintf( stdout, CYAN" %s\n"GRAY, p_parser->psz_help );
+ else
+ utf8_fprintf( stdout, " %s\n", p_parser->psz_help );
+ }
/* Print module options */
for( p_item = p_parser->p_config;
const char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL;
const char *psz_suf = "", *psz_prefix = NULL;
signed int i;
+ size_t i_cur_width;
/* Skip deprecated options */
if( p_item->psz_current )
case CONFIG_HINT_CATEGORY:
case CONFIG_HINT_USAGE:
if( !strcmp( "main", p_parser->psz_object_name ) )
- utf8_fprintf( stdout, "\n %s\n", p_item->psz_text );
+ {
+ if( b_color )
+ utf8_fprintf( stdout, GREEN "\n %s\n" GRAY,
+ p_item->psz_text );
+ else
+ utf8_fprintf( stdout, "\n %s\n", p_item->psz_text );
+ }
+ if( b_description && p_item->psz_longtext )
+ {
+ if( b_color )
+ utf8_fprintf( stdout, CYAN " %s\n" GRAY,
+ p_item->psz_longtext );
+ else
+ utf8_fprintf( stdout, " %s\n", p_item->psz_longtext );
+ }
+ break;
+
+ case CONFIG_HINT_SUBCATEGORY:
+ if( strcmp( "main", p_parser->psz_object_name ) )
+ break;
+ case CONFIG_SECTION:
+ if( b_color )
+ {
+ utf8_fprintf( stdout, RED" %s:\n"GRAY,
+ p_item->psz_text );
+ if( b_description && p_item->psz_longtext )
+ utf8_fprintf( stdout, MAGENTA" %s\n"GRAY,
+ p_item->psz_longtext );
+ }
+ else
+ {
+ utf8_fprintf( stdout, " %s:\n", p_item->psz_text );
+ if( b_description && p_item->psz_longtext )
+ utf8_fprintf( stdout, " %s\n", p_item->psz_longtext );
+ }
break;
case CONFIG_ITEM_STRING:
psz_type = _("integer");
psz_ket = ">";
+ if( p_item->min.i || p_item->max.i )
+ {
+ sprintf( psz_buffer, "%s [%i .. %i]", psz_type,
+ p_item->min.i, p_item->max.i );
+ psz_type = psz_buffer;
+ }
+
if( p_item->i_list )
{
psz_bra = OPTION_VALUE_SEP "{";
psz_bra = OPTION_VALUE_SEP "<";
psz_type = _("float");
psz_ket = ">";
+ if( p_item->min.f || p_item->max.f )
+ {
+ sprintf( psz_buffer, "%s [%f .. %f]", psz_type,
+ p_item->min.f, p_item->max.f );
+ psz_type = psz_buffer;
+ }
break;
case CONFIG_ITEM_BOOL:
psz_bra = ""; psz_type = ""; psz_ket = "";
/* We wrap the rest of the output */
sprintf( psz_buffer, "%s%s", p_item->psz_text, psz_suf );
- b_description = config_GetInt( p_this, "help-verbose" );
+ b_description_hack = b_description;
description:
psz_text = psz_buffer;
+ i_cur_width = b_description && !b_description_hack
+ ? i_width_description
+ : i_width;
while( *psz_text )
{
char *psz_parser, *psz_word;
size_t i_end = strlen( psz_text );
/* If the remaining text fits in a line, print it. */
- if( i_end <= (size_t)i_width )
+ if( i_end <= i_cur_width )
{
- utf8_fprintf( stdout, "%s\n", psz_text );
+ if( b_color )
+ {
+ if( !b_description || b_description_hack )
+ utf8_fprintf( stdout, BLUE"%s\n"GRAY, psz_text );
+ else
+ utf8_fprintf( stdout, "%s\n", psz_text );
+ }
+ else
+ {
+ utf8_fprintf( stdout, "%s\n", psz_text );
+ }
break;
}
psz_parser = psz_parser ? psz_parser + 1
: psz_text + i_end;
- } while( psz_parser - psz_text <= i_width );
+ } while( (size_t)(psz_parser - psz_text) <= i_cur_width );
/* We cut a word in one of these cases:
* - it's the only word in the line and it's too long.
* going to wrap is longer than 40% of the width, and even
* if the word would have fit in the next line. */
if( psz_word == psz_text
- || ( psz_word - psz_text < 80 * i_width / 100
- && psz_parser - psz_word > 40 * i_width / 100 ) )
+ || ( (size_t)(psz_word - psz_text) < 80 * i_cur_width / 100
+ && (size_t)(psz_parser - psz_word) > 40 * i_cur_width / 100 ) )
{
- char c = psz_text[i_width];
- psz_text[i_width] = '\0';
- utf8_fprintf( stdout, "%s\n%s", psz_text, psz_spaces );
- psz_text += i_width;
+ char c = psz_text[i_cur_width];
+ psz_text[i_cur_width] = '\0';
+ if( b_color )
+ {
+ if( !b_description || b_description_hack )
+ utf8_fprintf( stdout, BLUE"%s\n%s"GRAY,
+ psz_text, psz_spaces );
+ else
+ utf8_fprintf( stdout, "%s\n%s",
+ psz_text, psz_spaces );
+ }
+ else
+ {
+ utf8_fprintf( stdout, "%s\n%s", psz_text, psz_spaces );
+ }
+ psz_text += i_cur_width;
psz_text[0] = c;
}
else
{
psz_word[-1] = '\0';
- utf8_fprintf( stdout, "%s\n%s", psz_text, psz_spaces );
+ if( b_color )
+ {
+ if( !b_description || b_description_hack )
+ utf8_fprintf( stdout, BLUE"%s\n%s"GRAY,
+ psz_text, psz_spaces );
+ else
+ utf8_fprintf( stdout, "%s\n%s",
+ psz_text, psz_spaces );
+ }
+ else
+ {
+ utf8_fprintf( stdout, "%s\n%s", psz_text, psz_spaces );
+ }
psz_text = psz_word;
}
}
- if( b_description && p_item->psz_longtext )
+ if( b_description_hack && p_item->psz_longtext )
{
sprintf( psz_buffer, "%s%s", p_item->psz_longtext, psz_suf );
- b_description = VLC_FALSE;
+ b_description_hack = VLC_FALSE;
psz_spaces = psz_spaces_longtext;
utf8_fprintf( stdout, "%s", psz_spaces );
goto description;
* Print a list of all available modules (builtins and plugins) and a short
* description for each one.
*****************************************************************************/
-static void ListModules( libvlc_int_t *p_this )
+static void ListModules( libvlc_int_t *p_this, vlc_bool_t b_verbose )
{
vlc_list_t *p_list = NULL;
module_t *p_parser = NULL;
char psz_spaces[22];
int i_index;
+ vlc_bool_t b_color = config_GetInt( p_this, "color" );
+
memset( psz_spaces, ' ', 22 );
#ifdef WIN32
if( i < 0 ) i = 0;
psz_spaces[i] = 0;
- utf8_fprintf( stdout, " %s%s %s\n", p_parser->psz_object_name,
- psz_spaces, p_parser->psz_longname );
+ if( b_color )
+ utf8_fprintf( stdout, GREEN" %s%s "WHITE"%s\n"GRAY,
+ p_parser->psz_object_name,
+ psz_spaces,
+ p_parser->psz_longname );
+ else
+ utf8_fprintf( stdout, " %s%s %s\n",
+ p_parser->psz_object_name,
+ psz_spaces, p_parser->psz_longname );
+
+ if( b_verbose )
+ {
+ const char **pp_shortcut = p_parser->pp_shortcuts;
+ while( pp_shortcut && *pp_shortcut )
+ {
+ if( strcmp( *pp_shortcut, p_parser->psz_object_name ) )
+ {
+ if( b_color )
+ utf8_fprintf( stdout, CYAN" s %s\n"GRAY,
+ *pp_shortcut );
+ else
+ utf8_fprintf( stdout, " s %s\n",
+ *pp_shortcut );
+ }
+ pp_shortcut++;
+ }
+ if( p_parser->psz_capability )
+ {
+ if( b_color )
+ utf8_fprintf( stdout, MAGENTA" c %s (%d)\n"GRAY,
+ p_parser->psz_capability,
+ p_parser->i_score );
+ else
+ utf8_fprintf( stdout, " c %s (%d)\n",
+ p_parser->psz_capability,
+ p_parser->i_score );
+ }
+ if( p_parser->psz_program )
+ {
+ if( b_color )
+ utf8_fprintf( stdout, YELLOW " p %s\n"GRAY,
+ p_parser->psz_program );
+ else
+ utf8_fprintf( stdout, " p %s\n", p_parser->psz_program );
+ }
+ }
psz_spaces[i] = ' ';
}
vlc_value_t old_val, vlc_value_t new_val, void *param)
{
libvlc_int_t *p_libvlc = (libvlc_int_t *)p_this;
+ (void)psz_variable;
+ (void)old_val;
+ (void)param;
if( new_val.i_int >= -1 )
{
char **devices = NULL;
char *block_dev = NULL;
dbus_bool_t b_dvd;
+
+#ifdef HAVE_HAL_1
DBusConnection *p_connection = NULL;
DBusError error;
-#ifdef HAVE_HAL_1
ctx = libhal_ctx_new();
if( !ctx ) return;
dbus_error_init( &error );
p_connection = dbus_bus_get ( DBUS_BUS_SYSTEM, &error );
- if( dbus_error_is_set( &error ) )
+ if( dbus_error_is_set( &error ) || !p_connection )
{
dbus_error_free( &error );
return;
libhal_ctx_set_dbus_connection( ctx, p_connection );
if( libhal_ctx_init( ctx, &error ) )
#else
- if( ( ctx = hal_initialize( NULL, FALSE ) ) )
+ ctx = hal_initialize( NULL, FALSE );
+ if( ctx )
#endif
+
{
#ifdef HAVE_HAL_1
if( ( devices = libhal_get_all_devices( ctx, &i_devices, NULL ) ) )
{
msg_Warn( p_vlc, "Unable to get HAL device properties" );
}
-#endif
+#else
+ (void)p_vlc;
+#endif /* HAVE_HAL */
}