--- rxvt-unicode/src/init.C 2004/02/09 07:11:49 1.24 +++ rxvt-unicode/src/init.C 2004/10/24 14:02:44 1.93 @@ -1,5 +1,5 @@ /*--------------------------------*-C-*---------------------------------* - * File: init.c + * File: init.C *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. @@ -11,6 +11,7 @@ * - extensive modifications * Copyright (c) 1999 D J Hawkey Jr * - QNX support + * Copyright (c) 2003-2004 Marc Lehmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -68,256 +69,91 @@ "Magenta", /* 5/13: bright magenta (#FF00FF) */ "Cyan", /* 6/14: bright cyan (#00FFFF) */ "White", /* 7/15: bright white (#FFFFFF) */ -#ifdef TTY_256COLOR - "rgb:00/00/00", /* default 16-255 color table */ - "rgb:00/00/2a", - "rgb:00/00/55", - "rgb:00/00/7f", - "rgb:00/00/aa", - "rgb:00/00/d4", - "rgb:00/2a/00", - "rgb:00/2a/2a", - "rgb:00/2a/55", - "rgb:00/2a/7f", - "rgb:00/2a/aa", - "rgb:00/2a/d4", - "rgb:00/55/00", - "rgb:00/55/2a", - "rgb:00/55/55", - "rgb:00/55/7f", - "rgb:00/55/aa", - "rgb:00/55/d4", - "rgb:00/7f/00", - "rgb:00/7f/2a", - "rgb:00/7f/55", - "rgb:00/7f/7f", - "rgb:00/7f/aa", - "rgb:00/7f/d4", - "rgb:00/aa/00", - "rgb:00/aa/2a", - "rgb:00/aa/55", - "rgb:00/aa/7f", - "rgb:00/aa/aa", - "rgb:00/aa/d4", - "rgb:00/d4/00", - "rgb:00/d4/2a", - "rgb:00/d4/55", - "rgb:00/d4/7f", - "rgb:00/d4/aa", - "rgb:00/d4/d4", - "rgb:2a/00/00", - "rgb:2a/00/2a", - "rgb:2a/00/55", - "rgb:2a/00/7f", - "rgb:2a/00/aa", - "rgb:2a/00/d4", - "rgb:2a/2a/00", - "rgb:2a/2a/2a", - "rgb:2a/2a/55", - "rgb:2a/2a/7f", - "rgb:2a/2a/aa", - "rgb:2a/2a/d4", - "rgb:2a/55/00", - "rgb:2a/55/2a", - "rgb:2a/55/55", - "rgb:2a/55/7f", - "rgb:2a/55/aa", - "rgb:2a/55/d4", - "rgb:2a/7f/00", - "rgb:2a/7f/2a", - "rgb:2a/7f/55", - "rgb:2a/7f/7f", - "rgb:2a/7f/aa", - "rgb:2a/7f/d4", - "rgb:2a/aa/00", - "rgb:2a/aa/2a", - "rgb:2a/aa/55", - "rgb:2a/aa/7f", - "rgb:2a/aa/aa", - "rgb:2a/aa/d4", - "rgb:2a/d4/00", - "rgb:2a/d4/2a", - "rgb:2a/d4/55", - "rgb:2a/d4/7f", - "rgb:2a/d4/aa", - "rgb:2a/d4/d4", - "rgb:55/00/00", - "rgb:55/00/2a", - "rgb:55/00/55", - "rgb:55/00/7f", - "rgb:55/00/aa", - "rgb:55/00/d4", - "rgb:55/2a/00", - "rgb:55/2a/2a", - "rgb:55/2a/55", - "rgb:55/2a/7f", - "rgb:55/2a/aa", - "rgb:55/2a/d4", - "rgb:55/55/00", - "rgb:55/55/2a", - "rgb:55/55/55", - "rgb:55/55/7f", - "rgb:55/55/aa", - "rgb:55/55/d4", - "rgb:55/7f/00", - "rgb:55/7f/2a", - "rgb:55/7f/55", - "rgb:55/7f/7f", - "rgb:55/7f/aa", - "rgb:55/7f/d4", - "rgb:55/aa/00", - "rgb:55/aa/2a", - "rgb:55/aa/55", - "rgb:55/aa/7f", - "rgb:55/aa/aa", - "rgb:55/aa/d4", - "rgb:55/d4/00", - "rgb:55/d4/2a", - "rgb:55/d4/55", - "rgb:55/d4/7f", - "rgb:55/d4/aa", - "rgb:55/d4/d4", - "rgb:7f/00/00", - "rgb:7f/00/2a", - "rgb:7f/00/55", - "rgb:7f/00/7f", - "rgb:7f/00/aa", - "rgb:7f/00/d4", - "rgb:7f/2a/00", - "rgb:7f/2a/2a", - "rgb:7f/2a/55", - "rgb:7f/2a/7f", - "rgb:7f/2a/aa", - "rgb:7f/2a/d4", - "rgb:7f/55/00", - "rgb:7f/55/2a", - "rgb:7f/55/55", - "rgb:7f/55/7f", - "rgb:7f/55/aa", - "rgb:7f/55/d4", - "rgb:7f/7f/00", - "rgb:7f/7f/2a", - "rgb:7f/7f/55", - "rgb:7f/7f/7f", - "rgb:7f/7f/aa", - "rgb:7f/7f/d4", - "rgb:7f/aa/00", - "rgb:7f/aa/2a", - "rgb:7f/aa/55", - "rgb:7f/aa/7f", - "rgb:7f/aa/aa", - "rgb:7f/aa/d4", - "rgb:7f/d4/00", - "rgb:7f/d4/2a", - "rgb:7f/d4/55", - "rgb:7f/d4/7f", - "rgb:7f/d4/aa", - "rgb:7f/d4/d4", - "rgb:aa/00/00", - "rgb:aa/00/2a", - "rgb:aa/00/55", - "rgb:aa/00/7f", - "rgb:aa/00/aa", - "rgb:aa/00/d4", - "rgb:aa/2a/00", - "rgb:aa/2a/2a", - "rgb:aa/2a/55", - "rgb:aa/2a/7f", - "rgb:aa/2a/aa", - "rgb:aa/2a/d4", - "rgb:aa/55/00", - "rgb:aa/55/2a", - "rgb:aa/55/55", - "rgb:aa/55/7f", - "rgb:aa/55/aa", - "rgb:aa/55/d4", - "rgb:aa/7f/00", - "rgb:aa/7f/2a", - "rgb:aa/7f/55", - "rgb:aa/7f/7f", - "rgb:aa/7f/aa", - "rgb:aa/7f/d4", - "rgb:aa/aa/00", - "rgb:aa/aa/2a", - "rgb:aa/aa/55", - "rgb:aa/aa/7f", - "rgb:aa/aa/aa", - "rgb:aa/aa/d4", - "rgb:aa/d4/00", - "rgb:aa/d4/2a", - "rgb:aa/d4/55", - "rgb:aa/d4/7f", - "rgb:aa/d4/aa", - "rgb:aa/d4/d4", - "rgb:d4/00/00", - "rgb:d4/00/2a", - "rgb:d4/00/55", - "rgb:d4/00/7f", - "rgb:d4/00/aa", - "rgb:d4/00/d4", - "rgb:d4/2a/00", - "rgb:d4/2a/2a", - "rgb:d4/2a/55", - "rgb:d4/2a/7f", - "rgb:d4/2a/aa", - "rgb:d4/2a/d4", - "rgb:d4/55/00", - "rgb:d4/55/2a", - "rgb:d4/55/55", - "rgb:d4/55/7f", - "rgb:d4/55/aa", - "rgb:d4/55/d4", - "rgb:d4/7f/00", - "rgb:d4/7f/2a", - "rgb:d4/7f/55", - "rgb:d4/7f/7f", - "rgb:d4/7f/aa", - "rgb:d4/7f/d4", - "rgb:d4/aa/00", - "rgb:d4/aa/2a", - "rgb:d4/aa/55", - "rgb:d4/aa/7f", - "rgb:d4/aa/aa", - "rgb:d4/aa/d4", - "rgb:d4/d4/00", - "rgb:d4/d4/2a", - "rgb:d4/d4/55", - "rgb:d4/d4/7f", - "rgb:d4/d4/aa", - "rgb:d4/d4/d4", - "rgb:08/08/08", - "rgb:12/12/12", - "rgb:1c/1c/1c", - "rgb:26/26/26", - "rgb:30/30/30", - "rgb:3a/3a/3a", - "rgb:44/44/44", - "rgb:4e/4e/4e", - "rgb:58/58/58", - "rgb:62/62/62", - "rgb:6c/6c/6c", - "rgb:76/76/76", - "rgb:80/80/80", - "rgb:8a/8a/8a", - "rgb:94/94/94", - "rgb:9e/9e/9e", - "rgb:a8/a8/a8", - "rgb:b2/b2/b2", - "rgb:bc/bc/bc", - "rgb:c6/c6/c6", + + // 88 xterm colours + "rgb:00/00/00", + "rgb:00/00/8b", + "rgb:00/00/cd", + "rgb:00/00/ff", + "rgb:00/8b/00", + "rgb:00/8b/8b", + "rgb:00/8b/cd", + "rgb:00/8b/ff", + "rgb:00/cd/00", + "rgb:00/cd/8b", + "rgb:00/cd/cd", + "rgb:00/cd/ff", + "rgb:00/ff/00", + "rgb:00/ff/8b", + "rgb:00/ff/cd", + "rgb:00/ff/ff", + "rgb:8b/00/00", + "rgb:8b/00/8b", + "rgb:8b/00/cd", + "rgb:8b/00/ff", + "rgb:8b/8b/00", + "rgb:8b/8b/8b", + "rgb:8b/8b/cd", + "rgb:8b/8b/ff", + "rgb:8b/cd/00", + "rgb:8b/cd/8b", + "rgb:8b/cd/cd", + "rgb:8b/cd/ff", + "rgb:8b/ff/00", + "rgb:8b/ff/8b", + "rgb:8b/ff/cd", + "rgb:8b/ff/ff", + "rgb:cd/00/00", + "rgb:cd/00/8b", + "rgb:cd/00/cd", + "rgb:cd/00/ff", + "rgb:cd/8b/00", + "rgb:cd/8b/8b", + "rgb:cd/8b/cd", + "rgb:cd/8b/ff", + "rgb:cd/cd/00", + "rgb:cd/cd/8b", + "rgb:cd/cd/cd", + "rgb:cd/cd/ff", + "rgb:cd/ff/00", + "rgb:cd/ff/8b", + "rgb:cd/ff/cd", + "rgb:cd/ff/ff", + "rgb:ff/00/00", + "rgb:ff/00/8b", + "rgb:ff/00/cd", + "rgb:ff/00/ff", + "rgb:ff/8b/00", + "rgb:ff/8b/8b", + "rgb:ff/8b/cd", + "rgb:ff/8b/ff", + "rgb:ff/cd/00", + "rgb:ff/cd/8b", + "rgb:ff/cd/cd", + "rgb:ff/cd/ff", + "rgb:ff/ff/00", + "rgb:ff/ff/8b", + "rgb:ff/ff/cd", + "rgb:ff/ff/ff", + "rgb:2e/2e/2e", + "rgb:5c/5c/5c", + "rgb:73/73/73", + "rgb:8b/8b/8b", + "rgb:a2/a2/a2", + "rgb:b9/b9/b9", "rgb:d0/d0/d0", - "rgb:da/da/da", - "rgb:e4/e4/e4", - "rgb:ee/ee/ee", -#endif + "rgb:e7/e7/e7", + #ifndef NO_CURSORCOLOR COLOR_CURSOR_BACKGROUND, COLOR_CURSOR_FOREGROUND, #endif /* ! NO_CURSORCOLOR */ - NULL, /* Color_pointer */ + NULL, /* Color_pointer_fg */ + NULL, /* Color_pointer_bg */ NULL, /* Color_border */ #ifndef NO_BOLD_UNDERLINE_REVERSE NULL, /* Color_BD */ + NULL, /* Color_IT */ NULL, /* Color_UL */ NULL, /* Color_RV */ #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ @@ -328,7 +164,9 @@ COLOR_SCROLLBAR, COLOR_SCROLLTROUGH, #endif /* KEEP_SCROLLCOLOR */ - +#if TINTING + NULL, +#endif }; const char *const xa_names[NUM_XA] = @@ -355,27 +193,28 @@ bool rxvt_term::init_vars () { - PixColors = new rxvt_color [TOTAL_COLORS]; - if (PixColors == NULL) + sw_term.start (SIGTERM); + + pix_colors_focused = new rxvt_color [TOTAL_COLORS]; +#ifdef OFF_FOCUS_FADING + pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; +#endif + pix_colors = pix_colors_focused; + + if (pix_colors == NULL) return false; #if defined(XPM_BACKGROUND) || defined(TRANSPARENT) TermWin.pixmap = None; #endif -#ifdef UTMP_SUPPORT - next_utmp_action = SAVE; -#endif -#ifndef NO_SETOWNER_TTYDEV - next_tty_action = SAVE; -#endif MEvent.time = CurrentTime; MEvent.button = AnyButton; - Options = DEFAULT_OPTIONS; + options = DEFAULT_OPTIONS; want_refresh = 1; cmd_pid = -1; - cmd_fd = tty_fd = -1; - PrivateModes = SavedModes = PrivMode_Default; + pty.pty = pty.tty = -1; + priv_modes = SavedModes = PrivMode_Default; TermWin.focus = 0; TermWin.ncol = 80; TermWin.nrow = 24; @@ -383,36 +222,11 @@ TermWin.ext_bwidth = EXTERNALBORDERWIDTH; TermWin.lineSpace = LINESPACE; TermWin.saveLines = SAVELINES; - numPixColors = TOTAL_COLORS; - -#ifndef NO_NEW_SELECTION - selection_style = NEW_SELECT; -#else - selection_style = OLD_SELECT; -#endif - -#ifndef NO_BRIGHTCOLOR - colorfgbg = DEFAULT_RSTYLE; -#endif - -#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) - ks_bigfont = XK_greater; - ks_smallfont = XK_less; -#endif - -#ifdef GREEK_SUPPORT - ks_greekmodeswith = GREEK_KEYBOARD_MODESWITCH; -#endif + numpix_colors = TOTAL_COLORS; refresh_limit = 1; refresh_type = SLOW_REFRESH; prev_nrow = prev_ncol = 0; -#ifdef MULTICHAR_SET -# ifdef MULTICHAR_ENCODING - encoding_method = MULTICHAR_ENCODING; -# endif - multichar_decode = rxvt_euc2jis; -#endif oldcursor.row = oldcursor.col = -1; #ifdef XPM_BACKGROUND @@ -425,8 +239,8 @@ #ifdef MENUBAR menu_readonly = 1; -# if !(MENUBAR_MAX > 1) - CurrentBar = &(BarList); +# if ! (MENUBAR_MAX > 1) + CurrentBar = & (BarList); # endif /* (MENUBAR_MAX > 1) */ #endif @@ -437,21 +251,6 @@ rxvt_term::init_secondary () { int i; -#ifdef TTY_GID_SUPPORT - struct group *gr = getgrnam ("tty"); - - if (gr) - { /* change group ownership of tty to "tty" */ - ttymode = S_IRUSR | S_IWUSR | S_IWGRP; - ttygid = gr->gr_gid; - } - else -#endif /* TTY_GID_SUPPORT */ - - { - ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; - ttygid = getgid (); - } /* * Close all unused file descriptors @@ -477,7 +276,7 @@ if (i == 4 || i == 7) continue; #endif - close(i); + close (i); } #endif } @@ -494,10 +293,10 @@ * Look for -exec option. Find => split and make cmd_argv[] of command args */ for (r_argc = 0; r_argc < argc; r_argc++) - if (!STRCMP (argv[r_argc], "-e") || !STRCMP(argv[r_argc], "-exec")) + if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) break; - r_argv = (const char **)rxvt_malloc (sizeof(char *) * (r_argc + 1)); + r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); for (i = 0; i < r_argc; i++) r_argv[i] = (const char *)argv[i]; @@ -508,7 +307,7 @@ cmd_argv = NULL; else { - cmd_argv = (const char **)rxvt_malloc (sizeof(char *) * (argc - r_argc)); + cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); for (i = 0; i < argc - r_argc - 1; i++) cmd_argv[i] = (const char *)argv[i + r_argc + 1]; @@ -516,11 +315,7 @@ cmd_argv[i] = NULL; } - /* clear all resources */ - for (i = 0; i < NUM_RESOURCES;) - rs[i++] = NULL; - - rs[Rs_name] = rxvt_r_basename(argv[0]); + rs[Rs_name] = rxvt_r_basename (argv[0]); /* * Open display, get options/resources and create the window @@ -534,20 +329,17 @@ #ifdef LOCAL_X_IS_UNIX if (rs[Rs_display_name][0] == ':') { - val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name])); - STRCPY (val, "unix"); - STRCAT (val, rs[Rs_display_name]); + val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); + strcpy (val, "unix"); + strcat (val, rs[Rs_display_name]); display = displays.get (val); free (val); } #endif if (!display - && !(display = displays.get (rs[Rs_display_name]))) - { - rxvt_print_error ("can't open display %s", rs[Rs_display_name]); - exit (EXIT_FAILURE); - } + && ! (display = displays.get (rs[Rs_display_name]))) + rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); extract_resources (display->display, rs[Rs_name]); @@ -557,7 +349,7 @@ if (cmd_argv && cmd_argv[0]) { if (!rs[Rs_title]) - rs[Rs_title] = rxvt_r_basename(cmd_argv[0]); + rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); if (!rs[Rs_iconName]) rs[Rs_iconName] = rs[Rs_title]; } @@ -569,23 +361,23 @@ rs[Rs_iconName] = rs[Rs_name]; } - if (rs[Rs_saveLines] && (i = atoi(rs[Rs_saveLines])) >= 0) - TermWin.saveLines = BOUND_POSITIVE_INT16(i); + if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) + TermWin.saveLines = BOUND_POSITIVE_INT16 (i); -#ifndef NO_FRILLS - if (rs[Rs_int_bwidth] && (i = atoi(rs[Rs_int_bwidth])) >= 0) - TermWin.int_bwidth = min(i, 100); /* arbitrary limit */ - if (rs[Rs_ext_bwidth] && (i = atoi(rs[Rs_ext_bwidth])) >= 0) - TermWin.ext_bwidth = min(i, 100); /* arbitrary limit */ +#if ENABLE_FRILLS + if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) + TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ + if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) + TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ #endif #ifndef NO_LINESPACE - if (rs[Rs_lineSpace] && (i = atoi(rs[Rs_lineSpace])) >= 0) - TermWin.lineSpace = min(i, 100); /* arbitrary limit */ + if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) + TermWin.lineSpace = min (i, 100); /* arbitrary limit */ #endif #ifdef POINTER_BLANK - if (rs[Rs_pointerBlankDelay] && (i = atoi(rs[Rs_pointerBlankDelay])) >= 0) + if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) pointerBlankDelay = i; else pointerBlankDelay = 2; @@ -593,7 +385,7 @@ /* no point having a scrollbar without having any scrollback! */ if (!TermWin.saveLines) - Options &= ~Opt_scrollBar; + options &= ~Opt_scrollBar; #ifdef PRINTPIPE if (!rs[Rs_print_pipe]) @@ -603,18 +395,6 @@ if (!rs[Rs_cutchars]) rs[Rs_cutchars] = CUTCHARS; -#ifdef ACS_ASCII - if (!rs[Rs_acs_chars]) - rs[Rs_acs_chars] = ACS_CHARS; - if ((i = STRLEN(rs[Rs_acs_chars])) < 0x20) - { - val = rxvt_realloc((void *)rs[Rs_acs_chars], 0x20); - for (; i < 0x20; ) - val[i] = ' '; - rs[Rs_acs_chars] = val; - } -#endif - #ifndef NO_BACKSPACE_KEY if (!rs[Rs_backspace_key]) # ifdef DEFAULT_BACKSPACE @@ -624,9 +404,9 @@ # endif else { - val = STRDUP(rs[Rs_backspace_key]); - rxvt_Str_trim(val); - rxvt_Str_escaped(val); + val = strdup (rs[Rs_backspace_key]); + rxvt_Str_trim (val); + rxvt_Str_escaped (val); key_backspace = val; } #endif @@ -640,44 +420,25 @@ # endif else { - val = STRDUP(rs[Rs_delete_key]); - rxvt_Str_trim(val); - rxvt_Str_escaped(val); + val = strdup (rs[Rs_delete_key]); + rxvt_Str_trim (val); + rxvt_Str_escaped (val); key_delete = val; } #endif if (rs[Rs_answerbackstring]) { - rxvt_Str_trim((char *)rs[Rs_answerbackstring]); - rxvt_Str_escaped((char *)rs[Rs_answerbackstring]); - } - - if (rs[Rs_selectstyle]) - { - if (STRNCASECMP(rs[Rs_selectstyle], "oldword", 7) == 0) - selection_style = OLD_WORD_SELECT; -#ifndef NO_OLD_SELECTION - - else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0) - selection_style = OLD_SELECT; -#endif - + rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); + rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); } #ifdef HAVE_SCROLLBARS - setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], - rs[Rs_scrollBar_thickness]); + setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); #endif - TermWin.fontset = new rxvt_fontset (this); - TermWin.fontset->populate (rs[Rs_font]); - TermWin.fwidth = TermWin.fontset->base_font ()->width; - TermWin.fheight = TermWin.fontset->base_font ()->height; - TermWin.fbase = TermWin.fontset->base_font ()->ascent; - #ifdef XTERM_REVERSE_VIDEO /* this is how xterm implements reverseVideo */ - if (Options & Opt_reverseVideo) + if (options & Opt_reverseVideo) { if (!rs[Rs_color + Color_fg]) rs[Rs_color + Color_fg] = def_colorName[Color_bg]; @@ -692,8 +453,8 @@ #ifndef XTERM_REVERSE_VIDEO /* this is how we implement reverseVideo */ - if (Options & Opt_reverseVideo) - SWAP_IT(rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); + if (options & Opt_reverseVideo) + SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); #endif /* convenient aliases for setting fg/bg to colors */ @@ -703,7 +464,8 @@ color_aliases (Color_cursor); color_aliases (Color_cursor2); #endif /* NO_CURSORCOLOR */ - color_aliases (Color_pointer); + color_aliases (Color_pointer_fg); + color_aliases (Color_pointer_bg); color_aliases (Color_border); #ifndef NO_BOLD_UNDERLINE_REVERSE color_aliases (Color_BD); @@ -711,6 +473,9 @@ color_aliases (Color_RV); #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ + if (!rs[Rs_color + Color_border]) + rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; + return cmd_argv; } @@ -726,7 +491,7 @@ /* Fixup display_name for export over pty to any interested terminal * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number * (for the first non-loopback interface) that we get from - * rxvt_network_display(). This is more "name-resolution-portable", if you + * rxvt_network_display (). This is more "name-resolution-portable", if you * will, and probably allows for faster x-client startup if your name * server is beyond a slow link or overloaded at client startup. Of * course that only helps the shell's child processes, not us. @@ -738,22 +503,22 @@ if (val == NULL) #endif /* DISPLAY_IS_IP */ - val = XDisplayString(display->display); + val = XDisplayString (display->display); if (rs[Rs_display_name] == NULL) rs[Rs_display_name] = val; /* use broken `:0' value */ - i = STRLEN (val); - env_display = (char *)rxvt_malloc ((i + 9) * sizeof(char)); + i = strlen (val); + env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); sprintf (env_display, "DISPLAY=%s", val); /* avoiding the math library: - * i = (int)(ceil(log10((unsigned int)TermWin.parent[0]))) */ + * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) ; - MAX_IT(i, 1); - env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof(char)); + MAX_IT (i, 1); + env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); sprintf (env_windowid, "WINDOWID=%u", (unsigned int)TermWin.parent[0]); @@ -764,9 +529,12 @@ * @ COLORTERM: terminal sub-name and also indicates its color * @ TERM: terminal name * @ TERMINFO: path to terminfo directory + * @ COLORFGBG: fg;bg color codes */ putenv (env_display); putenv (env_windowid); + if (env_colorfgbg) + putenv (env_colorfgbg); #ifdef RXVT_TERMINFO putenv ("TERMINFO=" RXVT_TERMINFO); @@ -779,7 +547,7 @@ if (rs[Rs_term_name] != NULL) { - env_term = (char *)rxvt_malloc ((STRLEN(rs[Rs_term_name]) + 6) * sizeof(char)); + env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); sprintf (env_term, "TERM=%s", rs[Rs_term_name]); putenv (env_term); } @@ -804,16 +572,36 @@ { #if HAVE_XSETLOCALE || HAVE_SETLOCALE free (this->locale); - this->locale = rxvt_strdup (setlocale (LC_CTYPE, "")); + this->locale = setlocale (LC_CTYPE, locale); + + if (!this->locale) + { + if (*locale) + { + rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); + setlocale (LC_CTYPE, ""); + } + else + rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); + + this->locale = ""; + } + + + this->locale = rxvt_strdup (this->locale); + SET_LOCALE (this->locale); + mbstate.reset (); #endif +#if 0 #if HAVE_NL_LANGINFO free (codeset); codeset = strdup (nl_langinfo (CODESET)); - enc_utf8 = !STRCASECMP (codeset, "UTF-8") - || !STRCASECMP (codeset, "UTF8"); + enc_utf8 = !strcasecmp (codeset, "UTF-8") + || !strcasecmp (codeset, "UTF8"); #else enc_utf8 = 1; #endif +#endif } void @@ -821,7 +609,7 @@ { #ifdef USE_XIM if (!locale) - rxvt_print_error ("Setting locale failed."); + rxvt_warn ("setting locale failed, working without locale support.\n"); else { Atom wmlocale; @@ -829,28 +617,25 @@ wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); XChangeProperty (display->display, TermWin.parent[0], wmlocale, XA_STRING, 8, PropModeReplace, - (unsigned char *)locale, STRLEN(locale)); + (unsigned char *)locale, strlen (locale)); if (!XSupportsLocale ()) { - rxvt_print_error ("The locale is not supported by Xlib"); + rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); return; } - /* see if we can connect yet */ - rxvt_IMInstantiateCallback (display->display, NULL, NULL); + im_ev.start (display); - /* To avoid Segmentation Fault in C locale: Solaris only? */ - if (STRCMP (locale, "C")) - XRegisterIMInstantiateCallback (display->display, NULL, NULL, NULL, - rxvt_IMInstantiateCallback, NULL); + /* see if we can connect already */ + im_cb (); } #endif } /*----------------------------------------------------------------------*/ void -rxvt_term::init_command(const char *const *argv) +rxvt_term::init_command (const char *const *argv) { /* * Initialize the command connection. @@ -859,11 +644,11 @@ int i; for (i = 0; i < NUM_XA; i++) - xa[i] = XInternAtom(display->display, xa_names[i], False); + xa[i] = XInternAtom (display->display, xa_names[i], False); /* Enable delete window protocol */ XSetWMProtocols (display->display, TermWin.parent[0], - &(xa[XA_WMDELETEWINDOW]), 1); + & (xa[XA_WMDELETEWINDOW]), 1); #ifdef USING_W11LIB /* enable W11 callbacks */ @@ -871,49 +656,41 @@ #endif #ifdef META8_OPTION - meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); + meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); #endif get_ourmods (); - if (!(Options & Opt_scrollTtyOutput)) - PrivateModes |= PrivMode_TtyOutputInh; - if (Options & Opt_scrollTtyKeypress) - PrivateModes |= PrivMode_Keypress; - if (!(Options & Opt_jumpScroll)) - PrivateModes |= PrivMode_smoothScroll; + if (!(options & Opt_scrollTtyOutput)) + priv_modes |= PrivMode_TtyOutputInh; + if (options & Opt_scrollTtyKeypress) + priv_modes |= PrivMode_Keypress; + if (!(options & Opt_jumpScroll)) + priv_modes |= PrivMode_smoothScroll; #ifndef NO_BACKSPACE_KEY - if (STRCMP(key_backspace, "DEC") == 0) - PrivateModes |= PrivMode_HaveBackSpace; + if (strcmp (key_backspace, "DEC") == 0) + priv_modes |= PrivMode_HaveBackSpace; #endif /* add value for scrollBar */ if (scrollbar_visible ()) { - PrivateModes |= PrivMode_scrollBar; + priv_modes |= PrivMode_scrollBar; SavedModes |= PrivMode_scrollBar; } if (menubar_visible ()) { - PrivateModes |= PrivMode_menuBar; + priv_modes |= PrivMode_menuBar; SavedModes |= PrivMode_menuBar; } -#ifdef GREEK_SUPPORT - greek_init(); -#endif - #ifdef CURSOR_BLINK - if (Options & Opt_cursorBlink) + if (options & Opt_cursorBlink) (void)gettimeofday (&lastcursorchange, NULL); #endif - if ((cmd_fd = run_command (argv)) < 0) - { - rxvt_print_error ("aborting"); - exit (EXIT_FAILURE); - } + run_command (argv); } /*----------------------------------------------------------------------*/ @@ -922,7 +699,11 @@ { int i; - for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) +#ifdef OFF_FOCUS_FADING + pix_colors = pix_colors_focused; +#endif + + for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) { rxvt_color xcol; @@ -932,7 +713,7 @@ if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) { #ifndef XTERM_REVERSE_VIDEO - if (i < 2 && (Options & Opt_reverseVideo)) + if (i < 2 && (options & Opt_reverseVideo)) rs[Rs_color + i] = def_colorName[!i]; else #endif @@ -948,33 +729,38 @@ case Color_fg: case Color_bg: /* fatal: need bg/fg color */ - rxvt_print_error ("aborting"); - exit (EXIT_FAILURE); + rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); /* NOTREACHED */ break; #ifndef NO_CURSORCOLOR case Color_cursor2: - xcol = PixColors[Color_fg]; + xcol = pix_colors[Color_fg]; break; #endif /* ! NO_CURSORCOLOR */ - case Color_pointer: - xcol = PixColors[Color_fg]; + case Color_pointer_fg: + xcol = pix_colors[Color_fg]; break; default: - xcol = PixColors[Color_bg]; /* None */ + xcol = pix_colors[Color_bg]; /* None */ break; } } } - PixColors[i] = xcol; + pix_colors[i] = xcol; +#ifdef OFF_FOCUS_FADING + if (rs[Rs_fade]) + pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); +#endif SET_PIXCOLOR (i); } - if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) - PixColors[Color_pointer] = PixColors[Color_fg]; - if (XDEPTH <= 2 || !rs[Rs_color + Color_border]) - PixColors[Color_border] = PixColors[Color_fg]; + if (display->depth <= 2) + { + if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; + if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; + if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; + } /* * get scrollBar/menuBar shadow colors @@ -984,46 +770,37 @@ */ #ifdef KEEP_SCROLLCOLOR - if (XDEPTH <= 2) + if (display->depth <= 2) { /* Monochrome */ - PixColors[Color_scroll] = PixColors[Color_fg]; - PixColors[Color_topShadow] = PixColors[Color_bg]; - PixColors[Color_bottomShadow] = PixColors[Color_bg]; + pix_colors[Color_scroll] = pix_colors[Color_fg]; + pix_colors[Color_topShadow] = pix_colors[Color_bg]; + pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; } else { - rxvt_color xcol[3]; + rxvt_color xcol[2]; /* xcol[0] == white * xcol[1] == top shadow * xcol[2] == bot shadow */ - xcol[1] = PixColors[Color_scroll]; -# ifdef PREFER_24BIT + xcol[1] = pix_colors[Color_scroll]; xcol[0].set (display, 65535, 65535, 65535); - /* XFreeColors(display->display, XCMAP, &(xcol[0].pixel), 1, ~0); */ -# else - xcol[0].set (display, WhitePixel (display->display, display->screen)); -# endif unsigned short pr1, pg1, pb1, pr0, pg0, pb0; xcol[0].get (display, pr0, pg0, pb0); xcol[1].get (display, pr1, pg1, pb1); - /* bottomShadowColor */ - if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2)) - xcol[2] = PixColors[Color_Black]; - - PixColors[Color_bottomShadow] = xcol[2]; + pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); /* topShadowColor */ if (!xcol[1].set (display, min (pr0, max (pr0 / 5, pr1) * 7 / 5), min (pg0, max (pg0 / 5, pg1) * 7 / 5), min (pb0, max (pb0 / 5, pb1) * 7 / 5))) - xcol[1] = PixColors[Color_White]; + xcol[1] = pix_colors[Color_White]; - PixColors[Color_topShadow] = xcol[1]; + pix_colors[Color_topShadow] = xcol[1]; } #endif /* KEEP_SCROLLCOLOR */ } @@ -1031,9 +808,9 @@ /*----------------------------------------------------------------------*/ /* color aliases, fg/bg bright-bold */ void -rxvt_term::color_aliases(int idx) +rxvt_term::color_aliases (int idx) { - if (rs[Rs_color + idx] && isdigit (*(rs[Rs_color + idx]))) + if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) { int i = atoi (rs[Rs_color + idx]); @@ -1044,7 +821,6 @@ rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; return; #endif - } if (i >= 0 && i <= 7) /* normal colors */ @@ -1073,10 +849,10 @@ requestedmeta = realmeta = realalt = 0; rsmod = rs[Rs_modifier]; if (rsmod - && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) + && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) requestedmeta = rsmod[3] - '0'; - map = XGetModifierMapping(display->display); + map = XGetModifierMapping (display->display); kc = map->modifiermap; for (i = 1; i < 6; i++) { @@ -1085,13 +861,13 @@ { if (kc[k] == 0) break; - switch (XKeycodeToKeysym(display->display, kc[k], 0)) + switch (XKeycodeToKeysym (display->display, kc[k], 0)) { case XK_Num_Lock: ModNumLockMask = modmasks[i - 1]; /* FALLTHROUGH */ default: - continue; /* for(;;) */ + continue; /* for (;;) */ case XK_Meta_L: case XK_Meta_R: cm = "meta"; @@ -1111,11 +887,11 @@ cm = "hyper"; break; } - if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) + if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) requestedmeta = i; } } - XFreeModifiermap(map); + XFreeModifiermap (map); i = (requestedmeta ? requestedmeta : (realmeta ? realmeta : (realalt ? realalt : 0))); @@ -1124,40 +900,67 @@ } /*----------------------------------------------------------------------*/ -/* rxvt_Create_Windows() - Open and map the window */ +/* rxvt_Create_Windows () - Open and map the window */ void rxvt_term::create_windows (int argc, const char *const *argv) { - XClassHint classHint; - XWMHints wmHint; - XGCValues gcvalue; - long vt_emask; - + XClassHint classHint; + XWMHints wmHint; +#if ENABLE_FRILLS + Atom prop = None; + MWMHints mwmhints; +#endif + XGCValues gcvalue; + long vt_emask; + XSetWindowAttributes attributes; XWindowAttributes gattr; - if (Options & Opt_transparent) + if (options & Opt_transparent) { - XGetWindowAttributes (display->display, RootWindow(display->display, display->screen), &gattr); + XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); display->depth = gattr.depth; // doh //TODO, per-term not per-display? } +#if ENABLE_FRILLS + if (options & Opt_borderLess) + { + prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); + + if (prop == None) + { + /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ +#ifdef PREFER_24BIT + attributes.override_redirect = TRUE; +#endif + mwmhints.flags = 0; + } + else + { + mwmhints.flags = MWM_HINTS_DECORATIONS; + mwmhints.decorations = 0; + } + } + else + { + mwmhints.flags = 0; + } +#endif + /* grab colors before netscape does */ Get_Colours (); - change_font (1, NULL); + if (!set_fonts ()) + rxvt_fatal ("unable to load base fontset, please specify one using -fn, aborting.\n"); + window_calc (0, 0); old_width = szHint.width; old_height = szHint.height; - /* parent window - reverse video so we can see placement errors - * sub-window placement & size in rxvt_resize_subwindows() - */ + /* sub-window placement & size in rxvt_resize_subwindows () */ #ifdef PREFER_24BIT - XSetWindowAttributes attributes; - - attributes.background_pixel = PixColors[Color_fg]; - attributes.border_pixel = PixColors[Color_border]; + attributes.background_pixel = pix_colors_focused[Color_border]; + attributes.border_pixel = pix_colors_focused[Color_border]; attributes.colormap = display->cmap; TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), szHint.x, szHint.y, @@ -1165,47 +968,63 @@ TermWin.ext_bwidth, display->depth, InputOutput, display->visual, - CWBackPixel | CWBorderPixel | CWColormap, &attributes); + CWColormap | CWBackPixel | CWBorderPixel, &attributes); #else TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), - szHint.x, szHint.y, - szHint.width, - szHint.height, - TermWin.ext_bwidth, - PixColors[Color_border], - PixColors[Color_fg]); + szHint.x, szHint.y, + szHint.width, szHint.height, + TermWin.ext_bwidth, + pix_colors_focused[Color_border], + pix_colors_focused[Color_border]); #endif - xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); - xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); + process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); + process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); classHint.res_name = (char *)rs[Rs_name]; - classHint.res_class = (char *)APL_CLASS; + classHint.res_class = (char *)RESCLASS; - wmHint.flags = (InputHint | StateHint | WindowGroupHint); + wmHint.flags = InputHint | StateHint | WindowGroupHint; wmHint.input = True; - wmHint.initial_state = (Options & Opt_iconic ? IconicState - : NormalState); + wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; wmHint.window_group = TermWin.parent[0]; - XSetWMProperties(display->display, TermWin.parent[0], NULL, NULL, - (char **)argv, argc, &szHint, &wmHint, &classHint); + XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, + (char **)argv, argc, &szHint, &wmHint, &classHint); + +#if ENABLE_FRILLS + long pid = getpid (); + + XChangeProperty (display->display, TermWin.parent[0], + display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, + PropModeReplace, (unsigned char *)&pid, 1); +#endif - XSelectInput(display->display, TermWin.parent[0], - KeyPressMask -#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) - | KeyReleaseMask + XSelectInput (display->display, TermWin.parent[0], + KeyPressMask +#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 + | KeyReleaseMask #endif - | FocusChangeMask | VisibilityChangeMask - | StructureNotifyMask); + | FocusChangeMask | VisibilityChangeMask + | ExposureMask + | StructureNotifyMask); termwin_ev.start (display, TermWin.parent[0]); +#if ENABLE_FRILLS + if (mwmhints.flags) + { + prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False); + XChangeProperty (display->display, TermWin.parent[0], prop, prop, 32, + PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); + } +#endif + /* vt cursor: Black-on-White is standard, but this is more popular */ - TermWin_cursor = XCreateFontCursor(display->display, XC_xterm); + TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); #if defined(HAVE_SCROLLBARS) || defined(MENUBAR) /* cursor (menuBar/scrollBar): Black-on-White */ - leftptr_cursor = XCreateFontCursor(display->display, XC_left_ptr); + leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); #endif #ifdef POINTER_BLANK @@ -1222,50 +1041,56 @@ #endif /* the vt window */ - TermWin.vt = XCreateSimpleWindow(display->display, TermWin.parent[0], - window_vt_x, window_vt_y, - TermWin_TotalWidth(), - TermWin_TotalHeight(), + TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], + window_vt_x, + window_vt_y, + TermWin_TotalWidth (), + TermWin_TotalHeight (), 0, - PixColors[Color_fg], - PixColors[Color_bg]); - + pix_colors_focused[Color_fg], + pix_colors_focused[Color_bg]); #ifdef DEBUG_X - XStoreName(display->display, TermWin.vt, "vt window"); + XStoreName (display->display, TermWin.vt, "vt window"); #endif - vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask - | PropertyChangeMask); + attributes.bit_gravity = NorthWestGravity; + XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); + + vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; -#ifdef POINTER_BLANK pointer_unblank (); - if ((Options & Opt_pointerBlank)) +#ifdef POINTER_BLANK + if (options & Opt_pointerBlank) vt_emask |= PointerMotionMask; else #endif - vt_emask |= (Button1MotionMask | Button3MotionMask); + vt_emask |= Button1MotionMask | Button3MotionMask; - XSelectInput(display->display, TermWin.vt, vt_emask); + XSelectInput (display->display, TermWin.vt, vt_emask); vt_ev.start (display, TermWin.vt); #if defined(MENUBAR) && (MENUBAR_MAX > 1) - if (menuBar_height()) + if (menuBar_height ()) { - menuBar.win = XCreateSimpleWindow(display->display, TermWin.parent[0], - window_vt_x, 0, - TermWin_TotalWidth(), - menuBar_TotalHeight(), - 0, - PixColors[Color_fg], - PixColors[Color_scroll]); + menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], + window_vt_x, 0, + TermWin_TotalWidth (), + menuBar_TotalHeight (), + 0, + pix_colors_focused[Color_fg], + pix_colors_focused[Color_scroll]); + #ifdef DEBUG_X - XStoreName(display->display, menuBar.win, "menubar"); + XStoreName (display->display, menuBar.win, "menubar"); #endif - XDefineCursor(display->display, menuBar.win, pointer_leftptr); + menuBar.drawable = new rxvt_drawable (display, menuBar.win); - XSelectInput(display->display, menuBar.win, + XDefineCursor (display->display, menuBar.win, + XCreateFontCursor (display->display, XC_left_ptr)); + + XSelectInput (display->display, menuBar.win, (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask)); menubar_ev.start (display, menuBar.win); @@ -1274,309 +1099,60 @@ #ifdef XPM_BACKGROUND if (rs[Rs_backgroundPixmap] != NULL - && !(Options & Opt_transparent)) + && ! (options & Opt_transparent)) { - const char *p = rs[Rs_backgroundPixmap]; + const char *p = rs[Rs_backgroundPixmap]; - if ((p = STRCHR(p, ';')) != NULL) + if ((p = strchr (p, ';')) != NULL) { p++; scale_pixmap (p); } + set_bgPixmap (rs[Rs_backgroundPixmap]); - scr_touch (True); + scr_touch (true); } #endif /* graphics context for the vt window */ - gcvalue.foreground = PixColors[Color_fg]; - gcvalue.background = PixColors[Color_bg]; + gcvalue.foreground = pix_colors[Color_fg]; + gcvalue.background = pix_colors[Color_bg]; gcvalue.graphics_exposures = 1; - TermWin.gc = XCreateGC(display->display, TermWin.vt, - GCForeground | GCBackground - | GCGraphicsExposures, &gcvalue); - -#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) - gcvalue.foreground = PixColors[Color_topShadow]; - topShadowGC = XCreateGC(display->display, TermWin.vt, - GCForeground, &gcvalue); - gcvalue.foreground = PixColors[Color_bottomShadow]; - botShadowGC = XCreateGC(display->display, TermWin.vt, - GCForeground, &gcvalue); - gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg - : Color_scroll)]; - scrollbarGC = XCreateGC(display->display, TermWin.vt, - GCForeground, &gcvalue); -#endif -} - -/*----------------------------------------------------------------------*/ -/* - * Run the command in a subprocess and return a file descriptor for the - * master end of the pseudo-teletype pair with the command talking to - * the slave. - */ -int -rxvt_term::run_command (const char *const *argv) -{ - int cfd, er; - - /* get master (pty) */ - if ((cfd = rxvt_get_pty (&(tty_fd), &(ttydev))) < 0) - { - rxvt_print_error("can't open pseudo-tty"); - return -1; - } - - fcntl (cfd, F_SETFL, O_NONBLOCK); - - /* get slave (tty) */ - if (tty_fd < 0) - { -#ifndef NO_SETOWNER_TTYDEV - privileged_ttydev (SAVE); -#endif - - if ((tty_fd = rxvt_get_tty (ttydev)) < 0) - { - close(cfd); - rxvt_print_error("can't open slave tty %s", ttydev); - return -1; - } - } -#ifndef NO_BACKSPACE_KEY - if (key_backspace[0] && !key_backspace[1]) - er = key_backspace[0]; - else if (STRCMP(key_backspace, "DEC") == 0) - er = '\177'; /* the initial state anyway */ - else -#endif - - er = -1; - - rxvt_get_ttymode (&(tio), er); - -#ifndef __QNX__ - /* spin off the command interpreter */ - switch (cmd_pid = fork ()) - { - case -1: - rxvt_print_error("can't fork"); - return -1; - case 0: - close (cfd); /* only keep tty_fd and STDERR open */ - - if (rxvt_control_tty (tty_fd, ttydev) < 0) - rxvt_print_error ("could not obtain control of tty"); - else - { - /* Reopen stdin, stdout and stderr over the tty file descriptor */ - dup2 (tty_fd, STDIN_FILENO); - dup2 (tty_fd, STDOUT_FILENO); - dup2 (tty_fd, STDERR_FILENO); + TermWin.gc = XCreateGC (display->display, TermWin.vt, + GCForeground | GCBackground | GCGraphicsExposures, + &gcvalue); - if (tty_fd > 2) - close (tty_fd); + TermWin.drawable = new rxvt_drawable (display, TermWin.vt); - run_child (argv); - } - exit (EXIT_FAILURE); - /* NOTREACHED */ - default: - { -#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) - int fdstdin; - - fdstdin = dup (STDIN_FILENO); - dup2 (tty_fd, STDIN_FILENO); -#endif - -#ifdef UTMP_SUPPORT - privileged_utmp (SAVE); +#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) + gcvalue.foreground = pix_colors[Color_topShadow]; + topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); + gcvalue.foreground = pix_colors[Color_bottomShadow]; + botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); + gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; + scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); #endif -#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) - - dup2 (fdstdin, STDIN_FILENO); - close (fdstdin); +#ifdef OFF_FOCUS_FADING + // initially we are in unfocused state + if (rs[Rs_fade]) + pix_colors = pix_colors_unfocused; #endif - } - close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ - break; - } -#else /* __QNX__ uses qnxspawn() */ - fchmod (tty_fd, 0622); - fcntl (tty_fd, F_SETFD, FD_CLOEXEC); - fcntl (cfd, F_SETFD, FD_CLOEXEC); - - if (run_child (argv) == -1) - exit (EXIT_FAILURE); -#endif - - return cfd; -} - -/* ------------------------------------------------------------------------- * - * CHILD PROCESS OPERATIONS * - * ------------------------------------------------------------------------- */ -/* - * The only open file descriptor is the slave tty - so no error messages. - * returns are fatal - */ -int -rxvt_term::run_child (const char *const *argv) -{ - char *login; - - SET_TTYMODE (STDIN_FILENO, &(tio)); /* init terminal attributes */ - - if (Options & Opt_console) - { /* be virtual console, fail silently */ -#ifdef TIOCCONS - unsigned int on = 1; - - ioctl (STDIN_FILENO, TIOCCONS, &on); -#elif defined (SRIOCSREDIR) - int fd; - - fd = open (CONSOLE, O_WRONLY, 0); - if (fd >= 0) - { - if (ioctl (fd, SRIOCSREDIR, NULL) < 0) - close (fd); - } -#endif /* SRIOCSREDIR */ - - } - - /* reset signals and spin off the command interpreter */ - signal (SIGINT, SIG_DFL); - signal (SIGQUIT, SIG_DFL); - signal (SIGCHLD, SIG_DFL); - /* - * mimick login's behavior by disabling the job control signals - * a shell that wants them can turn them back on - */ -#ifdef SIGTSTP - signal (SIGTSTP, SIG_IGN); - signal (SIGTTIN, SIG_IGN); - signal (SIGTTOU, SIG_IGN); -#endif /* SIGTSTP */ - - /* set window size */ - struct winsize ws; - - ws.ws_col = TermWin.ncol; - ws.ws_row = TermWin.nrow; - ws.ws_xpixel = ws.ws_ypixel = 0; - (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws); - - // unblock signals (signals are blocked by iom.C - sigset_t ss; - sigemptyset (&ss); - sigprocmask (SIG_SETMASK, &ss, 0); - -#ifndef __QNX__ - /* command interpreter path */ - if (argv != NULL) - { -# ifdef DEBUG_CMD - int i; - - for (i = 0; argv[i]; i++) - fprintf(stderr, "argv [%d] = \"%s\"\n", i, argv[i]); -# endif - - execvp(argv[0], (char *const *)argv); - /* no error message: STDERR is closed! */ - } - else - { - const char *argv0, *shell; - - if ((shell = getenv("SHELL")) == NULL || *shell == '\0') - shell = "/bin/sh"; - - argv0 = (const char *)rxvt_r_basename(shell); - if (Options & Opt_loginShell) - { - login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char)); - - login[0] = '-'; - STRCPY(&login[1], argv0); - argv0 = login; - } - execlp(shell, argv0, NULL); - /* no error message: STDERR is closed! */ - } - -#else /* __QNX__ uses qnxspawn() */ - - char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; - char *command = NULL, fullcommand[_MAX_PATH]; - char **arg_v, *arg_a[2] = { NULL, NULL }; - - if (argv != NULL) - { - if (access(argv[0], X_OK) == -1) - { - if (STRCHR(argv[0], '/') == NULL) - { - searchenv(argv[0], "PATH", fullcommand); - if (fullcommand[0] != '\0') - command = fullcommand; - } - if (access(command, X_OK) == -1) - return -1; - } - else - command = argv[0]; - arg_v = argv; - } - else - { - if ((command = getenv("SHELL")) == NULL || *command == '\0') - command = "/bin/sh"; - - arg_a[0] = my_basename(command); - if (Options & Opt_loginShell) - { - login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); - - login[0] = '-'; - STRCPY(&login[1], arg_a[0]); - arg_a[0] = login; - } - arg_v = arg_a; - } - iov_a[0] = iov_a[1] = iov_a[2] = tty_fd; - cmd_pid = qnx_spawn(0, 0, 0, -1, -1, - _SPAWN_SETSID | _SPAWN_TCSETPGRP, - command, arg_v, environ, iov_a, 0); - if (login) - free(login); - - close(tty_fd); - return cmd_fd; - -#endif - return -1; + scr_recolour (); } /* ------------------------------------------------------------------------- * * GET TTY CURRENT STATE * * ------------------------------------------------------------------------- */ -/* rxvt_get_ttymode() */ -/* EXTPROTO */ void -rxvt_get_ttymode(ttymode_t *tio, int erase) +rxvt_get_ttymode (ttymode_t *tio, int erase) { #ifdef HAVE_TERMIOS_H /* * standard System V termios interface */ - if (GET_TERMIOS(STDIN_FILENO, tio) < 0) + if (GET_TERMIOS (STDIN_FILENO, tio) < 0) { /* return error - use system defaults */ tio->c_cc[VINTR] = CINTR; @@ -1660,7 +1236,7 @@ */ /* get parameters -- gtty */ - if (ioctl(STDIN_FILENO, TIOCGETP, &(tio->sg)) < 0) + if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) { tio->sg.sg_erase = CERASE; /* ^H */ tio->sg.sg_kill = CKILL; /* ^U */ @@ -1671,7 +1247,7 @@ tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); /* get special characters */ - if (ioctl(STDIN_FILENO, TIOCGETC, &(tio->tc)) < 0) + if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0) { tio->tc.t_intrc = CINTR; /* ^C */ tio->tc.t_quitc = CQUIT; /* ^\ */ @@ -1681,7 +1257,7 @@ tio->tc.t_brkc = -1; } /* get local special chars */ - if (ioctl(STDIN_FILENO, TIOCGLTC, &(tio->lc)) < 0) + if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) { tio->lc.t_suspc = CSUSP; /* ^Z */ tio->lc.t_dsuspc = CDSUSP; /* ^Y */ @@ -1691,7 +1267,7 @@ tio->lc.t_lnextc = CLNEXT; /* ^V */ } /* get line discipline */ - ioctl(STDIN_FILENO, TIOCGETD, &(tio->line)); + ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); # ifdef NTTYDISC tio->line = NTTYDISC; @@ -1706,7 +1282,7 @@ #ifdef DEBUG_TTYMODE #ifdef HAVE_TERMIOS_H /* c_iflag bits */ - fprintf(stderr, "Input flags\n"); + fprintf (stderr, "Input flags\n"); /* cpp token stringize doesn't work on all machines */ # define FOO(flag,name) \ @@ -1714,83 +1290,322 @@ fprintf (stderr, "%s ", name) /* c_iflag bits */ - FOO(IGNBRK, "IGNBRK"); - FOO(BRKINT, "BRKINT"); - FOO(IGNPAR, "IGNPAR"); - FOO(PARMRK, "PARMRK"); - FOO(INPCK, "INPCK"); - FOO(ISTRIP, "ISTRIP"); - FOO(INLCR, "INLCR"); - FOO(IGNCR, "IGNCR"); - FOO(ICRNL, "ICRNL"); - FOO(IXON, "IXON"); - FOO(IXOFF, "IXOFF"); + FOO (IGNBRK, "IGNBRK"); + FOO (BRKINT, "BRKINT"); + FOO (IGNPAR, "IGNPAR"); + FOO (PARMRK, "PARMRK"); + FOO (INPCK, "INPCK"); + FOO (ISTRIP, "ISTRIP"); + FOO (INLCR, "INLCR"); + FOO (IGNCR, "IGNCR"); + FOO (ICRNL, "ICRNL"); + FOO (IXON, "IXON"); + FOO (IXOFF, "IXOFF"); # ifdef IUCLC - FOO(IUCLC, "IUCLC"); + FOO (IUCLC, "IUCLC"); # endif # ifdef IXANY - FOO(IXANY, "IXANY"); + FOO (IXANY, "IXANY"); # endif # ifdef IMAXBEL - FOO(IMAXBEL, "IMAXBEL"); + FOO (IMAXBEL, "IMAXBEL"); # endif - fprintf(stderr, "\n"); + fprintf (stderr, "\n"); # undef FOO # define FOO(entry, name) \ - fprintf(stderr, "%-8s = %#04o\n", name, tio->c_cc [entry]) + fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry]) - FOO(VINTR, "VINTR"); - FOO(VQUIT, "VQUIT"); - FOO(VERASE, "VERASE"); - FOO(VKILL, "VKILL"); - FOO(VEOF, "VEOF"); - FOO(VEOL, "VEOL"); + FOO (VINTR, "VINTR"); + FOO (VQUIT, "VQUIT"); + FOO (VERASE, "VERASE"); + FOO (VKILL, "VKILL"); + FOO (VEOF, "VEOF"); + FOO (VEOL, "VEOL"); # ifdef VEOL2 - FOO(VEOL2, "VEOL2"); + FOO (VEOL2, "VEOL2"); # endif # ifdef VSWTC - FOO(VSWTC, "VSWTC"); + FOO (VSWTC, "VSWTC"); # endif # ifdef VSWTCH - FOO(VSWTCH, "VSWTCH"); + FOO (VSWTCH, "VSWTCH"); # endif - FOO(VSTART, "VSTART"); - FOO(VSTOP, "VSTOP"); - FOO(VSUSP, "VSUSP"); + FOO (VSTART, "VSTART"); + FOO (VSTOP, "VSTOP"); + FOO (VSUSP, "VSUSP"); # ifdef VDSUSP - FOO(VDSUSP, "VDSUSP"); + FOO (VDSUSP, "VDSUSP"); # endif # ifdef VREPRINT - FOO(VREPRINT, "VREPRINT"); + FOO (VREPRINT, "VREPRINT"); # endif # ifdef VDISCRD - FOO(VDISCRD, "VDISCRD"); + FOO (VDISCRD, "VDISCRD"); # endif # ifdef VWERSE - FOO(VWERSE, "VWERSE"); + FOO (VWERSE, "VWERSE"); # endif # ifdef VLNEXT - FOO(VLNEXT, "VLNEXT"); + FOO (VLNEXT, "VLNEXT"); # endif - fprintf(stderr, "\n"); + fprintf (stderr, "\n"); # undef FOO # endif /* HAVE_TERMIOS_H */ #endif /* DEBUG_TTYMODE */ } +/*----------------------------------------------------------------------*/ +/* + * Run the command in a subprocess and return a file descriptor for the + * master end of the pseudo-teletype pair with the command talking to + * the slave. + */ +void +rxvt_term::run_command (const char *const *argv) +{ + int er; + + if (!pty.get ()) + rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); + +#ifndef NO_BACKSPACE_KEY + if (key_backspace[0] && !key_backspace[1]) + er = key_backspace[0]; + else if (strcmp (key_backspace, "DEC") == 0) + er = '\177'; /* the initial state anyway */ + else +#endif + er = -1; + + rxvt_get_ttymode (&tio, er); + + /* set initial window size */ + tt_winch (); + + sw_chld.start (SIGCHLD); + +#ifndef __QNX__ + /* spin off the command interpreter */ + switch (cmd_pid = fork ()) + { + case -1: + rxvt_fatal ("can't fork, aborting.\n"); + case 0: + init_env (); + + if (!pty.make_controlling_tty ()) + fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); + else + { + /* Reopen stdin, stdout and stderr over the tty file descriptor */ + dup2 (pty.tty, STDIN_FILENO); + dup2 (pty.tty, STDOUT_FILENO); + dup2 (pty.tty, STDERR_FILENO); + + // close all our file handles that we do no longer need + for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) + { + if ((*t)->pty.pty > 2) close ((*t)->pty.pty); + if ((*t)->pty.tty > 2) close ((*t)->pty.tty); + } + + run_child (argv); + fprintf (stderr, "%s: unable to exec child.", RESNAME); + } + + _exit (EXIT_FAILURE); + + default: + { +#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) + int fdstdin; + + fdstdin = dup (STDIN_FILENO); + dup2 (pty.tty, STDIN_FILENO); +#endif + +#ifdef UTMP_SUPPORT + privileged_utmp (SAVE); +#endif + +#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) + + dup2 (fdstdin, STDIN_FILENO); + close (fdstdin); +#endif + } + + pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ + break; + } +#else /* __QNX__ uses qnxspawn () */ + fchmod (pty.tty, 0622); + fcntl (pty.tty, F_SETFD, FD_CLOEXEC); + fcntl (pty.pty, F_SETFD, FD_CLOEXEC); + + if (run_child (argv) == -1) + exit (EXIT_FAILURE); +#endif +} + +/* ------------------------------------------------------------------------- * + * CHILD PROCESS OPERATIONS * + * ------------------------------------------------------------------------- */ +/* + * The only open file descriptor is the slave tty - so no error messages. + * returns are fatal + */ +int +rxvt_term::run_child (const char *const *argv) +{ + char *login; + + SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ + + if (options & Opt_console) + { /* be virtual console, fail silently */ +#ifdef TIOCCONS + unsigned int on = 1; + + ioctl (STDIN_FILENO, TIOCCONS, &on); +#elif defined (SRIOCSREDIR) + int fd; + + fd = open (CONSOLE, O_WRONLY, 0); + if (fd >= 0) + if (ioctl (fd, SRIOCSREDIR, NULL) < 0) + close (fd); +#endif /* SRIOCSREDIR */ + } + + /* reset signals and spin off the command interpreter */ + signal (SIGINT, SIG_DFL); + signal (SIGQUIT, SIG_DFL); + signal (SIGCHLD, SIG_DFL); + signal (SIGHUP, SIG_DFL); + signal (SIGPIPE, SIG_DFL); + /* + * mimick login's behavior by disabling the job control signals + * a shell that wants them can turn them back on + */ +#ifdef SIGTSTP + signal (SIGTSTP, SIG_IGN); + signal (SIGTTIN, SIG_IGN); + signal (SIGTTOU, SIG_IGN); +#endif /* SIGTSTP */ + + // unblock signals (signals are blocked by iom.C + sigset_t ss; + sigemptyset (&ss); + sigprocmask (SIG_SETMASK, &ss, 0); + +#ifndef __QNX__ + /* command interpreter path */ + if (argv != NULL) + { +# ifdef DEBUG_CMD + int i; + + for (i = 0; argv[i]; i++) + fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]); +# endif + + execvp (argv[0], (char *const *)argv); + /* no error message: STDERR is closed! */ + } + else + { + const char *argv0, *shell; + + if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') + shell = "/bin/sh"; + + argv0 = (const char *)rxvt_r_basename (shell); + + if (options & Opt_loginShell) + { + login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); + + login[0] = '-'; + strcpy (&login[1], argv0); + argv0 = login; + } + execlp (shell, argv0, NULL); + /* no error message: STDERR is closed! */ + } + +#else /* __QNX__ uses qnxspawn () */ + + char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; + char *command = NULL, fullcommand[_MAX_PATH]; + char **arg_v, *arg_a[2] = { NULL, NULL }; + + if (argv != NULL) + { + if (access (argv[0], X_OK) == -1) + { + if (strchr (argv[0], '/') == NULL) + { + searchenv (argv[0], "PATH", fullcommand); + + if (fullcommand[0] != '\0') + command = fullcommand; + } + + if (access (command, X_OK) == -1) + return -1; + } + else + command = argv[0]; + + arg_v = argv; + } + else + { + if ((command = getenv ("SHELL")) == NULL || *command == '\0') + command = "/bin/sh"; + + arg_a[0] = my_basename (command); + + if (options & Opt_loginShell) + { + login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); + + login[0] = '-'; + strcpy (&login[1], arg_a[0]); + arg_a[0] = login; + } + + arg_v = arg_a; + } + + iov_a[0] = iov_a[1] = iov_a[2] = pty.tty; + cmd_pid = qnx_spawn (0, 0, 0, -1, -1, + _SPAWN_SETSID | _SPAWN_TCSETPGRP, + command, arg_v, environ, iov_a, 0); + if (login) + free (login); + + pty.close_tty (); + return pty.pty; +#endif + + return -1; +} + /*----------------------- end-of-file (C source) -----------------------*/