/*
* CINELERRA
- * Copyright (C) 1997-2011 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 1997-2017 Adam Williams <broadcast at earthling dot net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
while( *cp ) ++cp;
if( cp > path && *--cp != '/' ) return 0;
char *file_path = FileSystem::basepath(path);
- char *dir_path = FileSystem::basepath(filebox->fs->get_current_dir());
+ char *dir_path = FileSystem::basepath(filebox->directory);
int ret = !strcmp(file_path, dir_path) ? 0 : 1;
if( ret ) {
strcpy(filebox->directory, file_path);
this->want_directory = want_directory;
if(show_all_files) fs->set_show_all();
fs->complete_path(this->current_path);
- fs->complete_path(this->submitted_path);
+ strcpy(this->submitted_path, this->current_path);
fs->extract_dir(directory, this->current_path);
fs->extract_name(filename, this->current_path);
// Test if current directory exists
if(!fs->is_dir(directory))
{
- sprintf(this->current_path, "~");
- fs->complete_path(this->current_path);
- fs->set_current_dir(this->current_path);
-// fs->update(this->current_path);
- strcpy(directory, fs->get_current_dir());
+ sprintf(directory, "~");
+ fs->complete_path(directory);
+ strcpy(current_path,directory);
filename[0] = 0;
}
- else
- fs->set_current_dir(this->directory);
-
+ fs->set_current_dir(directory);
if(h_padding == -1)
{
int directory_title_margin = MAX(20,
resources->filebox_text_images[0]->get_h());
-// Create recent dir list
- create_history();
- update_history();
-
// Directories aren't filtered in FileSystem so skip this
if(!want_directory)
{
fs->set_filter(get_resources()->filebox_filter);
}
- fs->set_sort_order(sort_order);
- fs->set_sort_field(column_type[sort_column]);
- fs->update(directory);
-
create_icons();
create_tables();
add_subwindow(recent_popup = new BC_FileBoxRecent(this, x, y));
add_subwindow(directory_title = new BC_FileBoxDirectoryText(x, y, this));
- directory_title->reposition_window(x, y,
- get_w() - recent_popup->get_w() - 20, 1);
- recent_popup->reposition_window(
- x + directory_title->get_w(), y,
- directory_title->get_w(), 200);
+ directory_title->reposition_window(x, y, get_w() - recent_popup->get_w() - 20, 1);
+ x += directory_title->get_w() + 8;
+ recent_popup->reposition_window(x, y, directory_title->get_w(), 200);
x = 10;
y += directory_title->get_h() + 5;
if( newest >= 0 ) {
strcpy(directory, resources->filebox_history[newest].path);
fs->change_dir(directory, 0);
+ strcpy(directory, fs->get_current_dir());
directory_title->update(fs->get_current_dir());
}
+ fs->set_sort_order(sort_order);
+ fs->set_sort_field(column_type[sort_column]);
+ fs->update(directory);
+
+// Create recent dir list
+ create_history();
+ update_history();
listbox = 0;
create_listbox(x, y, get_display_mode());
rename_thread = new BC_RenameThread(this);
-
+ refresh();
show_window();
}
int BC_FileBox::get_listbox_h(int y)
{
- int result = get_h() -
- y -
- h_padding;
+ int result = get_h() - y - h_padding - 10;
if(want_directory)
result -= BC_WindowBase::get_resources()->dirbox_margin;
else
get_w() - recent_popup->get_w() - 20,
1);
recent_popup->reposition_window(
- directory_title->get_x() + directory_title->get_w(),
+ directory_title->get_x() + directory_title->get_w() + 8,
directory_title->get_y(),
directory_title->get_w() + recent_popup->get_w(),
recent_popup->get_h());
return 0;
}
+static inline int64_t ipow(int m, int n)
+{
+ int64_t v = 1;
+ for( int64_t vv=m; n>0; vv*=vv,n>>=1 ) if( n & 1 ) v *= vv;
+ return v;
+}
+
int BC_FileBox::create_tables()
{
delete_tables();
// {
if(!is_dir)
{
- sprintf(string, "%jd", file_item->size);
+ int64_t size = file_item->size;
+#if 1
+ int len = 1;
+ static const char *suffix[] = { "", "K", "M", "G", "T", "P" };
+ for( int64_t s=size; len<15 && (s/=10)>0; ++len );
+ int drop = len-3;
+ if( drop > 0 ) {
+ size /= ipow(10,drop);
+ int sfx = (len-1)/3;
+ int digits = (sfx+1)*3 - len;
+ int64_t frac = ipow(10,digits);
+ int mantisa = size / frac;
+ int fraction = size - mantisa*frac;
+ if( fraction )
+ sprintf(string, "%d.%0*d%s", mantisa, digits, fraction, suffix[sfx]);
+ else
+ sprintf(string, "%d%s", mantisa, suffix[sfx]);
+ }
+ else
+#endif
+ sprintf(string, "%jd", size);
new_item = new BC_ListBoxItem(string, get_resources()->file_color);
}
else
// Date entry
if(!is_dir || 1)
{
- static const char *month_text[13] = { "Nul",
- "Jan", "Feb", "Mar", "Apr", "May", "Jun",
- "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
- };
- sprintf(string,
- "%s %d, %d",
- month_text[file_item->month],
- file_item->day,
- file_item->year);
+ struct tm mod_time;
+ localtime_r(&file_item->mtime, &mod_time);
+ sprintf(string, "%04d.%02d.%02d %02d:%02d:%02d",
+ mod_time.tm_year+1900, mod_time.tm_mon+1, mod_time.tm_mday,
+ mod_time.tm_hour, mod_time.tm_min, mod_time.tm_sec);
new_item = new BC_ListBoxItem(string, get_resources()->file_color);
}
else
BC_Pixmap* BC_FileBox::get_icon(char *path, int is_dir)
{
- char *suffix = strrchr(path, '.');
+ if( is_dir ) return icons[ICON_FOLDER];
int icon_type = ICON_UNKNOWN;
-
- if(is_dir) return icons[ICON_FOLDER];
-
- if(suffix)
- {
- suffix++;
- if(*suffix != 0)
- {
- for(int i = 0; i < TOTAL_SUFFIXES; i++)
- {
- if(!strcasecmp(suffix, BC_WindowBase::get_resources()->suffix_to_type[i].suffix))
- {
- icon_type = BC_WindowBase::get_resources()->suffix_to_type[i].icon_type;
- break;
- }
- }
- }
+ char *suffix = strrchr(path, '.');
+ if( suffix && *++suffix ) {
+ suffix_to_type_t *stp = &BC_WindowBase::get_resources()->suffix_to_type[0];
+ while( stp->suffix && strcasecmp(stp->suffix, suffix) ) ++stp;
+ if( stp->icon_type ) icon_type = stp->icon_type;
}
return icons[icon_type];
int BC_FileBox::submit_file(const char *path, int use_this)
{
+ char path1[BCTEXTLEN];
+ strcpy(path1, path);
+ char *cp = strchr(path1,'\n');
+ if( cp ) *cp = 0;
+
// Deactivate textbox to hide suggestions
textbox->deactivate();
// If file wanted, take the current directory as the desired file.
// If directory wanted, ignore it.
- if(!path[0] && !want_directory)
+ if(!path1[0] && !want_directory)
{
// save complete path
strcpy(this->current_path, directory);
}
// is a directory, change directories
- if(fs->is_dir(path) && !use_this)
+ if(fs->is_dir(path1) && !use_this)
{
- fs->change_dir(path, 0);
+ fs->change_dir(path1, 0);
refresh(1);
directory_title->update(fs->get_current_dir());
strcpy(this->current_path, fs->get_current_dir());
// Is a file or desired directory. Quit the operation.
{
char path2[BCTEXTLEN];
- strcpy(path2, path);
+ strcpy(path2, path1);
// save directory for defaults
fs->extract_dir(directory, path2);
strcpy(path, directory);
// enfore one trailing slash
char *cp = path;
- while( *cp ) ++cp;
+ while( *cp && *cp != '\n' ) ++cp;
while( cp > path && *(cp-1) == '/' ) --cp;
*cp++ = '/'; *cp = 0;