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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.189 by root, Thu Jan 19 09:47:15 2006 UTC vs.
Revision 1.199 by root, Tue Jan 24 19:40:12 2006 UTC

 # include <termios.h>
 #endif
 vector<rxvt_term *> rxvt_term::termlist;
+// used to tell global functions which terminal instance is "active"
+rxvt_t rxvt_current_term;
 static char curlocale[128], savelocale[128];
 bool
-rxvt_set_locale (const char *locale)
+rxvt_set_locale (const char *locale) NOTHROW
 {
   if (!locale || !strncmp (locale, curlocale, 128))
     return false;
   strncpy (curlocale, locale, 128);
   setlocale (LC_CTYPE, curlocale);
   return true;
 }
 void
-rxvt_push_locale (const char *locale)
+rxvt_push_locale (const char *locale) NOTHROW
 {
   strcpy (savelocale, curlocale);
   rxvt_set_locale (locale);
 }
 void
-rxvt_pop_locale ()
+rxvt_pop_locale () NOTHROW
 {
   rxvt_set_locale (savelocale);
 }
 #if ENABLE_COMBINING
 #ifdef POINTER_BLANK
     pointer_ev (this, &rxvt_term::pointer_cb),
 #endif
 #ifdef USE_XIM
     im_ev (this, &rxvt_term::im_cb),
+#endif
+#ifndef NO_BELL
+    bell_ev (this, &rxvt_term::bell_cb),
 #endif
     termwin_ev (this, &rxvt_term::x_cb),
     vt_ev (this, &rxvt_term::x_cb),
     child_ev (this, &rxvt_term::child_cb),
     check_ev (this, &rxvt_term::check_cb),
   termlist.push_back (this);
 #ifdef KEYSYM_RESOURCE
   keyboard = new keyboard_manager;
-  if (!keyboard)
-    rxvt_fatal ("out of memory, aborting.\n");
 #endif
 }
 // clean up the most important stuff, do *not* call x or free mem etc.
 // for use before an emergency exit
   delete pty; pty = 0;
 }
 rxvt_term::~rxvt_term ()
 {
-  HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
   termlist.erase (find (termlist.begin (), termlist.end(), this));
   emergency_cleanup ();
 #if ENABLE_STYLES
 void
 rxvt_term::destroy ()
 {
   if (destroy_ev.active)
+    return;
+  if (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
-#if ENABLE_PERL
+  pty = ptytty::create ();
-  if (!rs[Rs_perl_ext_1])
-    rs[Rs_perl_ext_1] = "default";
-  if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
-      || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
-      || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
-    {
-      rxvt_perl.init (this);
-      HOOK_INVOKE ((this, HOOK_INIT, DT_END));
-    }
-#endif
-  pty = rxvt_new_ptytty ();
   create_windows (argc, argv);
   dDisp;
       check_our_parents ();
       rootwin_ev.start (display, display->root);
     }
 #endif
+  set_colorfgbg ();
+  init_command (cmd_argv);
+  free (cmd_argv);
+  if (pty->pty >= 0)
+    pty_ev.start (pty->pty, EVENT_READ);
+  check_ev.start ();
+  HOOK_INVOKE ((this, HOOK_START, DT_END));
   XMapWindow (disp, vt);
   XMapWindow (disp, parent[0]);
-  set_colorfgbg ();
-  init_command (cmd_argv);
-  free (cmd_argv);
-  if (pty->pty >= 0)
-    pty_ev.start (pty->pty, EVENT_READ);
-  check_ev.start ();
-  HOOK_INVOKE ((this, HOOK_START, DT_END));
   return true;
 }
 static struct sig_handlers
    * 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);
     rxvt_fatal ("memory allocation failure. aborting.\n");
   return p;
 }
-void           *
+void *
 rxvt_realloc (void *ptr, size_t size)
 {
   void *p = realloc (ptr, size);
   if (!p)
   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.
  * -------------------------------------------------------------------- */
 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
   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;
       rxvt_warn ("failed to create input context, continuing without XIM.\n");
       im_destroy ();
       return false;
     }
+  if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
+    vt_select_input ();
   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])
   XFree (preedit_attr);
   XFree (status_attr);
 }
 #endif                          /* USE_XIM */
-/*----------------------------------------------------------------------*/
-rxvt_t          rxvt_current_term;
 /*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.189 by root, Thu Jan 19 09:47:15 2006 UTC vs. Revision 1.199 by root, Tue Jan 24 19:40:12 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.189 by root, Thu Jan 19 09:47:15 2006 UTC vs.
Revision 1.199 by root, Tue Jan 24 19:40:12 2006 UTC