*** empty log message ***

diff --git a/Changes b/Changes
index f98c7bc8c564852ec7c62dfd4e9d29306f5c5954..ad3cc3991be6dde77c8eed1586f054175ea68d1c 100644 (file)
--- a/Changes
+++ b/Changes
@@ -19,8 +19,6 @@ WISH: load system-wide config file even if we don't have one
 WISH: look into XAddConnectionWatch, does anybody need that?
 DUMB: support tex fonts
 
-TODO: exg-- patch
-TODO: selection_beg/end should set screen, or so
 TODO: perl-shell-window?
 TODO: zweimal numlock? falsche codes rxvt urxvt for numpad?
        - port to glibc-2.10 changes (strchr etc. returning const char *
@@ -60,6 +58,9 @@ TODO: zweimal numlock? falsche codes rxvt urxvt for numpad?
         - setting the selection from perl will now reset the selection screen
           to the current screen. the srceen can be manipulated using
           the new ->selection_screen method.
+        - implement --enable-assert configure option and get rid of DEBUG_STRICT
+          (based on patch by exg).
+        - upgrade to libev-3.9 prerelease.
 
 9.06 Sat Nov  8 17:47:18 CET 2008
        - NOTICE: this release updates terminfo/termcap.

diff --git a/config.h.in b/config.h.in
index 4b24a2c58342ed7802d5f5ed3dc96ac858524c6f..33c2758c2573a2fa2ca9b76295e601f82a390868 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -297,6 +297,9 @@
 /* Define to use wheel events (button4 and button5) to scroll */
 #undef MOUSE_WHEEL
 
+/* Disable assertions (good for debugging) */
+#undef NDEBUG
+
 /* Support NeXT style scrollbars */
 #undef NEXT_SCROLLBAR
 

diff --git a/configure b/configure
index 3e4dbfe23c747877f29f0ed4904b7cd9acd822bd..80b6de44405ebbb2874fd93c9556dc9bdd6e57fd 100755 (executable)
--- a/configure
+++ b/configure
@@ -1296,6 +1296,7 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-everything     enable standard non-multichoice features
                           NOTE: this option is order dependent
+  --enable-assert         enable assertions
   --enable-warnings       turn on g++ warnings
   --enable-unicode3       use 21 instead of 16 bits to represent unicode characters
   --enable-combining      enable composition of base and combining characters
@@ -4455,6 +4456,22 @@ if test "${enable_everything+set}" = set; then
 fi
 
 
+ASSERTIONS=no
+# Check whether --enable-assert was given.
+if test "${enable_assert+set}" = set; then
+  enableval=$enable_assert; if test x$enableval = xyes; then
+    ASSERTIONS=yes
+  fi
+fi
+
+if test x$ASSERTIONS = xno; then
+
+cat >>confdefs.h <<\_ACEOF
+#define NDEBUG 1
+_ACEOF
+
+fi
+
 WARNINGS=no
 # Check whether --enable-warnings was given.
 if test "${enable_warnings+set}" = set; then

diff --git a/configure.ac b/configure.ac
index 050cd304163ddb4fcb627a27c38c10c5a539493a..d7952de4731ed4a8a26c21a33113e90e3a381e9f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -172,6 +172,16 @@ AC_ARG_ENABLE(everything,
     fi
   ])
 
