|
Lines 1-6
Link Here
|
| 1 |
--- src/main.c.orig Wed Feb 9 11:57:04 2000 |
1 |
--- src/init.c.orig Mon Mar 27 19:50:56 2000 |
| 2 |
+++ src/main.c Wed Feb 9 12:02:43 2000 |
2 |
+++ src/init.c Mon Mar 27 19:51:44 2000 |
| 3 |
@@ -460,6 +460,16 @@ |
3 |
@@ -866,6 +866,16 @@ |
| 4 |
GCForeground | GCBackground | |
4 |
GCForeground | GCBackground | |
| 5 |
GCFont | GCGraphicsExposures, |
5 |
GCFont | GCGraphicsExposures, |
| 6 |
&gcvalue); |
6 |
&gcvalue); |
|
Lines 9-23
Link Here
|
| 9 |
+#ifdef MULTICHAR_SET |
9 |
+#ifdef MULTICHAR_SET |
| 10 |
+ gcvalue.font = TermWin.mfont->fid; |
10 |
+ gcvalue.font = TermWin.mfont->fid; |
| 11 |
+ TermWin.mgc = XCreateGC(Xdisplay, TermWin.vt, |
11 |
+ TermWin.mgc = XCreateGC(Xdisplay, TermWin.vt, |
| 12 |
+ GCForeground | GCBackground | |
12 |
+ GCForeground | GCBackground | |
| 13 |
+ GCFont | GCGraphicsExposures, |
13 |
+ GCFont | GCGraphicsExposures, |
| 14 |
+ &gcvalue); |
14 |
+ &gcvalue); |
| 15 |
+#endif |
15 |
+#endif |
| 16 |
+#endif |
16 |
+#endif |
| 17 |
} |
17 |
} |
| 18 |
} |
18 |
} |
| 19 |
/* window resizing - assuming the parent window is the correct size */ |
19 |
/*----------------------------------------------------------------------*/ |
| 20 |
@@ -969,7 +979,11 @@ |
20 |
--- src/main.c.orig Mon Mar 27 19:53:37 2000 |
|
|
21 |
+++ src/main.c Mon Mar 27 19:54:04 2000 |
| 22 |
@@ -546,7 +546,11 @@ |
| 21 |
|
23 |
|
| 22 |
/* alter existing GC */ |
24 |
/* alter existing GC */ |
| 23 |
if (!init) { |
25 |
if (!init) { |
|
Lines 29-46
Link Here
|
| 29 |
menubar_expose(); |
31 |
menubar_expose(); |
| 30 |
} |
32 |
} |
| 31 |
|
33 |
|
| 32 |
--- src/rxvt.h.orig Wed Feb 9 12:01:07 2000 |
34 |
--- src/rxvt.h.orig Mon Mar 27 19:54:20 2000 |
| 33 |
+++ src/rxvt.h Wed Feb 9 12:04:17 2000 |
35 |
+++ src/rxvt.h Mon Mar 27 19:55:36 2000 |
| 34 |
@@ -7,6 +7,8 @@ |
36 |
@@ -172,12 +172,19 @@ |
| 35 |
|
|
|
| 36 |
#include "feature.h" |
| 37 |
|
| 38 |
+#define FIX_ALIGNMENT |
| 39 |
+ |
| 40 |
/* |
| 41 |
***************************************************************************** |
| 42 |
* SYSTEM HACKS |
| 43 |
@@ -170,12 +172,19 @@ |
| 44 |
Window parent[KNOW_PARENTS], /* parent[0] is our window */ |
37 |
Window parent[KNOW_PARENTS], /* parent[0] is our window */ |
| 45 |
vt; /* vt100 window */ |
38 |
vt; /* vt100 window */ |
| 46 |
GC gc; /* GC for drawing text */ |
39 |
GC gc; /* GC for drawing text */ |
|
Lines 56-121
Link Here
|
| 56 |
XFontStruct *mfont; /* Multichar font structure */ |
49 |
XFontStruct *mfont; /* Multichar font structure */ |
| 57 |
+#endif |
50 |
+#endif |
| 58 |
+#ifdef FIX_ALIGNMENT |
51 |
+#ifdef FIX_ALIGNMENT |
| 59 |
+ GC mgc; |
52 |
+ GC mgc; |
| 60 |
#endif |
53 |
#endif |
| 61 |
XFontSet fontset; |
54 |
XFontSet fontset; |
| 62 |
#ifdef XPM_BACKGROUND |
55 |
#ifdef XPM_BACKGROUND |
| 63 |
--- src/screen.c.orig Wed Feb 9 12:04:29 2000 |
56 |
--- src/screen.c.orig Mon Mar 27 19:56:10 2000 |
| 64 |
+++ src/screen.c Wed Feb 9 12:23:07 2000 |
57 |
+++ src/screen.c Mon Mar 27 20:00:03 2000 |
| 65 |
@@ -2169,7 +2169,12 @@ |
58 |
@@ -2162,7 +2162,12 @@ |
| 66 |
* always go back to the base font - it's much safer |
59 |
* always go back to the base font - it's much safer |
| 67 |
*/ |
60 |
*/ |
| 68 |
wbyte = 0; |
61 |
wbyte = 0; |
|
|
62 |
- XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid); |
| 69 |
+#ifdef FIX_ALIGNMENT |
63 |
+#ifdef FIX_ALIGNMENT |
| 70 |
+ TermWin.gc = TermWin.ngc; |
64 |
+ TermWin.gc = TermWin.ngc; |
| 71 |
+ TermWin.vascent = TermWin.font->ascent; |
65 |
+ TermWin.vascent = TermWin.font->ascent; |
| 72 |
+#else |
66 |
+#else |
| 73 |
XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid); |
67 |
+ XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid); |
| 74 |
+#endif |
68 |
+#endif |
| 75 |
draw_string = XDrawString; |
69 |
draw_string = XDrawString; |
| 76 |
draw_image_string = XDrawImageString; |
70 |
draw_image_string = XDrawImageString; |
| 77 |
clearfirst = clearlast = 0; |
71 |
clearfirst = clearlast = 0; |
| 78 |
@@ -2378,7 +2383,11 @@ |
72 |
@@ -2371,7 +2376,11 @@ |
| 79 |
len = 0; |
73 |
len = 0; |
| 80 |
buffer[len++] = stp[col]; |
74 |
buffer[len++] = stp[col]; |
| 81 |
ypixelc = Row2Pixel(row); |
75 |
ypixelc = Row2Pixel(row); |
| 82 |
+#ifdef FIX_ALIGNMENT |
76 |
+#ifdef FIX_ALIGNMENT |
| 83 |
+ ypixel = ypixelc + TermWin.vascent; |
77 |
+ ypixel = ypixelc + TermWin.vascent; |
| 84 |
+#else |
78 |
+#else |
| 85 |
ypixel = ypixelc + TermWin.font->ascent; |
79 |
ypixel = ypixelc + TermWin.font->ascent; |
| 86 |
+#endif |
80 |
+#endif |
| 87 |
xpixel = Col2Pixel(col); |
81 |
xpixel = Col2Pixel(col); |
| 88 |
fontdiff = 0; |
82 |
fontdiff = 0; |
| 89 |
wlen = 1; |
83 |
wlen = 1; |
| 90 |
@@ -2399,7 +2408,13 @@ |
84 |
@@ -2392,7 +2401,13 @@ |
| 91 |
fprop = TermWin.mprop; |
85 |
fprop = TermWin.mprop; |
| 92 |
if (!wbyte && TermWin.mfont) { |
86 |
if (!wbyte && TermWin.mfont) { |
| 93 |
wbyte = 1; |
87 |
wbyte = 1; |
| 94 |
+#ifdef FIX_ALIGNMENT |
88 |
+#ifdef FIX_ALIGNMENT |
| 95 |
+ TermWin.gc = TermWin.mgc; |
89 |
+ TermWin.gc = TermWin.mgc; |
| 96 |
+ ypixel += TermWin.mfont->ascent - TermWin.vascent; |
90 |
+ ypixel += TermWin.mfont->ascent - TermWin.vascent; |
| 97 |
+ TermWin.vascent = TermWin.mfont->ascent; |
91 |
+ TermWin.vascent = TermWin.mfont->ascent; |
| 98 |
+#else |
92 |
+#else |
| 99 |
XSetFont(Xdisplay, TermWin.gc, TermWin.mfont->fid); |
93 |
XSetFont(Xdisplay, TermWin.gc, TermWin.mfont->fid); |
| 100 |
+#endif |
94 |
+#endif |
| 101 |
fontdiff = TermWin.mprop; |
95 |
fontdiff = TermWin.mprop; |
| 102 |
draw_string = XDrawString16; |
96 |
draw_string = XDrawString16; |
| 103 |
draw_image_string = XDrawImageString16; |
97 |
draw_image_string = XDrawImageString16; |
| 104 |
@@ -2446,7 +2461,13 @@ |
98 |
@@ -2439,7 +2454,13 @@ |
| 105 |
} |
99 |
} |
| 106 |
if (wbyte) { |
100 |
if (wbyte) { |
| 107 |
wbyte = 0; |
101 |
wbyte = 0; |
| 108 |
+#ifdef FIX_ALIGNMENT |
102 |
+#ifdef FIX_ALIGNMENT |
| 109 |
+ TermWin.gc = TermWin.ngc; |
103 |
+ TermWin.gc = TermWin.ngc; |
| 110 |
+ ypixel += TermWin.font->ascent - TermWin.vascent; |
104 |
+ ypixel += TermWin.font->ascent - TermWin.vascent; |
| 111 |
+ TermWin.vascent = TermWin.font->ascent; |
105 |
+ TermWin.vascent = TermWin.font->ascent; |
| 112 |
+#else |
106 |
+#else |
| 113 |
XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid); |
107 |
XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid); |
| 114 |
+#endif |
108 |
+#endif |
| 115 |
draw_string = XDrawString; |
109 |
draw_string = XDrawString; |
| 116 |
draw_image_string = XDrawImageString; |
110 |
draw_image_string = XDrawImageString; |
| 117 |
} |
111 |
} |
| 118 |
@@ -2544,7 +2565,11 @@ |
112 |
@@ -2537,7 +2558,11 @@ |
| 119 |
rend &= ~RS_Bold; /* we've taken care of it */ |
113 |
rend &= ~RS_Bold; /* we've taken care of it */ |
| 120 |
} else if (bfont) { |
114 |
} else if (bfont) { |
| 121 |
bfont = 0; |
115 |
bfont = 0; |
|
Lines 127-133
Link Here
|
| 127 |
} |
121 |
} |
| 128 |
#endif |
122 |
#endif |
| 129 |
/* |
123 |
/* |
| 130 |
@@ -2679,6 +2704,9 @@ |
124 |
@@ -2672,6 +2697,9 @@ |
| 131 |
end_row = TermWin.saveLines - TermWin.view_start; |
125 |
end_row = TermWin.saveLines - TermWin.view_start; |
| 132 |
if (selection.op && current_screen == selection.screen) { |
126 |
if (selection.op && current_screen == selection.screen) { |
| 133 |
i = selection.beg.row + TermWin.saveLines; |
127 |
i = selection.beg.row + TermWin.saveLines; |
|
Lines 137-139
Link Here
|
| 137 |
row = selection.end.row + TermWin.saveLines; |
131 |
row = selection.end.row + TermWin.saveLines; |
| 138 |
if (i >= end_row) |
132 |
if (i >= end_row) |
| 139 |
col = selection.beg.col; |
133 |
col = selection.beg.col; |
|
|
134 |
--- src/feature.h.orig Mon Mar 27 20:06:40 2000 |
| 135 |
+++ src/feature.h Mon Mar 27 20:07:27 2000 |
| 136 |
@@ -55,18 +55,18 @@ |
| 137 |
* overstrike just for multi char fonts |
| 138 |
* Note: NO_BOLDOVERSTRIKE implies NO_BOLDOVERSTRIKE_MULTI |
| 139 |
*/ |
| 140 |
-/* #define NO_BOLDOVERSTRIKE */ |
| 141 |
+#define NO_BOLDOVERSTRIKE |
| 142 |
/* #define NO_BOLDOVERSTRIKE_MULTI */ |
| 143 |
|
| 144 |
/* |
| 145 |
* Also use bold font or overstrike even if we use colour for bold |
| 146 |
*/ |
| 147 |
-#define VERYBOLD |
| 148 |
+/* #define VERYBOLD */ |
| 149 |
|
| 150 |
/* |
| 151 |
* Compile without support for real bold fonts |
| 152 |
*/ |
| 153 |
-/* #define NO_BOLDFONT */ |
| 154 |
+#define NO_BOLDFONT |
| 155 |
|
| 156 |
/* |
| 157 |
* If the screen has 24 bit mode, use that even if the default is 8 bit. |