… | |
… | |
11 | * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> |
11 | * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> |
12 | * - extensive modifications |
12 | * - extensive modifications |
13 | * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> |
13 | * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> |
14 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
14 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
15 | * - extensive modifications |
15 | * - extensive modifications |
16 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
16 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
17 | * |
17 | * |
18 | * This program is free software; you can redistribute it and/or modify |
18 | * This program is free software; you can redistribute it and/or modify |
19 | * it under the terms of the GNU General Public License as published by |
19 | * it under the terms of the GNU General Public License as published by |
20 | * the Free Software Foundation; either version 2 of the License, or |
20 | * the Free Software Foundation; either version 2 of the License, or |
21 | * (at your option) any later version. |
21 | * (at your option) any later version. |
… | |
… | |
273 | // TODO: free pixcolours, colours should become part of rxvt_display |
273 | // TODO: free pixcolours, colours should become part of rxvt_display |
274 | |
274 | |
275 | delete pix_colors_focused; |
275 | delete pix_colors_focused; |
276 | #if OFF_FOCUS_FADING |
276 | #if OFF_FOCUS_FADING |
277 | delete pix_colors_unfocused; |
277 | delete pix_colors_unfocused; |
|
|
278 | #endif |
|
|
279 | #if USE_XGETDEFAULT |
|
|
280 | XrmDestroyDatabase (xrmdatabase); |
278 | #endif |
281 | #endif |
279 | |
282 | |
280 | displays.put (display); |
283 | displays.put (display); |
281 | |
284 | |
282 | scr_release (); |
285 | scr_release (); |
… | |
… | |
487 | if (OPTION (Opt_scrollBar)) |
490 | if (OPTION (Opt_scrollBar)) |
488 | scrollBar.setIdle (); /* set existence for size calculations */ |
491 | scrollBar.setIdle (); /* set existence for size calculations */ |
489 | #endif |
492 | #endif |
490 | |
493 | |
491 | #if ENABLE_PERL |
494 | #if ENABLE_PERL |
|
|
495 | if (!rs[Rs_perl_ext_1]) |
|
|
496 | rs[Rs_perl_ext_1] = "default"; |
|
|
497 | |
492 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
498 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
493 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
499 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
494 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
500 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
495 | { |
501 | { |
496 | rxvt_perl.init (); |
502 | rxvt_perl.init (); |
… | |
… | |
610 | /* signal (SIGURG, SIG_DFL); */ |
616 | /* signal (SIGURG, SIG_DFL); */ |
611 | |
617 | |
612 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
618 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
613 | // TODO: handle this with exceptions and tolerate the memory loss |
619 | // TODO: handle this with exceptions and tolerate the memory loss |
614 | XSetIOErrorHandler (rxvt_xioerror_handler); |
620 | XSetIOErrorHandler (rxvt_xioerror_handler); |
|
|
621 | |
|
|
622 | #ifdef USE_XGETDEFAULT |
|
|
623 | XrmInitialize (); |
|
|
624 | #endif |
615 | } |
625 | } |
616 | |
626 | |
617 | /* ------------------------------------------------------------------------- * |
627 | /* ------------------------------------------------------------------------- * |
618 | * MEMORY ALLOCATION WRAPPERS * |
628 | * MEMORY ALLOCATION WRAPPERS * |
619 | * ------------------------------------------------------------------------- */ |
629 | * ------------------------------------------------------------------------- */ |