Renamed mc_refresh() to tty_refresh().
Этот коммит содержится в:
родитель
7ed7c83e8d
Коммит
069aab9ebc
@ -135,7 +135,7 @@ void edit_refresh_cmd (WEdit * edit)
|
||||
}
|
||||
touchwin(stdscr);
|
||||
#endif /* !HAVE_SLANG */
|
||||
mc_refresh();
|
||||
tty_refresh ();
|
||||
doupdate();
|
||||
}
|
||||
|
||||
|
@ -348,7 +348,7 @@ background_attention (int fd, void *closure)
|
||||
g_free (data [i]);
|
||||
|
||||
do_refresh ();
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
doupdate ();
|
||||
return 0;
|
||||
}
|
||||
|
@ -552,7 +552,7 @@ static inline void dialog_handle_key (Dlg_head *h, int d_key)
|
||||
#else
|
||||
touchwin (stdscr);
|
||||
#endif /* HAVE_SLANG */
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
doupdate ();
|
||||
break;
|
||||
|
||||
|
24
src/file.c
24
src/file.c
@ -429,7 +429,7 @@ copy_file_file (FileOpContext *ctx, const char *src_path, const char *dst_path,
|
||||
file_progress_show_target (ctx, dst_path) == FILE_ABORT)
|
||||
return FILE_ABORT;
|
||||
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
|
||||
while (mc_stat (dst_path, &sb2) == 0) {
|
||||
if (S_ISDIR (sb2.st_mode)) {
|
||||
@ -584,7 +584,7 @@ copy_file_file (FileOpContext *ctx, const char *src_path, const char *dst_path,
|
||||
|
||||
return_status = file_progress_show (ctx, 0, file_size);
|
||||
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
|
||||
if (return_status != FILE_CONT)
|
||||
goto ret;
|
||||
@ -684,7 +684,7 @@ copy_file_file (FileOpContext *ctx, const char *src_path, const char *dst_path,
|
||||
return_status =
|
||||
file_progress_show (ctx, n_read_total + ctx->do_reget, file_size);
|
||||
}
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
if (return_status != FILE_CONT)
|
||||
goto ret;
|
||||
}
|
||||
@ -998,7 +998,7 @@ move_file_file (FileOpContext *ctx, const char *s, const char *d,
|
||||
|| file_progress_show_target (ctx, d) == FILE_ABORT)
|
||||
return FILE_ABORT;
|
||||
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
|
||||
while (mc_lstat (s, &src_stats) != 0) {
|
||||
/* Source doesn't exist */
|
||||
@ -1073,7 +1073,7 @@ move_file_file (FileOpContext *ctx, const char *s, const char *d,
|
||||
|| (return_status = file_progress_show (ctx, 0, 0)) != FILE_CONT)
|
||||
return return_status;
|
||||
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
|
||||
retry_src_remove:
|
||||
if (mc_unlink (s)) {
|
||||
@ -1109,7 +1109,7 @@ move_dir_dir (FileOpContext *ctx, const char *s, const char *d,
|
||||
file_progress_show_target (ctx, d) == FILE_ABORT)
|
||||
return FILE_ABORT;
|
||||
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
|
||||
mc_stat (s, &sbuf);
|
||||
dstat_ok = (mc_stat (d, &dbuf) == 0);
|
||||
@ -1180,7 +1180,7 @@ move_dir_dir (FileOpContext *ctx, const char *s, const char *d,
|
||||
|| (return_status = file_progress_show (ctx, 0, 0)) != FILE_CONT)
|
||||
goto ret;
|
||||
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
if (ctx->erase_at_end) {
|
||||
for (; erase_list && return_status != FILE_ABORT;) {
|
||||
if (S_ISDIR (erase_list->st_mode)) {
|
||||
@ -1219,7 +1219,7 @@ erase_file (FileOpContext *ctx, const char *s, off_t *progress_count,
|
||||
|
||||
if (file_progress_show_deleting (ctx, s) == FILE_ABORT)
|
||||
return FILE_ABORT;
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
|
||||
if (progress_count && mc_lstat (s, &buf)) {
|
||||
/* ignore, most likely the mc_unlink fails, too */
|
||||
@ -1284,7 +1284,7 @@ recursive_erase (FileOpContext *ctx, const char *s, off_t *progress_count,
|
||||
return return_status;
|
||||
if (file_progress_show_deleting (ctx, s) == FILE_ABORT)
|
||||
return FILE_ABORT;
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
|
||||
while (my_rmdir (s)) {
|
||||
return_status =
|
||||
@ -1336,7 +1336,7 @@ erase_dir (FileOpContext *ctx, const char *s, off_t *progress_count,
|
||||
|
||||
if (file_progress_show_deleting (ctx, s) == FILE_ABORT)
|
||||
return FILE_ABORT;
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
|
||||
/* The old way to detect a non empty directory was:
|
||||
error = my_rmdir (s);
|
||||
@ -1378,7 +1378,7 @@ erase_dir_iff_empty (FileOpContext *ctx, const char *s)
|
||||
|
||||
if (file_progress_show_deleting (ctx, s) == FILE_ABORT)
|
||||
return FILE_ABORT;
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
|
||||
if (1 != check_dir_is_empty (s)) /* not empty or error */
|
||||
return FILE_CONT;
|
||||
@ -2112,7 +2112,7 @@ panel_operate (void *source_panel, FileOperation operation,
|
||||
&& file_progress_show (ctx, 0, 0) == FILE_ABORT)
|
||||
goto clean_up;
|
||||
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
} /* Loop for every file */
|
||||
} /* Many entries */
|
||||
clean_up:
|
||||
|
@ -665,7 +665,7 @@ search_content (Dlg_head *h, const char *directory, const char *filename)
|
||||
g_snprintf (buffer, sizeof (buffer), _("Grepping in %s"), str_trunc (filename, FIND2_X_USE));
|
||||
|
||||
status_update (buffer);
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
|
||||
enable_interrupt_key ();
|
||||
got_interrupt ();
|
||||
@ -897,7 +897,7 @@ do_search (struct Dlg_head *h)
|
||||
tty_setcolor (DLG_NORMALC (h));
|
||||
dlg_move (h, FIND2_Y - 7, FIND2_X - 4);
|
||||
addch (rotating_dash [pos]);
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
}
|
||||
} else
|
||||
goto do_search_begin;
|
||||
|
@ -631,7 +631,7 @@ clr_scr (void)
|
||||
{
|
||||
standend ();
|
||||
dlg_erase (midnight_dlg);
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
doupdate ();
|
||||
}
|
||||
|
||||
@ -826,7 +826,7 @@ void set_hintbar(const char *str)
|
||||
{
|
||||
label_set_text (the_hint, str);
|
||||
if (ok_to_refresh > 0)
|
||||
mc_refresh();
|
||||
tty_refresh();
|
||||
}
|
||||
|
||||
void print_vfs_message (const char *msg, ...)
|
||||
@ -857,7 +857,7 @@ void print_vfs_message (const char *msg, ...)
|
||||
|
||||
/* Restore cursor position */
|
||||
tty_gotoyx (row, col);
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
return;
|
||||
}
|
||||
|
||||
@ -879,7 +879,7 @@ void rotate_dash (void)
|
||||
tty_gotoyx (0, COLS - 1);
|
||||
tty_setcolor (NORMAL_COLOR);
|
||||
addch (rotating_dash [pos]);
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
pos++;
|
||||
}
|
||||
|
||||
|
@ -93,7 +93,7 @@ _("Please press the %s\n"
|
||||
"If you want to escape, press a single Escape key\n"
|
||||
"and wait as well."),
|
||||
_(key_name_conv_tab [action - B_USER].longname));
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
if (learnkeys [action - B_USER].sequence != NULL) {
|
||||
g_free (learnkeys [action - B_USER].sequence);
|
||||
learnkeys [action - B_USER].sequence = NULL;
|
||||
|
@ -537,7 +537,7 @@ void
|
||||
repaint_screen (void)
|
||||
{
|
||||
do_refresh ();
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
}
|
||||
|
||||
/* Wrapper for do_subshell_chdir, check for availability of subshell */
|
||||
@ -748,7 +748,7 @@ load_prompt (int fd, void *unused)
|
||||
* automatically: force a cursor update and a screen refresh
|
||||
*/
|
||||
update_cursor (midnight_dlg);
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
}
|
||||
update_prompt = 1;
|
||||
return 0;
|
||||
|
@ -2093,7 +2093,7 @@ start_search (WPanel *panel)
|
||||
panel->search_char[0] = '\0';
|
||||
panel->search_chpoint = 0;
|
||||
display_mini_info (panel);
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1069,7 +1069,7 @@ get_event (struct Gpm_Event *event, int redo_event, int block)
|
||||
static int dirty = 3;
|
||||
|
||||
if ((dirty == 3) || is_idle ()) {
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
doupdate ();
|
||||
dirty = 1;
|
||||
} else
|
||||
|
@ -97,7 +97,7 @@ tty_print_alt_char (int c)
|
||||
}
|
||||
|
||||
void
|
||||
tty_print_string(const char *s)
|
||||
tty_print_string (const char *s)
|
||||
{
|
||||
addstr (str_term_form (s));
|
||||
}
|
||||
@ -120,7 +120,7 @@ tty_tgetstr (const char *cap)
|
||||
}
|
||||
|
||||
void
|
||||
mc_refresh (void)
|
||||
tty_refresh (void)
|
||||
{
|
||||
#ifdef WITH_BACKGROUND
|
||||
if (!we_are_background)
|
||||
|
@ -514,13 +514,12 @@ tty_print_string (const char *s)
|
||||
SLsmg_write_string (str_unconst (str_term_form (s)));
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
tty_printf (const char *fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
||||
va_start(args, fmt);
|
||||
va_start (args, fmt);
|
||||
SLsmg_vprintf (str_unconst(fmt), args);
|
||||
va_end (args);
|
||||
}
|
||||
@ -532,7 +531,7 @@ tty_tgetstr (const char *cap)
|
||||
}
|
||||
|
||||
void
|
||||
mc_refresh (void)
|
||||
tty_refresh (void)
|
||||
{
|
||||
#ifdef WITH_BACKGROUND
|
||||
if (!we_are_background)
|
||||
|
@ -65,6 +65,6 @@ extern char *tty_tgetstr (const char *name);
|
||||
#define KEY_KP_SUBTRACT 4002
|
||||
#define KEY_KP_MULTIPLY 4003
|
||||
|
||||
void mc_refresh (void);
|
||||
void tty_refresh (void);
|
||||
|
||||
#endif /* MC_TTY_H */
|
||||
|
@ -3178,7 +3178,7 @@ do_search (WView *view)
|
||||
|
||||
if (verbose) {
|
||||
d = create_message (D_NORMAL, _("Search"), _("Searching %s"), view->last_search_string);
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
}
|
||||
|
||||
/*for avoid infinite search loop we need to increase or decrease start offset of search */
|
||||
@ -3226,7 +3226,7 @@ do_search (WView *view)
|
||||
dlg_run_done (d);
|
||||
destroy_dlg (d);
|
||||
d = create_message (D_NORMAL, _("Search"), _("Seeking to search result"));
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
}
|
||||
|
||||
view_moveto_match (view);
|
||||
|
@ -2251,7 +2251,7 @@ listbox_event (Gpm_Event *event, void *data)
|
||||
/* We need to refresh ourselves since the dialog manager doesn't */
|
||||
/* know about this event */
|
||||
listbox_callback (w, WIDGET_DRAW, 0);
|
||||
mc_refresh ();
|
||||
tty_refresh ();
|
||||
return MOU_REPEAT;
|
||||
}
|
||||
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user