| … | |
… | |
| 9 | #ifdef HAVE_XSETLOCALE |
9 | #ifdef HAVE_XSETLOCALE |
| 10 | # define X_LOCALE |
10 | # define X_LOCALE |
| 11 | # include <X11/Xlocale.h> |
11 | # include <X11/Xlocale.h> |
| 12 | #else |
12 | #else |
| 13 | # ifdef HAVE_SETLOCALE |
13 | # ifdef HAVE_SETLOCALE |
| 14 | # include <locale.h> |
14 | # include <clocale> |
| 15 | # endif |
15 | # endif |
| 16 | #endif /* HAVE_XLOCALE */ |
16 | #endif /* HAVE_XLOCALE */ |
| 17 | |
17 | |
| 18 | #ifdef HAVE_NL_LANGINFO |
18 | #ifdef HAVE_NL_LANGINFO |
| 19 | # include <langinfo.h> |
19 | # include <langinfo.h> |
| … | |
… | |
| 55 | |
55 | |
| 56 | operator Drawable() { return drawable; } |
56 | operator Drawable() { return drawable; } |
| 57 | }; |
57 | }; |
| 58 | |
58 | |
| 59 | struct rxvt_font { |
59 | struct rxvt_font { |
|
|
60 | struct rxvt_fontset *fs; |
| 60 | // managed by the fontset |
61 | // managed by the fontset |
| 61 | rxvt_t r; |
62 | rxvt_t r; |
| 62 | void set_term (rxvt_t r) { this->r = r; } |
63 | void set_term (rxvt_t r) { this->r = r; } |
| 63 | |
64 | |
| 64 | char *name; |
65 | char *name; |
| … | |
… | |
| 97 | #define FONT_UNREF(f) do { (f)->clear (); delete (f); } while (0) |
98 | #define FONT_UNREF(f) do { (f)->clear (); delete (f); } while (0) |
| 98 | |
99 | |
| 99 | struct rxvt_fallback_font; |
100 | struct rxvt_fallback_font; |
| 100 | |
101 | |
| 101 | struct rxvt_fontset { |
102 | struct rxvt_fontset { |
|
|
103 | char *fontdesc; |
|
|
104 | |
| 102 | rxvt_fontset (rxvt_t r); |
105 | rxvt_fontset (rxvt_t r); |
| 103 | ~rxvt_fontset (); |
106 | ~rxvt_fontset (); |
| 104 | |
107 | |
| 105 | rxvt_font *new_font (const char *name, codeset cs); |
108 | rxvt_font *new_font (const char *name, codeset cs); |
| 106 | |
109 | |
