From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karthik Nayak Subject: [PATCH v15 03/13] utf8: add function to align a string into given strbuf Date: Tue, 1 Sep 2015 23:56:24 +0530 Message-ID: <1441131994-13508-4-git-send-email-Karthik.188@gmail.com> References: <1441131994-13508-1-git-send-email-Karthik.188@gmail.com> Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr, gitster@pobox.com, Karthik Nayak , Karthik Nayak To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Sep 01 20:26:53 2015 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 1ZWqGe-0007BT-8w for gcvg-git-2@plane.gmane.org; Tue, 01 Sep 2015 20:26:48 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755245AbbIAS0l (ORCPT ); Tue, 1 Sep 2015 14:26:41 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:35649 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754855AbbIAS0j (ORCPT ); Tue, 1 Sep 2015 14:26:39 -0400 Received: by pacfv12 with SMTP id fv12so3689969pac.2 for ; Tue, 01 Sep 2015 11:26:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JHArrAW4lGGd8JvxvCZaco4f/Z28TekTm3yscw2HPl0=; b=NFwJqDPBNl2VluJnRxXtXiiQrecOg1UUOw6ChrteFnVhUuocd7AJIklWmhQmhyh83n 5mE+dT06kNSLGegx03BXDqH9IIu6lFbjf/vm+djaQlKE3e3odefxFntb1YiX1Q1q8bn0 oaxxy6q715hL7uVrcSDkjausdBd+fKTMKl2/HoXzNRUP0NU/tqPuMxaJ/OAR1zO0/UDS VC1t8WNGt1kybCs/TobrFdbVfh7Q7/y9efXSUwC3K6ORIfQVHEV84ksvnWEyP+jnS+DA VTpTtPG/cxAc+q031qdZ3QcbRV4h7rCzLkZGl2N3a6GGTlD4t/FF3c9z6zBzhSwgUhIf SJdg== X-Received: by 10.66.243.70 with SMTP id ww6mr49770940pac.88.1441131998758; Tue, 01 Sep 2015 11:26:38 -0700 (PDT) Received: from ashley.localdomain ([106.51.130.23]) by smtp.gmail.com with ESMTPSA id uk6sm19091682pac.27.2015.09.01.11.26.35 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 01 Sep 2015 11:26:37 -0700 (PDT) X-Google-Original-From: Karthik Nayak X-Mailer: git-send-email 2.5.0 In-Reply-To: <1441131994-13508-1-git-send-email-Karthik.188@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Add strbuf_utf8_align() which will align a given string into a strbuf as per given align_type and width. If the width is greater than the string length then no alignment is performed. Helped-by: Eric Sunshine Mentored-by: Christian Couder Mentored-by: Matthieu Moy Signed-off-by: Karthik Nayak --- utf8.c | 21 +++++++++++++++++++++ utf8.h | 15 +++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/utf8.c b/utf8.c index 28e6d76..00e10c8 100644 --- a/utf8.c +++ b/utf8.c @@ -644,3 +644,24 @@ int skip_utf8_bom(char **text, size_t len) *text += strlen(utf8_bom); return 1; } + +void strbuf_utf8_align(struct strbuf *buf, align_type position, unsigned int width, + const char *s) +{ + int slen = strlen(s); + int display_len = utf8_strnwidth(s, slen, 0); + int utf8_compensation = slen - display_len; + + if (display_len >= width) { + strbuf_addstr(buf, s); + return; + } + + if (position == ALIGN_LEFT) + strbuf_addf(buf, "%-*s", width + utf8_compensation, s); + else if (position == ALIGN_MIDDLE) { + int left = (width - display_len) / 2; + strbuf_addf(buf, "%*s%-*s", left, "", width - left + utf8_compensation, s); + } else if (position == ALIGN_RIGHT) + strbuf_addf(buf, "%*s", width + utf8_compensation, s); +} diff --git a/utf8.h b/utf8.h index 5a9e94b..7930b44 100644 --- a/utf8.h +++ b/utf8.h @@ -55,4 +55,19 @@ int mbs_chrlen(const char **text, size_t *remainder_p, const char *encoding); */ int is_hfs_dotgit(const char *path); +typedef enum { + ALIGN_LEFT, + ALIGN_MIDDLE, + ALIGN_RIGHT +} align_type; + +/* + * Align the string given and store it into a strbuf as per the + * 'position' and 'width'. If the given string length is larger than + * 'width' than then the input string is not truncated and no + * alignment is done. + */ +void strbuf_utf8_align(struct strbuf *buf, align_type position, unsigned int width, + const char *s); + #endif -- 2.5.0