From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH v4 01/13] Save terminal width before setting up pager Date: Fri, 3 Feb 2012 20:34:26 +0700 Message-ID: <1328276078-27955-2-git-send-email-pclouds@gmail.com> References: <1328276078-27955-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Feb 03 14:30:53 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RtJE4-0007gv-8i for gcvg-git-2@plane.gmane.org; Fri, 03 Feb 2012 14:30:52 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756304Ab2BCNat convert rfc822-to-quoted-printable (ORCPT ); Fri, 3 Feb 2012 08:30:49 -0500 Received: from mail-pw0-f46.google.com ([209.85.160.46]:47389 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756283Ab2BCNar (ORCPT ); Fri, 3 Feb 2012 08:30:47 -0500 Received: by pbdu11 with SMTP id u11so2900162pbd.19 for ; Fri, 03 Feb 2012 05:30:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=Z/QyJAwBpxT97drIrD1jcYppRWuqkN7yBgqHb3FWvS0=; b=DsNW/rDnwCW65Ft3ATgE3+Inmh03jHGHIPF4nowFKq5PX7RGPC4OIt97phCiJGdvfx PI0xuvKxA36pnFzyq+kuPjhSAhfI3yc8YT08YlTFL5l6GLbckZxTtMZb/txRD7iXk122 LJlDm+zGGNehXbT/u1h9pJLmzRXkwKejptdLQ= Received: by 10.68.233.135 with SMTP id tw7mr7771647pbc.67.1328275847483; Fri, 03 Feb 2012 05:30:47 -0800 (PST) Received: from tre ([115.74.57.120]) by mx.google.com with ESMTPS id e10sm13136882pbv.0.2012.02.03.05.30.39 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 03 Feb 2012 05:30:46 -0800 (PST) Received: by tre (sSMTP sendmail emulation); Fri, 03 Feb 2012 20:34:51 +0700 X-Mailer: git-send-email 1.7.8.36.g69ee2 In-Reply-To: <1328276078-27955-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: term_columns() checks for terminal width via ioctl(2). After redirecting, stdin is no longer terminal to get terminal width. Check terminal width and save it before redirect stdin in setup_pager() and let term_columns() reuse the value. Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- Makefile | 1 + column.h | 6 ++++++ help.c | 23 +---------------------- pager.c | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 22 deletions(-) create mode 100644 column.h diff --git a/Makefile b/Makefile index c457c34..cbbc699 100644 --- a/Makefile +++ b/Makefile @@ -2114,6 +2114,7 @@ builtin/prune.o builtin/reflog.o reachable.o: rea= chable.h builtin/commit.o builtin/revert.o wt-status.o: wt-status.h builtin/tar-tree.o archive-tar.o: tar.h connect.o transport.o url.o http-backend.o: url.h +help.o pager.o: column.h http-fetch.o http-walker.o remote-curl.o transport.o walker.o: walker.= h http.o http-walker.o http-push.o http-fetch.o remote-curl.o: http.h ur= l.h =20 diff --git a/column.h b/column.h new file mode 100644 index 0000000..55d8067 --- /dev/null +++ b/column.h @@ -0,0 +1,6 @@ +#ifndef COLUMN_H +#define COLUMN_H + +extern int term_columns(void); + +#endif diff --git a/help.c b/help.c index cbbe966..672561b 100644 --- a/help.c +++ b/help.c @@ -4,28 +4,7 @@ #include "levenshtein.h" #include "help.h" #include "common-cmds.h" - -/* most GUI terminals set COLUMNS (although some don't export it) */ -static int term_columns(void) -{ - char *col_string =3D getenv("COLUMNS"); - int n_cols; - - if (col_string && (n_cols =3D atoi(col_string)) > 0) - return n_cols; - -#ifdef TIOCGWINSZ - { - struct winsize ws; - if (!ioctl(1, TIOCGWINSZ, &ws)) { - if (ws.ws_col) - return ws.ws_col; - } - } -#endif - - return 80; -} +#include "column.h" =20 void add_cmdname(struct cmdnames *cmds, const char *name, int len) { diff --git a/pager.c b/pager.c index 975955b..772a5a6 100644 --- a/pager.c +++ b/pager.c @@ -6,6 +6,21 @@ #define DEFAULT_PAGER "less" #endif =20 +static int spawned_pager; +static int max_columns; + +static int retrieve_terminal_width(void) +{ +#ifdef TIOCGWINSZ + struct winsize ws; + if (ioctl(1, TIOCGWINSZ, &ws)) /* e.g., ENOSYS */ + return 0; + return ws.ws_col; +#else + return 0; +#endif +} + /* * This is split up from the rest of git so that we can do * something different on Windows. @@ -72,12 +87,17 @@ const char *git_pager(int stdout_is_tty) void setup_pager(void) { const char *pager =3D git_pager(isatty(1)); + int width; =20 if (!pager) return; =20 setenv("GIT_PAGER_IN_USE", "true", 1); =20 + width =3D retrieve_terminal_width(); + if (width) + max_columns =3D width; + /* spawn the pager */ pager_argv[0] =3D pager; pager_process.use_shell =3D 1; @@ -110,3 +130,18 @@ int pager_in_use(void) env =3D getenv("GIT_PAGER_IN_USE"); return env ? git_config_bool("GIT_PAGER_IN_USE", env) : 0; } + +int term_columns() +{ + char *col_string =3D getenv("COLUMNS"); + int n_cols; + + if (col_string && (n_cols =3D atoi(col_string)) > 0) + return n_cols; + + if (spawned_pager && max_columns) + return max_columns; + + n_cols =3D retrieve_terminal_width(); + return n_cols ? n_cols : 80; +} --=20 1.7.8.36.g69ee2