From: root Date: Sat, 21 Jan 2006 19:50:52 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=f266296e3c53e368a04911eccc135ac58f50131b;p=dana%2Furxvt.git *** empty log message *** --- diff --git a/Changes b/Changes index 84d3d53d..dfb4eaff 100644 --- a/Changes +++ b/Changes @@ -29,6 +29,9 @@ WISH: support tex fonts - the non-terminfo visual bell is now done asynchronously, so continous ASCI BELs in one terminal do no longer monopolise the while urxvt[d] process. + - support some bsd makes (for the time being, gnu make is a safe bet). + - work around bugs in FreeBSDs gcc. + - implemented some *bsd fixes in configure. - removed support for obsolete offix dnd protocol. 7.1 Thu Jan 19 20:25:34 CET 2006 diff --git a/configure b/configure index 3e1fe49b..e95529c4 100755 --- a/configure +++ b/configure @@ -3223,35 +3223,33 @@ if test "$ac_cv_search_strerror" != no; then fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -LINKER="$CXX" if test x$GCC = xyes && test x$GXX = xyes; then - echo "$as_me:$LINENO: checking for main in -lsupc++" >&5 -echo $ECHO_N "checking for main in -lsupc++... $ECHO_C" >&6 -if test "${ac_cv_lib_supcpp_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsupc++ $LIBS" + echo "$as_me:$LINENO: checking for working libsupc++" >&5 +echo $ECHO_N "checking for working libsupc++... $ECHO_C" >&6 + save_CXX="$CXX" + save_LIBS="$LIBS" + CXX="$CC" + LIBS="$LIBS -lsupc++" + LINKER="$CC" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - - +struct test { }; void f() try { throw new test; } catch (...) { throw; } int main () { -main (); + ; return 0; } @@ -3265,7 +3263,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3277,26 +3275,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_supcpp_main=yes + echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6 else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_supcpp_main=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_supcpp_main" >&5 -echo "${ECHO_T}$ac_cv_lib_supcpp_main" >&6 -if test $ac_cv_lib_supcpp_main = yes; then - LINKER="$CC" - LIBS="$LIBS -lsupc++" + echo "$as_me:$LINENO: result: no, make everything bigger and slower" >&5 +echo "${ECHO_T}no, make everything bigger and slower" >&6 + CXX="$save_CXX" + LIBS="$save_LIBS" + LINKER="$CXX" -fi +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi LINKER=$LINKER @@ -3310,8 +3305,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test -z "$orig_CXXFLAGS"; then if test x$GCC = xyes && test "x$GXX" = xyes; then CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs" - -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -12001,8 +11995,10 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include // broken bsds (is that redundant) need this #include #include +#include int main () diff --git a/configure.ac b/configure.ac index 1d7b7d40..b4f2d817 100644 --- a/configure.ac +++ b/configure.ac @@ -35,16 +35,27 @@ AC_PROG_INSTALL AC_AIX AC_ISC_POSIX +AC_LANG(C++) -AC_LANG(C) - -dnl check wetehr we can link with gcc -lsupc++ -LINKER="$CXX" +dnl check wether we can link with gcc -lsupc++ if test x$GCC = xyes && test x$GXX = xyes; then - AC_CHECK_LIB(supc++, main, [ - LINKER="$CC" - LIBS="$LIBS -lsupc++" - ]) + dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it + AC_MSG_CHECKING([for working libsupc++]) + save_CXX="$CXX" + save_LIBS="$LIBS" + CXX="$CC" + LIBS="$LIBS -lsupc++" + LINKER="$CC" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }])], + [AC_MSG_RESULT(ok)], + [ + AC_MSG_RESULT([no, make everything bigger and slower]) + CXX="$save_CXX" + LIBS="$save_LIBS" + LINKER="$CXX" + ] + ) fi AC_SUBST(LINKER,[$LINKER]) @@ -774,8 +785,10 @@ fi AC_CACHE_CHECK(for unix-compliant filehandle passing ability, rxvt_can_pass_fds, [AC_TRY_LINK([ +#include // broken bsds (is that redundant) need this #include #include +#include ],[ { msghdr msg; diff --git a/doc/rxvtperl.3.html b/doc/rxvtperl.3.html index c49caa78..250b8c65 100644 --- a/doc/rxvtperl.3.html +++ b/doc/rxvtperl.3.html @@ -197,6 +197,28 @@ additionally stores the first match in the current line into the primary selection.

+
readline (enabled by default)
+
+
+A support package that tries to make editing with readline easier. At the +moment, it reacts to clicking with the left mouse button by trying to +move the text cursor to this position. It does so by generating as many +cursor-left or cursor-right keypresses as required (the this only works +for programs that correctly support wide characters). +
+
+

