[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.201 by root, Wed Jan 25 00:57:57 2006 UTC vs.
Revision 1.204 by root, Wed Jan 25 02:53:13 2006 UTC

   for (int i = 0; i < allocated.size (); i++)
     free (allocated [i]);
   free (selection.text);
   // TODO: manage env vars in child only(!)
-  free (env_windowid);
   free (env_display);
   free (env_term);
-  free (env_colorfgbg);
   free (locale);
   free (v_buffer);
   free (incr_buf);
   delete envv;
   check_ev.start ();
   HOOK_INVOKE ((this, HOOK_START, DT_END));
+#if ENABLE_XEMBED
+  if (rs[Rs_embed])
+    {
+      long info[2] = { 0, XEMBED_MAPPED };
+      XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
+                       32, PropModeReplace, (unsigned char *)&info, 2);
+    }
+#endif
   XMapWindow (disp, vt);
   XMapWindow (disp, parent[0]);
   return true;
 }
 {
   unsigned int i;
   const char *xpmb = "\0";
   char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
-  env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
   strcpy (fstr, "default");
   strcpy (bstr, "default");
   for (i = Color_Black; i <= Color_White; i++)
     if (pix_colors[Color_fg] == pix_colors[i])
       {
   XPoint nspot;
   XVaNestedList preedit_attr;
   if (!Input_Context
       || !focus
-      || !(input_style & XIMPreeditPosition))
+      || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
     return;
   im_set_position (nspot);
   if (nspot.x == spot.x && nspot.y == spot.y)
                                          XNFontSet, fs,
                                          NULL);
     }
   else if (input_style & XIMPreeditCallbacks)
     {
+      im_set_position (spot);
       xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
       xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
       xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
 #if 0
       xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
 #endif
       preedit_attr = XVaCreateNestedList (0,
+                                          XNSpotLocation, &spot,
                                           XNPreeditStartCallback, &xcb[0],
                                           XNPreeditDoneCallback , &xcb[1],
                                           XNPreeditDrawCallback , &xcb[2],
 #if 0
                                           XNPreeditCaretCallback, &xcb[3],

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.201 by root, Wed Jan 25 00:57:57 2006 UTC vs. Revision 1.204 by root, Wed Jan 25 02:53:13 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.201 by root, Wed Jan 25 00:57:57 2006 UTC vs.
Revision 1.204 by root, Wed Jan 25 02:53:13 2006 UTC