… | |
… | |
235 | selection_clear (); |
235 | selection_clear (); |
236 | |
236 | |
237 | #ifdef USE_XIM |
237 | #ifdef USE_XIM |
238 | im_destroy (); |
238 | im_destroy (); |
239 | #endif |
239 | #endif |
240 | #ifdef XTERM_SCROLLBAR |
240 | scrollBar.destroy (); |
241 | if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC); |
|
|
242 | if (ShadowGC) XFreeGC (dpy, ShadowGC); |
|
|
243 | #endif |
|
|
244 | #ifdef PLAIN_SCROLLBAR |
|
|
245 | if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC); |
|
|
246 | #endif |
|
|
247 | #ifdef NEXT_SCROLLBAR |
|
|
248 | if (blackGC) XFreeGC (dpy, blackGC); |
|
|
249 | if (whiteGC) XFreeGC (dpy, whiteGC); |
|
|
250 | if (grayGC) XFreeGC (dpy, grayGC); |
|
|
251 | if (darkGC) XFreeGC (dpy, darkGC); |
|
|
252 | if (stippleGC) XFreeGC (dpy, stippleGC); |
|
|
253 | if (dimple) XFreePixmap (dpy, dimple); |
|
|
254 | if (upArrow) XFreePixmap (dpy, upArrow); |
|
|
255 | if (downArrow) XFreePixmap (dpy, downArrow); |
|
|
256 | if (upArrowHi) XFreePixmap (dpy, upArrowHi); |
|
|
257 | if (downArrowHi) XFreePixmap (dpy, downArrowHi); |
|
|
258 | #endif |
|
|
259 | #ifdef RXVT_SCROLLBAR |
|
|
260 | if (topShadowGC) XFreeGC (dpy, topShadowGC); |
|
|
261 | if (botShadowGC) XFreeGC (dpy, botShadowGC); |
|
|
262 | if (scrollbarGC) XFreeGC (dpy, scrollbarGC); |
|
|
263 | #endif |
|
|
264 | if (gc) XFreeGC (dpy, gc); |
241 | if (gc) XFreeGC (dpy, gc); |
265 | |
242 | |
266 | delete drawable; |
243 | delete drawable; |
267 | // destroy all windows |
244 | // destroy all windows |
268 | if (parent[0]) |
245 | if (parent[0]) |
… | |
… | |
978 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
955 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
979 | |
956 | |
980 | if (fix_screen || newwidth != old_width || newheight != old_height) |
957 | if (fix_screen || newwidth != old_width || newheight != old_height) |
981 | { |
958 | { |
982 | if (scrollBar.state) |
959 | if (scrollBar.state) |
983 | resize_scrollbar (); |
960 | scrollBar.resize (); |
984 | |
961 | |
985 | XMoveResizeWindow (dpy, vt, |
962 | XMoveResizeWindow (dpy, vt, |
986 | window_vt_x, window_vt_y, |
963 | window_vt_x, window_vt_y, |
987 | width, height); |
964 | width, height); |
988 | |
965 | |