*** empty log message ***

diff --git a/src/.indent.pro b/src/.indent.pro
deleted file mode 100644 (file)
index 59dc602..0000000
--- a/src/.indent.pro
+++ /dev/null
@@ -1,32 +0,0 @@
---dont-format-comments
---procnames-start-lines
---parameter-indentation4
---indent-level4
---line-comments-indentation4
---cuddle-else
---brace-indent0
---start-left-side-of-comments
---no-blank-lines-after-commas
---blank-lines-after-declarations
---blank-lines-after-procedures
---comment-indentation33
---declaration-comment-column33
---no-comment-delimiters-on-blank-lines
---continuation-indentation4
---case-indentation0
---else-endif-column33
---no-space-after-casts
---no-blank-before-sizeof
---declaration-indentation16
---continue-at-parentheses
---no-space-after-function-call-names
---swallow-optional-blank-lines
---space-special-semicolon
---tab-size8
---line-length79
---braces-on-if-line
---braces-on-struct-decl-line
---leave-preprocessor-space
---no-space-after-parentheses
---honour-newlines
---break-before-boolean-operator

diff --git a/src/command.h b/src/command.h
index d693e5f312559b31379f7c5c985a6eed5a922ca1..8dc64fc3a9f5517cdc5ac675c8fdcda5fa63eea5 100644 (file)
--- a/src/command.h
+++ b/src/command.h
@@ -1,5 +1,5 @@
 /*
- * $Id: command.h,v 1.13 2004-08-10 20:39:19 root Exp $
+ * $Id: command.h,v 1.14 2004-08-15 00:37:04 root Exp $
  */
 
 #ifndef COMMAND_H_
@@ -89,5 +89,4 @@
 # define ESCZ_ANSWER   VT100_ANS       /* obsolete ANSI ESC[c */
 #endif
 
-#include "command.intpro"      /* PROTOS for internal routines */
 #endif /* _COMMAND_H_ */

diff --git a/src/iom_conf.h b/src/iom_conf.h
index eb20f0cccd9f9a827b8c011341c1ab2b737153d0..42275fcd4b6f8b173cfaa5acc1872e83daf0f4e7 100644 (file)
--- a/src/iom_conf.h
+++ b/src/iom_conf.h
@@ -20,7 +20,7 @@
 #ifndef RXVT_IOM_CONF_H__
 #define RXVT_IOM_CONF_H__
 
-#include <rxvtstl.h>
+#include <rxvtutil.h>
 
 #define IOM_IO 1
 #define IOM_TIME 1

diff --git a/src/makeextprotos-awk b/src/makeextprotos-awk
deleted file mode 100644 (file)
index 4136e41..0000000
--- a/src/makeextprotos-awk
+++ /dev/null
@@ -1,20 +0,0 @@
-/^\/\* EXTPROTO \*\/$/ {
-    getline     # function return
-    printf "%-16s ", $0
-    cline=""
-    while (index(cline, "{") == 0 && index(cline, "#") == 0) {
-       getline # function name and args
-        cline=cline $0
-    }
-    gsub(/[\t\n]/, " ", cline)
-    gsub(/[ ]+/, " ", cline)
-    l = index(cline, "(")
-    m = index(cline, "{")
-    n = index(cline, "#")
-    if (n > 0) { m = n }
-    outstring = sprintf("%%-32.%ds __PROTO(", l - 1)
-    printf outstring, cline
-    reststring = substr(cline, l, m - l)
-    printf reststring
-    print ");"
-}

