--- rxvt-unicode/src/init.C 2006/01/25 02:42:06 1.153 +++ rxvt-unicode/src/init.C 2012/05/17 10:18:32 1.322 @@ -1,4 +1,4 @@ -/*--------------------------------*-C-*---------------------------------* +/*----------------------------------------------------------------------* * File: init.C *----------------------------------------------------------------------* * @@ -7,11 +7,12 @@ * - original version * Copyright (c) 1994 Robert Nation * - extensive modifications + * Copyright (c) 1996 Chuck Blake + * Copyright (c) 1997 mj olesen + * Copyright (c) 1997,1998 Oezguer Kesim * Copyright (c) 1998-2001 Geoff Wing * - extensive modifications - * Copyright (c) 1999 D J Hawkey Jr - * - QNX support - * Copyright (c) 2003-2006 Marc Lehmann + * Copyright (c) 2003-2008 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 @@ -35,42 +36,150 @@ #include "rxvt.h" /* NECESSARY */ #include "rxvtutil.h" #include "init.h" +#include "keyboard.h" #include -#include +#include -const char *const def_colorName[] = +#include + +#ifdef HAVE_XSETLOCALE +# define X_LOCALE +# include +#else +# include +#endif + +#ifdef HAVE_NL_LANGINFO +# include +#endif + +#ifdef HAVE_STARTUP_NOTIFICATION +# define SN_API_NOT_YET_FROZEN +# include +#endif + +#ifdef DISPLAY_IS_IP +/* On Solaris link with -lsocket and -lnsl */ +#include +#include + +/* these next two are probably only on Sun (not Solaris) */ +#ifdef HAVE_SYS_SOCKIO_H +#include +#endif +#ifdef HAVE_SYS_BYTEORDER_H +#include +#endif + +#include +#include +#include +#include + +static char * +rxvt_network_display (const char *display) +{ + char buffer[1024], *rval = NULL; + struct ifconf ifc; + struct ifreq *ifr; + int i, skfd; + + if (display[0] != ':' && strncmp (display, "unix:", 5)) + return (char *) display; /* nothing to do */ + + ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */ + ifc.ifc_buf = buffer; + + if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0) + { + perror ("socket"); + return NULL; + } + + if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0) + { + perror ("SIOCGIFCONF"); + close (skfd); + return NULL; + } + + for (i = 0, ifr = ifc.ifc_req; + i < (ifc.ifc_len / sizeof (struct ifreq)); + i++, ifr++) + { + struct ifreq ifr2; + + strcpy (ifr2.ifr_name, ifr->ifr_name); + + if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0) + { + unsigned long addr; + struct sockaddr_in *p_addr; + + p_addr = (struct sockaddr_in *) &ifr2.ifr_addr; + addr = htonl ((unsigned long)p_addr->sin_addr.s_addr); + + /* + * not "0.0.0.0" or "127.0.0.1" - so format the address + */ + if (addr && addr != 0x7F000001) + { + char *colon = strchr (display, ':'); + + if (colon == NULL) + colon = ":0.0"; + + rval = rxvt_malloc (strlen (colon) + 16); + sprintf (rval, "%d.%d.%d.%d%s", + (int) ((addr >> 030) & 0xFF), + (int) ((addr >> 020) & 0xFF), + (int) ((addr >> 010) & 0xFF), + (int) (addr & 0xFF), colon); + break; + } + } + } + + close (skfd); + + return rval; +} +#endif + +static const char *const def_colorName[] = { COLOR_FOREGROUND, COLOR_BACKGROUND, /* low-intensity colors */ - "Black", /* 0: black (#000000) */ - "Red3", /* 1: red (#CD0000) */ - "Green3", /* 2: green (#00CD00) */ - "Yellow3", /* 3: yellow (#CDCD00) */ - "Blue3", /* 4: blue (#0000CD) */ - "Magenta3", /* 5: magenta (#CD00CD) */ - "Cyan3", /* 6: cyan (#00CDCD) */ + "rgb:00/00/00", // 0: black (Black) + "rgb:cd/00/00", // 1: red (Red3) + "rgb:00/cd/00", // 2: green (Green3) + "rgb:cd/cd/00", // 3: yellow (Yellow3) + "rgb:00/00/cd", // 4: blue (Blue3) + "rgb:cd/00/cd", // 5: magenta (Magenta3) + "rgb:00/cd/cd", // 6: cyan (Cyan3) # ifdef XTERM_COLORS - "Grey90", /* 7: white (#E5E5E5) */ + "rgb:e5/e5/e5", // 7: white (Grey90) # else - "AntiqueWhite", /* 7: white (#FAEBD7) */ + "rgb:fa/eb/d7", // 7: white (AntiqueWhite) # endif /* high-intensity colors */ # ifdef XTERM_COLORS - "Grey30", /* 8: bright black (#4D4D4D) */ + "rgb:4d/4d/4d", // 8: bright black (Grey30) # else - "Grey25", /* 8: bright black (#404040) */ + "rgb:40/40/40", // 8: bright black (Grey25) # endif - "Red", /* 1/9: bright red (#FF0000) */ - "Green", /* 2/10: bright green (#00FF00) */ - "Yellow", /* 3/11: bright yellow (#FFFF00) */ - "Blue", /* 4/12: bright blue (#0000FF) */ - "Magenta", /* 5/13: bright magenta (#FF00FF) */ - "Cyan", /* 6/14: bright cyan (#00FFFF) */ - "White", /* 7/15: bright white (#FFFFFF) */ + "rgb:ff/00/00", // 1/9: bright red (Reed) + "rgb:00/ff/00", // 2/10: bright green (Green) + "rgb:ff/ff/00", // 3/11: bright yellow (Yellow) + "rgb:00/00/ff", // 4/12: bright blue (Blue) + "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) + "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) + "rgb:ff/ff/ff", // 7/15: bright white (White) +#if !USE_256_COLORS // 88 xterm colours "rgb:00/00/00", "rgb:00/00/8b", @@ -144,11 +253,254 @@ "rgb:b9/b9/b9", "rgb:d0/d0/d0", "rgb:e7/e7/e7", +#else + // 256 xterm colours + "rgb:00/00/00", + "rgb:00/00/5f", + "rgb:00/00/87", + "rgb:00/00/af", + "rgb:00/00/d7", + "rgb:00/00/ff", + "rgb:00/5f/00", + "rgb:00/5f/5f", + "rgb:00/5f/87", + "rgb:00/5f/af", + "rgb:00/5f/d7", + "rgb:00/5f/ff", + "rgb:00/87/00", + "rgb:00/87/5f", + "rgb:00/87/87", + "rgb:00/87/af", + "rgb:00/87/d7", + "rgb:00/87/ff", + "rgb:00/af/00", + "rgb:00/af/5f", + "rgb:00/af/87", + "rgb:00/af/af", + "rgb:00/af/d7", + "rgb:00/af/ff", + "rgb:00/d7/00", + "rgb:00/d7/5f", + "rgb:00/d7/87", + "rgb:00/d7/af", + "rgb:00/d7/d7", + "rgb:00/d7/ff", + "rgb:00/ff/00", + "rgb:00/ff/5f", + "rgb:00/ff/87", + "rgb:00/ff/af", + "rgb:00/ff/d7", + "rgb:00/ff/ff", + "rgb:5f/00/00", + "rgb:5f/00/5f", + "rgb:5f/00/87", + "rgb:5f/00/af", + "rgb:5f/00/d7", + "rgb:5f/00/ff", + "rgb:5f/5f/00", + "rgb:5f/5f/5f", + "rgb:5f/5f/87", + "rgb:5f/5f/af", + "rgb:5f/5f/d7", + "rgb:5f/5f/ff", + "rgb:5f/87/00", + "rgb:5f/87/5f", + "rgb:5f/87/87", + "rgb:5f/87/af", + "rgb:5f/87/d7", + "rgb:5f/87/ff", + "rgb:5f/af/00", + "rgb:5f/af/5f", + "rgb:5f/af/87", + "rgb:5f/af/af", + "rgb:5f/af/d7", + "rgb:5f/af/ff", + "rgb:5f/d7/00", + "rgb:5f/d7/5f", + "rgb:5f/d7/87", + "rgb:5f/d7/af", + "rgb:5f/d7/d7", + "rgb:5f/d7/ff", + "rgb:5f/ff/00", + "rgb:5f/ff/5f", + "rgb:5f/ff/87", + "rgb:5f/ff/af", + "rgb:5f/ff/d7", + "rgb:5f/ff/ff", + "rgb:87/00/00", + "rgb:87/00/5f", + "rgb:87/00/87", + "rgb:87/00/af", + "rgb:87/00/d7", + "rgb:87/00/ff", + "rgb:87/5f/00", + "rgb:87/5f/5f", + "rgb:87/5f/87", + "rgb:87/5f/af", + "rgb:87/5f/d7", + "rgb:87/5f/ff", + "rgb:87/87/00", + "rgb:87/87/5f", + "rgb:87/87/87", + "rgb:87/87/af", + "rgb:87/87/d7", + "rgb:87/87/ff", + "rgb:87/af/00", + "rgb:87/af/5f", + "rgb:87/af/87", + "rgb:87/af/af", + "rgb:87/af/d7", + "rgb:87/af/ff", + "rgb:87/d7/00", + "rgb:87/d7/5f", + "rgb:87/d7/87", + "rgb:87/d7/af", + "rgb:87/d7/d7", + "rgb:87/d7/ff", + "rgb:87/ff/00", + "rgb:87/ff/5f", + "rgb:87/ff/87", + "rgb:87/ff/af", + "rgb:87/ff/d7", + "rgb:87/ff/ff", + "rgb:af/00/00", + "rgb:af/00/5f", + "rgb:af/00/87", + "rgb:af/00/af", + "rgb:af/00/d7", + "rgb:af/00/ff", + "rgb:af/5f/00", + "rgb:af/5f/5f", + "rgb:af/5f/87", + "rgb:af/5f/af", + "rgb:af/5f/d7", + "rgb:af/5f/ff", + "rgb:af/87/00", + "rgb:af/87/5f", + "rgb:af/87/87", + "rgb:af/87/af", + "rgb:af/87/d7", + "rgb:af/87/ff", + "rgb:af/af/00", + "rgb:af/af/5f", + "rgb:af/af/87", + "rgb:af/af/af", + "rgb:af/af/d7", + "rgb:af/af/ff", + "rgb:af/d7/00", + "rgb:af/d7/5f", + "rgb:af/d7/87", + "rgb:af/d7/af", + "rgb:af/d7/d7", + "rgb:af/d7/ff", + "rgb:af/ff/00", + "rgb:af/ff/5f", + "rgb:af/ff/87", + "rgb:af/ff/af", + "rgb:af/ff/d7", + "rgb:af/ff/ff", + "rgb:d7/00/00", + "rgb:d7/00/5f", + "rgb:d7/00/87", + "rgb:d7/00/af", + "rgb:d7/00/d7", + "rgb:d7/00/ff", + "rgb:d7/5f/00", + "rgb:d7/5f/5f", + "rgb:d7/5f/87", + "rgb:d7/5f/af", + "rgb:d7/5f/d7", + "rgb:d7/5f/ff", + "rgb:d7/87/00", + "rgb:d7/87/5f", + "rgb:d7/87/87", + "rgb:d7/87/af", + "rgb:d7/87/d7", + "rgb:d7/87/ff", + "rgb:d7/af/00", + "rgb:d7/af/5f", + "rgb:d7/af/87", + "rgb:d7/af/af", + "rgb:d7/af/d7", + "rgb:d7/af/ff", + "rgb:d7/d7/00", + "rgb:d7/d7/5f", + "rgb:d7/d7/87", + "rgb:d7/d7/af", + "rgb:d7/d7/d7", + "rgb:d7/d7/ff", + "rgb:d7/ff/00", + "rgb:d7/ff/5f", + "rgb:d7/ff/87", + "rgb:d7/ff/af", + "rgb:d7/ff/d7", + "rgb:d7/ff/ff", + "rgb:ff/00/00", + "rgb:ff/00/5f", + "rgb:ff/00/87", + "rgb:ff/00/af", + "rgb:ff/00/d7", + "rgb:ff/00/ff", + "rgb:ff/5f/00", + "rgb:ff/5f/5f", + "rgb:ff/5f/87", + "rgb:ff/5f/af", + "rgb:ff/5f/d7", + "rgb:ff/5f/ff", + "rgb:ff/87/00", + "rgb:ff/87/5f", + "rgb:ff/87/87", + "rgb:ff/87/af", + "rgb:ff/87/d7", + "rgb:ff/87/ff", + "rgb:ff/af/00", + "rgb:ff/af/5f", + "rgb:ff/af/87", + "rgb:ff/af/af", + "rgb:ff/af/d7", + "rgb:ff/af/ff", + "rgb:ff/d7/00", + "rgb:ff/d7/5f", + "rgb:ff/d7/87", + "rgb:ff/d7/af", + "rgb:ff/d7/d7", + "rgb:ff/d7/ff", + "rgb:ff/ff/00", + "rgb:ff/ff/5f", + "rgb:ff/ff/87", + "rgb:ff/ff/af", + "rgb:ff/ff/d7", + "rgb:ff/ff/ff", + "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", + "rgb:d0/d0/d0", + "rgb:da/da/da", + "rgb:e4/e4/e4", + "rgb:ee/ee/ee", +#endif #ifndef NO_CURSORCOLOR COLOR_CURSOR_BACKGROUND, COLOR_CURSOR_FOREGROUND, -#endif /* ! NO_CURSORCOLOR */ +#endif /* ! NO_CURSORCOLOR */ NULL, /* Color_pointer_fg */ NULL, /* Color_pointer_bg */ NULL, /* Color_border */ @@ -157,140 +509,68 @@ NULL, /* Color_IT */ NULL, /* Color_UL */ NULL, /* Color_RV */ -#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ +#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ #if ENABLE_FRILLS NULL, // Color_underline #endif #ifdef OPTION_HC NULL, + NULL, #endif -#ifdef KEEP_SCROLLCOLOR COLOR_SCROLLBAR, +#ifdef RXVT_SCROLLBAR COLOR_SCROLLTROUGH, -#endif /* KEEP_SCROLLCOLOR */ -#if TINTING +#endif +#if ENABLE_TRANSPARENCY NULL, #endif #if OFF_FOCUS_FADING - "black", + "rgb:00/00/00", #endif }; -bool +void rxvt_term::init_vars () { - 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) - pixmap = None; -#endif - MEvent.time = CurrentTime; MEvent.button = AnyButton; - options = DEFAULT_OPTIONS; want_refresh = 1; priv_modes = SavedModes = PrivMode_Default; - focus = 0; ncol = 80; nrow = 24; int_bwidth = INTERNALBORDERWIDTH; ext_bwidth = EXTERNALBORDERWIDTH; lineSpace = LINESPACE; + letterSpace = LETTERSPACE; saveLines = SAVELINES; - numpix_colors = TOTAL_COLORS; - refresh_limit = 1; refresh_type = SLOW_REFRESH; - prev_nrow = prev_ncol = 0; oldcursor.row = oldcursor.col = -1; -#ifdef XPM_BACKGROUND - /* bgPixmap.w = bgPixmap.h = 0; */ - bgPixmap.x = bgPixmap.y = 50; - bgPixmap.pixmap = None; -#endif - last_bot = last_state = -1; - - return true; -} - -void -rxvt_term::init_secondary () -{ - int i; - - /* - * Close all unused file descriptors - * We don't want them, we don't need them. - */ - if ((i = open ("/dev/null", O_RDONLY)) < 0) - { - /* TODO: BOO HISS */ - dup2 (STDERR_FILENO, STDIN_FILENO); - } - else if (i > STDIN_FILENO) - { - dup2 (i, STDIN_FILENO); - close (i); - } - - dup2 (STDERR_FILENO, STDOUT_FILENO); - -#if 0 // schmorp sayz closing filies is murder - for (i = STDERR_FILENO + 1; i < num_fds; i++) - { -#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */ - if (i == 4 || i == 7) - continue; -#endif - close (i); - } -#endif + set_option (Opt_scrollBar); + set_option (Opt_scrollTtyOutput); + set_option (Opt_jumpScroll); + set_option (Opt_skipScroll); + set_option (Opt_secondaryScreen); + set_option (Opt_secondaryScroll); + set_option (Opt_pastableTabs); + set_option (Opt_intensityStyles); + set_option (Opt_iso14755); + set_option (Opt_iso14755_52); + set_option (Opt_buffered); } /*----------------------------------------------------------------------*/ const char ** rxvt_term::init_resources (int argc, const char *const *argv) { - int i, r_argc; - char *val; - const char **cmd_argv, **r_argv; - - /* - * 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")) - break; - - 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]; - - r_argv[i] = NULL; - - if (r_argc == argc) - cmd_argv = NULL; - else - { - 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]; - - cmd_argv[i] = NULL; - } + int i; + const char **cmd_argv; - rs[Rs_name] = rxvt_r_basename (argv[0]); + rs[Rs_name] = rxvt_basename (argv[0]); /* * Open display, get options/resources and create the window @@ -299,14 +579,25 @@ if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) rs[Rs_display_name] = ":0"; - get_options (r_argc, r_argv); + cmd_argv = get_options (argc, argv); if (!(display = displays.get (rs[Rs_display_name]))) rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); + // using a local pointer decreases code size a lot + xa = display->xa; + + set (display); extract_resources (); - free (r_argv); +#if XFT + if (rs[Rs_depth]) + select_visual (strtol (rs[Rs_depth], 0, 0)); +#endif + + for (int i = NUM_RESOURCES; i--; ) + if (rs [i] == resval_undef) + rs [i] = 0; #if ENABLE_PERL if (!rs[Rs_perl_ext_1]) @@ -321,13 +612,18 @@ } #endif + // must be called after initialising the perl interpreter as it + // may invoke the `on_register_command' hook + extract_keysym_resources (); + /* * set any defaults not already set */ if (cmd_argv && cmd_argv[0]) { if (!rs[Rs_title]) - rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); + rs[Rs_title] = rxvt_basename (cmd_argv[0]); + if (!rs[Rs_iconName]) rs[Rs_iconName] = rs[Rs_title]; } @@ -335,6 +631,7 @@ { if (!rs[Rs_title]) rs[Rs_title] = rs[Rs_name]; + if (!rs[Rs_iconName]) rs[Rs_iconName] = rs[Rs_name]; } @@ -351,6 +648,9 @@ if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) lineSpace = min (i, std::numeric_limits::max ()); + + if (rs[Rs_letterSpace]) + letterSpace = atoi (rs[Rs_letterSpace]); #endif #ifdef POINTER_BLANK @@ -364,61 +664,36 @@ if (!saveLines) set_option (Opt_scrollBar, 0); -#ifdef PRINTPIPE - if (!rs[Rs_print_pipe]) - rs[Rs_print_pipe] = PRINTPIPE; -#endif - if (!rs[Rs_cutchars]) rs[Rs_cutchars] = CUTCHARS; #ifndef NO_BACKSPACE_KEY if (!rs[Rs_backspace_key]) # ifdef DEFAULT_BACKSPACE - key_backspace = DEFAULT_BACKSPACE; + rs[Rs_backspace_key] = DEFAULT_BACKSPACE; # else - key_backspace = "DEC"; /* can toggle between \010 or \177 */ + rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */ # endif - else - { - val = strdup (rs[Rs_backspace_key]); - rxvt_Str_trim (val); - rxvt_Str_escaped (val); - key_backspace = val; - } #endif #ifndef NO_DELETE_KEY if (!rs[Rs_delete_key]) # ifdef DEFAULT_DELETE - key_delete = DEFAULT_DELETE; + rs[Rs_delete_key] = DEFAULT_DELETE; # else - key_delete = "\033[3~"; + rs[Rs_delete_key] = "\033[3~"; # endif - else - { - 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]); - } -#ifdef HAVE_SCROLLBARS - setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); -#endif + scrollBar.setup (this); #ifdef XTERM_REVERSE_VIDEO /* this is how xterm implements reverseVideo */ - if (OPTION (Opt_reverseVideo)) + if (option (Opt_reverseVideo)) { if (!rs[Rs_color + Color_fg]) rs[Rs_color + Color_fg] = def_colorName[Color_bg]; + if (!rs[Rs_color + Color_bg]) rs[Rs_color + Color_bg] = def_colorName[Color_fg]; } @@ -430,7 +705,7 @@ #ifndef XTERM_REVERSE_VIDEO /* this is how we implement reverseVideo */ - if (OPTION (Opt_reverseVideo)) + if (option (Opt_reverseVideo)) ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); #endif @@ -440,7 +715,7 @@ #ifndef NO_CURSORCOLOR color_aliases (Color_cursor); color_aliases (Color_cursor2); -#endif /* NO_CURSORCOLOR */ +#endif /* NO_CURSORCOLOR */ color_aliases (Color_pointer_fg); color_aliases (Color_pointer_bg); color_aliases (Color_border); @@ -448,7 +723,7 @@ color_aliases (Color_BD); color_aliases (Color_UL); color_aliases (Color_RV); -#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ +#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ if (!rs[Rs_color + Color_border]) rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; @@ -458,11 +733,178 @@ /*----------------------------------------------------------------------*/ void +rxvt_term::init (stringvec *argv, stringvec *envv) +{ + argv->push_back (0); + envv->push_back (0); + + this->argv = argv; + this->envv = envv; + + init2 (argv->size () - 1, argv->begin ()); +} + +void +rxvt_term::init (int argc, const char *const *argv, const char *const *envv) +{ +#if ENABLE_PERL + // perl might want to access the stringvecs later, so we need to copy them + stringvec *args = new stringvec; + for (int i = 0; i < argc; i++) + args->push_back (strdup (argv [i])); + + stringvec *envs = new stringvec; + for (const char *const *var = envv; *var; var++) + envs->push_back (strdup (*var)); + + init (args, envs); +#else + init2 (argc, argv); +#endif +} + +void +rxvt_term::init2 (int argc, const char *const *argv) +{ + SET_R (this); + set_locale (""); + set_environ (envv); // a few things in X do not call setlocale :( + + init_vars (); + + const char **cmd_argv = init_resources (argc, argv); + +#ifdef KEYSYM_RESOURCE + keyboard->register_done (); +#endif + + if (const char *path = rs[Rs_chdir]) + if (*path) // ignored if empty + { + if (*path != '/') + rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n"); + + if (chdir (path)) + rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); + } + + if (option (Opt_scrollBar)) + scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ + + pty = ptytty::create (); + + // must be called before create_windows, because the latter may call set_icon +#ifdef HAVE_PIXBUF + g_type_init (); +#endif + + create_windows (argc, argv); + + init_xlocale (); + + scr_poweron (); // initialize screen + +#if 0 + XSynchronize (dpy, True); +#endif + + if (option (Opt_scrollBar)) + scrollBar.resize (); /* create and map scrollbar */ +#ifdef HAVE_BG_PIXMAP + { + bg_init (); + +#ifdef ENABLE_TRANSPARENCY + if (option (Opt_transparent)) + { + bg_set_transparent (); + + if (rs [Rs_blurradius]) + bg_set_blur (rs [Rs_blurradius]); + + if (ISSET_PIXCOLOR (Color_tint)) + bg_set_tint (pix_colors_focused [Color_tint]); + + if (rs [Rs_shade]) + bg_set_shade (rs [Rs_shade]); + + bg_set_root_pixmap (); + XSelectInput (dpy, display->root, PropertyChangeMask); + rootwin_ev.start (display, display->root); + } +#endif + +#ifdef BG_IMAGE_FROM_FILE + if (rs[Rs_backgroundPixmap]) + if (bg_image.set_file (rs[Rs_backgroundPixmap])) + if (!bg_window_position_sensitive ()) + update_background (); +#endif + } +#endif + +#if ENABLE_PERL + rootwin_ev.start (display, display->root); +#endif + + init_done = 1; + + init_command (cmd_argv); + + if (pty->pty >= 0) + pty_ev.start (pty->pty, ev::READ); + + HOOK_INVOKE ((this, HOOK_START, DT_END)); + +#if ENABLE_XEMBED + if (rs[Rs_embed]) + { + long info[2] = { 0, XEMBED_MAPPED }; + + XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], + 32, PropModeReplace, (unsigned char *)&info, 2); + } +#endif + +#if HAVE_STARTUP_NOTIFICATION + SnDisplay *snDisplay; + SnLauncheeContext *snContext; + + snDisplay = sn_display_new (dpy, NULL, NULL); + snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy)); + + /* Tell the window manager that this window is part of the startup context */ + if (snContext) + sn_launchee_context_setup_window (snContext, parent); +#endif + + XMapWindow (dpy, vt); + XMapWindow (dpy, parent); + +#if HAVE_STARTUP_NOTIFICATION + if (snContext) + { + /* Mark the startup process as complete */ + sn_launchee_context_complete (snContext); + + sn_launchee_context_unref (snContext); + } + + sn_display_unref (snDisplay); +#endif + + refresh_check (); +} + +/*----------------------------------------------------------------------*/ +void rxvt_term::init_env () { - int i; - unsigned int u; char *val; + char *env_display; + char *env_windowid; + char *env_colorfgbg; + char *env_term; #ifdef DISPLAY_IS_IP /* Fixup display_name for export over pty to any interested terminal @@ -479,26 +921,18 @@ rs[Rs_display_name] = (const char *)val; if (val == NULL) -#endif /* DISPLAY_IS_IP */ - val = XDisplayString (display->display); +#endif /* DISPLAY_IS_IP */ + val = XDisplayString (dpy); 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)); + env_display = (char *)rxvt_malloc (strlen (val) + 9); sprintf (env_display, "DISPLAY=%s", val); - /* avoiding the math library: - * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */ - for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++) - ; - max_it (i, 1); - env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); - - sprintf (env_windowid, "WINDOWID=%u", - (unsigned int)parent[0]); + env_windowid = (char *)rxvt_malloc (21); + sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); /* add entries to the environment: * @ DISPLAY: in case we started with -display @@ -510,21 +944,22 @@ */ putenv (env_display); putenv (env_windowid); - if (env_colorfgbg) - putenv (env_colorfgbg); + + env_colorfgbg = get_colorfgbg (); + putenv (env_colorfgbg); #ifdef RXVT_TERMINFO putenv ("TERMINFO=" RXVT_TERMINFO); #endif - if (display->depth <= 2) + if (depth <= 2) putenv ("COLORTERM=" COLORTERMENV "-mono"); else putenv ("COLORTERM=" COLORTERMENVFULL); 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); sprintf (env_term, "TERM=%s", rs[Rs_term_name]); putenv (env_term); } @@ -536,20 +971,15 @@ unsetenv ("LINES"); unsetenv ("COLUMNS"); unsetenv ("TERMCAP"); /* terminfo should be okay */ -#endif /* HAVE_UNSETENV */ +#endif /* HAVE_UNSETENV */ } /*----------------------------------------------------------------------*/ -/* - * This is more or less stolen straight from XFree86 xterm. - * This should support all European type languages. - */ void rxvt_term::set_locale (const char *locale) { set_environ (envv); -#if HAVE_XSETLOCALE || HAVE_SETLOCALE free (this->locale); this->locale = setlocale (LC_CTYPE, locale); @@ -567,19 +997,17 @@ } - this->locale = rxvt_strdup (this->locale); + this->locale = strdup (this->locale); SET_LOCALE (this->locale); mbstate.reset (); -#endif #if HAVE_NL_LANGINFO - char *codeset = strdup (nl_langinfo (CODESET)); + char *codeset = nl_langinfo (CODESET); // /^UTF.?8/i enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') && (codeset[1] == 'T' || codeset[1] == 't') && (codeset[2] == 'F' || codeset[2] == 'f') && (codeset[3] == '8' || codeset[4] == '8'); - free (codeset); #else enc_utf8 = 0; #endif @@ -592,14 +1020,14 @@ #ifdef USE_XIM if (!locale) - rxvt_warn ("setting locale failed, working without locale support.\n"); + rxvt_warn ("setting locale failed, continuing without locale support.\n"); else { set_string_property (xa[XA_WM_LOCALE_NAME], locale); if (!XSupportsLocale ()) { - rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); + rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n"); return; } @@ -621,20 +1049,20 @@ */ #ifdef META8_OPTION - meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; + meta_char = option (Opt_meta8) ? 0x80 : C0_ESC; #endif get_ourmods (); - if (!OPTION (Opt_scrollTtyOutput)) + if (!option (Opt_scrollTtyOutput)) priv_modes |= PrivMode_TtyOutputInh; - if (OPTION (Opt_scrollTtyKeypress)) + if (option (Opt_scrollTtyKeypress)) priv_modes |= PrivMode_Keypress; - if (!OPTION (Opt_jumpScroll)) + if (!option (Opt_jumpScroll)) priv_modes |= PrivMode_smoothScroll; #ifndef NO_BACKSPACE_KEY - if (strcmp (key_backspace, "DEC") == 0) + if (strcmp (rs[Rs_backspace_key], "DEC") == 0) priv_modes |= PrivMode_HaveBackSpace; #endif @@ -650,73 +1078,68 @@ /*----------------------------------------------------------------------*/ void -rxvt_term::Get_Colours () +rxvt_term::get_colours () { int i; #ifdef OFF_FOCUS_FADING pix_colors = pix_colors_focused; #endif - - for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) + + for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) { - rxvt_color xcol; + const char *name = rs[Rs_color + i]; - if (!rs[Rs_color + i]) + if (!name) continue; - if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) + rxvt_color xcol; + + if (!set_color (xcol, name)) { #ifndef XTERM_REVERSE_VIDEO - if (i < 2 && OPTION (Opt_reverseVideo)) - rs[Rs_color + i] = def_colorName[!i]; + if (i < 2 && option (Opt_reverseVideo)) + name = def_colorName [1 - i]; else #endif - rs[Rs_color + i] = def_colorName[i]; + name = def_colorName [i]; - if (!rs[Rs_color + i]) + if (!name) continue; - if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) + if (!set_color (xcol, name)) { switch (i) { case Color_fg: case Color_bg: - /* fatal: need bg/fg color */ - rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); - /* NOTREACHED */ + rxvt_warn ("unable to get foreground/background colour, continuing.\n"); + name = ""; break; #ifndef NO_CURSORCOLOR case Color_cursor2: - xcol = pix_colors[Color_fg]; - break; -#endif /* ! NO_CURSORCOLOR */ +#endif case Color_pointer_fg: - xcol = pix_colors[Color_fg]; + name = rs[Rs_color + Color_fg]; + xcol.set (this, name); break; default: - xcol = pix_colors[Color_bg]; /* None */ + name = rs[Rs_color + Color_bg]; + xcol.set (this, name); break; } } } pix_colors[i] = xcol; - SET_PIXCOLOR (i); + rs[Rs_color + i] = name; } -#ifdef OFF_FOCUS_FADING - if (rs[Rs_fade]) - for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) - pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); -#endif - - if (display->depth <= 2) + if (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]; + if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg); + if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg); + if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg); } /* @@ -725,42 +1148,37 @@ * The calculations of topShadow/bottomShadow values are adapted * from the fvwm window manager. */ -#ifdef KEEP_SCROLLCOLOR - - if (display->depth <= 2) +#ifdef RXVT_SCROLLBAR + if (depth <= 2) { /* Monochrome */ - pix_colors[Color_scroll] = pix_colors[Color_fg]; - pix_colors[Color_topShadow] = pix_colors[Color_bg]; - pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; + alias_color (Color_scroll, Color_fg); + alias_color (Color_topShadow, Color_bg); + alias_color (Color_bottomShadow, Color_bg); } else { - rxvt_color xcol[2]; - /* xcol[0] == white - * xcol[1] == top shadow - * xcol[2] == bot shadow */ - - xcol[1] = pix_colors[Color_scroll]; - xcol[0].set (display, 65535, 65535, 65535); - - unsigned short pr1, pg1, pb1, pr0, pg0, pb0; - - xcol[0].get (display, pr0, pg0, pb0); - xcol[1].get (display, pr1, pg1, pb1); + pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); - pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); + rgba cscroll; + pix_colors [Color_scroll].get (cscroll); /* 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] = pix_colors[Color_White]; - - pix_colors[Color_topShadow] = xcol[1]; + if (!pix_colors[Color_topShadow].set (this, + rgba ( + min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), + min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), + min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), + cscroll.a) + )) + alias_color (Color_topShadow, Color_White); } -#endif /* KEEP_SCROLLCOLOR */ +#endif + +#ifdef OFF_FOCUS_FADING + for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) + update_fade_color (i); +#endif } /*----------------------------------------------------------------------*/ @@ -768,18 +1186,15 @@ void 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]); if (i >= 8 && i <= 15) - { /* bright colors */ - i -= 8; - rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; - return; - } - - if (i >= 0 && i <= 7) /* normal colors */ + /* bright colors */ + rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8]; + else if (i >= 0 && i <= 7) + /* normal colors */ rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; } } @@ -809,7 +1224,7 @@ && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) requestedmeta = rsmod[3] - '0'; - map = XGetModifierMapping (display->display); + map = XGetModifierMapping (dpy); kc = map->modifiermap; for (i = 1; i < 6; i++) @@ -821,7 +1236,7 @@ if (kc[k] == 0) break; - switch (XKeycodeToKeysym (display->display, kc[k], 0)) + switch (XKeycodeToKeysym (dpy, kc[k], 0)) { case XK_Num_Lock: ModNumLockMask = modmasks[i - 1]; @@ -873,50 +1288,106 @@ ModMetaMask = modmasks[i - 1]; } +void +rxvt_term::set_icon (const char *file) +{ +#ifdef HAVE_PIXBUF + GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); + if (!pixbuf) + { + rxvt_warn ("Loading image icon failed, continuing without.\n"); + return; + } + + unsigned int w = gdk_pixbuf_get_width (pixbuf); + unsigned int h = gdk_pixbuf_get_height (pixbuf); + + if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383)) + { + rxvt_warn ("Icon image too big, continuing without.\n"); + g_object_unref (pixbuf); + return; + } + + if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long))) + { + int rowstride = gdk_pixbuf_get_rowstride (pixbuf); + unsigned char *row = gdk_pixbuf_get_pixels (pixbuf); + int channels = gdk_pixbuf_get_n_channels (pixbuf); + + buffer [0] = w; + buffer [1] = h; + for (int i = 0; i < h; i++) + { + for (int j = 0; j < w; j++) + { + unsigned char *pixel = row + j * channels; + long value; + + if (channels == 4) + value = pixel[3]; + else + value = (unsigned char)0x00ff; + + value = (value << 8) + pixel[0]; + value = (value << 8) + pixel[1]; + value = (value << 8) + pixel[2]; + buffer[(i * w + j) + 2] = value; + } + + row += rowstride; + } + + XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32, + PropModeReplace, (const unsigned char *) buffer, 2 + w * h); + free (buffer); + } + else + rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); + + g_object_unref (pixbuf); +#endif +} + /*----------------------------------------------------------------------*/ -/* rxvt_Create_Windows () - Open and map the window */ +/* Open and map the window */ void rxvt_term::create_windows (int argc, const char *const *argv) { XClassHint classHint; XWMHints wmHint; #if ENABLE_FRILLS - MWMHints mwmhints; + MWMHints mwmhints = { }; #endif XGCValues gcvalue; XSetWindowAttributes attributes; Window top, parent; - dDisp; - xa = display->xa; + dLocal (Display *, dpy); /* grab colors before netscape does */ - Get_Colours (); + get_colours (); if (!set_fonts ()) rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); parent = display->root; - attributes.override_redirect = !!OPTION (Opt_override_redirect); + attributes.override_redirect = !!option (Opt_override_redirect); #if ENABLE_FRILLS - if (OPTION (Opt_borderLess)) + if (option (Opt_borderLess)) { - if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) + if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) { - /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ - attributes.override_redirect = TRUE; - mwmhints.flags = 0; + // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n"); + attributes.override_redirect = true; } else { mwmhints.flags = MWM_HINTS_DECORATIONS; - mwmhints.decorations = 0; } } - else - mwmhints.flags = 0; #endif #if ENABLE_XEMBED @@ -926,7 +1397,7 @@ parent = strtol (rs[Rs_embed], 0, 0); - if (!XGetWindowAttributes (disp, parent, &wattr)) + if (!XGetWindowAttributes (dpy, parent, &wattr)) rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); window_calc (wattr.width, wattr.height); @@ -935,42 +1406,49 @@ window_calc (0, 0); - /* sub-window placement & size in rxvt_resize_subwindows () */ - attributes.background_pixel = pix_colors_focused[Color_border]; - attributes.border_pixel = pix_colors_focused[Color_border]; - attributes.colormap = display->cmap; + /* sub-window placement & size in rxvt_term::resize_all_windows () */ + attributes.background_pixel = pix_colors_focused [Color_border]; + attributes.border_pixel = pix_colors_focused [Color_border]; + attributes.colormap = cmap; - top = XCreateWindow (disp, parent, + top = XCreateWindow (dpy, parent, szHint.x, szHint.y, szHint.width, szHint.height, ext_bwidth, - display->depth, InputOutput, - display->visual, + depth, InputOutput, visual, CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, &attributes); - this->parent[0] = top; - - old_width = szHint.width; - old_height = szHint.height; + this->parent = top; - process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); - process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); + set_title (rs [Rs_title]); + set_icon_name (rs [Rs_iconName]); classHint.res_name = (char *)rs[Rs_name]; classHint.res_class = (char *)RESCLASS; wmHint.flags = InputHint | StateHint | WindowGroupHint; wmHint.input = True; - wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; + wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; wmHint.window_group = top; - XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, + XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, &szHint, &wmHint, &classHint); +#if ENABLE_EWMH + /* + * set up icon hint + * rs [Rs_iconfile] is path to icon + */ + + if (rs [Rs_iconfile]) + { + set_icon (rs [Rs_iconfile]); + } +#endif #if ENABLE_FRILLS if (mwmhints.flags) - XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, + XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); #endif @@ -981,24 +1459,24 @@ #endif }; - XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); + XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols)); #if ENABLE_FRILLS if (rs[Rs_transient_for]) - XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); + XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); #endif #if ENABLE_EWMH long pid = getpid (); - XChangeProperty (disp, top, + XChangeProperty (dpy, top, xa[XA_NET_WM_PID], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&pid, 1); // _NET_WM_WINDOW_TYPE is NORMAL, which is the default #endif - XSelectInput (disp, top, + XSelectInput (dpy, top, KeyPressMask #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 | KeyReleaseMask @@ -1009,27 +1487,22 @@ termwin_ev.start (display, top); /* vt cursor: Black-on-White is standard, but this is more popular */ - TermWin_cursor = XCreateFontCursor (disp, XC_xterm); - -#ifdef HAVE_SCROLLBARS - /* cursor scrollBar: Black-on-White */ - leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); -#endif + TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); /* the vt window */ - vt = XCreateSimpleWindow (disp, top, + vt = XCreateSimpleWindow (dpy, top, window_vt_x, window_vt_y, - width, height, + vt_width, vt_height, 0, pix_colors_focused[Color_fg], pix_colors_focused[Color_bg]); attributes.bit_gravity = NorthWestGravity; - XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); + XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; - if (OPTION (Opt_pointerBlank)) + if (option (Opt_pointerBlank)) vt_emask |= PointerMotionMask; else vt_emask |= Button1MotionMask | Button3MotionMask; @@ -1038,42 +1511,16 @@ vt_ev.start (display, vt); -#ifdef XPM_BACKGROUND - if (rs[Rs_backgroundPixmap] != NULL - && ! OPTION (Opt_transparent)) - { - const char *p = rs[Rs_backgroundPixmap]; - - if ((p = strchr (p, ';')) != NULL) - { - p++; - scale_pixmap (p); - } - - set_bgPixmap (rs[Rs_backgroundPixmap]); - scr_touch (true); - } -#endif - /* graphics context for the vt window */ gcvalue.foreground = pix_colors[Color_fg]; gcvalue.background = pix_colors[Color_bg]; - gcvalue.graphics_exposures = 1; + gcvalue.graphics_exposures = 0; - gc = XCreateGC (disp, vt, + gc = XCreateGC (dpy, vt, GCForeground | GCBackground | GCGraphicsExposures, &gcvalue); - drawable = new rxvt_drawable (display, vt); - -#ifdef RXVT_SCROLLBAR - gcvalue.foreground = pix_colors[Color_topShadow]; - topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); - gcvalue.foreground = pix_colors[Color_bottomShadow]; - botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); - gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; - scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); -#endif + drawable = new rxvt_drawable (this, vt); #ifdef OFF_FOCUS_FADING // initially we are in unfocused state @@ -1085,218 +1532,6 @@ scr_recolour (); } -/* ------------------------------------------------------------------------- * - * GET TTY CURRENT STATE * - * ------------------------------------------------------------------------- */ -void -rxvt_get_ttymode (ttymode_t *tio, int erase) -{ -#ifdef HAVE_TERMIOS_H - /* - * standard System V termios interface - */ - if (GET_TERMIOS (STDIN_FILENO, tio) < 0) - { - // return error - use system defaults, - // where possible, and zero elsewhere - memset (tio, 0, sizeof (ttymode_t)); - - tio->c_cc[VINTR] = CINTR; - tio->c_cc[VQUIT] = CQUIT; - tio->c_cc[VERASE] = CERASE; -#ifdef VERASE2 - tio->c_cc[VERASE2] = CERASE2; -#endif - tio->c_cc[VKILL] = CKILL; - tio->c_cc[VSTART] = CSTART; - tio->c_cc[VSTOP] = CSTOP; - tio->c_cc[VSUSP] = CSUSP; -# ifdef VDSUSP - tio->c_cc[VDSUSP] = CDSUSP; -# endif -# ifdef VREPRINT - tio->c_cc[VREPRINT] = CRPRNT; -# endif -# ifdef VDISCRD - tio->c_cc[VDISCRD] = CFLUSH; -# endif -# ifdef VWERSE - tio->c_cc[VWERSE] = CWERASE; -# endif -# ifdef VLNEXT - tio->c_cc[VLNEXT] = CLNEXT; -# endif - } - - tio->c_cc[VEOF] = CEOF; - tio->c_cc[VEOL] = VDISABLE; -# ifdef VEOL2 - tio->c_cc[VEOL2] = VDISABLE; -# endif -# ifdef VSWTC - tio->c_cc[VSWTC] = VDISABLE; -# endif -# ifdef VSWTCH - tio->c_cc[VSWTCH] = VDISABLE; -# endif -# if VMIN != VEOF - tio->c_cc[VMIN] = 1; -# endif -# if VTIME != VEOL - tio->c_cc[VTIME] = 0; -# endif - - if (erase != -1) - tio->c_cc[VERASE] = (char)erase; - - /* input modes */ - tio->c_iflag = (BRKINT | IGNPAR | ICRNL -# ifdef IMAXBEL - | IMAXBEL -# endif - | IXON); - - /* output modes */ - tio->c_oflag = (OPOST | ONLCR); - - /* control modes */ - tio->c_cflag = (CS8 | CREAD); - - /* line discipline modes */ - tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO -# if defined (ECHOCTL) && defined (ECHOKE) - | ECHOCTL | ECHOKE -# endif - | ECHOE | ECHOK); -# else /* HAVE_TERMIOS_H */ - - /* - * sgtty interface - */ - - /* get parameters -- gtty */ - if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) - { - tio->sg.sg_erase = CERASE; /* ^H */ - tio->sg.sg_kill = CKILL; /* ^U */ - } - - if (erase != -1) - tio->sg.sg_erase = (char)erase; - - tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); - - /* get special characters */ - if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0) - { - tio->tc.t_intrc = CINTR; /* ^C */ - tio->tc.t_quitc = CQUIT; /* ^\ */ - tio->tc.t_startc = CSTART; /* ^Q */ - tio->tc.t_stopc = CSTOP; /* ^S */ - tio->tc.t_eofc = CEOF; /* ^D */ - tio->tc.t_brkc = -1; - } - - /* get local special chars */ - if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) - { - tio->lc.t_suspc = CSUSP; /* ^Z */ - tio->lc.t_dsuspc = CDSUSP; /* ^Y */ - tio->lc.t_rprntc = CRPRNT; /* ^R */ - tio->lc.t_flushc = CFLUSH; /* ^O */ - tio->lc.t_werasc = CWERASE; /* ^W */ - tio->lc.t_lnextc = CLNEXT; /* ^V */ - } - /* get line discipline */ - ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); -# ifdef NTTYDISC - tio->line = NTTYDISC; -# endif /* NTTYDISC */ - - tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); -#endif /* HAVE_TERMIOS_H */ - - /* - * Debugging - */ -#ifdef DEBUG_TTYMODE -#ifdef HAVE_TERMIOS_H - /* c_iflag bits */ - fprintf (stderr, "Input flags\n"); - - /* cpp token stringize doesn't work on all machines */ -# define FOO(flag,name) \ - if ((tio->c_iflag) & flag) \ - 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"); -# ifdef IUCLC - FOO (IUCLC, "IUCLC"); -# endif -# ifdef IXANY - FOO (IXANY, "IXANY"); -# endif -# ifdef IMAXBEL - FOO (IMAXBEL, "IMAXBEL"); -# endif - - fprintf (stderr, "\n"); - -# undef FOO -# define FOO(entry, name) \ - 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"); -# ifdef VEOL2 - FOO (VEOL2, "VEOL2"); -# endif -# ifdef VSWTC - FOO (VSWTC, "VSWTC"); -# endif -# ifdef VSWTCH - FOO (VSWTCH, "VSWTCH"); -# endif - FOO (VSTART, "VSTART"); - FOO (VSTOP, "VSTOP"); - FOO (VSUSP, "VSUSP"); -# ifdef VDSUSP - FOO (VDSUSP, "VDSUSP"); -# endif -# ifdef VREPRINT - FOO (VREPRINT, "VREPRINT"); -# endif -# ifdef VDISCRD - FOO (VDISCRD, "VDISCRD"); -# endif -# ifdef VWERSE - FOO (VWERSE, "VWERSE"); -# endif -# ifdef VLNEXT - FOO (VLNEXT, "VLNEXT"); -# endif - - 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 @@ -1316,7 +1551,7 @@ if (getfd_hook) pty->pty = (*getfd_hook) (pty->pty); - if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) + if (pty->pty < 0) rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); } } @@ -1325,23 +1560,25 @@ if (!pty->get ()) rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); - pty->set_utf8_mode (enc_utf8); + fcntl (pty->pty, F_SETFL, O_NONBLOCK); - /* set initial window size */ - tt_winch (); - - int er; + struct termios tio = def_tio; #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 + if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) + tio.c_cc[VERASE] = rs[Rs_backspace_key][0]; + else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) + tio.c_cc[VERASE] = '\177'; /* the initial state anyway */ #endif - er = -1; - rxvt_get_ttymode (&tio, er); + /* init terminal attributes */ + cfsetospeed (&tio, BAUDRATE); + cfsetispeed (&tio, BAUDRATE); + tcsetattr (pty->tty, TCSANOW, &tio); + pty->set_utf8_mode (enc_utf8); + + /* set initial window size */ + tt_winch (); #if ENABLE_FRILLS if (rs[Rs_pty_fd]) @@ -1382,8 +1619,15 @@ _exit (EXIT_FAILURE); default: - if (!OPTION (Opt_utmpInhibit)) - pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); + if (!option (Opt_utmpInhibit)) + { +#ifdef LOG_ONLY_ON_LOGIN + bool login_shell = option (Opt_loginShell); +#else + bool login_shell = true; +#endif + pty->login (cmd_pid, login_shell, rs[Rs_display_name]); + } pty->close_tty (); @@ -1406,10 +1650,9 @@ { char *login; - SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ - - if (OPTION (Opt_console)) - { /* be virtual console, fail silently */ + if (option (Opt_console)) + { + /* be virtual console, fail silently */ #ifdef TIOCCONS unsigned int on = 1; @@ -1419,9 +1662,11 @@ fd = open (CONSOLE, O_WRONLY, 0); if (fd >= 0) - if (ioctl (fd, SRIOCSREDIR, NULL) < 0) + { + ioctl (fd, SRIOCSREDIR, STDIN_FILENO); close (fd); -#endif /* SRIOCSREDIR */ + } +#endif /* SRIOCSREDIR */ } /* reset signals and spin off the command interpreter */ @@ -1431,22 +1676,17 @@ signal (SIGHUP, SIG_DFL); signal (SIGPIPE, SIG_DFL); /* - * mimick login's behavior by disabling the job control signals + * mimic 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); +#endif /* SIGTSTP */ /* command interpreter path */ - if (argv != NULL) + if (argv) { # ifdef DEBUG_CMD int i; @@ -1465,18 +1705,18 @@ if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') shell = "/bin/sh"; - argv0 = (const char *)rxvt_r_basename (shell); + argv0 = rxvt_basename (shell); - if (OPTION (Opt_loginShell)) + if (option (Opt_loginShell)) { - login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); + login = (char *)rxvt_malloc (strlen (argv0) + 2); login[0] = '-'; strcpy (&login[1], argv0); argv0 = login; } - execlp (shell, argv0, NULL); + execlp (shell, argv0, (char *)0); /* no error message: STDERR is closed! */ }