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 07/13] column: support columns with different widths Date: Fri, 3 Feb 2012 20:34:32 +0700 Message-ID: <1328276078-27955-8-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:31:59 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 1RtJF9-0008Fq-5Z for gcvg-git-2@plane.gmane.org; Fri, 03 Feb 2012 14:31:59 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756409Ab2BCNbi convert rfc822-to-quoted-printable (ORCPT ); Fri, 3 Feb 2012 08:31:38 -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 S1756404Ab2BCNbg (ORCPT ); Fri, 3 Feb 2012 08:31:36 -0500 Received: by mail-pw0-f46.google.com with SMTP id u11so2900162pbd.19 for ; Fri, 03 Feb 2012 05:31:36 -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=OUMIy5NRoQ97cvP5vCa84rJ6yS/GLDnf9yCmRbnh8nY=; b=kBd9vjOA0CQethGk3KVSUgfDHIa03CatMFQxD1gH15+FdbYgQ0YfzJUOVLj4TeReDv 0gVZtBr5nPoKFRqpneoqTn/ImMrUKi718kCQVQGQI26pPGC0VYctiSfLi9vf14+MFnH2 Q2dq7p8QhHDlwcWNaggGEtXveoGtFQxy0+lZo= Received: by 10.68.208.196 with SMTP id mg4mr17436702pbc.108.1328275896004; Fri, 03 Feb 2012 05:31:36 -0800 (PST) Received: from tre ([115.74.57.120]) by mx.google.com with ESMTPS id z5sm13133077pbc.5.2012.02.03.05.31.32 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 03 Feb 2012 05:31:35 -0800 (PST) Received: by tre (sSMTP sendmail emulation); Fri, 03 Feb 2012 20:35:45 +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: Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- column.c | 80 +++++++++++++++++++++++++++++++++++++++++++++= ++++++++ column.h | 2 + t/t9002-column.sh | 22 ++++++++++++++ 3 files changed, 104 insertions(+), 0 deletions(-) diff --git a/column.c b/column.c index 4681106..0f658d9 100644 --- a/column.c +++ b/column.c @@ -19,6 +19,7 @@ struct column_data { =20 int rows, cols; int *len; /* cell length */ + int *width; /* index to the longest row in column */ }; =20 /* return length of 's' in letters, ANSI escapes stripped */ @@ -63,6 +64,69 @@ static void layout(struct column_data *data, int *wi= dth) data->rows =3D DIV_ROUND_UP(data->list->nr, data->cols); } =20 +static void compute_column_width(struct column_data *data) +{ + int i, x, y; + for (x =3D 0; x < data->cols; x++) { + data->width[x] =3D XY2LINEAR(data, x, 0); + for (y =3D 0; y < data->rows; y++) { + i =3D XY2LINEAR(data, x, y); + if (i >=3D data->list->nr) + continue; + if (data->len[data->width[x]] < data->len[i]) + data->width[x] =3D i; + } + } +} + +/* + * Shrink all columns by shortening them one row each time (and adding + * more columns along the way). Hopefully the longest cell will be + * moved to the next column, column is shrunk so we have more space + * for new columns. The process ends when the whole thing no longer + * fits in data->total_width. + */ +static void shrink_columns(struct column_data *data) +{ + int x, y, total_width, cols, rows; + + data->width =3D xrealloc(data->width, + sizeof(*data->width) * data->cols); + for (x =3D 0; x < data->cols; x++) { + data->width[x] =3D 0; + for (y =3D 0; y < data->rows; y++) { + int len1 =3D data->len[data->width[x]]; + int len2 =3D data->len[XY2LINEAR(data, x, y)]; + if (len1 < len2) + data->width[x] =3D y; + } + } + + while (data->rows > 1) { + rows =3D data->rows; + cols =3D data->cols; + + data->rows--; + data->cols =3D DIV_ROUND_UP(data->list->nr, data->rows); + if (data->cols !=3D cols) + data->width =3D xrealloc(data->width, sizeof(*data->width) * data->= cols); + + compute_column_width(data); + + total_width =3D strlen(data->indent); + for (x =3D 0; x < data->cols; x++) { + total_width +=3D data->len[data->width[x]]; + total_width +=3D data->padding; + } + if (total_width > data->total_width) { + data->rows =3D rows; + data->cols =3D cols; + compute_column_width(data); + break; + } + } +} + struct string_list_item *add_cell_to_list(struct string_list *list, int mode, const char *string) @@ -97,7 +161,18 @@ static int display_cell(struct column_data *data, i= nt initial_width, i =3D XY2LINEAR(data, x, y); if (i >=3D data->list->nr) return -1; + len =3D data->len[i]; + if (data->width && data->len[data->width[x]] < initial_width) { + /* + * empty_cell has initial_width chars, if real column + * is narrower, increase len a bit so we fill less + * space. + */ + len +=3D initial_width - data->len[data->width[x]]; + len -=3D data->padding; + } + if (MODE(data->mode) =3D=3D COL_MODE_COLUMN) newline =3D i + data->rows >=3D data->list->nr; else @@ -134,6 +209,9 @@ static void display_table(const struct string_list = *list, =20 layout(&data, &initial_width); =20 + if (mode & COL_DENSE) + shrink_columns(&data); + empty_cell =3D xmalloc(initial_width + 1); memset(empty_cell, ' ', initial_width); empty_cell[initial_width] =3D '\0'; @@ -144,6 +222,7 @@ static void display_table(const struct string_list = *list, } =20 free(data.len); + free(data.width); free(empty_cell); } =20 @@ -242,6 +321,7 @@ static int parse_option(const char *arg, int len, { MODE, "column", COL_MODE_COLUMN }, { MODE, "row", COL_MODE_ROW }, { OPTION, "color", COL_ANSI }, + { OPTION, "dense", COL_DENSE }, }; int i, set, name_len; =20 diff --git a/column.h b/column.h index 38976ea..1912cb0 100644 --- a/column.h +++ b/column.h @@ -7,6 +7,8 @@ #define COL_ENABLED (1 << 4) #define COL_ENABLED_SET (1 << 5) /* Has COL_ENABLED been set by conf= ig? */ #define COL_ANSI (1 << 6) /* Remove ANSI escapes from string = length */ +#define COL_DENSE (1 << 7) /* Shrink columns when possible, + making space for more columns */ =20 struct column_options { int width; diff --git a/t/t9002-column.sh b/t/t9002-column.sh index cffb029..23d340e 100755 --- a/t/t9002-column.sh +++ b/t/t9002-column.sh @@ -71,6 +71,17 @@ EOF test_cmp expected actual ' =20 +test_expect_success '20 columns, dense' ' + cat >expected <<\EOF && +one five nine +two six ten +three seven eleven +four eight +EOF + git column --mode=3Dcolumn,dense < lista > actual && + test_cmp expected actual +' + test_expect_success '20 columns, padding 2' ' cat >expected <<\EOF && one seven @@ -110,4 +121,15 @@ EOF test_cmp expected actual ' =20 +test_expect_success '20 columns, row first, dense' ' + cat >expected <<\EOF && +one two three +four five six +seven eight nine +ten eleven +EOF + git column --mode=3Drow,dense actual && + test_cmp expected actual +' + test_done --=20 1.7.8.36.g69ee2