… | |
… | |
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 | |
60 | |
|
|
61 | #if ENABLE_COMBINING |
61 | class rxvt_composite_vec rxvt_composite; |
62 | class rxvt_composite_vec rxvt_composite; |
62 | |
63 | |
63 | text_t rxvt_composite_vec::compose (uint32_t c1, uint32_t c2) |
64 | text_t rxvt_composite_vec::compose (uint32_t c1, uint32_t c2) |
64 | { |
65 | { |
65 | compose_char *cc; |
66 | compose_char *cc; |
… | |
… | |
117 | } |
118 | } |
118 | |
119 | |
119 | return len; |
120 | return len; |
120 | |
121 | |
121 | } |
122 | } |
|
|
123 | #endif |
122 | |
124 | |
123 | extern struct rxvt_composite_vec rxvt_composite; |
|
|
124 | void * |
125 | void * |
125 | rxvt_term::operator new (size_t s) |
126 | rxvt_term::operator new (size_t s) |
126 | { |
127 | { |
127 | void *p = malloc (s); |
128 | void *p = malloc (s); |
128 | |
129 | |
… | |
… | |
685 | else |
686 | else |
686 | szHint.win_gravity = SouthWestGravity; |
687 | szHint.win_gravity = SouthWestGravity; |
687 | } |
688 | } |
688 | } |
689 | } |
689 | } |
690 | } |
|
|
691 | |
690 | /* TODO: BOUNDS */ |
692 | /* TODO: BOUNDS */ |
691 | TermWin.width = TermWin.ncol * TermWin.fwidth; |
693 | TermWin.width = TermWin.ncol * TermWin.fwidth; |
692 | TermWin.height = TermWin.nrow * TermWin.fheight; |
694 | TermWin.height = TermWin.nrow * TermWin.fheight; |
693 | max_width = MAX_COLS * TermWin.fwidth; |
695 | max_width = MAX_COLS * TermWin.fwidth; |
694 | max_height = MAX_ROWS * TermWin.fheight; |
696 | max_height = MAX_ROWS * TermWin.fheight; |