--- rxvt-unicode/src/init.C	2005/02/17 20:52:48	1.111
+++ rxvt-unicode/src/init.C	2005/02/20 02:00:43	1.115
@@ -183,6 +183,7 @@
     "TIMESTAMP",
     "VT_SELECTION",
     "INCR",
+    "WM_PROTOCOLS",
     "WM_DELETE_WINDOW",
     "CLIPBOARD",
 #if ENABLE_FRILLS
@@ -202,6 +203,10 @@
     "DndProtocol",
     "DndSelection",
 #endif
+#if ENABLE_XEMBED
+    "_XEMBED",
+    "_XEMBED_INFO",
+#endif
   };
 
 bool
@@ -927,7 +932,7 @@
   long vt_emask;
   XSetWindowAttributes attributes;
   XWindowAttributes gattr;
-  Window top;
+  Window top, parent;
   dDisp;
 
 #ifdef USING_W11LIB
@@ -975,59 +980,44 @@
   if (!set_fonts ())
     rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
 
-#if ENABLE_FRILLS
+  parent = DefaultRootWindow (disp);
+
+#if ENABLE_XEMBED
   if (rs[Rs_embed])
     {
       XWindowAttributes wattr;
 
-      top = strtol (rs[Rs_embed], 0, 0);
+      parent = strtol (rs[Rs_embed], 0, 0);
 
-      if (!XGetWindowAttributes (disp, top, &wattr))
+      if (!XGetWindowAttributes (disp, parent, &wattr))
         rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
 
       window_calc (wattr.width, wattr.height);
-
-#if 0
-      if (wattr.map_state == IsViewable)
-        {
-          TermWin.mapped = 1;
-          refresh_type = FAST_REFRESH;
-          XClearWindow (disp, top);
-          // TODO: make XMapNotify-event-code a function and call it
-          // TODO: how can I detetc visibility without unmpa/map?
-          // TODO: focusin etc.
-        }
-#else
-      // it'S easiets just to unmap/map to get all state correctly set-up
-      XUnmapWindow (disp, top);
-#endif
     }
-  else
+
 #endif
-    {
-      window_calc (0, 0);
+  window_calc (0, 0);
 
-      /* sub-window placement & size in rxvt_resize_subwindows () */
+  /* sub-window placement & size in rxvt_resize_subwindows () */
 #ifdef PREFER_24BIT
-      attributes.background_pixel = pix_colors_focused[Color_border];
-      attributes.border_pixel = pix_colors_focused[Color_border];
-      attributes.colormap = display->cmap;
-      top = XCreateWindow (disp, DefaultRootWindow (disp),
-                                         szHint.x, szHint.y,
-                                         szHint.width, szHint.height,
-                                         TermWin.ext_bwidth,
-                                         display->depth, InputOutput,
-                                         display->visual,
-                                         CWColormap | CWBackPixel | CWBorderPixel, &attributes);
+  attributes.background_pixel = pix_colors_focused[Color_border];
+  attributes.border_pixel = pix_colors_focused[Color_border];
+  attributes.colormap = display->cmap;
+  top = XCreateWindow (disp, parent,
+                       szHint.x, szHint.y,
+                       szHint.width, szHint.height,
+                       TermWin.ext_bwidth,
+                       display->depth, InputOutput,
+                       display->visual,
+                       CWColormap | CWBackPixel | CWBorderPixel, &attributes);
 #else
-      top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
-                                               szHint.x, szHint.y,
-                                               szHint.width, szHint.height,
-                                               TermWin.ext_bwidth,
-                                               pix_colors_focused[Color_border],
-                                               pix_colors_focused[Color_border]);
+  top = XCreateSimpleWindow (disp, parent,
+                             szHint.x, szHint.y,
+                             szHint.width, szHint.height,
+                             TermWin.ext_bwidth,
+                             pix_colors_focused[Color_border],
+                             pix_colors_focused[Color_border]);
 #endif
-    }
 
   TermWin.parent[0] = top;
 
@@ -1045,11 +1035,11 @@
   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_WMDELETEWINDOW], 1);
+  XSetWMProtocols (disp, top, &xa[XA_WM_DELETE_WINDOW], 1);
 
 #if ENABLE_FRILLS
   long pid = getpid ();
@@ -1065,8 +1055,8 @@
                 | KeyReleaseMask
 #endif
                 | FocusChangeMask | VisibilityChangeMask
-                | ExposureMask
-                | StructureNotifyMask);
+                | ExposureMask | StructureNotifyMask);
+
   termwin_ev.start (display, top);
 
 #if ENABLE_FRILLS
@@ -1101,8 +1091,6 @@
 
   vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
 
-  pointer_unblank ();
-
 #ifdef POINTER_BLANK
   if (options & Opt_pointerBlank)
     vt_emask |= PointerMotionMask;
@@ -1181,7 +1169,18 @@
     pix_colors = pix_colors_unfocused;
 #endif
 
+  pointer_unblank ();
   scr_recolour ();
+
+#if ENABLE_XEMBED
+  if (rs[Rs_embed])
+    {
+      long info[2] = { 0, XEMBED_MAPPED };
+
+      XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
+                       32, PropModeReplace, (unsigned char *)&info, 2);
+    }
+#endif
 }
 
 /* ------------------------------------------------------------------------- *