X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-scr.c;h=e95c0ea361e893dae68b14fb2d0fcb4e8d04e208;hp=41e35de849381a568cfb6b4f04ecfd862f23d8a4;hb=18a47a31b46d916c58a31e8784a7c3a3abcae446;hpb=66bf929fa97fabb70198455f9eec2e9ccf0661fa;ds=inline diff --git a/ui/ncurses/nc-scr.c b/ui/ncurses/nc-scr.c index 41e35de..e95c0ea 100644 --- a/ui/ncurses/nc-scr.c +++ b/ui/ncurses/nc-scr.c @@ -36,8 +36,8 @@ static void nc_scr_status_clear(struct nc_scr *scr) static void nc_scr_status_draw(struct nc_scr *scr) { - mvwaddstr(scr->main_ncw, LINES - nc_scr_pos_status, 1, - scr->frame.status); + mvwaddnstr(scr->main_ncw, LINES - nc_scr_pos_status, 1, + scr->frame.status, COLS); } int nc_scr_post(struct nc_scr *scr) @@ -56,7 +56,7 @@ int nc_scr_unpost(struct nc_scr *scr) void nc_scr_frame_draw(struct nc_scr *scr) { - int ltitle_len, rtitle_len; + int ltitle_len, rtitle_len, help_len; DBGS("ltitle '%s'\n", scr->frame.ltitle); DBGS("rtitle '%s'\n", scr->frame.rtitle); @@ -77,6 +77,10 @@ void nc_scr_frame_draw(struct nc_scr *scr) mvwhline(scr->main_ncw, LINES - nc_scr_pos_help_sep, 1, ACS_HLINE, COLS - 2); + help_len = 1 + strlen(scr->frame.help); + if (help_len < COLS) + mvwhline(scr->main_ncw, LINES - nc_scr_pos_help, help_len, ' ', + COLS - help_len); mvwaddstr(scr->main_ncw, LINES - nc_scr_pos_help, 1, scr->frame.help); nc_scr_status_draw(scr); }