To avoid too many false positives, this is only done when:

+
+
+
- the mouse is on the same (multi-row-) line as the text cursor.
+
+
- the primary screen is currently being displayed.
+
+
- the text cursor is visible.
+
+
+

The normal selection mechanism isn't disabled, so quick successive clicks +might interfere with selection creation in harmless ways.

selection-autotransform
@@ -248,23 +270,6 @@ every error message as a selection pattern, and the second line transforms the message into vi commands to load the file.

-
readline
-
-
-A support package that tries to make editing with readline easier. At the -moment, it reacts to clicking with the left mouse button by trying to -move the text cursor to this position. It does so by generating as many -cursor-left or cursor-right keypresses as required (the this only works -for programs that correctly support wide characters). -
-
-

It only works when clicking into the same line (possibly extended over -multiple rows) as the text cursor and on the primary screen, to reduce the -risk of misinterpreting. The normal selection isn't disabled, so quick -successive clicks might interfere with selection creation in harmless -ways.

-
-

tabbed
@@ -1281,6 +1286,12 @@ AltGr), the meta key (often Alt) and the num lock key, if applicable. Returns the currently displayed screen (0 primary, 1 secondary).

+
$cursor_is_hidden = $term->hidden_cursor
+
+
+Returns wether the cursor is currently hidden or not. +
+

