--- rxvt-unicode/src/init.C 2007/07/12 22:33:16 1.190 +++ rxvt-unicode/src/init.C 2010/08/29 15:05:08 1.279 @@ -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,11 +36,115 @@ #include "rxvt.h" /* NECESSARY */ #include "rxvtutil.h" #include "init.h" +#include "keyboard.h" #include #include +#include + +#ifdef HAVE_XSETLOCALE +# define X_LOCALE +# include +#else +# ifdef HAVE_SETLOCALE +# include +# endif +#endif + +#ifdef HAVE_NL_LANGINFO +# 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 + const char *const def_colorName[] = { COLOR_FOREGROUND, @@ -52,9 +157,9 @@ "rgb:00/00/cd", // 4: blue (Blue3) "rgb:cd/00/cd", // 5: magenta (Magenta3) "rgb:00/cd/cd", // 6: cyan (Cyan3) -# ifdef XTERM_COLORS +# ifdef XTERM_COLORS "rgb:e5/e5/e5", // 7: white (Grey90) -# else +# else "rgb:fa/eb/d7", // 7: white (AntiqueWhite) # endif /* high-intensity colors */ @@ -71,6 +176,7 @@ "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 +250,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,18 +506,19 @@ 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 @@ -176,18 +526,10 @@ #endif }; -bool +void rxvt_term::init_vars () { - pix_colors = // - pix_colors_focused = new rxvt_color [TOTAL_COLORS]; -#ifdef OFF_FOCUS_FADING - pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; -#endif - -#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY) - pixmap = None; -#endif + pix_colors = pix_colors_focused; MEvent.time = CurrentTime; MEvent.button = AnyButton; @@ -198,19 +540,12 @@ int_bwidth = INTERNALBORDERWIDTH; ext_bwidth = EXTERNALBORDERWIDTH; lineSpace = LINESPACE; + letterSpace = LETTERSPACE; saveLines = SAVELINES; - numpix_colors = TOTAL_COLORS; refresh_type = SLOW_REFRESH; oldcursor.row = oldcursor.col = -1; -#ifdef XPM_BACKGROUND - /* bgPixmap.w = bgPixmap.h = 0; */ - bgPixmap.x = bgPixmap.y = 0; - bgPixmap.pixmap = None; -#endif - - last_bot = last_state = -1; set_option (Opt_scrollBar); set_option (Opt_scrollTtyOutput); @@ -220,43 +555,9 @@ set_option (Opt_secondaryScroll); set_option (Opt_pastableTabs); set_option (Opt_intensityStyles); + set_option (Opt_iso14755); set_option (Opt_iso14755_52); - - 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_buffered); } /*----------------------------------------------------------------------*/ @@ -264,7 +565,6 @@ rxvt_term::init_resources (int argc, const char *const *argv) { int i, r_argc; - char *val; const char **cmd_argv, **r_argv; /* @@ -274,15 +574,10 @@ if (!strcmp (argv[r_argc], "-e")) 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 if (!argv[r_argc + 1]) + rxvt_fatal ("option '-e' requires an argument, aborting.\n"); else { cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); @@ -293,7 +588,14 @@ cmd_argv[i] = NULL; } - rs[Rs_name] = rxvt_r_basename (argv[0]); + 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; + + rs[Rs_name] = rxvt_basename (argv[0]); /* * Open display, get options/resources and create the window @@ -305,7 +607,10 @@ get_options (r_argc, r_argv); if (!(display = displays.get (rs[Rs_display_name]))) - rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); + { + free (r_argv); + 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; @@ -318,16 +623,17 @@ select_visual (strtol (rs[Rs_depth], 0, 0)); #endif -#ifdef HAVE_AFTERIMAGE - ::dpy = NULL ; /* init global var from libAfter... */ - asv = AFTERIMAGE_DPY_OP(create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL)); -#endif free (r_argv); for (int i = NUM_RESOURCES; i--; ) if (rs [i] == resval_undef) rs [i] = 0; +#ifdef HAVE_AFTERIMAGE + set_application_name ((char *)rs[Rs_name]); + set_output_threshold (OUTPUT_LEVEL_WARNING); +#endif + #if ENABLE_PERL if (!rs[Rs_perl_ext_1]) rs[Rs_perl_ext_1] = "default"; @@ -347,7 +653,8 @@ 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]; } @@ -355,6 +662,7 @@ { if (!rs[Rs_title]) rs[Rs_title] = rs[Rs_name]; + if (!rs[Rs_iconName]) rs[Rs_iconName] = rs[Rs_name]; } @@ -371,6 +679,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 @@ -384,54 +695,28 @@ 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 */ @@ -461,7 +746,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); @@ -469,7 +754,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]; @@ -479,10 +764,132 @@ /*----------------------------------------------------------------------*/ void +rxvt_term::init (int argc, const char *const *argv, stringvec *envv) +{ + this->envv = envv; + + 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 = STATE_IDLE; /* set existence for size calculations */ + + pty = ptytty::create (); + + 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 + { + bgPixmap.set_target (this); + bgPixmap.invalidate (); + +#ifdef ENABLE_TRANSPARENCY + if (option (Opt_transparent)) + { + bgPixmap.set_transparent (); + +#ifdef HAVE_AFTERIMAGE + if (rs [Rs_blurradius]) + bgPixmap.set_blur_radius (rs [Rs_blurradius]); +#endif + if (ISSET_PIXCOLOR (Color_tint)) + bgPixmap.set_tint (pix_colors_focused [Color_tint]); + + if (rs [Rs_shade]) + bgPixmap.set_shade (rs [Rs_shade]); + + bgPixmap.set_root_pixmap (); + XSelectInput (dpy, display->root, PropertyChangeMask); + rootwin_ev.start (display, display->root); + } +#endif + +#ifdef BG_IMAGE_FROM_FILE + if (rs[Rs_backgroundPixmap]) + { + const char *p = rs[Rs_backgroundPixmap]; + + if ((p = strchr (p, ';')) != 0) + { + p++; + bgPixmap.set_geometry (p); + } + else + bgPixmap.set_defaultGeometry (); + + if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) + if (!bgPixmap.window_position_sensitive ()) + update_background (); + } +#endif + } +#endif + +#if ENABLE_PERL + rootwin_ev.start (display, display->root); +#endif + + set_colorfgbg (); + + init_command (cmd_argv); + + free (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[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], + 32, PropModeReplace, (unsigned char *)&info, 2); + } +#endif + + XMapWindow (dpy, vt); + XMapWindow (dpy, parent[0]); + + refresh_check (); +} + +/*----------------------------------------------------------------------*/ +void rxvt_term::init_env () { int i; - unsigned int u; char *val; #ifdef DISPLAY_IS_IP @@ -500,14 +907,14 @@ rs[Rs_display_name] = (const char *)val; if (val == NULL) -#endif /* DISPLAY_IS_IP */ +#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 (i + 9); sprintf (env_display, "DISPLAY=%s", val); @@ -538,7 +945,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); sprintf (env_term, "TERM=%s", rs[Rs_term_name]); putenv (env_term); } @@ -550,7 +957,7 @@ unsetenv ("LINES"); unsetenv ("COLUMNS"); unsetenv ("TERMCAP"); /* terminfo should be okay */ -#endif /* HAVE_UNSETENV */ +#endif /* HAVE_UNSETENV */ } /*----------------------------------------------------------------------*/ @@ -581,7 +988,7 @@ } - this->locale = rxvt_strdup (this->locale); + this->locale = strdup (this->locale); SET_LOCALE (this->locale); mbstate.reset (); #endif @@ -648,7 +1055,7 @@ 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 @@ -664,14 +1071,14 @@ /*----------------------------------------------------------------------*/ 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 < (depth <= 2 ? 2 : NRS_COLORS); i++) { const char *name = rs[Rs_color + i]; @@ -734,7 +1141,7 @@ * The calculations of topShadow/bottomShadow values are adapted * from the fvwm window manager. */ -#ifdef KEEP_SCROLLCOLOR +#ifdef RXVT_SCROLLBAR if (depth <= 2) { /* Monochrome */ @@ -759,7 +1166,7 @@ )) alias_color (Color_topShadow, Color_White); } -#endif /* KEEP_SCROLLCOLOR */ +#endif #ifdef OFF_FOCUS_FADING for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) @@ -777,13 +1184,10 @@ 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]; } } @@ -877,6 +1281,61 @@ ModMetaMask = modmasks[i - 1]; } +void +rxvt_term::set_icon (const char *file) +{ +#ifdef HAVE_AFTERIMAGE + init_asv (); + + ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL); + if (!im) + { + rxvt_warn ("Loading image icon failed, continuing without.\n"); + return; + } + + int w = im->width; + int h = im->height; + + if (!IN_RANGE_INC (w, 1, 32767) || !IN_RANGE_INC (h, 1, 32767)) + { + rxvt_warn ("Icon image too big, continuing without.\n"); + destroy_asimage (&im); + return; + } + + ASImage *result = scale_asimage (asv, im, + w, h, ASA_ARGB32, + 100, ASIMAGE_QUALITY_DEFAULT); + destroy_asimage (&im); + + if (!result) + { + rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n"); + return; + } + + long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)); + if (buffer) + { + ARGB32 *asbuf = result->alt.argb32; + buffer [0] = w; + buffer [1] = h; + + for (unsigned int i = 0; i < w * h; ++i) + buffer [i + 2] = asbuf [i]; + + XChangeProperty (dpy, parent[0], 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"); + + destroy_asimage (&result); +#endif +} + /*----------------------------------------------------------------------*/ /* rxvt_Create_Windows () - Open and map the window */ void @@ -885,7 +1344,7 @@ XClassHint classHint; XWMHints wmHint; #if ENABLE_FRILLS - MWMHints mwmhints; + MWMHints mwmhints = { }; #endif XGCValues gcvalue; XSetWindowAttributes attributes; @@ -894,7 +1353,7 @@ 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"); @@ -908,18 +1367,14 @@ { 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");*/ + // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n"); attributes.override_redirect = true; - mwmhints.flags = 0; } else { mwmhints.flags = MWM_HINTS_DECORATIONS; - mwmhints.decorations = 0; } } - else - mwmhints.flags = 0; #endif #if ENABLE_XEMBED @@ -956,8 +1411,8 @@ old_width = szHint.width; old_height = szHint.height; - 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; @@ -969,6 +1424,17 @@ 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) @@ -1013,11 +1479,6 @@ /* vt cursor: Black-on-White is standard, but this is more popular */ TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); -#ifdef HAVE_SCROLLBARS - /* cursor scrollBar: Black-on-White */ - leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr); -#endif - /* the vt window */ vt = XCreateSimpleWindow (dpy, top, window_vt_x, window_vt_y, @@ -1040,26 +1501,6 @@ vt_ev.start (display, vt); -#ifdef XPM_BACKGROUND - if (rs[Rs_backgroundPixmap] != NULL -#ifndef HAVE_AFTERIMAGE - && !option (Opt_transparent) -#endif - ) - { - 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]; @@ -1071,15 +1512,6 @@ drawable = new rxvt_drawable (this, vt); -#ifdef RXVT_SCROLLBAR - gcvalue.foreground = pix_colors[Color_topShadow]; - topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); - gcvalue.foreground = pix_colors[Color_bottomShadow]; - botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); - gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; - scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); -#endif - #ifdef OFF_FOCUS_FADING // initially we are in unfocused state if (rs[Rs_fade]) @@ -1090,170 +1522,6 @@ scr_recolour (); } -/* ------------------------------------------------------------------------- * - * GET TTY CURRENT STATE * - * ------------------------------------------------------------------------- */ -void -rxvt_get_ttymode (ttymode_t *tio, int erase) -{ - /* - * 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); - - /* - * 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 @@ -1282,19 +1550,19 @@ if (!pty->get ()) rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); - 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); - SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ + /* init terminal attributes */ + cfsetospeed (&tio, BAUDRATE); + cfsetispeed (&tio, BAUDRATE); + tcsetattr (pty->tty, TCSANOW, &tio); pty->set_utf8_mode (enc_utf8); /* set initial window size */ @@ -1364,7 +1632,8 @@ char *login; if (option (Opt_console)) - { /* be virtual console, fail silently */ + { + /* be virtual console, fail silently */ #ifdef TIOCCONS unsigned int on = 1; @@ -1376,7 +1645,7 @@ if (fd >= 0) if (ioctl (fd, SRIOCSREDIR, NULL) < 0) close (fd); -#endif /* SRIOCSREDIR */ +#endif /* SRIOCSREDIR */ } /* reset signals and spin off the command interpreter */ @@ -1386,22 +1655,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; @@ -1420,18 +1684,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)) { - 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! */ }