repo: rxvt-unicode-sixel
action: commit
revision: 
path_from: 
revision_from: a4f6091c7de43aba082bee0629a0cca7b1df9c29:
path_to: 
revision_to: 

commit a4f6091c7de43aba082bee0629a0cca7b1df9c29
Author: Marc Lehmann 
Date:   Thu Jun 17 00:08:35 2021 +0000

    editorial changes

diff --git a/src/rxvt.h b/src/rxvt.h

--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -791,7 +791,10 @@ struct mbstate
 // not fitting in the BMP.
 struct compose_char
 {
-  unicode_t c1, c2; // any chars != NOCHAR are valid
+  // c1 can be any chaarcter != NOCHAR, including another compose character
+  // c2 must always be a zero-width character or NOCHAR, in case
+  // this just extends beyondthe BMP.
+  unicode_t c1, c2;

   compose_char (unicode_t c1, unicode_t c2)
   : c1(c1), c2(c2)
diff --git a/src/rxvtd.C b/src/rxvtd.C

--- a/src/rxvtd.C
+++ b/src/rxvtd.C
@@ -47,7 +47,8 @@
 #include "rxvtdaemon.h"
 #include "libptytty.h"

-struct server : rxvt_connection {
+struct server : rxvt_connection
+{
   log_callback log_cb;
   getfd_callback getfd_cb;

@@ -70,7 +71,8 @@ struct server : rxvt_connection {
   void err (const char *format = 0, ...);
 };

-struct unix_listener {
+struct unix_listener
+{
   int fd;

   void accept_cb (ev::io &w, int revents); ev::io accept_ev;
diff --git a/src/rxvtfont.C b/src/rxvtfont.C

--- a/src/rxvtfont.C
+++ b/src/rxvtfont.C
@@ -264,7 +264,8 @@ rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)

 /////////////////////////////////////////////////////////////////////////////

-struct rxvt_font_default : rxvt_font {
+struct rxvt_font_default : rxvt_font
+{
   struct rxvt_fontset *fs;

   rxvt_font_default (rxvt_fontset *fs)
@@ -494,7 +495,8 @@ rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
     }
 }

-struct rxvt_font_overflow : rxvt_font {
+struct rxvt_font_overflow : rxvt_font
+{
   struct rxvt_fontset *fs;

   rxvt_font_overflow (rxvt_fontset *fs)
@@ -550,7 +552,8 @@ struct rxvt_font_overflow : rxvt_font {

 /////////////////////////////////////////////////////////////////////////////

-struct rxvt_font_x11 : rxvt_font {
+struct rxvt_font_x11 : rxvt_font
+{
   rxvt_font_x11 () { f = 0; }

   void clear ();
@@ -1135,8 +1138,12 @@ rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,

 #if XFT

-struct rxvt_font_xft : rxvt_font {
-  rxvt_font_xft () { f = 0; }
+struct rxvt_font_xft : rxvt_font
+{
+  rxvt_font_xft ()
+  {
+    f = 0;
+  }

   void clear ();

-----END OF PAGE-----