summaryrefslogtreecommitdiffstats
path: root/gui/skin
diff options
context:
space:
mode:
Diffstat (limited to 'gui/skin')
-rw-r--r--gui/skin/cut.c4
-rw-r--r--gui/skin/font.c30
-rw-r--r--gui/skin/skin.c26
3 files changed, 30 insertions, 30 deletions
diff --git a/gui/skin/cut.c b/gui/skin/cut.c
index c0c114ab20..b05f238984 100644
--- a/gui/skin/cut.c
+++ b/gui/skin/cut.c
@@ -34,14 +34,14 @@ void cutItem( char * in,char * out,char sep,int num )
int cutItemToInt( char * in,char sep,int num )
{
char tmp[512];
- cutItem( in,tmp,sep,num );
+ cutItem( in,tmp,sep,num );
return atoi( tmp );
}
float cutItemToFloat( char * in,char sep,int num )
{
char tmp[512];
- cutItem( in,tmp,sep,num );
+ cutItem( in,tmp,sep,num );
return atof( tmp );
}
diff --git a/gui/skin/font.c b/gui/skin/font.c
index b18bf4b689..f565289925 100644
--- a/gui/skin/font.c
+++ b/gui/skin/font.c
@@ -46,7 +46,7 @@ int fntAddNewFont( char * name )
if ( ( Fonts[id]=calloc( 1,sizeof( bmpFont ) ) ) == NULL ) return -1;
av_strlcpy( Fonts[id]->name,name,128 ); // FIXME: as defined in font.h
- for ( i=0;i<256;i++ )
+ for ( i=0;i<256;i++ )
Fonts[id]->Fnt[i].x=Fonts[id]->Fnt[i].y=Fonts[id]->Fnt[i].sx=Fonts[id]->Fnt[i].sy=-1;
return id;
@@ -75,14 +75,14 @@ int fntRead( char * path,char * fname )
unsigned char param[256];
int c,linenumber = 0;
int id = fntAddNewFont( fname );
-
+
if ( id < 0 ) return id;
av_strlcpy( tmp,path,sizeof( tmp ) );
av_strlcat( tmp,fname,sizeof( tmp ) ); av_strlcat( tmp,".fnt",sizeof( tmp ) );
- if ( ( f=fopen( tmp,"rt" ) ) == NULL )
+ if ( ( f=fopen( tmp,"rt" ) ) == NULL )
{ free( Fonts[id] ); return -3; }
-
+
while ( !feof( f ) )
{
fgets( tmp,255,f ); linenumber++;
@@ -189,7 +189,7 @@ txSample * fntRender( wItem * item,int px,const char * fmt,... )
tw=fntTextWidth( id,p );
fbw=Fonts[id]->Bitmap.Width;
- if ( item->Bitmap.Image == NULL )
+ if ( item->Bitmap.Image == NULL )
{
item->Bitmap.Height=item->height=fntTextHeight( id,p );
item->Bitmap.Width=item->width=iw;
@@ -203,8 +203,8 @@ txSample * fntRender( wItem * item,int px,const char * fmt,... )
ibuf=(uint32_t *)Fonts[id]->Bitmap.Image;
for ( i=0;i < item->Bitmap.ImageSize / 4;i++ ) obuf[i]=0xff00ff;
-
- if ( tw <= iw )
+
+ if ( tw <= iw )
{
switch ( item->align )
{
@@ -213,23 +213,23 @@ txSample * fntRender( wItem * item,int px,const char * fmt,... )
case fntAlignCenter: dx=( iw - fntTextWidth( id,p ) ) / 2; break;
case fntAlignRight: dx=iw - fntTextWidth( id,p ); break;
}
-
+
} else dx+=px;
ofs=dx;
-
+
for ( i=0;i < (int)strlen( p );i++ )
{
c=(unsigned int)p[i];
fw=Fonts[id]->Fnt[c].sx;
-
+
if ( fw == -1 ) { c=32; fw=Fonts[id]->Fnt[c].sx; }
-
+
fh=Fonts[id]->Fnt[c].sy;
fyc=Fonts[id]->Fnt[c].y * fbw + Fonts[id]->Fnt[c].x;
yc=dx;
-
- if ( dx >= 0 )
+
+ if ( dx >= 0 )
for ( y=0;y < fh;y++ )
{
for ( x=0; x < fw;x++ )
@@ -247,14 +247,14 @@ txSample * fntRender( wItem * item,int px,const char * fmt,... )
{
c=(unsigned int)p[i];
fw=Fonts[id]->Fnt[c].sx;
-
+
if ( fw == -1 ) { c=32; fw=Fonts[id]->Fnt[c].sx; }
fh=Fonts[id]->Fnt[c].sy;
fyc=Fonts[id]->Fnt[c].y * fbw + Fonts[id]->Fnt[c].x;
dx-=fw; yc=dx;
- if ( dx >= 0 )
+ if ( dx >= 0 )
for ( y=0;y < fh;y++ )
{
for ( x=fw - 1;x >= 0;x-- )
diff --git a/gui/skin/skin.c b/gui/skin/skin.c
index 064bde68cb..50d31b74d7 100644
--- a/gui/skin/skin.c
+++ b/gui/skin/skin.c
@@ -165,7 +165,7 @@ int cmd_base( char * in )
defList->main.x=x;
defList->main.y=y;
defList->main.type=itBase;
- av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp ));
+ av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp ));
if ( skinBPRead( tmp,&defList->main.Bitmap ) ) return 1;
defList->main.width=defList->main.Bitmap.Width;
defList->main.height=defList->main.Bitmap.Height;
@@ -180,7 +180,7 @@ int cmd_base( char * in )
if ( !strcmp( window_name,"sub" ) )
{
defList->sub.type=itBase;
- av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp ));
+ av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp ));
if ( skinBPRead( tmp,&defList->sub.Bitmap ) ) return 1;
defList->sub.x=x;
defList->sub.y=y;
@@ -197,7 +197,7 @@ int cmd_base( char * in )
{
defList->menuIsPresent=1;
defList->menuBase.type=itBase;
- av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp ));
+ av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp ));
if ( skinBPRead( tmp,&defList->menuBase.Bitmap ) ) return 1;
defList->menuBase.width=defList->menuBase.Bitmap.Width;
defList->menuBase.height=defList->menuBase.Bitmap.Height;
@@ -215,7 +215,7 @@ int cmd_base( char * in )
defList->bar.x=x;
defList->bar.y=y;
defList->bar.type=itBase;
- av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp ));
+ av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp ));
if ( skinBPRead( tmp,&defList->bar.Bitmap ) ) return 1;
defList->bar.width=defList->bar.Bitmap.Width;
defList->bar.height=defList->bar.Bitmap.Height;
@@ -237,12 +237,12 @@ int cmd_background( char * in )
CHECK( "menu" );
CHECK( "main" );
-
+
currSection->R=cutItemToInt( in,',',0 );
currSection->G=cutItemToInt( in,',',1 );
currSection->B=cutItemToInt( in,',',2 );
mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"\n[skin] background color is #%x%x%x.\n",currSection->R,currSection->G,currSection->B );
-
+
return 0;
}
@@ -257,7 +257,7 @@ int cmd_button( char * in )
CHECKWINLIST( "button" );
CHECK( "sub" );
- CHECK( "menu" );
+ CHECK( "menu" );
cutItem( in,fname,',',0 );
x=cutItemToInt( in,',',1 );
@@ -286,7 +286,7 @@ int cmd_button( char * in )
currSubItems[ *currSubItem ].Bitmap.Image=NULL;
if ( strcmp( fname,"NULL" ) )
{
- av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp ));
+ av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp ));
if ( skinBPRead( tmp,&currSubItems[ *currSubItem ].Bitmap ) ) return 1;
}
@@ -307,7 +307,7 @@ int cmd_selected( char * in )
cutItem( in,fname,',',0 );
defList->menuSelected.type=itBase;
- av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp ));
+ av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp ));
mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"\n[skin] selected: %s\n",fname );
if ( skinBPRead( tmp,&defList->menuSelected.Bitmap ) ) return 1;
defList->menuSelected.width=defList->menuSelected.Bitmap.Width;
@@ -327,7 +327,7 @@ int cmd_menu( char * in )
CHECK( "main" );
CHECK( "sub" );
CHECK( "playbar" );
-
+
x=cutItemToInt( in,',',0 );
y=cutItemToInt( in,',',1 );
sx=cutItemToInt( in,',',2 );
@@ -399,14 +399,14 @@ int cmd_hpotmeter( char * in )
item->Bitmap.Image=NULL;
if ( strcmp( phfname,"NULL" ) )
{
- av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, phfname, sizeof( tmp ));
+ av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, phfname, sizeof( tmp ));
if ( skinBPRead( tmp,&item->Bitmap ) ) return 1;
}
item->Mask.Image=NULL;
if ( strcmp( pfname,"NULL" ) )
{
- av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, pfname, sizeof( tmp ));
+ av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, pfname, sizeof( tmp ));
if ( skinBPRead( tmp,&item->Mask ) ) return 1;
}
return 0;
@@ -463,7 +463,7 @@ int cmd_potmeter( char * in )
item->Bitmap.Image=NULL;
if ( strcmp( phfname,"NULL" ) )
{
- av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, phfname, sizeof( tmp ));
+ av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, phfname, sizeof( tmp ));
if ( skinBPRead( tmp,&item->Bitmap ) ) return 1;
}
return 0;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 15:47:31 +0000