| … | |
… | |
| 78 | |
78 | |
| 79 | #if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY) |
79 | #if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY) |
| 80 | # define HAVE_BG_PIXMAP 1 |
80 | # define HAVE_BG_PIXMAP 1 |
| 81 | #endif |
81 | #endif |
| 82 | |
82 | |
|
|
83 | #include <ecb.h> |
| 83 | #include "encoding.h" |
84 | #include "encoding.h" |
| 84 | #include "rxvtutil.h" |
85 | #include "rxvtutil.h" |
| 85 | #include "rxvtfont.h" |
86 | #include "rxvtfont.h" |
| 86 | #include "rxvttoolkit.h" |
87 | #include "rxvttoolkit.h" |
| 87 | #include "scrollbar.h" |
88 | #include "scrollbar.h" |
| … | |
… | |
| 831 | // that are not representable in unicode, as well as characters |
832 | // that are not representable in unicode, as well as characters |
| 832 | // not fitting in the BMP. |
833 | // not fitting in the BMP. |
| 833 | struct compose_char |
834 | struct compose_char |
| 834 | { |
835 | { |
| 835 | unicode_t c1, c2; // any chars != NOCHAR are valid |
836 | unicode_t c1, c2; // any chars != NOCHAR are valid |
| 836 | #if __cplusplus >= 201103L |
837 | #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4) |
| 837 | compose_char () = default; |
838 | compose_char () = default; |
| 838 | #endif |
839 | #endif |
| 839 | compose_char (unicode_t c1, unicode_t c2) |
840 | compose_char (unicode_t c1, unicode_t c2) |
| 840 | : c1(c1), c2(c2) |
841 | : c1(c1), c2(c2) |
| 841 | { } |
842 | { } |
