From patchwork Mon Jul 30 19:22:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Poirier X-Patchwork-Id: 1255931 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 5D4323FCC5 for ; Mon, 30 Jul 2012 19:24:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754358Ab2G3TX5 (ORCPT ); Mon, 30 Jul 2012 15:23:57 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:62821 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754668Ab2G3TXE (ORCPT ); Mon, 30 Jul 2012 15:23:04 -0400 Received: by yenl2 with SMTP id l2so5222756yen.19 for ; Mon, 30 Jul 2012 12:23:03 -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=Ab4iLTW0HcZAufe92K7iiCPJToKKusxiVSyJUf7orUQ=; b=QkVZ1b8FOBmVRXrEHZopE7OoH0p04HPZaUWuh0oQzjupeQ3v/gwl8UghN0bTUizsW1 2+EpR+ZfIIOvzrTJDaIwnY+rNBTkZ5KJYCLP7M51cuxxPGLo4X2Iyrj3pqifCij9XxZ9 OG4yct1hSUh4fQpvblMaihxqrR25ImvabBwBhrYBoa8mX0ker0NuL7BNQ+nt8japMHUo 3wi0KM9uAOnl8Qd9GuJS//8Ucagi0cB17eoS25/+zIsIwrfdaPmQjaWqTPyU7YiDTi/j 9OSo9WXvwe8N50DaKofVOlLAClITJOHiHObXgB/8BYb6xR6xP6L04Tej+Jw+i4M+a6C3 u29Q== Received: by 10.50.94.133 with SMTP id dc5mr146539igb.16.1343676183464; Mon, 30 Jul 2012 12:23:03 -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.23.01 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 30 Jul 2012 12:23:02 -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 3/6] menuconfig: Extend dialog_textbox so that it can return to a scrolled position Date: Mon, 30 Jul 2012 15:22:07 -0400 Message-Id: <1343676130-29770-4-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 | 2 +- scripts/kconfig/lxdialog/textbox.c | 24 +++++++++++++++++++++++- scripts/kconfig/mconf.c | 8 ++++---- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/scripts/kconfig/lxdialog/dialog.h b/scripts/kconfig/lxdialog/dialog.h index 014c029..8e7f43b 100644 --- a/scripts/kconfig/lxdialog/dialog.h +++ b/scripts/kconfig/lxdialog/dialog.h @@ -210,7 +210,7 @@ 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 *keys); + int *keys, int *_vscroll, int *_hscroll); 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 eb4ee92..506a095 100644 --- a/scripts/kconfig/lxdialog/textbox.c +++ b/scripts/kconfig/lxdialog/textbox.c @@ -51,7 +51,7 @@ static void refresh_text_box(WINDOW *dialog, WINDOW *box, int boxh, int boxw, * keys is a null-terminated array */ int dialog_textbox(const char *title, const char *tbuf, int initial_height, - int initial_width, int *keys) + int initial_width, int *keys, int *_vscroll, int *_hscroll) { int i, x, y, cur_x, cur_y, key = 0; int height, width, boxh, boxw; @@ -65,6 +65,15 @@ int dialog_textbox(const char *title, const char *tbuf, int initial_height, buf = tbuf; page = buf; /* page is pointer to start of page to be displayed */ + if (_vscroll && *_vscroll) { + begin_reached = 0; + + for (i = 0; i < *_vscroll; i++) + get_line(); + } + if (_hscroll) + hscroll = *_hscroll; + do_resize: getmaxyx(stdscr, height, width); if (height < 8 || width < 8) @@ -275,6 +284,19 @@ do_resize: } delwin(box); delwin(dialog); + if (_vscroll) { + const char *s; + + s = buf; + *_vscroll = 0; + back_lines(page_length); + while (s < page && (s = strchr(s, '\n'))) { + (*_vscroll)++; + s++; + } + } + if (_hscroll) + *_hscroll = hscroll; return key; } diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index 116e5da..c57cc6a 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c @@ -281,7 +281,7 @@ 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); + int *keys, int *vscroll, int *hscroll); 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); @@ -622,15 +622,15 @@ static void conf(struct menu *menu) } static int show_textbox_ext(const char *title, const char *text, int r, int c, - int *keys) + int *keys, int *vscroll, int *hscroll) { dialog_clear(); - return dialog_textbox(title, text, r, c, keys); + return dialog_textbox(title, text, r, c, keys, vscroll, hscroll); } static void show_textbox(const char *title, const char *text, int r, int c) { - show_textbox_ext(title, text, r, c, (int []) {0}); + show_textbox_ext(title, text, r, c, (int []) {0}, NULL, NULL); } static void show_helptext(const char *title, const char *text)