ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.147 by root, Sun Dec 12 15:13:37 2004 UTC vs.
Revision 1.178 by root, Tue Dec 20 22:27:49 2005 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29 29
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 30#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 31
32#include <inttypes.h> 32#include <inttypes.h>
33#include <wchar.h>
34 33
35#include "salloc.C" // HACK, should be a seperate compile! 34#include "salloc.C" // HACK, should be a seperate compile!
36 35
37inline void fill_text (text_t *start, text_t value, int len) 36inline void fill_text (text_t *start, text_t value, int len)
38{ 37{
39 while (len--) 38 while (len--)
40 *start++ = value; 39 *start++ = value;
41} 40}
42 41
43/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
44#define PROP_SIZE 16384 43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 45#define TABSIZE 8 /* default tab size */
46 46
47/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 50#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 51 if (options & Opt_scrollTtyOutput) \
52 TermWin.view_start = 0 52 view_start = 0
53#define CLEAR_SELECTION() \ 53#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 54 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 55 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 56#define CLEAR_ALL_SELECTION() \
57 selection.beg.row = selection.beg.col \ 57 selection.beg.row = selection.beg.col \
… …
88/* 88/*
89 * CLEAR_ROWS : clear <num> rows starting from row <row> 89 * CLEAR_ROWS : clear <num> rows starting from row <row>
90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
92 */ 92 */
93#define drawBuffer TermWin.vt 93#define drawBuffer vt
94 94
95#define CLEAR_ROWS(row, num) \ 95#define CLEAR_ROWS(row, num) \
96 if (TermWin.mapped) \ 96 if (mapped) \
97 XClearArea (display->display, drawBuffer, 0, \ 97 XClearArea (display->display, drawBuffer, 0, \
98 Row2Pixel (row), (unsigned int)TermWin.width, \ 98 Row2Pixel (row), (unsigned int)width, \
99 (unsigned int)Height2Pixel (num), False) 99 (unsigned int)Height2Pixel (num), False)
100 100
101#define CLEAR_CHARS(x, y, num) \ 101#define CLEAR_CHARS(x, y, num) \
102 if (TermWin.mapped) \ 102 if (mapped) \
103 XClearArea (display->display, drawBuffer, x, y, \ 103 XClearArea (display->display, drawBuffer, x, y, \
104 (unsigned int)Width2Pixel (num), \ 104 (unsigned int)Width2Pixel (num), \
105 (unsigned int)Height2Pixel (1), False) 105 (unsigned int)Height2Pixel (1), False)
106 106
107#define ERASE_ROWS(row, num) \ 107#define ERASE_ROWS(row, num) \
108 XFillRectangle (display->display, drawBuffer, TermWin.gc, \ 108 XFillRectangle (display->display, drawBuffer, gc, \
109 0, Row2Pixel (row), \ 109 0, Row2Pixel (row), \
110 (unsigned int)TermWin.width, \ 110 (unsigned int)width, \
111 (unsigned int)Height2Pixel (num)) 111 (unsigned int)Height2Pixel (num))
112 112
113/* ------------------------------------------------------------------------- * 113/* ------------------------------------------------------------------------- *
114 * SCREEN `COMMON' ROUTINES * 114 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 115 * ------------------------------------------------------------------------- */
116 116
117/* Fill part/all of a line with blanks. */ 117/* Fill part/all of a line with blanks. */
118void 118void
119rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 119rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)
120{ 120{
121 if (!l.t)
122 {
123 lalloc (l);
124 col = 0;
125 width = ncol;
126 }
127
121 efs &= ~RS_baseattrMask; 128 efs &= ~RS_baseattrMask;
122 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 129 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
123 130
131 text_t *et = l.t + col;
132 rend_t *er = l.r + col;
133
124 while (width--) 134 while (width--)
125 { 135 {
126 *et++ = ' '; 136 *et++ = ' ';
127 *er++ = efs; 137 *er++ = efs;
128 } 138 }
129} 139}
130 140
131/* ------------------------------------------------------------------------- */ 141/* ------------------------------------------------------------------------- */
132/* Fill a full line with blanks - make sure it is allocated first */ 142/* Fill a full line with blanks - make sure it is allocated first */
133void 143void
134rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) 144rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
135{ 145{
136#ifdef DEBUG_STRICT 146 scr_blank_line (l, 0, ncol, efs);
137 assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL));
138#endif
139 if (tp[row] == NULL)
140 {
141 tp[row] = (text_t *)talloc->alloc ();
142 rp[row] = (rend_t *)ralloc->alloc ();
143 }
144
145 scr_blank_line (tp[row], rp[row], TermWin.ncol, efs);
146} 147}
147 148
148/* ------------------------------------------------------------------------- * 149/* ------------------------------------------------------------------------- *
149 * SCREEN INITIALISATION * 150 * SCREEN INITIALISATION *
150 * ------------------------------------------------------------------------- */ 151 * ------------------------------------------------------------------------- */
151void 152void
152rxvt_term::scr_reset () 153rxvt_term::scr_reset ()
153{ 154{
154 unsigned int ncol, nrow, total_rows, prev_total_rows;
155 unsigned int p, q; 155 unsigned int p, q;
156 int k; 156 int k;
157 rend_t setrstyle;
158 157
159#if ENABLE_OVERLAY 158#if ENABLE_OVERLAY
160 scr_overlay_off (); 159 scr_overlay_off ();
161#endif 160#endif
162 161
163 TermWin.view_start = 0; 162 view_start = 0;
164 num_scr = 0; 163 num_scr = 0;
165 164
166 if (TermWin.ncol == 0) 165 if (ncol == 0)
167 TermWin.ncol = 80; 166 ncol = 80;
168 167
169 if (TermWin.nrow == 0) 168 if (nrow == 0)
170 TermWin.nrow = 24; 169 nrow = 24;
171
172 ncol = TermWin.ncol;
173 nrow = TermWin.nrow;
174 170
175 if (ncol == prev_ncol && nrow == prev_nrow) 171 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 172 return;
177 173
178 // we need at least two lines for wrapping to work correctly 174 // we need at least two lines for wrapping to work correctly
179 if (nrow + TermWin.saveLines < 2) 175 if (nrow + saveLines < 2)
180 { 176 {
181 TermWin.saveLines++; 177 saveLines++;
182 prev_nrow--; 178 prev_nrow--;
183 TermWin.nscrolled++; 179 nsaved++;
184 } 180 }
185 181
186 want_refresh = 1; 182 want_refresh = 1;
187 183
188 prev_total_rows = prev_nrow + TermWin.saveLines; 184 int prev_total_rows = prev_nrow + saveLines;
189 total_rows = nrow + TermWin.saveLines; 185 total_rows = nrow + saveLines;
190 186
191 screen.tscroll = 0; 187 screen.tscroll = 0;
192 screen.bscroll = nrow - 1; 188 screen.bscroll = nrow - 1;
193 189
194 if (!talloc) 190 if (!save)
195 {
196 talloc = new rxvt_salloc (ncol * sizeof (text_t));
197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198 }
199
200 if (!screen.text)
201 { 191 {
202 /* 192 /*
203 * first time called so just malloc everything: don't rely on realloc 193 * first time called so just malloc everything: don't rely on realloc
204 * Note: this is still needed so that all the scrollback lines are NULL 194 * Note: this is still needed so that all the scrollback lines are NULL
205 */ 195 */
206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 196 nsaved = 0; /* no saved lines */
207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 197 term_start = 0;
208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 198
199 talloc = new rxvt_salloc (ncol * sizeof (text_t));
200 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
201
202 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
204 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 205 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
210 206
211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
213
214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
218
219 for (p = 0; p < nrow; p++) 207 for (p = nrow; p--; )
220 { 208 {
221 q = p + TermWin.saveLines;
222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 209 scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE);
223 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 210 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
224 screen.tlen[q] = swap.tlen[p] = 0;
225 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 211 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
226 } 212 }
227 213
228 memset (charsets, 'B', sizeof (charsets)); 214 memset (charsets, 'B', sizeof (charsets));
229 TermWin.nscrolled = 0; /* no saved lines */
230 rstyle = DEFAULT_RSTYLE; 215 rstyle = DEFAULT_RSTYLE;
231 screen.flags = Screen_DefaultFlags; 216 screen.flags = Screen_DefaultFlags;
232 screen.cur.row = screen.cur.col = 0; 217 screen.cur.row = screen.cur.col = 0;
233 screen.charset = 0; 218 screen.charset = 0;
234 current_screen = PRIMARY; 219 current_screen = PRIMARY;
… …
254 else 239 else
255 { 240 {
256 /* 241 /*
257 * add or delete rows as appropriate 242 * add or delete rows as appropriate
258 */ 243 */
259 setrstyle = DEFAULT_RSTYLE; 244
245 rxvt_salloc *old_ta;
246 rxvt_salloc *old_ra;
260 247
261 if (nrow < prev_nrow) 248 if (nrow < prev_nrow)
262 { 249 {
263 /* delete rows */ 250 /* delete rows */
264 k = min (TermWin.nscrolled, prev_nrow - nrow); 251 k = min (nsaved, prev_nrow - nrow);
252 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
265 scr_scroll_text (0, (int)prev_nrow - 1, k, 1); 253 scr_scroll_text (0, (int)prev_nrow - 1, k);
266 254
267 for (p = nrow; p < prev_nrow; p++) 255 for (p = nrow; p < prev_nrow; p++)
268 { 256 {
269 q = p + TermWin.saveLines; 257 lfree (ROW(p));
270
271 if (screen.text[q])
272 {
273#ifdef DEBUG_STRICT
274 assert (screen.rend[q]);
275#endif
276 talloc->free (screen.text[q]);
277 ralloc->free (screen.rend[q]);
278 }
279
280 if (swap.text[p]) 258 lfree (swap_save[p]);
281 {
282#ifdef DEBUG_STRICT
283 assert (swap.rend[p]);
284#endif
285 talloc->free (swap.text[p]);
286 ralloc->free (swap.rend[p]);
287 }
288
289#ifdef DEBUG_STRICT
290 assert (drawn_text[p] && drawn_rend[p]);
291#endif
292 talloc->free (drawn_text[p]); 259 lfree (drawn[p]);
293 ralloc->free (drawn_rend[p]);
294 } 260 }
295 261
296 /* we have fewer rows so fix up cursor position */ 262 /* we have fewer rows so fix up cursor position */
297 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 263 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
298 MIN_IT (swap.cur.row, (int32_t)nrow - 1);
299 264
300 scr_reset_realloc (); /* realloc _last_ */ 265 scr_reset_realloc (); /* realloc _last_ */
301 } 266 }
302 else if (nrow > prev_nrow) 267 else if (nrow > prev_nrow)
303 { 268 {
304 /* add rows */ 269 /* add rows */
305 scr_reset_realloc (); /* realloc _first_ */ 270 scr_reset_realloc (); /* realloc _first_ */
306 271
272 int ocol = ncol;
307 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 273 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
308 274
309 k = min (TermWin.nscrolled, nrow - prev_nrow); 275 k = min (nsaved, nrow - prev_nrow);
310 276
311 for (p = prev_total_rows; p < total_rows; p++) 277 for (p = prev_total_rows; p < total_rows; p++)
312 { 278 save[p].clear ();
313 screen.tlen[p] = 0;
314 screen.text[p] = NULL;
315 screen.rend[p] = NULL;
316 }
317 279
318 for (p = prev_total_rows; p < total_rows - k; p++) 280 for (p = prev_total_rows; p < total_rows - k; p++)
319 scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle); 281 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
320 282
321 for (p = prev_nrow; p < nrow; p++) 283 for (p = prev_nrow; p < nrow; p++)
322 { 284 {
323 swap.tlen[p] = 0; 285 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
324 swap.text[p] = NULL; 286 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
325 swap.rend[p] = NULL;
326 drawn_text[p] = NULL;
327 drawn_rend[p] = NULL;
328 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
329 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
330 } 287 }
331 288
332 if (k > 0) 289 if (k > 0)
333 { 290 {
334 scr_scroll_text (0, (int)nrow - 1, -k, 1); 291 scr_scroll_text (0, (int)nrow - 1, -k);
335 screen.cur.row += k; 292 screen.cur.row += k;
336 screen.s_cur.row += k; 293 screen.s_cur.row += k;
337 TermWin.nscrolled -= k; 294 nsaved -= k;
338 } 295 }
296
339#ifdef DEBUG_STRICT 297#ifdef DEBUG_STRICT
340 assert (screen.cur.row < TermWin.nrow); 298 assert (screen.cur.row < nrow);
341 assert (swap.cur.row < TermWin.nrow);
342#else /* drive with your eyes closed */ 299#else /* drive with your eyes closed */
343
344 MIN_IT (screen.cur.row, nrow - 1); 300 MIN_IT (screen.cur.row, nrow - 1);
345 MIN_IT (swap.cur.row, nrow - 1);
346#endif 301#endif
347 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this 302 ncol = ocol; // save b/c scr_blank_screen_mem uses this
348 } 303 }
349 304
350 /* resize columns */ 305 /* resize columns */
351 if (ncol != prev_ncol) 306 if (ncol != prev_ncol)
352 { 307 {
353 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); 308 old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
354 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); 309 old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
355 310
356 for (p = 0; p < total_rows; p++) 311 for (p = total_rows; p--; )
312 lresize (save[p]);
313
314 for (p = nrow; p--; )
357 { 315 {
358 if (screen.text[p]) 316 lresize (drawn[p]);
317 lresize (swap_save[p]);
318 }
319
320 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
321
322 delete old_ta;
323 delete old_ra;
324 }
325
326#if 0
327 // re-wrap lines, this is rather ugly, possibly because I am too dumb
328 // to come up with a lean and mean algorithm.
329 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
330 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
331
332 text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
333 rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
334 tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
335
336 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
337
338 p = prev_total_rows;
339 q = total_rows;
340
341 while (p > 0 && q > 0)
342 {
343 --p;
344
345 printf ("pq %d:%d\n", p, q);
346 if (save[p].t)
347 {
348 int llen = save[p].l;
349
350 assert (llen >= 0);
351
352 while (p && save[p - 1].l < 0)
359 { 353 {
360 screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t)); 354 --p;
361 screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
362
363 MIN_IT (screen.tlen[p], (int16_t)ncol);
364
365 if (ncol > prev_ncol) 355 llen += prev_ncol;
366 scr_blank_line (&screen.text[p][prev_ncol], 356 }
367 &screen.rend[p][prev_ncol], 357
368 ncol - prev_ncol, setrstyle); 358 int qlines = llen / ncol + 1;
359 int lofs = 0;
360
361 q -= qlines;
362
363 int qrow = q;
364
365 printf ("QL %d llen %d\n", qlines, llen);//D
366 for (; qlines--; qrow++)
367 {
368 if (qrow >= 0)
369 {
370 tp [qrow] = (text_t *)ta->alloc ();
371 rp [qrow] = (rend_t *)ra->alloc ();
372 tl [qrow] = LINE_CONT1;
373
374 int qcol = 0;
375
376 for (;;)
377 {
378 int prow = lofs / prev_ncol + p;
379 int pcol = lofs % prev_ncol;
380
381 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
382
383 printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol);
384
385 if (len <= 0)
386 {
387 tl [qrow] = qcol;
388
389 TODO
390 scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
391 ncol - qcol, DEFAULT_RSTYLE);
392
393 break;
394 }
395
396 assert (lofs < 1000);
397
398 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t));
399 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t));
400
401 lofs += len;
402 qcol += len;
403
404 if (qcol == ncol)
405 break;
406 }
407 }
408 else
409 lofs += ncol;
369 } 410 }
370 } 411 }
371
372 for (p = 0; p < nrow; p++)
373 {
374 drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t));
375 drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
376
377 if (ncol > prev_ncol)
378 scr_blank_line (&drawn_text[p][prev_ncol],
379 &drawn_rend[p][prev_ncol],
380 ncol - prev_ncol, setrstyle);
381
382 if (swap.text[p])
383 {
384 swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t));
385 swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
386
387 MIN_IT (swap.tlen[p], (int16_t)ncol);
388
389 if (ncol > prev_ncol)
390 scr_blank_line (&swap.text[p][prev_ncol],
391 &swap.rend[p][prev_ncol],
392 ncol - prev_ncol, setrstyle);
393 }
394
395 } 412 }
396 413
397 MIN_IT (screen.cur.col, (int16_t)ncol - 1); 414 free (screen.text); screen.text = tp;
398 MIN_IT (swap.cur.col, (int16_t)ncol - 1); 415 free (screen.rend); screen.rend = rp;
416 free (screen.tlen); screen.tlen = tl;
399 417
400 delete talloc; talloc = ta; 418 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
401 delete ralloc; ralloc = ra; 419#endif
402 }
403 420
404 if (tabs) 421 if (tabs)
405 free (tabs); 422 free (tabs);
406 } 423 }
407 424
… …
417} 434}
418 435
419void 436void
420rxvt_term::scr_reset_realloc () 437rxvt_term::scr_reset_realloc ()
421{ 438{
422 unsigned int total_rows, nrow;
423
424 nrow = TermWin.nrow;
425 total_rows = nrow + TermWin.saveLines;
426 /* *INDENT-OFF* */
427 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
428 buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *));
429 drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *));
430 swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *)); 439 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
431 440 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
432 screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t)); 441 buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
433 swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t)); 442 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
434
435 screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *));
436 buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *));
437 drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *));
438 swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *));
439 /* *INDENT-ON* */
440} 443}
441 444
442/* ------------------------------------------------------------------------- */ 445/* ------------------------------------------------------------------------- */
443/* 446/*
444 * Free everything. That way malloc debugging can find leakage. 447 * Free everything. That way malloc debugging can find leakage.
445 */ 448 */
446void 449void
447rxvt_term::scr_release () 450rxvt_term::scr_release ()
448{ 451{
449 unsigned int total_rows;
450 int i;
451
452 total_rows = TermWin.nrow + TermWin.saveLines;
453
454 delete talloc; talloc = 0; 452 delete talloc; talloc = 0;
455 delete ralloc; ralloc = 0; 453 delete ralloc; ralloc = 0;
456 454
457 free (screen.text); 455 free (save);
458 free (screen.tlen); 456 free (swap_save);
459 free (screen.rend);
460 free (drawn_text); 457 free (drawn);
461 free (drawn_rend);
462 free (swap.text);
463 free (swap.tlen);
464 free (swap.rend);
465 free (buf_text); 458 free (buf);
466 free (buf_rend);
467 free (tabs); 459 free (tabs);
468
469 /* NULL these so if anything tries to use them, we'll know about it */
470 screen.text = drawn_text = swap.text = NULL;
471 screen.rend = drawn_rend = swap.rend = NULL;
472 screen.tlen = swap.tlen = NULL;
473 buf_text = NULL;
474 buf_rend = NULL;
475 tabs = NULL;
476} 460}
477 461
478/* ------------------------------------------------------------------------- */ 462/* ------------------------------------------------------------------------- */
479/* 463/*
480 * Hard reset 464 * Hard reset
… …
531 set_font_style (); 515 set_font_style ();
532 break; 516 break;
533 } 517 }
534 518
535 /* boundary check in case screen size changed between SAVE and RESTORE */ 519 /* boundary check in case screen size changed between SAVE and RESTORE */
536 MIN_IT (s->cur.row, TermWin.nrow - 1); 520 MIN_IT (s->cur.row, nrow - 1);
537 MIN_IT (s->cur.col, TermWin.ncol - 1); 521 MIN_IT (s->cur.col, ncol - 1);
538#ifdef DEBUG_STRICT 522#ifdef DEBUG_STRICT
539 assert (s->cur.row >= 0); 523 assert (s->cur.row >= 0);
540 assert (s->cur.col >= 0); 524 assert (s->cur.col >= 0);
541#else /* drive with your eyes closed */ 525#else /* drive with your eyes closed */
542 MAX_IT (s->cur.row, 0); 526 MAX_IT (s->cur.row, 0);
… …
551 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 535 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
552 */ 536 */
553int 537int
554rxvt_term::scr_change_screen (int scrn) 538rxvt_term::scr_change_screen (int scrn)
555{ 539{
556 int i;
557#if NSCREENS
558 int offset;
559#endif
560
561 want_refresh = 1; 540 want_refresh = 1;
562
563 TermWin.view_start = 0; 541 view_start = 0;
564 542
565 if (current_screen == scrn) 543 if (current_screen == scrn)
566 return scrn; 544 return scrn;
567 545
568 selection_check (2); /* check for boundary cross */ 546 selection_check (2); /* check for boundary cross */
569 547
570 SWAP_IT (current_screen, scrn, int); 548 SWAP_IT (scrn, current_screen, int);
571 549
572 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 550 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
573 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 551 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
574# ifdef DEBUG_STRICT
575 assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow);
576 assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol);
577# else /* drive with your eyes closed */
578 MAX_IT (screen.cur.row, 0); 552 MAX_IT (screen.cur.row, 0);
579 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 553 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
580 MAX_IT (screen.cur.col, 0); 554 MAX_IT (screen.cur.col, 0);
581 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); 555 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
582# endif
583 556
584#if NSCREENS 557#if NSCREENS
585 if (options & Opt_secondaryScreen) 558 if (options & Opt_secondaryScreen)
586 { 559 {
587 num_scr = 0; 560 num_scr = 0;
588 offset = TermWin.saveLines;
589 561
590 for (i = prev_nrow; i--;) 562 for (int i = nrow; i--; )
591 { 563 SWAP_IT (ROW(i), swap_save[i], line_t);
592 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
593 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
594 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
595 }
596 564
597 SWAP_IT (screen.charset, swap.charset, int16_t); 565 SWAP_IT (screen.charset, swap.charset, int16_t);
598 SWAP_IT (screen.flags, swap.flags, int); 566 SWAP_IT (screen.flags, swap.flags, int);
599 screen.flags |= Screen_VisibleCursor; 567 screen.flags |= Screen_VisibleCursor;
600 swap.flags |= Screen_VisibleCursor; 568 swap.flags |= Screen_VisibleCursor;
601 } 569 }
602 else 570 else
603#endif 571#endif
604 if (options & Opt_secondaryScroll) 572 if (options & Opt_secondaryScroll)
605 //if (current_screen == PRIMARY)
606 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 573 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
607 574
608 return scrn; 575 return scrn;
609} 576}
610 577
611// clear WrapNext indicator, solidifying position on next line 578// clear WrapNext indicator, solidifying position on next line
… …
618 screen.flags &= ~Screen_WrapNext; 585 screen.flags &= ~Screen_WrapNext;
619 586
620 screen.cur.col = 0; 587 screen.cur.col = 0;
621 588
622 if (screen.cur.row == screen.bscroll) 589 if (screen.cur.row == screen.bscroll)
623 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 590 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
624 else if (screen.cur.row < TermWin.nrow - 1) 591 else if (screen.cur.row < nrow - 1)
625 screen.cur.row++; 592 screen.cur.row++;
626} 593}
627 594
628/* ------------------------------------------------------------------------- */ 595/* ------------------------------------------------------------------------- */
629/* 596/*
… …
659/* ------------------------------------------------------------------------- */ 626/* ------------------------------------------------------------------------- */
660/* 627/*
661 * Scroll text between <row1> and <row2> inclusive, by <count> lines 628 * Scroll text between <row1> and <row2> inclusive, by <count> lines
662 * count positive ==> scroll up 629 * count positive ==> scroll up
663 * count negative ==> scroll down 630 * count negative ==> scroll down
664 * spec == 0 for normal routines
665 */ 631 */
666int 632int
667rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 633rxvt_term::scr_scroll_text (int row1, int row2, int count)
668{ 634{
669 int i, j;
670 long nscrolled;
671
672 if (count == 0 || (row1 > row2)) 635 if (count == 0 || (row1 > row2))
673 return 0; 636 return 0;
674 637
675 want_refresh = 1; 638 want_refresh = 1;
639 num_scr += count;
676 640
677 if (row1 == 0 && count > 0 641 if (count > 0
642 && row1 == 0
643 && row2 == nrow - 1
678 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 644 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
679 { 645 {
680 nscrolled = (long)TermWin.nscrolled + (long)count; 646 nsaved = min (nsaved + count, saveLines);
647 term_start = (term_start + count) % total_rows;
681 648
682 if (nscrolled > (long)TermWin.saveLines) 649 if (selection.op && current_screen == selection.screen)
683 TermWin.nscrolled = TermWin.saveLines; 650 {
651 selection.beg.row -= count;
652 selection.end.row -= count;
653 selection.mark.row -= count;
654
655 selection_check (0);
656 }
657
658 for (int i = count; i--; )
659 scr_blank_screen_mem (ROW(row2 - i), rstyle);
684 else 660
685 TermWin.nscrolled = (unsigned int)nscrolled;
686
687 if ((options & Opt_scrollWithBuffer) 661 if ((options & Opt_scrollWithBuffer)
688 && TermWin.view_start != 0 662 && view_start != 0
689 && TermWin.view_start != TermWin.saveLines) 663 && view_start != saveLines)
690 scr_page (UP, count); 664 scr_page (UP, count);
691 } 665 }
692 else if (!spec) 666 else
693 row1 += TermWin.saveLines; 667 {
694
695 row2 += TermWin.saveLines;
696
697 if (selection.op && current_screen == selection.screen) 668 if (selection.op && current_screen == selection.screen)
698 { 669 {
699 i = selection.beg.row + TermWin.saveLines; 670 int i = selection.beg.row;
700 j = selection.end.row + TermWin.saveLines; 671 int j = selection.end.row;
672
701 if ((i < row1 && j > row1) 673 if ((i < row1 && j > row1)
702 || (i < row2 && j > row2) 674 || (i < row2 && j > row2)
703 || (i - count < row1 && i >= row1) 675 || (i - count < row1 && i >= row1)
704 || (i - count > row2 && i <= row2) 676 || (i - count > row2 && i <= row2)
705 || (j - count < row1 && j >= row1) 677 || (j - count < row1 && j >= row1)
706 || (j - count > row2 && j <= row2)) 678 || (j - count > row2 && j <= row2))
707 { 679 {
708 CLEAR_ALL_SELECTION (); 680 CLEAR_ALL_SELECTION ();
709 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 681 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
710 } 682 }
711 else if (j >= row1 && j <= row2) 683 else if (j >= row1 && j <= row2)
712 { 684 {
713 /* move selected region too */ 685 /* move selected region too */
714 selection.beg.row -= count; 686 selection.beg.row -= count;
715 selection.end.row -= count; 687 selection.end.row -= count;
716 selection.mark.row -= count; 688 selection.mark.row -= count;
689
690 selection_check (0);
717 } 691 }
718 }
719
720 selection_check (0); /* _after_ TermWin.nscrolled update */
721
722 num_scr += count;
723 j = count;
724
725 if (count < 0)
726 count = -count;
727
728 i = row2 - row1 + 1;
729 MIN_IT (count, i);
730
731 if (j > 0)
732 {
733 /* A: scroll up */
734
735 /* A1: Copy lines that will get clobbered by the rotation */
736 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
737 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
738
739 /* A2: Rotate lines */
740 i = row2 - row1 - count + 1;
741 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
742 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
743 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
744
745 j = row2 - count + 1, i = count;
746 }
747 else /* if (j < 0) */
748 {
749 /* B: scroll down */
750
751 /* B1: Copy lines that will get clobbered by the rotation */
752 for (i = 0, j = row2; i < count; i++, j--)
753 { 692 }
754 buf_text[i] = screen.text[j]; 693
755 buf_rend[i] = screen.rend[j]; 694 // use a simple and robust scrolling algorithm, this
695 // part of scr_scroll_text is not time-critical.
696
697 int rows = row2 - row1 + 1;
698
699 for (int row = 0; row < rows; row++)
756 } 700 {
701 buf [row] = ROW(row1 + (row + count + rows) % rows);
757 702
758 /* B2: Rotate lines */ 703 if (!IN_RANGE_EXC (row + count, 0, rows))
759 for (j = row2, i = j - count; i >= row1; i--, j--) 704 scr_blank_screen_mem (buf [row], rstyle);
760 { 705 }
761 screen.tlen[j] = screen.tlen[i];
762 screen.text[j] = screen.text[i];
763 screen.rend[j] = screen.rend[i];
764 }
765 706
766 j = row1, i = count; 707 for (int row = 0; row < rows; row++)
767 count = -count; 708 ROW(row1 + row) = buf [row];
768 } 709 }
769
770 /* C: Resurrect lines */
771 memset (screen.tlen + j, 0, i * sizeof (int16_t));
772 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
773 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
774 if (!spec) /* line length may not equal TermWin.ncol */
775 for (; i--; j++)
776 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
777 710
778 return count; 711 return count;
779} 712}
780 713
781/* ------------------------------------------------------------------------- */ 714/* ------------------------------------------------------------------------- */
… …
783 * Add text given in <str> of length <len> to screen struct 716 * Add text given in <str> of length <len> to screen struct
784 */ 717 */
785void 718void
786rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 719rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
787{ 720{
721 if (len <= 0) /* sanity */
722 return;
723
788 unsigned char checksel; 724 unsigned char checksel;
789 unicode_t c; 725 unicode_t c;
790 int i, row, last_col; 726 int row, last_col;
791 text_t *stp; 727 const unicode_t *strend = str + len;
792 rend_t *srp;
793
794 if (len <= 0) /* sanity */
795 return;
796 728
797 want_refresh = 1; 729 want_refresh = 1;
798 ZERO_SCROLLBACK (); 730 ZERO_SCROLLBACK ();
799 last_col = TermWin.ncol; 731 last_col = ncol;
800 732
801 if (nlines > 0) 733 if (nlines > 0)
802 { 734 {
803 nlines += screen.cur.row - screen.bscroll; 735 nlines += screen.cur.row - screen.bscroll;
804 if ((nlines > 0) 736 if ((nlines > 0)
805 && (screen.tscroll == 0) 737 && (screen.tscroll == 0)
806 && (screen.bscroll == (TermWin.nrow - 1))) 738 && (screen.bscroll == (nrow - 1)))
807 { 739 {
808 /* _at least_ this many lines need to be scrolled */ 740 /* _at least_ this many lines need to be scrolled */
809 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 741 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
810 screen.cur.row -= nlines; 742 screen.cur.row -= nlines;
811 } 743 }
812 } 744 }
813 745
814#ifdef DEBUG_STRICT 746#ifdef DEBUG_STRICT
815 assert (screen.cur.col < last_col); 747 assert (screen.cur.col < last_col);
816 assert ((screen.cur.row < TermWin.nrow) 748 assert ((screen.cur.row < nrow)
817 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 749 && (screen.cur.row >= - (int32_t)nsaved));
818#else /* drive with your eyes closed */ 750#else /* drive with your eyes closed */
819 MIN_IT (screen.cur.col, last_col - 1); 751 MIN_IT (screen.cur.col, last_col - 1);
820 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 752 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
821 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 753 MAX_IT (screen.cur.row, - (int32_t)nsaved);
822#endif 754#endif
823 row = screen.cur.row + TermWin.saveLines; 755 row = screen.cur.row;
824 756
825 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 757 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
826 758
827 stp = screen.text[row]; 759 line_t *line = &ROW(row);
828 srp = screen.rend[row];
829 760
830 while (len--) 761 while (str < strend)
831 { 762 {
832 c = *str++; 763 c = *str++;
833 764
834 if (c < 0x20) 765 if (c < 0x20)
835 switch (c) 766 if (c == C0_LF)
767 {
768 if (!line->is_longer ()) /* XXX: think about this */
769 MAX_IT (line->l, screen.cur.col);
770
771 screen.flags &= ~Screen_WrapNext;
772
773 if (screen.cur.row == screen.bscroll)
774 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
775 else if (screen.cur.row < (nrow - 1))
776 row = ++screen.cur.row;
777
778 line = &ROW(row); /* _must_ refresh */
779 continue;
780 }
781 else if (c == C0_CR)
836 { 782 {
837 case C0_HT: 783 if (!line->is_longer ()) /* XXX: think about this */
838 scr_tab (1, true);
839 continue;
840
841 case C0_LF:
842 if (screen.tlen[row] != -1) /* XXX: think about this */
843 MAX_IT (screen.tlen[row], screen.cur.col); 784 MAX_IT (line->l, screen.cur.col);
844 785
845 screen.flags &= ~Screen_WrapNext; 786 screen.flags &= ~Screen_WrapNext;
846
847 if (screen.cur.row == screen.bscroll)
848 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
849 else if (screen.cur.row < (TermWin.nrow - 1))
850 row = (++screen.cur.row) + TermWin.saveLines;
851
852 stp = screen.text[row]; /* _must_ refresh */
853 srp = screen.rend[row]; /* _must_ refresh */
854 continue;
855
856 case C0_CR:
857 if (screen.tlen[row] != -1) /* XXX: think about this */
858 MAX_IT (screen.tlen[row], screen.cur.col);
859
860 screen.flags &= ~Screen_WrapNext;
861 screen.cur.col = 0; 787 screen.cur.col = 0;
862 continue; 788 continue;
789 }
790 else if (c == C0_HT)
791 {
792 scr_tab (1, true);
793 continue;
863 } 794 }
864 795
865 if (checksel /* see if we're writing within selection */ 796 if (checksel /* see if we're writing within selection */
866 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 797 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
867 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 798 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
… …
875 CLEAR_SELECTION (); 806 CLEAR_SELECTION ();
876 } 807 }
877 808
878 if (screen.flags & Screen_WrapNext) 809 if (screen.flags & Screen_WrapNext)
879 { 810 {
880 screen.tlen[row] = -1; 811 line->set_is_longer ();
881 812
882 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; 813 scr_do_wrap ();
883
884 stp = screen.text[row]; /* _must_ refresh */
885 srp = screen.rend[row]; /* _must_ refresh */
886 } 814
815 row = screen.cur.row;
816 line = &ROW(row); /* _must_ refresh */
817 }
818
819 // some utf-8 decoders "decode" surrogate characters: let's fix this.
820 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
821 c = 0xfffd;
887 822
888 // rely on wcwidth to tell us the character width, at least for non-latin1 823 // rely on wcwidth to tell us the character width, at least for non-latin1
889 // do wcwidth before further replacements, as wcwidth says that line-drawing 824 // do wcwidth before further replacements, as wcwidth might return -1
890 // characters have width -1 (DOH!) on GNU/Linux sometimes. 825 // for the line drawing characters below as they might be invalid in the current
826 // locale.
891 int width = c < 0x100 ? 1 : wcwidth (c); 827 int width = c < 0x100 ? 1 : wcwidth (c);
892 828
893 if (charsets[screen.charset] == '0') // DEC SPECIAL 829 if (charsets[screen.charset] == '0') // DEC SPECIAL
894 { 830 {
895 // vt100 special graphics and line drawing 831 // vt100 special graphics and line drawing
896 // 5f-7e standard vt100 832 // 5f-7e standard vt100
897 // 40-5e rxvt extension for extra curses acs chars 833 // 40-5e rxvt extension for extra curses acs chars
898 static uint16_t vt100_0[63] = { // 40 .. 7e 834 static uint16_t vt100_0[62] = { // 41 .. 7e
899 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! 835 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 836 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
901 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 837 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
902 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 838 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
903 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 839 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
904 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f 840 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
905 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 841 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
906 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e 842 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
907 }; 843 };
908 844
909 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) 845 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
910 { 846 {
911 c = vt100_0[c - 0x40]; 847 c = vt100_0[c - 0x41];
912 width = 1; 848 width = 1; // vt100 line drawing characters are always single-width
913 } 849 }
914 } 850 }
915 851
916 if (screen.flags & Screen_Insert) 852 if (screen.flags & Screen_Insert)
917 scr_insdel_chars (width, INSERT); 853 scr_insdel_chars (width, INSERT);
918 854
919 if (width != 0) 855 if (width != 0)
920 { 856 {
921 // some utf-8 decoders decode surrogate characters.
922 if (0xd800 <= c && c <= 0xdfff)
923 c = 0xfffd;
924
925#if !UNICODE_3 857#if !UNICODE_3
926 // trim characters we can't store directly :( 858 // trim characters we can't store directly :(
927 if (c >= 0x10000) 859 if (c >= 0x10000)
928# if ENABLE_COMBINING 860# if ENABLE_COMBINING
929 c = rxvt_composite.compose (c); // map to lower 16 bits 861 c = rxvt_composite.compose (c); // map to lower 16 bits
… …
931 c = 0xfffd; 863 c = 0xfffd;
932# endif 864# endif
933#endif 865#endif
934 866
935 // nuke the character at this position, if required 867 // nuke the character at this position, if required
936 if (stp[screen.cur.col] == NOCHAR 868 if (line->t[screen.cur.col] == NOCHAR
937 || (screen.cur.col < TermWin.ncol - 1 869 || (screen.cur.col < ncol - 1
938 && stp[screen.cur.col + 1] == NOCHAR)) 870 && line->t[screen.cur.col + 1] == NOCHAR))
939 { 871 {
940 int col = screen.cur.col; 872 int col = screen.cur.col;
941 873
942 // find begin 874 // find begin
943 while (col > 0 && stp[col] == NOCHAR) 875 while (col > 0 && line->t[col] == NOCHAR)
944 col--; 876 col--;
945 877
946 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); 878 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
947 879
948 // found begin, nuke 880 // found begin, nuke
949 do { 881 do {
950 stp[col] = ' '; 882 line->t[col] = ' ';
951 srp[col] = rend; 883 line->r[col] = rend;
952 col++; 884 col++;
953 } while (col < TermWin.ncol && stp[col] == NOCHAR); 885 } while (col < ncol && line->t[col] == NOCHAR);
954 } 886 }
955 887
956 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 888 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
889
890 // if the character doesn't fit into the remaining columns...
891 if (screen.cur.col > last_col - width && last_col >= width)
892 {
893 // ...output spaces
894 c = ' ';
895 // and try the same character next loop iteration
896 --str;
897 }
957 898
958 do 899 do
959 { 900 {
960 stp[screen.cur.col] = c; 901 line->t[screen.cur.col] = c;
961 srp[screen.cur.col] = rend; 902 line->r[screen.cur.col] = rend;
962 903
963 if (screen.cur.col < last_col - 1) 904 if (screen.cur.col < last_col - 1)
964 screen.cur.col++; 905 screen.cur.col++;
965 else 906 else
966 { 907 {
967 screen.tlen[row] = last_col; 908 line->l = last_col;
968 if (screen.flags & Screen_Autowrap) 909 if (screen.flags & Screen_Autowrap)
969 screen.flags |= Screen_WrapNext; 910 screen.flags |= Screen_WrapNext;
970 break; 911 break;
971 } 912 }
972 913
… …
974 } 915 }
975 while (--width > 0); 916 while (--width > 0);
976 917
977 // pad with spaces when overwriting wide character with smaller one 918 // pad with spaces when overwriting wide character with smaller one
978 if (!width) 919 if (!width)
979 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 920 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++)
980 { 921 {
981 stp[c] = ' '; 922 line->t[c] = ' ';
982 srp[c] = rend; 923 line->r[c] = rend;
983 } 924 }
984 } 925 }
985 else if (width == 0) 926 else // width == 0
986 { 927 {
987#if ENABLE_COMBINING 928#if ENABLE_COMBINING
988 // handle combining characters 929 // handle combining characters
989 // we just tag the accent on the previous on-screen character. 930 // we just tag the accent on the previous on-screen character.
990 // this is arguably not correct, but also arguably not wrong. 931 // this is arguably not correct, but also arguably not wrong.
991 // we don't handle double-width characters nicely yet. 932 // we don't handle double-width characters nicely yet.
992
993 text_t *tp; 933 text_t *tp;
994 rend_t *rp; 934 rend_t *rp;
995 935
996 if (screen.cur.col > 0) 936 if (screen.cur.col > 0)
997 { 937 {
998 tp = stp + screen.cur.col - 1; 938 tp = line->t + screen.cur.col - 1;
999 rp = srp + screen.cur.col - 1; 939 rp = line->r + screen.cur.col - 1;
1000 940
1001 while (*tp == NOCHAR && tp > stp) 941 while (*tp == NOCHAR && tp > line->t)
1002 tp--, rp--; 942 tp--, rp--;
1003 } 943 }
1004 else if (screen.cur.row > 0 944 else if (screen.cur.row > 0
1005 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 945 && ROW(screen.cur.row - 1).is_longer ())
1006 { 946 {
1007 int line = screen.cur.row - 1 + TermWin.saveLines; 947 line_t *line = &ROW(screen.cur.row - 1);
1008 948
1009 tp = screen.text[line] + last_col - 1; 949 tp = line->t + last_col - 1;
1010 rp = screen.rend[line] + last_col - 1; 950 rp = line->r + last_col - 1;
1011 951
1012 while (*tp == NOCHAR && tp > screen.text[line]) 952 while (*tp == NOCHAR && tp > line->t)
1013 tp--, rp--; 953 tp--, rp--;
1014 } 954 }
1015 else 955 else
1016 continue; 956 continue;
1017 957
… …
1024 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 964 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1025#endif 965#endif
1026 } 966 }
1027 } 967 }
1028 968
1029 if (screen.tlen[row] != -1) /* XXX: think about this */ 969 if (!line->is_longer ()) /* XXX: think about this */
1030 MAX_IT (screen.tlen[row], screen.cur.col); 970 MAX_IT (line->l, screen.cur.col);
1031 971
1032#ifdef DEBUG_STRICT 972#ifdef DEBUG_STRICT
1033 assert (screen.cur.row >= 0); 973 assert (screen.cur.row >= 0);
1034#else /* drive with your eyes closed */ 974#else /* drive with your eyes closed */
1035 MAX_IT (screen.cur.row, 0); 975 MAX_IT (screen.cur.row, 0);
… …
1049 if (screen.cur.col == 0) 989 if (screen.cur.col == 0)
1050 { 990 {
1051 if (screen.cur.row > 0) 991 if (screen.cur.row > 0)
1052 { 992 {
1053#ifdef TERMCAP_HAS_BW 993#ifdef TERMCAP_HAS_BW
1054 screen.cur.col = TermWin.ncol - 1; 994 screen.cur.col = ncol - 1;
1055 screen.cur.row--; 995 screen.cur.row--;
1056 return; 996 return;
1057#endif 997#endif
1058 } 998 }
1059 } 999 }
… …
1079 1019
1080 if (count == 0) 1020 if (count == 0)
1081 return; 1021 return;
1082 else if (count > 0) 1022 else if (count > 0)
1083 { 1023 {
1084 int row = TermWin.saveLines + screen.cur.row; 1024 int row = screen.cur.row;
1085 text_t *tp = screen.text[row]; 1025
1086 rend_t *rp = screen.rend[row]; 1026 line_t &l = ROW(row);
1087 rend_t base_rend = rp[i]; 1027 rend_t base_rend = l.r[i];
1088 ht &= tp[i] == ' '; 1028 ht &= l.t[i] == ' ';
1089 1029
1090 for (; ++i < TermWin.ncol; ) 1030 for (; ++i < ncol; )
1091 if (tabs[i]) 1031 if (tabs[i])
1092 { 1032 {
1093 x = i; 1033 x = i;
1094 if (!--count) 1034 if (!--count)
1095 break; 1035 break;
1096 } 1036 }
1097 else 1037 else
1098 ht &= tp[i] == ' ' 1038 ht &= l.t[i] == ' '
1099 && RS_SAME (rp[i], base_rend); 1039 && RS_SAME (l.r[i], base_rend);
1100 1040
1101 if (count) 1041 if (count)
1102 x = TermWin.ncol - 1; 1042 x = ncol - 1;
1103 1043
1104 // store horizontal tab commands as characters inside the text 1044 // store horizontal tab commands as characters inside the text
1105 // buffer so they can be selected and pasted. 1045 // buffer so they can be selected and pasted.
1106 if (ht && options & Opt_pastableTabs) 1046 if (ht && options & Opt_pastableTabs)
1107 { 1047 {
1108 base_rend = SET_FONT (base_rend, 0); 1048 base_rend = SET_FONT (base_rend, 0);
1109 1049
1110 if (screen.tlen[row] != -1) /* XXX: think about this */ 1050 if (!l.is_longer ()) /* XXX: think about this */
1111 MAX_IT (screen.tlen[row], x); 1051 MAX_IT (l.l, x);
1112 1052
1113 i = screen.cur.col; 1053 i = screen.cur.col;
1114 1054
1115 tp[i] = '\t'; 1055 l.t[i] = '\t';
1116 rp[i] = base_rend; 1056 l.r[i] = base_rend;
1117 1057
1118 while (++i < x) 1058 while (++i < x)
1119 { 1059 {
1120 tp[i] = NOCHAR; 1060 l.t[i] = NOCHAR;
1121 rp[i] = base_rend; 1061 l.r[i] = base_rend;
1122 } 1062 }
1123 } 1063 }
1124 } 1064 }
1125 else /* if (count < 0) */ 1065 else /* if (count < 0) */
1126 { 1066 {
… …
1152rxvt_term::scr_backindex () 1092rxvt_term::scr_backindex ()
1153{ 1093{
1154 if (screen.cur.col > 0) 1094 if (screen.cur.col > 0)
1155 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1095 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1156 else 1096 else
1157 {
1158 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1159 return; /* um, yeah? */
1160
1161 scr_insdel_chars (1, INSERT); 1097 scr_insdel_chars (1, INSERT);
1162 }
1163} 1098}
1164#endif 1099#endif
1165/* ------------------------------------------------------------------------- */ 1100/* ------------------------------------------------------------------------- */
1166/* 1101/*
1167 * Process DEC Forward Index 1102 * Process DEC Forward Index
… …
1171 */ 1106 */
1172#if ENABLE_FRILLS 1107#if ENABLE_FRILLS
1173void 1108void
1174rxvt_term::scr_forwardindex () 1109rxvt_term::scr_forwardindex ()
1175{ 1110{
1176 int row; 1111 int row;
1177 1112
1178 if (screen.cur.col < TermWin.ncol - 1) 1113 if (screen.cur.col < ncol - 1)
1179 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1114 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1180 else 1115 else
1181 { 1116 {
1182 row = screen.cur.row + TermWin.saveLines; 1117 row = screen.cur.row;
1183 1118
1184 if (screen.tlen[row] == 0) 1119 if (ROW(row).is_longer ()) //TODO//FIXME//LEN
1185 return; /* um, yeah? */ 1120 ROW(row).l = ncol;
1186 else if (screen.tlen[row] == -1)
1187 screen.tlen[row] = TermWin.ncol;
1188 1121
1189 scr_gotorc (0, 0, R_RELATIVE); 1122 scr_gotorc (0, 0, R_RELATIVE);
1190 scr_insdel_chars (1, DELETE); 1123 scr_insdel_chars (1, DELETE);
1191 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1124 scr_gotorc (0, ncol - 1, R_RELATIVE);
1192 } 1125 }
1193} 1126}
1194#endif 1127#endif
1195 1128
1196/* ------------------------------------------------------------------------- */ 1129/* ------------------------------------------------------------------------- */
… …
1203 want_refresh = 1; 1136 want_refresh = 1;
1204 ZERO_SCROLLBACK (); 1137 ZERO_SCROLLBACK ();
1205 1138
1206 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1139 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1207 MAX_IT (screen.cur.col, 0); 1140 MAX_IT (screen.cur.col, 0);
1208 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1141 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1209 1142
1210 screen.flags &= ~Screen_WrapNext; 1143 screen.flags &= ~Screen_WrapNext;
1211 1144
1212 if (relative & R_RELATIVE) 1145 if (relative & R_RELATIVE)
1213 { 1146 {
… …
1238 else 1171 else
1239 screen.cur.row = row; 1172 screen.cur.row = row;
1240 } 1173 }
1241 1174
1242 MAX_IT (screen.cur.row, 0); 1175 MAX_IT (screen.cur.row, 0);
1243 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1176 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1244} 1177}
1245 1178
1246/* ------------------------------------------------------------------------- */ 1179/* ------------------------------------------------------------------------- */
1247/* 1180/*
1248 * direction should be UP or DN 1181 * direction should be UP or DN
… …
1259 1192
1260 screen.flags &= ~Screen_WrapNext; 1193 screen.flags &= ~Screen_WrapNext;
1261 1194
1262 if ((screen.cur.row == screen.bscroll && direction == UP) 1195 if ((screen.cur.row == screen.bscroll && direction == UP)
1263 || (screen.cur.row == screen.tscroll && direction == DN)) 1196 || (screen.cur.row == screen.tscroll && direction == DN))
1264 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1197 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1265 else 1198 else
1266 screen.cur.row += dirn; 1199 screen.cur.row += dirn;
1267 1200
1268 MAX_IT (screen.cur.row, 0); 1201 MAX_IT (screen.cur.row, 0);
1269 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1202 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1270 selection_check (0); 1203 selection_check (0);
1271} 1204}
1272 1205
1273/* ------------------------------------------------------------------------- */ 1206/* ------------------------------------------------------------------------- */
1274/* 1207/*
… …
1285 want_refresh = 1; 1218 want_refresh = 1;
1286 ZERO_SCROLLBACK (); 1219 ZERO_SCROLLBACK ();
1287 1220
1288 selection_check (1); 1221 selection_check (1);
1289 1222
1290 row = TermWin.saveLines + screen.cur.row; 1223 row = screen.cur.row;
1224
1291 switch (mode) 1225 switch (mode)
1292 { 1226 {
1293 case 0: /* erase to end of line */ 1227 case 0: /* erase to end of line */
1294 col = screen.cur.col; 1228 col = screen.cur.col;
1295 num = TermWin.ncol - col; 1229 num = ncol - col;
1296 MIN_IT (screen.tlen[row], (int16_t)col); 1230 MIN_IT (ROW(row).l, (int16_t)col);
1297 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1231 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1298 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1232 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1299 CLEAR_SELECTION (); 1233 CLEAR_SELECTION ();
1300 break; 1234 break;
1301 case 1: /* erase to beginning of line */ 1235 case 1: /* erase to beginning of line */
… …
1305 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1239 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1306 CLEAR_SELECTION (); 1240 CLEAR_SELECTION ();
1307 break; 1241 break;
1308 case 2: /* erase whole line */ 1242 case 2: /* erase whole line */
1309 col = 0; 1243 col = 0;
1310 num = TermWin.ncol; 1244 num = ncol;
1311 screen.tlen[row] = 0; 1245 ROW(row).l = 0;
1312 if (selection.beg.row <= screen.cur.row 1246 if (selection.beg.row <= screen.cur.row
1313 && selection.end.row >= screen.cur.row) 1247 && selection.end.row >= screen.cur.row)
1314 CLEAR_SELECTION (); 1248 CLEAR_SELECTION ();
1315 break; 1249 break;
1316 default: 1250 default:
1317 return; 1251 return;
1318 } 1252 }
1319 1253
1320 if (screen.text[row]) 1254 scr_blank_line (ROW(row), col, num, rstyle);
1321 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1322 else
1323 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1324} 1255}
1325 1256
1326/* ------------------------------------------------------------------------- */ 1257/* ------------------------------------------------------------------------- */
1327/* 1258/*
1328 * Erase part of whole of the screen 1259 * Erase part of whole of the screen
… …
1332 */ 1263 */
1333void 1264void
1334rxvt_term::scr_erase_screen (int mode) 1265rxvt_term::scr_erase_screen (int mode)
1335{ 1266{
1336 int num; 1267 int num;
1337 int32_t row, row_offset; 1268 int32_t row;
1338 rend_t ren; 1269 rend_t ren;
1339 XGCValues gcvalue; 1270 XGCValues gcvalue;
1340 1271
1341 want_refresh = 1; 1272 want_refresh = 1;
1342 ZERO_SCROLLBACK (); 1273 ZERO_SCROLLBACK ();
1343
1344 row_offset = (int32_t)TermWin.saveLines;
1345 1274
1346 switch (mode) 1275 switch (mode)
1347 { 1276 {
1348 case 0: /* erase to end of screen */ 1277 case 0: /* erase to end of screen */
1349 selection_check (1); 1278 selection_check (1);
1350 scr_erase_line (0); 1279 scr_erase_line (0);
1351 row = screen.cur.row + 1; /* possible OOB */ 1280 row = screen.cur.row + 1; /* possible OOB */
1352 num = TermWin.nrow - row; 1281 num = nrow - row;
1353 break; 1282 break;
1354 case 1: /* erase to beginning of screen */ 1283 case 1: /* erase to beginning of screen */
1355 selection_check (3); 1284 selection_check (3);
1356 scr_erase_line (1); 1285 scr_erase_line (1);
1357 row = 0; 1286 row = 0;
1358 num = screen.cur.row; 1287 num = screen.cur.row;
1359 break; 1288 break;
1360 case 2: /* erase whole screen */ 1289 case 2: /* erase whole screen */
1361 selection_check (3); 1290 selection_check (3);
1362 row = 0; 1291 row = 0;
1363 num = TermWin.nrow; 1292 num = nrow;
1364 break; 1293 break;
1365 default: 1294 default:
1366 return; 1295 return;
1367 } 1296 }
1368 1297
… …
1370 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1299 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1371 || (selection.end.row >= row 1300 || (selection.end.row >= row
1372 && selection.end.row <= row + num))) 1301 && selection.end.row <= row + num)))
1373 CLEAR_SELECTION (); 1302 CLEAR_SELECTION ();
1374 1303
1375 if (row >= TermWin.nrow) /* Out Of Bounds */ 1304 if (row >= nrow) /* Out Of Bounds */
1376 return; 1305 return;
1377 1306
1378 MIN_IT (num, (TermWin.nrow - row)); 1307 MIN_IT (num, (nrow - row));
1379 1308
1380 if (rstyle & (RS_RVid | RS_Uline)) 1309 if (rstyle & (RS_RVid | RS_Uline))
1381 ren = (rend_t) ~RS_None; 1310 ren = (rend_t) ~RS_None;
1382 else if (GET_BASEBG (rstyle) == Color_bg) 1311 else if (GET_BASEBG (rstyle) == Color_bg)
1383 { 1312 {
… …
1386 } 1315 }
1387 else 1316 else
1388 { 1317 {
1389 ren = rstyle & (RS_fgMask | RS_bgMask); 1318 ren = rstyle & (RS_fgMask | RS_bgMask);
1390 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1319 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1391 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1320 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1392 ERASE_ROWS (row, num); 1321 ERASE_ROWS (row, num);
1393 gcvalue.foreground = pix_colors[Color_fg]; 1322 gcvalue.foreground = pix_colors[Color_fg];
1394 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1323 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1395 } 1324 }
1396 1325
1397 for (; num--; row++) 1326 for (; num--; row++)
1398 { 1327 {
1399 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); 1328 scr_blank_screen_mem (ROW (row), rstyle);
1400 screen.tlen[row + row_offset] = 0; 1329 ROW (row).l = 0;
1401 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); 1330 scr_blank_line (drawn[row], 0, ncol, ren);
1402 } 1331 }
1403} 1332}
1333
1334#if ENABLE_FRILLS
1335void
1336rxvt_term::scr_erase_savelines ()
1337{
1338 want_refresh = 1;
1339 ZERO_SCROLLBACK ();
1340
1341 nsaved = 0;
1342}
1343#endif
1404 1344
1405/* ------------------------------------------------------------------------- */ 1345/* ------------------------------------------------------------------------- */
1406/* 1346/*
1407 * Fill the screen with `E's 1347 * Fill the screen with `E's
1408 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1348 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1409 */ 1349 */
1410void 1350void
1411rxvt_term::scr_E () 1351rxvt_term::scr_E ()
1412{ 1352{
1413 int i, j, k; 1353 rend_t fs;
1414 rend_t *r1, fs;
1415 1354
1416 want_refresh = 1; 1355 want_refresh = 1;
1417 ZERO_SCROLLBACK (); 1356 ZERO_SCROLLBACK ();
1418 1357
1419 num_scr_allow = 0; 1358 num_scr_allow = 0;
1420 selection_check (3); 1359 selection_check (3);
1421 1360
1422 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1361 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1423 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1362 for (int row = nrow; row--; )
1424 { 1363 {
1425 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1364 line_t &line = ROW(row);
1365
1426 fill_text (screen.text[k], 'E', TermWin.ncol); 1366 fill_text (line.t, 'E', ncol);
1427 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1367 rend_t *r1 = line.r;
1368
1369 for (int j = ncol; j--; )
1428 *r1++ = fs; 1370 *r1++ = fs;
1371
1372 line.l = ncol; /* make the `E's selectable */
1429 } 1373 }
1430} 1374}
1431 1375
1432/* ------------------------------------------------------------------------- */ 1376/* ------------------------------------------------------------------------- */
1433/* 1377/*
… …
1454 count = end; 1398 count = end;
1455 } 1399 }
1456 1400
1457 scr_do_wrap (); 1401 scr_do_wrap ();
1458 1402
1459 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1403 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1460} 1404}
1461 1405
1462/* ------------------------------------------------------------------------- */ 1406/* ------------------------------------------------------------------------- */
1463/* 1407/*
1464 * Insert/Delete <count> characters from the current position 1408 * Insert/Delete <count> characters from the current position
… …
1466void 1410void
1467rxvt_term::scr_insdel_chars (int count, int insdel) 1411rxvt_term::scr_insdel_chars (int count, int insdel)
1468{ 1412{
1469 int col, row; 1413 int col, row;
1470 rend_t tr; 1414 rend_t tr;
1471 text_t *stp;
1472 rend_t *srp;
1473 int16_t *slp;
1474 1415
1475 want_refresh = 1; 1416 want_refresh = 1;
1476 ZERO_SCROLLBACK (); 1417 ZERO_SCROLLBACK ();
1477 1418
1478 if (count <= 0) 1419 if (count <= 0)
1479 return; 1420 return;
1480 1421
1481 scr_do_wrap (); 1422 scr_do_wrap ();
1482 1423
1483 selection_check (1); 1424 selection_check (1);
1484 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1425 MIN_IT (count, (ncol - screen.cur.col));
1485 1426
1486 row = screen.cur.row + TermWin.saveLines;
1487
1488 stp = screen.text[row];
1489 srp = screen.rend[row]; 1427 row = screen.cur.row;
1490 slp = &screen.tlen[row]; 1428
1429 line_t *line = &ROW(row);
1491 1430
1492 switch (insdel) 1431 switch (insdel)
1493 { 1432 {
1494 case INSERT: 1433 case INSERT:
1495 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) 1434 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1496 { 1435 {
1497 stp[col] = stp[col - count]; 1436 line->t[col] = line->t[col - count];
1498 srp[col] = srp[col - count]; 1437 line->r[col] = line->r[col - count];
1499 } 1438 }
1500 1439
1501 if (*slp != -1) 1440 if (!line->is_longer ())
1502 { 1441 {
1503 *slp += count; 1442 line->l += count;
1504 MIN_IT (*slp, TermWin.ncol); 1443 MIN_IT (line->l, ncol);
1505 } 1444 }
1506 1445
1507 if (selection.op && current_screen == selection.screen 1446 if (selection.op && current_screen == selection.screen
1508 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1447 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1509 { 1448 {
1510 if (selection.end.row != screen.cur.row 1449 if (selection.end.row != screen.cur.row
1511 || (selection.end.col + count >= TermWin.ncol)) 1450 || (selection.end.col + count >= ncol))
1512 CLEAR_SELECTION (); 1451 CLEAR_SELECTION ();
1513 else 1452 else
1514 { /* shift selection */ 1453 { /* shift selection */
1515 selection.beg.col += count; 1454 selection.beg.col += count;
1516 selection.mark.col += count; /* XXX: yes? */ 1455 selection.mark.col += count; /* XXX: yes? */
1517 selection.end.col += count; 1456 selection.end.col += count;
1518 } 1457 }
1519 } 1458 }
1520 1459
1521 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1460 scr_blank_line (*line, screen.cur.col, count, rstyle);
1522 (unsigned int)count, rstyle);
1523 break; 1461 break;
1524 1462
1525 case ERASE: 1463 case ERASE:
1526 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1464 screen.cur.col += count; /* don't worry if > ncol */
1527 selection_check (1); 1465 selection_check (1);
1528 screen.cur.col -= count; 1466 screen.cur.col -= count;
1529 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1467 scr_blank_line (*line, screen.cur.col, count, rstyle);
1530 (unsigned int)count, rstyle);
1531 break; 1468 break;
1532 1469
1533 case DELETE: 1470 case DELETE:
1534 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1471 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1535 1472
1536 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1473 for (col = screen.cur.col; (col + count) < ncol; col++)
1537 { 1474 {
1538 stp[col] = stp[col + count]; 1475 line->t[col] = line->t[col + count];
1539 srp[col] = srp[col + count]; 1476 line->r[col] = line->r[col + count];
1540 } 1477 }
1541 1478
1542 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], 1479 scr_blank_line (*line, ncol - count, count, tr);
1543 (unsigned int)count, tr);
1544 1480
1545 if (*slp == -1) /* break line continuation */ 1481 if (line->is_longer ()) /* break line continuation */
1546 *slp = TermWin.ncol; 1482 line->l = ncol;
1547 1483
1548 *slp -= count; 1484 line->l = max (line->l - count, 0);
1549 MAX_IT (*slp, 0);
1550 1485
1551 if (selection.op && current_screen == selection.screen 1486 if (selection.op && current_screen == selection.screen
1552 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1487 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1553 { 1488 {
1554 if (selection.end.row != screen.cur.row 1489 if (selection.end.row != screen.cur.row
1555 || (screen.cur.col >= selection.beg.col - count) 1490 || (screen.cur.col >= selection.beg.col - count)
1556 || selection.end.col >= TermWin.ncol) 1491 || selection.end.col >= ncol)
1557 CLEAR_SELECTION (); 1492 CLEAR_SELECTION ();
1558 else 1493 else
1559 { 1494 {
1560 /* shift selection */ 1495 /* shift selection */
1561 selection.beg.col -= count; 1496 selection.beg.col -= count;
… …
1575 */ 1510 */
1576void 1511void
1577rxvt_term::scr_scroll_region (int top, int bot) 1512rxvt_term::scr_scroll_region (int top, int bot)
1578{ 1513{
1579 MAX_IT (top, 0); 1514 MAX_IT (top, 0);
1580 MIN_IT (bot, (int)TermWin.nrow - 1); 1515 MIN_IT (bot, (int)nrow - 1);
1581 1516
1582 if (top > bot) 1517 if (top > bot)
1583 return; 1518 return;
1584 1519
1585 screen.tscroll = top; 1520 screen.tscroll = top;
… …
1664 */ 1599 */
1665void 1600void
1666rxvt_term::scr_set_tab (int mode) 1601rxvt_term::scr_set_tab (int mode)
1667{ 1602{
1668 if (mode < 0) 1603 if (mode < 0)
1669 memset (tabs, 0, TermWin.ncol * sizeof (char)); 1604 memset (tabs, 0, ncol * sizeof (char));
1670 else if (screen.cur.col < TermWin.ncol) 1605 else if (screen.cur.col < ncol)
1671 tabs[screen.cur.col] = (mode ? 1 : 0); 1606 tabs[screen.cur.col] = (mode ? 1 : 0);
1672} 1607}
1673 1608
1674/* ------------------------------------------------------------------------- */ 1609/* ------------------------------------------------------------------------- */
1675/* 1610/*
… …
1690 if (bgPixmap.pixmap == None) 1625 if (bgPixmap.pixmap == None)
1691#endif 1626#endif
1692#if TRANSPARENT 1627#if TRANSPARENT
1693 if (! (options & Opt_transparent) || am_transparent == 0) 1628 if (! (options & Opt_transparent) || am_transparent == 0)
1694#endif 1629#endif
1695 XSetWindowBackground (display->display, TermWin.vt, 1630 XSetWindowBackground (display->display, vt,
1696 pix_colors[Color_bg]); 1631 pix_colors[Color_bg]);
1697 1632
1698 gcvalue.foreground = pix_colors[Color_fg]; 1633 gcvalue.foreground = pix_colors[Color_fg];
1699 gcvalue.background = pix_colors[Color_bg]; 1634 gcvalue.background = pix_colors[Color_bg];
1700 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1635 XChangeGC (display->display, gc, GCBackground | GCForeground,
1701 &gcvalue); 1636 &gcvalue);
1702 scr_clear (); 1637 scr_clear ();
1703 scr_touch (true); 1638 scr_touch (true);
1704 } 1639 }
1705} 1640}
… …
1786bool 1721bool
1787rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1722rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1788{ 1723{
1789 bool found = false; 1724 bool found = false;
1790 1725
1791 for (int i = 0; i < TermWin.nrow; i++) 1726 for (int i = 0; i < nrow; i++)
1792 { 1727 {
1793 int col = 0; 1728 int col = 0;
1794 rend_t *drp = drawn_rend [i]; 1729 rend_t *drp = drawn[i].r;
1795 1730
1796 for (; col < TermWin.ncol; col++, drp++) 1731 for (; col < ncol; col++, drp++)
1797 if ((*drp & mask) == value) 1732 if ((*drp & mask) == value)
1798 { 1733 {
1799 found = true; 1734 found = true;
1800 *drp = ~value; 1735 *drp = ~value;
1801 } 1736 }
… …
1812 PART_END, 1747 PART_END,
1813 RC_COUNT 1748 RC_COUNT
1814}; 1749};
1815 1750
1816void 1751void
1817rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1752rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1818{ 1753{
1819 int i; 1754 int i;
1820 row_col_t rc[RC_COUNT]; 1755 row_col_t rc[RC_COUNT];
1821 1756
1822 if (drawn_text == NULL) /* sanity check */ 1757 if (!drawn) /* sanity check */
1823 return; 1758 return;
1824 1759
1825#ifndef NO_SLOW_LINK_SUPPORT 1760#ifndef NO_SLOW_LINK_SUPPORT
1826 if (refresh_type == FAST_REFRESH && !display->is_local) 1761 if (refresh_type == FAST_REFRESH && !display->is_local)
1827 { 1762 {
1828 y = 0; 1763 y = 0;
1829 height = TermWin.height; 1764 eheight = height;
1830 } 1765 }
1831#endif 1766#endif
1832 1767
1833#ifdef DEBUG_STRICT 1768#ifdef DEBUG_STRICT
1834 x = max (x, 0); 1769 x = max (x, 0);
1835 x = min (x, (int)TermWin.width); 1770 x = min (x, (int)width);
1836 y = max (y, 0); 1771 y = max (y, 0);
1837 y = min (y, (int)TermWin.height); 1772 y = min (y, (int)height);
1838#endif 1773#endif
1839 1774
1840 /* round down */ 1775 /* round down */
1841 rc[PART_BEG].col = Pixel2Col (x); 1776 rc[PART_BEG].col = Pixel2Col (x);
1842 rc[PART_BEG].row = Pixel2Row (y); 1777 rc[PART_BEG].row = Pixel2Row (y);
1843 /* round up */ 1778 /* round up */
1844 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1779 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1845 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1780 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1846 1781
1847 /* sanity checks */ 1782 /* sanity checks */
1848 for (i = PART_BEG; i < RC_COUNT; i++) 1783 for (i = PART_BEG; i < RC_COUNT; i++)
1849 { 1784 {
1850 MIN_IT (rc[i].col, TermWin.ncol - 1); 1785 MIN_IT (rc[i].col, ncol - 1);
1851 MIN_IT (rc[i].row, TermWin.nrow - 1); 1786 MIN_IT (rc[i].row, nrow - 1);
1852 } 1787 }
1853 1788
1854 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1789 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1855 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1790 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1856 1791
1857 if (refresh) 1792 if (refresh)
1858 scr_refresh (SLOW_REFRESH); 1793 scr_refresh (SLOW_REFRESH);
1859} 1794}
1860 1795
… …
1863 * Refresh the entire screen 1798 * Refresh the entire screen
1864 */ 1799 */
1865void 1800void
1866rxvt_term::scr_touch (bool refresh) 1801rxvt_term::scr_touch (bool refresh)
1867{ 1802{
1868 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1803 scr_expose (0, 0, width, height, refresh);
1869} 1804}
1870 1805
1871/* ------------------------------------------------------------------------- */ 1806/* ------------------------------------------------------------------------- */
1872/* 1807/*
1873 * Move the display so that the line represented by scrollbar value Y is at 1808 * Move the display so that the line represented by scrollbar value Y is at
… …
1877rxvt_term::scr_move_to (int y, int len) 1812rxvt_term::scr_move_to (int y, int len)
1878{ 1813{
1879 long p = 0; 1814 long p = 0;
1880 unsigned int oldviewstart; 1815 unsigned int oldviewstart;
1881 1816
1882 oldviewstart = TermWin.view_start; 1817 oldviewstart = view_start;
1883 1818
1884 if (y < len) 1819 if (y < len)
1885 { 1820 {
1886 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1821 p = (nrow + nsaved) * (len - y) / len;
1887 p -= (long) (TermWin.nrow - 1); 1822 p -= (long) (nrow - 1);
1888 p = max (p, 0); 1823 p = max (p, 0);
1889 } 1824 }
1890 1825
1891 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); 1826 view_start = (unsigned int)min (p, nsaved);
1892 1827
1893 return scr_changeview (oldviewstart); 1828 return scr_changeview (oldviewstart);
1894} 1829}
1895 1830
1896/* ------------------------------------------------------------------------- */ 1831/* ------------------------------------------------------------------------- */
… …
1902rxvt_term::scr_page (enum page_dirn direction, int nlines) 1837rxvt_term::scr_page (enum page_dirn direction, int nlines)
1903{ 1838{
1904 int n; 1839 int n;
1905 unsigned int oldviewstart; 1840 unsigned int oldviewstart;
1906 1841
1907#ifdef DEBUG_STRICT
1908 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1909#endif
1910 oldviewstart = TermWin.view_start; 1842 oldviewstart = view_start;
1843
1911 if (direction == UP) 1844 if (direction == UP)
1912 { 1845 {
1913 n = TermWin.view_start + nlines; 1846 n = view_start + nlines;
1914 TermWin.view_start = min (n, TermWin.nscrolled); 1847 view_start = min (n, nsaved);
1915 } 1848 }
1916 else 1849 else
1917 { 1850 {
1918 n = TermWin.view_start - nlines; 1851 n = view_start - nlines;
1919 TermWin.view_start = max (n, 0); 1852 view_start = max (n, 0);
1920 } 1853 }
1854
1921 return scr_changeview (oldviewstart); 1855 return scr_changeview (oldviewstart);
1922} 1856}
1923 1857
1924int 1858int
1925rxvt_term::scr_changeview (unsigned int oldviewstart) 1859rxvt_term::scr_changeview (unsigned int oldviewstart)
1926{ 1860{
1927 if (TermWin.view_start != oldviewstart) 1861 if (view_start != oldviewstart)
1928 { 1862 {
1929 want_refresh = 1; 1863 want_refresh = 1;
1930 num_scr -= (TermWin.view_start - oldviewstart); 1864 num_scr -= (view_start - oldviewstart);
1931 } 1865 }
1932 1866
1933 return (int) (TermWin.view_start - oldviewstart); 1867 return (int) (view_start - oldviewstart);
1934} 1868}
1935 1869
1936/* ------------------------------------------------------------------------- */ 1870/* ------------------------------------------------------------------------- */
1937void 1871void
1938rxvt_term::scr_bell () 1872rxvt_term::scr_bell ()
1939{ 1873{
1940#ifndef NO_BELL 1874#ifndef NO_BELL
1875
1941# ifndef NO_MAPALERT 1876# ifndef NO_MAPALERT
1942# ifdef MAPALERT_OPTION 1877# ifdef MAPALERT_OPTION
1943 if (options & Opt_mapAlert) 1878 if (options & Opt_mapAlert)
1944# endif 1879# endif
1945 XMapWindow (display->display, TermWin.parent[0]); 1880 XMapWindow (display->display, parent[0]);
1946# endif 1881# endif
1882
1947 if (options & Opt_visualBell) 1883 if (options & Opt_visualBell)
1948 { 1884 {
1949 scr_rvideo_mode (!rvideo); /* refresh also done */ 1885 scr_rvideo_mode (!rvideo); /* refresh also done */
1886 rxvt_usleep (VISUAL_BELL_DURATION);
1950 scr_rvideo_mode (!rvideo); /* refresh also done */ 1887 scr_rvideo_mode (!rvideo); /* refresh also done */
1951 } 1888 }
1952 else 1889 else
1953 XBell (display->display, 0); 1890 XBell (display->display, 0);
1891
1954#endif 1892#endif
1955} 1893}
1956 1894
1957/* ------------------------------------------------------------------------- */ 1895/* ------------------------------------------------------------------------- */
1958/* ARGSUSED */ 1896/* ARGSUSED */
1959void 1897void
1960rxvt_term::scr_printscreen (int fullhist) 1898rxvt_term::scr_printscreen (int fullhist)
1961{ 1899{
1962#ifdef PRINTPIPE 1900#ifdef PRINTPIPE
1963 int i, r1, nrows, row_offset; 1901 int nrows, row_start;
1964 FILE *fd; 1902 FILE *fd;
1965 1903
1966 if ((fd = popen_printer ()) == NULL) 1904 if ((fd = popen_printer ()) == NULL)
1967 return; 1905 return;
1968 1906
1969 nrows = TermWin.nrow;
1970 row_offset = TermWin.saveLines;
1971
1972 if (!fullhist) 1907 if (fullhist)
1973 row_offset -= TermWin.view_start; 1908 {
1909 nrows = nrow + nsaved;
1910 row_start = -nsaved;
1911 }
1974 else 1912 else
1975 { 1913 {
1976 nrows += TermWin.nscrolled; 1914 nrows = nrow;
1977 row_offset -= TermWin.nscrolled; 1915 row_start = -view_start;
1978 } 1916 }
1979 1917
1980 wctomb (0, 0); 1918 wctomb (0, 0);
1981 1919
1982 for (r1 = 0; r1 < nrows; r1++) 1920 for (int r1 = 0; r1 < nrows; r1++)
1983 { 1921 {
1984 text_t *tp = screen.text[r1 + row_offset]; 1922 text_t *tp = ROW(r1).t;
1985 int len = screen.tlen[r1 + row_offset]; 1923 int len = ROW(r1).l;
1986 1924
1987 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) 1925 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1988 { 1926 {
1989 char mb[MB_LEN_MAX]; 1927 char mb[MB_LEN_MAX];
1990 text_t t = *tp++; 1928 text_t t = *tp++;
1991 if (t == NOCHAR) 1929 if (t == NOCHAR)
1992 continue; 1930 continue;
… …
2013/* 1951/*
2014 * Refresh the screen 1952 * Refresh the screen
2015 * drawn_text/drawn_rend contain the screen information before the update. 1953 * drawn_text/drawn_rend contain the screen information before the update.
2016 * screen.text/screen.rend contain what the screen will change to. 1954 * screen.text/screen.rend contain what the screen will change to.
2017 */ 1955 */
2018
2019#define FONT_WIDTH(X, Y) \
2020 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2021#define FONT_RBEAR(X, Y) \
2022 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2023#define FONT_LBEAR(X, Y) \
2024 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2025#define IS_FONT_CHAR(X, Y) \
2026 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2027
2028void 1956void
2029rxvt_term::scr_refresh (unsigned char refresh_type) 1957rxvt_term::scr_refresh (unsigned char refresh_type)
2030{ 1958{
2031 unsigned char must_clear, /* use draw_string not draw_image_string */ 1959 unsigned char must_clear, /* use draw_string not draw_image_string */
2032 showcursor; /* show the cursor */ 1960 showcursor; /* show the cursor */
… …
2039#endif 1967#endif
2040 rend_t *crp; // cursor rendition pointer 1968 rend_t *crp; // cursor rendition pointer
2041 1969
2042 want_refresh = 0; /* screen is current */ 1970 want_refresh = 0; /* screen is current */
2043 1971
2044 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1972 if (refresh_type == NO_REFRESH || !mapped)
2045 return; 1973 return;
2046 1974
2047 /* 1975 /*
2048 * A: set up vars 1976 * A: set up vars
2049 */ 1977 */
2050 must_clear = 0; 1978 must_clear = 0;
2051 refresh_count = 0; 1979 refresh_count = 0;
2052 1980
2053 row_offset = TermWin.saveLines - TermWin.view_start; 1981 row_offset = term_start - view_start;
2054 1982
2055#if XPM_BACKGROUND 1983#if XPM_BACKGROUND
2056 must_clear |= (bgPixmap.pixmap != None); 1984 must_clear |= bgPixmap.pixmap != None;
2057#endif 1985#endif
2058#if TRANSPARENT 1986#if TRANSPARENT
2059 must_clear |= ((options & Opt_transparent) && am_transparent); 1987 must_clear |= (options & Opt_transparent) && am_transparent;
2060#endif 1988#endif
2061 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1989 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2062 1990
2063 /* 1991 /*
2064 * B: reverse any characters which are selected 1992 * B: reverse any characters which are selected
… …
2081 2009
2082 if (showcursor) 2010 if (showcursor)
2083 { 2011 {
2084 int col = screen.cur.col; 2012 int col = screen.cur.col;
2085 2013
2086 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 2014 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2087 col--; 2015 col--;
2088 2016
2089 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2017 crp = &ROW(screen.cur.row).r[col];
2090 2018
2091 if (showcursor && TermWin.focus) 2019 if (showcursor && focus)
2092 { 2020 {
2021 if (options & Opt_cursorUnderline)
2022 *crp ^= RS_Uline;
2023 else
2024 {
2093 *crp ^= RS_RVid; 2025 *crp ^= RS_RVid;
2026
2094#ifndef NO_CURSORCOLOR 2027#ifndef NO_CURSORCOLOR
2095 cc1 = *crp & (RS_fgMask | RS_bgMask); 2028 cc1 = *crp & (RS_fgMask | RS_bgMask);
2096 if (ISSET_PIXCOLOR (Color_cursor)) 2029 if (ISSET_PIXCOLOR (Color_cursor))
2097 ccol1 = Color_cursor; 2030 ccol1 = Color_cursor;
2098 else 2031 else
2099#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2032#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2100 ccol1 = GET_FGCOLOR (rstyle); 2033 ccol1 = GET_FGCOLOR (rstyle);
2101#else 2034#else
2102 ccol1 = Color_fg; 2035 ccol1 = Color_fg;
2103#endif 2036#endif
2104 if (ISSET_PIXCOLOR (Color_cursor2)) 2037 if (ISSET_PIXCOLOR (Color_cursor2))
2105 ccol2 = Color_cursor2; 2038 ccol2 = Color_cursor2;
2106 else 2039 else
2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2040#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2108 ccol2 = GET_BGCOLOR (rstyle); 2041 ccol2 = GET_BGCOLOR (rstyle);
2109#else 2042#else
2110 ccol2 = Color_bg; 2043 ccol2 = Color_bg;
2111#endif 2044#endif
2112 *crp = SET_FGCOLOR (*crp, ccol1); 2045 *crp = SET_FGCOLOR (*crp, ccol1);
2113 *crp = SET_BGCOLOR (*crp, ccol2); 2046 *crp = SET_BGCOLOR (*crp, ccol2);
2114#endif 2047#endif
2048 }
2115 } 2049 }
2116 } 2050 }
2117 2051
2118 /* make sure no outline cursor is left around */ 2052 /* make sure no outline cursor is left around */
2119 setoldcursor = 0; 2053 setoldcursor = 0;
2120 if (ocrow != -1) 2054 if (ocrow != -1)
2121 { 2055 {
2122 if (screen.cur.row + TermWin.view_start != ocrow 2056 if (screen.cur.row + view_start != ocrow
2123 || screen.cur.col != oldcursor.col) 2057 || screen.cur.col != oldcursor.col)
2124 { 2058 {
2125 if (ocrow < TermWin.nrow 2059 if (ocrow < nrow
2126 && oldcursor.col < TermWin.ncol) 2060 && oldcursor.col < ncol)
2127 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2061 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2128 2062
2129 if (TermWin.focus || !showcursor) 2063 if (focus || !showcursor)
2130 oldcursor.row = -1; 2064 oldcursor.row = -1;
2131 else 2065 else
2132 setoldcursor = 1; 2066 setoldcursor = 1;
2133 } 2067 }
2134 } 2068 }
2135 else if (!TermWin.focus) 2069 else if (!focus)
2136 setoldcursor = 1; 2070 setoldcursor = 1;
2137 2071
2138 if (setoldcursor) 2072 if (setoldcursor)
2139 { 2073 {
2140 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2074 if (screen.cur.row + view_start >= nrow)
2141 oldcursor.row = -1; 2075 oldcursor.row = -1;
2142 else 2076 else
2143 { 2077 {
2144 oldcursor.row = screen.cur.row + TermWin.view_start; 2078 oldcursor.row = screen.cur.row + view_start;
2145 oldcursor.col = screen.cur.col; 2079 oldcursor.col = screen.cur.col;
2146 } 2080 }
2147 } 2081 }
2148 } 2082 }
2149 2083
2150#if ENABLE_OVERLAY 2084#if ENABLE_OVERLAY
2151 scr_swap_overlay (); 2085 scr_swap_overlay ();
2152#endif 2086#endif
2153
2154 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2155 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2156 2087
2157#ifndef NO_SLOW_LINK_SUPPORT 2088#ifndef NO_SLOW_LINK_SUPPORT
2158 /* 2089 /*
2159 * D: CopyArea pass - very useful for slower links 2090 * D: CopyArea pass - very useful for slower links
2160 * This has been deliberately kept simple. 2091 * This has been deliberately kept simple.
2161 */ 2092 */
2162 i = num_scr; 2093 i = num_scr;
2163 if (!display->is_local 2094 if (!display->is_local
2164 && refresh_type == FAST_REFRESH && num_scr_allow && i 2095 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2165 && abs (i) < TermWin.nrow && !must_clear) 2096 && abs (num_scr) < nrow && !must_clear)
2166 { 2097 {
2167 int16_t nits; 2098 int16_t nits;
2168 int j; 2099 int j;
2169 int len, wlen; 2100 int len, wlen;
2170 2101
2171 j = TermWin.nrow; 2102 j = nrow;
2172 wlen = len = -1; 2103 wlen = len = -1;
2173 row = i > 0 ? 0 : j - 1; 2104 row = i > 0 ? 0 : j - 1;
2174 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2105 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2175 { 2106 {
2176 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2107 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2177 { 2108 {
2178 text_t *stp = screen.text[row + row_offset]; 2109 line_t s = save[(row + row_offset) % total_rows];
2179 rend_t *srp = screen.rend[row + row_offset];
2180 text_t *dtp = drawn_text[row]; 2110 line_t d = drawn[row];
2181 text_t *dtp2 = drawn_text[row + i]; 2111 line_t d2 = drawn[row + i];
2182 rend_t *drp = drawn_rend[row];
2183 rend_t *drp2 = drawn_rend[row + i];
2184 2112
2185 for (nits = 0, col = TermWin.ncol; col--; ) 2113 for (nits = 0, col = ncol; col--; )
2186 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2114 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2187 nits--; 2115 nits--;
2188 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2116 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2189 nits++; 2117 nits++;
2190 2118
2191 if (nits > 8) /* XXX: arbitrary choice */ 2119 if (nits > 8) /* XXX: arbitrary choice */
2192 { 2120 {
2193 for (col = TermWin.ncol; col--; ) 2121 for (col = ncol; col--; )
2194 { 2122 {
2195 *dtp++ = *dtp2++; 2123 *d.t++ = *d2.t++;
2196 *drp++ = *drp2++; 2124 *d.r++ = *d2.r++;
2197 } 2125 }
2198 2126
2199 if (len == -1) 2127 if (len == -1)
2200 len = row; 2128 len = row;
2201 2129
… …
2208 { 2136 {
2209 /* also comes here at end if needed because of >= above */ 2137 /* also comes here at end if needed because of >= above */
2210 if (wlen < len) 2138 if (wlen < len)
2211 SWAP_IT (wlen, len, int); 2139 SWAP_IT (wlen, len, int);
2212 2140
2213 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2141 XCopyArea (display->display, vt, vt,
2214 TermWin.gc, 0, Row2Pixel (len + i), 2142 gc, 0, Row2Pixel (len + i),
2215 (unsigned int)TermWin_TotalWidth (), 2143 (unsigned int)TermWin_TotalWidth (),
2216 (unsigned int)Height2Pixel (wlen - len + 1), 2144 (unsigned int)Height2Pixel (wlen - len + 1),
2217 0, Row2Pixel (len)); 2145 0, Row2Pixel (len));
2218 len = -1; 2146 len = -1;
2219 } 2147 }
… …
2222#endif 2150#endif
2223 2151
2224 /* 2152 /*
2225 * E: main pass across every character 2153 * E: main pass across every character
2226 */ 2154 */
2227 for (row = 0; row < TermWin.nrow; row++) 2155 for (row = 0; row < nrow; row++)
2228 { 2156 {
2229 text_t *stp = screen.text[row + row_offset]; 2157 text_t *stp = save[(row + row_offset) % total_rows].t;
2230 rend_t *srp = screen.rend[row + row_offset]; 2158 rend_t *srp = save[(row + row_offset) % total_rows].r;
2231 text_t *dtp = drawn_text[row]; 2159 text_t *dtp = drawn[row].t;
2232 rend_t *drp = drawn_rend[row]; 2160 rend_t *drp = drawn[row].r;
2233 2161
2234 /* 2162 /*
2235 * E2: OK, now the real pass 2163 * E2: OK, now the real pass
2236 */ 2164 */
2237 int ypixel = (int)Row2Pixel (row); 2165 int ypixel = (int)Row2Pixel (row);
2238 2166
2239 for (col = 0; col < TermWin.ncol; col++) 2167 for (col = 0; col < ncol; col++)
2240 { 2168 {
2241 /* compare new text with old - if exactly the same then continue */ 2169 /* compare new text with old - if exactly the same then continue */
2242 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2170 if (stp[col] == dtp[col] /* Must match characters to skip. */
2243 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2171 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2244 || (stp[col] == ' ' /* space w/ no background change */ 2172 || (stp[col] == ' ' /* space w/ no background change */
… …
2258 dtp[col] = stp[col]; 2186 dtp[col] = stp[col];
2259 drp[col] = rend; 2187 drp[col] = rend;
2260 2188
2261 int xpixel = Col2Pixel (col); 2189 int xpixel = Col2Pixel (col);
2262 2190
2263 for (i = 0; ++col < TermWin.ncol; ) 2191 for (i = 0; ++col < ncol; )
2264 { 2192 {
2265 if (stp[col] == NOCHAR) 2193 if (stp[col] == NOCHAR)
2266 { 2194 {
2267 dtp[col] = stp[col]; 2195 dtp[col] = stp[col];
2268 drp[col] = rend; 2196 drp[col] = rend;
… …
2296 2224
2297 // sometimes we optimize away the trailing NOCHAR's, add them back 2225 // sometimes we optimize away the trailing NOCHAR's, add them back
2298 while (i && text[count] == NOCHAR) 2226 while (i && text[count] == NOCHAR)
2299 count++, i--; 2227 count++, i--;
2300 2228
2301#if ENABLE_STYLES
2302 // force redraw after "careful" characters to avoid pixel droppings
2303 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2304 drp[col + 1] = ~srp[col + 1];
2305
2306 // include previous careful character(s) if possible, looks nicer (best effort...)
2307 while (text > stp
2308 && srp[text - stp - 1] & RS_Careful
2309 && RS_SAME (rend, srp[text - stp - 1]))
2310 text--, count++, xpixel -= TermWin.fwidth;
2311#endif
2312
2313 /* 2229 /*
2314 * Determine the attributes for the string 2230 * Determine the attributes for the string
2315 */ 2231 */
2316 int fore = GET_FGCOLOR (rend); // desired foreground 2232 int fore = GET_FGCOLOR (rend); // desired foreground
2317 int back = GET_BGCOLOR (rend); // desired background 2233 int back = GET_BGCOLOR (rend); // desired background
2318 2234
2319 // only do special processing if ana attributes are set, which is rare 2235 // only do special processing if any attributes are set, which is rare
2320 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) 2236 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2321 { 2237 {
2238#if ENABLE_STYLES
2239 // force redraw after "careful" characters to avoid pixel droppings
2240 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2241 drp[col + 1] = ~srp[col + 1];
2242
2243 // include previous careful character(s) if possible, looks nicer (best effort...)
2244 while (text > stp
2245 && srp[text - stp - 1] & RS_Careful
2246 && RS_SAME (rend, srp[text - stp - 1]))
2247 text--, count++, xpixel -= fwidth;
2248#endif
2249
2322 bool invert = rend & RS_RVid; 2250 bool invert = rend & RS_RVid;
2323 2251
2324#ifndef NO_BOLD_UNDERLINE_REVERSE 2252#ifndef NO_BOLD_UNDERLINE_REVERSE
2325 if (rend & RS_Bold 2253 if (rend & RS_Bold
2326 && fore == Color_fg) 2254 && fore == Color_fg)
… …
2353 SWAP_IT (fore, back, int); 2281 SWAP_IT (fore, back, int);
2354 2282
2355#ifndef NO_BOLD_UNDERLINE_REVERSE 2283#ifndef NO_BOLD_UNDERLINE_REVERSE
2356 if (ISSET_PIXCOLOR (Color_RV)) 2284 if (ISSET_PIXCOLOR (Color_RV))
2357 back = Color_RV; 2285 back = Color_RV;
2286
2287 if (fore == back)
2288 {
2289 fore = Color_bg;
2290 back = Color_fg;
2291 }
2358#endif 2292#endif
2359 } 2293 }
2360 2294
2361#ifdef TEXT_BLINK 2295#ifdef TEXT_BLINK
2362 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2296 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
… …
2373 } 2307 }
2374 2308
2375 /* 2309 /*
2376 * Actually do the drawing of the string here 2310 * Actually do the drawing of the string here
2377 */ 2311 */
2378 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2312 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2379 2313
2380 if (back == fore) 2314 if (back == fore)
2381 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2315 font->clear_rect (*drawable, xpixel, ypixel,
2382 TermWin.fwidth * count, TermWin.fheight, 2316 fwidth * count, fheight,
2383 back); 2317 back);
2384 else if (back == Color_bg) 2318 else if (back == Color_bg)
2385 { 2319 {
2386 if (must_clear) 2320 if (must_clear)
2387 { 2321 {
2388 CLEAR_CHARS (xpixel, ypixel, count); 2322 CLEAR_CHARS (xpixel, ypixel, count);
2389 2323
2390 for (i = 0; i < count; i++) /* don't draw empty strings */ 2324 for (i = 0; i < count; i++) /* don't draw empty strings */
2391 if (text[i] != ' ') 2325 if (text[i] != ' ')
2392 { 2326 {
2393 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2327 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2394 break; 2328 break;
2395 } 2329 }
2396 } 2330 }
2397 else 2331 else
2398 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2332 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2399 } 2333 }
2400 else 2334 else
2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2335 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2402 2336
2403 if (rend & RS_Uline && font->descent > 1 && fore != back) 2337 if (rend & RS_Uline && font->descent > 1 && fore != back)
2404 { 2338 {
2339#if ENABLE_FRILLS
2340 if (ISSET_PIXCOLOR (Color_underline))
2341 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2342 else
2343#endif
2405 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2344 XSetForeground (display->display, gc, pix_colors[fore]);
2345
2406 XDrawLine (display->display, drawBuffer, TermWin.gc, 2346 XDrawLine (display->display, drawBuffer, gc,
2407 xpixel, ypixel + font->ascent + 1, 2347 xpixel, ypixel + font->ascent + 1,
2408 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2348 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2409 } 2349 }
2410 } /* for (col....) */ 2350 } /* for (col....) */
2411 } /* for (row....) */ 2351 } /* for (row....) */
… …
2417 /* 2357 /*
2418 * G: cleanup cursor and display outline cursor if necessary 2358 * G: cleanup cursor and display outline cursor if necessary
2419 */ 2359 */
2420 if (showcursor) 2360 if (showcursor)
2421 { 2361 {
2422 if (TermWin.focus) 2362 if (focus)
2363 {
2364 if (options & Opt_cursorUnderline)
2365 *crp ^= RS_Uline;
2366 else
2423 { 2367 {
2424 *crp ^= RS_RVid; 2368 *crp ^= RS_RVid;
2425#ifndef NO_CURSORCOLOR 2369#ifndef NO_CURSORCOLOR
2426 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2370 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2427#endif 2371#endif
2372 }
2428 } 2373 }
2429 else if (oldcursor.row >= 0) 2374 else if (oldcursor.row >= 0)
2430 { 2375 {
2376 int cursorwidth = 1;
2377 int col = oldcursor.col;
2378
2379 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2380 col--;
2381
2382 while (col + cursorwidth < ncol
2383 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2384 cursorwidth++;
2385
2431#ifndef NO_CURSORCOLOR 2386#ifndef NO_CURSORCOLOR
2432 if (ISSET_PIXCOLOR (Color_cursor)) 2387 if (ISSET_PIXCOLOR (Color_cursor))
2433 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2388 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2434#endif 2389#endif
2435 int cursorwidth = 1;
2436 while (oldcursor.col + cursorwidth < TermWin.ncol
2437 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2438 cursorwidth++;
2439 2390
2440 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2391 XDrawRectangle (display->display, drawBuffer, gc,
2441 Col2Pixel (oldcursor.col), 2392 Col2Pixel (col),
2442 Row2Pixel (oldcursor.row), 2393 Row2Pixel (oldcursor.row),
2443 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2394 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2444 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2395 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2445 } 2396 }
2446 } 2397 }
2447 2398
2448 /* 2399 /*
2449 * H: cleanup selection 2400 * H: cleanup selection
… …
2456 num_scr = 0; 2407 num_scr = 0;
2457 num_scr_allow = 1; 2408 num_scr_allow = 1;
2458} 2409}
2459 2410
2460void 2411void
2461rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2412rxvt_term::scr_remap_chars (const line_t &l)
2462{ 2413{
2463 if (!rp || !tp) 2414 if (!l.t)
2464 return; 2415 return;
2465 2416
2466 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2417 for (int i = ncol; i--; )
2467 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 2418 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2468} 2419}
2469 2420
2470void 2421void
2471rxvt_term::scr_remap_chars () 2422rxvt_term::scr_remap_chars ()
2472{ 2423{
2473 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2424 for (int i = total_rows; i--; )
2474 scr_remap_chars (screen.text[i], screen.rend[i]); 2425 scr_remap_chars (save[i]);
2475 2426
2476 for (int i = TermWin.nrow; i--; ) 2427 for (int i = nrow; i--; )
2477 { 2428 {
2478 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2429 scr_remap_chars (drawn[i]);
2479 scr_remap_chars (swap.text[i], swap.rend[i]); 2430 scr_remap_chars (swap_save[i]);
2480 } 2431 }
2481} 2432}
2482 2433
2483void 2434void
2484rxvt_term::scr_recolour () 2435rxvt_term::scr_recolour ()
… …
2490#if XPM_BACKGROUND 2441#if XPM_BACKGROUND
2491 && !bgPixmap.pixmap 2442 && !bgPixmap.pixmap
2492#endif 2443#endif
2493 ) 2444 )
2494 { 2445 {
2495 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); 2446 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2496 XClearWindow (display->display, TermWin.parent[0]); 2447 XClearWindow (display->display, parent[0]);
2497 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 2448 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2498#if HAVE_SCROLLBARS 2449#if HAVE_SCROLLBARS
2499 if (scrollBar.win) 2450 if (scrollBar.win)
2500 { 2451 {
2501 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2452 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2502 scrollBar.setIdle (); 2453 scrollBar.setIdle ();
… …
2512 2463
2513/* ------------------------------------------------------------------------- */ 2464/* ------------------------------------------------------------------------- */
2514void 2465void
2515rxvt_term::scr_clear (bool really) 2466rxvt_term::scr_clear (bool really)
2516{ 2467{
2517 if (!TermWin.mapped) 2468 if (!mapped)
2518 return; 2469 return;
2519 2470
2520 num_scr_allow = 0; 2471 num_scr_allow = 0;
2521 want_refresh = 1; 2472 want_refresh = 1;
2522 2473
2523#if TRANSPARENT
2524 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2525 {
2526 int i;
2527
2528 if (!(options & Opt_transparent_all))
2529 i = 0;
2530 else
2531 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2532
2533 while (i--)
2534 if (TermWin.parent[i] != None)
2535 XClearWindow (display->display, TermWin.parent[i]);
2536 }
2537#endif
2538
2539 if (really) 2474 if (really)
2540 XClearWindow (display->display, TermWin.vt); 2475 XClearWindow (display->display, vt);
2541} 2476}
2542 2477
2543/* ------------------------------------------------------------------------- */ 2478/* ------------------------------------------------------------------------- */
2544void 2479void
2545rxvt_term::scr_reverse_selection () 2480rxvt_term::scr_reverse_selection ()
2546{ 2481{
2482 if (selection.op
2547 if (selection.op && current_screen == selection.screen) 2483 && current_screen == selection.screen
2484 && selection.end.row >= -view_start)
2548 { 2485 {
2549 int end_row = TermWin.saveLines - TermWin.view_start; 2486 int view_end = -view_start + nrow;
2550 int i = selection.beg.row + TermWin.saveLines; 2487 int row, col;
2551 int col, row = selection.end.row + TermWin.saveLines;
2552 rend_t *srp;
2553 2488
2554#if ENABLE_FRILLS 2489#if ENABLE_FRILLS
2555 if (selection.rect) 2490 if (selection.rect)
2556 { 2491 {
2557 end_row += TermWin.nrow; 2492 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2558
2559 for (; i <= row && i <= end_row; i++)
2560 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++) 2493 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)
2561 srp[col] ^= RS_RVid; 2494 srp[col] ^= RS_RVid;
2562 } 2495 }
2563 else 2496 else
2564#endif 2497#endif
2565 { 2498 {
2566 if (i >= end_row) 2499 if (selection.beg.row >= -view_start)
2500 {
2567 col = selection.beg.col; 2501 col = selection.beg.col;
2502 row = selection.beg.row;
2503 }
2568 else 2504 else
2569 { 2505 {
2570 col = 0; 2506 col = 0;
2571 i = end_row; 2507 row = view_start;
2572 } 2508 }
2573 2509
2574 end_row += TermWin.nrow; 2510 for (; row < min (selection.end.row, view_end); row++, col = 0)
2575 2511 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2576 for (; i < row && i < end_row; i++, col = 0)
2577 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2578 srp[col] ^= RS_RVid; 2512 srp[col] ^= RS_RVid;
2579 2513
2580 if (i == row && i < end_row) 2514 if (row == selection.end.row)
2581 for (srp = screen.rend[i]; col < selection.end.col; col++) 2515 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2582 srp[col] ^= RS_RVid; 2516 srp[col] ^= RS_RVid;
2583 } 2517 }
2584 } 2518 }
2585} 2519}
2586 2520
… …
2595{ 2529{
2596 int row, wrote; 2530 int row, wrote;
2597 unsigned int width, towrite; 2531 unsigned int width, towrite;
2598 char r1[] = "\n"; 2532 char r1[] = "\n";
2599 2533
2600 for (row = TermWin.saveLines - TermWin.nscrolled; 2534 for (row = saveLines - nsaved;
2601 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2535 row < saveLines + nrow - 1; row++)
2602 { 2536 {
2603 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2537 width = save[row].l >= 0 ? save[row].l
2604 : TermWin.ncol; 2538 : ncol;
2605 for (towrite = width; towrite; towrite -= wrote) 2539 for (towrite = width; towrite; towrite -= wrote)
2606 { 2540 {
2607 wrote = write (fd, & (screen.text[row][width - towrite]), 2541 wrote = write (fd, & (save[row].t[width - towrite]),
2608 towrite); 2542 towrite);
2609 if (wrote < 0) 2543 if (wrote < 0)
2610 return; /* XXX: death, no report */ 2544 return; /* XXX: death, no report */
2611 } 2545 }
2612 if (screen.tlen[row] >= 0) 2546 if (save[row].l >= 0)
2613 if (write (fd, r1, 1) <= 0) 2547 if (write (fd, r1, 1) <= 0)
2614 return; /* XXX: death, no report */ 2548 return; /* XXX: death, no report */
2615 } 2549 }
2616} 2550}
2617#endif 2551#endif
2618 2552
2619/* ------------------------------------------------------------------------- * 2553/* ------------------------------------------------------------------------- *
2620 * CHARACTER SELECTION * 2554 * CHARACTER SELECTION *
2621 * ------------------------------------------------------------------------- */ 2555 * ------------------------------------------------------------------------- */
2622
2623/*
2624 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2625 */
2626void 2556void
2627rxvt_term::selection_check (int check_more) 2557rxvt_term::selection_check (int check_more)
2628{ 2558{
2629 row_col_t pos; 2559 row_col_t pos;
2630 2560
2631 if (!selection.op) 2561 if (!selection.op)
2632 return; 2562 return;
2633 2563
2634 pos.row = pos.col = 0; 2564 pos.row = pos.col = 0;
2635 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2565 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2636 || (selection.beg.row >= TermWin.nrow) 2566 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2637 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2567 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2638 || (selection.mark.row >= TermWin.nrow)
2639 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2640 || (selection.end.row >= TermWin.nrow)
2641 || (check_more == 1 2568 || (check_more == 1
2642 && current_screen == selection.screen 2569 && current_screen == selection.screen
2643 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2570 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2644 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2571 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2645 || (check_more == 2 2572 || (check_more == 2
… …
2647 && ROWCOL_IS_AFTER (selection.end, pos)) 2574 && ROWCOL_IS_AFTER (selection.end, pos))
2648 || (check_more == 3 2575 || (check_more == 3
2649 && ROWCOL_IS_AFTER (selection.end, pos)) 2576 && ROWCOL_IS_AFTER (selection.end, pos))
2650 || (check_more == 4 /* screen width change */ 2577 || (check_more == 4 /* screen width change */
2651 && (selection.beg.row != selection.end.row 2578 && (selection.beg.row != selection.end.row
2652 || selection.end.col > TermWin.ncol))) 2579 || selection.end.col > ncol)))
2653 CLEAR_SELECTION (); 2580 CLEAR_SELECTION ();
2654} 2581}
2655 2582
2656/* ------------------------------------------------------------------------- */ 2583/* ------------------------------------------------------------------------- */
2657/* 2584/*
2658 * Paste a selection direct to the command fd 2585 * Paste a selection direct to the command fd
2659 */ 2586 */
2660void 2587void
2661rxvt_term::paste (const unsigned char *data, unsigned int len) 2588rxvt_term::paste (unsigned char *data, unsigned int len)
2662{ 2589{
2663 unsigned int i, j, n;
2664 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2665
2666 /* convert normal newline chars into common keyboard Return key sequence */ 2590 /* convert normal newline chars into common keyboard Return key sequence */
2667 for (i = 0; i < len; i += PROP_SIZE) 2591 for (unsigned int i = 0; i < len; i++)
2668 {
2669 n = min (len - i, PROP_SIZE);
2670 memcpy (ds, data + i, n);
2671
2672 for (j = 0; j < n; j++)
2673 if (ds[j] == C0_LF) 2592 if (data[i] == C0_LF)
2674 ds[j] = C0_CR; 2593 data[i] = C0_CR;
2675 2594
2676 tt_write (ds, (int)n); 2595 tt_write (data, len);
2677 }
2678
2679 free (ds);
2680} 2596}
2681 2597
2682/* ------------------------------------------------------------------------- */ 2598/* ------------------------------------------------------------------------- */
2683/* 2599/*
2684 * Respond to a notification that a primary selection has been sent 2600 * Respond to a notification that a primary selection has been sent
2685 * EXT: SelectionNotify 2601 * EXT: SelectionNotify
2686 */ 2602 */
2687int 2603void
2688rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2604rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2689{ 2605{
2690 long nread = 0;
2691 unsigned long bytes_after;
2692 XTextProperty ct;
2693
2694 if (prop == None) /* check for failed XConvertSelection */ 2606 if (prop == None) /* check for failed XConvertSelection */
2695 { 2607 {
2696 if ((selection_type & Sel_CompoundText)) 2608 if ((selection_type & Sel_CompoundText))
2697 { 2609 {
2698 int selnum = selection_type & Sel_whereMask; 2610 int selnum = selection_type & Sel_whereMask;
… …
2711 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2623 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2712 else 2624 else
2713 selection_type = 0; 2625 selection_type = 0;
2714 } 2626 }
2715 2627
2716 return 0; 2628 return;
2717 }
2718
2719 for (;;)
2720 { 2629 }
2630
2631 unsigned long bytes_after;
2632 XTextProperty ct;
2633
2634 if (XGetWindowProperty (display->display, win, prop,
2635 0, PROP_SIZE / 4,
2636 delete_prop, AnyPropertyType,
2637 &ct.encoding, &ct.format,
2638 &ct.nitems, &bytes_after,
2639 &ct.value) != Success)
2640 {
2641 ct.value = 0;
2642 goto bailout;
2643 }
2644
2645 if (ct.encoding == None)
2646 goto bailout;
2647
2648 if (bytes_after)
2649 {
2650 // fetch and append remaining data
2651 XTextProperty ct2;
2652
2721 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2653 if (XGetWindowProperty (display->display, win, prop,
2722 (long) (PROP_SIZE / 4), delete_prop, 2654 ct.nitems / 4, (bytes_after + 3) / 4,
2655 delete_prop, AnyPropertyType,
2723 AnyPropertyType, &ct.encoding, &ct.format, 2656 &ct2.encoding, &ct2.format,
2724 &ct.nitems, &bytes_after, 2657 &ct2.nitems, &bytes_after,
2725 &ct.value) != Success) 2658 &ct2.value) != Success)
2726 break; 2659 goto bailout;
2727 2660
2728 if (ct.encoding == 0) 2661 // realloc should be compatible to XFree, here, and elsewhere, too
2729 break; 2662 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2663 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2664 ct.nitems += ct2.nitems;
2730 2665
2666 XFree (ct2.value);
2667 }
2668
2669 if (ct.value == 0)
2670 goto bailout;
2671
2731 if (ct.encoding == xa[XA_INCR]) 2672 if (ct.encoding == xa[XA_INCR])
2732 { 2673 {
2733 // INCR selection, start handshake 2674 // INCR selection, start handshake
2675 if (!delete_prop)
2734 XDeleteProperty (display->display, win, prop); 2676 XDeleteProperty (display->display, win, prop);
2677
2735 selection_wait = Sel_incr; 2678 selection_wait = Sel_incr;
2679 incr_buf_fill = 0;
2736 incr_ev.start (NOW + 10); 2680 incr_ev.start (NOW + 10);
2737 break;
2738 }
2739 2681
2740 if (ct.value == NULL) 2682 goto bailout;
2741 continue; 2683 }
2742 2684
2743 if (ct.nitems == 0) 2685 if (ct.nitems == 0)
2686 {
2687 if (selection_wait == Sel_incr)
2688 {
2689 XFree (ct.value);
2690
2691 // finally complete, now paste the whole thing
2692 selection_wait = Sel_normal;
2693 ct.value = (unsigned char *)incr_buf;
2694 ct.nitems = incr_buf_fill;
2695 incr_buf = 0;
2696 incr_buf_size = 0;
2697 incr_ev.stop ();
2744 { 2698 }
2699 else
2700 {
2745 if (selection_wait == Sel_normal && nread == 0 2701 if (selection_wait == Sel_normal
2746 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2702 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2747 { 2703 {
2748 /* 2704 /*
2749 * pass through again trying CUT_BUFFER0 if we've come from 2705 * pass through again trying CUT_BUFFER0 if we've come from
2750 * XConvertSelection () but nothing was presented 2706 * XConvertSelection () but nothing was presented
2751 */ 2707 */
2752 selection_paste (display->root, XA_CUT_BUFFER0, False); 2708 selection_paste (display->root, XA_CUT_BUFFER0, False);
2753 } 2709 }
2754 2710
2755 nread = -1; /* discount any previous stuff */ 2711 goto bailout;
2756 break; 2712 }
2713 }
2714 else if (selection_wait == Sel_incr)
2715 {
2716 incr_ev.start (NOW + 10);
2717
2718 while (incr_buf_fill + ct.nitems > incr_buf_size)
2757 } 2719 {
2720 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2721 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2722 }
2758 2723
2724 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2759 nread += ct.nitems; 2725 incr_buf_fill += ct.nitems;
2760 2726
2727 goto bailout;
2728 }
2729
2761 char **cl; 2730 char **cl;
2762 int cr; 2731 int cr;
2763 2732
2764#if ENABLE_FRILLS 2733#if ENABLE_FRILLS
2765 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2734 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2766 // so recode it manually 2735 // so recode it manually
2767 if (ct.encoding == xa[XA_UTF8_STRING]) 2736 if (ct.encoding == xa[XA_UTF8_STRING])
2768 { 2737 {
2769 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2738 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2770 char *s = rxvt_wcstombs (w); 2739 char *s = rxvt_wcstombs (w);
2771 2740 free (w);
2772 // TODO: strlen == only the first element will be converted. well... 2741 // TODO: strlen == only the first element will be converted. well...
2773 paste ((unsigned char *)s, strlen (s)); 2742 paste ((unsigned char *)s, strlen (s));
2774
2775 free (s); 2743 free (s);
2776 free (w); 2744 }
2777 }
2778 else 2745 else
2779#endif 2746#endif
2780 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2747 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2781 { 2748 && cl)
2749 {
2782 for (int i = 0; i < cr; i++) 2750 for (int i = 0; i < cr; i++)
2783 paste ((unsigned char *)cl[i], strlen (cl[i])); 2751 paste ((unsigned char *)cl[i], strlen (cl[i]));
2784 2752
2785 XFreeStringList (cl); 2753 XFreeStringList (cl);
2786 } 2754 }
2787 else 2755 else
2788 paste (ct.value, ct.nitems); 2756 paste (ct.value, ct.nitems); // paste raw
2789 2757
2790 if (bytes_after == 0) 2758bailout:
2791 break;
2792
2793 XFree (ct.value);
2794 }
2795
2796 if (ct.value)
2797 XFree (ct.value); 2759 XFree (ct.value);
2798 2760
2799 if (selection_wait == Sel_normal) 2761 if (selection_wait == Sel_normal)
2800 selection_wait = Sel_none; 2762 selection_wait = Sel_none;
2801
2802 return (int)nread;
2803} 2763}
2804 2764
2805void 2765void
2806rxvt_term::incr_cb (time_watcher &w) 2766rxvt_term::incr_cb (time_watcher &w)
2807{ 2767{
2808 selection_wait = Sel_none; 2768 selection_wait = Sel_none;
2809 2769
2770 incr_buf_size = 0;
2771 free (incr_buf);
2772
2810 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2773 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2811} 2774}
2812 2775
2813/*
2814 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2815 */
2816void 2776void
2817rxvt_term::selection_property (Window win, Atom prop) 2777rxvt_term::selection_property (Window win, Atom prop)
2818{ 2778{
2819 if (prop == None || selection_wait != Sel_incr) 2779 if (prop == None || selection_wait != Sel_incr)
2820 return; 2780 return;
2821 2781
2822 if (selection_paste (win, prop, 1) > 0) 2782 selection_paste (win, prop, true);
2823 incr_ev.start (NOW + 10);
2824 else
2825 {
2826 selection_wait = Sel_none;
2827 incr_ev.stop ();
2828 }
2829} 2783}
2830 2784
2831/* ------------------------------------------------------------------------- */ 2785/* ------------------------------------------------------------------------- */
2832/* 2786/*
2833 * Request the current selection: 2787 * Request the current selection:
… …
2839 * EXT: button 2 release 2793 * EXT: button 2 release
2840 */ 2794 */
2841void 2795void
2842rxvt_term::selection_request (Time tm, int x, int y) 2796rxvt_term::selection_request (Time tm, int x, int y)
2843{ 2797{
2844 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2798 if (x < 0 || x >= width || y < 0 || y >= height)
2845 return; /* outside window */ 2799 return; /* outside window */
2846 2800
2847 if (selection.text) 2801 if (selection.text)
2848 { /* internal selection */ 2802 { /* internal selection */
2849 char *str = rxvt_wcstombs (selection.text, selection.len); 2803 char *str = rxvt_wcstombs (selection.text, selection.len);
… …
2870 return; 2824 return;
2871#endif 2825#endif
2872 } 2826 }
2873 } 2827 }
2874 2828
2875 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2829 selection_wait = Sel_none; /* don't loop in selection_paste () */
2876 selection_paste (display->root, XA_CUT_BUFFER0, False); 2830 selection_paste (display->root, XA_CUT_BUFFER0, false);
2877} 2831}
2878 2832
2879int 2833int
2880rxvt_term::selection_request_other (Atom target, int selnum) 2834rxvt_term::selection_request_other (Atom target, int selnum)
2881{ 2835{
2882 Atom sel; 2836 Atom sel;
2883#ifdef DEBUG_SELECT
2884 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2885#endif
2886 2837
2887 selection_type |= selnum; 2838 selection_type |= selnum;
2888 2839
2889 if (selnum == Sel_Primary) 2840 if (selnum == Sel_Primary)
2890 sel = XA_PRIMARY; 2841 sel = XA_PRIMARY;
… …
2894 sel = xa[XA_CLIPBOARD]; 2845 sel = xa[XA_CLIPBOARD];
2895 2846
2896 if (XGetSelectionOwner (display->display, sel) != None) 2847 if (XGetSelectionOwner (display->display, sel) != None)
2897 { 2848 {
2898 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2849 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2899 TermWin.vt, selection_request_time); 2850 vt, selection_request_time);
2900 return 1; 2851 return 1;
2901 } 2852 }
2902 2853
2903 return 0; 2854 return 0;
2904} 2855}
… …
2927 * EXT: button 1 or 3 release 2878 * EXT: button 1 or 3 release
2928 */ 2879 */
2929void 2880void
2930rxvt_term::selection_make (Time tm) 2881rxvt_term::selection_make (Time tm)
2931{ 2882{
2932 int i, col, end_col, row, end_row; 2883 int i;
2933 wchar_t *new_selection_text; 2884 wchar_t *new_selection_text;
2934 text_t *t; 2885 text_t *t;
2935 2886
2936 switch (selection.op) 2887 switch (selection.op)
2937 { 2888 {
… …
2950 selection.op = SELECTION_DONE; 2901 selection.op = SELECTION_DONE;
2951 2902
2952 if (selection.clicks == 4) 2903 if (selection.clicks == 4)
2953 return; /* nothing selected, go away */ 2904 return; /* nothing selected, go away */
2954 2905
2955 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2906 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2956 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2907 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2957 2908
2958 col = selection.beg.col;
2959 row = selection.beg.row + TermWin.saveLines;
2960 end_row = selection.end.row + TermWin.saveLines;
2961 int ofs = 0; 2909 int ofs = 0;
2962 int extra = 0; 2910 int extra = 0;
2963 2911
2912 int col = selection.beg.col;
2913 int row = selection.beg.row;
2914
2915 int end_col;
2916
2964 for (; row <= end_row; row++, col = 0) 2917 for (; row <= selection.end.row; row++, col = 0)
2965 { 2918 {
2966 end_col = screen.tlen[row];
2967
2968#if ENABLE_FRILLS 2919#if ENABLE_FRILLS
2969 if (selection.rect) 2920 if (selection.rect)
2970 { 2921 {
2971 col = selection.beg.col; 2922 col = selection.beg.col;
2972 end_col = TermWin.ncol + 1; 2923 end_col = ncol + 1;
2973 } 2924 }
2925 else
2974#endif 2926#endif
2927 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2975 2928
2976 MAX_IT (col, 0); 2929 col = max (col, 0);
2977 2930
2978 if (end_col == -1)
2979 end_col = TermWin.ncol;
2980
2981 if (row == end_row || selection.rect) 2931 if (row == selection.end.row || selection.rect)
2982 MIN_IT (end_col, selection.end.col); 2932 end_col = min (end_col, selection.end.col);
2983 2933
2984 t = &screen.text[row][col]; 2934 t = ROW(row).t + col;
2985 for (; col < end_col; col++) 2935 for (; col < end_col; col++)
2986 { 2936 {
2987 if (*t == NOCHAR) 2937 if (*t == NOCHAR)
2988 t++; 2938 t++;
2989#if ENABLE_COMBINING 2939#if ENABLE_COMBINING
… …
3005#endif 2955#endif
3006 else 2956 else
3007 new_selection_text[ofs++] = *t++; 2957 new_selection_text[ofs++] = *t++;
3008 } 2958 }
3009 2959
3010 if (screen.tlen[row] != -1 && row != end_row) 2960 if (!ROW(row).is_longer () && row != selection.end.row)
3011 new_selection_text[ofs++] = C0_LF; 2961 new_selection_text[ofs++] = C0_LF;
3012 } 2962 }
3013 2963
3014 if (end_col != selection.end.col) 2964 if (end_col != selection.end.col)
3015 new_selection_text[ofs++] = C0_LF; 2965 new_selection_text[ofs++] = C0_LF;
… …
3026 2976
3027 // we usually allocate much more than necessary, so realloc it smaller again 2977 // we usually allocate much more than necessary, so realloc it smaller again
3028 selection.len = ofs; 2978 selection.len = ofs;
3029 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2979 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3030 2980
3031 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2981 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3032 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2982 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3033 display->set_selection_owner (this); 2983 display->set_selection_owner (this);
3034 else 2984 else
3035 rxvt_warn ("can't get primary selection, ignoring.\n"); 2985 rxvt_warn ("can't get primary selection, ignoring.\n");
3036 2986
3037#if 0 2987#if 0
… …
3060 3010
3061 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3011 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3062 3012
3063 if (clicks == 2 || clicks == 3) 3013 if (clicks == 2 || clicks == 3)
3064 selection_extend_colrow (selection.mark.col, 3014 selection_extend_colrow (selection.mark.col,
3065 selection.mark.row + TermWin.view_start, 3015 selection.mark.row + view_start,
3066 0, /* button 3 */ 3016 0, /* button 3 */
3067 1, /* button press */ 3017 1, /* button press */
3068 0); /* click change */ 3018 0); /* click change */
3069} 3019}
3070 3020
… …
3074 */ 3024 */
3075void 3025void
3076rxvt_term::selection_start_colrow (int col, int row) 3026rxvt_term::selection_start_colrow (int col, int row)
3077{ 3027{
3078 want_refresh = 1; 3028 want_refresh = 1;
3029
3030 selection.mark.row = row - view_start;
3079 selection.mark.col = col; 3031 selection.mark.col = col;
3080 selection.mark.row = row - TermWin.view_start;
3081 3032
3082 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3033 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1);
3083 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3034 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1);
3084 MAX_IT (selection.mark.col, 0);
3085 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
3086 3035
3087 while (selection.mark.col > 0 3036 while (selection.mark.col > 0
3088 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3037 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3089 --selection.mark.col; 3038 --selection.mark.col;
3090 3039
3091 if (selection.op) 3040 if (selection.op)
3092 { /* clear the old selection */ 3041 { /* clear the old selection */
3093 selection.beg.row = selection.end.row = selection.mark.row; 3042 selection.beg.row = selection.end.row = selection.mark.row;
… …
3117 text_t *stp; 3066 text_t *stp;
3118 rend_t *srp; 3067 rend_t *srp;
3119 3068
3120 if (dirn == UP) 3069 if (dirn == UP)
3121 { 3070 {
3122 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3071 bound.row = - nsaved - 1;
3123 bound.col = 0; 3072 bound.col = 0;
3124 dirnadd = -1; 3073 dirnadd = -1;
3125 } 3074 }
3126 else 3075 else
3127 { 3076 {
3128 bound.row = TermWin.saveLines + TermWin.nrow; 3077 bound.row = nrow;
3129 bound.col = TermWin.ncol - 1; 3078 bound.col = ncol - 1;
3130 dirnadd = 1; 3079 dirnadd = 1;
3131 } 3080 }
3132 3081
3133 row = mark->row + TermWin.saveLines; 3082 row = mark->row;
3134 col = mark->col; 3083 col = max (mark->col, 0);
3135 MAX_IT (col, 0); 3084
3136 /* find the edge of a word */ 3085 /* find the edge of a word */
3137 stp = &screen.text[row][col]; 3086 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3138 w1 = DELIMIT_TEXT (*stp); 3087 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3139
3140 srp = &screen.rend[row][col];
3141 w2 = DELIMIT_REND (*srp);
3142 3088
3143 for (;;) 3089 for (;;)
3144 { 3090 {
3145 for (; col != bound.col; col += dirnadd) 3091 for (; col != bound.col; col += dirnadd)
3146 { 3092 {
… …
3156 break; 3102 break;
3157 } 3103 }
3158 3104
3159 if ((col == bound.col) && (row != bound.row)) 3105 if ((col == bound.col) && (row != bound.row))
3160 { 3106 {
3161 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3107 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3162 { 3108 {
3163 trow = row + dirnadd; 3109 trow = row + dirnadd;
3164 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3110 tcol = dirn == UP ? ncol - 1 : 0;
3165 3111
3166 if (screen.text[trow] == NULL) 3112 if (!ROW(trow).t)
3167 break; 3113 break;
3168 3114
3169 stp = & (screen.text[trow][tcol]); 3115 stp = ROW(trow).t + tcol;
3170 srp = & (screen.rend[trow][tcol]); 3116 srp = ROW(trow).r + tcol;
3171 3117
3172 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3118 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3173 break; 3119 break;
3174 3120
3175 row = trow; 3121 row = trow;
… …
3183Old_Word_Selection_You_Die: 3129Old_Word_Selection_You_Die:
3184 if (dirn == DN) 3130 if (dirn == DN)
3185 col++; /* put us on one past the end */ 3131 col++; /* put us on one past the end */
3186 3132
3187 /* Poke the values back in */ 3133 /* Poke the values back in */
3188 ret->row = row - TermWin.saveLines; 3134 ret->row = row;
3189 ret->col = col; 3135 ret->col = col;
3190} 3136}
3191 3137
3192/* ------------------------------------------------------------------------- */ 3138/* ------------------------------------------------------------------------- */
3193/* 3139/*
… …
3198 * flag == 2 ==> button 3 motion 3144 * flag == 2 ==> button 3 motion
3199 */ 3145 */
3200void 3146void
3201rxvt_term::selection_extend (int x, int y, int flag) 3147rxvt_term::selection_extend (int x, int y, int flag)
3202{ 3148{
3203 int col, row; 3149 int col = min (max (Pixel2Col (x), 0), ncol);
3204 3150 int row = min (max (Pixel2Row (y), 0), nrow - 1);
3205 col = Pixel2Col (x);
3206 row = Pixel2Row (y);
3207 MAX_IT (row, 0);
3208 MIN_IT (row, (int)TermWin.nrow - 1);
3209 MAX_IT (col, 0);
3210 MIN_IT (col, (int)TermWin.ncol);
3211 3151
3212 /* 3152 /*
3213 * If we're selecting characters (single click) then we must check first 3153 * If we're selecting characters (single click) then we must check first
3214 * if we are at the same place as the original mark. If we are then 3154 * if we are at the same place as the original mark. If we are then
3215 * select nothing. Otherwise, if we're to the right of the mark, you have to 3155 * select nothing. Otherwise, if we're to the right of the mark, you have to
3216 * be _past_ a character for it to be selected. 3156 * be _past_ a character for it to be selected.
3217 */ 3157 */
3218 if (((selection.clicks % 3) == 1) && !flag 3158 if (((selection.clicks % 3) == 1) && !flag
3219 && (col == selection.mark.col 3159 && (col == selection.mark.col
3220 && (row == selection.mark.row + TermWin.view_start))) 3160 && (row == selection.mark.row + view_start)))
3221 { 3161 {
3222 /* select nothing */ 3162 /* select nothing */
3223 selection.beg.row = selection.end.row = 0; 3163 selection.beg.row = selection.end.row = 0;
3224 selection.beg.col = selection.end.col = 0; 3164 selection.beg.col = selection.end.col = 0;
3225 selection.clicks = 4; 3165 selection.clicks = 4;
… …
3240 * Extend the selection to the specified col/row 3180 * Extend the selection to the specified col/row
3241 */ 3181 */
3242void 3182void
3243rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3183rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3244{ 3184{
3245 int16_t ncol = TermWin.ncol;
3246 int end_col;
3247 row_col_t pos; 3185 row_col_t pos;
3248 enum { 3186 enum {
3249 LEFT, RIGHT 3187 LEFT, RIGHT
3250 } closeto = RIGHT; 3188 } closeto = RIGHT;
3251 3189
… …
3282 selection.beg.col = selection.end.col = selection.mark.col; 3220 selection.beg.col = selection.end.col = selection.mark.col;
3283 selection.beg.row = selection.end.row = selection.mark.row; 3221 selection.beg.row = selection.end.row = selection.mark.row;
3284 } 3222 }
3285 3223
3286 pos.col = col; 3224 pos.col = col;
3287 pos.row = row; 3225 pos.row = row - view_start;
3288
3289 pos.row -= TermWin.view_start; /* adjust for scroll */
3290 3226
3291 /* 3227 /*
3292 * This is mainly xterm style selection with a couple of differences, mainly 3228 * This is mainly xterm style selection with a couple of differences, mainly
3293 * in the way button3 drag extension works. 3229 * in the way button3 drag extension works.
3294 * We're either doing: button1 drag; button3 press; or button3 drag 3230 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3353 } 3289 }
3354 } 3290 }
3355 3291
3356 if (selection.clicks == 1) 3292 if (selection.clicks == 1)
3357 { 3293 {
3358 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3294 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3359 3295 && !ROW(selection.beg.row).is_longer ()
3360 if (selection.beg.col > end_col
3361 && end_col != -1
3362#if ENABLE_FRILLS 3296#if ENABLE_FRILLS
3363 && !selection.rect 3297 && !selection.rect
3364#endif 3298#endif
3365 ) 3299 )
3366 selection.beg.col = ncol; 3300 selection.beg.col = ncol;
3367 3301
3368 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3369
3370 if ( 3302 if (
3371 selection.end.col > end_col 3303 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3372 && end_col != -1 3304 && !ROW(selection.end.row).is_longer ()
3373#if ENABLE_FRILLS 3305#if ENABLE_FRILLS
3374 && !selection.rect 3306 && !selection.rect
3375#endif 3307#endif
3376 ) 3308 )
3377 selection.end.col = ncol; 3309 selection.end.col = ncol;
… …
3385 selection_delimit_word (DN, &selection.end, &selection.end); 3317 selection_delimit_word (DN, &selection.end, &selection.end);
3386 } 3318 }
3387 else if (selection.clicks == 3) 3319 else if (selection.clicks == 3)
3388 { 3320 {
3389#if ENABLE_FRILLS 3321#if ENABLE_FRILLS
3390 if ((options & Opt_tripleclickwords)) 3322 if (options & Opt_tripleclickwords)
3391 { 3323 {
3392 int end_row;
3393
3394 selection_delimit_word (UP, &selection.beg, &selection.beg); 3324 selection_delimit_word (UP, &selection.beg, &selection.beg);
3395 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3396 3325
3397 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3326 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3398 { 3327 {
3399 end_col = screen.tlen[end_row + TermWin.saveLines]; 3328 if (!ROW(end_row).is_longer ())
3400
3401 if (end_col != -1)
3402 { 3329 {
3403 selection.end.row = end_row; 3330 selection.end.row = end_row;
3404 selection.end.col = end_col; 3331 selection.end.col = ROW(end_row).l;
3405 selection_remove_trailing_spaces (); 3332 selection_remove_trailing_spaces ();
3406 break; 3333 break;
3407 } 3334 }
3408 } 3335 }
3409 } 3336 }
… …
3413 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3340 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3414 selection.mark.col++; 3341 selection.mark.col++;
3415 3342
3416 selection.beg.col = 0; 3343 selection.beg.col = 0;
3417 selection.end.col = ncol; 3344 selection.end.col = ncol;
3345
3346 // select a complete logical line
3347 while (selection.beg.row > -saveLines
3348 && ROW(selection.beg.row - 1).is_longer ())
3349 selection.beg.row--;
3350
3351 while (selection.end.row < nrow
3352 && ROW(selection.end.row).is_longer ())
3353 selection.end.row++;
3418 } 3354 }
3419 } 3355 }
3420 3356
3421 if (button3 && buttonpress) 3357 if (button3 && buttonpress)
3422 { /* mark may need to be changed */ 3358 { /* mark may need to be changed */
… …
3446 text_t *stp; 3382 text_t *stp;
3447 3383
3448 end_col = selection.end.col; 3384 end_col = selection.end.col;
3449 end_row = selection.end.row; 3385 end_row = selection.end.row;
3450 3386
3451 for ( ; end_row >= selection.beg.row; ) 3387 for (; end_row >= selection.beg.row; )
3452 { 3388 {
3453 stp = screen.text[end_row + TermWin.saveLines]; 3389 stp = ROW(end_row).t;
3454 3390
3455 while (--end_col >= 0) 3391 while (--end_col >= 0)
3456 { 3392 {
3457 if (stp[end_col] != ' ' 3393 if (stp[end_col] != ' '
3458 && stp[end_col] != '\t' 3394 && stp[end_col] != '\t'
3459 && stp[end_col] != NOCHAR) 3395 && stp[end_col] != NOCHAR)
3460 break; 3396 break;
3461 } 3397 }
3462 3398
3463 if (end_col >= 0 3399 if (end_col >= 0
3464 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3400 || !ROW(end_row - 1).is_longer ())
3465 { 3401 {
3466 selection.end.col = end_col + 1; 3402 selection.end.col = end_col + 1;
3467 selection.end.row = end_row; 3403 selection.end.row = end_row;
3468 break; 3404 break;
3469 } 3405 }
3470 3406
3471 end_row--; 3407 end_row--;
3472 end_col = TermWin.ncol; 3408 end_col = ncol;
3473 } 3409 }
3474 3410
3475 if (selection.mark.row > selection.end.row) 3411 if (selection.mark.row > selection.end.row)
3476 { 3412 {
3477 selection.mark.row = selection.end.row; 3413 selection.mark.row = selection.end.row;
… …
3502 */ 3438 */
3503void 3439void
3504rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3440rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3505{ 3441{
3506 XSelectionEvent ev; 3442 XSelectionEvent ev;
3443 dDisp;
3507 3444
3508 ev.type = SelectionNotify; 3445 ev.type = SelectionNotify;
3509 ev.property = None; 3446 ev.property = None;
3510 ev.display = rq.display; 3447 ev.display = rq.display;
3511 ev.requestor = rq.requestor; 3448 ev.requestor = rq.requestor;
… …
3525 *target++ = xa[XA_COMPOUND_TEXT]; 3462 *target++ = xa[XA_COMPOUND_TEXT];
3526#if X_HAVE_UTF8_STRING 3463#if X_HAVE_UTF8_STRING
3527 *target++ = xa[XA_UTF8_STRING]; 3464 *target++ = xa[XA_UTF8_STRING];
3528#endif 3465#endif
3529 3466
3530 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3467 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3531 32, PropModeReplace, 3468 32, PropModeReplace,
3532 (unsigned char *)target_list, target - target_list); 3469 (unsigned char *)target_list, target - target_list);
3533 ev.property = rq.property; 3470 ev.property = rq.property;
3534 } 3471 }
3535#if TODO // TODO 3472#if TODO // TODO
… …
3538 /* TODO: Handle MULTIPLE */ 3475 /* TODO: Handle MULTIPLE */
3539 } 3476 }
3540#endif 3477#endif
3541 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3478 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3542 { 3479 {
3543 XChangeProperty (display->display, rq.requestor, rq.property, rq.target, 3480 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3544 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3481 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3545 ev.property = rq.property; 3482 ev.property = rq.property;
3546 } 3483 }
3547 else if (rq.target == XA_STRING 3484 else if (rq.target == XA_STRING
3548 || rq.target == xa[XA_TEXT] 3485 || rq.target == xa[XA_TEXT]
… …
3606 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3543 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3607 ct.nitems = strlen ((char *)ct.value); 3544 ct.nitems = strlen ((char *)ct.value);
3608 } 3545 }
3609 else 3546 else
3610#endif 3547#endif
3611 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3548 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3612 freect = 1; 3549 freect = 1;
3613 else 3550 else
3614 { 3551 {
3615 /* if we failed to convert then send it raw */ 3552 /* if we failed to convert then send it raw */
3616 ct.value = (unsigned char *)cl; 3553 ct.value = (unsigned char *)cl;
3617 ct.nitems = selectlen; 3554 ct.nitems = selectlen;
3618 ct.encoding = target; 3555 ct.encoding = target;
3619 } 3556 }
3620 3557
3621 XChangeProperty (display->display, rq.requestor, rq.property, 3558 XChangeProperty (disp, rq.requestor, rq.property,
3622 ct.encoding, 8, PropModeReplace, 3559 ct.encoding, 8, PropModeReplace,
3623 ct.value, (int)ct.nitems); 3560 ct.value, (int)ct.nitems);
3624 ev.property = rq.property; 3561 ev.property = rq.property;
3625 3562
3626 if (freect) 3563 if (freect)
3627 XFree (ct.value); 3564 XFree (ct.value);
3628 } 3565 }
3629 3566
3630 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3567 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3631} 3568}
3632 3569
3633/* ------------------------------------------------------------------------- * 3570/* ------------------------------------------------------------------------- *
3634 * MOUSE ROUTINES * 3571 * MOUSE ROUTINES *
3635 * ------------------------------------------------------------------------- */ 3572 * ------------------------------------------------------------------------- */
… …
3639 */ 3576 */
3640void 3577void
3641rxvt_term::pixel_position (int *x, int *y) 3578rxvt_term::pixel_position (int *x, int *y)
3642{ 3579{
3643 *x = Pixel2Col (*x); 3580 *x = Pixel2Col (*x);
3644 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3581 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */
3645 *y = Pixel2Row (*y); 3582 *y = Pixel2Row (*y);
3646 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3583 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */
3647} 3584}
3648 3585
3649/* ------------------------------------------------------------------------- */ 3586/* ------------------------------------------------------------------------- */
3650#ifdef USE_XIM 3587#ifdef USE_XIM
3651void 3588void
3652rxvt_term::im_set_position (XPoint &pos) 3589rxvt_term::im_set_position (XPoint &pos)
3653{ 3590{
3654 XWindowAttributes xwa; 3591 XWindowAttributes xwa;
3655 3592
3656 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3593 XGetWindowAttributes (display->display, vt, &xwa);
3657 3594
3658 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3595 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3659 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; 3596 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3660} 3597}
3661#endif 3598#endif
3662 3599
3663#if ENABLE_OVERLAY 3600#if ENABLE_OVERLAY
3664void 3601void
3665rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3602rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3666{ 3603{
3667 if (TermWin.nrow < 3 || TermWin.ncol < 3) 3604 if (nrow < 3 || ncol < 3)
3668 return; 3605 return;
3669 3606
3670 want_refresh = 1; 3607 want_refresh = 1;
3671 3608
3672 scr_overlay_off (); 3609 scr_overlay_off ();
3673 3610
3674 if (x < 0) x = TermWin.ncol - w; 3611 if (x < 0) x = ncol - w;
3675 if (y < 0) y = TermWin.nrow - h; 3612 if (y < 0) y = nrow - h;
3676 3613
3677 // make space for border 3614 // make space for border
3678 w += 2; MIN_IT (w, TermWin.ncol); 3615 w += 2; MIN_IT (w, ncol);
3679 h += 2; MIN_IT (h, TermWin.nrow); 3616 h += 2; MIN_IT (h, nrow);
3680 3617
3681 x -= 1; MAX_IT (x, 0); 3618 x -= 1; MAX_IT (x, 0);
3682 y -= 1; MAX_IT (y, 0); 3619 y -= 1; MAX_IT (y, 0);
3683 3620
3684 MIN_IT (x, TermWin.ncol - w); 3621 MIN_IT (x, ncol - w);
3685 MIN_IT (y, TermWin.nrow - h); 3622 MIN_IT (y, nrow - h);
3686 3623
3687 ov_x = x; ov_y = y; 3624 ov_x = x; ov_y = y;
3688 ov_w = w; ov_h = h; 3625 ov_w = w; ov_h = h;
3689 3626
3690 ov_text = new text_t *[h]; 3627 ov_text = new text_t *[h];
… …
3755 while (*s) 3692 while (*s)
3756 scr_overlay_set (x++, y, *s++); 3693 scr_overlay_set (x++, y, *s++);
3757} 3694}
3758 3695
3759void 3696void
3697rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3698{
3699 while (*s)
3700 {
3701 text_t t = *s++;
3702 int width = wcwidth (t);
3703
3704 while (width--)
3705 {
3706 scr_overlay_set (x++, y, t);
3707 t = NOCHAR;
3708 }
3709 }
3710}
3711
3712void
3760rxvt_term::scr_swap_overlay () 3713rxvt_term::scr_swap_overlay ()
3761{ 3714{
3762 if (!ov_text) 3715 if (!ov_text)
3763 return; 3716 return;
3764 3717
3765 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3766
3767 // swap screen mem with overlay 3718 // swap screen mem with overlay
3768 for (int y = ov_h; y--; ) 3719 for (int y = ov_h; y--; )
3769 { 3720 {
3770 text_t *t1 = ov_text[y]; 3721 text_t *t1 = ov_text[y];
3771 rend_t *r1 = ov_rend[y]; 3722 rend_t *r1 = ov_rend[y];
3772 3723
3773 text_t *t2 = screen.text[y + row_offset] + ov_x; 3724 text_t *t2 = ROW(y - view_start).t + ov_x;
3774 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3725 rend_t *r2 = ROW(y - view_start).r + ov_x;
3775 3726
3776 for (int x = ov_w; x--; ) 3727 for (int x = ov_w; x--; )
3777 { 3728 {
3778 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3729 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3779 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3730 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3781 } 3732 }
3782} 3733}
3783 3734
3784#endif 3735#endif
3785/* ------------------------------------------------------------------------- */ 3736/* ------------------------------------------------------------------------- */
3737

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines