From a2b8b616cdc860259cf5fdf7e31ab728921b4f31 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 16 Mar 2010 00:54:46 +0000 Subject: [PATCH] update to libev 4.0 --- README.FAQ | 6 +++--- README.configure | 4 ++-- configure | 32 ++++++++++++++++---------------- doc/rxvt.1.man.in | 5 ++++- doc/rxvt.7.man.in | 12 ++++++------ doc/rxvtperl.3.man.in | 6 +++++- src/ev_cpp.h | 26 +++++++++++--------------- 7 files changed, 47 insertions(+), 44 deletions(-) diff --git a/README.FAQ b/README.FAQ index 80460cac..1c257cea 100644 --- a/README.FAQ +++ b/README.FAQ @@ -652,7 +652,7 @@ RXVT-UNICODE/URXVT FREQUENTLY ASKED QUESTIONS The selection stuff mainly makes the selection perl-error-message aware and tells it to convert perl error messages into vi-commands to load the - relevant file and go tot he error line number. + relevant file and go to the error line number. URxvt.scrollstyle: plain URxvt.secondaryScroll: true @@ -735,7 +735,7 @@ RXVT-UNICODE/URXVT FREQUENTLY ASKED QUESTIONS bold and normal fonts. Please note that I used the "urxvt" instance name and not the "URxvt" - class name. Thats because I use different configs for different + class name. That is because I use different configs for different purposes, for example, my IRC window is started with "-name IRC", and uses these defaults: @@ -1040,7 +1040,7 @@ RXVT-UNICODE/URXVT FREQUENTLY ASKED QUESTIONS should be enabled, as important functionality (menus, selection, likely more in the future) depends on it. - You should not overwrite the "perl-ext-common" snd "perl-ext" resources + You should not overwrite the "perl-ext-common" and "perl-ext" resources system-wide (except maybe with "defaults"). This will result in useful behaviour. If your distribution aims at low memory, add an empty "perl-ext-common" resource to the app-defaults file. This will keep the diff --git a/README.configure b/README.configure index 672f685a..8c0a4ab0 100644 --- a/README.configure +++ b/README.configure @@ -64,7 +64,7 @@ CONFIGURE OPTIONS --enable-combining (default: on) Enable automatic composition of combining characters into composite characters. This is required for proper viewing of text where - accents are encoded as seperate unicode characters. This is done by + accents are encoded as separate unicode characters. This is done by using precomposited characters when available or creating new pseudo-characters when no precomposed form exists. @@ -163,7 +163,7 @@ CONFIGURE OPTIONS MWM-hints EWMH-hints (pid, utf8 names) and protocols (ping) urgency hint - seperate underline colour (-underlineColor) + separate underline colour (-underlineColor) settable border widths and borderless switch (-w, -b, -bl) visual depth selection (-depth) settable extra linespacing /-lsp) diff --git a/configure b/configure index 80b6de44..05a3ab7d 100755 --- a/configure +++ b/configure @@ -1324,7 +1324,7 @@ Optional Features: --enable-slipwheeling enable slip wheel scrolling (requires --enable-mousewheel) --enable-smart-resize enable smart growth/shrink behaviour --enable-text-blink enable blinking text - --enable-pointer-blank enable pointer blank when typing or inactive pointer + --enable-pointer-blank enable pointer blanking when typing or inactive --enable-utmp enable utmp (utmpx) support --enable-wtmp enable wtmp (wtmpx) support (requires --enable-utmp) --enable-lastlog enable lastlog support (requires --enable-utmp) @@ -5343,8 +5343,7 @@ done - -for ac_header in sys/inotify.h sys/epoll.h sys/event.h sys/queue.h port.h poll.h sys/select.h sys/eventfd.h sys/signalfd.h +for ac_header in sys/inotify.h sys/epoll.h sys/event.h port.h poll.h sys/select.h sys/eventfd.h sys/signalfd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then @@ -5680,7 +5679,8 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include + #include #include int main () @@ -7880,7 +7880,7 @@ fi { echo "$as_me:$LINENO: checking for XLIB_ILLEGAL_ACCESS" >&5 echo $ECHO_N "checking for XLIB_ILLEGAL_ACCESS... $ECHO_C" >&6; } -if test "${rxvt_xlib_illegal_access+set}" = set; then +if test "${rxvt_cv_xlib_illegal_access+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -7921,20 +7921,20 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - rxvt_xlib_illegal_access=yes + rxvt_cv_xlib_illegal_access=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - rxvt_xlib_illegal_access=no + rxvt_cv_xlib_illegal_access=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $rxvt_xlib_illegal_access" >&5 -echo "${ECHO_T}$rxvt_xlib_illegal_access" >&6; } -if test x$rxvt_xlib_illegal_access = xyes; then +{ echo "$as_me:$LINENO: result: $rxvt_cv_xlib_illegal_access" >&5 +echo "${ECHO_T}$rxvt_cv_xlib_illegal_access" >&6; } +if test x$rxvt_cv_xlib_illegal_access = xyes; then cat >>confdefs.h <<\_ACEOF #define XLIB_ILLEGAL_ACCESS 1 @@ -10244,7 +10244,7 @@ _ACEOF { echo "$as_me:$LINENO: checking for broken XIM callback" >&5 echo $ECHO_N "checking for broken XIM callback... $ECHO_C" >&6; } -if test "${rxvt_broken_ximcb+set}" = set; then +if test "${rxvt_cv_broken_ximcb+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -10276,20 +10276,20 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - rxvt_broken_ximcb=yes + rxvt_cv_broken_ximcb=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - rxvt_broken_ximcb=no + rxvt_cv_broken_ximcb=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $rxvt_broken_ximcb" >&5 -echo "${ECHO_T}$rxvt_broken_ximcb" >&6; } +{ echo "$as_me:$LINENO: result: $rxvt_cv_broken_ximcb" >&5 +echo "${ECHO_T}$rxvt_cv_broken_ximcb" >&6; } - if test x$rxvt_broken_ximcb = xyes; then + if test x$rxvt_cv_broken_ximcb = xyes; then cat >>confdefs.h <<\_ACEOF #define XIMCB_PROTO_BROKEN 1 diff --git a/doc/rxvt.1.man.in b/doc/rxvt.1.man.in index 6b80bcdb..77761eef 100644 --- a/doc/rxvt.1.man.in +++ b/doc/rxvt.1.man.in @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "@@RXVT_NAME@@ 1" -.TH @@RXVT_NAME@@ 1 "2009-12-30" "@@RXVT_VERSION@@" "RXVT-UNICODE" +.TH @@RXVT_NAME@@ 1 "2010-02-06" "@@RXVT_VERSION@@" "RXVT-UNICODE" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -1295,6 +1295,9 @@ Compile \fIfrills\fR: Sets the \s-1WM_TRANSIENT_FOR\s0 property to the given win .IX Item "override-redirect: boolean" Compile \fIfrills\fR: Sets override-redirect for the terminal window, making it almost invisible to window managers; option \fB\-override\-redirect\fR. +.IP "\fBiso14755:\fR \fIboolean\fR" 4 +.IX Item "iso14755: boolean" +Turn on/off \s-1ISO\s0 14755 (default enabled). .IP "\fBiso14755_52:\fR \fIboolean\fR" 4 .IX Item "iso14755_52: boolean" Turn on/off \s-1ISO\s0 14755 5.2 mode (default enabled). diff --git a/doc/rxvt.7.man.in b/doc/rxvt.7.man.in index 2ae84d50..577723e4 100644 --- a/doc/rxvt.7.man.in +++ b/doc/rxvt.7.man.in @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "@@RXVT_NAME@@ 7" -.TH @@RXVT_NAME@@ 7 "2009-12-30" "@@RXVT_VERSION@@" "RXVT-UNICODE" +.TH @@RXVT_NAME@@ 7 "2010-02-06" "@@RXVT_VERSION@@" "RXVT-UNICODE" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -940,7 +940,7 @@ write. .PP The selection stuff mainly makes the selection perl-error-message aware and tells it to convert perl error messages into vi-commands to load the -relevant file and go tot he error line number. +relevant file and go to the error line number. .PP .Vb 2 \& URxvt.scrollstyle: plain @@ -1042,7 +1042,7 @@ font is already bold, and I want to see a difference between bold and normal fonts. .PP Please note that I used the \f(CW\*(C`urxvt\*(C'\fR instance name and not the \f(CW\*(C`URxvt\*(C'\fR -class name. Thats because I use different configs for different purposes, +class name. That is because I use different configs for different purposes, for example, my \s-1IRC\s0 window is started with \f(CW\*(C`\-name IRC\*(C'\fR, and uses these defaults: .PP @@ -1414,7 +1414,7 @@ except higher disk and possibly memory usage. The perl interpreter should be enabled, as important functionality (menus, selection, likely more in the future) depends on it. .PP -You should not overwrite the \f(CW\*(C`perl\-ext\-common\*(C'\fR snd \f(CW\*(C`perl\-ext\*(C'\fR resources +You should not overwrite the \f(CW\*(C`perl\-ext\-common\*(C'\fR and \f(CW\*(C`perl\-ext\*(C'\fR resources system-wide (except maybe with \f(CW\*(C`defaults\*(C'\fR). This will result in useful behaviour. If your distribution aims at low memory, add an empty \&\f(CW\*(C`perl\-ext\-common\*(C'\fR resource to the app-defaults file. This will keep the @@ -2505,7 +2505,7 @@ see next switch), and right now rxvt-unicode cannot display them .IX Item "--enable-combining (default: on)" Enable automatic composition of combining characters into composite characters. This is required for proper viewing of text -where accents are encoded as seperate unicode characters. This is +where accents are encoded as separate unicode characters. This is done by using precomposited characters when available or creating new pseudo-characters when no precomposed form exists. .Sp @@ -2601,7 +2601,7 @@ in combination with other switches) is: \& MWM\-hints \& EWMH\-hints (pid, utf8 names) and protocols (ping) \& urgency hint -\& seperate underline colour (\-underlineColor) +\& separate underline colour (\-underlineColor) \& settable border widths and borderless switch (\-w, \-b, \-bl) \& visual depth selection (\-depth) \& settable extra linespacing /\-lsp) diff --git a/doc/rxvtperl.3.man.in b/doc/rxvtperl.3.man.in index fb026bc6..b8633732 100644 --- a/doc/rxvtperl.3.man.in +++ b/doc/rxvtperl.3.man.in @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "@@RXVT_NAME@@ 3" -.TH @@RXVT_NAME@@ 3 "2009-12-30" "@@RXVT_VERSION@@" "RXVT-UNICODE" +.TH @@RXVT_NAME@@ 3 "2010-02-06" "@@RXVT_VERSION@@" "RXVT-UNICODE" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -860,6 +860,10 @@ subwindow. .PD Called when various types of ClientMessage events are received (all with format=32, \s-1WM_PROTOCOLS\s0 or \s-1WM_PROTOCOLS:WM_DELETE_WINDOW\s0). +.ie n .IP "on_bell $term" 4 +.el .IP "on_bell \f(CW$term\fR" 4 +.IX Item "on_bell $term" +Called on receipt of a bell character. .ie n .SS "Variables in the ""urxvt"" Package" .el .SS "Variables in the \f(CWurxvt\fP Package" .IX Subsection "Variables in the urxvt Package" diff --git a/src/ev_cpp.h b/src/ev_cpp.h index c0051390..9764ee39 100644 --- a/src/ev_cpp.h +++ b/src/ev_cpp.h @@ -1,22 +1,18 @@ -#define EV_MINIMAL 2 -#define EV_USE_POLL 0 -#define EV_USE_INOTIFY 0 -#define EV_USE_EVENTFD 0 -#define EV_USE_SIGNALFD 0 -#define EV_MULTIPLICITY 0 -#define EV_PERIODIC_ENABLE 0 -#define EV_STAT_ENABLE 0 -#define EV_FORK_ENABLE 0 -#define EV_ASYNC_ENABLE 0 -#define EV_EMBED_ENABLE 0 -#define EV_CONFIG_H -#define EV_MINPRI 0 -#define EV_MAXPRI 0 +#define EV_USE_SELECT 1 +#define EV_USE_EPOLL 1 +#define EV_PREPARE_ENABLE 1 +#define EV_IDLE_ENABLE 1 +#define EV_SIGNAL_ENABLE 1 +#define EV_CHILD_ENABLE 1 #define EV_USE_STDEXCEPT 0 +#define EV_CONFIG_H #include -#if !ENABLE_FRILLS +#if ENABLE_FRILLS +# define EV_FEATURES 1+2 +#else +# define EV_FEATURES 0 # define NDEBUG #endif -- 2.34.1