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.172 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.200 by root, Tue Dec 27 01:54:08 2005 UTC

… …
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 (line_t &l, unsigned int col, 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
124 text_t *et = l.t + col; 131 text_t *et = l.t + col;
125 rend_t *er = l.r + col; 132 rend_t *er = l.r + col;
… …
134/* ------------------------------------------------------------------------- */ 141/* ------------------------------------------------------------------------- */
135/* 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 */
136void 143void
137rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 144rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
138{ 145{
139 if (!l.t)
140 lalloc (l);
141
142 scr_blank_line (l, 0, ncol, efs); 146 scr_blank_line (l, 0, ncol, efs);
143} 147}
144 148
145/* ------------------------------------------------------------------------- * 149/* ------------------------------------------------------------------------- *
146 * SCREEN INITIALISATION * 150 * SCREEN INITIALISATION *
147 * ------------------------------------------------------------------------- */ 151 * ------------------------------------------------------------------------- */
152
148void 153void
149rxvt_term::scr_reset () 154rxvt_term::scr_reset ()
150{ 155{
151 unsigned int p, q;
152 int k;
153
154#if ENABLE_OVERLAY 156#if ENABLE_OVERLAY
155 scr_overlay_off (); 157 scr_overlay_off ();
156#endif 158#endif
157 159
158 view_start = 0; 160 view_start = 0;
… …
168 return; 170 return;
169 171
170 // we need at least two lines for wrapping to work correctly 172 // we need at least two lines for wrapping to work correctly
171 if (nrow + saveLines < 2) 173 if (nrow + saveLines < 2)
172 { 174 {
175 //TODO//FIXME
173 saveLines++; 176 saveLines++;
174 prev_nrow--; 177 prev_nrow--;
175 nscrolled++; 178 nsaved++;
176 } 179 }
177 180
178 want_refresh = 1; 181 want_refresh = 1;
179 182
180 int prev_total_rows = prev_nrow + saveLines; 183 int prev_total_rows = prev_nrow + saveLines;
181 int total_rows = nrow + saveLines; 184 total_rows = nrow + saveLines;
182 185
183 screen.tscroll = 0; 186 screen.tscroll = 0;
184 screen.bscroll = nrow - 1; 187 screen.bscroll = nrow - 1;
185 188
186 if (!save) 189 if (!row_buf)
187 { 190 {
188 /* 191 /*
189 * first time called so just malloc everything: don't rely on realloc 192 * first time called so just malloc everything: don't rely on realloc
190 * Note: this is still needed so that all the scrollback lines are NULL 193 * Note: this is still needed so that all the scrollback lines are NULL
191 */ 194 */
192 nscrolled = 0; /* no saved lines */ 195 nsaved = 0; /* no saved lines */
193 term_start = 0; 196 term_start = 0;
194 nsaved = 0;
195 197
196 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 198 talloc = new rxvt_salloc (ncol * sizeof (text_t));
197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 199 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198 200
199 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
200 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 201 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
202 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
201 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 203 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
202 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 204 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
203 205
204 screen.line = (line_t **)rxvt_calloc (nrow, sizeof (line_t *));
205
206 scr_update_term ();
207
208 for (p = nrow; p--; ) 206 for (int row = nrow; row--; )
209 { 207 {
210 scr_blank_screen_mem (*screen.line[p], DEFAULT_RSTYLE); 208 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
211 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 209 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
212 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 210 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
213 } 211 }
214 212
215 memset (charsets, 'B', sizeof (charsets)); 213 memset (charsets, 'B', sizeof (charsets));
216 rstyle = DEFAULT_RSTYLE; 214 rstyle = DEFAULT_RSTYLE;
217 screen.flags = Screen_DefaultFlags; 215 screen.flags = Screen_DefaultFlags;
… …
241 { 239 {
242 /* 240 /*
243 * add or delete rows as appropriate 241 * add or delete rows as appropriate
244 */ 242 */
245 243
246 rxvt_salloc *old_ta; 244 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
247 rxvt_salloc *old_ra; 245 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248 246
247#if 0
249 if (nrow < prev_nrow) 248 if (nrow < prev_nrow)
250 { 249 {
251 /* delete rows */
252 k = min (nscrolled, prev_nrow - nrow);
253 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
254 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
255
256 for (p = nrow; p < prev_nrow; p++) 250 for (int row = nrow; row < prev_nrow; row++)
257 { 251 {
258 lfree (save[p + saveLines]);
259 lfree (swap_save[p]); 252 lfree (swap_buf [row]);
260 lfree (drawn[p]); 253 lfree (drawn_buf[row]);
261 } 254 }
255 }
256#endif
262 257
263 /* we have fewer rows so fix up cursor position */ 258 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
264 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 259 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
260 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
265 261
266 scr_reset_realloc (); /* realloc _last_ */ 262 for (int row = min (nrow, prev_nrow); row--; )
263 {
264 lresize (drawn_buf[row]);
265 lresize (swap_buf [row]);
266 }
267
268 for (int row = prev_nrow; row < nrow; row++)
269 {
270 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272 }
273
274 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
267 } 275
268 else if (nrow > prev_nrow) 276 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
277 int pend = MOD (term_start - nsaved , prev_total_rows);
278 int q = total_rows; // rewrapped row
279
280 if (nsaved)
281 {
282 // re-wrap lines, this is rather ugly, possibly because I am too dumb
283 // to come up with a lean and mean algorithm.
284
285 row_col_t ocur = screen.cur;
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287
269 { 288 do
270 /* add rows */
271 scr_reset_realloc (); /* realloc _first_ */
272
273 int ocol = ncol;
274 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
275
276 k = min (nscrolled, nrow - prev_nrow);
277
278 for (p = prev_total_rows; p < total_rows; p++)
279 save[p].clear ();
280
281 for (p = prev_total_rows; p < total_rows - k; p++)
282 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
283
284 scr_update_term ();
285
286 for (p = prev_nrow; p < nrow; p++)
287 { 289 {
288 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 290 p = MOD (p - 1, prev_total_rows);
289 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
290 }
291
292 if (k > 0)
293 {
294 scr_scroll_text (0, (int)nrow - 1, -k, 1);
295 screen.cur.row += k;
296 screen.s_cur.row += k;
297 nscrolled -= k;
298 }
299
300#ifdef DEBUG_STRICT 291#ifdef DEBUG_STRICT
301 assert (screen.cur.row < nrow); 292 assert (old_buf [MOD (p, prev_total_rows)].t);
302#else /* drive with your eyes closed */
303 MIN_IT (screen.cur.row, nrow - 1);
304#endif 293#endif
305 ncol = ocol; // save b/c scr_blank_screen_mem uses this
306 }
307 294
308 /* resize columns */
309 if (ncol != prev_ncol)
310 {
311 old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
312 old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
313
314 for (p = total_rows; p--; )
315 lresize (save[p]);
316
317 for (p = nrow; p--; )
318 {
319 lresize (drawn[p]);
320 lresize (swap_save[p]);
321 }
322
323 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
324
325 delete old_ta;
326 delete old_ra;
327 }
328
329#if 0
330 // re-wrap lines, this is rather ugly, possibly because I am too dumb
331 // to come up with a lean and mean algorithm.
332 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
333 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
334
335 text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
336 rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
337 tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
338
339 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
340
341 p = prev_total_rows;
342 q = total_rows;
343
344 while (p > 0 && q > 0)
345 {
346 --p;
347
348 printf ("pq %d:%d\n", p, q);
349 if (save[p].t)
350 {
351 int llen = save[p].l; 295 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l;
352 297
353 assert (llen >= 0); 298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
354
355 while (p && save[p - 1].l < 0)
356 { 299 {
300 p = MOD (p - 1, prev_total_rows);
301
357 --p; 302 plines++;
358 llen += prev_ncol; 303 llen += prev_ncol;
359 } 304 }
360 305
361 int qlines = llen / ncol + 1; 306 int qlines = max (0, (llen - 1) / ncol) + 1;
307
308 // drop partial lines completely
309 if (q < qlines)
310 break;
311
312 q -= qlines;
313
362 int lofs = 0; 314 int lofs = 0;
315 line_t *qline;
363 316
364 q -= qlines; 317 // re-assemble the full line by destination lines
365
366 int qrow = q;
367
368 printf ("QL %d llen %d\n", qlines, llen);//D
369 for (; qlines--; qrow++) 318 for (int qrow = q; qlines--; qrow++)
370 { 319 {
320 qline = row_buf + qrow;
321 lalloc (*qline);
322 qline->set_is_longer ();
323
371 if (qrow >= 0) 324 int qcol = 0;
325
326 // fill a single destination line
327 while (lofs < llen && qcol < ncol)
372 { 328 {
373 tp [qrow] = (text_t *)ta->alloc ();
374 rp [qrow] = (rend_t *)ra->alloc ();
375 tl [qrow] = -1;
376
377 int qcol = 0;
378
379 for (;;)
380 {
381 int prow = lofs / prev_ncol + p; 329 int prow = lofs / prev_ncol;
382 int pcol = lofs % prev_ncol; 330 int pcol = lofs % prev_ncol;
383 331
332 prow = MOD (p + prow, prev_total_rows);
333
334 // we only adjust the cursor _row_ and put it into
335 // the topmost line of "long line" it was in, as
336 // this seems to upset applications/shells/readline
337 // least.
338 if (prow == ocur.row)
339 screen.cur.row = q - (total_rows - nrow);
340
341 line_t &pline = old_buf [prow];
342
384 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 343 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385 344
386 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);
387
388 if (len <= 0)
389 {
390 tl [qrow] = qcol;
391
392 TODO
393 scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
394 ncol - qcol, DEFAULT_RSTYLE);
395
396 break;
397 }
398
399 assert (lofs < 1000); 345 assert (len);
346 assert (pline.t);
400 347
401 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 348 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
402 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 349 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
403 350
404 lofs += len; 351 lofs += len;
405 qcol += len; 352 qcol += len;
406
407 if (qcol == ncol)
408 break;
409 }
410 } 353 }
411 else
412 lofs += ncol;
413 } 354 }
355
356 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
357#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY
358 if (qline->l < 0)
359 {
360 fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
361 qline->l = 0;
362 }
363#endif
364 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
414 } 365 }
366 while (p != pend && q > 0);
367
368 term_start = total_rows - nrow;
369 nsaved = term_start - q;
370
371 // make sure all terminal lines exist
372 while (nsaved < 0)
373 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
374
375 }
376 else
415 } 377 {
378 // if no scrollback exists (yet), wing, instead of wrap
379
380 for (int row = min (nrow, prev_nrow); row--; )
381 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row];
416 384
417 free (screen.text); screen.text = tp; 385 qline = pline;
418 free (screen.rend); screen.rend = rp; 386 lresize (qline);
419 free (screen.tlen); screen.tlen = tl; 387 }
420 388
421 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 389 for (int row = prev_nrow; row < nrow; row++)
390 {
391 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
392 }
393
394 term_start = 0;
395 }
396
397#ifdef DEBUG_STRICT //TODO: remove
398 for (int i = -nsaved; i < nrow; i++)
399 assert (ROW (i).t);
422#endif 400#endif
401
402 free (old_buf);
403 delete old_ta;
404 delete old_ra;
405
406 clamp_it (screen.cur.row, 0, nrow - 1);
407 clamp_it (screen.cur.col, 0, ncol - 1);
423 408
424 if (tabs) 409 if (tabs)
425 free (tabs); 410 free (tabs);
426 } 411 }
427 412
428 prev_nrow = nrow; 413 prev_nrow = nrow;
429 prev_ncol = ncol; 414 prev_ncol = ncol;
430 415
431 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 416 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
432 417
433 for (p = 0; p < ncol; p++) 418 for (int col = ncol; col--; )
434 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 419 tabs [col] = col % TABSIZE == 0;
435 420
436 tt_winch (); 421 tt_winch ();
437} 422}
438 423
439void
440rxvt_term::scr_reset_realloc ()
441{
442 unsigned int total_rows = nrow + saveLines;
443
444 screen.line = (line_t **)rxvt_realloc (screen.line, nrow * sizeof (line_t *));
445 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
446 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
447 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
448 buf = (line_t *) rxvt_realloc (buf , total_rows * sizeof (line_t));
449}
450
451/* ------------------------------------------------------------------------- */ 424/* ------------------------------------------------------------------------- */
452/* 425/*
453 * Free everything. That way malloc debugging can find leakage. 426 * Free everything. That way malloc debugging can find leakage.
454 */ 427 */
455void 428void
456rxvt_term::scr_release () 429rxvt_term::scr_release ()
457{ 430{
458 unsigned int total_rows;
459
460 total_rows = nrow + saveLines;
461
462 delete talloc; talloc = 0; 431 delete talloc; talloc = 0;
463 delete ralloc; ralloc = 0; 432 delete ralloc; ralloc = 0;
464 433
465 free (screen.line); 434 free (row_buf);
466 free (save);
467 free (swap_save); 435 free (swap_buf);
468 free (drawn); 436 free (drawn_buf);
469 free (buf); 437 free (temp_buf);
470 free (tabs); 438 free (tabs);
439
440 row_buf = 0; // signal that we freed all the arrays
471} 441}
472 442
473/* ------------------------------------------------------------------------- */ 443/* ------------------------------------------------------------------------- */
474/* 444/*
475 * Hard reset 445 * Hard reset
… …
526 set_font_style (); 496 set_font_style ();
527 break; 497 break;
528 } 498 }
529 499
530 /* boundary check in case screen size changed between SAVE and RESTORE */ 500 /* boundary check in case screen size changed between SAVE and RESTORE */
531 MIN_IT (s->cur.row, nrow - 1); 501 min_it (s->cur.row, nrow - 1);
532 MIN_IT (s->cur.col, ncol - 1); 502 min_it (s->cur.col, ncol - 1);
533#ifdef DEBUG_STRICT 503#ifdef DEBUG_STRICT
534 assert (s->cur.row >= 0); 504 assert (s->cur.row >= 0);
535 assert (s->cur.col >= 0); 505 assert (s->cur.col >= 0);
536#else /* drive with your eyes closed */
537 MAX_IT (s->cur.row, 0);
538 MAX_IT (s->cur.col, 0);
539#endif 506#endif
540} 507}
541 508
542/* ------------------------------------------------------------------------- */ 509/* ------------------------------------------------------------------------- */
543/* 510/*
… …
546 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
547 */ 514 */
548int 515int
549rxvt_term::scr_change_screen (int scrn) 516rxvt_term::scr_change_screen (int scrn)
550{ 517{
551 int i;
552#if NSCREENS
553 int offset;
554#endif
555
556 want_refresh = 1; 518 want_refresh = 1;
557
558 view_start = 0; 519 view_start = 0;
559 520
560 if (current_screen == scrn) 521 if (current_screen == scrn)
561 return scrn; 522 return scrn;
562 523
563 selection_check (2); /* check for boundary cross */ 524 selection_check (2); /* check for boundary cross */
564 525
565 i = current_screen; current_screen = scrn; scrn = i; 526 int i = current_screen; current_screen = scrn; scrn = i;
566 527
567 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 528 ::swap (screen.cur.row, swap.cur.row);
568 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 529 ::swap (screen.cur.col, swap.cur.col);
569 MAX_IT (screen.cur.row, 0); 530
570 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
571 MAX_IT (screen.cur.col, 0); 532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
572 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
573 533
574#if NSCREENS 534#if NSCREENS
575 if (options & Opt_secondaryScreen) 535 if (options & Opt_secondaryScreen)
576 { 536 {
577 num_scr = 0; 537 num_scr = 0;
578 offset = saveLines;
579 538
580 for (i = prev_nrow; i--;) 539 for (int i = prev_nrow; i--; )
581 SWAP_IT (*(screen.line[i]), swap_save[i], line_t); 540 ::swap (ROW(i), swap_buf [i]);
582 541
583 SWAP_IT (screen.charset, swap.charset, int16_t); 542 ::swap (screen.charset, swap.charset);
584 SWAP_IT (screen.flags, swap.flags, int); 543 ::swap (screen.flags, swap.flags);
585 screen.flags |= Screen_VisibleCursor; 544 screen.flags |= Screen_VisibleCursor;
586 swap.flags |= Screen_VisibleCursor; 545 swap.flags |= Screen_VisibleCursor;
587 } 546 }
588 else 547 else
589#endif 548#endif
590 if (options & Opt_secondaryScroll) 549 if (options & Opt_secondaryScroll)
591 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 550 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
592 551
593 return scrn; 552 return scrn;
594} 553}
595 554
596// clear WrapNext indicator, solidifying position on next line 555// clear WrapNext indicator, solidifying position on next line
… …
603 screen.flags &= ~Screen_WrapNext; 562 screen.flags &= ~Screen_WrapNext;
604 563
605 screen.cur.col = 0; 564 screen.cur.col = 0;
606 565
607 if (screen.cur.row == screen.bscroll) 566 if (screen.cur.row == screen.bscroll)
608 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 567 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
609 else if (screen.cur.row < nrow - 1) 568 else if (screen.cur.row < nrow - 1)
610 screen.cur.row++; 569 screen.cur.row++;
611} 570}
612 571
613/* ------------------------------------------------------------------------- */ 572/* ------------------------------------------------------------------------- */
… …
639 rstyle = DEFAULT_RSTYLE; 598 rstyle = DEFAULT_RSTYLE;
640 else 599 else
641 rstyle &= ~style; 600 rstyle &= ~style;
642 } 601 }
643 602
644// set screen.line pointers to the actual lines in the save buffer
645void
646rxvt_term::scr_update_term ()
647{
648 for (int i = nrow; i--; )
649 screen.line[i] = save + saveLines + i;
650}
651
652/* ------------------------------------------------------------------------- */ 603/* ------------------------------------------------------------------------- */
653/* 604/*
654 * Scroll text between <row1> and <row2> inclusive, by <count> lines 605 * Scroll text between <row1> and <row2> inclusive, by <count> lines
655 * count positive ==> scroll up 606 * count positive ==> scroll up
656 * count negative ==> scroll down 607 * count negative ==> scroll down
657 * spec == 0 for normal routines
658 */ 608 */
659int 609int
660rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 610rxvt_term::scr_scroll_text (int row1, int row2, int count)
661{ 611{
662 int i, j;
663
664 if (count == 0 || (row1 > row2)) 612 if (count == 0 || (row1 > row2))
665 return 0; 613 return 0;
666 614
667 want_refresh = 1; 615 want_refresh = 1;
616 num_scr += count;
668 617
669 if (row1 == 0 && count > 0 618 if (count > 0
619 && row1 == 0
620 && row2 == nrow - 1
670 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 621 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
671 { 622 {
672 nscrolled += count; 623 nsaved = min (nsaved + count, saveLines);
624 term_start = (term_start + count) % total_rows;
673 625
674 if (nscrolled > saveLines) 626 if (selection.op && current_screen == selection.screen)
675 nscrolled = saveLines; 627 {
628 selection.beg.row -= count;
629 selection.end.row -= count;
630 selection.mark.row -= count;
676 631
632 if (selection.beg.row < -nsaved
633 || selection.end.row < -nsaved
634 || selection.mark.row < -nsaved)
635 {
636 CLEAR_ALL_SELECTION ();
637 selection.op = SELECTION_CLEAR;
638 }
639 }
640
641 for (int i = count; i--; )
642 {
643 ROW(row2 - i).l = 0;
644 scr_blank_screen_mem (ROW(row2 - i), rstyle);
645 }
646
677 if ((options & Opt_scrollWithBuffer) 647 if ((options & Opt_scrollWithBuffer)
678 && view_start != 0 648 && view_start != 0
679 && view_start != saveLines) 649 && view_start != saveLines)
680 scr_page (UP, count); 650 scr_page (UP, count);
681 } 651 }
682 else if (!spec) 652 else
683 row1 += saveLines; 653 {
684
685 row2 += saveLines;
686
687 if (selection.op && current_screen == selection.screen) 654 if (selection.op && current_screen == selection.screen)
688 { 655 {
689 i = selection.beg.row + saveLines; 656 if ((selection.beg.row < row1 && selection.end.row > row1)
690 j = selection.end.row + saveLines; 657 || (selection.beg.row < row2 && selection.end.row > row2)
691 658 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
692 if ((i < row1 && j > row1) 659 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
693 || (i < row2 && j > row2) 660 || (selection.end.row - count < row1 && selection.end.row >= row1)
694 || (i - count < row1 && i >= row1) 661 || (selection.end.row - count > row2 && selection.end.row <= row2))
695 || (i - count > row2 && i <= row2)
696 || (j - count < row1 && j >= row1)
697 || (j - count > row2 && j <= row2))
698 { 662 {
699 CLEAR_ALL_SELECTION (); 663 CLEAR_ALL_SELECTION ();
700 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 664 selection.op = SELECTION_CLEAR;
701 } 665 }
702 else if (j >= row1 && j <= row2) 666 else if (selection.end.row >= row1 && selection.end.row <= row2)
703 { 667 {
704 /* move selected region too */ 668 /* move selected region too */
705 selection.beg.row -= count; 669 selection.beg.row -= count;
706 selection.end.row -= count; 670 selection.end.row -= count;
707 selection.mark.row -= count; 671 selection.mark.row -= count;
672
673 selection_check (0);
674 }
675 }
676
677 // use a simple and robust scrolling algorithm, this
678 // part of scr_scroll_text is not time-critical.
679
680 int rows = row2 - row1 + 1;
681
682 min_it (count, rows);
683
684 for (int row = 0; row < rows; row++)
708 } 685 {
709 } 686 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
710 687
711 selection_check (0); /* _after_ nscrolled update */ 688 if (!IN_RANGE_EXC (row + count, 0, rows))
689 scr_blank_screen_mem (temp_buf [row], rstyle);
690 }
712 691
713 num_scr += count; 692 for (int row = 0; row < rows; row++)
714 j = count; 693 ROW(row1 + row) = temp_buf [row];
715
716 if (count < 0)
717 count = -count;
718
719 i = row2 - row1 + 1;
720 MIN_IT (count, i);
721
722 if (j > 0)
723 { 694 }
724 /* scroll up */
725
726 /* Copy lines that will get clobbered by the rotation */
727 memcpy (buf, save + row1, count * sizeof (line_t));
728
729 /* Rotate lines */
730 i = row2 - row1 - count + 1;
731 memmove (save + row1, save + row1 + count, i * sizeof (line_t));
732
733 j = row2 - count + 1, i = count;
734 }
735 else /* if (j < 0) */
736 {
737 /* scroll down */
738
739 /* Copy lines that will get clobbered by the rotation */
740 for (i = 0, j = row2; i < count; i++, j--)
741 buf[i] = save[j];
742
743 /* Rotate lines */
744 for (j = row2, i = j - count; i >= row1; i--, j--)
745 save[j] = save[i];
746
747 j = row1, i = count;
748 count = -count;
749 }
750
751 /* Resurrect lines */
752 memcpy (save + j, buf, i * sizeof (line_t));
753
754 scr_update_term ();
755
756 if (!spec) /* line length may not equal ncol */
757 for (; i--; j++)
758 scr_blank_screen_mem (save[j], rstyle);
759 695
760 return count; 696 return count;
761} 697}
762 698
763/* ------------------------------------------------------------------------- */ 699/* ------------------------------------------------------------------------- */
… …
770 if (len <= 0) /* sanity */ 706 if (len <= 0) /* sanity */
771 return; 707 return;
772 708
773 unsigned char checksel; 709 unsigned char checksel;
774 unicode_t c; 710 unicode_t c;
775 int row, last_col; 711 int last_col;
776 const unicode_t *strend = str + len; 712 const unicode_t *strend = str + len;
777 713
778 want_refresh = 1; 714 want_refresh = 1;
779 ZERO_SCROLLBACK (); 715 ZERO_SCROLLBACK ();
780 last_col = ncol; 716 last_col = ncol;
781 717
782 if (nlines > 0) 718 if (nlines > 0)
783 { 719 {
784 nlines += screen.cur.row - screen.bscroll; 720 nlines += screen.cur.row - screen.bscroll;
785 if ((nlines > 0) 721 if (nlines > 0
786 && (screen.tscroll == 0) 722 && screen.tscroll == 0
787 && (screen.bscroll == (nrow - 1))) 723 && screen.bscroll == (nrow - 1))
788 { 724 {
789 /* _at least_ this many lines need to be scrolled */ 725 /* _at least_ this many lines need to be scrolled */
790 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 726 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
791 screen.cur.row -= nlines; 727 screen.cur.row -= nlines;
792 } 728 }
793 } 729 }
794 730
795#ifdef DEBUG_STRICT 731#ifdef DEBUG_STRICT
796 assert (screen.cur.col < last_col); 732 assert (screen.cur.col < last_col);
797 assert ((screen.cur.row < nrow) 733 assert (screen.cur.row < nrow
798 && (screen.cur.row >= - (int32_t)nscrolled)); 734 && screen.cur.row >= -nsaved);
799#else /* drive with your eyes closed */
800 MIN_IT (screen.cur.col, last_col - 1);
801 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
802 MAX_IT (screen.cur.row, - (int32_t)nscrolled);
803#endif 735#endif
804 row = screen.cur.row + saveLines; 736 int row = screen.cur.row;
805 737
806 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 738 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807 739
808 line_t *line = save + row; 740 line_t *line = &ROW(row);
809 741
810 while (str < strend) 742 while (str < strend)
811 { 743 {
812 c = *str++; 744 c = *str++;
813 745
814 if (c < 0x20) 746 if (c < 0x20)
815 if (c == C0_LF) 747 if (c == C0_LF)
816 { 748 {
817 if (line->l != -1) /* XXX: think about this */ 749 if (!line->is_longer ()) /* XXX: think about this */
818 MAX_IT (line->l, screen.cur.col); 750 max_it (line->l, screen.cur.col);
819 751
820 screen.flags &= ~Screen_WrapNext; 752 screen.flags &= ~Screen_WrapNext;
821 753
822 if (screen.cur.row == screen.bscroll) 754 if (screen.cur.row == screen.bscroll)
823 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 755 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
824 else if (screen.cur.row < (nrow - 1)) 756 else if (screen.cur.row < (nrow - 1))
825 row = (++screen.cur.row) + saveLines; 757 row = ++screen.cur.row;
826 758
827 line = save + row; /* _must_ refresh */ 759 line = &ROW(row); /* _must_ refresh */
828 continue; 760 continue;
829 } 761 }
830 else if (c == C0_CR) 762 else if (c == C0_CR)
831 { 763 {
832 if (line->l != -1) /* XXX: think about this */ 764 if (!line->is_longer ()) /* XXX: think about this */
833 MAX_IT (line->l, screen.cur.col); 765 max_it (line->l, screen.cur.col);
834 766
835 screen.flags &= ~Screen_WrapNext; 767 screen.flags &= ~Screen_WrapNext;
836 screen.cur.col = 0; 768 screen.cur.col = 0;
837 continue; 769 continue;
838 } 770 }
… …
855 CLEAR_SELECTION (); 787 CLEAR_SELECTION ();
856 } 788 }
857 789
858 if (screen.flags & Screen_WrapNext) 790 if (screen.flags & Screen_WrapNext)
859 { 791 {
860 line->l = -1; 792 line->set_is_longer ();
861 793
862 scr_do_wrap (); 794 scr_do_wrap ();
863 795
864 row = screen.cur.row + saveLines; 796 row = screen.cur.row;
865 line = save + row; /* _must_ refresh */ 797 line = &ROW(row); /* _must_ refresh */
866 } 798 }
867 799
868 // some utf-8 decoders "decode" surrogate characters: let's fix this. 800 // some utf-8 decoders "decode" surrogate characters: let's fix this.
869 if (IN_RANGE (c, 0xd800, 0xdfff)) 801 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
870 c = 0xfffd; 802 c = 0xfffd;
871 803
872 // rely on wcwidth to tell us the character width, at least for non-latin1 804 // rely on wcwidth to tell us the character width, at least for non-latin1
873 // do wcwidth before further replacements, as wcwidth might return -1 805 // do wcwidth before further replacements, as wcwidth might return -1
874 // for the line drawing characters below as they might be invalid in the current 806 // for the line drawing characters below as they might be invalid in the current
… …
989 921
990 while (*tp == NOCHAR && tp > line->t) 922 while (*tp == NOCHAR && tp > line->t)
991 tp--, rp--; 923 tp--, rp--;
992 } 924 }
993 else if (screen.cur.row > 0 925 else if (screen.cur.row > 0
994 && save [screen.cur.row - 1 + saveLines].l == -1) 926 && ROW(screen.cur.row - 1).is_longer ())
995 { 927 {
996 line_t *line = save + (screen.cur.row - 1 + saveLines); 928 line_t *line = &ROW(screen.cur.row - 1);
997 929
998 tp = line->t + last_col - 1; 930 tp = line->t + last_col - 1;
999 rp = line->r + last_col - 1; 931 rp = line->r + last_col - 1;
1000 932
1001 while (*tp == NOCHAR && tp > line->t) 933 while (*tp == NOCHAR && tp > line->t)
… …
1013 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 945 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1014#endif 946#endif
1015 } 947 }
1016 } 948 }
1017 949
1018 if (line->l != -1) /* XXX: think about this */ 950 if (!line->is_longer ()) /* XXX: think about this */
1019 MAX_IT (line->l, screen.cur.col); 951 max_it (line->l, screen.cur.col);
1020 952
1021#ifdef DEBUG_STRICT 953#ifdef DEBUG_STRICT
1022 assert (screen.cur.row >= 0); 954 assert (screen.cur.row >= 0);
1023#else /* drive with your eyes closed */
1024 MAX_IT (screen.cur.row, 0);
1025#endif 955#endif
1026} 956}
1027 957
1028/* ------------------------------------------------------------------------- */ 958/* ------------------------------------------------------------------------- */
1029/* 959/*
… …
1068 998
1069 if (count == 0) 999 if (count == 0)
1070 return; 1000 return;
1071 else if (count > 0) 1001 else if (count > 0)
1072 { 1002 {
1073 int row = saveLines + screen.cur.row; 1003 line_t &l = ROW(screen.cur.row);
1074
1075 line_t &l = save[row];
1076 rend_t base_rend = l.r[i]; 1004 rend_t base_rend = l.r[i];
1077 ht &= l.t[i] == ' '; 1005 ht &= l.t[i] == ' ';
1078 1006
1079 for (; ++i < ncol; ) 1007 for (; ++i < ncol; )
1080 if (tabs[i]) 1008 if (tabs[i])
… …
1094 // buffer so they can be selected and pasted. 1022 // buffer so they can be selected and pasted.
1095 if (ht && options & Opt_pastableTabs) 1023 if (ht && options & Opt_pastableTabs)
1096 { 1024 {
1097 base_rend = SET_FONT (base_rend, 0); 1025 base_rend = SET_FONT (base_rend, 0);
1098 1026
1099 if (l.l != -1) /* XXX: think about this */ 1027 if (!l.is_longer ()) /* XXX: think about this */
1100 MAX_IT (l.l, x); 1028 max_it (l.l, x);
1101 1029
1102 i = screen.cur.col; 1030 i = screen.cur.col;
1103 1031
1104 l.t[i] = '\t'; 1032 l.t[i] = '\t';
1105 l.r[i] = base_rend; 1033 l.r[i] = base_rend;
… …
1141rxvt_term::scr_backindex () 1069rxvt_term::scr_backindex ()
1142{ 1070{
1143 if (screen.cur.col > 0) 1071 if (screen.cur.col > 0)
1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1072 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1145 else 1073 else
1146 {
1147 if (save[screen.cur.row + saveLines].l == 0)
1148 return; /* um, yeah? */
1149
1150 scr_insdel_chars (1, INSERT); 1074 scr_insdel_chars (1, INSERT);
1151 }
1152} 1075}
1153#endif 1076#endif
1154/* ------------------------------------------------------------------------- */ 1077/* ------------------------------------------------------------------------- */
1155/* 1078/*
1156 * Process DEC Forward Index 1079 * Process DEC Forward Index
… …
1160 */ 1083 */
1161#if ENABLE_FRILLS 1084#if ENABLE_FRILLS
1162void 1085void
1163rxvt_term::scr_forwardindex () 1086rxvt_term::scr_forwardindex ()
1164{ 1087{
1165 int row;
1166
1167 if (screen.cur.col < ncol - 1) 1088 if (screen.cur.col < ncol - 1)
1168 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1089 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1169 else 1090 else
1170 { 1091 {
1171 row = screen.cur.row + saveLines; 1092 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
1172 1093 ROW(screen.cur.row).l = ncol;
1173 if (save[row].l == 0)
1174 return; /* um, yeah? */
1175 else if (save[row].l == -1)
1176 save[row].l = ncol;
1177 1094
1178 scr_gotorc (0, 0, R_RELATIVE); 1095 scr_gotorc (0, 0, R_RELATIVE);
1179 scr_insdel_chars (1, DELETE); 1096 scr_insdel_chars (1, DELETE);
1180 scr_gotorc (0, ncol - 1, R_RELATIVE); 1097 scr_gotorc (0, ncol - 1, R_RELATIVE);
1181 } 1098 }
… …
1191{ 1108{
1192 want_refresh = 1; 1109 want_refresh = 1;
1193 ZERO_SCROLLBACK (); 1110 ZERO_SCROLLBACK ();
1194 1111
1195 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1112 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1196 MAX_IT (screen.cur.col, 0); 1113 clamp_it (screen.cur.col, 0, ncol - 1);
1197 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1198 1114
1199 screen.flags &= ~Screen_WrapNext; 1115 screen.flags &= ~Screen_WrapNext;
1200 1116
1201 if (relative & R_RELATIVE) 1117 if (relative & R_RELATIVE)
1202 { 1118 {
… …
1220 else 1136 else
1221 { 1137 {
1222 if (screen.flags & Screen_Relative) 1138 if (screen.flags & Screen_Relative)
1223 { /* relative origin mode */ 1139 { /* relative origin mode */
1224 screen.cur.row = row + screen.tscroll; 1140 screen.cur.row = row + screen.tscroll;
1225 MIN_IT (screen.cur.row, screen.bscroll); 1141 min_it (screen.cur.row, screen.bscroll);
1226 } 1142 }
1227 else 1143 else
1228 screen.cur.row = row; 1144 screen.cur.row = row;
1229 } 1145 }
1230 1146
1231 MAX_IT (screen.cur.row, 0); 1147 clamp_it (screen.cur.row, 0, nrow - 1);
1232 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1233} 1148}
1234 1149
1235/* ------------------------------------------------------------------------- */ 1150/* ------------------------------------------------------------------------- */
1236/* 1151/*
1237 * direction should be UP or DN 1152 * direction should be UP or DN
… …
1248 1163
1249 screen.flags &= ~Screen_WrapNext; 1164 screen.flags &= ~Screen_WrapNext;
1250 1165
1251 if ((screen.cur.row == screen.bscroll && direction == UP) 1166 if ((screen.cur.row == screen.bscroll && direction == UP)
1252 || (screen.cur.row == screen.tscroll && direction == DN)) 1167 || (screen.cur.row == screen.tscroll && direction == DN))
1253 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1168 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1254 else 1169 else
1255 screen.cur.row += dirn; 1170 screen.cur.row += dirn;
1256 1171
1257 MAX_IT (screen.cur.row, 0); 1172 clamp_it (screen.cur.row, 0, nrow - 1);
1258 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1259 selection_check (0); 1173 selection_check (0);
1260} 1174}
1261 1175
1262/* ------------------------------------------------------------------------- */ 1176/* ------------------------------------------------------------------------- */
1263/* 1177/*
… …
1267 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1181 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1268 */ 1182 */
1269void 1183void
1270rxvt_term::scr_erase_line (int mode) 1184rxvt_term::scr_erase_line (int mode)
1271{ 1185{
1272 unsigned int row, col, num; 1186 unsigned int col, num;
1273 1187
1274 want_refresh = 1; 1188 want_refresh = 1;
1275 ZERO_SCROLLBACK (); 1189 ZERO_SCROLLBACK ();
1276 1190
1277 selection_check (1); 1191 selection_check (1);
1278 1192
1279 row = saveLines + screen.cur.row; 1193 line_t &line = ROW(screen.cur.row);
1280 1194
1281 switch (mode) 1195 switch (mode)
1282 { 1196 {
1283 case 0: /* erase to end of line */ 1197 case 0: /* erase to end of line */
1284 col = screen.cur.col; 1198 col = screen.cur.col;
1285 num = ncol - col; 1199 num = ncol - col;
1286 MIN_IT (save[row].l, (int16_t)col); 1200 min_it (line.l, col);
1287 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1201 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1288 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1202 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1289 CLEAR_SELECTION (); 1203 CLEAR_SELECTION ();
1290 break; 1204 break;
1291 case 1: /* erase to beginning of line */ 1205 case 1: /* erase to beginning of line */
… …
1296 CLEAR_SELECTION (); 1210 CLEAR_SELECTION ();
1297 break; 1211 break;
1298 case 2: /* erase whole line */ 1212 case 2: /* erase whole line */
1299 col = 0; 1213 col = 0;
1300 num = ncol; 1214 num = ncol;
1301 save[row].l = 0; 1215 line.l = 0;
1302 if (selection.beg.row <= screen.cur.row 1216 if (selection.beg.row <= screen.cur.row
1303 && selection.end.row >= screen.cur.row) 1217 && selection.end.row >= screen.cur.row)
1304 CLEAR_SELECTION (); 1218 CLEAR_SELECTION ();
1305 break; 1219 break;
1306 default: 1220 default:
1307 return; 1221 return;
1308 } 1222 }
1309 1223
1310 if (save[row].t)
1311 scr_blank_line (save[row], col, num, rstyle); 1224 scr_blank_line (line, col, num, rstyle);
1312 else
1313 scr_blank_screen_mem (save[row], rstyle);
1314} 1225}
1315 1226
1316/* ------------------------------------------------------------------------- */ 1227/* ------------------------------------------------------------------------- */
1317/* 1228/*
1318 * Erase part of whole of the screen 1229 * Erase part of whole of the screen
… …
1322 */ 1233 */
1323void 1234void
1324rxvt_term::scr_erase_screen (int mode) 1235rxvt_term::scr_erase_screen (int mode)
1325{ 1236{
1326 int num; 1237 int num;
1327 int32_t row, row_offset; 1238 int32_t row;
1328 rend_t ren; 1239 rend_t ren;
1329 XGCValues gcvalue; 1240 XGCValues gcvalue;
1330 1241
1331 want_refresh = 1; 1242 want_refresh = 1;
1332 ZERO_SCROLLBACK (); 1243 ZERO_SCROLLBACK ();
1333
1334 row_offset = (int32_t)saveLines;
1335 1244
1336 switch (mode) 1245 switch (mode)
1337 { 1246 {
1338 case 0: /* erase to end of screen */ 1247 case 0: /* erase to end of screen */
1339 selection_check (1); 1248 selection_check (1);
… …
1363 CLEAR_SELECTION (); 1272 CLEAR_SELECTION ();
1364 1273
1365 if (row >= nrow) /* Out Of Bounds */ 1274 if (row >= nrow) /* Out Of Bounds */
1366 return; 1275 return;
1367 1276
1368 MIN_IT (num, (nrow - row)); 1277 min_it (num, nrow - row);
1369 1278
1370 if (rstyle & (RS_RVid | RS_Uline)) 1279 if (rstyle & (RS_RVid | RS_Uline))
1371 ren = (rend_t) ~RS_None; 1280 ren = (rend_t) ~RS_None;
1372 else if (GET_BASEBG (rstyle) == Color_bg) 1281 else if (GET_BASEBG (rstyle) == Color_bg)
1373 { 1282 {
… …
1384 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1293 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1385 } 1294 }
1386 1295
1387 for (; num--; row++) 1296 for (; num--; row++)
1388 { 1297 {
1298 ROW (row).l = 0;
1389 scr_blank_screen_mem (save[row + row_offset], rstyle); 1299 scr_blank_screen_mem (ROW (row), rstyle);
1390 save[row + row_offset].l = 0;
1391 scr_blank_line (drawn[row], 0, ncol, ren); 1300 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1392 } 1301 }
1393} 1302}
1394 1303
1395#if ENABLE_FRILLS 1304#if ENABLE_FRILLS
1396void 1305void
1397rxvt_term::scr_erase_savelines () 1306rxvt_term::scr_erase_savelines ()
1398{ 1307{
1399 want_refresh = 1; 1308 want_refresh = 1;
1400 ZERO_SCROLLBACK (); 1309 ZERO_SCROLLBACK ();
1401 1310
1402 nscrolled = 0; 1311 nsaved = 0;
1403} 1312}
1404#endif 1313#endif
1405 1314
1406/* ------------------------------------------------------------------------- */ 1315/* ------------------------------------------------------------------------- */
1407/* 1316/*
… …
1409 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1318 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1410 */ 1319 */
1411void 1320void
1412rxvt_term::scr_E () 1321rxvt_term::scr_E ()
1413{ 1322{
1414 int i, j, k;
1415 rend_t *r1, fs; 1323 rend_t fs;
1416 1324
1417 want_refresh = 1; 1325 want_refresh = 1;
1418 ZERO_SCROLLBACK (); 1326 ZERO_SCROLLBACK ();
1419 1327
1420 num_scr_allow = 0; 1328 num_scr_allow = 0;
1421 selection_check (3); 1329 selection_check (3);
1422 1330
1423 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1331 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1424 for (k = saveLines, i = nrow; i--; k++) 1332 for (int row = nrow; row--; )
1425 { 1333 {
1426 save[k].l = ncol; /* make the `E's selectable */ 1334 line_t &line = ROW(row);
1335
1427 fill_text (save[k].t, 'E', ncol); 1336 fill_text (line.t, 'E', ncol);
1428 for (r1 = save[k].r, j = ncol; j--; ) 1337 rend_t *r1 = line.r;
1338
1339 for (int j = ncol; j--; )
1429 *r1++ = fs; 1340 *r1++ = fs;
1341
1342 line.l = ncol; /* make the `E's selectable */
1430 } 1343 }
1431} 1344}
1432 1345
1433/* ------------------------------------------------------------------------- */ 1346/* ------------------------------------------------------------------------- */
1434/* 1347/*
… …
1455 count = end; 1368 count = end;
1456 } 1369 }
1457 1370
1458 scr_do_wrap (); 1371 scr_do_wrap ();
1459 1372
1460 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1373 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1461} 1374}
1462 1375
1463/* ------------------------------------------------------------------------- */ 1376/* ------------------------------------------------------------------------- */
1464/* 1377/*
1465 * Insert/Delete <count> characters from the current position 1378 * Insert/Delete <count> characters from the current position
… …
1477 return; 1390 return;
1478 1391
1479 scr_do_wrap (); 1392 scr_do_wrap ();
1480 1393
1481 selection_check (1); 1394 selection_check (1);
1482 MIN_IT (count, (ncol - screen.cur.col)); 1395 min_it (count, ncol - screen.cur.col);
1483 1396
1484 row = screen.cur.row + saveLines; 1397 row = screen.cur.row;
1485 1398
1486 line_t *line = save + row; 1399 line_t *line = &ROW(row);
1487 1400
1488 switch (insdel) 1401 switch (insdel)
1489 { 1402 {
1490 case INSERT: 1403 case INSERT:
1491 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1404 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1492 { 1405 {
1493 line->t[col] = line->t[col - count]; 1406 line->t[col] = line->t[col - count];
1494 line->r[col] = line->r[col - count]; 1407 line->r[col] = line->r[col - count];
1495 } 1408 }
1496 1409
1497 if (line->l != -1) 1410 if (!line->is_longer ())
1498 { 1411 {
1499 line->l += count; 1412 line->l += count;
1500 MIN_IT (line->l, ncol); 1413 min_it (line->l, ncol);
1501 } 1414 }
1502 1415
1503 if (selection.op && current_screen == selection.screen 1416 if (selection.op && current_screen == selection.screen
1504 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1417 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1505 { 1418 {
… …
1512 selection.mark.col += count; /* XXX: yes? */ 1425 selection.mark.col += count; /* XXX: yes? */
1513 selection.end.col += count; 1426 selection.end.col += count;
1514 } 1427 }
1515 } 1428 }
1516 1429
1517 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1430 scr_blank_line (*line, screen.cur.col, count, rstyle);
1518 break; 1431 break;
1519 1432
1520 case ERASE: 1433 case ERASE:
1521 screen.cur.col += count; /* don't worry if > ncol */ 1434 screen.cur.col += count; /* don't worry if > ncol */
1522 selection_check (1); 1435 selection_check (1);
1523 screen.cur.col -= count; 1436 screen.cur.col -= count;
1524 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1437 scr_blank_line (*line, screen.cur.col, count, rstyle);
1525 break; 1438 break;
1526 1439
1527 case DELETE: 1440 case DELETE:
1528 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1441 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1529 1442
… …
1533 line->r[col] = line->r[col + count]; 1446 line->r[col] = line->r[col + count];
1534 } 1447 }
1535 1448
1536 scr_blank_line (*line, ncol - count, count, tr); 1449 scr_blank_line (*line, ncol - count, count, tr);
1537 1450
1538 if (line->l == -1) /* break line continuation */ 1451 if (line->is_longer ()) /* break line continuation */
1539 line->l = ncol; 1452 line->l = ncol;
1540 1453
1541 line->l -= count; 1454 line->l = max (line->l - count, 0);
1542 MAX_IT (line->l, 0);
1543 1455
1544 if (selection.op && current_screen == selection.screen 1456 if (selection.op && current_screen == selection.screen
1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1457 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1546 { 1458 {
1547 if (selection.end.row != screen.cur.row 1459 if (selection.end.row != screen.cur.row
… …
1567 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1479 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1568 */ 1480 */
1569void 1481void
1570rxvt_term::scr_scroll_region (int top, int bot) 1482rxvt_term::scr_scroll_region (int top, int bot)
1571{ 1483{
1572 MAX_IT (top, 0); 1484 max_it (top, 0);
1573 MIN_IT (bot, (int)nrow - 1); 1485 min_it (bot, nrow - 1);
1574 1486
1575 if (top > bot) 1487 if (top > bot)
1576 return; 1488 return;
1577 1489
1578 screen.tscroll = top; 1490 screen.tscroll = top;
… …
1676 XGCValues gcvalue; 1588 XGCValues gcvalue;
1677 1589
1678 if (rvideo != mode) 1590 if (rvideo != mode)
1679 { 1591 {
1680 rvideo = mode; 1592 rvideo = mode;
1681 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1593 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1682#if XPM_BACKGROUND 1594#if XPM_BACKGROUND
1683 if (bgPixmap.pixmap == None) 1595 if (bgPixmap.pixmap == None)
1684#endif 1596#endif
1685#if TRANSPARENT 1597#if TRANSPARENT
1686 if (! (options & Opt_transparent) || am_transparent == 0) 1598 if (! (options & Opt_transparent) || am_transparent == 0)
… …
1782 bool found = false; 1694 bool found = false;
1783 1695
1784 for (int i = 0; i < nrow; i++) 1696 for (int i = 0; i < nrow; i++)
1785 { 1697 {
1786 int col = 0; 1698 int col = 0;
1787 rend_t *drp = drawn[i].r; 1699 rend_t *drp = drawn_buf[i].r;
1788 1700
1789 for (; col < ncol; col++, drp++) 1701 for (; col < ncol; col++, drp++)
1790 if ((*drp & mask) == value) 1702 if ((*drp & mask) == value)
1791 { 1703 {
1792 found = true; 1704 found = true;
… …
1810rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1722rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1811{ 1723{
1812 int i; 1724 int i;
1813 row_col_t rc[RC_COUNT]; 1725 row_col_t rc[RC_COUNT];
1814 1726
1815 if (!drawn) /* sanity check */ 1727 if (!drawn_buf) /* sanity check */
1816 return; 1728 return;
1817 1729
1818#ifndef NO_SLOW_LINK_SUPPORT 1730#ifndef NO_SLOW_LINK_SUPPORT
1819 if (refresh_type == FAST_REFRESH && !display->is_local) 1731 if (refresh_type == FAST_REFRESH && !display->is_local)
1820 { 1732 {
1821 y = 0; 1733 y = 0;
1822 eheight = height; 1734 eheight = height;
1823 } 1735 }
1824#endif
1825
1826#ifdef DEBUG_STRICT
1827 x = max (x, 0);
1828 x = min (x, (int)width);
1829 y = max (y, 0);
1830 y = min (y, (int)height);
1831#endif 1736#endif
1832 1737
1833 /* round down */ 1738 /* round down */
1834 rc[PART_BEG].col = Pixel2Col (x); 1739 rc[PART_BEG].col = Pixel2Col (x);
1835 rc[PART_BEG].row = Pixel2Row (y); 1740 rc[PART_BEG].row = Pixel2Row (y);
… …
1838 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1743 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1839 1744
1840 /* sanity checks */ 1745 /* sanity checks */
1841 for (i = PART_BEG; i < RC_COUNT; i++) 1746 for (i = PART_BEG; i < RC_COUNT; i++)
1842 { 1747 {
1843 MIN_IT (rc[i].col, ncol - 1); 1748 min_it (rc[i].col, ncol - 1);
1844 MIN_IT (rc[i].row, nrow - 1); 1749 min_it (rc[i].row, nrow - 1);
1845 } 1750 }
1846 1751
1847 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1752 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1848 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1753 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1849 1754
1850 if (refresh) 1755 if (refresh)
1851 scr_refresh (SLOW_REFRESH); 1756 scr_refresh (SLOW_REFRESH);
1852} 1757}
1853 1758
… …
1874 1779
1875 oldviewstart = view_start; 1780 oldviewstart = view_start;
1876 1781
1877 if (y < len) 1782 if (y < len)
1878 { 1783 {
1879 p = (nrow + nscrolled) * (len - y) / len; 1784 p = (nrow + nsaved) * (len - y) / len;
1880 p -= (long) (nrow - 1); 1785 p -= (long) (nrow - 1);
1881 p = max (p, 0); 1786 p = max (p, 0);
1882 } 1787 }
1883 1788
1884 view_start = (unsigned int)min (p, nscrolled); 1789 view_start = (unsigned int)min (p, nsaved);
1885 1790
1886 return scr_changeview (oldviewstart); 1791 return scr_changeview (oldviewstart);
1887} 1792}
1888 1793
1889/* ------------------------------------------------------------------------- */ 1794/* ------------------------------------------------------------------------- */
… …
1900 oldviewstart = view_start; 1805 oldviewstart = view_start;
1901 1806
1902 if (direction == UP) 1807 if (direction == UP)
1903 { 1808 {
1904 n = view_start + nlines; 1809 n = view_start + nlines;
1905 view_start = min (n, nscrolled); 1810 view_start = min (n, nsaved);
1906 } 1811 }
1907 else 1812 else
1908 { 1813 {
1909 n = view_start - nlines; 1814 n = view_start - nlines;
1910 view_start = max (n, 0); 1815 view_start = max (n, 0);
… …
1954/* ARGSUSED */ 1859/* ARGSUSED */
1955void 1860void
1956rxvt_term::scr_printscreen (int fullhist) 1861rxvt_term::scr_printscreen (int fullhist)
1957{ 1862{
1958#ifdef PRINTPIPE 1863#ifdef PRINTPIPE
1959 int i, r1, nrows, row_offset; 1864 int nrows, row_start;
1960 FILE *fd; 1865 FILE *fd;
1961 1866
1962 if ((fd = popen_printer ()) == NULL) 1867 if ((fd = popen_printer ()) == NULL)
1963 return; 1868 return;
1964 1869
1965 nrows = nrow;
1966 row_offset = saveLines;
1967
1968 if (!fullhist) 1870 if (fullhist)
1969 row_offset -= view_start; 1871 {
1872 nrows = nrow + nsaved;
1873 row_start = -nsaved;
1874 }
1970 else 1875 else
1971 { 1876 {
1972 nrows += nscrolled; 1877 nrows = nrow;
1973 row_offset -= nscrolled; 1878 row_start = -view_start;
1974 } 1879 }
1975 1880
1976 wctomb (0, 0); 1881 wctomb (0, 0);
1977 1882
1978 for (r1 = 0; r1 < nrows; r1++) 1883 for (int r1 = 0; r1 < nrows; r1++)
1979 { 1884 {
1980 text_t *tp = save[r1 + row_offset].t; 1885 text_t *tp = ROW(r1).t;
1981 int len = save[r1 + row_offset].l; 1886 int len = ROW(r1).l;
1982 1887
1983 for (i = len >= 0 ? len : ncol - 1; i--; ) 1888 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1984 { 1889 {
1985 char mb[MB_LEN_MAX]; 1890 char mb[MB_LEN_MAX];
1986 text_t t = *tp++; 1891 text_t t = *tp++;
1987 if (t == NOCHAR) 1892 if (t == NOCHAR)
1988 continue; 1893 continue;
… …
2016{ 1921{
2017 unsigned char must_clear, /* use draw_string not draw_image_string */ 1922 unsigned char must_clear, /* use draw_string not draw_image_string */
2018 showcursor; /* show the cursor */ 1923 showcursor; /* show the cursor */
2019 int16_t col, row, /* column/row we're processing */ 1924 int16_t col, row, /* column/row we're processing */
2020 ocrow; /* old cursor row */ 1925 ocrow; /* old cursor row */
2021 int i, /* tmp */ 1926 int i; /* tmp */
2022 row_offset; /* basic offset in screen structure */
2023#ifndef NO_CURSORCOLOR 1927#ifndef NO_CURSORCOLOR
2024 rend_t cc1; /* store colours at cursor position (s) */ 1928 rend_t cc1; /* store colours at cursor position (s) */
2025#endif 1929#endif
2026 rend_t *crp; // cursor rendition pointer 1930 rend_t *crp; // cursor rendition pointer
2027 1931
… …
2033 /* 1937 /*
2034 * A: set up vars 1938 * A: set up vars
2035 */ 1939 */
2036 must_clear = 0; 1940 must_clear = 0;
2037 refresh_count = 0; 1941 refresh_count = 0;
2038
2039 row_offset = saveLines - view_start;
2040 1942
2041#if XPM_BACKGROUND 1943#if XPM_BACKGROUND
2042 must_clear |= bgPixmap.pixmap != None; 1944 must_clear |= bgPixmap.pixmap != None;
2043#endif 1945#endif
2044#if TRANSPARENT 1946#if TRANSPARENT
… …
2067 1969
2068 if (showcursor) 1970 if (showcursor)
2069 { 1971 {
2070 int col = screen.cur.col; 1972 int col = screen.cur.col;
2071 1973
2072 while (col && screen.line[screen.cur.row]->t[col] == NOCHAR) 1974 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2073 col--; 1975 col--;
2074 1976
2075 crp = &screen.line[screen.cur.row]->r[col]; 1977 crp = &ROW(screen.cur.row).r[col];
2076 1978
2077 if (showcursor && focus) 1979 if (showcursor && focus)
2078 { 1980 {
2079 if (options & Opt_cursorUnderline) 1981 if (options & Opt_cursorUnderline)
2080 *crp ^= RS_Uline; 1982 *crp ^= RS_Uline;
… …
2114 if (screen.cur.row + view_start != ocrow 2016 if (screen.cur.row + view_start != ocrow
2115 || screen.cur.col != oldcursor.col) 2017 || screen.cur.col != oldcursor.col)
2116 { 2018 {
2117 if (ocrow < nrow 2019 if (ocrow < nrow
2118 && oldcursor.col < ncol) 2020 && oldcursor.col < ncol)
2119 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2021 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2120 2022
2121 if (focus || !showcursor) 2023 if (focus || !showcursor)
2122 oldcursor.row = -1; 2024 oldcursor.row = -1;
2123 else 2025 else
2124 setoldcursor = 1; 2026 setoldcursor = 1;
… …
2148 * D: CopyArea pass - very useful for slower links 2050 * D: CopyArea pass - very useful for slower links
2149 * This has been deliberately kept simple. 2051 * This has been deliberately kept simple.
2150 */ 2052 */
2151 i = num_scr; 2053 i = num_scr;
2152 if (!display->is_local 2054 if (!display->is_local
2153 && refresh_type == FAST_REFRESH && num_scr_allow && i 2055 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2154 && abs (i) < nrow && !must_clear) 2056 && abs (num_scr) < nrow && !must_clear)
2155 { 2057 {
2156 int16_t nits; 2058 int16_t nits;
2157 int j; 2059 int j;
2158 int len, wlen; 2060 int len, wlen;
2159 2061
… …
2162 row = i > 0 ? 0 : j - 1; 2064 row = i > 0 ? 0 : j - 1;
2163 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2065 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2164 { 2066 {
2165 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2067 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2166 { 2068 {
2167 line_t s = save[row + row_offset]; 2069 line_t s = ROW(row - view_start);
2168 line_t d = drawn[row]; 2070 line_t d = drawn_buf[row];
2169 line_t d2 = drawn[row + i]; 2071 line_t d2 = drawn_buf[row + i];
2170 2072
2171 for (nits = 0, col = ncol; col--; ) 2073 for (nits = 0, col = ncol; col--; )
2172 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2074 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2173 nits--; 2075 nits--;
2174 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2076 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2192 2094
2193 if (len != -1) 2095 if (len != -1)
2194 { 2096 {
2195 /* also comes here at end if needed because of >= above */ 2097 /* also comes here at end if needed because of >= above */
2196 if (wlen < len) 2098 if (wlen < len)
2197 SWAP_IT (wlen, len, int); 2099 ::swap (wlen, len);
2198 2100
2199 XCopyArea (display->display, vt, vt, 2101 XCopyArea (display->display, vt, vt,
2200 gc, 0, Row2Pixel (len + i), 2102 gc, 0, Row2Pixel (len + i),
2201 (unsigned int)TermWin_TotalWidth (), 2103 (unsigned int)TermWin_TotalWidth (),
2202 (unsigned int)Height2Pixel (wlen - len + 1), 2104 (unsigned int)Height2Pixel (wlen - len + 1),
… …
2210 /* 2112 /*
2211 * E: main pass across every character 2113 * E: main pass across every character
2212 */ 2114 */
2213 for (row = 0; row < nrow; row++) 2115 for (row = 0; row < nrow; row++)
2214 { 2116 {
2215 text_t *stp = save[row + row_offset].t; 2117 text_t *stp = ROW(row - view_start).t;
2216 rend_t *srp = save[row + row_offset].r; 2118 rend_t *srp = ROW(row - view_start).r;
2217 text_t *dtp = drawn[row].t; 2119 text_t *dtp = drawn_buf[row].t;
2218 rend_t *drp = drawn[row].r; 2120 rend_t *drp = drawn_buf[row].r;
2219 2121
2220 /* 2122 /*
2221 * E2: OK, now the real pass 2123 * E2: OK, now the real pass
2222 */ 2124 */
2223 int ypixel = (int)Row2Pixel (row); 2125 int ypixel = (int)Row2Pixel (row);
… …
2288 * Determine the attributes for the string 2190 * Determine the attributes for the string
2289 */ 2191 */
2290 int fore = GET_FGCOLOR (rend); // desired foreground 2192 int fore = GET_FGCOLOR (rend); // desired foreground
2291 int back = GET_BGCOLOR (rend); // desired background 2193 int back = GET_BGCOLOR (rend); // desired background
2292 2194
2293 // only do special processing if any attributes are set, which is rare 2195 // only do special processing if any attributes are set, which is unlikely
2294 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2196 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2295 { 2197 {
2296#if ENABLE_STYLES 2198#if ENABLE_STYLES
2297 // force redraw after "careful" characters to avoid pixel droppings 2199 // force redraw after "careful" characters to avoid pixel droppings
2298 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2200 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2334 fore = Color_UL; 2236 fore = Color_UL;
2335#endif 2237#endif
2336 2238
2337 if (invert) 2239 if (invert)
2338 { 2240 {
2339 SWAP_IT (fore, back, int); 2241 ::swap (fore, back);
2340 2242
2341#ifndef NO_BOLD_UNDERLINE_REVERSE 2243#ifndef NO_BOLD_UNDERLINE_REVERSE
2342 if (ISSET_PIXCOLOR (Color_RV)) 2244 if (ISSET_PIXCOLOR (Color_RV))
2343 back = Color_RV; 2245 back = Color_RV;
2344 2246
… …
2432 else if (oldcursor.row >= 0) 2334 else if (oldcursor.row >= 0)
2433 { 2335 {
2434 int cursorwidth = 1; 2336 int cursorwidth = 1;
2435 int col = oldcursor.col; 2337 int col = oldcursor.col;
2436 2338
2437 while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR) 2339 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2438 col--; 2340 col--;
2439 2341
2440 while (col + cursorwidth < ncol 2342 while (col + cursorwidth < ncol
2441 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2343 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2442 cursorwidth++; 2344 cursorwidth++;
2443 2345
2444#ifndef NO_CURSORCOLOR 2346#ifndef NO_CURSORCOLOR
2445 if (ISSET_PIXCOLOR (Color_cursor)) 2347 if (ISSET_PIXCOLOR (Color_cursor))
2446 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2348 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2477} 2379}
2478 2380
2479void 2381void
2480rxvt_term::scr_remap_chars () 2382rxvt_term::scr_remap_chars ()
2481{ 2383{
2482 for (int i = nrow + saveLines; i--; ) 2384 for (int i = total_rows; i--; )
2483 scr_remap_chars (save[i]); 2385 scr_remap_chars (row_buf [i]);
2484 2386
2485 for (int i = nrow; i--; ) 2387 for (int i = nrow; i--; )
2486 { 2388 {
2487 scr_remap_chars (drawn[i]); 2389 scr_remap_chars (drawn_buf [i]);
2488 scr_remap_chars (swap_save[i]); 2390 scr_remap_chars (swap_buf [i]);
2489 } 2391 }
2490} 2392}
2491 2393
2492void 2394void
2493rxvt_term::scr_recolour () 2395rxvt_term::scr_recolour ()
… …
2535 2437
2536/* ------------------------------------------------------------------------- */ 2438/* ------------------------------------------------------------------------- */
2537void 2439void
2538rxvt_term::scr_reverse_selection () 2440rxvt_term::scr_reverse_selection ()
2539{ 2441{
2442 if (selection.op
2540 if (selection.op && current_screen == selection.screen) 2443 && current_screen == selection.screen
2444 && selection.end.row >= -view_start)
2541 { 2445 {
2542 int end_row = saveLines - view_start; 2446 int view_end = -view_start + nrow;
2543 int i = selection.beg.row + saveLines; 2447 int row, col;
2544 int col, row = selection.end.row + saveLines;
2545 rend_t *srp;
2546 2448
2547#if ENABLE_FRILLS 2449#if ENABLE_FRILLS
2548 if (selection.rect) 2450 if (selection.rect)
2549 { 2451 {
2550 end_row += nrow; 2452 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2453 {
2454 text_t *stp = ROW(row).t;
2455 rend_t *srp = ROW(row).r;
2551 2456
2552 for (; i <= row && i <= end_row; i++)
2553 for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++) 2457 for (col = selection.beg.col; col < selection.end.col; col++)
2554 srp[col] ^= RS_RVid; 2458 srp[col] ^= RS_RVid;
2459
2460 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2461 srp[col] ^= RS_RVid | RS_Uline;
2462 }
2555 } 2463 }
2556 else 2464 else
2557#endif 2465#endif
2558 { 2466 {
2559 if (i >= end_row) 2467 if (selection.beg.row >= -view_start)
2468 {
2560 col = selection.beg.col; 2469 col = selection.beg.col;
2470 row = selection.beg.row;
2471 }
2561 else 2472 else
2562 { 2473 {
2563 col = 0; 2474 col = 0;
2564 i = end_row; 2475 row = -view_start;
2565 } 2476 }
2566 2477
2567 end_row += nrow; 2478 for (; row < min (selection.end.row, view_end); row++, col = 0)
2568
2569 for (; i < row && i < end_row; i++, col = 0)
2570 for (srp = save[i].r; col < ncol; col++) 2479 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2571 srp[col] ^= RS_RVid; 2480 srp[col] ^= RS_RVid;
2572 2481
2573 if (i == row && i < end_row) 2482 if (row == selection.end.row)
2574 for (srp = save[i].r; col < selection.end.col; col++) 2483 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2575 srp[col] ^= RS_RVid; 2484 srp[col] ^= RS_RVid;
2576 } 2485 }
2577 } 2486 }
2578} 2487}
2579 2488
… …
2588{ 2497{
2589 int row, wrote; 2498 int row, wrote;
2590 unsigned int width, towrite; 2499 unsigned int width, towrite;
2591 char r1[] = "\n"; 2500 char r1[] = "\n";
2592 2501
2593 for (row = saveLines - nscrolled; 2502 for (row = saveLines - nsaved;
2594 row < saveLines + nrow - 1; row++) 2503 row < saveLines + nrow - 1; row++)
2595 { 2504 {
2596 width = save[row].l >= 0 ? save[row].l 2505 width = row_buf[row].l >= 0 ? row_buf[row].l
2597 : ncol; 2506 : ncol;
2598 for (towrite = width; towrite; towrite -= wrote) 2507 for (towrite = width; towrite; towrite -= wrote)
2599 { 2508 {
2600 wrote = write (fd, & (save[row].t[width - towrite]), 2509 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2601 towrite); 2510 towrite);
2602 if (wrote < 0) 2511 if (wrote < 0)
2603 return; /* XXX: death, no report */ 2512 return; /* XXX: death, no report */
2604 } 2513 }
2605 if (save[row].l >= 0) 2514 if (row_buf[row].l >= 0)
2606 if (write (fd, r1, 1) <= 0) 2515 if (write (fd, r1, 1) <= 0)
2607 return; /* XXX: death, no report */ 2516 return; /* XXX: death, no report */
2608 } 2517 }
2609} 2518}
2610#endif 2519#endif
2611 2520
2612/* ------------------------------------------------------------------------- * 2521/* ------------------------------------------------------------------------- *
2613 * CHARACTER SELECTION * 2522 * CHARACTER SELECTION *
2614 * ------------------------------------------------------------------------- */ 2523 * ------------------------------------------------------------------------- */
2615
2616/*
2617 * -nscrolled <= (selection row) <= nrow - 1
2618 */
2619void 2524void
2620rxvt_term::selection_check (int check_more) 2525rxvt_term::selection_check (int check_more)
2621{ 2526{
2622 row_col_t pos; 2527 row_col_t pos;
2623 2528
2624 if (!selection.op) 2529 if (!selection.op)
2625 return; 2530 return;
2626 2531
2627 pos.row = pos.col = 0; 2532 pos.row = pos.col = 0;
2628 if ((selection.beg.row < - (int32_t)nscrolled) 2533 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2629 || (selection.beg.row >= nrow) 2534 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2630 || (selection.mark.row < - (int32_t)nscrolled) 2535 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2631 || (selection.mark.row >= nrow)
2632 || (selection.end.row < - (int32_t)nscrolled)
2633 || (selection.end.row >= nrow)
2634 || (check_more == 1 2536 || (check_more == 1
2635 && current_screen == selection.screen 2537 && current_screen == selection.screen
2636 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2538 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2637 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2539 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2638 || (check_more == 2 2540 || (check_more == 2
… …
2944 * EXT: button 1 or 3 release 2846 * EXT: button 1 or 3 release
2945 */ 2847 */
2946void 2848void
2947rxvt_term::selection_make (Time tm) 2849rxvt_term::selection_make (Time tm)
2948{ 2850{
2949 int i, col, end_col, row, end_row; 2851 int i;
2950 wchar_t *new_selection_text; 2852 wchar_t *new_selection_text;
2951 text_t *t; 2853 text_t *t;
2952 2854
2953 switch (selection.op) 2855 switch (selection.op)
2954 { 2856 {
… …
2970 return; /* nothing selected, go away */ 2872 return; /* nothing selected, go away */
2971 2873
2972 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2874 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2973 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2875 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2974 2876
2975 col = selection.beg.col;
2976 row = selection.beg.row + saveLines;
2977 end_row = selection.end.row + saveLines;
2978 int ofs = 0; 2877 int ofs = 0;
2979 int extra = 0; 2878 int extra = 0;
2980 2879
2880 int col = selection.beg.col;
2881 int row = selection.beg.row;
2882
2883 int end_col;
2884
2981 for (; row <= end_row; row++, col = 0) 2885 for (; row <= selection.end.row; row++, col = 0)
2982 { 2886 {
2983 end_col = save[row].l;
2984
2985#if ENABLE_FRILLS 2887#if ENABLE_FRILLS
2986 if (selection.rect) 2888 if (selection.rect)
2987 { 2889 {
2988 col = selection.beg.col; 2890 col = selection.beg.col;
2989 end_col = ncol + 1; 2891 end_col = ncol + 1;
2990 } 2892 }
2893 else
2991#endif 2894#endif
2895 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2992 2896
2993 MAX_IT (col, 0); 2897 col = max (col, 0);
2994 2898
2995 if (end_col == -1) 2899 if (row == selection.end.row
2996 end_col = ncol; 2900#if ENABLE_FRILLS
2997 2901 || selection.rect
2998 if (row == end_row || selection.rect) 2902#endif
2903 )
2999 MIN_IT (end_col, selection.end.col); 2904 min_it (end_col, selection.end.col);
3000 2905
3001 t = &save[row].t[col]; 2906 t = ROW(row).t + col;
3002 for (; col < end_col; col++) 2907 for (; col < end_col; col++)
3003 { 2908 {
3004 if (*t == NOCHAR) 2909 if (*t == NOCHAR)
3005 t++; 2910 t++;
3006#if ENABLE_COMBINING 2911#if ENABLE_COMBINING
… …
3022#endif 2927#endif
3023 else 2928 else
3024 new_selection_text[ofs++] = *t++; 2929 new_selection_text[ofs++] = *t++;
3025 } 2930 }
3026 2931
3027 if (save[row].l != -1 && row != end_row) 2932#if ENABLE_FRILLS
2933 if (selection.rect)
2934 {
2935 while (ofs
2936 && new_selection_text[ofs - 1] != C0_LF
2937 && unicode::is_space (new_selection_text[ofs - 1]))
2938 --ofs;
2939
3028 new_selection_text[ofs++] = C0_LF; 2940 new_selection_text[ofs++] = C0_LF;
2941 }
2942 else
2943#endif
2944 if (!ROW(row).is_longer () && row != selection.end.row)
2945 new_selection_text[ofs++] = C0_LF;
3029 } 2946 }
3030 2947
3031 if (end_col != selection.end.col) 2948 if (end_col != selection.end.col)
3032 new_selection_text[ofs++] = C0_LF; 2949 new_selection_text[ofs++] = C0_LF;
3033 2950
… …
3091 */ 3008 */
3092void 3009void
3093rxvt_term::selection_start_colrow (int col, int row) 3010rxvt_term::selection_start_colrow (int col, int row)
3094{ 3011{
3095 want_refresh = 1; 3012 want_refresh = 1;
3013
3014 selection.mark.row = row - view_start;
3096 selection.mark.col = col; 3015 selection.mark.col = col;
3097 selection.mark.row = row - view_start;
3098 3016
3099 MAX_IT (selection.mark.row, - (int32_t)nscrolled); 3017 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3100 MIN_IT (selection.mark.row, (int32_t)nrow - 1); 3018 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3101 MAX_IT (selection.mark.col, 0);
3102 MIN_IT (selection.mark.col, (int32_t)ncol - 1);
3103 3019
3104 while (selection.mark.col > 0 3020 while (selection.mark.col > 0
3105 && save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR) 3021 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3106 --selection.mark.col; 3022 --selection.mark.col;
3107 3023
3108 if (selection.op) 3024 if (selection.op)
3109 { /* clear the old selection */ 3025 { /* clear the old selection */
3110 selection.beg.row = selection.end.row = selection.mark.row; 3026 selection.beg.row = selection.end.row = selection.mark.row;
… …
3134 text_t *stp; 3050 text_t *stp;
3135 rend_t *srp; 3051 rend_t *srp;
3136 3052
3137 if (dirn == UP) 3053 if (dirn == UP)
3138 { 3054 {
3139 bound.row = saveLines - nscrolled - 1; 3055 bound.row = - nsaved - 1;
3140 bound.col = 0; 3056 bound.col = 0;
3141 dirnadd = -1; 3057 dirnadd = -1;
3142 } 3058 }
3143 else 3059 else
3144 { 3060 {
3145 bound.row = saveLines + nrow; 3061 bound.row = nrow;
3146 bound.col = ncol - 1; 3062 bound.col = ncol - 1;
3147 dirnadd = 1; 3063 dirnadd = 1;
3148 } 3064 }
3149 3065
3150 row = mark->row + saveLines; 3066 row = mark->row;
3151 col = mark->col; 3067 col = max (mark->col, 0);
3152 MAX_IT (col, 0); 3068
3153 /* find the edge of a word */ 3069 /* find the edge of a word */
3154 stp = &save[row].t[col]; 3070 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3155 w1 = DELIMIT_TEXT (*stp); 3071 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3156
3157 srp = &save[row].r[col];
3158 w2 = DELIMIT_REND (*srp);
3159 3072
3160 for (;;) 3073 for (;;)
3161 { 3074 {
3162 for (; col != bound.col; col += dirnadd) 3075 for (; col != bound.col; col += dirnadd)
3163 { 3076 {
… …
3173 break; 3086 break;
3174 } 3087 }
3175 3088
3176 if ((col == bound.col) && (row != bound.row)) 3089 if ((col == bound.col) && (row != bound.row))
3177 { 3090 {
3178 if (save[ (row - (dirn == UP ? 1 : 0))].l == -1) 3091 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3179 { 3092 {
3180 trow = row + dirnadd; 3093 trow = row + dirnadd;
3181 tcol = dirn == UP ? ncol - 1 : 0; 3094 tcol = dirn == UP ? ncol - 1 : 0;
3182 3095
3183 if (save[trow].t == NULL) 3096 if (!ROW(trow).t)
3184 break; 3097 break;
3185 3098
3186 stp = & (save[trow].t[tcol]); 3099 stp = ROW(trow).t + tcol;
3187 srp = & (save[trow].r[tcol]); 3100 srp = ROW(trow).r + tcol;
3188 3101
3189 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3102 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3190 break; 3103 break;
3191 3104
3192 row = trow; 3105 row = trow;
… …
3200Old_Word_Selection_You_Die: 3113Old_Word_Selection_You_Die:
3201 if (dirn == DN) 3114 if (dirn == DN)
3202 col++; /* put us on one past the end */ 3115 col++; /* put us on one past the end */
3203 3116
3204 /* Poke the values back in */ 3117 /* Poke the values back in */
3205 ret->row = row - saveLines; 3118 ret->row = row;
3206 ret->col = col; 3119 ret->col = col;
3207} 3120}
3208 3121
3209/* ------------------------------------------------------------------------- */ 3122/* ------------------------------------------------------------------------- */
3210/* 3123/*
… …
3215 * flag == 2 ==> button 3 motion 3128 * flag == 2 ==> button 3 motion
3216 */ 3129 */
3217void 3130void
3218rxvt_term::selection_extend (int x, int y, int flag) 3131rxvt_term::selection_extend (int x, int y, int flag)
3219{ 3132{
3220 int col, row; 3133 int col = clamp (Pixel2Col (x), 0, ncol);
3221 3134 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3222 col = Pixel2Col (x);
3223 row = Pixel2Row (y);
3224 MAX_IT (row, 0);
3225 MIN_IT (row, (int)nrow - 1);
3226 MAX_IT (col, 0);
3227 MIN_IT (col, (int)ncol);
3228 3135
3229 /* 3136 /*
3230 * If we're selecting characters (single click) then we must check first 3137 * If we're selecting characters (single click) then we must check first
3231 * if we are at the same place as the original mark. If we are then 3138 * if we are at the same place as the original mark. If we are then
3232 * select nothing. Otherwise, if we're to the right of the mark, you have to 3139 * select nothing. Otherwise, if we're to the right of the mark, you have to
… …
3257 * Extend the selection to the specified col/row 3164 * Extend the selection to the specified col/row
3258 */ 3165 */
3259void 3166void
3260rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3167rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3261{ 3168{
3262 int end_col;
3263 row_col_t pos; 3169 row_col_t pos;
3264 enum { 3170 enum {
3265 LEFT, RIGHT 3171 LEFT, RIGHT
3266 } closeto = RIGHT; 3172 } closeto = RIGHT;
3267 3173
… …
3298 selection.beg.col = selection.end.col = selection.mark.col; 3204 selection.beg.col = selection.end.col = selection.mark.col;
3299 selection.beg.row = selection.end.row = selection.mark.row; 3205 selection.beg.row = selection.end.row = selection.mark.row;
3300 } 3206 }
3301 3207
3302 pos.col = col; 3208 pos.col = col;
3303 pos.row = row; 3209 pos.row = row - view_start;
3304
3305 pos.row -= view_start; /* adjust for scroll */
3306 3210
3307 /* 3211 /*
3308 * This is mainly xterm style selection with a couple of differences, mainly 3212 * This is mainly xterm style selection with a couple of differences, mainly
3309 * in the way button3 drag extension works. 3213 * in the way button3 drag extension works.
3310 * We're either doing: button1 drag; button3 press; or button3 drag 3214 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3369 } 3273 }
3370 } 3274 }
3371 3275
3372 if (selection.clicks == 1) 3276 if (selection.clicks == 1)
3373 { 3277 {
3374 end_col = save[selection.beg.row + saveLines].l; 3278 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3375 3279 && !ROW(selection.beg.row).is_longer ()
3376 if (selection.beg.col > end_col
3377 && end_col != -1
3378#if ENABLE_FRILLS 3280#if ENABLE_FRILLS
3379 && !selection.rect 3281 && !selection.rect
3380#endif 3282#endif
3381 ) 3283 )
3382 selection.beg.col = ncol; 3284 selection.beg.col = ncol;
3383 3285
3384 end_col = save[selection.end.row + saveLines].l;
3385
3386 if ( 3286 if (
3387 selection.end.col > end_col 3287 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3388 && end_col != -1 3288 && !ROW(selection.end.row).is_longer ()
3389#if ENABLE_FRILLS 3289#if ENABLE_FRILLS
3390 && !selection.rect 3290 && !selection.rect
3391#endif 3291#endif
3392 ) 3292 )
3393 selection.end.col = ncol; 3293 selection.end.col = ncol;
… …
3403 else if (selection.clicks == 3) 3303 else if (selection.clicks == 3)
3404 { 3304 {
3405#if ENABLE_FRILLS 3305#if ENABLE_FRILLS
3406 if (options & Opt_tripleclickwords) 3306 if (options & Opt_tripleclickwords)
3407 { 3307 {
3408 int end_row;
3409
3410 selection_delimit_word (UP, &selection.beg, &selection.beg); 3308 selection_delimit_word (UP, &selection.beg, &selection.beg);
3411 end_row = save[selection.mark.row + saveLines].l;
3412 3309
3413 for (end_row = selection.mark.row; end_row < nrow; end_row++) 3310 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3414 { 3311 {
3415 end_col = save[end_row + saveLines].l; 3312 if (!ROW(end_row).is_longer ())
3416
3417 if (end_col != -1)
3418 { 3313 {
3419 selection.end.row = end_row; 3314 selection.end.row = end_row;
3420 selection.end.col = end_col; 3315 selection.end.col = ROW(end_row).l;
3421 selection_remove_trailing_spaces (); 3316 selection_remove_trailing_spaces ();
3422 break; 3317 break;
3423 } 3318 }
3424 } 3319 }
3425 } 3320 }
… …
3432 selection.beg.col = 0; 3327 selection.beg.col = 0;
3433 selection.end.col = ncol; 3328 selection.end.col = ncol;
3434 3329
3435 // select a complete logical line 3330 // select a complete logical line
3436 while (selection.beg.row > -saveLines 3331 while (selection.beg.row > -saveLines
3437 && save[selection.beg.row - 1 + saveLines].l == -1) 3332 && ROW(selection.beg.row - 1).is_longer ())
3438 selection.beg.row--; 3333 selection.beg.row--;
3439 3334
3440 while (selection.end.row < nrow 3335 while (selection.end.row < nrow
3441 && save[selection.end.row + saveLines].l == -1) 3336 && ROW(selection.end.row).is_longer ())
3442 selection.end.row++; 3337 selection.end.row++;
3443 } 3338 }
3444 } 3339 }
3445 3340
3446 if (button3 && buttonpress) 3341 if (button3 && buttonpress)
… …
3457 } 3352 }
3458 } 3353 }
3459 3354
3460#if ENABLE_FRILLS 3355#if ENABLE_FRILLS
3461 if (selection.rect && selection.beg.col > selection.end.col) 3356 if (selection.rect && selection.beg.col > selection.end.col)
3462 SWAP_IT (selection.beg.col, selection.end.col, int); 3357 ::swap (selection.beg.col, selection.end.col);
3463#endif 3358#endif
3464} 3359}
3465 3360
3466#if ENABLE_FRILLS 3361#if ENABLE_FRILLS
3467void 3362void
… …
3471 text_t *stp; 3366 text_t *stp;
3472 3367
3473 end_col = selection.end.col; 3368 end_col = selection.end.col;
3474 end_row = selection.end.row; 3369 end_row = selection.end.row;
3475 3370
3476 for ( ; end_row >= selection.beg.row; ) 3371 for (; end_row >= selection.beg.row; )
3477 { 3372 {
3478 stp = save[end_row + saveLines].t; 3373 stp = ROW(end_row).t;
3479 3374
3480 while (--end_col >= 0) 3375 while (--end_col >= 0)
3481 { 3376 {
3482 if (stp[end_col] != ' ' 3377 if (stp[end_col] != NOCHAR
3483 && stp[end_col] != '\t' 3378 && !unicode::is_space (stp[end_col]))
3484 && stp[end_col] != NOCHAR)
3485 break; 3379 break;
3486 } 3380 }
3487 3381
3488 if (end_col >= 0 3382 if (end_col >= 0
3489 || save[end_row - 1 + saveLines].l != -1) 3383 || !ROW(end_row - 1).is_longer ())
3490 { 3384 {
3491 selection.end.col = end_col + 1; 3385 selection.end.col = end_col + 1;
3492 selection.end.row = end_row; 3386 selection.end.row = end_row;
3493 break; 3387 break;
3494 } 3388 }
… …
3665 */ 3559 */
3666void 3560void
3667rxvt_term::pixel_position (int *x, int *y) 3561rxvt_term::pixel_position (int *x, int *y)
3668{ 3562{
3669 *x = Pixel2Col (*x); 3563 *x = Pixel2Col (*x);
3670 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3564 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3671 *y = Pixel2Row (*y); 3565 *y = Pixel2Row (*y);
3672 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3566 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3673} 3567}
3674 3568
3675/* ------------------------------------------------------------------------- */ 3569/* ------------------------------------------------------------------------- */
3676#ifdef USE_XIM 3570#ifdef USE_XIM
3677void 3571void
… …
3699 3593
3700 if (x < 0) x = ncol - w; 3594 if (x < 0) x = ncol - w;
3701 if (y < 0) y = nrow - h; 3595 if (y < 0) y = nrow - h;
3702 3596
3703 // make space for border 3597 // make space for border
3704 w += 2; MIN_IT (w, ncol); 3598 w += 2; min_it (w, ncol);
3705 h += 2; MIN_IT (h, nrow); 3599 h += 2; min_it (h, nrow);
3706 3600
3707 x -= 1; MAX_IT (x, 0); 3601 x -= 1; clamp_it (x, 0, ncol - w);
3708 y -= 1; MAX_IT (y, 0); 3602 y -= 1; clamp_it (y, 0, nrow - h);
3709
3710 MIN_IT (x, ncol - w);
3711 MIN_IT (y, nrow - h);
3712 3603
3713 ov_x = x; ov_y = y; 3604 ov_x = x; ov_y = y;
3714 ov_w = w; ov_h = h; 3605 ov_w = w; ov_h = h;
3715 3606
3716 ov_text = new text_t *[h]; 3607 ov_text = new text_t *[h];
… …
3802rxvt_term::scr_swap_overlay () 3693rxvt_term::scr_swap_overlay ()
3803{ 3694{
3804 if (!ov_text) 3695 if (!ov_text)
3805 return; 3696 return;
3806 3697
3807 int row_offset = ov_y + saveLines - view_start;
3808
3809 // swap screen mem with overlay 3698 // swap screen mem with overlay
3810 for (int y = ov_h; y--; ) 3699 for (int y = ov_h; y--; )
3811 { 3700 {
3812 text_t *t1 = ov_text[y]; 3701 text_t *t1 = ov_text[y];
3813 rend_t *r1 = ov_rend[y]; 3702 rend_t *r1 = ov_rend[y];
3814 3703
3815 text_t *t2 = save[y + row_offset].t + ov_x; 3704 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3816 rend_t *r2 = save[y + row_offset].r + ov_x; 3705 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3817 3706
3818 for (int x = ov_w; x--; ) 3707 for (int x = ov_w; x--; )
3819 { 3708 {
3820 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3709 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3821 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3710 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3823 } 3712 }
3824} 3713}
3825 3714
3826#endif 3715#endif
3827/* ------------------------------------------------------------------------- */ 3716/* ------------------------------------------------------------------------- */
3717

Diff Legend

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