Undo revision 23130 which was a merge with 2.5, a messy one because I did something...
[blender.git] / source / blender / editors / space_file / file_ops.c
index 3b5843f..9c73956 100644 (file)
 #include "ED_screen.h"
 #include "ED_fileselect.h"
 
-#include "WM_api.h"
-#include "WM_types.h"
+#include "MEM_guardedalloc.h"
 
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "UI_interface.h"
 #include "UI_view2d.h"
 
+#include "WM_api.h"
+#include "WM_types.h"
+
 #include "file_intern.h"
 #include "filelist.h"
 #include "fsmenu.h"
 #define ACTIVATE                       1
 #define INACTIVATE                     2
 
+/* ---------- FILE SELECTION ------------ */
 
-static void set_active_file_thumbs(SpaceFile *sfile, FileSelectParams* params, struct ARegion* ar, short mval[])
+static int find_file_mouse(SpaceFile *sfile, struct ARegion* ar, short x, short y, short clamp)
 {
-       float x,y;
+       float fx,fy;
        int active_file = -1;
-       struct direntry* file;
-       int offsetx, offsety;
-       int numfiles = filelist_numfiles(params->files);
-       int columns;
-
+       int numfiles = filelist_numfiles(sfile->files);
        View2D* v2d = &ar->v2d;
-       UI_view2d_region_to_view(v2d, mval[0], mval[1], &x, &y);
-       
-       offsetx = (x - (v2d->cur.xmin+sfile->tile_border_x))/(sfile->tile_w + sfile->tile_border_x);
-       offsety = (-y+sfile->tile_border_y)/(sfile->tile_h + sfile->tile_border_y);
-       columns = (v2d->cur.xmax - v2d->cur.xmin) / (sfile->tile_w+ sfile->tile_border_x);
-       active_file = offsetx + columns*offsety;
-
-       if (active_file >= 0 && active_file < numfiles )
-       {
-               params->active_file = active_file;
-               if (params->selstate & ACTIVATE) {
-                       file = filelist_file(params->files, params->active_file);
-                       file->flags |= ACTIVE;
-               }                       
+
+       UI_view2d_region_to_view(v2d, x, y, &fx, &fy);
+
+       active_file = ED_fileselect_layout_offset(sfile->layout, v2d->tot.xmin + fx, v2d->tot.ymax - fy);
+
+       if(active_file < 0) {
+               if(clamp)       active_file=  0;
+               else            active_file= -1;
+       }
+       else if(active_file >= numfiles) {
+               if(clamp)       active_file=  numfiles-1;
+               else            active_file= -1;
        }
+       
+       return active_file;
 }
 
 
-static void set_active_file(SpaceFile *sfile, FileSelectParams* params, struct ARegion* ar, short mval[])
+static void file_deselect_all(SpaceFile* sfile)
 {
-       int offsetx, offsety;
-       float x,y;
-       int active_file = -1;
-       int numfiles = filelist_numfiles(params->files);
-       int rows;
-       struct direntry* file;
+       int numfiles = filelist_numfiles(sfile->files);
+       int i;
 
-       View2D* v2d = &ar->v2d;
-       UI_view2d_region_to_view(v2d, mval[0], mval[1], &x, &y);
-       
-       offsetx = (x-sfile->tile_border_x)/(sfile->tile_w + sfile->tile_border_x);
-       offsety = (v2d->cur.ymax-y-sfile->tile_border_y)/(sfile->tile_h + sfile->tile_border_y);
-       rows = (v2d->cur.ymax - v2d->cur.ymin - 2*sfile->tile_border_y) / (sfile->tile_h+sfile->tile_border_y);
-       active_file = rows*offsetx + offsety;
-       if ( (active_file >= 0) && (active_file < numfiles) )
-       {
-               params->active_file = active_file;
-               if (params->selstate & ACTIVATE) {
-                       file = filelist_file(params->files, params->active_file);
-                       file->flags |= ACTIVE;
-               }                       
-       } 
-}
-
-
-static void set_active_bookmark(SpaceFile *sfile, FileSelectParams* params, struct ARegion* ar, short y)
-{
-       int nentries = fsmenu_get_nentries();
-       short posy = ar->v2d.mask.ymax - TILE_BORDER_Y - y;
-       params->active_bookmark = ((float)posy / (U.fontsize*3.0f/2.0f));
-       if (params->active_bookmark < 0 || params->active_bookmark > nentries) {
-               params->active_bookmark = -1;
+       for ( i=0; i < numfiles; ++i) {
+               struct direntry* file = filelist_file(sfile->files, i);
+               if (file && (file->flags & ACTIVE)) {
+                       file->flags &= ~ACTIVE;
+               }
        }
 }
 
-static void mouse_select(SpaceFile* sfile, FileSelectParams* params, ARegion* ar, short *mval)
+typedef enum FileSelect { FILE_SELECT_DIR = 1, 
+  FILE_SELECT_FILE = 2 } FileSelect;
+
+
+static FileSelect file_select(SpaceFile* sfile, ARegion* ar, const rcti* rect, short val)
 {
-       int numfiles = filelist_numfiles(params->files);
-       if(mval[0]>ar->v2d.mask.xmin && mval[0]<ar->v2d.mask.xmax
-               && mval[1]>ar->v2d.mask.ymin && mval[1]<ar->v2d.mask.ymax) {
-                       params->selstate = NOTACTIVE;
-                       if (params->display) {
-                               set_active_file_thumbs(sfile, params, ar, mval);
+       int first_file = -1;
+       int last_file = -1;
+       int act_file;
+       short selecting = (val == LEFTMOUSE);
+       FileSelect retval = FILE_SELECT_FILE;
+
+       FileSelectParams *params = ED_fileselect_get_params(sfile);
+       // FileLayout *layout = ED_fileselect_get_layout(sfile, ar);
+
+       int numfiles = filelist_numfiles(sfile->files);
+
+       params->selstate = NOTACTIVE;
+       first_file = find_file_mouse(sfile, ar, rect->xmin, rect->ymax, 1);
+       last_file = find_file_mouse(sfile, ar, rect->xmax, rect->ymin, 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++) {
+                       struct direntry* file = filelist_file(sfile->files, act_file);
+                       if (selecting) 
+                               file->flags |= ACTIVE;
+                       else
+                               file->flags &= ~ACTIVE;
+               }
+       }
+
+       /* make the last file active */
+       if (selecting && (last_file >= 0 && last_file < numfiles)) {
+               struct direntry* file = filelist_file(sfile->files, last_file);
+               params->active_file = last_file;
+
+               if(file && S_ISDIR(file->type)) {
+                       /* the path is too long and we are not going up! */
+                       if (strcmp(file->relname, "..") && strlen(params->dir) + strlen(file->relname) >= FILE_MAX ) 
+                       {
+                               // XXX error("Path too long, cannot enter this directory");
                        } else {
-                               set_active_file(sfile, params, ar, mval);
+                               if (strcmp(file->relname, "..")==0) {    
+                                       /* avoids /../../ */     
+                                       BLI_parent_dir(params->dir);     
+                               } else {
+                                       BLI_cleanup_dir(G.sce, params->dir);
+                                       strcat(params->dir, file->relname);
+                                       BLI_add_slash(params->dir);
+                               }
+
+                               file_change_dir(sfile);
+                               retval = FILE_SELECT_DIR;
                        }
-                       if (params->active_file >= 0 && params->active_file < numfiles) {
-                               struct direntry* file = filelist_file(params->files, params->active_file);
-                               
-                               if(file && S_ISDIR(file->type)) {
-                                       /* the path is too long and we are not going up! */
-                                       if (strcmp(file->relname, ".") &&
-                                               strcmp(file->relname, "..") &&
-                                               strlen(params->dir) + strlen(file->relname) >= FILE_MAX ) 
-                                       {
-                                               // XXX error("Path too long, cannot enter this directory");
-                                       } else {
-                                               if (strcmp(file->relname, "..")==0) {
-                                                       /* avoids /../../ */
-                                                       BLI_parent_dir(params->dir);
-                                               } else {
-                                                       strcat(params->dir, file->relname);
-                                                       strcat(params->dir,"/");
-                                                       params->file[0] = '\0';
-                                                       BLI_cleanup_dir(G.sce, params->dir);
+               }
+               else if (file)
+               {
+                       if (file->relname) {
+                               BLI_strncpy(params->file, file->relname, FILE_MAXFILE);
+                       }
+                       
+               }       
+       }
+       return retval;
+}
+
+
+
+static int file_border_select_exec(bContext *C, wmOperator *op)
+{
+       ARegion *ar= CTX_wm_region(C);
+       SpaceFile *sfile= CTX_wm_space_file(C);
+       short val;
+       rcti rect;
+
+       val= RNA_int_get(op->ptr, "event_type");
+       rect.xmin= RNA_int_get(op->ptr, "xmin");
+       rect.ymin= RNA_int_get(op->ptr, "ymin");
+       rect.xmax= RNA_int_get(op->ptr, "xmax");
+       rect.ymax= RNA_int_get(op->ptr, "ymax");
+
+       BLI_isect_rcti(&(ar->v2d.mask), &rect, &rect);
+       
+       if (FILE_SELECT_DIR == file_select(sfile, ar, &rect, val )) {
+               WM_event_add_notifier(C, NC_FILE|ND_FILELIST, NULL);
+       } else {
+               WM_event_add_notifier(C, NC_FILE|ND_PARAMS, NULL);
+       }
+       return OPERATOR_FINISHED;
+}
+
+void FILE_OT_select_border(wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Activate/Select File";
+       ot->idname= "FILE_OT_select_border";
+       
+       /* api callbacks */
+       ot->invoke= WM_border_select_invoke;
+       ot->exec= file_border_select_exec;
+       ot->modal= WM_border_select_modal;
+
+       /* rna */
+       RNA_def_int(ot->srna, "event_type", 0, INT_MIN, INT_MAX, "Event Type", "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, "X Max", "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, "Y Min", "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, "Y Max", "", INT_MIN, INT_MAX);
+
+       ot->poll= ED_operator_file_active;
+}
+
+static int file_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+       ARegion *ar= CTX_wm_region(C);
+       SpaceFile *sfile= CTX_wm_space_file(C);
+       short val;
+       rcti rect;
+
+       if(ar->regiontype != RGN_TYPE_WINDOW)
+               return OPERATOR_CANCELLED;
+
+       rect.xmin = rect.xmax = event->x - ar->winrct.xmin;
+       rect.ymin = rect.ymax = event->y - ar->winrct.ymin;
+       val = event->val;
+
+       if(!BLI_in_rcti(&ar->v2d.mask, rect.xmin, rect.ymin))
+               return OPERATOR_CANCELLED;
+
+       /* single select, deselect all selected first */
+       file_deselect_all(sfile);
+
+       if (FILE_SELECT_DIR == file_select(sfile, ar, &rect, val ))
+               WM_event_add_notifier(C, NC_FILE|ND_FILELIST, NULL);
+       else
+               WM_event_add_notifier(C, NC_FILE|ND_PARAMS, NULL);
+
+       WM_event_add_mousemove(C); /* for directory changes */
+       WM_event_add_notifier(C, NC_FILE|ND_PARAMS, NULL);
+
+       return OPERATOR_FINISHED;
+}
+
+void FILE_OT_select(wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Activate/Select File";
+       ot->idname= "FILE_OT_select";
+       
+       /* api callbacks */
+       ot->invoke= file_select_invoke;
+
+       /* rna */
+
+       ot->poll= ED_operator_file_active;
+}
+
+static int file_select_all_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+       ScrArea *sa= CTX_wm_area(C);
+       SpaceFile *sfile= CTX_wm_space_file(C);
+       int numfiles = filelist_numfiles(sfile->files);
+       int i;
+       int select = 1;
+
+       /* if any file is selected, deselect all first */
+       for ( i=0; i < numfiles; ++i) {
+               struct direntry* file = filelist_file(sfile->files, i);
+               if (file && (file->flags & ACTIVE)) {
+                       file->flags &= ~ACTIVE;
+                       select = 0;
+                       ED_area_tag_redraw(sa);
+               }
+       }
+       /* select all only if previously no file was selected */
+       if (select) {
+               for ( i=0; i < numfiles; ++i) {
+                       struct direntry* file = filelist_file(sfile->files, i);
+                       if(file && !S_ISDIR(file->type)) {
+                               file->flags |= ACTIVE;
+                               ED_area_tag_redraw(sa);
+                       }
+               }
+       }
+       return OPERATOR_FINISHED;
+}
+
+void FILE_OT_select_all_toggle(wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Select/Deselect all files";
+       ot->idname= "FILE_OT_select_all_toggle";
+       
+       /* api callbacks */
+       ot->invoke= file_select_all_invoke;
+
+       /* rna */
+
+       ot->poll= ED_operator_file_active;
+}
+
+/* ---------- BOOKMARKS ----------- */
+
+static int bookmark_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+       SpaceFile *sfile= CTX_wm_space_file(C);
+
+       if(RNA_struct_find_property(op->ptr, "dir")) {
+               char entry[256];
+               FileSelectParams* params = sfile->params;
+
+               RNA_string_get(op->ptr, "dir", entry);
+               BLI_strncpy(params->dir, entry, sizeof(params->dir));
+               BLI_cleanup_dir(G.sce, params->dir);
+               file_change_dir(sfile);                         
+
+               WM_event_add_notifier(C, NC_FILE|ND_FILELIST, NULL);
+       }
+       
+       return OPERATOR_FINISHED;
+}
+
+void FILE_OT_select_bookmark(wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Select Directory";
+       ot->idname= "FILE_OT_select_bookmark";
+       
+       /* api callbacks */
+       ot->invoke= bookmark_select_invoke;
+       ot->poll= ED_operator_file_active;
+
+       RNA_def_string(ot->srna, "dir", "", 256, "Dir", "");
+}
+
+static int bookmark_add_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+       ScrArea *sa= CTX_wm_area(C);
+       SpaceFile *sfile= CTX_wm_space_file(C);
+       struct FSMenu* fsmenu = fsmenu_get();
+       struct FileSelectParams* params= ED_fileselect_get_params(sfile);
+
+       if (params->dir[0] != '\0') {
+               char name[FILE_MAX];
+       
+               fsmenu_insert_entry(fsmenu, FS_CATEGORY_BOOKMARKS, params->dir, 0, 1);
+               BLI_make_file_string("/", name, BLI_gethome(), ".Bfs");
+               fsmenu_write_file(fsmenu, name);
+       }
+
+       ED_area_tag_redraw(sa);
+       return OPERATOR_FINISHED;
+}
+
+void FILE_OT_add_bookmark(wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Add Bookmark";
+       ot->idname= "FILE_OT_add_bookmark";
+       
+       /* api callbacks */
+       ot->invoke= bookmark_add_invoke;
+       ot->poll= ED_operator_file_active;
+}
+
+static int bookmark_delete_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+       ScrArea *sa= CTX_wm_area(C);
+       struct FSMenu* fsmenu = fsmenu_get();
+       int nentries = fsmenu_get_nentries(fsmenu, FS_CATEGORY_BOOKMARKS);
+       
+       if(RNA_struct_find_property(op->ptr, "index")) {
+               int index = RNA_int_get(op->ptr, "index");
+               if ( (index >-1) && (index < nentries)) {
+                       char name[FILE_MAX];
+                       
+                       fsmenu_remove_entry(fsmenu, FS_CATEGORY_BOOKMARKS, index);
+                       BLI_make_file_string("/", name, BLI_gethome(), ".Bfs");
+                       fsmenu_write_file(fsmenu, name);
+                       ED_area_tag_redraw(sa);
+               }
+       }
+
+       return OPERATOR_FINISHED;
+}
+
+void FILE_OT_delete_bookmark(wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Delete Bookmark";
+       ot->idname= "FILE_OT_delete_bookmark";
+       
+       /* api callbacks */
+       ot->invoke= bookmark_delete_invoke;
+       ot->poll= ED_operator_file_active;
+
+       RNA_def_int(ot->srna, "index", -1, -1, 20000, "Index", "", -1, 20000);
+}
+
+
+static int loadimages_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+       ScrArea *sa= CTX_wm_area(C);
+       SpaceFile *sfile= CTX_wm_space_file(C);
+       if (sfile->files) {
+               filelist_loadimage_timer(sfile->files);
+               if (filelist_changed(sfile->files)) {
+                       ED_area_tag_redraw(sa);
+               }
+       }
+
+       return OPERATOR_FINISHED;
+}
+
+void FILE_OT_loadimages(wmOperatorType *ot)
+{
+       
+       /* identifiers */
+       ot->name= "Load Images";
+       ot->idname= "FILE_OT_loadimages";
+       
+       /* api callbacks */
+       ot->invoke= loadimages_invoke;
+       
+       ot->poll= ED_operator_file_active;
+}
+
+int file_hilight_set(SpaceFile *sfile, ARegion *ar, int mx, int my)
+{
+       FileSelectParams* params;
+       int numfiles, actfile, origfile;
+       
+       if(sfile==NULL || sfile->files==NULL) return 0;
+
+       numfiles = filelist_numfiles(sfile->files);
+       params = ED_fileselect_get_params(sfile);
+
+       origfile= params->active_file;
+
+       mx -= ar->winrct.xmin;
+       my -= ar->winrct.ymin;
+
+       if(BLI_in_rcti(&ar->v2d.mask, mx, my)) {
+               actfile = find_file_mouse(sfile, ar, mx , my, 0);
+
+               if((actfile >= 0) && (actfile < numfiles))
+                       params->active_file=actfile;
+               else
+                       params->active_file= -1;
+       }
+       else
+               params->active_file= -1;
+
+       return (params->active_file != origfile);
+}
+
+static int file_highlight_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+       ARegion *ar= CTX_wm_region(C);
+       SpaceFile *sfile= CTX_wm_space_file(C);
+
+       if(!file_hilight_set(sfile, ar, event->x, event->y))
+               return OPERATOR_CANCELLED;
+
+       ED_area_tag_redraw(CTX_wm_area(C));
+       
+       return OPERATOR_FINISHED;
+}
+
+void FILE_OT_highlight(struct wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Highlight File";
+       ot->idname= "FILE_OT_highlight";
+       
+       /* api callbacks */
+       ot->invoke= file_highlight_invoke;
+       ot->poll= ED_operator_file_active;
+}
+
+int file_cancel_exec(bContext *C, wmOperator *unused)
+{
+       SpaceFile *sfile= CTX_wm_space_file(C);
+
+       folderlist_free(sfile->folders_prev);
+       folderlist_free(sfile->folders_next);
+
+       WM_event_fileselect_event(C, sfile->op, EVT_FILESELECT_CANCEL);
+       sfile->op = NULL;
+       
+       return OPERATOR_FINISHED;
+}
+
+void FILE_OT_cancel(struct wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Cancel File Load";
+       ot->idname= "FILE_OT_cancel";
+       
+       /* api callbacks */
+       ot->exec= file_cancel_exec;
+       ot->poll= ED_operator_file_active;
+}
+
+/* sends events now, so things get handled on windowqueue level */
+int file_exec(bContext *C, wmOperator *unused)
+{
+       SpaceFile *sfile= CTX_wm_space_file(C);
+       char name[FILE_MAX];
+       
+       if(sfile->op) {
+               wmOperator *op= sfile->op;
+               
+               sfile->op = NULL;
+               BLI_strncpy(name, sfile->params->dir, sizeof(name));
+               strcat(name, sfile->params->file);
+               RNA_string_set(op->ptr, "filename", name);
+               
+               /* some ops have multiple files to select */
+               {
+                       PointerRNA itemptr;
+                       int i, numfiles = filelist_numfiles(sfile->files);
+                       struct direntry *file;
+                       if(RNA_struct_find_property(op->ptr, "files")) {
+                               for (i=0; i<numfiles; i++) {
+                                       file = filelist_file(sfile->files, i);
+                                       if(file->flags & ACTIVE) {
+                                               if ((file->type & S_IFDIR)==0) {
+                                                       RNA_collection_add(op->ptr, "files", &itemptr);
+                                                       RNA_string_set(&itemptr, "name", file->relname);
                                                }
-                                               filelist_setdir(params->files, params->dir);
-                                               filelist_free(params->files);
-                                               params->active_file = -1;
                                        }
                                }
-                               else if (file)
-                               {
-                                       if (file->relname) {
-                                               BLI_strncpy(params->file, file->relname, FILE_MAXFILE);
-                                               /* XXX
-                                               if(event==MIDDLEMOUSE && filelist_gettype(sfile->files)) 
-                                                       imasel_execute(sfile);
-                                               */
+                       }
+                       
+                       if(RNA_struct_find_property(op->ptr, "dirs")) {
+                               for (i=0; i<numfiles; i++) {
+                                       file = filelist_file(sfile->files, i);
+                                       if(file->flags & ACTIVE) {
+                                               if ((file->type & S_IFDIR)) {
+                                                       RNA_collection_add(op->ptr, "dirs", &itemptr);
+                                                       RNA_string_set(&itemptr, "name", file->relname);
+                                               }
                                        }
-                                       
-                               }       
-                               /* XXX
-                               if(BIF_filelist_gettype(sfile->files)==FILE_MAIN) {
-                                       active_imasel_object(sfile);
                                }
-                               */
                        }
                }
+               
+               folderlist_free(sfile->folders_prev);
+               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);
+               WM_event_fileselect_event(C, op, EVT_FILESELECT_EXEC);
+       }
+                               
+       return OPERATOR_FINISHED;
+}
+
+void FILE_OT_exec(struct wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Execute File Window";
+       ot->idname= "FILE_OT_exec";
+       
+       /* api callbacks */
+       ot->exec= file_exec;
+       ot->poll= ED_operator_file_active; /* <- important, handler is on window level */
 }
 
-static void mouse_select_bookmark(SpaceFile* sfile, ARegion* ar, short *mval)
-{
-       if(mval[0]>ar->v2d.mask.xmin && mval[0]<ar->v2d.mask.xmax
-       && mval[1]>ar->v2d.mask.ymin && mval[1]<ar->v2d.mask.ymax) {
-               char *selected;
-               set_active_bookmark(sfile, sfile->params, ar, mval[1]);
-               selected= fsmenu_get_entry(sfile->params->active_bookmark);                     
-               /* which string */
-               if (selected) {
-                       FileSelectParams* params = sfile->params;
-                       BLI_strncpy(params->dir, selected, sizeof(params->dir));
-                       BLI_cleanup_dir(G.sce, params->dir);
-                       filelist_free(params->files);   
-                       filelist_setdir(params->files, params->dir);
-                       params->file[0] = '\0';                 
-                       params->active_file = -1;
+
+int file_parent_exec(bContext *C, wmOperator *unused)
+{
+       SpaceFile *sfile= CTX_wm_space_file(C);
+       
+       if(sfile->params) {
+               if (BLI_has_parent(sfile->params->dir)) {
+                       BLI_parent_dir(sfile->params->dir);
+                       BLI_cleanup_dir(G.sce, sfile->params->dir);
+                       file_change_dir(sfile);
+                       WM_event_add_notifier(C, NC_FILE|ND_FILELIST, NULL);
                }
+       }               
+       
+       return OPERATOR_FINISHED;
+
+}
+
+
+void FILE_OT_parent(struct wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Parent File";
+       ot->idname= "FILE_OT_parent";
+       
+       /* api callbacks */
+       ot->exec= file_parent_exec;
+       ot->poll= ED_operator_file_active; /* <- important, handler is on window level */
+}
+
+
+int file_refresh_exec(bContext *C, wmOperator *unused)
+{
+       SpaceFile *sfile= CTX_wm_space_file(C);
+       
+       file_change_dir(sfile);
+
+       WM_event_add_notifier(C, NC_FILE|ND_FILELIST, NULL);
+
+       return OPERATOR_FINISHED;
+
+}
+
+void FILE_OT_previous(struct wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Previous Folder";
+       ot->idname= "FILE_OT_previous";
+       
+       /* api callbacks */
+       ot->exec= file_previous_exec;
+       ot->poll= ED_operator_file_active; /* <- important, handler is on window level */
+}
+
+int file_previous_exec(bContext *C, wmOperator *unused)
+{
+       SpaceFile *sfile= CTX_wm_space_file(C);
+
+       if(sfile->params) {
+               if (!sfile->folders_next)
+                       sfile->folders_next = folderlist_new();
+
+               folderlist_pushdir(sfile->folders_next, sfile->params->dir);
+               folderlist_popdir(sfile->folders_prev, sfile->params->dir);
+               folderlist_pushdir(sfile->folders_next, sfile->params->dir);
+
+               file_change_dir(sfile);
        }
+       WM_event_add_notifier(C, NC_FILE|ND_FILELIST, NULL);
+
+       return OPERATOR_FINISHED;
 }
 
-static int file_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
+void FILE_OT_next(struct wmOperatorType *ot)
 {
-       ARegion *ar= CTX_wm_region(C);
-       SpaceFile *sfile= (SpaceFile*)CTX_wm_space_data(C);
-       short mval[2];
+       /* identifiers */
+       ot->name= "Next Folder";
+       ot->idname= "FILE_OT_next";
        
-       /* note; otherwise opengl select won't work. do this for every glSelectBuffer() */
-       wmSubWindowSet(CTX_wm_window(C), ar->swinid);
+       /* api callbacks */
+       ot->exec= file_next_exec;
+       ot->poll= ED_operator_file_active; /* <- important, handler is on window level */
+}
+
+int file_next_exec(bContext *C, wmOperator *unused)
+{
+       SpaceFile *sfile= CTX_wm_space_file(C);
+               if(sfile->params) {
+                       if (!sfile->folders_next)
+                       sfile->folders_next = folderlist_new();
+
+               folderlist_pushdir(sfile->folders_prev, sfile->params->dir);
+               folderlist_popdir(sfile->folders_next, sfile->params->dir);
+
+               // update folder_prev so we can check for it in folderlist_clear_next()
+               folderlist_pushdir(sfile->folders_prev, sfile->params->dir);
+
+               file_change_dir(sfile);
+       }               
+       WM_event_add_notifier(C, NC_FILE|ND_FILELIST, NULL);
+
+       return OPERATOR_FINISHED;
+}
+
+int file_directory_new_exec(bContext *C, wmOperator *unused)
+{
+       char tmpstr[FILE_MAX];
+       char tmpdir[FILE_MAXFILE];
+       int i = 1;
+
+       SpaceFile *sfile= CTX_wm_space_file(C);
        
-       mval[0]= event->x - ar->winrct.xmin;
-       mval[1]= event->y - ar->winrct.ymin;
-       mouse_select(sfile, sfile->params, ar, mval);
-       WM_event_add_notifier(C, NC_WINDOW, NULL);
+       if(sfile->params) {
+                
+               BLI_strncpy(tmpstr, sfile->params->dir, FILE_MAX);
+               BLI_join_dirfile(tmpstr, tmpstr, "New Folder");
+               while (BLI_exists(tmpstr)) {
+                       BLI_snprintf(tmpdir, FILE_MAXFILE, "New Folder(%d)", i++);
+                       BLI_strncpy(tmpstr, sfile->params->dir, FILE_MAX);
+                       BLI_join_dirfile(tmpstr, tmpstr, tmpdir);
+               }
+               BLI_recurdir_fileops(tmpstr);
+               if (!BLI_exists(tmpstr)) {
+                       filelist_free(sfile->files);
+                       filelist_parent(sfile->files);
+                       BLI_strncpy(sfile->params->dir, filelist_dir(sfile->files), FILE_MAX);
+               } 
+       }               
+       WM_event_add_notifier(C, NC_FILE|ND_FILELIST, NULL);
+
        return OPERATOR_FINISHED;
 }
 
 
-void ED_FILE_OT_select(wmOperatorType *ot)
+void FILE_OT_directory_new(struct wmOperatorType *ot)
 {
        /* identifiers */
-       ot->name= "Activate/Select File";
-       ot->idname= "ED_FILE_OT_select";
+       ot->name= "Create New Directory";
+       ot->idname= "FILE_OT_directory_new";
+       ot->description= "Create a new directory";
        
        /* api callbacks */
-       ot->invoke= file_select_invoke;
-       ot->poll= ED_operator_file_active;
+       ot->invoke= WM_operator_confirm;
+       ot->exec= file_directory_new_exec;
+       ot->poll= ED_operator_file_active; /* <- important, handler is on window level */
 }
 
+int file_directory_exec(bContext *C, wmOperator *unused)
+{
+       char tmpstr[FILE_MAX];
+
+       SpaceFile *sfile= CTX_wm_space_file(C);
+       
+       if(sfile->params) {
 
-static int bookmark_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
+               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));
+                       }
+               }
+#ifdef WIN32
+               if (sfile->params->dir[0] == '\0')
+                       get_default_root(sfile->params->dir);
+#endif
+               BLI_cleanup_dir(G.sce, sfile->params->dir);
+               BLI_add_slash(sfile->params->dir);
+               file_change_dir(sfile);
+               WM_event_add_notifier(C, NC_FILE|ND_FILELIST, NULL);
+       }               
+       
+
+       return OPERATOR_FINISHED;
+}
+
+int file_filename_exec(bContext *C, wmOperator *unused)
+{
+       SpaceFile *sfile= CTX_wm_space_file(C);
+       
+       if(sfile->params) {
+               if (file_select_match(sfile, sfile->params->file))
+               {
+                       sfile->params->file[0] = '\0';
+                       WM_event_add_notifier(C, NC_FILE|ND_PARAMS, NULL);
+               }
+       }               
+
+       return OPERATOR_FINISHED;
+}
+
+
+void FILE_OT_refresh(struct wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Refresh Filelist";
+       ot->idname= "FILE_OT_refresh";
+       
+       /* api callbacks */
+       ot->exec= file_refresh_exec;
+       ot->poll= ED_operator_file_active; /* <- important, handler is on window level */
+}
+
+int file_hidedot_exec(bContext *C, wmOperator *unused)
+{
+       SpaceFile *sfile= CTX_wm_space_file(C);
+       
+       if(sfile->params) {
+               sfile->params->flag ^= FILE_HIDE_DOT;
+               filelist_free(sfile->files);
+               sfile->params->active_file = -1;
+               WM_event_add_notifier(C, NC_FILE|ND_FILELIST, NULL);
+       }
+       
+       return OPERATOR_FINISHED;
+
+}
+
+
+void FILE_OT_hidedot(struct wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Toggle Hide Dot Files";
+       ot->idname= "FILE_OT_hidedot";
+       
+       /* api callbacks */
+       ot->exec= file_hidedot_exec;
+       ot->poll= ED_operator_file_active; /* <- important, handler is on window level */
+}
+
+struct ARegion *file_buttons_region(struct ScrArea *sa)
+{
+       ARegion *ar, *arnew;
+       
+       for(ar= sa->regionbase.first; ar; ar= ar->next)
+               if(ar->regiontype==RGN_TYPE_CHANNELS)
+                       return ar;
+
+       /* add subdiv level; after header */
+       for(ar= sa->regionbase.first; ar; ar= ar->next)
+               if(ar->regiontype==RGN_TYPE_HEADER)
+                       break;
+       
+       /* is error! */
+       if(ar==NULL) return NULL;
+       
+       arnew= MEM_callocN(sizeof(ARegion), "buttons for file panels");
+       
+       BLI_insertlinkafter(&sa->regionbase, ar, arnew);
+       arnew->regiontype= RGN_TYPE_CHANNELS;
+       arnew->alignment= RGN_ALIGN_LEFT;
+       
+       arnew->flag = RGN_FLAG_HIDDEN;
+       
+       return arnew;
+}
+
+int file_bookmark_toggle_exec(bContext *C, wmOperator *unused)
+{
+       ScrArea *sa= CTX_wm_area(C);
+       ARegion *ar= file_buttons_region(sa);
+       
+       if(ar) {
+               ar->flag ^= RGN_FLAG_HIDDEN;
+               ar->v2d.flag &= ~V2D_IS_INITIALISED; /* XXX should become hide/unhide api? */
+               
+               ED_area_initialize(CTX_wm_manager(C), CTX_wm_window(C), sa);
+               ED_area_tag_redraw(sa);
+       }
+       return OPERATOR_FINISHED;
+}
+
+void FILE_OT_bookmark_toggle(struct wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Toggle Bookmarks";
+       ot->idname= "FILE_OT_bookmark_toggle";
+       
+       /* api callbacks */
+       ot->exec= file_bookmark_toggle_exec;
+       ot->poll= ED_operator_file_active; /* <- important, handler is on window level */
+}
+
+
+int file_filenum_exec(bContext *C, wmOperator *op)
+{
+       SpaceFile *sfile= CTX_wm_space_file(C);
+       
+       int inc = RNA_int_get(op->ptr, "increment");
+       if(sfile->params && (inc != 0)) {
+               BLI_newname(sfile->params->file, inc);
+               WM_event_add_notifier(C, NC_WINDOW, NULL);
+       }
+       
+       return OPERATOR_FINISHED;
+
+}
+
+void FILE_OT_filenum(struct wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Increment Number in Filename";
+       ot->idname= "FILE_OT_filenum";
+       
+       /* api callbacks */
+       ot->exec= file_filenum_exec;
+       ot->poll= ED_operator_file_active; /* <- important, handler is on window level */
+
+       /* props */
+       RNA_def_int(ot->srna, "increment", 1, 0, 100, "Increment", "", 0,100);
+}
+
+int file_rename_exec(bContext *C, wmOperator *op)
 {
        ScrArea *sa= CTX_wm_area(C);
-       ARegion *ar= CTX_wm_region(C);
        SpaceFile *sfile= (SpaceFile*)CTX_wm_space_data(C);
-       short mval[2];
        
-       /* note; otherwise opengl select won't work. do this for every glSelectBuffer() */
-       wmSubWindowSet(CTX_wm_window(C), ar->swinid);
+       if(sfile->params) {
+               int idx = sfile->params->active_file;
+               int numfiles = filelist_numfiles(sfile->files);
+               if ( (0<=idx) && (idx<numfiles) ) {
+                       struct direntry *file= filelist_file(sfile->files, idx);
+                       file->flags |= EDITING;
+               }
+               ED_area_tag_redraw(sa);
+       }
        
-       mval[0]= event->x - ar->winrct.xmin;
-       mval[1]= event->y - ar->winrct.ymin;
-       mouse_select_bookmark(sfile, ar, mval);
-       ED_area_tag_redraw(sa);
        return OPERATOR_FINISHED;
+
 }
 
-void ED_FILE_OT_select_bookmark(wmOperatorType *ot)
+void FILE_OT_rename(struct wmOperatorType *ot)
 {
        /* identifiers */
-       ot->name= "Select Directory";
-       ot->idname= "ED_FILE_OT_select_bookmark";
+       ot->name= "Rename File or Directory";
+       ot->idname= "FILE_OT_rename";
        
        /* api callbacks */
-       ot->invoke= bookmark_select_invoke;
-       ot->poll= ED_operator_file_active;
-}
\ No newline at end of file
+       ot->exec= file_rename_exec;
+       ot->poll= ED_operator_file_active; /* <- important, handler is on window level */
+
+}
+
+int file_delete_poll(bContext *C)
+{
+       int poll = ED_operator_file_active(C);
+       SpaceFile *sfile= CTX_wm_space_file(C);
+       struct direntry* file;
+
+       if (sfile && sfile->params) {
+               if (sfile->params->active_file < 0) { 
+                       poll= 0;
+               } else {
+                       file = filelist_file(sfile->files, sfile->params->active_file);
+                       if (file && S_ISDIR(file->type)) poll= 0;
+               }
+       }
+       else
+               poll= 0;
+               
+       return poll;
+}
+
+int file_delete_exec(bContext *C, wmOperator *op)
+{
+       char str[FILE_MAX];
+       SpaceFile *sfile= CTX_wm_space_file(C);
+       struct direntry* file;
+       
+       
+       file = filelist_file(sfile->files, sfile->params->active_file);
+       BLI_make_file_string(G.sce, str, sfile->params->dir, file->relname);
+       BLI_delete(str, 0, 0);  
+       WM_event_add_notifier(C, NC_FILE | ND_FILELIST, NULL);
+       
+       return OPERATOR_FINISHED;
+
+}
+
+void FILE_OT_delete(struct wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Delete File";
+       ot->idname= "FILE_OT_delete";
+       
+       /* api callbacks */
+       ot->invoke= WM_operator_confirm;
+       ot->exec= file_delete_exec;
+       ot->poll= file_delete_poll; /* <- important, handler is on window level */
+}
+