1 files changed, 162 insertions, 33 deletions

diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index f1d3702160f..2a50b505c57 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -121,7 +121,7 @@ static void clamp_to_filelist(int numfiles, int *first_file, int *last_file)
 	}
 }
 
-static FileSelect file_select(bContext* C, const rcti* rect, short selecting, short toggle_one)
+static FileSelect file_select(bContext* C, const rcti* rect, short selecting, short toggle_one, short fill)
 {
 	ARegion *ar= CTX_wm_region(C);
 	SpaceFile *sfile= CTX_wm_space_file(C);
@@ -141,6 +141,19 @@ static FileSelect file_select(bContext* C, const rcti* rect, short selecting, sh
 	
 	clamp_to_filelist(numfiles, &first_file, &last_file);
 
+	if (fill && (last_file >= 0) && (last_file < numfiles) ) {
+		int f= last_file;
+		while (f >= 0) {
+			struct direntry* file = filelist_file(sfile->files, f);
+			if (file->flags & ACTIVEFILE)
+				break;
+			f--;
+		}
+		if (f >= 0) {
+			first_file = f+1;
+		}
+	}
+
 	/* select all valid files between first and last indicated */
 	if ( (first_file >= 0) && (first_file < numfiles) && (last_file >= 0) && (last_file < numfiles) ) {
 		for (act_file = first_file; act_file <= last_file; act_file++) {
@@ -213,7 +226,7 @@ static int file_border_select_exec(bContext *C, wmOperator *op)
 
 	BLI_isect_rcti(&(ar->v2d.mask), &rect, &rect);
 	
-	if (FILE_SELECT_DIR == file_select(C, &rect, selecting, 0)) {
+	if (FILE_SELECT_DIR == file_select(C, &rect, selecting, 0, 0)) {
 		WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 	} else {
 		WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_PARAMS, NULL);
@@ -245,6 +258,7 @@ static int file_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	short val;
 	rcti rect;
 	int extend = RNA_boolean_get(op->ptr, "extend");
+	int fill = RNA_boolean_get(op->ptr, "fill");
 
 	if(ar->regiontype != RGN_TYPE_WINDOW)
 		return OPERATOR_CANCELLED;
@@ -259,7 +273,7 @@ static int file_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	/* single select, deselect all selected first */
 	if (!extend) file_deselect_all(sfile);
 
-	if (FILE_SELECT_DIR == file_select(C, &rect, 1, extend ))
+	if (FILE_SELECT_DIR == file_select(C, &rect, 1, extend, fill ))
 		WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 	else
 		WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_PARAMS, NULL);
@@ -283,6 +297,7 @@ void FILE_OT_select(wmOperatorType *ot)
 
 	/* rna */
 	RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend selection instead of deselecting everything first.");
+	RNA_def_boolean(ot->srna, "fill", 0, "Fill", "Select everything beginning with the last selection.");
 }
 
 static int file_select_all_exec(bContext *C, wmOperator *op)
@@ -318,7 +333,7 @@ static int file_select_all_exec(bContext *C, wmOperator *op)
 void FILE_OT_select_all_toggle(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Select/Deselect all files";
+	ot->name= "Select/Deselect All Files";
 	ot->description= "Select/deselect all files";
 	ot->idname= "FILE_OT_select_all_toggle";
 	
@@ -376,7 +391,7 @@ static int bookmark_add_exec(bContext *C, wmOperator *op)
 		char name[FILE_MAX];
 	
 		fsmenu_insert_entry(fsmenu, FS_CATEGORY_BOOKMARKS, params->dir, 0, 1);
-		BLI_make_file_string("/", name, BLI_gethome(), ".Bfs");
+		BLI_make_file_string("/", name, BLI_get_folder_create(BLENDER_USER_CONFIG, NULL), BLENDER_BOOKMARK_FILE);
 		fsmenu_write_file(fsmenu, name);
 	}
 
@@ -408,7 +423,7 @@ static int bookmark_delete_exec(bContext *C, wmOperator *op)
 			char name[FILE_MAX];
 			
 			fsmenu_remove_entry(fsmenu, FS_CATEGORY_BOOKMARKS, index);
-			BLI_make_file_string("/", name, BLI_gethome(), ".Bfs");
+			BLI_make_file_string("/", name, BLI_get_folder_create(BLENDER_USER_CONFIG, NULL), BLENDER_BOOKMARK_FILE);
 			fsmenu_write_file(fsmenu, name);
 			ED_area_tag_redraw(sa);
 		}
@@ -530,7 +545,7 @@ void FILE_OT_cancel(struct wmOperatorType *ot)
 int file_exec(bContext *C, wmOperator *exec_op)
 {
 	SpaceFile *sfile= CTX_wm_space_file(C);
-	char name[FILE_MAX];
+	char filepath[FILE_MAX];
 	
 	if(sfile->op) {
 		wmOperator *op= sfile->op;
@@ -552,16 +567,23 @@ int file_exec(bContext *C, wmOperator *exec_op)
 		}
 		
 		sfile->op = NULL;
-		RNA_string_set(op->ptr, "filename", sfile->params->file);
-		BLI_strncpy(name, sfile->params->dir, sizeof(name));
-		RNA_string_set(op->ptr, "directory", name);
-		strcat(name, sfile->params->file); // XXX unsafe
 
-		if(RNA_struct_find_property(op->ptr, "relative_path"))
-			if(RNA_boolean_get(op->ptr, "relative_path"))
-				BLI_path_rel(name, G.sce);
+		BLI_join_dirfile(filepath, sfile->params->dir, sfile->params->file);
+		if(RNA_struct_find_property(op->ptr, "relative_path")) {
+			if(RNA_boolean_get(op->ptr, "relative_path")) {
+				BLI_path_rel(filepath, G.sce);
+			}
+		}
 
-		RNA_string_set(op->ptr, "path", name);
+		if(RNA_struct_find_property(op->ptr, "filename")) {
+			RNA_string_set(op->ptr, "filename", sfile->params->file);
+		}
+		if(RNA_struct_find_property(op->ptr, "directory")) {
+			RNA_string_set(op->ptr, "directory", sfile->params->dir);
+		}
+		if(RNA_struct_find_property(op->ptr, "filepath")) {
+			RNA_string_set(op->ptr, "filepath", filepath);
+		}
 		
 		/* some ops have multiple files to select */
 		{
@@ -597,8 +619,8 @@ int file_exec(bContext *C, wmOperator *exec_op)
 		folderlist_free(sfile->folders_next);
 
 		fsmenu_insert_entry(fsmenu_get(), FS_CATEGORY_RECENT, sfile->params->dir,0, 1);
-		BLI_make_file_string(G.sce, name, BLI_gethome(), ".Bfs");
-		fsmenu_write_file(fsmenu_get(), name);
+		BLI_make_file_string(G.sce, filepath, BLI_get_folder_create(BLENDER_USER_CONFIG, NULL), BLENDER_BOOKMARK_FILE);
+		fsmenu_write_file(fsmenu_get(), filepath);
 		WM_event_fileselect_event(C, op, EVT_FILESELECT_EXEC);
 
 		ED_fileselect_clear(C, sfile);
@@ -657,7 +679,9 @@ void FILE_OT_parent(struct wmOperatorType *ot)
 
 int file_refresh_exec(bContext *C, wmOperator *unused)
 {
-	file_change_dir(C, 1);
+	SpaceFile *sfile= CTX_wm_space_file(C);
+
+	ED_fileselect_clear(C, sfile);
 
 	WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 
@@ -728,6 +752,116 @@ int file_next_exec(bContext *C, wmOperator *unused)
 	return OPERATOR_FINISHED;
 }
 
+
+/* only meant for timer usage */
+static int file_smoothscroll_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	ScrArea *sa = CTX_wm_area(C);
+	SpaceFile *sfile= CTX_wm_space_file(C);
+	ARegion *ar, *oldar= CTX_wm_region(C);
+	int numfiles, offset;
+	int edit_idx = 0;
+	int numfiles_layout;
+	int i;
+
+	/* escape if not our timer */
+	if(sfile->smoothscroll_timer==NULL || sfile->smoothscroll_timer!=event->customdata)
+		return OPERATOR_PASS_THROUGH;
+	
+	numfiles = filelist_numfiles(sfile->files);
+
+	/* check if we are editing a name */
+	for (i=0; i < numfiles; ++i)
+	{
+		struct direntry *file = filelist_file(sfile->files, i);	
+		if (file->flags & EDITING) {
+			edit_idx=i;
+			break;
+		}
+	}
+
+	/* if we are not editing, we are done */
+	if (0==edit_idx) {
+		WM_event_remove_timer(CTX_wm_manager(C), CTX_wm_window(C), sfile->smoothscroll_timer);
+		sfile->smoothscroll_timer=NULL;
+		return OPERATOR_PASS_THROUGH;
+	}
+
+	/* we need the correct area for scrolling */
+	ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW);
+	if (!ar || ar->regiontype != RGN_TYPE_WINDOW) {
+		WM_event_remove_timer(CTX_wm_manager(C), CTX_wm_window(C), sfile->smoothscroll_timer);
+		sfile->smoothscroll_timer=NULL;
+		return OPERATOR_PASS_THROUGH;
+	}
+
+	offset = ED_fileselect_layout_offset(sfile->layout, 0, ar->v2d.cur.xmin, -ar->v2d.cur.ymax);
+	if (offset<0) offset=0;
+
+	/* scroll offset is the first file in the row/column we are editing in */
+	if (sfile->scroll_offset == 0) {
+		if (sfile->layout->flag & FILE_LAYOUT_HOR) {
+			sfile->scroll_offset = (edit_idx/sfile->layout->rows)*sfile->layout->rows;
+			if (sfile->scroll_offset <= offset) sfile->scroll_offset -= sfile->layout->rows;
+		} else {
+			sfile->scroll_offset = (edit_idx/sfile->layout->columns)*sfile->layout->columns;
+			if (sfile->scroll_offset <= offset) sfile->scroll_offset -= sfile->layout->columns;
+		}
+	}
+	
+	numfiles_layout = ED_fileselect_layout_numfiles(sfile->layout, ar);
+	
+	/* check if we have reached our final scroll position */
+	if ( (sfile->scroll_offset >= offset) && (sfile->scroll_offset < offset + numfiles_layout) ) {
+		WM_event_remove_timer(CTX_wm_manager(C), CTX_wm_window(C), sfile->smoothscroll_timer);
+		sfile->smoothscroll_timer=NULL;
+		return OPERATOR_FINISHED;
+	}
+
+	/* temporarily set context to the main window region, 
+	 * so the scroll operators work */
+	CTX_wm_region_set(C, ar);
+	
+	/* scroll one step in the desired direction */
+	if (sfile->scroll_offset < offset) {
+		if (sfile->layout->flag & FILE_LAYOUT_HOR) {
+			WM_operator_name_call(C, "VIEW2D_OT_scroll_left", 0, NULL);
+		} else {
+			WM_operator_name_call(C, "VIEW2D_OT_scroll_up", 0, NULL);
+		}
+		
+	} else {
+		if (sfile->layout->flag & FILE_LAYOUT_HOR) {
+			WM_operator_name_call(C, "VIEW2D_OT_scroll_right", 0, NULL);
+		} else {
+			WM_operator_name_call(C, "VIEW2D_OT_scroll_down", 0, NULL);
+		}
+	}
+	
+	ED_region_tag_redraw(CTX_wm_region(C));
+	
+	/* and restore context */
+	CTX_wm_region_set(C, oldar);
+	
+	return OPERATOR_FINISHED;
+}
+
+
+void FILE_OT_smoothscroll(wmOperatorType *ot)
+{
+	
+	/* identifiers */
+	ot->name= "Smooth Scroll";
+	ot->idname= "FILE_OT_smoothscroll";
+	ot->description="Smooth scroll to make editable file visible.";
+	
+	/* api callbacks */
+	ot->invoke= file_smoothscroll_invoke;
+	
+	ot->poll= ED_operator_file_active;
+}
+
+
 /* create a new, non-existing folder name, returns 1 if successful, 0 if name couldn't be created.
    The actual name is returned in 'name', 'folder' contains the complete path, including the new folder name.
 */
@@ -777,6 +911,12 @@ int file_directory_new_exec(bContext *C, wmOperator *op)
 
 	/* now remember file to jump into editing */
 	BLI_strncpy(sfile->params->renamefile, name, FILE_MAXFILE);
+
+	/* set timer to smoothly view newly generated file */
+	sfile->smoothscroll_timer = WM_event_add_timer(CTX_wm_manager(C), CTX_wm_window(C), TIMER1, 1.0/1000.0);	/* max 30 frs/sec */
+	sfile->scroll_offset=0;
+
+	/* reload dir to make sure we're seeing what's in the directory */
 	ED_fileselect_clear(C, sfile);
 	WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
 
@@ -799,26 +939,15 @@ void FILE_OT_directory_new(struct wmOperatorType *ot)
 
 int file_directory_exec(bContext *C, wmOperator *unused)
 {
-	char tmpstr[FILE_MAX];
-
 	SpaceFile *sfile= CTX_wm_space_file(C);
 	
 	if(sfile->params) {
 		if ( sfile->params->dir[0] == '~' ) {
-			if (sfile->params->dir[1] == '\0') {
-				BLI_strncpy(sfile->params->dir, BLI_gethome(), sizeof(sfile->params->dir) );
-			} else {
-				/* replace ~ with home */
-				char homestr[FILE_MAX];
-				char *d = &sfile->params->dir[1];
-
-				while ( (*d == '\\') || (*d == '/') )
-					d++;
-				BLI_strncpy(homestr,  BLI_gethome(), FILE_MAX);
-				BLI_join_dirfile(tmpstr, homestr, d);
-				BLI_strncpy(sfile->params->dir, tmpstr, sizeof(sfile->params->dir));
-			}
+			char tmpstr[sizeof(sfile->params->dir)-1];
+			strncpy(tmpstr, sfile->params->dir+1, sizeof(tmpstr));
+			BLI_join_dirfile(sfile->params->dir, BLI_getDefaultDocumentFolder(), tmpstr);
 		}
+
 #ifdef WIN32
 		if (sfile->params->dir[0] == '\0')
 			get_default_root(sfile->params->dir);