1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
|
--- src/rxvtfont.C
+++ src/rxvtfont.C
@@ -1253,98 +1253,60 @@
return false;
int ftheight = 0;
- bool success = true;
+ p = FcPatternDuplicate (match);
+ f = XftFontOpenPattern (disp, p);
- for (;;)
+ if (!f)
{
- p = FcPatternDuplicate (match);
- f = XftFontOpenPattern (disp, p);
-
- if (!f)
- {
- FcPatternDestroy (p);
- success = false;
- break;
- }
-
- FT_Face face = XftLockFace (f);
-
- // fuck me plenty: XftLockFace can actually return 0. try not to crash.
- // we also assume blindly that if the first lock succeeeds, then subsequent
- // locks will also succeed.
- if (!face)
- {
- XftFontClose (disp, f);
- success = false;
- break;
- }
-
- ascent = (face->size->metrics.ascender + 63) >> 6;
- descent = (-face->size->metrics.descender + 63) >> 6;
- height = max (ascent + descent, (face->size->metrics.height + 63) >> 6);
- width = 0;
-
- bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
-
- XftUnlockFace (f);
-
- int glheight = height;
+ FcPatternDestroy (p);
+ return false;
+ }
- for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
- {
- FcChar16 ch = *t;
+ FT_Face face = XftLockFace (f);
- if (cs != CS_UNICODE
- && ch > 0x100
- && FROM_UNICODE (cs, ch) == NOCHAR)
- continue;
+ ascent = f->ascent;
+ descent = f->descent;
+ height = max (ascent + descent, f->height);
+ width = 0;
- // ignore characters we wouldn't use anyways
- bool careful;
- if (!has_char (*t, &prop, careful))
- continue;
+ bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
- XGlyphInfo g;
- XftTextExtents16 (disp, f, &ch, 1, &g);
+ XftUnlockFace (f);
- g.width -= g.x;
+ for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
+ {
+ FcChar16 ch = *t;
- int wcw = WCWIDTH (ch);
- if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
+ if (cs != CS_UNICODE
+ && ch > 0x100
+ && FROM_UNICODE (cs, ch) == NOCHAR)
+ continue;
+
+ // ignore characters we wouldn't use anyways
+ bool careful;
+ if (!has_char (*t, &prop, careful))
+ continue;
- if (width < g.width ) width = g.width;
- if (height < g.height ) height = g.height;
- if (glheight < g.height - g.y) glheight = g.height - g.y;
- }
+ XGlyphInfo g;
+ XftTextExtents16 (disp, f, &ch, 1, &g);
- if (!width)
- {
- rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
- width = f->max_advance_width;
- break;
- }
-
- if (prop.height == rxvt_fontprop::unset
- || (height <= prop.height && glheight <= prop.height)
- || height <= 2
- || !scalable)
- break;
+ g.width -= g.x;
- if (ftheight)
- {
- // take smaller steps near the end
- if (height > prop.height + 1) ftheight++;
- if (height > prop.height + 2) ftheight++;
- if (height > prop.height + 3) ftheight++;
+ int wcw = WCWIDTH (ch);
+ if (wcw > 1) g.xOff = g.xOff / wcw;
+ if (width < g.xOff ) width = g.xOff;
+ if (height < g.height) height = g.height;
+ }
+ bool success = true;
- ftheight -= height - prop.height;
- }
- else
- ftheight = prop.height - 1;
+ if (!width)
+ {
+ rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
XftFontClose (disp, f);
- FcPatternDel (match, FC_PIXEL_SIZE);
- FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
+ f = 0;
+
+ success = false;
}
FcPatternDestroy (match);
@@ -1505,7 +1467,7 @@
/* Left-align to bounding box, do not overlap to the left. */
max_it(ep->x, x_);
#endif
- ep->y = y_ + ascent;
+ ep->y = y_ + term->fbase + (term->lineSpace >> 1);
// the xft font cell might differ from the terminal font cell,
// in which case we use the average between the two.
--- src/screen.C
+++ src/screen.C
@@ -2539,8 +2539,8 @@
XSetForeground (dpy, gc, lookup_color(fore, pix_colors));
XDrawLine (dpy, vt, gc,
- xpixel, ypixel + font->ascent + 1,
- xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
+ xpixel, ypixel + Height2Pixel (1) - 1,
+ xpixel + Width2Pixel (count) - 1, ypixel + Height2Pixel (1) - 1);
}
} /* for (col....) */
} /* for (row....) */
--- src/table/jis0208_1990_0.h
+++ src/table/jis0208_1990_0.h
@@ -2241,6 +2241,7 @@
static uint32_t cs_jis0208_1990_0_from_unicode (unicode_t unicode) {
if (unicode == 0x2312) return 0x225e;
+ if (unicode == 0xff5e) return 0x2141;
uint8_t l = unicode;
uint16_t h = unicode >> 8;
if (0x00 <= h && h <= 0xff
|