… | |
… | |
11 | * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> |
11 | * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> |
12 | * - extensive modifications |
12 | * - extensive modifications |
13 | * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> |
13 | * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> |
14 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
14 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
15 | * - extensive modifications |
15 | * - extensive modifications |
16 | * Copyright (c) 2003-2010 Marc Lehmann <pcg@goof.com> |
16 | * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de> |
17 | * |
17 | * |
18 | * This program is free software; you can redistribute it and/or modify |
18 | * This program is free software; you can redistribute it and/or modify |
19 | * it under the terms of the GNU General Public License as published by |
19 | * it under the terms of the GNU General Public License as published by |
20 | * the Free Software Foundation; either version 2 of the License, or |
20 | * the Free Software Foundation; either version 2 of the License, or |
21 | * (at your option) any later version. |
21 | * (at your option) any later version. |
… | |
… | |
187 | #endif |
187 | #endif |
188 | child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); |
188 | child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); |
189 | flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); |
189 | flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); |
190 | destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); |
190 | destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); |
191 | pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); |
191 | pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); |
192 | incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this); |
|
|
193 | termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); |
192 | termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); |
194 | vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); |
193 | vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); |
195 | |
194 | |
196 | cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; |
195 | cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; |
197 | |
196 | |
… | |
… | |
226 | delete fontset[i]; |
225 | delete fontset[i]; |
227 | #endif |
226 | #endif |
228 | delete fontset[0]; |
227 | delete fontset[0]; |
229 | |
228 | |
230 | #ifdef HAVE_BG_PIXMAP |
229 | #ifdef HAVE_BG_PIXMAP |
231 | bgPixmap.destroy (); |
230 | bg_destroy (); |
232 | #endif |
|
|
233 | #ifdef HAVE_AFTERIMAGE |
|
|
234 | if (asv) |
|
|
235 | destroy_asvisual (asv, 0); |
|
|
236 | if (asimman) |
|
|
237 | destroy_image_manager (asimman, 0); |
|
|
238 | #endif |
231 | #endif |
239 | |
232 | |
240 | if (display) |
233 | if (display) |
241 | { |
234 | { |
242 | selection_clear (); |
235 | selection_clear (); |
… | |
… | |
279 | // TODO: manage env vars in child only(!) |
272 | // TODO: manage env vars in child only(!) |
280 | free (env_display); |
273 | free (env_display); |
281 | free (env_term); |
274 | free (env_term); |
282 | free (locale); |
275 | free (locale); |
283 | free (v_buffer); |
276 | free (v_buffer); |
284 | free (incr_buf); |
277 | |
|
|
278 | delete selection_req; |
285 | |
279 | |
286 | delete envv; |
280 | delete envv; |
287 | delete argv; |
281 | delete argv; |
288 | |
282 | |
289 | #ifdef KEYSYM_RESOURCE |
283 | #ifdef KEYSYM_RESOURCE |
… | |
… | |
325 | #endif |
319 | #endif |
326 | scrollbar_ev.stop (display); |
320 | scrollbar_ev.stop (display); |
327 | #if ENABLE_TRANSPARENCY || ENABLE_PERL |
321 | #if ENABLE_TRANSPARENCY || ENABLE_PERL |
328 | rootwin_ev.stop (display); |
322 | rootwin_ev.stop (display); |
329 | #endif |
323 | #endif |
330 | incr_ev.stop (); |
|
|
331 | termwin_ev.stop (display); |
324 | termwin_ev.stop (display); |
332 | vt_ev.stop (display); |
325 | vt_ev.stop (display); |
333 | } |
326 | } |
334 | |
327 | |
335 | flush_ev.stop (); |
328 | flush_ev.stop (); |
… | |
… | |
1082 | XMoveResizeWindow (dpy, vt, |
1075 | XMoveResizeWindow (dpy, vt, |
1083 | window_vt_x, window_vt_y, |
1076 | window_vt_x, window_vt_y, |
1084 | width, height); |
1077 | width, height); |
1085 | |
1078 | |
1086 | #ifdef HAVE_BG_PIXMAP |
1079 | #ifdef HAVE_BG_PIXMAP |
1087 | if (bgPixmap.window_size_sensitive ()) |
1080 | if (bg_window_size_sensitive ()) |
1088 | update_background (); |
1081 | update_background (); |
1089 | #endif |
1082 | #endif |
1090 | } |
1083 | } |
1091 | |
1084 | |
1092 | if (fix_screen || old_height == 0) |
1085 | if (fix_screen || old_height == 0) |
1093 | scr_reset (); |
1086 | scr_reset (); |
1094 | |
|
|
1095 | #ifdef HAVE_BG_PIXMAP |
|
|
1096 | // TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? |
|
|
1097 | // if (bgPixmap.pixmap) |
|
|
1098 | // scr_touch (false); |
|
|
1099 | #endif |
|
|
1100 | |
1087 | |
1101 | #ifdef USE_XIM |
1088 | #ifdef USE_XIM |
1102 | IMSetPosition (); |
1089 | IMSetPosition (); |
1103 | #endif |
1090 | #endif |
1104 | } |
1091 | } |
… | |
… | |
1187 | |
1174 | |
1188 | atom = XInternAtom (dpy, server, False); |
1175 | atom = XInternAtom (dpy, server, False); |
1189 | win = XGetSelectionOwner (dpy, atom); |
1176 | win = XGetSelectionOwner (dpy, atom); |
1190 | |
1177 | |
1191 | if (win != None) |
1178 | if (win != None) |
1192 | return True; |
1179 | return true; |
1193 | } |
1180 | } |
1194 | |
1181 | |
1195 | return False; |
1182 | return false; |
1196 | } |
1183 | } |
1197 | |
1184 | |
1198 | void |
1185 | void |
1199 | rxvt_term::IMSendSpot () |
1186 | rxvt_term::IMSendSpot () |
1200 | { |
1187 | { |
… | |
… | |
1668 | rxvt_term::update_background () |
1655 | rxvt_term::update_background () |
1669 | { |
1656 | { |
1670 | if (update_background_ev.is_active ()) |
1657 | if (update_background_ev.is_active ()) |
1671 | return; |
1658 | return; |
1672 | |
1659 | |
1673 | bgPixmap.invalidate (); |
1660 | bg_invalidate (); |
1674 | |
1661 | |
1675 | ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); |
1662 | ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); |
1676 | |
1663 | |
1677 | if (to_wait <= 0.) |
1664 | if (to_wait <= 0.) |
1678 | bgPixmap.render (); |
1665 | bg_render (); |
1679 | else |
1666 | else |
1680 | update_background_ev.start (to_wait); |
1667 | update_background_ev.start (to_wait); |
1681 | } |
1668 | } |
1682 | |
1669 | |
1683 | void |
1670 | void |
1684 | rxvt_term::update_background_cb (ev::timer &w, int revents) |
1671 | rxvt_term::update_background_cb (ev::timer &w, int revents) |
1685 | { |
1672 | { |
1686 | make_current (); |
1673 | make_current (); |
1687 | |
1674 | |
1688 | update_background_ev.stop (); |
1675 | update_background_ev.stop (); |
1689 | bgPixmap.render (); |
1676 | bg_render (); |
1690 | refresh_check (); |
1677 | refresh_check (); |
1691 | } |
1678 | } |
1692 | |
1679 | |
1693 | #endif /* HAVE_BG_PIXMAP */ |
1680 | #endif /* HAVE_BG_PIXMAP */ |
1694 | |
1681 | |