mirror of https://github.com/MidnightCommander/mc
(widget_redraw): rename to widget_draw.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
parent
35f14be028
commit
60fe701b76
|
@ -244,7 +244,7 @@ button_set_text (WButton * b, const char *text)
|
|||
b->text = parse_hotkey (text);
|
||||
b->hotpos = (b->text.hotkey != NULL) ? str_term_width1 (b->text.start) : -1;
|
||||
w->cols = button_get_len (b);
|
||||
widget_redraw (w);
|
||||
widget_draw (w);
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------------------------------- */
|
||||
|
|
|
@ -74,7 +74,7 @@ check_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d
|
|||
if (parm != ' ')
|
||||
return MSG_NOT_HANDLED;
|
||||
c->state = !c->state;
|
||||
widget_redraw (w);
|
||||
widget_draw (w);
|
||||
send_message (w->owner, w, MSG_NOTIFY, 0, NULL);
|
||||
return MSG_HANDLED;
|
||||
|
||||
|
|
|
@ -154,7 +154,7 @@ gauge_set_value (WGauge * g, int max, int current)
|
|||
max = 1; /* I do not like division by zero :) */
|
||||
g->current = current;
|
||||
g->max = max;
|
||||
widget_redraw (WIDGET (g));
|
||||
widget_draw (WIDGET (g));
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------------------------------- */
|
||||
|
@ -165,7 +165,7 @@ gauge_show (WGauge * g, gboolean shown)
|
|||
if (g->shown != shown)
|
||||
{
|
||||
g->shown = shown;
|
||||
widget_redraw (WIDGET (g));
|
||||
widget_draw (WIDGET (g));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -124,7 +124,7 @@ groupbox_set_title (WGroupbox * g, const char *title)
|
|||
g_free (t);
|
||||
}
|
||||
|
||||
widget_redraw (WIDGET (g));
|
||||
widget_draw (WIDGET (g));
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------------------------------- */
|
||||
|
|
|
@ -148,7 +148,7 @@ hline_set_text (WHLine * l, const char *text)
|
|||
else
|
||||
l->text = g_strdup (text);
|
||||
|
||||
widget_redraw (WIDGET (l));
|
||||
widget_draw (WIDGET (l));
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------------------------------- */
|
||||
|
|
|
@ -1067,7 +1067,7 @@ query_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d
|
|||
listbox_select_entry (LISTBOX (h->current->data), i);
|
||||
end = new_end;
|
||||
input_handle_char (input, parm);
|
||||
widget_redraw (WIDGET (h->current->data));
|
||||
widget_draw (WIDGET (h->current->data));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -1173,7 +1173,7 @@ query_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d
|
|||
if (need_redraw == 2)
|
||||
{
|
||||
insert_text (input, last_text, low);
|
||||
widget_redraw (WIDGET (h->current->data));
|
||||
widget_draw (WIDGET (h->current->data));
|
||||
}
|
||||
else if (need_redraw == 1)
|
||||
{
|
||||
|
|
|
@ -173,7 +173,7 @@ label_set_text (WLabel * label, const char *text)
|
|||
}
|
||||
}
|
||||
|
||||
widget_redraw (w);
|
||||
widget_draw (w);
|
||||
|
||||
if (newcols < w->cols)
|
||||
w->cols = newcols;
|
||||
|
|
|
@ -92,7 +92,7 @@ radio_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d
|
|||
if (r->pos > 0)
|
||||
{
|
||||
r->pos--;
|
||||
widget_redraw (w);
|
||||
widget_draw (w);
|
||||
return MSG_HANDLED;
|
||||
}
|
||||
return MSG_NOT_HANDLED;
|
||||
|
@ -102,7 +102,7 @@ radio_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d
|
|||
if (r->count - 1 > r->pos)
|
||||
{
|
||||
r->pos++;
|
||||
widget_redraw (w);
|
||||
widget_draw (w);
|
||||
return MSG_HANDLED;
|
||||
}
|
||||
return MSG_NOT_HANDLED;
|
||||
|
|
|
@ -434,7 +434,7 @@ widget_is_active (const void *w)
|
|||
/* --------------------------------------------------------------------------------------------- */
|
||||
|
||||
void
|
||||
widget_redraw (Widget * w)
|
||||
widget_draw (Widget * w)
|
||||
{
|
||||
if (w != NULL)
|
||||
{
|
||||
|
@ -503,7 +503,7 @@ widget_replace (Widget * old_w, Widget * new_w)
|
|||
if (should_focus)
|
||||
widget_select (new_w);
|
||||
else
|
||||
widget_redraw (new_w);
|
||||
widget_draw (new_w);
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------------------------------- */
|
||||
|
|
|
@ -185,7 +185,7 @@ void widget_adjust_position (widget_pos_flags_t pos_flags, int *y, int *x, int *
|
|||
void widget_set_size (Widget * widget, int y, int x, int lines, int cols);
|
||||
/* select color for widget in dependance of state */
|
||||
void widget_selectcolor (Widget * w, gboolean focused, gboolean hotkey);
|
||||
void widget_redraw (Widget * w);
|
||||
void widget_draw (Widget * w);
|
||||
void widget_erase (Widget * w);
|
||||
gboolean widget_is_active (const void *w);
|
||||
gboolean widget_overlapped (const Widget * a, const Widget * b);
|
||||
|
|
|
@ -1805,7 +1805,7 @@ user_menu (WEdit * edit, const char *menu_file, int selected_entry)
|
|||
|
||||
edit_cursor_move (edit, curs - edit->buffer.curs1);
|
||||
edit->force |= REDRAW_PAGE;
|
||||
widget_redraw (WIDGET (edit));
|
||||
widget_draw (WIDGET (edit));
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------------------------------- */
|
||||
|
|
|
@ -3416,7 +3416,7 @@ edit_select_codepage_cmd (WEdit * edit)
|
|||
edit_set_codeset (edit);
|
||||
|
||||
edit->force = REDRAW_PAGE;
|
||||
widget_redraw (WIDGET (edit));
|
||||
widget_draw (WIDGET (edit));
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1300,7 +1300,7 @@ edit_update_screen (WEdit * e)
|
|||
edit_render_keypress (e);
|
||||
}
|
||||
|
||||
widget_redraw (WIDGET (find_buttonbar (h)));
|
||||
widget_draw (WIDGET (find_buttonbar (h)));
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------------------------------- */
|
||||
|
|
|
@ -939,7 +939,7 @@ find_add_match (const char *dir, const char *file, gsize start, gsize end)
|
|||
/* Don't scroll */
|
||||
if (matches == 0)
|
||||
listbox_select_first (find_list);
|
||||
widget_redraw (WIDGET (find_list));
|
||||
widget_draw (WIDGET (find_list));
|
||||
|
||||
matches++;
|
||||
found_num_update ();
|
||||
|
|
|
@ -594,7 +594,7 @@ hotlist_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void
|
|||
* (2) Refresh the hotlist.
|
||||
*
|
||||
* We may have run a command that changed the contents of the list.
|
||||
* We therefore need to refresh it. So we do `widget_redraw (lst)`.
|
||||
* We therefore need to refresh it. So we do `widget_draw (lst)`.
|
||||
*/
|
||||
{
|
||||
Widget *lst;
|
||||
|
@ -603,11 +603,11 @@ hotlist_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void
|
|||
|
||||
/* widget_select() already redraws the widget, but since it's a
|
||||
* no-op if the widget is already selected ("focused"), we have
|
||||
* to call widget_redraw() separately. */
|
||||
* to call widget_draw() separately. */
|
||||
if (!widget_get_state (lst, WST_FOCUSED))
|
||||
widget_select (lst);
|
||||
else
|
||||
widget_redraw (lst);
|
||||
widget_draw (lst);
|
||||
}
|
||||
return MSG_HANDLED;
|
||||
|
||||
|
|
|
@ -229,7 +229,7 @@ update_split (const WDialog * h)
|
|||
check_options[0].widget->state = panels_layout.horizontal_equal ? 1 : 0;
|
||||
else
|
||||
check_options[0].widget->state = panels_layout.vertical_equal ? 1 : 0;
|
||||
widget_redraw (WIDGET (check_options[0].widget));
|
||||
widget_draw (WIDGET (check_options[0].widget));
|
||||
|
||||
tty_setcolor (check_options[0].widget->state ? DISABLED_COLOR : COLOR_NORMAL);
|
||||
|
||||
|
|
|
@ -1111,10 +1111,10 @@ static void
|
|||
update_dirty_panels (void)
|
||||
{
|
||||
if (get_current_type () == view_listing && current_panel->dirty)
|
||||
widget_redraw (WIDGET (current_panel));
|
||||
widget_draw (WIDGET (current_panel));
|
||||
|
||||
if (get_other_type () == view_listing && other_panel->dirty)
|
||||
widget_redraw (WIDGET (other_panel));
|
||||
widget_draw (WIDGET (other_panel));
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------------------------------- */
|
||||
|
|
|
@ -2711,7 +2711,7 @@ do_search (WPanel * panel, int c_code)
|
|||
unselect_item (panel);
|
||||
panel->selected = sel;
|
||||
select_item (panel);
|
||||
widget_redraw (WIDGET (panel));
|
||||
widget_draw (WIDGET (panel));
|
||||
}
|
||||
else if (c_code != KEY_BACKSPACE)
|
||||
{
|
||||
|
@ -3674,7 +3674,7 @@ panel_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d
|
|||
|
||||
bb = find_buttonbar (w->owner);
|
||||
midnight_set_buttonbar (bb);
|
||||
widget_redraw (WIDGET (bb));
|
||||
widget_draw (WIDGET (bb));
|
||||
return MSG_HANDLED;
|
||||
|
||||
case MSG_UNFOCUS:
|
||||
|
@ -3939,7 +3939,7 @@ panel_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event)
|
|||
}
|
||||
|
||||
if (panel->dirty)
|
||||
widget_redraw (w);
|
||||
widget_draw (w);
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------------------------------- */
|
||||
|
|
|
@ -585,7 +585,7 @@ tree_chdir_sel (WTree * tree)
|
|||
message (D_ERROR, MSG_ERROR, _("Cannot chdir to \"%s\"\n%s"),
|
||||
vfs_path_as_str (tree->selected_ptr->name), unix_error_string (errno));
|
||||
|
||||
widget_redraw (WIDGET (current_panel));
|
||||
widget_draw (WIDGET (current_panel));
|
||||
change_panel ();
|
||||
show_tree (tree);
|
||||
}
|
||||
|
@ -979,7 +979,7 @@ tree_toggle_navig (WTree * tree)
|
|||
buttonbar_set_label (b, 4,
|
||||
tree_navigation_flag ? Q_ ("ButtonBar|Static") : Q_ ("ButtonBar|Dynamc"),
|
||||
tree_map, WIDGET (tree));
|
||||
widget_redraw (WIDGET (b));
|
||||
widget_draw (WIDGET (b));
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------------------------------- */
|
||||
|
@ -1158,7 +1158,7 @@ tree_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *da
|
|||
if (widget_get_state (w, WST_FOCUSED))
|
||||
{
|
||||
b = find_buttonbar (h);
|
||||
widget_redraw (WIDGET (b));
|
||||
widget_draw (WIDGET (b));
|
||||
}
|
||||
return MSG_HANDLED;
|
||||
|
||||
|
|
|
@ -204,7 +204,7 @@ mcview_update (WView * view)
|
|||
{
|
||||
view->dpy_bbar_dirty = FALSE;
|
||||
mcview_set_buttonbar (view);
|
||||
widget_redraw (WIDGET (find_buttonbar (WIDGET (view)->owner)));
|
||||
widget_draw (WIDGET (find_buttonbar (WIDGET (view)->owner)));
|
||||
}
|
||||
|
||||
if (view->dirty > dirt_limit)
|
||||
|
|
Loading…
Reference in New Issue