*** empty log message ***

diff --git a/autoconf/config.h.in b/autoconf/config.h.in
index b5d2fbe1ca3be961d39898b2143cb54b13bb1174..4e4142f423e00d20ffb6292098e60e98e78eb9e2 100644 (file)
--- a/autoconf/config.h.in
+++ b/autoconf/config.h.in
@@ -241,12 +241,6 @@
 /* Define if you don't want support linespace */
 #undef NO_LINESPACE
 
-/* Define to remove xterm style mouse selection */
-#undef NO_NEW_SELECTION
-
-/* Define to remove old rxvt (ver 2.20 and before) style selection */
-#undef NO_OLD_SELECTION
-
 /* Define if you don't want any resources read */
 #undef NO_RESOURCES
 

diff --git a/autoconf/configure.in b/autoconf/configure.in
index d898dbbe47b797170768d6092093fdb862ee341e..f9467c4daf2932ee6a8cdaf7de8ea84c84153c6c 100644 (file)
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -67,7 +67,6 @@ support_selectionscrolling=no
 support_menubar=no 
 support_mousewheel=no
 support_mouseslipwheel=no
-support_oldselection=no
 support_utmp=no
 support_wtmp=no
 support_lastlog=no
@@ -110,7 +109,6 @@ AC_ARG_ENABLE(everything,
     support_menubar=yes
     support_mousewheel=yes
     support_mouseslipwheel=yes
-    support_oldselection=yes
     support_cursor_blink=yes
     support_text_blink=yes
     support_pointer_blank=yes
@@ -339,18 +337,6 @@ AC_ARG_ENABLE(slipwheeling,
     support_mouseslipwheel=$enableval
   fi])
 