diff --git a/src/makeextprotos-sed b/src/makeextprotos-sed
deleted file mode 100644 (file)
index cb48e35..0000000
--- a/src/makeextprotos-sed
+++ /dev/null
@@ -1,18 +0,0 @@
-# Get prototypes from a .c file
-# $Id: makeextprotos-sed,v 1.2 2003-11-24 17:31:27 pcg Exp $
-# /* EXTPROTO */   must be above return type which are above function.
-#              Args are on one line
-# eg.
-# /* EXTPROTO */
-# void                           ------>   void main(int argc, char **argv);
-# main(int argc, char **argv)
-# {
-# }
-#
-/^[/][*] EXTPROTO [*][/]$/{
-n
-N
-s/\n\([_a-zA-Z][_a-zA-Z0-9]* *\)(/ \1 __PROTO((/
-s/$/);/
-p
-}

diff --git a/src/menubar.C b/src/menubar.C
index c9f2ab3e118b116dde093dc8eddf28dbb24c0cd2..a18f682471f1fc14b39660ff573f140042c1a979 100644 (file)
--- a/src/menubar.C
+++ b/src/menubar.C
@@ -31,7 +31,6 @@
 #ifdef MENUBAR
 #include "version.h"
 #include "menubar.h"
-#include "menubar.intpro"      /* PROTOS for internal routines */
 
 #define Menu_PixelWidth(menu)                                  \
     (2 * SHADOW + Width2Pixel ((menu)->width + 3 * HSPACE))

diff --git a/src/netdisp.h b/src/netdisp.h
index ee13081ce019607fa9379bba76556dbc5daad009..0d4c4f5743c20a047c2c0bf4da1eb32d52731fa3 100644 (file)
--- a/src/netdisp.h
+++ b/src/netdisp.h
@@ -14,5 +14,3 @@
 #include <arpa/inet.h>
 #include <net/if.h>
 #include <net/if_arp.h>
-
-#include "netdisp.intpro"      /* PROTOS for internal routines */

diff --git a/src/protos.h b/src/protos.h
deleted file mode 100644 (file)
index 1b263cb..0000000
--- a/src/protos.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Include prototypes for all files */
-#include "command.extpro"
-
-#include "defaultfont.extpro"
-
-#include "init.extpro"
-
-#ifdef UTMP_SUPPORT
-# include "logging.extpro"
-#endif
-
-#include "main.extpro"
-
-#ifdef MENUBAR
-# include "menubar.extpro"
-#endif
-
-#include "misc.extpro"
-
-#ifdef DISPLAY_IS_IP
-# include "netdisp.extpro"
-#endif
-
-#include "ptytty.extpro"
-
-#if !defined(NO_STRINGS) && !defined(HAVE_STRING_H)
-# include "strings.extpro"
-#endif
-
-#include "screen.extpro"
-
-#include "scrollbar.extpro"
-#ifdef RXVT_SCROLLBAR
-# include "scrollbar-rxvt.extpro"
-#endif
-#ifdef NEXT_SCROLLBAR
-# include "scrollbar-next.extpro"
-#endif
-#ifdef XTERM_SCROLLBAR
-# include "scrollbar-xterm.extpro"
-#endif
-
-#include "xdefaults.extpro"
-
-#ifdef XPM_BACKGROUND
-# include "xpm.extpro"
-#endif

diff --git a/src/rxvtdaemon.h b/src/rxvtdaemon.h
index 967666245877e4fd672dfecc3653062dab0f2dce..b7203ba48fa58963603cbe5a967e8ef5a6b3837d 100644 (file)
--- a/src/rxvtdaemon.h
+++ b/src/rxvtdaemon.h
@@ -1,7 +1,7 @@
 #ifndef RXVT_DAEMON_H
 #define RXVT_DAEMON_H
 
-#include "rxvtstl.h"
+#include "rxvtutil.h"
 
 struct rxvt_connection {
   int fd;

diff --git a/src/defaultfont.C b/src/rxvtfont.C
similarity index 99%
rename from src/defaultfont.C
rename to src/rxvtfont.C
index 8c894a0462694f6af08a5609dfdce8d387c47977..32720a8c476e6f7df431f3757f2e2bcd888bbdf7 100644 (file)
--- a/src/defaultfont.C
+++ b/src/rxvtfont.C
@@ -21,7 +21,7 @@
 
 #include "../config.h"
 #include "rxvt.h"
-#include "defaultfont.h"
+#include "rxvtfont.h"
 
 #include <cstdlib>
 

diff --git a/src/defaultfont.h b/src/rxvtfont.h
similarity index 99%
rename from src/defaultfont.h
rename to src/rxvtfont.h
index 98055a813f8e7a2287847faf2898c875ee89e0de..036a10a274a6b262a2ded4a226014881e637905c 100644 (file)
--- a/src/defaultfont.h
+++ b/src/rxvtfont.h
@@ -24,7 +24,7 @@
 #include "rxvtlib.h"
 #include "feature.h"
 #include "encoding.h"
-#include "rxvtstl.h"
+#include "rxvtutil.h"
 
 struct rxvt_fontprop {
   enum {

diff --git a/src/rxvtstl.C b/src/rxvtstl.C
deleted file mode 100644 (file)
index 8497cc7..0000000
--- a/src/rxvtstl.C
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <cstdlib>
-#include <cstring>
-
-#include "rxvtstl.h"
-
-
-

diff --git a/src/rxvtcolor.C b/src/rxvttoolkit.C
similarity index 97%
rename from src/rxvtcolor.C
rename to src/rxvttoolkit.C
index 1f8eb769ff2935276b5886dd1885f5fdf09138ea..398b730559afec0ff9a48bf0f073dbd665c1cda4 100644 (file)
--- a/src/rxvtcolor.C
+++ b/src/rxvttoolkit.C
@@ -22,7 +22,7 @@
 
 #include "../config.h"
 #include <rxvt.h>
-#include <rxvtcolor.h>
+#include <rxvttoolkit.h>
 
 #include <unistd.h>
 #include <fcntl.h>
@@ -32,23 +32,6 @@
 # include <sys/un.h>
 #endif
 
-class byteorder byteorder;
-
-byteorder::byteorder ()
-{
-  union {
-    uint32_t u;
-    uint8_t b[4];
-  } w;
-
-  w.b[0] = 0x11;
-  w.b[1] = 0x22;
-  w.b[2] = 0x33;
-  w.b[3] = 0x44;
-
-  e = w.u;
-}
-
 refcounted::refcounted (const char *id)
 {
   this->id = STRDUP (id);

diff --git a/src/rxvtcolor.h b/src/rxvttoolkit.h
similarity index 90%
rename from src/rxvtcolor.h
rename to src/rxvttoolkit.h
index 403a543112c20408633819fa38c413483d51c4c7..99a64b3f80118526963903fd5a0db6eb5369da19 100644 (file)
--- a/src/rxvtcolor.h
+++ b/src/rxvttoolkit.h
@@ -1,5 +1,8 @@
-#ifndef RXVT_COLOR_H
-#define RXVT_COLOR_H
+/*
+ * rxvttoolkit.h - provide toolkit-functionality for rxvt.
+ */
+#ifndef RXVT_TOOLKIT_H
+#define RXVT_TOOLKIT_H
 
 #include <X11/Xlib.h>
 
@@ -10,21 +13,10 @@
 #include "iom.h"
 
 #include "rxvtlib.h"
-#include "rxvtstl.h"
+#include "rxvtutil.h"
 
 #include "callback.h"
 
-extern class byteorder {
-  uint32_t e;
-public:
-  byteorder ();
-
-  bool big_endian    () { return e == 0x11223344; };
-  bool network       () { return e == 0x11223344; };
-  bool little_endian () { return e == 0x44332211; };
-  bool vax           () { return e == 0x44332211; };
-} byteorder;
-
 struct rxvt_term;
 
 struct im_watcher;

diff --git a/src/rxvtutil.C b/src/rxvtutil.C
new file mode 100644 (file)
index 0000000..f8cbf93
--- /dev/null
+++ b/src/rxvtutil.C
@@ -0,0 +1,25 @@
+#include <cstdlib>
+#include <cstring>
+#include <inttypes.h>
+
+#include "rxvtutil.h"
+
+class byteorder byteorder;
+
+byteorder::byteorder ()
+{
+  union {
+    uint32_t u;
+    uint8_t b[4];
+  } w;
+
+  w.b[0] = 0x11;
+  w.b[1] = 0x22;
+  w.b[2] = 0x33;
+  w.b[3] = 0x44;
+
+  e = w.u;
+}
+
+
+

diff --git a/src/rxvtstl.h b/src/rxvtutil.h
similarity index 83%
rename from src/rxvtstl.h
rename to src/rxvtutil.h
index d1a805722e7070b5969cb33b2f30f815040025e4..10b7501f2434a923b10b1abccfba5f53f1a1e344 100644 (file)
--- a/src/rxvtstl.h
+++ b/src/rxvtutil.h
@@ -1,5 +1,16 @@
-#ifndef RXVT_STL_H
-#define RXVT_STL_H
+#ifndef RXVT_UTIL_H
+#define RXVT_UTIL_H
+
+extern class byteorder {
+  static unsigned int e; // at least 32 bits
+public:
+  byteorder ();
+
+  static bool big_endian    () { return e == 0x11223344; };
+  static bool network       () { return e == 0x11223344; };
+  static bool little_endian () { return e == 0x44332211; };
+  static bool vax           () { return e == 0x44332211; };
+} byteorder;
 
 template<typename T, typename U> static inline T min (T a, U b) { return a < b ? a : b; }
 template<typename T, typename U> static inline T max (T a, U b) { return a > b ? a : b; }
@@ -103,6 +114,5 @@ struct stringvec : simplevec<char *>
       delete [] *c;
   }
 };
-
 #endif
 

diff --git a/src/strings.C b/src/strings.C
index bb73eabbfebb0c7cb1a4e00247421dea6c641478..210218170b56cf5badc6c4a05f6e88dfeb68510d 100644 (file)
--- a/src/strings.C
+++ b/src/strings.C
@@ -23,7 +23,6 @@
 
 #include "../config.h"         /* NECESSARY */
 #include "rxvt.h"              /* NECESSARY */
-#include "strings.intpro"      /* PROTOS for internal routines */
 
 #ifndef NO_STRINGS
 /*----------------------------------------------------------------------*/