$view_start = $term->view_start ([$newvalue])
diff --git a/doc/rxvtperl.3.man.in b/doc/rxvtperl.3.man.in index 785ec7f4..8c7777c7 100644 --- a/doc/rxvtperl.3.man.in +++ b/doc/rxvtperl.3.man.in @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.3 +.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14 .\" .\" Standard preamble: .\" ======================================================================== @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "rxvt 3" -.TH rxvt 3 "2006-01-20" "7.1" "RXVT-UNICODE" +.TH rxvt 3 "2006-01-21" "7.2" "RXVT-UNICODE" .SH "NAME" @@RXVT_NAME@@perl \- rxvt\-unicode's embedded perl interpreter .SH "SYNOPSIS" @@ -267,6 +267,30 @@ bottom. \f(CW\*(C`Escape\*(C'\fR leaves search mode and returns to the point whe was started, while \f(CW\*(C`Enter\*(C'\fR or \f(CW\*(C`Return\*(C'\fR stay at the current position and additionally stores the first match in the current line into the primary selection. +.IP "readline (enabled by default)" 4 +.IX Item "readline (enabled by default)" +A support package that tries to make editing with readline easier. At the +moment, it reacts to clicking with the left mouse button by trying to +move the text cursor to this position. It does so by generating as many +cursor-left or cursor-right keypresses as required (the this only works +for programs that correctly support wide characters). +.Sp +To avoid too many false positives, this is only done when: +.RS 4 +.IP "\- the mouse is on the same (multi\-row\-) line as the text cursor." 4 +.IX Item "- the mouse is on the same (multi-row-) line as the text cursor." +.PD 0 +.IP "\- the primary screen is currently being displayed." 4 +.IX Item "- the primary screen is currently being displayed." +.IP "\- the text cursor is visible." 4 +.IX Item "- the text cursor is visible." +.RE +.RS 4 +.PD +.Sp +The normal selection mechanism isn't disabled, so quick successive clicks +might interfere with selection creation in harmless ways. +.RE .IP "selection-autotransform" 4 .IX Item "selection-autotransform" This selection allows you to do automatic transforms on a selection @@ -309,19 +333,6 @@ To expand the example above to typical perl error messages (\*(L"\s-1XXX\s0 at The first line tells the selection code to treat the unchanging part of every error message as a selection pattern, and the second line transforms the message into vi commands to load the file. -.IP "readline" 4 -.IX Item "readline" -A support package that tries to make editing with readline easier. At the -moment, it reacts to clicking with the left mouse button by trying to -move the text cursor to this position. It does so by generating as many -cursor-left or cursor-right keypresses as required (the this only works -for programs that correctly support wide characters). -.Sp -It only works when clicking into the same line (possibly extended over -multiple rows) as the text cursor and on the primary screen, to reduce the -risk of misinterpreting. The normal selection isn't disabled, so quick -successive clicks might interfere with selection creation in harmless -ways. .IP "tabbed" 4 .IX Item "tabbed" This transforms the terminal into a tabbar with additional terminals, that @@ -1121,6 +1132,10 @@ AltGr), the meta key (often Alt) and the num lock key, if applicable. .el .IP "$screen = \f(CW$term\fR\->current_screen" 4 .IX Item "$screen = $term->current_screen" Returns the currently displayed screen (0 primary, 1 secondary). +.ie n .IP "$cursor_is_hidden = $term\->hidden_cursor" 4 +.el .IP "$cursor_is_hidden = \f(CW$term\fR\->hidden_cursor" 4 +.IX Item "$cursor_is_hidden = $term->hidden_cursor" +Returns wether the cursor is currently hidden or not. .ie n .IP "$view_start = $term\->view_start ([$newvalue])" 4 .el .IP "$view_start = \f(CW$term\fR\->view_start ([$newvalue])" 4 .IX Item "$view_start = $term->view_start ([$newvalue])" diff --git a/doc/rxvtperl.3.txt b/doc/rxvtperl.3.txt index c113451a..240dc297 100644 --- a/doc/rxvtperl.3.txt +++ b/doc/rxvtperl.3.txt @@ -114,6 +114,23 @@ PREPACKAGED EXTENSIONS stay at the current position and additionally stores the first match in the current line into the primary selection. + readline (enabled by default) + A support package that tries to make editing with readline easier. + At the moment, it reacts to clicking with the left mouse button by + trying to move the text cursor to this position. It does so by + generating as many cursor-left or cursor-right keypresses as + required (the this only works for programs that correctly support + wide characters). + + To avoid too many false positives, this is only done when: + + - the mouse is on the same (multi-row-) line as the text cursor. + - the primary screen is currently being displayed. + - the text cursor is visible. + + The normal selection mechanism isn't disabled, so quick successive + clicks might interfere with selection creation in harmless ways. + selection-autotransform This selection allows you to do automatic transforms on a selection whenever a selection is made. @@ -149,20 +166,6 @@ PREPACKAGED EXTENSIONS of every error message as a selection pattern, and the second line transforms the message into vi commands to load the file. - readline - A support package that tries to make editing with readline easier. - At the moment, it reacts to clicking with the left mouse button by - trying to move the text cursor to this position. It does so by - generating as many cursor-left or cursor-right keypresses as - required (the this only works for programs that correctly support - wide characters). - - It only works when clicking into the same line (possibly extended - over multiple rows) as the text cursor and on the primary screen, to - reduce the risk of misinterpreting. The normal selection isn't - disabled, so quick successive clicks might interfere with selection - creation in harmless ways. - tabbed This transforms the terminal into a tabbar with additional terminals, that is, it implements what is commonly refered to as @@ -842,6 +845,9 @@ API DOCUMENTATION $screen = $term->current_screen Returns the currently displayed screen (0 primary, 1 secondary). + $cursor_is_hidden = $term->hidden_cursor + Returns wether the cursor is currently hidden or not. + $view_start = $term->view_start ([$newvalue]) Returns the row number of the topmost displayed line. Maximum value is 0, which displays the normal terminal contents. Lower values diff --git a/src/Makefile.in b/src/Makefile.in index c7581435..84281a96 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -88,15 +88,15 @@ RXVTD_BINNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)d$(EXEEXT) all: allbin rxvt: rxvt.o $(COMMON) - $(LINK) -o $@ $^ $(LIBS) $(XLIB) $(DLIB) @PERLLIB@ + $(LINK) -o $@ rxvt.o $(COMMON) $(LIBS) $(XLIB) $(DLIB) @PERLLIB@ # $(LIBTOOL) --mode=link $(LINK) rxvt.o librxvt.la $(LIBS) $(XLIB) $(DLIB) -o $@ rxvtd: rxvtd.o $(COMMON) $(COMMON_DAEMON) - $(LINK) -o $@ $^ $(LIBS) $(XLIB) $(DLIB) @PERLLIB@ + $(LINK) -o $@ rxvtd.o $(COMMON) $(COMMON_DAEMON) $(LIBS) $(XLIB) $(DLIB) @PERLLIB@ # $(LIBTOOL) --mode=link $(LINK) rxvtd.o rxvtdaemon.o librxvt.la $(LIBS) $(XLIB) $(DLIB) -o $@ rxvtc: rxvtc.o $(COMMON_DAEMON) fdpass.o - $(LINK) -o $@ $^ $(LIBS) $(DLIB) + $(LINK) -o $@ rxvtc.o $(COMMON_DAEMON) fdpass.o $(LIBS) $(DLIB) # $(LIBTOOL) --mode=link $(LINK) rxvtc.o rxvtdaemon.o $(LIBS) $(DLIB) -o $@ #librxvt.la: $(LIBOBJS)