view Gui/skin/font.h @ 11350:007ec48cf146

Current mplayer (mine is mplayer-1.0-pre1cvs20031001) cannot play mms stream with multibyte characters in the url. There is a bug in string_utf16() of libmpdemux/asf_mmst_streaming.c: the url encoding code is written for single-byte character only. It just fill a zero byte between every two adjacent bytes of the url string. This is wrong when the url string contains multi-byte characters. My patch is in the attachment, and has been tested working. It uses iconv() to convert the url's encoding to utf-16 correctly. So can this patch be accepted and commit into CVS? patch by Wang WenRui <[e-mail]>

#ifndef _FONT_H
#define _FONT_H

#include "../bitmap.h"
#include "../app.h"

#define fntAlignLeft   0
#define fntAlignCenter 1
#define fntAlignRight  2

typedef struct
{
 int x,y;   // location
 int sx,sy; // size
} fntChar;

typedef struct
{
 fntChar    Fnt[256];
 txSample   Bitmap;
 char       name[128];
} bmpFont;

extern txSample   Bitmap;
extern bmpFont  * Fonts[26];

extern int  fntAddNewFont( char * name );
extern void fntFreeFont( void );
extern int  fntFindID( char * name );
extern int  fntTextHeight( int id,char * str );
extern int  fntTextWidth( int id,char * str );

extern int        fntRead( char * path,char * fname );
extern txSample * fntRender( wItem * item,int px,char * fmt,... );

#endif