+ASSERTIONS=no
+AC_ARG_ENABLE(assert,
+  [  --enable-assert         enable assertions],
+  [if test x$enableval = xyes; then
+    ASSERTIONS=yes
+  fi])
+if test x$ASSERTIONS = xno; then
+  AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging))
+fi
+
 WARNINGS=no
 AC_ARG_ENABLE(warnings,
   [  --enable-warnings       turn on g++ warnings],

diff --git a/doc/rxvt.7.pod b/doc/rxvt.7.pod
index 90065a219d6d634e844b4a27bf29bed3b7161887..2e48b30d822175a32f3443efe470be380fcfe70c 100644 (file)
--- a/doc/rxvt.7.pod
+++ b/doc/rxvt.7.pod
@@ -2261,8 +2261,8 @@ All
 
 =item --enable-everything
 
-Add (or remove) support for all non-multichoice options listed in "./configure
---help".
+Add (or remove) support for all non-multichoice options listed in
+C<./configure --help>, except for C<--enable-assert>.
 
 You can specify this and then disable options you do not like by
 I<following> this with the appropriate C<--disable-...> arguments,
@@ -2520,6 +2520,11 @@ perl will I<not> be initialised when all extensions have been disabled
 C<-pe "" --perl-ext-common "">, so it should be safe to enable from a
 resource standpoint.
 
+=item --enable-assert (default: off)
+
+Enables the assertions in the code, normally disabled. This switch is only
+useful when developing rxvt-unicode.
+
 =item --with-afterimage-config=DIR
 
 Look for the libAfterImage config script in DIR.

diff --git a/src/Makefile.in b/src/Makefile.in
index 012bcf5616bf9072d06796f57e525be5cb3ea3bc..64006b806b4f14c8bf46d94a3d59ea7b4cf74230 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -21,14 +21,12 @@ DEFS = @DEFS@
 LIBS = @LIBS@
 XINC = @X_CFLAGS@ @AFTERIMAGE_CFLAGS@
 XLIB = @X_LIBS@ @AFTERIMAGE_LIBS@ -lX11 @X_EXTRA_LIBS@
-COMPILE = $(CXX) -I.. -I$(srcdir) -I. -I$(srcdir)/../libev $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(DEBUG) $(XINC)
+COMPILE = $(CXX) -I.. -I$(srcdir) -I. -I$(srcdir)/../libev $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(XINC)
 LINK = @LINKER@ $(LDFLAGS)
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 
-DEBUG=-DDEBUG_STRICT
-
 first_rule: all
 dummy:
 

diff --git a/src/keyboard.C b/src/keyboard.C
index 818773c5948b5d5843eb5b02a23c07dc78c0b6ae..4c2249292d4e04364acf251b9679c3d24527679f 100644 (file)
--- a/src/keyboard.C
+++ b/src/keyboard.C
@@ -428,7 +428,7 @@ keyboard_manager::setup_hash ()
 
   keymap.swap (sorted_keymap);
 
-#ifdef DEBUG_STRICT
+#ifndef NDEBUG
   // check for invariants
   for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i)
     {

diff --git a/src/screen.C b/src/screen.C
index a4a14c5b609e26d94530c24cc5b6a871787f4cf9..6c60c45a50cfbe25a93501922452e577dd932713 100644 (file)
--- a/src/screen.C
+++ b/src/screen.C
@@ -288,9 +288,7 @@ rxvt_term::scr_reset ()
           do
             {
               p = MOD (p - 1, prev_total_rows);
-#ifdef DEBUG_STRICT
               assert (old_buf [MOD (p, prev_total_rows)].t);
-#endif
               int plines = 1;
               int llen = old_buf [MOD (p, prev_total_rows)].l;
 
@@ -512,10 +510,8 @@ rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
   /* boundary check in case screen size changed between SAVE and RESTORE */
   min_it (s->cur.row, nrow - 1);
   min_it (s->cur.col, ncol - 1);
-#ifdef DEBUG_STRICT
   assert (s->cur.row >= 0);
   assert (s->cur.col >= 0);
-#endif
 }
 
 void
@@ -785,11 +781,9 @@ rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
         }
     }
 
-#ifdef DEBUG_STRICT
   assert (screen.cur.col < ncol);
   assert (screen.cur.row < nrow
           && screen.cur.row >= top_row);
-#endif
   int row = screen.cur.row;
 
   checksel = selection.op && current_screen == selection.screen ? 1 : 0;
@@ -1003,9 +997,7 @@ rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
 
   max_it (line->l, screen.cur.col);
 
-#ifdef DEBUG_STRICT
   assert (screen.cur.row >= 0);
-#endif
 }
 
 /* ------------------------------------------------------------------------- */

diff --git a/src/version.h b/src/version.h
index 8b8d769b1321dae65c057f4f5015d03e19fb7210..37d35271510f8fa413b475883fca16e6a4120fec 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,3 @@
 // VERSION _must_ be \d.\d+
-#define VERSION "9.06"
-#define DATE   "2008-06-15"
+#define VERSION "9.07"
+#define DATE   "2009-12-27"

diff --git a/src/xdefaults.C b/src/xdefaults.C
index 97bf4c7414eb7763f7d8f5f5db3b7542b5c455db..4717dd4899c9bc33c7498b19b11b4d4672b1f558 100644 (file)
--- a/src/xdefaults.C
+++ b/src/xdefaults.C
@@ -403,9 +403,7 @@ rxvt_usage (int type)
 
               if (optList[i].arg)
                 len = strlen (optList[i].arg) + 1;
-#ifdef DEBUG_STRICT
               assert (optList[i].opt != NULL);
-#endif
               len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
               col += len;
               if (col > 79)
@@ -429,9 +427,7 @@ rxvt_usage (int type)
         for (i = 0; i < optList_size; i++)
           if (optList[i].desc != NULL)
             {
-#ifdef DEBUG_STRICT
               assert (optList[i].opt != NULL);
-#endif
               rxvt_log ("  %s%s %-*s%s%s\n",
                          (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
                          (INDENT - strlen (optList[i].opt)