mplayer.hg: Gui/mplayer/gtk/fs.c comparison

comparison Gui/mplayer/gtk/fs.c @ 6794:77980ab4e296

- add preferences support (first try) - fix some playlist bug - fix some equ bug - fix some redraw bug - fix dvd playing - fix file open dialog box - etc.

author	pontscho
date	Thu, 25 Jul 2002 20:26:38 +0000
parents	a31b9f15cbff
children	ed02bae611d5

comparison

equal deleted inserted replaced

-:48d432a8d531
+:77980ab4e296
 #include "../../../help_mp.h"
 #include "../../../libmpdemux/stream.h"
 #include "../widgets.h"
 #include "fs.h"
+#include "opts.h"
 #ifndef __linux__
 #define get_current_dir_name()  getcwd(NULL, PATH_MAX)
 #endif
 #define fsNumberOfAudioFilterNames 3
 char * fsAudioFileNames[fsNumberOfAudioFilterNames+1][2] =
 	 { { "WAV files (*.wav)",					   "*.wav" },
 	   { "MP3 files (*.mp2, *.mp3)",				   "*.mp2,*.mp3" },
 	   { "Audio files (*.wav,*.mp2,*.mp3)",				   "*.wav,*.mp2,*.mp3" },
+	   { "All files ( * )",						   "*" } };
+#define fsNumberOfFontFilterNames 1
+char * fsFontFileNames[fsNumberOfFontFilterNames+1][2] =
+	 { { "font files (*.desc)",					   "*.desc" },
 	   { "All files ( * )",						   "*" } };
 GtkWidget   * fsFileNamesList;
 GtkWidget   * fsFNameList;
 GtkWidget   * fsFileSelect;
 strcpy( str[0][1],".." ); gtk_clist_append( GTK_CLIST( list ),str[0] ); gtk_clist_set_pixmap( GTK_CLIST( list ),1,0,pixmap,mask );
 free( str[0][0] );
 glob( "*",0,NULL,&gg );
 // glob( ".*",GLOB_NOSORT | GLOB_APPEND,NULL,&gg );
-for(  i=0;i<gg.gl_pathc;i++ )
+for(  i=0;(unsigned)i<gg.gl_pathc;i++ )
 {
 stat( gg.gl_pathv[i],&fs );
 if( !S_ISDIR( fs.st_mode ) ) continue;
 str[0][1]=(gchar *)malloc( strlen( gg.gl_pathv[i] ) + 1 );
 }
 #endif
 // glob( ".*",GLOB_NOSORT | GLOB_APPEND,NULL,&gg );
 pixmap=fpixmap; mask=fmask;
-for(  i=0;i<gg.gl_pathc;i++ )
+for(  i=0;(unsigned)i<gg.gl_pathc;i++ )
 {
 stat( gg.gl_pathv[i],&fs );
 if(  S_ISDIR( fs.st_mode ) ) continue;
 str[0][1]=(gchar *)malloc( strlen( gg.gl_pathv[i] ) + 1 );
 gtk_clist_set_column_width( GTK_CLIST( list ),0,17 );
 gtk_clist_select_row( GTK_CLIST( list ),0,1 );
 gtk_widget_show( list );
 }
