--- rxvt-unicode/src/command.C	2005/02/17 12:23:39	1.196
+++ rxvt-unicode/src/command.C	2005/02/20 02:00:43	1.199
@@ -1332,14 +1332,25 @@
 
       case ClientMessage:
         if (ev.xclient.format == 32
-            && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
-          destroy ();
+            && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]
+            && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
+           destroy ();
+#if ENABLE_XEMBED
+        else if (ev.xclient.format == 32
+                 && ev.xclient.message_type == xa[XA_XEMBED])
+          {
+            if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
+              focus_in ();
+            else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
+              focus_out ();
+          }
+#endif
 #ifdef OFFIX_DND
         /* OffiX Dnd (drag 'n' drop) protocol */
-        else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
-                 && (ev.xclient.data.l[0] == DndFile
-                     || ev.xclient.data.l[0] == DndDir
-                     || ev.xclient.data.l[0] == DndLink))
+          else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
+            && (ev.xclient.data.l[0] == DndFile
+                || ev.xclient.data.l[0] == DndDir
+                || ev.xclient.data.l[0] == DndLink))
           {
             /* Get Dnd data */
             Atom ActualType;
@@ -1392,61 +1403,11 @@
         break;
 
       case FocusIn:
-        if (!TermWin.focus)
-          {
-            TermWin.focus = 1;
-            want_refresh = 1;
-#ifdef USE_XIM
-            if (Input_Context != NULL)
-              {
-                IMSetStatusPosition ();
-                XSetICFocus (Input_Context);
-              }
-#endif
-#ifdef CURSOR_BLINK
-            if (options & Opt_cursorBlink)
-              cursor_blink_ev.start (NOW + BLINK_INTERVAL);
-#endif
-#ifdef OFF_FOCUS_FADING
-            if (rs[Rs_fade])
-              {
-                pix_colors = pix_colors_focused;
-                scr_recolour ();
-              }
-#endif
-
-          }
+        focus_in ();
         break;
 
       case FocusOut:
-        if (TermWin.focus)
-          {
-            TermWin.focus = 0;
-            want_refresh = 1;
-
-#if ENABLE_FRILLS || ISO_14755
-            iso14755buf = 0;
-#endif
-#if ENABLE_OVERLAY
-            scr_overlay_off ();
-#endif
-#ifdef USE_XIM
-            if (Input_Context != NULL)
-              XUnsetICFocus (Input_Context);
-#endif
-#ifdef CURSOR_BLINK
-            if (options & Opt_cursorBlink)
-              cursor_blink_ev.stop ();
-            hidden_cursor = 0;
-#endif
-#ifdef OFF_FOCUS_FADING
-            if (rs[Rs_fade])
-              {
-                pix_colors = pix_colors_unfocused;
-                scr_recolour ();
-              }
-#endif
-          }
+        focus_out ();
         break;
 
       case ConfigureNotify:
@@ -1673,6 +1634,67 @@
     }
 }
 
+void
+rxvt_term::focus_in ()
+{
+  if (!TermWin.focus)
+    {
+      TermWin.focus = 1;
+      want_refresh = 1;
+#ifdef USE_XIM
+      if (Input_Context != NULL)
+        {
+          IMSetStatusPosition ();
+          XSetICFocus (Input_Context);
+        }
+#endif
+#ifdef CURSOR_BLINK
+      if (options & Opt_cursorBlink)
+        cursor_blink_ev.start (NOW + BLINK_INTERVAL);
+#endif
+#ifdef OFF_FOCUS_FADING
+      if (rs[Rs_fade])
+        {
+          pix_colors = pix_colors_focused;
+          scr_recolour ();
+        }
+#endif
+    }
+}
+
+void
+rxvt_term::focus_out ()
+{
+  if (TermWin.focus)
+    {
+      TermWin.focus = 0;
+      want_refresh = 1;
+
+#if ENABLE_FRILLS || ISO_14755
+      iso14755buf = 0;
+#endif
+#if ENABLE_OVERLAY
+      scr_overlay_off ();
+#endif
+#ifdef USE_XIM
+      if (Input_Context != NULL)
+        XUnsetICFocus (Input_Context);
+#endif
+#ifdef CURSOR_BLINK
+      if (options & Opt_cursorBlink)
+        cursor_blink_ev.stop ();
+      hidden_cursor = 0;
+#endif
+#ifdef OFF_FOCUS_FADING
+      if (rs[Rs_fade])
+        {
+          pix_colors = pix_colors_unfocused;
+          scr_recolour ();
+        }
+#endif
+    }
+}
+
 #if TRANSPARENT
 void
 rxvt_term::rootwin_cb (XEvent &ev)
@@ -2604,7 +2626,7 @@
               // unfortunately other programs are even more buggy and dislike
               // being sent SIGWINCH, so only do it when we were in fact being
               // resized.
-              if (seen_resize)
+              if (seen_resize && cmd_pid)
                 kill (-cmd_pid, SIGWINCH);
             }
 
@@ -3856,9 +3878,7 @@
           {
             set_locale (str);
             pty.set_utf8_mode (enc_utf8);
-# ifdef USE_XIM
-            im_cb ();
-# endif
+            init_xlocale ();
           }
         break;
 #endif