| … | |
… | |
| 159 | #endif |
159 | #endif |
| 160 | #ifdef USE_XIM |
160 | #ifdef USE_XIM |
| 161 | im_ev (this, &rxvt_term::im_cb), |
161 | im_ev (this, &rxvt_term::im_cb), |
| 162 | #endif |
162 | #endif |
| 163 | sw_term (this, &rxvt_term::sig_term), |
163 | sw_term (this, &rxvt_term::sig_term), |
|
|
164 | sw_int (this, &rxvt_term::sig_term), |
| 164 | sw_chld (this, &rxvt_term::sig_chld), |
165 | sw_chld (this, &rxvt_term::sig_chld), |
| 165 | termwin_ev (this, &rxvt_term::x_cb), |
166 | termwin_ev (this, &rxvt_term::x_cb), |
| 166 | vt_ev (this, &rxvt_term::x_cb), |
167 | vt_ev (this, &rxvt_term::x_cb), |
| 167 | check_ev (this, &rxvt_term::check_cb), |
168 | check_ev (this, &rxvt_term::check_cb), |
| 168 | flush_ev (this, &rxvt_term::flush_cb), |
169 | flush_ev (this, &rxvt_term::flush_cb), |
| … | |
… | |
| 187 | termlist.erase (find (termlist.begin (), termlist.end(), this)); |
188 | termlist.erase (find (termlist.begin (), termlist.end(), this)); |
| 188 | |
189 | |
| 189 | if (cmd_pid) |
190 | if (cmd_pid) |
| 190 | kill (-cmd_pid, SIGHUP); |
191 | kill (-cmd_pid, SIGHUP); |
| 191 | |
192 | |
| 192 | pty.put (); |
|
|
| 193 | |
|
|
| 194 | #ifdef UTMP_SUPPORT |
193 | #ifdef UTMP_SUPPORT |
| 195 | privileged_utmp (RESTORE); |
194 | privileged_utmp (RESTORE); |
| 196 | #endif |
195 | #endif |
|
|
196 | |
|
|
197 | pty.put (); |
| 197 | |
198 | |
| 198 | #if ENABLE_STYLES |
199 | #if ENABLE_STYLES |
| 199 | for (int i = RS_styleCount; --i; ) |
200 | for (int i = RS_styleCount; --i; ) |
| 200 | if (TermWin.fontset[i] != TermWin.fontset[0]) |
201 | if (TermWin.fontset[i] != TermWin.fontset[0]) |
| 201 | delete TermWin.fontset[i]; |
202 | delete TermWin.fontset[i]; |
| … | |
… | |
| 1115 | TermWin_TotalWidth (), menuBar_TotalHeight ()); |
1116 | TermWin_TotalWidth (), menuBar_TotalHeight ()); |
| 1116 | |
1117 | |
| 1117 | XMoveResizeWindow (display->display, TermWin.vt, |
1118 | XMoveResizeWindow (display->display, TermWin.vt, |
| 1118 | window_vt_x, window_vt_y, |
1119 | window_vt_x, window_vt_y, |
| 1119 | TermWin_TotalWidth (), TermWin_TotalHeight ()); |
1120 | TermWin_TotalWidth (), TermWin_TotalHeight ()); |
|
|
1121 | |
| 1120 | scr_clear (); |
1122 | scr_clear (); |
| 1121 | #ifdef XPM_BACKGROUND |
1123 | #ifdef XPM_BACKGROUND |
| 1122 | resize_pixmap (); |
1124 | resize_pixmap (); |
| 1123 | #endif |
1125 | #endif |
| 1124 | } |
1126 | } |
| … | |
… | |
| 1146 | } |
1148 | } |
| 1147 | } |
1149 | } |
| 1148 | |
1150 | |
| 1149 | old_width = szHint.width; |
1151 | old_width = szHint.width; |
| 1150 | old_height = szHint.height; |
1152 | old_height = szHint.height; |
|
|
1153 | |
|
|
1154 | #ifdef XPM_BACKGROUND |
|
|
1155 | if (TermWin.pixmap) |
|
|
1156 | scr_touch (false); |
|
|
1157 | #endif |
| 1151 | |
1158 | |
| 1152 | #ifdef USE_XIM |
1159 | #ifdef USE_XIM |
| 1153 | IMSetStatusPosition (); |
1160 | IMSetStatusPosition (); |
| 1154 | #endif |
1161 | #endif |
| 1155 | } |
1162 | } |
| … | |
… | |
| 1385 | "*", |
1392 | "*", |
| 1386 | TermWin.fheight, |
1393 | TermWin.fheight, |
| 1387 | TermWin.fheight + 1, TermWin.fheight - 1, |
1394 | TermWin.fheight + 1, TermWin.fheight - 1, |
| 1388 | TermWin.fheight - 2, TermWin.fheight + 2); |
1395 | TermWin.fheight - 2, TermWin.fheight + 2); |
| 1389 | |
1396 | |
| 1390 | fs = XCreateFontSet (display->display, pat, |
1397 | fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, |
| 1391 | &missing_charset_list, &missing_charset_count, &def_string); |
1398 | &missing_charset_list, &missing_charset_count, &def_string); |
| 1392 | |
1399 | |
| 1393 | if (missing_charset_list) |
1400 | if (missing_charset_list) |
| 1394 | XFreeStringList (missing_charset_list); |
1401 | XFreeStringList (missing_charset_list); |
| 1395 | |
1402 | |
