mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 12:56:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

* screen.c (paint_dir): Don't make panel clean here.

Browse Source 
(panel_update_contents): Do it here.
(panel_callback): Repaint the panel on focus.
(select_item): Don't paint anything here.
This commit is contained in:
Pavel Roskin 2003-09-11 00:01:16 +00:00
parent c847c91d61
commit 9ddc1c9cbc
2 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,5 +1,10 @@
2003-09-10 Pavel Roskin <proski@gnu.org> 2003-09-10 Pavel Roskin <proski@gnu.org>
* screen.c (paint_dir): Don't make panel clean here.
(panel_update_contents): Do it here.
(panel_callback): Repaint the panel on focus.
(select_item): Don't paint anything here.
* dlg.h (send_message): Use cb_ret_t and widget_msg_t. * dlg.h (send_message): Use cb_ret_t and widget_msg_t.
* main.c (menu_cmd): If the current panel is inactive, use the * main.c (menu_cmd): If the current panel is inactive, use the

35
src/screen.c
View File

@ -704,7 +704,6 @@ paint_dir (WPanel *panel)
repaint_file (panel, i+panel->top_file, 1, color, 0); repaint_file (panel, i+panel->top_file, 1, color, 0);
} }
standend (); standend ();
panel->dirty = 0;
} }
static void static void
@ -786,6 +785,7 @@ panel_update_contents (WPanel *panel)
show_dir (panel); show_dir (panel);
paint_dir (panel); paint_dir (panel);
display_mini_info (panel); display_mini_info (panel);
panel->dirty = 0;
} }
/* Repaint everything, including frame and separator */ /* Repaint everything, including frame and separator */
@ -1481,21 +1481,18 @@ ITEMS (WPanel *p)
return llines (p); return llines (p);
} }
/* This function sets redisplays the selection */ /* Select current item and readjust the panel */
void void
select_item (WPanel *panel) select_item (WPanel *panel)
{ {
int repaint = 0;
int items = ITEMS (panel); int items = ITEMS (panel);
/* Although currently all over the code we set the selection and /* Although currently all over the code we set the selection and
top file to decent values before calling select_item, I could top file to decent values before calling select_item, I could
forget it someday, so it's better to do the actual fitting here */ forget it someday, so it's better to do the actual fitting here */
if (panel->top_file < 0) { if (panel->top_file < 0)
repaint = 1;
panel->top_file = 0; panel->top_file = 0;
}
if (panel->selected < 0) if (panel->selected < 0)
panel->selected = 0; panel->selected = 0;
@ -1503,37 +1500,22 @@ select_item (WPanel *panel)
if (panel->selected > panel->count - 1) if (panel->selected > panel->count - 1)
panel->selected = panel->count - 1; panel->selected = panel->count - 1;
if (panel->top_file > panel->count - 1) { if (panel->top_file > panel->count - 1)
repaint = 1;
panel->top_file = panel->count - 1; panel->top_file = panel->count - 1;
}
if ((panel->count - panel->top_file) < items) { if ((panel->count - panel->top_file) < items) {
repaint = 1;
panel->top_file = panel->count - items; panel->top_file = panel->count - items;
if (panel->top_file < 0) if (panel->top_file < 0)
panel->top_file = 0; panel->top_file = 0;
} }
if (panel->selected < panel->top_file) { if (panel->selected < panel->top_file)
repaint = 1;
panel->top_file = panel->selected; panel->top_file = panel->selected;
}
if ((panel->selected - panel->top_file) >= items) { if ((panel->selected - panel->top_file) >= items)
repaint = 1;
panel->top_file = panel->selected - items + 1; panel->top_file = panel->selected - items + 1;
}
if (repaint) panel->dirty = 1;
paint_panel (panel);
else {
if (panel->active)
repaint_file (panel, panel->selected, 1,
2 * selection (panel)->f.marked + 1, 0);
}
display_mini_info (panel);
execute_hooks (select_file_hook); execute_hooks (select_file_hook);
} }
@ -2196,8 +2178,9 @@ panel_callback (WPanel *panel, widget_msg_t msg, int parm)
subshell_chdir (panel->cwd); subshell_chdir (panel->cwd);
update_xterm_title_path (); update_xterm_title_path ();
show_dir (panel);
select_item (panel); select_item (panel);
show_dir (panel);
paint_dir (panel);
define_label (h, 1, _("Help"), help_cmd); define_label (h, 1, _("Help"), help_cmd);
define_label (h, 2, _("Menu"), user_file_menu_cmd); define_label (h, 2, _("Menu"), user_file_menu_cmd);