| … | |
… | |
| 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] && !rs[Rs_embed]) |
| 259 | XDestroyWindow (disp, TermWin.parent[0]); |
259 | XDestroyWindow (disp, TermWin.parent[0]); |
| 260 | } |
260 | } |
| 261 | |
261 | |
| 262 | // TODO: free pixcolours, colours should become part of rxvt_display |
262 | // TODO: free pixcolours, colours should become part of rxvt_display |
| 263 | |
263 | |
| … | |
… | |
| 712 | if (!parsed_geometry) |
712 | if (!parsed_geometry) |
| 713 | { |
713 | { |
| 714 | parsed_geometry = 1; |
714 | parsed_geometry = 1; |
| 715 | if (rs[Rs_geometry]) |
715 | if (rs[Rs_geometry]) |
| 716 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
716 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
|
|
717 | |
| 717 | if (flags & WidthValue) |
718 | if (flags & WidthValue) |
| 718 | { |
719 | { |
| 719 | TermWin.ncol = BOUND_POSITIVE_INT16 (w); |
720 | TermWin.ncol = BOUND_POSITIVE_INT16 (w); |
| 720 | szHint.flags |= USSize; |
721 | szHint.flags |= USSize; |
| 721 | } |
722 | } |
|
|
723 | |
| 722 | if (flags & HeightValue) |
724 | if (flags & HeightValue) |
| 723 | { |
725 | { |
| 724 | TermWin.nrow = BOUND_POSITIVE_INT16 (h); |
726 | TermWin.nrow = BOUND_POSITIVE_INT16 (h); |
| 725 | szHint.flags |= USSize; |
727 | szHint.flags |= USSize; |
| 726 | } |
728 | } |
|
|
729 | |
| 727 | if (flags & XValue) |
730 | if (flags & XValue) |
| 728 | { |
731 | { |
| 729 | szHint.x = x; |
732 | szHint.x = x; |
| 730 | szHint.flags |= USPosition; |
733 | szHint.flags |= USPosition; |
| 731 | if (flags & XNegative) |
734 | if (flags & XNegative) |
| 732 | { |
735 | { |
| 733 | recalc_x = 1; |
736 | recalc_x = 1; |
| 734 | szHint.win_gravity = NorthEastGravity; |
737 | szHint.win_gravity = NorthEastGravity; |
| 735 | } |
738 | } |
| 736 | } |
739 | } |
|
|
740 | |
| 737 | if (flags & YValue) |
741 | if (flags & YValue) |
| 738 | { |
742 | { |
| 739 | szHint.y = y; |
743 | szHint.y = y; |
| 740 | szHint.flags |= USPosition; |
744 | szHint.flags |= USPosition; |
| 741 | if (flags & YNegative) |
745 | if (flags & YNegative) |
