| … | |
… | |
| 55 | { |
55 | { |
| 56 | STRNCPY (curlocale, locale, 128); |
56 | STRNCPY (curlocale, locale, 128); |
| 57 | setlocale (LC_CTYPE, curlocale); |
57 | setlocale (LC_CTYPE, curlocale); |
| 58 | } |
58 | } |
| 59 | } |
59 | } |
|
|
60 | |
|
|
61 | #if ENABLE_COMBINING |
|
|
62 | class rxvt_composite_vec rxvt_composite; |
|
|
63 | |
|
|
64 | text_t rxvt_composite_vec::compose (uint32_t c1, uint32_t c2) |
|
|
65 | { |
|
|
66 | compose_char *cc; |
|
|
67 | |
|
|
68 | // break compose chains, as stupid readline really likes to duplicate |
|
|
69 | // composing characters for some reason near the end of a line. |
|
|
70 | cc = (*this)[c1]; |
|
|
71 | while (cc) |
|
|
72 | { |
|
|
73 | if (cc->c2 == c2) return c1; |
|
|
74 | cc = (*this)[cc->c1]; |
|
|
75 | } |
|
|
76 | |
|
|
77 | // check to see wether this combination already exists otherwise |
|
|
78 | for (cc = v.end (); cc-- > v.begin (); ) |
|
|
79 | { |
|
|
80 | if (cc->c1 == c1 && cc->c2 == c2) |
|
|
81 | return COMPOSE_LO + (cc - v.begin ()); |
|
|
82 | } |
|
|
83 | |
|
|
84 | // allocate a new combination |
|
|
85 | if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) |
|
|
86 | { |
|
|
87 | static int seen; |
|
|
88 | |
|
|
89 | if (!seen++) |
|
|
90 | fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); |
|
|
91 | |
|
|
92 | return REPLACEMENT_CHAR; |
|
|
93 | } |
|
|
94 | |
|
|
95 | v.push_back (compose_char (c1, c2)); |
|
|
96 | |
|
|
97 | return v.size () - 1 + COMPOSE_LO; |
|
|
98 | } |
|
|
99 | |
|
|
100 | int rxvt_composite_vec::expand (uint32_t c, wchar_t *r) |
|
|
101 | { |
|
|
102 | compose_char *cc = (*this)[c]; |
|
|
103 | |
|
|
104 | if (!cc) |
|
|
105 | { |
|
|
106 | if (r) *r = c; |
|
|
107 | return 1; |
|
|
108 | } |
|
|
109 | |
|
|
110 | int len = expand (cc->c1, r); |
|
|
111 | |
|
|
112 | if (r) r += len; |
|
|
113 | |
|
|
114 | if (cc->c2 != NOCHAR) |
|
|
115 | { |
|
|
116 | len++; |
|
|
117 | if (r) *r++ = cc->c2; |
|
|
118 | } |
|
|
119 | |
|
|
120 | return len; |
|
|
121 | |
|
|
122 | } |
|
|
123 | #endif |
| 60 | |
124 | |
| 61 | void * |
125 | void * |
| 62 | rxvt_term::operator new (size_t s) |
126 | rxvt_term::operator new (size_t s) |
| 63 | { |
127 | { |
| 64 | void *p = malloc (s); |
128 | void *p = malloc (s); |
| … | |
… | |
| 622 | else |
686 | else |
| 623 | szHint.win_gravity = SouthWestGravity; |
687 | szHint.win_gravity = SouthWestGravity; |
| 624 | } |
688 | } |
| 625 | } |
689 | } |
| 626 | } |
690 | } |
|
|
691 | |
| 627 | /* TODO: BOUNDS */ |
692 | /* TODO: BOUNDS */ |
| 628 | TermWin.width = TermWin.ncol * TermWin.fwidth; |
693 | TermWin.width = TermWin.ncol * TermWin.fwidth; |
| 629 | TermWin.height = TermWin.nrow * TermWin.fheight; |
694 | TermWin.height = TermWin.nrow * TermWin.fheight; |
| 630 | max_width = MAX_COLS * TermWin.fwidth; |
695 | max_width = MAX_COLS * TermWin.fwidth; |
| 631 | max_height = MAX_ROWS * TermWin.fheight; |
696 | max_height = MAX_ROWS * TermWin.fheight; |
