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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.193 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.205 by root, Wed Jan 25 13:24:45 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;
 rxvt_term::destroy ()
 {
   if (destroy_ev.active)
     return;
-  if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
+  HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
-    return;
 #if ENABLE_OVERLAY
   scr_overlay_off ();
 #endif
   _exit (EXIT_FAILURE);
 }
 /*----------------------------------------------------------------------*/
 bool
-rxvt_term::init (int argc, const char *const *argv)
+rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
 {
+  this->envv = envv;
   SET_R (this);
   set_locale ("");
   set_environ (envv); // few things in X do not call setlocale :(
   if (!init_vars ())
 #ifdef HAVE_SCROLLBARS
   if (OPTION (Opt_scrollBar))
     scrollBar.setIdle ();    /* set existence for size calculations */
 #endif
-  pty = rxvt_new_ptytty ();
+  pty = ptytty::create ();
   create_windows (argc, argv);
   dDisp;
     pty_ev.start (pty->pty, EVENT_READ);
   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;
    * Catch a fatal signal and tidy up before quitting
    */
   void
   sig_term (sig_watcher &w)
   {
-#ifdef DEBUG_CMD
-    rxvt_warn ("caught signal %d, exiting.\n", w.signum);
-#endif
     rxvt_emergency_cleanup ();
     signal (w.signum, SIG_DFL);
     kill (getpid (), w.signum);
   }
 char **rxvt_environ; // startup environment
 void
 rxvt_init ()
 {
-  uid_t uid = getuid ();
+  ptytty::init ();
-  gid_t gid = getgid ();
-  // before doing anything else, check for setuid/setgid operation,
-  // start the helper process and drop privileges
-  if (uid != geteuid ()
-      || gid != getegid ())
-    {
-#if PTYTTY_HELPER
-      rxvt_ptytty_server ();
-#else
-      rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
-#endif
-      // drop privileges
-#if HAVE_SETRESUID
-      setresgid (gid, gid, gid);
-      setresuid (uid, uid, uid);
-#elif HAVE_SETREUID
-      setregid (gid, gid);
-      setreuid (uid, uid);
-#elif HAVE_SETUID
-      setgid (gid);
-      setuid (uid);
-#endif
-      if (uid != geteuid ()
-          || gid != getegid ())
-        rxvt_fatal ("unable to drop privileges, aborting.\n");
-    }
   rxvt_environ = environ;
   signal (SIGHUP,  SIG_IGN);
   signal (SIGPIPE, SIG_IGN);
   short recalc_x, recalc_y;
   int x, y, sb_w, flags;
   unsigned int w, h;
   unsigned int max_width, max_height;
   dDisp;
-  D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
-          ncol, nrow, szHint.width, szHint.height));
   szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
   szHint.win_gravity = NorthWestGravity;
   /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
   if (recalc_y)
     szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
   ncol = width / fwidth;
   nrow = height / fheight;
-  D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
-          ncol, nrow, szHint.width,
-          szHint.height));
-  return;
 }
 /*----------------------------------------------------------------------*/
 /*
  * Tell the teletype handler what size the window is.
 {
   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])
       {
  * -------------------------------------------------------------------- */
 void
 rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
 {
   int fix_screen;
-  int old_width = szHint.width, old_height = szHint.height;
+  int old_width  = szHint.width;
+  int old_height = szHint.height;
   dDisp;
   window_calc (newwidth, newheight);
   XSetWMNormalHints (disp, parent[0], &szHint);
         {
           x -= x1;
           y -= y1;
         }
-      x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
+      x1 = (DisplayWidth  (disp, display->screen) - old_width ) / 2;
       y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
-      dx = old_width - szHint.width;
+      dx = old_width  - szHint.width;
       dy = old_height - szHint.height;
       /* Check position of the center of the window */
       if (x < x1)             /* left half */
         dx = 0;
       resize_pixmap ();
 #endif
     }
   if (fix_screen || old_height == 0)
-    {
-      int curr_screen = -1;
-      int old_ncol = prev_ncol;
-      /* scr_reset only works on the primary screen */
-      if (old_height)      /* this is not the first time through */
-        {
-          unsigned int ocol = ncol;
-          ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
-          curr_screen = scr_change_screen (PRIMARY);
-          ncol = ocol;
-        }
-      scr_reset ();
+    scr_reset ();
-      if (curr_screen >= 0) /* this is not the first time through */
-        {
-          scr_change_screen (curr_screen);
-          selection_check (old_ncol != ncol ? 4 : 0);
-        }
-    }
-  old_width = szHint.width;
-  old_height = szHint.height;
 #ifdef XPM_BACKGROUND
   if (pixmap)
     scr_touch (false);
 #endif
   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)
       input_method = 0;
     }
   Input_Context = 0;
 }
