@@ -94,6 +94,7 @@ redata_init(int (*pluginregisterfn)(redata_t *redata, redata_plugin_t *slot), ..

         redata->undostack.undo=NULL;

         redata->undostack.buf=NULL;

         /* plugins */

+        va_start(args,pluginregisterfn);

         for(nargs=0,fn=pluginregisterfn;fn!=NULL;fn=va_arg(args,int (*)(redata_t *redata,redata_plugin_t *slot))) {

                 res=fn(redata,redata->plugins+nargs);

                 redata->plugins[nargs].active=(res==0)?1:0;

@@ -146,6 +147,20 @@ redata_free(redata_t *redata)

         return;

 }

+void

+redata_idleproc(redata_t *redata, char *filename)

+{

+        int i;

+        if(redata==NULL)

+                return;

+        for(i=0;i<redata->sizeplugins;i++) {

+                if(redata->plugins[i].commit!=NULL)

+                        redata->plugins[i].commit(redata,redata->plugins+i,filename);

+        }

+        return;

+}

+

+

 int

 redata_config_chunkdatasize(redata_t *redata, int chunkdatasize)

 {

@@ -524,27 +539,94 @@ redata_fix_nl(redata_t *redata, int chunkno)

 }

 int

-redata_load(redata_t *redata, char *filename, int (*callback_question)(/*char *title, char *body, int nopts, char *opts[],void *userptr*/), void *userptr)

+redata_loadquestions_setup(redata_t *redata, char *filename)

+{

+        int i;

+        if(redata==NULL || filename==NULL)

+                return(-1); /* sanity check failed */

+        redata_loadquestions_wipe(redata);

+        /* unsaved and other plugins: loadquestion (pre-to-load) */

+        for(i=0;i<redata->sizeplugins;i++) {

+                if(!redata->plugins[i].active)

+                        continue;

+                if(redata->plugins[i].loadquestion!=NULL)

+                        redata->plugins[i].loadquestion(redata,redata->plugins+i,filename);

+        }

+        return(0);

+

+}

+

+question_t *

+redata_loadquestions_getnext(redata_t *redata)

+{

+        int i;

+        if(redata==NULL)

+                return(NULL); /* sanity check failed */

+        for(i=0;i<redata->sizeplugins;i++) {

+                if(!redata->plugins[i].active || redata->plugins[i].question.active==0)

+                        continue;

+                if(redata->plugins[i].question.selectedoption==-1)

+                        return(&(redata->plugins[i].question));

+        }

+        return(NULL); /* no more questions */

+}

+

+int

+redata_loadquestions_reply(redata_t *redata, question_t *question, int selectedoption)

+{

+        if(redata==NULL || question==NULL || selectedoption<-1 || selectedoption>=question->nopts)

+                return(-1);

+        question->selectedoption=(selectedoption==-1)?question->defaultoption:selectedoption;

+        return(0);

+}

+

+int

+redata_loadquestions_wipe(redata_t *redata)

 {

+        int i;

+        if(redata==NULL)

+                return(-1);

+        for(i=0;i<redata->sizeplugins;i++) {

+                if(!redata->plugins[i].active)

+                        continue;

+                memset(redata->plugins[i].questionfilename,0,sizeof(redata->plugins[i].questionfilename));

+                memset(&(redata->plugins[i].question),0,sizeof(redata->plugins[i].question));

+                redata->plugins[i].question.active=0;

+                redata->plugins[i].question.selectedoption=-1;

+        }

+        return(0);

+}

+

+int

+redata_load(redata_t *redata, char *filename, char **errordesc)

+{

+#warning TODO: what to do when there plugins with questions AFTER loading instead of before loading...

         int fd,nread,totalread;

         int chunkno, avail;

         struct stat statbuf;

         rechunk_t *chunk;

         int i;

         int reply;

-        if(redata==NULL || filename==NULL)

+        if(redata==NULL || filename==NULL) {

+                if(errordesc!=NULL)

+                        *errordesc="Internal error";

                 return(-1); /* sanity check failed */

+        }

         redata_wipe(redata);

         strncpy(redata->filename,filename,sizeof(redata->filename));

         redata->filename[sizeof(redata->filename)-1]='\0';

         if((fd=open(filename,O_RDONLY))==-1 || fstat(fd,&statbuf)!=0 || !S_ISREG(statbuf.st_mode)) {

                 if(fd!=-1)

                         close(fd),fd=-1;

-                return(-1); /* file not found, couldn't query size or not regular file */

+                if(errordesc!=NULL)

+                        *errordesc="File not found, couldn't query size or not a regular file";

+                return(-1); /* file not found, couldn't query size or not a regular file */

         }

         /* preallocate 10% more than needed */

         if(redata_preallocate(redata,statbuf.st_size+(statbuf.st_size/10)+1 )) {

                 close(fd),fd=-1;

+                if(errordesc!=NULL)

+                        *errordesc="Insufficient memory";

                 return(-1); /* insuf. mem. */

         }

         for(totalread=0,chunkno=0,nread=0;totalread<statbuf.st_size;totalread+=nread,nread=0) {

@@ -568,6 +650,8 @@ redata_load(redata_t *redata, char *filename, int (*callback_question)(/*char *t

                 }

                 if((nread=read(fd,chunk->data+chunk->useddata,avail))<=0) {

                         close(fd),fd=-1;

+                        if(errordesc!=NULL)

+                                *errordesc="Short read loading file";

                         return(-1); /* short read */

                 }

                 chunk->useddata+=nread;

@@ -578,49 +662,56 @@ redata_load(redata_t *redata, char *filename, int (*callback_question)(/*char *t

                 redata_fix_nl(redata,chunkno);

         for(chunkno=0;chunkno<redata->sizechunks;chunkno++)

                 redata_whatin_refresh(redata,chunkno);

-        /* unsaved and other plugins */

+        /* unsaved and other plugins: postload */

         for(i=0;i<redata->sizeplugins;i++) {

                 if(!redata->plugins[i].active)

                         continue;

-                reply=-1;

-                if(redata->plugins[i].loadquestion!=NULL && callback_question!=NULL) {

-                        char *title, *body;

-                        int nopts;

-                        char **opts;

-                        if(redata->plugins[i].loadquestion(redata,redata->plugins+i,filename,&title,&body,&nopts,&opts)!=-1)

-                                reply=callback_question(title,body,nopts,opts,userptr);

-                }

                 if(redata->plugins[i].postload!=NULL)

-                        redata->plugins[i].postload(redata,redata->plugins+i,filename,reply);

+                        redata->plugins[i].postload(redata,redata->plugins+i,filename);

         }

+        redata_loadquestions_wipe(redata);

+#warning TODO: IMPLEMENT POSTLOADQUESTIONS (call now loadquestion_postload).

         /* all done */

         return(0);

 }

 int

-redata_save(redata_t *redata, char *filename)

+redata_save(redata_t *redata, char *filename, char **errordesc)

 {

         int fd;

         int i,n;

         char tmpfile[PATH_MAX+1];

-        if(redata==NULL || filename==NULL)

+        if(redata==NULL || filename==NULL) {

+                if(errordesc!=NULL)

+                        *errordesc="Internal error";

                 return(-1); /* sanity check failed */

-        if((securesave_genname(redata->filename,tmpfile,sizeof(tmpfile)))==NULL)

+        }

+        if((securesave_genname(redata->filename,tmpfile,sizeof(tmpfile)))==NULL) {

+                if(errordesc!=NULL)

+                        *errordesc="Malformed filename";

                 return(-1); /* malformed filename */

-        if((fd=open(tmpfile,O_WRONLY|O_TRUNC|O_CREAT,0644))==-1)

+        }

+        if((fd=open(tmpfile,O_WRONLY|O_TRUNC|O_CREAT,0644))==-1) {

+                if(errordesc!=NULL)

+                        *errordesc="Couldn't open file for writing";

                 return(-1); /* couldn't open file for writing */

+        }

         for(i=0;i<redata->sizechunks;i++) {

                 if(redata->chunks[i]->useddata==0)

                         continue;

                 if((n=write(fd,redata->chunks[i]->data,redata->chunks[i]->useddata))==-1 || n!=redata->chunks[i]->useddata) {

                         close(fd),fd=-1;

                         unlink(tmpfile);

+                        if(errordesc!=NULL)

+                                *errordesc="Short write saving file";

                         return(-1); /* short write */

                 }

         }

         close(fd),fd=-1;

         if(rename(tmpfile,filename)!=0) {

                 unlink(tmpfile);

+                if(errordesc!=NULL)

+                        *errordesc="Couldn't overwrite old file";

                 return(-1); /* couldn't overwrite old file */

         }

         for(i=0;i<redata->sizeplugins;i++) {

@@ -13,8 +13,22 @@

 #include <limits.h>

+#ifndef RE_DATA_H

+#define RE_DATA_H

 #define MAXPLUGINNAME 32

+typedef struct question_t {

+        int active;

+        int is_postload;

+        char *id;

+        char *title,*titleshort;

+        char *body,*bodyshort;

+        int nopts;

+        char **opts,**optsshort;

+        int defaultoption;

+        int selectedoption;

+} question_t;

+

 typedef struct whatin_t {

         int nlcount;

         int iscontinuation;

@@ -51,11 +65,12 @@ typedef struct undostack_t {

 typedef struct redata_plugin_t {

         int active;

         char name[MAXPLUGINNAME];

+        char *questionfilename[PATH_MAX];

+        question_t question;

         int (*unregister)(/*redata_t *redata, redata_plugin_t *plugin,char *filename*/);

         int (*wipe)(/*redata_t *redata, redata_plugin_t *plugin,char *filename*/);

-        /* loadquestion returns -1 if no question needed */

-        int (*loadquestion)(/*redata_t *redata, redata_plugin_t *plugin,char *filename, char **title, char **body, int *nopts, char **opts[] */);

-        int (*postload)(/*redata_t *redata, redata_plugin_t *plugin,char *filename,int questionreply */);

+        int (*loadquestion)(/*redata_t *redata, redata_plugin_t *plugin,char *filename */);

+        int (*postload)(/*redata_t *redata, redata_plugin_t *plugin,char *filename */);

         int (*postsave)(/*redata_t *redata, redata_plugin_t *plugin,char *oldfilename,char *newfilename*/);

         int (*add)(/*redata_t *redata, redata_plugin_t *plugin,undo_t *undo*/);

         int (*unadd)(/*redata_t *redata, redata_plugin_t *plugin,undo_t *undo*/);

@@ -84,6 +99,8 @@ typedef struct redata_t {

 redata_t *redata_init( int (*pluginregisterfn)(redata_t *redata, redata_plugin_t *slot), ...);

 void redata_free(redata_t *redata);

+void redata_idleproc(redata_t *redata, char *filename);

+

 int redata_config_chunkdatasize(redata_t *redata, int chunkdatasize);

 long redata_getsize(redata_t *redata);

@@ -119,8 +136,13 @@ int redata_undo_groupinit(redata_t *redata, undostack_t *stack);

 int redata_undo_groupcommit(redata_t *redata, undostack_t *stack);

 /* high level stuff */

-int redata_load(redata_t *redata, char *filename, int (*callback_question)(/*char *title, char *body, int nopts, char *opts[],void *userptr*/), void *userptr);

-int redata_save(redata_t *redata, char *filename);

+int redata_loadquestions_setup(redata_t *redata, char *filename);

+question_t *redata_loadquestions_getnext(redata_t *redata);

+int redata_loadquestions_reply(redata_t *redata, question_t *question, int selectedoption);

+int redata_loadquestions_wipe(redata_t *redata);

+

+int redata_load(redata_t *redata, char *filename, char **errordesc);

+int redata_save(redata_t *redata, char *filename, char **errordesc);

 int redata_op_add(redata_t *redata, long pos, char *buf, long buflen, undostack_t *fromhere);

 int redata_op_addn(redata_t *redata, long pos, char character, long n, undostack_t *fromhere);

@@ -170,3 +192,4 @@ int redata_pos2linecol(redata_t *redata, long pos, int *line, int *col);

 /* get the pos of that line/col (calculated using the utf8 convenience functions) */

 int redata_linecol2pos(redata_t *redata, int line, int colrequest, long *pos, int *coldone);

+#endif

@@ -28,8 +28,8 @@

-static int redata_unsaved_loadquestion(redata_t *redata, redata_plugin_t *slot,char *filename, char **title, char **body, int *nopts, char **opts[]);

-static int redata_unsaved_postload(redata_t *redata, redata_plugin_t *slot,char *filename,int questionreply);

+static int redata_unsaved_loadquestion(redata_t *redata, redata_plugin_t *slot,char *filename);

+static int redata_unsaved_postload(redata_t *redata, redata_plugin_t *slot,char *filename);

 static int redata_unsaved_check_gen(redata_t *redata, redata_plugin_t *slot, char *filename);

 static char *unsaved_genname(char *filename, char *buf, int bufsize);

 static char *ptr_getlong(char *ptr,char *endptr,long *data);

@@ -58,6 +58,7 @@ redata_unsaved_register(redata_t *redata, redata_plugin_t *slot)

         slot->add=redata_unsaved_add;

         slot->unadd=redata_unsaved_unadd;

         slot->commit=redata_unsaved_commit;

+        slot->userptr=unsaved;

         return(0);

 }

@@ -205,6 +206,9 @@ redata_unsaved_trunc(redata_t *redata, redata_plugin_t *slot, char *oldfilename,

 int

 redata_unsaved_truncload(redata_t *redata, redata_plugin_t *slot, char *filename)

 {

+#if 1

+fprintf(stderr,"UNSAVED: TRUNCLOAD (ignore)\n");

+#endif

         return(redata_unsaved_trunc(redata, slot, NULL, filename));

 }

@@ -224,16 +228,28 @@ redata_unsaved_loadappend(redata_t *redata, redata_plugin_t *slot, char *filenam

         char endcode;

         int flag_multipart;

         unsaved_t *unsaved=(unsaved_t *) ((slot!=NULL)?(slot->userptr):NULL);

+#if 1

+fprintf(stderr,"UNSAVED: LOADAPPEND (recover)\n");

+#endif

         if(redata==NULL || slot==NULL || unsaved==NULL || filename==NULL)

                 return(-1);

+#if 1

+fprintf(stderr,"UNSAVED: LOADAPPEND pre-check\n");

+#endif

         if((fd=redata_unsaved_check_gen(redata,slot,filename))==-1)

                 return(-1); /* check failed */

+#if 1

+fprintf(stderr,"UNSAVED: LOADAPPEND post-check\n");

+#endif

         if(fstat(fd,&statbuf)!=0 || !S_ISREG(statbuf.st_mode)) {

                 close(fd),fd=-1;

                 return(-1); /* couldn't query size or not regular file */

         }

         redata_hash(redata,unsaved->initialhash);

-        headerhashsize=(sizeof(header)-1)+1+128+1;

+        headerhashsize=(sizeof(header)-1)+128+1;

+#if 1

+fprintf(stderr,"UNSAVED: LOADAPPEND headerhashsize: %li\n",headerhashsize);

+#endif

         /* load unsaved to memory */

         if(unsaved->sizebuf<(statbuf.st_size-headerhashsize)) {

                 if((newptr=realloc(unsaved->buf,(statbuf.st_size-headerhashsize)))==NULL) {

@@ -254,8 +270,21 @@ redata_unsaved_loadappend(redata_t *redata, redata_plugin_t *slot, char *filenam

         }

         close(fd),fd=-1;

         /* process unsaved data */

+        slot->active=0;

         endptr=unsaved->buf+unsaved->usedbuf;

         for(ptr=unsaved->buf;ptr<endptr;) {

+#ifdef DEBUG_PLUGIN_UNSAVED

+{

+int m;

+fprintf(stderr,"%05X: ",ptr-unsaved->buf);

+for(m=0;m<16 && (ptr+m)<endptr;m++)

+        fprintf(stderr,"%02X%s ",((unsigned char *)ptr)[m],(m==7)?" ":"");

+fprintf(stderr," | ");

+for(m=0;m<16 && (ptr+m)<endptr;m++)

+        fprintf(stderr,"%c%s",((((unsigned char *)ptr)[m])<20)?'.':((((unsigned char *)ptr)[m])>126)?'.':((unsigned char *)ptr)[m],(m==7)?" ":"");

+fprintf(stderr,"\n");

+}

+#endif

                 if((ptr=ptr_getchar(ptr,endptr,&actioncode))==NULL)

                         return(-1); /* no space for action char */

                 /* multipart example: A10+$aj$%$% >> insert "aj$" into pos 10 */

@@ -322,7 +351,8 @@ redata_unsaved_loadappend(redata_t *redata, redata_plugin_t *slot, char *filenam

                         return(-1); /* corrupted undobuf */

                 }

         }

-        return(-1);

+        slot->active=1;

+        return(0);

 }

 int

@@ -337,7 +367,7 @@ redata_unsaved_add(redata_t *redata, redata_plugin_t *slot, undo_t *undo)

         undostack_t *stack;

         unsaved_t *unsaved=(unsaved_t *) ((slot!=NULL)?(slot->userptr):NULL);

         stack=redata_getstack(redata,undo);

-        if(redata==NULL || slot==NULL || unsaved==NULL || undo==NULL || stack==NULL)

+        if(redata==NULL || slot==NULL || unsaved==NULL || undo==NULL || stack==NULL || slot->active==0)

                 return(-1); /* sanity check failed */

         /* syntax (see loadappend): A<pos><+?><sep><text><sep>[<+?><sep><text><sep>[...]] */

         if(undo->type!='A' && undo->type!='D' && undo->type!='M')

@@ -389,7 +419,8 @@ redata_unsaved_add(redata_t *redata, redata_plugin_t *slot, undo_t *undo)

                                 unsaved->sizebuf=newsize;

                         }

                         buf=unsaved->buf+unsaved->usedbuf;

-                }

+                } else

+                        unsaved->usedbuf+=maxsize;

         }

         return(0);

 }

@@ -407,7 +438,7 @@ redata_unsaved_unadd(redata_t *redata, redata_plugin_t *slot, undo_t *undo)

         undostack_t *stack;

         unsaved_t *unsaved=(unsaved_t *) ((slot!=NULL)?(slot->userptr):NULL);

         stack=redata_getstack(redata,undo);

-        if(redata==NULL || slot==NULL || unsaved==NULL || undo==NULL || stack==NULL)

+        if(redata==NULL || slot==NULL || unsaved==NULL || undo==NULL || stack==NULL || slot->active==0)

                 return(-1); /* sanity check failed */

         /* syntax (see loadappend): A<pos><+?><sep><text><sep>[<+?><sep><text><sep>[...]] */

         if(undo->type!='A' && undo->type!='D' && undo->type!='M')

@@ -475,6 +506,9 @@ redata_unsaved_commit(redata_t *redata, redata_plugin_t *slot,char *filename)

         unsaved_t *unsaved=(unsaved_t *) ((slot!=NULL)?(slot->userptr):NULL);

         if(redata==NULL || slot==NULL || unsaved==NULL || unsaved->unsavedfd==-1)

                 return(-1);

+#if 1

+fprintf(stderr,"UNSAVED_COMMITTED\n");

+#endif

         for(nwritten=0;nwritten<unsaved->usedbuf;nwritten+=n) {

                 if((n=write(unsaved->unsavedfd,unsaved->buf+nwritten,unsaved->usedbuf-nwritten))<0) {

                         close(unsaved->unsavedfd),unsaved->unsavedfd=-1;

@@ -488,30 +522,47 @@ redata_unsaved_commit(redata_t *redata, redata_plugin_t *slot,char *filename)

 }

 static int

-redata_unsaved_loadquestion(redata_t *redata, redata_plugin_t *slot,char *filename, char **title, char **body, int *nopts, char **opts[])

+redata_unsaved_loadquestion(redata_t *redata, redata_plugin_t *slot,char *filename)

 {

         static char mytitle[]={"Unsaved data from a previous session detected"};

         static char mybody[]={"The file you're trying to load has some unsaved data from a previous session. I can recover the data. What do you want to do?"};

         static char *myopts[]={"Recover unsaved data (safest option)","Don't use old unsaved data, delete old unsaved data (if you're sure what you're doing)"};

-        if(redata==NULL || slot==NULL || filename==NULL || title==NULL || body==NULL || nopts==NULL || opts==NULL)

+        static char mytitleshort[]={"Unsaved data found"};

+        static char mybodyshort[]={"Should try to recover the data?"};

+        static char *myoptsshort[]={"Recover","Ignore it"};

+        question_t *q;

+        if(redata==NULL || slot==NULL || filename==NULL)

                 return(-1); /* sanity check failed */

+        q=&(slot->question);

+        q->active=0;

         if(redata_unsaved_check(redata,slot,filename)==-1)

-                return(-1); /* no unsaved data on disk */

-        *title=mytitle;

-        *body=mybody;

-        *opts=myopts;

-        *nopts=2;

+                return(0); /* no unsaved data on disk */

+        q->active=1;

+        q->title=mytitle;

+        q->titleshort=mytitleshort;

+        q->body=mybody;

+        q->bodyshort=mybodyshort;

+        q->opts=myopts;

+        q->optsshort=myoptsshort;

+        q->nopts=2;

+        q->defaultoption=1;

+        q->selectedoption=-1;

         return(0);

 }

 static int

-redata_unsaved_postload(redata_t *redata, redata_plugin_t *slot,char *filename,int questionreply)

+redata_unsaved_postload(redata_t *redata, redata_plugin_t *slot,char *filename)

 {

+#warning XXX TODO: add errordesc parameter, so that the user can see what happened.

+        int selectedoption;

+        if(redata==NULL || slot==NULL || filename==NULL)

+                return(-1); /* sanity check failed */

         /* questionreply is from loadquestion, specifically the selected element in the array "opts" */

-        if(questionreply==0) /* recover */

-                return(redata_unsaved_loadappend(redata, slot, filename));

-        else if(questionreply==1 || questionreply==-1) /* delete unsaved data */

+        selectedoption=slot->question.selectedoption;

+        if(slot->question.active==0 || selectedoption==1 || selectedoption==-1) /* delete unsaved data */

                 return(redata_unsaved_truncload(redata, slot, filename));

+        else if(selectedoption==0) /* recover */

+                return(redata_unsaved_loadappend(redata, slot, filename));

         return(-1);

 }

@@ -154,7 +154,7 @@ fprintf(stderr,"\ntest_newfile(%s%s%s,%s%s%s,%i,%i);\nResult: ",(filename!=NULL)

         redata_filehash(redata,filename,hash129_pre);

         free(mem),mem=NULL;

         /* load file */

-        if(redata_load(redata,filename,NULL,NULL)!=0) {

+        if(redata_load(redata,filename,NULL)!=0) {

                 unlink(filename);

                 return("couldn't load file");

         }

@@ -163,7 +163,7 @@ fprintf(stderr,"\ntest_newfile(%s%s%s,%s%s%s,%i,%i);\nResult: ",(filename!=NULL)

         if(strcmp(hash129_pre,hash129_post)!=0)

                 return("loaded file is corrupted");

         /* save file */

-        redata_save(redata,filename);

+        redata_save(redata,filename,NULL);

         hash129_post[0]='\0';

         redata_filehash(redata,filename,hash129_post);

         if(strcmp(hash129_pre,hash129_post)!=0)

@@ -201,7 +201,7 @@ fprintf(stderr,"\ntest_edit(%s%s%s,%s%s%s,%i,%i);\nResult: ",(filename!=NULL)?"\

                                 progress[l+1]='\0';

                         }

 if(k!=0) unlink("test.pre"),unlink("test.post"),unlink("test.undo"),unlink("test.redo");

-if(k!=0) redata_save(redata,"test.pre");

+if(k!=0) redata_save(redata,"test.pre",NULL);

                         if(*ptr=='A') {

                                 /* A<insertpos><endchar><text><endchar> */

                                 ptr++;

@@ -318,7 +318,7 @@ if(k!=0) redata_save(redata,"test.pre");

                         if(cursize>maxsize)

                                 maxsize=cursize;

                         if(k!=0) {

-if(k!=0) redata_save(redata,"test.post");

+if(k!=0) redata_save(redata,"test.post",NULL);

                                 redata_hash(redata,hash129_redata);

                                 redata_memhash(redata,mem,cursize,hash129_mem);

                                 if(strcmp(hash129_redata,hash129_mem)!=0) {

@@ -330,7 +330,7 @@ if(k!=0) redata_save(redata,"test.post");

                                         return(errorbuf);

                                 }

                                 redata_op_undo(redata,NULL);

-redata_save(redata,"test.undo");

+redata_save(redata,"test.undo",NULL);

                                 redata_hash(redata,hash129_redata);

                                 if(strcmp(hash129_redata,hash129_memold)!=0) {

                                         if(mem!=NULL)

@@ -341,7 +341,7 @@ redata_save(redata,"test.undo");

                                         return(errorbuf);

                                 }

                                 redata_op_redo(redata,NULL);

-redata_save(redata,"test.redo");

+redata_save(redata,"test.redo",NULL);

                                 redata_hash(redata,hash129_redata);

                                 if(strcmp(hash129_redata,hash129_mem)!=0) {

                                         if(mem!=NULL)

@@ -359,7 +359,7 @@ redata_save(redata,"test.redo");

                                 return("insuf. mem. for temp. buffer");

                         if(write_file(filename,mem,filesize)==-1)

                                 return("couldn't create temporary file");

-                        if(redata_load(redata,filename,NULL,NULL)!=0) {

+                        if(redata_load(redata,filename,NULL)!=0) {

                                 unlink(filename);

                                 return("couldn't load file");

                         }

@@ -13,18 +13,24 @@

 #include <string.h>

 #include <limits.h>

 #include <signal.h>

+#include <time.h>

 #include "re_data.h"

+#include "re_plugin_unsaved.h"

 #include "re_ui.h"

 #include "ext/socklib.h"

 #define LINEFORCESCROLL 1

 #define COLFORCESCROLL 5

+#define IDLETIMEOUTSECONDS 10

+

 #define COMMANDBUFSIZE 1024

 #define COMMAND_WARNING "(!)"

 #define COMMAND_GOTOLINE "Go to line: "

+#define COMMAND_QUESTION "(?)"

+#define COMMAND_EXIT "Exit"

 #define COLOR_STATUSBG "\x00\x00\xff\xff"

 #define COLOR_STATUSFG "\xff\xff\x00\xff"

@@ -48,8 +54,10 @@ typedef struct re_t {

         int maxrow,maxcol;

         int headerdirty;

         int contentsdirty;

+        int command_first_key;

         char *command;

         char commandbuf[COMMANDBUFSIZE];

+        question_t *question;

         int ignorenkeys;

 } re_t;

@@ -86,6 +94,8 @@ main(int argc, char *argv[])

         SDL_Event event;

         sselect *ssel;

         int flag_had_events;

+        time_t lastidle,now;

+        int load_pending;

         if(argc!=2 || strcmp(argv[argc-1],"--help")==0) {

                 fprintf(stderr,"Syntax: %s filename\n",argv[0]);

                 return(1);

@@ -104,18 +114,6 @@ main(int argc, char *argv[])

                 re_free(re),re=NULL;

                 return(2);

         }

-        if((redata_load(re->data,re->filename,NULL,NULL))!=0)

-                re->flag_newfile=1;

-        else

-                re->flag_newfile=0;

-#if 0

-#warning TESTS

-        {

-                char buf[129];

-                redata_hash(re->data,buf);

-                fprintf(stderr,"%s %s\n",buf,re->filename);

-        }

-#endif

         reui_title(re->ui,re->filename);

         flag_sigint=flag_sigpipe=0;

         setsignal(SIGINT,sighandler_sigint);

@@ -134,13 +132,43 @@ main(int argc, char *argv[])

         re->contentsdirty=1;

         flag_had_events=0;

         SDL_StartTextInput();

+        lastidle=0;

+        load_pending=1;

+        redata_loadquestions_setup(re->data, re->filename);

         while(do_exit==0 && flag_sigint==0) {

+                /* load file (or ask pre-load questions), if pending */

+                if(load_pending && re->command==NULL) {

+                        question_t *question;

+                        if((question=redata_loadquestions_getnext(re->data))!=NULL) {

+                                re->command=COMMAND_QUESTION;

+                                re->question=question;

+#if 0

+fprintf(stderr,"QUESTION INIT: %s: %s\n",re->question->title,re->question->body);

+#endif

+                        } else {

+                                if(redata_load(re->data,re->filename,NULL)==-1)

+                                        re->flag_newfile=1;

+                                else

+                                        re->flag_newfile=0;

+#warning XXX TODO: NO PARECE FUNCIONAR EL PLUGIN_UNSAVED (pregunta pero no carga los cambios)

+                                re->originline=re->origincol=0;

+                                re->curline=re->curcol=0;

+                                re->cursorpos=0;

+                                load_pending=0;

+                                re->headerdirty=1;

+                                re->contentsdirty=1;

+                        }

+                }

                 if(re->headerdirty) {

                         if(re->command==NULL) {

+#if 0

 fprintf(stderr,"REDRAW Header (editing)\n");

+#endif

                                 re_drawheader_editing(re);

                         } else {

+#if 0

 fprintf(stderr,"REDRAW Header (command)\n");

+#endif

                                 re_drawheader_command(re);

                                 if(strcmp(re->command,COMMAND_WARNING)==0) {

                                         /* the warnings only get shown once, remove it */

@@ -182,6 +210,15 @@ fprintf(stderr,"REDRAW Header (command)\n");

                                         break;

                         }

                 }

+                /* additional processing of global commands */

+                if(re->command!=NULL && strcmp(re->command,COMMAND_EXIT)==0)

+                        do_exit=1;

+                /* timeouts */

+                now=time(NULL);

+                if((lastidle+IDLETIMEOUTSECONDS)<now || (lastidle-IDLETIMEOUTSECONDS)>now) {

+                        lastidle=now;

+                        redata_idleproc(re->data,re->filename);

+                }

         }

         SDL_StopTextInput();

         sselect_free(ssel),ssel=NULL;

@@ -219,7 +256,7 @@ re_init(void)

         if((re=malloc(sizeof(re_t)))==NULL)

                 return(NULL); /* insuf. mem. */

         memset(re,0,sizeof(re_t));

-        if((re->data=redata_init(NULL))==NULL) {

+        if((re->data=redata_init(redata_unsaved_register,NULL))==NULL) {

                 re_free(re),re=NULL;

                 return(NULL); /* insuf. mem. */

         }

@@ -326,7 +363,7 @@ fprintf(stderr,"SDL_TEXTEDITING: composition:\"%s\" start:%i len:%i\n",event->ed

         /* default case: keydown event */

         if(event->type!=SDL_KEYDOWN)

                 return(0); /* Ignore other possible events */

-#if 1

+#if 0

 fprintf(stderr,"SDL_KEYDOWN: sym:%i\n",event->key.keysym.sym);

 #endif

         if(event->key.keysym.sym==SDLK_DOWN || event->key.keysym.sym==SDLK_UP) {

@@ -411,10 +448,15 @@ fprintf(stderr,"SDL_KEYDOWN: sym:%i\n",event->key.keysym.sym);

         } else if(event->key.keysym.sym==SDLK_q && (SDL_GetModState()&KMOD_CTRL)!=0) {

 fprintf(stderr,"re_processkey(): received Control+q\n");

                 re->command="";

+                re->command_first_key='q';

+                re->headerdirty=1;

+        } else if(event->key.keysym.sym==SDLK_k && (SDL_GetModState()&KMOD_CTRL)!=0) {

+fprintf(stderr,"re_processkey(): received Control+k\n");

+                re->command="";

+                re->command_first_key='k';

                 re->headerdirty=1;

         } else if(event->key.keysym.sym==SDLK_z && (SDL_GetModState()&KMOD_CTRL)!=0) {

                 long newpos;

-                int oldline;

 fprintf(stderr,"re_processkey(): received Control+z\n");

                 if(redata_op_undo(re->data,&newpos))

                         return(-1);

@@ -439,10 +481,14 @@ re_processkey_commandwait(re_t *re, SDL_Event *event)

         /* default case: keydown event */

         if(event->type!=SDL_KEYDOWN)

                 return(0); /* Ignore other possible events */

-        if(event->key.keysym.sym==SDLK_l) {

+        if(re->command_first_key=='q' && event->key.keysym.sym==SDLK_l) {

                 re->command=COMMAND_GOTOLINE;

                 re->commandbuf[0]='\0';

                 re->headerdirty=1;

+        } else if(re->command_first_key=='k' && event->key.keysym.sym==SDLK_q) {

+                re->command=COMMAND_EXIT;

+                re->commandbuf[0]='\0';

+                re->headerdirty=1;

         } else {

                 re->command=NULL;

                 re->headerdirty=1;

@@ -478,6 +524,7 @@ re_processkey_commanddata(re_t *re, SDL_Event *event)

                 re->command=NULL;

                 re->commandbuf[0]='\0';

                 re->headerdirty=1;

+#warning XXX: TODO: re->question: Make cursor change option, make numbers change option

         } else if(event->key.keysym.sym==SDLK_BACKSPACE && re->commandbuf[0]!='\0') {

                 int nchar;

                 char *ptr;

@@ -517,6 +564,17 @@ re_processcommand(re_t *re)

                 re->originline=line-(re->maxrow/2);

                 re->headerdirty=1;

                 re->contentsdirty=1;

+        } else if(strcmp(re->command,COMMAND_QUESTION)==0) {

+                /* validate reply */

+                if(!(atoi(re->commandbuf)>0 && atoi(re->commandbuf)<=re->question->nopts)) {

+                        /* invalid reply: reset buf */

+                        re->commandbuf[0]=0;

+                        re->headerdirty=1;

+                        return(-1);

+                }

+                /* send reply */

+                redata_loadquestions_reply(re->data,re->question,atoi(re->commandbuf)-1);

+                re->headerdirty=1;

         }

         re->command=NULL;

         re->commandbuf[0]='\0';

@@ -536,7 +594,9 @@ re_moveupdown(re_t *re, int totalinc)

         inc=(totalinc<0)?-1:1;

         newpos=re->cursorpos; /* get rid of compiler warning (will be overwitten in the loop as totalinc never is 0) */

         for(doneinc=0;doneinc!=totalinc;doneinc+=inc) {

+#if 0

 fprintf(stderr,"MOVING from cursorpos:%li line:%i col:%i\n",re->cursorpos,re->curline,re->curcol);

+#endif

                 if((inc==-1 && redata_line_prevrealstart(re->data,re->cursorpos,&realstart)==-1)

                    || (inc==1 && redata_line_nextrealstart(re->data,re->cursorpos,&realstart)==-1)) {

                         break; /* couldn't get current line data, we are at start/end */

@@ -549,17 +609,25 @@ fprintf(stderr,"MOVING from cursorpos:%li line:%i col:%i\n",re->cursorpos,re->cu

                 }

                 if(re->curline>(re->originline+re->maxrow-LINEFORCESCROLL))

                         re->originline+=LINEFORCESCROLL;

+#if 0

 fprintf(stderr,"MOVING   to cursorpos:%li line:%i col:%i\n",re->cursorpos,re->curline,re->curcol);

+#endif

         }

         if(redata_line_inccol(re->data,re->cursorpos,re->curcol,&newpos2,NULL)==-1) {

                 /* error advancing cursor, "emergency" repositioning */

+#if 0

 fprintf(stderr,"COLUMN ERROR\n");

+#endif

                 re->curcol=0;

                 newpos2=newpos;

         }

+#if 0

 fprintf(stderr,"COLUMN from cursorpos:%li line:%i col:%i\n",re->cursorpos,re->curline,re->curcol);

+#endif

         re->cursorpos=newpos2;

+#if 0

 fprintf(stderr,"COLUMN   to cursorpos:%li line:%i col:%i\n",re->cursorpos,re->curline,re->curcol);

+#endif

         re->contentsdirty=1;

         re->headerdirty=1;

         return(0);

@@ -701,6 +769,21 @@ re_drawheader_command(re_t *re)

         } else if(strcmp(re->command,COMMAND_WARNING)==0) {

                 reui_fill(re->ui,0,0,re->ui->w,re->ui->fontheight,COLOR_WARNINGBG);

                 reui_printf(re->ui,0,0,COLOR_WARNINGFG,"%s %s",re->command,re->commandbuf);

+        } else if(strcmp(re->command,COMMAND_QUESTION)==0) {

+                question_t *q;

+                reui_fill(re->ui,0,0,re->ui->w,re->ui->fontheight,COLOR_QUERYBG);

+#warning XXX TODO: suppont arbitrary number of options, highlight current option

+                q=re->question;

+                re->commandbuf[sizeof(re->commandbuf)-1]='\0';

+                reui_printf(re->ui,0,0,COLOR_QUERYFG,"%s %s: %s %s%s%s%s%s%s%s%s: %s"

+                   ,re->command

+                   ,(q->titleshort!=NULL)?q->titleshort:q->title

+                   ,(q->bodyshort!=NULL)?q->bodyshort:q->body

+                   ,(q->nopts>0)?"1.":"",(q->nopts>0)?(q->optsshort!=NULL)?q->optsshort[0]:q->opts[0]:""

+                   ,(q->nopts>1)?" 2.":"",(q->nopts>1)?(q->optsshort!=NULL)?q->optsshort[1]:q->opts[1]:""

+                   ,(q->nopts>2)?" 3.":"",(q->nopts>2)?(q->optsshort!=NULL)?q->optsshort[2]:q->opts[2]:""

+                   ,(q->nopts>3)?" 4.":"",(q->nopts>4)?(q->optsshort!=NULL)?q->optsshort[3]:q->opts[3]:""

+                   ,re->commandbuf);

         } else {

                 reui_fill(re->ui,0,0,re->ui->w,re->ui->fontheight,COLOR_QUERYBG);

                 re->commandbuf[sizeof(re->commandbuf)-1]='\0';