| … | |
… | |
| 253 | //if (menuBar.win) |
253 | //if (menuBar.win) |
| 254 | // XDestroyWindow (disp, menuBar.win); |
254 | // XDestroyWindow (disp, menuBar.win); |
| 255 | #endif |
255 | #endif |
| 256 | delete TermWin.drawable; |
256 | delete TermWin.drawable; |
| 257 | // destroy all windows |
257 | // destroy all windows |
| 258 | if (TermWin.parent[0]) |
258 | if (TermWin.parent[0] |
|
|
259 | #if ENABLE_FRILLS |
|
|
260 | && !rs[Rs_embed] |
|
|
261 | #endif |
|
|
262 | ) |
| 259 | XDestroyWindow (disp, TermWin.parent[0]); |
263 | XDestroyWindow (disp, TermWin.parent[0]); |
| 260 | } |
264 | } |
| 261 | |
265 | |
| 262 | // TODO: free pixcolours, colours should become part of rxvt_display |
266 | // TODO: free pixcolours, colours should become part of rxvt_display |
| 263 | |
267 | |
| … | |
… | |
| 712 | if (!parsed_geometry) |
716 | if (!parsed_geometry) |
| 713 | { |
717 | { |
| 714 | parsed_geometry = 1; |
718 | parsed_geometry = 1; |
| 715 | if (rs[Rs_geometry]) |
719 | if (rs[Rs_geometry]) |
| 716 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
720 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
|
|
721 | |
| 717 | if (flags & WidthValue) |
722 | if (flags & WidthValue) |
| 718 | { |
723 | { |
| 719 | TermWin.ncol = BOUND_POSITIVE_INT16 (w); |
724 | TermWin.ncol = BOUND_POSITIVE_INT16 (w); |
| 720 | szHint.flags |= USSize; |
725 | szHint.flags |= USSize; |
| 721 | } |
726 | } |
|
|
727 | |
| 722 | if (flags & HeightValue) |
728 | if (flags & HeightValue) |
| 723 | { |
729 | { |
| 724 | TermWin.nrow = BOUND_POSITIVE_INT16 (h); |
730 | TermWin.nrow = BOUND_POSITIVE_INT16 (h); |
| 725 | szHint.flags |= USSize; |
731 | szHint.flags |= USSize; |
| 726 | } |
732 | } |
|
|
733 | |
| 727 | if (flags & XValue) |
734 | if (flags & XValue) |
| 728 | { |
735 | { |
| 729 | szHint.x = x; |
736 | szHint.x = x; |
| 730 | szHint.flags |= USPosition; |
737 | szHint.flags |= USPosition; |
| 731 | if (flags & XNegative) |
738 | if (flags & XNegative) |
| 732 | { |
739 | { |
| 733 | recalc_x = 1; |
740 | recalc_x = 1; |
| 734 | szHint.win_gravity = NorthEastGravity; |
741 | szHint.win_gravity = NorthEastGravity; |
| 735 | } |
742 | } |
| 736 | } |
743 | } |
|
|
744 | |
| 737 | if (flags & YValue) |
745 | if (flags & YValue) |
| 738 | { |
746 | { |
| 739 | szHint.y = y; |
747 | szHint.y = y; |
| 740 | szHint.flags |= USPosition; |
748 | szHint.flags |= USPosition; |
| 741 | if (flags & YNegative) |
749 | if (flags & YNegative) |