-static int FirstInit = 1;
 void ShowFileSelect( int type,int modal )
 {
 int i;
+char * tmp = NULL;
 if ( gtkVFileSelect ) gtkActive( fsFileSelect );
 else fsFileSelect=create_FileSelect();
-if ( FirstInit )
-{
-fsTopList_items=g_list_append( fsTopList_items,(gchar *)get_current_dir_name() );
-if ( getenv( "HOME" ) ) fsTopList_items=g_list_append( fsTopList_items,getenv( "HOME" ) );
-fsTopList_items=g_list_append( fsTopList_items,"/home" );
-fsTopList_items=g_list_append( fsTopList_items,"/mnt" );
-fsTopList_items=g_list_append( fsTopList_items,"/" );
-FirstInit=0;
-}
-gtk_combo_set_popdown_strings( GTK_COMBO( fsCombo4 ),fsTopList_items );
 fsType=type;
 switch ( type )
 {
 case fsVideoSelector:
 gtk_window_set_title( GTK_WINDOW( fsFileSelect ),MSGTR_FileSelect );
 for( i=0;i<fsNumberOfVideoFilterNames + 1;i++ )
 fsList_items=g_list_append( fsList_items,fsVideoFilterNames[i][0] );
 gtk_combo_set_popdown_strings( GTK_COMBO( List ),fsList_items );
 g_list_free( fsList_items );
 gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsVideoFilterNames[fsNumberOfVideoFilterNames - 1][0] );
+	tmp=guiIntfStruct.Filename;
 break;
 case fsSubtitleSelector:
 gtk_window_set_title( GTK_WINDOW( fsFileSelect ),MSGTR_SubtitleSelect );
 fsList_items=NULL;
 for( i=0;i<fsNumberOfSubtitleFilterNames + 1;i++ )
 fsList_items=g_list_append( fsList_items,fsSubtitleFilterNames[i][0] );
 gtk_combo_set_popdown_strings( GTK_COMBO( List ),fsList_items );
 g_list_free( fsList_items );
 gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsSubtitleFilterNames[fsNumberOfSubtitleFilterNames - 1][0] );
+	tmp=guiIntfStruct.Subtitlename;
 break;
 case fsOtherSelector:
 gtk_window_set_title( GTK_WINDOW( fsFileSelect ),MSGTR_OtherSelect );
 fsList_items=NULL;
 for( i=0;i<fsNumberOfSubtitleFilterNames + 1;i++ )
 fsList_items=g_list_append( fsList_items,fsOtherFilterNames[i][0] );
 gtk_combo_set_popdown_strings( GTK_COMBO( List ),fsList_items );
 g_list_free( fsList_items );
 gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsOtherFilterNames[fsNumberOfOtherFilterNames][0] );
+	tmp=guiIntfStruct.Othername;
 break;
 case fsAudioSelector:
 	gtk_window_set_title( GTK_WINDOW( fsFileSelect ),MSGTR_AudioFileSelect );
 	fsList_items=NULL;
 	for( i=0;i<fsNumberOfAudioFilterNames + 1;i++ )
 	  fsList_items=g_list_append( fsList_items,fsAudioFileNames[i][0] );
 	gtk_combo_set_popdown_strings( GTK_COMBO( List ),fsList_items );
 	g_list_free( fsList_items );
 	gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsAudioFileNames[fsNumberOfAudioFilterNames - 1][0] );
+	tmp=guiIntfStruct.AudioFile;
 	break;
+case fsFontSelector:
+gtk_window_set_title( GTK_WINDOW( fsFileSelect ),MSGTR_FontSelect );
+	fsList_items=NULL;
+	for( i=0;i<fsNumberOfFontFilterNames + 1;i++ )
+	  fsList_items=g_list_append( fsList_items,fsFontFileNames[i][0] );
+	gtk_combo_set_popdown_strings( GTK_COMBO( List ),fsList_items );
+	g_list_free( fsList_items );
+	gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsFontFileNames[fsNumberOfFontFilterNames - 1][0] );
+	tmp=guiIntfStruct.Fontname;
+	break;
+}
+if ( tmp && tmp[0] )
+{
+struct stat f;
+char * dir = strdup( tmp );
+do
+{
+char * c = strrchr( dir,'/' );
+stat( dir,&f );
+if ( S_ISDIR( f.st_mode ) ) break;
+if ( c ) *c=0;
+} while ( strrchr( dir,'/' ) );
+if ( dir[0] ) chdir( dir );
+free( dir );
 }
