fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not display a mark when files are auto-saved

Browse Source 
This is kind of useless since users are not able to react to an
auto-save notification. It also causes all kinds of problems if the
status bar is in a non-standard mode (message, prompt, ...) and is prone
to race conditions if the status bar is updated by another thread at the
same time.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2012-11-23 10:53:37 +01:00
parent e269f09438
commit e16ac0a8a8
2 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/calcurse.h
View File

@ -580,7 +580,6 @@ enum export_type {
/* To customize the display when saving data. */ /* To customize the display when saving data. */
enum save_display { enum save_display {
IO_SAVE_DISPLAY_BAR, IO_SAVE_DISPLAY_BAR,
IO_SAVE_DISPLAY_MARK,
IO_SAVE_DISPLAY_NONE IO_SAVE_DISPLAY_NONE
}; };

24
src/io.c
View File

@ -302,23 +302,6 @@ void io_extract_data(char *dst_data, const char *org, int len)
*dst_data = '\0'; *dst_data = '\0';
} }
static void display_mark(void)
{
const int DISPLAY_TIME = 1;
WINDOW *mwin;
mwin = newwin(1, 2, 1, col - 3);
custom_apply_attr(mwin, ATTR_HIGHEST);
mvwaddstr(mwin, 0, 0, "**");
wins_wrefresh(mwin);
sleep(DISPLAY_TIME);
mvwaddstr(mwin, 0, 0, " ");
wins_wrefresh(mwin);
delwin(mwin);
wins_doupdate();
}
static pthread_mutex_t io_save_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t io_save_mutex = PTHREAD_MUTEX_INITIALIZER;
/* /*
@ -412,8 +395,6 @@ void io_save_cal(enum save_display display)
if (ui_mode == UI_CURSES && display == IO_SAVE_DISPLAY_BAR if (ui_mode == UI_CURSES && display == IO_SAVE_DISPLAY_BAR
&& conf.progress_bar) && conf.progress_bar)
show_bar = 1; show_bar = 1;
else if (ui_mode == UI_CURSES && display == IO_SAVE_DISPLAY_MARK)
display_mark();
if (show_bar) if (show_bar)
progress_bar(PROGRESS_BAR_SAVE, PROGRESS_BAR_CONF); progress_bar(PROGRESS_BAR_SAVE, PROGRESS_BAR_CONF);
@ -436,8 +417,7 @@ void io_save_cal(enum save_display display)
ERROR_MSG("%s", access_pb); ERROR_MSG("%s", access_pb);
/* Print a message telling data were saved */ /* Print a message telling data were saved */
if (ui_mode == UI_CURSES && conf.system_dialogs if (ui_mode == UI_CURSES && conf.system_dialogs) {
&& display != IO_SAVE_DISPLAY_MARK) {
status_mesg(save_success, enter); status_mesg(save_success, enter);
wgetch(win[STA].p); wgetch(win[STA].p);
} }
@ -1152,7 +1132,7 @@ static void *io_psave_thread(void *arg)
for (;;) { for (;;) {
sleep(delay * MININSEC); sleep(delay * MININSEC);
io_save_cal(IO_SAVE_DISPLAY_MARK); io_save_cal(IO_SAVE_DISPLAY_NONE);
} }
} }