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.179 by root, Tue Dec 20 22:47:14 2005 UTC vs.
Revision 1.216 by root, Mon Jan 9 18:51:19 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
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() \
… …
123 lalloc (l); 124 lalloc (l);
124 col = 0; 125 col = 0;
125 width = ncol; 126 width = ncol;
126 } 127 }
127 128
129 l.touch ();
130
128 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
129 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
130 133
131 text_t *et = l.t + col; 134 text_t *et = l.t + col;
132 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
142/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
143void 146void
144rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
145{ 148{
146 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
147} 153}
148 154
149/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
158
152void 159void
153rxvt_term::scr_reset () 160rxvt_term::scr_reset ()
154{ 161{
155 unsigned int p, q;
156 int k;
157
158#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
159 scr_overlay_off (); 163 scr_overlay_off ();
160#endif 164#endif
161 165
162 view_start = 0; 166 view_start = 0;
… …
172 return; 176 return;
173 177
174 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
175 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
176 { 180 {
181 //TODO//FIXME
177 saveLines++; 182 saveLines++;
178 prev_nrow--; 183 prev_nrow--;
179 nsaved++; 184 nsaved++;
180 } 185 }
181 186
… …
185 total_rows = nrow + saveLines; 190 total_rows = nrow + saveLines;
186 191
187 screen.tscroll = 0; 192 screen.tscroll = 0;
188 screen.bscroll = nrow - 1; 193 screen.bscroll = nrow - 1;
189 194
190 if (!save) 195 if (!row_buf)
191 { 196 {
192 /* 197 /*
193 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
194 * Note: this is still needed so that all the scrollback lines are NULL 199 * Note: this is still needed so that all the scrollback lines are NULL
195 */ 200 */
… …
197 term_start = 0; 202 term_start = 0;
198 203
199 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 204 talloc = new rxvt_salloc (ncol * sizeof (text_t));
200 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 205 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
201 206
202 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 207 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
208 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
204 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 211
207 for (p = nrow; p--; ) 212 for (int row = nrow; row--; )
208 { 213 {
209 scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE); 214 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 215 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
211 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 216 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
212 } 217 }
213 218
214 memset (charsets, 'B', sizeof (charsets)); 219 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 220 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 221 screen.flags = Screen_DefaultFlags;
… …
240 { 245 {
241 /* 246 /*
242 * add or delete rows as appropriate 247 * add or delete rows as appropriate
243 */ 248 */
244 249
245 rxvt_salloc *old_ta; 250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
246 rxvt_salloc *old_ra; 251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
247 252
253#if 0
248 if (nrow < prev_nrow) 254 if (nrow < prev_nrow)
249 { 255 {
250 /* delete rows */
251 k = min (nsaved, prev_nrow - nrow);
252 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
253 scr_scroll_text (0, (int)prev_nrow - 1, k);
254
255 for (p = nrow; p < prev_nrow; p++) 256 for (int row = nrow; row < prev_nrow; row++)
256 { 257 {
257 lfree (ROW(p));
258 lfree (swap_save[p]); 258 lfree (swap_buf [row]);
259 lfree (drawn[p]); 259 lfree (drawn_buf[row]);
260 } 260 }
261 }
262#endif
261 263
262 /* we have fewer rows so fix up cursor position */ 264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 265 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
266 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264 267
265 scr_reset_realloc (); /* realloc _last_ */ 268 for (int row = min (nrow, prev_nrow); row--; )
269 {
270 lresize (drawn_buf[row]);
271 lresize (swap_buf [row]);
272 }
273
274 for (int row = prev_nrow; row < nrow; row++)
275 {
276 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
277 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
278 }
279
280 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
266 } 281
267 else if (nrow > prev_nrow) 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start - nsaved , prev_total_rows);
284 int q = total_rows; // rewrapped row
285
286 if (nsaved)
287 {
288 // re-wrap lines, this is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm.
290
291 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293
268 { 294 do
269 /* add rows */
270 scr_reset_realloc (); /* realloc _first_ */
271
272 int ocol = ncol;
273 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
274
275 k = min (nsaved, nrow - prev_nrow);
276
277 for (p = prev_total_rows; p < total_rows; p++)
278 save[p].clear ();
279
280 for (p = prev_total_rows; p < total_rows - k; p++)
281 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
282
283 for (p = prev_nrow; p < nrow; p++)
284 { 295 {
285 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 296 p = MOD (p - 1, prev_total_rows);
286 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
287 }
288
289 if (k > 0)
290 {
291 scr_scroll_text (0, (int)nrow - 1, -k);
292 screen.cur.row += k;
293 screen.s_cur.row += k;
294 nsaved -= k;
295 }
296
297#ifdef DEBUG_STRICT 297#ifdef DEBUG_STRICT
298 assert (screen.cur.row < nrow); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
299#else /* drive with your eyes closed */
300 MIN_IT (screen.cur.row, nrow - 1);
301#endif 299#endif
302 ncol = ocol; // save b/c scr_blank_screen_mem uses this
303 }
304
305 /* resize columns */
306 if (ncol != prev_ncol)
307 {
308 old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
309 old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
310
311 for (p = total_rows; p--; )
312 lresize (save[p]);
313
314 for (p = nrow; p--; )
315 {
316 lresize (drawn[p]);
317 lresize (swap_save[p]);
318 }
319
320 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
321
322 delete old_ta;
323 delete old_ra;
324 }
325
326#if 0
327 // re-wrap lines, this is rather ugly, possibly because I am too dumb
328 // to come up with a lean and mean algorithm.
329 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
330 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
331
332 text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
333 rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
334 tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
335
336 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
337
338 p = prev_total_rows;
339 q = total_rows;
340
341 while (p > 0 && q > 0)
342 {
343 --p;
344
345 printf ("pq %d:%d\n", p, q);
346 if (save[p].t)
347 {
348 int llen = save[p].l; 300 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l;
349 302
350 assert (llen >= 0); 303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
351
352 while (p && save[p - 1].l < 0)
353 { 304 {
305 p = MOD (p - 1, prev_total_rows);
306
354 --p; 307 plines++;
355 llen += prev_ncol; 308 llen += prev_ncol;
356 } 309 }
357 310
358 int qlines = llen / ncol + 1; 311 int qlines = max (0, (llen - 1) / ncol) + 1;
312
313 // drop partial lines completely
314 if (q < qlines)
315 break;
316
317 q -= qlines;
318
359 int lofs = 0; 319 int lofs = 0;
320 line_t *qline;
360 321
361 q -= qlines; 322 // re-assemble the full line by destination lines
362
363 int qrow = q;
364
365 printf ("QL %d llen %d\n", qlines, llen);//D
366 for (; qlines--; qrow++) 323 for (int qrow = q; qlines--; qrow++)
367 { 324 {
325 qline = row_buf + qrow;
326 lalloc (*qline);
327 qline->l = ncol;
328 qline->is_longer (1);
329
368 if (qrow >= 0) 330 int qcol = 0;
331
332 // fill a single destination line
333 while (lofs < llen && qcol < ncol)
369 { 334 {
370 tp [qrow] = (text_t *)ta->alloc ();
371 rp [qrow] = (rend_t *)ra->alloc ();
372 tl [qrow] = LINE_CONT1;
373
374 int qcol = 0;
375
376 for (;;)
377 {
378 int prow = lofs / prev_ncol + p; 335 int prow = lofs / prev_ncol;
379 int pcol = lofs % prev_ncol; 336 int pcol = lofs % prev_ncol;
380 337
338 prow = MOD (p + prow, prev_total_rows);
339
340 // we only adjust the cursor _row_ and put it into
341 // the topmost line of "long line" it was in, as
342 // this seems to upset applications/shells/readline
343 // least.
344 if (prow == ocur.row)
345 screen.cur.row = q - (total_rows - nrow);
346
347 line_t &pline = old_buf [prow];
348
381 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 349 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
382 350
383 printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol);
384
385 if (len <= 0)
386 {
387 tl [qrow] = qcol;
388
389 TODO
390 scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
391 ncol - qcol, DEFAULT_RSTYLE);
392
393 break;
394 }
395
396 assert (lofs < 1000); 351 assert (len);
352 assert (pline.t);
397 353
398 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
399 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
400 356
401 lofs += len; 357 lofs += len;
402 qcol += len; 358 qcol += len;
403
404 if (qcol == ncol)
405 break;
406 }
407 } 359 }
408 else
409 lofs += ncol;
410 } 360 }
361
362 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
363 qline->is_longer (0);
364 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
411 } 365 }
366 while (p != pend && q > 0);
367
368 term_start = total_rows - nrow;
369 nsaved = term_start - q;
370
371 // make sure all terminal lines exist
372 while (nsaved < 0)
373 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
374 }
375 else
412 } 376 {
377 // if no scrollback exists (yet), wing, instead of wrap
378
379 for (int row = min (nrow, prev_nrow); row--; )
380 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row];
413 383
414 free (screen.text); screen.text = tp; 384 qline = pline;
415 free (screen.rend); screen.rend = rp; 385 lresize (qline);
416 free (screen.tlen); screen.tlen = tl; 386 }
417 387
418 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 388 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392
393 term_start = 0;
394 }
395
396#ifdef DEBUG_STRICT //TODO: remove
397 for (int i = -nsaved; i < nrow; i++)
398 assert (ROW (i).t);
419#endif 399#endif
400
401 free (old_buf);
402 delete old_ta;
403 delete old_ra;
404
405 clamp_it (screen.cur.row, 0, nrow - 1);
406 clamp_it (screen.cur.col, 0, ncol - 1);
420 407
421 if (tabs) 408 if (tabs)
422 free (tabs); 409 free (tabs);
423 } 410 }
424 411
425 prev_nrow = nrow; 412 prev_nrow = nrow;
426 prev_ncol = ncol; 413 prev_ncol = ncol;
427 414
428 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 415 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
429 416
430 for (p = 0; p < ncol; p++) 417 for (int col = ncol; col--; )
431 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 418 tabs [col] = col % TABSIZE == 0;
432 419
433 tt_winch (); 420 tt_winch ();
434}
435 421
436void 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
437rxvt_term::scr_reset_realloc ()
438{
439 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
440 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
441 buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
442 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
443} 423}
444 424
445/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
446/* 426/*
447 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
… …
450rxvt_term::scr_release () 430rxvt_term::scr_release ()
451{ 431{
452 delete talloc; talloc = 0; 432 delete talloc; talloc = 0;
453 delete ralloc; ralloc = 0; 433 delete ralloc; ralloc = 0;
454 434
455 free (save); 435 free (row_buf);
456 free (swap_save); 436 free (swap_buf);
457 free (drawn); 437 free (drawn_buf);
458 free (buf); 438 free (temp_buf);
459 free (tabs); 439 free (tabs);
440
441 row_buf = 0; // signal that we freed all the arrays
460} 442}
461 443
462/* ------------------------------------------------------------------------- */ 444/* ------------------------------------------------------------------------- */
463/* 445/*
464 * Hard reset 446 * Hard reset
… …
515 set_font_style (); 497 set_font_style ();
516 break; 498 break;
517 } 499 }
518 500
519 /* boundary check in case screen size changed between SAVE and RESTORE */ 501 /* boundary check in case screen size changed between SAVE and RESTORE */
520 MIN_IT (s->cur.row, nrow - 1); 502 min_it (s->cur.row, nrow - 1);
521 MIN_IT (s->cur.col, ncol - 1); 503 min_it (s->cur.col, ncol - 1);
522#ifdef DEBUG_STRICT 504#ifdef DEBUG_STRICT
523 assert (s->cur.row >= 0); 505 assert (s->cur.row >= 0);
524 assert (s->cur.col >= 0); 506 assert (s->cur.col >= 0);
525#else /* drive with your eyes closed */
526 MAX_IT (s->cur.row, 0);
527 MAX_IT (s->cur.col, 0);
528#endif 507#endif
529} 508}
530 509
531/* ------------------------------------------------------------------------- */ 510/* ------------------------------------------------------------------------- */
532/* 511/*
… …
543 if (current_screen == scrn) 522 if (current_screen == scrn)
544 return scrn; 523 return scrn;
545 524
546 selection_check (2); /* check for boundary cross */ 525 selection_check (2); /* check for boundary cross */
547 526
548 SWAP_IT (scrn, current_screen, int); 527 int i = current_screen; current_screen = scrn; scrn = i;
549 528
550 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 529 ::swap (screen.cur.row, swap.cur.row);
551 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 530 ::swap (screen.cur.col, swap.cur.col);
552 MAX_IT (screen.cur.row, 0); 531
553 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 532 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
554 MAX_IT (screen.cur.col, 0); 533 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
555 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
556 534
557#if NSCREENS 535#if NSCREENS
558 if (options & Opt_secondaryScreen) 536 if (OPTION (Opt_secondaryScreen))
559 { 537 {
560 num_scr = 0; 538 num_scr = 0;
561 539
562 for (int i = nrow; i--; ) 540 for (int i = prev_nrow; i--; )
563 SWAP_IT (ROW(i), swap_save[i], line_t); 541 ::swap (ROW(i), swap_buf [i]);
564 542
565 SWAP_IT (screen.charset, swap.charset, int16_t); 543 ::swap (screen.charset, swap.charset);
566 SWAP_IT (screen.flags, swap.flags, int); 544 ::swap (screen.flags, swap.flags);
567 screen.flags |= Screen_VisibleCursor; 545 screen.flags |= Screen_VisibleCursor;
568 swap.flags |= Screen_VisibleCursor; 546 swap.flags |= Screen_VisibleCursor;
569 } 547 }
570 else 548 else
571#endif 549#endif
572 if (options & Opt_secondaryScroll) 550 if (OPTION (Opt_secondaryScroll))
573 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 551 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
574 552
575 return scrn; 553 return scrn;
576} 554}
577 555
… …
639 num_scr += count; 617 num_scr += count;
640 618
641 if (count > 0 619 if (count > 0
642 && row1 == 0 620 && row1 == 0
643 && row2 == nrow - 1 621 && row2 == nrow - 1
644 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 622 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
645 { 623 {
646 nsaved = min (nsaved + count, saveLines); 624 nsaved = min (nsaved + count, saveLines);
625
626 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
627
647 term_start = (term_start + count) % total_rows; 628 term_start = (term_start + count) % total_rows;
648 629
649 if (selection.op && current_screen == selection.screen) 630 if (selection.op && current_screen == selection.screen)
650 { 631 {
651 selection.beg.row -= count; 632 selection.beg.row -= count;
652 selection.end.row -= count; 633 selection.end.row -= count;
653 selection.mark.row -= count; 634 selection.mark.row -= count;
654 635
655 selection_check (0); 636 if (selection.beg.row < -nsaved
637 || selection.end.row < -nsaved
638 || selection.mark.row < -nsaved)
639 {
640 CLEAR_ALL_SELECTION ();
641 selection.op = SELECTION_CLEAR;
642 }
656 } 643 }
657 644
658 for (int i = count; i--; ) 645 for (int i = count; i--; )
659 scr_blank_screen_mem (ROW(row2 - i), rstyle); 646 {
647 // basically thi is a slightly optimized scr_blank_screen_mem
648 // it is worth the effort on slower machines
649 line_t &l = ROW(row2 - i);
650
651 scr_blank_line (l, 0, l.l, rstyle);
652
653 l.l = 0;
654 l.f = 0;
655 }
660 656
661 if ((options & Opt_scrollWithBuffer) 657 if (OPTION (Opt_scrollWithBuffer)
662 && view_start != 0 658 && view_start != 0
663 && view_start != saveLines) 659 && view_start != saveLines)
664 scr_page (UP, count); 660 scr_page (UP, count);
665 } 661 }
666 else 662 else
667 { 663 {
668 if (selection.op && current_screen == selection.screen) 664 if (selection.op && current_screen == selection.screen)
669 { 665 {
670 int i = selection.beg.row; 666 if ((selection.beg.row < row1 && selection.end.row > row1)
671 int j = selection.end.row; 667 || (selection.beg.row < row2 && selection.end.row > row2)
672
673 if ((i < row1 && j > row1)
674 || (i < row2 && j > row2)
675 || (i - count < row1 && i >= row1) 668 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
676 || (i - count > row2 && i <= row2) 669 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
677 || (j - count < row1 && j >= row1) 670 || (selection.end.row - count < row1 && selection.end.row >= row1)
678 || (j - count > row2 && j <= row2)) 671 || (selection.end.row - count > row2 && selection.end.row <= row2))
679 { 672 {
680 CLEAR_ALL_SELECTION (); 673 CLEAR_ALL_SELECTION ();
681 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 674 selection.op = SELECTION_CLEAR;
682 } 675 }
683 else if (j >= row1 && j <= row2) 676 else if (selection.end.row >= row1 && selection.end.row <= row2)
684 { 677 {
685 /* move selected region too */ 678 /* move selected region too */
686 selection.beg.row -= count; 679 selection.beg.row -= count;
687 selection.end.row -= count; 680 selection.end.row -= count;
688 selection.mark.row -= count; 681 selection.mark.row -= count;
… …
694 // use a simple and robust scrolling algorithm, this 687 // use a simple and robust scrolling algorithm, this
695 // part of scr_scroll_text is not time-critical. 688 // part of scr_scroll_text is not time-critical.
696 689
697 int rows = row2 - row1 + 1; 690 int rows = row2 - row1 + 1;
698 691
692 min_it (count, rows);
693
699 for (int row = 0; row < rows; row++) 694 for (int row = 0; row < rows; row++)
700 { 695 {
701 buf [row] = ROW(row1 + (row + count + rows) % rows); 696 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
702 697
703 if (!IN_RANGE_EXC (row + count, 0, rows)) 698 if (!IN_RANGE_EXC (row + count, 0, rows))
704 scr_blank_screen_mem (buf [row], rstyle); 699 scr_blank_screen_mem (temp_buf [row], rstyle);
705 } 700 }
706 701
707 for (int row = 0; row < rows; row++) 702 for (int row = 0; row < rows; row++)
708 ROW(row1 + row) = buf [row]; 703 ROW(row1 + row) = temp_buf [row];
709 } 704 }
710 705
711 return count; 706 return count;
712} 707}
713 708
714/* ------------------------------------------------------------------------- */ 709/* ------------------------------------------------------------------------- */
715/* 710/*
716 * Add text given in <str> of length <len> to screen struct 711 * Add text given in <str> of length <len> to screen struct
717 */ 712 */
718void 713void
719rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 714rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
720{ 715{
721 if (len <= 0) /* sanity */ 716 if (len <= 0) /* sanity */
722 return; 717 return;
723 718
724 unsigned char checksel; 719 unsigned char checksel;
725 unicode_t c; 720 unicode_t c;
726 int row, last_col; 721 int ncol = this->ncol;
727 const unicode_t *strend = str + len; 722 const wchar_t *strend = str + len;
728 723
729 want_refresh = 1; 724 want_refresh = 1;
730 ZERO_SCROLLBACK (); 725 ZERO_SCROLLBACK ();
731 last_col = ncol;
732 726
733 if (nlines > 0) 727 if (minlines > 0)
734 { 728 {
735 nlines += screen.cur.row - screen.bscroll; 729 minlines += screen.cur.row - screen.bscroll;
730
736 if ((nlines > 0) 731 if (minlines > 0
737 && (screen.tscroll == 0) 732 && screen.tscroll == 0
738 && (screen.bscroll == (nrow - 1))) 733 && screen.bscroll == nrow - 1)
739 { 734 {
740 /* _at least_ this many lines need to be scrolled */ 735 /* _at least_ this many lines need to be scrolled */
741 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 736 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
742 screen.cur.row -= nlines; 737 screen.cur.row -= minlines;
743 } 738 }
744 } 739 }
745 740
746#ifdef DEBUG_STRICT 741#ifdef DEBUG_STRICT
747 assert (screen.cur.col < last_col); 742 assert (screen.cur.col < ncol);
748 assert ((screen.cur.row < nrow) 743 assert (screen.cur.row < nrow
749 && (screen.cur.row >= - (int32_t)nsaved)); 744 && screen.cur.row >= -nsaved);
750#else /* drive with your eyes closed */
751 MIN_IT (screen.cur.col, last_col - 1);
752 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
753 MAX_IT (screen.cur.row, - (int32_t)nsaved);
754#endif 745#endif
755 row = screen.cur.row; 746 int row = screen.cur.row;
756 747
757 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 748 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
758 749
759 line_t *line = &ROW(row); 750 line_t *line = &ROW(row);
760 751
761 while (str < strend) 752 while (str < strend)
762 { 753 {
763 c = *str++; 754 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
764 755
765 if (c < 0x20) 756 if (c < 0x20)
766 if (c == C0_LF) 757 if (c == C0_LF)
767 { 758 {
768 if (!line->is_longer ()) /* XXX: think about this */
769 MAX_IT (line->l, screen.cur.col); 759 max_it (line->l, screen.cur.col);
770 760
771 screen.flags &= ~Screen_WrapNext; 761 screen.flags &= ~Screen_WrapNext;
772 762
773 if (screen.cur.row == screen.bscroll) 763 if (screen.cur.row == screen.bscroll)
774 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 764 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
778 line = &ROW(row); /* _must_ refresh */ 768 line = &ROW(row); /* _must_ refresh */
779 continue; 769 continue;
780 } 770 }
781 else if (c == C0_CR) 771 else if (c == C0_CR)
782 { 772 {
783 if (!line->is_longer ()) /* XXX: think about this */
784 MAX_IT (line->l, screen.cur.col); 773 max_it (line->l, screen.cur.col);
785 774
786 screen.flags &= ~Screen_WrapNext; 775 screen.flags &= ~Screen_WrapNext;
787 screen.cur.col = 0; 776 screen.cur.col = 0;
788 continue; 777 continue;
789 } 778 }
… …
806 CLEAR_SELECTION (); 795 CLEAR_SELECTION ();
807 } 796 }
808 797
809 if (screen.flags & Screen_WrapNext) 798 if (screen.flags & Screen_WrapNext)
810 { 799 {
800 max_it (line->l, ncol);
811 line->set_is_longer (); 801 line->is_longer (1);
812 802
813 scr_do_wrap (); 803 scr_do_wrap ();
814 804
815 row = screen.cur.row; 805 row = screen.cur.row;
816 line = &ROW(row); /* _must_ refresh */ 806 line = &ROW(row); /* _must_ refresh */
… …
824 // do wcwidth before further replacements, as wcwidth might return -1 814 // do wcwidth before further replacements, as wcwidth might return -1
825 // for the line drawing characters below as they might be invalid in the current 815 // for the line drawing characters below as they might be invalid in the current
826 // locale. 816 // locale.
827 int width = c < 0x100 ? 1 : wcwidth (c); 817 int width = c < 0x100 ? 1 : wcwidth (c);
828 818
829 if (charsets[screen.charset] == '0') // DEC SPECIAL 819 if (charsets [screen.charset] == '0') // DEC SPECIAL
830 { 820 {
831 // vt100 special graphics and line drawing 821 // vt100 special graphics and line drawing
832 // 5f-7e standard vt100 822 // 5f-7e standard vt100
833 // 40-5e rxvt extension for extra curses acs chars 823 // 40-5e rxvt extension for extra curses acs chars
834 static uint16_t vt100_0[62] = { // 41 .. 7e 824 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
886 } 876 }
887 877
888 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 878 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
889 879
890 // if the character doesn't fit into the remaining columns... 880 // if the character doesn't fit into the remaining columns...
891 if (screen.cur.col > last_col - width && last_col >= width) 881 if (screen.cur.col > ncol - width && ncol >= width)
892 { 882 {
893 // ...output spaces 883 // ...output spaces
894 c = ' '; 884 c = ' ';
895 // and try the same character next loop iteration 885 // and try the same character next loop iteration
896 --str; 886 --str;
897 } 887 }
898 888
889 line->touch ();
890
899 do 891 do
900 { 892 {
901 line->t[screen.cur.col] = c; 893 line->t[screen.cur.col] = c;
902 line->r[screen.cur.col] = rend; 894 line->r[screen.cur.col] = rend;
903 895
904 if (screen.cur.col < last_col - 1) 896 if (screen.cur.col < ncol - 1)
905 screen.cur.col++; 897 screen.cur.col++;
906 else 898 else
907 { 899 {
908 line->l = last_col; 900 line->l = ncol;
909 if (screen.flags & Screen_Autowrap) 901 if (screen.flags & Screen_Autowrap)
910 screen.flags |= Screen_WrapNext; 902 screen.flags |= Screen_WrapNext;
911 break; 903 break;
912 } 904 }
913 905
… …
915 } 907 }
916 while (--width > 0); 908 while (--width > 0);
917 909
918 // pad with spaces when overwriting wide character with smaller one 910 // pad with spaces when overwriting wide character with smaller one
919 if (!width) 911 if (!width)
912 {
913 line->touch ();
914
920 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 915 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
921 { 916 {
922 line->t[c] = ' '; 917 line->t[c] = ' ';
923 line->r[c] = rend; 918 line->r[c] = rend;
924 } 919 }
920 }
925 } 921 }
926 else // width == 0 922 else // width == 0
927 { 923 {
928#if ENABLE_COMBINING 924#if ENABLE_COMBINING
929 // handle combining characters 925 // handle combining characters
930 // we just tag the accent on the previous on-screen character. 926 // we just tag the accent on the previous on-screen character.
931 // this is arguably not correct, but also arguably not wrong. 927 // this is arguably not correct, but also arguably not wrong.
932 // we don't handle double-width characters nicely yet. 928 // we don't handle double-width characters nicely yet.
929 line_t *linep;
933 text_t *tp; 930 text_t *tp;
934 rend_t *rp; 931 rend_t *rp;
935 932
936 if (screen.cur.col > 0) 933 if (screen.cur.col > 0)
937 { 934 {
935 linep = line;
938 tp = line->t + screen.cur.col - 1; 936 tp = line->t + screen.cur.col - 1;
939 rp = line->r + screen.cur.col - 1; 937 rp = line->r + screen.cur.col - 1;
940
941 while (*tp == NOCHAR && tp > line->t)
942 tp--, rp--;
943 } 938 }
944 else if (screen.cur.row > 0 939 else if (screen.cur.row > 0
945 && ROW(screen.cur.row - 1).is_longer ()) 940 && ROW(screen.cur.row - 1).is_longer ())
946 { 941 {
947 line_t *line = &ROW(screen.cur.row - 1); 942 linep = &ROW(screen.cur.row - 1);
948
949 tp = line->t + last_col - 1; 943 tp = line->t + ncol - 1;
950 rp = line->r + last_col - 1; 944 rp = line->r + ncol - 1;
951
952 while (*tp == NOCHAR && tp > line->t)
953 tp--, rp--;
954 } 945 }
955 else 946 else
956 continue; 947 continue;
948
949 linep->touch ();
950
951 while (*tp == NOCHAR && tp > linep->t)
952 tp--, rp--;
957 953
958 // first try to find a precomposed character 954 // first try to find a precomposed character
959 unicode_t n = rxvt_compose (*tp, c); 955 unicode_t n = rxvt_compose (*tp, c);
960 if (n == NOCHAR) 956 if (n == NOCHAR)
961 n = rxvt_composite.compose (*tp, c); 957 n = rxvt_composite.compose (*tp, c);
… …
964 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 960 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
965#endif 961#endif
966 } 962 }
967 } 963 }
968 964
969 if (!line->is_longer ()) /* XXX: think about this */
970 MAX_IT (line->l, screen.cur.col); 965 max_it (line->l, screen.cur.col);
971 966
972#ifdef DEBUG_STRICT 967#ifdef DEBUG_STRICT
973 assert (screen.cur.row >= 0); 968 assert (screen.cur.row >= 0);
974#else /* drive with your eyes closed */
975 MAX_IT (screen.cur.row, 0);
976#endif 969#endif
977} 970}
978 971
979/* ------------------------------------------------------------------------- */ 972/* ------------------------------------------------------------------------- */
980/* 973/*
… …
1019 1012
1020 if (count == 0) 1013 if (count == 0)
1021 return; 1014 return;
1022 else if (count > 0) 1015 else if (count > 0)
1023 { 1016 {
1024 int row = screen.cur.row;
1025
1026 line_t &l = ROW(row); 1017 line_t &l = ROW(screen.cur.row);
1027 rend_t base_rend = l.r[i]; 1018 rend_t base_rend = l.r[i];
1028 ht &= l.t[i] == ' '; 1019 ht &= l.t[i] == ' ';
1029 1020
1030 for (; ++i < ncol; ) 1021 for (; ++i < ncol; )
1031 if (tabs[i]) 1022 if (tabs[i])
1032 { 1023 {
1033 x = i; 1024 x = i;
1025
1034 if (!--count) 1026 if (!--count)
1035 break; 1027 break;
1036 } 1028 }
1037 else 1029 else
1038 ht &= l.t[i] == ' ' 1030 ht &= l.t[i] == ' '
… …
1041 if (count) 1033 if (count)
1042 x = ncol - 1; 1034 x = ncol - 1;
1043 1035
1044 // store horizontal tab commands as characters inside the text 1036 // store horizontal tab commands as characters inside the text
1045 // buffer so they can be selected and pasted. 1037 // buffer so they can be selected and pasted.
1046 if (ht && options & Opt_pastableTabs) 1038 if (ht && OPTION (Opt_pastableTabs))
1047 { 1039 {
1048 base_rend = SET_FONT (base_rend, 0); 1040 base_rend = SET_FONT (base_rend, 0);
1049 1041
1050 if (!l.is_longer ()) /* XXX: think about this */ 1042 l.touch (x);
1051 MAX_IT (l.l, x);
1052 1043
1053 i = screen.cur.col; 1044 i = screen.cur.col;
1054 1045
1055 l.t[i] = '\t'; 1046 l.t[i] = '\t';
1056 l.r[i] = base_rend; 1047 l.r[i] = base_rend;
… …
1106 */ 1097 */
1107#if ENABLE_FRILLS 1098#if ENABLE_FRILLS
1108void 1099void
1109rxvt_term::scr_forwardindex () 1100rxvt_term::scr_forwardindex ()
1110{ 1101{
1111 int row;
1112
1113 if (screen.cur.col < ncol - 1) 1102 if (screen.cur.col < ncol - 1)
1114 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1103 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1115 else 1104 else
1116 { 1105 {
1117 row = screen.cur.row; 1106 line_t &l = ROW(screen.cur.row);
1118 1107
1119 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1108 l.touch ();
1120 ROW(row).l = ncol; 1109 l.is_longer (0);
1121 1110
1122 scr_gotorc (0, 0, R_RELATIVE); 1111 scr_gotorc (0, 0, R_RELATIVE);
1123 scr_insdel_chars (1, DELETE); 1112 scr_insdel_chars (1, DELETE);
1124 scr_gotorc (0, ncol - 1, R_RELATIVE); 1113 scr_gotorc (0, ncol - 1, R_RELATIVE);
1125 } 1114 }
… …
1135{ 1124{
1136 want_refresh = 1; 1125 want_refresh = 1;
1137 ZERO_SCROLLBACK (); 1126 ZERO_SCROLLBACK ();
1138 1127
1139 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1128 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1140 MAX_IT (screen.cur.col, 0); 1129 clamp_it (screen.cur.col, 0, ncol - 1);
1141 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1142 1130
1143 screen.flags &= ~Screen_WrapNext; 1131 screen.flags &= ~Screen_WrapNext;
1144 1132
1145 if (relative & R_RELATIVE) 1133 if (relative & R_RELATIVE)
1146 { 1134 {
… …
1164 else 1152 else
1165 { 1153 {
1166 if (screen.flags & Screen_Relative) 1154 if (screen.flags & Screen_Relative)
1167 { /* relative origin mode */ 1155 { /* relative origin mode */
1168 screen.cur.row = row + screen.tscroll; 1156 screen.cur.row = row + screen.tscroll;
1169 MIN_IT (screen.cur.row, screen.bscroll); 1157 min_it (screen.cur.row, screen.bscroll);
1170 } 1158 }
1171 else 1159 else
1172 screen.cur.row = row; 1160 screen.cur.row = row;
1173 } 1161 }
1174 1162
1175 MAX_IT (screen.cur.row, 0); 1163 clamp_it (screen.cur.row, 0, nrow - 1);
1176 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1177} 1164}
1178 1165
1179/* ------------------------------------------------------------------------- */ 1166/* ------------------------------------------------------------------------- */
1180/* 1167/*
1181 * direction should be UP or DN 1168 * direction should be UP or DN
… …
1196 || (screen.cur.row == screen.tscroll && direction == DN)) 1183 || (screen.cur.row == screen.tscroll && direction == DN))
1197 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1184 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1198 else 1185 else
1199 screen.cur.row += dirn; 1186 screen.cur.row += dirn;
1200 1187
1201 MAX_IT (screen.cur.row, 0); 1188 clamp_it (screen.cur.row, 0, nrow - 1);
1202 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1203 selection_check (0); 1189 selection_check (0);
1204} 1190}
1205 1191
1206/* ------------------------------------------------------------------------- */ 1192/* ------------------------------------------------------------------------- */
1207/* 1193/*
… …
1211 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1197 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1212 */ 1198 */
1213void 1199void
1214rxvt_term::scr_erase_line (int mode) 1200rxvt_term::scr_erase_line (int mode)
1215{ 1201{
1216 unsigned int row, col, num; 1202 unsigned int col, num;
1217 1203
1218 want_refresh = 1; 1204 want_refresh = 1;
1219 ZERO_SCROLLBACK (); 1205 ZERO_SCROLLBACK ();
1220 1206
1221 selection_check (1); 1207 selection_check (1);
1222 1208
1223 row = screen.cur.row; 1209 line_t &line = ROW(screen.cur.row);
1210
1211 line.touch ();
1212 line.is_longer (0);
1224 1213
1225 switch (mode) 1214 switch (mode)
1226 { 1215 {
1227 case 0: /* erase to end of line */ 1216 case 0: /* erase to end of line */
1228 col = screen.cur.col; 1217 col = screen.cur.col;
1229 num = ncol - col; 1218 num = ncol - col;
1230 MIN_IT (ROW(row).l, (int16_t)col); 1219 min_it (line.l, col);
1231 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1220 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1232 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1221 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1233 CLEAR_SELECTION (); 1222 CLEAR_SELECTION ();
1234 break; 1223 break;
1235 case 1: /* erase to beginning of line */ 1224 case 1: /* erase to beginning of line */
… …
1240 CLEAR_SELECTION (); 1229 CLEAR_SELECTION ();
1241 break; 1230 break;
1242 case 2: /* erase whole line */ 1231 case 2: /* erase whole line */
1243 col = 0; 1232 col = 0;
1244 num = ncol; 1233 num = ncol;
1245 ROW(row).l = 0; 1234 line.l = 0;
1246 if (selection.beg.row <= screen.cur.row 1235 if (selection.beg.row <= screen.cur.row
1247 && selection.end.row >= screen.cur.row) 1236 && selection.end.row >= screen.cur.row)
1248 CLEAR_SELECTION (); 1237 CLEAR_SELECTION ();
1249 break; 1238 break;
1250 default: 1239 default:
1251 return; 1240 return;
1252 } 1241 }
1253 1242
1254 scr_blank_line (ROW(row), col, num, rstyle); 1243 scr_blank_line (line, col, num, rstyle);
1255} 1244}
1256 1245
1257/* ------------------------------------------------------------------------- */ 1246/* ------------------------------------------------------------------------- */
1258/* 1247/*
1259 * Erase part of whole of the screen 1248 * Erase part of whole of the screen
… …
1302 CLEAR_SELECTION (); 1291 CLEAR_SELECTION ();
1303 1292
1304 if (row >= nrow) /* Out Of Bounds */ 1293 if (row >= nrow) /* Out Of Bounds */
1305 return; 1294 return;
1306 1295
1307 MIN_IT (num, (nrow - row)); 1296 min_it (num, nrow - row);
1308 1297
1309 if (rstyle & (RS_RVid | RS_Uline)) 1298 if (rstyle & (RS_RVid | RS_Uline))
1310 ren = (rend_t) ~RS_None; 1299 ren = (rend_t) ~RS_None;
1311 else if (GET_BASEBG (rstyle) == Color_bg) 1300 else if (GET_BASEBG (rstyle) == Color_bg)
1312 { 1301 {
… …
1314 CLEAR_ROWS (row, num); 1303 CLEAR_ROWS (row, num);
1315 } 1304 }
1316 else 1305 else
1317 { 1306 {
1318 ren = rstyle & (RS_fgMask | RS_bgMask); 1307 ren = rstyle & (RS_fgMask | RS_bgMask);
1319 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1308 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1320 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1309 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1321 ERASE_ROWS (row, num); 1310 ERASE_ROWS (row, num);
1322 gcvalue.foreground = pix_colors[Color_fg]; 1311 gcvalue.foreground = pix_colors[Color_fg];
1323 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1312 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1324 } 1313 }
1325 1314
1326 for (; num--; row++) 1315 for (; num--; row++)
1327 { 1316 {
1328 scr_blank_screen_mem (ROW (row), rstyle); 1317 scr_blank_screen_mem (ROW(row), rstyle);
1329 ROW (row).l = 0;
1330 scr_blank_line (drawn[row], 0, ncol, ren); 1318 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1331 } 1319 }
1332} 1320}
1333 1321
1334#if ENABLE_FRILLS 1322#if ENABLE_FRILLS
1335void 1323void
… …
1367 rend_t *r1 = line.r; 1355 rend_t *r1 = line.r;
1368 1356
1369 for (int j = ncol; j--; ) 1357 for (int j = ncol; j--; )
1370 *r1++ = fs; 1358 *r1++ = fs;
1371 1359
1372 line.l = ncol; /* make the `E's selectable */ 1360 line.is_longer (0);
1361 line.touch (ncol);
1373 } 1362 }
1374} 1363}
1375 1364
1376/* ------------------------------------------------------------------------- */ 1365/* ------------------------------------------------------------------------- */
1377/* 1366/*
… …
1420 return; 1409 return;
1421 1410
1422 scr_do_wrap (); 1411 scr_do_wrap ();
1423 1412
1424 selection_check (1); 1413 selection_check (1);
1425 MIN_IT (count, (ncol - screen.cur.col)); 1414 min_it (count, ncol - screen.cur.col);
1426 1415
1427 row = screen.cur.row; 1416 row = screen.cur.row;
1428 1417
1429 line_t *line = &ROW(row); 1418 line_t *line = &ROW(row);
1419
1420 line->touch ();
1421 line->is_longer (0);
1430 1422
1431 switch (insdel) 1423 switch (insdel)
1432 { 1424 {
1433 case INSERT: 1425 case INSERT:
1434 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1426 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1435 { 1427 {
1436 line->t[col] = line->t[col - count]; 1428 line->t[col] = line->t[col - count];
1437 line->r[col] = line->r[col - count]; 1429 line->r[col] = line->r[col - count];
1438 } 1430 }
1439 1431
1440 if (!line->is_longer ()) 1432 line->l = min (line->l + count, ncol);
1441 {
1442 line->l += count;
1443 MIN_IT (line->l, ncol);
1444 }
1445 1433
1446 if (selection.op && current_screen == selection.screen 1434 if (selection.op && current_screen == selection.screen
1447 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1435 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1448 { 1436 {
1449 if (selection.end.row != screen.cur.row 1437 if (selection.end.row != screen.cur.row
… …
1462 1450
1463 case ERASE: 1451 case ERASE:
1464 screen.cur.col += count; /* don't worry if > ncol */ 1452 screen.cur.col += count; /* don't worry if > ncol */
1465 selection_check (1); 1453 selection_check (1);
1466 screen.cur.col -= count; 1454 screen.cur.col -= count;
1455
1456 line->l = max (line->l - count, 0);
1467 scr_blank_line (*line, screen.cur.col, count, rstyle); 1457 scr_blank_line (*line, screen.cur.col, count, rstyle);
1468 break; 1458 break;
1469 1459
1470 case DELETE: 1460 case DELETE:
1471 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1461 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1474 { 1464 {
1475 line->t[col] = line->t[col + count]; 1465 line->t[col] = line->t[col + count];
1476 line->r[col] = line->r[col + count]; 1466 line->r[col] = line->r[col + count];
1477 } 1467 }
1478 1468
1469 line->l = max (line->l - count, 0);
1479 scr_blank_line (*line, ncol - count, count, tr); 1470 scr_blank_line (*line, ncol - count, count, tr);
1480
1481 if (line->is_longer ()) /* break line continuation */
1482 line->l = ncol;
1483
1484 line->l = max (line->l - count, 0);
1485 1471
1486 if (selection.op && current_screen == selection.screen 1472 if (selection.op && current_screen == selection.screen
1487 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1488 { 1474 {
1489 if (selection.end.row != screen.cur.row 1475 if (selection.end.row != screen.cur.row
… …
1509 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1495 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1510 */ 1496 */
1511void 1497void
1512rxvt_term::scr_scroll_region (int top, int bot) 1498rxvt_term::scr_scroll_region (int top, int bot)
1513{ 1499{
1514 MAX_IT (top, 0); 1500 max_it (top, 0);
1515 MIN_IT (bot, (int)nrow - 1); 1501 min_it (bot, nrow - 1);
1516 1502
1517 if (top > bot) 1503 if (top > bot)
1518 return; 1504 return;
1519 1505
1520 screen.tscroll = top; 1506 screen.tscroll = top;
… …
1601rxvt_term::scr_set_tab (int mode) 1587rxvt_term::scr_set_tab (int mode)
1602{ 1588{
1603 if (mode < 0) 1589 if (mode < 0)
1604 memset (tabs, 0, ncol * sizeof (char)); 1590 memset (tabs, 0, ncol * sizeof (char));
1605 else if (screen.cur.col < ncol) 1591 else if (screen.cur.col < ncol)
1606 tabs[screen.cur.col] = (mode ? 1 : 0); 1592 tabs [screen.cur.col] = !!mode;
1607} 1593}
1608 1594
1609/* ------------------------------------------------------------------------- */ 1595/* ------------------------------------------------------------------------- */
1610/* 1596/*
1611 * Set reverse/normal video 1597 * Set reverse/normal video
… …
1618 XGCValues gcvalue; 1604 XGCValues gcvalue;
1619 1605
1620 if (rvideo != mode) 1606 if (rvideo != mode)
1621 { 1607 {
1622 rvideo = mode; 1608 rvideo = mode;
1623 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1609 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1624#if XPM_BACKGROUND 1610#if XPM_BACKGROUND
1625 if (bgPixmap.pixmap == None) 1611 if (bgPixmap.pixmap == None)
1626#endif 1612#endif
1627#if TRANSPARENT 1613#if TRANSPARENT
1628 if (! (options & Opt_transparent) || am_transparent == 0) 1614 if (! OPTION (Opt_transparent) || am_transparent == 0)
1629#endif 1615#endif
1630 XSetWindowBackground (display->display, vt, 1616 XSetWindowBackground (display->display, vt,
1631 pix_colors[Color_bg]); 1617 pix_colors[Color_bg]);
1632 1618
1633 gcvalue.foreground = pix_colors[Color_fg]; 1619 gcvalue.foreground = pix_colors[Color_fg];
… …
1658 * Set font style 1644 * Set font style
1659 */ 1645 */
1660void 1646void
1661rxvt_term::set_font_style () 1647rxvt_term::set_font_style ()
1662{ 1648{
1649#if 0
1663 switch (charsets[screen.charset]) 1650 switch (charsets [screen.charset])
1664 { 1651 {
1665 case '0': /* DEC Special Character & Line Drawing Set */ 1652 case '0': /* DEC Special Character & Line Drawing Set */
1666 break; 1653 break;
1667 case 'A': /* United Kingdom (UK) */ 1654 case 'A': /* United Kingdom (UK) */
1668 break; 1655 break;
… …
1675 case 'C': /* Finnish character set */ 1662 case 'C': /* Finnish character set */
1676 break; 1663 break;
1677 case 'K': /* German character set */ 1664 case 'K': /* German character set */
1678 break; 1665 break;
1679 } 1666 }
1667#endif
1680} 1668}
1681 1669
1682/* ------------------------------------------------------------------------- */ 1670/* ------------------------------------------------------------------------- */
1683/* 1671/*
1684 * Choose a font 1672 * Choose a font
… …
1724 bool found = false; 1712 bool found = false;
1725 1713
1726 for (int i = 0; i < nrow; i++) 1714 for (int i = 0; i < nrow; i++)
1727 { 1715 {
1728 int col = 0; 1716 int col = 0;
1729 rend_t *drp = drawn[i].r; 1717 rend_t *drp = drawn_buf[i].r;
1730 1718
1731 for (; col < ncol; col++, drp++) 1719 for (; col < ncol; col++, drp++)
1732 if ((*drp & mask) == value) 1720 if ((*drp & mask) == value)
1733 { 1721 {
1734 found = true; 1722 found = true;
… …
1752rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1740rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1753{ 1741{
1754 int i; 1742 int i;
1755 row_col_t rc[RC_COUNT]; 1743 row_col_t rc[RC_COUNT];
1756 1744
1757 if (!drawn) /* sanity check */ 1745 if (!drawn_buf) /* sanity check */
1758 return; 1746 return;
1759 1747
1760#ifndef NO_SLOW_LINK_SUPPORT 1748#ifndef NO_SLOW_LINK_SUPPORT
1761 if (refresh_type == FAST_REFRESH && !display->is_local) 1749 if (refresh_type == FAST_REFRESH && !display->is_local)
1762 { 1750 {
1763 y = 0; 1751 y = 0;
1764 eheight = height; 1752 eheight = height;
1765 } 1753 }
1766#endif
1767
1768#ifdef DEBUG_STRICT
1769 x = max (x, 0);
1770 x = min (x, (int)width);
1771 y = max (y, 0);
1772 y = min (y, (int)height);
1773#endif 1754#endif
1774 1755
1775 /* round down */ 1756 /* round down */
1776 rc[PART_BEG].col = Pixel2Col (x); 1757 rc[PART_BEG].col = Pixel2Col (x);
1777 rc[PART_BEG].row = Pixel2Row (y); 1758 rc[PART_BEG].row = Pixel2Row (y);
… …
1780 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1761 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1781 1762
1782 /* sanity checks */ 1763 /* sanity checks */
1783 for (i = PART_BEG; i < RC_COUNT; i++) 1764 for (i = PART_BEG; i < RC_COUNT; i++)
1784 { 1765 {
1785 MIN_IT (rc[i].col, ncol - 1); 1766 min_it (rc[i].col, ncol - 1);
1786 MIN_IT (rc[i].row, nrow - 1); 1767 min_it (rc[i].row, nrow - 1);
1787 } 1768 }
1788 1769
1789 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1770 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1790 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1771 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1791 1772
1792 if (refresh) 1773 if (refresh)
1793 scr_refresh (SLOW_REFRESH); 1774 scr_refresh (SLOW_REFRESH);
1794} 1775}
1795 1776
… …
1858int 1839int
1859rxvt_term::scr_changeview (unsigned int oldviewstart) 1840rxvt_term::scr_changeview (unsigned int oldviewstart)
1860{ 1841{
1861 if (view_start != oldviewstart) 1842 if (view_start != oldviewstart)
1862 { 1843 {
1844 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1845
1863 want_refresh = 1; 1846 want_refresh = 1;
1864 num_scr -= (view_start - oldviewstart); 1847 num_scr -= (view_start - oldviewstart);
1865 } 1848 }
1866 1849
1867 return (int) (view_start - oldviewstart); 1850 return (int)view_start - (int)oldviewstart;
1868} 1851}
1869 1852
1870/* ------------------------------------------------------------------------- */ 1853/* ------------------------------------------------------------------------- */
1871void 1854void
1872rxvt_term::scr_bell () 1855rxvt_term::scr_bell ()
1873{ 1856{
1874#ifndef NO_BELL 1857#ifndef NO_BELL
1875 1858
1876# ifndef NO_MAPALERT 1859# ifndef NO_MAPALERT
1877# ifdef MAPALERT_OPTION 1860# ifdef MAPALERT_OPTION
1878 if (options & Opt_mapAlert) 1861 if (OPTION (Opt_mapAlert))
1879# endif 1862# endif
1880 XMapWindow (display->display, parent[0]); 1863 XMapWindow (display->display, parent[0]);
1881# endif 1864# endif
1882 1865
1883 if (options & Opt_visualBell) 1866 if (OPTION (Opt_visualBell))
1884 { 1867 {
1885 scr_rvideo_mode (!rvideo); /* refresh also done */ 1868 scr_rvideo_mode (!rvideo); /* refresh also done */
1886 rxvt_usleep (VISUAL_BELL_DURATION); 1869 rxvt_usleep (VISUAL_BELL_DURATION);
1887 scr_rvideo_mode (!rvideo); /* refresh also done */ 1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1888 } 1871 }
… …
1979 1962
1980#if XPM_BACKGROUND 1963#if XPM_BACKGROUND
1981 must_clear |= bgPixmap.pixmap != None; 1964 must_clear |= bgPixmap.pixmap != None;
1982#endif 1965#endif
1983#if TRANSPARENT 1966#if TRANSPARENT
1984 must_clear |= (options & Opt_transparent) && am_transparent; 1967 must_clear |= OPTION (Opt_transparent) && am_transparent;
1985#endif 1968#endif
1986 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1969 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1987 1970
1988 /* 1971 /*
1989 * B: reverse any characters which are selected 1972 * B: reverse any characters which are selected
… …
2013 1996
2014 crp = &ROW(screen.cur.row).r[col]; 1997 crp = &ROW(screen.cur.row).r[col];
2015 1998
2016 if (showcursor && focus) 1999 if (showcursor && focus)
2017 { 2000 {
2018 if (options & Opt_cursorUnderline) 2001 if (OPTION (Opt_cursorUnderline))
2019 *crp ^= RS_Uline; 2002 *crp ^= RS_Uline;
2020 else 2003 else
2021 { 2004 {
2022 *crp ^= RS_RVid; 2005 *crp ^= RS_RVid;
2023 2006
… …
2025 cc1 = *crp & (RS_fgMask | RS_bgMask); 2008 cc1 = *crp & (RS_fgMask | RS_bgMask);
2026 if (ISSET_PIXCOLOR (Color_cursor)) 2009 if (ISSET_PIXCOLOR (Color_cursor))
2027 ccol1 = Color_cursor; 2010 ccol1 = Color_cursor;
2028 else 2011 else
2029#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2012#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2030 ccol1 = GET_FGCOLOR (rstyle); 2013 ccol1 = fgcolor_of (rstyle);
2031#else 2014#else
2032 ccol1 = Color_fg; 2015 ccol1 = Color_fg;
2033#endif 2016#endif
2034 if (ISSET_PIXCOLOR (Color_cursor2)) 2017 if (ISSET_PIXCOLOR (Color_cursor2))
2035 ccol2 = Color_cursor2; 2018 ccol2 = Color_cursor2;
2036 else 2019 else
2037#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2020#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2038 ccol2 = GET_BGCOLOR (rstyle); 2021 ccol2 = bgcolor_of (rstyle);
2039#else 2022#else
2040 ccol2 = Color_bg; 2023 ccol2 = Color_bg;
2041#endif 2024#endif
2042 *crp = SET_FGCOLOR (*crp, ccol1); 2025 *crp = SET_FGCOLOR (*crp, ccol1);
2043 *crp = SET_BGCOLOR (*crp, ccol2); 2026 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2053 if (screen.cur.row + view_start != ocrow 2036 if (screen.cur.row + view_start != ocrow
2054 || screen.cur.col != oldcursor.col) 2037 || screen.cur.col != oldcursor.col)
2055 { 2038 {
2056 if (ocrow < nrow 2039 if (ocrow < nrow
2057 && oldcursor.col < ncol) 2040 && oldcursor.col < ncol)
2058 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2041 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2059 2042
2060 if (focus || !showcursor) 2043 if (focus || !showcursor)
2061 oldcursor.row = -1; 2044 oldcursor.row = -1;
2062 else 2045 else
2063 setoldcursor = 1; 2046 setoldcursor = 1;
… …
2076 oldcursor.col = screen.cur.col; 2059 oldcursor.col = screen.cur.col;
2077 } 2060 }
2078 } 2061 }
2079 } 2062 }
2080 2063
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2081#if ENABLE_OVERLAY 2065#if ENABLE_OVERLAY
2082 scr_swap_overlay (); 2066 scr_swap_overlay ();
2083#endif 2067#endif
2084 2068
2085#ifndef NO_SLOW_LINK_SUPPORT 2069#ifndef NO_SLOW_LINK_SUPPORT
… …
2102 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2103 { 2087 {
2104 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2105 { 2089 {
2106 line_t s = ROW(row - view_start); 2090 line_t s = ROW(row - view_start);
2107 line_t d = drawn[row]; 2091 line_t d = drawn_buf[row];
2108 line_t d2 = drawn[row + i]; 2092 line_t d2 = drawn_buf[row + i];
2109 2093
2110 for (nits = 0, col = ncol; col--; ) 2094 for (nits = 0, col = ncol; col--; )
2111 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2095 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2112 nits--; 2096 nits--;
2113 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2097 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2131 2115
2132 if (len != -1) 2116 if (len != -1)
2133 { 2117 {
2134 /* also comes here at end if needed because of >= above */ 2118 /* also comes here at end if needed because of >= above */
2135 if (wlen < len) 2119 if (wlen < len)
2136 SWAP_IT (wlen, len, int); 2120 ::swap (wlen, len);
2137 2121
2138 XCopyArea (display->display, vt, vt, 2122 XCopyArea (display->display, vt, vt,
2139 gc, 0, Row2Pixel (len + i), 2123 gc, 0, Row2Pixel (len + i),
2140 (unsigned int)TermWin_TotalWidth (), 2124 (unsigned int)this->width,
2141 (unsigned int)Height2Pixel (wlen - len + 1), 2125 (unsigned int)Height2Pixel (wlen - len + 1),
2142 0, Row2Pixel (len)); 2126 0, Row2Pixel (len));
2143 len = -1; 2127 len = -1;
2144 } 2128 }
2145 } 2129 }
… …
2151 */ 2135 */
2152 for (row = 0; row < nrow; row++) 2136 for (row = 0; row < nrow; row++)
2153 { 2137 {
2154 text_t *stp = ROW(row - view_start).t; 2138 text_t *stp = ROW(row - view_start).t;
2155 rend_t *srp = ROW(row - view_start).r; 2139 rend_t *srp = ROW(row - view_start).r;
2156 text_t *dtp = drawn[row].t; 2140 text_t *dtp = drawn_buf[row].t;
2157 rend_t *drp = drawn[row].r; 2141 rend_t *drp = drawn_buf[row].r;
2158 2142
2159 /* 2143 /*
2160 * E2: OK, now the real pass 2144 * E2: OK, now the real pass
2161 */ 2145 */
2162 int ypixel = (int)Row2Pixel (row); 2146 int ypixel = (int)Row2Pixel (row);
… …
2224 count++, i--; 2208 count++, i--;
2225 2209
2226 /* 2210 /*
2227 * Determine the attributes for the string 2211 * Determine the attributes for the string
2228 */ 2212 */
2229 int fore = GET_FGCOLOR (rend); // desired foreground 2213 int fore = fgcolor_of (rend); // desired foreground
2230 int back = GET_BGCOLOR (rend); // desired background 2214 int back = bgcolor_of (rend); // desired background
2231 2215
2232 // only do special processing if any attributes are set, which is rare 2216 // only do special processing if any attributes are set, which is unlikely
2233 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2217 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2234 { 2218 {
2235#if ENABLE_STYLES 2219#if ENABLE_STYLES
2236 // force redraw after "careful" characters to avoid pixel droppings 2220 // force redraw after "careful" characters to avoid pixel droppings
2237 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2221 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2273 fore = Color_UL; 2257 fore = Color_UL;
2274#endif 2258#endif
2275 2259
2276 if (invert) 2260 if (invert)
2277 { 2261 {
2278 SWAP_IT (fore, back, int); 2262 ::swap (fore, back);
2279 2263
2280#ifndef NO_BOLD_UNDERLINE_REVERSE 2264#ifndef NO_BOLD_UNDERLINE_REVERSE
2281 if (ISSET_PIXCOLOR (Color_RV)) 2265 if (ISSET_PIXCOLOR (Color_RV))
2282 back = Color_RV; 2266 back = Color_RV;
2283 2267
… …
2348 } /* for (row....) */ 2332 } /* for (row....) */
2349 2333
2350#if ENABLE_OVERLAY 2334#if ENABLE_OVERLAY
2351 scr_swap_overlay (); 2335 scr_swap_overlay ();
2352#endif 2336#endif
2337 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2353 2338
2354 /* 2339 /*
2355 * G: cleanup cursor and display outline cursor if necessary 2340 * G: cleanup cursor and display outline cursor if necessary
2356 */ 2341 */
2357 if (showcursor) 2342 if (showcursor)
2358 { 2343 {
2359 if (focus) 2344 if (focus)
2360 { 2345 {
2361 if (options & Opt_cursorUnderline) 2346 if (OPTION (Opt_cursorUnderline))
2362 *crp ^= RS_Uline; 2347 *crp ^= RS_Uline;
2363 else 2348 else
2364 { 2349 {
2365 *crp ^= RS_RVid; 2350 *crp ^= RS_RVid;
2366#ifndef NO_CURSORCOLOR 2351#ifndef NO_CURSORCOLOR
… …
2375 2360
2376 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2361 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2377 col--; 2362 col--;
2378 2363
2379 while (col + cursorwidth < ncol 2364 while (col + cursorwidth < ncol
2380 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2365 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2381 cursorwidth++; 2366 cursorwidth++;
2382 2367
2383#ifndef NO_CURSORCOLOR 2368#ifndef NO_CURSORCOLOR
2384 if (ISSET_PIXCOLOR (Color_cursor)) 2369 if (ISSET_PIXCOLOR (Color_cursor))
2385 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2370 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2404 num_scr = 0; 2389 num_scr = 0;
2405 num_scr_allow = 1; 2390 num_scr_allow = 1;
2406} 2391}
2407 2392
2408void 2393void
2409rxvt_term::scr_remap_chars (const line_t &l) 2394rxvt_term::scr_remap_chars (line_t &l)
2410{ 2395{
2411 if (!l.t) 2396 if (!l.t)
2412 return; 2397 return;
2413 2398
2399 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2400
2414 for (int i = ncol; i--; ) 2401 for (int i = ncol; i--; )
2415 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2402 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2416} 2403}
2417 2404
2418void 2405void
2419rxvt_term::scr_remap_chars () 2406rxvt_term::scr_remap_chars ()
2420{ 2407{
2421 for (int i = total_rows; i--; ) 2408 for (int i = total_rows; i--; )
2422 scr_remap_chars (save[i]); 2409 scr_remap_chars (row_buf [i]);
2423 2410
2424 for (int i = nrow; i--; ) 2411 for (int i = nrow; i--; )
2425 { 2412 {
2426 scr_remap_chars (drawn[i]); 2413 scr_remap_chars (drawn_buf [i]);
2427 scr_remap_chars (swap_save[i]); 2414 scr_remap_chars (swap_buf [i]);
2428 } 2415 }
2429} 2416}
2430 2417
2431void 2418void
2432rxvt_term::scr_recolour () 2419rxvt_term::scr_recolour ()
… …
2485 2472
2486#if ENABLE_FRILLS 2473#if ENABLE_FRILLS
2487 if (selection.rect) 2474 if (selection.rect)
2488 { 2475 {
2489 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2476 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2477 {
2478 text_t *stp = ROW(row).t;
2479 rend_t *srp = ROW(row).r;
2480
2490 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2481 for (col = selection.beg.col; col < selection.end.col; col++)
2491 srp[col] ^= RS_RVid; 2482 srp[col] ^= RS_RVid;
2483
2484 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2485 srp[col] ^= RS_RVid | RS_Uline;
2486
2487 if (++col < selection.end.col)
2488 srp[col] ^= RS_RVid | RS_Uline;
2489 }
2492 } 2490 }
2493 else 2491 else
2494#endif 2492#endif
2495 { 2493 {
2496 if (selection.beg.row >= -view_start) 2494 if (selection.beg.row >= -view_start)
… …
2499 row = selection.beg.row; 2497 row = selection.beg.row;
2500 } 2498 }
2501 else 2499 else
2502 { 2500 {
2503 col = 0; 2501 col = 0;
2504 row = view_start; 2502 row = -view_start;
2505 } 2503 }
2506 2504
2507 for (; row < min (selection.end.row, view_end); row++, col = 0) 2505 for (; row < min (selection.end.row, view_end); row++, col = 0)
2508 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2506 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2509 srp[col] ^= RS_RVid; 2507 srp[col] ^= RS_RVid;
… …
2529 char r1[] = "\n"; 2527 char r1[] = "\n";
2530 2528
2531 for (row = saveLines - nsaved; 2529 for (row = saveLines - nsaved;
2532 row < saveLines + nrow - 1; row++) 2530 row < saveLines + nrow - 1; row++)
2533 { 2531 {
2534 width = save[row].l >= 0 ? save[row].l 2532 width = row_buf[row].l >= 0 ? row_buf[row].l
2535 : ncol; 2533 : ncol;
2536 for (towrite = width; towrite; towrite -= wrote) 2534 for (towrite = width; towrite; towrite -= wrote)
2537 { 2535 {
2538 wrote = write (fd, & (save[row].t[width - towrite]), 2536 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2539 towrite); 2537 towrite);
2540 if (wrote < 0) 2538 if (wrote < 0)
2541 return; /* XXX: death, no report */ 2539 return; /* XXX: death, no report */
2542 } 2540 }
2543 if (save[row].l >= 0) 2541 if (row_buf[row].l >= 0)
2544 if (write (fd, r1, 1) <= 0) 2542 if (write (fd, r1, 1) <= 0)
2545 return; /* XXX: death, no report */ 2543 return; /* XXX: death, no report */
2546 } 2544 }
2547} 2545}
2548#endif 2546#endif
… …
2580/* ------------------------------------------------------------------------- */ 2578/* ------------------------------------------------------------------------- */
2581/* 2579/*
2582 * Paste a selection direct to the command fd 2580 * Paste a selection direct to the command fd
2583 */ 2581 */
2584void 2582void
2585rxvt_term::paste (unsigned char *data, unsigned int len) 2583rxvt_term::paste (char *data, unsigned int len)
2586{ 2584{
2587 /* convert normal newline chars into common keyboard Return key sequence */ 2585 /* convert normal newline chars into common keyboard Return key sequence */
2588 for (unsigned int i = 0; i < len; i++) 2586 for (unsigned int i = 0; i < len; i++)
2589 if (data[i] == C0_LF) 2587 if (data[i] == C0_LF)
2590 data[i] = C0_CR; 2588 data[i] = C0_CR;
… …
2734 { 2732 {
2735 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2733 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2736 char *s = rxvt_wcstombs (w); 2734 char *s = rxvt_wcstombs (w);
2737 free (w); 2735 free (w);
2738 // TODO: strlen == only the first element will be converted. well... 2736 // TODO: strlen == only the first element will be converted. well...
2739 paste ((unsigned char *)s, strlen (s)); 2737 paste (s, strlen (s));
2740 free (s); 2738 free (s);
2741 } 2739 }
2742 else 2740 else
2743#endif 2741#endif
2744 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2742 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2745 && cl) 2743 && cl)
2746 { 2744 {
2747 for (int i = 0; i < cr; i++) 2745 for (int i = 0; i < cr; i++)
2748 paste ((unsigned char *)cl[i], strlen (cl[i])); 2746 paste (cl[i], strlen (cl[i]));
2749 2747
2750 XFreeStringList (cl); 2748 XFreeStringList (cl);
2751 } 2749 }
2752 else 2750 else
2753 paste (ct.value, ct.nitems); // paste raw 2751 paste ((char *)ct.value, ct.nitems); // paste raw
2754 2752
2755bailout: 2753bailout:
2756 XFree (ct.value); 2754 XFree (ct.value);
2757 2755
2758 if (selection_wait == Sel_normal) 2756 if (selection_wait == Sel_normal)
… …
2796 return; /* outside window */ 2794 return; /* outside window */
2797 2795
2798 if (selection.text) 2796 if (selection.text)
2799 { /* internal selection */ 2797 { /* internal selection */
2800 char *str = rxvt_wcstombs (selection.text, selection.len); 2798 char *str = rxvt_wcstombs (selection.text, selection.len);
2801 paste ((unsigned char *)str, strlen (str)); 2799 paste (str, strlen (str));
2802 free (str); 2800 free (str);
2803 return; 2801 return;
2804 } 2802 }
2805 else 2803 else
2806 { 2804 {
… …
2898 selection.op = SELECTION_DONE; 2896 selection.op = SELECTION_DONE;
2899 2897
2900 if (selection.clicks == 4) 2898 if (selection.clicks == 4)
2901 return; /* nothing selected, go away */ 2899 return; /* nothing selected, go away */
2902 2900
2901 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2902 return;
2903
2903 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2904 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2904 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2905 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2905 2906
2906 int ofs = 0; 2907 int ofs = 0;
2907 int extra = 0; 2908 int extra = 0;
… …
2919 col = selection.beg.col; 2920 col = selection.beg.col;
2920 end_col = ncol + 1; 2921 end_col = ncol + 1;
2921 } 2922 }
2922 else 2923 else
2923#endif 2924#endif
2924 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2925 end_col = ROW(row).l;
2925 2926
2926 col = max (col, 0); 2927 col = max (col, 0);
2927 2928
2928 if (row == selection.end.row || selection.rect) 2929 if (row == selection.end.row
2930#if ENABLE_FRILLS
2931 || selection.rect
2932#endif
2933 )
2929 end_col = min (end_col, selection.end.col); 2934 min_it (end_col, selection.end.col);
2930 2935
2931 t = ROW(row).t + col; 2936 t = ROW(row).t + col;
2937
2932 for (; col < end_col; col++) 2938 for (; col < end_col; col++)
2933 { 2939 {
2934 if (*t == NOCHAR) 2940 if (*t == NOCHAR)
2935 t++; 2941 t++;
2936#if ENABLE_COMBINING 2942#if ENABLE_COMBINING
… …
2952#endif 2958#endif
2953 else 2959 else
2954 new_selection_text[ofs++] = *t++; 2960 new_selection_text[ofs++] = *t++;
2955 } 2961 }
2956 2962
2963#if ENABLE_FRILLS
2964 if (selection.rect)
2965 {
2966 while (ofs
2967 && new_selection_text[ofs - 1] != C0_LF
2968 && unicode::is_space (new_selection_text[ofs - 1]))
2969 --ofs;
2970
2971 new_selection_text[ofs++] = C0_LF;
2972 }
2973 else
2974#endif
2957 if (!ROW(row).is_longer () && row != selection.end.row) 2975 if (!ROW(row).is_longer () && row != selection.end.row)
2958 new_selection_text[ofs++] = C0_LF; 2976 new_selection_text[ofs++] = C0_LF;
2959 } 2977 }
2960 2978
2961 if (end_col != selection.end.col) 2979 if (end_col != selection.end.col)
2962 new_selection_text[ofs++] = C0_LF; 2980 new_selection_text[ofs++] = C0_LF;
2963 2981
… …
2973 2991
2974 // we usually allocate much more than necessary, so realloc it smaller again 2992 // we usually allocate much more than necessary, so realloc it smaller again
2975 selection.len = ofs; 2993 selection.len = ofs;
2976 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2994 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2977 2995
2996 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2997 return;
2998
2999 selection_grab (tm);
3000}
3001
3002bool
3003rxvt_term::selection_grab (Time tm)
3004{
3005 selection_time = tm;
3006
2978 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3007 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2979 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3008 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3009 {
2980 display->set_selection_owner (this); 3010 display->set_selection_owner (this);
3011 return true;
3012 }
2981 else 3013 else
2982 rxvt_warn ("can't get primary selection, ignoring.\n"); 3014 return false;
2983 3015
2984#if 0 3016#if 0
2985 XTextProperty ct; 3017 XTextProperty ct;
2986 3018
2987 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3019 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2988 { 3020 {
2989 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3021 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2990 XFree (ct.value); 3022 XFree (ct.value);
2991 } 3023 }
2992#endif 3024#endif
2993
2994 selection_time = tm;
2995} 3025}
2996 3026
2997/* ------------------------------------------------------------------------- */ 3027/* ------------------------------------------------------------------------- */
2998/* 3028/*
2999 * Mark or select text based upon number of clicks: 1, 2, or 3 3029 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3025 want_refresh = 1; 3055 want_refresh = 1;
3026 3056
3027 selection.mark.row = row - view_start; 3057 selection.mark.row = row - view_start;
3028 selection.mark.col = col; 3058 selection.mark.col = col;
3029 3059
3030 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1); 3060 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3031 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1); 3061 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3032 3062
3033 while (selection.mark.col > 0 3063 while (selection.mark.col > 0
3034 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3064 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3035 --selection.mark.col; 3065 --selection.mark.col;
3036 3066
… …
3121 } 3151 }
3122 } 3152 }
3123 break; 3153 break;
3124 } 3154 }
3125 3155
3126Old_Word_Selection_You_Die:
3127 if (dirn == DN) 3156 if (dirn == DN)
3128 col++; /* put us on one past the end */ 3157 col++; /* put us on one past the end */
3129 3158
3130 /* Poke the values back in */ 3159 /* Poke the values back in */
3131 ret->row = row; 3160 ret->row = row;
… …
3141 * flag == 2 ==> button 3 motion 3170 * flag == 2 ==> button 3 motion
3142 */ 3171 */
3143void 3172void
3144rxvt_term::selection_extend (int x, int y, int flag) 3173rxvt_term::selection_extend (int x, int y, int flag)
3145{ 3174{
3146 int col = min (max (Pixel2Col (x), 0), ncol); 3175 int col = clamp (Pixel2Col (x), 0, ncol);
3147 int row = min (max (Pixel2Row (y), 0), nrow - 1); 3176 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3148 3177
3149 /* 3178 /*
3150 * If we're selecting characters (single click) then we must check first 3179 * If we're selecting characters (single click) then we must check first
3151 * if we are at the same place as the original mark. If we are then 3180 * if we are at the same place as the original mark. If we are then
3152 * select nothing. Otherwise, if we're to the right of the mark, you have to 3181 * select nothing. Otherwise, if we're to the right of the mark, you have to
… …
3308 else if (selection.clicks == 2) 3337 else if (selection.clicks == 2)
3309 { 3338 {
3310 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3339 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3311 selection.end.col--; 3340 selection.end.col--;
3312 3341
3342 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3343 {
3313 selection_delimit_word (UP, &selection.beg, &selection.beg); 3344 selection_delimit_word (UP, &selection.beg, &selection.beg);
3314 selection_delimit_word (DN, &selection.end, &selection.end); 3345 selection_delimit_word (DN, &selection.end, &selection.end);
3346 }
3315 } 3347 }
3316 else if (selection.clicks == 3) 3348 else if (selection.clicks == 3)
3317 { 3349 {
3318#if ENABLE_FRILLS 3350#if ENABLE_FRILLS
3319 if (options & Opt_tripleclickwords) 3351 if (OPTION (Opt_tripleclickwords))
3320 { 3352 {
3321 selection_delimit_word (UP, &selection.beg, &selection.beg); 3353 selection_delimit_word (UP, &selection.beg, &selection.beg);
3322 3354
3323 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3355 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3324 { 3356 {
… …
3365 } 3397 }
3366 } 3398 }
3367 3399
3368#if ENABLE_FRILLS 3400#if ENABLE_FRILLS
3369 if (selection.rect && selection.beg.col > selection.end.col) 3401 if (selection.rect && selection.beg.col > selection.end.col)
3370 SWAP_IT (selection.beg.col, selection.end.col, int); 3402 ::swap (selection.beg.col, selection.end.col);
3371#endif 3403#endif
3372} 3404}
3373 3405
3374#if ENABLE_FRILLS 3406#if ENABLE_FRILLS
3375void 3407void
… …
3385 { 3417 {
3386 stp = ROW(end_row).t; 3418 stp = ROW(end_row).t;
3387 3419
3388 while (--end_col >= 0) 3420 while (--end_col >= 0)
3389 { 3421 {
3390 if (stp[end_col] != ' ' 3422 if (stp[end_col] != NOCHAR
3391 && stp[end_col] != '\t' 3423 && !unicode::is_space (stp[end_col]))
3392 && stp[end_col] != NOCHAR)
3393 break; 3424 break;
3394 } 3425 }
3395 3426
3396 if (end_col >= 0 3427 if (end_col >= 0
3397 || !ROW(end_row - 1).is_longer ()) 3428 || !ROW(end_row - 1).is_longer ())
… …
3573 */ 3604 */
3574void 3605void
3575rxvt_term::pixel_position (int *x, int *y) 3606rxvt_term::pixel_position (int *x, int *y)
3576{ 3607{
3577 *x = Pixel2Col (*x); 3608 *x = Pixel2Col (*x);
3578 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3609 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3579 *y = Pixel2Row (*y); 3610 *y = Pixel2Row (*y);
3580 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3611 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3581} 3612}
3582 3613
3583/* ------------------------------------------------------------------------- */ 3614/* ------------------------------------------------------------------------- */
3584#ifdef USE_XIM 3615#ifdef USE_XIM
3585void 3616void
… …
3596 3627
3597#if ENABLE_OVERLAY 3628#if ENABLE_OVERLAY
3598void 3629void
3599rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3630rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3600{ 3631{
3601 if (nrow < 3 || ncol < 3) 3632 if (nrow < 1 || ncol < 1)
3602 return; 3633 return;
3603 3634
3604 want_refresh = 1; 3635 want_refresh = 1;
3605 3636
3606 scr_overlay_off (); 3637 scr_overlay_off ();
3607 3638
3608 if (x < 0) x = ncol - w; 3639 if (x < 0) x = ncol - w;
3609 if (y < 0) y = nrow - h; 3640 if (y < 0) y = nrow - h;
3610 3641
3611 // make space for border 3642 // make space for border
3612 w += 2; MIN_IT (w, ncol); 3643 w += 2; min_it (w, ncol);
3613 h += 2; MIN_IT (h, nrow); 3644 h += 2; min_it (h, nrow);
3614 3645
3615 x -= 1; MAX_IT (x, 0); 3646 x -= 1; clamp_it (x, 0, ncol - w);
3616 y -= 1; MAX_IT (y, 0); 3647 y -= 1; clamp_it (y, 0, nrow - h);
3617
3618 MIN_IT (x, ncol - w);
3619 MIN_IT (y, nrow - h);
3620 3648
3621 ov_x = x; ov_y = y; 3649 ov_x = x; ov_y = y;
3622 ov_w = w; ov_h = h; 3650 ov_w = w; ov_h = h;
3623 3651
3624 ov_text = new text_t *[h]; 3652 ov_text = new text_t *[h];
… …
3716 for (int y = ov_h; y--; ) 3744 for (int y = ov_h; y--; )
3717 { 3745 {
3718 text_t *t1 = ov_text[y]; 3746 text_t *t1 = ov_text[y];
3719 rend_t *r1 = ov_rend[y]; 3747 rend_t *r1 = ov_rend[y];
3720 3748
3721 text_t *t2 = ROW(y - view_start).t + ov_x; 3749 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3722 rend_t *r2 = ROW(y - view_start).r + ov_x; 3750 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3723 3751
3724 for (int x = ov_w; x--; ) 3752 for (int x = ov_w; x--; )
3725 { 3753 {
3726 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3754 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3727 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3755 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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