#include <errno.h> /* errno */
#include <stdlib.h> /* free() */
+#include <stdio.h> /* sprintf() */
#include <string.h> /* strerror() */
#include <fcntl.h> /* open() */
#include <unistd.h> /* read(), close() */
*****************************************************************************/
vout_font_t *vout_LoadFont( const char *psz_name )
{
+ static char * path[] = { "share", DATA_PATH, NULL };
+
+ char ** ppsz_path = path;
+ char * psz_file;
+#ifdef SYS_BEOS
+ char * psz_vlcpath = beos_GetProgramPath();
+ int i_vlclen = strlen( psz_vlcpath );
+#endif
int i_char, i_line; /* character and line indexes */
- int i_file; /* source file */
+ int i_file = -1; /* source file */
byte_t pi_buffer[2]; /* file buffer */
vout_font_t * p_font; /* the font itself */
- /* Open file */
- i_file = open( psz_name, O_RDONLY );
+ for( ; *ppsz_path != NULL ; ppsz_path++ )
+ {
+#ifdef SYS_BEOS
+ /* Under BeOS, we need to add beos_GetProgramPath() to access
+ * files under the current directory */
+ if( strncmp( *ppsz_path, "/", 1 ) )
+ {
+ psz_file = malloc( strlen( psz_name ) + strlen( *ppsz_path )
+ + i_vlclen + 3 );
+ if( psz_file == NULL )
+ {
+ continue;
+ }
+ sprintf( psz_file, "%s/%s/%s", psz_vlcpath, *ppsz_path, psz_name );
+ }
+ else
+#endif
+ {
+ psz_file = malloc( strlen( psz_name ) + strlen( *ppsz_path ) + 2 );
+ if( psz_file == NULL )
+ {
+ continue;
+ }
+ sprintf( psz_file, "%s/%s", *ppsz_path, psz_name );
+ }
+
+ /* Open file */
+ i_file = open( psz_file, O_RDONLY );
+ free( psz_file );
+
+ if( i_file != -1 )
+ {
+ break;
+ }
+ }
+
if( i_file == -1 )
{
- intf_ErrMsg("error: can't open file '%s' (%s)\n", psz_name, strerror(errno));
+ intf_DbgMsg( "vout error: can't open file '%s' (%s)",
+ psz_name, strerror(errno) );
return( NULL );
}
/* Read magick number */
if( read( i_file, pi_buffer, 2 ) != 2 )
{
- intf_ErrMsg("error: unexpected end of file '%s'\n", psz_name );
+ intf_ErrMsg("vout error: unexpected end of file '%s'", psz_name );
close( i_file );
return( NULL );
}
p_font = malloc( sizeof( vout_font_t ) );
if( p_font == NULL )
{
- intf_ErrMsg("error: %s\n", strerror(ENOMEM));
+ intf_ErrMsg( "vout error: cannot allocate vout_font_t (%s)",
+ strerror(ENOMEM) );
close( i_file );
return( NULL );
}
case 0x3604: /* .psf file */
/*
* PSF font: simple fixed font. Only the first 256 characters are read.
- * Those fonts are always 1 byte width, and 256 or 512 characters long.
+ * Those fonts are always 1 byte wide, and 256 or 512 characters long.
*/
/* Read font header - two bytes indicate the font properties */
if( read( i_file, pi_buffer, 2 ) != 2)
{
- intf_ErrMsg("error: unexpected end of file '%s'\n", psz_name );
+ intf_ErrMsg( "vout error: unexpected end of file '%s'", psz_name );
free( p_font );
close( i_file );
return( NULL );
p_font->p_data = malloc( 2 * 256 * pi_buffer[1] );
if( p_font->p_data == NULL )
{
- intf_ErrMsg("error: %s\n", strerror(ENOMEM));
+ intf_ErrMsg( "vout error: cannot allocate font space (%s)",
+ strerror(ENOMEM) );
free( p_font );
close( i_file );
return( NULL );
/* Copy raw data */
if( read( i_file, p_font->p_data, 256 * pi_buffer[1] ) != 256 * pi_buffer[1] )
{
- intf_ErrMsg("error: unexpected end of file '%s'\n", psz_name );
+ intf_ErrMsg("vout error: unexpected end of file '%s'", psz_name );
free( p_font->p_data );
free( p_font );
close( i_file );
break;
default:
- intf_ErrMsg("error: file '%s' has an unknown format\n", psz_name );
+ intf_ErrMsg("vout error: file '%s' has an unknown format", psz_name );
free( p_font );
close( i_file );
return( NULL );
}
- intf_DbgMsg( "loaded %s: type %d, %d-%dx%d\n", psz_name, p_font->i_type,
+ intf_DbgMsg( "loaded %s: type %d, %d-%dx%d", psz_name, p_font->i_type,
p_font->i_width, p_font->i_interspacing, p_font->i_height );
return( p_font );
}
*****************************************************************************/
void vout_UnloadFont( vout_font_t *p_font )
{
- intf_DbgMsg( "font %p\n", p_font );
+ intf_DbgMsg( "vout: unloading font %p", p_font );
free( p_font->p_data );
free( p_font );
}
break;
#ifdef DEBUG
default:
- intf_DbgMsg("error: unknown font type %d\n", p_font->i_type );
+ intf_DbgMsg("error: unknown font type %d", p_font->i_type );
break;
#endif
}
* previously loaded bitmap font.
*****************************************************************************/
void vout_Print( vout_font_t *p_font, byte_t *p_pic, int i_bytes_per_pixel, int i_bytes_per_line,
- u32 i_char_color, u32 i_border_color, u32 i_bg_color, int i_style, const char *psz_text )
+ u32 i_char_color, u32 i_border_color, u32 i_bg_color, int i_style, const char *psz_text, int i_percent)
{
byte_t *p_char, *p_border; /* character and border mask data */
int i_char_mask, i_border_mask, i_bg_mask; /* masks */
int i_byte; /* current byte in character */
int i_interspacing; /* offset between two chars */
int i_font_bytes_per_line, i_font_height; /* font properties */
+ int i_position, i_end; /* current position */
vout_put_byte_t *p_PutByte; /* PutByte function */
/* FIXME: background: can be something else that whole byte ?? */
p_font->i_interspacing * 2 :
p_font->i_interspacing);
+ /* compute where to stop... */
+ i_end = (int) (i_percent * strlen(psz_text) / 100LL);
+ if(i_end > strlen(psz_text))
+ i_end = strlen(psz_text);
+
+
/* Print text */
- for( ; *psz_text != '\0'; psz_text++ )
+ for( i_position = 0; i_position < i_end; i_position++ ,psz_text++ )
{
/* Check that the character is valid */
if( (*psz_text >= p_font->i_first) && (*psz_text <= p_font->i_last) )
break;
#ifdef DEBUG
default:
- intf_DbgMsg("error: unknown font type %d\n", p_font->i_type );
+ intf_DbgMsg("error: unknown font type %d", p_font->i_type );
break;
#endif
}
}
+
}
}
projects / vlc / blobdiff