-AC_ARG_ENABLE(old-selection,
-  [  --enable-old-selection  enable v2.20 (& prior) mouse selection style support],
-  [if test x$enableval = xyes -o x$enableval = xno; then
-    support_oldselection=$enableval
-  fi])
-
-AC_ARG_ENABLE(new-selection,
-  [  --disable-new-selection disable new mouse (xterm) selection style support],
-  [if test x$enableval = xno; then
-    AC_DEFINE(NO_NEW_SELECTION, 1, Define to remove xterm style mouse selection)
-  fi])
-
 AC_ARG_ENABLE(dmalloc,
   [  --enable-dmalloc        enable Gray Watson's malloc - for debugging use],
   [if test x$enableval = xyes; then
@@ -1193,9 +1179,6 @@ fi
 if test x$support_mouseslipwheel = xyes; then
   AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling)
 fi
-if test x$support_oldselection = xno; then
-  AC_DEFINE(NO_OLD_SELECTION, 1, Define to remove old rxvt (ver 2.20 and before) style selection)
-fi
 if test x$support_utmp = xyes; then
   AC_DEFINE(UTMP_SUPPORT, 1, Define if you want to have utmp/utmpx support)
 fi

diff --git a/configure b/configure
index 8985ea36fdbbe1b75d529aa16e1f804ac2098e9c..714330face6b7b1a219687892d03c87442b42e45 100755 (executable)
--- a/configure
+++ b/configure
@@ -1060,8 +1060,6 @@ Optional Features:
   --enable-selectionscrolling  enable scrolling during selections
   --enable-mousewheel     enable scrolling via mouse wheel or buttons 4 & 5
   --enable-slipwheeling   enable slip wheel scrolling     (requires previous)
-  --enable-old-selection  enable v2.20 (& prior) mouse selection style support
-  --disable-new-selection disable new mouse (xterm) selection style support
   --enable-dmalloc        enable Gray Watson's malloc - for debugging use
   --enable-dlmalloc       enable Doug Lea's malloc - for production use
                      NOTE: enable only one malloc package
@@ -5037,7 +5035,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5040 "configure"' > conftest.$ac_ext
+  echo '#line 5038 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5588,7 +5586,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:5591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -7204,7 +7202,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 7207 "configure"
+#line 7205 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -7302,7 +7300,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 7305 "configure"
+#line 7303 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8040,7 +8038,6 @@ support_selectionscrolling=no
 support_menubar=no
 support_mousewheel=no
 support_mouseslipwheel=no
-support_oldselection=no
 support_utmp=no
 support_wtmp=no
 support_lastlog=no
@@ -8083,7 +8080,6 @@ if test "${enable_everything+set}" = set; then
     support_menubar=yes
     support_mousewheel=yes
     support_mouseslipwheel=yes
-    support_oldselection=yes
     support_cursor_blink=yes
     support_text_blink=yes
     support_pointer_blank=yes
@@ -8425,26 +8421,6 @@ if test "${enable_slipwheeling+set}" = set; then
   fi
 fi;
 
-# Check whether --enable-old-selection or --disable-old-selection was given.
-if test "${enable_old_selection+set}" = set; then
-  enableval="$enable_old_selection"
-  if test x$enableval = xyes -o x$enableval = xno; then
-    support_oldselection=$enableval
-  fi
-fi;
-
-# Check whether --enable-new-selection or --disable-new-selection was given.
-if test "${enable_new_selection+set}" = set; then
-  enableval="$enable_new_selection"
-  if test x$enableval = xno; then
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_NEW_SELECTION 1
-_ACEOF
-
-  fi
-fi;
-
 # Check whether --enable-dmalloc or --disable-dmalloc was given.
 if test "${enable_dmalloc+set}" = set; then
   enableval="$enable_dmalloc"
@@ -16301,13 +16277,6 @@ cat >>confdefs.h <<\_ACEOF
 #define MOUSE_SLIP_WHEELING 1
 _ACEOF
 
-fi
-if test x$support_oldselection = xno; then
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_OLD_SELECTION 1
-_ACEOF
-
 fi
 if test x$support_utmp = xyes; then
 

diff --git a/src/gencompose b/src/gencompose
index 4ddb59dbe6d883cda4b10d805a8d1d4641139979..0ba46e13beaa66c28e7aef5abded599ab63a3ceb 100755 (executable)
--- a/src/gencompose
+++ b/src/gencompose
@@ -2,6 +2,23 @@
 
 open UNIDATA, "<", "www.unicode.org/Public/UNIDATA/UnicodeData.txt"
    or die "www.unicode.org/Public/UNIDATA/UnicodeData.txt: $!";
+my %docom = qw(initial | medial | final | isolated | compat | none |);
+
+while (<UNIDATA>) {
+   my ($code, undef, $category, undef, undef, $decompose, undef) = split /;/;
+
+   push @cat_z, $code if $category =~ /^Z/;
+
+   if ($decompose) {
+      $type = $decompose =~ s/^<(.*)>\s*// ? $1 : "none";
+
+      next unless $docom{$type};
+      next unless $decompose =~ /^([0-9a-f]+) ([0-9a-f]+)$/i;
+      my $pfx = sprintf "%08d %08d %08d", hex $1, hex $2, hex $code;
+      push @compose, [$pfx, hex $1, hex $2, hex $code];
+   }
+}
+
 open TABLE, ">", "table/compose.h"
    or die "table/compose.h: $!";
 
@@ -16,19 +33,6 @@ struct rxvt_compose_entry {
 #ifdef ENCODING_COMPOSE
 EOF
 
-my %docom = qw(initial | medial | final | isolated | compat | none |);
-
-while (<UNIDATA>) {
-   my ($code, undef, undef, undef, undef, $decompose, undef) = split /;/;
-   next unless $decompose;
-   $type = $decompose =~ s/^<(.*)>\s*// ? $1 : "none";
-
-   next unless $docom{$type};
-   next unless $decompose =~ /^([0-9a-f]+) ([0-9a-f]+)$/i;
-   my $pfx = sprintf "%08d %08d %08d", hex $1, hex $2, hex $code;
-   push @compose, [$pfx, hex $1, hex $2, hex $code];
-}
-
 for (sort { $a->[0] cmp $b->[0] } @compose) {
    next if $seen{$_->[1],$_->[2]}++;
    printf TABLE " { 0x%05x, 0x%05x, 0x%05x },\n", $_->[1], $_->[2], $_->[3];
@@ -39,3 +43,20 @@ print TABLE <<EOF;
 #endif
 };
 EOF
+
+open TABLE_Z, ">", "table/category.h";
+
+print TABLE_Z <<EOF;
+//
+// AUTOMATICALLLY GENERATED by gencompose
+//
+
+#define IS_SPACE(c)    \\
+EOF
+
+for (@cat_z) {
+   print TABLE_Z "     (c) == 0x$_ || \\\n";
+}
+
+print TABLE_Z "        0\n";
+

diff --git a/src/init.C b/src/init.C
index 7cfb982b459f7347259ebac14a771ed6c7f0b290..772efa4c3d86e265a9b485f46c76c3888a740fa1 100644 (file)
--- a/src/init.C
+++ b/src/init.C
@@ -386,12 +386,6 @@ rxvt_term::init_vars ()
   TermWin.saveLines = SAVELINES;
   numPixColors = TOTAL_COLORS;
 
-#ifndef NO_NEW_SELECTION
-  selection_style = NEW_SELECT;
-#else
-  selection_style = OLD_SELECT;
-#endif
-
 #ifndef NO_BRIGHTCOLOR
   colorfgbg = DEFAULT_RSTYLE;
 #endif
@@ -626,18 +620,6 @@ rxvt_term::init_resources (int argc, const char *const *argv)
       rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
     }
 
-  if (rs[Rs_selectstyle])
-    {
-      if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
-        selection_style = OLD_WORD_SELECT;
-#ifndef NO_OLD_SELECTION
-
-      else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
-        selection_style = OLD_SELECT;
-#endif
-
-    }
-
 #ifdef HAVE_SCROLLBARS
   setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
                    rs[Rs_scrollBar_thickness]);

diff --git a/src/rxvtlib.h.in b/src/rxvtlib.h.in
index 2d1157cfa43472f3ce2c09835fa583c719f14eea..613ae1966e052636de69fc80a14404e91ab31ea1 100644 (file)
--- a/src/rxvtlib.h.in
+++ b/src/rxvtlib.h.in
@@ -171,10 +171,6 @@ typedef struct {
   row_col_t       end;        /* one character past end point              */
 } selection_t;
 
-typedef enum {
-    OLD_SELECT, OLD_WORD_SELECT, NEW_SELECT
-} sstyle_t;
-
 /* ------------------------------------------------------------------------- */
 
 /* screen_t flags */
@@ -263,7 +259,6 @@ struct rxvt_vars {
   screen_t        screen;
   screen_t        swap;
   selection_t     selection;
-  sstyle_t        selection_style;
 };
 
 void rxvt_init_signals ();

diff --git a/src/table/category.h b/src/table/category.h
new file mode 100644 (file)
index 0000000..6e42f7c
--- /dev/null
+++ b/src/table/category.h
@@ -0,0 +1,27 @@
+//
+// AUTOMATICALLLY GENERATED by gencompose
+//
+
+#define IS_SPACE(c)    \
+       (c) == 0x0020 || \
+       (c) == 0x00A0 || \
+       (c) == 0x1680 || \
+       (c) == 0x180E || \
+       (c) == 0x2000 || \
+       (c) == 0x2001 || \
+       (c) == 0x2002 || \
+       (c) == 0x2003 || \
+       (c) == 0x2004 || \
+       (c) == 0x2005 || \
+       (c) == 0x2006 || \
+       (c) == 0x2007 || \
+       (c) == 0x2008 || \
+       (c) == 0x2009 || \
+       (c) == 0x200A || \
+       (c) == 0x200B || \
+       (c) == 0x2028 || \
+       (c) == 0x2029 || \
+       (c) == 0x202F || \
+       (c) == 0x205F || \
+       (c) == 0x3000 || \
+       0