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.246 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.329 by root, Sat Dec 26 10:24:04 2009 UTC

1/*--------------------------------*-C-*--------------------------------------* 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-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 86
89/* 87/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 89 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 91 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 95
114/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
117 99
… …
126 width = ncol; 108 width = ncol;
127 } 109 }
128 110
129 l.touch (); 111 l.touch ();
130 112
131 efs &= ~RS_baseattrMask; 113 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 114 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 115
134 text_t *et = l.t + col; 116 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 117 rend_t *er = l.r + col;
136 118
… …
148{ 130{
149 scr_blank_line (l, 0, ncol, efs); 131 scr_blank_line (l, 0, ncol, efs);
150 132
151 l.l = 0; 133 l.l = 0;
152 l.f = 0; 134 l.f = 0;
135}
136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
153} 154}
154 155
155/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
158 159
159void 160void
160rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
161{ 162{
162#if ENABLE_OVERLAY
163 scr_overlay_off ();
164#endif
165
166 view_start = 0; 163 view_start = 0;
167 num_scr = 0; 164 num_scr = 0;
168 165
169 if (ncol == 0) 166 if (ncol == 0)
170 ncol = 80; 167 ncol = 80;
… …
174 171
175 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 173 return;
177 174
178 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 176 while (nrow + saveLines < 2)
180 { 177 {
181 //TODO//FIXME 178 //TODO//FIXME
182 saveLines++; 179 saveLines++;
183 prev_nrow--; 180 prev_nrow--;
184 top_row--; 181 top_row--;
… …
195 if (!row_buf) 192 if (!row_buf)
196 { 193 {
197 /* 194 /*
198 * first time called so just malloc everything: don't rely on realloc 195 * first time called so just malloc everything: don't rely on realloc
199 */ 196 */
200 top_row = 0; /* no saved lines */ 197 top_row = 0;
201 term_start = 0; 198 term_start = 0;
202 199
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 200 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 201 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 202
… …
234 selection.text = NULL; 231 selection.text = NULL;
235 selection.len = 0; 232 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 233 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 234 selection.screen = PRIMARY;
238 selection.clicks = 0; 235 selection.clicks = 0;
239 rvideo_state = rvideo_mode = false;
240 } 236 }
241 else 237 else
242 { 238 {
243 /* 239 /*
244 * add or delete rows as appropriate 240 * add or delete rows as appropriate
… …
273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 269 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
274 } 270 }
275 271
276 line_t *old_buf = row_buf; 272 line_t *old_buf = row_buf;
277 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 273 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
278 274
279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 275 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start + top_row , prev_total_rows); 276 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row 277 int q = total_rows; // rewrapped row
282 278
283 if (top_row) 279 if (top_row)
284 { 280 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb 281 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm. 282 // to come up with a lean and mean algorithm.
283 // TODO: maybe optimise when width didn't change
287 284
288 row_col_t ocur = screen.cur; 285 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 287
291 do 288 do
292 { 289 {
293 p = MOD (p - 1, prev_total_rows); 290 p = MOD (p - 1, prev_total_rows);
294#ifdef DEBUG_STRICT
295 assert (old_buf [MOD (p, prev_total_rows)].t); 291 assert (old_buf [MOD (p, prev_total_rows)].t);
296#endif
297 int plines = 1; 292 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l; 293 int llen = old_buf [MOD (p, prev_total_rows)].l;
299 294
300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 295 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
301 { 296 {
… …
327 int qcol = 0; 322 int qcol = 0;
328 323
329 // see below for cursor adjustment rationale 324 // see below for cursor adjustment rationale
330 if (p == ocur.row) 325 if (p == ocur.row)
331 screen.cur.row = q - (total_rows - nrow); 326 screen.cur.row = q - (total_rows - nrow);
332 327
333 // fill a single destination line 328 // fill a single destination line
334 while (lofs < llen && qcol < ncol) 329 while (lofs < llen && qcol < ncol)
335 { 330 {
336 int prow = lofs / prev_ncol; 331 int prow = lofs / prev_ncol;
337 int pcol = lofs % prev_ncol; 332 int pcol = lofs % prev_ncol;
… …
347 342
348 line_t &pline = old_buf [prow]; 343 line_t &pline = old_buf [prow];
349 344
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 345 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 346
352#if DEBUG_STRICT
353 assert (len);
354 assert (pline.t);
355#endif
356
357 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 347 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 348 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
359 349
360 lofs += len; 350 lofs += len;
361 qcol += len; 351 qcol += len;
… …
368 } 358 }
369 while (p != pend && q > 0); 359 while (p != pend && q > 0);
370 360
371 term_start = total_rows - nrow; 361 term_start = total_rows - nrow;
372 top_row = q - term_start; 362 top_row = q - term_start;
373 363
374 // make sure all terminal lines exist 364 // make sure all terminal lines exist
375 while (top_row > 0) 365 while (top_row > 0)
376 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 366 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
377 } 367 }
378 else 368 else
379 { 369 {
380 // if no scrollback exists (yet), wing, instead of wrap 370 // if no scrollback exists (yet), wing, instead of wrap
381 371
382 for (int row = min (nrow, prev_nrow); row--; ) 372 for (int row = min (nrow, prev_nrow); row--; )
383 { 373 {
384 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 374 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
385 line_t &qline = row_buf [row]; 375 line_t &qline = row_buf [row];
386 376
… …
400 delete old_ta; 390 delete old_ta;
401 delete old_ra; 391 delete old_ra;
402 392
403 clamp_it (screen.cur.row, 0, nrow - 1); 393 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 394 clamp_it (screen.cur.col, 0, ncol - 1);
395 }
405 396
406 if (tabs)
407 free (tabs); 397 free (tabs);
408 } 398 tabs = (char *)rxvt_malloc (ncol);
399
400 for (int col = ncol; --col; )
401 tabs [col] = col % TABSIZE == 0;
409 402
410 CLEAR_ALL_SELECTION (); 403 CLEAR_ALL_SELECTION ();
411 404
412 prev_nrow = nrow; 405 prev_nrow = nrow;
413 prev_ncol = ncol; 406 prev_ncol = ncol;
414 407
415 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
416
417 for (int col = ncol; col--; )
418 tabs [col] = col % TABSIZE == 0;
419
420 tt_winch (); 408 tt_winch ();
421 409
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 410 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 411}
424 412
… …
427 * Free everything. That way malloc debugging can find leakage. 415 * Free everything. That way malloc debugging can find leakage.
428 */ 416 */
429void 417void
430rxvt_term::scr_release () NOTHROW 418rxvt_term::scr_release () NOTHROW
431{ 419{
420 if (row_buf)
421 {
432 delete talloc; talloc = 0; 422 delete talloc; talloc = 0;
433 delete ralloc; ralloc = 0; 423 delete ralloc; ralloc = 0;
434 424
435 free (row_buf); 425 free (row_buf);
436 free (swap_buf); 426 free (swap_buf);
437 free (drawn_buf); 427 free (drawn_buf);
438 free (tabs);
439
440 row_buf = 0; // signal that we freed all the arrays 428 row_buf = 0; // signal that we freed all the arrays above
441}
442 429
430 free (tabs);
431 tabs = 0;
432 }
433}
434
443/* ------------------------------------------------------------------------- */ 435/* ------------------------------------------------------------------------- */
444/* 436/*
445 * Hard reset 437 * Hard/Soft reset
446 */ 438 */
447void 439void
448rxvt_term::scr_poweron () NOTHROW 440rxvt_term::scr_poweron ()
449{ 441{
450 scr_release (); 442 scr_release ();
451 prev_nrow = prev_ncol = 0; 443 prev_nrow = prev_ncol = 0;
444 rvideo_mode = false;
445 scr_soft_reset ();
452 scr_reset (); 446 scr_reset ();
453 447
454 scr_clear (true); 448 scr_clear (true);
455 scr_refresh (); 449 scr_refresh ();
450}
451
452void
453rxvt_term::scr_soft_reset ()
454{
455 /* only affects modes, nothing drastic such as clearing the screen */
456#if ENABLE_OVERLAY
457 scr_overlay_off ();
458#endif
459
460 if (current_screen != PRIMARY)
461 scr_swap_screen ();
462
463 scr_scroll_region (0, MAX_ROWS - 1);
464 scr_rendition (0, ~RS_None);
465 scr_insert_mode (0);
456} 466}
457 467
458/* ------------------------------------------------------------------------- * 468/* ------------------------------------------------------------------------- *
459 * PROCESS SCREEN COMMANDS * 469 * PROCESS SCREEN COMMANDS *
460 * ------------------------------------------------------------------------- */ 470 * ------------------------------------------------------------------------- */
… …
498 } 508 }
499 509
500 /* boundary check in case screen size changed between SAVE and RESTORE */ 510 /* boundary check in case screen size changed between SAVE and RESTORE */
501 min_it (s->cur.row, nrow - 1); 511 min_it (s->cur.row, nrow - 1);
502 min_it (s->cur.col, ncol - 1); 512 min_it (s->cur.col, ncol - 1);
503#ifdef DEBUG_STRICT
504 assert (s->cur.row >= 0); 513 assert (s->cur.row >= 0);
505 assert (s->cur.col >= 0); 514 assert (s->cur.col >= 0);
506#endif 515}
516
517void
518rxvt_term::scr_swap_screen ()
519{
520 if (!option (Opt_secondaryScreen))
521 return;
522
523 for (int i = prev_nrow; i--; )
524 ::swap (ROW(i), swap_buf [i]);
525
526 ::swap (screen.cur, swap.cur);
527
528 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
529 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
507} 530}
508 531
509/* ------------------------------------------------------------------------- */ 532/* ------------------------------------------------------------------------- */
510/* 533/*
511 * Swap between primary and secondary screens 534 * Swap between primary and secondary screens
512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 535 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 536 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
514 */ 537 */
515int 538void
516rxvt_term::scr_change_screen (int scrn) NOTHROW 539rxvt_term::scr_change_screen (int scrn)
517{ 540{
541 if (scrn == current_screen)
542 return;
543
518 want_refresh = 1; 544 want_refresh = 1;
519 view_start = 0; 545 view_start = 0;
520 546
521 if (current_screen == scrn)
522 return scrn;
523
524 selection_check (2); /* check for boundary cross */ 547 selection_check (2); /* check for boundary cross */
525 548
526 int i = current_screen; current_screen = scrn; scrn = i; 549 int i = current_screen; current_screen = scrn; scrn = i;
527 550
528 ::swap (screen.cur.row, swap.cur.row);
529 ::swap (screen.cur.col, swap.cur.col);
530
531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
533
534#if NSCREENS 551#if NSCREENS
535 if (OPTION (Opt_secondaryScreen)) 552 if (option (Opt_secondaryScreen))
536 { 553 {
537 num_scr = 0; 554 num_scr = 0;
538 555
539 for (int i = prev_nrow; i--; ) 556 scr_swap_screen ();
540 ::swap (ROW(i), swap_buf [i]);
541 557
542 ::swap (screen.charset, swap.charset); 558 ::swap (screen.charset, swap.charset);
543 ::swap (screen.flags, swap.flags); 559 ::swap (screen.flags, swap.flags);
544 screen.flags |= Screen_VisibleCursor; 560 screen.flags |= Screen_VisibleCursor;
545 swap.flags |= Screen_VisibleCursor; 561 swap.flags |= Screen_VisibleCursor;
546 } 562 }
547 else 563 else
548#endif 564#endif
549 if (OPTION (Opt_secondaryScroll)) 565 if (option (Opt_secondaryScroll))
550 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 566 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
551
552 return scrn;
553} 567}
554 568
555// clear WrapNext indicator, solidifying position on next line 569// clear WrapNext indicator, solidifying position on next line
556void 570void
557rxvt_term::scr_do_wrap () NOTHROW 571rxvt_term::scr_do_wrap () NOTHROW
… …
589/* 603/*
590 * Change the rendition style for following text 604 * Change the rendition style for following text
591 */ 605 */
592void 606void
593rxvt_term::scr_rendition (int set, int style) NOTHROW 607rxvt_term::scr_rendition (int set, int style) NOTHROW
594 { 608{
595 if (set) 609 if (set)
596 rstyle |= style; 610 rstyle |= style;
597 else if (style == ~RS_None) 611 else if (style == ~RS_None)
598 rstyle = DEFAULT_RSTYLE; 612 rstyle = DEFAULT_RSTYLE;
599 else 613 else
600 rstyle &= ~style; 614 rstyle &= ~style;
601 } 615}
602 616
603/* ------------------------------------------------------------------------- */ 617/* ------------------------------------------------------------------------- */
604/* 618/*
605 * Scroll text between <row1> and <row2> inclusive, by <count> lines 619 * Scroll text between <row1> and <row2> inclusive, by <count> lines
606 * count positive ==> scroll up 620 * count positive ==> scroll up
… …
615 want_refresh = 1; 629 want_refresh = 1;
616 num_scr += count; 630 num_scr += count;
617 631
618 if (count > 0 632 if (count > 0
619 && row1 == 0 633 && row1 == 0
620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 634 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
621 { 635 {
622 top_row = max (top_row - count, -saveLines); 636 top_row = max (top_row - count, -saveLines);
623 637
624 // scroll everything up 'count' lines 638 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows; 639 term_start = (term_start + count) % total_rows;
… …
632 } 646 }
633 647
634 // erase newly scrolled-in lines 648 // erase newly scrolled-in lines
635 for (int i = count; i--; ) 649 for (int i = count; i--; )
636 { 650 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - 1 - i); 651 line_t &l = ROW(nrow - 1 - i);
640 652
653 // optimize if already cleared, can be significant on slow machines
654 // could be rolled into scr_blank_screen_mem
655 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
656 {
641 scr_blank_line (l, 0, l.l, rstyle); 657 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0; 658 l.l = 0;
644 l.f = 0; 659 l.f = 0;
660 }
661 else
662 scr_blank_screen_mem (l, rstyle);
645 } 663 }
646 664
647 // now copy lines below the scroll region bottom to the 665 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 666 // bottom of the screen again, so they look as if they
649 // hadn't moved. 667 // hadn't moved.
… …
653 line_t &l2 = ROW(i); 671 line_t &l2 = ROW(i);
654 672
655 ::swap (l1, l2); 673 ::swap (l1, l2);
656 l2.touch (); 674 l2.touch ();
657 } 675 }
658 676
659 // move and/or clear selection, if any 677 // move and/or clear selection, if any
660 if (selection.op && current_screen == selection.screen) 678 if (selection.op && current_screen == selection.screen)
661 { 679 {
662 selection.beg.row -= count; 680 selection.beg.row -= count;
663 selection.end.row -= count; 681 selection.end.row -= count;
… …
671 selection.op = SELECTION_CLEAR; 689 selection.op = SELECTION_CLEAR;
672 } 690 }
673 } 691 }
674 692
675 // finally move the view window, if desired 693 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 694 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 695 && view_start != 0
678 && view_start != -saveLines) 696 && view_start != -saveLines)
679 scr_page (UP, count); 697 scr_page (UP, count);
680 698
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 699 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
699 { 717 {
700 /* move selected region too */ 718 /* move selected region too */
701 selection.beg.row -= count; 719 selection.beg.row -= count;
702 selection.end.row -= count; 720 selection.end.row -= count;
703 selection.mark.row -= count; 721 selection.mark.row -= count;
704 722
705 selection_check (0); 723 selection_check (0);
706 } 724 }
707 } 725 }
708 726
709 // use a simple and robust scrolling algorithm, this 727 // use a simple and robust scrolling algorithm, this
… …
749 ZERO_SCROLLBACK (); 767 ZERO_SCROLLBACK ();
750 768
751 if (minlines > 0) 769 if (minlines > 0)
752 { 770 {
753 minlines += screen.cur.row - screen.bscroll; 771 minlines += screen.cur.row - screen.bscroll;
772 min_it (minlines, screen.cur.row - top_row);
754 773
755 if (minlines > 0 774 if (minlines > 0
756 && screen.tscroll == 0 775 && screen.tscroll == 0
757 && screen.bscroll == nrow - 1) 776 && screen.bscroll == nrow - 1)
758 { 777 {
… …
760 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 779 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
761 screen.cur.row -= minlines; 780 screen.cur.row -= minlines;
762 } 781 }
763 } 782 }
764 783
765#ifdef DEBUG_STRICT
766 assert (screen.cur.col < ncol); 784 assert (screen.cur.col < ncol);
767 assert (screen.cur.row < nrow 785 assert (screen.cur.row < nrow
768 && screen.cur.row >= top_row); 786 && screen.cur.row >= top_row);
769#endif
770 int row = screen.cur.row; 787 int row = screen.cur.row;
771 788
772 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 789 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
773 790
774 line_t *line = &ROW(row); 791 line_t *line = &ROW(row);
775 792
776 while (str < strend) 793 while (str < strend)
777 { 794 {
778 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 795 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
779 796
780 if (c < 0x20) 797 if (expect_false (c < 0x20))
781 if (c == C0_LF) 798 if (c == C0_LF)
782 { 799 {
783 max_it (line->l, screen.cur.col); 800 max_it (line->l, screen.cur.col);
784 801
785 screen.flags &= ~Screen_WrapNext; 802 screen.flags &= ~Screen_WrapNext;
… …
804 { 821 {
805 scr_tab (1, true); 822 scr_tab (1, true);
806 continue; 823 continue;
807 } 824 }
808 825
826 if (expect_false (
809 if (checksel /* see if we're writing within selection */ 827 checksel /* see if we're writing within selection */
810 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 828 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
811 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 829 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
830 ))
812 { 831 {
813 checksel = 0; 832 checksel = 0;
814 /* 833 /*
815 * If we wrote anywhere in the selected area, kill the selection 834 * If we wrote anywhere in the selected area, kill the selection
816 * XXX: should we kill the mark too? Possibly, but maybe that 835 * XXX: should we kill the mark too? Possibly, but maybe that
817 * should be a similar check. 836 * should be a similar check.
818 */ 837 */
819 CLEAR_SELECTION (); 838 CLEAR_SELECTION ();
820 } 839 }
821 840
822 if (screen.flags & Screen_WrapNext) 841 if (expect_false (screen.flags & Screen_WrapNext))
823 { 842 {
824 scr_do_wrap (); 843 scr_do_wrap ();
825 844
826 line->l = ncol; 845 line->l = ncol;
827 line->is_longer (1); 846 line->is_longer (1);
828 847
829 row = screen.cur.row; 848 row = screen.cur.row;
830 line = &ROW(row); /* _must_ refresh */ 849 line = &ROW(row); /* _must_ refresh */
831 } 850 }
832 851
833 // some utf-8 decoders "decode" surrogate characters: let's fix this. 852 // some utf-8 decoders "decode" surrogate characters: let's fix this.
834 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 853 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
835 c = 0xfffd; 854 c = 0xfffd;
836 855
837 // rely on wcwidth to tell us the character width, at least for non-latin1 856 // rely on wcwidth to tell us the character width, do wcwidth before
838 // do wcwidth before further replacements, as wcwidth might return -1 857 // further replacements, as wcwidth might return -1 for the line
839 // for the line drawing characters below as they might be invalid in the current 858 // drawing characters below as they might be invalid in the current
840 // locale. 859 // locale.
841 int width = c < 0x100 ? 1 : wcwidth (c); 860 int width = WCWIDTH (c);
842 861
843 if (charsets [screen.charset] == '0') // DEC SPECIAL 862 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
844 { 863 {
845 // vt100 special graphics and line drawing 864 // vt100 special graphics and line drawing
846 // 5f-7e standard vt100 865 // 5f-7e standard vt100
847 // 40-5e rxvt extension for extra curses acs chars 866 // 40-5e rxvt extension for extra curses acs chars
848 static uint16_t vt100_0[62] = { // 41 .. 7e 867 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
861 c = vt100_0[c - 0x41]; 880 c = vt100_0[c - 0x41];
862 width = 1; // vt100 line drawing characters are always single-width 881 width = 1; // vt100 line drawing characters are always single-width
863 } 882 }
864 } 883 }
865 884
866 if (screen.flags & Screen_Insert) 885 if (expect_false (screen.flags & Screen_Insert))
867 scr_insdel_chars (width, INSERT); 886 scr_insdel_chars (width, INSERT);
868 887
869 if (width != 0) 888 if (width != 0)
870 { 889 {
871#if !UNICODE_3 890#if !UNICODE_3
… …
877 c = 0xfffd; 896 c = 0xfffd;
878# endif 897# endif
879#endif 898#endif
880 899
881 // nuke the character at this position, if required 900 // nuke the character at this position, if required
901 if (expect_false (
882 if (line->t[screen.cur.col] == NOCHAR 902 line->t[screen.cur.col] == NOCHAR
883 || (screen.cur.col < ncol - 1 903 || (screen.cur.col < ncol - 1
884 && line->t[screen.cur.col + 1] == NOCHAR)) 904 && line->t[screen.cur.col + 1] == NOCHAR)
905 ))
906 scr_kill_char (*line, screen.cur.col);
907
908 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
909
910 // if the character doesn't fit into the remaining columns...
911 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
885 { 912 {
886 int col = screen.cur.col; 913 // ... artificially enlargen the previous one
887
888 // find begin
889 while (col > 0 && line->t[col] == NOCHAR)
890 col--;
891
892 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
893
894 // found begin, nuke
895 do {
896 line->t[col] = ' ';
897 line->r[col] = rend;
898 col++;
899 } while (col < ncol && line->t[col] == NOCHAR);
900 }
901
902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903
904 // if the character doesn't fit into the remaining columns...
905 if (screen.cur.col > ncol - width && ncol >= width)
906 {
907 // ...output spaces
908 c = ' '; 914 c = NOCHAR;
909 // and try the same character next loop iteration 915 // and try the same character next loop iteration
910 --str; 916 --str;
911 } 917 }
912 918
913 line->touch (); 919 line->touch ();
… …
915 do 921 do
916 { 922 {
917 line->t[screen.cur.col] = c; 923 line->t[screen.cur.col] = c;
918 line->r[screen.cur.col] = rend; 924 line->r[screen.cur.col] = rend;
919 925
920 if (screen.cur.col < ncol - 1) 926 if (expect_true (screen.cur.col < ncol - 1))
921 screen.cur.col++; 927 screen.cur.col++;
922 else 928 else
923 { 929 {
924 line->l = ncol; 930 line->l = ncol;
925 if (screen.flags & Screen_Autowrap) 931 if (screen.flags & Screen_Autowrap)
… …
927 break; 933 break;
928 } 934 }
929 935
930 c = NOCHAR; 936 c = NOCHAR;
931 } 937 }
932 while (--width > 0); 938 while (expect_false (--width > 0));
933 939
934 // pad with spaces when overwriting wide character with smaller one 940 // pad with spaces when overwriting wide character with smaller one
935 if (!width) 941 if (expect_false (!width))
936 { 942 {
937 line->touch (); 943 line->touch ();
938 944
939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 945 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
940 { 946 {
941 line->t[c] = ' '; 947 line->t[c] = ' ';
942 line->r[c] = rend; 948 line->r[c] = rend;
943 } 949 }
944 } 950 }
945 } 951 }
952#if ENABLE_COMBINING
946 else // width == 0 953 else // width == 0
947 { 954 {
948#if ENABLE_COMBINING 955 if (c != 0xfeff) // ignore BOM
949 // handle combining characters
950 // we just tag the accent on the previous on-screen character.
951 // this is arguably not correct, but also arguably not wrong.
952 // we don't handle double-width characters nicely yet.
953 line_t *linep;
954 text_t *tp;
955 rend_t *rp;
956
957 if (screen.cur.col > 0)
958 { 956 {
957 // handle combining characters
958 // we just tag the accent on the previous on-screen character.
959 // this is arguably not correct, but also arguably not wrong.
960 // we don't handle double-width characters nicely yet.
961 line_t *linep;
962 text_t *tp;
963 rend_t *rp;
964
965 if (screen.cur.col > 0)
966 {
959 linep = line; 967 linep = line;
960 tp = line->t + screen.cur.col - 1; 968 tp = line->t + screen.cur.col - 1;
961 rp = line->r + screen.cur.col - 1; 969 rp = line->r + screen.cur.col - 1;
970 }
971 else if (screen.cur.row > 0
972 && ROW(screen.cur.row - 1).is_longer ())
973 {
974 linep = &ROW(screen.cur.row - 1);
975 tp = line->t + ncol - 1;
976 rp = line->r + ncol - 1;
977 }
978 else
979 continue;
980
981 linep->touch ();
982
983 while (*tp == NOCHAR && tp > linep->t)
984 tp--, rp--;
985
986 // first try to find a precomposed character
987 unicode_t n = rxvt_compose (*tp, c);
988 if (n == NOCHAR)
989 n = rxvt_composite.compose (*tp, c);
990
991 *tp = n;
992 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
962 } 993 }
963 else if (screen.cur.row > 0
964 && ROW(screen.cur.row - 1).is_longer ())
965 {
966 linep = &ROW(screen.cur.row - 1);
967 tp = line->t + ncol - 1;
968 rp = line->r + ncol - 1;
969 } 994 }
970 else
971 continue;
972
973 linep->touch ();
974
975 while (*tp == NOCHAR && tp > linep->t)
976 tp--, rp--;
977
978 // first try to find a precomposed character
979 unicode_t n = rxvt_compose (*tp, c);
980 if (n == NOCHAR)
981 n = rxvt_composite.compose (*tp, c);
982
983 *tp = n;
984 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
985#endif 995#endif
986 }
987 } 996 }
988 997
989 max_it (line->l, screen.cur.col); 998 max_it (line->l, screen.cur.col);
990 999
991#ifdef DEBUG_STRICT
992 assert (screen.cur.row >= 0); 1000 assert (screen.cur.row >= 0);
993#endif
994} 1001}
995 1002
996/* ------------------------------------------------------------------------- */ 1003/* ------------------------------------------------------------------------- */
997/* 1004/*
998 * Process Backspace. Move back the cursor back a position, wrap if have to 1005 * Process Backspace. Move back the cursor back a position, wrap if have to
999 * XTERM_SEQ: CTRL-H 1006 * XTERM_SEQ: CTRL-H
1000 */ 1007 */
1001void 1008void
1002rxvt_term::scr_backspace () NOTHROW 1009rxvt_term::scr_backspace () NOTHROW
1003{ 1010{
1004 want_refresh = 1;
1005
1006 if (screen.cur.col == 0) 1011 if (screen.cur.col == 0)
1007 { 1012 {
1008 if (screen.cur.row > 0) 1013 if (screen.cur.row > 0)
1009 { 1014 {
1010#ifdef TERMCAP_HAS_BW 1015#ifdef TERMCAP_HAS_BW
1011 screen.cur.col = ncol - 1; 1016 screen.cur.col = ncol - 1;
1012 screen.cur.row--; 1017 --screen.cur.row;
1013 return; 1018
1019 want_refresh = 1;
1014#endif 1020#endif
1015 } 1021 }
1016 } 1022 }
1017 else if (!(screen.flags & Screen_WrapNext)) 1023 else
1018 scr_gotorc (0, -1, RELATIVE); 1024 scr_gotorc (0, -1, RELATIVE);
1019
1020 screen.flags &= ~Screen_WrapNext;
1021} 1025}
1022 1026
1023/* ------------------------------------------------------------------------- */ 1027/* ------------------------------------------------------------------------- */
1024/* 1028/*
1025 * Process Horizontal Tab 1029 * Process Horizontal Tab
… …
1048 x = i; 1052 x = i;
1049 1053
1050 if (!--count) 1054 if (!--count)
1051 break; 1055 break;
1052 } 1056 }
1053 else 1057 else
1054 ht &= l.t[i] == ' ' 1058 ht &= l.t[i] == ' '
1055 && RS_SAME (l.r[i], base_rend); 1059 && RS_SAME (l.r[i], base_rend);
1056 1060
1057 if (count) 1061 if (count)
1058 x = ncol - 1; 1062 x = ncol - 1;
1059 1063
1060 // store horizontal tab commands as characters inside the text 1064 // store horizontal tab commands as characters inside the text
1061 // buffer so they can be selected and pasted. 1065 // buffer so they can be selected and pasted.
1062 if (ht && OPTION (Opt_pastableTabs)) 1066 if (ht && option (Opt_pastableTabs))
1063 { 1067 {
1064 base_rend = SET_FONT (base_rend, 0); 1068 base_rend = SET_FONT (base_rend, 0);
1065 1069
1066 l.touch (x); 1070 l.touch (x);
1067 1071
… …
1100 * Process DEC Back Index 1104 * Process DEC Back Index
1101 * XTERM_SEQ: ESC 6 1105 * XTERM_SEQ: ESC 6
1102 * Move cursor left in row. If we're at the left boundary, shift everything 1106 * Move cursor left in row. If we're at the left boundary, shift everything
1103 * in that row right. Clear left column. 1107 * in that row right. Clear left column.
1104 */ 1108 */
1105#if ENABLE_FRILLS 1109#if !ENABLE_MINIMAL
1106void 1110void
1107rxvt_term::scr_backindex () NOTHROW 1111rxvt_term::scr_backindex () NOTHROW
1108{ 1112{
1109 if (screen.cur.col > 0) 1113 if (screen.cur.col > 0)
1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1114 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1117 * Process DEC Forward Index 1121 * Process DEC Forward Index
1118 * XTERM_SEQ: ESC 9 1122 * XTERM_SEQ: ESC 9
1119 * Move cursor right in row. If we're at the right boundary, shift everything 1123 * Move cursor right in row. If we're at the right boundary, shift everything
1120 * in that row left. Clear right column. 1124 * in that row left. Clear right column.
1121 */ 1125 */
1122#if ENABLE_FRILLS 1126#if !ENABLE_MINIMAL
1123void 1127void
1124rxvt_term::scr_forwardindex () NOTHROW 1128rxvt_term::scr_forwardindex () NOTHROW
1125{ 1129{
1126 if (screen.cur.col < ncol - 1) 1130 if (screen.cur.col < ncol - 1)
1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1131 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1174 } 1178 }
1175 } 1179 }
1176 else 1180 else
1177 { 1181 {
1178 if (screen.flags & Screen_Relative) 1182 if (screen.flags & Screen_Relative)
1183 {
1179 { /* relative origin mode */ 1184 /* relative origin mode */
1180 screen.cur.row = row + screen.tscroll; 1185 screen.cur.row = row + screen.tscroll;
1181 min_it (screen.cur.row, screen.bscroll); 1186 min_it (screen.cur.row, screen.bscroll);
1182 } 1187 }
1183 else 1188 else
1184 screen.cur.row = row; 1189 screen.cur.row = row;
… …
1217/* 1222/*
1218 * Erase part or whole of a line 1223 * Erase part or whole of a line
1219 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1224 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1220 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1225 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1226 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1227 * extension: clear to right unless wrapped: ESC [ 3 K
1222 */ 1228 */
1223void 1229void
1224rxvt_term::scr_erase_line (int mode) NOTHROW 1230rxvt_term::scr_erase_line (int mode) NOTHROW
1225{ 1231{
1226 unsigned int col, num; 1232 unsigned int col, num;
… …
1235 line.touch (); 1241 line.touch ();
1236 line.is_longer (0); 1242 line.is_longer (0);
1237 1243
1238 switch (mode) 1244 switch (mode)
1239 { 1245 {
1246 case 3:
1247 if (screen.flags & Screen_WrapNext)
1248 return;
1249
1250 /* fall through */
1251
1240 case 0: /* erase to end of line */ 1252 case 0: /* erase to end of line */
1241 col = screen.cur.col; 1253 col = screen.cur.col;
1242 num = ncol - col; 1254 num = ncol - col;
1243 min_it (line.l, col); 1255 min_it (line.l, col);
1256
1244 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1245 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1246 CLEAR_SELECTION (); 1259 CLEAR_SELECTION ();
1247 break; 1260 break;
1261
1248 case 1: /* erase to beginning of line */ 1262 case 1: /* erase to beginning of line */
1249 col = 0; 1263 col = 0;
1250 num = screen.cur.col + 1; 1264 num = screen.cur.col + 1;
1265
1251 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1266 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1252 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1267 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1253 CLEAR_SELECTION (); 1268 CLEAR_SELECTION ();
1254 break; 1269 break;
1270
1255 case 2: /* erase whole line */ 1271 case 2: /* erase whole line */
1256 col = 0; 1272 col = 0;
1257 num = ncol; 1273 num = ncol;
1258 line.l = 0; 1274 line.l = 0;
1259 if (selection.beg.row <= screen.cur.row 1275 if (selection.beg.row <= screen.cur.row
… …
1317 if (row >= nrow) /* Out Of Bounds */ 1333 if (row >= nrow) /* Out Of Bounds */
1318 return; 1334 return;
1319 1335
1320 min_it (num, nrow - row); 1336 min_it (num, nrow - row);
1321 1337
1338 // TODO: the code below does not work when view_start != 0
1339 // the workaround is to disable the clear and use a normal refresh
1340 // when view_start != 0. mysterious.
1322 if (rstyle & (RS_RVid | RS_Uline)) 1341 if (rstyle & (RS_RVid | RS_Uline))
1323 ren = (rend_t) ~RS_None; 1342 ren = (rend_t) ~RS_None;
1324 else if (GET_BASEBG (rstyle) == Color_bg) 1343 else if (GET_BASEBG (rstyle) == Color_bg)
1325 { 1344 {
1326 ren = DEFAULT_RSTYLE; 1345 ren = DEFAULT_RSTYLE;
1327 CLEAR_ROWS (row, num); 1346
1347 if (mapped && !view_start)
1348 XClearArea (dpy, vt, 0,
1349 Row2Pixel (row - view_start), (unsigned int)width,
1350 (unsigned int)Height2Pixel (num), False);
1328 } 1351 }
1329 else 1352 else
1330 { 1353 {
1331 ren = rstyle & (RS_fgMask | RS_bgMask); 1354 ren = rstyle & (RS_fgMask | RS_bgMask);
1355
1356 if (mapped && !view_start)
1357 {
1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1359 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1334 ERASE_ROWS (row, num); 1360 XFillRectangle (dpy, vt, gc,
1361 0, Row2Pixel (row - view_start),
1362 (unsigned int)width,
1363 (unsigned int)Height2Pixel (num));
1335 gcvalue.foreground = pix_colors[Color_fg]; 1364 gcvalue.foreground = pix_colors[Color_fg];
1336 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1365 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1366 }
1337 } 1367 }
1338 1368
1339 for (; num--; row++) 1369 for (; num--; row++)
1340 { 1370 {
1341 scr_blank_screen_mem (ROW(row), rstyle); 1371 scr_blank_screen_mem (ROW(row), rstyle);
1372
1373 if (!view_start)
1342 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1374 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1343 } 1375 }
1344} 1376}
1345 1377
1346#if ENABLE_FRILLS 1378#if !ENABLE_MINIMAL
1347void 1379void
1348rxvt_term::scr_erase_savelines () NOTHROW 1380rxvt_term::scr_erase_savelines () NOTHROW
1349{ 1381{
1350 want_refresh = 1; 1382 want_refresh = 1;
1351 ZERO_SCROLLBACK (); 1383 ZERO_SCROLLBACK ();
… …
1421 * Insert/Delete <count> characters from the current position 1453 * Insert/Delete <count> characters from the current position
1422 */ 1454 */
1423void 1455void
1424rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1456rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1425{ 1457{
1426 int col, row;
1427 rend_t tr;
1428
1429 want_refresh = 1; 1458 want_refresh = 1;
1430 ZERO_SCROLLBACK (); 1459 ZERO_SCROLLBACK ();
1431 1460
1432 if (count <= 0) 1461 if (count <= 0)
1433 return; 1462 return;
… …
1435 scr_do_wrap (); 1464 scr_do_wrap ();
1436 1465
1437 selection_check (1); 1466 selection_check (1);
1438 min_it (count, ncol - screen.cur.col); 1467 min_it (count, ncol - screen.cur.col);
1439 1468
1440 row = screen.cur.row; 1469 int row = screen.cur.row;
1441 1470
1442 line_t *line = &ROW(row); 1471 line_t *line = &ROW(row);
1443 1472
1444 line->touch (); 1473 line->touch ();
1445 line->is_longer (0); 1474 line->is_longer (0);
1446 1475
1476 // nuke wide spanning the start
1477 if (line->t[screen.cur.col] == NOCHAR)
1478 scr_kill_char (*line, screen.cur.col);
1479
1447 switch (insdel) 1480 switch (insdel)
1448 { 1481 {
1449 case INSERT: 1482 case INSERT:
1450 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1483 line->l = min (line->l + count, ncol);
1484
1485 if (line->t[screen.cur.col] == NOCHAR)
1486 scr_kill_char (*line, screen.cur.col);
1487
1488 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1451 { 1489 {
1452 line->t[col] = line->t[col - count]; 1490 line->t[col] = line->t[col - count];
1453 line->r[col] = line->r[col - count]; 1491 line->r[col] = line->r[col - count];
1454 } 1492 }
1455
1456 line->l = min (line->l + count, ncol);
1457 1493
1458 if (selection.op && current_screen == selection.screen 1494 if (selection.op && current_screen == selection.screen
1459 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1495 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1460 { 1496 {
1461 if (selection.end.row != screen.cur.row 1497 if (selection.end.row != screen.cur.row
1462 || (selection.end.col + count >= ncol)) 1498 || (selection.end.col + count >= ncol))
1463 CLEAR_SELECTION (); 1499 CLEAR_SELECTION ();
1464 else 1500 else
1501 {
1465 { /* shift selection */ 1502 /* shift selection */
1466 selection.beg.col += count; 1503 selection.beg.col += count;
1467 selection.mark.col += count; /* XXX: yes? */ 1504 selection.mark.col += count; /* XXX: yes? */
1468 selection.end.col += count; 1505 selection.end.col += count;
1469 } 1506 }
1470 } 1507 }
… …
1475 case ERASE: 1512 case ERASE:
1476 screen.cur.col += count; /* don't worry if > ncol */ 1513 screen.cur.col += count; /* don't worry if > ncol */
1477 selection_check (1); 1514 selection_check (1);
1478 screen.cur.col -= count; 1515 screen.cur.col -= count;
1479 1516
1480 line->l = max (line->l - count, 0); 1517 // nuke wide char after the end
1518 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1519 scr_kill_char (*line, screen.cur.col + count);
1520
1481 scr_blank_line (*line, screen.cur.col, count, rstyle); 1521 scr_blank_line (*line, screen.cur.col, count, rstyle);
1482 break; 1522 break;
1483 1523
1484 case DELETE: 1524 case DELETE:
1485 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1525 line->l = max (line->l - count, 0);
1486 1526
1527 // nuke wide char spanning the end
1528 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1529 scr_kill_char (*line, screen.cur.col + count);
1530
1487 for (col = screen.cur.col; (col + count) < ncol; col++) 1531 for (int col = screen.cur.col; (col + count) < ncol; col++)
1488 { 1532 {
1489 line->t[col] = line->t[col + count]; 1533 line->t[col] = line->t[col + count];
1490 line->r[col] = line->r[col + count]; 1534 line->r[col] = line->r[col + count];
1491 } 1535 }
1492 1536
1493 line->l = max (line->l - count, 0);
1494 scr_blank_line (*line, ncol - count, count, tr); 1537 scr_blank_line (*line, ncol - count, count, rstyle);
1495 1538
1496 if (selection.op && current_screen == selection.screen 1539 if (selection.op && current_screen == selection.screen
1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1540 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1498 { 1541 {
1499 if (selection.end.row != screen.cur.row 1542 if (selection.end.row != screen.cur.row
… …
1609 */ 1652 */
1610void 1653void
1611rxvt_term::scr_set_tab (int mode) NOTHROW 1654rxvt_term::scr_set_tab (int mode) NOTHROW
1612{ 1655{
1613 if (mode < 0) 1656 if (mode < 0)
1614 memset (tabs, 0, ncol * sizeof (char)); 1657 memset (tabs, 0, ncol);
1615 else if (screen.cur.col < ncol) 1658 else if (screen.cur.col < ncol)
1616 tabs [screen.cur.col] = !!mode; 1659 tabs [screen.cur.col] = !!mode;
1617} 1660}
1618 1661
1619/* ------------------------------------------------------------------------- */ 1662/* ------------------------------------------------------------------------- */
… …
1634 if (rvideo_state != on) 1677 if (rvideo_state != on)
1635 { 1678 {
1636 rvideo_state = on; 1679 rvideo_state = on;
1637 1680
1638 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1681 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1639#if XPM_BACKGROUND 1682#ifdef HAVE_BG_PIXMAP
1640 if (bgPixmap.pixmap == None) 1683 if (bgPixmap.pixmap == None)
1641#endif 1684#endif
1642#if TRANSPARENT
1643 if (!OPTION (Opt_transparent) || am_transparent == 0)
1644#endif
1645 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 1685 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1646 1686
1647 XGCValues gcvalue; 1687 XGCValues gcvalue;
1648 gcvalue.foreground = pix_colors[Color_fg]; 1688 gcvalue.foreground = pix_colors[Color_fg];
1649 gcvalue.background = pix_colors[Color_bg]; 1689 gcvalue.background = pix_colors[Color_bg];
1650 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); 1690 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1651 1691
1652 scr_clear (); 1692 scr_clear ();
1653 scr_touch (true); 1693 scr_touch (true);
1654 } 1694 }
1655} 1695}
… …
1740{ 1780{
1741 bool found = false; 1781 bool found = false;
1742 1782
1743 for (int i = 0; i < nrow; i++) 1783 for (int i = 0; i < nrow; i++)
1744 { 1784 {
1745 int col = 0;
1746 rend_t *drp = drawn_buf[i].r; 1785 rend_t *drp = drawn_buf[i].r;
1747 1786
1748 for (; col < ncol; col++, drp++) 1787 for (int col = 0; col < ncol; col++, drp++)
1749 if ((*drp & mask) == value) 1788 if ((*drp & mask) == value)
1750 { 1789 {
1751 found = true; 1790 found = true;
1752 *drp = ~value; 1791 *drp = ~value;
1753 } 1792 }
… …
1793 for (i = PART_BEG; i < RC_COUNT; i++) 1832 for (i = PART_BEG; i < RC_COUNT; i++)
1794 { 1833 {
1795 min_it (rc[i].col, ncol - 1); 1834 min_it (rc[i].col, ncol - 1);
1796 min_it (rc[i].row, nrow - 1); 1835 min_it (rc[i].row, nrow - 1);
1797 } 1836 }
1798 1837// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1799 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1838 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1800 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1839 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1801 1840
1802 num_scr_allow = 0; 1841 num_scr_allow = 0;
1803 1842
… …
1858 return true; 1897 return true;
1859} 1898}
1860 1899
1861#ifndef NO_BELL 1900#ifndef NO_BELL
1862void 1901void
1863rxvt_term::bell_cb (time_watcher &w) 1902rxvt_term::bell_cb (ev::timer &w, int revents)
1864{ 1903{
1865 rvideo_bell = false; 1904 rvideo_bell = false;
1866 scr_rvideo_mode (rvideo_mode); 1905 scr_rvideo_mode (rvideo_mode);
1906 refresh_check ();
1867} 1907}
1868#endif 1908#endif
1869 1909
1870/* ------------------------------------------------------------------------- */ 1910/* ------------------------------------------------------------------------- */
1871void 1911void
… …
1873{ 1913{
1874#ifndef NO_BELL 1914#ifndef NO_BELL
1875 1915
1876# ifndef NO_MAPALERT 1916# ifndef NO_MAPALERT
1877# ifdef MAPALERT_OPTION 1917# ifdef MAPALERT_OPTION
1878 if (OPTION (Opt_mapAlert)) 1918 if (option (Opt_mapAlert))
1879# endif 1919# endif
1880 XMapWindow (display->display, parent[0]); 1920 XMapWindow (dpy, parent[0]);
1881# endif 1921# endif
1882 1922
1923# if ENABLE_FRILLS
1924 if (option (Opt_urgentOnBell))
1925 set_urgency (1);
1926# endif
1927
1883 if (OPTION (Opt_visualBell)) 1928 if (option (Opt_visualBell))
1884 { 1929 {
1885 rvideo_bell = true; 1930 rvideo_bell = true;
1886 scr_rvideo_mode (rvideo_mode); 1931 scr_rvideo_mode (rvideo_mode);
1887 display->flush (); 1932 flush ();
1888 1933
1889 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1934 bell_ev.start (VISUAL_BELL_DURATION);
1890 } 1935 }
1891 else 1936 else
1892 XBell (display->display, 0); 1937 XBell (dpy, 0);
1893
1894#endif 1938#endif
1895} 1939}
1896 1940
1897/* ------------------------------------------------------------------------- */ 1941/* ------------------------------------------------------------------------- */
1898/* ARGSUSED */ 1942/* ARGSUSED */
1899void 1943void
1900rxvt_term::scr_printscreen (int fullhist) NOTHROW 1944rxvt_term::scr_printscreen (int fullhist) NOTHROW
1901{ 1945{
1902#ifdef PRINTPIPE 1946#ifdef PRINTPIPE
1903 int nrows, row_start; 1947 int nrows, row_start;
1904 FILE *fd; 1948 FILE *fd = popen_printer ();
1905 1949
1906 if ((fd = popen_printer ()) == NULL) 1950 if (!fd)
1907 return; 1951 return;
1908 1952
1909 if (fullhist) 1953 if (fullhist)
1910 { 1954 {
1911 nrows = nrow - top_row; 1955 nrows = nrow - top_row;
… …
1956 * screen.text/screen.rend contain what the screen will change to. 2000 * screen.text/screen.rend contain what the screen will change to.
1957 */ 2001 */
1958void 2002void
1959rxvt_term::scr_refresh () NOTHROW 2003rxvt_term::scr_refresh () NOTHROW
1960{ 2004{
1961 unsigned char must_clear, /* use draw_string not draw_image_string */
1962 showcursor; /* show the cursor */
1963 int16_t col, row, /* column/row we're processing */ 2005 int16_t col, row, /* column/row we're processing */
1964 ocrow; /* old cursor row */ 2006 ocrow; /* old cursor row */
1965 int i; /* tmp */ 2007 int i; /* tmp */
1966#ifndef NO_CURSORCOLOR 2008#ifndef NO_CURSORCOLOR
1967 rend_t cc1; /* store colours at cursor position (s) */ 2009 rend_t cc1; /* store colours at cursor position (s) */
1968#endif 2010#endif
1969 rend_t *crp; // cursor rendition pointer 2011 rend_t *crp; // cursor rendition pointer
2012 rend_t ccol1, /* Cursor colour */
2013 ccol2; /* Cursor colour2 */
1970 2014
1971 want_refresh = 0; /* screen is current */ 2015 want_refresh = 0; /* screen is current */
1972 2016
1973 if (refresh_type == NO_REFRESH || !mapped) 2017 if (refresh_type == NO_REFRESH || !mapped)
1974 return; 2018 return;
1975 2019
1976 /* 2020 /*
1977 * A: set up vars 2021 * A: set up vars
1978 */ 2022 */
1979 must_clear = 0;
1980 refresh_count = 0; 2023 refresh_count = 0;
1981 2024
1982#if XPM_BACKGROUND 2025 unsigned int old_screen_flags = screen.flags;
2026 char have_bg = 0;
2027#ifdef HAVE_BG_PIXMAP
1983 must_clear |= bgPixmap.pixmap != None; 2028 have_bg = bgPixmap.pixmap != None;
1984#endif
1985#if TRANSPARENT
1986 must_clear |= OPTION (Opt_transparent) && am_transparent;
1987#endif 2029#endif
1988 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2030 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1989 2031
1990 /* 2032 /*
1991 * B: reverse any characters which are selected 2033 * B: reverse any characters which are selected
1992 */ 2034 */
1993 scr_reverse_selection (); 2035 scr_reverse_selection ();
2036
2037 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2038#if ENABLE_OVERLAY
2039 scr_swap_overlay ();
2040#endif
2041
2042 char showcursor = screen.flags & Screen_VisibleCursor;
1994 2043
1995 /* 2044 /*
1996 * C: set the cursor character (s) 2045 * C: set the cursor character (s)
1997 */ 2046 */
1998 { 2047 {
1999 unsigned char setoldcursor; 2048 unsigned char setoldcursor;
2000 rend_t ccol1, /* Cursor colour */
2001 ccol2; /* Cursor colour2 */
2002 2049
2003 showcursor = (screen.flags & Screen_VisibleCursor);
2004#ifdef CURSOR_BLINK 2050#ifdef CURSOR_BLINK
2005 if (hidden_cursor) 2051 if (hidden_cursor)
2006 showcursor = 0; 2052 showcursor = 0;
2007#endif 2053#endif
2008 2054
… …
2013 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2059 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2014 col--; 2060 col--;
2015 2061
2016 crp = &ROW(screen.cur.row).r[col]; 2062 crp = &ROW(screen.cur.row).r[col];
2017 2063
2064#ifndef NO_CURSORCOLOR
2065 cc1 = *crp & (RS_fgMask | RS_bgMask);
2066 if (ISSET_PIXCOLOR (Color_cursor))
2067 ccol1 = Color_cursor;
2068 else
2069#endif
2070#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2071 ccol1 = fgcolor_of (rstyle);
2072#else
2073 ccol1 = Color_fg;
2074#endif
2075
2076#ifndef NO_CURSORCOLOR
2077 if (ISSET_PIXCOLOR (Color_cursor2))
2078 ccol2 = Color_cursor2;
2079 else
2080#endif
2081#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2082 ccol2 = bgcolor_of (rstyle);
2083#else
2084 ccol2 = Color_bg;
2085#endif
2086
2018 if (showcursor && focus) 2087 if (showcursor && focus)
2019 { 2088 {
2020 if (OPTION (Opt_cursorUnderline)) 2089 if (option (Opt_cursorUnderline))
2021 *crp ^= RS_Uline; 2090 *crp ^= RS_Uline;
2022 else 2091 else
2023 { 2092 {
2024 *crp ^= RS_RVid; 2093 *crp ^= RS_RVid;
2025
2026#ifndef NO_CURSORCOLOR
2027 cc1 = *crp & (RS_fgMask | RS_bgMask);
2028 if (ISSET_PIXCOLOR (Color_cursor))
2029 ccol1 = Color_cursor;
2030 else
2031#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2032 ccol1 = fgcolor_of (rstyle);
2033#else
2034 ccol1 = Color_fg;
2035#endif
2036 if (ISSET_PIXCOLOR (Color_cursor2))
2037 ccol2 = Color_cursor2;
2038 else
2039#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2040 ccol2 = bgcolor_of (rstyle);
2041#else
2042 ccol2 = Color_bg;
2043#endif
2044 *crp = SET_FGCOLOR (*crp, ccol1); 2094 *crp = SET_FGCOLOR (*crp, ccol1);
2045 *crp = SET_BGCOLOR (*crp, ccol2); 2095 *crp = SET_BGCOLOR (*crp, ccol2);
2046#endif
2047 } 2096 }
2048 } 2097 }
2049 } 2098 }
2050 2099
2051 /* make sure no outline cursor is left around */ 2100 /* make sure no outline cursor is left around */
… …
2078 oldcursor.col = screen.cur.col; 2127 oldcursor.col = screen.cur.col;
2079 } 2128 }
2080 } 2129 }
2081 } 2130 }
2082 2131
2083 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2084#if ENABLE_OVERLAY
2085 scr_swap_overlay ();
2086#endif
2087
2088#ifndef NO_SLOW_LINK_SUPPORT 2132#ifndef NO_SLOW_LINK_SUPPORT
2089 /* 2133 /*
2090 * D: CopyArea pass - very useful for slower links 2134 * D: CopyArea pass - very useful for slower links
2091 * This has been deliberately kept simple. 2135 * This has been deliberately kept simple.
2092 */ 2136 */
2093 if (!display->is_local 2137 if (!display->is_local
2094 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2138 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2095 && abs (num_scr) < nrow && !must_clear) 2139 && abs (num_scr) < nrow && !have_bg)
2096 { 2140 {
2097 int16_t nits; 2141 int16_t nits;
2142 int i = num_scr;
2098 int j; 2143 int j;
2099 int len, wlen; 2144 int len, wlen;
2100 dLocal (int, num_scr); 2145 dLocal (int, num_scr);
2101 2146
2102 j = nrow; 2147 j = nrow;
2103 wlen = len = -1; 2148 wlen = len = -1;
2104 row = i > 0 ? 0 : j - 1; 2149 row = i > 0 ? 0 : j - 1;
2150
2105 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2151 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2106 { 2152 {
2107 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2153 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2108 { 2154 {
2109 line_t s = ROW(view_start + row); 2155 line_t s = ROW(view_start + row);
… …
2130 wlen = row; 2176 wlen = row;
2131 continue; 2177 continue;
2132 } 2178 }
2133 } 2179 }
2134 2180
2135 if (len != -1) 2181 if (len >= 0)
2136 { 2182 {
2137 /* also comes here at end if needed because of >= above */ 2183 /* also comes here at end if needed because of >= above */
2138 if (wlen < len) 2184 if (wlen < len)
2139 ::swap (wlen, len); 2185 ::swap (wlen, len);
2140 2186
2187 XGCValues gcv;
2188
2189 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2141 XCopyArea (display->display, vt, vt, 2190 XCopyArea (dpy, vt, vt,
2142 gc, 0, Row2Pixel (len + i), 2191 gc, 0, Row2Pixel (len + i),
2143 (unsigned int)this->width, 2192 (unsigned int)this->width,
2144 (unsigned int)Height2Pixel (wlen - len + 1), 2193 (unsigned int)Height2Pixel (wlen - len + 1),
2145 0, Row2Pixel (len)); 2194 0, Row2Pixel (len));
2195 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2196
2146 len = -1; 2197 len = -1;
2147 } 2198 }
2148 } 2199 }
2149 } 2200 }
2150#endif 2201#endif
… …
2174 continue; 2225 continue;
2175 2226
2176 // redraw one or more characters 2227 // redraw one or more characters
2177 2228
2178 // seek to the beginning of wide characters 2229 // seek to the beginning of wide characters
2179 while (stp[col] == NOCHAR && col > 0) 2230 while (expect_false (stp[col] == NOCHAR && col > 0))
2180 --col; 2231 --col;
2181 2232
2182 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2233 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2183 text_t *text = stp + col; 2234 text_t *text = stp + col;
2184 int count = 1; 2235 int count = 1;
… …
2191 for (i = 0; ++col < ncol; ) 2242 for (i = 0; ++col < ncol; )
2192 { 2243 {
2193 if (stp[col] == NOCHAR) 2244 if (stp[col] == NOCHAR)
2194 { 2245 {
2195 dtp[col] = stp[col]; 2246 dtp[col] = stp[col];
2196 drp[col] = rend; 2247 drp[col] = srp[col];
2248
2197 count++; 2249 count++;
2198 i++; 2250 i++;
2199 2251
2200 continue; 2252 continue;
2201 } 2253 }
… …
2206 count++; 2258 count++;
2207 2259
2208 if (stp[col] != dtp[col] 2260 if (stp[col] != dtp[col]
2209 || !RS_SAME (srp[col], drp[col])) 2261 || !RS_SAME (srp[col], drp[col]))
2210 { 2262 {
2211 if (must_clear && (i++ > count / 2)) 2263 if (have_bg && (i++ > count / 2))
2212 break; 2264 break;
2213 2265
2214 dtp[col] = stp[col]; 2266 dtp[col] = stp[col];
2215 drp[col] = rend; 2267 drp[col] = rend;
2216 i = 0; 2268 i = 0;
2217 } 2269 }
2218 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2270 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2219 break; 2271 break;
2220 } 2272 }
2221 2273
2222 col--; /* went one too far. move back */ 2274 col--; /* went one too far. move back */
2223 count -= i; /* dump any matching trailing chars */ 2275 count -= i; /* dump any matching trailing chars */
2224 2276
2225 // sometimes we optimize away the trailing NOCHAR's, add them back 2277 // sometimes we optimize away the trailing NOCHAR's, add them back
2226 while (i && text[count] == NOCHAR) 2278 while (expect_false (i && text[count] == NOCHAR))
2227 count++, i--; 2279 count++, i--;
2228 2280
2229 /* 2281 /*
2230 * Determine the attributes for the string 2282 * Determine the attributes for the string
2231 */ 2283 */
2232 int fore = fgcolor_of (rend); // desired foreground 2284 int fore = fgcolor_of (rend); // desired foreground
2233 int back = bgcolor_of (rend); // desired background 2285 int back = bgcolor_of (rend); // desired background
2234 2286
2235 // only do special processing if any attributes are set, which is unlikely 2287 // only do special processing if any attributes are set, which is unlikely
2236 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2288 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2237 { 2289 {
2238#if ENABLE_STYLES
2239 // force redraw after "careful" characters to avoid pixel droppings
2240 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2241 drp[col + 1] = ~srp[col + 1];
2242
2243 // include previous careful character(s) if possible, looks nicer (best effort...)
2244 while (text > stp
2245 && srp[text - stp - 1] & RS_Careful
2246 && RS_SAME (rend, srp[text - stp - 1]))
2247 text--, count++, xpixel -= fwidth;
2248#endif
2249
2250 bool invert = rend & RS_RVid; 2290 bool invert = rend & RS_RVid;
2251 2291
2252#ifndef NO_BOLD_UNDERLINE_REVERSE 2292#ifndef NO_BOLD_UNDERLINE_REVERSE
2253 if (rend & RS_Bold
2254 && fore == Color_fg) 2293 if (rend & RS_Bold && fore == Color_fg)
2255 { 2294 {
2256 if (ISSET_PIXCOLOR (Color_BD)) 2295 if (ISSET_PIXCOLOR (Color_BD))
2257 fore = Color_BD; 2296 fore = Color_BD;
2258# if !ENABLE_STYLES 2297# if !ENABLE_STYLES
2259 else 2298 else
2260 invert = !invert; 2299 invert = !invert;
2261# endif 2300# endif
2262 } 2301 }
2263 2302
2264 if (rend & RS_Italic 2303 if (rend & RS_Italic && fore == Color_fg)
2265 && fore == Color_fg)
2266 { 2304 {
2267 if (ISSET_PIXCOLOR (Color_IT)) 2305 if (ISSET_PIXCOLOR (Color_IT))
2268 fore = Color_IT; 2306 fore = Color_IT;
2269# if !ENABLE_STYLES 2307# if !ENABLE_STYLES
2270 else 2308 else
2271 invert = !invert; 2309 invert = !invert;
2272# endif 2310# endif
2273 } 2311 }
2274 2312
2275 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2313 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2276 fore = Color_UL; 2314 fore = Color_UL;
2277#endif 2315#endif
2278 2316
2279 if (invert) 2317 if (invert)
2280 { 2318 {
2319#ifdef OPTION_HC
2320 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2321 || !ISSET_PIXCOLOR (Color_HC))
2322#endif
2323 /* invert the column if no highlightColor is set or it is the
2324 * current cursor column */
2281 ::swap (fore, back); 2325 ::swap (fore, back);
2326#ifdef OPTION_HC
2327 else if (ISSET_PIXCOLOR (Color_HC))
2328 back = Color_HC;
2329#endif
2282 2330
2283#ifndef NO_BOLD_UNDERLINE_REVERSE 2331#ifndef NO_BOLD_UNDERLINE_REVERSE
2332# ifndef OPTION_HC
2284 if (ISSET_PIXCOLOR (Color_RV)) 2333 if (ISSET_PIXCOLOR (Color_RV))
2285 back = Color_RV; 2334 back = Color_RV;
2286 2335# endif
2287 if (fore == back) 2336 if (fore == back)
2288 { 2337 {
2289 fore = Color_bg; 2338 fore = Color_bg;
2290 back = Color_fg; 2339 back = Color_fg;
2291 } 2340 }
… …
2293 } 2342 }
2294 2343
2295#ifdef TEXT_BLINK 2344#ifdef TEXT_BLINK
2296 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2345 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2297 { 2346 {
2298 if (!text_blink_ev.active) 2347 if (!text_blink_ev.is_active ())
2299 { 2348 {
2300 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2349 text_blink_ev.again ();
2301 hidden_text = 0; 2350 hidden_text = 0;
2302 } 2351 }
2303 else if (hidden_text) 2352 else if (hidden_text)
2304 fore = back; 2353 fore = back;
2305 } 2354 }
2306#endif 2355#endif
2356
2357#if ENABLE_STYLES
2358 // "careful" (too wide) character handling
2359
2360 // include previous careful character(s) if possible, looks nicer (best effort...)
2361 while (text > stp
2362 && srp[text - stp - 1] & RS_Careful
2363 && RS_SAME (rend, srp[text - stp - 1]))
2364 text--, count++, xpixel -= fwidth;
2365
2366 // force redraw after "careful" characters to avoid pixel droppings
2367 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2368 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2369
2370 // force redraw before "careful" characters to avoid pixel droppings
2371 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2372 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2373#endif
2307 } 2374 }
2308 2375
2309 /* 2376 /*
2310 * Actually do the drawing of the string here 2377 * Actually do the drawing of the string here
2311 */ 2378 */
2312 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2379 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2313 2380
2314 if (back == fore) 2381 if (expect_true (have_bg && back == Color_bg))
2315 font->clear_rect (*drawable, xpixel, ypixel,
2316 fwidth * count, fheight,
2317 back);
2318 else if (back == Color_bg)
2319 { 2382 {
2320 if (must_clear) 2383 // this is very ugly, maybe push it into ->draw?
2321 {
2322 CLEAR_CHARS (xpixel, ypixel, count);
2323 2384
2324 for (i = 0; i < count; i++) /* don't draw empty strings */ 2385 for (i = 0; i < count; i++) /* don't draw empty strings */
2325 if (text[i] != ' ') 2386 if (text[i] != ' ')
2326 { 2387 {
2327 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2388 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2328 break; 2389 goto did_clear;
2329 }
2330 } 2390 }
2331 else 2391
2332 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2392 CLEAR_CHARS (xpixel, ypixel, count);
2393 did_clear: ;
2333 } 2394 }
2334 else 2395 else
2335 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2396 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2336 2397
2337 if (rend & RS_Uline && font->descent > 1 && fore != back) 2398 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2338 { 2399 {
2339#if ENABLE_FRILLS 2400#if ENABLE_FRILLS
2340 if (ISSET_PIXCOLOR (Color_underline)) 2401 if (ISSET_PIXCOLOR (Color_underline))
2341 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2402 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2342 else 2403 else
2343#endif 2404#endif
2344 XSetForeground (display->display, gc, pix_colors[fore]); 2405 XSetForeground (dpy, gc, pix_colors[fore]);
2345 2406
2346 XDrawLine (display->display, drawBuffer, gc, 2407 XDrawLine (dpy, vt, gc,
2347 xpixel, ypixel + font->ascent + 1, 2408 xpixel, ypixel + font->ascent + 1,
2348 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2409 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2349 } 2410 }
2350 } /* for (col....) */ 2411 } /* for (col....) */
2351 } /* for (row....) */ 2412 } /* for (row....) */
2352 2413
2353#if ENABLE_OVERLAY
2354 scr_swap_overlay ();
2355#endif
2356 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2357
2358 /* 2414 /*
2359 * G: cleanup cursor and display outline cursor if necessary 2415 * G: cleanup cursor and display outline cursor if necessary
2360 */ 2416 */
2361 if (showcursor) 2417 if (showcursor)
2362 { 2418 {
2363 if (focus) 2419 if (focus)
2364 { 2420 {
2365 if (OPTION (Opt_cursorUnderline)) 2421 if (option (Opt_cursorUnderline))
2366 *crp ^= RS_Uline; 2422 *crp ^= RS_Uline;
2367 else 2423 else
2368 { 2424 {
2369 *crp ^= RS_RVid; 2425 *crp ^= RS_RVid;
2370#ifndef NO_CURSORCOLOR 2426#ifndef NO_CURSORCOLOR
… …
2384 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2440 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2385 cursorwidth++; 2441 cursorwidth++;
2386 2442
2387#ifndef NO_CURSORCOLOR 2443#ifndef NO_CURSORCOLOR
2388 if (ISSET_PIXCOLOR (Color_cursor)) 2444 if (ISSET_PIXCOLOR (Color_cursor))
2389 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2445 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2446 else
2390#endif 2447#endif
2448 XSetForeground (dpy, gc, pix_colors[ccol1]);
2391 2449
2392 XDrawRectangle (display->display, drawBuffer, gc, 2450 XDrawRectangle (dpy, vt, gc,
2393 Col2Pixel (col), 2451 Col2Pixel (col),
2394 Row2Pixel (oldcursor.row), 2452 Row2Pixel (oldcursor.row),
2395 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2453 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2396 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2454 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2397 } 2455 }
2398 } 2456 }
2399 2457
2400 /* 2458 /*
2401 * H: cleanup selection 2459 * H: cleanup selection
2402 */ 2460 */
2461#if ENABLE_OVERLAY
2462 scr_swap_overlay ();
2463#endif
2464 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2465
2403 scr_reverse_selection (); 2466 scr_reverse_selection ();
2404 2467
2468 screen.flags = old_screen_flags;
2405 num_scr = 0; 2469 num_scr = 0;
2406 num_scr_allow = 1; 2470 num_scr_allow = 1;
2407} 2471}
2408 2472
2409void 2473void
… …
2432} 2496}
2433 2497
2434void 2498void
2435rxvt_term::scr_recolour () NOTHROW 2499rxvt_term::scr_recolour () NOTHROW
2436{ 2500{
2437 if (1 2501#ifdef HAVE_BG_PIXMAP
2438#if TRANSPARENT 2502 bgPixmap.apply ();
2439 && !am_transparent 2503#else
2440#endif 2504
2441#if XPM_BACKGROUND
2442 && !bgPixmap.pixmap
2443#endif
2444 )
2445 {
2446 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2505 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2447 XClearWindow (display->display, parent[0]); 2506 XClearWindow (dpy, parent[0]);
2448 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2507 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2449#if HAVE_SCROLLBARS 2508
2450 if (scrollBar.win) 2509 if (scrollBar.win)
2451 { 2510 {
2452 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2511 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2453 scrollBar.setIdle (); 2512 scrollBar.state = STATE_IDLE;
2454 scrollbar_show (0); 2513 scrollBar.show (0);
2455 }
2456#endif
2457 } 2514 }
2458 2515
2516#endif
2517
2518 /* bgPixmap.apply () does not do the following : */
2459 scr_clear (); 2519 scr_clear ();
2460 scr_touch (true); 2520 scr_touch (true);
2461 want_refresh = 1; 2521 want_refresh = 1;
2462} 2522}
2463 2523
… …
2470 2530
2471 num_scr_allow = 0; 2531 num_scr_allow = 0;
2472 want_refresh = 1; 2532 want_refresh = 1;
2473 2533
2474 if (really) 2534 if (really)
2475 XClearWindow (display->display, vt); 2535 XClearWindow (dpy, vt);
2476} 2536}
2477 2537
2478void 2538void
2479rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2539rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2480{ 2540{
… …
2529{ 2589{
2530 if (selection.op 2590 if (selection.op
2531 && current_screen == selection.screen 2591 && current_screen == selection.screen
2532 && selection.end.row >= view_start) 2592 && selection.end.row >= view_start)
2533 { 2593 {
2534#if ENABLE_FRILLS 2594#if !ENABLE_MINIMAL
2535 if (selection.rect) 2595 if (selection.rect)
2536 scr_xor_rect (selection.beg.row, selection.beg.col, 2596 scr_xor_rect (selection.beg.row, selection.beg.col,
2537 selection.end.row, selection.end.col, 2597 selection.end.row, selection.end.col,
2538 RS_RVid, RS_RVid | RS_Uline); 2598 RS_RVid, RS_RVid | RS_Uline);
2539 else 2599 else
… …
2555{ 2615{
2556 int row, wrote; 2616 int row, wrote;
2557 unsigned int width, towrite; 2617 unsigned int width, towrite;
2558 char r1[] = "\n"; 2618 char r1[] = "\n";
2559 2619
2560 for (row = saveLines - nsaved; 2620 for (row = saveLines + top_row;
2561 row < saveLines + nrow - 1; row++) 2621 row < saveLines + nrow - 1; row++)
2562 { 2622 {
2563 width = row_buf[row].l >= 0 ? row_buf[row].l 2623 width = row_buf[row].l >= 0 ? row_buf[row].l
2564 : ncol; 2624 : ncol;
2565 for (towrite = width; towrite; towrite -= wrote) 2625 for (towrite = width; towrite; towrite -= wrote)
… …
2616 /* convert normal newline chars into common keyboard Return key sequence */ 2676 /* convert normal newline chars into common keyboard Return key sequence */
2617 for (unsigned int i = 0; i < len; i++) 2677 for (unsigned int i = 0; i < len; i++)
2618 if (data[i] == C0_LF) 2678 if (data[i] == C0_LF)
2619 data[i] = C0_CR; 2679 data[i] = C0_CR;
2620 2680
2681 if (priv_modes & PrivMode_BracketPaste)
2682 tt_printf ("\e[200~");
2683
2621 tt_write (data, len); 2684 tt_write (data, len);
2685
2686 if (priv_modes & PrivMode_BracketPaste)
2687 tt_printf ("\e[201~");
2622} 2688}
2623 2689
2624/* ------------------------------------------------------------------------- */ 2690/* ------------------------------------------------------------------------- */
2625/* 2691/*
2626 * Respond to a notification that a primary selection has been sent 2692 * Respond to a notification that a primary selection has been sent
… …
2655 } 2721 }
2656 2722
2657 unsigned long bytes_after; 2723 unsigned long bytes_after;
2658 XTextProperty ct; 2724 XTextProperty ct;
2659 2725
2660 if (XGetWindowProperty (display->display, win, prop, 2726 if (XGetWindowProperty (dpy, win, prop,
2661 0, PROP_SIZE / 4, 2727 0, PROP_SIZE / 4,
2662 delete_prop, AnyPropertyType, 2728 delete_prop, AnyPropertyType,
2663 &ct.encoding, &ct.format, 2729 &ct.encoding, &ct.format,
2664 &ct.nitems, &bytes_after, 2730 &ct.nitems, &bytes_after,
2665 &ct.value) != Success) 2731 &ct.value) != Success)
… …
2674 if (bytes_after) 2740 if (bytes_after)
2675 { 2741 {
2676 // fetch and append remaining data 2742 // fetch and append remaining data
2677 XTextProperty ct2; 2743 XTextProperty ct2;
2678 2744
2679 if (XGetWindowProperty (display->display, win, prop, 2745 if (XGetWindowProperty (dpy, win, prop,
2680 ct.nitems / 4, (bytes_after + 3) / 4, 2746 ct.nitems / 4, (bytes_after + 3) / 4,
2681 delete_prop, AnyPropertyType, 2747 delete_prop, AnyPropertyType,
2682 &ct2.encoding, &ct2.format, 2748 &ct2.encoding, &ct2.format,
2683 &ct2.nitems, &bytes_after, 2749 &ct2.nitems, &bytes_after,
2684 &ct2.value) != Success) 2750 &ct2.value) != Success)
… …
2697 2763
2698 if (ct.encoding == xa[XA_INCR]) 2764 if (ct.encoding == xa[XA_INCR])
2699 { 2765 {
2700 // INCR selection, start handshake 2766 // INCR selection, start handshake
2701 if (!delete_prop) 2767 if (!delete_prop)
2702 XDeleteProperty (display->display, win, prop); 2768 XDeleteProperty (dpy, win, prop);
2703 2769
2704 selection_wait = Sel_incr; 2770 selection_wait = Sel_incr;
2705 incr_buf_fill = 0; 2771 incr_buf_fill = 0;
2706 incr_ev.start (NOW + 10); 2772 incr_ev.start (10);
2707 2773
2708 goto bailout; 2774 goto bailout;
2709 } 2775 }
2710 2776
2711 if (ct.nitems == 0) 2777 if (ct.nitems == 0)
… …
2720 ct.nitems = incr_buf_fill; 2786 ct.nitems = incr_buf_fill;
2721 incr_buf = 0; 2787 incr_buf = 0;
2722 incr_buf_size = 0; 2788 incr_buf_size = 0;
2723 incr_ev.stop (); 2789 incr_ev.stop ();
2724 } 2790 }
2725 else 2791 else
2726 { 2792 {
2727 if (selection_wait == Sel_normal 2793 if (selection_wait == Sel_normal
2728 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2794 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2729 { 2795 {
2730 /* 2796 /*
… …
2737 goto bailout; 2803 goto bailout;
2738 } 2804 }
2739 } 2805 }
2740 else if (selection_wait == Sel_incr) 2806 else if (selection_wait == Sel_incr)
2741 { 2807 {
2742 incr_ev.start (NOW + 10); 2808 incr_ev.start (10);
2743 2809
2744 while (incr_buf_fill + ct.nitems > incr_buf_size) 2810 while (incr_buf_fill + ct.nitems > incr_buf_size)
2745 { 2811 {
2746 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2812 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2747 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2813 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2754 } 2820 }
2755 2821
2756 char **cl; 2822 char **cl;
2757 int cr; 2823 int cr;
2758 2824
2759#if ENABLE_FRILLS 2825#if !ENABLE_MINIMAL
2760 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2826 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2761 // so recode it manually 2827 // so recode it manually
2762 if (ct.encoding == xa[XA_UTF8_STRING]) 2828 if (ct.encoding == xa[XA_UTF8_STRING])
2763 { 2829 {
2764 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2830 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2768 paste (s, strlen (s)); 2834 paste (s, strlen (s));
2769 free (s); 2835 free (s);
2770 } 2836 }
2771 else 2837 else
2772#endif 2838#endif
2773 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2839 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2774 && cl) 2840 && cl)
2775 { 2841 {
2776 for (int i = 0; i < cr; i++) 2842 for (int i = 0; i < cr; i++)
2777 paste (cl[i], strlen (cl[i])); 2843 paste (cl[i], strlen (cl[i]));
2778 2844
… …
2787 if (selection_wait == Sel_normal) 2853 if (selection_wait == Sel_normal)
2788 selection_wait = Sel_none; 2854 selection_wait = Sel_none;
2789} 2855}
2790 2856
2791void 2857void
2792rxvt_term::incr_cb (time_watcher &w) NOTHROW 2858rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2793{ 2859{
2794 selection_wait = Sel_none; 2860 selection_wait = Sel_none;
2795 2861
2796 incr_buf_size = 0; 2862 incr_buf_size = 0;
2797 free (incr_buf); 2863 free (incr_buf);
… …
2808 selection_paste (win, prop, true); 2874 selection_paste (win, prop, true);
2809} 2875}
2810 2876
2811/* ------------------------------------------------------------------------- */ 2877/* ------------------------------------------------------------------------- */
2812/* 2878/*
2813 * Request the current selection: 2879 * Request the current selection:
2814 * Order: > internal selection if available 2880 * Order: > internal selection if available
2815 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2881 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2816 * > CUT_BUFFER0 2882 * > CUT_BUFFER0
2817 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2883 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2818 * will auto fallback to CUT_BUFFER0 2884 * will auto fallback to CUT_BUFFER0
… …
2820 */ 2886 */
2821void 2887void
2822rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2888rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2823{ 2889{
2824 if (selection.text && selnum == Sel_Primary) 2890 if (selection.text && selnum == Sel_Primary)
2891 {
2825 { /* internal selection */ 2892 /* internal selection */
2826 char *str = rxvt_wcstombs (selection.text, selection.len); 2893 char *str = rxvt_wcstombs (selection.text, selection.len);
2827 paste (str, strlen (str)); 2894 paste (str, strlen (str));
2828 free (str); 2895 free (str);
2829 return; 2896 return;
2830 } 2897 }
… …
2860 else if (selnum == Sel_Secondary) 2927 else if (selnum == Sel_Secondary)
2861 sel = XA_SECONDARY; 2928 sel = XA_SECONDARY;
2862 else 2929 else
2863 sel = xa[XA_CLIPBOARD]; 2930 sel = xa[XA_CLIPBOARD];
2864 2931
2865 if (XGetSelectionOwner (display->display, sel) != None) 2932 if (XGetSelectionOwner (dpy, sel) != None)
2866 { 2933 {
2867 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2934 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2868 vt, selection_request_time); 2935 vt, selection_request_time);
2869 return 1; 2936 return 1;
2870 } 2937 }
2871 2938
2872 return 0; 2939 return 0;
… …
2935 3002
2936 int end_col; 3003 int end_col;
2937 3004
2938 for (; row <= selection.end.row; row++, col = 0) 3005 for (; row <= selection.end.row; row++, col = 0)
2939 { 3006 {
2940#if ENABLE_FRILLS 3007#if !ENABLE_MINIMAL
2941 if (selection.rect) 3008 if (selection.rect)
2942 { 3009 {
2943 col = selection.beg.col; 3010 col = selection.beg.col;
2944 end_col = ncol + 1; 3011 end_col = ncol + 1;
2945 } 3012 }
… …
2948 end_col = ROW(row).l; 3015 end_col = ROW(row).l;
2949 3016
2950 col = max (col, 0); 3017 col = max (col, 0);
2951 3018
2952 if (row == selection.end.row 3019 if (row == selection.end.row
2953#if ENABLE_FRILLS 3020#if !ENABLE_MINIMAL
2954 || selection.rect 3021 || selection.rect
2955#endif 3022#endif
2956 ) 3023 )
2957 min_it (end_col, selection.end.col); 3024 min_it (end_col, selection.end.col);
2958 3025
… …
2981#endif 3048#endif
2982 else 3049 else
2983 new_selection_text[ofs++] = *t++; 3050 new_selection_text[ofs++] = *t++;
2984 } 3051 }
2985 3052
2986#if ENABLE_FRILLS 3053#if !ENABLE_MINIMAL
2987 if (selection.rect) 3054 if (selection.rect)
2988 { 3055 {
2989 while (ofs 3056 while (ofs
2990 && new_selection_text[ofs - 1] != C0_LF 3057 && new_selection_text[ofs - 1] != C0_LF
2991 && unicode::is_space (new_selection_text[ofs - 1])) 3058 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3025bool 3092bool
3026rxvt_term::selection_grab (Time tm) NOTHROW 3093rxvt_term::selection_grab (Time tm) NOTHROW
3027{ 3094{
3028 selection_time = tm; 3095 selection_time = tm;
3029 3096
3030 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3097 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3031 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3098 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3032 { 3099 {
3033 display->set_selection_owner (this); 3100 display->set_selection_owner (this);
3034 return true; 3101 return true;
3035 } 3102 }
3036 else 3103 else
… …
3040 } 3107 }
3041 3108
3042#if 0 3109#if 0
3043 XTextProperty ct; 3110 XTextProperty ct;
3044 3111
3045 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3112 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3046 { 3113 {
3047 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3114 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3048 XFree (ct.value); 3115 XFree (ct.value);
3049 } 3116 }
3050#endif 3117#endif
… …
3096 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3163 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3097 3164
3098 while (selection.mark.col > 0 3165 while (selection.mark.col > 0
3099 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3166 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3100 --selection.mark.col; 3167 --selection.mark.col;
3101 3168
3102 if (selection.op) 3169 if (selection.op)
3170 {
3103 { /* clear the old selection */ 3171 /* clear the old selection */
3104 selection.beg.row = selection.end.row = selection.mark.row; 3172 selection.beg.row = selection.end.row = selection.mark.row;
3105 selection.beg.col = selection.end.col = selection.mark.col; 3173 selection.beg.col = selection.end.col = selection.mark.col;
3106 } 3174 }
3107 3175
3108 selection.op = SELECTION_INIT; 3176 selection.op = SELECTION_INIT;
… …
3297 * a point/word/line which is either the start or end of the selection 3365 * a point/word/line which is either the start or end of the selection
3298 * and it was decided by whichever point/word/line was `fixed' at the 3366 * and it was decided by whichever point/word/line was `fixed' at the
3299 * time of the most recent button3 press 3367 * time of the most recent button3 press
3300 */ 3368 */
3301 if (button3 && buttonpress) 3369 if (button3 && buttonpress)
3370 {
3302 { /* button3 press */ 3371 /* button3 press */
3303 /* 3372 /*
3304 * first determine which edge of the selection we are closest to 3373 * first determine which edge of the selection we are closest to
3305 */ 3374 */
3306 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3375 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3307 || (!ROWCOL_IS_AFTER (pos, selection.end) 3376 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3325 selection.mark.row = selection.beg.row; 3394 selection.mark.row = selection.beg.row;
3326 selection.mark.col = selection.beg.col; 3395 selection.mark.col = selection.beg.col;
3327 } 3396 }
3328 } 3397 }
3329 else 3398 else
3399 {
3330 { /* button1 drag or button3 drag */ 3400 /* button1 drag or button3 drag */
3331 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3401 if (ROWCOL_IS_AFTER (selection.mark, pos))
3332 { 3402 {
3333 if (selection.mark.row == selection.end.row 3403 if (selection.mark.row == selection.end.row
3334 && selection.mark.col == selection.end.col 3404 && selection.mark.col == selection.end.col
3335 && clickchange 3405 && clickchange
… …
3352 3422
3353 if (selection.clicks == 1) 3423 if (selection.clicks == 1)
3354 { 3424 {
3355 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3425 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3356 && !ROW(selection.beg.row).is_longer () 3426 && !ROW(selection.beg.row).is_longer ()
3357#if ENABLE_FRILLS 3427#if !ENABLE_MINIMAL
3358 && !selection.rect 3428 && !selection.rect
3359#endif 3429#endif
3360 ) 3430 )
3361 selection.beg.col = ncol; 3431 selection.beg.col = ncol;
3362 3432
3363 if ( 3433 if (
3364 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3434 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3365 && !ROW(selection.end.row).is_longer () 3435 && !ROW(selection.end.row).is_longer ()
3366#if ENABLE_FRILLS 3436#if !ENABLE_MINIMAL
3367 && !selection.rect 3437 && !selection.rect
3368#endif 3438#endif
3369 ) 3439 )
3370 selection.end.col = ncol; 3440 selection.end.col = ncol;
3371 } 3441 }
… …
3378 selection_delimit_word (DN, &selection.end, &selection.end); 3448 selection_delimit_word (DN, &selection.end, &selection.end);
3379 } 3449 }
3380 else if (selection.clicks == 3) 3450 else if (selection.clicks == 3)
3381 { 3451 {
3382#if ENABLE_FRILLS 3452#if ENABLE_FRILLS
3383 if (OPTION (Opt_tripleclickwords)) 3453 if (option (Opt_tripleclickwords))
3384 { 3454 {
3385 selection_delimit_word (UP, &selection.beg, &selection.beg); 3455 selection_delimit_word (UP, &selection.beg, &selection.beg);
3386 3456
3387 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3457 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3388 { 3458 {
3389 if (!ROW(end_row).is_longer ()) 3459 if (!ROW(end_row).is_longer ())
3390 { 3460 {
3391 selection.end.row = end_row; 3461 selection.end.row = end_row;
3392 selection.end.col = ROW(end_row).l; 3462 selection.end.col = ROW(end_row).l;
3463# if !ENABLE_MINIMAL
3393 selection_remove_trailing_spaces (); 3464 selection_remove_trailing_spaces ();
3465# endif
3394 break; 3466 break;
3395 } 3467 }
3396 } 3468 }
3397 } 3469 }
3398 else 3470 else
… …
3414 selection.end.row++; 3486 selection.end.row++;
3415 } 3487 }
3416 } 3488 }
3417 3489
3418 if (button3 && buttonpress) 3490 if (button3 && buttonpress)
3491 {
3419 { /* mark may need to be changed */ 3492 /* mark may need to be changed */
3420 if (closeto == LEFT) 3493 if (closeto == LEFT)
3421 { 3494 {
3422 selection.mark.row = selection.end.row; 3495 selection.mark.row = selection.end.row;
3423 selection.mark.col = selection.end.col - (selection.clicks == 2); 3496 selection.mark.col = selection.end.col - (selection.clicks == 2);
3424 } 3497 }
… …
3427 selection.mark.row = selection.beg.row; 3500 selection.mark.row = selection.beg.row;
3428 selection.mark.col = selection.beg.col; 3501 selection.mark.col = selection.beg.col;
3429 } 3502 }
3430 } 3503 }
3431 3504
3432#if ENABLE_FRILLS 3505#if !ENABLE_MINIMAL
3433 if (selection.rect && selection.beg.col > selection.end.col) 3506 if (selection.rect && selection.beg.col > selection.end.col)
3434 ::swap (selection.beg.col, selection.end.col); 3507 ::swap (selection.beg.col, selection.end.col);
3435#endif 3508#endif
3436} 3509}
3437 3510
3438#if ENABLE_FRILLS 3511#if !ENABLE_MINIMAL
3439void 3512void
3440rxvt_term::selection_remove_trailing_spaces () NOTHROW 3513rxvt_term::selection_remove_trailing_spaces () NOTHROW
3441{ 3514{
3442 int32_t end_col, end_row; 3515 int32_t end_col, end_row;
3443 text_t *stp; 3516 text_t *stp;
… …
3498 */ 3571 */
3499void 3572void
3500rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3573rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3501{ 3574{
3502 XSelectionEvent ev; 3575 XSelectionEvent ev;
3503 dDisp;
3504 3576
3505 ev.type = SelectionNotify; 3577 ev.type = SelectionNotify;
3506 ev.property = None; 3578 ev.property = None;
3507 ev.display = rq.display; 3579 ev.display = rq.display;
3508 ev.requestor = rq.requestor; 3580 ev.requestor = rq.requestor;
… …
3522 *target++ = xa[XA_COMPOUND_TEXT]; 3594 *target++ = xa[XA_COMPOUND_TEXT];
3523#if X_HAVE_UTF8_STRING 3595#if X_HAVE_UTF8_STRING
3524 *target++ = xa[XA_UTF8_STRING]; 3596 *target++ = xa[XA_UTF8_STRING];
3525#endif 3597#endif
3526 3598
3527 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3599 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3528 32, PropModeReplace, 3600 32, PropModeReplace,
3529 (unsigned char *)target_list, target - target_list); 3601 (unsigned char *)target_list, target - target_list);
3530 ev.property = rq.property; 3602 ev.property = rq.property;
3531 } 3603 }
3532#if TODO // TODO 3604#if TODO // TODO
… …
3535 /* TODO: Handle MULTIPLE */ 3607 /* TODO: Handle MULTIPLE */
3536 } 3608 }
3537#endif 3609#endif
3538 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3610 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3539 { 3611 {
3540 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3612 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3541 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3613 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3542 ev.property = rq.property; 3614 ev.property = rq.property;
3543 } 3615 }
3544 else if (rq.target == XA_STRING 3616 else if (rq.target == XA_STRING
3545 || rq.target == xa[XA_TEXT] 3617 || rq.target == xa[XA_TEXT]
… …
3569 style = enc_string; 3641 style = enc_string;
3570 else if (target == xa[XA_TEXT]) 3642 else if (target == xa[XA_TEXT])
3571 style = enc_text; 3643 style = enc_text;
3572 else if (target == xa[XA_COMPOUND_TEXT]) 3644 else if (target == xa[XA_COMPOUND_TEXT])
3573 style = enc_compound_text; 3645 style = enc_compound_text;
3574#if ENABLE_FRILLS 3646#if !ENABLE_MINIMAL
3575 else if (target == xa[XA_UTF8_STRING]) 3647 else if (target == xa[XA_UTF8_STRING])
3576 style = enc_utf8; 3648 style = enc_utf8;
3577#endif 3649#endif
3578 else 3650 else
3579 { 3651 {
… …
3590 { 3662 {
3591 cl = L""; 3663 cl = L"";
3592 selectlen = 0; 3664 selectlen = 0;
3593 } 3665 }
3594 3666
3595#if ENABLE_FRILLS 3667#if !ENABLE_MINIMAL
3596 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3668 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3597 // so recode it manually 3669 // so recode it manually
3598 if (style == enc_utf8) 3670 if (style == enc_utf8)
3599 { 3671 {
3600 freect = 1; 3672 freect = 1;
… …
3603 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3675 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3604 ct.nitems = strlen ((char *)ct.value); 3676 ct.nitems = strlen ((char *)ct.value);
3605 } 3677 }
3606 else 3678 else
3607#endif 3679#endif
3608 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3680 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3609 freect = 1; 3681 freect = 1;
3610 else 3682 else
3611 { 3683 {
3612 /* if we failed to convert then send it raw */ 3684 /* if we failed to convert then send it raw */
3613 ct.value = (unsigned char *)cl; 3685 ct.value = (unsigned char *)cl;
3614 ct.nitems = selectlen; 3686 ct.nitems = selectlen;
3615 ct.encoding = target; 3687 ct.encoding = target;
3616 } 3688 }
3617 3689
3618 XChangeProperty (disp, rq.requestor, rq.property, 3690 XChangeProperty (dpy, rq.requestor, rq.property,
3619 ct.encoding, 8, PropModeReplace, 3691 ct.encoding, 8, PropModeReplace,
3620 ct.value, (int)ct.nitems); 3692 ct.value, (int)ct.nitems);
3621 ev.property = rq.property; 3693 ev.property = rq.property;
3622 3694
3623 if (freect) 3695 if (freect)
3624 XFree (ct.value); 3696 XFree (ct.value);
3625 } 3697 }
3626 3698
3627 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3699 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3628}
3629
3630/* ------------------------------------------------------------------------- *
3631 * MOUSE ROUTINES *
3632 * ------------------------------------------------------------------------- */
3633
3634/*
3635 * return col/row values corresponding to x/y pixel values
3636 */
3637void
3638rxvt_term::pixel_position (int *x, int *y) NOTHROW
3639{
3640 *x = Pixel2Col (*x);
3641 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3642 *y = Pixel2Row (*y);
3643 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3644} 3700}
3645 3701
3646/* ------------------------------------------------------------------------- */ 3702/* ------------------------------------------------------------------------- */
3647#ifdef USE_XIM 3703#ifdef USE_XIM
3648void 3704void
3649rxvt_term::im_set_position (XPoint &pos) NOTHROW 3705rxvt_term::im_set_position (XPoint &pos) NOTHROW
3650{ 3706{
3651 XWindowAttributes xwa; 3707 XWindowAttributes xwa;
3652 3708
3653 XGetWindowAttributes (display->display, vt, &xwa); 3709 XGetWindowAttributes (dpy, vt, &xwa);
3654 3710
3655 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3711 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3656 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3712 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3657} 3713}
3658#endif 3714#endif
… …
3676 h += 2; min_it (h, nrow); 3732 h += 2; min_it (h, nrow);
3677 3733
3678 x -= 1; clamp_it (x, 0, ncol - w); 3734 x -= 1; clamp_it (x, 0, ncol - w);
3679 y -= 1; clamp_it (y, 0, nrow - h); 3735 y -= 1; clamp_it (y, 0, nrow - h);
3680 3736
3681 ov_x = x; ov_y = y; 3737 ov.x = x; ov.y = y;
3682 ov_w = w; ov_h = h; 3738 ov.w = w; ov.h = h;
3683 3739
3684 ov_text = new text_t *[h]; 3740 ov.text = new text_t *[h];
3685 ov_rend = new rend_t *[h]; 3741 ov.rend = new rend_t *[h];
3686 3742
3687 for (y = 0; y < h; y++) 3743 for (y = 0; y < h; y++)
3688 { 3744 {
3689 text_t *tp = ov_text[y] = new text_t[w]; 3745 text_t *tp = ov.text[y] = new text_t[w];
3690 rend_t *rp = ov_rend[y] = new rend_t[w]; 3746 rend_t *rp = ov.rend[y] = new rend_t[w];
3691 3747
3692 text_t t0, t1, t2; 3748 text_t t0, t1, t2;
3693 rend_t r = OVERLAY_RSTYLE; 3749 rend_t r = OVERLAY_RSTYLE;
3694 3750
3695 if (y == 0) 3751 if (y == 0)
… …
3714} 3770}
3715 3771
3716void 3772void
3717rxvt_term::scr_overlay_off () NOTHROW 3773rxvt_term::scr_overlay_off () NOTHROW
3718{ 3774{
3719 if (!ov_text) 3775 if (!ov.text)
3720 return; 3776 return;
3721 3777
3722 want_refresh = 1; 3778 want_refresh = 1;
3723 3779
3724 for (int y = 0; y < ov_h; y++) 3780 for (int y = 0; y < ov.h; y++)
3725 { 3781 {
3726 delete [] ov_text[y]; 3782 delete [] ov.text[y];
3727 delete [] ov_rend[y]; 3783 delete [] ov.rend[y];
3728 } 3784 }
3729 3785
3730 delete [] ov_text; ov_text = 0; 3786 delete [] ov.text; ov.text = 0;
3731 delete [] ov_rend; ov_rend = 0; 3787 delete [] ov.rend; ov.rend = 0;
3732} 3788}
3733 3789
3734void 3790void
3735rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3791rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3736{ 3792{
3737 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3793 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3738 return; 3794 return;
3739 3795
3740 x++, y++; 3796 x++, y++;
3741 3797
3742 ov_text[y][x] = text; 3798 ov.text[y][x] = text;
3743 ov_rend[y][x] = rend; 3799 ov.rend[y][x] = rend;
3744} 3800}
3745 3801
3746void 3802void
3747rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3803rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3748{ 3804{
… …
3754rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3810rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3755{ 3811{
3756 while (*s) 3812 while (*s)
3757 { 3813 {
3758 text_t t = *s++; 3814 text_t t = *s++;
3759 int width = wcwidth (t); 3815 int width = WCWIDTH (t);
3760 3816
3761 while (width--) 3817 while (width--)
3762 { 3818 {
3763 scr_overlay_set (x++, y, t); 3819 scr_overlay_set (x++, y, t);
3764 t = NOCHAR; 3820 t = NOCHAR;
… …
3767} 3823}
3768 3824
3769void 3825void
3770rxvt_term::scr_swap_overlay () NOTHROW 3826rxvt_term::scr_swap_overlay () NOTHROW
3771{ 3827{
3772 if (!ov_text) 3828 if (!ov.text)
3773 return; 3829 return;
3774 3830
3831 // hide cursor if it is within the overlay area
3832 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3833 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3834 screen.flags &= ~Screen_VisibleCursor;
3835
3775 // swap screen mem with overlay 3836 // swap screen mem with overlay
3776 for (int y = ov_h; y--; ) 3837 for (int y = ov.h; y--; )
3777 { 3838 {
3778 text_t *t1 = ov_text[y]; 3839 text_t *t1 = ov.text[y];
3779 rend_t *r1 = ov_rend[y]; 3840 rend_t *r1 = ov.rend[y];
3780 3841
3781 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3842 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3782 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3843 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3783 3844
3784 for (int x = ov_w; x--; ) 3845 for (int x = ov.w; x--; )
3785 { 3846 {
3786 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3847 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3787 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3848 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3788 } 3849 }
3789 } 3850 }

Diff Legend

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