@@ -6,7 +6,6 @@

  * Author: Dario Rodriguez dario@softhome.net

  * This program is licensed under the terms of GNU GPL v2.1+

  */

-

 #include <stdio.h>

 #include <stdlib.h>

 #include <unistd.h>

@@ -42,8 +41,10 @@

 #define COMMAND_QUESTION "(?)"

 #define COMMAND_EXIT "Exit"

+/* "forest" theme */

 #define COLOR_STATUSBG "\x14\x3a\xaf\xff"

 #define COLOR_STATUSFG "\xe6\xdc\x5d\xff"

+#define COLOR_STATUSFGLIGHT "\x6f\x73\xa3\xff"

 #define COLOR_QUERYBG "\xad\x92\x5e\xff"

 #define COLOR_QUERYFG "\xd0\xef\x4f\xff"

@@ -53,7 +54,7 @@

 #define COLOR_INFOBG "\x4e\x8a\x4e\xff"

 #define COLOR_INFOFG "\xee\xee\x46\xff"

-

+#define COLOR_INFOFGLIGHT "\x84\xa4\x4c\xff"

 typedef struct re_t {

         redata_t *data;

@@ -1561,16 +1562,37 @@ int

 re_drawheader_editing(re_t *re)

 {

         long cursorpos;

+        char linebuf[32],colbuf[32],posbuf[32],sizebuf[32];

+        char *spaceslinebuf,*spacescolbuf,*spacesposbuf,*spacessizebuf;

+        char spaces[128];

+        int lenfilename;

+        char *filename;

+        char *spacesfilename;

         if(re==NULL)

                 return(-1);

         if(redata_linecol2pos(re->data,re->curline,re->curcol,&cursorpos,NULL)!=0)

                 return(0); /* error obtaining position */

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

+        reui_fill(re->ui,0,0,re->ui->w,re->ui->fontheight,redata_needs_saving(re->data)?COLOR_STATUSBG:COLOR_INFOBG);

         /* for the user, lines start at 0 (internally they start at 0) */

-        reui_printf(re->ui,0,0,COLOR_STATUSFG,"File: %s Line:%i Col:%i Pos:%li Size:%li %s"

-          ,re->filename,re->curline+1,re->curcol+1,cursorpos,redata_getused(re->data)

-          ,"");

-#warning #error MAKE THE PREVIOUS LINE LAST %s print: "CHANGED" when unsaved&not-in-reu, "changed" when unsaved but is in reu, "saved" when it is saved.

+        memset(spaces,' ',sizeof(spaces));

+        spaces[sizeof(spaces)-1]='\0';

+        snprintf(linebuf,sizeof(linebuf),"%i",re->curline+1),linebuf[sizeof(linebuf)-1]='\0';

+        spaceslinebuf=spaces+sizeof(spaces)-1-strlen(linebuf);

+        snprintf(colbuf,sizeof(colbuf),"%i",re->curcol+1),colbuf[sizeof(colbuf)-1]='\0';

+        spacescolbuf=spaces+sizeof(spaces)-1-strlen(colbuf);

+        snprintf(posbuf,sizeof(posbuf),"%li",cursorpos),posbuf[sizeof(posbuf)-1]='\0';

+        spacesposbuf=spaces+sizeof(spaces)-1-strlen(posbuf);

+        snprintf(sizebuf,sizeof(sizebuf),"%li",redata_getused(re->data)),sizebuf[sizeof(sizebuf)-1]='\0';

+        spacessizebuf=spaces+sizeof(spaces)-1-strlen(sizebuf);

+        lenfilename=strlen(re->filename);

+        filename=((lenfilename)>(sizeof(spaces)-1))?(re->filename+lenfilename-sizeof(spaces)-1):re->filename;

+        spacesfilename=spaces+sizeof(spaces)-1-strlen(filename);

+        reui_printf(re->ui,0,0,redata_needs_saving(re->data)?COLOR_STATUSFGLIGHT:COLOR_INFOFGLIGHT

+           ,"File:%s%s Line:%s Col:%s Pos:%s Size:%s"

+          ,spacesfilename,redata_needs_saving(re->data)?"*":" ",spaceslinebuf,spacescolbuf,spacesposbuf,spacessizebuf);

+        reui_printf(re->ui,0,0,redata_needs_saving(re->data)?COLOR_STATUSFG:COLOR_INFOFG

+           ,"     %s%s      %s     %s     %s      %s"

+          ,filename," ",linebuf,colbuf,posbuf,sizebuf);

         re->headerdirty=0;

         re->ui->rendererdirty=1;

         return(0);