From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr,
gitster@pobox.com, Karthik Nayak <Karthik.188@gmail.com>,
Karthik Nayak <karthik.188@gmail.com>
Subject: [PATCH v10 04/13] utf8: add function to align a string into given strbuf
Date: Sun, 9 Aug 2015 19:41:37 +0530 [thread overview]
Message-ID: <1439129506-9989-5-git-send-email-Karthik.188@gmail.com> (raw)
In-Reply-To: <1439129506-9989-1-git-send-email-Karthik.188@gmail.com>
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 <sunshine@sunshineco.com>
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
---
utf8.c | 22 ++++++++++++++++++++++
utf8.h | 13 +++++++++++++
2 files changed, 35 insertions(+)
diff --git a/utf8.c b/utf8.c
index 28e6d76..65e55cc 100644
--- a/utf8.c
+++ b/utf8.c
@@ -644,3 +644,25 @@ 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 display_len = utf8_strnwidth(s, strlen(s), 0);
+ int utf8_compenstation = strlen(s) - display_len;
+
+ if (!strlen(s))
+ return;
+ if (display_len >= width) {
+ strbuf_addstr(buf, s);
+ return;
+ }
+
+ if (position == ALIGN_LEFT)
+ strbuf_addf(buf, "%-*s", width + utf8_compenstation, s);
+ else if (position == ALIGN_MIDDLE) {
+ int left = (width - display_len)/2;
+ strbuf_addf(buf, "%*s%-*s", left, "", width - left + utf8_compenstation, s);
+ } else if (position == ALIGN_RIGHT)
+ strbuf_addf(buf, "%*s", width + utf8_compenstation, s);
+}
diff --git a/utf8.h b/utf8.h
index 5a9e94b..db8ca63 100644
--- a/utf8.h
+++ b/utf8.h
@@ -55,4 +55,17 @@ 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 type
+ * and width.
+ */
+void strbuf_utf8_align(struct strbuf *buf, align_type position, unsigned int width,
+ const char *s);
+
#endif
--
2.5.0
next prev parent reply other threads:[~2015-08-09 14:12 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-09 14:11 [PATCH v10 00/13] port tag.c to use ref-filter APIs Karthik Nayak
2015-08-09 14:11 ` [PATCH v10 01/13] ref-filter: move `struct atom_value` to ref-filter.c Karthik Nayak
2015-08-09 14:11 ` [PATCH v10 02/13] ref-filter: print output to strbuf for formatting Karthik Nayak
2015-08-11 17:56 ` Junio C Hamano
2015-08-12 13:22 ` Karthik Nayak
2015-08-12 16:29 ` Junio C Hamano
2015-08-12 16:56 ` Karthik Nayak
2015-08-11 18:00 ` Junio C Hamano
2015-08-12 13:22 ` Karthik Nayak
2015-08-09 14:11 ` [PATCH v10 03/13] ref-filter: introduce ref_formatting_state Karthik Nayak
2015-08-11 18:13 ` Junio C Hamano
2015-08-12 13:26 ` Karthik Nayak
2015-08-09 14:11 ` Karthik Nayak [this message]
2015-08-11 18:22 ` [PATCH v10 04/13] utf8: add function to align a string into given strbuf Junio C Hamano
2015-08-12 13:41 ` Karthik Nayak
2015-08-12 16:40 ` Junio C Hamano
2015-08-12 17:10 ` Karthik Nayak
2015-08-13 19:08 ` Eric Sunshine
2015-08-13 20:55 ` Karthik Nayak
2015-08-14 16:06 ` Junio C Hamano
2015-08-15 8:27 ` Duy Nguyen
2015-08-09 14:11 ` [PATCH v10 05/13] ref-filter: implement an `align` atom Karthik Nayak
2015-08-11 18:52 ` Junio C Hamano
2015-08-12 16:24 ` Karthik Nayak
2015-08-12 17:13 ` Junio C Hamano
2015-08-12 20:07 ` Karthik Nayak
2015-08-12 20:24 ` Junio C Hamano
2015-08-14 15:46 ` Karthik Nayak
2015-08-14 17:42 ` Junio C Hamano
2015-08-13 18:26 ` Eric Sunshine
2015-08-13 20:29 ` Karthik Nayak
2015-08-09 14:11 ` [PATCH v10 06/13] ref-filter: add option to filter only tags Karthik Nayak
2015-08-09 14:11 ` [PATCH v10 07/13] ref-filter: support printing N lines from tag annotation Karthik Nayak
2015-08-09 14:11 ` [PATCH v10 08/13] ref-filter: add support to sort by version Karthik Nayak
2015-08-09 14:11 ` [PATCH v10 09/13] ref-filter: add option to match literal pattern Karthik Nayak
2015-08-09 14:11 ` [PATCH v10 10/13] tag.c: use 'ref-filter' data structures Karthik Nayak
2015-08-09 14:17 ` Karthik Nayak
2015-08-09 14:32 ` [PATCH v10 11/13] tag.c: use 'ref-filter' APIs Karthik Nayak
2015-08-09 14:32 ` [PATCH v10 12/13] tag.c: implement '--format' option Karthik Nayak
2015-08-09 14:32 ` [PATCH v10 13/13] tag.c: implement '--merged' and '--no-merged' options Karthik Nayak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1439129506-9989-5-git-send-email-Karthik.188@gmail.com \
--to=karthik.188@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).