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.173 by root, Mon Dec 19 02:16:24 2005 UTC vs.
Revision 1.209 by root, Thu Jan 5 01:04:10 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] = -1;
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;
727
785 if ((nlines > 0) 728 if (nlines > 0
786 && (screen.tscroll == 0) 729 && screen.tscroll == 0
787 && (screen.bscroll == (nrow - 1))) 730 && screen.bscroll == (nrow - 1))
788 { 731 {
789 /* _at least_ this many lines need to be scrolled */ 732 /* _at least_ this many lines need to be scrolled */
790 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 733 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
791 screen.cur.row -= nlines; 734 screen.cur.row -= nlines;
792 } 735 }
793 } 736 }
794 737
795#ifdef DEBUG_STRICT 738#ifdef DEBUG_STRICT
796 assert (screen.cur.col < last_col); 739 assert (screen.cur.col < last_col);
797 assert ((screen.cur.row < nrow) 740 assert (screen.cur.row < nrow
798 && (screen.cur.row >= - (int32_t)nscrolled)); 741 && 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 742#endif
804 row = screen.cur.row + saveLines; 743 int row = screen.cur.row;
805 744
806 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 745 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807 746
808 line_t *line = save + row; 747 line_t *line = &ROW(row);
809 748
810 while (str < strend) 749 while (str < strend)
811 { 750 {
812 c = *str++; 751 c = *str++;
813 752
814 if (c < 0x20) 753 if (c < 0x20)
815 if (c == C0_LF) 754 if (c == C0_LF)
816 { 755 {
817 if (line->l != -1) /* XXX: think about this */ 756 if (!line->is_longer ()) /* XXX: think about this */
818 MAX_IT (line->l, screen.cur.col); 757 max_it (line->l, screen.cur.col);
819 758
820 screen.flags &= ~Screen_WrapNext; 759 screen.flags &= ~Screen_WrapNext;
821 760
822 if (screen.cur.row == screen.bscroll) 761 if (screen.cur.row == screen.bscroll)
823 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 762 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
824 else if (screen.cur.row < (nrow - 1)) 763 else if (screen.cur.row < (nrow - 1))
825 row = (++screen.cur.row) + saveLines; 764 row = ++screen.cur.row;
826 765
827 line = save + row; /* _must_ refresh */ 766 line = &ROW(row); /* _must_ refresh */
828 continue; 767 continue;
829 } 768 }
830 else if (c == C0_CR) 769 else if (c == C0_CR)
831 { 770 {
832 if (line->l != -1) /* XXX: think about this */ 771 if (!line->is_longer ()) /* XXX: think about this */
833 MAX_IT (line->l, screen.cur.col); 772 max_it (line->l, screen.cur.col);
834 773
835 screen.flags &= ~Screen_WrapNext; 774 screen.flags &= ~Screen_WrapNext;
836 screen.cur.col = 0; 775 screen.cur.col = 0;
837 continue; 776 continue;
838 } 777 }
… …
855 CLEAR_SELECTION (); 794 CLEAR_SELECTION ();
856 } 795 }
857 796
858 if (screen.flags & Screen_WrapNext) 797 if (screen.flags & Screen_WrapNext)
859 { 798 {
860 line->l = -1; 799 line->set_is_longer ();
861 800
862 scr_do_wrap (); 801 scr_do_wrap ();
863 802
864 row = screen.cur.row + saveLines; 803 row = screen.cur.row;
865 line = save + row; /* _must_ refresh */ 804 line = &ROW(row); /* _must_ refresh */
866 } 805 }
867 806
868 // some utf-8 decoders "decode" surrogate characters: let's fix this. 807 // some utf-8 decoders "decode" surrogate characters: let's fix this.
869 if (IN_RANGE (c, 0xd800, 0xdfff)) 808 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
870 c = 0xfffd; 809 c = 0xfffd;
871 810
872 // rely on wcwidth to tell us the character width, at least for non-latin1 811 // 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 812 // 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 813 // for the line drawing characters below as they might be invalid in the current
… …
989 928
990 while (*tp == NOCHAR && tp > line->t) 929 while (*tp == NOCHAR && tp > line->t)
991 tp--, rp--; 930 tp--, rp--;
992 } 931 }
993 else if (screen.cur.row > 0 932 else if (screen.cur.row > 0
994 && save [screen.cur.row - 1 + saveLines].is_cont ()) 933 && ROW(screen.cur.row - 1).is_longer ())
995 { 934 {
996 line_t *line = save + (screen.cur.row - 1 + saveLines); 935 line_t *line = &ROW(screen.cur.row - 1);
997 936
998 tp = line->t + last_col - 1; 937 tp = line->t + last_col - 1;
999 rp = line->r + last_col - 1; 938 rp = line->r + last_col - 1;
1000 939
1001 while (*tp == NOCHAR && tp > line->t) 940 while (*tp == NOCHAR && tp > line->t)
… …
1013 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 952 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1014#endif 953#endif
1015 } 954 }
1016 } 955 }
1017 956
1018 if (line->l != -1) /* XXX: think about this */ 957 if (!line->is_longer ()) /* XXX: think about this */
1019 MAX_IT (line->l, screen.cur.col); 958 max_it (line->l, screen.cur.col);
1020 959
1021#ifdef DEBUG_STRICT 960#ifdef DEBUG_STRICT
1022 assert (screen.cur.row >= 0); 961 assert (screen.cur.row >= 0);
1023#else /* drive with your eyes closed */
1024 MAX_IT (screen.cur.row, 0);
1025#endif 962#endif
1026} 963}
1027 964
1028/* ------------------------------------------------------------------------- */ 965/* ------------------------------------------------------------------------- */
1029/* 966/*
… …
1068 1005
1069 if (count == 0) 1006 if (count == 0)
1070 return; 1007 return;
1071 else if (count > 0) 1008 else if (count > 0)
1072 { 1009 {
1073 int row = saveLines + screen.cur.row; 1010 line_t &l = ROW(screen.cur.row);
1074
1075 line_t &l = save[row];
1076 rend_t base_rend = l.r[i]; 1011 rend_t base_rend = l.r[i];
1077 ht &= l.t[i] == ' '; 1012 ht &= l.t[i] == ' ';
1078 1013
1079 for (; ++i < ncol; ) 1014 for (; ++i < ncol; )
1080 if (tabs[i]) 1015 if (tabs[i])
… …
1090 if (count) 1025 if (count)
1091 x = ncol - 1; 1026 x = ncol - 1;
1092 1027
1093 // store horizontal tab commands as characters inside the text 1028 // store horizontal tab commands as characters inside the text
1094 // buffer so they can be selected and pasted. 1029 // buffer so they can be selected and pasted.
1095 if (ht && options & Opt_pastableTabs) 1030 if (ht && OPTION (Opt_pastableTabs))
1096 { 1031 {
1097 base_rend = SET_FONT (base_rend, 0); 1032 base_rend = SET_FONT (base_rend, 0);
1098 1033
1099 if (l.l != -1) /* XXX: think about this */ 1034 if (!l.is_longer ()) /* XXX: think about this */
1100 MAX_IT (l.l, x); 1035 max_it (l.l, x);
1101 1036
1102 i = screen.cur.col; 1037 i = screen.cur.col;
1103 1038
1104 l.t[i] = '\t'; 1039 l.t[i] = '\t';
1105 l.r[i] = base_rend; 1040 l.r[i] = base_rend;
… …
1141rxvt_term::scr_backindex () 1076rxvt_term::scr_backindex ()
1142{ 1077{
1143 if (screen.cur.col > 0) 1078 if (screen.cur.col > 0)
1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1079 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1145 else 1080 else
1146 {
1147 if (save[screen.cur.row + saveLines].l == 0)
1148 return; /* um, yeah? */
1149
1150 scr_insdel_chars (1, INSERT); 1081 scr_insdel_chars (1, INSERT);
1151 }
1152} 1082}
1153#endif 1083#endif
1154/* ------------------------------------------------------------------------- */ 1084/* ------------------------------------------------------------------------- */
1155/* 1085/*
1156 * Process DEC Forward Index 1086 * Process DEC Forward Index
… …
1160 */ 1090 */
1161#if ENABLE_FRILLS 1091#if ENABLE_FRILLS
1162void 1092void
1163rxvt_term::scr_forwardindex () 1093rxvt_term::scr_forwardindex ()
1164{ 1094{
1165 int row;
1166
1167 if (screen.cur.col < ncol - 1) 1095 if (screen.cur.col < ncol - 1)
1168 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1096 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1169 else 1097 else
1170 { 1098 {
1171 row = screen.cur.row + saveLines; 1099 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
1172 1100 ROW(screen.cur.row).l = ncol;
1173 if (save[row].l == 0)
1174 return; /* um, yeah? */
1175 else if (save[row].is_cont ())
1176 save[row].l = ncol;
1177 1101
1178 scr_gotorc (0, 0, R_RELATIVE); 1102 scr_gotorc (0, 0, R_RELATIVE);
1179 scr_insdel_chars (1, DELETE); 1103 scr_insdel_chars (1, DELETE);
1180 scr_gotorc (0, ncol - 1, R_RELATIVE); 1104 scr_gotorc (0, ncol - 1, R_RELATIVE);
1181 } 1105 }
… …
1191{ 1115{
1192 want_refresh = 1; 1116 want_refresh = 1;
1193 ZERO_SCROLLBACK (); 1117 ZERO_SCROLLBACK ();
1194 1118
1195 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1119 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1196 MAX_IT (screen.cur.col, 0); 1120 clamp_it (screen.cur.col, 0, ncol - 1);
1197 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1198 1121
1199 screen.flags &= ~Screen_WrapNext; 1122 screen.flags &= ~Screen_WrapNext;
1200 1123
1201 if (relative & R_RELATIVE) 1124 if (relative & R_RELATIVE)
1202 { 1125 {
… …
1220 else 1143 else
1221 { 1144 {
1222 if (screen.flags & Screen_Relative) 1145 if (screen.flags & Screen_Relative)
1223 { /* relative origin mode */ 1146 { /* relative origin mode */
1224 screen.cur.row = row + screen.tscroll; 1147 screen.cur.row = row + screen.tscroll;
1225 MIN_IT (screen.cur.row, screen.bscroll); 1148 min_it (screen.cur.row, screen.bscroll);
1226 } 1149 }
1227 else 1150 else
1228 screen.cur.row = row; 1151 screen.cur.row = row;
1229 } 1152 }
1230 1153
1231 MAX_IT (screen.cur.row, 0); 1154 clamp_it (screen.cur.row, 0, nrow - 1);
1232 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1233} 1155}
1234 1156
1235/* ------------------------------------------------------------------------- */ 1157/* ------------------------------------------------------------------------- */
1236/* 1158/*
1237 * direction should be UP or DN 1159 * direction should be UP or DN
… …
1248 1170
1249 screen.flags &= ~Screen_WrapNext; 1171 screen.flags &= ~Screen_WrapNext;
1250 1172
1251 if ((screen.cur.row == screen.bscroll && direction == UP) 1173 if ((screen.cur.row == screen.bscroll && direction == UP)
1252 || (screen.cur.row == screen.tscroll && direction == DN)) 1174 || (screen.cur.row == screen.tscroll && direction == DN))
1253 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1175 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1254 else 1176 else
1255 screen.cur.row += dirn; 1177 screen.cur.row += dirn;
1256 1178
1257 MAX_IT (screen.cur.row, 0); 1179 clamp_it (screen.cur.row, 0, nrow - 1);
1258 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1259 selection_check (0); 1180 selection_check (0);
1260} 1181}
1261 1182
1262/* ------------------------------------------------------------------------- */ 1183/* ------------------------------------------------------------------------- */
1263/* 1184/*
… …
1267 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1188 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1268 */ 1189 */
1269void 1190void
1270rxvt_term::scr_erase_line (int mode) 1191rxvt_term::scr_erase_line (int mode)
1271{ 1192{
1272 unsigned int row, col, num; 1193 unsigned int col, num;
1273 1194
1274 want_refresh = 1; 1195 want_refresh = 1;
1275 ZERO_SCROLLBACK (); 1196 ZERO_SCROLLBACK ();
1276 1197
1277 selection_check (1); 1198 selection_check (1);
1278 1199
1279 row = saveLines + screen.cur.row; 1200 line_t &line = ROW(screen.cur.row);
1280 1201
1281 switch (mode) 1202 switch (mode)
1282 { 1203 {
1283 case 0: /* erase to end of line */ 1204 case 0: /* erase to end of line */
1284 col = screen.cur.col; 1205 col = screen.cur.col;
1285 num = ncol - col; 1206 num = ncol - col;
1286 MIN_IT (save[row].l, (int16_t)col); 1207 min_it (line.l, col);
1287 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1208 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1288 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1209 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1289 CLEAR_SELECTION (); 1210 CLEAR_SELECTION ();
1290 break; 1211 break;
1291 case 1: /* erase to beginning of line */ 1212 case 1: /* erase to beginning of line */
… …
1296 CLEAR_SELECTION (); 1217 CLEAR_SELECTION ();
1297 break; 1218 break;
1298 case 2: /* erase whole line */ 1219 case 2: /* erase whole line */
1299 col = 0; 1220 col = 0;
1300 num = ncol; 1221 num = ncol;
1301 save[row].l = 0; 1222 line.l = 0;
1302 if (selection.beg.row <= screen.cur.row 1223 if (selection.beg.row <= screen.cur.row
1303 && selection.end.row >= screen.cur.row) 1224 && selection.end.row >= screen.cur.row)
1304 CLEAR_SELECTION (); 1225 CLEAR_SELECTION ();
1305 break; 1226 break;
1306 default: 1227 default:
1307 return; 1228 return;
1308 } 1229 }
1309 1230
1310 if (save[row].t)
1311 scr_blank_line (save[row], col, num, rstyle); 1231 scr_blank_line (line, col, num, rstyle);
1312 else
1313 scr_blank_screen_mem (save[row], rstyle);
1314} 1232}
1315 1233
1316/* ------------------------------------------------------------------------- */ 1234/* ------------------------------------------------------------------------- */
1317/* 1235/*
1318 * Erase part of whole of the screen 1236 * Erase part of whole of the screen
… …
1322 */ 1240 */
1323void 1241void
1324rxvt_term::scr_erase_screen (int mode) 1242rxvt_term::scr_erase_screen (int mode)
1325{ 1243{
1326 int num; 1244 int num;
1327 int32_t row, row_offset; 1245 int32_t row;
1328 rend_t ren; 1246 rend_t ren;
1329 XGCValues gcvalue; 1247 XGCValues gcvalue;
1330 1248
1331 want_refresh = 1; 1249 want_refresh = 1;
1332 ZERO_SCROLLBACK (); 1250 ZERO_SCROLLBACK ();
1333
1334 row_offset = (int32_t)saveLines;
1335 1251
1336 switch (mode) 1252 switch (mode)
1337 { 1253 {
1338 case 0: /* erase to end of screen */ 1254 case 0: /* erase to end of screen */
1339 selection_check (1); 1255 selection_check (1);
… …
1363 CLEAR_SELECTION (); 1279 CLEAR_SELECTION ();
1364 1280
1365 if (row >= nrow) /* Out Of Bounds */ 1281 if (row >= nrow) /* Out Of Bounds */
1366 return; 1282 return;
1367 1283
1368 MIN_IT (num, (nrow - row)); 1284 min_it (num, nrow - row);
1369 1285
1370 if (rstyle & (RS_RVid | RS_Uline)) 1286 if (rstyle & (RS_RVid | RS_Uline))
1371 ren = (rend_t) ~RS_None; 1287 ren = (rend_t) ~RS_None;
1372 else if (GET_BASEBG (rstyle) == Color_bg) 1288 else if (GET_BASEBG (rstyle) == Color_bg)
1373 { 1289 {
… …
1375 CLEAR_ROWS (row, num); 1291 CLEAR_ROWS (row, num);
1376 } 1292 }
1377 else 1293 else
1378 { 1294 {
1379 ren = rstyle & (RS_fgMask | RS_bgMask); 1295 ren = rstyle & (RS_fgMask | RS_bgMask);
1380 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1296 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1381 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1297 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1382 ERASE_ROWS (row, num); 1298 ERASE_ROWS (row, num);
1383 gcvalue.foreground = pix_colors[Color_fg]; 1299 gcvalue.foreground = pix_colors[Color_fg];
1384 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1300 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1385 } 1301 }
1386 1302
1387 for (; num--; row++) 1303 for (; num--; row++)
1388 { 1304 {
1305 ROW (row).l = 0;
1389 scr_blank_screen_mem (save[row + row_offset], rstyle); 1306 scr_blank_screen_mem (ROW (row), rstyle);
1390 save[row + row_offset].l = 0;
1391 scr_blank_line (drawn[row], 0, ncol, ren); 1307 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1392 } 1308 }
1393} 1309}
1394 1310
1395#if ENABLE_FRILLS 1311#if ENABLE_FRILLS
1396void 1312void
1397rxvt_term::scr_erase_savelines () 1313rxvt_term::scr_erase_savelines ()
1398{ 1314{
1399 want_refresh = 1; 1315 want_refresh = 1;
1400 ZERO_SCROLLBACK (); 1316 ZERO_SCROLLBACK ();
1401 1317
1402 nscrolled = 0; 1318 nsaved = 0;
1403} 1319}
1404#endif 1320#endif
1405 1321
1406/* ------------------------------------------------------------------------- */ 1322/* ------------------------------------------------------------------------- */
1407/* 1323/*
… …
1409 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1325 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1410 */ 1326 */
1411void 1327void
1412rxvt_term::scr_E () 1328rxvt_term::scr_E ()
1413{ 1329{
1414 int i, j, k;
1415 rend_t *r1, fs; 1330 rend_t fs;
1416 1331
1417 want_refresh = 1; 1332 want_refresh = 1;
1418 ZERO_SCROLLBACK (); 1333 ZERO_SCROLLBACK ();
1419 1334
1420 num_scr_allow = 0; 1335 num_scr_allow = 0;
1421 selection_check (3); 1336 selection_check (3);
1422 1337
1423 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1338 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1424 for (k = saveLines, i = nrow; i--; k++) 1339 for (int row = nrow; row--; )
1425 { 1340 {
1426 save[k].l = ncol; /* make the `E's selectable */ 1341 line_t &line = ROW(row);
1342
1427 fill_text (save[k].t, 'E', ncol); 1343 fill_text (line.t, 'E', ncol);
1428 for (r1 = save[k].r, j = ncol; j--; ) 1344 rend_t *r1 = line.r;
1345
1346 for (int j = ncol; j--; )
1429 *r1++ = fs; 1347 *r1++ = fs;
1348
1349 line.l = ncol; /* make the `E's selectable */
1430 } 1350 }
1431} 1351}
1432 1352
1433/* ------------------------------------------------------------------------- */ 1353/* ------------------------------------------------------------------------- */
1434/* 1354/*
… …
1455 count = end; 1375 count = end;
1456 } 1376 }
1457 1377
1458 scr_do_wrap (); 1378 scr_do_wrap ();
1459 1379
1460 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1380 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1461} 1381}
1462 1382
1463/* ------------------------------------------------------------------------- */ 1383/* ------------------------------------------------------------------------- */
1464/* 1384/*
1465 * Insert/Delete <count> characters from the current position 1385 * Insert/Delete <count> characters from the current position
… …
1477 return; 1397 return;
1478 1398
1479 scr_do_wrap (); 1399 scr_do_wrap ();
1480 1400
1481 selection_check (1); 1401 selection_check (1);
1482 MIN_IT (count, (ncol - screen.cur.col)); 1402 min_it (count, ncol - screen.cur.col);
1483 1403
1484 row = screen.cur.row + saveLines; 1404 row = screen.cur.row;
1485 1405
1486 line_t *line = save + row; 1406 line_t *line = &ROW(row);
1487 1407
1488 switch (insdel) 1408 switch (insdel)
1489 { 1409 {
1490 case INSERT: 1410 case INSERT:
1491 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1411 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1492 { 1412 {
1493 line->t[col] = line->t[col - count]; 1413 line->t[col] = line->t[col - count];
1494 line->r[col] = line->r[col - count]; 1414 line->r[col] = line->r[col - count];
1495 } 1415 }
1496 1416
1497 if (line->l != -1) 1417 if (!line->is_longer ())
1498 { 1418 {
1499 line->l += count; 1419 line->l += count;
1500 MIN_IT (line->l, ncol); 1420 min_it (line->l, ncol);
1501 } 1421 }
1502 1422
1503 if (selection.op && current_screen == selection.screen 1423 if (selection.op && current_screen == selection.screen
1504 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1424 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1505 { 1425 {
… …
1512 selection.mark.col += count; /* XXX: yes? */ 1432 selection.mark.col += count; /* XXX: yes? */
1513 selection.end.col += count; 1433 selection.end.col += count;
1514 } 1434 }
1515 } 1435 }
1516 1436
1517 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1437 scr_blank_line (*line, screen.cur.col, count, rstyle);
1518 break; 1438 break;
1519 1439
1520 case ERASE: 1440 case ERASE:
1521 screen.cur.col += count; /* don't worry if > ncol */ 1441 screen.cur.col += count; /* don't worry if > ncol */
1522 selection_check (1); 1442 selection_check (1);
1523 screen.cur.col -= count; 1443 screen.cur.col -= count;
1524 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1444 scr_blank_line (*line, screen.cur.col, count, rstyle);
1525 break; 1445 break;
1526 1446
1527 case DELETE: 1447 case DELETE:
1528 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1448 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1529 1449
… …
1533 line->r[col] = line->r[col + count]; 1453 line->r[col] = line->r[col + count];
1534 } 1454 }
1535 1455
1536 scr_blank_line (*line, ncol - count, count, tr); 1456 scr_blank_line (*line, ncol - count, count, tr);
1537 1457
1538 if (line->is_cont ()) /* break line continuation */ 1458 if (line->is_longer ()) /* break line continuation */
1539 line->l = ncol; 1459 line->l = ncol;
1540 1460
1541 line->l -= count; 1461 line->l = max (line->l - count, 0);
1542 MAX_IT (line->l, 0);
1543 1462
1544 if (selection.op && current_screen == selection.screen 1463 if (selection.op && current_screen == selection.screen
1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1464 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1546 { 1465 {
1547 if (selection.end.row != screen.cur.row 1466 if (selection.end.row != screen.cur.row
… …
1567 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1486 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1568 */ 1487 */
1569void 1488void
1570rxvt_term::scr_scroll_region (int top, int bot) 1489rxvt_term::scr_scroll_region (int top, int bot)
1571{ 1490{
1572 MAX_IT (top, 0); 1491 max_it (top, 0);
1573 MIN_IT (bot, (int)nrow - 1); 1492 min_it (bot, nrow - 1);
1574 1493
1575 if (top > bot) 1494 if (top > bot)
1576 return; 1495 return;
1577 1496
1578 screen.tscroll = top; 1497 screen.tscroll = top;
… …
1676 XGCValues gcvalue; 1595 XGCValues gcvalue;
1677 1596
1678 if (rvideo != mode) 1597 if (rvideo != mode)
1679 { 1598 {
1680 rvideo = mode; 1599 rvideo = mode;
1681 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1600 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1682#if XPM_BACKGROUND 1601#if XPM_BACKGROUND
1683 if (bgPixmap.pixmap == None) 1602 if (bgPixmap.pixmap == None)
1684#endif 1603#endif
1685#if TRANSPARENT 1604#if TRANSPARENT
1686 if (! (options & Opt_transparent) || am_transparent == 0) 1605 if (! OPTION (Opt_transparent) || am_transparent == 0)
1687#endif 1606#endif
1688 XSetWindowBackground (display->display, vt, 1607 XSetWindowBackground (display->display, vt,
1689 pix_colors[Color_bg]); 1608 pix_colors[Color_bg]);
1690 1609
1691 gcvalue.foreground = pix_colors[Color_fg]; 1610 gcvalue.foreground = pix_colors[Color_fg];
… …
1782 bool found = false; 1701 bool found = false;
1783 1702
1784 for (int i = 0; i < nrow; i++) 1703 for (int i = 0; i < nrow; i++)
1785 { 1704 {
1786 int col = 0; 1705 int col = 0;
1787 rend_t *drp = drawn[i].r; 1706 rend_t *drp = drawn_buf[i].r;
1788 1707
1789 for (; col < ncol; col++, drp++) 1708 for (; col < ncol; col++, drp++)
1790 if ((*drp & mask) == value) 1709 if ((*drp & mask) == value)
1791 { 1710 {
1792 found = true; 1711 found = true;
… …
1810rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1729rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1811{ 1730{
1812 int i; 1731 int i;
1813 row_col_t rc[RC_COUNT]; 1732 row_col_t rc[RC_COUNT];
1814 1733
1815 if (!drawn) /* sanity check */ 1734 if (!drawn_buf) /* sanity check */
1816 return; 1735 return;
1817 1736
1818#ifndef NO_SLOW_LINK_SUPPORT 1737#ifndef NO_SLOW_LINK_SUPPORT
1819 if (refresh_type == FAST_REFRESH && !display->is_local) 1738 if (refresh_type == FAST_REFRESH && !display->is_local)
1820 { 1739 {
1821 y = 0; 1740 y = 0;
1822 eheight = height; 1741 eheight = height;
1823 } 1742 }
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 1743#endif
1832 1744
1833 /* round down */ 1745 /* round down */
1834 rc[PART_BEG].col = Pixel2Col (x); 1746 rc[PART_BEG].col = Pixel2Col (x);
1835 rc[PART_BEG].row = Pixel2Row (y); 1747 rc[PART_BEG].row = Pixel2Row (y);
… …
1838 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1750 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1839 1751
1840 /* sanity checks */ 1752 /* sanity checks */
1841 for (i = PART_BEG; i < RC_COUNT; i++) 1753 for (i = PART_BEG; i < RC_COUNT; i++)
1842 { 1754 {
1843 MIN_IT (rc[i].col, ncol - 1); 1755 min_it (rc[i].col, ncol - 1);
1844 MIN_IT (rc[i].row, nrow - 1); 1756 min_it (rc[i].row, nrow - 1);
1845 } 1757 }
1846 1758
1847 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1759 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); 1760 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1849 1761
1850 if (refresh) 1762 if (refresh)
1851 scr_refresh (SLOW_REFRESH); 1763 scr_refresh (SLOW_REFRESH);
1852} 1764}
1853 1765
… …
1874 1786
1875 oldviewstart = view_start; 1787 oldviewstart = view_start;
1876 1788
1877 if (y < len) 1789 if (y < len)
1878 { 1790 {
1879 p = (nrow + nscrolled) * (len - y) / len; 1791 p = (nrow + nsaved) * (len - y) / len;
1880 p -= (long) (nrow - 1); 1792 p -= (long) (nrow - 1);
1881 p = max (p, 0); 1793 p = max (p, 0);
1882 } 1794 }
1883 1795
1884 view_start = (unsigned int)min (p, nscrolled); 1796 view_start = (unsigned int)min (p, nsaved);
1885 1797
1886 return scr_changeview (oldviewstart); 1798 return scr_changeview (oldviewstart);
1887} 1799}
1888 1800
1889/* ------------------------------------------------------------------------- */ 1801/* ------------------------------------------------------------------------- */
… …
1900 oldviewstart = view_start; 1812 oldviewstart = view_start;
1901 1813
1902 if (direction == UP) 1814 if (direction == UP)
1903 { 1815 {
1904 n = view_start + nlines; 1816 n = view_start + nlines;
1905 view_start = min (n, nscrolled); 1817 view_start = min (n, nsaved);
1906 } 1818 }
1907 else 1819 else
1908 { 1820 {
1909 n = view_start - nlines; 1821 n = view_start - nlines;
1910 view_start = max (n, 0); 1822 view_start = max (n, 0);
… …
1914} 1826}
1915 1827
1916int 1828int
1917rxvt_term::scr_changeview (unsigned int oldviewstart) 1829rxvt_term::scr_changeview (unsigned int oldviewstart)
1918{ 1830{
1831 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1832
1919 if (view_start != oldviewstart) 1833 if (view_start != oldviewstart)
1920 { 1834 {
1921 want_refresh = 1; 1835 want_refresh = 1;
1922 num_scr -= (view_start - oldviewstart); 1836 num_scr -= (view_start - oldviewstart);
1923 } 1837 }
… …
1931{ 1845{
1932#ifndef NO_BELL 1846#ifndef NO_BELL
1933 1847
1934# ifndef NO_MAPALERT 1848# ifndef NO_MAPALERT
1935# ifdef MAPALERT_OPTION 1849# ifdef MAPALERT_OPTION
1936 if (options & Opt_mapAlert) 1850 if (OPTION (Opt_mapAlert))
1937# endif 1851# endif
1938 XMapWindow (display->display, parent[0]); 1852 XMapWindow (display->display, parent[0]);
1939# endif 1853# endif
1940 1854
1941 if (options & Opt_visualBell) 1855 if (OPTION (Opt_visualBell))
1942 { 1856 {
1943 scr_rvideo_mode (!rvideo); /* refresh also done */ 1857 scr_rvideo_mode (!rvideo); /* refresh also done */
1944 rxvt_usleep (VISUAL_BELL_DURATION); 1858 rxvt_usleep (VISUAL_BELL_DURATION);
1945 scr_rvideo_mode (!rvideo); /* refresh also done */ 1859 scr_rvideo_mode (!rvideo); /* refresh also done */
1946 } 1860 }
… …
1954/* ARGSUSED */ 1868/* ARGSUSED */
1955void 1869void
1956rxvt_term::scr_printscreen (int fullhist) 1870rxvt_term::scr_printscreen (int fullhist)
1957{ 1871{
1958#ifdef PRINTPIPE 1872#ifdef PRINTPIPE
1959 int i, r1, nrows, row_offset; 1873 int nrows, row_start;
1960 FILE *fd; 1874 FILE *fd;
1961 1875
1962 if ((fd = popen_printer ()) == NULL) 1876 if ((fd = popen_printer ()) == NULL)
1963 return; 1877 return;
1964 1878
1965 nrows = nrow;
1966 row_offset = saveLines;
1967
1968 if (!fullhist) 1879 if (fullhist)
1969 row_offset -= view_start; 1880 {
1881 nrows = nrow + nsaved;
1882 row_start = -nsaved;
1883 }
1970 else 1884 else
1971 { 1885 {
1972 nrows += nscrolled; 1886 nrows = nrow;
1973 row_offset -= nscrolled; 1887 row_start = -view_start;
1974 } 1888 }
1975 1889
1976 wctomb (0, 0); 1890 wctomb (0, 0);
1977 1891
1978 for (r1 = 0; r1 < nrows; r1++) 1892 for (int r1 = 0; r1 < nrows; r1++)
1979 { 1893 {
1980 text_t *tp = save[r1 + row_offset].t; 1894 text_t *tp = ROW(r1).t;
1981 int len = save[r1 + row_offset].l; 1895 int len = ROW(r1).l;
1982 1896
1983 for (i = len >= 0 ? len : ncol - 1; i--; ) 1897 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1984 { 1898 {
1985 char mb[MB_LEN_MAX]; 1899 char mb[MB_LEN_MAX];
1986 text_t t = *tp++; 1900 text_t t = *tp++;
1987 if (t == NOCHAR) 1901 if (t == NOCHAR)
1988 continue; 1902 continue;
… …
2016{ 1930{
2017 unsigned char must_clear, /* use draw_string not draw_image_string */ 1931 unsigned char must_clear, /* use draw_string not draw_image_string */
2018 showcursor; /* show the cursor */ 1932 showcursor; /* show the cursor */
2019 int16_t col, row, /* column/row we're processing */ 1933 int16_t col, row, /* column/row we're processing */
2020 ocrow; /* old cursor row */ 1934 ocrow; /* old cursor row */
2021 int i, /* tmp */ 1935 int i; /* tmp */
2022 row_offset; /* basic offset in screen structure */
2023#ifndef NO_CURSORCOLOR 1936#ifndef NO_CURSORCOLOR
2024 rend_t cc1; /* store colours at cursor position (s) */ 1937 rend_t cc1; /* store colours at cursor position (s) */
2025#endif 1938#endif
2026 rend_t *crp; // cursor rendition pointer 1939 rend_t *crp; // cursor rendition pointer
2027 1940
… …
2034 * A: set up vars 1947 * A: set up vars
2035 */ 1948 */
2036 must_clear = 0; 1949 must_clear = 0;
2037 refresh_count = 0; 1950 refresh_count = 0;
2038 1951
2039 row_offset = saveLines - view_start;
2040
2041#if XPM_BACKGROUND 1952#if XPM_BACKGROUND
2042 must_clear |= bgPixmap.pixmap != None; 1953 must_clear |= bgPixmap.pixmap != None;
2043#endif 1954#endif
2044#if TRANSPARENT 1955#if TRANSPARENT
2045 must_clear |= (options & Opt_transparent) && am_transparent; 1956 must_clear |= OPTION (Opt_transparent) && am_transparent;
2046#endif 1957#endif
2047 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1958 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2048 1959
2049 /* 1960 /*
2050 * B: reverse any characters which are selected 1961 * B: reverse any characters which are selected
… …
2067 1978
2068 if (showcursor) 1979 if (showcursor)
2069 { 1980 {
2070 int col = screen.cur.col; 1981 int col = screen.cur.col;
2071 1982
2072 while (col && screen.line[screen.cur.row]->t[col] == NOCHAR) 1983 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2073 col--; 1984 col--;
2074 1985
2075 crp = &screen.line[screen.cur.row]->r[col]; 1986 crp = &ROW(screen.cur.row).r[col];
2076 1987
2077 if (showcursor && focus) 1988 if (showcursor && focus)
2078 { 1989 {
2079 if (options & Opt_cursorUnderline) 1990 if (OPTION (Opt_cursorUnderline))
2080 *crp ^= RS_Uline; 1991 *crp ^= RS_Uline;
2081 else 1992 else
2082 { 1993 {
2083 *crp ^= RS_RVid; 1994 *crp ^= RS_RVid;
2084 1995
… …
2086 cc1 = *crp & (RS_fgMask | RS_bgMask); 1997 cc1 = *crp & (RS_fgMask | RS_bgMask);
2087 if (ISSET_PIXCOLOR (Color_cursor)) 1998 if (ISSET_PIXCOLOR (Color_cursor))
2088 ccol1 = Color_cursor; 1999 ccol1 = Color_cursor;
2089 else 2000 else
2090#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2001#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2091 ccol1 = GET_FGCOLOR (rstyle); 2002 ccol1 = fgcolor_of (rstyle);
2092#else 2003#else
2093 ccol1 = Color_fg; 2004 ccol1 = Color_fg;
2094#endif 2005#endif
2095 if (ISSET_PIXCOLOR (Color_cursor2)) 2006 if (ISSET_PIXCOLOR (Color_cursor2))
2096 ccol2 = Color_cursor2; 2007 ccol2 = Color_cursor2;
2097 else 2008 else
2098#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2009#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2099 ccol2 = GET_BGCOLOR (rstyle); 2010 ccol2 = bgcolor_of (rstyle);
2100#else 2011#else
2101 ccol2 = Color_bg; 2012 ccol2 = Color_bg;
2102#endif 2013#endif
2103 *crp = SET_FGCOLOR (*crp, ccol1); 2014 *crp = SET_FGCOLOR (*crp, ccol1);
2104 *crp = SET_BGCOLOR (*crp, ccol2); 2015 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2114 if (screen.cur.row + view_start != ocrow 2025 if (screen.cur.row + view_start != ocrow
2115 || screen.cur.col != oldcursor.col) 2026 || screen.cur.col != oldcursor.col)
2116 { 2027 {
2117 if (ocrow < nrow 2028 if (ocrow < nrow
2118 && oldcursor.col < ncol) 2029 && oldcursor.col < ncol)
2119 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2030 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2120 2031
2121 if (focus || !showcursor) 2032 if (focus || !showcursor)
2122 oldcursor.row = -1; 2033 oldcursor.row = -1;
2123 else 2034 else
2124 setoldcursor = 1; 2035 setoldcursor = 1;
… …
2137 oldcursor.col = screen.cur.col; 2048 oldcursor.col = screen.cur.col;
2138 } 2049 }
2139 } 2050 }
2140 } 2051 }
2141 2052
2053 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2142#if ENABLE_OVERLAY 2054#if ENABLE_OVERLAY
2143 scr_swap_overlay (); 2055 scr_swap_overlay ();
2144#endif 2056#endif
2145 2057
2146#ifndef NO_SLOW_LINK_SUPPORT 2058#ifndef NO_SLOW_LINK_SUPPORT
… …
2148 * D: CopyArea pass - very useful for slower links 2060 * D: CopyArea pass - very useful for slower links
2149 * This has been deliberately kept simple. 2061 * This has been deliberately kept simple.
2150 */ 2062 */
2151 i = num_scr; 2063 i = num_scr;
2152 if (!display->is_local 2064 if (!display->is_local
2153 && refresh_type == FAST_REFRESH && num_scr_allow && i 2065 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2154 && abs (i) < nrow && !must_clear) 2066 && abs (num_scr) < nrow && !must_clear)
2155 { 2067 {
2156 int16_t nits; 2068 int16_t nits;
2157 int j; 2069 int j;
2158 int len, wlen; 2070 int len, wlen;
2159 2071
… …
2162 row = i > 0 ? 0 : j - 1; 2074 row = i > 0 ? 0 : j - 1;
2163 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2075 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2164 { 2076 {
2165 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2077 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2166 { 2078 {
2167 line_t s = save[row + row_offset]; 2079 line_t s = ROW(row - view_start);
2168 line_t d = drawn[row]; 2080 line_t d = drawn_buf[row];
2169 line_t d2 = drawn[row + i]; 2081 line_t d2 = drawn_buf[row + i];
2170 2082
2171 for (nits = 0, col = ncol; col--; ) 2083 for (nits = 0, col = ncol; col--; )
2172 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2084 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2173 nits--; 2085 nits--;
2174 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2086 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2192 2104
2193 if (len != -1) 2105 if (len != -1)
2194 { 2106 {
2195 /* also comes here at end if needed because of >= above */ 2107 /* also comes here at end if needed because of >= above */
2196 if (wlen < len) 2108 if (wlen < len)
2197 SWAP_IT (wlen, len, int); 2109 ::swap (wlen, len);
2198 2110
2199 XCopyArea (display->display, vt, vt, 2111 XCopyArea (display->display, vt, vt,
2200 gc, 0, Row2Pixel (len + i), 2112 gc, 0, Row2Pixel (len + i),
2201 (unsigned int)TermWin_TotalWidth (), 2113 (unsigned int)this->width,
2202 (unsigned int)Height2Pixel (wlen - len + 1), 2114 (unsigned int)Height2Pixel (wlen - len + 1),
2203 0, Row2Pixel (len)); 2115 0, Row2Pixel (len));
2204 len = -1; 2116 len = -1;
2205 } 2117 }
2206 } 2118 }
… …
2210 /* 2122 /*
2211 * E: main pass across every character 2123 * E: main pass across every character
2212 */ 2124 */
2213 for (row = 0; row < nrow; row++) 2125 for (row = 0; row < nrow; row++)
2214 { 2126 {
2215 text_t *stp = save[row + row_offset].t; 2127 text_t *stp = ROW(row - view_start).t;
2216 rend_t *srp = save[row + row_offset].r; 2128 rend_t *srp = ROW(row - view_start).r;
2217 text_t *dtp = drawn[row].t; 2129 text_t *dtp = drawn_buf[row].t;
2218 rend_t *drp = drawn[row].r; 2130 rend_t *drp = drawn_buf[row].r;
2219 2131
2220 /* 2132 /*
2221 * E2: OK, now the real pass 2133 * E2: OK, now the real pass
2222 */ 2134 */
2223 int ypixel = (int)Row2Pixel (row); 2135 int ypixel = (int)Row2Pixel (row);
… …
2285 count++, i--; 2197 count++, i--;
2286 2198
2287 /* 2199 /*
2288 * Determine the attributes for the string 2200 * Determine the attributes for the string
2289 */ 2201 */
2290 int fore = GET_FGCOLOR (rend); // desired foreground 2202 int fore = fgcolor_of (rend); // desired foreground
2291 int back = GET_BGCOLOR (rend); // desired background 2203 int back = bgcolor_of (rend); // desired background
2292 2204
2293 // only do special processing if any attributes are set, which is rare 2205 // 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)) 2206 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2295 { 2207 {
2296#if ENABLE_STYLES 2208#if ENABLE_STYLES
2297 // force redraw after "careful" characters to avoid pixel droppings 2209 // force redraw after "careful" characters to avoid pixel droppings
2298 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2210 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2334 fore = Color_UL; 2246 fore = Color_UL;
2335#endif 2247#endif
2336 2248
2337 if (invert) 2249 if (invert)
2338 { 2250 {
2339 SWAP_IT (fore, back, int); 2251 ::swap (fore, back);
2340 2252
2341#ifndef NO_BOLD_UNDERLINE_REVERSE 2253#ifndef NO_BOLD_UNDERLINE_REVERSE
2342 if (ISSET_PIXCOLOR (Color_RV)) 2254 if (ISSET_PIXCOLOR (Color_RV))
2343 back = Color_RV; 2255 back = Color_RV;
2344 2256
… …
2409 } /* for (row....) */ 2321 } /* for (row....) */
2410 2322
2411#if ENABLE_OVERLAY 2323#if ENABLE_OVERLAY
2412 scr_swap_overlay (); 2324 scr_swap_overlay ();
2413#endif 2325#endif
2326 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2414 2327
2415 /* 2328 /*
2416 * G: cleanup cursor and display outline cursor if necessary 2329 * G: cleanup cursor and display outline cursor if necessary
2417 */ 2330 */
2418 if (showcursor) 2331 if (showcursor)
2419 { 2332 {
2420 if (focus) 2333 if (focus)
2421 { 2334 {
2422 if (options & Opt_cursorUnderline) 2335 if (OPTION (Opt_cursorUnderline))
2423 *crp ^= RS_Uline; 2336 *crp ^= RS_Uline;
2424 else 2337 else
2425 { 2338 {
2426 *crp ^= RS_RVid; 2339 *crp ^= RS_RVid;
2427#ifndef NO_CURSORCOLOR 2340#ifndef NO_CURSORCOLOR
… …
2432 else if (oldcursor.row >= 0) 2345 else if (oldcursor.row >= 0)
2433 { 2346 {
2434 int cursorwidth = 1; 2347 int cursorwidth = 1;
2435 int col = oldcursor.col; 2348 int col = oldcursor.col;
2436 2349
2437 while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR) 2350 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2438 col--; 2351 col--;
2439 2352
2440 while (col + cursorwidth < ncol 2353 while (col + cursorwidth < ncol
2441 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2354 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2442 cursorwidth++; 2355 cursorwidth++;
2443 2356
2444#ifndef NO_CURSORCOLOR 2357#ifndef NO_CURSORCOLOR
2445 if (ISSET_PIXCOLOR (Color_cursor)) 2358 if (ISSET_PIXCOLOR (Color_cursor))
2446 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2359 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2477} 2390}
2478 2391
2479void 2392void
2480rxvt_term::scr_remap_chars () 2393rxvt_term::scr_remap_chars ()
2481{ 2394{
2482 for (int i = nrow + saveLines; i--; ) 2395 for (int i = total_rows; i--; )
2483 scr_remap_chars (save[i]); 2396 scr_remap_chars (row_buf [i]);
2484 2397
2485 for (int i = nrow; i--; ) 2398 for (int i = nrow; i--; )
2486 { 2399 {
2487 scr_remap_chars (drawn[i]); 2400 scr_remap_chars (drawn_buf [i]);
2488 scr_remap_chars (swap_save[i]); 2401 scr_remap_chars (swap_buf [i]);
2489 } 2402 }
2490} 2403}
2491 2404
2492void 2405void
2493rxvt_term::scr_recolour () 2406rxvt_term::scr_recolour ()
… …
2535 2448
2536/* ------------------------------------------------------------------------- */ 2449/* ------------------------------------------------------------------------- */
2537void 2450void
2538rxvt_term::scr_reverse_selection () 2451rxvt_term::scr_reverse_selection ()
2539{ 2452{
2453 if (selection.op
2540 if (selection.op && current_screen == selection.screen) 2454 && current_screen == selection.screen
2455 && selection.end.row >= -view_start)
2541 { 2456 {
2542 int end_row = saveLines - view_start; 2457 int view_end = -view_start + nrow;
2543 int i = selection.beg.row + saveLines; 2458 int row, col;
2544 int col, row = selection.end.row + saveLines;
2545 rend_t *srp;
2546 2459
2547#if ENABLE_FRILLS 2460#if ENABLE_FRILLS
2548 if (selection.rect) 2461 if (selection.rect)
2549 { 2462 {
2550 end_row += nrow; 2463 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2464 {
2465 text_t *stp = ROW(row).t;
2466 rend_t *srp = ROW(row).r;
2551 2467
2552 for (; i <= row && i <= end_row; i++)
2553 for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++) 2468 for (col = selection.beg.col; col < selection.end.col; col++)
2554 srp[col] ^= RS_RVid; 2469 srp[col] ^= RS_RVid;
2470
2471 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2472 srp[col] ^= RS_RVid | RS_Uline;
2473
2474 if (++col < selection.end.col)
2475 srp[col] ^= RS_RVid | RS_Uline;
2476 }
2555 } 2477 }
2556 else 2478 else
2557#endif 2479#endif
2558 { 2480 {
2559 if (i >= end_row) 2481 if (selection.beg.row >= -view_start)
2482 {
2560 col = selection.beg.col; 2483 col = selection.beg.col;
2484 row = selection.beg.row;
2485 }
2561 else 2486 else
2562 { 2487 {
2563 col = 0; 2488 col = 0;
2564 i = end_row; 2489 row = -view_start;
2565 } 2490 }
2566 2491
2567 end_row += nrow; 2492 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++) 2493 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2571 srp[col] ^= RS_RVid; 2494 srp[col] ^= RS_RVid;
2572 2495
2573 if (i == row && i < end_row) 2496 if (row == selection.end.row)
2574 for (srp = save[i].r; col < selection.end.col; col++) 2497 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2575 srp[col] ^= RS_RVid; 2498 srp[col] ^= RS_RVid;
2576 } 2499 }
2577 } 2500 }
2578} 2501}
2579 2502
… …
2588{ 2511{
2589 int row, wrote; 2512 int row, wrote;
2590 unsigned int width, towrite; 2513 unsigned int width, towrite;
2591 char r1[] = "\n"; 2514 char r1[] = "\n";
2592 2515
2593 for (row = saveLines - nscrolled; 2516 for (row = saveLines - nsaved;
2594 row < saveLines + nrow - 1; row++) 2517 row < saveLines + nrow - 1; row++)
2595 { 2518 {
2596 width = save[row].l >= 0 ? save[row].l 2519 width = row_buf[row].l >= 0 ? row_buf[row].l
2597 : ncol; 2520 : ncol;
2598 for (towrite = width; towrite; towrite -= wrote) 2521 for (towrite = width; towrite; towrite -= wrote)
2599 { 2522 {
2600 wrote = write (fd, & (save[row].t[width - towrite]), 2523 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2601 towrite); 2524 towrite);
2602 if (wrote < 0) 2525 if (wrote < 0)
2603 return; /* XXX: death, no report */ 2526 return; /* XXX: death, no report */
2604 } 2527 }
2605 if (save[row].l >= 0) 2528 if (row_buf[row].l >= 0)
2606 if (write (fd, r1, 1) <= 0) 2529 if (write (fd, r1, 1) <= 0)
2607 return; /* XXX: death, no report */ 2530 return; /* XXX: death, no report */
2608 } 2531 }
2609} 2532}
2610#endif 2533#endif
2611 2534
2612/* ------------------------------------------------------------------------- * 2535/* ------------------------------------------------------------------------- *
2613 * CHARACTER SELECTION * 2536 * CHARACTER SELECTION *
2614 * ------------------------------------------------------------------------- */ 2537 * ------------------------------------------------------------------------- */
2615
2616/*
2617 * -nscrolled <= (selection row) <= nrow - 1
2618 */
2619void 2538void
2620rxvt_term::selection_check (int check_more) 2539rxvt_term::selection_check (int check_more)
2621{ 2540{
2622 row_col_t pos; 2541 row_col_t pos;
2623 2542
2624 if (!selection.op) 2543 if (!selection.op)
2625 return; 2544 return;
2626 2545
2627 pos.row = pos.col = 0; 2546 pos.row = pos.col = 0;
2628 if ((selection.beg.row < - (int32_t)nscrolled) 2547 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2629 || (selection.beg.row >= nrow) 2548 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2630 || (selection.mark.row < - (int32_t)nscrolled) 2549 || !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 2550 || (check_more == 1
2635 && current_screen == selection.screen 2551 && current_screen == selection.screen
2636 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2552 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2637 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2553 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2638 || (check_more == 2 2554 || (check_more == 2
… …
2649/* ------------------------------------------------------------------------- */ 2565/* ------------------------------------------------------------------------- */
2650/* 2566/*
2651 * Paste a selection direct to the command fd 2567 * Paste a selection direct to the command fd
2652 */ 2568 */
2653void 2569void
2654rxvt_term::paste (unsigned char *data, unsigned int len) 2570rxvt_term::paste (char *data, unsigned int len)
2655{ 2571{
2656 /* convert normal newline chars into common keyboard Return key sequence */ 2572 /* convert normal newline chars into common keyboard Return key sequence */
2657 for (unsigned int i = 0; i < len; i++) 2573 for (unsigned int i = 0; i < len; i++)
2658 if (data[i] == C0_LF) 2574 if (data[i] == C0_LF)
2659 data[i] = C0_CR; 2575 data[i] = C0_CR;
… …
2803 { 2719 {
2804 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2720 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2805 char *s = rxvt_wcstombs (w); 2721 char *s = rxvt_wcstombs (w);
2806 free (w); 2722 free (w);
2807 // TODO: strlen == only the first element will be converted. well... 2723 // TODO: strlen == only the first element will be converted. well...
2808 paste ((unsigned char *)s, strlen (s)); 2724 paste (s, strlen (s));
2809 free (s); 2725 free (s);
2810 } 2726 }
2811 else 2727 else
2812#endif 2728#endif
2813 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2729 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2814 && cl) 2730 && cl)
2815 { 2731 {
2816 for (int i = 0; i < cr; i++) 2732 for (int i = 0; i < cr; i++)
2817 paste ((unsigned char *)cl[i], strlen (cl[i])); 2733 paste (cl[i], strlen (cl[i]));
2818 2734
2819 XFreeStringList (cl); 2735 XFreeStringList (cl);
2820 } 2736 }
2821 else 2737 else
2822 paste (ct.value, ct.nitems); // paste raw 2738 paste ((char *)ct.value, ct.nitems); // paste raw
2823 2739
2824bailout: 2740bailout:
2825 XFree (ct.value); 2741 XFree (ct.value);
2826 2742
2827 if (selection_wait == Sel_normal) 2743 if (selection_wait == Sel_normal)
… …
2865 return; /* outside window */ 2781 return; /* outside window */
2866 2782
2867 if (selection.text) 2783 if (selection.text)
2868 { /* internal selection */ 2784 { /* internal selection */
2869 char *str = rxvt_wcstombs (selection.text, selection.len); 2785 char *str = rxvt_wcstombs (selection.text, selection.len);
2870 paste ((unsigned char *)str, strlen (str)); 2786 paste (str, strlen (str));
2871 free (str); 2787 free (str);
2872 return; 2788 return;
2873 } 2789 }
2874 else 2790 else
2875 { 2791 {
… …
2944 * EXT: button 1 or 3 release 2860 * EXT: button 1 or 3 release
2945 */ 2861 */
2946void 2862void
2947rxvt_term::selection_make (Time tm) 2863rxvt_term::selection_make (Time tm)
2948{ 2864{
2949 int i, col, end_col, row, end_row; 2865 int i;
2950 wchar_t *new_selection_text; 2866 wchar_t *new_selection_text;
2951 text_t *t; 2867 text_t *t;
2952 2868
2953 switch (selection.op) 2869 switch (selection.op)
2954 { 2870 {
… …
2967 selection.op = SELECTION_DONE; 2883 selection.op = SELECTION_DONE;
2968 2884
2969 if (selection.clicks == 4) 2885 if (selection.clicks == 4)
2970 return; /* nothing selected, go away */ 2886 return; /* nothing selected, go away */
2971 2887
2888 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2889 return;
2890
2972 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2891 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2973 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2892 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2974 2893
2975 col = selection.beg.col;
2976 row = selection.beg.row + saveLines;
2977 end_row = selection.end.row + saveLines;
2978 int ofs = 0; 2894 int ofs = 0;
2979 int extra = 0; 2895 int extra = 0;
2980 2896
2897 int col = selection.beg.col;
2898 int row = selection.beg.row;
2899
2900 int end_col;
2901
2981 for (; row <= end_row; row++, col = 0) 2902 for (; row <= selection.end.row; row++, col = 0)
2982 { 2903 {
2983#if ENABLE_FRILLS 2904#if ENABLE_FRILLS
2984 if (selection.rect) 2905 if (selection.rect)
2985 { 2906 {
2986 col = selection.beg.col; 2907 col = selection.beg.col;
2987 end_col = ncol + 1; 2908 end_col = ncol + 1;
2988 } 2909 }
2989 else 2910 else
2990#endif 2911#endif
2991 end_col = save[row].is_cont () ? ncol : save[row].l; //TODO//FIXME 2912 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2992 2913
2993 MAX_IT (col, 0); 2914 col = max (col, 0);
2994 2915
2995 if (row == end_row || selection.rect) 2916 if (row == selection.end.row
2917#if ENABLE_FRILLS
2918 || selection.rect
2919#endif
2920 )
2996 MIN_IT (end_col, selection.end.col); 2921 min_it (end_col, selection.end.col);
2997 2922
2998 t = &save[row].t[col]; 2923 t = ROW(row).t + col;
2999 for (; col < end_col; col++) 2924 for (; col < end_col; col++)
3000 { 2925 {
3001 if (*t == NOCHAR) 2926 if (*t == NOCHAR)
3002 t++; 2927 t++;
3003#if ENABLE_COMBINING 2928#if ENABLE_COMBINING
… …
3019#endif 2944#endif
3020 else 2945 else
3021 new_selection_text[ofs++] = *t++; 2946 new_selection_text[ofs++] = *t++;
3022 } 2947 }
3023 2948
3024 if (save[row].l != -1 && row != end_row) 2949#if ENABLE_FRILLS
2950 if (selection.rect)
2951 {
2952 while (ofs
2953 && new_selection_text[ofs - 1] != C0_LF
2954 && unicode::is_space (new_selection_text[ofs - 1]))
2955 --ofs;
2956
3025 new_selection_text[ofs++] = C0_LF; 2957 new_selection_text[ofs++] = C0_LF;
2958 }
2959 else
2960#endif
2961 if (!ROW(row).is_longer () && row != selection.end.row)
2962 new_selection_text[ofs++] = C0_LF;
3026 } 2963 }
3027 2964
3028 if (end_col != selection.end.col) 2965 if (end_col != selection.end.col)
3029 new_selection_text[ofs++] = C0_LF; 2966 new_selection_text[ofs++] = C0_LF;
3030 2967
… …
3040 2977
3041 // we usually allocate much more than necessary, so realloc it smaller again 2978 // we usually allocate much more than necessary, so realloc it smaller again
3042 selection.len = ofs; 2979 selection.len = ofs;
3043 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2980 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3044 2981
2982 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2983 return;
2984
2985 selection_grab (tm);
2986}
2987
2988bool
2989rxvt_term::selection_grab (Time tm)
2990{
2991 selection_time = tm;
2992
3045 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 2993 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3046 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 2994 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
2995 {
3047 display->set_selection_owner (this); 2996 display->set_selection_owner (this);
2997 return true;
2998 }
3048 else 2999 else
3049 rxvt_warn ("can't get primary selection, ignoring.\n"); 3000 return false;
3050 3001
3051#if 0 3002#if 0
3052 XTextProperty ct; 3003 XTextProperty ct;
3053 3004
3054 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3005 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3055 { 3006 {
3056 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3007 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3057 XFree (ct.value); 3008 XFree (ct.value);
3058 } 3009 }
3059#endif 3010#endif
3060
3061 selection_time = tm;
3062} 3011}
3063 3012
3064/* ------------------------------------------------------------------------- */ 3013/* ------------------------------------------------------------------------- */
3065/* 3014/*
3066 * Mark or select text based upon number of clicks: 1, 2, or 3 3015 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3088 */ 3037 */
3089void 3038void
3090rxvt_term::selection_start_colrow (int col, int row) 3039rxvt_term::selection_start_colrow (int col, int row)
3091{ 3040{
3092 want_refresh = 1; 3041 want_refresh = 1;
3042
3043 selection.mark.row = row - view_start;
3093 selection.mark.col = col; 3044 selection.mark.col = col;
3094 selection.mark.row = row - view_start;
3095 3045
3096 MAX_IT (selection.mark.row, - (int32_t)nscrolled); 3046 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3097 MIN_IT (selection.mark.row, (int32_t)nrow - 1); 3047 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3098 MAX_IT (selection.mark.col, 0);
3099 MIN_IT (selection.mark.col, (int32_t)ncol - 1);
3100 3048
3101 while (selection.mark.col > 0 3049 while (selection.mark.col > 0
3102 && save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR) 3050 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3103 --selection.mark.col; 3051 --selection.mark.col;
3104 3052
3105 if (selection.op) 3053 if (selection.op)
3106 { /* clear the old selection */ 3054 { /* clear the old selection */
3107 selection.beg.row = selection.end.row = selection.mark.row; 3055 selection.beg.row = selection.end.row = selection.mark.row;
… …
3131 text_t *stp; 3079 text_t *stp;
3132 rend_t *srp; 3080 rend_t *srp;
3133 3081
3134 if (dirn == UP) 3082 if (dirn == UP)
3135 { 3083 {
3136 bound.row = saveLines - nscrolled - 1; 3084 bound.row = - nsaved - 1;
3137 bound.col = 0; 3085 bound.col = 0;
3138 dirnadd = -1; 3086 dirnadd = -1;
3139 } 3087 }
3140 else 3088 else
3141 { 3089 {
3142 bound.row = saveLines + nrow; 3090 bound.row = nrow;
3143 bound.col = ncol - 1; 3091 bound.col = ncol - 1;
3144 dirnadd = 1; 3092 dirnadd = 1;
3145 } 3093 }
3146 3094
3147 row = mark->row + saveLines; 3095 row = mark->row;
3148 col = mark->col; 3096 col = max (mark->col, 0);
3149 MAX_IT (col, 0); 3097
3150 /* find the edge of a word */ 3098 /* find the edge of a word */
3151 stp = &save[row].t[col]; 3099 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3152 w1 = DELIMIT_TEXT (*stp); 3100 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3153
3154 srp = &save[row].r[col];
3155 w2 = DELIMIT_REND (*srp);
3156 3101
3157 for (;;) 3102 for (;;)
3158 { 3103 {
3159 for (; col != bound.col; col += dirnadd) 3104 for (; col != bound.col; col += dirnadd)
3160 { 3105 {
… …
3170 break; 3115 break;
3171 } 3116 }
3172 3117
3173 if ((col == bound.col) && (row != bound.row)) 3118 if ((col == bound.col) && (row != bound.row))
3174 { 3119 {
3175 if (save[ (row - (dirn == UP ? 1 : 0))].is_cont ()) 3120 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3176 { 3121 {
3177 trow = row + dirnadd; 3122 trow = row + dirnadd;
3178 tcol = dirn == UP ? ncol - 1 : 0; 3123 tcol = dirn == UP ? ncol - 1 : 0;
3179 3124
3180 if (save[trow].t == NULL) 3125 if (!ROW(trow).t)
3181 break; 3126 break;
3182 3127
3183 stp = & (save[trow].t[tcol]); 3128 stp = ROW(trow).t + tcol;
3184 srp = & (save[trow].r[tcol]); 3129 srp = ROW(trow).r + tcol;
3185 3130
3186 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3131 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3187 break; 3132 break;
3188 3133
3189 row = trow; 3134 row = trow;
… …
3192 } 3137 }
3193 } 3138 }
3194 break; 3139 break;
3195 } 3140 }
3196 3141
3197Old_Word_Selection_You_Die:
3198 if (dirn == DN) 3142 if (dirn == DN)
3199 col++; /* put us on one past the end */ 3143 col++; /* put us on one past the end */
3200 3144
3201 /* Poke the values back in */ 3145 /* Poke the values back in */
3202 ret->row = row - saveLines; 3146 ret->row = row;
3203 ret->col = col; 3147 ret->col = col;
3204} 3148}
3205 3149
3206/* ------------------------------------------------------------------------- */ 3150/* ------------------------------------------------------------------------- */
3207/* 3151/*
… …
3212 * flag == 2 ==> button 3 motion 3156 * flag == 2 ==> button 3 motion
3213 */ 3157 */
3214void 3158void
3215rxvt_term::selection_extend (int x, int y, int flag) 3159rxvt_term::selection_extend (int x, int y, int flag)
3216{ 3160{
3217 int col, row; 3161 int col = clamp (Pixel2Col (x), 0, ncol);
3218 3162 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3219 col = Pixel2Col (x);
3220 row = Pixel2Row (y);
3221 MAX_IT (row, 0);
3222 MIN_IT (row, (int)nrow - 1);
3223 MAX_IT (col, 0);
3224 MIN_IT (col, (int)ncol);
3225 3163
3226 /* 3164 /*
3227 * 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
3228 * 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
3229 * 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
… …
3254 * Extend the selection to the specified col/row 3192 * Extend the selection to the specified col/row
3255 */ 3193 */
3256void 3194void
3257rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3195rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3258{ 3196{
3259 int end_col;
3260 row_col_t pos; 3197 row_col_t pos;
3261 enum { 3198 enum {
3262 LEFT, RIGHT 3199 LEFT, RIGHT
3263 } closeto = RIGHT; 3200 } closeto = RIGHT;
3264 3201
… …
3295 selection.beg.col = selection.end.col = selection.mark.col; 3232 selection.beg.col = selection.end.col = selection.mark.col;
3296 selection.beg.row = selection.end.row = selection.mark.row; 3233 selection.beg.row = selection.end.row = selection.mark.row;
3297 } 3234 }
3298 3235
3299 pos.col = col; 3236 pos.col = col;
3300 pos.row = row; 3237 pos.row = row - view_start;
3301
3302 pos.row -= view_start; /* adjust for scroll */
3303 3238
3304 /* 3239 /*
3305 * 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
3306 * in the way button3 drag extension works. 3241 * in the way button3 drag extension works.
3307 * We're either doing: button1 drag; button3 press; or button3 drag 3242 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3366 } 3301 }
3367 } 3302 }
3368 3303
3369 if (selection.clicks == 1) 3304 if (selection.clicks == 1)
3370 { 3305 {
3371 end_col = save[selection.beg.row + saveLines].l; 3306 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3372 3307 && !ROW(selection.beg.row).is_longer ()
3373 if (selection.beg.col > end_col
3374 && end_col != -1
3375#if ENABLE_FRILLS 3308#if ENABLE_FRILLS
3376 && !selection.rect 3309 && !selection.rect
3377#endif 3310#endif
3378 ) 3311 )
3379 selection.beg.col = ncol; 3312 selection.beg.col = ncol;
3380 3313
3381 end_col = save[selection.end.row + saveLines].l;
3382
3383 if ( 3314 if (
3384 selection.end.col > end_col 3315 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3385 && end_col != -1 3316 && !ROW(selection.end.row).is_longer ()
3386#if ENABLE_FRILLS 3317#if ENABLE_FRILLS
3387 && !selection.rect 3318 && !selection.rect
3388#endif 3319#endif
3389 ) 3320 )
3390 selection.end.col = ncol; 3321 selection.end.col = ncol;
… …
3392 else if (selection.clicks == 2) 3323 else if (selection.clicks == 2)
3393 { 3324 {
3394 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3325 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3395 selection.end.col--; 3326 selection.end.col--;
3396 3327
3328 if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3329 {
3397 selection_delimit_word (UP, &selection.beg, &selection.beg); 3330 selection_delimit_word (UP, &selection.beg, &selection.beg);
3398 selection_delimit_word (DN, &selection.end, &selection.end); 3331 selection_delimit_word (DN, &selection.end, &selection.end);
3332 }
3399 } 3333 }
3400 else if (selection.clicks == 3) 3334 else if (selection.clicks == 3)
3401 { 3335 {
3402#if ENABLE_FRILLS 3336#if ENABLE_FRILLS
3403 if (options & Opt_tripleclickwords) 3337 if (OPTION (Opt_tripleclickwords))
3404 { 3338 {
3405 int end_row;
3406
3407 selection_delimit_word (UP, &selection.beg, &selection.beg); 3339 selection_delimit_word (UP, &selection.beg, &selection.beg);
3408 end_row = save[selection.mark.row + saveLines].l;
3409 3340
3410 for (end_row = selection.mark.row; end_row < nrow; end_row++) 3341 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3411 { 3342 {
3412 end_col = save[end_row + saveLines].l; 3343 if (!ROW(end_row).is_longer ())
3413
3414 if (end_col != -1)
3415 { 3344 {
3416 selection.end.row = end_row; 3345 selection.end.row = end_row;
3417 selection.end.col = end_col; 3346 selection.end.col = ROW(end_row).l;
3418 selection_remove_trailing_spaces (); 3347 selection_remove_trailing_spaces ();
3419 break; 3348 break;
3420 } 3349 }
3421 } 3350 }
3422 } 3351 }
… …
3429 selection.beg.col = 0; 3358 selection.beg.col = 0;
3430 selection.end.col = ncol; 3359 selection.end.col = ncol;
3431 3360
3432 // select a complete logical line 3361 // select a complete logical line
3433 while (selection.beg.row > -saveLines 3362 while (selection.beg.row > -saveLines
3434 && save[selection.beg.row - 1 + saveLines].is_cont ()) 3363 && ROW(selection.beg.row - 1).is_longer ())
3435 selection.beg.row--; 3364 selection.beg.row--;
3436 3365
3437 while (selection.end.row < nrow 3366 while (selection.end.row < nrow
3438 && save[selection.end.row + saveLines].is_cont ()) 3367 && ROW(selection.end.row).is_longer ())
3439 selection.end.row++; 3368 selection.end.row++;
3440 } 3369 }
3441 } 3370 }
3442 3371
3443 if (button3 && buttonpress) 3372 if (button3 && buttonpress)
… …
3454 } 3383 }
3455 } 3384 }
3456 3385
3457#if ENABLE_FRILLS 3386#if ENABLE_FRILLS
3458 if (selection.rect && selection.beg.col > selection.end.col) 3387 if (selection.rect && selection.beg.col > selection.end.col)
3459 SWAP_IT (selection.beg.col, selection.end.col, int); 3388 ::swap (selection.beg.col, selection.end.col);
3460#endif 3389#endif
3461} 3390}
3462 3391
3463#if ENABLE_FRILLS 3392#if ENABLE_FRILLS
3464void 3393void
… …
3468 text_t *stp; 3397 text_t *stp;
3469 3398
3470 end_col = selection.end.col; 3399 end_col = selection.end.col;
3471 end_row = selection.end.row; 3400 end_row = selection.end.row;
3472 3401
3473 for ( ; end_row >= selection.beg.row; ) 3402 for (; end_row >= selection.beg.row; )
3474 { 3403 {
3475 stp = save[end_row + saveLines].t; 3404 stp = ROW(end_row).t;
3476 3405
3477 while (--end_col >= 0) 3406 while (--end_col >= 0)
3478 { 3407 {
3479 if (stp[end_col] != ' ' 3408 if (stp[end_col] != NOCHAR
3480 && stp[end_col] != '\t' 3409 && !unicode::is_space (stp[end_col]))
3481 && stp[end_col] != NOCHAR)
3482 break; 3410 break;
3483 } 3411 }
3484 3412
3485 if (end_col >= 0 3413 if (end_col >= 0
3486 || save[end_row - 1 + saveLines].l != -1) 3414 || !ROW(end_row - 1).is_longer ())
3487 { 3415 {
3488 selection.end.col = end_col + 1; 3416 selection.end.col = end_col + 1;
3489 selection.end.row = end_row; 3417 selection.end.row = end_row;
3490 break; 3418 break;
3491 } 3419 }
… …
3662 */ 3590 */
3663void 3591void
3664rxvt_term::pixel_position (int *x, int *y) 3592rxvt_term::pixel_position (int *x, int *y)
3665{ 3593{
3666 *x = Pixel2Col (*x); 3594 *x = Pixel2Col (*x);
3667 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3595 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3668 *y = Pixel2Row (*y); 3596 *y = Pixel2Row (*y);
3669 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3597 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3670} 3598}
3671 3599
3672/* ------------------------------------------------------------------------- */ 3600/* ------------------------------------------------------------------------- */
3673#ifdef USE_XIM 3601#ifdef USE_XIM
3674void 3602void
… …
3685 3613
3686#if ENABLE_OVERLAY 3614#if ENABLE_OVERLAY
3687void 3615void
3688rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3616rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3689{ 3617{
3690 if (nrow < 3 || ncol < 3) 3618 if (nrow < 1 || ncol < 1)
3691 return; 3619 return;
3692 3620
3693 want_refresh = 1; 3621 want_refresh = 1;
3694 3622
3695 scr_overlay_off (); 3623 scr_overlay_off ();
3696 3624
3697 if (x < 0) x = ncol - w; 3625 if (x < 0) x = ncol - w;
3698 if (y < 0) y = nrow - h; 3626 if (y < 0) y = nrow - h;
3699 3627
3700 // make space for border 3628 // make space for border
3701 w += 2; MIN_IT (w, ncol); 3629 w += 2; min_it (w, ncol);
3702 h += 2; MIN_IT (h, nrow); 3630 h += 2; min_it (h, nrow);
3703 3631
3704 x -= 1; MAX_IT (x, 0); 3632 x -= 1; clamp_it (x, 0, ncol - w);
3705 y -= 1; MAX_IT (y, 0); 3633 y -= 1; clamp_it (y, 0, nrow - h);
3706
3707 MIN_IT (x, ncol - w);
3708 MIN_IT (y, nrow - h);
3709 3634
3710 ov_x = x; ov_y = y; 3635 ov_x = x; ov_y = y;
3711 ov_w = w; ov_h = h; 3636 ov_w = w; ov_h = h;
3712 3637
3713 ov_text = new text_t *[h]; 3638 ov_text = new text_t *[h];
… …
3799rxvt_term::scr_swap_overlay () 3724rxvt_term::scr_swap_overlay ()
3800{ 3725{
3801 if (!ov_text) 3726 if (!ov_text)
3802 return; 3727 return;
3803 3728
3804 int row_offset = ov_y + saveLines - view_start;
3805
3806 // swap screen mem with overlay 3729 // swap screen mem with overlay
3807 for (int y = ov_h; y--; ) 3730 for (int y = ov_h; y--; )
3808 { 3731 {
3809 text_t *t1 = ov_text[y]; 3732 text_t *t1 = ov_text[y];
3810 rend_t *r1 = ov_rend[y]; 3733 rend_t *r1 = ov_rend[y];
3811 3734
3812 text_t *t2 = save[y + row_offset].t + ov_x; 3735 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3813 rend_t *r2 = save[y + row_offset].r + ov_x; 3736 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3814 3737
3815 for (int x = ov_w; x--; ) 3738 for (int x = ov_w; x--; )
3816 { 3739 {
3817 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3740 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3818 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3741 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3820 } 3743 }
3821} 3744}
3822 3745
3823#endif 3746#endif
3824/* ------------------------------------------------------------------------- */ 3747/* ------------------------------------------------------------------------- */
3748

Diff Legend

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