From bc333fb6d6ac48cdcf4e9b87a1a9b7b9283bee4b Mon Sep 17 00:00:00 2001 From: pcg Date: Sun, 14 Mar 2004 23:14:37 +0000 Subject: [PATCH] *** empty log message *** --- autoconf/config.h.in | 6 ------ autoconf/configure.in | 17 ---------------- configure | 39 ++++------------------------------- src/gencompose | 47 +++++++++++++++++++++++++++++++------------ src/init.C | 18 ----------------- src/rxvtlib.h.in | 5 ----- src/table/category.h | 27 +++++++++++++++++++++++++ 7 files changed, 65 insertions(+), 94 deletions(-) create mode 100644 src/table/category.h diff --git a/autoconf/config.h.in b/autoconf/config.h.in index b5d2fbe1..4e4142f4 100644 --- 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 d898dbbe..f9467c4d 100644 --- 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 8985ea36..714330fa 100755 --- 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 < conftest.$ac_ext <>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 4ddb59db..0ba46e13 100755 --- 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 () { + 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 () { - 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 <", "table/category.h"; + +print TABLE_Z <