… | |
… | |
80 | vt_ev (this, &rxvt_term::x_cb), |
80 | vt_ev (this, &rxvt_term::x_cb), |
81 | #ifdef HAVE_SCROLLBARS |
81 | #ifdef HAVE_SCROLLBARS |
82 | scrollbar_ev (this, &rxvt_term::x_cb), |
82 | scrollbar_ev (this, &rxvt_term::x_cb), |
83 | #endif |
83 | #endif |
84 | #ifdef MENUBAR |
84 | #ifdef MENUBAR |
85 | menubar_ev (this, &rxvt_term::x_cb), fixme |
85 | menubar_ev (this, &rxvt_term::x_cb), |
86 | #endif |
86 | #endif |
87 | #ifdef CURSOR_BLINK |
87 | #ifdef CURSOR_BLINK |
88 | cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), |
88 | cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), |
89 | #endif |
89 | #endif |
90 | #ifdef TEXT_BLINK |
90 | #ifdef TEXT_BLINK |
… | |
… | |
117 | #endif |
117 | #endif |
118 | |
118 | |
119 | delete TermWin.fontset; |
119 | delete TermWin.fontset; |
120 | |
120 | |
121 | if (display) |
121 | if (display) |
|
|
122 | { |
|
|
123 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
|
|
124 | delete menuBar.drawable; |
|
|
125 | //if (menuBar.win) |
|
|
126 | // XDestroyWindow (display->display, menuBar.win); |
|
|
127 | #endif |
|
|
128 | delete TermWin.drawable; |
|
|
129 | // destroy all windows |
122 | if (TermWin.parent[0]) |
130 | if (TermWin.parent[0]) |
123 | XDestroyWindow (display->display, TermWin.parent[0]); |
131 | XDestroyWindow (display->display, TermWin.parent[0]); |
|
|
132 | } |
124 | |
133 | |
125 | // TODO: free pixcolours, colours should become part of rxvt_display |
134 | // TODO: free pixcolours, colours should become part of rxvt_display |
126 | |
135 | |
127 | delete PixColors; |
136 | delete PixColors; |
128 | |
137 | |
… | |
… | |
249 | |
258 | |
250 | const char **cmd_argv = init_resources (argc, argv); |
259 | const char **cmd_argv = init_resources (argc, argv); |
251 | |
260 | |
252 | set_locale (""); |
261 | set_locale (""); |
253 | |
262 | |
254 | #if (MENUBAR_MAX) |
263 | #if MENUBAR_MAX |
255 | menubar_read (rs[Rs_menu]); |
264 | menubar_read (rs[Rs_menu]); |
256 | #endif |
265 | #endif |
257 | #ifdef HAVE_SCROLLBARS |
266 | #ifdef HAVE_SCROLLBARS |
258 | if (Options & Opt_scrollBar) |
267 | if (Options & Opt_scrollBar) |
259 | scrollBar.setIdle (); /* set existence for size calculations */ |
268 | scrollBar.setIdle (); /* set existence for size calculations */ |
… | |
… | |
272 | #ifdef HAVE_SCROLLBARS |
281 | #ifdef HAVE_SCROLLBARS |
273 | if (Options & Opt_scrollBar) |
282 | if (Options & Opt_scrollBar) |
274 | resize_scrollbar (); /* create and map scrollbar */ |
283 | resize_scrollbar (); /* create and map scrollbar */ |
275 | #endif |
284 | #endif |
276 | #if (MENUBAR_MAX) |
285 | #if (MENUBAR_MAX) |
277 | if (menubar_visible (r)) |
286 | if (menubar_visible ()) |
278 | XMapWindow (display->display, menuBar.win); |
287 | XMapWindow (display->display, menuBar.win); |
279 | #endif |
288 | #endif |
280 | #ifdef TRANSPARENT |
289 | #ifdef TRANSPARENT |
281 | if (Options & Opt_transparent) |
290 | if (Options & Opt_transparent) |
282 | { |
291 | { |