9front - general discussion about 9front
 help / color / mirror / Atom feed
* [9front] cmd/cal: fix days of week alignment for year view (patch)
@ 2021-06-18 22:34 igor
  2021-06-19 12:01 ` kvik
  0 siblings, 1 reply; 2+ messages in thread
From: igor @ 2021-06-18 22:34 UTC (permalink / raw)
  To: 9front; +Cc: igor

Inline below is a patch fixing the alignment of the rows
printing days of the week when viewing the whole year.

  term% cal -s1 2021
                                  2021
  
           Jan                    Feb                    Mar
   M Tu  W Th  F Sa Su     M Tu  W Th  F Sa Su     M Tu  W Th  F Sa Su 
               1  2  3    1  2  3  4  5  6  7    1  2  3  4  5  6  7
   4  5  6  7  8  9 10    8  9 10 11 12 13 14    8  9 10 11 12 13 14
  11 12 13 14 15 16 17   15 16 17 18 19 20 21   15 16 17 18 19 20 21
  18 19 20 21 22 23 24   22 23 24 25 26 27 28   22 23 24 25 26 27 28
  25 26 27 28 29 30 31                          29 30 31
  …

Note how the days (i.e. ' M Tu  W Th  F Sa Su') for Feb and Mar
do not align with the day numbers.

This is because an extra space is left *before* adding the terminating
'\0' via the pointer `dayw`.

With the patch applied the calendar aligns nicely for the year view:

  term% cal -s1 2021
                                  2021
  
           Jan                    Feb                    Mar
   M Tu  W Th  F Sa Su    M Tu  W Th  F Sa Su    M Tu  W Th  F Sa Su
               1  2  3    1  2  3  4  5  6  7    1  2  3  4  5  6  7
   4  5  6  7  8  9 10    8  9 10 11 12 13 14    8  9 10 11 12 13 14
  11 12 13 14 15 16 17   15 16 17 18 19 20 21   15 16 17 18 19 20 21
  18 19 20 21 22 23 24   22 23 24 25 26 27 28   22 23 24 25 26 27 28
  25 26 27 28 29 30 31                          29 30 31
  …

Patch:

term% git/diff /sys/src/cmd/cal.c
--- //.git/fs/object/b3215c807556cdaaa0f949f1fb3f97c484ffd1da/tree//sys/src/cmd/cal.c
+++ /sys/src/cmd/cal.c
@@ -60,7 +60,7 @@
 	Binit(&bout, 1, OWRITE);
 
 	dayw = dayws + 3*wstart;
-	dayw[3*7] = '\0';
+	dayw[(3*7)-1] = '\0';
 
 /*
  * no arg, print current month


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [9front] cmd/cal: fix days of week alignment for year view (patch)
  2021-06-18 22:34 [9front] cmd/cal: fix days of week alignment for year view (patch) igor
@ 2021-06-19 12:01 ` kvik
  0 siblings, 0 replies; 2+ messages in thread
From: kvik @ 2021-06-19 12:01 UTC (permalink / raw)
  To: 9front

Applied, thanks!


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-06-19 16:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-18 22:34 [9front] cmd/cal: fix days of week alignment for year view (patch) igor
2021-06-19 12:01 ` kvik

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 NNTP newsgroup(s).