| … | |
… | |
| 106 | rxvt_term::~rxvt_term () |
106 | rxvt_term::~rxvt_term () |
| 107 | { |
107 | { |
| 108 | if (cmd_fd >= 0) |
108 | if (cmd_fd >= 0) |
| 109 | close (cmd_fd); |
109 | close (cmd_fd); |
| 110 | |
110 | |
|
|
111 | #ifndef NO_SETOWNER_TTYDEV |
|
|
112 | privileged_ttydev (RESTORE); |
|
|
113 | #endif |
|
|
114 | #ifdef UTMP_SUPPORT |
|
|
115 | privileged_utmp (RESTORE); |
|
|
116 | #endif |
|
|
117 | |
|
|
118 | delete TermWin.fontset; |
|
|
119 | |
|
|
120 | if (display) |
|
|
121 | if (TermWin.parent[0]) |
|
|
122 | XDestroyWindow (display->display, TermWin.parent[0]); |
|
|
123 | |
|
|
124 | // TODO: free pixcolours, colours should become part of rxvt_display |
|
|
125 | |
|
|
126 | delete PixColors; |
|
|
127 | |
|
|
128 | displays.put (display); |
|
|
129 | |
| 111 | scr_release (); |
130 | scr_release (); |
| 112 | |
131 | |
| 113 | free (env_windowid); |
132 | free (env_windowid); |
| 114 | free (env_display); |
133 | free (env_display); |
| 115 | free (env_term); |
134 | free (env_term); |
| 116 | free (env_colorfgbg); |
135 | free (env_colorfgbg); |
| 117 | free (locale); |
136 | free (locale); |
| 118 | free (codeset); |
137 | free (codeset); |
| 119 | |
138 | |
| 120 | #ifndef NO_SETOWNER_TTYDEV |
|
|
| 121 | privileged_ttydev (RESTORE); |
|
|
| 122 | #endif |
|
|
| 123 | #ifdef UTMP_SUPPORT |
|
|
| 124 | privileged_utmp (RESTORE); |
|
|
| 125 | #endif |
|
|
| 126 | |
|
|
| 127 | // TODO: free pixcolours, colours should become part of rxvt_display |
|
|
| 128 | |
|
|
| 129 | delete PixColors; |
|
|
| 130 | delete TermWin.fontset; |
|
|
| 131 | |
|
|
| 132 | displays.put (display); |
|
|
| 133 | |
|
|
| 134 | delete envv; |
139 | delete envv; |
| 135 | delete argv; |
140 | delete argv; |
| 136 | } |
141 | } |
| 137 | |
142 | |
| 138 | void |
143 | void |
| 139 | rxvt_term::destroy () |
144 | rxvt_term::destroy () |
| 140 | { |
145 | { |
| 141 | if (display) |
146 | if (display) |
| 142 | { |
147 | { |
| 143 | if (TermWin.parent[0]) |
|
|
| 144 | XDestroyWindow (display->display, TermWin.parent[0]); |
|
|
| 145 | |
|
|
| 146 | rootwin_ev.stop (display); |
148 | rootwin_ev.stop (display); |
| 147 | termwin_ev.stop (display); |
149 | termwin_ev.stop (display); |
| 148 | vt_ev.stop (display); |
150 | vt_ev.stop (display); |
| 149 | |
|
|
| 150 | #ifdef USE_XIM |
151 | #ifdef USE_XIM |
| 151 | im_destroy (); |
152 | im_destroy (); |
| 152 | im_ev.stop (display); |
153 | im_ev.stop (display); |
| 153 | #endif |
154 | #endif |
| 154 | #ifdef HAVE_SCROLLBARS |
155 | #ifdef HAVE_SCROLLBARS |
| … | |
… | |
| 264 | scr_reset (); /* initialize screen */ |
265 | scr_reset (); /* initialize screen */ |
| 265 | #ifdef RXVT_GRAPHICS |
266 | #ifdef RXVT_GRAPHICS |
| 266 | Gr_reset (); /* reset graphics */ |
267 | Gr_reset (); /* reset graphics */ |
| 267 | #endif |
268 | #endif |
| 268 | |
269 | |
| 269 | #if 0 |
270 | #if 1 |
| 270 | #ifdef DEBUG_X |
|
|
| 271 | XSynchronize (display->display, True); |
271 | XSynchronize (display->display, True); |
| 272 | #endif |
|
|
| 273 | #endif |
272 | #endif |
| 274 | |
273 | |
| 275 | #ifdef HAVE_SCROLLBARS |
274 | #ifdef HAVE_SCROLLBARS |
| 276 | if (Options & Opt_scrollBar) |
275 | if (Options & Opt_scrollBar) |
| 277 | resize_scrollbar (); /* create and map scrollbar */ |
276 | resize_scrollbar (); /* create and map scrollbar */ |
