X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-scr.c;h=9a3f3dfc77d0dd1b45dfdbdfff40256ba0e36899;hp=d2455d4408c72ecef8bc41414e95473616b20aae;hb=47bc66a0c744f68a84147b0bd616ab25a242fb70;hpb=f1599796efed1eb67759cf42f47fe4bf6a9bf93c

diff --git a/ui/ncurses/nc-scr.c b/ui/ncurses/nc-scr.c
index d2455d4..9a3f3df 100644
--- a/ui/ncurses/nc-scr.c
+++ b/ui/ncurses/nc-scr.c
@@ -22,6 +22,7 @@
 
 #include <assert.h>
 #include <stdarg.h>
+#include <string.h>
 
 #include "log/log.h"
 #include "talloc/talloc.h"
@@ -38,6 +39,14 @@ void nc_start(void)
 	intrflush(stdscr, FALSE);	/* Disable interrupt flush. */
 	curs_set(0);			/* Make cursor invisible */
 	nodelay(stdscr, TRUE);		/* Enable non-blocking getch() */
+
+	/* We may be operating with an incorrect $TERM type; in this case
+	 * the keymappings will be slightly broken. We want at least
+	 * backspace to work though, so we'll define both DEL and ^H to
+	 * map to backspace */
+	define_key("\x7f", KEY_BACKSPACE);
+	define_key("\x08", KEY_BACKSPACE);
+
 	while (getch() != ERR)		/* flush stdin */
 		(void)0;
 }
@@ -62,11 +71,23 @@ static void nc_scr_status_draw(struct nc_scr *scr)
 
 void nc_scr_frame_draw(struct nc_scr *scr)
 {
-	DBGS("title '%s'\n", scr->frame.title);
+	int ltitle_len, rtitle_len;
+
+	DBGS("ltitle '%s'\n", scr->frame.ltitle);
+	DBGS("rtitle '%s'\n", scr->frame.rtitle);
 	DBGS("help '%s'\n", scr->frame.help);
 	DBGS("status '%s'\n", scr->frame.status);
 
-	mvwaddstr(scr->main_ncw, nc_scr_pos_title, 1, scr->frame.title);
+	ltitle_len = strlen(scr->frame.ltitle);
+	rtitle_len = scr->frame.rtitle ? strlen(scr->frame.rtitle) : 0;
+
+	/* if both ltitle and rtitle don't fit, trim rtitle */
+	if (ltitle_len + rtitle_len + nc_scr_pos_lrtitle_space > COLS - 2)
+		rtitle_len = COLS - 2 - ltitle_len - nc_scr_pos_lrtitle_space;
+
+	mvwaddstr(scr->main_ncw, nc_scr_pos_title, 1, scr->frame.ltitle);
+	mvwaddnstr(scr->main_ncw, nc_scr_pos_title, COLS - rtitle_len - 1,
+			scr->frame.rtitle, rtitle_len);
 	mvwhline(scr->main_ncw, nc_scr_pos_title_sep, 1, ACS_HLINE, COLS - 2);
 
 	mvwhline(scr->main_ncw, LINES - nc_scr_pos_help_sep, 1, ACS_HLINE,