From patchwork Mon Jul 30 19:22:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Poirier X-Patchwork-Id: 1255941 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 43ACE3FCC5 for ; Mon, 30 Jul 2012 19:24:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754269Ab2G3TXD (ORCPT ); Mon, 30 Jul 2012 15:23:03 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:47581 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753487Ab2G3TXB (ORCPT ); Mon, 30 Jul 2012 15:23:01 -0400 Received: by mail-yw0-f46.google.com with SMTP id m54so5227539yhm.19 for ; Mon, 30 Jul 2012 12:23:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=vCl057wGj7ZUMC14i5MpBc6JMZP+hMEJnfmSe/5zS6Y=; b=TMCFndIK8d/ilw8YOrzBHkhHL3hMbET4T229b2un/JuFsCzF/F/575xHeYevFmlSlc 29whn1XIhA+WP1Dy49RRoVBLY5QG0F6BI8tH4ScSO/fLRDpBw7IZ/SL+zSQ+2SBv9lKs kw/9yQyARYfYNXxb7vokxPtovHTo/KKZVA5l5hO7EkVrdehkt++rXZi/TIgtCa7vs90C XmtmWVfth5dk12hgtWPJKHuqMHoF21aepxjFxwU5xmTXWEzFeg0S/SmoEsgayjp8zFtu diQEOTh8RZzgG3AP366XzHh4XyCkGLQEn4cfhu542Hfnq2/V5jIngqF+LoqIh9Eqs/0G Luzg== Received: by 10.50.186.233 with SMTP id fn9mr121034igc.29.1343676180496; Mon, 30 Jul 2012 12:23:00 -0700 (PDT) Received: from localhost.localdomain (modemcable118.38-22-96.mc.videotron.ca. [96.22.38.118]) by mx.google.com with ESMTPS id dk7sm15471252igb.10.2012.07.30.12.22.58 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 30 Jul 2012 12:22:59 -0700 (PDT) From: Benjamin Poirier To: Michal Marek Cc: Lucas De Marchi , Arnaud Lacombe , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Randy Dunlap Subject: [PATCH 2/6] menuconfig: Extend dialog_textbox so that it can exit on arbitrary keypresses Date: Mon, 30 Jul 2012 15:22:06 -0400 Message-Id: <1343676130-29770-3-git-send-email-bpoirier@suse.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1343676130-29770-1-git-send-email-bpoirier@suse.de> References: <1343676130-29770-1-git-send-email-bpoirier@suse.de> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Signed-off-by: Benjamin Poirier --- scripts/kconfig/lxdialog/dialog.h | 3 ++- scripts/kconfig/lxdialog/textbox.c | 31 +++++++++++++++++++++---------- scripts/kconfig/mconf.c | 12 ++++++++++-- 3 files changed, 33 insertions(+), 13 deletions(-) diff --git a/scripts/kconfig/lxdialog/dialog.h b/scripts/kconfig/lxdialog/dialog.h index b5211fc..014c029 100644 --- a/scripts/kconfig/lxdialog/dialog.h +++ b/scripts/kconfig/lxdialog/dialog.h @@ -209,7 +209,8 @@ int first_alpha(const char *string, const char *exempt); int dialog_yesno(const char *title, const char *prompt, int height, int width); int dialog_msgbox(const char *title, const char *prompt, int height, int width, int pause); -int dialog_textbox(const char *title, const char *file, int height, int width); +int dialog_textbox(const char *title, const char *file, int height, int width, + int *keys); int dialog_menu(const char *title, const char *prompt, const void *selected, int *s_scroll); int dialog_checklist(const char *title, const char *prompt, int height, diff --git a/scripts/kconfig/lxdialog/textbox.c b/scripts/kconfig/lxdialog/textbox.c index 264a2b9..eb4ee92 100644 --- a/scripts/kconfig/lxdialog/textbox.c +++ b/scripts/kconfig/lxdialog/textbox.c @@ -47,14 +47,16 @@ static void refresh_text_box(WINDOW *dialog, WINDOW *box, int boxh, int boxw, /* * Display text from a file in a dialog box. + * + * keys is a null-terminated array */ -int dialog_textbox(const char *title, const char *tbuf, - int initial_height, int initial_width) +int dialog_textbox(const char *title, const char *tbuf, int initial_height, + int initial_width, int *keys) { int i, x, y, cur_x, cur_y, key = 0; int height, width, boxh, boxw; - int passed_end; WINDOW *dialog, *box; + bool done = false; begin_reached = 1; end_reached = 0; @@ -122,7 +124,7 @@ do_resize: attr_clear(box, boxh, boxw, dlg.dialog.atr); refresh_text_box(dialog, box, boxh, boxw, cur_y, cur_x); - while ((key != KEY_ESC) && (key != '\n')) { + while (!done) { key = wgetch(dialog); switch (key) { case 'E': /* Exit */ @@ -130,9 +132,9 @@ do_resize: case 'X': case 'x': case 'q': - delwin(box); - delwin(dialog); - return 0; + case '\n': + done = true; + break; case 'g': /* First page */ case KEY_HOME: if (!begin_reached) { @@ -156,6 +158,8 @@ do_resize: case 'k': case KEY_UP: if (!begin_reached) { + int passed_end = 0; + back_lines(page_length + 1); /* We don't call print_page() here but use @@ -169,7 +173,6 @@ do_resize: wscrl(box, -1); /* Scroll box region down one line */ scrollok(box, FALSE); page_length = 0; - passed_end = 0; for (i = 0; i < boxh; i++) { if (!i) { /* print first line of page */ @@ -252,7 +255,8 @@ do_resize: cur_y, cur_x); break; case KEY_ESC: - key = on_key_esc(dialog); + if (on_key_esc(dialog) == KEY_ESC) + done = true; break; case KEY_RESIZE: back_lines(height); @@ -260,11 +264,18 @@ do_resize: delwin(dialog); on_key_resize(); goto do_resize; + default: + for (i = 0; keys[i]; i++) { + if (key == keys[i]) { + done = true; + break; + } + } } } delwin(box); delwin(dialog); - return key; /* ESC pressed */ + return key; } /* diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index f584a28..116e5da 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c @@ -280,6 +280,8 @@ static void conf_choice(struct menu *menu); static void conf_string(struct menu *menu); static void conf_load(void); static void conf_save(void); +static int show_textbox_ext(const char *title, const char *text, int r, int c, + int *keys); static void show_textbox(const char *title, const char *text, int r, int c); static void show_helptext(const char *title, const char *text); static void show_help(struct menu *menu); @@ -619,10 +621,16 @@ static void conf(struct menu *menu) } } -static void show_textbox(const char *title, const char *text, int r, int c) +static int show_textbox_ext(const char *title, const char *text, int r, int c, + int *keys) { dialog_clear(); - dialog_textbox(title, text, r, c); + return dialog_textbox(title, text, r, c, keys); +} + +static void show_textbox(const char *title, const char *text, int r, int c) +{ + show_textbox_ext(title, text, r, c, (int []) {0}); } static void show_helptext(const char *title, const char *text)