...
|
...
|
@@ -32,6 +32,7 @@
|
32
|
32
|
#define SELECTBUFBLOCK 16384
|
33
|
33
|
|
34
|
34
|
#define COMMAND_WARNING "(!)"
|
|
35
|
+#define COMMAND_INFO "(i)"
|
35
|
36
|
#define COMMAND_GOTOLINE "Go to line:"
|
36
|
37
|
#define COMMAND_SEARCHFORWARD "Search:"
|
37
|
38
|
#define COMMAND_REPLACEWHAT "Search for:"
|
...
|
...
|
@@ -40,14 +41,17 @@
|
40
|
41
|
#define COMMAND_QUESTION "(?)"
|
41
|
42
|
#define COMMAND_EXIT "Exit"
|
42
|
43
|
|
43
|
|
-#define COLOR_STATUSBG "\x00\x00\xff\xff"
|
44
|
|
-#define COLOR_STATUSFG "\xff\xff\x00\xff"
|
|
44
|
+#define COLOR_STATUSBG "\x14\x3a\xaf\xff"
|
|
45
|
+#define COLOR_STATUSFG "\xe6\xdc\x5d\xff"
|
45
|
46
|
|
46
|
|
-#define COLOR_QUERYBG "\xc0\xff\x00\xff"
|
47
|
|
-#define COLOR_QUERYFG "\x3f\x00\xff\xff"
|
|
47
|
+#define COLOR_QUERYBG "\xad\x92\x5e\xff"
|
|
48
|
+#define COLOR_QUERYFG "\xd0\xef\x4f\xff"
|
48
|
49
|
|
49
|
|
-#define COLOR_WARNINGBG "\xff\x00\x00\xff"
|
50
|
|
-#define COLOR_WARNINGFG "\xff\xff\x00\xff"
|
|
50
|
+#define COLOR_WARNINGBG "\xba\x07\x07\xff"
|
|
51
|
+#define COLOR_WARNINGFG "\xe6\xdc\x5d\xff"
|
|
52
|
+
|
|
53
|
+#define COLOR_INFOBG "\x4e\x8a\x4e\xff"
|
|
54
|
+#define COLOR_INFOFG "\xee\xee\x46\xff"
|
51
|
55
|
|
52
|
56
|
|
53
|
57
|
typedef struct re_t {
|
...
|
...
|
@@ -207,8 +211,8 @@ fprintf(stderr,"REDRAW Header (editing)\n");
|
207
|
211
|
fprintf(stderr,"REDRAW Header (command)\n");
|
208
|
212
|
#endif
|
209
|
213
|
re_drawheader_command(re);
|
210
|
|
- if(strcmp(re->command,COMMAND_WARNING)==0) {
|
211
|
|
- /* the warnings only get shown once, remove it */
|
|
214
|
+ if(strcmp(re->command,COMMAND_WARNING)==0 || strcmp(re->command,COMMAND_INFO)==0) {
|
|
215
|
+ /* the warnings/info only get shown once, remove it */
|
212
|
216
|
re->command=NULL;
|
213
|
217
|
re->commandbuf[0]='\0';
|
214
|
218
|
re->showingwarning=1;
|
...
|
...
|
@@ -237,7 +241,7 @@ fprintf(stderr,"RENDER\n");
|
237
|
241
|
case SDL_KEYDOWN:
|
238
|
242
|
case SDL_TEXTINPUT:
|
239
|
243
|
case SDL_TEXTEDITING:
|
240
|
|
- if(re->command==NULL || strcmp(re->command,COMMAND_WARNING)==0)
|
|
244
|
+ if(re->command==NULL || strcmp(re->command,COMMAND_WARNING)==0 || strcmp(re->command,COMMAND_INFO)==0)
|
241
|
245
|
re_processkey_editing(re,&event);
|
242
|
246
|
else if(re->command[0]=='\0')
|
243
|
247
|
re_processkey_commandwait(re,&event);
|
...
|
...
|
@@ -695,7 +699,7 @@ fprintf(stderr,"SDL_KEYDOWN: BACKSPACE%s\n",(event==&fakeevent)?" (fake)":"");
|
695
|
699
|
char *errormsg=NULL;
|
696
|
700
|
if(redata_save(re->data,re->filename,&errormsg)!=-1)
|
697
|
701
|
errormsg="File saved";
|
698
|
|
- re->command=COMMAND_WARNING;
|
|
702
|
+ re->command=COMMAND_INFO;
|
699
|
703
|
snprintf(re->commandbuf,sizeof(re->commandbuf),errormsg);
|
700
|
704
|
re->commandbuf[sizeof(re->commandbuf)-1]='\0';
|
701
|
705
|
re->headerdirty=1;
|
...
|
...
|
@@ -1049,7 +1053,7 @@ re_processcommand(re_t *re)
|
1049
|
1053
|
re_fixorigin_center(re);
|
1050
|
1054
|
re->headerdirty=1;
|
1051
|
1055
|
re->contentsdirty=1;
|
1052
|
|
- re->command=COMMAND_WARNING;
|
|
1056
|
+ re->command=COMMAND_INFO;
|
1053
|
1057
|
snprintf(re->commandbuf,sizeof(re->commandbuf),"%li subst",total);
|
1054
|
1058
|
re->commandbuf[sizeof(re->commandbuf)-1]='\0';
|
1055
|
1059
|
re->headerdirty=1;
|
...
|
...
|
@@ -1565,6 +1569,9 @@ re_drawheader_command(re_t *re)
|
1565
|
1569
|
} else if(strcmp(re->command,COMMAND_WARNING)==0) {
|
1566
|
1570
|
reui_fill(re->ui,0,0,re->ui->w,re->ui->fontheight,COLOR_WARNINGBG);
|
1567
|
1571
|
reui_printf(re->ui,0,0,COLOR_WARNINGFG,"%s %s",re->command,re->commandbuf);
|
|
1572
|
+ } else if(strcmp(re->command,COMMAND_INFO)==0) {
|
|
1573
|
+ reui_fill(re->ui,0,0,re->ui->w,re->ui->fontheight,COLOR_INFOBG);
|
|
1574
|
+ reui_printf(re->ui,0,0,COLOR_INFOFG,"%s %s",re->command,re->commandbuf);
|
1568
|
1575
|
} else if(strcmp(re->command,COMMAND_QUESTION)==0) {
|
1569
|
1576
|
question_t *q;
|
1570
|
1577
|
reui_fill(re->ui,0,0,re->ui->w,re->ui->fontheight,COLOR_QUERYBG);
|