--- rxvt-unicode/src/init.C 2004/02/24 16:25:44 1.36 +++ rxvt-unicode/src/init.C 2010/08/29 17:58:54 1.280 @@ -1,5 +1,5 @@ -/*--------------------------------*-C-*---------------------------------* - * File: init.c +/*----------------------------------------------------------------------* + * File: init.C *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. @@ -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-2004 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 @@ -33,259 +34,440 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ +#include "rxvtutil.h" #include "init.h" +#include "keyboard.h" -#include +#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, COLOR_BACKGROUND, /* low-intensity colors */ - "Black", /* 0: black (#000000) */ -#ifndef NO_BRIGHTCOLOR - "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 -#endif /* NO_BRIGHTCOLOR */ - "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) */ -#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: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", + "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: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", @@ -311,166 +493,71 @@ "rgb:e4/e4/e4", "rgb:ee/ee/ee", #endif + #ifndef NO_CURSORCOLOR COLOR_CURSOR_BACKGROUND, COLOR_CURSOR_FOREGROUND, -#endif /* ! NO_CURSORCOLOR */ - NULL, /* Color_pointer */ +#endif /* ! NO_CURSORCOLOR */ + 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 */ +#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 */ - - }; - -const char *const xa_names[NUM_XA] = - { - "TEXT", - "COMPOUND_TEXT", - "UTF8_STRING", - "MULTIPLE", - "TARGETS", - "TIMESTAMP", - "VT_SELECTION", - "INCR", - "WM_DELETE_WINDOW", -#ifdef TRANSPARENT - "_XROOTPMAP_ID", -#endif -#ifdef OFFIX_DND - "DndProtocol", - "DndSelection", #endif - "CLIPBOARD" +#if ENABLE_TRANSPARENCY + NULL, +#endif +#if OFF_FOCUS_FADING + "rgb:00/00/00", +#endif }; -bool +void rxvt_term::init_vars () { - PixColors = new rxvt_color [TOTAL_COLORS]; - if (PixColors == 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 + pix_colors = pix_colors_focused; MEvent.time = CurrentTime; MEvent.button = AnyButton; - Options = DEFAULT_OPTIONS; want_refresh = 1; - cmd_pid = -1; - cmd_fd = tty_fd = -1; - PrivateModes = SavedModes = PrivMode_Default; - TermWin.focus = 0; - TermWin.ncol = 80; - TermWin.nrow = 24; - TermWin.int_bwidth = INTERNALBORDERWIDTH; - 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 + priv_modes = SavedModes = PrivMode_Default; + ncol = 80; + nrow = 24; + int_bwidth = INTERNALBORDERWIDTH; + ext_bwidth = EXTERNALBORDERWIDTH; + lineSpace = LINESPACE; + letterSpace = LETTERSPACE; + saveLines = SAVELINES; -#ifndef NO_BRIGHTCOLOR - colorfgbg = DEFAULT_RSTYLE; -#endif - -#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) - ks_bigfont = XK_greater; - ks_smallfont = XK_less; -#endif - - 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; - -#ifdef MENUBAR - menu_readonly = 1; -# if ! (MENUBAR_MAX > 1) - CurrentBar = & (BarList); -# endif /* (MENUBAR_MAX > 1) */ -#endif - - return true; -} - -void -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 - * 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); } /*----------------------------------------------------------------------*/ @@ -478,25 +565,19 @@ 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 + * Look for -e 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")) 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)); @@ -507,40 +588,64 @@ cmd_argv[i] = NULL; } - /* clear all resources */ - for (i = 0; i < NUM_RESOURCES;) - rs[i++] = NULL; + 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_r_basename (argv[0]); + rs[Rs_name] = rxvt_basename (argv[0]); /* * Open display, get options/resources and create the window */ + if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) rs[Rs_display_name] = ":0"; get_options (r_argc, r_argv); - free (r_argv); -#ifdef LOCAL_X_IS_UNIX - if (rs[Rs_display_name][0] == ':') + if (!(display = displays.get (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); + 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; + + set (display); + extract_resources (); + +#if XFT + if (rs[Rs_depth]) + select_visual (strtol (rs[Rs_depth], 0, 0)); #endif - if (!display - && ! (display = displays.get (rs[Rs_display_name]))) + 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"; + + if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) + || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) + || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) { - rxvt_print_error ("can't open display %s", rs[Rs_display_name]); - exit (EXIT_FAILURE); + rxvt_perl.init (this); + HOOK_INVOKE ((this, HOOK_INIT, DT_END)); } - - extract_resources (display->display, rs[Rs_name]); +#endif /* * set any defaults not already set @@ -548,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]; } @@ -556,23 +662,26 @@ { if (!rs[Rs_title]) rs[Rs_title] = rs[Rs_name]; + if (!rs[Rs_iconName]) rs[Rs_iconName] = rs[Rs_name]; } if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) - TermWin.saveLines = BOUND_POSITIVE_INT16 (i); + saveLines = min (i, MAX_SAVELINES); -#ifndef NO_FRILLS +#if ENABLE_FRILLS if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) - TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ + int_bwidth = min (i, std::numeric_limits::max ()); + if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) - TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ -#endif + ext_bwidth = min (i, std::numeric_limits::max ()); -#ifndef NO_LINESPACE if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) - TermWin.lineSpace = min (i, 100); /* arbitrary limit */ + lineSpace = min (i, std::numeric_limits::max ()); + + if (rs[Rs_letterSpace]) + letterSpace = atoi (rs[Rs_letterSpace]); #endif #ifdef POINTER_BLANK @@ -583,89 +692,39 @@ #endif /* no point having a scrollbar without having any scrollback! */ - if (!TermWin.saveLines) - Options &= ~Opt_scrollBar; - -#ifdef PRINTPIPE - if (!rs[Rs_print_pipe]) - rs[Rs_print_pipe] = PRINTPIPE; -#endif + if (!saveLines) + set_option (Opt_scrollBar, 0); 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 - 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]); - } - - 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 - } - -#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 (Options & 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]; } @@ -677,8 +736,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 (option (Opt_reverseVideo)) + ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); #endif /* convenient aliases for setting fg/bg to colors */ @@ -687,24 +746,150 @@ #ifndef NO_CURSORCOLOR color_aliases (Color_cursor); color_aliases (Color_cursor2); -#endif /* NO_CURSORCOLOR */ - color_aliases (Color_pointer); +#endif /* NO_CURSORCOLOR */ + color_aliases (Color_pointer_fg); + color_aliases (Color_pointer_bg); color_aliases (Color_border); #ifndef NO_BOLD_UNDERLINE_REVERSE 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]; return cmd_argv; } /*----------------------------------------------------------------------*/ 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 @@ -722,26 +907,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)); + i = strlen (val); + env_display = (char *)rxvt_malloc (i + 9); sprintf (env_display, "DISPLAY=%s", val); - /* avoiding the math library: - * 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)); - - sprintf (env_windowid, "WINDOWID=%u", - (unsigned int)TermWin.parent[0]); + sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); /* add entries to the environment: * @ DISPLAY: in case we started with -display @@ -753,6 +930,7 @@ */ putenv (env_display); putenv (env_windowid); + if (env_colorfgbg) putenv (env_colorfgbg); @@ -760,14 +938,14 @@ 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); } @@ -779,7 +957,7 @@ unsetenv ("LINES"); unsetenv ("COLUMNS"); unsetenv ("TERMCAP"); /* terminfo should be okay */ -#endif /* HAVE_UNSETENV */ +#endif /* HAVE_UNSETENV */ } /*----------------------------------------------------------------------*/ @@ -790,40 +968,59 @@ void rxvt_term::set_locale (const char *locale) { + set_environ (envv); + #if HAVE_XSETLOCALE || HAVE_SETLOCALE free (this->locale); - this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale)); + this->locale = setlocale (LC_CTYPE, locale); + + if (!this->locale) + { + if (*locale) + { + rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale); + setlocale (LC_CTYPE, "C"); + } + else + rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); + + this->locale = "C"; + } + + + this->locale = strdup (this->locale); SET_LOCALE (this->locale); mbstate.reset (); #endif + #if HAVE_NL_LANGINFO + char *codeset = strdup (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); - codeset = strdup (nl_langinfo (CODESET)); - enc_utf8 = !STRCASECMP (codeset, "UTF-8") - || !STRCASECMP (codeset, "UTF8"); #else - enc_utf8 = 1; + enc_utf8 = 0; #endif } void rxvt_term::init_xlocale () { + set_environ (envv); + #ifdef USE_XIM if (!locale) - rxvt_print_error ("Setting locale failed."); + rxvt_warn ("setting locale failed, working without locale support.\n"); else { - Atom wmlocale; - - wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); - XChangeProperty (display->display, TermWin.parent[0], wmlocale, - XA_STRING, 8, PropModeReplace, - (unsigned char *)locale, STRLEN (locale)); + set_string_property (xa[XA_WM_LOCALE_NAME], 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; } @@ -843,172 +1040,138 @@ * Initialize the command connection. * This should be called after the X server connection is established. */ - int i; - - for (i = 0; i < NUM_XA; i++) - xa[i] = XInternAtom (display->display, xa_names[i], False); - - /* Enable delete window protocol */ - XSetWMProtocols (display->display, TermWin.parent[0], - & (xa[XA_WMDELETEWINDOW]), 1); - -#ifdef USING_W11LIB - /* enable W11 callbacks */ - W11AddEventHandler (display->display, rxvt_W11_process_x_event); -#endif #ifdef META8_OPTION - meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); + meta_char = option (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 (!option (Opt_scrollTtyOutput)) + priv_modes |= PrivMode_TtyOutputInh; + if (option (Opt_scrollTtyKeypress)) + priv_modes |= PrivMode_Keypress; + if (!option (Opt_jumpScroll)) + priv_modes |= PrivMode_smoothScroll; #ifndef NO_BACKSPACE_KEY - if (STRCMP (key_backspace, "DEC") == 0) - PrivateModes |= PrivMode_HaveBackSpace; + if (strcmp (rs[Rs_backspace_key], "DEC") == 0) + priv_modes |= PrivMode_HaveBackSpace; #endif /* add value for scrollBar */ - if (scrollbar_visible ()) + if (scrollBar.state) { - PrivateModes |= PrivMode_scrollBar; + priv_modes |= PrivMode_scrollBar; SavedModes |= PrivMode_scrollBar; } - if (menubar_visible ()) - { - PrivateModes |= PrivMode_menuBar; - SavedModes |= PrivMode_menuBar; - } -#ifdef CURSOR_BLINK - 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); } /*----------------------------------------------------------------------*/ void -rxvt_term::Get_Colours () +rxvt_term::get_colours () { 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 < (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 && (Options & 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_print_error ("aborting"); - exit (EXIT_FAILURE); - /* NOTREACHED */ + rxvt_warn ("unable to get foreground/background colour, continuing.\n"); + name = ""; break; #ifndef NO_CURSORCOLOR case Color_cursor2: - xcol = PixColors[Color_fg]; - break; -#endif /* ! NO_CURSORCOLOR */ - case Color_pointer: - xcol = PixColors[Color_fg]; +#endif + case Color_pointer_fg: + name = rs[Rs_color + Color_fg]; + xcol.set (this, name); break; default: - xcol = PixColors[Color_bg]; /* None */ + name = rs[Rs_color + Color_bg]; + xcol.set (this, name); break; } } } - PixColors[i] = xcol; - SET_PIXCOLOR (i); + pix_colors[i] = xcol; + rs[Rs_color + i] = name; } - 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 (depth <= 2) + { + 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); + } /* - * get scrollBar/menuBar shadow colors + * get scrollBar shadow colors * * The calculations of topShadow/bottomShadow values are adapted * from the fvwm window manager. */ -#ifdef KEEP_SCROLLCOLOR - - if (XDEPTH <= 2) - { /* Monochrome */ - PixColors[Color_scroll] = PixColors[Color_fg]; - PixColors[Color_topShadow] = PixColors[Color_bg]; - PixColors[Color_bottomShadow] = PixColors[Color_bg]; +#ifdef RXVT_SCROLLBAR + if (depth <= 2) + { + /* Monochrome */ + alias_color (Color_scroll, Color_fg); + alias_color (Color_topShadow, Color_bg); + alias_color (Color_bottomShadow, Color_bg); } else { - rxvt_color xcol[3]; - /* xcol[0] == white - * xcol[1] == top shadow - * xcol[2] == bot shadow */ - - xcol[1] = PixColors[Color_scroll]; -# ifdef PREFER_24BIT - 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); + pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); - /* bottomShadowColor */ - if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2)) - xcol[2] = PixColors[Color_Black]; - - PixColors[Color_bottomShadow] = xcol[2]; + 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] = PixColors[Color_White]; - - PixColors[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 } /*----------------------------------------------------------------------*/ @@ -1021,16 +1184,10 @@ int i = atoi (rs[Rs_color + idx]); if (i >= 8 && i <= 15) - { /* bright colors */ - i -= 8; -#ifndef NO_BRIGHTCOLOR - rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; - return; -#endif - - } - - 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]; } } @@ -1043,11 +1200,11 @@ void rxvt_term::get_ourmods () { - int i, j, k; - int requestedmeta, realmeta, realalt; - const char *cm, *rsmod; + int i, j, k; + int requestedmeta, realmeta, realalt; + const char *cm, *rsmod; XModifierKeymap *map; - KeyCode *kc; + KeyCode *kc; const unsigned int modmasks[] = { Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask @@ -1055,250 +1212,314 @@ 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 (dpy); kc = map->modifiermap; + for (i = 1; i < 6; i++) { k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ + for (j = map->max_keypermod; j--; k++) { 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]; - /* FALLTHROUGH */ - default: - continue; /* for (;;) */ + continue; + + case XK_ISO_Level3_Shift: + ModLevel3Mask = modmasks[i - 1]; + continue; + case XK_Meta_L: case XK_Meta_R: cm = "meta"; realmeta = i; break; + case XK_Alt_L: case XK_Alt_R: cm = "alt"; realalt = i; break; + case XK_Super_L: case XK_Super_R: cm = "super"; break; + case XK_Hyper_L: case XK_Hyper_R: cm = "hyper"; break; + + default: + continue; } - if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0) + + if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) requestedmeta = i; } } + XFreeModifiermap (map); - i = (requestedmeta ? requestedmeta - : (realmeta ? realmeta - : (realalt ? realalt : 0))); + + i = requestedmeta ? requestedmeta + : realmeta ? realmeta + : realalt ? realalt + : 0; + if (i) 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, 16383) || !IN_RANGE_INC (h, 1, 16383)) + { + 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 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 + MWMHints mwmhints = { }; +#endif + XGCValues gcvalue; + XSetWindowAttributes attributes; + Window top, parent; + + dLocal (Display *, dpy); + + /* grab colors before netscape does */ + get_colours (); + + if (!set_fonts ()) + rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); - XWindowAttributes gattr; + parent = display->root; - if (Options & Opt_transparent) + attributes.override_redirect = !!option (Opt_override_redirect); + +#if ENABLE_FRILLS + if (option (Opt_borderLess)) { - XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); - display->depth = gattr.depth; // doh //TODO, per-term not per-display? + if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) + { + // 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; + } } +#endif - /* grab colors before netscape does */ - Get_Colours (); - - if (!change_font (rs[Rs_font])) +#if ENABLE_XEMBED + if (rs[Rs_embed]) { - fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n"); - destroy (); - return; + XWindowAttributes wattr; + + parent = strtol (rs[Rs_embed], 0, 0); + + if (!XGetWindowAttributes (dpy, parent, &wattr)) + rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); + + window_calc (wattr.width, wattr.height); } +#endif 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 = cmap; + + top = XCreateWindow (dpy, parent, + szHint.x, szHint.y, + szHint.width, szHint.height, + ext_bwidth, + depth, InputOutput, visual, + CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, + &attributes); + + this->parent[0] = top; + 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 () - */ + set_title (rs [Rs_title]); + set_icon_name (rs [Rs_iconName]); -#ifdef PREFER_24BIT - XSetWindowAttributes attributes; + classHint.res_name = (char *)rs[Rs_name]; + classHint.res_class = (char *)RESCLASS; - attributes.background_pixel = PixColors[Color_fg]; - attributes.border_pixel = PixColors[Color_border]; - attributes.colormap = display->cmap; - TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), - szHint.x, szHint.y, - szHint.width, szHint.height, - TermWin.ext_bwidth, - display->depth, InputOutput, - display->visual, - CWBackPixel | CWBorderPixel | CWColormap, &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]); -#endif - - xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); - xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); - - classHint.res_name = (char *)rs[Rs_name]; - classHint.res_class = (char *)APL_CLASS; - - wmHint.flags = (InputHint | StateHint | WindowGroupHint); - wmHint.input = True; - 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); - - XSelectInput (display->display, TermWin.parent[0], - KeyPressMask -#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) - | KeyReleaseMask -#endif - | FocusChangeMask | VisibilityChangeMask - | StructureNotifyMask); - termwin_ev.start (display, TermWin.parent[0]); + wmHint.flags = InputHint | StateHint | WindowGroupHint; + wmHint.input = True; + wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; + wmHint.window_group = top; + + 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 + */ - /* vt cursor: Black-on-White is standard, but this is more popular */ - TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); + if (rs [Rs_iconfile]) + { + set_icon (rs [Rs_iconfile]); + } +#endif -#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) - /* cursor (menuBar/scrollBar): Black-on-White */ - leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); +#if ENABLE_FRILLS + if (mwmhints.flags) + XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, + PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); #endif -#ifdef POINTER_BLANK - { - XColor blackcolour; - blackcolour.red = 0; - blackcolour.green = 0; - blackcolour.blue = 0; - Font f = XLoadFont (display->display, "fixed"); - blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ', - &blackcolour, &blackcolour); - XUnloadFont (display->display, f); - } + Atom protocols[] = { + xa[XA_WM_DELETE_WINDOW], +#if ENABLE_EWMH + xa[XA_NET_WM_PING], #endif + }; - /* the vt window */ - 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]); + XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); -#ifdef DEBUG_X - XStoreName (display->display, TermWin.vt, "vt window"); +#if ENABLE_FRILLS + if (rs[Rs_transient_for]) + XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); #endif - vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask - | PropertyChangeMask); +#if ENABLE_EWMH + long pid = getpid (); -#ifdef POINTER_BLANK - pointer_unblank (); + XChangeProperty (dpy, top, + xa[XA_NET_WM_PID], XA_CARDINAL, 32, + PropModeReplace, (unsigned char *)&pid, 1); - if ((Options & Opt_pointerBlank)) - vt_emask |= PointerMotionMask; - else + // _NET_WM_WINDOW_TYPE is NORMAL, which is the default #endif - vt_emask |= (Button1MotionMask | Button3MotionMask); - XSelectInput (display->display, TermWin.vt, vt_emask); - vt_ev.start (display, TermWin.vt); + XSelectInput (dpy, top, + KeyPressMask +#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 + | KeyReleaseMask +#endif + | FocusChangeMask | VisibilityChangeMask + | ExposureMask | StructureNotifyMask); -#if defined(MENUBAR) && (MENUBAR_MAX > 1) - 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]); + termwin_ev.start (display, top); -#ifdef DEBUG_X - XStoreName (display->display, menuBar.win, "menubar"); -#endif + /* vt cursor: Black-on-White is standard, but this is more popular */ + TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); - menuBar.drawable = new rxvt_drawable (display, menuBar.win); + /* the vt window */ + vt = XCreateSimpleWindow (dpy, top, + window_vt_x, window_vt_y, + width, height, + 0, + pix_colors_focused[Color_fg], + pix_colors_focused[Color_bg]); - XDefineCursor (display->display, menuBar.win, - XCreateFontCursor (display->display, XC_left_ptr)); + attributes.bit_gravity = NorthWestGravity; + XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); - XSelectInput (display->display, menuBar.win, - (ExposureMask | ButtonPressMask | ButtonReleaseMask - | Button1MotionMask)); - menubar_ev.start (display, menuBar.win); - } -#endif + vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; -#ifdef XPM_BACKGROUND - if (rs[Rs_backgroundPixmap] != NULL - && ! (Options & Opt_transparent)) - { - const char *p = rs[Rs_backgroundPixmap]; + if (option (Opt_pointerBlank)) + vt_emask |= PointerMotionMask; + else + vt_emask |= Button1MotionMask | Button3MotionMask; - if ((p = STRCHR (p, ';')) != NULL) - { - p++; - scale_pixmap (p); - } - set_bgPixmap (rs[Rs_backgroundPixmap]); - scr_touch (True); - } -#endif + vt_select_input (); + + vt_ev.start (display, vt); /* graphics context for the vt window */ - gcvalue.foreground = PixColors[Color_fg]; - gcvalue.background = PixColors[Color_bg]; - gcvalue.graphics_exposures = 1; - TermWin.gc = XCreateGC (display->display, TermWin.vt, - GCForeground | GCBackground - | GCGraphicsExposures, &gcvalue); - - TermWin.drawable = new rxvt_drawable (display, TermWin.vt); - -#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); + gcvalue.foreground = pix_colors[Color_fg]; + gcvalue.background = pix_colors[Color_bg]; + gcvalue.graphics_exposures = 0; + + gc = XCreateGC (dpy, vt, + GCForeground | GCBackground | GCGraphicsExposures, + &gcvalue); + + drawable = new rxvt_drawable (this, vt); + +#ifdef OFF_FOCUS_FADING + // initially we are in unfocused state + if (rs[Rs_fade]) + pix_colors = pix_colors_unfocused; #endif + + pointer_unblank (); + scr_recolour (); } /*----------------------------------------------------------------------*/ @@ -1307,107 +1528,95 @@ * master end of the pseudo-teletype pair with the command talking to * the slave. */ -int +void 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) +#if ENABLE_FRILLS + if (rs[Rs_pty_fd]) { -#ifndef NO_SETOWNER_TTYDEV - privileged_ttydev (SAVE); -#endif + pty->pty = atoi (rs[Rs_pty_fd]); - if ((tty_fd = rxvt_get_tty (ttydev)) < 0) + if (pty->pty >= 0) { - close (cfd); - rxvt_print_error ("can't open slave tty %s", ttydev); - return -1; + if (getfd_hook) + pty->pty = (*getfd_hook) (pty->pty); + + if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) + rxvt_fatal ("unusable pty-fd filehandle, 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 + if (!pty->get ()) + rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); - er = -1; + struct termios tio = def_tio; - rxvt_get_ttymode (& (tio), er); +#ifndef NO_BACKSPACE_KEY + 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 + + /* 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]) + return; +#endif -#ifndef __QNX__ /* spin off the command interpreter */ switch (cmd_pid = fork ()) { case -1: - rxvt_print_error ("can't fork"); - return -1; + { + cmd_pid = 0; + rxvt_fatal ("can't fork, aborting.\n"); + } case 0: - close (cfd); /* only keep tty_fd and STDERR open */ - init_env (); - if (rxvt_control_tty (tty_fd, ttydev) < 0) - rxvt_print_error ("could not obtain control of tty"); + 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 (tty_fd, STDIN_FILENO); - dup2 (tty_fd, STDOUT_FILENO); - dup2 (tty_fd, STDERR_FILENO); - - if (tty_fd > 2) - close (tty_fd); + 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); - /* NOTREACHED */ - default: - { -#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) - int fdstdin; - fdstdin = dup (STDIN_FILENO); - dup2 (tty_fd, STDIN_FILENO); -#endif + _exit (EXIT_FAILURE); -#ifdef UTMP_SUPPORT - privileged_utmp (SAVE); -#endif + default: + if (!option (Opt_utmpInhibit)) + pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); -#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) + pty->close_tty (); - dup2 (fdstdin, STDIN_FILENO); - close (fdstdin); -#endif + child_ev.start (cmd_pid); - } - close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ + HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END)); 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; } /* ------------------------------------------------------------------------- * @@ -1422,10 +1631,9 @@ { char *login; - SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */ - - if (Options & Opt_console) - { /* be virtual console, fail silently */ + if (option (Opt_console)) + { + /* be virtual console, fail silently */ #ifdef TIOCCONS unsigned int on = 1; @@ -1435,44 +1643,29 @@ fd = open (CONSOLE, O_WRONLY, 0); if (fd >= 0) - { - if (ioctl (fd, SRIOCSREDIR, NULL) < 0) - close (fd); - } -#endif /* SRIOCSREDIR */ - + 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 + * 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 */ - - /* set window size */ - struct winsize ws; +#endif /* SIGTSTP */ - 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) + if (argv) { # ifdef DEBUG_CMD int i; @@ -1486,304 +1679,27 @@ } else { - const char *argv0, *shell; + 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) + 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); + 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; + execlp (shell, argv0, (char *)0); + /* no error message: STDERR is closed! */ } - 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; } -/* ------------------------------------------------------------------------- * - * GET TTY CURRENT STATE * - * ------------------------------------------------------------------------- */ -/* rxvt_get_ttymode () */ -/* EXTPROTO */ -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 */ - tio->c_cc[VINTR] = CINTR; - tio->c_cc[VQUIT] = CQUIT; - tio->c_cc[VERASE] = CERASE; - 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 */ -} - /*----------------------- end-of-file (C source) -----------------------*/