+if ( fsTopList_items ) g_list_free( fsTopList_items ); fsTopList_items=NULL;
+fsTopList_items=g_list_append( fsTopList_items,(gchar *)get_current_dir_name() );
+if ( getenv( "HOME" ) ) fsTopList_items=g_list_append( fsTopList_items,getenv( "HOME" ) );
+fsTopList_items=g_list_append( fsTopList_items,"/home" );
+fsTopList_items=g_list_append( fsTopList_items,"/mnt" );
+fsTopList_items=g_list_append( fsTopList_items,"/" );
+gtk_combo_set_popdown_strings( GTK_COMBO( fsCombo4 ),fsTopList_items );
 gtk_window_set_modal( GTK_WINDOW( fsFileSelect ),modal );
 gtk_widget_show( fsFileSelect ); gtkVisible++;
 }
 case fsAudioSelector:
 for( i=0;i<fsNumberOfAudioFilterNames+1;i++ )
 if( !strcmp( str,fsAudioFileNames[i][0] ) )
 { strcpy( fsFilter,fsAudioFileNames[i][1] ); break; }
 	  break;
+case fsFontSelector:
+for( i=0;i<fsNumberOfFontFilterNames+1;i++ )
+	    if( !strcmp( str,fsFontFileNames[i][0] ) )
+	     { strcpy( fsFilter,fsFontFileNames[i][1] ); break; }
+	  break;
 default: return;
 }
 CheckDir( fsFNameList,get_current_dir_name() );
 }
 {
 case fsVideoSelector:
 guiSetDF( guiIntfStruct.Filename,fsSelectedDirectory,fsSelectedFile );
 guiIntfStruct.StreamType=STREAMTYPE_FILE;
 guiIntfStruct.FilenameChanged=1;
-	  if ( guiIntfStruct.AudioFile ) free( guiIntfStruct.AudioFile );
+	  gfree( &guiIntfStruct.AudioFile );
-	  guiIntfStruct.AudioFile=NULL;
+	  gfree( &guiIntfStruct.Subtitlename );
 break;
 case fsSubtitleSelector:
 guiSetDF( guiIntfStruct.Subtitlename,fsSelectedDirectory,fsSelectedFile );
 guiIntfStruct.SubtitleChanged=1;
 break;
 guiSetDF( guiIntfStruct.Othername,fsSelectedDirectory,fsSelectedFile );
 break;
 case fsAudioSelector:
 guiSetDF( guiIntfStruct.AudioFile,fsSelectedDirectory,fsSelectedFile );
 break;
+case fsFontSelector:
+guiSetDF( guiIntfStruct.Fontname,fsSelectedDirectory,fsSelectedFile );
+#if defined( USE_OSD ) || defined( USE_SUB )
+	  guiLoadFont();
+#endif
+	  if ( gtkVPreferences ) gtk_entry_set_text( GTK_ENTRY( prEFontName ),guiIntfStruct.Fontname );
+	  break;
 }
 HideFileSelect();
 item=fsTopList_items;
 gtk_widget_show( fsCancel );
 gtk_signal_connect( GTK_OBJECT( fsFileSelect ),"destroy",GTK_SIGNAL_FUNC( fs_fsFileSelect_destroy ),NULL );
 gtk_signal_connect( GTK_OBJECT( fsFileSelect ),"key_release_event",GTK_SIGNAL_FUNC( on_FileSelect_key_release_event ),NULL );
-gtk_signal_connect( GTK_OBJECT( fsFileSelect ),"show",GTK_SIGNAL_FUNC( fs_FileSelect_show ),1 );
+gtk_signal_connect( GTK_OBJECT( fsFileSelect ),"show",GTK_SIGNAL_FUNC( fs_FileSelect_show ),(void *)1 );
 gtk_signal_connect( GTK_OBJECT( fsFileSelect ),"hide",GTK_SIGNAL_FUNC( fs_FileSelect_show ),0 );
 gtk_signal_connect( GTK_OBJECT( fsFilterCombo ),"changed",GTK_SIGNAL_FUNC( fs_fsFilterCombo_changed ),fsFilterCombo );
 gtk_signal_connect( GTK_OBJECT( fsFilterCombo ),"activate",GTK_SIGNAL_FUNC( fs_fsFilterCombo_activate ),fsFilterCombo );
 gtk_signal_connect( GTK_OBJECT( fsPathCombo ),"changed",GTK_SIGNAL_FUNC( fs_fsPathCombo_changed ),fsPathCombo );

Mercurial > mplayer.hg

comparison Gui/mplayer/gtk/fs.c @ 6794:77980ab4e296