Skip to content

Commit

Permalink
kconfig: Add print_title helper in lxdialog
Browse files Browse the repository at this point in the history 
Simplify check for long title and use a helper function in util.c

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
  • Loading branch information
Sam Ravnborg committed Nov 19, 2005
1 parent a06104a commit fa7009d
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 82 deletions.
15 changes: 1 addition & 14 deletions scripts/lxdialog/checklist.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,20 +158,7 @@ int dialog_checklist(const char *title, const char *prompt, int height,
wattrset(dialog, dialog_attr);
waddch(dialog, ACS_RTEE);

if (title != NULL && strlen(title) >= width - 2) {
/* truncate long title -- mec */
char *title2 = malloc(width - 2 + 1);
memcpy(title2, title, width - 2);
title2[width - 2] = '\0';
title = title2;
}

if (title != NULL) {
wattrset(dialog, title_attr);
mvwaddch(dialog, 0, (width - strlen(title)) / 2 - 1, ' ');
waddstr(dialog, (char *)title);
waddch(dialog, ' ');
}
print_title(dialog, title, width);

wattrset(dialog, dialog_attr);
print_autowrap(dialog, prompt, width - 2, 1, 3);
Expand Down
1 change: 1 addition & 0 deletions scripts/lxdialog/dialog.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ void dialog_clear(void);
void color_setup(void);
void print_autowrap(WINDOW * win, const char *prompt, int width, int y, int x);
void print_button(WINDOW * win, const char *label, int y, int x, int selected);
void print_title(WINDOW *dialog, const char *title, int width);
void draw_box(WINDOW * win, int y, int x, int height, int width, chtype box,
chtype border);
void draw_shadow(WINDOW * win, int y, int x, int height, int width);
Expand Down
15 changes: 1 addition & 14 deletions scripts/lxdialog/inputbox.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,20 +66,7 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int width
wattrset(dialog, dialog_attr);
waddch(dialog, ACS_RTEE);

if (title != NULL && strlen(title) >= width - 2) {
/* truncate long title -- mec */
char *title2 = malloc(width - 2 + 1);
memcpy(title2, title, width - 2);
title2[width - 2] = '\0';
title = title2;
}

if (title != NULL) {
wattrset(dialog, title_attr);
mvwaddch(dialog, 0, (width - strlen(title)) / 2 - 1, ' ');
waddstr(dialog, (char *)title);
waddch(dialog, ' ');
}
print_title(dialog, title, width);

wattrset(dialog, dialog_attr);
print_autowrap(dialog, prompt, width - 2, 1, 3);
Expand Down
15 changes: 1 addition & 14 deletions scripts/lxdialog/menubox.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,20 +189,7 @@ int dialog_menu(const char *title, const char *prompt, int height, int width,
wbkgdset(dialog, dialog_attr & A_COLOR);
waddch(dialog, ACS_RTEE);

if (title != NULL && strlen(title) >= width - 2) {
/* truncate long title -- mec */
char *title2 = malloc(width - 2 + 1);
memcpy(title2, title, width - 2);
title2[width - 2] = '\0';
title = title2;
}

if (title != NULL) {
wattrset(dialog, title_attr);
mvwaddch(dialog, 0, (width - strlen(title)) / 2 - 1, ' ');
waddstr(dialog, (char *)title);
waddch(dialog, ' ');
}
print_title(dialog, title, width);

wattrset(dialog, dialog_attr);
print_autowrap(dialog, prompt, width - 2, 1, 3);
Expand Down
14 changes: 1 addition & 13 deletions scripts/lxdialog/msgbox.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,8 @@ int dialog_msgbox(const char *title, const char *prompt, int height, int width,

draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);

if (title != NULL && strlen(title) >= width - 2) {
/* truncate long title -- mec */
char *title2 = malloc(width - 2 + 1);
memcpy(title2, title, width - 2);
title2[width - 2] = '\0';
title = title2;
}
print_title(dialog, title, width);

if (title != NULL) {
wattrset(dialog, title_attr);
mvwaddch(dialog, 0, (width - strlen(title)) / 2 - 1, ' ');
waddstr(dialog, (char *)title);
waddch(dialog, ' ');
}
wattrset(dialog, dialog_attr);
print_autowrap(dialog, prompt, width - 2, 1, 2);

Expand Down
14 changes: 1 addition & 13 deletions scripts/lxdialog/textbox.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,20 +103,8 @@ int dialog_textbox(const char *title, const char *file, int height, int width)
wbkgdset(dialog, dialog_attr & A_COLOR);
waddch(dialog, ACS_RTEE);

if (title != NULL && strlen(title) >= width - 2) {
/* truncate long title -- mec */
char *title2 = malloc(width - 2 + 1);
memcpy(title2, title, width - 2);
title2[width - 2] = '\0';
title = title2;
}
print_title(dialog, title, width);

if (title != NULL) {
wattrset(dialog, title_attr);
mvwaddch(dialog, 0, (width - strlen(title)) / 2 - 1, ' ');
waddstr(dialog, (char *)title);
waddch(dialog, ' ');
}
print_button(dialog, " Exit ", height - 2, width / 2 - 4, TRUE);
wnoutrefresh(dialog);
getyx(dialog, cur_y, cur_x); /* Save cursor position */
Expand Down
14 changes: 14 additions & 0 deletions scripts/lxdialog/util.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,20 @@ void end_dialog(void)
endwin();
}

/* Print the title of the dialog. Center the title and truncate
* tile if wider than dialog (- 2 chars).
**/
void print_title(WINDOW *dialog, const char *title, int width)
{
if (title) {
int tlen = MIN(width - 2, strlen(title));
wattrset(dialog, title_attr);
mvwaddch(dialog, 0, (width - tlen) / 2 - 1, ' ');
mvwaddnstr(dialog, 0, (width - tlen)/2, title, tlen);
waddch(dialog, ' ');
}
}

/*
* Print a string of text in a window, automatically wrap around to the
* next line if the string is too long to fit on one line. Newline
Expand Down
15 changes: 1 addition & 14 deletions scripts/lxdialog/yesno.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,20 +61,7 @@ int dialog_yesno(const char *title, const char *prompt, int height, int width)
wattrset(dialog, dialog_attr);
waddch(dialog, ACS_RTEE);

if (title != NULL && strlen(title) >= width - 2) {
/* truncate long title -- mec */
char *title2 = malloc(width - 2 + 1);
memcpy(title2, title, width - 2);
title2[width - 2] = '\0';
title = title2;
}

if (title != NULL) {
wattrset(dialog, title_attr);
mvwaddch(dialog, 0, (width - strlen(title)) / 2 - 1, ' ');
waddstr(dialog, (char *)title);
waddch(dialog, ' ');
}
print_title(dialog, title, width);

wattrset(dialog, dialog_attr);
print_autowrap(dialog, prompt, width - 2, 1, 3);
Expand Down

0 comments on commit fa7009d

Please sign in to comment.