--- rxvt-unicode/src/init.C	2005/02/20 00:09:25	1.114
+++ rxvt-unicode/src/init.C	2005/11/30 21:05:39	1.121
@@ -171,6 +171,9 @@
 #if TINTING
     NULL,
 #endif
+#if OFF_FOCUS_FADING
+    "black",
+#endif
   };
 
 const char *const xa_names[] =
@@ -187,10 +190,13 @@
     "WM_DELETE_WINDOW",
     "CLIPBOARD",
 #if ENABLE_FRILLS
-    "_NET_WM_PID",
     "_MOTIF_WM_HINTS",
+#endif
+#if ENABLE_EWMH
+    "_NET_WM_PID",
     "_NET_WM_NAME",
     "_NET_WM_ICON_NAME",
+    "_NET_WM_PING",
 #endif
 #if USE_XIM
     "WM_LOCALE_NAME",
@@ -212,9 +218,6 @@
 bool
 rxvt_term::init_vars ()
 {
-  sw_term.start (SIGTERM);
-  sw_int.start  (SIGINT);
-
   pix_colors_focused = new rxvt_color [TOTAL_COLORS];
 #ifdef OFF_FOCUS_FADING
   pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
@@ -343,19 +346,7 @@
 
   get_options (r_argc, r_argv);
 
-#ifdef LOCAL_X_IS_UNIX
-  if (rs[Rs_display_name][0] == ':')
-    {
-      val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
-      strcpy (val, "unix");
-      strcat (val, rs[Rs_display_name]);
-      display = displays.get (val);
-      free (val);
-    }
-#endif
-
-  if (!display
-      && ! (display = displays.get (rs[Rs_display_name])))
+  if (!(display = displays.get (rs[Rs_display_name])))
     rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
 
   extract_resources ();
@@ -748,13 +739,15 @@
         }
 
       pix_colors[i] = xcol;
-#ifdef OFF_FOCUS_FADING
-      if (rs[Rs_fade])
-        pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
-#endif
       SET_PIXCOLOR (i);
     }
 
+#ifdef OFF_FOCUS_FADING
+  if (rs[Rs_fade])
+    for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
+      pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
+#endif
+
   if (display->depth <= 2)
     {
       if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
@@ -771,7 +764,8 @@
 #ifdef KEEP_SCROLLCOLOR
 
   if (display->depth <= 2)
-    {  /* Monochrome */
+    {
+      /* Monochrome */
       pix_colors[Color_scroll]       = pix_colors[Color_fg];
       pix_colors[Color_topShadow]    = pix_colors[Color_bg];
       pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
@@ -969,9 +963,7 @@
         }
     }
   else
-    {
-      mwmhints.flags = 0;
-    }
+    mwmhints.flags = 0;
 #endif
 
   /* grab colors before netscape does */
@@ -1035,18 +1027,26 @@
   wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
   wmHint.window_group = top;
 
-  XSetWMProperties (disp, top, NULL, NULL,
-                    (char **)argv, argc, &szHint, &wmHint, &classHint);
+  XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
+                      &szHint, &wmHint, &classHint);
 
-  /* Enable delete window protocol */
-  XSetWMProtocols (disp, top, &xa[XA_WM_DELETE_WINDOW], 1);
+  Atom protocols[] = {
+    xa[XA_WM_DELETE_WINDOW],
+#if ENABLE_EWMH
+    xa[XA_NET_WM_PING],
+#endif
+  };
 
-#if ENABLE_FRILLS
+  XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
+
+#if ENABLE_EWMH
   long pid = getpid ();
 
   XChangeProperty (disp, top,
                    xa[XA_NET_WM_PID], XA_CARDINAL, 32,
                    PropModeReplace, (unsigned char *)&pid, 1);
+
+  // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
 #endif
 
   XSelectInput (disp, top,
@@ -1204,47 +1204,37 @@
       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
 
@@ -1282,6 +1272,7 @@
       tio->sg.sg_erase = CERASE;      /* ^H */
       tio->sg.sg_kill = CKILL;        /* ^U */
     }
+
   if (erase != -1)
     tio->sg.sg_erase = (char)erase;
 
@@ -1297,6 +1288,7 @@
       tio->tc.t_eofc = CEOF;  /* ^D */
       tio->tc.t_brkc = -1;
     }
+
   /* get local special chars */
   if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
     {
@@ -1310,7 +1302,6 @@
   /* get line discipline */
   ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
 # ifdef NTTYDISC
-
   tio->line = NTTYDISC;
 # endif                         /* NTTYDISC */
 
@@ -1343,15 +1334,12 @@
   FOO (IXON, "IXON");
   FOO (IXOFF, "IXOFF");
 # ifdef IUCLC
-
   FOO (IUCLC, "IUCLC");
 # endif
 # ifdef IXANY
-
   FOO (IXANY, "IXANY");
 # endif
 # ifdef IMAXBEL
-
   FOO (IMAXBEL, "IMAXBEL");
 # endif
 
@@ -1368,39 +1356,30 @@
   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
 
@@ -1453,8 +1432,6 @@
     return;
 #endif
 
-  sw_chld.start (SIGCHLD);
-
 #ifndef __QNX__
   /* spin off the command interpreter */
   switch (cmd_pid = fork ())