-/*--------------------------------*-C-*---------------------------------*
+/*----------------------------------------------------------------------*
* File: init.C
*----------------------------------------------------------------------*
*
* - original version
* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
* - extensive modifications
+ * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
+ * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
+ * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
* - extensive modifications
- * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
- * - QNX support
- * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
*
* 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
#include "rxvt.h" /* NECESSARY */
#include "rxvtutil.h"
#include "init.h"
+#include "keyboard.h"
#include <limits>
#include <csignal>
+#include <fcntl.h>
+
+#ifdef HAVE_XSETLOCALE
+# define X_LOCALE
+# include <X11/Xlocale.h>
+#else
+# ifdef HAVE_SETLOCALE
+# include <clocale>
+# endif
+#endif
+
+#ifdef HAVE_NL_LANGINFO
+# include <langinfo.h>
+#endif
+
+#ifdef DISPLAY_IS_IP
+/* On Solaris link with -lsocket and -lnsl */
+#include <sys/types.h>
+#include <sys/socket.h>
+
+/* these next two are probably only on Sun (not Solaris) */
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+#ifdef HAVE_SYS_BYTEORDER_H
+#include <sys/byteorder.h>
+#endif
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+
+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,
"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: ywlloe (Yellow3)
+ "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
+# ifdef XTERM_COLORS
"rgb:e5/e5/e5", // 7: white (Grey90)
-# else
+# else
"rgb:fa/eb/d7", // 7: white (AntiqueWhite)
# endif
/* high-intensity colors */
"rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
"rgb:ff/ff/ff", // 7/15: bright white (White)
+#ifndef USE_256_COLORS
// 88 xterm colours
"rgb:00/00/00",
"rgb:00/00/8b",
"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 */
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,
#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
#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(TRANSPARENT)
- pixmap = None;
-#endif
+ pix_colors = pix_colors_focused;
MEvent.time = CurrentTime;
MEvent.button = AnyButton;
- options = DEFAULT_OPTIONS;
want_refresh = 1;
priv_modes = SavedModes = PrivMode_Default;
ncol = 80;
int_bwidth = INTERNALBORDERWIDTH;
ext_bwidth = EXTERNALBORDERWIDTH;
lineSpace = LINESPACE;
+ letterSpace = LETTERSPACE;
saveLines = SAVELINES;
- numpix_colors = TOTAL_COLORS;
- refresh_limit = 1;
refresh_type = SLOW_REFRESH;
oldcursor.row = oldcursor.col = -1;
-#ifdef XPM_BACKGROUND
- /* bgPixmap.w = bgPixmap.h = 0; */
- bgPixmap.x = bgPixmap.y = 50;
- bgPixmap.pixmap = None;
-#endif
- last_bot = last_state = -1;
-
- return true;
+ 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);
}
-void
-rxvt_term::init_secondary ()
+static void
+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)
+ 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
}
/*----------------------------------------------------------------------*/
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));
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
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;
+ set (display);
+ extract_resources ();
+
#if XFT
if (rs[Rs_depth])
- set (display, strtol (rs[Rs_depth], 0, 0));
- else
+ select_visual (strtol (rs[Rs_depth], 0, 0));
#endif
- set (display);
-
- extract_resources ();
free (r_argv);
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 (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];
}
{
if (!rs[Rs_title])
rs[Rs_title] = rs[Rs_name];
+
if (!rs[Rs_iconName])
rs[Rs_iconName] = rs[Rs_name];
}
if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
lineSpace = min (i, std::numeric_limits<int16_t>::max ());
+
+ if (rs[Rs_letterSpace])
+ letterSpace = atoi (rs[Rs_letterSpace]);
#endif
#ifdef POINTER_BLANK
if (!saveLines)
set_option (Opt_scrollBar, 0);
-#ifdef PRINTPIPE
- if (!rs[Rs_print_pipe])
- rs[Rs_print_pipe] = PRINTPIPE;
-#endif
-
if (!rs[Rs_cutchars])
rs[Rs_cutchars] = CUTCHARS;
#ifndef NO_BACKSPACE_KEY
if (!rs[Rs_backspace_key])
# ifdef DEFAULT_BACKSPACE
- key_backspace = DEFAULT_BACKSPACE;
+ rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
# else
- key_backspace = "DEC"; /* can toggle between \010 or \177 */
+ rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
# endif
- else
- {
- val = strdup (rs[Rs_backspace_key]);
- rxvt_Str_trim (val);
- rxvt_Str_escaped (val);
- key_backspace = val;
- }
#endif
#ifndef NO_DELETE_KEY
if (!rs[Rs_delete_key])
# ifdef DEFAULT_DELETE
- key_delete = DEFAULT_DELETE;
+ rs[Rs_delete_key] = DEFAULT_DELETE;
# else
- key_delete = "\033[3~";
+ rs[Rs_delete_key] = "\033[3~";
# endif
- else
- {
- val = strdup (rs[Rs_delete_key]);
- rxvt_Str_trim (val);
- rxvt_Str_escaped (val);
- key_delete = val;
- }
#endif
- if (rs[Rs_answerbackstring])
- {
- rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
- rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
- }
-#ifdef HAVE_SCROLLBARS
- setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
-#endif
+ scrollBar.setup (this);
#ifdef XTERM_REVERSE_VIDEO
/* this is how xterm implements reverseVideo */
- if (OPTION (Opt_reverseVideo))
+ if (option (Opt_reverseVideo))
{
if (!rs[Rs_color + Color_fg])
rs[Rs_color + Color_fg] = def_colorName[Color_bg];
#ifndef XTERM_REVERSE_VIDEO
/* this is how we implement reverseVideo */
- if (OPTION (Opt_reverseVideo))
+ if (option (Opt_reverseVideo))
::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
#endif
#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);
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];
/*----------------------------------------------------------------------*/
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 ();
+
+ init_secondary ();
+
+ 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
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);
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);
}
unsetenv ("LINES");
unsetenv ("COLUMNS");
unsetenv ("TERMCAP"); /* terminfo should be okay */
-#endif /* HAVE_UNSETENV */
+#endif /* HAVE_UNSETENV */
}
/*----------------------------------------------------------------------*/
}
- this->locale = rxvt_strdup (this->locale);
+ this->locale = strdup (this->locale);
SET_LOCALE (this->locale);
mbstate.reset ();
#endif
*/
#ifdef META8_OPTION
- meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
+ meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
#endif
get_ourmods ();
- if (!OPTION (Opt_scrollTtyOutput))
+ if (!option (Opt_scrollTtyOutput))
priv_modes |= PrivMode_TtyOutputInh;
- if (OPTION (Opt_scrollTtyKeypress))
+ if (option (Opt_scrollTtyKeypress))
priv_modes |= PrivMode_Keypress;
- if (!OPTION (Opt_jumpScroll))
+ if (!option (Opt_jumpScroll))
priv_modes |= PrivMode_smoothScroll;
#ifndef NO_BACKSPACE_KEY
- if (strcmp (key_backspace, "DEC") == 0)
+ if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
priv_modes |= PrivMode_HaveBackSpace;
#endif
/*----------------------------------------------------------------------*/
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];
if (!set_color (xcol, name))
{
#ifndef XTERM_REVERSE_VIDEO
- if (i < 2 && OPTION (Opt_reverseVideo))
+ if (i < 2 && option (Opt_reverseVideo))
name = def_colorName [1 - i];
else
#endif
* The calculations of topShadow/bottomShadow values are adapted
* from the fvwm window manager.
*/
-#ifdef KEEP_SCROLLCOLOR
+#ifdef RXVT_SCROLLBAR
if (depth <= 2)
{
/* Monochrome */
))
alias_color (Color_topShadow, Color_White);
}
-#endif /* KEEP_SCROLLCOLOR */
+#endif
#ifdef OFF_FOCUS_FADING
- if (rs[Rs_fade])
- for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
- {
- rgba c;
- pix_colors [Color_fade].get (c);
- pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
- }
+ for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
+ update_fade_color (i);
#endif
}
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];
}
}
XClassHint classHint;
XWMHints wmHint;
#if ENABLE_FRILLS
- MWMHints mwmhints;
+ MWMHints mwmhints = { };
#endif
XGCValues gcvalue;
XSetWindowAttributes attributes;
dLocal (Display *, dpy);
/* grab colors before netscape does */
- Get_Colours ();
+ get_colours ();
if (!set_fonts ())
rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
parent = display->root;
- attributes.override_redirect = !!OPTION (Opt_override_redirect);
+ attributes.override_redirect = !!option (Opt_override_redirect);
#if ENABLE_FRILLS
- if (OPTION (Opt_borderLess))
+ if (option (Opt_borderLess))
{
if (XInternAtom (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
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;
wmHint.flags = InputHint | StateHint | WindowGroupHint;
wmHint.input = True;
- wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
+ wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
wmHint.window_group = top;
XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
&szHint, &wmHint, &classHint);
+#if ENABLE_EWMH
+# ifdef HAVE_AFTERIMAGE
+ /*
+ * set up icon hint
+ * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
+ */
+
+ if (rs [Rs_iconfile])
+ {
+ init_asv ();
+
+ ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
+ if (asv && im)
+ {
+ int w = im->width;
+ int h = im->height;
+ long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
+ ASImage *result = scale_asimage (asv, im,
+ w, h, ASA_ARGB32,
+ 100, ASIMAGE_QUALITY_DEFAULT);
+ destroy_asimage (&im);
+
+ if (buffer && result)
+ {
+ 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];
+
+ destroy_asimage (&result);
+ XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
+ PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
+ free (buffer);
+ }
+ else
+ {
+ if (!buffer)
+ rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
+
+ if (!result)
+ rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
+ }
+ }
+ else
+ rxvt_warn ("Loading image icon failed, continuing without.\n");
+ }
+# endif
+#endif
#if ENABLE_FRILLS
if (mwmhints.flags)
/* 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,
vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
- if (OPTION (Opt_pointerBlank))
+ if (option (Opt_pointerBlank))
vt_emask |= PointerMotionMask;
else
vt_emask |= Button1MotionMask | Button3MotionMask;
vt_ev.start (display, vt);
-#ifdef XPM_BACKGROUND
- if (rs[Rs_backgroundPixmap] != NULL
- && !OPTION (Opt_transparent))
- {
- const char *p = rs[Rs_backgroundPixmap];
-
- if ((p = strchr (p, ';')) != NULL)
- {
- p++;
- scale_pixmap (p);
- }
-
- set_bgPixmap (rs[Rs_backgroundPixmap]);
- scr_touch (true);
- }
-#endif
-
/* graphics context for the vt window */
gcvalue.foreground = pix_colors[Color_fg];
gcvalue.background = pix_colors[Color_bg];
- gcvalue.graphics_exposures = 1;
+ gcvalue.graphics_exposures = 0;
gc = XCreateGC (dpy, vt,
GCForeground | GCBackground | GCGraphicsExposures,
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])
* GET TTY CURRENT STATE *
* ------------------------------------------------------------------------- */
void
-rxvt_get_ttymode (ttymode_t *tio, int erase)
+rxvt_get_ttymode (struct termios *tio, int erase)
{
-#ifdef HAVE_TERMIOS_H
/*
* standard System V termios interface
*/
- if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
+ if (tcgetattr (STDIN_FILENO, tio) < 0)
{
// return error - use system defaults,
// where possible, and zero elsewhere
- memset (tio, 0, sizeof (ttymode_t));
+ memset (tio, 0, sizeof (struct termios));
tio->c_cc[VINTR] = CINTR;
tio->c_cc[VQUIT] = CQUIT;
| 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");
fprintf (stderr, "\n");
# undef FOO
-# endif /* HAVE_TERMIOS_H */
-#endif /* DEBUG_TTYMODE */
+#endif /* DEBUG_TTYMODE */
}
/*----------------------------------------------------------------------*/
if (!pty->get ())
rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
- pty->set_utf8_mode (enc_utf8);
-
- /* set initial window size */
- tt_winch ();
-
int er;
#ifndef NO_BACKSPACE_KEY
- if (key_backspace[0] && !key_backspace[1])
- er = key_backspace[0];
- else if (strcmp (key_backspace, "DEC") == 0)
+ if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
+ er = rs[Rs_backspace_key][0];
+ else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
er = '\177'; /* the initial state anyway */
else
#endif
er = -1;
rxvt_get_ttymode (&tio, er);
+ /* init terminal attributes */
+ cfsetospeed (&tio, BAUDRATE);
+ cfsetispeed (&tio, BAUDRATE);
+ tcsetattr (pty->tty, TCSANOW, &tio);
+ pty->set_utf8_mode (enc_utf8);
+
+ /* set initial window size */
+ tt_winch ();
#if ENABLE_FRILLS
if (rs[Rs_pty_fd])
_exit (EXIT_FAILURE);
default:
- if (!OPTION (Opt_utmpInhibit))
- pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
+ if (!option (Opt_utmpInhibit))
+ pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
pty->close_tty ();
{
char *login;
- SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
-
- if (OPTION (Opt_console))
- { /* be virtual console, fail silently */
+ if (option (Opt_console))
+ {
+ /* be virtual console, fail silently */
#ifdef TIOCCONS
unsigned int on = 1;
if (fd >= 0)
if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
close (fd);
-#endif /* SRIOCSREDIR */
+#endif /* SRIOCSREDIR */
}
/* reset signals and spin off the command interpreter */
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;
if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
shell = "/bin/sh";
- argv0 = (const char *)rxvt_r_basename (shell);
+ argv0 = rxvt_basename (shell);
- if (OPTION (Opt_loginShell))
+ if (option (Opt_loginShell))
{
- login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
+ login = (char *)rxvt_malloc (strlen (argv0) + 2);
login[0] = '-';
strcpy (&login[1], argv0);
argv0 = login;
}
- execlp (shell, argv0, NULL);
+ execlp (shell, argv0, (char *)0);
/* no error message: STDERR is closed! */
}
projects / dana / urxvt.git / blobdiff