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.309 by root, Mon Jul 21 16:51:31 2008 UTC vs.
Revision 1.424 by root, Fri Jun 29 22:10:09 2012 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
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-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
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.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
36{ 35{
37 while (len--) 36 while (len--)
38 *start++ = value; 37 *start++ = value;
39} 38}
40 39
41/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
45 42
46/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
99 96
100/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
101void 98void
102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
103{ 100{
104 if (!l.t) 101 if (!l.valid ())
105 { 102 {
106 lalloc (l); 103 l.alloc ();
107 col = 0; 104 col = 0;
108 width = ncol; 105 width = ncol;
109 } 106 }
110 107
111 l.touch (); 108 l.touch ();
… …
130{ 127{
131 scr_blank_line (l, 0, ncol, efs); 128 scr_blank_line (l, 0, ncol, efs);
132 129
133 l.l = 0; 130 l.l = 0;
134 l.f = 0; 131 l.f = 0;
132}
133
134// nuke a single wide character at the given column
135void
136rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
137{
138 // find begin
139 while (col > 0 && l.t[col] == NOCHAR)
140 col--;
141
142 rend_t rend = l.r[col] & ~RS_baseattrMask;
143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
144
145 l.touch ();
146
147 // found start, nuke
148 do {
149 l.t[col] = ' ';
150 l.r[col] = rend;
151 col++;
152 } while (col < ncol && l.t[col] == NOCHAR);
135} 153}
136 154
137/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
138 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
139 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
140 158
141void 159void
160rxvt_term::scr_alloc () NOTHROW
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for text_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = chunk_alloc (chunk_size, 0);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
142rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
143{ 195{
144#if ENABLE_OVERLAY 196#if ENABLE_OVERLAY
145 scr_overlay_off (); 197 scr_overlay_off ();
146#endif 198#endif
147 199
148 rvideo_mode = false;
149 view_start = 0; 200 view_start = 0;
150 num_scr = 0; 201 num_scr = 0;
151 202
152 if (ncol == 0) 203 if (ncol == 0)
153 ncol = 80; 204 ncol = 80;
… …
155 if (nrow == 0) 206 if (nrow == 0)
156 nrow = 24; 207 nrow = 24;
157 208
158 if (ncol == prev_ncol && nrow == prev_nrow) 209 if (ncol == prev_ncol && nrow == prev_nrow)
159 return; 210 return;
160
161 if (current_screen != PRIMARY)
162 scr_swap_screen ();
163 211
164 // we need at least two lines for wrapping to work correctly 212 // we need at least two lines for wrapping to work correctly
165 while (nrow + saveLines < 2) 213 while (nrow + saveLines < 2)
166 { 214 {
167 //TODO//FIXME 215 //TODO//FIXME
… …
176 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
177 225
178 screen.tscroll = 0; 226 screen.tscroll = 0;
179 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
180 228
229 void *prev_chunk = chunk;
230 size_t prev_chunk_size = chunk_size;
231 line_t *prev_drawn_buf = drawn_buf;
232 line_t *prev_swap_buf = swap_buf;
233 line_t *prev_row_buf = row_buf;
234
235 int common_col = min (prev_ncol, ncol);
236
237 scr_alloc ();
238
181 if (!row_buf) 239 if (!prev_row_buf)
182 { 240 {
183 /* 241 /*
184 * first time called so just malloc everything: don't rely on realloc 242 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
185 */ 243 */
186 top_row = 0; 244 top_row = 0;
187 term_start = 0; 245 term_start = 0;
188
189 talloc = new rxvt_salloc (ncol * sizeof (text_t));
190 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
191
192 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
193 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
194 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
195
196 for (int row = nrow; row--; )
197 {
198 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
199 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
200 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
201 }
202 246
203 memset (charsets, 'B', sizeof (charsets)); 247 memset (charsets, 'B', sizeof (charsets));
204 rstyle = DEFAULT_RSTYLE; 248 rstyle = DEFAULT_RSTYLE;
205 screen.flags = Screen_DefaultFlags; 249 screen.flags = Screen_DefaultFlags;
206 screen.cur.row = screen.cur.col = 0; 250 screen.cur.row = screen.cur.col = 0;
… …
220 selection.text = NULL; 264 selection.text = NULL;
221 selection.len = 0; 265 selection.len = 0;
222 selection.op = SELECTION_CLEAR; 266 selection.op = SELECTION_CLEAR;
223 selection.screen = PRIMARY; 267 selection.screen = PRIMARY;
224 selection.clicks = 0; 268 selection.clicks = 0;
269 selection.clip_text = NULL;
270 selection.clip_len = 0;
225 } 271 }
226 else 272 else
227 { 273 {
228 /* 274 /*
229 * add or delete rows as appropriate 275 * add or delete rows as appropriate
230 */ 276 */
231 277
232 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
233 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
234
235#if 0
236 if (nrow < prev_nrow)
237 {
238 for (int row = nrow; row < prev_nrow; row++)
239 {
240 lfree (swap_buf [row]);
241 lfree (drawn_buf[row]);
242 }
243 }
244#endif
245
246 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
247 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
248
249 for (int row = min (nrow, prev_nrow); row--; ) 278 for (int row = min (nrow, prev_nrow); row--; )
250 { 279 {
251 lresize (drawn_buf[row]); 280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
252 lresize (swap_buf [row]); 281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
253 }
254 282
255 for (int row = prev_nrow; row < nrow; row++) 283 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
284 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
286 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
256 { 287 }
257 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
258 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
259 }
260
261 line_t *old_buf = row_buf;
262 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
263 288
264 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 289 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
265 int pend = MOD (term_start + top_row , prev_total_rows); 290 int pend = MOD (term_start + top_row , prev_total_rows);
266 int q = total_rows; // rewrapped row 291 int q = total_rows; // rewrapped row
267 292
268 if (top_row) 293 if (top_row)
269 { 294 {
270 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 295 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
271 // to come up with a lean and mean algorithm. 296 // to come up with a lean and mean algorithm.
297 // TODO: maybe optimise when width didn't change
272 298
273 row_col_t ocur = screen.cur; 299 row_col_t ocur = screen.cur;
274 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 300 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
275 301
276 do 302 do
277 { 303 {
278 p = MOD (p - 1, prev_total_rows); 304 p = MOD (p - 1, prev_total_rows);
279#ifdef DEBUG_STRICT
280 assert (old_buf [MOD (p, prev_total_rows)].t); 305 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
281#endif
282 int plines = 1; 306 int plines = 1;
283 int llen = old_buf [MOD (p, prev_total_rows)].l; 307 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
284 308
285 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 309 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
286 { 310 {
287 p = MOD (p - 1, prev_total_rows); 311 p = MOD (p - 1, prev_total_rows);
288 312
289 plines++; 313 plines++;
290 llen += prev_ncol; 314 llen += prev_ncol;
… …
303 327
304 // re-assemble the full line by destination lines 328 // re-assemble the full line by destination lines
305 for (int qrow = q; qlines--; qrow++) 329 for (int qrow = q; qlines--; qrow++)
306 { 330 {
307 qline = row_buf + qrow; 331 qline = row_buf + qrow;
308 lalloc (*qline); 332 qline->alloc (); // redundant with next line
309 qline->l = ncol; 333 qline->l = ncol;
310 qline->is_longer (1); 334 qline->is_longer (1);
311 335
312 int qcol = 0; 336 int qcol = 0;
313 337
… …
328 // this seems to upset applications/shells/readline 352 // this seems to upset applications/shells/readline
329 // least. 353 // least.
330 if (prow == ocur.row) 354 if (prow == ocur.row)
331 screen.cur.row = q - (total_rows - nrow); 355 screen.cur.row = q - (total_rows - nrow);
332 356
333 line_t &pline = old_buf [prow]; 357 line_t &pline = prev_row_buf [prow];
334 358
335 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 359 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
336 360
337 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 361 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
338 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 362 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
359 { 383 {
360 // if no scrollback exists (yet), wing, instead of wrap 384 // if no scrollback exists (yet), wing, instead of wrap
361 385
362 for (int row = min (nrow, prev_nrow); row--; ) 386 for (int row = min (nrow, prev_nrow); row--; )
363 { 387 {
364 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 388 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
365 line_t &qline = row_buf [row]; 389 line_t &dst = row_buf [row];
366 390
367 qline = pline; 391 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
368 lresize (qline); 392
393 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
394 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
369 } 395 }
370 396
371 for (int row = prev_nrow; row < nrow; row++) 397 for (int row = prev_nrow; row < nrow; row++)
372 {
373 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 398 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
374 }
375 399
376 term_start = 0; 400 term_start = 0;
377 } 401 }
378
379 free (old_buf);
380 delete old_ta;
381 delete old_ra;
382 402
383 clamp_it (screen.cur.row, 0, nrow - 1); 403 clamp_it (screen.cur.row, 0, nrow - 1);
384 clamp_it (screen.cur.col, 0, ncol - 1); 404 clamp_it (screen.cur.col, 0, ncol - 1);
405 }
385 406
407 for (int row = nrow; row--; )
408 {
409 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
410 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
411 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
412 }
413
414 printf ("pc %p\n", prev_chunk);//D
415 chunk_free (prev_chunk, prev_chunk_size);
416
386 free (tabs); 417 free (tabs);
387 } 418 tabs = (char *)rxvt_malloc (ncol);
419
420 for (int col = ncol; col--; )
421 tabs [col] = col % TABSIZE == 0;
388 422
389 CLEAR_ALL_SELECTION (); 423 CLEAR_ALL_SELECTION ();
390 424
391 prev_nrow = nrow; 425 prev_nrow = nrow;
392 prev_ncol = ncol; 426 prev_ncol = ncol;
393 427
394 tabs = (char *)rxvt_malloc (ncol); 428 tt_winch ();
395 429
396 for (int col = ncol; --col; ) 430 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
397 tabs [col] = col % TABSIZE == 0; 431}
432
433void ecb_cold
434rxvt_term::scr_release () NOTHROW
435{
436 chunk_free (chunk, chunk_size);
437 chunk = 0;
438 row_buf = 0;
439
440 free (tabs);
441 tabs = 0;
442}
443
444/* ------------------------------------------------------------------------- */
445/*
446 * Hard/Soft reset
447 */
448void ecb_cold
449rxvt_term::scr_poweron ()
450{
451 scr_release ();
452
453 prev_nrow = prev_ncol = 0;
454 rvideo_mode = false;
455 scr_soft_reset ();
456 scr_reset ();
457
458 scr_clear (true);
459 scr_refresh ();
460}
461
462void ecb_cold
463rxvt_term::scr_soft_reset () NOTHROW
464{
465 /* only affects modes, nothing drastic such as clearing the screen */
466#if ENABLE_OVERLAY
467 scr_overlay_off ();
468#endif
398 469
399 if (current_screen != PRIMARY) 470 if (current_screen != PRIMARY)
400 scr_swap_screen (); 471 scr_swap_screen ();
401 472
402 tt_winch (); 473 scr_scroll_region (0, MAX_ROWS - 1);
403 474 scr_rendition (0, ~RS_None);
404 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 475 scr_insert_mode (0);
405}
406
407/* ------------------------------------------------------------------------- */
408/*
409 * Free everything. That way malloc debugging can find leakage.
410 */
411void
412rxvt_term::scr_release () NOTHROW
413{
414 if (row_buf)
415 {
416 delete talloc; talloc = 0;
417 delete ralloc; ralloc = 0;
418
419 free (row_buf);
420 free (swap_buf);
421 free (drawn_buf);
422 free (tabs);
423
424 row_buf = 0; // signal that we freed all the arrays
425 }
426}
427
428/* ------------------------------------------------------------------------- */
429/*
430 * Hard reset
431 */
432void
433rxvt_term::scr_poweron ()
434{
435 scr_release ();
436 prev_nrow = prev_ncol = 0;
437 scr_reset ();
438
439 scr_clear (true);
440 scr_refresh ();
441} 476}
442 477
443/* ------------------------------------------------------------------------- * 478/* ------------------------------------------------------------------------- *
444 * PROCESS SCREEN COMMANDS * 479 * PROCESS SCREEN COMMANDS *
445 * ------------------------------------------------------------------------- */ 480 * ------------------------------------------------------------------------- */
… …
483 } 518 }
484 519
485 /* boundary check in case screen size changed between SAVE and RESTORE */ 520 /* boundary check in case screen size changed between SAVE and RESTORE */
486 min_it (s->cur.row, nrow - 1); 521 min_it (s->cur.row, nrow - 1);
487 min_it (s->cur.col, ncol - 1); 522 min_it (s->cur.col, ncol - 1);
488#ifdef DEBUG_STRICT
489 assert (s->cur.row >= 0); 523 assert (s->cur.row >= 0);
490 assert (s->cur.col >= 0); 524 assert (s->cur.col >= 0);
491#endif
492} 525}
493 526
494void 527void
495rxvt_term::scr_swap_screen () 528rxvt_term::scr_swap_screen () NOTHROW
496{ 529{
497 if (!option (Opt_secondaryScreen)) 530 if (!option (Opt_secondaryScreen))
498 return; 531 return;
499 532
500 for (int i = prev_nrow; i--; ) 533 for (int i = prev_nrow; i--; )
… …
519 return; 552 return;
520 553
521 want_refresh = 1; 554 want_refresh = 1;
522 view_start = 0; 555 view_start = 0;
523 556
524 selection_check (2); /* check for boundary cross */ 557 /* check for boundary cross */
558 row_col_t pos;
559 pos.row = pos.col = 0;
560 if (ROWCOL_IS_BEFORE (selection.beg, pos)
561 && ROWCOL_IS_AFTER (selection.end, pos))
562 CLEAR_SELECTION ();
525 563
526 int i = current_screen; current_screen = scrn; scrn = i; 564 current_screen = scrn;
527 565
528#if NSCREENS 566#if NSCREENS
529 if (option (Opt_secondaryScreen)) 567 if (option (Opt_secondaryScreen))
530 { 568 {
531 num_scr = 0; 569 num_scr = 0;
… …
595/* 633/*
596 * Scroll text between <row1> and <row2> inclusive, by <count> lines 634 * Scroll text between <row1> and <row2> inclusive, by <count> lines
597 * count positive ==> scroll up 635 * count positive ==> scroll up
598 * count negative ==> scroll down 636 * count negative ==> scroll down
599 */ 637 */
600int 638int ecb_hot
601rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 639rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
602{ 640{
603 if (count == 0 || (row1 > row2)) 641 if (count == 0 || (row1 > row2))
604 return 0; 642 return 0;
605 643
… …
608 646
609 if (count > 0 647 if (count > 0
610 && row1 == 0 648 && row1 == 0
611 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 649 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
612 { 650 {
651 min_it (count, total_rows - (nrow - (row2 + 1)));
652
613 top_row = max (top_row - count, -saveLines); 653 top_row = max (top_row - count, -saveLines);
614
615 // scroll everything up 'count' lines
616 term_start = (term_start + count) % total_rows;
617 654
618 // sever bottommost line 655 // sever bottommost line
619 { 656 {
620 line_t &l = ROW(row2 - count); 657 line_t &l = ROW(row2);
621 l.is_longer (0); 658 l.is_longer (0);
622 l.touch (); 659 l.touch ();
623 } 660 }
624 661
662 // scroll everything up 'count' lines
663 term_start = (term_start + count) % total_rows;
664
665 // now copy lines below the scroll region bottom to the
666 // bottom of the screen again, so they look as if they
667 // hadn't moved.
668 for (int i = nrow; --i > row2; )
669 {
670 line_t &l1 = ROW(i - count);
671 line_t &l2 = ROW(i);
672
673 ::swap (l1, l2);
674 l2.touch ();
675 }
676
625 // erase newly scrolled-in lines 677 // erase newly scrolled-in lines
626 for (int i = count; i--; ) 678 for (int i = count; i--; )
627 { 679 {
628 line_t &l = ROW(nrow - 1 - i); 680 line_t &l = ROW(row2 - i);
629 681
630 // optimize if already cleared, can be significant on slow machines 682 // optimise if already cleared, can be significant on slow machines
631 // could be rolled into scr_blank_screen_mem 683 // could be rolled into scr_blank_screen_mem
632 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 684 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
633 { 685 {
634 scr_blank_line (l, 0, l.l, rstyle); 686 scr_blank_line (l, 0, l.l, rstyle);
635 l.l = 0; 687 l.l = 0;
… …
637 } 689 }
638 else 690 else
639 scr_blank_screen_mem (l, rstyle); 691 scr_blank_screen_mem (l, rstyle);
640 } 692 }
641 693
642 // now copy lines below the scroll region bottom to the
643 // bottom of the screen again, so they look as if they
644 // hadn't moved.
645 for (int i = nrow; --i > row2; )
646 {
647 line_t &l1 = ROW(i - count);
648 line_t &l2 = ROW(i);
649
650 ::swap (l1, l2);
651 l2.touch ();
652 }
653
654 // move and/or clear selection, if any 694 // move and/or clear selection, if any
655 if (selection.op && current_screen == selection.screen) 695 if (selection.op && current_screen == selection.screen
696 && selection.beg.row <= row2)
656 { 697 {
657 selection.beg.row -= count; 698 selection.beg.row -= count;
658 selection.end.row -= count; 699 selection.end.row -= count;
659 selection.mark.row -= count; 700 selection.mark.row -= count;
660 701
661 if (selection.beg.row < top_row 702 selection_check (0);
662 || selection.end.row < top_row
663 || selection.mark.row < top_row)
664 {
665 CLEAR_ALL_SELECTION ();
666 selection.op = SELECTION_CLEAR;
667 }
668 } 703 }
669 704
670 // finally move the view window, if desired 705 // finally move the view window, if desired
671 if (option (Opt_scrollWithBuffer) 706 if (option (Opt_scrollWithBuffer)
672 && view_start != 0 707 && view_start != 0
… …
702 } 737 }
703 738
704 // use a simple and robust scrolling algorithm, this 739 // use a simple and robust scrolling algorithm, this
705 // part of scr_scroll_text is not time-critical. 740 // part of scr_scroll_text is not time-critical.
706 741
742 // sever line above scroll region
743 if (row1)
744 {
745 line_t &l = ROW(row1 - 1);
746 l.is_longer (0);
747 l.touch ();
748 }
749
707 int rows = row2 - row1 + 1; 750 int rows = row2 - row1 + 1;
708 751
709 min_it (count, rows); 752 min_it (count, rows);
710 753
711 line_t *temp_buf = row_buf + total_rows; 754 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
712 755
713 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
714 { 757 {
715 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 758 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
716 759
… …
718 scr_blank_screen_mem (temp_buf [row], rstyle); 761 scr_blank_screen_mem (temp_buf [row], rstyle);
719 } 762 }
720 763
721 for (int row = 0; row < rows; row++) 764 for (int row = 0; row < rows; row++)
722 ROW(row1 + row) = temp_buf [row]; 765 ROW(row1 + row) = temp_buf [row];
766
767 // sever bottommost line
768 {
769 line_t &l = ROW(row2);
770 l.is_longer (0);
771 l.touch ();
772 }
723 } 773 }
724 774
725 return count; 775 return count;
726} 776}
727 777
728/* ------------------------------------------------------------------------- */ 778/* ------------------------------------------------------------------------- */
729/* 779/*
730 * Add text given in <str> of length <len> to screen struct 780 * Add text given in <str> of length <len> to screen struct
731 */ 781 */
732void 782void ecb_hot
733rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 783rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
734{ 784{
735 if (len <= 0) /* sanity */ 785 if (len <= 0) /* sanity */
736 return; 786 return;
737 787
738 unsigned char checksel; 788 bool checksel;
739 unicode_t c; 789 unicode_t c;
740 int ncol = this->ncol; 790 int ncol = this->ncol;
741 const wchar_t *strend = str + len; 791 const wchar_t *strend = str + len;
742 792
743 want_refresh = 1; 793 want_refresh = 1;
… …
756 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 806 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
757 screen.cur.row -= minlines; 807 screen.cur.row -= minlines;
758 } 808 }
759 } 809 }
760 810
761#ifdef DEBUG_STRICT
762 assert (screen.cur.col < ncol); 811 assert (screen.cur.col < ncol);
763 assert (screen.cur.row < nrow 812 assert (screen.cur.row < nrow
764 && screen.cur.row >= top_row); 813 && screen.cur.row >= top_row);
765#endif
766 int row = screen.cur.row; 814 int row = screen.cur.row;
767 815
768 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 816 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
769 817
770 line_t *line = &ROW(row); 818 line_t *line = &ROW(row);
771 819
772 while (str < strend) 820 while (str < strend)
773 { 821 {
774 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 822 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
775 823
776 if (expect_false (c < 0x20)) 824 if (ecb_unlikely (c < 0x20))
777 if (c == C0_LF) 825 if (c == C0_LF)
778 { 826 {
779 max_it (line->l, screen.cur.col); 827 max_it (line->l, screen.cur.col);
780 828
781 screen.flags &= ~Screen_WrapNext; 829 screen.flags &= ~Screen_WrapNext;
… …
800 { 848 {
801 scr_tab (1, true); 849 scr_tab (1, true);
802 continue; 850 continue;
803 } 851 }
804 852
805 if (expect_false ( 853 if (ecb_unlikely (
806 checksel /* see if we're writing within selection */ 854 checksel /* see if we're writing within selection */
807 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 855 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
808 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 856 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
809 )) 857 ))
810 { 858 {
… …
815 * should be a similar check. 863 * should be a similar check.
816 */ 864 */
817 CLEAR_SELECTION (); 865 CLEAR_SELECTION ();
818 } 866 }
819 867
820 if (expect_false (screen.flags & Screen_WrapNext)) 868 if (ecb_unlikely (screen.flags & Screen_WrapNext))
821 { 869 {
822 scr_do_wrap (); 870 scr_do_wrap ();
823 871
824 line->l = ncol; 872 line->l = ncol;
825 line->is_longer (1); 873 line->is_longer (1);
… …
827 row = screen.cur.row; 875 row = screen.cur.row;
828 line = &ROW(row); /* _must_ refresh */ 876 line = &ROW(row); /* _must_ refresh */
829 } 877 }
830 878
831 // some utf-8 decoders "decode" surrogate characters: let's fix this. 879 // some utf-8 decoders "decode" surrogate characters: let's fix this.
832 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 880 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
833 c = 0xfffd; 881 c = 0xfffd;
834 882
835 // rely on wcwidth to tell us the character width, do wcwidth before 883 // rely on wcwidth to tell us the character width, do wcwidth before
836 // further replacements, as wcwidth might return -1 for the line 884 // further replacements, as wcwidth might return -1 for the line
837 // drawing characters below as they might be invalid in the current 885 // drawing characters below as they might be invalid in the current
838 // locale. 886 // locale.
839 int width = WCWIDTH (c); 887 int width = WCWIDTH (c);
840 888
841 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 889 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
842 { 890 {
843 // vt100 special graphics and line drawing 891 // vt100 special graphics and line drawing
844 // 5f-7e standard vt100 892 // 5f-7e standard vt100
845 // 40-5e rxvt extension for extra curses acs chars 893 // 40-5e rxvt extension for extra curses acs chars
846 static uint16_t vt100_0[62] = { // 41 .. 7e 894 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
859 c = vt100_0[c - 0x41]; 907 c = vt100_0[c - 0x41];
860 width = 1; // vt100 line drawing characters are always single-width 908 width = 1; // vt100 line drawing characters are always single-width
861 } 909 }
862 } 910 }
863 911
864 if (expect_false (screen.flags & Screen_Insert)) 912 if (ecb_unlikely (screen.flags & Screen_Insert))
865 scr_insdel_chars (width, INSERT); 913 scr_insdel_chars (width, INSERT);
866 914
867 if (width != 0) 915 if (width != 0)
868 { 916 {
869#if !UNICODE_3 917#if !UNICODE_3
… …
874# else 922# else
875 c = 0xfffd; 923 c = 0xfffd;
876# endif 924# endif
877#endif 925#endif
878 926
927 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
928
929 // if the character doesn't fit into the remaining columns...
930 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
931 {
932 if (screen.flags & Screen_Autowrap)
933 {
934 // ... artificially enlargen the previous one
935 c = NOCHAR;
936 // and try the same character next loop iteration
937 --str;
938 }
939 else
940 screen.cur.col = ncol - width;
941 }
942
879 // nuke the character at this position, if required 943 // nuke the character at this position, if required
880 if (expect_false ( 944 // due to wonderful coincidences everywhere else in this loop
945 // we never have to check for overwriting a wide char itself,
946 // only its tail.
881 line->t[screen.cur.col] == NOCHAR 947 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
882 || (screen.cur.col < ncol - 1 948 scr_kill_char (*line, screen.cur.col);
883 && line->t[screen.cur.col + 1] == NOCHAR)
884 ))
885 {
886 int col = screen.cur.col;
887
888 // find begin
889 while (col > 0 && line->t[col] == NOCHAR)
890 col--;
891
892 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
893
894 // found begin, nuke
895 do {
896 line->t[col] = ' ';
897 line->r[col] = rend;
898 col++;
899 } while (col < ncol && line->t[col] == NOCHAR);
900 }
901
902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903
904 // if the character doesn't fit into the remaining columns...
905 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
906 {
907 // ...output spaces
908 c = ' ';
909 // and try the same character next loop iteration
910 --str;
911 }
912 949
913 line->touch (); 950 line->touch ();
914 951
915 do 952 do
916 { 953 {
917 line->t[screen.cur.col] = c; 954 line->t[screen.cur.col] = c;
918 line->r[screen.cur.col] = rend; 955 line->r[screen.cur.col] = rend;
919 956
920 if (expect_true (screen.cur.col < ncol - 1)) 957 if (ecb_likely (screen.cur.col < ncol - 1))
921 screen.cur.col++; 958 screen.cur.col++;
922 else 959 else
923 { 960 {
924 line->l = ncol; 961 line->l = ncol;
925 if (screen.flags & Screen_Autowrap) 962 if (screen.flags & Screen_Autowrap)
926 screen.flags |= Screen_WrapNext; 963 screen.flags |= Screen_WrapNext;
927 break; 964
965 goto end_of_line;
928 } 966 }
929 967
930 c = NOCHAR; 968 c = NOCHAR;
931 } 969 }
932 while (expect_false (--width > 0)); 970 while (ecb_unlikely (--width > 0));
933 971
934 // pad with spaces when overwriting wide character with smaller one 972 // pad with spaces when overwriting wide character with smaller one
935 if (expect_false (!width)) 973 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
936 { 974 {
937 line->touch ();
938
939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
940 {
941 line->t[c] = ' '; 975 line->t[c] = ' ';
942 line->r[c] = rend; 976 line->r[c] = rend;
943 }
944 } 977 }
978
979end_of_line:
980 ;
945 } 981 }
946#if ENABLE_COMBINING 982#if ENABLE_COMBINING
947 else // width == 0 983 else // width == 0
948 { 984 {
949 if (c != 0xfeff) // ignore BOM 985 if (c != 0xfeff) // ignore BOM
… …
989#endif 1025#endif
990 } 1026 }
991 1027
992 max_it (line->l, screen.cur.col); 1028 max_it (line->l, screen.cur.col);
993 1029
994#ifdef DEBUG_STRICT
995 assert (screen.cur.row >= 0); 1030 assert (screen.cur.row >= 0);
996#endif
997} 1031}
998 1032
999/* ------------------------------------------------------------------------- */ 1033/* ------------------------------------------------------------------------- */
1000/* 1034/*
1001 * Process Backspace. Move back the cursor back a position, wrap if have to 1035 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1014 1048
1015 want_refresh = 1; 1049 want_refresh = 1;
1016#endif 1050#endif
1017 } 1051 }
1018 } 1052 }
1053 else if (screen.flags & Screen_WrapNext)
1054 screen.flags &= ~Screen_WrapNext;
1019 else 1055 else
1020 scr_gotorc (0, -1, RELATIVE); 1056 scr_gotorc (0, -1, RELATIVE);
1021} 1057}
1022 1058
1023/* ------------------------------------------------------------------------- */ 1059/* ------------------------------------------------------------------------- */
… …
1101 * XTERM_SEQ: ESC 6 1137 * XTERM_SEQ: ESC 6
1102 * Move cursor left in row. If we're at the left boundary, shift everything 1138 * Move cursor left in row. If we're at the left boundary, shift everything
1103 * in that row right. Clear left column. 1139 * in that row right. Clear left column.
1104 */ 1140 */
1105#if !ENABLE_MINIMAL 1141#if !ENABLE_MINIMAL
1106void 1142void ecb_cold
1107rxvt_term::scr_backindex () NOTHROW 1143rxvt_term::scr_backindex () NOTHROW
1108{ 1144{
1109 if (screen.cur.col > 0) 1145 if (screen.cur.col > 0)
1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1146 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1111 else 1147 else
… …
1118 * XTERM_SEQ: ESC 9 1154 * XTERM_SEQ: ESC 9
1119 * Move cursor right in row. If we're at the right boundary, shift everything 1155 * Move cursor right in row. If we're at the right boundary, shift everything
1120 * in that row left. Clear right column. 1156 * in that row left. Clear right column.
1121 */ 1157 */
1122#if !ENABLE_MINIMAL 1158#if !ENABLE_MINIMAL
1123void 1159void ecb_cold
1124rxvt_term::scr_forwardindex () NOTHROW 1160rxvt_term::scr_forwardindex () NOTHROW
1125{ 1161{
1126 if (screen.cur.col < ncol - 1) 1162 if (screen.cur.col < ncol - 1)
1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1163 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1128 else 1164 else
… …
1279 scr_blank_line (line, col, num, rstyle); 1315 scr_blank_line (line, col, num, rstyle);
1280} 1316}
1281 1317
1282/* ------------------------------------------------------------------------- */ 1318/* ------------------------------------------------------------------------- */
1283/* 1319/*
1284 * Erase part of whole of the screen 1320 * Erase part or whole of the screen
1285 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1321 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1286 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1322 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1287 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1323 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1288 */ 1324 */
1289void 1325void
… …
1298 ZERO_SCROLLBACK (); 1334 ZERO_SCROLLBACK ();
1299 1335
1300 switch (mode) 1336 switch (mode)
1301 { 1337 {
1302 case 0: /* erase to end of screen */ 1338 case 0: /* erase to end of screen */
1303 selection_check (1);
1304 scr_erase_line (0); 1339 scr_erase_line (0);
1305 row = screen.cur.row + 1; /* possible OOB */ 1340 row = screen.cur.row + 1; /* possible OOB */
1306 num = nrow - row; 1341 num = nrow - row;
1307 break; 1342 break;
1308 case 1: /* erase to beginning of screen */ 1343 case 1: /* erase to beginning of screen */
1309 selection_check (3);
1310 scr_erase_line (1); 1344 scr_erase_line (1);
1311 row = 0; 1345 row = 0;
1312 num = screen.cur.row; 1346 num = screen.cur.row;
1313 break; 1347 break;
1314 case 2: /* erase whole screen */ 1348 case 2: /* erase whole screen */
1315 selection_check (3);
1316 row = 0; 1349 row = 0;
1317 num = nrow; 1350 num = nrow;
1318 break; 1351 break;
1319 default: 1352 default:
1320 return; 1353 return;
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1362 if (row >= nrow) /* Out Of Bounds */
1330 return; 1363 return;
1331 1364
1332 min_it (num, nrow - row); 1365 min_it (num, nrow - row);
1333 1366
1334 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1335 if (rstyle & (RS_RVid | RS_Uline)) 1367 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1368 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1369 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1370 {
1339 ren = DEFAULT_RSTYLE; 1371 ren = DEFAULT_RSTYLE;
1340 1372
1341 if (mapped) 1373 if (mapped)
1342 XClearArea (dpy, vt, 0, 1374 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width, 1375 Row2Pixel (row - view_start), (unsigned int)vt_width,
1344 (unsigned int)Height2Pixel (num), False); 1376 (unsigned int)Height2Pixel (num), False);
1345 } 1377 }
1346 else 1378 else
1347 { 1379 {
1348 ren = rstyle & (RS_fgMask | RS_bgMask); 1380 ren = rstyle & (RS_fgMask | RS_bgMask);
1349 1381
1382 if (mapped)
1383 {
1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1384 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1351 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1352 XFillRectangle (dpy, vt, gc, 1386 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row), 1387 0, Row2Pixel (row - view_start),
1354 (unsigned int)width, 1388 (unsigned int)vt_width,
1355 (unsigned int)Height2Pixel (num)); 1389 (unsigned int)Height2Pixel (num));
1356 gcvalue.foreground = pix_colors[Color_fg]; 1390 gcvalue.foreground = pix_colors[Color_fg];
1357 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1391 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1392 }
1358 } 1393 }
1359 1394
1360 for (; num--; row++) 1395 for (; num--; row++)
1361 { 1396 {
1362 scr_blank_screen_mem (ROW(row), rstyle); 1397 scr_blank_screen_mem (ROW(row), rstyle);
1398
1399 if (row - view_start < nrow)
1363 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1400 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1364 } 1401 }
1365} 1402}
1366 1403
1367#if !ENABLE_MINIMAL 1404#if !ENABLE_MINIMAL
1368void 1405void
… …
1378/* ------------------------------------------------------------------------- */ 1415/* ------------------------------------------------------------------------- */
1379/* 1416/*
1380 * Fill the screen with `E's 1417 * Fill the screen with `E's
1381 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1418 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1382 */ 1419 */
1383void 1420void ecb_cold
1384rxvt_term::scr_E () NOTHROW 1421rxvt_term::scr_E () NOTHROW
1385{ 1422{
1386 rend_t fs; 1423 rend_t fs;
1387 1424
1388 want_refresh = 1; 1425 want_refresh = 1;
1389 ZERO_SCROLLBACK (); 1426 ZERO_SCROLLBACK ();
1390 1427
1391 num_scr_allow = 0; 1428 num_scr_allow = 0;
1392 selection_check (3); 1429
1430 row_col_t pos;
1431 pos.row = pos.col = 0;
1432 if (ROWCOL_IS_AFTER (selection.end, pos))
1433 CLEAR_SELECTION ();
1393 1434
1394 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1435 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1395 for (int row = nrow; row--; ) 1436 for (int row = nrow; row--; )
1396 { 1437 {
1397 line_t &line = ROW(row); 1438 line_t &line = ROW(row);
… …
1442 * Insert/Delete <count> characters from the current position 1483 * Insert/Delete <count> characters from the current position
1443 */ 1484 */
1444void 1485void
1445rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1486rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1446{ 1487{
1447 int col, row;
1448 rend_t tr;
1449
1450 want_refresh = 1; 1488 want_refresh = 1;
1451 ZERO_SCROLLBACK (); 1489 ZERO_SCROLLBACK ();
1452 1490
1453 if (count <= 0) 1491 if (count <= 0)
1454 return; 1492 return;
… …
1456 scr_do_wrap (); 1494 scr_do_wrap ();
1457 1495
1458 selection_check (1); 1496 selection_check (1);
1459 min_it (count, ncol - screen.cur.col); 1497 min_it (count, ncol - screen.cur.col);
1460 1498
1461 row = screen.cur.row; 1499 int row = screen.cur.row;
1462 1500
1463 line_t *line = &ROW(row); 1501 line_t *line = &ROW(row);
1464 1502
1465 line->touch (); 1503 line->touch ();
1466 line->is_longer (0); 1504 line->is_longer (0);
1467 1505
1506 // nuke wide spanning the start
1507 if (line->t[screen.cur.col] == NOCHAR)
1508 scr_kill_char (*line, screen.cur.col);
1509
1468 switch (insdel) 1510 switch (insdel)
1469 { 1511 {
1470 case INSERT: 1512 case INSERT:
1471 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1513 line->l = min (line->l + count, ncol);
1514
1515 if (line->t[screen.cur.col] == NOCHAR)
1516 scr_kill_char (*line, screen.cur.col);
1517
1518 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1472 { 1519 {
1473 line->t[col] = line->t[col - count]; 1520 line->t[col] = line->t[col - count];
1474 line->r[col] = line->r[col - count]; 1521 line->r[col] = line->r[col - count];
1475 } 1522 }
1476
1477 line->l = min (line->l + count, ncol);
1478 1523
1479 if (selection.op && current_screen == selection.screen 1524 if (selection.op && current_screen == selection.screen
1480 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1525 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1481 { 1526 {
1482 if (selection.end.row != screen.cur.row 1527 if (selection.end.row != screen.cur.row
… …
1497 case ERASE: 1542 case ERASE:
1498 screen.cur.col += count; /* don't worry if > ncol */ 1543 screen.cur.col += count; /* don't worry if > ncol */
1499 selection_check (1); 1544 selection_check (1);
1500 screen.cur.col -= count; 1545 screen.cur.col -= count;
1501 1546
1502 line->l = max (line->l - count, 0); 1547 // nuke wide char after the end
1548 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1549 scr_kill_char (*line, screen.cur.col + count);
1550
1503 scr_blank_line (*line, screen.cur.col, count, rstyle); 1551 scr_blank_line (*line, screen.cur.col, count, rstyle);
1504 break; 1552 break;
1505 1553
1506 case DELETE: 1554 case DELETE:
1507 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1555 line->l = max (line->l - count, 0);
1508 1556
1557 // nuke wide char spanning the end
1558 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1559 scr_kill_char (*line, screen.cur.col + count);
1560
1509 for (col = screen.cur.col; (col + count) < ncol; col++) 1561 for (int col = screen.cur.col; (col + count) < ncol; col++)
1510 { 1562 {
1511 line->t[col] = line->t[col + count]; 1563 line->t[col] = line->t[col + count];
1512 line->r[col] = line->r[col + count]; 1564 line->r[col] = line->r[col + count];
1513 } 1565 }
1514 1566
1515 line->l = max (line->l - count, 0);
1516 scr_blank_line (*line, ncol - count, count, tr); 1567 scr_blank_line (*line, ncol - count, count, rstyle);
1517 1568
1518 if (selection.op && current_screen == selection.screen 1569 if (selection.op && current_screen == selection.screen
1519 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1570 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1520 { 1571 {
1521 if (selection.end.row != screen.cur.row 1572 if (selection.end.row != screen.cur.row
… …
1538/* ------------------------------------------------------------------------- */ 1589/* ------------------------------------------------------------------------- */
1539/* 1590/*
1540 * Set the scrolling region 1591 * Set the scrolling region
1541 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1592 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1542 */ 1593 */
1543void 1594void ecb_cold
1544rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1595rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1545{ 1596{
1546 max_it (top, 0); 1597 max_it (top, 0);
1547 min_it (bot, nrow - 1); 1598 min_it (bot, nrow - 1);
1548 1599
… …
1558/* 1609/*
1559 * Make the cursor visible/invisible 1610 * Make the cursor visible/invisible
1560 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1611 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1561 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1612 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1562 */ 1613 */
1563void 1614void ecb_cold
1564rxvt_term::scr_cursor_visible (int mode) NOTHROW 1615rxvt_term::scr_cursor_visible (int mode) NOTHROW
1565{ 1616{
1566 want_refresh = 1; 1617 want_refresh = 1;
1567 1618
1568 if (mode) 1619 if (mode)
… …
1575/* 1626/*
1576 * Set/unset automatic wrapping 1627 * Set/unset automatic wrapping
1577 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1628 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1578 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1629 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1579 */ 1630 */
1580void 1631void ecb_cold
1581rxvt_term::scr_autowrap (int mode) NOTHROW 1632rxvt_term::scr_autowrap (int mode) NOTHROW
1582{ 1633{
1583 if (mode) 1634 if (mode)
1584 screen.flags |= Screen_Autowrap; 1635 screen.flags |= Screen_Autowrap;
1585 else 1636 else
… …
1594 * Relative mode: line numbers are relative to top margin of scrolling region 1645 * Relative mode: line numbers are relative to top margin of scrolling region
1595 * and the cursor cannot be moved outside. 1646 * and the cursor cannot be moved outside.
1596 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1647 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1597 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1648 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1598 */ 1649 */
1599void 1650void ecb_cold
1600rxvt_term::scr_relative_origin (int mode) NOTHROW 1651rxvt_term::scr_relative_origin (int mode) NOTHROW
1601{ 1652{
1602 if (mode) 1653 if (mode)
1603 screen.flags |= Screen_Relative; 1654 screen.flags |= Screen_Relative;
1604 else 1655 else
… …
1611/* 1662/*
1612 * Set insert/replace mode 1663 * Set insert/replace mode
1613 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1664 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1614 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1665 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1615 */ 1666 */
1616void 1667void ecb_cold
1617rxvt_term::scr_insert_mode (int mode) NOTHROW 1668rxvt_term::scr_insert_mode (int mode) NOTHROW
1618{ 1669{
1619 if (mode) 1670 if (mode)
1620 screen.flags |= Screen_Insert; 1671 screen.flags |= Screen_Insert;
1621 else 1672 else
… …
1627 * Set/Unset tabs 1678 * Set/Unset tabs
1628 * XTERM_SEQ: Set tab at current column : ESC H 1679 * XTERM_SEQ: Set tab at current column : ESC H
1629 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1680 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1630 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1681 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1631 */ 1682 */
1632void 1683void ecb_cold
1633rxvt_term::scr_set_tab (int mode) NOTHROW 1684rxvt_term::scr_set_tab (int mode) NOTHROW
1634{ 1685{
1635 if (mode < 0) 1686 if (mode < 0)
1636 memset (tabs, 0, ncol); 1687 memset (tabs, 0, ncol);
1637 else if (screen.cur.col < ncol) 1688 else if (screen.cur.col < ncol)
… …
1657 { 1708 {
1658 rvideo_state = on; 1709 rvideo_state = on;
1659 1710
1660 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1711 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1661#ifdef HAVE_BG_PIXMAP 1712#ifdef HAVE_BG_PIXMAP
1662 if (bgPixmap.pixmap == None) 1713 if (bg_img == 0)
1663#endif 1714#endif
1664 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1715 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1665 1716
1666 XGCValues gcvalue; 1717 XGCValues gcvalue;
1667 gcvalue.foreground = pix_colors[Color_fg]; 1718 gcvalue.foreground = pix_colors[Color_fg];
… …
1676/* ------------------------------------------------------------------------- */ 1727/* ------------------------------------------------------------------------- */
1677/* 1728/*
1678 * Report current cursor position 1729 * Report current cursor position
1679 * XTERM_SEQ: Report position: ESC [ 6 n 1730 * XTERM_SEQ: Report position: ESC [ 6 n
1680 */ 1731 */
1681void 1732void ecb_cold
1682rxvt_term::scr_report_position () NOTHROW 1733rxvt_term::scr_report_position () NOTHROW
1683{ 1734{
1684 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1735 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1685} 1736}
1686 1737
… …
1689 * ------------------------------------------------------------------------- */ 1740 * ------------------------------------------------------------------------- */
1690 1741
1691/* 1742/*
1692 * Set font style 1743 * Set font style
1693 */ 1744 */
1694void 1745void ecb_cold
1695rxvt_term::set_font_style () NOTHROW 1746rxvt_term::set_font_style () NOTHROW
1696{ 1747{
1697#if 0 1748#if 0
1698 switch (charsets [screen.charset]) 1749 switch (charsets [screen.charset])
1699 { 1750 {
… …
1721 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1772 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1722 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1773 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1723 * XTERM_SEQ: Invoke G2 character set: ESC N 1774 * XTERM_SEQ: Invoke G2 character set: ESC N
1724 * XTERM_SEQ: Invoke G3 character set: ESC O 1775 * XTERM_SEQ: Invoke G3 character set: ESC O
1725 */ 1776 */
1726void 1777void ecb_cold
1727rxvt_term::scr_charset_choose (int set) NOTHROW 1778rxvt_term::scr_charset_choose (int set) NOTHROW
1728{ 1779{
1729 screen.charset = set; 1780 screen.charset = set;
1730 set_font_style (); 1781 set_font_style ();
1731} 1782}
… …
1752 * ------------------------------------------------------------------------- */ 1803 * ------------------------------------------------------------------------- */
1753 1804
1754/* 1805/*
1755 * refresh matching text. 1806 * refresh matching text.
1756 */ 1807 */
1757bool 1808bool ecb_cold
1758rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1809rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1759{ 1810{
1760 bool found = false; 1811 bool found = false;
1761 1812
1762 for (int i = 0; i < nrow; i++) 1813 for (int i = 0; i < nrow; i++)
… …
1781 PART_BEG = 0, 1832 PART_BEG = 0,
1782 PART_END, 1833 PART_END,
1783 RC_COUNT 1834 RC_COUNT
1784}; 1835};
1785 1836
1786void 1837void ecb_hot
1787rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1838rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1788{ 1839{
1789 int i; 1840 int i;
1790 row_col_t rc[RC_COUNT]; 1841 row_col_t rc[RC_COUNT];
1791 1842
… …
1811 for (i = PART_BEG; i < RC_COUNT; i++) 1862 for (i = PART_BEG; i < RC_COUNT; i++)
1812 { 1863 {
1813 min_it (rc[i].col, ncol - 1); 1864 min_it (rc[i].col, ncol - 1);
1814 min_it (rc[i].row, nrow - 1); 1865 min_it (rc[i].row, nrow - 1);
1815 } 1866 }
1816// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1867
1817 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1868 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1818 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1869 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1819 1870
1820 num_scr_allow = 0; 1871 num_scr_allow = 0;
1821 1872
… …
1828 * Refresh the entire screen 1879 * Refresh the entire screen
1829 */ 1880 */
1830void 1881void
1831rxvt_term::scr_touch (bool refresh) NOTHROW 1882rxvt_term::scr_touch (bool refresh) NOTHROW
1832{ 1883{
1833 scr_expose (0, 0, width, height, refresh); 1884 scr_expose (0, 0, vt_width, vt_height, refresh);
1834} 1885}
1835 1886
1836/* ------------------------------------------------------------------------- */ 1887/* ------------------------------------------------------------------------- */
1837/* 1888/*
1838 * Move the display so that the line represented by scrollbar value Y is at 1889 * Move the display so that the line represented by scrollbar value Y is at
… …
1894 1945
1895# ifndef NO_MAPALERT 1946# ifndef NO_MAPALERT
1896# ifdef MAPALERT_OPTION 1947# ifdef MAPALERT_OPTION
1897 if (option (Opt_mapAlert)) 1948 if (option (Opt_mapAlert))
1898# endif 1949# endif
1899 XMapWindow (dpy, parent[0]); 1950 XMapWindow (dpy, parent);
1900# endif 1951# endif
1901 1952
1902# if ENABLE_FRILLS 1953# if ENABLE_FRILLS
1903 if (option (Opt_urgentOnBell)) 1954 if (option (Opt_urgentOnBell))
1904 { 1955 set_urgency (1);
1905 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1906 {
1907 h->flags |= XUrgencyHint;
1908 XSetWMHints (dpy, parent[0], h);
1909 }
1910 }
1911# endif 1956# endif
1912 1957
1913 if (option (Opt_visualBell)) 1958 if (option (Opt_visualBell))
1914 { 1959 {
1915 rvideo_bell = true; 1960 rvideo_bell = true;
… …
1918 1963
1919 bell_ev.start (VISUAL_BELL_DURATION); 1964 bell_ev.start (VISUAL_BELL_DURATION);
1920 } 1965 }
1921 else 1966 else
1922 XBell (dpy, 0); 1967 XBell (dpy, 0);
1968 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1923#endif 1969#endif
1924} 1970}
1925 1971
1926/* ------------------------------------------------------------------------- */ 1972/* ------------------------------------------------------------------------- */
1927/* ARGSUSED */ 1973void ecb_cold
1928void
1929rxvt_term::scr_printscreen (int fullhist) NOTHROW 1974rxvt_term::scr_printscreen (int fullhist) NOTHROW
1930{ 1975{
1931#ifdef PRINTPIPE 1976#ifdef PRINTPIPE
1932 int nrows, row_start; 1977 int nrows, row_start;
1933 FILE *fd = popen_printer (); 1978 FILE *fd = popen_printer ();
… …
1946 row_start = view_start; 1991 row_start = view_start;
1947 } 1992 }
1948 1993
1949 wctomb (0, 0); 1994 wctomb (0, 0);
1950 1995
1951 for (int r1 = 0; r1 < nrows; r1++) 1996 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1952 { 1997 {
1953 text_t *tp = ROW(r1).t; 1998 text_t *tp = ROW(r1).t;
1954 int len = ROW(r1).l; 1999 int len = ROW(r1).l;
1955 2000
1956 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2001 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1982/* 2027/*
1983 * Refresh the screen 2028 * Refresh the screen
1984 * drawn_text/drawn_rend contain the screen information before the update. 2029 * drawn_text/drawn_rend contain the screen information before the update.
1985 * screen.text/screen.rend contain what the screen will change to. 2030 * screen.text/screen.rend contain what the screen will change to.
1986 */ 2031 */
1987void 2032void ecb_hot
1988rxvt_term::scr_refresh () NOTHROW 2033rxvt_term::scr_refresh () NOTHROW
1989{ 2034{
1990 unsigned char have_bg,
1991 showcursor; /* show the cursor */
1992 int16_t col, row, /* column/row we're processing */ 2035 int16_t col, row, /* column/row we're processing */
1993 ocrow; /* old cursor row */ 2036 ocrow; /* old cursor row */
1994 int i; /* tmp */ 2037 int i; /* tmp */
1995#ifndef NO_CURSORCOLOR 2038#ifndef NO_CURSORCOLOR
1996 rend_t cc1; /* store colours at cursor position (s) */ 2039 rend_t cc1; /* store colours at cursor position (s) */
… …
2007 /* 2050 /*
2008 * A: set up vars 2051 * A: set up vars
2009 */ 2052 */
2010 refresh_count = 0; 2053 refresh_count = 0;
2011 2054
2055 unsigned int old_screen_flags = screen.flags;
2012 have_bg = 0; 2056 bool have_bg = 0;
2013#ifdef HAVE_BG_PIXMAP 2057#ifdef HAVE_BG_PIXMAP
2014 have_bg = bgPixmap.pixmap != None; 2058 have_bg = bg_img != 0;
2015#endif 2059#endif
2016 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2017 2061
2018 /* 2062 /*
2019 * B: reverse any characters which are selected 2063 * B: reverse any characters which are selected
2020 */ 2064 */
2021 scr_reverse_selection (); 2065 scr_reverse_selection ();
2022 2066
2067 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2068#if ENABLE_OVERLAY
2069 scr_swap_overlay ();
2070#endif
2071
2072 bool showcursor = screen.flags & Screen_VisibleCursor;
2073
2023 /* 2074 /*
2024 * C: set the cursor character (s) 2075 * C: set the cursor character (s)
2025 */ 2076 */
2026 { 2077 {
2027 unsigned char setoldcursor; 2078 bool setoldcursor;
2028 2079
2029 showcursor = (screen.flags & Screen_VisibleCursor);
2030#ifdef CURSOR_BLINK 2080#ifdef CURSOR_BLINK
2031 if (hidden_cursor) 2081 if (hidden_cursor)
2032 showcursor = 0; 2082 showcursor = 0;
2033#endif 2083#endif
2034 2084
… …
2062 ccol2 = bgcolor_of (rstyle); 2112 ccol2 = bgcolor_of (rstyle);
2063#else 2113#else
2064 ccol2 = Color_bg; 2114 ccol2 = Color_bg;
2065#endif 2115#endif
2066 2116
2067 if (showcursor && focus) 2117 if (focus)
2068 { 2118 {
2069 if (option (Opt_cursorUnderline)) 2119 if (option (Opt_cursorUnderline))
2070 *crp ^= RS_Uline; 2120 *crp ^= RS_Uline;
2071 else 2121 else
2072 { 2122 {
… …
2107 oldcursor.col = screen.cur.col; 2157 oldcursor.col = screen.cur.col;
2108 } 2158 }
2109 } 2159 }
2110 } 2160 }
2111 2161
2112 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2113#if ENABLE_OVERLAY
2114 scr_swap_overlay ();
2115#endif
2116
2117#ifndef NO_SLOW_LINK_SUPPORT 2162#ifndef NO_SLOW_LINK_SUPPORT
2118 /* 2163 /*
2119 * D: CopyArea pass - very useful for slower links 2164 * D: CopyArea pass - very useful for slower links
2120 * This has been deliberately kept simple. 2165 * This has been deliberately kept simple.
2121 */ 2166 */
… …
2125 { 2170 {
2126 int16_t nits; 2171 int16_t nits;
2127 int i = num_scr; 2172 int i = num_scr;
2128 int j; 2173 int j;
2129 int len, wlen; 2174 int len, wlen;
2130 dLocal (int, num_scr);
2131 2175
2132 j = nrow; 2176 j = nrow;
2133 wlen = len = -1; 2177 wlen = len = -1;
2134 row = i > 0 ? 0 : j - 1; 2178 row = i > 0 ? 0 : j - 1;
2135 2179
… …
2210 continue; 2254 continue;
2211 2255
2212 // redraw one or more characters 2256 // redraw one or more characters
2213 2257
2214 // seek to the beginning of wide characters 2258 // seek to the beginning of wide characters
2215 while (stp[col] == NOCHAR && col > 0) 2259 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2216 --col; 2260 --col;
2217 2261
2218 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2262 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2219 text_t *text = stp + col; 2263 text_t *text = stp + col;
2220 int count = 1; 2264 int count = 1;
2221 2265
2222 dtp[col] = stp[col]; 2266 dtp[col] = stp[col];
2223 drp[col] = rend; 2267 drp[col] = rend;
… …
2227 for (i = 0; ++col < ncol; ) 2271 for (i = 0; ++col < ncol; )
2228 { 2272 {
2229 if (stp[col] == NOCHAR) 2273 if (stp[col] == NOCHAR)
2230 { 2274 {
2231 dtp[col] = stp[col]; 2275 dtp[col] = stp[col];
2232 drp[col] = rend; 2276 drp[col] = srp[col];
2277
2233 count++; 2278 count++;
2234 i++; 2279 i++;
2235 2280
2236 continue; 2281 continue;
2237 } 2282 }
… …
2257 2302
2258 col--; /* went one too far. move back */ 2303 col--; /* went one too far. move back */
2259 count -= i; /* dump any matching trailing chars */ 2304 count -= i; /* dump any matching trailing chars */
2260 2305
2261 // sometimes we optimize away the trailing NOCHAR's, add them back 2306 // sometimes we optimize away the trailing NOCHAR's, add them back
2262 while (i && text[count] == NOCHAR) 2307 while (ecb_unlikely (i && text[count] == NOCHAR))
2263 count++, i--; 2308 count++, i--;
2264 2309
2265 /* 2310 /*
2266 * Determine the attributes for the string 2311 * Determine the attributes for the string
2267 */ 2312 */
2268 int fore = fgcolor_of (rend); // desired foreground 2313 int fore = fgcolor_of (rend); // desired foreground
2269 int back = bgcolor_of (rend); // desired background 2314 int back = bgcolor_of (rend); // desired background
2270 2315
2271 // only do special processing if any attributes are set, which is unlikely 2316 // only do special processing if any attributes are set, which is unlikely
2272 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2317 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2273 { 2318 {
2274 bool invert = rend & RS_RVid; 2319 bool invert = rend & RS_RVid;
2275 2320
2276#ifndef NO_BOLD_UNDERLINE_REVERSE 2321#ifndef NO_BOLD_UNDERLINE_REVERSE
2277 if (rend & RS_Bold && fore == Color_fg) 2322 if (rend & RS_Bold && fore == Color_fg)
… …
2296 2341
2297 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2342 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2298 fore = Color_UL; 2343 fore = Color_UL;
2299#endif 2344#endif
2300 2345
2346#ifdef OPTION_HC
2347 if (rend & RS_Sel)
2348 {
2349 /* invert the column if no highlightColor is set or it is the
2350 * current cursor column */
2351 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2352 && ISSET_PIXCOLOR (Color_HC))
2353 {
2354 if (ISSET_PIXCOLOR (Color_HTC))
2355 fore = Color_HTC;
2356 // if invert is 0 reverse video is set so we use bg color as fg color
2357 else if (!invert)
2358 fore = back;
2359
2360 back = Color_HC;
2361 invert = 0;
2362 }
2363 }
2364#endif
2365
2301 if (invert) 2366 if (invert)
2302 { 2367 {
2303#ifdef OPTION_HC
2304 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2305 || !ISSET_PIXCOLOR (Color_HC))
2306#endif
2307 /* invert the column if no highlightColor is set or it is the
2308 * current cursor column */
2309 ::swap (fore, back); 2368 ::swap (fore, back);
2310#ifdef OPTION_HC
2311 else if (ISSET_PIXCOLOR (Color_HC))
2312 back = Color_HC;
2313#endif
2314 2369
2315#ifndef NO_BOLD_UNDERLINE_REVERSE 2370#ifndef NO_BOLD_UNDERLINE_REVERSE
2316# ifndef OPTION_HC
2317 if (ISSET_PIXCOLOR (Color_RV))
2318 back = Color_RV;
2319# endif
2320 if (fore == back) 2371 if (fore == back)
2321 { 2372 {
2322 fore = Color_bg; 2373 fore = Color_bg;
2323 back = Color_fg; 2374 back = Color_fg;
2324 } 2375 }
… …
2360 /* 2411 /*
2361 * Actually do the drawing of the string here 2412 * Actually do the drawing of the string here
2362 */ 2413 */
2363 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2414 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2364 2415
2365 if (have_bg && back == Color_bg) 2416 if (ecb_likely (have_bg && back == Color_bg))
2366 { 2417 {
2367 // this is very ugly, maybe push it into ->draw? 2418 // this is very ugly, maybe push it into ->draw?
2368 2419
2369 for (i = 0; i < count; i++) /* don't draw empty strings */ 2420 for (i = 0; i < count; i++) /* don't draw empty strings */
2370 if (text[i] != ' ') 2421 if (text[i] != ' ')
… …
2377 did_clear: ; 2428 did_clear: ;
2378 } 2429 }
2379 else 2430 else
2380 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2431 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2381 2432
2382 if (rend & RS_Uline && font->descent > 1 && fore != back) 2433 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2383 { 2434 {
2384#if ENABLE_FRILLS 2435#if ENABLE_FRILLS
2385 if (ISSET_PIXCOLOR (Color_underline)) 2436 if (ISSET_PIXCOLOR (Color_underline))
2386 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2437 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2387 else 2438 else
… …
2392 xpixel, ypixel + font->ascent + 1, 2443 xpixel, ypixel + font->ascent + 1,
2393 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2444 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2394 } 2445 }
2395 } /* for (col....) */ 2446 } /* for (col....) */
2396 } /* for (row....) */ 2447 } /* for (row....) */
2397
2398#if ENABLE_OVERLAY
2399 scr_swap_overlay ();
2400#endif
2401 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2402 2448
2403 /* 2449 /*
2404 * G: cleanup cursor and display outline cursor if necessary 2450 * G: cleanup cursor and display outline cursor if necessary
2405 */ 2451 */
2406 if (showcursor) 2452 if (showcursor)
… …
2438 2484
2439 XDrawRectangle (dpy, vt, gc, 2485 XDrawRectangle (dpy, vt, gc,
2440 Col2Pixel (col), 2486 Col2Pixel (col),
2441 Row2Pixel (oldcursor.row), 2487 Row2Pixel (oldcursor.row),
2442 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2488 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2443 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2489 (unsigned int) (Height2Pixel (1) - 1));
2444 } 2490 }
2445 } 2491 }
2446 2492
2447 /* 2493 /*
2448 * H: cleanup selection 2494 * H: cleanup selection
2449 */ 2495 */
2496#if ENABLE_OVERLAY
2497 scr_swap_overlay ();
2498#endif
2499 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2500
2450 scr_reverse_selection (); 2501 scr_reverse_selection ();
2451 2502
2503 screen.flags = old_screen_flags;
2452 num_scr = 0; 2504 num_scr = 0;
2453 num_scr_allow = 1; 2505 num_scr_allow = 1;
2454} 2506}
2455 2507
2456void 2508void ecb_cold
2457rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2509rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2458{ 2510{
2459 if (!l.t) 2511 if (!l.valid ())
2460 return; 2512 return;
2461 2513
2462 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2514 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2463 2515
2464 for (int i = ncol; i--; ) 2516 for (int i = ncol; i--; )
2465 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2517 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2466} 2518}
2467 2519
2468void 2520void ecb_cold
2469rxvt_term::scr_remap_chars () NOTHROW 2521rxvt_term::scr_remap_chars () NOTHROW
2470{ 2522{
2471 for (int i = total_rows; i--; ) 2523 for (int i = total_rows; i--; )
2472 scr_remap_chars (row_buf [i]); 2524 scr_remap_chars (row_buf [i]);
2473 2525
… …
2476 scr_remap_chars (drawn_buf [i]); 2528 scr_remap_chars (drawn_buf [i]);
2477 scr_remap_chars (swap_buf [i]); 2529 scr_remap_chars (swap_buf [i]);
2478 } 2530 }
2479} 2531}
2480 2532
2481void 2533void ecb_cold
2482rxvt_term::scr_recolour () NOTHROW 2534rxvt_term::scr_recolour (bool refresh) NOTHROW
2483{ 2535{
2536 bool transparent = false;
2537
2484#ifdef HAVE_BG_PIXMAP 2538#ifdef HAVE_BG_PIXMAP
2485 bgPixmap.apply (); 2539 if (bg_img != 0)
2486#else 2540 {
2541# if ENABLE_TRANSPARENCY
2542 if (bg_flags & BG_IS_TRANSPARENT)
2543 {
2544 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2545 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2487 2546
2547 transparent = true;
2548 }
2549 else
2550# endif
2551 {
2552 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2553 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2554 }
2555 }
2556 else
2557#endif
2558 {
2488 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2559 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2489 XClearWindow (dpy, parent[0]);
2490 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2560 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2561 }
2562
2563 XClearWindow (dpy, parent);
2491 2564
2492 if (scrollBar.win) 2565 if (scrollBar.win)
2493 { 2566 {
2567 if (transparent)
2568 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2569 else
2494 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2570 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2495 scrollBar.state = STATE_IDLE; 2571 scrollBar.state = SB_STATE_IDLE;
2496 scrollBar.show (0); 2572 scrollBar.show (0);
2497 } 2573 }
2498 2574
2499#endif 2575 if (refresh)
2500 2576 {
2501 /* bgPixmap.apply () does not do the following : */
2502 scr_clear (); 2577 scr_clear ();
2503 scr_touch (true); 2578 scr_touch (true);
2579 }
2504 want_refresh = 1; 2580 want_refresh = 1;
2505} 2581}
2506 2582
2507/* ------------------------------------------------------------------------- */ 2583/* ------------------------------------------------------------------------- */
2508void 2584void
… …
2565 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2641 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2566 srp[col] ^= rstyle; 2642 srp[col] ^= rstyle;
2567} 2643}
2568 2644
2569/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2570void 2646void ecb_hot
2571rxvt_term::scr_reverse_selection () NOTHROW 2647rxvt_term::scr_reverse_selection () NOTHROW
2572{ 2648{
2573 if (selection.op 2649 if (selection.op
2574 && current_screen == selection.screen 2650 && current_screen == selection.screen
2575 && selection.end.row >= view_start) 2651 && selection.end.row >= view_start)
2576 { 2652 {
2577#if !ENABLE_MINIMAL 2653#if !ENABLE_MINIMAL
2578 if (selection.rect) 2654 if (selection.rect)
2579 scr_xor_rect (selection.beg.row, selection.beg.col, 2655 scr_xor_rect (selection.beg.row, selection.beg.col,
2580 selection.end.row, selection.end.col, 2656 selection.end.row, selection.end.col,
2581 RS_RVid, RS_RVid | RS_Uline); 2657 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2582 else 2658 else
2583#endif 2659#endif
2584 scr_xor_span (selection.beg.row, selection.beg.col, 2660 scr_xor_span (selection.beg.row, selection.beg.col,
2585 selection.end.row, selection.end.col, 2661 selection.end.row, selection.end.col,
2586 RS_RVid); 2662 RS_Sel | RS_RVid);
2587 } 2663 }
2588} 2664}
2589 2665
2590/* ------------------------------------------------------------------------- */ 2666/* ------------------------------------------------------------------------- */
2591/* 2667/*
… …
2594 */ 2670 */
2595#if 0 2671#if 0
2596void 2672void
2597rxvt_term::scr_dump (int fd) NOTHROW 2673rxvt_term::scr_dump (int fd) NOTHROW
2598{ 2674{
2599 int row, wrote; 2675 // if this method is needed, it can be implemented by factoring the
2600 unsigned int width, towrite; 2676 // relevant code in scr_printscreen
2601 char r1[] = "\n";
2602
2603 for (row = saveLines + top_row;
2604 row < saveLines + nrow - 1; row++)
2605 {
2606 width = row_buf[row].l >= 0 ? row_buf[row].l
2607 : ncol;
2608 for (towrite = width; towrite; towrite -= wrote)
2609 {
2610 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2611 towrite);
2612 if (wrote < 0)
2613 return; /* XXX: death, no report */
2614 }
2615 if (row_buf[row].l >= 0)
2616 if (write (fd, r1, 1) <= 0)
2617 return; /* XXX: death, no report */
2618 }
2619} 2677}
2620#endif 2678#endif
2621 2679
2622/* ------------------------------------------------------------------------- * 2680/* ------------------------------------------------------------------------- *
2623 * CHARACTER SELECTION * 2681 * CHARACTER SELECTION *
2624 * ------------------------------------------------------------------------- */ 2682 * ------------------------------------------------------------------------- */
2625void 2683void
2626rxvt_term::selection_check (int check_more) NOTHROW 2684rxvt_term::selection_check (int check_more) NOTHROW
2627{ 2685{
2628 row_col_t pos;
2629
2630 if (!selection.op) 2686 if (!selection.op)
2631 return; 2687 return;
2632 2688
2633 pos.row = pos.col = 0;
2634 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2689 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2635 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2690 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2636 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2691 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2637 || (check_more == 1 2692 || (check_more == 1
2638 && current_screen == selection.screen 2693 && current_screen == selection.screen
2639 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2694 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2640 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2695 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2641 || (check_more == 2
2642 && ROWCOL_IS_BEFORE (selection.beg, pos)
2643 && ROWCOL_IS_AFTER (selection.end, pos))
2644 || (check_more == 3
2645 && ROWCOL_IS_AFTER (selection.end, pos))
2646 || (check_more == 4 /* screen width change */
2647 && (selection.beg.row != selection.end.row
2648 || selection.end.col > ncol)))
2649 CLEAR_SELECTION (); 2696 CLEAR_ALL_SELECTION ();
2650} 2697}
2651 2698
2652/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2653/* 2700/*
2654 * Paste a selection direct to the command fd 2701 * Paste a selection direct to the command fd
2655 */ 2702 */
2656void 2703void
2657rxvt_term::paste (char *data, unsigned int len) NOTHROW 2704rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2658{ 2705{
2659 /* convert normal newline chars into common keyboard Return key sequence */ 2706 /* convert normal newline chars into common keyboard Return key sequence */
2660 for (unsigned int i = 0; i < len; i++) 2707 for (unsigned int i = 0; i < len; i++)
2661 if (data[i] == C0_LF) 2708 if (data[i] == C0_LF)
2662 data[i] = C0_CR; 2709 data[i] = C0_CR;
2663 2710
2664 if (priv_modes & PrivMode_BracketPaste) 2711 if (priv_modes & PrivMode_BracketPaste)
2665 tt_printf ("\e[200~"); 2712 tt_printf ("\x1b[200~");
2666 2713
2667 tt_write (data, len); 2714 tt_write (data, len);
2668 2715
2669 if (priv_modes & PrivMode_BracketPaste) 2716 if (priv_modes & PrivMode_BracketPaste)
2670 tt_printf ("\e[201~"); 2717 tt_printf ("\x1b[201~");
2671} 2718}
2672 2719
2673/* ------------------------------------------------------------------------- */
2674/*
2675 * Respond to a notification that a primary selection has been sent
2676 * EXT: SelectionNotify
2677 */
2678void 2720void
2679rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2721rxvt_term::paste (char *data, unsigned int len) NOTHROW
2680{ 2722{
2681 if (prop == None) /* check for failed XConvertSelection */ 2723 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2682 {
2683 if ((selection_type & Sel_CompoundText))
2684 {
2685 int selnum = selection_type & Sel_whereMask;
2686
2687 selection_type = 0;
2688 if (selnum != Sel_direct)
2689 selection_request_other (XA_STRING, selnum);
2690 }
2691
2692 if ((selection_type & Sel_UTF8String))
2693 {
2694 int selnum = selection_type & Sel_whereMask;
2695
2696 selection_type = Sel_CompoundText;
2697 if (selnum != Sel_direct)
2698 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2699 else
2700 selection_type = 0;
2701 }
2702
2703 return;
2704 }
2705
2706 unsigned long bytes_after;
2707 XTextProperty ct;
2708
2709 if (XGetWindowProperty (dpy, win, prop,
2710 0, PROP_SIZE / 4,
2711 delete_prop, AnyPropertyType,
2712 &ct.encoding, &ct.format,
2713 &ct.nitems, &bytes_after,
2714 &ct.value) != Success)
2715 {
2716 ct.value = 0;
2717 goto bailout;
2718 }
2719
2720 if (ct.encoding == None)
2721 goto bailout;
2722
2723 if (bytes_after)
2724 {
2725 // fetch and append remaining data
2726 XTextProperty ct2;
2727
2728 if (XGetWindowProperty (dpy, win, prop,
2729 ct.nitems / 4, (bytes_after + 3) / 4,
2730 delete_prop, AnyPropertyType,
2731 &ct2.encoding, &ct2.format,
2732 &ct2.nitems, &bytes_after,
2733 &ct2.value) != Success)
2734 goto bailout;
2735
2736 // realloc should be compatible to XFree, here, and elsewhere, too
2737 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2738 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2739 ct.nitems += ct2.nitems;
2740
2741 XFree (ct2.value);
2742 }
2743
2744 if (ct.value == 0)
2745 goto bailout;
2746
2747 if (ct.encoding == xa[XA_INCR])
2748 {
2749 // INCR selection, start handshake
2750 if (!delete_prop)
2751 XDeleteProperty (dpy, win, prop);
2752
2753 selection_wait = Sel_incr;
2754 incr_buf_fill = 0;
2755 incr_ev.start (10);
2756
2757 goto bailout;
2758 }
2759
2760 if (ct.nitems == 0)
2761 {
2762 if (selection_wait == Sel_incr)
2763 {
2764 XFree (ct.value);
2765
2766 // finally complete, now paste the whole thing
2767 selection_wait = Sel_normal;
2768 ct.value = (unsigned char *)incr_buf;
2769 ct.nitems = incr_buf_fill;
2770 incr_buf = 0;
2771 incr_buf_size = 0;
2772 incr_ev.stop ();
2773 }
2774 else
2775 {
2776 if (selection_wait == Sel_normal
2777 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2778 {
2779 /*
2780 * pass through again trying CUT_BUFFER0 if we've come from
2781 * XConvertSelection () but nothing was presented
2782 */
2783 selection_paste (display->root, XA_CUT_BUFFER0, False);
2784 }
2785
2786 goto bailout;
2787 }
2788 }
2789 else if (selection_wait == Sel_incr)
2790 {
2791 incr_ev.start (10);
2792
2793 while (incr_buf_fill + ct.nitems > incr_buf_size)
2794 {
2795 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2796 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2797 }
2798
2799 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2800 incr_buf_fill += ct.nitems;
2801
2802 goto bailout;
2803 }
2804
2805 char **cl;
2806 int cr;
2807
2808#if !ENABLE_MINIMAL
2809 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2810 // so recode it manually
2811 if (ct.encoding == xa[XA_UTF8_STRING])
2812 {
2813 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2814 char *s = rxvt_wcstombs (w);
2815 free (w);
2816 // TODO: strlen == only the first element will be converted. well...
2817 paste (s, strlen (s));
2818 free (s);
2819 }
2820 else
2821#endif
2822 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2823 && cl)
2824 {
2825 for (int i = 0; i < cr; i++)
2826 paste (cl[i], strlen (cl[i]));
2827
2828 XFreeStringList (cl);
2829 }
2830 else
2831 paste ((char *)ct.value, ct.nitems); // paste raw
2832
2833bailout:
2834 XFree (ct.value);
2835
2836 if (selection_wait == Sel_normal)
2837 selection_wait = Sel_none;
2838}
2839
2840void
2841rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2842{
2843 selection_wait = Sel_none;
2844
2845 incr_buf_size = 0;
2846 free (incr_buf);
2847
2848 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2849}
2850
2851void
2852rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2853{
2854 if (prop == None || selection_wait != Sel_incr)
2855 return; 2724 return;
2856 2725
2857 selection_paste (win, prop, true); 2726 tt_paste (data, len);
2858} 2727}
2859 2728
2860/* ------------------------------------------------------------------------- */ 2729/* ------------------------------------------------------------------------- */
2861/* 2730/*
2862 * Request the current selection: 2731 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2863 * Order: > internal selection if available 2732 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2864 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2733 * as fallback
2865 * > CUT_BUFFER0
2866 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2867 * will auto fallback to CUT_BUFFER0
2868 * EXT: button 2 release 2734 * EXT: button 2 release
2869 */ 2735 */
2870void 2736void
2871rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2737rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2872{ 2738{
2873 if (selection.text && selnum == Sel_Primary) 2739 if (!selection_req)
2874 {
2875 /* internal selection */
2876 char *str = rxvt_wcstombs (selection.text, selection.len);
2877 paste (str, strlen (str));
2878 free (str);
2879 return;
2880 } 2740 {
2881 else 2741 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2742 selection_req->run ();
2882 { 2743 }
2883 selection_request_time = tm;
2884 selection_wait = Sel_normal;
2885
2886#if X_HAVE_UTF8_STRING
2887 selection_type = Sel_UTF8String;
2888 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2889 return;
2890#else
2891 selection_type = Sel_CompoundText;
2892 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2893 return;
2894#endif
2895 }
2896
2897 selection_wait = Sel_none; /* don't loop in selection_paste () */
2898 selection_paste (display->root, XA_CUT_BUFFER0, false);
2899}
2900
2901int
2902rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2903{
2904 Atom sel;
2905
2906 selection_type |= selnum;
2907
2908 if (selnum == Sel_Primary)
2909 sel = XA_PRIMARY;
2910 else if (selnum == Sel_Secondary)
2911 sel = XA_SECONDARY;
2912 else
2913 sel = xa[XA_CLIPBOARD];
2914
2915 if (XGetSelectionOwner (dpy, sel) != None)
2916 {
2917 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2918 vt, selection_request_time);
2919 return 1;
2920 }
2921
2922 return 0;
2923} 2744}
2924 2745
2925/* ------------------------------------------------------------------------- */ 2746/* ------------------------------------------------------------------------- */
2926/* 2747/*
2927 * Clear all selected text 2748 * Clear all selected text
2928 * EXT: SelectionClear 2749 * EXT: SelectionClear
2929 */ 2750 */
2930void 2751void
2931rxvt_term::selection_clear () NOTHROW 2752rxvt_term::selection_clear (bool clipboard) NOTHROW
2932{ 2753{
2754 if (!clipboard)
2755 {
2933 want_refresh = 1; 2756 want_refresh = 1;
2934 free (selection.text); 2757 free (selection.text);
2935 selection.text = NULL; 2758 selection.text = NULL;
2936 selection.len = 0; 2759 selection.len = 0;
2937 CLEAR_SELECTION (); 2760 CLEAR_SELECTION ();
2938 2761
2939 if (display->selection_owner == this) 2762 if (display->selection_owner == this)
2940 display->selection_owner = 0; 2763 display->selection_owner = 0;
2764 }
2765 else
2766 {
2767 free (selection.clip_text);
2768 selection.clip_text = NULL;
2769 selection.clip_len = 0;
2770
2771 if (display->clipboard_owner == this)
2772 display->clipboard_owner = 0;
2773 }
2941} 2774}
2942 2775
2943/* ------------------------------------------------------------------------- */ 2776/* ------------------------------------------------------------------------- */
2944/* 2777/*
2945 * Copy a selection into the cut buffer 2778 * Copy a selection into the cut buffer
2946 * EXT: button 1 or 3 release 2779 * EXT: button 1 or 3 release
2947 */ 2780 */
2948void 2781void
2949rxvt_term::selection_make (Time tm) 2782rxvt_term::selection_make (Time tm)
2950{ 2783{
2951 int i; 2784 int size;
2952 wchar_t *new_selection_text; 2785 wchar_t *new_selection_text;
2953 text_t *t; 2786 text_t *t;
2954 2787
2955 switch (selection.op) 2788 switch (selection.op)
2956 { 2789 {
… …
2972 return; /* nothing selected, go away */ 2805 return; /* nothing selected, go away */
2973 2806
2974 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2807 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2975 return; 2808 return;
2976 2809
2977 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2810 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2978 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2811 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2979 2812
2980 int ofs = 0; 2813 int ofs = 0;
2981 int extra = 0; 2814 int extra = 0;
2982 2815
2983 int col = selection.beg.col; 2816 int col = selection.beg.col;
… …
2989 { 2822 {
2990#if !ENABLE_MINIMAL 2823#if !ENABLE_MINIMAL
2991 if (selection.rect) 2824 if (selection.rect)
2992 { 2825 {
2993 col = selection.beg.col; 2826 col = selection.beg.col;
2994 end_col = ncol + 1; 2827 end_col = selection.end.col;
2995 } 2828 }
2996 else 2829 else
2997#endif 2830#endif
2998 end_col = ROW(row).l; 2831 end_col = ROW(row).l;
2999 2832
3000 col = max (col, 0); 2833 col = max (col, 0);
3001 2834
3002 if (row == selection.end.row 2835 if (row == selection.end.row)
3003#if !ENABLE_MINIMAL
3004 || selection.rect
3005#endif
3006 )
3007 min_it (end_col, selection.end.col); 2836 min_it (end_col, selection.end.col);
3008 2837
3009 t = ROW(row).t + col; 2838 t = ROW(row).t + col;
3010 2839
3011 for (; col < end_col; col++) 2840 for (; col < end_col; col++)
… …
3019 2848
3020 extra -= (len - 1); 2849 extra -= (len - 1);
3021 2850
3022 if (extra < 0) 2851 if (extra < 0)
3023 { 2852 {
3024 extra += i; 2853 extra += size;
3025 i += i; 2854 size += size;
3026 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2855 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3027 } 2856 }
3028 2857
3029 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2858 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3030 } 2859 }
3031#endif 2860#endif
… …
3043 2872
3044 new_selection_text[ofs++] = C0_LF; 2873 new_selection_text[ofs++] = C0_LF;
3045 } 2874 }
3046 else 2875 else
3047#endif 2876#endif
3048 if (!ROW(row).is_longer () && row != selection.end.row) 2877 if (!ROW(row).is_longer ()
2878 && (row != selection.end.row || end_col != selection.end.col)
2879 && (row != selection.beg.row || selection.beg.col < ncol))
3049 new_selection_text[ofs++] = C0_LF; 2880 new_selection_text[ofs++] = C0_LF;
3050 } 2881 }
3051
3052 if (end_col != selection.end.col)
3053 new_selection_text[ofs++] = C0_LF;
3054 2882
3055 new_selection_text[ofs] = 0; 2883 new_selection_text[ofs] = 0;
3056 2884
3057 if (ofs == 0) 2885 if (ofs == 0)
3058 { 2886 {
… …
3071 2899
3072 selection_grab (tm); 2900 selection_grab (tm);
3073} 2901}
3074 2902
3075bool 2903bool
3076rxvt_term::selection_grab (Time tm) NOTHROW 2904rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3077{ 2905{
2906 Atom sel;
2907
2908 if (!clipboard)
2909 {
3078 selection_time = tm; 2910 selection_time = tm;
2911 sel = XA_PRIMARY;
2912 }
2913 else
2914 {
2915 clipboard_time = tm;
2916 sel = xa[XA_CLIPBOARD];
2917 }
3079 2918
3080 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2919 XSetSelectionOwner (dpy, sel, vt, tm);
3081 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2920 if (XGetSelectionOwner (dpy, sel) == vt)
3082 { 2921 {
3083 display->set_selection_owner (this); 2922 display->set_selection_owner (this, clipboard);
3084 return true; 2923 return true;
3085 } 2924 }
3086 else 2925 else
3087 { 2926 {
3088 selection_clear (); 2927 selection_clear (clipboard);
3089 return false; 2928 return false;
3090 } 2929 }
3091 2930
3092#if 0 2931#if 0
3093 XTextProperty ct; 2932 XTextProperty ct;
… …
3103/* ------------------------------------------------------------------------- */ 2942/* ------------------------------------------------------------------------- */
3104/* 2943/*
3105 * Mark or select text based upon number of clicks: 1, 2, or 3 2944 * Mark or select text based upon number of clicks: 1, 2, or 3
3106 * EXT: button 1 press 2945 * EXT: button 1 press
3107 */ 2946 */
3108void 2947void ecb_cold
3109rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2948rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3110{ 2949{
3111 clicks = ((clicks - 1) % 3) + 1; 2950 clicks = ((clicks - 1) % 3) + 1;
3112 selection.clicks = clicks; /* save clicks so extend will work */ 2951 selection.clicks = clicks; /* save clicks so extend will work */
3113 2952
… …
3132 2971
3133/* ------------------------------------------------------------------------- */ 2972/* ------------------------------------------------------------------------- */
3134/* 2973/*
3135 * Mark a selection at the specified col/row 2974 * Mark a selection at the specified col/row
3136 */ 2975 */
3137void 2976void ecb_cold
3138rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2977rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3139{ 2978{
3140 want_refresh = 1; 2979 want_refresh = 1;
3141 2980
3142 selection.mark.row = row + view_start; 2981 selection.mark.row = row + view_start;
… …
3169/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3008/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3170#define DELIMIT_TEXT(x) \ 3009#define DELIMIT_TEXT(x) \
3171 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3010 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3172#define DELIMIT_REND(x) 1 3011#define DELIMIT_REND(x) 1
3173 3012
3174void 3013void ecb_cold
3175rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3014rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3176{ 3015{
3177 int col, row, dirnadd, tcol, trow, w1, w2; 3016 int col, row, dirnadd, tcol, trow, w1, w2;
3178 row_col_t bound; 3017 row_col_t bound;
3179 text_t *stp; 3018 text_t *stp;
… …
3253 * EXT: button 3 press; button 1 or 3 drag 3092 * EXT: button 3 press; button 1 or 3 drag
3254 * flag == 0 ==> button 1 3093 * flag == 0 ==> button 1
3255 * flag == 1 ==> button 3 press 3094 * flag == 1 ==> button 3 press
3256 * flag == 2 ==> button 3 motion 3095 * flag == 2 ==> button 3 motion
3257 */ 3096 */
3258void 3097void ecb_cold
3259rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3098rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3260{ 3099{
3261 int col = clamp (Pixel2Col (x), 0, ncol); 3100 int col = clamp (Pixel2Col (x), 0, ncol);
3262 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3101 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3263 3102
… …
3289 3128
3290/* ------------------------------------------------------------------------- */ 3129/* ------------------------------------------------------------------------- */
3291/* 3130/*
3292 * Extend the selection to the specified col/row 3131 * Extend the selection to the specified col/row
3293 */ 3132 */
3294void 3133void ecb_cold
3295rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3134rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3296{ 3135{
3297 row_col_t pos; 3136 row_col_t pos;
3298 enum { 3137 enum {
3299 LEFT, RIGHT 3138 LEFT, RIGHT
… …
3490 ::swap (selection.beg.col, selection.end.col); 3329 ::swap (selection.beg.col, selection.end.col);
3491#endif 3330#endif
3492} 3331}
3493 3332
3494#if !ENABLE_MINIMAL 3333#if !ENABLE_MINIMAL
3495void 3334void ecb_cold
3496rxvt_term::selection_remove_trailing_spaces () NOTHROW 3335rxvt_term::selection_remove_trailing_spaces () NOTHROW
3497{ 3336{
3498 int32_t end_col, end_row; 3337 int32_t end_col, end_row;
3499 text_t *stp; 3338 text_t *stp;
3500 3339
… …
3538/* ------------------------------------------------------------------------- */ 3377/* ------------------------------------------------------------------------- */
3539/* 3378/*
3540 * Double click on button 3 when already selected 3379 * Double click on button 3 when already selected
3541 * EXT: button 3 double click 3380 * EXT: button 3 double click
3542 */ 3381 */
3543void 3382void ecb_cold
3544rxvt_term::selection_rotate (int x, int y) NOTHROW 3383rxvt_term::selection_rotate (int x, int y) NOTHROW
3545{ 3384{
3546 selection.clicks = selection.clicks % 3 + 1; 3385 selection.clicks = selection.clicks % 3 + 1;
3547 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3386 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3548} 3387}
… …
3550/* ------------------------------------------------------------------------- */ 3389/* ------------------------------------------------------------------------- */
3551/* 3390/*
3552 * Respond to a request for our current selection 3391 * Respond to a request for our current selection
3553 * EXT: SelectionRequest 3392 * EXT: SelectionRequest
3554 */ 3393 */
3555void 3394void ecb_cold
3556rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3395rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3557{ 3396{
3397 Atom property = rq.property == None ? rq.target : rq.property;
3558 XSelectionEvent ev; 3398 XSelectionEvent ev;
3559 3399
3560 ev.type = SelectionNotify; 3400 ev.type = SelectionNotify;
3561 ev.property = None; 3401 ev.property = None;
3562 ev.display = rq.display; 3402 ev.display = rq.display;
… …
3577 *target++ = xa[XA_COMPOUND_TEXT]; 3417 *target++ = xa[XA_COMPOUND_TEXT];
3578#if X_HAVE_UTF8_STRING 3418#if X_HAVE_UTF8_STRING
3579 *target++ = xa[XA_UTF8_STRING]; 3419 *target++ = xa[XA_UTF8_STRING];
3580#endif 3420#endif
3581 3421
3582 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3422 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3583 32, PropModeReplace, 3423 32, PropModeReplace,
3584 (unsigned char *)target_list, target - target_list); 3424 (unsigned char *)target_list, target - target_list);
3585 ev.property = rq.property; 3425 ev.property = property;
3586 } 3426 }
3587#if TODO // TODO 3427#if TODO // TODO
3588 else if (rq.target == xa[XA_MULTIPLE]) 3428 else if (rq.target == xa[XA_MULTIPLE])
3589 { 3429 {
3590 /* TODO: Handle MULTIPLE */ 3430 /* TODO: Handle MULTIPLE */
3591 } 3431 }
3592#endif 3432#endif
3593 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3433 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3594 { 3434 {
3595 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3435 XChangeProperty (dpy, rq.requestor, property, rq.target,
3596 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3436 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3597 ev.property = rq.property; 3437 ev.property = property;
3438 }
3439 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3440 {
3441 XChangeProperty (dpy, rq.requestor, property, rq.target,
3442 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3443 ev.property = property;
3598 } 3444 }
3599 else if (rq.target == XA_STRING 3445 else if (rq.target == XA_STRING
3600 || rq.target == xa[XA_TEXT] 3446 || rq.target == xa[XA_TEXT]
3601 || rq.target == xa[XA_COMPOUND_TEXT] 3447 || rq.target == xa[XA_COMPOUND_TEXT]
3602 || rq.target == xa[XA_UTF8_STRING] 3448 || rq.target == xa[XA_UTF8_STRING]
… …
3634 { 3480 {
3635 target = xa[XA_COMPOUND_TEXT]; 3481 target = xa[XA_COMPOUND_TEXT];
3636 style = enc_compound_text; 3482 style = enc_compound_text;
3637 } 3483 }
3638 3484
3639 if (selection.text) 3485 if (rq.selection == XA_PRIMARY && selection.text)
3640 { 3486 {
3641 cl = selection.text; 3487 cl = selection.text;
3642 selectlen = selection.len; 3488 selectlen = selection.len;
3489 }
3490 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3491 {
3492 cl = selection.clip_text;
3493 selectlen = selection.clip_len;
3643 } 3494 }
3644 else 3495 else
3645 { 3496 {
3646 cl = L""; 3497 cl = L"";
3647 selectlen = 0; 3498 selectlen = 0;
… …
3668 ct.value = (unsigned char *)cl; 3519 ct.value = (unsigned char *)cl;
3669 ct.nitems = selectlen; 3520 ct.nitems = selectlen;
3670 ct.encoding = target; 3521 ct.encoding = target;
3671 } 3522 }
3672 3523
3673 XChangeProperty (dpy, rq.requestor, rq.property, 3524 XChangeProperty (dpy, rq.requestor, property,
3674 ct.encoding, 8, PropModeReplace, 3525 ct.encoding, 8, PropModeReplace,
3675 ct.value, (int)ct.nitems); 3526 ct.value, (int)ct.nitems);
3676 ev.property = rq.property; 3527 ev.property = property;
3677 3528
3678 if (freect) 3529 if (freect)
3679 XFree (ct.value); 3530 XFree (ct.value);
3680 } 3531 }
3681 3532
3682 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3533 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3683} 3534}
3684 3535
3685/* ------------------------------------------------------------------------- */ 3536/* ------------------------------------------------------------------------- */
3686#ifdef USE_XIM 3537#if USE_XIM
3687void 3538void ecb_cold
3688rxvt_term::im_set_position (XPoint &pos) NOTHROW 3539rxvt_term::im_set_position (XPoint &pos) NOTHROW
3689{ 3540{
3690 XWindowAttributes xwa; 3541 XWindowAttributes xwa;
3691 3542
3692 XGetWindowAttributes (dpy, vt, &xwa); 3543 XGetWindowAttributes (dpy, vt, &xwa);
… …
3715 h += 2; min_it (h, nrow); 3566 h += 2; min_it (h, nrow);
3716 3567
3717 x -= 1; clamp_it (x, 0, ncol - w); 3568 x -= 1; clamp_it (x, 0, ncol - w);
3718 y -= 1; clamp_it (y, 0, nrow - h); 3569 y -= 1; clamp_it (y, 0, nrow - h);
3719 3570
3720 ov_x = x; ov_y = y; 3571 ov.x = x; ov.y = y;
3721 ov_w = w; ov_h = h; 3572 ov.w = w; ov.h = h;
3722 3573
3723 ov_text = new text_t *[h]; 3574 ov.text = new text_t *[h];
3724 ov_rend = new rend_t *[h]; 3575 ov.rend = new rend_t *[h];
3725 3576
3726 for (y = 0; y < h; y++) 3577 for (y = 0; y < h; y++)
3727 { 3578 {
3728 text_t *tp = ov_text[y] = new text_t[w]; 3579 text_t *tp = ov.text[y] = new text_t[w];
3729 rend_t *rp = ov_rend[y] = new rend_t[w]; 3580 rend_t *rp = ov.rend[y] = new rend_t[w];
3730 3581
3731 text_t t0, t1, t2; 3582 text_t t0, t1, t2;
3732 rend_t r = OVERLAY_RSTYLE; 3583 rend_t r = OVERLAY_RSTYLE;
3733 3584
3734 if (y == 0) 3585 if (y == 0)
… …
3753} 3604}
3754 3605
3755void 3606void
3756rxvt_term::scr_overlay_off () NOTHROW 3607rxvt_term::scr_overlay_off () NOTHROW
3757{ 3608{
3758 if (!ov_text) 3609 if (!ov.text)
3759 return; 3610 return;
3760 3611
3761 want_refresh = 1; 3612 want_refresh = 1;
3762 3613
3763 for (int y = 0; y < ov_h; y++) 3614 for (int y = 0; y < ov.h; y++)
3764 { 3615 {
3765 delete [] ov_text[y]; 3616 delete [] ov.text[y];
3766 delete [] ov_rend[y]; 3617 delete [] ov.rend[y];
3767 } 3618 }
3768 3619
3769 delete [] ov_text; ov_text = 0; 3620 delete [] ov.text; ov.text = 0;
3770 delete [] ov_rend; ov_rend = 0; 3621 delete [] ov.rend; ov.rend = 0;
3771} 3622}
3772 3623
3773void 3624void
3774rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3625rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3775{ 3626{
3776 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3627 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3777 return; 3628 return;
3778 3629
3779 x++, y++; 3630 x++, y++;
3780 3631
3781 ov_text[y][x] = text; 3632 ov.text[y][x] = text;
3782 ov_rend[y][x] = rend; 3633 ov.rend[y][x] = rend;
3783} 3634}
3784 3635
3785void 3636void
3786rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3637rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3787{ 3638{
… …
3806} 3657}
3807 3658
3808void 3659void
3809rxvt_term::scr_swap_overlay () NOTHROW 3660rxvt_term::scr_swap_overlay () NOTHROW
3810{ 3661{
3811 if (!ov_text) 3662 if (!ov.text)
3812 return; 3663 return;
3813 3664
3665 // hide cursor if it is within the overlay area
3666 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3667 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3668 screen.flags &= ~Screen_VisibleCursor;
3669
3814 // swap screen mem with overlay 3670 // swap screen mem with overlay
3815 for (int y = ov_h; y--; ) 3671 for (int y = ov.h; y--; )
3816 { 3672 {
3817 text_t *t1 = ov_text[y]; 3673 text_t *t1 = ov.text[y];
3818 rend_t *r1 = ov_rend[y]; 3674 rend_t *r1 = ov.rend[y];
3819 3675
3820 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3676 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3821 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3677 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3822 3678
3823 for (int x = ov_w; x--; ) 3679 for (int x = ov.w; x--; )
3824 { 3680 {
3825 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3681 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3826 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3682 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3827 } 3683 }
3828 } 3684 }

Diff Legend

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