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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.136 by root, Mon Feb 14 18:47:54 2005 UTC vs.
Revision 1.148 by root, Wed Nov 30 21:05:39 2005 UTC

  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *---------------------------------------------------------------------*/
 #include "../config.h"          /* NECESSARY */
 #include "rxvt.h"               /* NECESSARY */
-#include "main.intpro"          /* PROTOS for internal routines */
 #include <csignal>
 #include <cstring>
 #ifdef TTY_GID_SUPPORT
     pointer_ev (this, &rxvt_term::pointer_cb),
 #endif
 #ifdef USE_XIM
     im_ev (this, &rxvt_term::im_cb),
 #endif
-    sw_term (this, &rxvt_term::sig_term),
-    sw_int (this, &rxvt_term::sig_term),
-    sw_chld (this, &rxvt_term::sig_chld),
     termwin_ev (this, &rxvt_term::x_cb),
     vt_ev (this, &rxvt_term::x_cb),
     check_ev (this, &rxvt_term::check_cb),
     flush_ev (this, &rxvt_term::flush_cb),
     destroy_ev (this, &rxvt_term::destroy_cb),
       //if (menuBar.win)
       //  XDestroyWindow (disp, menuBar.win);
 #endif
       delete TermWin.drawable;
       // destroy all windows
-      if (TermWin.parent[0] && !rs[Rs_embed])
+      if (TermWin.parent[0])
         XDestroyWindow (disp, TermWin.parent[0]);
     }
   // TODO: free pixcolours, colours should become part of rxvt_display
   delete pix_colors_focused;
-#ifdef OFF_FOCUS_FADING
+#if OFF_FOCUS_FADING
   delete pix_colors_unfocused;
 #endif
   displays.put (display);
 {
   if (GET_R->allowedxerror == -1)
     GET_R->allowedxerror = event->error_code;
   else
     {
-      //TODO: GET_R is most likely not the terminal which caused the error
+      // GET_R is most likely not the terminal which caused the error,
-      //TODO: maybe just output the error and continue?
+      // so just output the error and continue
 #if ENABLE_FRILLS
       print_x_error (display, event);
 #else
       old_xerror_handler (display, event);
 #endif
              DisplayString (display));
   rxvt_emergency_cleanup ();
   _exit (EXIT_FAILURE);
 }
-/*
- * Catch a fatal signal and tidy up before quitting
- */
-void
-rxvt_term::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);
-}
 /*----------------------------------------------------------------------*/
-/* rxvt_init () */
 bool
 rxvt_term::init (int argc, const char *const *argv)
 {
   SET_R (this);
   check_ev.start ();
   return true;
 }
+static struct sig_handlers
+{
+  sig_watcher sw_chld, sw_term, sw_int;
+  void sig_chld (sig_watcher &w)
+  {
+    // we are being called for every SIGCHLD, find the corresponding term
+    int pid;
+    while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
+      for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
+        if (pid == (*t)->cmd_pid)
+          {
+            (*t)->destroy ();
+            break;
+          }
+  }
+  /*
+   * 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);
+  }
+  sig_handlers ()
+  : sw_chld (this, &sig_handlers::sig_chld),
+    sw_term (this, &sig_handlers::sig_term),
+    sw_int  (this, &sig_handlers::sig_term)
+  {
+  }
+} sig_handlers;
 void
 rxvt_init ()
 {
   /*
   rxvt_privileges (IGNORE);
   signal (SIGHUP,  SIG_IGN);
   signal (SIGPIPE, SIG_IGN);
+  sig_handlers.sw_chld.start (SIGCHLD);
+  sig_handlers.sw_term.start (SIGTERM);
+  sig_handlers.sw_int.start  (SIGINT);
   /* need to trap SIGURG for SVR4 (Unixware) rlogin */
   /* signal (SIGURG, SIG_DFL); */
   old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
   // TODO: handle this with exceptions and tolerate the memory loss
   XSetIOErrorHandler (rxvt_xioerror_handler);
-}
-/* ------------------------------------------------------------------------- *
- *                       SIGNAL HANDLING & EXIT HANDLER                      *
- * ------------------------------------------------------------------------- */
-/*
- * Catch a SIGCHLD signal and exit if the direct child has died
- */
-void
-rxvt_term::sig_chld (sig_watcher &w)
-{
-  // we are being called for every SIGCHLD, not just ours
-  int pid;
-  while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
-    for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
-      if (pid == (*t)->cmd_pid)
-        {
-          (*t)->destroy ();
-          break;
-        }
 }
 /* ------------------------------------------------------------------------- *
  *                         MEMORY ALLOCATION WRAPPERS                        *
  * ------------------------------------------------------------------------- */
     rxvt_fatal ("memory allocation failure. aborting.\n");
   return p;
 }
