From: root Date: Tue, 3 Jan 2006 23:40:58 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=ef9e3929f1499ee666d11100be8e006097e1dd90;p=dana%2Furxvt.git *** empty log message *** --- diff --git a/Changes b/Changes index 5f6b4272..c31aeba7 100644 --- a/Changes +++ b/Changes @@ -23,6 +23,7 @@ WISH: better support for mixing xft font sizes rxvt -fn "xft:Andale Mono:size=15 intelligent/customized selection support, visual feedback, menus, tabs etc. See the the urxvtperl manpage, the -pe option, perl*-resources and keysym resources. Not everything is there yet. + - try to be more clever about differing font sizes and their ascent. - fix directory permissions on install. - improved sched_yield support. diff --git a/doc/rxvt.1.html b/doc/rxvt.1.html index 91965c16..21995151 100644 --- a/doc/rxvt.1.html +++ b/doc/rxvt.1.html @@ -268,22 +268,23 @@ section of rxvt(7).

-fb fontlist
-Compile font-styles: The bold font list to use when bold characters are to +Compile font-styles: The bold font list to use when bold characters are to be printed. See resource boldFont for details.

-fi fontlist
-Compile font-styles: The italic font list to use when bold characters are to +Compile font-styles: The italic font list to use when italic characters are to be printed. See resource italicFont for details.

-fbi fontlist
-Compile font-styles: The bold italic font list to use when bold characters are to -be printed. See resource boldItalicFont for details. +Compile font-styles: The bold italic font list to use when bold +italic > characters are to be printed. See resource boldItalicFont +for details.

