*** empty log message ***

diff --git a/MANIFEST b/MANIFEST
index c272a9c8358a4b57dae306504ea372d7afe7b0ab..e6d2b03ec2ddab024db46a04d46dc760ea7c7b4a 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -75,13 +75,10 @@ autoconf/mkinstalldirs
 autoconf/xpm.m4
 
 src/.cvsignore
-src/.indent.pro
 src/Makefile.in
 src/callback.h
 src/command.C
 src/command.h
-src/defaultfont.C
-src/defaultfont.h
 src/encoding.C
 src/encoding.h
 src/feature.h
@@ -93,8 +90,6 @@ src/iom_conf.h
 src/logging.C
 src/logging.h
 src/main.C
-src/makeextprotos-awk
-src/makeextprotos-sed
 src/makeintprotos-awk
 src/makeintprotos-sed
 src/menubar.C
@@ -102,20 +97,22 @@ src/menubar.h
 src/misc.C
 src/netdisp.C
 src/netdisp.h
-src/protos.h
+src/ptytty.h
 src/ptytty.C
+src/rxvtutil.C
+src/rxvtutil.h
+src/rxvttoolkit.C
+src/rxvttoolkit.h
+src/rxvtfont.C
+src/rxvtfont.h
 src/rxvt.C
 src/rxvt.h
 src/rxvtc.C
-src/rxvtcolor.C
-src/rxvtcolor.h
 src/rxvtd.C
 src/rxvtdaemon.C
 src/rxvtdaemon.h
 src/rxvtlib.h
 src/rxvtlib.h.in
-src/rxvtstl.C
-src/rxvtstl.h
 src/salloc.C
 src/salloc.h
 src/screen.C

diff --git a/src/init.h b/src/init.h
index e57ef594eac5194fbcfe71d08903155409e81336..dbc1b50877c2867b289c97002404f53ec2e5ebd4 100644 (file)
--- a/src/init.h
+++ b/src/init.h
@@ -148,5 +148,4 @@
 
 #define CONSOLE                "/dev/console"  /* console device */
 
-#include "init.intpro" /* PROTOS for internal routines */
 #endif /* _INIT_H_ */

diff --git a/src/ptytty.h b/src/ptytty.h
new file mode 100644 (file)
index 0000000..7dc736c
--- /dev/null
+++ b/src/ptytty.h
@@ -0,0 +1,28 @@
+#ifndef PTYTTY_H
+#define PTYTTY_H
+
+#include "rxvt.h"
+
+enum rxvt_privaction { IGNORE = 'i', SAVE = 's', RESTORE = 'r' };
+
+struct rxvt_ptytty {
+#ifndef RESET_TTY_TO_COMMON_DEFAULTS
+  struct stat savestat; /* original status of our tty */
+#endif
+  void privileges (rxvt_privaction action);
+public:
+  int pty; // pty file descriptor; connected to rxvt
+  int tty; // tty file descriptor; connected to child
+  char *name;
+
+  rxvt_ptytty ();
+  ~rxvt_ptytty ();
+
+  bool get ();
+  void put ();
+
+  bool make_controlling_tty ();
+};
+
+#endif
+

diff --git a/src/rxvt.C b/src/rxvt.C
index f0009d018dcda1ab643620311e97abb19fa9b50b..d4a5b13df97b884be67be048a61fdbba4a977dce 100644 (file)
--- a/src/rxvt.C
+++ b/src/rxvt.C
@@ -27,7 +27,7 @@ int
 main (int argc, const char *const *argv)
 try
   {
-    rxvt_init_signals ();
+    rxvt_init ();
 
     rxvt_term *t = new rxvt_term;
 

diff --git a/src/rxvtd.C b/src/rxvtd.C
index c5251cd27c9f81f256078db236b5149990d68b8b..a67473d70bb428b34290292d3644bd9d36cc19f9 100644 (file)
--- a/src/rxvtd.C
+++ b/src/rxvtd.C
@@ -213,7 +213,7 @@ void server::read_cb (io_watcher &w, short revents)
 int
 main (int argc, const char *const *argv)
 {
-  rxvt_init_signals ();
+  rxvt_init ();
 
   char *sockname = rxvt_connection::unix_sockname ();
   unix_listener l (sockname);