-/* INTPROTO */
+void *
-void           *
 rxvt_calloc (size_t number, size_t size)
 {
   void *p = calloc (number, size);
   if (!p)
     rxvt_fatal ("memory allocation failure. aborting.\n");
   return p;
 }
-/* INTPROTO */
 void           *
 rxvt_realloc (void *ptr, size_t size)
 {
   void *p = realloc (ptr, size);
   (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
 #if 0
   // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
   if (cmd_pid)               /* force through to the command */
-    kill (cmd_pid, SIGWINCH);
+    kill (-cmd_pid, SIGWINCH);
 #endif
 }
 /*----------------------------------------------------------------------*/
 /* set_fonts () - load and set the various fonts
-/*
+ *
  * init = 1   - initialize
  *
  * fontname == FONT_UP  - switch to bigger font
  * fontname == FONT_DN  - switch to smaller font
  */
 /* xterm sequences - title, iconName, color (exptl) */
 void
 rxvt_term::set_title (const char *str)
 {
   set_string_property (XA_WM_NAME, str);
-#if ENABLE_FRILLS
+#if ENABLE_EWMH
   set_utf8_property (xa[XA_NET_WM_NAME], str);
 #endif
 }
 void
 rxvt_term::set_icon_name (const char *str)
 {
   set_string_property (XA_WM_ICON_NAME, str);
-#if ENABLE_FRILLS
+#if ENABLE_EWMH
   set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
 #endif
 }
 #ifdef XTERM_COLOR_CHANGE
         {        /* bright colors */
           i -= 8;
 # ifndef NO_BRIGHTCOLOR
           pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
           SET_PIXCOLOR (idx);
-          goto Done;
+          goto done;
 # endif
         }
       if (i >= 0 && i <= 7)
         { /* normal colors */
           pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
           SET_PIXCOLOR (idx);
-          goto Done;
+          goto done;
         }
     }
   if (!rXParseAllocColor (&xcol, color))
     return;
   pix_colors_focused[idx] = xcol;
   SET_PIXCOLOR (idx);
   /* XSetWindowAttributes attr; */
   /* Cursor cursor; */
-Done:
+done:
-#ifdef OFF_FOCUS_FADING
+#if OFF_FOCUS_FADING
   if (rs[Rs_fade])
-    pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
+    pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
 #endif
   /*TODO: handle Color_BD, scrollbar background, etc. */
   recolour_cursor ();
   XWindowAttributes wattr;
   if (width == 0 || height == 0)
     {
       XGetWindowAttributes (display->display, display->root, &wattr);
       if (width == 0)
         width = wattr.width - szHint.base_width;
       if (height == 0)
         height = wattr.height - szHint.base_height;
     }
 }
 void
 rxvt_term::im_cb ()
 {
-  int i, found, had_im;
+  int i;
   const char *p;
   char **s;
   char buf[IMBUFSIZ];
   SET_R (this);

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.136 by root, Mon Feb 14 18:47:54 2005 UTC vs. Revision 1.148 by root, Wed Nov 30 21:05:39 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.136 by root, Mon Feb 14 18:47:54 2005 UTC vs.
Revision 1.148 by root, Wed Nov 30 21:05:39 2005 UTC