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.340 by sf-exg, Sat Apr 17 23:00:45 2010 UTC vs.
Revision 1.431 by root, Sun Jan 13 20:19:24 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;
… …
156/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
157 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
158 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
159 158
160void 159void
160rxvt_term::scr_alloc () NOTHROW
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for text_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = chunk_alloc (chunk_size, 0);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
161rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
162{ 195{
196#if ENABLE_OVERLAY
197 scr_overlay_off ();
198#endif
199
163 view_start = 0; 200 view_start = 0;
164 num_scr = 0; 201 num_scr = 0;
165 202
166 if (ncol == 0) 203 if (ncol == 0)
167 ncol = 80; 204 ncol = 80;
… …
187 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
188 225
189 screen.tscroll = 0; 226 screen.tscroll = 0;
190 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
191 228
229 void *prev_chunk = chunk;
230 size_t prev_chunk_size = chunk_size;
231 line_t *prev_drawn_buf = drawn_buf;
232 line_t *prev_swap_buf = swap_buf;
233 line_t *prev_row_buf = row_buf;
234
235 int common_col = min (prev_ncol, ncol);
236
237 scr_alloc ();
238
192 if (!row_buf) 239 if (!prev_row_buf)
193 { 240 {
194 /* 241 /*
195 * first time called so just malloc everything: don't rely on realloc 242 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
196 */ 243 */
197 top_row = 0; 244 top_row = 0;
198 term_start = 0; 245 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 246
214 memset (charsets, 'B', sizeof (charsets)); 247 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 248 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 249 screen.flags = Screen_DefaultFlags;
217 screen.cur.row = screen.cur.col = 0; 250 screen.cur.row = screen.cur.col = 0;
… …
240 { 273 {
241 /* 274 /*
242 * add or delete rows as appropriate 275 * add or delete rows as appropriate
243 */ 276 */
244 277
245 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
246 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
247
248#if 0
249 if (nrow < prev_nrow)
250 {
251 for (int row = nrow; row < prev_nrow; row++)
252 {
253 lfree (swap_buf [row]);
254 lfree (drawn_buf[row]);
255 }
256 }
257#endif
258
259 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
260 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
261
262 for (int row = min (nrow, prev_nrow); row--; ) 278 for (int row = min (nrow, prev_nrow); row--; )
263 { 279 {
264 lresize (drawn_buf[row]); 280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
265 lresize (swap_buf [row]); 281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
266 }
267 282
268 for (int row = prev_nrow; row < nrow; row++) 283 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
284 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285
286 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
287 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
288 swap_buf [row].l = min (prev_swap_buf [row].l, ncol);
289 swap_buf [row].f = prev_swap_buf [row].f;
269 { 290 }
270 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272 }
273
274 line_t *old_buf = row_buf;
275 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
276 291
277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 292 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
278 int pend = MOD (term_start + top_row , prev_total_rows); 293 int pend = MOD (term_start + top_row , prev_total_rows);
279 int q = total_rows; // rewrapped row 294 int q = total_rows; // rewrapped row
280 295
… …
288 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 303 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
289 304
290 do 305 do
291 { 306 {
292 p = MOD (p - 1, prev_total_rows); 307 p = MOD (p - 1, prev_total_rows);
293 assert (old_buf [MOD (p, prev_total_rows)].t); 308 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
294 int plines = 1; 309 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 310 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
296 311
297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 312 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
298 { 313 {
299 p = MOD (p - 1, prev_total_rows); 314 p = MOD (p - 1, prev_total_rows);
300 315
301 plines++; 316 plines++;
302 llen += prev_ncol; 317 llen += prev_ncol;
… …
315 330
316 // re-assemble the full line by destination lines 331 // re-assemble the full line by destination lines
317 for (int qrow = q; qlines--; qrow++) 332 for (int qrow = q; qlines--; qrow++)
318 { 333 {
319 qline = row_buf + qrow; 334 qline = row_buf + qrow;
320 lalloc (*qline); 335 qline->alloc (); // redundant with next line
321 qline->l = ncol; 336 qline->l = ncol;
322 qline->is_longer (1); 337 qline->is_longer (1);
323 338
324 int qcol = 0; 339 int qcol = 0;
325 340
… …
340 // this seems to upset applications/shells/readline 355 // this seems to upset applications/shells/readline
341 // least. 356 // least.
342 if (prow == ocur.row) 357 if (prow == ocur.row)
343 screen.cur.row = q - (total_rows - nrow); 358 screen.cur.row = q - (total_rows - nrow);
344 359
345 line_t &pline = old_buf [prow]; 360 line_t &pline = prev_row_buf [prow];
346 361
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 362 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 363
349 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 364 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
350 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 365 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
371 { 386 {
372 // if no scrollback exists (yet), wing, instead of wrap 387 // if no scrollback exists (yet), wing, instead of wrap
373 388
374 for (int row = min (nrow, prev_nrow); row--; ) 389 for (int row = min (nrow, prev_nrow); row--; )
375 { 390 {
376 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 391 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
377 line_t &qline = row_buf [row]; 392 line_t &dst = row_buf [row];
378 393
379 qline = pline; 394 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
380 lresize (qline); 395
396 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
397 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
398 dst.l = min (src.l, ncol);
399 dst.f = src.f;
381 } 400 }
382 401
383 for (int row = prev_nrow; row < nrow; row++) 402 for (int row = prev_nrow; row < nrow; row++)
384 {
385 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 403 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
386 }
387 404
388 term_start = 0; 405 term_start = 0;
389 } 406 }
390
391 free (old_buf);
392 delete old_ta;
393 delete old_ra;
394 407
395 clamp_it (screen.cur.row, 0, nrow - 1); 408 clamp_it (screen.cur.row, 0, nrow - 1);
396 clamp_it (screen.cur.col, 0, ncol - 1); 409 clamp_it (screen.cur.col, 0, ncol - 1);
397 } 410 }
398 411
412 for (int row = nrow; row--; )
413 {
414 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
415 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
416 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
417 }
418
419 chunk_free (prev_chunk, prev_chunk_size);
420
399 free (tabs); 421 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 422 tabs = (char *)rxvt_malloc (ncol);
401 423
402 for (int col = ncol; --col; ) 424 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 425 tabs [col] = col % TABSIZE == 0;
404 426
405 CLEAR_ALL_SELECTION (); 427 CLEAR_ALL_SELECTION ();
406 428
407 prev_nrow = nrow; 429 prev_nrow = nrow;
… …
410 tt_winch (); 432 tt_winch ();
411 433
412 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 434 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
413} 435}
414 436
415/* ------------------------------------------------------------------------- */ 437void ecb_cold
416/*
417 * Free everything. That way malloc debugging can find leakage.
418 */
419void
420rxvt_term::scr_release () NOTHROW 438rxvt_term::scr_release () NOTHROW
421{ 439{
422 if (row_buf) 440 chunk_free (chunk, chunk_size);
423 { 441 chunk = 0;
424 delete talloc; talloc = 0; 442 row_buf = 0;
425 delete ralloc; ralloc = 0;
426 443
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); 444 free (tabs);
433 tabs = 0; 445 tabs = 0;
434 }
435} 446}
436 447
437/* ------------------------------------------------------------------------- */ 448/* ------------------------------------------------------------------------- */
438/* 449/*
439 * Hard/Soft reset 450 * Hard/Soft reset
440 */ 451 */
441void 452void ecb_cold
442rxvt_term::scr_poweron () 453rxvt_term::scr_poweron ()
443{ 454{
444 scr_release (); 455 scr_release ();
456
445 prev_nrow = prev_ncol = 0; 457 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false; 458 rvideo_mode = false;
447 scr_soft_reset (); 459 scr_soft_reset ();
448 scr_reset (); 460 scr_reset ();
449 461
450 scr_clear (true); 462 scr_clear (true);
451 scr_refresh (); 463 scr_refresh ();
452} 464}
453 465
454void 466void ecb_cold
455rxvt_term::scr_soft_reset () 467rxvt_term::scr_soft_reset () NOTHROW
456{ 468{
457 /* only affects modes, nothing drastic such as clearing the screen */ 469 /* only affects modes, nothing drastic such as clearing the screen */
458#if ENABLE_OVERLAY 470#if ENABLE_OVERLAY
459 scr_overlay_off (); 471 scr_overlay_off ();
460#endif 472#endif
… …
515 assert (s->cur.row >= 0); 527 assert (s->cur.row >= 0);
516 assert (s->cur.col >= 0); 528 assert (s->cur.col >= 0);
517} 529}
518 530
519void 531void
520rxvt_term::scr_swap_screen () 532rxvt_term::scr_swap_screen () NOTHROW
521{ 533{
522 if (!option (Opt_secondaryScreen)) 534 if (!option (Opt_secondaryScreen))
523 return; 535 return;
524 536
525 for (int i = prev_nrow; i--; ) 537 for (int i = prev_nrow; i--; )
… …
544 return; 556 return;
545 557
546 want_refresh = 1; 558 want_refresh = 1;
547 view_start = 0; 559 view_start = 0;
548 560
549 selection_check (2); /* check for boundary cross */ 561 /* check for boundary cross */
562 row_col_t pos;
563 pos.row = pos.col = 0;
564 if (ROWCOL_IS_BEFORE (selection.beg, pos)
565 && ROWCOL_IS_AFTER (selection.end, pos))
566 CLEAR_SELECTION ();
550 567
551 current_screen = scrn; 568 current_screen = scrn;
552 569
553#if NSCREENS 570#if NSCREENS
554 if (option (Opt_secondaryScreen)) 571 if (option (Opt_secondaryScreen))
… …
620/* 637/*
621 * Scroll text between <row1> and <row2> inclusive, by <count> lines 638 * Scroll text between <row1> and <row2> inclusive, by <count> lines
622 * count positive ==> scroll up 639 * count positive ==> scroll up
623 * count negative ==> scroll down 640 * count negative ==> scroll down
624 */ 641 */
625int 642int ecb_hot
626rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 643rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
627{ 644{
628 if (count == 0 || (row1 > row2)) 645 if (count == 0 || (row1 > row2))
629 return 0; 646 return 0;
630 647
… …
633 650
634 if (count > 0 651 if (count > 0
635 && row1 == 0 652 && row1 == 0
636 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 653 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
637 { 654 {
655 min_it (count, total_rows - (nrow - (row2 + 1)));
656
638 top_row = max (top_row - count, -saveLines); 657 top_row = max (top_row - count, -saveLines);
639
640 // scroll everything up 'count' lines
641 term_start = (term_start + count) % total_rows;
642 658
643 // sever bottommost line 659 // sever bottommost line
644 { 660 {
645 line_t &l = ROW(row2 - count); 661 line_t &l = ROW(row2);
646 l.is_longer (0); 662 l.is_longer (0);
647 l.touch (); 663 l.touch ();
648 } 664 }
649 665
666 // scroll everything up 'count' lines
667 term_start = (term_start + count) % total_rows;
668
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
650 // erase newly scrolled-in lines 681 // erase newly scrolled-in lines
651 for (int i = count; i--; ) 682 for (int i = count; i--; )
652 { 683 {
653 line_t &l = ROW(nrow - 1 - i); 684 line_t &l = ROW(row2 - i);
654 685
655 // optimize if already cleared, can be significant on slow machines 686 // optimise if already cleared, can be significant on slow machines
656 // could be rolled into scr_blank_screen_mem 687 // could be rolled into scr_blank_screen_mem
657 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 688 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
658 { 689 {
659 scr_blank_line (l, 0, l.l, rstyle); 690 scr_blank_line (l, 0, l.l, rstyle);
660 l.l = 0; 691 l.l = 0;
… …
662 } 693 }
663 else 694 else
664 scr_blank_screen_mem (l, rstyle); 695 scr_blank_screen_mem (l, rstyle);
665 } 696 }
666 697
667 // now copy lines below the scroll region bottom to the
668 // bottom of the screen again, so they look as if they
669 // hadn't moved.
670 for (int i = nrow; --i > row2; )
671 {
672 line_t &l1 = ROW(i - count);
673 line_t &l2 = ROW(i);
674
675 ::swap (l1, l2);
676 l2.touch ();
677 }
678
679 // move and/or clear selection, if any 698 // move and/or clear selection, if any
680 if (selection.op && current_screen == selection.screen) 699 if (selection.op && current_screen == selection.screen
700 && selection.beg.row <= row2)
681 { 701 {
682 selection.beg.row -= count; 702 selection.beg.row -= count;
683 selection.end.row -= count; 703 selection.end.row -= count;
684 selection.mark.row -= count; 704 selection.mark.row -= count;
685 705
686 if (selection.beg.row < top_row 706 selection_check (0);
687 || selection.end.row < top_row
688 || selection.mark.row < top_row)
689 {
690 CLEAR_ALL_SELECTION ();
691 selection.op = SELECTION_CLEAR;
692 }
693 } 707 }
694 708
695 // finally move the view window, if desired 709 // finally move the view window, if desired
696 if (option (Opt_scrollWithBuffer) 710 if (option (Opt_scrollWithBuffer)
697 && view_start != 0 711 && view_start != 0
… …
727 } 741 }
728 742
729 // use a simple and robust scrolling algorithm, this 743 // use a simple and robust scrolling algorithm, this
730 // part of scr_scroll_text is not time-critical. 744 // part of scr_scroll_text is not time-critical.
731 745
746 // sever line above scroll region
747 if (row1)
748 {
749 line_t &l = ROW(row1 - 1);
750 l.is_longer (0);
751 l.touch ();
752 }
753
732 int rows = row2 - row1 + 1; 754 int rows = row2 - row1 + 1;
733 755
734 min_it (count, rows); 756 min_it (count, rows);
735 757
736 line_t *temp_buf = row_buf + total_rows; 758 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
737 759
738 for (int row = 0; row < rows; row++) 760 for (int row = 0; row < rows; row++)
739 { 761 {
740 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 762 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
741 763
… …
743 scr_blank_screen_mem (temp_buf [row], rstyle); 765 scr_blank_screen_mem (temp_buf [row], rstyle);
744 } 766 }
745 767
746 for (int row = 0; row < rows; row++) 768 for (int row = 0; row < rows; row++)
747 ROW(row1 + row) = temp_buf [row]; 769 ROW(row1 + row) = temp_buf [row];
770
771 // sever bottommost line
772 {
773 line_t &l = ROW(row2);
774 l.is_longer (0);
775 l.touch ();
776 }
748 } 777 }
749 778
750 return count; 779 return count;
751} 780}
752 781
753/* ------------------------------------------------------------------------- */ 782/* ------------------------------------------------------------------------- */
754/* 783/*
755 * Add text given in <str> of length <len> to screen struct 784 * Add text given in <str> of length <len> to screen struct
756 */ 785 */
757void 786void ecb_hot
758rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 787rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
759{ 788{
760 if (len <= 0) /* sanity */ 789 if (len <= 0) /* sanity */
761 return; 790 return;
762 791
763 unsigned char checksel; 792 bool checksel;
764 unicode_t c; 793 unicode_t c;
765 int ncol = this->ncol; 794 int ncol = this->ncol;
766 const wchar_t *strend = str + len; 795 const wchar_t *strend = str + len;
767 796
768 want_refresh = 1; 797 want_refresh = 1;
… …
794 823
795 while (str < strend) 824 while (str < strend)
796 { 825 {
797 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 826 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
798 827
799 if (expect_false (c < 0x20)) 828 if (ecb_unlikely (c < 0x20))
800 if (c == C0_LF) 829 if (c == C0_LF)
801 { 830 {
802 max_it (line->l, screen.cur.col); 831 max_it (line->l, screen.cur.col);
803 832
804 screen.flags &= ~Screen_WrapNext; 833 screen.flags &= ~Screen_WrapNext;
… …
823 { 852 {
824 scr_tab (1, true); 853 scr_tab (1, true);
825 continue; 854 continue;
826 } 855 }
827 856
828 if (expect_false ( 857 if (ecb_unlikely (
829 checksel /* see if we're writing within selection */ 858 checksel /* see if we're writing within selection */
830 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 859 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
831 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 860 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
832 )) 861 ))
833 { 862 {
… …
838 * should be a similar check. 867 * should be a similar check.
839 */ 868 */
840 CLEAR_SELECTION (); 869 CLEAR_SELECTION ();
841 } 870 }
842 871
843 if (expect_false (screen.flags & Screen_WrapNext)) 872 if (ecb_unlikely (screen.flags & Screen_WrapNext))
844 { 873 {
845 scr_do_wrap (); 874 scr_do_wrap ();
846 875
847 line->l = ncol; 876 line->l = ncol;
848 line->is_longer (1); 877 line->is_longer (1);
… …
850 row = screen.cur.row; 879 row = screen.cur.row;
851 line = &ROW(row); /* _must_ refresh */ 880 line = &ROW(row); /* _must_ refresh */
852 } 881 }
853 882
854 // some utf-8 decoders "decode" surrogate characters: let's fix this. 883 // some utf-8 decoders "decode" surrogate characters: let's fix this.
855 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 884 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
856 c = 0xfffd; 885 c = 0xfffd;
857 886
858 // rely on wcwidth to tell us the character width, do wcwidth before 887 // rely on wcwidth to tell us the character width, do wcwidth before
859 // further replacements, as wcwidth might return -1 for the line 888 // further replacements, as wcwidth might return -1 for the line
860 // drawing characters below as they might be invalid in the current 889 // drawing characters below as they might be invalid in the current
861 // locale. 890 // locale.
862 int width = WCWIDTH (c); 891 int width = WCWIDTH (c);
863 892
864 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 893 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
865 { 894 {
866 // vt100 special graphics and line drawing 895 // vt100 special graphics and line drawing
867 // 5f-7e standard vt100 896 // 5f-7e standard vt100
868 // 40-5e rxvt extension for extra curses acs chars 897 // 40-5e rxvt extension for extra curses acs chars
869 static uint16_t vt100_0[62] = { // 41 .. 7e 898 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
882 c = vt100_0[c - 0x41]; 911 c = vt100_0[c - 0x41];
883 width = 1; // vt100 line drawing characters are always single-width 912 width = 1; // vt100 line drawing characters are always single-width
884 } 913 }
885 } 914 }
886 915
887 if (expect_false (screen.flags & Screen_Insert)) 916 if (ecb_unlikely (screen.flags & Screen_Insert))
888 scr_insdel_chars (width, INSERT); 917 scr_insdel_chars (width, INSERT);
889 918
890 if (width != 0) 919 if (width != 0)
891 { 920 {
892#if !UNICODE_3 921#if !UNICODE_3
… …
897# else 926# else
898 c = 0xfffd; 927 c = 0xfffd;
899# endif 928# endif
900#endif 929#endif
901 930
931 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
932
933 // if the character doesn't fit into the remaining columns...
934 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
935 {
936 if (screen.flags & Screen_Autowrap)
937 {
938 // ... artificially enlargen the previous one
939 c = NOCHAR;
940 // and try the same character next loop iteration
941 --str;
942 }
943 else
944 screen.cur.col = ncol - width;
945 }
946
902 // nuke the character at this position, if required 947 // nuke the character at this position, if required
903 if (expect_false ( 948 // due to wonderful coincidences everywhere else in this loop
949 // we never have to check for overwriting a wide char itself,
950 // only its tail.
904 line->t[screen.cur.col] == NOCHAR 951 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
905 || (screen.cur.col < ncol - 1
906 && line->t[screen.cur.col + 1] == NOCHAR)
907 ))
908 scr_kill_char (*line, screen.cur.col); 952 scr_kill_char (*line, screen.cur.col);
909
910 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
911
912 // if the character doesn't fit into the remaining columns...
913 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
914 {
915 // ... artificially enlargen the previous one
916 c = NOCHAR;
917 // and try the same character next loop iteration
918 --str;
919 }
920 953
921 line->touch (); 954 line->touch ();
922 955
923 do 956 do
924 { 957 {
925 line->t[screen.cur.col] = c; 958 line->t[screen.cur.col] = c;
926 line->r[screen.cur.col] = rend; 959 line->r[screen.cur.col] = rend;
927 960
928 if (expect_true (screen.cur.col < ncol - 1)) 961 if (ecb_likely (screen.cur.col < ncol - 1))
929 screen.cur.col++; 962 screen.cur.col++;
930 else 963 else
931 { 964 {
932 line->l = ncol; 965 line->l = ncol;
933 if (screen.flags & Screen_Autowrap) 966 if (screen.flags & Screen_Autowrap)
934 screen.flags |= Screen_WrapNext; 967 screen.flags |= Screen_WrapNext;
935 break; 968
969 goto end_of_line;
936 } 970 }
937 971
938 c = NOCHAR; 972 c = NOCHAR;
939 } 973 }
940 while (expect_false (--width > 0)); 974 while (ecb_unlikely (--width > 0));
941 975
942 // pad with spaces when overwriting wide character with smaller one 976 // pad with spaces when overwriting wide character with smaller one
943 if (expect_false (!width)) 977 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
944 { 978 {
945 line->touch ();
946
947 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
948 {
949 line->t[c] = ' '; 979 line->t[c] = ' ';
950 line->r[c] = rend; 980 line->r[c] = rend;
951 }
952 } 981 }
982
983end_of_line:
984 ;
953 } 985 }
954#if ENABLE_COMBINING 986#if ENABLE_COMBINING
955 else // width == 0 987 else // width == 0
956 { 988 {
957 if (c != 0xfeff) // ignore BOM 989 if (c != 0xfeff) // ignore BOM
… …
1020 1052
1021 want_refresh = 1; 1053 want_refresh = 1;
1022#endif 1054#endif
1023 } 1055 }
1024 } 1056 }
1057 else if (screen.flags & Screen_WrapNext)
1058 screen.flags &= ~Screen_WrapNext;
1025 else 1059 else
1026 scr_gotorc (0, -1, RELATIVE); 1060 scr_gotorc (0, -1, RELATIVE);
1027} 1061}
1028 1062
1029/* ------------------------------------------------------------------------- */ 1063/* ------------------------------------------------------------------------- */
… …
1107 * XTERM_SEQ: ESC 6 1141 * XTERM_SEQ: ESC 6
1108 * Move cursor left in row. If we're at the left boundary, shift everything 1142 * Move cursor left in row. If we're at the left boundary, shift everything
1109 * in that row right. Clear left column. 1143 * in that row right. Clear left column.
1110 */ 1144 */
1111#if !ENABLE_MINIMAL 1145#if !ENABLE_MINIMAL
1112void 1146void ecb_cold
1113rxvt_term::scr_backindex () NOTHROW 1147rxvt_term::scr_backindex () NOTHROW
1114{ 1148{
1115 if (screen.cur.col > 0) 1149 if (screen.cur.col > 0)
1116 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1150 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1117 else 1151 else
… …
1124 * XTERM_SEQ: ESC 9 1158 * XTERM_SEQ: ESC 9
1125 * Move cursor right in row. If we're at the right boundary, shift everything 1159 * Move cursor right in row. If we're at the right boundary, shift everything
1126 * in that row left. Clear right column. 1160 * in that row left. Clear right column.
1127 */ 1161 */
1128#if !ENABLE_MINIMAL 1162#if !ENABLE_MINIMAL
1129void 1163void ecb_cold
1130rxvt_term::scr_forwardindex () NOTHROW 1164rxvt_term::scr_forwardindex () NOTHROW
1131{ 1165{
1132 if (screen.cur.col < ncol - 1) 1166 if (screen.cur.col < ncol - 1)
1133 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1167 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1134 else 1168 else
… …
1285 scr_blank_line (line, col, num, rstyle); 1319 scr_blank_line (line, col, num, rstyle);
1286} 1320}
1287 1321
1288/* ------------------------------------------------------------------------- */ 1322/* ------------------------------------------------------------------------- */
1289/* 1323/*
1290 * Erase part of whole of the screen 1324 * Erase part or whole of the screen
1291 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1325 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1292 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1326 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1293 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1327 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1294 */ 1328 */
1295void 1329void
… …
1304 ZERO_SCROLLBACK (); 1338 ZERO_SCROLLBACK ();
1305 1339
1306 switch (mode) 1340 switch (mode)
1307 { 1341 {
1308 case 0: /* erase to end of screen */ 1342 case 0: /* erase to end of screen */
1309 selection_check (1);
1310 scr_erase_line (0); 1343 scr_erase_line (0);
1311 row = screen.cur.row + 1; /* possible OOB */ 1344 row = screen.cur.row + 1; /* possible OOB */
1312 num = nrow - row; 1345 num = nrow - row;
1313 break; 1346 break;
1314 case 1: /* erase to beginning of screen */ 1347 case 1: /* erase to beginning of screen */
1315 selection_check (3);
1316 scr_erase_line (1); 1348 scr_erase_line (1);
1317 row = 0; 1349 row = 0;
1318 num = screen.cur.row; 1350 num = screen.cur.row;
1319 break; 1351 break;
1320 case 2: /* erase whole screen */ 1352 case 2: /* erase whole screen */
1321 selection_check (3);
1322 row = 0; 1353 row = 0;
1323 num = nrow; 1354 num = nrow;
1324 break; 1355 break;
1325 default: 1356 default:
1326 return; 1357 return;
… …
1335 if (row >= nrow) /* Out Of Bounds */ 1366 if (row >= nrow) /* Out Of Bounds */
1336 return; 1367 return;
1337 1368
1338 min_it (num, nrow - row); 1369 min_it (num, nrow - row);
1339 1370
1340 // TODO: the code below does not work when view_start != 0
1341 // the workaround is to disable the clear and use a normal refresh
1342 // when view_start != 0. mysterious.
1343 if (rstyle & (RS_RVid | RS_Uline)) 1371 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1344 ren = (rend_t) ~RS_None; 1372 ren = (rend_t) ~RS_None;
1345 else if (GET_BASEBG (rstyle) == Color_bg) 1373 else if (GET_BASEBG (rstyle) == Color_bg)
1346 { 1374 {
1347 ren = DEFAULT_RSTYLE; 1375 ren = DEFAULT_RSTYLE;
1348 1376
1349 if (mapped && !view_start) 1377 if (mapped)
1350 XClearArea (dpy, vt, 0, 1378 XClearArea (dpy, vt, 0,
1351 Row2Pixel (row - view_start), (unsigned int)width, 1379 Row2Pixel (row - view_start), (unsigned int)vt_width,
1352 (unsigned int)Height2Pixel (num), False); 1380 (unsigned int)Height2Pixel (num), False);
1353 } 1381 }
1354 else 1382 else
1355 { 1383 {
1356 ren = rstyle & (RS_fgMask | RS_bgMask); 1384 ren = rstyle & (RS_fgMask | RS_bgMask);
1357 1385
1358 if (mapped && !view_start) 1386 if (mapped)
1359 { 1387 {
1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1388 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1389 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1362 XFillRectangle (dpy, vt, gc, 1390 XFillRectangle (dpy, vt, gc,
1363 0, Row2Pixel (row - view_start), 1391 0, Row2Pixel (row - view_start),
1364 (unsigned int)width, 1392 (unsigned int)vt_width,
1365 (unsigned int)Height2Pixel (num)); 1393 (unsigned int)Height2Pixel (num));
1366 gcvalue.foreground = pix_colors[Color_fg]; 1394 gcvalue.foreground = pix_colors[Color_fg];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1395 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 } 1396 }
1369 } 1397 }
1370 1398
1371 for (; num--; row++) 1399 for (; num--; row++)
1372 { 1400 {
1373 scr_blank_screen_mem (ROW(row), rstyle); 1401 scr_blank_screen_mem (ROW(row), rstyle);
1374 1402
1375 if (!view_start) 1403 if (row - view_start < nrow)
1376 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1404 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1377 } 1405 }
1378} 1406}
1379 1407
1380#if !ENABLE_MINIMAL 1408#if !ENABLE_MINIMAL
1381void 1409void
… …
1391/* ------------------------------------------------------------------------- */ 1419/* ------------------------------------------------------------------------- */
1392/* 1420/*
1393 * Fill the screen with `E's 1421 * Fill the screen with `E's
1394 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1422 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1395 */ 1423 */
1396void 1424void ecb_cold
1397rxvt_term::scr_E () NOTHROW 1425rxvt_term::scr_E () NOTHROW
1398{ 1426{
1399 rend_t fs; 1427 rend_t fs;
1400 1428
1401 want_refresh = 1; 1429 want_refresh = 1;
1402 ZERO_SCROLLBACK (); 1430 ZERO_SCROLLBACK ();
1403 1431
1404 num_scr_allow = 0; 1432 num_scr_allow = 0;
1405 selection_check (3); 1433
1434 row_col_t pos;
1435 pos.row = pos.col = 0;
1436 if (ROWCOL_IS_AFTER (selection.end, pos))
1437 CLEAR_SELECTION ();
1406 1438
1407 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1439 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1408 for (int row = nrow; row--; ) 1440 for (int row = nrow; row--; )
1409 { 1441 {
1410 line_t &line = ROW(row); 1442 line_t &line = ROW(row);
… …
1561/* ------------------------------------------------------------------------- */ 1593/* ------------------------------------------------------------------------- */
1562/* 1594/*
1563 * Set the scrolling region 1595 * Set the scrolling region
1564 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1596 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1565 */ 1597 */
1566void 1598void ecb_cold
1567rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1599rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1568{ 1600{
1569 max_it (top, 0); 1601 max_it (top, 0);
1570 min_it (bot, nrow - 1); 1602 min_it (bot, nrow - 1);
1571 1603
… …
1581/* 1613/*
1582 * Make the cursor visible/invisible 1614 * Make the cursor visible/invisible
1583 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1615 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1584 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1616 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1585 */ 1617 */
1586void 1618void ecb_cold
1587rxvt_term::scr_cursor_visible (int mode) NOTHROW 1619rxvt_term::scr_cursor_visible (int mode) NOTHROW
1588{ 1620{
1589 want_refresh = 1; 1621 want_refresh = 1;
1590 1622
1591 if (mode) 1623 if (mode)
… …
1598/* 1630/*
1599 * Set/unset automatic wrapping 1631 * Set/unset automatic wrapping
1600 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1632 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1601 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1633 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1602 */ 1634 */
1603void 1635void ecb_cold
1604rxvt_term::scr_autowrap (int mode) NOTHROW 1636rxvt_term::scr_autowrap (int mode) NOTHROW
1605{ 1637{
1606 if (mode) 1638 if (mode)
1607 screen.flags |= Screen_Autowrap; 1639 screen.flags |= Screen_Autowrap;
1608 else 1640 else
… …
1617 * Relative mode: line numbers are relative to top margin of scrolling region 1649 * Relative mode: line numbers are relative to top margin of scrolling region
1618 * and the cursor cannot be moved outside. 1650 * and the cursor cannot be moved outside.
1619 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1651 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1620 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1652 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1621 */ 1653 */
1622void 1654void ecb_cold
1623rxvt_term::scr_relative_origin (int mode) NOTHROW 1655rxvt_term::scr_relative_origin (int mode) NOTHROW
1624{ 1656{
1625 if (mode) 1657 if (mode)
1626 screen.flags |= Screen_Relative; 1658 screen.flags |= Screen_Relative;
1627 else 1659 else
… …
1634/* 1666/*
1635 * Set insert/replace mode 1667 * Set insert/replace mode
1636 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1668 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1637 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1669 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1638 */ 1670 */
1639void 1671void ecb_cold
1640rxvt_term::scr_insert_mode (int mode) NOTHROW 1672rxvt_term::scr_insert_mode (int mode) NOTHROW
1641{ 1673{
1642 if (mode) 1674 if (mode)
1643 screen.flags |= Screen_Insert; 1675 screen.flags |= Screen_Insert;
1644 else 1676 else
… …
1650 * Set/Unset tabs 1682 * Set/Unset tabs
1651 * XTERM_SEQ: Set tab at current column : ESC H 1683 * XTERM_SEQ: Set tab at current column : ESC H
1652 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1684 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1653 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1685 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1654 */ 1686 */
1655void 1687void ecb_cold
1656rxvt_term::scr_set_tab (int mode) NOTHROW 1688rxvt_term::scr_set_tab (int mode) NOTHROW
1657{ 1689{
1658 if (mode < 0) 1690 if (mode < 0)
1659 memset (tabs, 0, ncol); 1691 memset (tabs, 0, ncol);
1660 else if (screen.cur.col < ncol) 1692 else if (screen.cur.col < ncol)
… …
1679 if (rvideo_state != on) 1711 if (rvideo_state != on)
1680 { 1712 {
1681 rvideo_state = on; 1713 rvideo_state = on;
1682 1714
1683 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1715 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1684#ifdef HAVE_BG_PIXMAP 1716#ifdef HAVE_IMG
1685 if (bgPixmap.pixmap == None) 1717 if (bg_img == 0)
1686#endif 1718#endif
1687 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1719 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1688 1720
1689 XGCValues gcvalue; 1721 XGCValues gcvalue;
1690 gcvalue.foreground = pix_colors[Color_fg]; 1722 gcvalue.foreground = pix_colors[Color_fg];
… …
1699/* ------------------------------------------------------------------------- */ 1731/* ------------------------------------------------------------------------- */
1700/* 1732/*
1701 * Report current cursor position 1733 * Report current cursor position
1702 * XTERM_SEQ: Report position: ESC [ 6 n 1734 * XTERM_SEQ: Report position: ESC [ 6 n
1703 */ 1735 */
1704void 1736void ecb_cold
1705rxvt_term::scr_report_position () NOTHROW 1737rxvt_term::scr_report_position () NOTHROW
1706{ 1738{
1707 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1739 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1708} 1740}
1709 1741
… …
1712 * ------------------------------------------------------------------------- */ 1744 * ------------------------------------------------------------------------- */
1713 1745
1714/* 1746/*
1715 * Set font style 1747 * Set font style
1716 */ 1748 */
1717void 1749void ecb_cold
1718rxvt_term::set_font_style () NOTHROW 1750rxvt_term::set_font_style () NOTHROW
1719{ 1751{
1720#if 0 1752#if 0
1721 switch (charsets [screen.charset]) 1753 switch (charsets [screen.charset])
1722 { 1754 {
… …
1744 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1776 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1745 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1777 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1746 * XTERM_SEQ: Invoke G2 character set: ESC N 1778 * XTERM_SEQ: Invoke G2 character set: ESC N
1747 * XTERM_SEQ: Invoke G3 character set: ESC O 1779 * XTERM_SEQ: Invoke G3 character set: ESC O
1748 */ 1780 */
1749void 1781void ecb_cold
1750rxvt_term::scr_charset_choose (int set) NOTHROW 1782rxvt_term::scr_charset_choose (int set) NOTHROW
1751{ 1783{
1752 screen.charset = set; 1784 screen.charset = set;
1753 set_font_style (); 1785 set_font_style ();
1754} 1786}
… …
1775 * ------------------------------------------------------------------------- */ 1807 * ------------------------------------------------------------------------- */
1776 1808
1777/* 1809/*
1778 * refresh matching text. 1810 * refresh matching text.
1779 */ 1811 */
1780bool 1812bool ecb_cold
1781rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1813rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1782{ 1814{
1783 bool found = false; 1815 bool found = false;
1784 1816
1785 for (int i = 0; i < nrow; i++) 1817 for (int i = 0; i < nrow; i++)
… …
1804 PART_BEG = 0, 1836 PART_BEG = 0,
1805 PART_END, 1837 PART_END,
1806 RC_COUNT 1838 RC_COUNT
1807}; 1839};
1808 1840
1809void 1841void ecb_hot
1810rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1842rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1811{ 1843{
1812 int i; 1844 int i;
1813 row_col_t rc[RC_COUNT]; 1845 row_col_t rc[RC_COUNT];
1814 1846
… …
1851 * Refresh the entire screen 1883 * Refresh the entire screen
1852 */ 1884 */
1853void 1885void
1854rxvt_term::scr_touch (bool refresh) NOTHROW 1886rxvt_term::scr_touch (bool refresh) NOTHROW
1855{ 1887{
1856 scr_expose (0, 0, width, height, refresh); 1888 scr_expose (0, 0, vt_width, vt_height, refresh);
1857} 1889}
1858 1890
1859/* ------------------------------------------------------------------------- */ 1891/* ------------------------------------------------------------------------- */
1860/* 1892/*
1861 * Move the display so that the line represented by scrollbar value Y is at 1893 * Move the display so that the line represented by scrollbar value Y is at
… …
1917 1949
1918# ifndef NO_MAPALERT 1950# ifndef NO_MAPALERT
1919# ifdef MAPALERT_OPTION 1951# ifdef MAPALERT_OPTION
1920 if (option (Opt_mapAlert)) 1952 if (option (Opt_mapAlert))
1921# endif 1953# endif
1922 XMapWindow (dpy, parent[0]); 1954 XMapWindow (dpy, parent);
1923# endif 1955# endif
1924 1956
1925# if ENABLE_FRILLS 1957# if ENABLE_FRILLS
1926 if (option (Opt_urgentOnBell)) 1958 if (option (Opt_urgentOnBell))
1927 set_urgency (1); 1959 set_urgency (1);
… …
1940 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1972 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1941#endif 1973#endif
1942} 1974}
1943 1975
1944/* ------------------------------------------------------------------------- */ 1976/* ------------------------------------------------------------------------- */
1945/* ARGSUSED */ 1977void ecb_cold
1946void
1947rxvt_term::scr_printscreen (int fullhist) NOTHROW 1978rxvt_term::scr_printscreen (int fullhist) NOTHROW
1948{ 1979{
1949#ifdef PRINTPIPE 1980#ifdef PRINTPIPE
1950 int nrows, row_start; 1981 int nrows, row_start;
1951 FILE *fd = popen_printer (); 1982 FILE *fd = popen_printer ();
… …
2000/* 2031/*
2001 * Refresh the screen 2032 * Refresh the screen
2002 * drawn_text/drawn_rend contain the screen information before the update. 2033 * drawn_text/drawn_rend contain the screen information before the update.
2003 * screen.text/screen.rend contain what the screen will change to. 2034 * screen.text/screen.rend contain what the screen will change to.
2004 */ 2035 */
2005void 2036void ecb_hot
2006rxvt_term::scr_refresh () NOTHROW 2037rxvt_term::scr_refresh () NOTHROW
2007{ 2038{
2008 int16_t col, row, /* column/row we're processing */ 2039 int16_t col, row, /* column/row we're processing */
2009 ocrow; /* old cursor row */ 2040 ocrow; /* old cursor row */
2010 int i; /* tmp */ 2041 int i; /* tmp */
… …
2024 * A: set up vars 2055 * A: set up vars
2025 */ 2056 */
2026 refresh_count = 0; 2057 refresh_count = 0;
2027 2058
2028 unsigned int old_screen_flags = screen.flags; 2059 unsigned int old_screen_flags = screen.flags;
2029 char have_bg = 0; 2060 bool have_bg = 0;
2030#ifdef HAVE_BG_PIXMAP 2061#ifdef HAVE_IMG
2031 have_bg = bgPixmap.pixmap != None; 2062 have_bg = bg_img != 0;
2032#endif 2063#endif
2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2064 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2034 2065
2035 /* 2066 /*
2036 * B: reverse any characters which are selected 2067 * B: reverse any characters which are selected
… …
2040 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2071 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2041#if ENABLE_OVERLAY 2072#if ENABLE_OVERLAY
2042 scr_swap_overlay (); 2073 scr_swap_overlay ();
2043#endif 2074#endif
2044 2075
2045 char showcursor = screen.flags & Screen_VisibleCursor; 2076 bool showcursor = screen.flags & Screen_VisibleCursor;
2046 2077
2047 /* 2078 /*
2048 * C: set the cursor character (s) 2079 * C: set the cursor character (s)
2049 */ 2080 */
2050 { 2081 {
2051 unsigned char setoldcursor; 2082 bool setoldcursor;
2052 2083
2053#ifdef CURSOR_BLINK 2084#ifdef CURSOR_BLINK
2054 if (hidden_cursor) 2085 if (hidden_cursor)
2055 showcursor = 0; 2086 showcursor = 0;
2056#endif 2087#endif
… …
2143 { 2174 {
2144 int16_t nits; 2175 int16_t nits;
2145 int i = num_scr; 2176 int i = num_scr;
2146 int j; 2177 int j;
2147 int len, wlen; 2178 int len, wlen;
2148 dLocal (int, num_scr);
2149 2179
2150 j = nrow; 2180 j = nrow;
2151 wlen = len = -1; 2181 wlen = len = -1;
2152 row = i > 0 ? 0 : j - 1; 2182 row = i > 0 ? 0 : j - 1;
2153 2183
… …
2228 continue; 2258 continue;
2229 2259
2230 // redraw one or more characters 2260 // redraw one or more characters
2231 2261
2232 // seek to the beginning of wide characters 2262 // seek to the beginning of wide characters
2233 while (expect_false (stp[col] == NOCHAR && col > 0)) 2263 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2234 --col; 2264 --col;
2235 2265
2236 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2266 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2237 text_t *text = stp + col; 2267 text_t *text = stp + col;
2238 int count = 1; 2268 int count = 1;
… …
2276 2306
2277 col--; /* went one too far. move back */ 2307 col--; /* went one too far. move back */
2278 count -= i; /* dump any matching trailing chars */ 2308 count -= i; /* dump any matching trailing chars */
2279 2309
2280 // sometimes we optimize away the trailing NOCHAR's, add them back 2310 // sometimes we optimize away the trailing NOCHAR's, add them back
2281 while (expect_false (i && text[count] == NOCHAR)) 2311 while (ecb_unlikely (i && text[count] == NOCHAR))
2282 count++, i--; 2312 count++, i--;
2283 2313
2284 /* 2314 /*
2285 * Determine the attributes for the string 2315 * Determine the attributes for the string
2286 */ 2316 */
2287 int fore = fgcolor_of (rend); // desired foreground 2317 int fore = fgcolor_of (rend); // desired foreground
2288 int back = bgcolor_of (rend); // desired background 2318 int back = bgcolor_of (rend); // desired background
2289 2319
2290 // only do special processing if any attributes are set, which is unlikely 2320 // only do special processing if any attributes are set, which is unlikely
2291 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2321 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2292 { 2322 {
2293 bool invert = rend & RS_RVid; 2323 bool invert = rend & RS_RVid;
2294 2324
2295#ifndef NO_BOLD_UNDERLINE_REVERSE 2325#ifndef NO_BOLD_UNDERLINE_REVERSE
2296 if (rend & RS_Bold && fore == Color_fg) 2326 if (rend & RS_Bold && fore == Color_fg)
… …
2328 if (ISSET_PIXCOLOR (Color_HTC)) 2358 if (ISSET_PIXCOLOR (Color_HTC))
2329 fore = Color_HTC; 2359 fore = Color_HTC;
2330 // if invert is 0 reverse video is set so we use bg color as fg color 2360 // if invert is 0 reverse video is set so we use bg color as fg color
2331 else if (!invert) 2361 else if (!invert)
2332 fore = back; 2362 fore = back;
2363
2333 back = Color_HC; 2364 back = Color_HC;
2334 invert = 0; 2365 invert = 0;
2335 } 2366 }
2336 } 2367 }
2337#endif 2368#endif
… …
2384 /* 2415 /*
2385 * Actually do the drawing of the string here 2416 * Actually do the drawing of the string here
2386 */ 2417 */
2387 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2418 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2388 2419
2389 if (expect_true (have_bg && back == Color_bg)) 2420 if (ecb_likely (have_bg && back == Color_bg))
2390 { 2421 {
2391 // this is very ugly, maybe push it into ->draw? 2422 // this is very ugly, maybe push it into ->draw?
2392 2423
2393 for (i = 0; i < count; i++) /* don't draw empty strings */ 2424 for (i = 0; i < count; i++) /* don't draw empty strings */
2394 if (text[i] != ' ') 2425 if (text[i] != ' ')
… …
2401 did_clear: ; 2432 did_clear: ;
2402 } 2433 }
2403 else 2434 else
2404 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2435 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2405 2436
2406 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2437 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2407 { 2438 {
2408#if ENABLE_FRILLS 2439#if ENABLE_FRILLS
2409 if (ISSET_PIXCOLOR (Color_underline)) 2440 if (ISSET_PIXCOLOR (Color_underline))
2410 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2441 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2411 else 2442 else
… …
2457 2488
2458 XDrawRectangle (dpy, vt, gc, 2489 XDrawRectangle (dpy, vt, gc,
2459 Col2Pixel (col), 2490 Col2Pixel (col),
2460 Row2Pixel (oldcursor.row), 2491 Row2Pixel (oldcursor.row),
2461 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2492 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2462 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2493 (unsigned int) (Height2Pixel (1) - 1));
2463 } 2494 }
2464 } 2495 }
2465 2496
2466 /* 2497 /*
2467 * H: cleanup selection 2498 * H: cleanup selection
… …
2476 screen.flags = old_screen_flags; 2507 screen.flags = old_screen_flags;
2477 num_scr = 0; 2508 num_scr = 0;
2478 num_scr_allow = 1; 2509 num_scr_allow = 1;
2479} 2510}
2480 2511
2481void 2512void ecb_cold
2482rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2513rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2483{ 2514{
2484 if (!l.t) 2515 if (!l.valid ())
2485 return; 2516 return;
2486 2517
2487 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2518 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2488 2519
2489 for (int i = ncol; i--; ) 2520 for (int i = ncol; i--; )
2490 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2521 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2491} 2522}
2492 2523
2493void 2524void ecb_cold
2494rxvt_term::scr_remap_chars () NOTHROW 2525rxvt_term::scr_remap_chars () NOTHROW
2495{ 2526{
2496 for (int i = total_rows; i--; ) 2527 for (int i = total_rows; i--; )
2497 scr_remap_chars (row_buf [i]); 2528 scr_remap_chars (row_buf [i]);
2498 2529
… …
2501 scr_remap_chars (drawn_buf [i]); 2532 scr_remap_chars (drawn_buf [i]);
2502 scr_remap_chars (swap_buf [i]); 2533 scr_remap_chars (swap_buf [i]);
2503 } 2534 }
2504} 2535}
2505 2536
2506void 2537void ecb_cold
2507rxvt_term::scr_recolour () NOTHROW 2538rxvt_term::scr_recolour (bool refresh) NOTHROW
2508{ 2539{
2509#ifdef HAVE_BG_PIXMAP 2540 bool transparent = false;
2510 bgPixmap.apply ();
2511#else
2512 2541
2542#ifdef HAVE_IMG
2543 if (bg_img != 0)
2544 {
2545# if ENABLE_TRANSPARENCY
2546 if (bg_flags & BG_IS_TRANSPARENT)
2547 {
2548 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2549 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2550
2551 transparent = true;
2552 }
2553 else
2554# endif
2555 {
2556 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2557 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2558 }
2559 }
2560 else
2561#endif
2562 {
2513 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2563 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2514 XClearWindow (dpy, parent[0]);
2515 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2564 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2565 }
2566
2567 XClearWindow (dpy, parent);
2516 2568
2517 if (scrollBar.win) 2569 if (scrollBar.win)
2518 { 2570 {
2571 if (transparent)
2572 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2573 else
2519 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2574 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2520 scrollBar.state = STATE_IDLE; 2575 scrollBar.state = SB_STATE_IDLE;
2521 scrollBar.show (0); 2576 scrollBar.show (0);
2522 } 2577 }
2523 2578
2524#endif 2579 if (refresh)
2525 2580 {
2526 /* bgPixmap.apply () does not do the following : */
2527 scr_clear (); 2581 scr_clear ();
2528 scr_touch (true); 2582 scr_touch (true);
2583 }
2529 want_refresh = 1; 2584 want_refresh = 1;
2530} 2585}
2531 2586
2532/* ------------------------------------------------------------------------- */ 2587/* ------------------------------------------------------------------------- */
2533void 2588void
… …
2590 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2645 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2591 srp[col] ^= rstyle; 2646 srp[col] ^= rstyle;
2592} 2647}
2593 2648
2594/* ------------------------------------------------------------------------- */ 2649/* ------------------------------------------------------------------------- */
2595void 2650void ecb_hot
2596rxvt_term::scr_reverse_selection () NOTHROW 2651rxvt_term::scr_reverse_selection () NOTHROW
2597{ 2652{
2598 if (selection.op 2653 if (selection.op
2599 && current_screen == selection.screen 2654 && current_screen == selection.screen
2600 && selection.end.row >= view_start) 2655 && selection.end.row >= view_start)
… …
2619 */ 2674 */
2620#if 0 2675#if 0
2621void 2676void
2622rxvt_term::scr_dump (int fd) NOTHROW 2677rxvt_term::scr_dump (int fd) NOTHROW
2623{ 2678{
2624 int row, wrote; 2679 // if this method is needed, it can be implemented by factoring the
2625 unsigned int width, towrite; 2680 // relevant code in scr_printscreen
2626 char r1[] = "\n";
2627
2628 for (row = saveLines + top_row;
2629 row < saveLines + nrow - 1; row++)
2630 {
2631 width = row_buf[row].l >= 0 ? row_buf[row].l
2632 : ncol;
2633 for (towrite = width; towrite; towrite -= wrote)
2634 {
2635 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2636 towrite);
2637 if (wrote < 0)
2638 return; /* XXX: death, no report */
2639 }
2640 if (row_buf[row].l >= 0)
2641 if (write (fd, r1, 1) <= 0)
2642 return; /* XXX: death, no report */
2643 }
2644} 2681}
2645#endif 2682#endif
2646 2683
2647/* ------------------------------------------------------------------------- * 2684/* ------------------------------------------------------------------------- *
2648 * CHARACTER SELECTION * 2685 * CHARACTER SELECTION *
2649 * ------------------------------------------------------------------------- */ 2686 * ------------------------------------------------------------------------- */
2650void 2687void
2651rxvt_term::selection_check (int check_more) NOTHROW 2688rxvt_term::selection_check (int check_more) NOTHROW
2652{ 2689{
2653 row_col_t pos;
2654
2655 if (!selection.op) 2690 if (!selection.op)
2656 return; 2691 return;
2657 2692
2658 pos.row = pos.col = 0;
2659 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2693 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2660 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2694 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2661 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2695 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2662 || (check_more == 1 2696 || (check_more == 1
2663 && current_screen == selection.screen 2697 && current_screen == selection.screen
2664 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2698 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2665 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2699 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2666 || (check_more == 2
2667 && ROWCOL_IS_BEFORE (selection.beg, pos)
2668 && ROWCOL_IS_AFTER (selection.end, pos))
2669 || (check_more == 3
2670 && ROWCOL_IS_AFTER (selection.end, pos))
2671 || (check_more == 4 /* screen width change */
2672 && (selection.beg.row != selection.end.row
2673 || selection.end.col > ncol)))
2674 CLEAR_SELECTION (); 2700 CLEAR_ALL_SELECTION ();
2675} 2701}
2676 2702
2677/* ------------------------------------------------------------------------- */ 2703/* ------------------------------------------------------------------------- */
2678/* 2704/*
2679 * Paste a selection direct to the command fd 2705 * Paste a selection direct to the command fd
2680 */ 2706 */
2681void 2707void
2682rxvt_term::paste (char *data, unsigned int len) NOTHROW 2708rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2683{ 2709{
2684 /* convert normal newline chars into common keyboard Return key sequence */ 2710 /* convert normal newline chars into common keyboard Return key sequence */
2685 for (unsigned int i = 0; i < len; i++) 2711 for (unsigned int i = 0; i < len; i++)
2686 if (data[i] == C0_LF) 2712 if (data[i] == C0_LF)
2687 data[i] = C0_CR; 2713 data[i] = C0_CR;
2688 2714
2689 if (priv_modes & PrivMode_BracketPaste) 2715 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[200~"); 2716 tt_printf ("\x1b[200~");
2691 2717
2692 tt_write (data, len); 2718 tt_write (data, len);
2693 2719
2694 if (priv_modes & PrivMode_BracketPaste) 2720 if (priv_modes & PrivMode_BracketPaste)
2695 tt_printf ("\e[201~"); 2721 tt_printf ("\x1b[201~");
2696} 2722}
2697 2723
2698/* ------------------------------------------------------------------------- */
2699/*
2700 * Respond to a notification that a primary selection has been sent
2701 * EXT: SelectionNotify
2702 */
2703void 2724void
2704rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2725rxvt_term::paste (char *data, unsigned int len) NOTHROW
2705{ 2726{
2706 if (prop == None) /* check for failed XConvertSelection */ 2727 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2707 {
2708 if ((selection_type & Sel_CompoundText))
2709 {
2710 int selnum = selection_type & Sel_whereMask;
2711
2712 selection_type = 0;
2713 if (selnum != Sel_direct)
2714 selection_request_other (XA_STRING, selnum);
2715 }
2716
2717 if ((selection_type & Sel_UTF8String))
2718 {
2719 int selnum = selection_type & Sel_whereMask;
2720
2721 selection_type = Sel_CompoundText;
2722 if (selnum != Sel_direct)
2723 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2724 else
2725 selection_type = 0;
2726 }
2727
2728 return;
2729 }
2730
2731 unsigned long bytes_after;
2732 XTextProperty ct;
2733
2734 if (XGetWindowProperty (dpy, win, prop,
2735 0, PROP_SIZE / 4,
2736 delete_prop, AnyPropertyType,
2737 &ct.encoding, &ct.format,
2738 &ct.nitems, &bytes_after,
2739 &ct.value) != Success)
2740 {
2741 ct.value = 0;
2742 goto bailout;
2743 }
2744
2745 if (ct.encoding == None)
2746 goto bailout;
2747
2748 if (bytes_after)
2749 {
2750 // fetch and append remaining data
2751 XTextProperty ct2;
2752
2753 if (XGetWindowProperty (dpy, win, prop,
2754 ct.nitems / 4, (bytes_after + 3) / 4,
2755 delete_prop, AnyPropertyType,
2756 &ct2.encoding, &ct2.format,
2757 &ct2.nitems, &bytes_after,
2758 &ct2.value) != Success)
2759 goto bailout;
2760
2761 // realloc should be compatible to XFree, here, and elsewhere, too
2762 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2763 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2764 ct.nitems += ct2.nitems;
2765
2766 XFree (ct2.value);
2767 }
2768
2769 if (ct.value == 0)
2770 goto bailout;
2771
2772 if (ct.encoding == xa[XA_INCR])
2773 {
2774 // INCR selection, start handshake
2775 if (!delete_prop)
2776 XDeleteProperty (dpy, win, prop);
2777
2778 selection_wait = Sel_incr;
2779 incr_buf_fill = 0;
2780 incr_ev.start (10);
2781
2782 goto bailout;
2783 }
2784
2785 if (ct.nitems == 0)
2786 {
2787 if (selection_wait == Sel_incr)
2788 {
2789 XFree (ct.value);
2790
2791 // finally complete, now paste the whole thing
2792 selection_wait = Sel_normal;
2793 ct.value = (unsigned char *)incr_buf;
2794 ct.nitems = incr_buf_fill;
2795 incr_buf = 0;
2796 incr_buf_size = 0;
2797 incr_ev.stop ();
2798 }
2799 else
2800 {
2801 if (selection_wait == Sel_normal
2802 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2803 {
2804 /*
2805 * pass through again trying CUT_BUFFER0 if we've come from
2806 * XConvertSelection () but nothing was presented
2807 */
2808 selection_paste (display->root, XA_CUT_BUFFER0, False);
2809 }
2810
2811 goto bailout;
2812 }
2813 }
2814 else if (selection_wait == Sel_incr)
2815 {
2816 incr_ev.start (10);
2817
2818 while (incr_buf_fill + ct.nitems > incr_buf_size)
2819 {
2820 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2821 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2822 }
2823
2824 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2825 incr_buf_fill += ct.nitems;
2826
2827 goto bailout;
2828 }
2829
2830 char **cl;
2831 int cr;
2832
2833#if !ENABLE_MINIMAL
2834 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2835 // so recode it manually
2836 if (ct.encoding == xa[XA_UTF8_STRING])
2837 {
2838 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2839 char *s = rxvt_wcstombs (w);
2840 free (w);
2841 // TODO: strlen == only the first element will be converted. well...
2842 paste (s, strlen (s));
2843 free (s);
2844 }
2845 else
2846#endif
2847 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2848 && cl)
2849 {
2850 for (int i = 0; i < cr; i++)
2851 paste (cl[i], strlen (cl[i]));
2852
2853 XFreeStringList (cl);
2854 }
2855 else
2856 paste ((char *)ct.value, ct.nitems); // paste raw
2857
2858bailout:
2859 XFree (ct.value);
2860
2861 if (selection_wait == Sel_normal)
2862 selection_wait = Sel_none;
2863}
2864
2865void
2866rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2867{
2868 selection_wait = Sel_none;
2869
2870 incr_buf_size = 0;
2871 free (incr_buf);
2872
2873 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2874}
2875
2876void
2877rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2878{
2879 if (prop == None || selection_wait != Sel_incr)
2880 return; 2728 return;
2881 2729
2882 selection_paste (win, prop, true); 2730 tt_paste (data, len);
2883} 2731}
2884 2732
2885/* ------------------------------------------------------------------------- */ 2733/* ------------------------------------------------------------------------- */
2886/* 2734/*
2887 * Request the current selection: 2735 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2888 * Order: > internal selection if available 2736 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2889 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2737 * as fallback
2890 * > CUT_BUFFER0
2891 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2892 * will auto fallback to CUT_BUFFER0
2893 * EXT: button 2 release 2738 * EXT: button 2 release
2894 */ 2739 */
2895void 2740void
2896rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2741rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2897{ 2742{
2898 if (selection.text && selnum == Sel_Primary) 2743 if (!selection_req)
2899 {
2900 /* internal selection */
2901 char *str = rxvt_wcstombs (selection.text, selection.len);
2902 paste (str, strlen (str));
2903 free (str);
2904 return;
2905 } 2744 {
2906 else 2745 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2746 selection_req->run ();
2907 { 2747 }
2908 selection_request_time = tm;
2909 selection_wait = Sel_normal;
2910
2911#if X_HAVE_UTF8_STRING
2912 selection_type = Sel_UTF8String;
2913 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2914 return;
2915#else
2916 selection_type = Sel_CompoundText;
2917 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2918 return;
2919#endif
2920 }
2921
2922 selection_wait = Sel_none; /* don't loop in selection_paste () */
2923 selection_paste (display->root, XA_CUT_BUFFER0, false);
2924}
2925
2926int
2927rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2928{
2929 Atom sel;
2930
2931 selection_type |= selnum;
2932
2933 if (selnum == Sel_Primary)
2934 sel = XA_PRIMARY;
2935 else if (selnum == Sel_Secondary)
2936 sel = XA_SECONDARY;
2937 else
2938 sel = xa[XA_CLIPBOARD];
2939
2940 if (XGetSelectionOwner (dpy, sel) != None)
2941 {
2942 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2943 vt, selection_request_time);
2944 return 1;
2945 }
2946
2947 return 0;
2948} 2748}
2949 2749
2950/* ------------------------------------------------------------------------- */ 2750/* ------------------------------------------------------------------------- */
2951/* 2751/*
2952 * Clear all selected text 2752 * Clear all selected text
… …
2975 if (display->clipboard_owner == this) 2775 if (display->clipboard_owner == this)
2976 display->clipboard_owner = 0; 2776 display->clipboard_owner = 0;
2977 } 2777 }
2978} 2778}
2979 2779
2980void
2981rxvt_term::clipboard_copy (Time tm)
2982{
2983 if (selection.len > 0)
2984 {
2985 free (selection.clip_text);
2986 selection.clip_len = selection.len;
2987 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2988 memcpy (selection.clip_text, selection.text,
2989 sizeof (wchar_t) * selection.clip_len);
2990 selection_grab (tm, true);
2991 }
2992}
2993
2994/* ------------------------------------------------------------------------- */ 2780/* ------------------------------------------------------------------------- */
2995/* 2781/*
2996 * Copy a selection into the cut buffer 2782 * Copy a selection into the cut buffer
2997 * EXT: button 1 or 3 release 2783 * EXT: button 1 or 3 release
2998 */ 2784 */
2999void 2785void
3000rxvt_term::selection_make (Time tm) 2786rxvt_term::selection_make (Time tm)
3001{ 2787{
3002 int i; 2788 int size;
3003 wchar_t *new_selection_text; 2789 wchar_t *new_selection_text;
3004 text_t *t; 2790 text_t *t;
3005 2791
3006 switch (selection.op) 2792 switch (selection.op)
3007 { 2793 {
… …
3023 return; /* nothing selected, go away */ 2809 return; /* nothing selected, go away */
3024 2810
3025 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2811 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3026 return; 2812 return;
3027 2813
3028 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2814 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3029 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2815 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3030 2816
3031 int ofs = 0; 2817 int ofs = 0;
3032 int extra = 0; 2818 int extra = 0;
3033 2819
3034 int col = selection.beg.col; 2820 int col = selection.beg.col;
… …
3040 { 2826 {
3041#if !ENABLE_MINIMAL 2827#if !ENABLE_MINIMAL
3042 if (selection.rect) 2828 if (selection.rect)
3043 { 2829 {
3044 col = selection.beg.col; 2830 col = selection.beg.col;
3045 end_col = ncol + 1; 2831 end_col = selection.end.col;
3046 } 2832 }
3047 else 2833 else
3048#endif 2834#endif
3049 end_col = ROW(row).l; 2835 end_col = ROW(row).l;
3050 2836
3051 col = max (col, 0); 2837 col = max (col, 0);
3052 2838
3053 if (row == selection.end.row 2839 if (row == selection.end.row)
3054#if !ENABLE_MINIMAL
3055 || selection.rect
3056#endif
3057 )
3058 min_it (end_col, selection.end.col); 2840 min_it (end_col, selection.end.col);
3059 2841
3060 t = ROW(row).t + col; 2842 t = ROW(row).t + col;
3061 2843
3062 for (; col < end_col; col++) 2844 for (; col < end_col; col++)
… …
3070 2852
3071 extra -= (len - 1); 2853 extra -= (len - 1);
3072 2854
3073 if (extra < 0) 2855 if (extra < 0)
3074 { 2856 {
3075 extra += i; 2857 extra += size;
3076 i += i; 2858 size += size;
3077 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2859 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3078 } 2860 }
3079 2861
3080 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2862 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3081 } 2863 }
3082#endif 2864#endif
… …
3094 2876
3095 new_selection_text[ofs++] = C0_LF; 2877 new_selection_text[ofs++] = C0_LF;
3096 } 2878 }
3097 else 2879 else
3098#endif 2880#endif
3099 if (!ROW(row).is_longer () && row != selection.end.row) 2881 if (!ROW(row).is_longer ()
2882 && (row != selection.end.row || end_col != selection.end.col)
2883 && (row != selection.beg.row || selection.beg.col < ncol))
3100 new_selection_text[ofs++] = C0_LF; 2884 new_selection_text[ofs++] = C0_LF;
3101 } 2885 }
3102
3103 if (end_col != selection.end.col)
3104 new_selection_text[ofs++] = C0_LF;
3105 2886
3106 new_selection_text[ofs] = 0; 2887 new_selection_text[ofs] = 0;
3107 2888
3108 if (ofs == 0) 2889 if (ofs == 0)
3109 { 2890 {
… …
3165/* ------------------------------------------------------------------------- */ 2946/* ------------------------------------------------------------------------- */
3166/* 2947/*
3167 * Mark or select text based upon number of clicks: 1, 2, or 3 2948 * Mark or select text based upon number of clicks: 1, 2, or 3
3168 * EXT: button 1 press 2949 * EXT: button 1 press
3169 */ 2950 */
3170void 2951void ecb_cold
3171rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2952rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3172{ 2953{
3173 clicks = ((clicks - 1) % 3) + 1; 2954 clicks = ((clicks - 1) % 3) + 1;
3174 selection.clicks = clicks; /* save clicks so extend will work */ 2955 selection.clicks = clicks; /* save clicks so extend will work */
3175 2956
… …
3194 2975
3195/* ------------------------------------------------------------------------- */ 2976/* ------------------------------------------------------------------------- */
3196/* 2977/*
3197 * Mark a selection at the specified col/row 2978 * Mark a selection at the specified col/row
3198 */ 2979 */
3199void 2980void ecb_cold
3200rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2981rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3201{ 2982{
3202 want_refresh = 1; 2983 want_refresh = 1;
3203 2984
3204 selection.mark.row = row + view_start; 2985 selection.mark.row = row + view_start;
… …
3231/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3012/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3232#define DELIMIT_TEXT(x) \ 3013#define DELIMIT_TEXT(x) \
3233 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3014 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3234#define DELIMIT_REND(x) 1 3015#define DELIMIT_REND(x) 1
3235 3016
3236void 3017void ecb_cold
3237rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3018rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3238{ 3019{
3239 int col, row, dirnadd, tcol, trow, w1, w2; 3020 int col, row, dirnadd, tcol, trow, w1, w2;
3240 row_col_t bound; 3021 row_col_t bound;
3241 text_t *stp; 3022 text_t *stp;
… …
3315 * EXT: button 3 press; button 1 or 3 drag 3096 * EXT: button 3 press; button 1 or 3 drag
3316 * flag == 0 ==> button 1 3097 * flag == 0 ==> button 1
3317 * flag == 1 ==> button 3 press 3098 * flag == 1 ==> button 3 press
3318 * flag == 2 ==> button 3 motion 3099 * flag == 2 ==> button 3 motion
3319 */ 3100 */
3320void 3101void ecb_cold
3321rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3102rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3322{ 3103{
3323 int col = clamp (Pixel2Col (x), 0, ncol); 3104 int col = clamp (Pixel2Col (x), 0, ncol);
3324 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3105 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3325 3106
… …
3351 3132
3352/* ------------------------------------------------------------------------- */ 3133/* ------------------------------------------------------------------------- */
3353/* 3134/*
3354 * Extend the selection to the specified col/row 3135 * Extend the selection to the specified col/row
3355 */ 3136 */
3356void 3137void ecb_cold
3357rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3138rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3358{ 3139{
3359 row_col_t pos; 3140 row_col_t pos;
3360 enum { 3141 enum {
3361 LEFT, RIGHT 3142 LEFT, RIGHT
… …
3552 ::swap (selection.beg.col, selection.end.col); 3333 ::swap (selection.beg.col, selection.end.col);
3553#endif 3334#endif
3554} 3335}
3555 3336
3556#if !ENABLE_MINIMAL 3337#if !ENABLE_MINIMAL
3557void 3338void ecb_cold
3558rxvt_term::selection_remove_trailing_spaces () NOTHROW 3339rxvt_term::selection_remove_trailing_spaces () NOTHROW
3559{ 3340{
3560 int32_t end_col, end_row; 3341 int32_t end_col, end_row;
3561 text_t *stp; 3342 text_t *stp;
3562 3343
… …
3600/* ------------------------------------------------------------------------- */ 3381/* ------------------------------------------------------------------------- */
3601/* 3382/*
3602 * Double click on button 3 when already selected 3383 * Double click on button 3 when already selected
3603 * EXT: button 3 double click 3384 * EXT: button 3 double click
3604 */ 3385 */
3605void 3386void ecb_cold
3606rxvt_term::selection_rotate (int x, int y) NOTHROW 3387rxvt_term::selection_rotate (int x, int y) NOTHROW
3607{ 3388{
3608 selection.clicks = selection.clicks % 3 + 1; 3389 selection.clicks = selection.clicks % 3 + 1;
3609 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3390 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3610} 3391}
… …
3612/* ------------------------------------------------------------------------- */ 3393/* ------------------------------------------------------------------------- */
3613/* 3394/*
3614 * Respond to a request for our current selection 3395 * Respond to a request for our current selection
3615 * EXT: SelectionRequest 3396 * EXT: SelectionRequest
3616 */ 3397 */
3617void 3398void ecb_cold
3618rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3399rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3619{ 3400{
3401 Atom property = rq.property == None ? rq.target : rq.property;
3620 XSelectionEvent ev; 3402 XSelectionEvent ev;
3621 3403
3622 ev.type = SelectionNotify; 3404 ev.type = SelectionNotify;
3623 ev.property = None; 3405 ev.property = None;
3624 ev.display = rq.display; 3406 ev.display = rq.display;
… …
3639 *target++ = xa[XA_COMPOUND_TEXT]; 3421 *target++ = xa[XA_COMPOUND_TEXT];
3640#if X_HAVE_UTF8_STRING 3422#if X_HAVE_UTF8_STRING
3641 *target++ = xa[XA_UTF8_STRING]; 3423 *target++ = xa[XA_UTF8_STRING];
3642#endif 3424#endif
3643 3425
3644 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3426 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3645 32, PropModeReplace, 3427 32, PropModeReplace,
3646 (unsigned char *)target_list, target - target_list); 3428 (unsigned char *)target_list, target - target_list);
3647 ev.property = rq.property; 3429 ev.property = property;
3648 } 3430 }
3649#if TODO // TODO 3431#if TODO // TODO
3650 else if (rq.target == xa[XA_MULTIPLE]) 3432 else if (rq.target == xa[XA_MULTIPLE])
3651 { 3433 {
3652 /* TODO: Handle MULTIPLE */ 3434 /* TODO: Handle MULTIPLE */
3653 } 3435 }
3654#endif 3436#endif
3655 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3437 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3656 { 3438 {
3657 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3439 XChangeProperty (dpy, rq.requestor, property, rq.target,
3658 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3440 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3659 ev.property = rq.property; 3441 ev.property = property;
3660 } 3442 }
3661 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3443 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3662 { 3444 {
3663 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3445 XChangeProperty (dpy, rq.requestor, property, rq.target,
3664 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3446 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3665 ev.property = rq.property; 3447 ev.property = property;
3666 } 3448 }
3667 else if (rq.target == XA_STRING 3449 else if (rq.target == XA_STRING
3668 || rq.target == xa[XA_TEXT] 3450 || rq.target == xa[XA_TEXT]
3669 || rq.target == xa[XA_COMPOUND_TEXT] 3451 || rq.target == xa[XA_COMPOUND_TEXT]
3670 || rq.target == xa[XA_UTF8_STRING] 3452 || rq.target == xa[XA_UTF8_STRING]
… …
3741 ct.value = (unsigned char *)cl; 3523 ct.value = (unsigned char *)cl;
3742 ct.nitems = selectlen; 3524 ct.nitems = selectlen;
3743 ct.encoding = target; 3525 ct.encoding = target;
3744 } 3526 }
3745 3527
3746 XChangeProperty (dpy, rq.requestor, rq.property, 3528 XChangeProperty (dpy, rq.requestor, property,
3747 ct.encoding, 8, PropModeReplace, 3529 ct.encoding, 8, PropModeReplace,
3748 ct.value, (int)ct.nitems); 3530 ct.value, (int)ct.nitems);
3749 ev.property = rq.property; 3531 ev.property = property;
3750 3532
3751 if (freect) 3533 if (freect)
3752 XFree (ct.value); 3534 XFree (ct.value);
3753 } 3535 }
3754 3536
3755 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3537 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3756} 3538}
3757 3539
3758/* ------------------------------------------------------------------------- */ 3540/* ------------------------------------------------------------------------- */
3759#ifdef USE_XIM 3541#if USE_XIM
3760void 3542void ecb_cold
3761rxvt_term::im_set_position (XPoint &pos) NOTHROW 3543rxvt_term::im_set_position (XPoint &pos) NOTHROW
3762{ 3544{
3763 XWindowAttributes xwa; 3545 XWindowAttributes xwa;
3764 3546
3765 XGetWindowAttributes (dpy, vt, &xwa); 3547 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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