| … | |
… | |
| 252 | //if (menuBar.win) |
252 | //if (menuBar.win) |
| 253 | // XDestroyWindow (disp, menuBar.win); |
253 | // XDestroyWindow (disp, menuBar.win); |
| 254 | #endif |
254 | #endif |
| 255 | delete TermWin.drawable; |
255 | delete TermWin.drawable; |
| 256 | // destroy all windows |
256 | // destroy all windows |
| 257 | if (TermWin.parent[0] |
257 | if (TermWin.parent[0]) |
| 258 | #if ENABLE_XEMBED |
|
|
| 259 | && !rs[Rs_embed] |
|
|
| 260 | #endif |
|
|
| 261 | ) |
|
|
| 262 | XDestroyWindow (disp, TermWin.parent[0]); |
258 | XDestroyWindow (disp, TermWin.parent[0]); |
| 263 | } |
259 | } |
| 264 | |
260 | |
| 265 | // TODO: free pixcolours, colours should become part of rxvt_display |
261 | // TODO: free pixcolours, colours should become part of rxvt_display |
| 266 | |
262 | |
| … | |
… | |
| 1250 | XWindowAttributes wattr; |
1246 | XWindowAttributes wattr; |
| 1251 | |
1247 | |
| 1252 | if (width == 0 || height == 0) |
1248 | if (width == 0 || height == 0) |
| 1253 | { |
1249 | { |
| 1254 | XGetWindowAttributes (display->display, display->root, &wattr); |
1250 | XGetWindowAttributes (display->display, display->root, &wattr); |
|
|
1251 | |
| 1255 | if (width == 0) |
1252 | if (width == 0) |
| 1256 | width = wattr.width - szHint.base_width; |
1253 | width = wattr.width - szHint.base_width; |
| 1257 | if (height == 0) |
1254 | if (height == 0) |
| 1258 | height = wattr.height - szHint.base_height; |
1255 | height = wattr.height - szHint.base_height; |
| 1259 | } |
1256 | } |