+#ifdef ENABLE_XIM_ONTHESPOT
+static void
+xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
+{
+  ((rxvt_term *)client_data)->make_current ();
+  HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
+}
+static void
+xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
+{
+  ((rxvt_term *)client_data)->make_current ();
+  HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
+}
+static void
+xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
+{
+  rxvt_term *term = (rxvt_term *)client_data;
+  XIMText *text = call_data->text;
+  term->make_current ();
+  if (text)
+    {
+      void *str;
+      if (!text->encoding_is_wchar && text->string.multi_byte)
+        {
+          // of course, X makes it ugly again
+          if (term->rs[Rs_imLocale])
+            SET_LOCALE (term->rs[Rs_imLocale]);
+          str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
+          mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
+          if (term->rs[Rs_imLocale])
+            SET_LOCALE (term->locale);
+        }
+      else
+        str = (void *)text->string.wide_char;
+      HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
+                    DT_INT, call_data->caret,
+                    DT_INT, call_data->chg_first,
+                    DT_INT, call_data->chg_length,
+                    DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
+                    DT_WCS_LEN, str, str ? (int)text->length : 0,
+                    DT_END));
+    }
+  else
+    HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
+                  DT_INT, call_data->caret,
+                  DT_INT, call_data->chg_first,
+                  DT_INT, call_data->chg_length,
+                  DT_END));
+}
+#if 0
+static void
+xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
+{
+  ((rxvt_term *)client_data)->make_current ();
+  HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
+                DT_INT, call_data->position,
+                DT_INT, call_data->direction,
+                DT_INT, call_data->style,
+                DT_END));
+}
+#endif
+#endif
 /*
  * Try to open a XIM with the current modifiers, then see if we can
  * open a suitable preedit type
  */
   XRectangle rect, status_rect, needed_rect;
   unsigned long fg, bg;
   const char *p;
   char **s;
   XIMStyles *xim_styles;
+#ifdef ENABLE_XIM_ONTHESPOT
+  XIMCallback xcb[4];
+#endif
   set_environ (envv);
   if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
     return false;
-  D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
   input_method = display->get_xim (locale, modifiers);
   if (input_method == NULL)
     return false;
   xim = input_method->xim;
       s = rxvt_splitcommastring (p);
       for (i = found = 0; !found && s[i]; i++)
         {
           if (!strcmp (s[i], "OverTheSpot"))
-            input_style = (XIMPreeditPosition | XIMStatusNothing);
+            input_style = XIMPreeditPosition | XIMStatusNothing;
           else if (!strcmp (s[i], "OffTheSpot"))
-            input_style = (XIMPreeditArea | XIMStatusArea);
+            input_style = XIMPreeditArea | XIMStatusArea;
           else if (!strcmp (s[i], "Root"))
-            input_style = (XIMPreeditNothing | XIMStatusNothing);
+            input_style = XIMPreeditNothing | XIMStatusNothing;
           else if (!strcmp (s[i], "None"))
-            input_style = (XIMPreeditNone | XIMStatusNone);
+            input_style = XIMPreeditNone | XIMStatusNone;
+#ifdef ENABLE_XIM_ONTHESPOT
+          else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
+            input_style = XIMPreeditCallbacks | XIMStatusNothing;
+#endif
+          else
+            input_style = XIMPreeditNothing | XIMStatusNothing;
           for (j = 0; j < xim_styles->count_styles; j++)
             if (input_style == xim_styles->supported_styles[j])
               {
                 rxvt_freecommastring (s);
                                          XNBackground, bg,
                                          XNArea, &status_rect,
                                          XNFontSet, fs,
                                          NULL);
     }
+#if ENABLE_XIM_ONTHESPOT
+  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],
+# endif
+                                          NULL);
+    }
+#endif
   Input_Context = XCreateIC (xim,
                              XNInputStyle, input_style,
                              XNClientWindow, vt,
                              XNFocusWindow, parent[0],
       rxvt_warn ("failed to create input context, continuing without XIM.\n");
       im_destroy ();
       return false;
     }
+#if 0
+  // unfortunately, only the focus window is used by XIM, hard to fix
+  if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
+    vt_select_input ();
+#endif
   if (input_style & XIMPreeditArea)
     IMSetStatusPosition ();
-  D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
   return true;
 }
 void
 rxvt_term::im_cb ()
   make_current ();
   im_destroy ();
-  D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
   if (Input_Context)
     return;
 #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
   if (rs[Rs_imLocale])

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.193 by root, Sat Jan 21 14:25:05 2006 UTC vs. Revision 1.205 by root, Wed Jan 25 13:24:45 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.193 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.205 by root, Wed Jan 25 13:24:45 2006 UTC