-is|+is
diff --git a/doc/rxvt.1.man.in b/doc/rxvt.1.man.in index e74d19be..1b17fbbd 100644 --- a/doc/rxvt.1.man.in +++ b/doc/rxvt.1.man.in @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "rxvt 1" -.TH rxvt 1 "2006-01-03" "6.2" "RXVT-UNICODE" +.TH rxvt 1 "2006-01-04" "6.2" "RXVT-UNICODE" .SH "NAME" rxvt\-unicode (ouR XVT, unicode) \- (a VT102 emulator for the X window system) .SH "SYNOPSIS" @@ -300,16 +300,17 @@ See also the question \*(L"How does rxvt-unicode choose fonts?\*(R" in the \s-1F section of @@RXVT_NAME@@(7). .IP "\fB\-fb\fR \fIfontlist\fR" 4 .IX Item "-fb fontlist" -Compile font\-styles: The bold font list to use when bold characters are to +Compile font\-styles: The bold font list to use when \fBbold\fR characters are to be printed. See resource \fBboldFont\fR for details. .IP "\fB\-fi\fR \fIfontlist\fR" 4 .IX Item "-fi fontlist" -Compile font\-styles: The italic font list to use when bold characters are to +Compile font\-styles: The italic font list to use when \fIitalic\fR characters are to be printed. See resource \fBitalicFont\fR for details. .IP "\fB\-fbi\fR \fIfontlist\fR" 4 .IX Item "-fbi fontlist" -Compile font\-styles: The bold italic font list to use when bold characters are to -be printed. See resource \fBboldItalicFont\fR for details. +Compile font\-styles: The bold italic font list to use when \fB\f(BIbold +italic\fB\fR characters are to be printed. See resource \fBboldItalicFont\fR +for details. .IP "\fB\-is\fR|\fB+is\fR" 4 .IX Item "-is|+is" Compile font\-styles: Bold/Italic font styles imply high intensity diff --git a/doc/rxvt.1.txt b/doc/rxvt.1.txt index 8fb71b41..38b1b3ae 100644 --- a/doc/rxvt.1.txt +++ b/doc/rxvt.1.txt @@ -169,13 +169,13 @@ OPTIONS are to be printed. See resource boldFont for details. -fi *fontlist* - Compile font-styles: The italic font list to use when bold + Compile font-styles: The italic font list to use when *italic* characters are to be printed. See resource italicFont for details. -fbi *fontlist* - Compile font-styles: The bold italic font list to use when bold - characters are to be printed. See resource boldItalicFont for - details. + Compile font-styles: The bold italic font list to use when *bold + italic* characters are to be printed. See resource boldItalicFont + for details. -is|+is Compile font-styles: Bold/Italic font styles imply high intensity diff --git a/doc/rxvtperl.3.html b/doc/rxvtperl.3.html index 06c21f16..f33e8221 100644 --- a/doc/rxvtperl.3.html +++ b/doc/rxvtperl.3.html @@ -81,8 +81,10 @@ find them in /opt/rxvt/lib/urxvt/perl/.

selection
-Intelligent selection. This etxension tries to be more intelligent when the user -extends selections (double-click). +Intelligent selection. This extension tries to be more intelligent when +the user extends selections (double-click). Right now, it tries to select +urls and complete shell-quoted arguments, which is very convenient, too, +if your ls supports --quoting-style=shell.

It also offers the following bindable event:

@@ -823,14 +825,14 @@ Stop watching for events on the given filehandle.

URXVT_PERL_VERBOSITY

This variable controls the verbosity level of the perl extension. Higher numbers indicate more verbose output.

-
    -
  1. - only fatal messages
    -
    2. -
  2. - script loading and management
    -
    3. -
  3. - all events received
    -
    4. -
+
+
=0 - only fatal messages
+
+
=3 - script loading and management
+
+
=10 - all events received
+
+

diff --git a/doc/rxvtperl.3.man.in b/doc/rxvtperl.3.man.in index 61a36094..21bb1bb4 100644 --- a/doc/rxvtperl.3.man.in +++ b/doc/rxvtperl.3.man.in @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "rxvt 3" -.TH rxvt 3 "2006-01-03" "6.2" "RXVT-UNICODE" +.TH rxvt 3 "2006-01-04" "6.2" "RXVT-UNICODE" .SH "NAME" @@RXVT_NAME@@perl \- rxvt\-unicode's embedded perl interpreter .SH "SYNOPSIS" @@ -174,8 +174,10 @@ You can activate them like this: .Ve .IP "selection" 4 .IX Item "selection" -Intelligent selection. This etxension tries to be more intelligent when the user -extends selections (double\-click). +Intelligent selection. This extension tries to be more intelligent when +the user extends selections (double\-click). Right now, it tries to select +urls and complete shell-quoted arguments, which is very convenient, too, +if your \fIls\fR supports \f(CW\*(C`\-\-quoting\-style=shell\*(C'\fR. .Sp It also offers the following bindable event: .RS 4 @@ -757,13 +759,13 @@ Stop watching for events on the given filehandle. .IX Subsection "URXVT_PERL_VERBOSITY" This variable controls the verbosity level of the perl extension. Higher numbers indicate more verbose output. -.IP "0 \- only fatal messages" 4 -.IX Item "0 - only fatal messages" +.IP "=0 \- only fatal messages" 4 +.IX Item "=0 - only fatal messages" .PD 0 -.IP "3 \- script loading and management" 4 -.IX Item "3 - script loading and management" -.IP "10 \- all events received" 4 -.IX Item "10 - all events received" +.IP "=3 \- script loading and management" 4 +.IX Item "=3 - script loading and management" +.IP "=10 \- all events received" 4 +.IX Item "=10 - all events received" .PD .SH "AUTHOR" .IX Header "AUTHOR" diff --git a/doc/rxvtperl.3.txt b/doc/rxvtperl.3.txt index 85258740..39007fdb 100644 --- a/doc/rxvtperl.3.txt +++ b/doc/rxvtperl.3.txt @@ -32,8 +32,10 @@ DESCRIPTION rxvt -pe selection - Intelligent selection. This etxension tries to be more intelligent - when the user extends selections (double-click). + Intelligent selection. This extension tries to be more intelligent + when the user extends selections (double-click). Right now, it tries + to select urls and complete shell-quoted arguments, which is very + convenient, too, if your ls supports "--quoting-style=shell". It also offers the following bindable event: @@ -509,9 +511,9 @@ ENVIRONMENT This variable controls the verbosity level of the perl extension. Higher numbers indicate more verbose output. - 0 - only fatal messages - 3 - script loading and management - 10 - all events received + =0 - only fatal messages + =3 - script loading and management + =10 - all events received AUTHOR Marc Lehmann diff --git a/src/main.C b/src/main.C index e3cbaeb1..2a204ba7 100644 --- a/src/main.C +++ b/src/main.C @@ -925,7 +925,7 @@ rxvt_term::set_fonts () fwidth = prop.width; fheight = prop.height; - fbase = (*fs)[1]->ascent; + fbase = prop.ascent; for (int style = 1; style < 4; style++) { diff --git a/src/rxvtfont.C b/src/rxvtfont.C index 5fda418f..3f315fa0 100644 --- a/src/rxvtfont.C +++ b/src/rxvtfont.C @@ -278,6 +278,7 @@ struct rxvt_font_default : rxvt_font { rxvt_fontprop p; p.width = p.height = 1; + p.ascent = rxvt_fontprop::unset; p.weight = rxvt_fontprop::medium; p.slant = rxvt_fontprop::roman; @@ -525,6 +526,7 @@ rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, { p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; p.height = height; + p.ascent = rxvt_fontprop::unset; p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; @@ -555,6 +557,8 @@ rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) free (weight); free (slant); + p.ascent = f->ascent; + return true; } @@ -1075,6 +1079,7 @@ rxvt_font_xft::properties () p.width = width; p.height = height; + p.ascent = ascent; p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium; p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC @@ -1338,7 +1343,7 @@ rxvt_fontset::~rxvt_fontset () void rxvt_fontset::clear () { - prop.width = prop.height = prop.weight = prop.slant + prop.width = prop.height = prop.ascent = prop.weight = prop.slant = rxvt_fontprop::unset; for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) @@ -1521,6 +1526,9 @@ rxvt_fontset::find_font (unicode_t unicode) if (!realize_font (i)) goto next_font; + + if (prop.ascent != rxvt_fontprop::unset) + max_it (f->ascent, prop.ascent); } if (f->cs == CS_UNKNOWN) diff --git a/src/rxvtfont.h b/src/rxvtfont.h index 8b8ef86d..b62cea18 100644 --- a/src/rxvtfont.h +++ b/src/rxvtfont.h @@ -34,7 +34,7 @@ struct rxvt_fontprop { medium = 100, bold = 200, roman = 0, italic = 100, }; - int width, height; + int width, height, ascent; int weight, slant; }; diff --git a/src/urxvt.pm b/src/urxvt.pm index 1a0d6cb3..4816eba5 100644 --- a/src/urxvt.pm +++ b/src/urxvt.pm @@ -852,11 +852,11 @@ numbers indicate more verbose output. =over 4 -=item 0 - only fatal messages +=item =0 - only fatal messages -=item 3 - script loading and management +=item =3 - script loading and management -=item 10 - all events received +=item =10 - all events received =back