… | |
… | |
309 | delete argv; |
309 | delete argv; |
310 | |
310 | |
311 | #ifdef KEYSYM_RESOURCE |
311 | #ifdef KEYSYM_RESOURCE |
312 | delete keyboard; |
312 | delete keyboard; |
313 | #endif |
313 | #endif |
|
|
314 | #ifndef NO_RESOURCES |
|
|
315 | XrmDestroyDatabase (option_db); |
|
|
316 | #endif |
314 | } |
317 | } |
315 | |
318 | |
316 | // child has exited, usually destroys |
319 | // child has exited, usually destroys |
317 | void |
320 | void |
318 | rxvt_term::child_cb (ev::child &w, int status) |
321 | rxvt_term::child_cb (ev::child &w, int status) |
… | |
… | |
619 | void |
622 | void |
620 | rxvt_init () |
623 | rxvt_init () |
621 | { |
624 | { |
622 | ptytty::init (); |
625 | ptytty::init (); |
623 | |
626 | |
624 | if (!ev::ev_default_loop (0)) |
627 | if (!ev_default_loop (0)) |
625 | rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); |
628 | rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); |
626 | |
629 | |
627 | rxvt_environ = environ; |
630 | rxvt_environ = environ; |
628 | |
631 | |
629 | signal (SIGHUP, SIG_IGN); |
632 | signal (SIGHUP, SIG_IGN); |
630 | signal (SIGPIPE, SIG_IGN); |
633 | signal (SIGPIPE, SIG_IGN); |
631 | |
634 | |
632 | sig_handlers.sw_term.start (SIGTERM); ev::ev_unref (); |
635 | sig_handlers.sw_term.start (SIGTERM); ev_unref (); |
633 | sig_handlers.sw_int.start (SIGINT); ev::ev_unref (); |
636 | sig_handlers.sw_int.start (SIGINT); ev_unref (); |
634 | |
637 | |
635 | /* need to trap SIGURG for SVR4 (Unixware) rlogin */ |
638 | /* need to trap SIGURG for SVR4 (Unixware) rlogin */ |
636 | /* signal (SIGURG, SIG_DFL); */ |
639 | /* signal (SIGURG, SIG_DFL); */ |
637 | |
640 | |
638 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
641 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
… | |
… | |
976 | if (isdigit (*color)) |
979 | if (isdigit (*color)) |
977 | { |
980 | { |
978 | i = atoi (color); |
981 | i = atoi (color); |
979 | |
982 | |
980 | if (i >= 8 && i <= 15) |
983 | if (i >= 8 && i <= 15) |
|
|
984 | { |
981 | { /* bright colors */ |
985 | /* bright colors */ |
982 | i -= 8; |
986 | i -= 8; |
983 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
987 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
984 | goto done; |
988 | goto done; |
985 | } |
989 | } |
986 | |
990 | |
987 | if (i >= 0 && i <= 7) |
991 | if (i >= 0 && i <= 7) |
|
|
992 | { |
988 | { /* normal colors */ |
993 | /* normal colors */ |
989 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
994 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
990 | goto done; |
995 | goto done; |
991 | } |
996 | } |
992 | } |
997 | } |
993 | |
998 | |
… | |
… | |
998 | * so just keep gobbling up the colormap |
1003 | * so just keep gobbling up the colormap |
999 | */ |
1004 | */ |
1000 | |
1005 | |
1001 | pix_colors_focused[idx] = xcol; |
1006 | pix_colors_focused[idx] = xcol; |
1002 | |
1007 | |
1003 | /* XSetWindowAttributes attr; */ |
|
|
1004 | /* Cursor cursor; */ |
|
|
1005 | done: |
1008 | done: |
1006 | /*TODO: handle Color_BD, scrollbar background, etc. */ |
1009 | /*TODO: handle Color_BD, scrollbar background, etc. */ |
1007 | |
1010 | |
1008 | update_fade_color (idx); |
1011 | update_fade_color (idx); |
1009 | recolour_cursor (); |
1012 | recolour_cursor (); |