--- rxvt-unicode/src/main.C	2010/04/03 16:30:39	1.326
+++ rxvt-unicode/src/main.C	2010/12/07 19:53:20	1.339
@@ -13,7 +13,7 @@
  * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
  * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
  *                              - extensive modifications
- * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2010 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
@@ -32,11 +32,13 @@
 
 #include "../config.h"          /* NECESSARY */
 #include "rxvt.h"               /* NECESSARY */
+#include "init.h"
 #include "keyboard.h"
 #include "rxvtperl.h"
 
 #include <limits>
 
+#include <cassert>
 #include <csignal>
 #include <cstring>
 
@@ -51,6 +53,7 @@
 # endif
 #endif
 
+struct termios rxvt_term::def_tio;
 vector<rxvt_term *> rxvt_term::termlist;
 
 // used to tell global functions which terminal instance is "active"
@@ -360,6 +363,18 @@
   delete this;
 }
 
+void
+rxvt_term::set_option (uint8_t opt, bool set)
+{
+  if (!opt)
+    return;
+
+  uint8_t mask = 1 << (opt & 7);
+  uint8_t &val = options [opt >> 3];
+
+  val = val & ~mask | (set ? mask : 0);
+}
+
 /*----------------------------------------------------------------------*/
 /*
  * Exit gracefully, clearing the utmp entry and restoring tty attributes
@@ -384,7 +399,7 @@
     char *mtype = "XlibMessage";
     XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
     XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
-    rxvt_warn ("An X Error occured, trying to continue after report.\n");
+    rxvt_warn ("An X Error occurred, trying to continue after report.\n");
     rxvt_warn ("%s:  %s\n", mesg, buffer);
     XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
     rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
@@ -475,14 +490,88 @@
   kill (getpid (), w.signum);
 }
 
+static void
+rxvt_get_ttymode (struct termios *tio)
+{
+  if (tcgetattr (STDIN_FILENO, tio) < 0)
+    memset (tio, 0, sizeof (struct termios));
+
+  for (int i = 0; i < NCCS; i++)
+    tio->c_cc[i] = VDISABLE;
+
+  tio->c_cc[VINTR] = CINTR;
+  tio->c_cc[VQUIT] = CQUIT;
+  tio->c_cc[VERASE] = CERASE;
+#ifdef VERASE2
+  tio->c_cc[VERASE2] = CERASE2;
+#endif
+  tio->c_cc[VKILL] = CKILL;
+  tio->c_cc[VEOF] = CEOF;
+  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
+# ifdef VSTATUS
+  tio->c_cc[VSTATUS] = CSTATUS;
+# endif
+
+# if VMIN != VEOF
+  tio->c_cc[VMIN] = 1;
+# endif
+# if VTIME != VEOL
+  tio->c_cc[VTIME] = 0;
+# endif
+
+  /* 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);
+
+  /* local modes */
+  tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
+# if defined (ECHOCTL) && defined (ECHOKE)
+                  | ECHOCTL | ECHOKE
+# endif
+                  | ECHOE | ECHOK);
+}
+
 char **rxvt_environ; // startup environment
 
 void
 rxvt_init ()
 {
-  ptytty::init ();
+  assert (("fontMask must not overlap other RS masks",
+           0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
+
+  rxvt_get_ttymode (&rxvt_term::def_tio);
+
+  // get rid of stdin/stdout as we don't need them, to free resources
+  dup2 (STDERR_FILENO, STDIN_FILENO);
+  dup2 (STDERR_FILENO, STDOUT_FILENO);
 
-  if (!ev_default_loop (0))
+  if (!ev_default_loop ())
     rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
 
   rxvt_environ = environ;
@@ -493,9 +582,6 @@
   sig_handlers.sw_term.start (SIGTERM); ev_unref ();
   sig_handlers.sw_int.start  (SIGINT);  ev_unref ();
 
-  /* need to trap SIGURG for SVR4 (Unixware) rlogin */
-  /* signal (SIGURG, SIG_DFL); */
-
   old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
   // TODO: handle this with exceptions and tolerate the memory loss
   XSetIOErrorHandler (rxvt_xioerror_handler);
@@ -752,6 +838,18 @@
 }
 
 void
+rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
+{
+  XTextProperty ct;
+
+  if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
+    {
+      XSetTextProperty (dpy, parent[0], &ct, prop);
+      XFree (ct.value);
+    }
+}
+
+void
 rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
 {
   wchar_t *ws = rxvt_mbstowcs (str, len);
@@ -771,7 +869,7 @@
 void
 rxvt_term::set_title (const char *str)
 {
-  set_string_property (XA_WM_NAME, str);
+  set_mbstring_property (XA_WM_NAME, str);
 #if ENABLE_EWMH
   set_utf8_property (xa[XA_NET_WM_NAME], str);
 #endif
@@ -780,7 +878,7 @@
 void
 rxvt_term::set_icon_name (const char *str)
 {
-  set_string_property (XA_WM_ICON_NAME, str);
+  set_mbstring_property (XA_WM_ICON_NAME, str);
 #if ENABLE_EWMH
   set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
 #endif
@@ -1543,7 +1641,6 @@
 {
   Window cr;
   XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
-/*  fprintf (stderr, "origin is %+d%+d\n", x, y);*/
 }
 
 Pixmap
@@ -1567,15 +1664,6 @@
 }
 
 #ifdef HAVE_BG_PIXMAP
-# if TRACE_PIXMAPS
-#  undef update_background
-void
-rxvt_term::trace_update_background (const char *file, int line)
-{
-  fprintf (stderr, "%s:%d:update_background()\n", file, line);
-  update_background ();
-}
-# endif
 
 void
 rxvt_term::update_background ()