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.174 by root, Mon Dec 19 02:40:14 2005 UTC vs.
Revision 1.204 by root, Mon Jan 2 15:35:43 2006 UTC

… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
116 117
117/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
118void 119void
119rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)
120{ 121{
122 if (!l.t)
123 {
124 lalloc (l);
125 col = 0;
126 width = ncol;
127 }
128
121 efs &= ~RS_baseattrMask; 129 efs &= ~RS_baseattrMask;
122 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 130 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
123 131
124 text_t *et = l.t + col; 132 text_t *et = l.t + col;
125 rend_t *er = l.r + col; 133 rend_t *er = l.r + col;
… …
134/* ------------------------------------------------------------------------- */ 142/* ------------------------------------------------------------------------- */
135/* Fill a full line with blanks - make sure it is allocated first */ 143/* Fill a full line with blanks - make sure it is allocated first */
136void 144void
137rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 145rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
138{ 146{
139 if (!l.t)
140 lalloc (l);
141
142 scr_blank_line (l, 0, ncol, efs); 147 scr_blank_line (l, 0, ncol, efs);
143} 148}
144 149
145/* ------------------------------------------------------------------------- * 150/* ------------------------------------------------------------------------- *
146 * SCREEN INITIALISATION * 151 * SCREEN INITIALISATION *
147 * ------------------------------------------------------------------------- */ 152 * ------------------------------------------------------------------------- */
153
148void 154void
149rxvt_term::scr_reset () 155rxvt_term::scr_reset ()
150{ 156{
151 unsigned int p, q;
152 int k;
153
154#if ENABLE_OVERLAY 157#if ENABLE_OVERLAY
155 scr_overlay_off (); 158 scr_overlay_off ();
156#endif 159#endif
157 160
158 view_start = 0; 161 view_start = 0;
… …
168 return; 171 return;
169 172
170 // we need at least two lines for wrapping to work correctly 173 // we need at least two lines for wrapping to work correctly
171 if (nrow + saveLines < 2) 174 if (nrow + saveLines < 2)
172 { 175 {
176 //TODO//FIXME
173 saveLines++; 177 saveLines++;
174 prev_nrow--; 178 prev_nrow--;
175 nscrolled++; 179 nsaved++;
176 } 180 }
177 181
178 want_refresh = 1; 182 want_refresh = 1;
179 183
180 int prev_total_rows = prev_nrow + saveLines; 184 int prev_total_rows = prev_nrow + saveLines;
181 int total_rows = nrow + saveLines; 185 total_rows = nrow + saveLines;
182 186
183 screen.tscroll = 0; 187 screen.tscroll = 0;
184 screen.bscroll = nrow - 1; 188 screen.bscroll = nrow - 1;
185 189
186 if (!save) 190 if (!row_buf)
187 { 191 {
188 /* 192 /*
189 * 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
190 * 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
191 */ 195 */
192 nscrolled = 0; /* no saved lines */ 196 nsaved = 0; /* no saved lines */
193 term_start = 0; 197 term_start = 0;
194 nsaved = 0;
195 198
196 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 199 talloc = new rxvt_salloc (ncol * sizeof (text_t));
197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 200 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198 201
199 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
200 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 202 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
201 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
202 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
203 206
204 screen.line = (line_t **)rxvt_calloc (nrow, sizeof (line_t *));
205
206 scr_update_term ();
207
208 for (p = nrow; p--; ) 207 for (int row = nrow; row--; )
209 { 208 {
210 scr_blank_screen_mem (*screen.line[p], DEFAULT_RSTYLE); 209 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
211 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 210 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
212 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 211 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
213 } 212 }
214 213
215 memset (charsets, 'B', sizeof (charsets)); 214 memset (charsets, 'B', sizeof (charsets));
216 rstyle = DEFAULT_RSTYLE; 215 rstyle = DEFAULT_RSTYLE;
217 screen.flags = Screen_DefaultFlags; 216 screen.flags = Screen_DefaultFlags;
… …
241 { 240 {
242 /* 241 /*
243 * add or delete rows as appropriate 242 * add or delete rows as appropriate
244 */ 243 */
245 244
246 rxvt_salloc *old_ta; 245 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
247 rxvt_salloc *old_ra; 246 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248 247
248#if 0
249 if (nrow < prev_nrow) 249 if (nrow < prev_nrow)
250 { 250 {
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++) 251 for (int row = nrow; row < prev_nrow; row++)
257 { 252 {
258 lfree (save[p + saveLines]);
259 lfree (swap_save[p]); 253 lfree (swap_buf [row]);
260 lfree (drawn[p]); 254 lfree (drawn_buf[row]);
261 } 255 }
256 }
257#endif
262 258
263 /* we have fewer rows so fix up cursor position */ 259 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
264 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 260 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
261 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
265 262
266 scr_reset_realloc (); /* realloc _last_ */ 263 for (int row = min (nrow, prev_nrow); row--; )
264 {
265 lresize (drawn_buf[row]);
266 lresize (swap_buf [row]);
267 }
268
269 for (int row = prev_nrow; row < nrow; row++)
270 {
271 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273 }
274
275 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
267 } 276
268 else if (nrow > prev_nrow) 277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
278 int pend = MOD (term_start - nsaved , prev_total_rows);
279 int q = total_rows; // rewrapped row
280
281 if (nsaved)
282 {
283 // re-wrap lines, this is rather ugly, possibly because I am too dumb
284 // to come up with a lean and mean algorithm.
285
286 row_col_t ocur = screen.cur;
287 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
288
269 { 289 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 { 290 {
288 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 291 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 292#ifdef DEBUG_STRICT
301 assert (screen.cur.row < nrow); 293 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 294#endif
305 ncol = ocol; // save b/c scr_blank_screen_mem uses this
306 }
307 295
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; 296 int plines = 1;
297 int llen = old_buf [MOD (p, prev_total_rows)].l;
352 298
353 assert (llen >= 0); 299 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
354
355 while (p && save[p - 1].l < 0)
356 { 300 {
301 p = MOD (p - 1, prev_total_rows);
302
357 --p; 303 plines++;
358 llen += prev_ncol; 304 llen += prev_ncol;
359 } 305 }
360 306
361 int qlines = llen / ncol + 1; 307 int qlines = max (0, (llen - 1) / ncol) + 1;
308
309 // drop partial lines completely
310 if (q < qlines)
311 break;
312
313 q -= qlines;
314
362 int lofs = 0; 315 int lofs = 0;
316 line_t *qline;
363 317
364 q -= qlines; 318 // 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++) 319 for (int qrow = q; qlines--; qrow++)
370 { 320 {
321 qline = row_buf + qrow;
322 lalloc (*qline);
323 qline->set_is_longer ();
324
371 if (qrow >= 0) 325 int qcol = 0;
326
327 // fill a single destination line
328 while (lofs < llen && qcol < ncol)
372 { 329 {
373 tp [qrow] = (text_t *)ta->alloc ();
374 rp [qrow] = (rend_t *)ra->alloc ();
375 tl [qrow] = LINE_CONT1;
376
377 int qcol = 0;
378
379 for (;;)
380 {
381 int prow = lofs / prev_ncol + p; 330 int prow = lofs / prev_ncol;
382 int pcol = lofs % prev_ncol; 331 int pcol = lofs % prev_ncol;
383 332
333 prow = MOD (p + prow, prev_total_rows);
334
335 // we only adjust the cursor _row_ and put it into
336 // the topmost line of "long line" it was in, as
337 // this seems to upset applications/shells/readline
338 // least.
339 if (prow == ocur.row)
340 screen.cur.row = q - (total_rows - nrow);
341
342 line_t &pline = old_buf [prow];
343
384 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 344 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385 345
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); 346 assert (len);
347 assert (pline.t);
400 348
401 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 349 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
402 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 350 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
403 351
404 lofs += len; 352 lofs += len;
405 qcol += len; 353 qcol += len;
406
407 if (qcol == ncol)
408 break;
409 }
410 } 354 }
411 else
412 lofs += ncol;
413 } 355 }
356
357 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
358#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY
359 if (qline->l < 0)
360 {
361 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
362 qline->l = 0;
363 }
364#endif
365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
414 } 366 }
367 while (p != pend && q > 0);
368
369 term_start = total_rows - nrow;
370 nsaved = term_start - q;
371
372 // make sure all terminal lines exist
373 while (nsaved < 0)
374 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
375
376 }
377 else
415 } 378 {
379 // if no scrollback exists (yet), wing, instead of wrap
380
381 for (int row = min (nrow, prev_nrow); row--; )
382 {
383 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
384 line_t &qline = row_buf [row];
416 385
417 free (screen.text); screen.text = tp; 386 qline = pline;
418 free (screen.rend); screen.rend = rp; 387 lresize (qline);
419 free (screen.tlen); screen.tlen = tl; 388 }
420 389
421 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 390 for (int row = prev_nrow; row < nrow; row++)
391 {
392 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
393 }
394
395 term_start = 0;
396 }
397
398#ifdef DEBUG_STRICT //TODO: remove
399 for (int i = -nsaved; i < nrow; i++)
400 assert (ROW (i).t);
422#endif 401#endif
402
403 free (old_buf);
404 delete old_ta;
405 delete old_ra;
406
407 clamp_it (screen.cur.row, 0, nrow - 1);
408 clamp_it (screen.cur.col, 0, ncol - 1);
423 409
424 if (tabs) 410 if (tabs)
425 free (tabs); 411 free (tabs);
426 } 412 }
427 413
428 prev_nrow = nrow; 414 prev_nrow = nrow;
429 prev_ncol = ncol; 415 prev_ncol = ncol;
430 416
431 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 417 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
432 418
433 for (p = 0; p < ncol; p++) 419 for (int col = ncol; col--; )
434 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 420 tabs [col] = col % TABSIZE == 0;
435 421
436 tt_winch (); 422 tt_winch ();
437}
438 423
439void 424 PERL_INVOKE ((this, HOOK_RESET, DT_END));
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} 425}
450 426
451/* ------------------------------------------------------------------------- */ 427/* ------------------------------------------------------------------------- */
452/* 428/*
453 * Free everything. That way malloc debugging can find leakage. 429 * Free everything. That way malloc debugging can find leakage.
454 */ 430 */
455void 431void
456rxvt_term::scr_release () 432rxvt_term::scr_release ()
457{ 433{
458 unsigned int total_rows;
459
460 total_rows = nrow + saveLines;
461
462 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
463 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
464 436
465 free (screen.line); 437 free (row_buf);
466 free (save);
467 free (swap_save); 438 free (swap_buf);
468 free (drawn); 439 free (drawn_buf);
469 free (buf); 440 free (temp_buf);
470 free (tabs); 441 free (tabs);
442
443 row_buf = 0; // signal that we freed all the arrays
471} 444}
472 445
473/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
474/* 447/*
475 * Hard reset 448 * Hard reset
… …
526 set_font_style (); 499 set_font_style ();
527 break; 500 break;
528 } 501 }
529 502
530 /* boundary check in case screen size changed between SAVE and RESTORE */ 503 /* boundary check in case screen size changed between SAVE and RESTORE */
531 MIN_IT (s->cur.row, nrow - 1); 504 min_it (s->cur.row, nrow - 1);
532 MIN_IT (s->cur.col, ncol - 1); 505 min_it (s->cur.col, ncol - 1);
533#ifdef DEBUG_STRICT 506#ifdef DEBUG_STRICT
534 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
535 assert (s->cur.col >= 0); 508 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 509#endif
540} 510}
541 511
542/* ------------------------------------------------------------------------- */ 512/* ------------------------------------------------------------------------- */
543/* 513/*
… …
546 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 516 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
547 */ 517 */
548int 518int
549rxvt_term::scr_change_screen (int scrn) 519rxvt_term::scr_change_screen (int scrn)
550{ 520{
551 int i;
552#if NSCREENS
553 int offset;
554#endif
555
556 want_refresh = 1; 521 want_refresh = 1;
557
558 view_start = 0; 522 view_start = 0;
559 523
560 if (current_screen == scrn) 524 if (current_screen == scrn)
561 return scrn; 525 return scrn;
562 526
563 selection_check (2); /* check for boundary cross */ 527 selection_check (2); /* check for boundary cross */
564 528
565 i = current_screen; current_screen = scrn; scrn = i; 529 int i = current_screen; current_screen = scrn; scrn = i;
566 530
567 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 531 ::swap (screen.cur.row, swap.cur.row);
568 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 532 ::swap (screen.cur.col, swap.cur.col);
569 MAX_IT (screen.cur.row, 0); 533
570 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 534 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
571 MAX_IT (screen.cur.col, 0); 535 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
572 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
573 536
574#if NSCREENS 537#if NSCREENS
575 if (options & Opt_secondaryScreen) 538 if (OPTION (Opt_secondaryScreen))
576 { 539 {
577 num_scr = 0; 540 num_scr = 0;
578 offset = saveLines;
579 541
580 for (i = prev_nrow; i--;) 542 for (int i = prev_nrow; i--; )
581 SWAP_IT (*(screen.line[i]), swap_save[i], line_t); 543 ::swap (ROW(i), swap_buf [i]);
582 544
583 SWAP_IT (screen.charset, swap.charset, int16_t); 545 ::swap (screen.charset, swap.charset);
584 SWAP_IT (screen.flags, swap.flags, int); 546 ::swap (screen.flags, swap.flags);
585 screen.flags |= Screen_VisibleCursor; 547 screen.flags |= Screen_VisibleCursor;
586 swap.flags |= Screen_VisibleCursor; 548 swap.flags |= Screen_VisibleCursor;
587 } 549 }
588 else 550 else
589#endif 551#endif
590 if (options & Opt_secondaryScroll) 552 if (OPTION (Opt_secondaryScroll))
591 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 553 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
592 554
593 return scrn; 555 return scrn;
594} 556}
595 557
596// clear WrapNext indicator, solidifying position on next line 558// clear WrapNext indicator, solidifying position on next line
… …
603 screen.flags &= ~Screen_WrapNext; 565 screen.flags &= ~Screen_WrapNext;
604 566
605 screen.cur.col = 0; 567 screen.cur.col = 0;
606 568
607 if (screen.cur.row == screen.bscroll) 569 if (screen.cur.row == screen.bscroll)
608 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 570 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
609 else if (screen.cur.row < nrow - 1) 571 else if (screen.cur.row < nrow - 1)
610 screen.cur.row++; 572 screen.cur.row++;
611} 573}
612 574
613/* ------------------------------------------------------------------------- */ 575/* ------------------------------------------------------------------------- */
… …
639 rstyle = DEFAULT_RSTYLE; 601 rstyle = DEFAULT_RSTYLE;
640 else 602 else
641 rstyle &= ~style; 603 rstyle &= ~style;
642 } 604 }
643 605
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/* ------------------------------------------------------------------------- */ 606/* ------------------------------------------------------------------------- */
653/* 607/*
654 * Scroll text between <row1> and <row2> inclusive, by <count> lines 608 * Scroll text between <row1> and <row2> inclusive, by <count> lines
655 * count positive ==> scroll up 609 * count positive ==> scroll up
656 * count negative ==> scroll down 610 * count negative ==> scroll down
657 * spec == 0 for normal routines
658 */ 611 */
659int 612int
660rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 613rxvt_term::scr_scroll_text (int row1, int row2, int count)
661{ 614{
662 int i, j;
663
664 if (count == 0 || (row1 > row2)) 615 if (count == 0 || (row1 > row2))
665 return 0; 616 return 0;
666 617
667 want_refresh = 1; 618 want_refresh = 1;
619 num_scr += count;
668 620
669 if (row1 == 0 && count > 0 621 if (count > 0
622 && row1 == 0
623 && row2 == nrow - 1
670 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 624 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
671 { 625 {
672 nscrolled += count; 626 nsaved = min (nsaved + count, saveLines);
673 627
674 if (nscrolled > saveLines) 628 PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
675 nscrolled = saveLines; 629
630 term_start = (term_start + count) % total_rows;
676 631
632 if (selection.op && current_screen == selection.screen)
633 {
634 selection.beg.row -= count;
635 selection.end.row -= count;
636 selection.mark.row -= count;
637
638 if (selection.beg.row < -nsaved
639 || selection.end.row < -nsaved
640 || selection.mark.row < -nsaved)
641 {
642 CLEAR_ALL_SELECTION ();
643 selection.op = SELECTION_CLEAR;
644 }
645 }
646
647 for (int i = count; i--; )
648 {
649 ROW(row2 - i).l = 0;
650 scr_blank_screen_mem (ROW(row2 - i), rstyle);
651 }
652
677 if ((options & Opt_scrollWithBuffer) 653 if (OPTION (Opt_scrollWithBuffer)
678 && view_start != 0 654 && view_start != 0
679 && view_start != saveLines) 655 && view_start != saveLines)
680 scr_page (UP, count); 656 scr_page (UP, count);
681 } 657 }
682 else if (!spec) 658 else
683 row1 += saveLines; 659 {
684
685 row2 += saveLines;
686
687 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
688 { 661 {
689 i = selection.beg.row + saveLines; 662 if ((selection.beg.row < row1 && selection.end.row > row1)
690 j = selection.end.row + saveLines; 663 || (selection.beg.row < row2 && selection.end.row > row2)
691 664 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
692 if ((i < row1 && j > row1) 665 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
693 || (i < row2 && j > row2) 666 || (selection.end.row - count < row1 && selection.end.row >= row1)
694 || (i - count < row1 && i >= row1) 667 || (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 { 668 {
699 CLEAR_ALL_SELECTION (); 669 CLEAR_ALL_SELECTION ();
700 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 670 selection.op = SELECTION_CLEAR;
701 } 671 }
702 else if (j >= row1 && j <= row2) 672 else if (selection.end.row >= row1 && selection.end.row <= row2)
703 { 673 {
704 /* move selected region too */ 674 /* move selected region too */
705 selection.beg.row -= count; 675 selection.beg.row -= count;
706 selection.end.row -= count; 676 selection.end.row -= count;
707 selection.mark.row -= count; 677 selection.mark.row -= count;
678
679 selection_check (0);
680 }
681 }
682
683 // use a simple and robust scrolling algorithm, this
684 // part of scr_scroll_text is not time-critical.
685
686 int rows = row2 - row1 + 1;
687
688 min_it (count, rows);
689
690 for (int row = 0; row < rows; row++)
708 } 691 {
709 } 692 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
710 693
711 selection_check (0); /* _after_ nscrolled update */ 694 if (!IN_RANGE_EXC (row + count, 0, rows))
695 scr_blank_screen_mem (temp_buf [row], rstyle);
696 }
712 697
713 num_scr += count; 698 for (int row = 0; row < rows; row++)
714 j = count; 699 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 { 700 }
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 701
760 return count; 702 return count;
761} 703}
762 704
763/* ------------------------------------------------------------------------- */ 705/* ------------------------------------------------------------------------- */
… …
770 if (len <= 0) /* sanity */ 712 if (len <= 0) /* sanity */
771 return; 713 return;
772 714
773 unsigned char checksel; 715 unsigned char checksel;
774 unicode_t c; 716 unicode_t c;
775 int row, last_col; 717 int last_col;
776 const unicode_t *strend = str + len; 718 const unicode_t *strend = str + len;
777 719
778 want_refresh = 1; 720 want_refresh = 1;
779 ZERO_SCROLLBACK (); 721 ZERO_SCROLLBACK ();
780 last_col = ncol; 722 last_col = ncol;
781 723
782 if (nlines > 0) 724 if (nlines > 0)
783 { 725 {
784 nlines += screen.cur.row - screen.bscroll; 726 nlines += screen.cur.row - screen.bscroll;
785 if ((nlines > 0) 727 if (nlines > 0
786 && (screen.tscroll == 0) 728 && screen.tscroll == 0
787 && (screen.bscroll == (nrow - 1))) 729 && screen.bscroll == (nrow - 1))
788 { 730 {
789 /* _at least_ this many lines need to be scrolled */ 731 /* _at least_ this many lines need to be scrolled */
790 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 732 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
791 screen.cur.row -= nlines; 733 screen.cur.row -= nlines;
792 } 734 }
793 } 735 }
794 736
795#ifdef DEBUG_STRICT 737#ifdef DEBUG_STRICT
796 assert (screen.cur.col < last_col); 738 assert (screen.cur.col < last_col);
797 assert ((screen.cur.row < nrow) 739 assert (screen.cur.row < nrow
798 && (screen.cur.row >= - (int32_t)nscrolled)); 740 && 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 741#endif
804 row = screen.cur.row + saveLines; 742 int row = screen.cur.row;
805 743
806 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 744 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807 745
808 line_t *line = save + row; 746 line_t *line = &ROW(row);
809 747
810 while (str < strend) 748 while (str < strend)
811 { 749 {
812 c = *str++; 750 c = *str++;
813 751
814 if (c < 0x20) 752 if (c < 0x20)
815 if (c == C0_LF) 753 if (c == C0_LF)
816 { 754 {
817 if (!line->is_longer ()) /* XXX: think about this */ 755 if (!line->is_longer ()) /* XXX: think about this */
818 MAX_IT (line->l, screen.cur.col); 756 max_it (line->l, screen.cur.col);
819 757
820 screen.flags &= ~Screen_WrapNext; 758 screen.flags &= ~Screen_WrapNext;
821 759
822 if (screen.cur.row == screen.bscroll) 760 if (screen.cur.row == screen.bscroll)
823 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 761 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
824 else if (screen.cur.row < (nrow - 1)) 762 else if (screen.cur.row < (nrow - 1))
825 row = (++screen.cur.row) + saveLines; 763 row = ++screen.cur.row;
826 764
827 line = save + row; /* _must_ refresh */ 765 line = &ROW(row); /* _must_ refresh */
828 continue; 766 continue;
829 } 767 }
830 else if (c == C0_CR) 768 else if (c == C0_CR)
831 { 769 {
832 if (!line->is_longer ()) /* XXX: think about this */ 770 if (!line->is_longer ()) /* XXX: think about this */
833 MAX_IT (line->l, screen.cur.col); 771 max_it (line->l, screen.cur.col);
834 772
835 screen.flags &= ~Screen_WrapNext; 773 screen.flags &= ~Screen_WrapNext;
836 screen.cur.col = 0; 774 screen.cur.col = 0;
837 continue; 775 continue;
838 } 776 }
… …
859 { 797 {
860 line->set_is_longer (); 798 line->set_is_longer ();
861 799
862 scr_do_wrap (); 800 scr_do_wrap ();
863 801
864 row = screen.cur.row + saveLines; 802 row = screen.cur.row;
865 line = save + row; /* _must_ refresh */ 803 line = &ROW(row); /* _must_ refresh */
866 } 804 }
867 805
868 // some utf-8 decoders "decode" surrogate characters: let's fix this. 806 // some utf-8 decoders "decode" surrogate characters: let's fix this.
869 if (IN_RANGE (c, 0xd800, 0xdfff)) 807 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
870 c = 0xfffd; 808 c = 0xfffd;
871 809
872 // rely on wcwidth to tell us the character width, at least for non-latin1 810 // 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 811 // 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 812 // for the line drawing characters below as they might be invalid in the current
… …
989 927
990 while (*tp == NOCHAR && tp > line->t) 928 while (*tp == NOCHAR && tp > line->t)
991 tp--, rp--; 929 tp--, rp--;
992 } 930 }
993 else if (screen.cur.row > 0 931 else if (screen.cur.row > 0
994 && save [screen.cur.row - 1 + saveLines].is_longer ()) 932 && ROW(screen.cur.row - 1).is_longer ())
995 { 933 {
996 line_t *line = save + (screen.cur.row - 1 + saveLines); 934 line_t *line = &ROW(screen.cur.row - 1);
997 935
998 tp = line->t + last_col - 1; 936 tp = line->t + last_col - 1;
999 rp = line->r + last_col - 1; 937 rp = line->r + last_col - 1;
1000 938
1001 while (*tp == NOCHAR && tp > line->t) 939 while (*tp == NOCHAR && tp > line->t)
… …
1014#endif 952#endif
1015 } 953 }
1016 } 954 }
1017 955
1018 if (!line->is_longer ()) /* XXX: think about this */ 956 if (!line->is_longer ()) /* XXX: think about this */
1019 MAX_IT (line->l, screen.cur.col); 957 max_it (line->l, screen.cur.col);
1020 958
1021#ifdef DEBUG_STRICT 959#ifdef DEBUG_STRICT
1022 assert (screen.cur.row >= 0); 960 assert (screen.cur.row >= 0);
1023#else /* drive with your eyes closed */
1024 MAX_IT (screen.cur.row, 0);
1025#endif 961#endif
1026} 962}
1027 963
1028/* ------------------------------------------------------------------------- */ 964/* ------------------------------------------------------------------------- */
1029/* 965/*
… …
1068 1004
1069 if (count == 0) 1005 if (count == 0)
1070 return; 1006 return;
1071 else if (count > 0) 1007 else if (count > 0)
1072 { 1008 {
1073 int row = saveLines + screen.cur.row; 1009 line_t &l = ROW(screen.cur.row);
1074
1075 line_t &l = save[row];
1076 rend_t base_rend = l.r[i]; 1010 rend_t base_rend = l.r[i];
1077 ht &= l.t[i] == ' '; 1011 ht &= l.t[i] == ' ';
1078 1012
1079 for (; ++i < ncol; ) 1013 for (; ++i < ncol; )
1080 if (tabs[i]) 1014 if (tabs[i])
… …
1090 if (count) 1024 if (count)
1091 x = ncol - 1; 1025 x = ncol - 1;
1092 1026
1093 // store horizontal tab commands as characters inside the text 1027 // store horizontal tab commands as characters inside the text
1094 // buffer so they can be selected and pasted. 1028 // buffer so they can be selected and pasted.
1095 if (ht && options & Opt_pastableTabs) 1029 if (ht && OPTION (Opt_pastableTabs))
1096 { 1030 {
1097 base_rend = SET_FONT (base_rend, 0); 1031 base_rend = SET_FONT (base_rend, 0);
1098 1032
1099 if (!l.is_longer ()) /* XXX: think about this */ 1033 if (!l.is_longer ()) /* XXX: think about this */
1100 MAX_IT (l.l, x); 1034 max_it (l.l, x);
1101 1035
1102 i = screen.cur.col; 1036 i = screen.cur.col;
1103 1037
1104 l.t[i] = '\t'; 1038 l.t[i] = '\t';
1105 l.r[i] = base_rend; 1039 l.r[i] = base_rend;
… …
1141rxvt_term::scr_backindex () 1075rxvt_term::scr_backindex ()
1142{ 1076{
1143 if (screen.cur.col > 0) 1077 if (screen.cur.col > 0)
1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1078 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1145 else 1079 else
1146 {
1147 if (!save[screen.cur.row + saveLines].l)
1148 return; /* um, yeah? */
1149
1150 scr_insdel_chars (1, INSERT); 1080 scr_insdel_chars (1, INSERT);
1151 }
1152} 1081}
1153#endif 1082#endif
1154/* ------------------------------------------------------------------------- */ 1083/* ------------------------------------------------------------------------- */
1155/* 1084/*
1156 * Process DEC Forward Index 1085 * Process DEC Forward Index
… …
1160 */ 1089 */
1161#if ENABLE_FRILLS 1090#if ENABLE_FRILLS
1162void 1091void
1163rxvt_term::scr_forwardindex () 1092rxvt_term::scr_forwardindex ()
1164{ 1093{
1165 int row;
1166
1167 if (screen.cur.col < ncol - 1) 1094 if (screen.cur.col < ncol - 1)
1168 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1095 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1169 else 1096 else
1170 { 1097 {
1171 row = screen.cur.row + saveLines;
1172
1173 if (!save[row].l)
1174 return; /* um, yeah? */
1175
1176 if (save[row].is_longer ()) //TODO//FIXME//LEN 1098 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
1177 save[row].l = ncol; 1099 ROW(screen.cur.row).l = ncol;
1178 1100
1179 scr_gotorc (0, 0, R_RELATIVE); 1101 scr_gotorc (0, 0, R_RELATIVE);
1180 scr_insdel_chars (1, DELETE); 1102 scr_insdel_chars (1, DELETE);
1181 scr_gotorc (0, ncol - 1, R_RELATIVE); 1103 scr_gotorc (0, ncol - 1, R_RELATIVE);
1182 } 1104 }
… …
1192{ 1114{
1193 want_refresh = 1; 1115 want_refresh = 1;
1194 ZERO_SCROLLBACK (); 1116 ZERO_SCROLLBACK ();
1195 1117
1196 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1118 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1197 MAX_IT (screen.cur.col, 0); 1119 clamp_it (screen.cur.col, 0, ncol - 1);
1198 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1199 1120
1200 screen.flags &= ~Screen_WrapNext; 1121 screen.flags &= ~Screen_WrapNext;
1201 1122
1202 if (relative & R_RELATIVE) 1123 if (relative & R_RELATIVE)
1203 { 1124 {
… …
1221 else 1142 else
1222 { 1143 {
1223 if (screen.flags & Screen_Relative) 1144 if (screen.flags & Screen_Relative)
1224 { /* relative origin mode */ 1145 { /* relative origin mode */
1225 screen.cur.row = row + screen.tscroll; 1146 screen.cur.row = row + screen.tscroll;
1226 MIN_IT (screen.cur.row, screen.bscroll); 1147 min_it (screen.cur.row, screen.bscroll);
1227 } 1148 }
1228 else 1149 else
1229 screen.cur.row = row; 1150 screen.cur.row = row;
1230 } 1151 }
1231 1152
1232 MAX_IT (screen.cur.row, 0); 1153 clamp_it (screen.cur.row, 0, nrow - 1);
1233 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1234} 1154}
1235 1155
1236/* ------------------------------------------------------------------------- */ 1156/* ------------------------------------------------------------------------- */
1237/* 1157/*
1238 * direction should be UP or DN 1158 * direction should be UP or DN
… …
1249 1169
1250 screen.flags &= ~Screen_WrapNext; 1170 screen.flags &= ~Screen_WrapNext;
1251 1171
1252 if ((screen.cur.row == screen.bscroll && direction == UP) 1172 if ((screen.cur.row == screen.bscroll && direction == UP)
1253 || (screen.cur.row == screen.tscroll && direction == DN)) 1173 || (screen.cur.row == screen.tscroll && direction == DN))
1254 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1174 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1255 else 1175 else
1256 screen.cur.row += dirn; 1176 screen.cur.row += dirn;
1257 1177
1258 MAX_IT (screen.cur.row, 0); 1178 clamp_it (screen.cur.row, 0, nrow - 1);
1259 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1260 selection_check (0); 1179 selection_check (0);
1261} 1180}
1262 1181
1263/* ------------------------------------------------------------------------- */ 1182/* ------------------------------------------------------------------------- */
1264/* 1183/*
… …
1268 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1187 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1269 */ 1188 */
1270void 1189void
1271rxvt_term::scr_erase_line (int mode) 1190rxvt_term::scr_erase_line (int mode)
1272{ 1191{
1273 unsigned int row, col, num; 1192 unsigned int col, num;
1274 1193
1275 want_refresh = 1; 1194 want_refresh = 1;
1276 ZERO_SCROLLBACK (); 1195 ZERO_SCROLLBACK ();
1277 1196
1278 selection_check (1); 1197 selection_check (1);
1279 1198
1280 row = saveLines + screen.cur.row; 1199 line_t &line = ROW(screen.cur.row);
1281 1200
1282 switch (mode) 1201 switch (mode)
1283 { 1202 {
1284 case 0: /* erase to end of line */ 1203 case 0: /* erase to end of line */
1285 col = screen.cur.col; 1204 col = screen.cur.col;
1286 num = ncol - col; 1205 num = ncol - col;
1287 MIN_IT (save[row].l, (int16_t)col); 1206 min_it (line.l, col);
1288 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1207 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1289 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1208 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1290 CLEAR_SELECTION (); 1209 CLEAR_SELECTION ();
1291 break; 1210 break;
1292 case 1: /* erase to beginning of line */ 1211 case 1: /* erase to beginning of line */
… …
1297 CLEAR_SELECTION (); 1216 CLEAR_SELECTION ();
1298 break; 1217 break;
1299 case 2: /* erase whole line */ 1218 case 2: /* erase whole line */
1300 col = 0; 1219 col = 0;
1301 num = ncol; 1220 num = ncol;
1302 save[row].l = 0; 1221 line.l = 0;
1303 if (selection.beg.row <= screen.cur.row 1222 if (selection.beg.row <= screen.cur.row
1304 && selection.end.row >= screen.cur.row) 1223 && selection.end.row >= screen.cur.row)
1305 CLEAR_SELECTION (); 1224 CLEAR_SELECTION ();
1306 break; 1225 break;
1307 default: 1226 default:
1308 return; 1227 return;
1309 } 1228 }
1310 1229
1311 if (save[row].t)
1312 scr_blank_line (save[row], col, num, rstyle); 1230 scr_blank_line (line, col, num, rstyle);
1313 else
1314 scr_blank_screen_mem (save[row], rstyle);
1315} 1231}
1316 1232
1317/* ------------------------------------------------------------------------- */ 1233/* ------------------------------------------------------------------------- */
1318/* 1234/*
1319 * Erase part of whole of the screen 1235 * Erase part of whole of the screen
… …
1323 */ 1239 */
1324void 1240void
1325rxvt_term::scr_erase_screen (int mode) 1241rxvt_term::scr_erase_screen (int mode)
1326{ 1242{
1327 int num; 1243 int num;
1328 int32_t row, row_offset; 1244 int32_t row;
1329 rend_t ren; 1245 rend_t ren;
1330 XGCValues gcvalue; 1246 XGCValues gcvalue;
1331 1247
1332 want_refresh = 1; 1248 want_refresh = 1;
1333 ZERO_SCROLLBACK (); 1249 ZERO_SCROLLBACK ();
1334
1335 row_offset = (int32_t)saveLines;
1336 1250
1337 switch (mode) 1251 switch (mode)
1338 { 1252 {
1339 case 0: /* erase to end of screen */ 1253 case 0: /* erase to end of screen */
1340 selection_check (1); 1254 selection_check (1);
… …
1364 CLEAR_SELECTION (); 1278 CLEAR_SELECTION ();
1365 1279
1366 if (row >= nrow) /* Out Of Bounds */ 1280 if (row >= nrow) /* Out Of Bounds */
1367 return; 1281 return;
1368 1282
1369 MIN_IT (num, (nrow - row)); 1283 min_it (num, nrow - row);
1370 1284
1371 if (rstyle & (RS_RVid | RS_Uline)) 1285 if (rstyle & (RS_RVid | RS_Uline))
1372 ren = (rend_t) ~RS_None; 1286 ren = (rend_t) ~RS_None;
1373 else if (GET_BASEBG (rstyle) == Color_bg) 1287 else if (GET_BASEBG (rstyle) == Color_bg)
1374 { 1288 {
… …
1376 CLEAR_ROWS (row, num); 1290 CLEAR_ROWS (row, num);
1377 } 1291 }
1378 else 1292 else
1379 { 1293 {
1380 ren = rstyle & (RS_fgMask | RS_bgMask); 1294 ren = rstyle & (RS_fgMask | RS_bgMask);
1381 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1295 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1382 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1296 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1383 ERASE_ROWS (row, num); 1297 ERASE_ROWS (row, num);
1384 gcvalue.foreground = pix_colors[Color_fg]; 1298 gcvalue.foreground = pix_colors[Color_fg];
1385 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1299 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1386 } 1300 }
1387 1301
1388 for (; num--; row++) 1302 for (; num--; row++)
1389 { 1303 {
1304 ROW (row).l = 0;
1390 scr_blank_screen_mem (save[row + row_offset], rstyle); 1305 scr_blank_screen_mem (ROW (row), rstyle);
1391 save[row + row_offset].l = 0;
1392 scr_blank_line (drawn[row], 0, ncol, ren); 1306 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1393 } 1307 }
1394} 1308}
1395 1309
1396#if ENABLE_FRILLS 1310#if ENABLE_FRILLS
1397void 1311void
1398rxvt_term::scr_erase_savelines () 1312rxvt_term::scr_erase_savelines ()
1399{ 1313{
1400 want_refresh = 1; 1314 want_refresh = 1;
1401 ZERO_SCROLLBACK (); 1315 ZERO_SCROLLBACK ();
1402 1316
1403 nscrolled = 0; 1317 nsaved = 0;
1404} 1318}
1405#endif 1319#endif
1406 1320
1407/* ------------------------------------------------------------------------- */ 1321/* ------------------------------------------------------------------------- */
1408/* 1322/*
… …
1410 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1324 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1411 */ 1325 */
1412void 1326void
1413rxvt_term::scr_E () 1327rxvt_term::scr_E ()
1414{ 1328{
1415 int i, j, k;
1416 rend_t *r1, fs; 1329 rend_t fs;
1417 1330
1418 want_refresh = 1; 1331 want_refresh = 1;
1419 ZERO_SCROLLBACK (); 1332 ZERO_SCROLLBACK ();
1420 1333
1421 num_scr_allow = 0; 1334 num_scr_allow = 0;
1422 selection_check (3); 1335 selection_check (3);
1423 1336
1424 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1337 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1425 for (k = saveLines, i = nrow; i--; k++) 1338 for (int row = nrow; row--; )
1426 { 1339 {
1427 line_t &line = save[k]; 1340 line_t &line = ROW(row);
1428 1341
1429 fill_text (line.t, 'E', ncol); 1342 fill_text (line.t, 'E', ncol);
1343 rend_t *r1 = line.r;
1430 1344
1431 for (r1 = line.r, j = ncol; j--; ) 1345 for (int j = ncol; j--; )
1432 *r1++ = fs; 1346 *r1++ = fs;
1433 1347
1434 line.l = ncol; /* make the `E's selectable */ 1348 line.l = ncol; /* make the `E's selectable */
1435 } 1349 }
1436} 1350}
… …
1460 count = end; 1374 count = end;
1461 } 1375 }
1462 1376
1463 scr_do_wrap (); 1377 scr_do_wrap ();
1464 1378
1465 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1379 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1466} 1380}
1467 1381
1468/* ------------------------------------------------------------------------- */ 1382/* ------------------------------------------------------------------------- */
1469/* 1383/*
1470 * Insert/Delete <count> characters from the current position 1384 * Insert/Delete <count> characters from the current position
… …
1482 return; 1396 return;
1483 1397
1484 scr_do_wrap (); 1398 scr_do_wrap ();
1485 1399
1486 selection_check (1); 1400 selection_check (1);
1487 MIN_IT (count, (ncol - screen.cur.col)); 1401 min_it (count, ncol - screen.cur.col);
1488 1402
1489 row = screen.cur.row + saveLines; 1403 row = screen.cur.row;
1490 1404
1491 line_t *line = save + row; 1405 line_t *line = &ROW(row);
1492 1406
1493 switch (insdel) 1407 switch (insdel)
1494 { 1408 {
1495 case INSERT: 1409 case INSERT:
1496 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1410 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
… …
1500 } 1414 }
1501 1415
1502 if (!line->is_longer ()) 1416 if (!line->is_longer ())
1503 { 1417 {
1504 line->l += count; 1418 line->l += count;
1505 MIN_IT (line->l, ncol); 1419 min_it (line->l, ncol);
1506 } 1420 }
1507 1421
1508 if (selection.op && current_screen == selection.screen 1422 if (selection.op && current_screen == selection.screen
1509 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1423 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1510 { 1424 {
… …
1517 selection.mark.col += count; /* XXX: yes? */ 1431 selection.mark.col += count; /* XXX: yes? */
1518 selection.end.col += count; 1432 selection.end.col += count;
1519 } 1433 }
1520 } 1434 }
1521 1435
1522 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1436 scr_blank_line (*line, screen.cur.col, count, rstyle);
1523 break; 1437 break;
1524 1438
1525 case ERASE: 1439 case ERASE:
1526 screen.cur.col += count; /* don't worry if > ncol */ 1440 screen.cur.col += count; /* don't worry if > ncol */
1527 selection_check (1); 1441 selection_check (1);
1528 screen.cur.col -= count; 1442 screen.cur.col -= count;
1529 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1443 scr_blank_line (*line, screen.cur.col, count, rstyle);
1530 break; 1444 break;
1531 1445
1532 case DELETE: 1446 case DELETE:
1533 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1447 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1534 1448
… …
1541 scr_blank_line (*line, ncol - count, count, tr); 1455 scr_blank_line (*line, ncol - count, count, tr);
1542 1456
1543 if (line->is_longer ()) /* break line continuation */ 1457 if (line->is_longer ()) /* break line continuation */
1544 line->l = ncol; 1458 line->l = ncol;
1545 1459
1546 line->l -= count; 1460 line->l = max (line->l - count, 0);
1547 MAX_IT (line->l, 0);
1548 1461
1549 if (selection.op && current_screen == selection.screen 1462 if (selection.op && current_screen == selection.screen
1550 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1463 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1551 { 1464 {
1552 if (selection.end.row != screen.cur.row 1465 if (selection.end.row != screen.cur.row
… …
1572 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1485 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1573 */ 1486 */
1574void 1487void
1575rxvt_term::scr_scroll_region (int top, int bot) 1488rxvt_term::scr_scroll_region (int top, int bot)
1576{ 1489{
1577 MAX_IT (top, 0); 1490 max_it (top, 0);
1578 MIN_IT (bot, (int)nrow - 1); 1491 min_it (bot, nrow - 1);
1579 1492
1580 if (top > bot) 1493 if (top > bot)
1581 return; 1494 return;
1582 1495
1583 screen.tscroll = top; 1496 screen.tscroll = top;
… …
1681 XGCValues gcvalue; 1594 XGCValues gcvalue;
1682 1595
1683 if (rvideo != mode) 1596 if (rvideo != mode)
1684 { 1597 {
1685 rvideo = mode; 1598 rvideo = mode;
1686 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1599 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687#if XPM_BACKGROUND 1600#if XPM_BACKGROUND
1688 if (bgPixmap.pixmap == None) 1601 if (bgPixmap.pixmap == None)
1689#endif 1602#endif
1690#if TRANSPARENT 1603#if TRANSPARENT
1691 if (! (options & Opt_transparent) || am_transparent == 0) 1604 if (! OPTION (Opt_transparent) || am_transparent == 0)
1692#endif 1605#endif
1693 XSetWindowBackground (display->display, vt, 1606 XSetWindowBackground (display->display, vt,
1694 pix_colors[Color_bg]); 1607 pix_colors[Color_bg]);
1695 1608
1696 gcvalue.foreground = pix_colors[Color_fg]; 1609 gcvalue.foreground = pix_colors[Color_fg];
… …
1787 bool found = false; 1700 bool found = false;
1788 1701
1789 for (int i = 0; i < nrow; i++) 1702 for (int i = 0; i < nrow; i++)
1790 { 1703 {
1791 int col = 0; 1704 int col = 0;
1792 rend_t *drp = drawn[i].r; 1705 rend_t *drp = drawn_buf[i].r;
1793 1706
1794 for (; col < ncol; col++, drp++) 1707 for (; col < ncol; col++, drp++)
1795 if ((*drp & mask) == value) 1708 if ((*drp & mask) == value)
1796 { 1709 {
1797 found = true; 1710 found = true;
… …
1815rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1728rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1816{ 1729{
1817 int i; 1730 int i;
1818 row_col_t rc[RC_COUNT]; 1731 row_col_t rc[RC_COUNT];
1819 1732
1820 if (!drawn) /* sanity check */ 1733 if (!drawn_buf) /* sanity check */
1821 return; 1734 return;
1822 1735
1823#ifndef NO_SLOW_LINK_SUPPORT 1736#ifndef NO_SLOW_LINK_SUPPORT
1824 if (refresh_type == FAST_REFRESH && !display->is_local) 1737 if (refresh_type == FAST_REFRESH && !display->is_local)
1825 { 1738 {
1826 y = 0; 1739 y = 0;
1827 eheight = height; 1740 eheight = height;
1828 } 1741 }
1829#endif
1830
1831#ifdef DEBUG_STRICT
1832 x = max (x, 0);
1833 x = min (x, (int)width);
1834 y = max (y, 0);
1835 y = min (y, (int)height);
1836#endif 1742#endif
1837 1743
1838 /* round down */ 1744 /* round down */
1839 rc[PART_BEG].col = Pixel2Col (x); 1745 rc[PART_BEG].col = Pixel2Col (x);
1840 rc[PART_BEG].row = Pixel2Row (y); 1746 rc[PART_BEG].row = Pixel2Row (y);
… …
1843 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1749 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1844 1750
1845 /* sanity checks */ 1751 /* sanity checks */
1846 for (i = PART_BEG; i < RC_COUNT; i++) 1752 for (i = PART_BEG; i < RC_COUNT; i++)
1847 { 1753 {
1848 MIN_IT (rc[i].col, ncol - 1); 1754 min_it (rc[i].col, ncol - 1);
1849 MIN_IT (rc[i].row, nrow - 1); 1755 min_it (rc[i].row, nrow - 1);
1850 } 1756 }
1851 1757
1852 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1758 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1853 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1759 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1854 1760
1855 if (refresh) 1761 if (refresh)
1856 scr_refresh (SLOW_REFRESH); 1762 scr_refresh (SLOW_REFRESH);
1857} 1763}
1858 1764
… …
1879 1785
1880 oldviewstart = view_start; 1786 oldviewstart = view_start;
1881 1787
1882 if (y < len) 1788 if (y < len)
1883 { 1789 {
1884 p = (nrow + nscrolled) * (len - y) / len; 1790 p = (nrow + nsaved) * (len - y) / len;
1885 p -= (long) (nrow - 1); 1791 p -= (long) (nrow - 1);
1886 p = max (p, 0); 1792 p = max (p, 0);
1887 } 1793 }
1888 1794
1889 view_start = (unsigned int)min (p, nscrolled); 1795 view_start = (unsigned int)min (p, nsaved);
1890 1796
1891 return scr_changeview (oldviewstart); 1797 return scr_changeview (oldviewstart);
1892} 1798}
1893 1799
1894/* ------------------------------------------------------------------------- */ 1800/* ------------------------------------------------------------------------- */
… …
1905 oldviewstart = view_start; 1811 oldviewstart = view_start;
1906 1812
1907 if (direction == UP) 1813 if (direction == UP)
1908 { 1814 {
1909 n = view_start + nlines; 1815 n = view_start + nlines;
1910 view_start = min (n, nscrolled); 1816 view_start = min (n, nsaved);
1911 } 1817 }
1912 else 1818 else
1913 { 1819 {
1914 n = view_start - nlines; 1820 n = view_start - nlines;
1915 view_start = max (n, 0); 1821 view_start = max (n, 0);
… …
1919} 1825}
1920 1826
1921int 1827int
1922rxvt_term::scr_changeview (unsigned int oldviewstart) 1828rxvt_term::scr_changeview (unsigned int oldviewstart)
1923{ 1829{
1830 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1831
1924 if (view_start != oldviewstart) 1832 if (view_start != oldviewstart)
1925 { 1833 {
1926 want_refresh = 1; 1834 want_refresh = 1;
1927 num_scr -= (view_start - oldviewstart); 1835 num_scr -= (view_start - oldviewstart);
1928 } 1836 }
… …
1936{ 1844{
1937#ifndef NO_BELL 1845#ifndef NO_BELL
1938 1846
1939# ifndef NO_MAPALERT 1847# ifndef NO_MAPALERT
1940# ifdef MAPALERT_OPTION 1848# ifdef MAPALERT_OPTION
1941 if (options & Opt_mapAlert) 1849 if (OPTION (Opt_mapAlert))
1942# endif 1850# endif
1943 XMapWindow (display->display, parent[0]); 1851 XMapWindow (display->display, parent[0]);
1944# endif 1852# endif
1945 1853
1946 if (options & Opt_visualBell) 1854 if (OPTION (Opt_visualBell))
1947 { 1855 {
1948 scr_rvideo_mode (!rvideo); /* refresh also done */ 1856 scr_rvideo_mode (!rvideo); /* refresh also done */
1949 rxvt_usleep (VISUAL_BELL_DURATION); 1857 rxvt_usleep (VISUAL_BELL_DURATION);
1950 scr_rvideo_mode (!rvideo); /* refresh also done */ 1858 scr_rvideo_mode (!rvideo); /* refresh also done */
1951 } 1859 }
… …
1959/* ARGSUSED */ 1867/* ARGSUSED */
1960void 1868void
1961rxvt_term::scr_printscreen (int fullhist) 1869rxvt_term::scr_printscreen (int fullhist)
1962{ 1870{
1963#ifdef PRINTPIPE 1871#ifdef PRINTPIPE
1964 int i, r1, nrows, row_offset; 1872 int nrows, row_start;
1965 FILE *fd; 1873 FILE *fd;
1966 1874
1967 if ((fd = popen_printer ()) == NULL) 1875 if ((fd = popen_printer ()) == NULL)
1968 return; 1876 return;
1969 1877
1970 nrows = nrow;
1971 row_offset = saveLines;
1972
1973 if (!fullhist) 1878 if (fullhist)
1974 row_offset -= view_start; 1879 {
1880 nrows = nrow + nsaved;
1881 row_start = -nsaved;
1882 }
1975 else 1883 else
1976 { 1884 {
1977 nrows += nscrolled; 1885 nrows = nrow;
1978 row_offset -= nscrolled; 1886 row_start = -view_start;
1979 } 1887 }
1980 1888
1981 wctomb (0, 0); 1889 wctomb (0, 0);
1982 1890
1983 for (r1 = 0; r1 < nrows; r1++) 1891 for (int r1 = 0; r1 < nrows; r1++)
1984 { 1892 {
1985 text_t *tp = save[r1 + row_offset].t; 1893 text_t *tp = ROW(r1).t;
1986 int len = save[r1 + row_offset].l; 1894 int len = ROW(r1).l;
1987 1895
1988 for (i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1896 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1989 { 1897 {
1990 char mb[MB_LEN_MAX]; 1898 char mb[MB_LEN_MAX];
1991 text_t t = *tp++; 1899 text_t t = *tp++;
1992 if (t == NOCHAR) 1900 if (t == NOCHAR)
1993 continue; 1901 continue;
… …
2021{ 1929{
2022 unsigned char must_clear, /* use draw_string not draw_image_string */ 1930 unsigned char must_clear, /* use draw_string not draw_image_string */
2023 showcursor; /* show the cursor */ 1931 showcursor; /* show the cursor */
2024 int16_t col, row, /* column/row we're processing */ 1932 int16_t col, row, /* column/row we're processing */
2025 ocrow; /* old cursor row */ 1933 ocrow; /* old cursor row */
2026 int i, /* tmp */ 1934 int i; /* tmp */
2027 row_offset; /* basic offset in screen structure */
2028#ifndef NO_CURSORCOLOR 1935#ifndef NO_CURSORCOLOR
2029 rend_t cc1; /* store colours at cursor position (s) */ 1936 rend_t cc1; /* store colours at cursor position (s) */
2030#endif 1937#endif
2031 rend_t *crp; // cursor rendition pointer 1938 rend_t *crp; // cursor rendition pointer
2032 1939
… …
2039 * A: set up vars 1946 * A: set up vars
2040 */ 1947 */
2041 must_clear = 0; 1948 must_clear = 0;
2042 refresh_count = 0; 1949 refresh_count = 0;
2043 1950
2044 row_offset = saveLines - view_start;
2045
2046#if XPM_BACKGROUND 1951#if XPM_BACKGROUND
2047 must_clear |= bgPixmap.pixmap != None; 1952 must_clear |= bgPixmap.pixmap != None;
2048#endif 1953#endif
2049#if TRANSPARENT 1954#if TRANSPARENT
2050 must_clear |= (options & Opt_transparent) && am_transparent; 1955 must_clear |= OPTION (Opt_transparent) && am_transparent;
2051#endif 1956#endif
2052 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1957 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2053 1958
2054 /* 1959 /*
2055 * B: reverse any characters which are selected 1960 * B: reverse any characters which are selected
2056 */ 1961 */
1962 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2057 scr_reverse_selection (); 1963 scr_reverse_selection ();
2058 1964
2059 /* 1965 /*
2060 * C: set the cursor character (s) 1966 * C: set the cursor character (s)
2061 */ 1967 */
… …
2072 1978
2073 if (showcursor) 1979 if (showcursor)
2074 { 1980 {
2075 int col = screen.cur.col; 1981 int col = screen.cur.col;
2076 1982
2077 while (col && screen.line[screen.cur.row]->t[col] == NOCHAR) 1983 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2078 col--; 1984 col--;
2079 1985
2080 crp = &screen.line[screen.cur.row]->r[col]; 1986 crp = &ROW(screen.cur.row).r[col];
2081 1987
2082 if (showcursor && focus) 1988 if (showcursor && focus)
2083 { 1989 {
2084 if (options & Opt_cursorUnderline) 1990 if (OPTION (Opt_cursorUnderline))
2085 *crp ^= RS_Uline; 1991 *crp ^= RS_Uline;
2086 else 1992 else
2087 { 1993 {
2088 *crp ^= RS_RVid; 1994 *crp ^= RS_RVid;
2089 1995
… …
2091 cc1 = *crp & (RS_fgMask | RS_bgMask); 1997 cc1 = *crp & (RS_fgMask | RS_bgMask);
2092 if (ISSET_PIXCOLOR (Color_cursor)) 1998 if (ISSET_PIXCOLOR (Color_cursor))
2093 ccol1 = Color_cursor; 1999 ccol1 = Color_cursor;
2094 else 2000 else
2095#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2001#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2096 ccol1 = GET_FGCOLOR (rstyle); 2002 ccol1 = fgcolor_of (rstyle);
2097#else 2003#else
2098 ccol1 = Color_fg; 2004 ccol1 = Color_fg;
2099#endif 2005#endif
2100 if (ISSET_PIXCOLOR (Color_cursor2)) 2006 if (ISSET_PIXCOLOR (Color_cursor2))
2101 ccol2 = Color_cursor2; 2007 ccol2 = Color_cursor2;
2102 else 2008 else
2103#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2009#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2104 ccol2 = GET_BGCOLOR (rstyle); 2010 ccol2 = bgcolor_of (rstyle);
2105#else 2011#else
2106 ccol2 = Color_bg; 2012 ccol2 = Color_bg;
2107#endif 2013#endif
2108 *crp = SET_FGCOLOR (*crp, ccol1); 2014 *crp = SET_FGCOLOR (*crp, ccol1);
2109 *crp = SET_BGCOLOR (*crp, ccol2); 2015 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2119 if (screen.cur.row + view_start != ocrow 2025 if (screen.cur.row + view_start != ocrow
2120 || screen.cur.col != oldcursor.col) 2026 || screen.cur.col != oldcursor.col)
2121 { 2027 {
2122 if (ocrow < nrow 2028 if (ocrow < nrow
2123 && oldcursor.col < ncol) 2029 && oldcursor.col < ncol)
2124 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2030 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2125 2031
2126 if (focus || !showcursor) 2032 if (focus || !showcursor)
2127 oldcursor.row = -1; 2033 oldcursor.row = -1;
2128 else 2034 else
2129 setoldcursor = 1; 2035 setoldcursor = 1;
… …
2153 * D: CopyArea pass - very useful for slower links 2059 * D: CopyArea pass - very useful for slower links
2154 * This has been deliberately kept simple. 2060 * This has been deliberately kept simple.
2155 */ 2061 */
2156 i = num_scr; 2062 i = num_scr;
2157 if (!display->is_local 2063 if (!display->is_local
2158 && refresh_type == FAST_REFRESH && num_scr_allow && i 2064 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2159 && abs (i) < nrow && !must_clear) 2065 && abs (num_scr) < nrow && !must_clear)
2160 { 2066 {
2161 int16_t nits; 2067 int16_t nits;
2162 int j; 2068 int j;
2163 int len, wlen; 2069 int len, wlen;
2164 2070
… …
2167 row = i > 0 ? 0 : j - 1; 2073 row = i > 0 ? 0 : j - 1;
2168 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2074 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2169 { 2075 {
2170 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2076 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2171 { 2077 {
2172 line_t s = save[row + row_offset]; 2078 line_t s = ROW(row - view_start);
2173 line_t d = drawn[row]; 2079 line_t d = drawn_buf[row];
2174 line_t d2 = drawn[row + i]; 2080 line_t d2 = drawn_buf[row + i];
2175 2081
2176 for (nits = 0, col = ncol; col--; ) 2082 for (nits = 0, col = ncol; col--; )
2177 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2083 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2178 nits--; 2084 nits--;
2179 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2085 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2197 2103
2198 if (len != -1) 2104 if (len != -1)
2199 { 2105 {
2200 /* also comes here at end if needed because of >= above */ 2106 /* also comes here at end if needed because of >= above */
2201 if (wlen < len) 2107 if (wlen < len)
2202 SWAP_IT (wlen, len, int); 2108 ::swap (wlen, len);
2203 2109
2204 XCopyArea (display->display, vt, vt, 2110 XCopyArea (display->display, vt, vt,
2205 gc, 0, Row2Pixel (len + i), 2111 gc, 0, Row2Pixel (len + i),
2206 (unsigned int)TermWin_TotalWidth (), 2112 (unsigned int)TermWin_TotalWidth (),
2207 (unsigned int)Height2Pixel (wlen - len + 1), 2113 (unsigned int)Height2Pixel (wlen - len + 1),
… …
2215 /* 2121 /*
2216 * E: main pass across every character 2122 * E: main pass across every character
2217 */ 2123 */
2218 for (row = 0; row < nrow; row++) 2124 for (row = 0; row < nrow; row++)
2219 { 2125 {
2220 text_t *stp = save[row + row_offset].t; 2126 text_t *stp = ROW(row - view_start).t;
2221 rend_t *srp = save[row + row_offset].r; 2127 rend_t *srp = ROW(row - view_start).r;
2222 text_t *dtp = drawn[row].t; 2128 text_t *dtp = drawn_buf[row].t;
2223 rend_t *drp = drawn[row].r; 2129 rend_t *drp = drawn_buf[row].r;
2224 2130
2225 /* 2131 /*
2226 * E2: OK, now the real pass 2132 * E2: OK, now the real pass
2227 */ 2133 */
2228 int ypixel = (int)Row2Pixel (row); 2134 int ypixel = (int)Row2Pixel (row);
… …
2290 count++, i--; 2196 count++, i--;
2291 2197
2292 /* 2198 /*
2293 * Determine the attributes for the string 2199 * Determine the attributes for the string
2294 */ 2200 */
2295 int fore = GET_FGCOLOR (rend); // desired foreground 2201 int fore = fgcolor_of (rend); // desired foreground
2296 int back = GET_BGCOLOR (rend); // desired background 2202 int back = bgcolor_of (rend); // desired background
2297 2203
2298 // only do special processing if any attributes are set, which is rare 2204 // only do special processing if any attributes are set, which is unlikely
2299 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2205 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2300 { 2206 {
2301#if ENABLE_STYLES 2207#if ENABLE_STYLES
2302 // force redraw after "careful" characters to avoid pixel droppings 2208 // force redraw after "careful" characters to avoid pixel droppings
2303 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2209 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2339 fore = Color_UL; 2245 fore = Color_UL;
2340#endif 2246#endif
2341 2247
2342 if (invert) 2248 if (invert)
2343 { 2249 {
2344 SWAP_IT (fore, back, int); 2250 ::swap (fore, back);
2345 2251
2346#ifndef NO_BOLD_UNDERLINE_REVERSE 2252#ifndef NO_BOLD_UNDERLINE_REVERSE
2347 if (ISSET_PIXCOLOR (Color_RV)) 2253 if (ISSET_PIXCOLOR (Color_RV))
2348 back = Color_RV; 2254 back = Color_RV;
2349 2255
… …
2422 */ 2328 */
2423 if (showcursor) 2329 if (showcursor)
2424 { 2330 {
2425 if (focus) 2331 if (focus)
2426 { 2332 {
2427 if (options & Opt_cursorUnderline) 2333 if (OPTION (Opt_cursorUnderline))
2428 *crp ^= RS_Uline; 2334 *crp ^= RS_Uline;
2429 else 2335 else
2430 { 2336 {
2431 *crp ^= RS_RVid; 2337 *crp ^= RS_RVid;
2432#ifndef NO_CURSORCOLOR 2338#ifndef NO_CURSORCOLOR
… …
2437 else if (oldcursor.row >= 0) 2343 else if (oldcursor.row >= 0)
2438 { 2344 {
2439 int cursorwidth = 1; 2345 int cursorwidth = 1;
2440 int col = oldcursor.col; 2346 int col = oldcursor.col;
2441 2347
2442 while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR) 2348 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2443 col--; 2349 col--;
2444 2350
2445 while (col + cursorwidth < ncol 2351 while (col + cursorwidth < ncol
2446 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2352 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2447 cursorwidth++; 2353 cursorwidth++;
2448 2354
2449#ifndef NO_CURSORCOLOR 2355#ifndef NO_CURSORCOLOR
2450 if (ISSET_PIXCOLOR (Color_cursor)) 2356 if (ISSET_PIXCOLOR (Color_cursor))
2451 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2357 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2461 2367
2462 /* 2368 /*
2463 * H: cleanup selection 2369 * H: cleanup selection
2464 */ 2370 */
2465 scr_reverse_selection (); 2371 scr_reverse_selection ();
2372 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2466 2373
2467 if (refresh_type & SMOOTH_REFRESH) 2374 if (refresh_type & SMOOTH_REFRESH)
2468 XFlush (display->display); 2375 XFlush (display->display);
2469 2376
2470 num_scr = 0; 2377 num_scr = 0;
… …
2482} 2389}
2483 2390
2484void 2391void
2485rxvt_term::scr_remap_chars () 2392rxvt_term::scr_remap_chars ()
2486{ 2393{
2487 for (int i = nrow + saveLines; i--; ) 2394 for (int i = total_rows; i--; )
2488 scr_remap_chars (save[i]); 2395 scr_remap_chars (row_buf [i]);
2489 2396
2490 for (int i = nrow; i--; ) 2397 for (int i = nrow; i--; )
2491 { 2398 {
2492 scr_remap_chars (drawn[i]); 2399 scr_remap_chars (drawn_buf [i]);
2493 scr_remap_chars (swap_save[i]); 2400 scr_remap_chars (swap_buf [i]);
2494 } 2401 }
2495} 2402}
2496 2403
2497void 2404void
2498rxvt_term::scr_recolour () 2405rxvt_term::scr_recolour ()
… …
2540 2447
2541/* ------------------------------------------------------------------------- */ 2448/* ------------------------------------------------------------------------- */
2542void 2449void
2543rxvt_term::scr_reverse_selection () 2450rxvt_term::scr_reverse_selection ()
2544{ 2451{
2452 if (selection.op
2545 if (selection.op && current_screen == selection.screen) 2453 && current_screen == selection.screen
2454 && selection.end.row >= -view_start)
2546 { 2455 {
2547 int end_row = saveLines - view_start; 2456 int view_end = -view_start + nrow;
2548 int i = selection.beg.row + saveLines; 2457 int row, col;
2549 int col, row = selection.end.row + saveLines;
2550 rend_t *srp;
2551 2458
2552#if ENABLE_FRILLS 2459#if ENABLE_FRILLS
2553 if (selection.rect) 2460 if (selection.rect)
2554 { 2461 {
2555 end_row += nrow; 2462 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2463 {
2464 text_t *stp = ROW(row).t;
2465 rend_t *srp = ROW(row).r;
2556 2466
2557 for (; i <= row && i <= end_row; i++)
2558 for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++) 2467 for (col = selection.beg.col; col < selection.end.col; col++)
2559 srp[col] ^= RS_RVid; 2468 srp[col] ^= RS_RVid;
2469
2470 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2471 srp[col] ^= RS_RVid | RS_Uline;
2472
2473 if (++col < selection.end.col)
2474 srp[col] ^= RS_RVid | RS_Uline;
2475 }
2560 } 2476 }
2561 else 2477 else
2562#endif 2478#endif
2563 { 2479 {
2564 if (i >= end_row) 2480 if (selection.beg.row >= -view_start)
2481 {
2565 col = selection.beg.col; 2482 col = selection.beg.col;
2483 row = selection.beg.row;
2484 }
2566 else 2485 else
2567 { 2486 {
2568 col = 0; 2487 col = 0;
2569 i = end_row; 2488 row = -view_start;
2570 } 2489 }
2571 2490
2572 end_row += nrow; 2491 for (; row < min (selection.end.row, view_end); row++, col = 0)
2573
2574 for (; i < row && i < end_row; i++, col = 0)
2575 for (srp = save[i].r; col < ncol; col++) 2492 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2576 srp[col] ^= RS_RVid; 2493 srp[col] ^= RS_RVid;
2577 2494
2578 if (i == row && i < end_row) 2495 if (row == selection.end.row)
2579 for (srp = save[i].r; col < selection.end.col; col++) 2496 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2580 srp[col] ^= RS_RVid; 2497 srp[col] ^= RS_RVid;
2581 } 2498 }
2582 } 2499 }
2583} 2500}
2584 2501
… …
2593{ 2510{
2594 int row, wrote; 2511 int row, wrote;
2595 unsigned int width, towrite; 2512 unsigned int width, towrite;
2596 char r1[] = "\n"; 2513 char r1[] = "\n";
2597 2514
2598 for (row = saveLines - nscrolled; 2515 for (row = saveLines - nsaved;
2599 row < saveLines + nrow - 1; row++) 2516 row < saveLines + nrow - 1; row++)
2600 { 2517 {
2601 width = save[row].l >= 0 ? save[row].l 2518 width = row_buf[row].l >= 0 ? row_buf[row].l
2602 : ncol; 2519 : ncol;
2603 for (towrite = width; towrite; towrite -= wrote) 2520 for (towrite = width; towrite; towrite -= wrote)
2604 { 2521 {
2605 wrote = write (fd, & (save[row].t[width - towrite]), 2522 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2606 towrite); 2523 towrite);
2607 if (wrote < 0) 2524 if (wrote < 0)
2608 return; /* XXX: death, no report */ 2525 return; /* XXX: death, no report */
2609 } 2526 }
2610 if (save[row].l >= 0) 2527 if (row_buf[row].l >= 0)
2611 if (write (fd, r1, 1) <= 0) 2528 if (write (fd, r1, 1) <= 0)
2612 return; /* XXX: death, no report */ 2529 return; /* XXX: death, no report */
2613 } 2530 }
2614} 2531}
2615#endif 2532#endif
2616 2533
2617/* ------------------------------------------------------------------------- * 2534/* ------------------------------------------------------------------------- *
2618 * CHARACTER SELECTION * 2535 * CHARACTER SELECTION *
2619 * ------------------------------------------------------------------------- */ 2536 * ------------------------------------------------------------------------- */
2620
2621/*
2622 * -nscrolled <= (selection row) <= nrow - 1
2623 */
2624void 2537void
2625rxvt_term::selection_check (int check_more) 2538rxvt_term::selection_check (int check_more)
2626{ 2539{
2627 row_col_t pos; 2540 row_col_t pos;
2628 2541
2629 if (!selection.op) 2542 if (!selection.op)
2630 return; 2543 return;
2631 2544
2632 pos.row = pos.col = 0; 2545 pos.row = pos.col = 0;
2633 if ((selection.beg.row < - (int32_t)nscrolled) 2546 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2634 || (selection.beg.row >= nrow) 2547 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2635 || (selection.mark.row < - (int32_t)nscrolled) 2548 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2636 || (selection.mark.row >= nrow)
2637 || (selection.end.row < - (int32_t)nscrolled)
2638 || (selection.end.row >= nrow)
2639 || (check_more == 1 2549 || (check_more == 1
2640 && current_screen == selection.screen 2550 && current_screen == selection.screen
2641 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2551 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2642 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2552 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2643 || (check_more == 2 2553 || (check_more == 2
… …
2949 * EXT: button 1 or 3 release 2859 * EXT: button 1 or 3 release
2950 */ 2860 */
2951void 2861void
2952rxvt_term::selection_make (Time tm) 2862rxvt_term::selection_make (Time tm)
2953{ 2863{
2954 int i, col, end_col, row, end_row; 2864 int i;
2955 wchar_t *new_selection_text; 2865 wchar_t *new_selection_text;
2956 text_t *t; 2866 text_t *t;
2957 2867
2958 switch (selection.op) 2868 switch (selection.op)
2959 { 2869 {
… …
2972 selection.op = SELECTION_DONE; 2882 selection.op = SELECTION_DONE;
2973 2883
2974 if (selection.clicks == 4) 2884 if (selection.clicks == 4)
2975 return; /* nothing selected, go away */ 2885 return; /* nothing selected, go away */
2976 2886
2887 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2888 return;
2889
2977 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2890 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2978 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2891 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2979 2892
2980 col = selection.beg.col;
2981 row = selection.beg.row + saveLines;
2982 end_row = selection.end.row + saveLines;
2983 int ofs = 0; 2893 int ofs = 0;
2984 int extra = 0; 2894 int extra = 0;
2985 2895
2896 int col = selection.beg.col;
2897 int row = selection.beg.row;
2898
2899 int end_col;
2900
2986 for (; row <= end_row; row++, col = 0) 2901 for (; row <= selection.end.row; row++, col = 0)
2987 { 2902 {
2988#if ENABLE_FRILLS 2903#if ENABLE_FRILLS
2989 if (selection.rect) 2904 if (selection.rect)
2990 { 2905 {
2991 col = selection.beg.col; 2906 col = selection.beg.col;
2992 end_col = ncol + 1; 2907 end_col = ncol + 1;
2993 } 2908 }
2994 else 2909 else
2995#endif 2910#endif
2996 end_col = save[row].is_longer () ? ncol : save[row].l; //TODO//FIXME//LEN 2911 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2997 2912
2998 MAX_IT (col, 0); 2913 col = max (col, 0);
2999 2914
3000 if (row == end_row || selection.rect) 2915 if (row == selection.end.row
2916#if ENABLE_FRILLS
2917 || selection.rect
2918#endif
2919 )
3001 MIN_IT (end_col, selection.end.col); 2920 min_it (end_col, selection.end.col);
3002 2921
3003 t = save[row].t + col; 2922 t = ROW(row).t + col;
3004 for (; col < end_col; col++) 2923 for (; col < end_col; col++)
3005 { 2924 {
3006 if (*t == NOCHAR) 2925 if (*t == NOCHAR)
3007 t++; 2926 t++;
3008#if ENABLE_COMBINING 2927#if ENABLE_COMBINING
… …
3024#endif 2943#endif
3025 else 2944 else
3026 new_selection_text[ofs++] = *t++; 2945 new_selection_text[ofs++] = *t++;
3027 } 2946 }
3028 2947
3029 if (!save[row].is_longer () && row != end_row) 2948#if ENABLE_FRILLS
2949 if (selection.rect)
2950 {
2951 while (ofs
2952 && new_selection_text[ofs - 1] != C0_LF
2953 && unicode::is_space (new_selection_text[ofs - 1]))
2954 --ofs;
2955
3030 new_selection_text[ofs++] = C0_LF; 2956 new_selection_text[ofs++] = C0_LF;
2957 }
2958 else
2959#endif
2960 if (!ROW(row).is_longer () && row != selection.end.row)
2961 new_selection_text[ofs++] = C0_LF;
3031 } 2962 }
3032 2963
3033 if (end_col != selection.end.col) 2964 if (end_col != selection.end.col)
3034 new_selection_text[ofs++] = C0_LF; 2965 new_selection_text[ofs++] = C0_LF;
3035 2966
… …
3045 2976
3046 // 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
3047 selection.len = ofs; 2978 selection.len = ofs;
3048 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));
3049 2980
2981 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2982 return;
2983
2984 selection_grab (tm);
2985}
2986
2987bool
2988rxvt_term::selection_grab (Time tm)
2989{
2990 selection_time = tm;
2991
3050 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 2992 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3051 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 2993 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
2994 {
3052 display->set_selection_owner (this); 2995 display->set_selection_owner (this);
2996 return true;
2997 }
3053 else 2998 else
3054 rxvt_warn ("can't get primary selection, ignoring.\n"); 2999 return false;
3055 3000
3056#if 0 3001#if 0
3057 XTextProperty ct; 3002 XTextProperty ct;
3058 3003
3059 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3004 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3060 { 3005 {
3061 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3006 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3062 XFree (ct.value); 3007 XFree (ct.value);
3063 } 3008 }
3064#endif 3009#endif
3065
3066 selection_time = tm;
3067} 3010}
3068 3011
3069/* ------------------------------------------------------------------------- */ 3012/* ------------------------------------------------------------------------- */
3070/* 3013/*
3071 * Mark or select text based upon number of clicks: 1, 2, or 3 3014 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3093 */ 3036 */
3094void 3037void
3095rxvt_term::selection_start_colrow (int col, int row) 3038rxvt_term::selection_start_colrow (int col, int row)
3096{ 3039{
3097 want_refresh = 1; 3040 want_refresh = 1;
3041
3042 selection.mark.row = row - view_start;
3098 selection.mark.col = col; 3043 selection.mark.col = col;
3099 selection.mark.row = row - view_start;
3100 3044
3101 MAX_IT (selection.mark.row, - (int32_t)nscrolled); 3045 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3102 MIN_IT (selection.mark.row, (int32_t)nrow - 1); 3046 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3103 MAX_IT (selection.mark.col, 0);
3104 MIN_IT (selection.mark.col, (int32_t)ncol - 1);
3105 3047
3106 while (selection.mark.col > 0 3048 while (selection.mark.col > 0
3107 && save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR) 3049 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3108 --selection.mark.col; 3050 --selection.mark.col;
3109 3051
3110 if (selection.op) 3052 if (selection.op)
3111 { /* clear the old selection */ 3053 { /* clear the old selection */
3112 selection.beg.row = selection.end.row = selection.mark.row; 3054 selection.beg.row = selection.end.row = selection.mark.row;
… …
3136 text_t *stp; 3078 text_t *stp;
3137 rend_t *srp; 3079 rend_t *srp;
3138 3080
3139 if (dirn == UP) 3081 if (dirn == UP)
3140 { 3082 {
3141 bound.row = saveLines - nscrolled - 1; 3083 bound.row = - nsaved - 1;
3142 bound.col = 0; 3084 bound.col = 0;
3143 dirnadd = -1; 3085 dirnadd = -1;
3144 } 3086 }
3145 else 3087 else
3146 { 3088 {
3147 bound.row = saveLines + nrow; 3089 bound.row = nrow;
3148 bound.col = ncol - 1; 3090 bound.col = ncol - 1;
3149 dirnadd = 1; 3091 dirnadd = 1;
3150 } 3092 }
3151 3093
3152 row = mark->row + saveLines; 3094 row = mark->row;
3153 col = mark->col; 3095 col = max (mark->col, 0);
3154 MAX_IT (col, 0); 3096
3155 /* find the edge of a word */ 3097 /* find the edge of a word */
3156 stp = save[row].t + col; w1 = DELIMIT_TEXT (*stp); 3098 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3157 srp = save[row].r + col; w2 = DELIMIT_REND (*srp); 3099 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3158 3100
3159 for (;;) 3101 for (;;)
3160 { 3102 {
3161 for (; col != bound.col; col += dirnadd) 3103 for (; col != bound.col; col += dirnadd)
3162 { 3104 {
… …
3172 break; 3114 break;
3173 } 3115 }
3174 3116
3175 if ((col == bound.col) && (row != bound.row)) 3117 if ((col == bound.col) && (row != bound.row))
3176 { 3118 {
3177 if (save[ (row - (dirn == UP ? 1 : 0))].is_longer ()) 3119 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3178 { 3120 {
3179 trow = row + dirnadd; 3121 trow = row + dirnadd;
3180 tcol = dirn == UP ? ncol - 1 : 0; 3122 tcol = dirn == UP ? ncol - 1 : 0;
3181 3123
3182 if (!save[trow].t) 3124 if (!ROW(trow).t)
3183 break; 3125 break;
3184 3126
3185 stp = save[trow].t + tcol; 3127 stp = ROW(trow).t + tcol;
3186 srp = save[trow].r + tcol; 3128 srp = ROW(trow).r + tcol;
3187 3129
3188 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3130 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3189 break; 3131 break;
3190 3132
3191 row = trow; 3133 row = trow;
… …
3199Old_Word_Selection_You_Die: 3141Old_Word_Selection_You_Die:
3200 if (dirn == DN) 3142 if (dirn == DN)
3201 col++; /* put us on one past the end */ 3143 col++; /* put us on one past the end */
3202 3144
3203 /* Poke the values back in */ 3145 /* Poke the values back in */
3204 ret->row = row - saveLines; 3146 ret->row = row;
3205 ret->col = col; 3147 ret->col = col;
3206} 3148}
3207 3149
3208/* ------------------------------------------------------------------------- */ 3150/* ------------------------------------------------------------------------- */
3209/* 3151/*
… …
3214 * flag == 2 ==> button 3 motion 3156 * flag == 2 ==> button 3 motion
3215 */ 3157 */
3216void 3158void
3217rxvt_term::selection_extend (int x, int y, int flag) 3159rxvt_term::selection_extend (int x, int y, int flag)
3218{ 3160{
3219 int col, row; 3161 int col = clamp (Pixel2Col (x), 0, ncol);
3220 3162 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3221 col = Pixel2Col (x);
3222 row = Pixel2Row (y);
3223 MAX_IT (row, 0);
3224 MIN_IT (row, (int)nrow - 1);
3225 MAX_IT (col, 0);
3226 MIN_IT (col, (int)ncol);
3227 3163
3228 /* 3164 /*
3229 * If we're selecting characters (single click) then we must check first 3165 * If we're selecting characters (single click) then we must check first
3230 * if we are at the same place as the original mark. If we are then 3166 * if we are at the same place as the original mark. If we are then
3231 * select nothing. Otherwise, if we're to the right of the mark, you have to 3167 * select nothing. Otherwise, if we're to the right of the mark, you have to
… …
3296 selection.beg.col = selection.end.col = selection.mark.col; 3232 selection.beg.col = selection.end.col = selection.mark.col;
3297 selection.beg.row = selection.end.row = selection.mark.row; 3233 selection.beg.row = selection.end.row = selection.mark.row;
3298 } 3234 }
3299 3235
3300 pos.col = col; 3236 pos.col = col;
3301 pos.row = row; 3237 pos.row = row - view_start;
3302
3303 pos.row -= view_start; /* adjust for scroll */
3304 3238
3305 /* 3239 /*
3306 * This is mainly xterm style selection with a couple of differences, mainly 3240 * This is mainly xterm style selection with a couple of differences, mainly
3307 * in the way button3 drag extension works. 3241 * in the way button3 drag extension works.
3308 * We're either doing: button1 drag; button3 press; or button3 drag 3242 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3367 } 3301 }
3368 } 3302 }
3369 3303
3370 if (selection.clicks == 1) 3304 if (selection.clicks == 1)
3371 { 3305 {
3372 if (selection.beg.col > save[selection.beg.row + saveLines].l //TODO//FIXME//LEN 3306 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3373 && !save[selection.beg.row + saveLines].is_longer () 3307 && !ROW(selection.beg.row).is_longer ()
3374#if ENABLE_FRILLS 3308#if ENABLE_FRILLS
3375 && !selection.rect 3309 && !selection.rect
3376#endif 3310#endif
3377 ) 3311 )
3378 selection.beg.col = ncol; 3312 selection.beg.col = ncol;
3379 3313
3380 if ( 3314 if (
3381 selection.end.col > save[selection.end.row + saveLines].l //TODO//FIXME//LEN 3315 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3382 && !save[selection.end.row + saveLines].is_longer () 3316 && !ROW(selection.end.row).is_longer ()
3383#if ENABLE_FRILLS 3317#if ENABLE_FRILLS
3384 && !selection.rect 3318 && !selection.rect
3385#endif 3319#endif
3386 ) 3320 )
3387 selection.end.col = ncol; 3321 selection.end.col = ncol;
… …
3395 selection_delimit_word (DN, &selection.end, &selection.end); 3329 selection_delimit_word (DN, &selection.end, &selection.end);
3396 } 3330 }
3397 else if (selection.clicks == 3) 3331 else if (selection.clicks == 3)
3398 { 3332 {
3399#if ENABLE_FRILLS 3333#if ENABLE_FRILLS
3400 if (options & Opt_tripleclickwords) 3334 if (OPTION (Opt_tripleclickwords))
3401 { 3335 {
3402 selection_delimit_word (UP, &selection.beg, &selection.beg); 3336 selection_delimit_word (UP, &selection.beg, &selection.beg);
3403 3337
3404 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3338 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3405 { 3339 {
3406 if (!save[end_row + saveLines].is_longer ()) 3340 if (!ROW(end_row).is_longer ())
3407 { 3341 {
3408 selection.end.row = end_row; 3342 selection.end.row = end_row;
3409 selection.end.col = save[end_row + saveLines].l; 3343 selection.end.col = ROW(end_row).l;
3410 selection_remove_trailing_spaces (); 3344 selection_remove_trailing_spaces ();
3411 break; 3345 break;
3412 } 3346 }
3413 } 3347 }
3414 } 3348 }
… …
3421 selection.beg.col = 0; 3355 selection.beg.col = 0;
3422 selection.end.col = ncol; 3356 selection.end.col = ncol;
3423 3357
3424 // select a complete logical line 3358 // select a complete logical line
3425 while (selection.beg.row > -saveLines 3359 while (selection.beg.row > -saveLines
3426 && save[selection.beg.row - 1 + saveLines].is_longer ()) 3360 && ROW(selection.beg.row - 1).is_longer ())
3427 selection.beg.row--; 3361 selection.beg.row--;
3428 3362
3429 while (selection.end.row < nrow 3363 while (selection.end.row < nrow
3430 && save[selection.end.row + saveLines].is_longer ()) 3364 && ROW(selection.end.row).is_longer ())
3431 selection.end.row++; 3365 selection.end.row++;
3432 } 3366 }
3433 } 3367 }
3434 3368
3435 if (button3 && buttonpress) 3369 if (button3 && buttonpress)
… …
3446 } 3380 }
3447 } 3381 }
3448 3382
3449#if ENABLE_FRILLS 3383#if ENABLE_FRILLS
3450 if (selection.rect && selection.beg.col > selection.end.col) 3384 if (selection.rect && selection.beg.col > selection.end.col)
3451 SWAP_IT (selection.beg.col, selection.end.col, int); 3385 ::swap (selection.beg.col, selection.end.col);
3452#endif 3386#endif
3453} 3387}
3454 3388
3455#if ENABLE_FRILLS 3389#if ENABLE_FRILLS
3456void 3390void
… …
3460 text_t *stp; 3394 text_t *stp;
3461 3395
3462 end_col = selection.end.col; 3396 end_col = selection.end.col;
3463 end_row = selection.end.row; 3397 end_row = selection.end.row;
3464 3398
3465 for ( ; end_row >= selection.beg.row; ) 3399 for (; end_row >= selection.beg.row; )
3466 { 3400 {
3467 stp = save[end_row + saveLines].t; 3401 stp = ROW(end_row).t;
3468 3402
3469 while (--end_col >= 0) 3403 while (--end_col >= 0)
3470 { 3404 {
3471 if (stp[end_col] != ' ' 3405 if (stp[end_col] != NOCHAR
3472 && stp[end_col] != '\t' 3406 && !unicode::is_space (stp[end_col]))
3473 && stp[end_col] != NOCHAR)
3474 break; 3407 break;
3475 } 3408 }
3476 3409
3477 if (end_col >= 0 3410 if (end_col >= 0
3478 || !save[end_row - 1 + saveLines].is_longer ()) 3411 || !ROW(end_row - 1).is_longer ())
3479 { 3412 {
3480 selection.end.col = end_col + 1; 3413 selection.end.col = end_col + 1;
3481 selection.end.row = end_row; 3414 selection.end.row = end_row;
3482 break; 3415 break;
3483 } 3416 }
… …
3654 */ 3587 */
3655void 3588void
3656rxvt_term::pixel_position (int *x, int *y) 3589rxvt_term::pixel_position (int *x, int *y)
3657{ 3590{
3658 *x = Pixel2Col (*x); 3591 *x = Pixel2Col (*x);
3659 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3592 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3660 *y = Pixel2Row (*y); 3593 *y = Pixel2Row (*y);
3661 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3594 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3662} 3595}
3663 3596
3664/* ------------------------------------------------------------------------- */ 3597/* ------------------------------------------------------------------------- */
3665#ifdef USE_XIM 3598#ifdef USE_XIM
3666void 3599void
… …
3677 3610
3678#if ENABLE_OVERLAY 3611#if ENABLE_OVERLAY
3679void 3612void
3680rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3613rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3681{ 3614{
3682 if (nrow < 3 || ncol < 3) 3615 if (nrow < 1 || ncol < 1)
3683 return; 3616 return;
3684 3617
3685 want_refresh = 1; 3618 want_refresh = 1;
3686 3619
3687 scr_overlay_off (); 3620 scr_overlay_off ();
3688 3621
3689 if (x < 0) x = ncol - w; 3622 if (x < 0) x = ncol - w;
3690 if (y < 0) y = nrow - h; 3623 if (y < 0) y = nrow - h;
3691 3624
3692 // make space for border 3625 // make space for border
3693 w += 2; MIN_IT (w, ncol); 3626 w += 2; min_it (w, ncol);
3694 h += 2; MIN_IT (h, nrow); 3627 h += 2; min_it (h, nrow);
3695 3628
3696 x -= 1; MAX_IT (x, 0); 3629 x -= 1; clamp_it (x, 0, ncol - w);
3697 y -= 1; MAX_IT (y, 0); 3630 y -= 1; clamp_it (y, 0, nrow - h);
3698
3699 MIN_IT (x, ncol - w);
3700 MIN_IT (y, nrow - h);
3701 3631
3702 ov_x = x; ov_y = y; 3632 ov_x = x; ov_y = y;
3703 ov_w = w; ov_h = h; 3633 ov_w = w; ov_h = h;
3704 3634
3705 ov_text = new text_t *[h]; 3635 ov_text = new text_t *[h];
… …
3791rxvt_term::scr_swap_overlay () 3721rxvt_term::scr_swap_overlay ()
3792{ 3722{
3793 if (!ov_text) 3723 if (!ov_text)
3794 return; 3724 return;
3795 3725
3796 int row_offset = ov_y + saveLines - view_start;
3797
3798 // swap screen mem with overlay 3726 // swap screen mem with overlay
3799 for (int y = ov_h; y--; ) 3727 for (int y = ov_h; y--; )
3800 { 3728 {
3801 text_t *t1 = ov_text[y]; 3729 text_t *t1 = ov_text[y];
3802 rend_t *r1 = ov_rend[y]; 3730 rend_t *r1 = ov_rend[y];
3803 3731
3804 text_t *t2 = save[y + row_offset].t + ov_x; 3732 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3805 rend_t *r2 = save[y + row_offset].r + ov_x; 3733 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3806 3734
3807 for (int x = ov_w; x--; ) 3735 for (int x = ov_w; x--; )
3808 { 3736 {
3809 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3737 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3810 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3738 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3812 } 3740 }
3813} 3741}
3814 3742
3815#endif 3743#endif
3816/* ------------------------------------------------------------------------- */ 3744/* ------------------------------------------------------------------------- */
3745

Diff Legend

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