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.326 by root, Wed Nov 5 13:04:51 2008 UTC vs.
Revision 1.439 by sf-exg, Mon Mar 25 16:24:18 2013 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 ();
… …
142 while (col > 0 && l.t[col] == NOCHAR) 139 while (col > 0 && l.t[col] == NOCHAR)
143 col--; 140 col--;
144 141
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 142 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
144
145 l.touch ();
147 146
148 // found start, nuke 147 // found start, nuke
149 do { 148 do {
150 l.t[col] = ' '; 149 l.t[col] = ' ';
151 l.r[col] = rend; 150 l.r[col] = rend;
152 col++; 151 col++;
153 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
154} 153}
155 154
155// set the rendition of a single wide character beginning at the given column
156void
157rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
158{
159 do {
160 l.r[col] = rend;
161 col++;
162 } while (col < ncol && l.t[col] == NOCHAR);
163}
164
156/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
157 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
158 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
159 168
160void 169void
170rxvt_term::scr_alloc () NOTHROW
171{
172 int tsize = sizeof (text_t) * ncol;
173 int rsize = sizeof (rend_t) * ncol;
174
175 // we assume that rend_t size is a sufficient alignment
176 // factor for text_t and line_t values, and we only
177 // need to adjust tsize.
178 tsize = (tsize + sizeof (rend_t) - 1);
179 tsize -= tsize % sizeof (rend_t);
180
181 int all_rows = total_rows + nrow + nrow;
182
183 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
184 chunk = chunk_alloc (chunk_size, 0);
185
186 char *base = (char *)chunk + sizeof (line_t) * all_rows;
187
188 for (int row = 0; row < all_rows; ++row)
189 {
190 line_t &l = ((line_t *)chunk) [row];
191
192 l.t = (text_t *)base; base += tsize;
193 l.r = (rend_t *)base; base += rsize;
194 l.l = -1;
195 l.f = 0;
196 }
197
198 drawn_buf = (line_t *)chunk;
199 swap_buf = drawn_buf + nrow;
200 row_buf = swap_buf + nrow;
201}
202
203void
204rxvt_term::copy_line (line_t &dst, line_t &src)
205{
206 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
207 dst.l = min (src.l, ncol);
208 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
209 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
210 dst.f = src.f;
211}
212
213void ecb_cold
161rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
162{ 215{
216#if ENABLE_OVERLAY
217 scr_overlay_off ();
218#endif
219
163 view_start = 0; 220 view_start = 0;
164 num_scr = 0; 221 num_scr = 0;
165 222
166 if (ncol == 0) 223 if (ncol == 0)
167 ncol = 80; 224 ncol = 80;
… …
187 total_rows = nrow + saveLines; 244 total_rows = nrow + saveLines;
188 245
189 screen.tscroll = 0; 246 screen.tscroll = 0;
190 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
191 248
249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
251 line_t *prev_drawn_buf = drawn_buf;
252 line_t *prev_swap_buf = swap_buf;
253 line_t *prev_row_buf = row_buf;
254
255 scr_alloc ();
256
192 if (!row_buf) 257 if (!prev_row_buf)
193 { 258 {
194 /*
195 * first time called so just malloc everything: don't rely on realloc
196 */
197 top_row = 0; 259 top_row = 0;
198 term_start = 0; 260 term_start = 0;
199
200 talloc = new rxvt_salloc (ncol * sizeof (text_t));
201 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
202
203 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206
207 for (int row = nrow; row--; )
208 {
209 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
211 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
212 }
213 261
214 memset (charsets, 'B', sizeof (charsets)); 262 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 263 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 264 screen.flags = Screen_DefaultFlags;
217 screen.cur.row = screen.cur.col = 0; 265 screen.cur.row = screen.cur.col = 0;
… …
231 selection.text = NULL; 279 selection.text = NULL;
232 selection.len = 0; 280 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 281 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 282 selection.screen = PRIMARY;
235 selection.clicks = 0; 283 selection.clicks = 0;
284 selection.clip_text = NULL;
285 selection.clip_len = 0;
236 } 286 }
237 else 287 else
238 { 288 {
239 /* 289 /*
240 * add or delete rows as appropriate 290 * add or delete rows as appropriate
241 */ 291 */
242 292
243 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 293 int common_col = min (prev_ncol, ncol);
244 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
245
246#if 0
247 if (nrow < prev_nrow)
248 {
249 for (int row = nrow; row < prev_nrow; row++)
250 {
251 lfree (swap_buf [row]);
252 lfree (drawn_buf[row]);
253 }
254 }
255#endif
256
257 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
258 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
259 294
260 for (int row = min (nrow, prev_nrow); row--; ) 295 for (int row = min (nrow, prev_nrow); row--; )
261 { 296 {
262 lresize (drawn_buf[row]); 297 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
263 lresize (swap_buf [row]); 298 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
264 } 299 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
265 300
266 for (int row = prev_nrow; row < nrow; row++) 301 copy_line (swap_buf [row], prev_swap_buf [row]);
267 { 302 }
268 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
269 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
270 }
271
272 line_t *old_buf = row_buf;
273 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
274 303
275 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 304 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
276 int pend = MOD (term_start + top_row , prev_total_rows); 305 int pend = MOD (term_start + top_row , prev_total_rows);
277 int q = total_rows; // rewrapped row 306 int q = total_rows; // rewrapped row
278 307
… …
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 315 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 316
288 do 317 do
289 { 318 {
290 p = MOD (p - 1, prev_total_rows); 319 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 320 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
293#endif
294 int plines = 1; 321 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 322 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
296 323
297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 324 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
298 { 325 {
299 p = MOD (p - 1, prev_total_rows); 326 p = MOD (p - 1, prev_total_rows);
300 327
301 plines++; 328 plines++;
302 llen += prev_ncol; 329 llen += prev_ncol;
… …
315 342
316 // re-assemble the full line by destination lines 343 // re-assemble the full line by destination lines
317 for (int qrow = q; qlines--; qrow++) 344 for (int qrow = q; qlines--; qrow++)
318 { 345 {
319 qline = row_buf + qrow; 346 qline = row_buf + qrow;
320 lalloc (*qline); 347 qline->alloc (); // redundant with next line
321 qline->l = ncol; 348 qline->l = ncol;
322 qline->is_longer (1); 349 qline->is_longer (1);
323 350
324 int qcol = 0; 351 int qcol = 0;
325 352
… …
340 // this seems to upset applications/shells/readline 367 // this seems to upset applications/shells/readline
341 // least. 368 // least.
342 if (prow == ocur.row) 369 if (prow == ocur.row)
343 screen.cur.row = q - (total_rows - nrow); 370 screen.cur.row = q - (total_rows - nrow);
344 371
345 line_t &pline = old_buf [prow]; 372 line_t &pline = prev_row_buf [prow];
346 373
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 374 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 375
349 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 376 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
350 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 377 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
371 { 398 {
372 // if no scrollback exists (yet), wing, instead of wrap 399 // if no scrollback exists (yet), wing, instead of wrap
373 400
374 for (int row = min (nrow, prev_nrow); row--; ) 401 for (int row = min (nrow, prev_nrow); row--; )
375 { 402 {
376 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 403 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
377 line_t &qline = row_buf [row]; 404 line_t &dst = row_buf [row];
378 405
379 qline = pline; 406 copy_line (dst, src);
380 lresize (qline);
381 } 407 }
382 408
383 for (int row = prev_nrow; row < nrow; row++) 409 for (int row = prev_nrow; row < nrow; row++)
384 {
385 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
386 }
387 411
388 term_start = 0; 412 term_start = 0;
389 } 413 }
390
391 free (old_buf);
392 delete old_ta;
393 delete old_ra;
394 414
395 clamp_it (screen.cur.row, 0, nrow - 1); 415 clamp_it (screen.cur.row, 0, nrow - 1);
396 clamp_it (screen.cur.col, 0, ncol - 1); 416 clamp_it (screen.cur.col, 0, ncol - 1);
397 } 417 }
398 418
419 for (int row = nrow; row--; )
420 {
421 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
422 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
423 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
424 }
425
426 chunk_free (prev_chunk, prev_chunk_size);
427
399 free (tabs); 428 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 429 tabs = (char *)rxvt_malloc (ncol);
401 430
402 for (int col = ncol; --col; ) 431 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 432 tabs [col] = col % TABSIZE == 0;
404 433
405 CLEAR_ALL_SELECTION (); 434 CLEAR_ALL_SELECTION ();
406 435
407 prev_nrow = nrow; 436 prev_nrow = nrow;
… …
410 tt_winch (); 439 tt_winch ();
411 440
412 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 441 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
413} 442}
414 443
415/* ------------------------------------------------------------------------- */ 444void ecb_cold
416/*
417 * Free everything. That way malloc debugging can find leakage.
418 */
419void
420rxvt_term::scr_release () NOTHROW 445rxvt_term::scr_release () NOTHROW
421{ 446{
422 if (row_buf) 447 chunk_free (chunk, chunk_size);
423 { 448 chunk = 0;
424 delete talloc; talloc = 0; 449 row_buf = 0;
425 delete ralloc; ralloc = 0;
426 450
427 free (row_buf);
428 free (swap_buf);
429 free (drawn_buf);
430 row_buf = 0; // signal that we freed all the arrays above
431
432 free (tabs); 451 free (tabs);
433 tabs = 0; 452 tabs = 0;
434 }
435} 453}
436 454
437/* ------------------------------------------------------------------------- */ 455/* ------------------------------------------------------------------------- */
438/* 456/*
439 * Hard/Soft reset 457 * Hard/Soft reset
440 */ 458 */
441void 459void ecb_cold
442rxvt_term::scr_poweron () 460rxvt_term::scr_poweron ()
443{ 461{
444 scr_release (); 462 scr_release ();
463
445 prev_nrow = prev_ncol = 0; 464 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false; 465 rvideo_mode = false;
447 scr_soft_reset (); 466 scr_soft_reset ();
448 scr_reset (); 467 scr_reset ();
449 468
450 scr_clear (true); 469 scr_clear (true);
451 scr_refresh (); 470 scr_refresh ();
452} 471}
453 472
454void 473void ecb_cold
455rxvt_term::scr_soft_reset () 474rxvt_term::scr_soft_reset () NOTHROW
456{ 475{
457 /* only affects modes, nothing drastic such as clearing the screen */ 476 /* only affects modes, nothing drastic such as clearing the screen */
458#if ENABLE_OVERLAY 477#if ENABLE_OVERLAY
459 scr_overlay_off (); 478 scr_overlay_off ();
460#endif 479#endif
… …
510 } 529 }
511 530
512 /* boundary check in case screen size changed between SAVE and RESTORE */ 531 /* boundary check in case screen size changed between SAVE and RESTORE */
513 min_it (s->cur.row, nrow - 1); 532 min_it (s->cur.row, nrow - 1);
514 min_it (s->cur.col, ncol - 1); 533 min_it (s->cur.col, ncol - 1);
515#ifdef DEBUG_STRICT
516 assert (s->cur.row >= 0); 534 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 535 assert (s->cur.col >= 0);
518#endif
519} 536}
520 537
521void 538void
522rxvt_term::scr_swap_screen () 539rxvt_term::scr_swap_screen () NOTHROW
523{ 540{
524 if (!option (Opt_secondaryScreen)) 541 if (!option (Opt_secondaryScreen))
525 return; 542 return;
526 543
527 for (int i = prev_nrow; i--; ) 544 for (int i = prev_nrow; i--; )
… …
546 return; 563 return;
547 564
548 want_refresh = 1; 565 want_refresh = 1;
549 view_start = 0; 566 view_start = 0;
550 567
551 selection_check (2); /* check for boundary cross */ 568 /* check for boundary cross */
569 row_col_t pos;
570 pos.row = pos.col = 0;
571 if (ROWCOL_IS_BEFORE (selection.beg, pos)
572 && ROWCOL_IS_AFTER (selection.end, pos))
573 CLEAR_SELECTION ();
552 574
553 int i = current_screen; current_screen = scrn; scrn = i; 575 current_screen = scrn;
554 576
555#if NSCREENS 577#if NSCREENS
556 if (option (Opt_secondaryScreen)) 578 if (option (Opt_secondaryScreen))
557 { 579 {
558 num_scr = 0; 580 num_scr = 0;
… …
622/* 644/*
623 * Scroll text between <row1> and <row2> inclusive, by <count> lines 645 * Scroll text between <row1> and <row2> inclusive, by <count> lines
624 * count positive ==> scroll up 646 * count positive ==> scroll up
625 * count negative ==> scroll down 647 * count negative ==> scroll down
626 */ 648 */
627int 649int ecb_hot
628rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 650rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
629{ 651{
630 if (count == 0 || (row1 > row2)) 652 if (count == 0 || (row1 > row2))
631 return 0; 653 return 0;
632 654
… …
635 657
636 if (count > 0 658 if (count > 0
637 && row1 == 0 659 && row1 == 0
638 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 660 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
639 { 661 {
662 min_it (count, total_rows - (nrow - (row2 + 1)));
663
640 top_row = max (top_row - count, -saveLines); 664 top_row = max (top_row - count, -saveLines);
641
642 // scroll everything up 'count' lines
643 term_start = (term_start + count) % total_rows;
644 665
645 // sever bottommost line 666 // sever bottommost line
646 { 667 {
647 line_t &l = ROW(row2 - count); 668 line_t &l = ROW(row2);
648 l.is_longer (0); 669 l.is_longer (0);
649 l.touch (); 670 l.touch ();
650 } 671 }
651 672
673 // scroll everything up 'count' lines
674 term_start = (term_start + count) % total_rows;
675
676 // now copy lines below the scroll region bottom to the
677 // bottom of the screen again, so they look as if they
678 // hadn't moved.
679 for (int i = nrow; --i > row2; )
680 {
681 line_t &l1 = ROW(i - count);
682 line_t &l2 = ROW(i);
683
684 ::swap (l1, l2);
685 l2.touch ();
686 }
687
652 // erase newly scrolled-in lines 688 // erase newly scrolled-in lines
653 for (int i = count; i--; ) 689 for (int i = count; i--; )
654 { 690 {
655 line_t &l = ROW(nrow - 1 - i); 691 line_t &l = ROW(row2 - i);
656 692
657 // optimize if already cleared, can be significant on slow machines 693 // optimise if already cleared, can be significant on slow machines
658 // could be rolled into scr_blank_screen_mem 694 // could be rolled into scr_blank_screen_mem
659 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 695 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
660 { 696 {
661 scr_blank_line (l, 0, l.l, rstyle); 697 scr_blank_line (l, 0, l.l, rstyle);
662 l.l = 0; 698 l.l = 0;
… …
664 } 700 }
665 else 701 else
666 scr_blank_screen_mem (l, rstyle); 702 scr_blank_screen_mem (l, rstyle);
667 } 703 }
668 704
669 // now copy lines below the scroll region bottom to the
670 // bottom of the screen again, so they look as if they
671 // hadn't moved.
672 for (int i = nrow; --i > row2; )
673 {
674 line_t &l1 = ROW(i - count);
675 line_t &l2 = ROW(i);
676
677 ::swap (l1, l2);
678 l2.touch ();
679 }
680
681 // move and/or clear selection, if any 705 // move and/or clear selection, if any
682 if (selection.op && current_screen == selection.screen) 706 if (selection.op && current_screen == selection.screen
707 && selection.beg.row <= row2)
683 { 708 {
684 selection.beg.row -= count; 709 selection.beg.row -= count;
685 selection.end.row -= count; 710 selection.end.row -= count;
686 selection.mark.row -= count; 711 selection.mark.row -= count;
687 712
688 if (selection.beg.row < top_row 713 selection_check (0);
689 || selection.end.row < top_row
690 || selection.mark.row < top_row)
691 {
692 CLEAR_ALL_SELECTION ();
693 selection.op = SELECTION_CLEAR;
694 }
695 } 714 }
696 715
697 // finally move the view window, if desired 716 // finally move the view window, if desired
698 if (option (Opt_scrollWithBuffer) 717 if (option (Opt_scrollWithBuffer)
699 && view_start != 0 718 && view_start != 0
… …
729 } 748 }
730 749
731 // use a simple and robust scrolling algorithm, this 750 // use a simple and robust scrolling algorithm, this
732 // part of scr_scroll_text is not time-critical. 751 // part of scr_scroll_text is not time-critical.
733 752
753 // sever line above scroll region
754 if (row1)
755 {
756 line_t &l = ROW(row1 - 1);
757 l.is_longer (0);
758 l.touch ();
759 }
760
734 int rows = row2 - row1 + 1; 761 int rows = row2 - row1 + 1;
735 762
736 min_it (count, rows); 763 min_it (count, rows);
737 764
738 line_t *temp_buf = row_buf + total_rows; 765 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
739 766
740 for (int row = 0; row < rows; row++) 767 for (int row = 0; row < rows; row++)
741 { 768 {
742 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 769 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
743 770
… …
745 scr_blank_screen_mem (temp_buf [row], rstyle); 772 scr_blank_screen_mem (temp_buf [row], rstyle);
746 } 773 }
747 774
748 for (int row = 0; row < rows; row++) 775 for (int row = 0; row < rows; row++)
749 ROW(row1 + row) = temp_buf [row]; 776 ROW(row1 + row) = temp_buf [row];
777
778 // sever bottommost line
779 {
780 line_t &l = ROW(row2);
781 l.is_longer (0);
782 l.touch ();
783 }
750 } 784 }
751 785
752 return count; 786 return count;
753} 787}
754 788
755/* ------------------------------------------------------------------------- */ 789/* ------------------------------------------------------------------------- */
756/* 790/*
757 * Add text given in <str> of length <len> to screen struct 791 * Add text given in <str> of length <len> to screen struct
758 */ 792 */
759void 793void ecb_hot
760rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 794rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
761{ 795{
762 if (len <= 0) /* sanity */ 796 if (len <= 0) /* sanity */
763 return; 797 return;
764 798
765 unsigned char checksel; 799 bool checksel;
766 unicode_t c; 800 unicode_t c;
767 int ncol = this->ncol; 801 int ncol = this->ncol;
768 const wchar_t *strend = str + len; 802 const wchar_t *strend = str + len;
769 803
770 want_refresh = 1; 804 want_refresh = 1;
… …
783 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 817 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784 screen.cur.row -= minlines; 818 screen.cur.row -= minlines;
785 } 819 }
786 } 820 }
787 821
788#ifdef DEBUG_STRICT
789 assert (screen.cur.col < ncol); 822 assert (screen.cur.col < ncol);
790 assert (screen.cur.row < nrow 823 assert (screen.cur.row < nrow
791 && screen.cur.row >= top_row); 824 && screen.cur.row >= top_row);
792#endif
793 int row = screen.cur.row; 825 int row = screen.cur.row;
794 826
795 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 827 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
796 828
797 line_t *line = &ROW(row); 829 line_t *line = &ROW(row);
798 830
799 while (str < strend) 831 while (str < strend)
800 { 832 {
801 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 833 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
802 834
803 if (expect_false (c < 0x20)) 835 if (ecb_unlikely (c < 0x20))
804 if (c == C0_LF) 836 if (c == C0_LF)
805 { 837 {
806 max_it (line->l, screen.cur.col); 838 max_it (line->l, screen.cur.col);
807 839
808 screen.flags &= ~Screen_WrapNext; 840 screen.flags &= ~Screen_WrapNext;
… …
827 { 859 {
828 scr_tab (1, true); 860 scr_tab (1, true);
829 continue; 861 continue;
830 } 862 }
831 863
832 if (expect_false ( 864 if (ecb_unlikely (
833 checksel /* see if we're writing within selection */ 865 checksel /* see if we're writing within selection */
834 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 866 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
835 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 867 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
836 )) 868 ))
837 { 869 {
… …
842 * should be a similar check. 874 * should be a similar check.
843 */ 875 */
844 CLEAR_SELECTION (); 876 CLEAR_SELECTION ();
845 } 877 }
846 878
847 if (expect_false (screen.flags & Screen_WrapNext)) 879 if (ecb_unlikely (screen.flags & Screen_WrapNext))
848 { 880 {
849 scr_do_wrap (); 881 scr_do_wrap ();
850 882
851 line->l = ncol; 883 line->l = ncol;
852 line->is_longer (1); 884 line->is_longer (1);
… …
854 row = screen.cur.row; 886 row = screen.cur.row;
855 line = &ROW(row); /* _must_ refresh */ 887 line = &ROW(row); /* _must_ refresh */
856 } 888 }
857 889
858 // some utf-8 decoders "decode" surrogate characters: let's fix this. 890 // some utf-8 decoders "decode" surrogate characters: let's fix this.
859 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 891 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
860 c = 0xfffd; 892 c = 0xfffd;
861 893
862 // rely on wcwidth to tell us the character width, do wcwidth before 894 // rely on wcwidth to tell us the character width, do wcwidth before
863 // further replacements, as wcwidth might return -1 for the line 895 // further replacements, as wcwidth might return -1 for the line
864 // drawing characters below as they might be invalid in the current 896 // drawing characters below as they might be invalid in the current
865 // locale. 897 // locale.
866 int width = WCWIDTH (c); 898 int width = WCWIDTH (c);
867 899
868 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 900 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
869 { 901 {
870 // vt100 special graphics and line drawing 902 // vt100 special graphics and line drawing
871 // 5f-7e standard vt100 903 // 5f-7e standard vt100
872 // 40-5e rxvt extension for extra curses acs chars 904 // 40-5e rxvt extension for extra curses acs chars
873 static uint16_t vt100_0[62] = { // 41 .. 7e 905 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
886 c = vt100_0[c - 0x41]; 918 c = vt100_0[c - 0x41];
887 width = 1; // vt100 line drawing characters are always single-width 919 width = 1; // vt100 line drawing characters are always single-width
888 } 920 }
889 } 921 }
890 922
891 if (expect_false (screen.flags & Screen_Insert)) 923 if (ecb_unlikely (screen.flags & Screen_Insert))
892 scr_insdel_chars (width, INSERT); 924 scr_insdel_chars (width, INSERT);
893 925
894 if (width != 0) 926 if (width != 0)
895 { 927 {
896#if !UNICODE_3 928#if !UNICODE_3
… …
901# else 933# else
902 c = 0xfffd; 934 c = 0xfffd;
903# endif 935# endif
904#endif 936#endif
905 937
938 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
939
940 // if the character doesn't fit into the remaining columns...
941 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
942 {
943 if (screen.flags & Screen_Autowrap)
944 {
945 // ... artificially enlargen the previous one
946 c = NOCHAR;
947 // and try the same character next loop iteration
948 --str;
949 }
950 else
951 screen.cur.col = ncol - width;
952 }
953
906 // nuke the character at this position, if required 954 // nuke the character at this position, if required
907 if (expect_false ( 955 // due to wonderful coincidences everywhere else in this loop
956 // we never have to check for overwriting a wide char itself,
957 // only its tail.
908 line->t[screen.cur.col] == NOCHAR 958 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
909 || (screen.cur.col < ncol - 1
910 && line->t[screen.cur.col + 1] == NOCHAR)
911 ))
912 scr_kill_char (*line, screen.cur.col); 959 scr_kill_char (*line, screen.cur.col);
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916 // if the character doesn't fit into the remaining columns...
917 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
918 {
919 // ... artificially enlargen the previous one
920 c = NOCHAR;
921 // and try the same character next loop iteration
922 --str;
923 }
924 960
925 line->touch (); 961 line->touch ();
926 962
927 do 963 do
928 { 964 {
929 line->t[screen.cur.col] = c; 965 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 966 line->r[screen.cur.col] = rend;
931 967
932 if (expect_true (screen.cur.col < ncol - 1)) 968 if (ecb_likely (screen.cur.col < ncol - 1))
933 screen.cur.col++; 969 screen.cur.col++;
934 else 970 else
935 { 971 {
936 line->l = ncol; 972 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 973 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 974 screen.flags |= Screen_WrapNext;
939 break; 975
976 goto end_of_line;
940 } 977 }
941 978
942 c = NOCHAR; 979 c = NOCHAR;
943 } 980 }
944 while (expect_false (--width > 0)); 981 while (ecb_unlikely (--width > 0));
945 982
946 // pad with spaces when overwriting wide character with smaller one 983 // pad with spaces when overwriting wide character with smaller one
947 if (expect_false (!width)) 984 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
948 { 985 {
949 line->touch ();
950
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 {
953 line->t[c] = ' '; 986 line->t[c] = ' ';
954 line->r[c] = rend; 987 line->r[c] = rend;
955 }
956 } 988 }
989
990end_of_line:
991 ;
957 } 992 }
958#if ENABLE_COMBINING 993#if ENABLE_COMBINING
959 else // width == 0 994 else // width == 0
960 { 995 {
961 if (c != 0xfeff) // ignore BOM 996 if (c != 0xfeff) // ignore BOM
… …
1001#endif 1036#endif
1002 } 1037 }
1003 1038
1004 max_it (line->l, screen.cur.col); 1039 max_it (line->l, screen.cur.col);
1005 1040
1006#ifdef DEBUG_STRICT
1007 assert (screen.cur.row >= 0); 1041 assert (screen.cur.row >= 0);
1008#endif
1009} 1042}
1010 1043
1011/* ------------------------------------------------------------------------- */ 1044/* ------------------------------------------------------------------------- */
1012/* 1045/*
1013 * Process Backspace. Move back the cursor back a position, wrap if have to 1046 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1026 1059
1027 want_refresh = 1; 1060 want_refresh = 1;
1028#endif 1061#endif
1029 } 1062 }
1030 } 1063 }
1064 else if (screen.flags & Screen_WrapNext)
1065 screen.flags &= ~Screen_WrapNext;
1031 else 1066 else
1032 scr_gotorc (0, -1, RELATIVE); 1067 scr_gotorc (0, -1, RELATIVE);
1033} 1068}
1034 1069
1035/* ------------------------------------------------------------------------- */ 1070/* ------------------------------------------------------------------------- */
… …
1113 * XTERM_SEQ: ESC 6 1148 * XTERM_SEQ: ESC 6
1114 * Move cursor left in row. If we're at the left boundary, shift everything 1149 * Move cursor left in row. If we're at the left boundary, shift everything
1115 * in that row right. Clear left column. 1150 * in that row right. Clear left column.
1116 */ 1151 */
1117#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1118void 1153void ecb_cold
1119rxvt_term::scr_backindex () NOTHROW 1154rxvt_term::scr_backindex () NOTHROW
1120{ 1155{
1121 if (screen.cur.col > 0) 1156 if (screen.cur.col > 0)
1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1123 else 1158 else
… …
1130 * XTERM_SEQ: ESC 9 1165 * XTERM_SEQ: ESC 9
1131 * Move cursor right in row. If we're at the right boundary, shift everything 1166 * Move cursor right in row. If we're at the right boundary, shift everything
1132 * in that row left. Clear right column. 1167 * in that row left. Clear right column.
1133 */ 1168 */
1134#if !ENABLE_MINIMAL 1169#if !ENABLE_MINIMAL
1135void 1170void ecb_cold
1136rxvt_term::scr_forwardindex () NOTHROW 1171rxvt_term::scr_forwardindex () NOTHROW
1137{ 1172{
1138 if (screen.cur.col < ncol - 1) 1173 if (screen.cur.col < ncol - 1)
1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1140 else 1175 else
… …
1291 scr_blank_line (line, col, num, rstyle); 1326 scr_blank_line (line, col, num, rstyle);
1292} 1327}
1293 1328
1294/* ------------------------------------------------------------------------- */ 1329/* ------------------------------------------------------------------------- */
1295/* 1330/*
1296 * Erase part of whole of the screen 1331 * Erase part or whole of the screen
1297 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1332 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1298 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1333 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1299 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1334 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1300 */ 1335 */
1301void 1336void
… …
1310 ZERO_SCROLLBACK (); 1345 ZERO_SCROLLBACK ();
1311 1346
1312 switch (mode) 1347 switch (mode)
1313 { 1348 {
1314 case 0: /* erase to end of screen */ 1349 case 0: /* erase to end of screen */
1315 selection_check (1);
1316 scr_erase_line (0); 1350 scr_erase_line (0);
1317 row = screen.cur.row + 1; /* possible OOB */ 1351 row = screen.cur.row + 1; /* possible OOB */
1318 num = nrow - row; 1352 num = nrow - row;
1319 break; 1353 break;
1320 case 1: /* erase to beginning of screen */ 1354 case 1: /* erase to beginning of screen */
1321 selection_check (3);
1322 scr_erase_line (1); 1355 scr_erase_line (1);
1323 row = 0; 1356 row = 0;
1324 num = screen.cur.row; 1357 num = screen.cur.row;
1325 break; 1358 break;
1326 case 2: /* erase whole screen */ 1359 case 2: /* erase whole screen */
1327 selection_check (3);
1328 row = 0; 1360 row = 0;
1329 num = nrow; 1361 num = nrow;
1330 break; 1362 break;
1331 default: 1363 default:
1332 return; 1364 return;
… …
1341 if (row >= nrow) /* Out Of Bounds */ 1373 if (row >= nrow) /* Out Of Bounds */
1342 return; 1374 return;
1343 1375
1344 min_it (num, nrow - row); 1376 min_it (num, nrow - row);
1345 1377
1346 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious.
1349 if (rstyle & (RS_RVid | RS_Uline)) 1378 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1350 ren = (rend_t) ~RS_None; 1379 ren = (rend_t) ~RS_None;
1351 else if (GET_BASEBG (rstyle) == Color_bg) 1380 else if (GET_BASEBG (rstyle) == Color_bg)
1352 { 1381 {
1353 ren = DEFAULT_RSTYLE; 1382 ren = DEFAULT_RSTYLE;
1354 1383
1355 if (mapped && !view_start) 1384 if (mapped)
1356 XClearArea (dpy, vt, 0, 1385 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width, 1386 Row2Pixel (row - view_start), (unsigned int)vt_width,
1358 (unsigned int)Height2Pixel (num), False); 1387 (unsigned int)Height2Pixel (num), False);
1359 } 1388 }
1360 else 1389 else
1361 { 1390 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1391 ren = rstyle & (RS_fgMask | RS_bgMask);
1363 1392
1364 if (mapped && !view_start) 1393 if (mapped)
1365 { 1394 {
1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1395 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1396 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 XFillRectangle (dpy, vt, gc, 1397 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start), 1398 0, Row2Pixel (row - view_start),
1370 (unsigned int)width, 1399 (unsigned int)vt_width,
1371 (unsigned int)Height2Pixel (num)); 1400 (unsigned int)Height2Pixel (num));
1372 gcvalue.foreground = pix_colors[Color_fg]; 1401 gcvalue.foreground = pix_colors[Color_fg];
1373 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1402 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 } 1403 }
1375 } 1404 }
1376 1405
1377 for (; num--; row++) 1406 for (; num--; row++)
1378 { 1407 {
1379 scr_blank_screen_mem (ROW(row), rstyle); 1408 scr_blank_screen_mem (ROW(row), rstyle);
1380 1409
1381 if (!view_start) 1410 if (row - view_start < nrow)
1382 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1411 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1383 } 1412 }
1384} 1413}
1385 1414
1386#if !ENABLE_MINIMAL 1415#if !ENABLE_MINIMAL
1387void 1416void
… …
1397/* ------------------------------------------------------------------------- */ 1426/* ------------------------------------------------------------------------- */
1398/* 1427/*
1399 * Fill the screen with `E's 1428 * Fill the screen with `E's
1400 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1429 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1401 */ 1430 */
1402void 1431void ecb_cold
1403rxvt_term::scr_E () NOTHROW 1432rxvt_term::scr_E () NOTHROW
1404{ 1433{
1405 rend_t fs; 1434 rend_t fs;
1406 1435
1407 want_refresh = 1; 1436 want_refresh = 1;
1408 ZERO_SCROLLBACK (); 1437 ZERO_SCROLLBACK ();
1409 1438
1410 num_scr_allow = 0; 1439 num_scr_allow = 0;
1411 selection_check (3); 1440
1441 row_col_t pos;
1442 pos.row = pos.col = 0;
1443 if (ROWCOL_IS_AFTER (selection.end, pos))
1444 CLEAR_SELECTION ();
1412 1445
1413 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1446 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1414 for (int row = nrow; row--; ) 1447 for (int row = nrow; row--; )
1415 { 1448 {
1416 line_t &line = ROW(row); 1449 line_t &line = ROW(row);
… …
1567/* ------------------------------------------------------------------------- */ 1600/* ------------------------------------------------------------------------- */
1568/* 1601/*
1569 * Set the scrolling region 1602 * Set the scrolling region
1570 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1603 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1571 */ 1604 */
1572void 1605void ecb_cold
1573rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1606rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1574{ 1607{
1575 max_it (top, 0); 1608 max_it (top, 0);
1576 min_it (bot, nrow - 1); 1609 min_it (bot, nrow - 1);
1577 1610
… …
1587/* 1620/*
1588 * Make the cursor visible/invisible 1621 * Make the cursor visible/invisible
1589 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1622 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1590 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1623 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1591 */ 1624 */
1592void 1625void ecb_cold
1593rxvt_term::scr_cursor_visible (int mode) NOTHROW 1626rxvt_term::scr_cursor_visible (int mode) NOTHROW
1594{ 1627{
1595 want_refresh = 1; 1628 want_refresh = 1;
1596 1629
1597 if (mode) 1630 if (mode)
… …
1604/* 1637/*
1605 * Set/unset automatic wrapping 1638 * Set/unset automatic wrapping
1606 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1639 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1607 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1640 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1608 */ 1641 */
1609void 1642void ecb_cold
1610rxvt_term::scr_autowrap (int mode) NOTHROW 1643rxvt_term::scr_autowrap (int mode) NOTHROW
1611{ 1644{
1612 if (mode) 1645 if (mode)
1613 screen.flags |= Screen_Autowrap; 1646 screen.flags |= Screen_Autowrap;
1614 else 1647 else
… …
1623 * Relative mode: line numbers are relative to top margin of scrolling region 1656 * Relative mode: line numbers are relative to top margin of scrolling region
1624 * and the cursor cannot be moved outside. 1657 * and the cursor cannot be moved outside.
1625 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1658 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1626 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1659 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1627 */ 1660 */
1628void 1661void ecb_cold
1629rxvt_term::scr_relative_origin (int mode) NOTHROW 1662rxvt_term::scr_relative_origin (int mode) NOTHROW
1630{ 1663{
1631 if (mode) 1664 if (mode)
1632 screen.flags |= Screen_Relative; 1665 screen.flags |= Screen_Relative;
1633 else 1666 else
… …
1640/* 1673/*
1641 * Set insert/replace mode 1674 * Set insert/replace mode
1642 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1675 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1643 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1676 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1644 */ 1677 */
1645void 1678void ecb_cold
1646rxvt_term::scr_insert_mode (int mode) NOTHROW 1679rxvt_term::scr_insert_mode (int mode) NOTHROW
1647{ 1680{
1648 if (mode) 1681 if (mode)
1649 screen.flags |= Screen_Insert; 1682 screen.flags |= Screen_Insert;
1650 else 1683 else
… …
1656 * Set/Unset tabs 1689 * Set/Unset tabs
1657 * XTERM_SEQ: Set tab at current column : ESC H 1690 * XTERM_SEQ: Set tab at current column : ESC H
1658 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1691 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1659 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1692 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1660 */ 1693 */
1661void 1694void ecb_cold
1662rxvt_term::scr_set_tab (int mode) NOTHROW 1695rxvt_term::scr_set_tab (int mode) NOTHROW
1663{ 1696{
1664 if (mode < 0) 1697 if (mode < 0)
1665 memset (tabs, 0, ncol); 1698 memset (tabs, 0, ncol);
1666 else if (screen.cur.col < ncol) 1699 else if (screen.cur.col < ncol)
… …
1685 if (rvideo_state != on) 1718 if (rvideo_state != on)
1686 { 1719 {
1687 rvideo_state = on; 1720 rvideo_state = on;
1688 1721
1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1722 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690#ifdef HAVE_BG_PIXMAP 1723#ifdef HAVE_IMG
1691 if (bgPixmap.pixmap == None) 1724 if (bg_img == 0)
1692#endif 1725#endif
1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1726 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1694 1727
1695 XGCValues gcvalue; 1728 XGCValues gcvalue;
1696 gcvalue.foreground = pix_colors[Color_fg]; 1729 gcvalue.foreground = pix_colors[Color_fg];
… …
1705/* ------------------------------------------------------------------------- */ 1738/* ------------------------------------------------------------------------- */
1706/* 1739/*
1707 * Report current cursor position 1740 * Report current cursor position
1708 * XTERM_SEQ: Report position: ESC [ 6 n 1741 * XTERM_SEQ: Report position: ESC [ 6 n
1709 */ 1742 */
1710void 1743void ecb_cold
1711rxvt_term::scr_report_position () NOTHROW 1744rxvt_term::scr_report_position () NOTHROW
1712{ 1745{
1713 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1746 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1714} 1747}
1715 1748
… …
1718 * ------------------------------------------------------------------------- */ 1751 * ------------------------------------------------------------------------- */
1719 1752
1720/* 1753/*
1721 * Set font style 1754 * Set font style
1722 */ 1755 */
1723void 1756void ecb_cold
1724rxvt_term::set_font_style () NOTHROW 1757rxvt_term::set_font_style () NOTHROW
1725{ 1758{
1726#if 0 1759#if 0
1727 switch (charsets [screen.charset]) 1760 switch (charsets [screen.charset])
1728 { 1761 {
… …
1750 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1783 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1751 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1784 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1752 * XTERM_SEQ: Invoke G2 character set: ESC N 1785 * XTERM_SEQ: Invoke G2 character set: ESC N
1753 * XTERM_SEQ: Invoke G3 character set: ESC O 1786 * XTERM_SEQ: Invoke G3 character set: ESC O
1754 */ 1787 */
1755void 1788void ecb_cold
1756rxvt_term::scr_charset_choose (int set) NOTHROW 1789rxvt_term::scr_charset_choose (int set) NOTHROW
1757{ 1790{
1758 screen.charset = set; 1791 screen.charset = set;
1759 set_font_style (); 1792 set_font_style ();
1760} 1793}
… …
1781 * ------------------------------------------------------------------------- */ 1814 * ------------------------------------------------------------------------- */
1782 1815
1783/* 1816/*
1784 * refresh matching text. 1817 * refresh matching text.
1785 */ 1818 */
1786bool 1819bool ecb_cold
1787rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1820rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1788{ 1821{
1789 bool found = false; 1822 bool found = false;
1790 1823
1791 for (int i = 0; i < nrow; i++) 1824 for (int i = 0; i < nrow; i++)
… …
1810 PART_BEG = 0, 1843 PART_BEG = 0,
1811 PART_END, 1844 PART_END,
1812 RC_COUNT 1845 RC_COUNT
1813}; 1846};
1814 1847
1815void 1848void ecb_hot
1816rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1849rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1817{ 1850{
1818 int i; 1851 int i;
1819 row_col_t rc[RC_COUNT]; 1852 row_col_t rc[RC_COUNT];
1820 1853
… …
1840 for (i = PART_BEG; i < RC_COUNT; i++) 1873 for (i = PART_BEG; i < RC_COUNT; i++)
1841 { 1874 {
1842 min_it (rc[i].col, ncol - 1); 1875 min_it (rc[i].col, ncol - 1);
1843 min_it (rc[i].row, nrow - 1); 1876 min_it (rc[i].row, nrow - 1);
1844 } 1877 }
1845// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1878
1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1879 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1847 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1880 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1848 1881
1849 num_scr_allow = 0; 1882 num_scr_allow = 0;
1850 1883
… …
1857 * Refresh the entire screen 1890 * Refresh the entire screen
1858 */ 1891 */
1859void 1892void
1860rxvt_term::scr_touch (bool refresh) NOTHROW 1893rxvt_term::scr_touch (bool refresh) NOTHROW
1861{ 1894{
1862 scr_expose (0, 0, width, height, refresh); 1895 scr_expose (0, 0, vt_width, vt_height, refresh);
1863} 1896}
1864 1897
1865/* ------------------------------------------------------------------------- */ 1898/* ------------------------------------------------------------------------- */
1866/* 1899/*
1867 * Move the display so that the line represented by scrollbar value Y is at 1900 * Move the display so that the line represented by scrollbar value Y is at
… …
1923 1956
1924# ifndef NO_MAPALERT 1957# ifndef NO_MAPALERT
1925# ifdef MAPALERT_OPTION 1958# ifdef MAPALERT_OPTION
1926 if (option (Opt_mapAlert)) 1959 if (option (Opt_mapAlert))
1927# endif 1960# endif
1928 XMapWindow (dpy, parent[0]); 1961 XMapWindow (dpy, parent);
1929# endif 1962# endif
1930 1963
1931# if ENABLE_FRILLS 1964# if ENABLE_FRILLS
1932 if (option (Opt_urgentOnBell)) 1965 if (option (Opt_urgentOnBell))
1933 set_urgency (1); 1966 set_urgency (1);
… …
1941 1974
1942 bell_ev.start (VISUAL_BELL_DURATION); 1975 bell_ev.start (VISUAL_BELL_DURATION);
1943 } 1976 }
1944 else 1977 else
1945 XBell (dpy, 0); 1978 XBell (dpy, 0);
1979 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1980#endif
1947} 1981}
1948 1982
1949/* ------------------------------------------------------------------------- */ 1983/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */ 1984void ecb_cold
1951void
1952rxvt_term::scr_printscreen (int fullhist) NOTHROW 1985rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953{ 1986{
1954#ifdef PRINTPIPE 1987#ifdef PRINTPIPE
1955 int nrows, row_start; 1988 int nrows, row_start;
1956 FILE *fd = popen_printer (); 1989 FILE *fd = popen_printer ();
… …
1969 row_start = view_start; 2002 row_start = view_start;
1970 } 2003 }
1971 2004
1972 wctomb (0, 0); 2005 wctomb (0, 0);
1973 2006
1974 for (int r1 = 0; r1 < nrows; r1++) 2007 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1975 { 2008 {
1976 text_t *tp = ROW(r1).t; 2009 text_t *tp = ROW(r1).t;
1977 int len = ROW(r1).l; 2010 int len = ROW(r1).l;
1978 2011
1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2012 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2005/* 2038/*
2006 * Refresh the screen 2039 * Refresh the screen
2007 * drawn_text/drawn_rend contain the screen information before the update. 2040 * drawn_text/drawn_rend contain the screen information before the update.
2008 * screen.text/screen.rend contain what the screen will change to. 2041 * screen.text/screen.rend contain what the screen will change to.
2009 */ 2042 */
2010void 2043void ecb_hot
2011rxvt_term::scr_refresh () NOTHROW 2044rxvt_term::scr_refresh () NOTHROW
2012{ 2045{
2013 unsigned char have_bg,
2014 showcursor; /* show the cursor */
2015 int16_t col, row, /* column/row we're processing */ 2046 int16_t col, row, /* column/row we're processing */
2016 ocrow; /* old cursor row */ 2047 ocrow; /* old cursor row */
2017 int i; /* tmp */ 2048 int i; /* tmp */
2018#ifndef NO_CURSORCOLOR
2019 rend_t cc1; /* store colours at cursor position (s) */
2020#endif
2021 rend_t *crp; // cursor rendition pointer
2022 rend_t ccol1, /* Cursor colour */ 2049 rend_t ccol1, /* Cursor colour */
2023 ccol2; /* Cursor colour2 */ 2050 ccol2; /* Cursor colour2 */
2051 rend_t cur_rend;
2052 int cur_col;
2053 int cursorwidth;
2024 2054
2025 want_refresh = 0; /* screen is current */ 2055 want_refresh = 0; /* screen is current */
2026 2056
2027 if (refresh_type == NO_REFRESH || !mapped) 2057 if (refresh_type == NO_REFRESH || !mapped)
2028 return; 2058 return;
… …
2030 /* 2060 /*
2031 * A: set up vars 2061 * A: set up vars
2032 */ 2062 */
2033 refresh_count = 0; 2063 refresh_count = 0;
2034 2064
2065 unsigned int old_screen_flags = screen.flags;
2035 have_bg = 0; 2066 bool have_bg = 0;
2036#ifdef HAVE_BG_PIXMAP 2067#ifdef HAVE_IMG
2037 have_bg = bgPixmap.pixmap != None; 2068 have_bg = bg_img != 0;
2038#endif 2069#endif
2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2070 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2040 2071
2041 /* 2072 /*
2042 * B: reverse any characters which are selected 2073 * B: reverse any characters which are selected
2043 */ 2074 */
2044 scr_reverse_selection (); 2075 scr_reverse_selection ();
2045 2076
2077 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2078#if ENABLE_OVERLAY
2079 scr_swap_overlay ();
2080#endif
2081
2082 bool showcursor = screen.flags & Screen_VisibleCursor;
2083
2046 /* 2084 /*
2047 * C: set the cursor character (s) 2085 * C: set the cursor character (s)
2048 */ 2086 */
2049 { 2087 {
2050 unsigned char setoldcursor;
2051
2052 showcursor = (screen.flags & Screen_VisibleCursor);
2053#ifdef CURSOR_BLINK 2088#ifdef CURSOR_BLINK
2054 if (hidden_cursor) 2089 if (hidden_cursor)
2055 showcursor = 0; 2090 showcursor = 0;
2056#endif 2091#endif
2057 2092
… …
2060 int col = screen.cur.col; 2095 int col = screen.cur.col;
2061 2096
2062 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2097 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2063 col--; 2098 col--;
2064 2099
2100 cursorwidth = 1;
2101 while (col + cursorwidth < ncol
2102 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2103 cursorwidth++;
2104
2065 crp = &ROW(screen.cur.row).r[col]; 2105 cur_rend = ROW(screen.cur.row).r[col];
2106 cur_col = col;
2066 2107
2067#ifndef NO_CURSORCOLOR 2108#ifndef NO_CURSORCOLOR
2068 cc1 = *crp & (RS_fgMask | RS_bgMask);
2069 if (ISSET_PIXCOLOR (Color_cursor)) 2109 if (ISSET_PIXCOLOR (Color_cursor))
2070 ccol1 = Color_cursor; 2110 ccol1 = Color_cursor;
2071 else 2111 else
2072#endif 2112#endif
2073#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2113#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2085 ccol2 = bgcolor_of (rstyle); 2125 ccol2 = bgcolor_of (rstyle);
2086#else 2126#else
2087 ccol2 = Color_bg; 2127 ccol2 = Color_bg;
2088#endif 2128#endif
2089 2129
2090 if (showcursor && focus) 2130 if (focus)
2091 { 2131 {
2132 rend_t rend = cur_rend;
2133
2092 if (option (Opt_cursorUnderline)) 2134 if (option (Opt_cursorUnderline))
2093 *crp ^= RS_Uline; 2135 rend ^= RS_Uline;
2094 else 2136 else
2095 { 2137 {
2096 *crp ^= RS_RVid; 2138 rend ^= RS_RVid;
2097 *crp = SET_FGCOLOR (*crp, ccol1); 2139 rend = SET_FGCOLOR (rend, ccol1);
2098 *crp = SET_BGCOLOR (*crp, ccol2); 2140 rend = SET_BGCOLOR (rend, ccol2);
2099 } 2141 }
2142
2143 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2100 } 2144 }
2101 } 2145 }
2102 2146
2103 /* make sure no outline cursor is left around */ 2147 /* make sure no outline cursor is left around */
2104 setoldcursor = 0;
2105 if (ocrow != -1) 2148 if (ocrow != -1)
2106 { 2149 {
2107 if (screen.cur.row - view_start != ocrow 2150 if (screen.cur.row - view_start != ocrow
2108 || screen.cur.col != oldcursor.col) 2151 || screen.cur.col != oldcursor.col)
2109 { 2152 {
2110 if (ocrow < nrow 2153 if (ocrow < nrow
2111 && oldcursor.col < ncol) 2154 && oldcursor.col < ncol)
2112 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2155 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2113
2114 if (focus || !showcursor)
2115 oldcursor.row = -1;
2116 else
2117 setoldcursor = 1;
2118 } 2156 }
2119 } 2157 }
2120 else if (!focus)
2121 setoldcursor = 1;
2122 2158
2123 if (setoldcursor) 2159 // save the current cursor coordinates if the cursor is visible
2160 // and the window is unfocused, so as to clear the outline cursor
2161 // in the next refresh if the cursor moves
2162 if (showcursor && !focus && screen.cur.row - view_start < nrow)
2124 { 2163 {
2125 if (screen.cur.row - view_start >= nrow)
2126 oldcursor.row = -1;
2127 else
2128 {
2129 oldcursor.row = screen.cur.row - view_start; 2164 oldcursor.row = screen.cur.row - view_start;
2130 oldcursor.col = screen.cur.col; 2165 oldcursor.col = screen.cur.col;
2131 }
2132 } 2166 }
2167 else
2168 oldcursor.row = -1;
2133 } 2169 }
2134
2135 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2136#if ENABLE_OVERLAY
2137 scr_swap_overlay ();
2138#endif
2139 2170
2140#ifndef NO_SLOW_LINK_SUPPORT 2171#ifndef NO_SLOW_LINK_SUPPORT
2141 /* 2172 /*
2142 * D: CopyArea pass - very useful for slower links 2173 * D: CopyArea pass - very useful for slower links
2143 * This has been deliberately kept simple. 2174 * This has been deliberately kept simple.
… …
2148 { 2179 {
2149 int16_t nits; 2180 int16_t nits;
2150 int i = num_scr; 2181 int i = num_scr;
2151 int j; 2182 int j;
2152 int len, wlen; 2183 int len, wlen;
2153 dLocal (int, num_scr);
2154 2184
2155 j = nrow; 2185 j = nrow;
2156 wlen = len = -1; 2186 wlen = len = -1;
2157 row = i > 0 ? 0 : j - 1; 2187 row = i > 0 ? 0 : j - 1;
2158 2188
… …
2233 continue; 2263 continue;
2234 2264
2235 // redraw one or more characters 2265 // redraw one or more characters
2236 2266
2237 // seek to the beginning of wide characters 2267 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2268 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2239 --col; 2269 --col;
2240 2270
2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2271 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2272 text_t *text = stp + col;
2243 int count = 1; 2273 int count = 1;
2244 2274
2245 dtp[col] = stp[col]; 2275 dtp[col] = stp[col];
2246 drp[col] = rend; 2276 drp[col] = rend;
… …
2250 for (i = 0; ++col < ncol; ) 2280 for (i = 0; ++col < ncol; )
2251 { 2281 {
2252 if (stp[col] == NOCHAR) 2282 if (stp[col] == NOCHAR)
2253 { 2283 {
2254 dtp[col] = stp[col]; 2284 dtp[col] = stp[col];
2255 drp[col] = rend; 2285 drp[col] = srp[col];
2286
2256 count++; 2287 count++;
2257 i++; 2288 i++;
2258 2289
2259 continue; 2290 continue;
2260 } 2291 }
… …
2280 2311
2281 col--; /* went one too far. move back */ 2312 col--; /* went one too far. move back */
2282 count -= i; /* dump any matching trailing chars */ 2313 count -= i; /* dump any matching trailing chars */
2283 2314
2284 // sometimes we optimize away the trailing NOCHAR's, add them back 2315 // sometimes we optimize away the trailing NOCHAR's, add them back
2285 while (expect_false (i && text[count] == NOCHAR)) 2316 while (ecb_unlikely (i && text[count] == NOCHAR))
2286 count++, i--; 2317 count++, i--;
2287 2318
2288 /* 2319 /*
2289 * Determine the attributes for the string 2320 * Determine the attributes for the string
2290 */ 2321 */
2291 int fore = fgcolor_of (rend); // desired foreground 2322 int fore = fgcolor_of (rend); // desired foreground
2292 int back = bgcolor_of (rend); // desired background 2323 int back = bgcolor_of (rend); // desired background
2293 2324
2294 // only do special processing if any attributes are set, which is unlikely 2325 // only do special processing if any attributes are set, which is unlikely
2295 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2326 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2296 { 2327 {
2297 bool invert = rend & RS_RVid; 2328 bool invert = rend & RS_RVid;
2298 2329
2299#ifndef NO_BOLD_UNDERLINE_REVERSE 2330#ifndef NO_BOLD_UNDERLINE_REVERSE
2300 if (rend & RS_Bold && fore == Color_fg) 2331 if (rend & RS_Bold && fore == Color_fg)
… …
2319 2350
2320 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2351 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2321 fore = Color_UL; 2352 fore = Color_UL;
2322#endif 2353#endif
2323 2354
2355#ifdef OPTION_HC
2356 if (rend & RS_Sel)
2357 {
2358 /* invert the column if no highlightColor is set or it is the
2359 * current cursor column */
2360 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2361 && ISSET_PIXCOLOR (Color_HC))
2362 {
2363 if (ISSET_PIXCOLOR (Color_HTC))
2364 fore = Color_HTC;
2365 // if invert is 0 reverse video is set so we use bg color as fg color
2366 else if (!invert)
2367 fore = back;
2368
2369 back = Color_HC;
2370 invert = 0;
2371 }
2372 }
2373#endif
2374
2324 if (invert) 2375 if (invert)
2325 { 2376 {
2326#ifdef OPTION_HC
2327 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2328 || !ISSET_PIXCOLOR (Color_HC))
2329#endif
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 ::swap (fore, back); 2377 ::swap (fore, back);
2333#ifdef OPTION_HC
2334 else if (ISSET_PIXCOLOR (Color_HC))
2335 back = Color_HC;
2336#endif
2337 2378
2338#ifndef NO_BOLD_UNDERLINE_REVERSE 2379#ifndef NO_BOLD_UNDERLINE_REVERSE
2339# ifndef OPTION_HC
2340 if (ISSET_PIXCOLOR (Color_RV))
2341 back = Color_RV;
2342# endif
2343 if (fore == back) 2380 if (fore == back)
2344 { 2381 {
2345 fore = Color_bg; 2382 fore = Color_bg;
2346 back = Color_fg; 2383 back = Color_fg;
2347 } 2384 }
… …
2383 /* 2420 /*
2384 * Actually do the drawing of the string here 2421 * Actually do the drawing of the string here
2385 */ 2422 */
2386 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2423 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2387 2424
2388 if (expect_true (have_bg && back == Color_bg)) 2425 if (ecb_likely (have_bg && back == Color_bg))
2389 { 2426 {
2390 // this is very ugly, maybe push it into ->draw? 2427 // this is very ugly, maybe push it into ->draw?
2391 2428
2392 for (i = 0; i < count; i++) /* don't draw empty strings */ 2429 for (i = 0; i < count; i++) /* don't draw empty strings */
2393 if (text[i] != ' ') 2430 if (text[i] != ' ')
… …
2400 did_clear: ; 2437 did_clear: ;
2401 } 2438 }
2402 else 2439 else
2403 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2440 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2404 2441
2405 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2442 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2406 { 2443 {
2444 if (showcursor && focus && row == screen.cur.row
2445 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2446 XSetForeground (dpy, gc, pix_colors[ccol1]);
2447 else
2407#if ENABLE_FRILLS 2448#if ENABLE_FRILLS
2408 if (ISSET_PIXCOLOR (Color_underline)) 2449 if (ISSET_PIXCOLOR (Color_underline))
2409 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2450 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2410 else 2451 else
2411#endif 2452#endif
… …
2416 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2457 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2417 } 2458 }
2418 } /* for (col....) */ 2459 } /* for (col....) */
2419 } /* for (row....) */ 2460 } /* for (row....) */
2420 2461
2421#if ENABLE_OVERLAY
2422 scr_swap_overlay ();
2423#endif
2424 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2425
2426 /* 2462 /*
2427 * G: cleanup cursor and display outline cursor if necessary 2463 * G: cleanup cursor and display outline cursor if necessary
2428 */ 2464 */
2429 if (showcursor) 2465 if (showcursor)
2430 { 2466 {
2431 if (focus) 2467 if (focus)
2432 { 2468 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2433 if (option (Opt_cursorUnderline))
2434 *crp ^= RS_Uline;
2435 else
2436 {
2437 *crp ^= RS_RVid;
2438#ifndef NO_CURSORCOLOR
2439 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2440#endif
2441 }
2442 }
2443 else if (oldcursor.row >= 0) 2469 else if (oldcursor.row >= 0)
2444 { 2470 {
2445 int cursorwidth = 1;
2446 int col = oldcursor.col;
2447
2448 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2449 col--;
2450
2451 while (col + cursorwidth < ncol
2452 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2453 cursorwidth++;
2454
2455#ifndef NO_CURSORCOLOR
2456 if (ISSET_PIXCOLOR (Color_cursor))
2457 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2458 else
2459#endif
2460 XSetForeground (dpy, gc, pix_colors[ccol1]); 2471 XSetForeground (dpy, gc, pix_colors[ccol1]);
2461 2472
2462 XDrawRectangle (dpy, vt, gc, 2473 XDrawRectangle (dpy, vt, gc,
2463 Col2Pixel (col), 2474 Col2Pixel (cur_col),
2464 Row2Pixel (oldcursor.row), 2475 Row2Pixel (oldcursor.row),
2465 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2476 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2466 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2477 (unsigned int) (Height2Pixel (1) - 1));
2467 } 2478 }
2468 } 2479 }
2469 2480
2470 /* 2481 /*
2471 * H: cleanup selection 2482 * H: cleanup selection
2472 */ 2483 */
2484#if ENABLE_OVERLAY
2485 scr_swap_overlay ();
2486#endif
2487 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2488
2473 scr_reverse_selection (); 2489 scr_reverse_selection ();
2474 2490
2491 screen.flags = old_screen_flags;
2475 num_scr = 0; 2492 num_scr = 0;
2476 num_scr_allow = 1; 2493 num_scr_allow = 1;
2477} 2494}
2478 2495
2479void 2496void ecb_cold
2480rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2497rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2481{ 2498{
2482 if (!l.t) 2499 if (!l.valid ())
2483 return; 2500 return;
2484 2501
2485 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2502 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2486 2503
2487 for (int i = ncol; i--; ) 2504 for (int i = ncol; i--; )
2488 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2505 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2489} 2506}
2490 2507
2491void 2508void ecb_cold
2492rxvt_term::scr_remap_chars () NOTHROW 2509rxvt_term::scr_remap_chars () NOTHROW
2493{ 2510{
2494 for (int i = total_rows; i--; ) 2511 for (int i = total_rows; i--; )
2495 scr_remap_chars (row_buf [i]); 2512 scr_remap_chars (row_buf [i]);
2496 2513
… …
2499 scr_remap_chars (drawn_buf [i]); 2516 scr_remap_chars (drawn_buf [i]);
2500 scr_remap_chars (swap_buf [i]); 2517 scr_remap_chars (swap_buf [i]);
2501 } 2518 }
2502} 2519}
2503 2520
2504void 2521void ecb_cold
2505rxvt_term::scr_recolour () NOTHROW 2522rxvt_term::scr_recolour (bool refresh) NOTHROW
2506{ 2523{
2507#ifdef HAVE_BG_PIXMAP 2524 bool transparent = false;
2508 bgPixmap.apply ();
2509#else
2510 2525
2526#ifdef HAVE_IMG
2527 if (bg_img != 0)
2528 {
2529# if ENABLE_TRANSPARENCY
2530 if (bg_flags & BG_IS_TRANSPARENT)
2531 {
2532 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2533 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2534
2535 transparent = true;
2536 }
2537 else
2538# endif
2539 {
2540 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2541 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2542 }
2543 }
2544 else
2545#endif
2546 {
2511 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2512 XClearWindow (dpy, parent[0]);
2513 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2548 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2549 }
2550
2551 XClearWindow (dpy, parent);
2514 2552
2515 if (scrollBar.win) 2553 if (scrollBar.win)
2516 { 2554 {
2555 if (transparent)
2556 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2557 else
2517 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2558 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2518 scrollBar.state = STATE_IDLE; 2559 scrollBar.state = SB_STATE_IDLE;
2519 scrollBar.show (0); 2560 scrollBar.show (0);
2520 } 2561 }
2521 2562
2522#endif 2563 if (refresh)
2523 2564 {
2524 /* bgPixmap.apply () does not do the following : */
2525 scr_clear (); 2565 scr_clear ();
2526 scr_touch (true); 2566 scr_touch (true);
2567 }
2527 want_refresh = 1; 2568 want_refresh = 1;
2528} 2569}
2529 2570
2530/* ------------------------------------------------------------------------- */ 2571/* ------------------------------------------------------------------------- */
2531void 2572void
… …
2588 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2629 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2589 srp[col] ^= rstyle; 2630 srp[col] ^= rstyle;
2590} 2631}
2591 2632
2592/* ------------------------------------------------------------------------- */ 2633/* ------------------------------------------------------------------------- */
2593void 2634void ecb_hot
2594rxvt_term::scr_reverse_selection () NOTHROW 2635rxvt_term::scr_reverse_selection () NOTHROW
2595{ 2636{
2596 if (selection.op 2637 if (selection.op
2597 && current_screen == selection.screen 2638 && current_screen == selection.screen
2598 && selection.end.row >= view_start) 2639 && selection.end.row >= view_start)
2599 { 2640 {
2600#if !ENABLE_MINIMAL 2641#if !ENABLE_MINIMAL
2601 if (selection.rect) 2642 if (selection.rect)
2602 scr_xor_rect (selection.beg.row, selection.beg.col, 2643 scr_xor_rect (selection.beg.row, selection.beg.col,
2603 selection.end.row, selection.end.col, 2644 selection.end.row, selection.end.col,
2604 RS_RVid, RS_RVid | RS_Uline); 2645 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2605 else 2646 else
2606#endif 2647#endif
2607 scr_xor_span (selection.beg.row, selection.beg.col, 2648 scr_xor_span (selection.beg.row, selection.beg.col,
2608 selection.end.row, selection.end.col, 2649 selection.end.row, selection.end.col,
2609 RS_RVid); 2650 RS_Sel | RS_RVid);
2610 } 2651 }
2611} 2652}
2612 2653
2613/* ------------------------------------------------------------------------- */ 2654/* ------------------------------------------------------------------------- */
2614/* 2655/*
… …
2617 */ 2658 */
2618#if 0 2659#if 0
2619void 2660void
2620rxvt_term::scr_dump (int fd) NOTHROW 2661rxvt_term::scr_dump (int fd) NOTHROW
2621{ 2662{
2622 int row, wrote; 2663 // if this method is needed, it can be implemented by factoring the
2623 unsigned int width, towrite; 2664 // relevant code in scr_printscreen
2624 char r1[] = "\n";
2625
2626 for (row = saveLines + top_row;
2627 row < saveLines + nrow - 1; row++)
2628 {
2629 width = row_buf[row].l >= 0 ? row_buf[row].l
2630 : ncol;
2631 for (towrite = width; towrite; towrite -= wrote)
2632 {
2633 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2634 towrite);
2635 if (wrote < 0)
2636 return; /* XXX: death, no report */
2637 }
2638 if (row_buf[row].l >= 0)
2639 if (write (fd, r1, 1) <= 0)
2640 return; /* XXX: death, no report */
2641 }
2642} 2665}
2643#endif 2666#endif
2644 2667
2645/* ------------------------------------------------------------------------- * 2668/* ------------------------------------------------------------------------- *
2646 * CHARACTER SELECTION * 2669 * CHARACTER SELECTION *
2647 * ------------------------------------------------------------------------- */ 2670 * ------------------------------------------------------------------------- */
2648void 2671void
2649rxvt_term::selection_check (int check_more) NOTHROW 2672rxvt_term::selection_check (int check_more) NOTHROW
2650{ 2673{
2651 row_col_t pos;
2652
2653 if (!selection.op) 2674 if (!selection.op)
2654 return; 2675 return;
2655 2676
2656 pos.row = pos.col = 0;
2657 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2677 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2658 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2678 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2659 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2679 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2660 || (check_more == 1 2680 || (check_more == 1
2661 && current_screen == selection.screen 2681 && current_screen == selection.screen
2662 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2682 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2663 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2683 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2664 || (check_more == 2
2665 && ROWCOL_IS_BEFORE (selection.beg, pos)
2666 && ROWCOL_IS_AFTER (selection.end, pos))
2667 || (check_more == 3
2668 && ROWCOL_IS_AFTER (selection.end, pos))
2669 || (check_more == 4 /* screen width change */
2670 && (selection.beg.row != selection.end.row
2671 || selection.end.col > ncol)))
2672 CLEAR_SELECTION (); 2684 CLEAR_ALL_SELECTION ();
2685}
2686
2687void
2688rxvt_term::selection_changed () NOTHROW
2689{
2690 line_t &r1 = ROW (selection.beg.row);
2691 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2692 --selection.beg.col;
2693
2694 line_t &r2 = ROW (selection.end.row);
2695 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2696 ++selection.end.col;
2697
2698 want_refresh = 1;
2673} 2699}
2674 2700
2675/* ------------------------------------------------------------------------- */ 2701/* ------------------------------------------------------------------------- */
2676/* 2702/*
2677 * Paste a selection direct to the command fd 2703 * Paste a selection direct to the command fd
2678 */ 2704 */
2679void 2705void
2680rxvt_term::paste (char *data, unsigned int len) NOTHROW 2706rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2681{ 2707{
2682 /* convert normal newline chars into common keyboard Return key sequence */ 2708 /* convert normal newline chars into common keyboard Return key sequence */
2683 for (unsigned int i = 0; i < len; i++) 2709 for (unsigned int i = 0; i < len; i++)
2684 if (data[i] == C0_LF) 2710 if (data[i] == C0_LF)
2685 data[i] = C0_CR; 2711 data[i] = C0_CR;
2686 2712
2687 if (priv_modes & PrivMode_BracketPaste) 2713 if (priv_modes & PrivMode_BracketPaste)
2688 tt_printf ("\e[200~"); 2714 tt_printf ("\x1b[200~");
2689 2715
2690 tt_write (data, len); 2716 tt_write (data, len);
2691 2717
2692 if (priv_modes & PrivMode_BracketPaste) 2718 if (priv_modes & PrivMode_BracketPaste)
2693 tt_printf ("\e[201~"); 2719 tt_printf ("\x1b[201~");
2694} 2720}
2695 2721
2696/* ------------------------------------------------------------------------- */
2697/*
2698 * Respond to a notification that a primary selection has been sent
2699 * EXT: SelectionNotify
2700 */
2701void 2722void
2702rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2723rxvt_term::paste (char *data, unsigned int len) NOTHROW
2703{ 2724{
2704 if (prop == None) /* check for failed XConvertSelection */ 2725 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2705 {
2706 if ((selection_type & Sel_CompoundText))
2707 {
2708 int selnum = selection_type & Sel_whereMask;
2709
2710 selection_type = 0;
2711 if (selnum != Sel_direct)
2712 selection_request_other (XA_STRING, selnum);
2713 }
2714
2715 if ((selection_type & Sel_UTF8String))
2716 {
2717 int selnum = selection_type & Sel_whereMask;
2718
2719 selection_type = Sel_CompoundText;
2720 if (selnum != Sel_direct)
2721 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2722 else
2723 selection_type = 0;
2724 }
2725
2726 return;
2727 }
2728
2729 unsigned long bytes_after;
2730 XTextProperty ct;
2731
2732 if (XGetWindowProperty (dpy, win, prop,
2733 0, PROP_SIZE / 4,
2734 delete_prop, AnyPropertyType,
2735 &ct.encoding, &ct.format,
2736 &ct.nitems, &bytes_after,
2737 &ct.value) != Success)
2738 {
2739 ct.value = 0;
2740 goto bailout;
2741 }
2742
2743 if (ct.encoding == None)
2744 goto bailout;
2745
2746 if (bytes_after)
2747 {
2748 // fetch and append remaining data
2749 XTextProperty ct2;
2750
2751 if (XGetWindowProperty (dpy, win, prop,
2752 ct.nitems / 4, (bytes_after + 3) / 4,
2753 delete_prop, AnyPropertyType,
2754 &ct2.encoding, &ct2.format,
2755 &ct2.nitems, &bytes_after,
2756 &ct2.value) != Success)
2757 goto bailout;
2758
2759 // realloc should be compatible to XFree, here, and elsewhere, too
2760 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2761 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2762 ct.nitems += ct2.nitems;
2763
2764 XFree (ct2.value);
2765 }
2766
2767 if (ct.value == 0)
2768 goto bailout;
2769
2770 if (ct.encoding == xa[XA_INCR])
2771 {
2772 // INCR selection, start handshake
2773 if (!delete_prop)
2774 XDeleteProperty (dpy, win, prop);
2775
2776 selection_wait = Sel_incr;
2777 incr_buf_fill = 0;
2778 incr_ev.start (10);
2779
2780 goto bailout;
2781 }
2782
2783 if (ct.nitems == 0)
2784 {
2785 if (selection_wait == Sel_incr)
2786 {
2787 XFree (ct.value);
2788
2789 // finally complete, now paste the whole thing
2790 selection_wait = Sel_normal;
2791 ct.value = (unsigned char *)incr_buf;
2792 ct.nitems = incr_buf_fill;
2793 incr_buf = 0;
2794 incr_buf_size = 0;
2795 incr_ev.stop ();
2796 }
2797 else
2798 {
2799 if (selection_wait == Sel_normal
2800 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2801 {
2802 /*
2803 * pass through again trying CUT_BUFFER0 if we've come from
2804 * XConvertSelection () but nothing was presented
2805 */
2806 selection_paste (display->root, XA_CUT_BUFFER0, False);
2807 }
2808
2809 goto bailout;
2810 }
2811 }
2812 else if (selection_wait == Sel_incr)
2813 {
2814 incr_ev.start (10);
2815
2816 while (incr_buf_fill + ct.nitems > incr_buf_size)
2817 {
2818 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2819 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2820 }
2821
2822 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2823 incr_buf_fill += ct.nitems;
2824
2825 goto bailout;
2826 }
2827
2828 char **cl;
2829 int cr;
2830
2831#if !ENABLE_MINIMAL
2832 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2833 // so recode it manually
2834 if (ct.encoding == xa[XA_UTF8_STRING])
2835 {
2836 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2837 char *s = rxvt_wcstombs (w);
2838 free (w);
2839 // TODO: strlen == only the first element will be converted. well...
2840 paste (s, strlen (s));
2841 free (s);
2842 }
2843 else
2844#endif
2845 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2846 && cl)
2847 {
2848 for (int i = 0; i < cr; i++)
2849 paste (cl[i], strlen (cl[i]));
2850
2851 XFreeStringList (cl);
2852 }
2853 else
2854 paste ((char *)ct.value, ct.nitems); // paste raw
2855
2856bailout:
2857 XFree (ct.value);
2858
2859 if (selection_wait == Sel_normal)
2860 selection_wait = Sel_none;
2861}
2862
2863void
2864rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2865{
2866 selection_wait = Sel_none;
2867
2868 incr_buf_size = 0;
2869 free (incr_buf);
2870
2871 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2872}
2873
2874void
2875rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2876{
2877 if (prop == None || selection_wait != Sel_incr)
2878 return; 2726 return;
2879 2727
2880 selection_paste (win, prop, true); 2728 tt_paste (data, len);
2881} 2729}
2882 2730
2883/* ------------------------------------------------------------------------- */ 2731/* ------------------------------------------------------------------------- */
2884/* 2732/*
2885 * Request the current selection: 2733 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2886 * Order: > internal selection if available 2734 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2887 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2735 * as fallback
2888 * > CUT_BUFFER0
2889 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2890 * will auto fallback to CUT_BUFFER0
2891 * EXT: button 2 release 2736 * EXT: button 2 release
2892 */ 2737 */
2893void 2738void
2894rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2739rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2895{ 2740{
2896 if (selection.text && selnum == Sel_Primary) 2741 if (!selection_req)
2897 {
2898 /* internal selection */
2899 char *str = rxvt_wcstombs (selection.text, selection.len);
2900 paste (str, strlen (str));
2901 free (str);
2902 return;
2903 } 2742 {
2904 else 2743 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2744 selection_req->run ();
2905 { 2745 }
2906 selection_request_time = tm;
2907 selection_wait = Sel_normal;
2908
2909#if X_HAVE_UTF8_STRING
2910 selection_type = Sel_UTF8String;
2911 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2912 return;
2913#else
2914 selection_type = Sel_CompoundText;
2915 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2916 return;
2917#endif
2918 }
2919
2920 selection_wait = Sel_none; /* don't loop in selection_paste () */
2921 selection_paste (display->root, XA_CUT_BUFFER0, false);
2922}
2923
2924int
2925rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2926{
2927 Atom sel;
2928
2929 selection_type |= selnum;
2930
2931 if (selnum == Sel_Primary)
2932 sel = XA_PRIMARY;
2933 else if (selnum == Sel_Secondary)
2934 sel = XA_SECONDARY;
2935 else
2936 sel = xa[XA_CLIPBOARD];
2937
2938 if (XGetSelectionOwner (dpy, sel) != None)
2939 {
2940 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2941 vt, selection_request_time);
2942 return 1;
2943 }
2944
2945 return 0;
2946} 2746}
2947 2747
2948/* ------------------------------------------------------------------------- */ 2748/* ------------------------------------------------------------------------- */
2949/* 2749/*
2950 * Clear all selected text 2750 * Clear all selected text
2951 * EXT: SelectionClear 2751 * EXT: SelectionClear
2952 */ 2752 */
2953void 2753void
2954rxvt_term::selection_clear () NOTHROW 2754rxvt_term::selection_clear (bool clipboard) NOTHROW
2955{ 2755{
2756 if (!clipboard)
2757 {
2956 want_refresh = 1; 2758 want_refresh = 1;
2957 free (selection.text); 2759 free (selection.text);
2958 selection.text = NULL; 2760 selection.text = NULL;
2959 selection.len = 0; 2761 selection.len = 0;
2960 CLEAR_SELECTION (); 2762 CLEAR_SELECTION ();
2961 2763
2962 if (display->selection_owner == this) 2764 if (display->selection_owner == this)
2963 display->selection_owner = 0; 2765 display->selection_owner = 0;
2766 }
2767 else
2768 {
2769 free (selection.clip_text);
2770 selection.clip_text = NULL;
2771 selection.clip_len = 0;
2772
2773 if (display->clipboard_owner == this)
2774 display->clipboard_owner = 0;
2775 }
2964} 2776}
2965 2777
2966/* ------------------------------------------------------------------------- */ 2778/* ------------------------------------------------------------------------- */
2967/* 2779/*
2968 * Copy a selection into the cut buffer 2780 * Copy a selection into the cut buffer
2969 * EXT: button 1 or 3 release 2781 * EXT: button 1 or 3 release
2970 */ 2782 */
2971void 2783void
2972rxvt_term::selection_make (Time tm) 2784rxvt_term::selection_make (Time tm)
2973{ 2785{
2974 int i; 2786 int size;
2975 wchar_t *new_selection_text; 2787 wchar_t *new_selection_text;
2976 text_t *t; 2788 text_t *t;
2977 2789
2978 switch (selection.op) 2790 switch (selection.op)
2979 { 2791 {
… …
2995 return; /* nothing selected, go away */ 2807 return; /* nothing selected, go away */
2996 2808
2997 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2809 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2998 return; 2810 return;
2999 2811
3000 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2812 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3001 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2813 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3002 2814
3003 int ofs = 0; 2815 int ofs = 0;
3004 int extra = 0; 2816 int extra = 0;
3005 2817
3006 int col = selection.beg.col; 2818 int col = selection.beg.col;
… …
3012 { 2824 {
3013#if !ENABLE_MINIMAL 2825#if !ENABLE_MINIMAL
3014 if (selection.rect) 2826 if (selection.rect)
3015 { 2827 {
3016 col = selection.beg.col; 2828 col = selection.beg.col;
3017 end_col = ncol + 1; 2829 end_col = selection.end.col;
3018 } 2830 }
3019 else 2831 else
3020#endif 2832#endif
3021 end_col = ROW(row).l; 2833 end_col = ROW(row).l;
3022 2834
3023 col = max (col, 0); 2835 col = max (col, 0);
3024 2836
3025 if (row == selection.end.row 2837 if (row == selection.end.row)
3026#if !ENABLE_MINIMAL
3027 || selection.rect
3028#endif
3029 )
3030 min_it (end_col, selection.end.col); 2838 min_it (end_col, selection.end.col);
3031 2839
3032 t = ROW(row).t + col; 2840 t = ROW(row).t + col;
3033 2841
3034 for (; col < end_col; col++) 2842 for (; col < end_col; col++)
… …
3042 2850
3043 extra -= (len - 1); 2851 extra -= (len - 1);
3044 2852
3045 if (extra < 0) 2853 if (extra < 0)
3046 { 2854 {
3047 extra += i; 2855 extra += size;
3048 i += i; 2856 size += size;
3049 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2857 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3050 } 2858 }
3051 2859
3052 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2860 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3053 } 2861 }
3054#endif 2862#endif
… …
3066 2874
3067 new_selection_text[ofs++] = C0_LF; 2875 new_selection_text[ofs++] = C0_LF;
3068 } 2876 }
3069 else 2877 else
3070#endif 2878#endif
3071 if (!ROW(row).is_longer () && row != selection.end.row) 2879 if (!ROW(row).is_longer ()
2880 && (row != selection.end.row || end_col != selection.end.col)
2881 && (row != selection.beg.row || selection.beg.col < ncol))
3072 new_selection_text[ofs++] = C0_LF; 2882 new_selection_text[ofs++] = C0_LF;
3073 } 2883 }
3074
3075 if (end_col != selection.end.col)
3076 new_selection_text[ofs++] = C0_LF;
3077 2884
3078 new_selection_text[ofs] = 0; 2885 new_selection_text[ofs] = 0;
3079 2886
3080 if (ofs == 0) 2887 if (ofs == 0)
3081 { 2888 {
… …
3094 2901
3095 selection_grab (tm); 2902 selection_grab (tm);
3096} 2903}
3097 2904
3098bool 2905bool
3099rxvt_term::selection_grab (Time tm) NOTHROW 2906rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3100{ 2907{
2908 Atom sel;
2909
2910 if (!clipboard)
2911 {
3101 selection_time = tm; 2912 selection_time = tm;
2913 sel = XA_PRIMARY;
2914 }
2915 else
2916 {
2917 clipboard_time = tm;
2918 sel = xa[XA_CLIPBOARD];
2919 }
3102 2920
3103 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2921 XSetSelectionOwner (dpy, sel, vt, tm);
3104 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2922 if (XGetSelectionOwner (dpy, sel) == vt)
3105 { 2923 {
3106 display->set_selection_owner (this); 2924 display->set_selection_owner (this, clipboard);
3107 return true; 2925 return true;
3108 } 2926 }
3109 else 2927 else
3110 { 2928 {
3111 selection_clear (); 2929 selection_clear (clipboard);
3112 return false; 2930 return false;
3113 } 2931 }
3114 2932
3115#if 0 2933#if 0
3116 XTextProperty ct; 2934 XTextProperty ct;
… …
3126/* ------------------------------------------------------------------------- */ 2944/* ------------------------------------------------------------------------- */
3127/* 2945/*
3128 * Mark or select text based upon number of clicks: 1, 2, or 3 2946 * Mark or select text based upon number of clicks: 1, 2, or 3
3129 * EXT: button 1 press 2947 * EXT: button 1 press
3130 */ 2948 */
3131void 2949void ecb_cold
3132rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2950rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3133{ 2951{
3134 clicks = ((clicks - 1) % 3) + 1; 2952 clicks = ((clicks - 1) % 3) + 1;
3135 selection.clicks = clicks; /* save clicks so extend will work */ 2953 selection.clicks = clicks; /* save clicks so extend will work */
3136 2954
… …
3155 2973
3156/* ------------------------------------------------------------------------- */ 2974/* ------------------------------------------------------------------------- */
3157/* 2975/*
3158 * Mark a selection at the specified col/row 2976 * Mark a selection at the specified col/row
3159 */ 2977 */
3160void 2978void ecb_cold
3161rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2979rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3162{ 2980{
3163 want_refresh = 1; 2981 want_refresh = 1;
3164 2982
3165 selection.mark.row = row + view_start; 2983 selection.mark.row = row + view_start;
… …
3188 * Word select: select text for 2 clicks 3006 * Word select: select text for 2 clicks
3189 * We now only find out the boundary in one direction 3007 * We now only find out the boundary in one direction
3190 */ 3008 */
3191 3009
3192/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3010/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3193#define DELIMIT_TEXT(x) \ 3011#define DELIMIT_TEXT(x) \
3194 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3012 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3195#define DELIMIT_REND(x) 1 3013#define DELIMIT_REND(x) 1
3196 3014
3197void 3015void ecb_cold
3198rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3016rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3199{ 3017{
3200 int col, row, dirnadd, tcol, trow, w1, w2; 3018 int col, row, dirnadd, tcol, trow, w1, w2;
3201 row_col_t bound; 3019 row_col_t bound;
3202 text_t *stp; 3020 text_t *stp;
… …
3276 * EXT: button 3 press; button 1 or 3 drag 3094 * EXT: button 3 press; button 1 or 3 drag
3277 * flag == 0 ==> button 1 3095 * flag == 0 ==> button 1
3278 * flag == 1 ==> button 3 press 3096 * flag == 1 ==> button 3 press
3279 * flag == 2 ==> button 3 motion 3097 * flag == 2 ==> button 3 motion
3280 */ 3098 */
3281void 3099void ecb_cold
3282rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3100rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3283{ 3101{
3284 int col = clamp (Pixel2Col (x), 0, ncol); 3102 int col = clamp (Pixel2Col (x), 0, ncol);
3285 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3103 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3286 3104
… …
3312 3130
3313/* ------------------------------------------------------------------------- */ 3131/* ------------------------------------------------------------------------- */
3314/* 3132/*
3315 * Extend the selection to the specified col/row 3133 * Extend the selection to the specified col/row
3316 */ 3134 */
3317void 3135void ecb_cold
3318rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3136rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3319{ 3137{
3320 row_col_t pos; 3138 row_col_t pos;
3321 enum { 3139 enum {
3322 LEFT, RIGHT 3140 LEFT, RIGHT
3323 } closeto = RIGHT; 3141 } closeto = RIGHT;
3324
3325 want_refresh = 1;
3326 3142
3327 switch (selection.op) 3143 switch (selection.op)
3328 { 3144 {
3329 case SELECTION_INIT: 3145 case SELECTION_INIT:
3330 CLEAR_SELECTION (); 3146 CLEAR_SELECTION ();
… …
3510 3326
3511#if !ENABLE_MINIMAL 3327#if !ENABLE_MINIMAL
3512 if (selection.rect && selection.beg.col > selection.end.col) 3328 if (selection.rect && selection.beg.col > selection.end.col)
3513 ::swap (selection.beg.col, selection.end.col); 3329 ::swap (selection.beg.col, selection.end.col);
3514#endif 3330#endif
3331
3332 selection_changed ();
3515} 3333}
3516 3334
3517#if !ENABLE_MINIMAL 3335#if !ENABLE_MINIMAL
3518void 3336void ecb_cold
3519rxvt_term::selection_remove_trailing_spaces () NOTHROW 3337rxvt_term::selection_remove_trailing_spaces () NOTHROW
3520{ 3338{
3521 int32_t end_col, end_row; 3339 int32_t end_col, end_row;
3522 text_t *stp; 3340 text_t *stp;
3523 3341
… …
3561/* ------------------------------------------------------------------------- */ 3379/* ------------------------------------------------------------------------- */
3562/* 3380/*
3563 * Double click on button 3 when already selected 3381 * Double click on button 3 when already selected
3564 * EXT: button 3 double click 3382 * EXT: button 3 double click
3565 */ 3383 */
3566void 3384void ecb_cold
3567rxvt_term::selection_rotate (int x, int y) NOTHROW 3385rxvt_term::selection_rotate (int x, int y) NOTHROW
3568{ 3386{
3569 selection.clicks = selection.clicks % 3 + 1; 3387 selection.clicks = selection.clicks % 3 + 1;
3570 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3388 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3571} 3389}
… …
3573/* ------------------------------------------------------------------------- */ 3391/* ------------------------------------------------------------------------- */
3574/* 3392/*
3575 * Respond to a request for our current selection 3393 * Respond to a request for our current selection
3576 * EXT: SelectionRequest 3394 * EXT: SelectionRequest
3577 */ 3395 */
3578void 3396void ecb_cold
3579rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3397rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3580{ 3398{
3399 Atom property = rq.property == None ? rq.target : rq.property;
3581 XSelectionEvent ev; 3400 XSelectionEvent ev;
3582 3401
3583 ev.type = SelectionNotify; 3402 ev.type = SelectionNotify;
3584 ev.property = None; 3403 ev.property = None;
3585 ev.display = rq.display; 3404 ev.display = rq.display;
… …
3600 *target++ = xa[XA_COMPOUND_TEXT]; 3419 *target++ = xa[XA_COMPOUND_TEXT];
3601#if X_HAVE_UTF8_STRING 3420#if X_HAVE_UTF8_STRING
3602 *target++ = xa[XA_UTF8_STRING]; 3421 *target++ = xa[XA_UTF8_STRING];
3603#endif 3422#endif
3604 3423
3605 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3424 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3606 32, PropModeReplace, 3425 32, PropModeReplace,
3607 (unsigned char *)target_list, target - target_list); 3426 (unsigned char *)target_list, target - target_list);
3608 ev.property = rq.property; 3427 ev.property = property;
3609 } 3428 }
3610#if TODO // TODO 3429#if TODO // TODO
3611 else if (rq.target == xa[XA_MULTIPLE]) 3430 else if (rq.target == xa[XA_MULTIPLE])
3612 { 3431 {
3613 /* TODO: Handle MULTIPLE */ 3432 /* TODO: Handle MULTIPLE */
3614 } 3433 }
3615#endif 3434#endif
3616 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3435 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3617 { 3436 {
3618 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3437 XChangeProperty (dpy, rq.requestor, property, rq.target,
3619 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3438 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3620 ev.property = rq.property; 3439 ev.property = property;
3440 }
3441 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3442 {
3443 XChangeProperty (dpy, rq.requestor, property, rq.target,
3444 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3445 ev.property = property;
3621 } 3446 }
3622 else if (rq.target == XA_STRING 3447 else if (rq.target == XA_STRING
3623 || rq.target == xa[XA_TEXT] 3448 || rq.target == xa[XA_TEXT]
3624 || rq.target == xa[XA_COMPOUND_TEXT] 3449 || rq.target == xa[XA_COMPOUND_TEXT]
3625 || rq.target == xa[XA_UTF8_STRING] 3450 || rq.target == xa[XA_UTF8_STRING]
… …
3657 { 3482 {
3658 target = xa[XA_COMPOUND_TEXT]; 3483 target = xa[XA_COMPOUND_TEXT];
3659 style = enc_compound_text; 3484 style = enc_compound_text;
3660 } 3485 }
3661 3486
3662 if (selection.text) 3487 if (rq.selection == XA_PRIMARY && selection.text)
3663 { 3488 {
3664 cl = selection.text; 3489 cl = selection.text;
3665 selectlen = selection.len; 3490 selectlen = selection.len;
3491 }
3492 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3493 {
3494 cl = selection.clip_text;
3495 selectlen = selection.clip_len;
3666 } 3496 }
3667 else 3497 else
3668 { 3498 {
3669 cl = L""; 3499 cl = L"";
3670 selectlen = 0; 3500 selectlen = 0;
… …
3691 ct.value = (unsigned char *)cl; 3521 ct.value = (unsigned char *)cl;
3692 ct.nitems = selectlen; 3522 ct.nitems = selectlen;
3693 ct.encoding = target; 3523 ct.encoding = target;
3694 } 3524 }
3695 3525
3696 XChangeProperty (dpy, rq.requestor, rq.property, 3526 XChangeProperty (dpy, rq.requestor, property,
3697 ct.encoding, 8, PropModeReplace, 3527 ct.encoding, 8, PropModeReplace,
3698 ct.value, (int)ct.nitems); 3528 ct.value, (int)ct.nitems);
3699 ev.property = rq.property; 3529 ev.property = property;
3700 3530
3701 if (freect) 3531 if (freect)
3702 XFree (ct.value); 3532 XFree (ct.value);
3703 } 3533 }
3704 3534
3705 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3535 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3706} 3536}
3707 3537
3708/* ------------------------------------------------------------------------- */ 3538/* ------------------------------------------------------------------------- */
3709#ifdef USE_XIM 3539#if USE_XIM
3710void 3540void ecb_cold
3711rxvt_term::im_set_position (XPoint &pos) NOTHROW 3541rxvt_term::im_set_position (XPoint &pos) NOTHROW
3712{ 3542{
3713 XWindowAttributes xwa; 3543 XWindowAttributes xwa;
3714 3544
3715 XGetWindowAttributes (dpy, vt, &xwa); 3545 XGetWindowAttributes (dpy, vt, &xwa);
… …
3738 h += 2; min_it (h, nrow); 3568 h += 2; min_it (h, nrow);
3739 3569
3740 x -= 1; clamp_it (x, 0, ncol - w); 3570 x -= 1; clamp_it (x, 0, ncol - w);
3741 y -= 1; clamp_it (y, 0, nrow - h); 3571 y -= 1; clamp_it (y, 0, nrow - h);
3742 3572
3743 ov_x = x; ov_y = y; 3573 ov.x = x; ov.y = y;
3744 ov_w = w; ov_h = h; 3574 ov.w = w; ov.h = h;
3745 3575
3746 ov_text = new text_t *[h]; 3576 ov.text = new text_t *[h];
3747 ov_rend = new rend_t *[h]; 3577 ov.rend = new rend_t *[h];
3748 3578
3749 for (y = 0; y < h; y++) 3579 for (y = 0; y < h; y++)
3750 { 3580 {
3751 text_t *tp = ov_text[y] = new text_t[w]; 3581 text_t *tp = ov.text[y] = new text_t[w];
3752 rend_t *rp = ov_rend[y] = new rend_t[w]; 3582 rend_t *rp = ov.rend[y] = new rend_t[w];
3753 3583
3754 text_t t0, t1, t2; 3584 text_t t0, t1, t2;
3755 rend_t r = OVERLAY_RSTYLE; 3585 rend_t r = OVERLAY_RSTYLE;
3756 3586
3757 if (y == 0) 3587 if (y == 0)
… …
3776} 3606}
3777 3607
3778void 3608void
3779rxvt_term::scr_overlay_off () NOTHROW 3609rxvt_term::scr_overlay_off () NOTHROW
3780{ 3610{
3781 if (!ov_text) 3611 if (!ov.text)
3782 return; 3612 return;
3783 3613
3784 want_refresh = 1; 3614 want_refresh = 1;
3785 3615
3786 for (int y = 0; y < ov_h; y++) 3616 for (int y = 0; y < ov.h; y++)
3787 { 3617 {
3788 delete [] ov_text[y]; 3618 delete [] ov.text[y];
3789 delete [] ov_rend[y]; 3619 delete [] ov.rend[y];
3790 } 3620 }
3791 3621
3792 delete [] ov_text; ov_text = 0; 3622 delete [] ov.text; ov.text = 0;
3793 delete [] ov_rend; ov_rend = 0; 3623 delete [] ov.rend; ov.rend = 0;
3794} 3624}
3795 3625
3796void 3626void
3797rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3627rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3798{ 3628{
3799 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3629 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3800 return; 3630 return;
3801 3631
3802 x++, y++; 3632 x++, y++;
3803 3633
3804 ov_text[y][x] = text; 3634 ov.text[y][x] = text;
3805 ov_rend[y][x] = rend; 3635 ov.rend[y][x] = rend;
3806} 3636}
3807 3637
3808void 3638void
3809rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3639rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3810{ 3640{
… …
3829} 3659}
3830 3660
3831void 3661void
3832rxvt_term::scr_swap_overlay () NOTHROW 3662rxvt_term::scr_swap_overlay () NOTHROW
3833{ 3663{
3834 if (!ov_text) 3664 if (!ov.text)
3835 return; 3665 return;
3836 3666
3667 // hide cursor if it is within the overlay area
3668 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3669 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3670 screen.flags &= ~Screen_VisibleCursor;
3671
3837 // swap screen mem with overlay 3672 // swap screen mem with overlay
3838 for (int y = ov_h; y--; ) 3673 for (int y = ov.h; y--; )
3839 { 3674 {
3840 text_t *t1 = ov_text[y]; 3675 text_t *t1 = ov.text[y];
3841 rend_t *r1 = ov_rend[y]; 3676 rend_t *r1 = ov.rend[y];
3842 3677
3843 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3678 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3844 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3679 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3845 3680
3846 for (int x = ov_w; x--; ) 3681 for (int x = ov.w; x--; )
3847 { 3682 {
3848 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3683 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3849 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3684 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3850 } 3685 }
3851 } 3686 }

Diff Legend

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