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.247 by root, Sun Jan 22 20:39:47 2006 UTC vs.
Revision 1.331 by sf-exg, Wed Jan 6 17:52:43 2010 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;
… …
172 if (nrow == 0) 169 if (nrow == 0)
173 nrow = 24; 170 nrow = 24;
174 171
175 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 173 return;
177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180 174
181 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
182 while (nrow + saveLines < 2) 176 while (nrow + saveLines < 2)
183 { 177 {
184 //TODO//FIXME 178 //TODO//FIXME
… …
237 selection.text = NULL; 231 selection.text = NULL;
238 selection.len = 0; 232 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 233 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 234 selection.screen = PRIMARY;
241 selection.clicks = 0; 235 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false;
243 } 236 }
244 else 237 else
245 { 238 {
246 /* 239 /*
247 * add or delete rows as appropriate 240 * add or delete rows as appropriate
… …
276 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);
277 } 270 }
278 271
279 line_t *old_buf = row_buf; 272 line_t *old_buf = row_buf;
280 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));
281 274
282 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
283 int pend = MOD (term_start + top_row , prev_total_rows); 276 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 277 int q = total_rows; // rewrapped row
285 278
286 if (top_row) 279 if (top_row)
287 { 280 {
288 // 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
289 // 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
290 284
291 row_col_t ocur = screen.cur; 285 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293 287
294 do 288 do
295 { 289 {
296 p = MOD (p - 1, prev_total_rows); 290 p = MOD (p - 1, prev_total_rows);
297#ifdef DEBUG_STRICT
298 assert (old_buf [MOD (p, prev_total_rows)].t); 291 assert (old_buf [MOD (p, prev_total_rows)].t);
299#endif
300 int plines = 1; 292 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l; 293 int llen = old_buf [MOD (p, prev_total_rows)].l;
302 294
303 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 ())
304 { 296 {
… …
330 int qcol = 0; 322 int qcol = 0;
331 323
332 // see below for cursor adjustment rationale 324 // see below for cursor adjustment rationale
333 if (p == ocur.row) 325 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 326 screen.cur.row = q - (total_rows - nrow);
335 327
336 // fill a single destination line 328 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 329 while (lofs < llen && qcol < ncol)
338 { 330 {
339 int prow = lofs / prev_ncol; 331 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 332 int pcol = lofs % prev_ncol;
… …
366 } 358 }
367 while (p != pend && q > 0); 359 while (p != pend && q > 0);
368 360
369 term_start = total_rows - nrow; 361 term_start = total_rows - nrow;
370 top_row = q - term_start; 362 top_row = q - term_start;
371 363
372 // make sure all terminal lines exist 364 // make sure all terminal lines exist
373 while (top_row > 0) 365 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 366 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 367 }
376 else 368 else
377 { 369 {
378 // if no scrollback exists (yet), wing, instead of wrap 370 // if no scrollback exists (yet), wing, instead of wrap
379 371
380 for (int row = min (nrow, prev_nrow); row--; ) 372 for (int row = min (nrow, prev_nrow); row--; )
381 { 373 {
382 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)];
383 line_t &qline = row_buf [row]; 375 line_t &qline = row_buf [row];
384 376
… …
398 delete old_ta; 390 delete old_ta;
399 delete old_ra; 391 delete old_ra;
400 392
401 clamp_it (screen.cur.row, 0, nrow - 1); 393 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1); 394 clamp_it (screen.cur.col, 0, ncol - 1);
395 }
403 396
404 free (tabs); 397 free (tabs);
405 } 398 tabs = (char *)rxvt_malloc (ncol);
399
400 for (int col = ncol; --col; )
401 tabs [col] = col % TABSIZE == 0;
406 402
407 CLEAR_ALL_SELECTION (); 403 CLEAR_ALL_SELECTION ();
408 404
409 prev_nrow = nrow; 405 prev_nrow = nrow;
410 prev_ncol = ncol; 406 prev_ncol = ncol;
411
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
413
414 for (int col = ncol; col--; )
415 tabs [col] = col % TABSIZE == 0;
416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419 407
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}
… …
435 delete ralloc; ralloc = 0; 423 delete ralloc; ralloc = 0;
436 424
437 free (row_buf); 425 free (row_buf);
438 free (swap_buf); 426 free (swap_buf);
439 free (drawn_buf); 427 free (drawn_buf);
428 row_buf = 0; // signal that we freed all the arrays above
429
440 free (tabs); 430 free (tabs);
441 431 tabs = 0;
442 row_buf = 0; // signal that we freed all the arrays
443 } 432 }
444} 433}
445 434
446/* ------------------------------------------------------------------------- */ 435/* ------------------------------------------------------------------------- */
447/* 436/*
448 * Hard reset 437 * Hard/Soft reset
449 */ 438 */
450void 439void
451rxvt_term::scr_poweron () 440rxvt_term::scr_poweron ()
452{ 441{
453 scr_release (); 442 scr_release ();
454 prev_nrow = prev_ncol = 0; 443 prev_nrow = prev_ncol = 0;
444 rvideo_mode = false;
445 scr_soft_reset ();
455 scr_reset (); 446 scr_reset ();
456 447
457 scr_clear (true); 448 scr_clear (true);
458 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);
459} 466}
460 467
461/* ------------------------------------------------------------------------- * 468/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 469 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 470 * ------------------------------------------------------------------------- */
… …
501 } 508 }
502 509
503 /* boundary check in case screen size changed between SAVE and RESTORE */ 510 /* boundary check in case screen size changed between SAVE and RESTORE */
504 min_it (s->cur.row, nrow - 1); 511 min_it (s->cur.row, nrow - 1);
505 min_it (s->cur.col, ncol - 1); 512 min_it (s->cur.col, ncol - 1);
506#ifdef DEBUG_STRICT
507 assert (s->cur.row >= 0); 513 assert (s->cur.row >= 0);
508 assert (s->cur.col >= 0); 514 assert (s->cur.col >= 0);
509#endif
510} 515}
511 516
512void 517void
513rxvt_term::scr_swap_screen () 518rxvt_term::scr_swap_screen ()
514{ 519{
515 if (!OPTION (Opt_secondaryScreen)) 520 if (!option (Opt_secondaryScreen))
516 return; 521 return;
517 522
518 for (int i = prev_nrow; i--; ) 523 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 524 ::swap (ROW(i), swap_buf [i]);
520 525
… …
542 selection_check (2); /* check for boundary cross */ 547 selection_check (2); /* check for boundary cross */
543 548
544 int i = current_screen; current_screen = scrn; scrn = i; 549 int i = current_screen; current_screen = scrn; scrn = i;
545 550
546#if NSCREENS 551#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 552 if (option (Opt_secondaryScreen))
548 { 553 {
549 num_scr = 0; 554 num_scr = 0;
550 555
551 scr_swap_screen (); 556 scr_swap_screen ();
552 557
… …
555 screen.flags |= Screen_VisibleCursor; 560 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 561 swap.flags |= Screen_VisibleCursor;
557 } 562 }
558 else 563 else
559#endif 564#endif
560 if (OPTION (Opt_secondaryScroll)) 565 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 566 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 567}
563 568
564// clear WrapNext indicator, solidifying position on next line 569// clear WrapNext indicator, solidifying position on next line
565void 570void
… …
598/* 603/*
599 * Change the rendition style for following text 604 * Change the rendition style for following text
600 */ 605 */
601void 606void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 607rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 608{
604 if (set) 609 if (set)
605 rstyle |= style; 610 rstyle |= style;
606 else if (style == ~RS_None) 611 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 612 rstyle = DEFAULT_RSTYLE;
608 else 613 else
609 rstyle &= ~style; 614 rstyle &= ~style;
610 } 615}
611 616
612/* ------------------------------------------------------------------------- */ 617/* ------------------------------------------------------------------------- */
613/* 618/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 619 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 620 * count positive ==> scroll up
… …
624 want_refresh = 1; 629 want_refresh = 1;
625 num_scr += count; 630 num_scr += count;
626 631
627 if (count > 0 632 if (count > 0
628 && row1 == 0 633 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 634 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 635 {
631 top_row = max (top_row - count, -saveLines); 636 top_row = max (top_row - count, -saveLines);
632 637
633 // scroll everything up 'count' lines 638 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 639 term_start = (term_start + count) % total_rows;
… …
641 } 646 }
642 647
643 // erase newly scrolled-in lines 648 // erase newly scrolled-in lines
644 for (int i = count; i--; ) 649 for (int i = count; i--; )
645 { 650 {
646 // basically this is a slightly optimized scr_blank_screen_mem
647 // it is worth the effort on slower machines
648 line_t &l = ROW(nrow - 1 - i); 651 line_t &l = ROW(nrow - 1 - i);
649 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 {
650 scr_blank_line (l, 0, l.l, rstyle); 657 scr_blank_line (l, 0, l.l, rstyle);
651
652 l.l = 0; 658 l.l = 0;
653 l.f = 0; 659 l.f = 0;
660 }
661 else
662 scr_blank_screen_mem (l, rstyle);
654 } 663 }
655 664
656 // now copy lines below the scroll region bottom to the 665 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they 666 // bottom of the screen again, so they look as if they
658 // hadn't moved. 667 // hadn't moved.
… …
662 line_t &l2 = ROW(i); 671 line_t &l2 = ROW(i);
663 672
664 ::swap (l1, l2); 673 ::swap (l1, l2);
665 l2.touch (); 674 l2.touch ();
666 } 675 }
667 676
668 // move and/or clear selection, if any 677 // move and/or clear selection, if any
669 if (selection.op && current_screen == selection.screen) 678 if (selection.op && current_screen == selection.screen)
670 { 679 {
671 selection.beg.row -= count; 680 selection.beg.row -= count;
672 selection.end.row -= count; 681 selection.end.row -= count;
… …
680 selection.op = SELECTION_CLEAR; 689 selection.op = SELECTION_CLEAR;
681 } 690 }
682 } 691 }
683 692
684 // finally move the view window, if desired 693 // finally move the view window, if desired
685 if (OPTION (Opt_scrollWithBuffer) 694 if (option (Opt_scrollWithBuffer)
686 && view_start != 0 695 && view_start != 0
687 && view_start != -saveLines) 696 && view_start != -saveLines)
688 scr_page (UP, count); 697 scr_page (UP, count);
689 698
690 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 699 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
708 { 717 {
709 /* move selected region too */ 718 /* move selected region too */
710 selection.beg.row -= count; 719 selection.beg.row -= count;
711 selection.end.row -= count; 720 selection.end.row -= count;
712 selection.mark.row -= count; 721 selection.mark.row -= count;
713 722
714 selection_check (0); 723 selection_check (0);
715 } 724 }
716 } 725 }
717 726
718 // use a simple and robust scrolling algorithm, this 727 // use a simple and robust scrolling algorithm, this
… …
758 ZERO_SCROLLBACK (); 767 ZERO_SCROLLBACK ();
759 768
760 if (minlines > 0) 769 if (minlines > 0)
761 { 770 {
762 minlines += screen.cur.row - screen.bscroll; 771 minlines += screen.cur.row - screen.bscroll;
772 min_it (minlines, screen.cur.row - top_row);
763 773
764 if (minlines > 0 774 if (minlines > 0
765 && screen.tscroll == 0 775 && screen.tscroll == 0
766 && screen.bscroll == nrow - 1) 776 && screen.bscroll == nrow - 1)
767 { 777 {
… …
769 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 779 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
770 screen.cur.row -= minlines; 780 screen.cur.row -= minlines;
771 } 781 }
772 } 782 }
773 783
774#ifdef DEBUG_STRICT
775 assert (screen.cur.col < ncol); 784 assert (screen.cur.col < ncol);
776 assert (screen.cur.row < nrow 785 assert (screen.cur.row < nrow
777 && screen.cur.row >= top_row); 786 && screen.cur.row >= top_row);
778#endif
779 int row = screen.cur.row; 787 int row = screen.cur.row;
780 788
781 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 789 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
782 790
783 line_t *line = &ROW(row); 791 line_t *line = &ROW(row);
784 792
785 while (str < strend) 793 while (str < strend)
786 { 794 {
787 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 795 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
788 796
789 if (c < 0x20) 797 if (expect_false (c < 0x20))
790 if (c == C0_LF) 798 if (c == C0_LF)
791 { 799 {
792 max_it (line->l, screen.cur.col); 800 max_it (line->l, screen.cur.col);
793 801
794 screen.flags &= ~Screen_WrapNext; 802 screen.flags &= ~Screen_WrapNext;
… …
813 { 821 {
814 scr_tab (1, true); 822 scr_tab (1, true);
815 continue; 823 continue;
816 } 824 }
817 825
826 if (expect_false (
818 if (checksel /* see if we're writing within selection */ 827 checksel /* see if we're writing within selection */
819 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 828 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
820 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 829 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
830 ))
821 { 831 {
822 checksel = 0; 832 checksel = 0;
823 /* 833 /*
824 * If we wrote anywhere in the selected area, kill the selection 834 * If we wrote anywhere in the selected area, kill the selection
825 * XXX: should we kill the mark too? Possibly, but maybe that 835 * XXX: should we kill the mark too? Possibly, but maybe that
826 * should be a similar check. 836 * should be a similar check.
827 */ 837 */
828 CLEAR_SELECTION (); 838 CLEAR_SELECTION ();
829 } 839 }
830 840
831 if (screen.flags & Screen_WrapNext) 841 if (expect_false (screen.flags & Screen_WrapNext))
832 { 842 {
833 scr_do_wrap (); 843 scr_do_wrap ();
834 844
835 line->l = ncol; 845 line->l = ncol;
836 line->is_longer (1); 846 line->is_longer (1);
837 847
838 row = screen.cur.row; 848 row = screen.cur.row;
839 line = &ROW(row); /* _must_ refresh */ 849 line = &ROW(row); /* _must_ refresh */
840 } 850 }
841 851
842 // some utf-8 decoders "decode" surrogate characters: let's fix this. 852 // some utf-8 decoders "decode" surrogate characters: let's fix this.
843 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 853 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
844 c = 0xfffd; 854 c = 0xfffd;
845 855
846 // 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
847 // do wcwidth before further replacements, as wcwidth might return -1 857 // further replacements, as wcwidth might return -1 for the line
848 // 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
849 // locale. 859 // locale.
850 int width = c < 0x100 ? 1 : wcwidth (c); 860 int width = WCWIDTH (c);
851 861
852 if (charsets [screen.charset] == '0') // DEC SPECIAL 862 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
853 { 863 {
854 // vt100 special graphics and line drawing 864 // vt100 special graphics and line drawing
855 // 5f-7e standard vt100 865 // 5f-7e standard vt100
856 // 40-5e rxvt extension for extra curses acs chars 866 // 40-5e rxvt extension for extra curses acs chars
857 static uint16_t vt100_0[62] = { // 41 .. 7e 867 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
870 c = vt100_0[c - 0x41]; 880 c = vt100_0[c - 0x41];
871 width = 1; // vt100 line drawing characters are always single-width 881 width = 1; // vt100 line drawing characters are always single-width
872 } 882 }
873 } 883 }
874 884
875 if (screen.flags & Screen_Insert) 885 if (expect_false (screen.flags & Screen_Insert))
876 scr_insdel_chars (width, INSERT); 886 scr_insdel_chars (width, INSERT);
877 887
878 if (width != 0) 888 if (width != 0)
879 { 889 {
880#if !UNICODE_3 890#if !UNICODE_3
… …
886 c = 0xfffd; 896 c = 0xfffd;
887# endif 897# endif
888#endif 898#endif
889 899
890 // nuke the character at this position, if required 900 // nuke the character at this position, if required
901 if (expect_false (
891 if (line->t[screen.cur.col] == NOCHAR 902 line->t[screen.cur.col] == NOCHAR
892 || (screen.cur.col < ncol - 1 903 || (screen.cur.col < ncol - 1
893 && 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))
894 { 912 {
895 int col = screen.cur.col; 913 // ... artificially enlargen the previous one
896
897 // find begin
898 while (col > 0 && line->t[col] == NOCHAR)
899 col--;
900
901 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
902
903 // found begin, nuke
904 do {
905 line->t[col] = ' ';
906 line->r[col] = rend;
907 col++;
908 } while (col < ncol && line->t[col] == NOCHAR);
909 }
910
911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912
913 // if the character doesn't fit into the remaining columns...
914 if (screen.cur.col > ncol - width && ncol >= width)
915 {
916 // ...output spaces
917 c = ' '; 914 c = NOCHAR;
918 // and try the same character next loop iteration 915 // and try the same character next loop iteration
919 --str; 916 --str;
920 } 917 }
921 918
922 line->touch (); 919 line->touch ();
… …
924 do 921 do
925 { 922 {
926 line->t[screen.cur.col] = c; 923 line->t[screen.cur.col] = c;
927 line->r[screen.cur.col] = rend; 924 line->r[screen.cur.col] = rend;
928 925
929 if (screen.cur.col < ncol - 1) 926 if (expect_true (screen.cur.col < ncol - 1))
930 screen.cur.col++; 927 screen.cur.col++;
931 else 928 else
932 { 929 {
933 line->l = ncol; 930 line->l = ncol;
934 if (screen.flags & Screen_Autowrap) 931 if (screen.flags & Screen_Autowrap)
… …
936 break; 933 break;
937 } 934 }
938 935
939 c = NOCHAR; 936 c = NOCHAR;
940 } 937 }
941 while (--width > 0); 938 while (expect_false (--width > 0));
942 939
943 // pad with spaces when overwriting wide character with smaller one 940 // pad with spaces when overwriting wide character with smaller one
944 if (!width) 941 if (expect_false (!width))
945 { 942 {
946 line->touch (); 943 line->touch ();
947 944
948 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++)
949 { 946 {
950 line->t[c] = ' '; 947 line->t[c] = ' ';
951 line->r[c] = rend; 948 line->r[c] = rend;
952 } 949 }
953 } 950 }
954 } 951 }
952#if ENABLE_COMBINING
955 else // width == 0 953 else // width == 0
956 { 954 {
957#if ENABLE_COMBINING 955 if (c != 0xfeff) // ignore BOM
958 // handle combining characters
959 // we just tag the accent on the previous on-screen character.
960 // this is arguably not correct, but also arguably not wrong.
961 // we don't handle double-width characters nicely yet.
962 line_t *linep;
963 text_t *tp;
964 rend_t *rp;
965
966 if (screen.cur.col > 0)
967 { 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 {
968 linep = line; 967 linep = line;
969 tp = line->t + screen.cur.col - 1; 968 tp = line->t + screen.cur.col - 1;
970 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));
971 } 993 }
972 else if (screen.cur.row > 0
973 && ROW(screen.cur.row - 1).is_longer ())
974 {
975 linep = &ROW(screen.cur.row - 1);
976 tp = line->t + ncol - 1;
977 rp = line->r + ncol - 1;
978 } 994 }
979 else
980 continue;
981
982 linep->touch ();
983
984 while (*tp == NOCHAR && tp > linep->t)
985 tp--, rp--;
986
987 // first try to find a precomposed character
988 unicode_t n = rxvt_compose (*tp, c);
989 if (n == NOCHAR)
990 n = rxvt_composite.compose (*tp, c);
991
992 *tp = n;
993 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
994#endif 995#endif
995 }
996 } 996 }
997 997
998 max_it (line->l, screen.cur.col); 998 max_it (line->l, screen.cur.col);
999 999
1000#ifdef DEBUG_STRICT
1001 assert (screen.cur.row >= 0); 1000 assert (screen.cur.row >= 0);
1002#endif
1003} 1001}
1004 1002
1005/* ------------------------------------------------------------------------- */ 1003/* ------------------------------------------------------------------------- */
1006/* 1004/*
1007 * 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
1008 * XTERM_SEQ: CTRL-H 1006 * XTERM_SEQ: CTRL-H
1009 */ 1007 */
1010void 1008void
1011rxvt_term::scr_backspace () NOTHROW 1009rxvt_term::scr_backspace () NOTHROW
1012{ 1010{
1013 want_refresh = 1;
1014
1015 if (screen.cur.col == 0) 1011 if (screen.cur.col == 0)
1016 { 1012 {
1017 if (screen.cur.row > 0) 1013 if (screen.cur.row > 0)
1018 { 1014 {
1019#ifdef TERMCAP_HAS_BW 1015#ifdef TERMCAP_HAS_BW
1020 screen.cur.col = ncol - 1; 1016 screen.cur.col = ncol - 1;
1021 screen.cur.row--; 1017 --screen.cur.row;
1022 return; 1018
1019 want_refresh = 1;
1023#endif 1020#endif
1024 } 1021 }
1025 } 1022 }
1026 else if (!(screen.flags & Screen_WrapNext)) 1023 else
1027 scr_gotorc (0, -1, RELATIVE); 1024 scr_gotorc (0, -1, RELATIVE);
1028
1029 screen.flags &= ~Screen_WrapNext;
1030} 1025}
1031 1026
1032/* ------------------------------------------------------------------------- */ 1027/* ------------------------------------------------------------------------- */
1033/* 1028/*
1034 * Process Horizontal Tab 1029 * Process Horizontal Tab
… …
1057 x = i; 1052 x = i;
1058 1053
1059 if (!--count) 1054 if (!--count)
1060 break; 1055 break;
1061 } 1056 }
1062 else 1057 else
1063 ht &= l.t[i] == ' ' 1058 ht &= l.t[i] == ' '
1064 && RS_SAME (l.r[i], base_rend); 1059 && RS_SAME (l.r[i], base_rend);
1065 1060
1066 if (count) 1061 if (count)
1067 x = ncol - 1; 1062 x = ncol - 1;
1068 1063
1069 // store horizontal tab commands as characters inside the text 1064 // store horizontal tab commands as characters inside the text
1070 // buffer so they can be selected and pasted. 1065 // buffer so they can be selected and pasted.
1071 if (ht && OPTION (Opt_pastableTabs)) 1066 if (ht && option (Opt_pastableTabs))
1072 { 1067 {
1073 base_rend = SET_FONT (base_rend, 0); 1068 base_rend = SET_FONT (base_rend, 0);
1074 1069
1075 l.touch (x); 1070 l.touch (x);
1076 1071
… …
1109 * Process DEC Back Index 1104 * Process DEC Back Index
1110 * XTERM_SEQ: ESC 6 1105 * XTERM_SEQ: ESC 6
1111 * 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
1112 * in that row right. Clear left column. 1107 * in that row right. Clear left column.
1113 */ 1108 */
1114#if ENABLE_FRILLS 1109#if !ENABLE_MINIMAL
1115void 1110void
1116rxvt_term::scr_backindex () NOTHROW 1111rxvt_term::scr_backindex () NOTHROW
1117{ 1112{
1118 if (screen.cur.col > 0) 1113 if (screen.cur.col > 0)
1119 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1114 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1126 * Process DEC Forward Index 1121 * Process DEC Forward Index
1127 * XTERM_SEQ: ESC 9 1122 * XTERM_SEQ: ESC 9
1128 * 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
1129 * in that row left. Clear right column. 1124 * in that row left. Clear right column.
1130 */ 1125 */
1131#if ENABLE_FRILLS 1126#if !ENABLE_MINIMAL
1132void 1127void
1133rxvt_term::scr_forwardindex () NOTHROW 1128rxvt_term::scr_forwardindex () NOTHROW
1134{ 1129{
1135 if (screen.cur.col < ncol - 1) 1130 if (screen.cur.col < ncol - 1)
1136 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1131 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1183 } 1178 }
1184 } 1179 }
1185 else 1180 else
1186 { 1181 {
1187 if (screen.flags & Screen_Relative) 1182 if (screen.flags & Screen_Relative)
1183 {
1188 { /* relative origin mode */ 1184 /* relative origin mode */
1189 screen.cur.row = row + screen.tscroll; 1185 screen.cur.row = row + screen.tscroll;
1190 min_it (screen.cur.row, screen.bscroll); 1186 min_it (screen.cur.row, screen.bscroll);
1191 } 1187 }
1192 else 1188 else
1193 screen.cur.row = row; 1189 screen.cur.row = row;
… …
1226/* 1222/*
1227 * Erase part or whole of a line 1223 * Erase part or whole of a line
1228 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1224 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1229 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1225 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1230 * 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
1231 */ 1228 */
1232void 1229void
1233rxvt_term::scr_erase_line (int mode) NOTHROW 1230rxvt_term::scr_erase_line (int mode) NOTHROW
1234{ 1231{
1235 unsigned int col, num; 1232 unsigned int col, num;
… …
1244 line.touch (); 1241 line.touch ();
1245 line.is_longer (0); 1242 line.is_longer (0);
1246 1243
1247 switch (mode) 1244 switch (mode)
1248 { 1245 {
1246 case 3:
1247 if (screen.flags & Screen_WrapNext)
1248 return;
1249
1250 /* fall through */
1251
1249 case 0: /* erase to end of line */ 1252 case 0: /* erase to end of line */
1250 col = screen.cur.col; 1253 col = screen.cur.col;
1251 num = ncol - col; 1254 num = ncol - col;
1252 min_it (line.l, col); 1255 min_it (line.l, col);
1256
1253 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1254 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1255 CLEAR_SELECTION (); 1259 CLEAR_SELECTION ();
1256 break; 1260 break;
1261
1257 case 1: /* erase to beginning of line */ 1262 case 1: /* erase to beginning of line */
1258 col = 0; 1263 col = 0;
1259 num = screen.cur.col + 1; 1264 num = screen.cur.col + 1;
1265
1260 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1266 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1261 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1267 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1262 CLEAR_SELECTION (); 1268 CLEAR_SELECTION ();
1263 break; 1269 break;
1270
1264 case 2: /* erase whole line */ 1271 case 2: /* erase whole line */
1265 col = 0; 1272 col = 0;
1266 num = ncol; 1273 num = ncol;
1267 line.l = 0; 1274 line.l = 0;
1268 if (selection.beg.row <= screen.cur.row 1275 if (selection.beg.row <= screen.cur.row
… …
1326 if (row >= nrow) /* Out Of Bounds */ 1333 if (row >= nrow) /* Out Of Bounds */
1327 return; 1334 return;
1328 1335
1329 min_it (num, nrow - row); 1336 min_it (num, nrow - row);
1330 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.
1331 if (rstyle & (RS_RVid | RS_Uline)) 1341 if (rstyle & (RS_RVid | RS_Uline))
1332 ren = (rend_t) ~RS_None; 1342 ren = (rend_t) ~RS_None;
1333 else if (GET_BASEBG (rstyle) == Color_bg) 1343 else if (GET_BASEBG (rstyle) == Color_bg)
1334 { 1344 {
1335 ren = DEFAULT_RSTYLE; 1345 ren = DEFAULT_RSTYLE;
1336 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);
1337 } 1351 }
1338 else 1352 else
1339 { 1353 {
1340 ren = rstyle & (RS_fgMask | RS_bgMask); 1354 ren = rstyle & (RS_fgMask | RS_bgMask);
1355
1356 if (mapped && !view_start)
1357 {
1341 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1342 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1359 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1343 ERASE_ROWS (row, num); 1360 XFillRectangle (dpy, vt, gc,
1361 0, Row2Pixel (row - view_start),
1362 (unsigned int)width,
1363 (unsigned int)Height2Pixel (num));
1344 gcvalue.foreground = pix_colors[Color_fg]; 1364 gcvalue.foreground = pix_colors[Color_fg];
1345 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1365 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1366 }
1346 } 1367 }
1347 1368
1348 for (; num--; row++) 1369 for (; num--; row++)
1349 { 1370 {
1350 scr_blank_screen_mem (ROW(row), rstyle); 1371 scr_blank_screen_mem (ROW(row), rstyle);
1372
1373 if (!view_start)
1351 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1374 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1352 } 1375 }
1353} 1376}
1354 1377
1355#if ENABLE_FRILLS 1378#if !ENABLE_MINIMAL
1356void 1379void
1357rxvt_term::scr_erase_savelines () NOTHROW 1380rxvt_term::scr_erase_savelines () NOTHROW
1358{ 1381{
1359 want_refresh = 1; 1382 want_refresh = 1;
1360 ZERO_SCROLLBACK (); 1383 ZERO_SCROLLBACK ();
… …
1430 * Insert/Delete <count> characters from the current position 1453 * Insert/Delete <count> characters from the current position
1431 */ 1454 */
1432void 1455void
1433rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1456rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1434{ 1457{
1435 int col, row;
1436 rend_t tr;
1437
1438 want_refresh = 1; 1458 want_refresh = 1;
1439 ZERO_SCROLLBACK (); 1459 ZERO_SCROLLBACK ();
1440 1460
1441 if (count <= 0) 1461 if (count <= 0)
1442 return; 1462 return;
… …
1444 scr_do_wrap (); 1464 scr_do_wrap ();
1445 1465
1446 selection_check (1); 1466 selection_check (1);
1447 min_it (count, ncol - screen.cur.col); 1467 min_it (count, ncol - screen.cur.col);
1448 1468
1449 row = screen.cur.row; 1469 int row = screen.cur.row;
1450 1470
1451 line_t *line = &ROW(row); 1471 line_t *line = &ROW(row);
1452 1472
1453 line->touch (); 1473 line->touch ();
1454 line->is_longer (0); 1474 line->is_longer (0);
1455 1475
1476 // nuke wide spanning the start
1477 if (line->t[screen.cur.col] == NOCHAR)
1478 scr_kill_char (*line, screen.cur.col);
1479
1456 switch (insdel) 1480 switch (insdel)
1457 { 1481 {
1458 case INSERT: 1482 case INSERT:
1459 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--)
1460 { 1489 {
1461 line->t[col] = line->t[col - count]; 1490 line->t[col] = line->t[col - count];
1462 line->r[col] = line->r[col - count]; 1491 line->r[col] = line->r[col - count];
1463 } 1492 }
1464
1465 line->l = min (line->l + count, ncol);
1466 1493
1467 if (selection.op && current_screen == selection.screen 1494 if (selection.op && current_screen == selection.screen
1468 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1495 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1469 { 1496 {
1470 if (selection.end.row != screen.cur.row 1497 if (selection.end.row != screen.cur.row
1471 || (selection.end.col + count >= ncol)) 1498 || (selection.end.col + count >= ncol))
1472 CLEAR_SELECTION (); 1499 CLEAR_SELECTION ();
1473 else 1500 else
1501 {
1474 { /* shift selection */ 1502 /* shift selection */
1475 selection.beg.col += count; 1503 selection.beg.col += count;
1476 selection.mark.col += count; /* XXX: yes? */ 1504 selection.mark.col += count; /* XXX: yes? */
1477 selection.end.col += count; 1505 selection.end.col += count;
1478 } 1506 }
1479 } 1507 }
… …
1484 case ERASE: 1512 case ERASE:
1485 screen.cur.col += count; /* don't worry if > ncol */ 1513 screen.cur.col += count; /* don't worry if > ncol */
1486 selection_check (1); 1514 selection_check (1);
1487 screen.cur.col -= count; 1515 screen.cur.col -= count;
1488 1516
1489 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
1490 scr_blank_line (*line, screen.cur.col, count, rstyle); 1521 scr_blank_line (*line, screen.cur.col, count, rstyle);
1491 break; 1522 break;
1492 1523
1493 case DELETE: 1524 case DELETE:
1494 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1525 line->l = max (line->l - count, 0);
1495 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
1496 for (col = screen.cur.col; (col + count) < ncol; col++) 1531 for (int col = screen.cur.col; (col + count) < ncol; col++)
1497 { 1532 {
1498 line->t[col] = line->t[col + count]; 1533 line->t[col] = line->t[col + count];
1499 line->r[col] = line->r[col + count]; 1534 line->r[col] = line->r[col + count];
1500 } 1535 }
1501 1536
1502 line->l = max (line->l - count, 0);
1503 scr_blank_line (*line, ncol - count, count, tr); 1537 scr_blank_line (*line, ncol - count, count, rstyle);
1504 1538
1505 if (selection.op && current_screen == selection.screen 1539 if (selection.op && current_screen == selection.screen
1506 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1540 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1507 { 1541 {
1508 if (selection.end.row != screen.cur.row 1542 if (selection.end.row != screen.cur.row
… …
1618 */ 1652 */
1619void 1653void
1620rxvt_term::scr_set_tab (int mode) NOTHROW 1654rxvt_term::scr_set_tab (int mode) NOTHROW
1621{ 1655{
1622 if (mode < 0) 1656 if (mode < 0)
1623 memset (tabs, 0, ncol * sizeof (char)); 1657 memset (tabs, 0, ncol);
1624 else if (screen.cur.col < ncol) 1658 else if (screen.cur.col < ncol)
1625 tabs [screen.cur.col] = !!mode; 1659 tabs [screen.cur.col] = !!mode;
1626} 1660}
1627 1661
1628/* ------------------------------------------------------------------------- */ 1662/* ------------------------------------------------------------------------- */
… …
1643 if (rvideo_state != on) 1677 if (rvideo_state != on)
1644 { 1678 {
1645 rvideo_state = on; 1679 rvideo_state = on;
1646 1680
1647 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1681 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1648#if XPM_BACKGROUND 1682#ifdef HAVE_BG_PIXMAP
1649 if (bgPixmap.pixmap == None) 1683 if (bgPixmap.pixmap == None)
1650#endif 1684#endif
1651#if TRANSPARENT
1652 if (!OPTION (Opt_transparent) || am_transparent == 0)
1653#endif
1654 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 1685 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1655 1686
1656 XGCValues gcvalue; 1687 XGCValues gcvalue;
1657 gcvalue.foreground = pix_colors[Color_fg]; 1688 gcvalue.foreground = pix_colors[Color_fg];
1658 gcvalue.background = pix_colors[Color_bg]; 1689 gcvalue.background = pix_colors[Color_bg];
1659 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); 1690 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1660 1691
1661 scr_clear (); 1692 scr_clear ();
1662 scr_touch (true); 1693 scr_touch (true);
1663 } 1694 }
1664} 1695}
… …
1749{ 1780{
1750 bool found = false; 1781 bool found = false;
1751 1782
1752 for (int i = 0; i < nrow; i++) 1783 for (int i = 0; i < nrow; i++)
1753 { 1784 {
1754 int col = 0;
1755 rend_t *drp = drawn_buf[i].r; 1785 rend_t *drp = drawn_buf[i].r;
1756 1786
1757 for (; col < ncol; col++, drp++) 1787 for (int col = 0; col < ncol; col++, drp++)
1758 if ((*drp & mask) == value) 1788 if ((*drp & mask) == value)
1759 { 1789 {
1760 found = true; 1790 found = true;
1761 *drp = ~value; 1791 *drp = ~value;
1762 } 1792 }
… …
1802 for (i = PART_BEG; i < RC_COUNT; i++) 1832 for (i = PART_BEG; i < RC_COUNT; i++)
1803 { 1833 {
1804 min_it (rc[i].col, ncol - 1); 1834 min_it (rc[i].col, ncol - 1);
1805 min_it (rc[i].row, nrow - 1); 1835 min_it (rc[i].row, nrow - 1);
1806 } 1836 }
1807 1837// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1808 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++)
1809 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);
1810 1840
1811 num_scr_allow = 0; 1841 num_scr_allow = 0;
1812 1842
… …
1867 return true; 1897 return true;
1868} 1898}
1869 1899
1870#ifndef NO_BELL 1900#ifndef NO_BELL
1871void 1901void
1872rxvt_term::bell_cb (time_watcher &w) 1902rxvt_term::bell_cb (ev::timer &w, int revents)
1873{ 1903{
1874 rvideo_bell = false; 1904 rvideo_bell = false;
1875 scr_rvideo_mode (rvideo_mode); 1905 scr_rvideo_mode (rvideo_mode);
1906 refresh_check ();
1876} 1907}
1877#endif 1908#endif
1878 1909
1879/* ------------------------------------------------------------------------- */ 1910/* ------------------------------------------------------------------------- */
1880void 1911void
… …
1882{ 1913{
1883#ifndef NO_BELL 1914#ifndef NO_BELL
1884 1915
1885# ifndef NO_MAPALERT 1916# ifndef NO_MAPALERT
1886# ifdef MAPALERT_OPTION 1917# ifdef MAPALERT_OPTION
1887 if (OPTION (Opt_mapAlert)) 1918 if (option (Opt_mapAlert))
1888# endif 1919# endif
1889 XMapWindow (display->display, parent[0]); 1920 XMapWindow (dpy, parent[0]);
1890# endif 1921# endif
1891 1922
1923# if ENABLE_FRILLS
1924 if (option (Opt_urgentOnBell))
1925 set_urgency (1);
1926# endif
1927
1892 if (OPTION (Opt_visualBell)) 1928 if (option (Opt_visualBell))
1893 { 1929 {
1894 rvideo_bell = true; 1930 rvideo_bell = true;
1895 scr_rvideo_mode (rvideo_mode); 1931 scr_rvideo_mode (rvideo_mode);
1896 display->flush (); 1932 flush ();
1897 1933
1898 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1934 bell_ev.start (VISUAL_BELL_DURATION);
1899 } 1935 }
1900 else 1936 else
1901 XBell (display->display, 0); 1937 XBell (dpy, 0);
1902 1938 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1903#endif 1939#endif
1904} 1940}
1905 1941
1906/* ------------------------------------------------------------------------- */ 1942/* ------------------------------------------------------------------------- */
1907/* ARGSUSED */ 1943/* ARGSUSED */
1908void 1944void
1909rxvt_term::scr_printscreen (int fullhist) NOTHROW 1945rxvt_term::scr_printscreen (int fullhist) NOTHROW
1910{ 1946{
1911#ifdef PRINTPIPE 1947#ifdef PRINTPIPE
1912 int nrows, row_start; 1948 int nrows, row_start;
1913 FILE *fd; 1949 FILE *fd = popen_printer ();
1914 1950
1915 if ((fd = popen_printer ()) == NULL) 1951 if (!fd)
1916 return; 1952 return;
1917 1953
1918 if (fullhist) 1954 if (fullhist)
1919 { 1955 {
1920 nrows = nrow - top_row; 1956 nrows = nrow - top_row;
… …
1926 row_start = view_start; 1962 row_start = view_start;
1927 } 1963 }
1928 1964
1929 wctomb (0, 0); 1965 wctomb (0, 0);
1930 1966
1931 for (int r1 = 0; r1 < nrows; r1++) 1967 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1932 { 1968 {
1933 text_t *tp = ROW(r1).t; 1969 text_t *tp = ROW(r1).t;
1934 int len = ROW(r1).l; 1970 int len = ROW(r1).l;
1935 1971
1936 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1972 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1965 * screen.text/screen.rend contain what the screen will change to. 2001 * screen.text/screen.rend contain what the screen will change to.
1966 */ 2002 */
1967void 2003void
1968rxvt_term::scr_refresh () NOTHROW 2004rxvt_term::scr_refresh () NOTHROW
1969{ 2005{
1970 unsigned char must_clear, /* use draw_string not draw_image_string */
1971 showcursor; /* show the cursor */
1972 int16_t col, row, /* column/row we're processing */ 2006 int16_t col, row, /* column/row we're processing */
1973 ocrow; /* old cursor row */ 2007 ocrow; /* old cursor row */
1974 int i; /* tmp */ 2008 int i; /* tmp */
1975#ifndef NO_CURSORCOLOR 2009#ifndef NO_CURSORCOLOR
1976 rend_t cc1; /* store colours at cursor position (s) */ 2010 rend_t cc1; /* store colours at cursor position (s) */
1977#endif 2011#endif
1978 rend_t *crp; // cursor rendition pointer 2012 rend_t *crp; // cursor rendition pointer
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
1979 2015
1980 want_refresh = 0; /* screen is current */ 2016 want_refresh = 0; /* screen is current */
1981 2017
1982 if (refresh_type == NO_REFRESH || !mapped) 2018 if (refresh_type == NO_REFRESH || !mapped)
1983 return; 2019 return;
1984 2020
1985 /* 2021 /*
1986 * A: set up vars 2022 * A: set up vars
1987 */ 2023 */
1988 must_clear = 0;
1989 refresh_count = 0; 2024 refresh_count = 0;
1990 2025
1991#if XPM_BACKGROUND 2026 unsigned int old_screen_flags = screen.flags;
2027 char have_bg = 0;
2028#ifdef HAVE_BG_PIXMAP
1992 must_clear |= bgPixmap.pixmap != None; 2029 have_bg = bgPixmap.pixmap != None;
1993#endif
1994#if TRANSPARENT
1995 must_clear |= OPTION (Opt_transparent) && am_transparent;
1996#endif 2030#endif
1997 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2031 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1998 2032
1999 /* 2033 /*
2000 * B: reverse any characters which are selected 2034 * B: reverse any characters which are selected
2001 */ 2035 */
2002 scr_reverse_selection (); 2036 scr_reverse_selection ();
2037
2038 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2039#if ENABLE_OVERLAY
2040 scr_swap_overlay ();
2041#endif
2042
2043 char showcursor = screen.flags & Screen_VisibleCursor;
2003 2044
2004 /* 2045 /*
2005 * C: set the cursor character (s) 2046 * C: set the cursor character (s)
2006 */ 2047 */
2007 { 2048 {
2008 unsigned char setoldcursor; 2049 unsigned char setoldcursor;
2009 rend_t ccol1, /* Cursor colour */
2010 ccol2; /* Cursor colour2 */
2011 2050
2012 showcursor = (screen.flags & Screen_VisibleCursor);
2013#ifdef CURSOR_BLINK 2051#ifdef CURSOR_BLINK
2014 if (hidden_cursor) 2052 if (hidden_cursor)
2015 showcursor = 0; 2053 showcursor = 0;
2016#endif 2054#endif
2017 2055
… …
2022 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2060 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2023 col--; 2061 col--;
2024 2062
2025 crp = &ROW(screen.cur.row).r[col]; 2063 crp = &ROW(screen.cur.row).r[col];
2026 2064
2065#ifndef NO_CURSORCOLOR
2066 cc1 = *crp & (RS_fgMask | RS_bgMask);
2067 if (ISSET_PIXCOLOR (Color_cursor))
2068 ccol1 = Color_cursor;
2069 else
2070#endif
2071#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2072 ccol1 = fgcolor_of (rstyle);
2073#else
2074 ccol1 = Color_fg;
2075#endif
2076
2077#ifndef NO_CURSORCOLOR
2078 if (ISSET_PIXCOLOR (Color_cursor2))
2079 ccol2 = Color_cursor2;
2080 else
2081#endif
2082#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2083 ccol2 = bgcolor_of (rstyle);
2084#else
2085 ccol2 = Color_bg;
2086#endif
2087
2027 if (showcursor && focus) 2088 if (showcursor && focus)
2028 { 2089 {
2029 if (OPTION (Opt_cursorUnderline)) 2090 if (option (Opt_cursorUnderline))
2030 *crp ^= RS_Uline; 2091 *crp ^= RS_Uline;
2031 else 2092 else
2032 { 2093 {
2033 *crp ^= RS_RVid; 2094 *crp ^= RS_RVid;
2034
2035#ifndef NO_CURSORCOLOR
2036 cc1 = *crp & (RS_fgMask | RS_bgMask);
2037 if (ISSET_PIXCOLOR (Color_cursor))
2038 ccol1 = Color_cursor;
2039 else
2040#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2041 ccol1 = fgcolor_of (rstyle);
2042#else
2043 ccol1 = Color_fg;
2044#endif
2045 if (ISSET_PIXCOLOR (Color_cursor2))
2046 ccol2 = Color_cursor2;
2047 else
2048#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2049 ccol2 = bgcolor_of (rstyle);
2050#else
2051 ccol2 = Color_bg;
2052#endif
2053 *crp = SET_FGCOLOR (*crp, ccol1); 2095 *crp = SET_FGCOLOR (*crp, ccol1);
2054 *crp = SET_BGCOLOR (*crp, ccol2); 2096 *crp = SET_BGCOLOR (*crp, ccol2);
2055#endif
2056 } 2097 }
2057 } 2098 }
2058 } 2099 }
2059 2100
2060 /* make sure no outline cursor is left around */ 2101 /* make sure no outline cursor is left around */
… …
2087 oldcursor.col = screen.cur.col; 2128 oldcursor.col = screen.cur.col;
2088 } 2129 }
2089 } 2130 }
2090 } 2131 }
2091 2132
2092 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2093#if ENABLE_OVERLAY
2094 scr_swap_overlay ();
2095#endif
2096
2097#ifndef NO_SLOW_LINK_SUPPORT 2133#ifndef NO_SLOW_LINK_SUPPORT
2098 /* 2134 /*
2099 * D: CopyArea pass - very useful for slower links 2135 * D: CopyArea pass - very useful for slower links
2100 * This has been deliberately kept simple. 2136 * This has been deliberately kept simple.
2101 */ 2137 */
2102 if (!display->is_local 2138 if (!display->is_local
2103 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2139 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2104 && abs (num_scr) < nrow && !must_clear) 2140 && abs (num_scr) < nrow && !have_bg)
2105 { 2141 {
2106 int16_t nits; 2142 int16_t nits;
2143 int i = num_scr;
2107 int j; 2144 int j;
2108 int len, wlen; 2145 int len, wlen;
2109 dLocal (int, num_scr); 2146 dLocal (int, num_scr);
2110 2147
2111 j = nrow; 2148 j = nrow;
2112 wlen = len = -1; 2149 wlen = len = -1;
2113 row = i > 0 ? 0 : j - 1; 2150 row = i > 0 ? 0 : j - 1;
2151
2114 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2152 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2115 { 2153 {
2116 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2154 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2117 { 2155 {
2118 line_t s = ROW(view_start + row); 2156 line_t s = ROW(view_start + row);
… …
2139 wlen = row; 2177 wlen = row;
2140 continue; 2178 continue;
2141 } 2179 }
2142 } 2180 }
2143 2181
2144 if (len != -1) 2182 if (len >= 0)
2145 { 2183 {
2146 /* also comes here at end if needed because of >= above */ 2184 /* also comes here at end if needed because of >= above */
2147 if (wlen < len) 2185 if (wlen < len)
2148 ::swap (wlen, len); 2186 ::swap (wlen, len);
2149 2187
2188 XGCValues gcv;
2189
2190 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2150 XCopyArea (display->display, vt, vt, 2191 XCopyArea (dpy, vt, vt,
2151 gc, 0, Row2Pixel (len + i), 2192 gc, 0, Row2Pixel (len + i),
2152 (unsigned int)this->width, 2193 (unsigned int)this->width,
2153 (unsigned int)Height2Pixel (wlen - len + 1), 2194 (unsigned int)Height2Pixel (wlen - len + 1),
2154 0, Row2Pixel (len)); 2195 0, Row2Pixel (len));
2196 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2197
2155 len = -1; 2198 len = -1;
2156 } 2199 }
2157 } 2200 }
2158 } 2201 }
2159#endif 2202#endif
… …
2183 continue; 2226 continue;
2184 2227
2185 // redraw one or more characters 2228 // redraw one or more characters
2186 2229
2187 // seek to the beginning of wide characters 2230 // seek to the beginning of wide characters
2188 while (stp[col] == NOCHAR && col > 0) 2231 while (expect_false (stp[col] == NOCHAR && col > 0))
2189 --col; 2232 --col;
2190 2233
2191 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2234 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2192 text_t *text = stp + col; 2235 text_t *text = stp + col;
2193 int count = 1; 2236 int count = 1;
… …
2200 for (i = 0; ++col < ncol; ) 2243 for (i = 0; ++col < ncol; )
2201 { 2244 {
2202 if (stp[col] == NOCHAR) 2245 if (stp[col] == NOCHAR)
2203 { 2246 {
2204 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2205 drp[col] = rend; 2248 drp[col] = srp[col];
2249
2206 count++; 2250 count++;
2207 i++; 2251 i++;
2208 2252
2209 continue; 2253 continue;
2210 } 2254 }
… …
2215 count++; 2259 count++;
2216 2260
2217 if (stp[col] != dtp[col] 2261 if (stp[col] != dtp[col]
2218 || !RS_SAME (srp[col], drp[col])) 2262 || !RS_SAME (srp[col], drp[col]))
2219 { 2263 {
2220 if (must_clear && (i++ > count / 2)) 2264 if (have_bg && (i++ > count / 2))
2221 break; 2265 break;
2222 2266
2223 dtp[col] = stp[col]; 2267 dtp[col] = stp[col];
2224 drp[col] = rend; 2268 drp[col] = rend;
2225 i = 0; 2269 i = 0;
2226 } 2270 }
2227 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2271 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2228 break; 2272 break;
2229 } 2273 }
2230 2274
2231 col--; /* went one too far. move back */ 2275 col--; /* went one too far. move back */
2232 count -= i; /* dump any matching trailing chars */ 2276 count -= i; /* dump any matching trailing chars */
2233 2277
2234 // sometimes we optimize away the trailing NOCHAR's, add them back 2278 // sometimes we optimize away the trailing NOCHAR's, add them back
2235 while (i && text[count] == NOCHAR) 2279 while (expect_false (i && text[count] == NOCHAR))
2236 count++, i--; 2280 count++, i--;
2237 2281
2238 /* 2282 /*
2239 * Determine the attributes for the string 2283 * Determine the attributes for the string
2240 */ 2284 */
2241 int fore = fgcolor_of (rend); // desired foreground 2285 int fore = fgcolor_of (rend); // desired foreground
2242 int back = bgcolor_of (rend); // desired background 2286 int back = bgcolor_of (rend); // desired background
2243 2287
2244 // only do special processing if any attributes are set, which is unlikely 2288 // only do special processing if any attributes are set, which is unlikely
2245 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2289 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2246 { 2290 {
2247#if ENABLE_STYLES
2248 // force redraw after "careful" characters to avoid pixel droppings
2249 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2250 drp[col + 1] = ~srp[col + 1];
2251
2252 // include previous careful character(s) if possible, looks nicer (best effort...)
2253 while (text > stp
2254 && srp[text - stp - 1] & RS_Careful
2255 && RS_SAME (rend, srp[text - stp - 1]))
2256 text--, count++, xpixel -= fwidth;
2257#endif
2258
2259 bool invert = rend & RS_RVid; 2291 bool invert = rend & RS_RVid;
2260 2292
2261#ifndef NO_BOLD_UNDERLINE_REVERSE 2293#ifndef NO_BOLD_UNDERLINE_REVERSE
2262 if (rend & RS_Bold
2263 && fore == Color_fg) 2294 if (rend & RS_Bold && fore == Color_fg)
2264 { 2295 {
2265 if (ISSET_PIXCOLOR (Color_BD)) 2296 if (ISSET_PIXCOLOR (Color_BD))
2266 fore = Color_BD; 2297 fore = Color_BD;
2267# if !ENABLE_STYLES 2298# if !ENABLE_STYLES
2268 else 2299 else
2269 invert = !invert; 2300 invert = !invert;
2270# endif 2301# endif
2271 } 2302 }
2272 2303
2273 if (rend & RS_Italic 2304 if (rend & RS_Italic && fore == Color_fg)
2274 && fore == Color_fg)
2275 { 2305 {
2276 if (ISSET_PIXCOLOR (Color_IT)) 2306 if (ISSET_PIXCOLOR (Color_IT))
2277 fore = Color_IT; 2307 fore = Color_IT;
2278# if !ENABLE_STYLES 2308# if !ENABLE_STYLES
2279 else 2309 else
2280 invert = !invert; 2310 invert = !invert;
2281# endif 2311# endif
2282 } 2312 }
2283 2313
2284 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2285 fore = Color_UL; 2315 fore = Color_UL;
2286#endif 2316#endif
2287 2317
2288 if (invert) 2318 if (invert)
2289 { 2319 {
2320#ifdef OPTION_HC
2321 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2322 || !ISSET_PIXCOLOR (Color_HC))
2323#endif
2324 /* invert the column if no highlightColor is set or it is the
2325 * current cursor column */
2290 ::swap (fore, back); 2326 ::swap (fore, back);
2327#ifdef OPTION_HC
2328 else if (ISSET_PIXCOLOR (Color_HC))
2329 back = Color_HC;
2330#endif
2291 2331
2292#ifndef NO_BOLD_UNDERLINE_REVERSE 2332#ifndef NO_BOLD_UNDERLINE_REVERSE
2333# ifndef OPTION_HC
2293 if (ISSET_PIXCOLOR (Color_RV)) 2334 if (ISSET_PIXCOLOR (Color_RV))
2294 back = Color_RV; 2335 back = Color_RV;
2295 2336# endif
2296 if (fore == back) 2337 if (fore == back)
2297 { 2338 {
2298 fore = Color_bg; 2339 fore = Color_bg;
2299 back = Color_fg; 2340 back = Color_fg;
2300 } 2341 }
… …
2302 } 2343 }
2303 2344
2304#ifdef TEXT_BLINK 2345#ifdef TEXT_BLINK
2305 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2346 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2306 { 2347 {
2307 if (!text_blink_ev.active) 2348 if (!text_blink_ev.is_active ())
2308 { 2349 {
2309 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2350 text_blink_ev.again ();
2310 hidden_text = 0; 2351 hidden_text = 0;
2311 } 2352 }
2312 else if (hidden_text) 2353 else if (hidden_text)
2313 fore = back; 2354 fore = back;
2314 } 2355 }
2315#endif 2356#endif
2357
2358#if ENABLE_STYLES
2359 // "careful" (too wide) character handling
2360
2361 // include previous careful character(s) if possible, looks nicer (best effort...)
2362 while (text > stp
2363 && srp[text - stp - 1] & RS_Careful
2364 && RS_SAME (rend, srp[text - stp - 1]))
2365 text--, count++, xpixel -= fwidth;
2366
2367 // force redraw after "careful" characters to avoid pixel droppings
2368 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2369 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2370
2371 // force redraw before "careful" characters to avoid pixel droppings
2372 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2373 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2374#endif
2316 } 2375 }
2317 2376
2318 /* 2377 /*
2319 * Actually do the drawing of the string here 2378 * Actually do the drawing of the string here
2320 */ 2379 */
2321 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2380 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2322 2381
2323 if (back == fore) 2382 if (expect_true (have_bg && back == Color_bg))
2324 font->clear_rect (*drawable, xpixel, ypixel,
2325 fwidth * count, fheight,
2326 back);
2327 else if (back == Color_bg)
2328 { 2383 {
2329 if (must_clear) 2384 // this is very ugly, maybe push it into ->draw?
2330 {
2331 CLEAR_CHARS (xpixel, ypixel, count);
2332 2385
2333 for (i = 0; i < count; i++) /* don't draw empty strings */ 2386 for (i = 0; i < count; i++) /* don't draw empty strings */
2334 if (text[i] != ' ') 2387 if (text[i] != ' ')
2335 { 2388 {
2336 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2389 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2337 break; 2390 goto did_clear;
2338 }
2339 } 2391 }
2340 else 2392
2341 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2393 CLEAR_CHARS (xpixel, ypixel, count);
2394 did_clear: ;
2342 } 2395 }
2343 else 2396 else
2344 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2397 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2345 2398
2346 if (rend & RS_Uline && font->descent > 1 && fore != back) 2399 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2347 { 2400 {
2348#if ENABLE_FRILLS 2401#if ENABLE_FRILLS
2349 if (ISSET_PIXCOLOR (Color_underline)) 2402 if (ISSET_PIXCOLOR (Color_underline))
2350 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2403 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2351 else 2404 else
2352#endif 2405#endif
2353 XSetForeground (display->display, gc, pix_colors[fore]); 2406 XSetForeground (dpy, gc, pix_colors[fore]);
2354 2407
2355 XDrawLine (display->display, drawBuffer, gc, 2408 XDrawLine (dpy, vt, gc,
2356 xpixel, ypixel + font->ascent + 1, 2409 xpixel, ypixel + font->ascent + 1,
2357 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2410 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2358 } 2411 }
2359 } /* for (col....) */ 2412 } /* for (col....) */
2360 } /* for (row....) */ 2413 } /* for (row....) */
2361 2414
2362#if ENABLE_OVERLAY
2363 scr_swap_overlay ();
2364#endif
2365 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2366
2367 /* 2415 /*
2368 * G: cleanup cursor and display outline cursor if necessary 2416 * G: cleanup cursor and display outline cursor if necessary
2369 */ 2417 */
2370 if (showcursor) 2418 if (showcursor)
2371 { 2419 {
2372 if (focus) 2420 if (focus)
2373 { 2421 {
2374 if (OPTION (Opt_cursorUnderline)) 2422 if (option (Opt_cursorUnderline))
2375 *crp ^= RS_Uline; 2423 *crp ^= RS_Uline;
2376 else 2424 else
2377 { 2425 {
2378 *crp ^= RS_RVid; 2426 *crp ^= RS_RVid;
2379#ifndef NO_CURSORCOLOR 2427#ifndef NO_CURSORCOLOR
… …
2393 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2441 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2394 cursorwidth++; 2442 cursorwidth++;
2395 2443
2396#ifndef NO_CURSORCOLOR 2444#ifndef NO_CURSORCOLOR
2397 if (ISSET_PIXCOLOR (Color_cursor)) 2445 if (ISSET_PIXCOLOR (Color_cursor))
2398 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2446 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2447 else
2399#endif 2448#endif
2449 XSetForeground (dpy, gc, pix_colors[ccol1]);
2400 2450
2401 XDrawRectangle (display->display, drawBuffer, gc, 2451 XDrawRectangle (dpy, vt, gc,
2402 Col2Pixel (col), 2452 Col2Pixel (col),
2403 Row2Pixel (oldcursor.row), 2453 Row2Pixel (oldcursor.row),
2404 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2454 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2405 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2455 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2406 } 2456 }
2407 } 2457 }
2408 2458
2409 /* 2459 /*
2410 * H: cleanup selection 2460 * H: cleanup selection
2411 */ 2461 */
2462#if ENABLE_OVERLAY
2463 scr_swap_overlay ();
2464#endif
2465 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2466
2412 scr_reverse_selection (); 2467 scr_reverse_selection ();
2413 2468
2469 screen.flags = old_screen_flags;
2414 num_scr = 0; 2470 num_scr = 0;
2415 num_scr_allow = 1; 2471 num_scr_allow = 1;
2416} 2472}
2417 2473
2418void 2474void
… …
2441} 2497}
2442 2498
2443void 2499void
2444rxvt_term::scr_recolour () NOTHROW 2500rxvt_term::scr_recolour () NOTHROW
2445{ 2501{
2446 if (1 2502#ifdef HAVE_BG_PIXMAP
2447#if TRANSPARENT 2503 bgPixmap.apply ();
2448 && !am_transparent 2504#else
2449#endif 2505
2450#if XPM_BACKGROUND
2451 && !bgPixmap.pixmap
2452#endif
2453 )
2454 {
2455 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2506 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2456 XClearWindow (display->display, parent[0]); 2507 XClearWindow (dpy, parent[0]);
2457 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2508 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2458#if HAVE_SCROLLBARS 2509
2459 if (scrollBar.win) 2510 if (scrollBar.win)
2460 { 2511 {
2461 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2512 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2462 scrollBar.setIdle (); 2513 scrollBar.state = STATE_IDLE;
2463 scrollbar_show (0); 2514 scrollBar.show (0);
2464 }
2465#endif
2466 } 2515 }
2467 2516
2517#endif
2518
2519 /* bgPixmap.apply () does not do the following : */
2468 scr_clear (); 2520 scr_clear ();
2469 scr_touch (true); 2521 scr_touch (true);
2470 want_refresh = 1; 2522 want_refresh = 1;
2471} 2523}
2472 2524
… …
2479 2531
2480 num_scr_allow = 0; 2532 num_scr_allow = 0;
2481 want_refresh = 1; 2533 want_refresh = 1;
2482 2534
2483 if (really) 2535 if (really)
2484 XClearWindow (display->display, vt); 2536 XClearWindow (dpy, vt);
2485} 2537}
2486 2538
2487void 2539void
2488rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2540rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2489{ 2541{
… …
2538{ 2590{
2539 if (selection.op 2591 if (selection.op
2540 && current_screen == selection.screen 2592 && current_screen == selection.screen
2541 && selection.end.row >= view_start) 2593 && selection.end.row >= view_start)
2542 { 2594 {
2543#if ENABLE_FRILLS 2595#if !ENABLE_MINIMAL
2544 if (selection.rect) 2596 if (selection.rect)
2545 scr_xor_rect (selection.beg.row, selection.beg.col, 2597 scr_xor_rect (selection.beg.row, selection.beg.col,
2546 selection.end.row, selection.end.col, 2598 selection.end.row, selection.end.col,
2547 RS_RVid, RS_RVid | RS_Uline); 2599 RS_RVid, RS_RVid | RS_Uline);
2548 else 2600 else
… …
2564{ 2616{
2565 int row, wrote; 2617 int row, wrote;
2566 unsigned int width, towrite; 2618 unsigned int width, towrite;
2567 char r1[] = "\n"; 2619 char r1[] = "\n";
2568 2620
2569 for (row = saveLines - nsaved; 2621 for (row = saveLines + top_row;
2570 row < saveLines + nrow - 1; row++) 2622 row < saveLines + nrow - 1; row++)
2571 { 2623 {
2572 width = row_buf[row].l >= 0 ? row_buf[row].l 2624 width = row_buf[row].l >= 0 ? row_buf[row].l
2573 : ncol; 2625 : ncol;
2574 for (towrite = width; towrite; towrite -= wrote) 2626 for (towrite = width; towrite; towrite -= wrote)
… …
2625 /* convert normal newline chars into common keyboard Return key sequence */ 2677 /* convert normal newline chars into common keyboard Return key sequence */
2626 for (unsigned int i = 0; i < len; i++) 2678 for (unsigned int i = 0; i < len; i++)
2627 if (data[i] == C0_LF) 2679 if (data[i] == C0_LF)
2628 data[i] = C0_CR; 2680 data[i] = C0_CR;
2629 2681
2682 if (priv_modes & PrivMode_BracketPaste)
2683 tt_printf ("\e[200~");
2684
2630 tt_write (data, len); 2685 tt_write (data, len);
2686
2687 if (priv_modes & PrivMode_BracketPaste)
2688 tt_printf ("\e[201~");
2631} 2689}
2632 2690
2633/* ------------------------------------------------------------------------- */ 2691/* ------------------------------------------------------------------------- */
2634/* 2692/*
2635 * Respond to a notification that a primary selection has been sent 2693 * Respond to a notification that a primary selection has been sent
… …
2664 } 2722 }
2665 2723
2666 unsigned long bytes_after; 2724 unsigned long bytes_after;
2667 XTextProperty ct; 2725 XTextProperty ct;
2668 2726
2669 if (XGetWindowProperty (display->display, win, prop, 2727 if (XGetWindowProperty (dpy, win, prop,
2670 0, PROP_SIZE / 4, 2728 0, PROP_SIZE / 4,
2671 delete_prop, AnyPropertyType, 2729 delete_prop, AnyPropertyType,
2672 &ct.encoding, &ct.format, 2730 &ct.encoding, &ct.format,
2673 &ct.nitems, &bytes_after, 2731 &ct.nitems, &bytes_after,
2674 &ct.value) != Success) 2732 &ct.value) != Success)
… …
2683 if (bytes_after) 2741 if (bytes_after)
2684 { 2742 {
2685 // fetch and append remaining data 2743 // fetch and append remaining data
2686 XTextProperty ct2; 2744 XTextProperty ct2;
2687 2745
2688 if (XGetWindowProperty (display->display, win, prop, 2746 if (XGetWindowProperty (dpy, win, prop,
2689 ct.nitems / 4, (bytes_after + 3) / 4, 2747 ct.nitems / 4, (bytes_after + 3) / 4,
2690 delete_prop, AnyPropertyType, 2748 delete_prop, AnyPropertyType,
2691 &ct2.encoding, &ct2.format, 2749 &ct2.encoding, &ct2.format,
2692 &ct2.nitems, &bytes_after, 2750 &ct2.nitems, &bytes_after,
2693 &ct2.value) != Success) 2751 &ct2.value) != Success)
… …
2706 2764
2707 if (ct.encoding == xa[XA_INCR]) 2765 if (ct.encoding == xa[XA_INCR])
2708 { 2766 {
2709 // INCR selection, start handshake 2767 // INCR selection, start handshake
2710 if (!delete_prop) 2768 if (!delete_prop)
2711 XDeleteProperty (display->display, win, prop); 2769 XDeleteProperty (dpy, win, prop);
2712 2770
2713 selection_wait = Sel_incr; 2771 selection_wait = Sel_incr;
2714 incr_buf_fill = 0; 2772 incr_buf_fill = 0;
2715 incr_ev.start (NOW + 10); 2773 incr_ev.start (10);
2716 2774
2717 goto bailout; 2775 goto bailout;
2718 } 2776 }
2719 2777
2720 if (ct.nitems == 0) 2778 if (ct.nitems == 0)
… …
2729 ct.nitems = incr_buf_fill; 2787 ct.nitems = incr_buf_fill;
2730 incr_buf = 0; 2788 incr_buf = 0;
2731 incr_buf_size = 0; 2789 incr_buf_size = 0;
2732 incr_ev.stop (); 2790 incr_ev.stop ();
2733 } 2791 }
2734 else 2792 else
2735 { 2793 {
2736 if (selection_wait == Sel_normal 2794 if (selection_wait == Sel_normal
2737 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2795 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2738 { 2796 {
2739 /* 2797 /*
… …
2746 goto bailout; 2804 goto bailout;
2747 } 2805 }
2748 } 2806 }
2749 else if (selection_wait == Sel_incr) 2807 else if (selection_wait == Sel_incr)
2750 { 2808 {
2751 incr_ev.start (NOW + 10); 2809 incr_ev.start (10);
2752 2810
2753 while (incr_buf_fill + ct.nitems > incr_buf_size) 2811 while (incr_buf_fill + ct.nitems > incr_buf_size)
2754 { 2812 {
2755 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2813 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2756 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2814 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2763 } 2821 }
2764 2822
2765 char **cl; 2823 char **cl;
2766 int cr; 2824 int cr;
2767 2825
2768#if ENABLE_FRILLS 2826#if !ENABLE_MINIMAL
2769 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2827 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2770 // so recode it manually 2828 // so recode it manually
2771 if (ct.encoding == xa[XA_UTF8_STRING]) 2829 if (ct.encoding == xa[XA_UTF8_STRING])
2772 { 2830 {
2773 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2831 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2777 paste (s, strlen (s)); 2835 paste (s, strlen (s));
2778 free (s); 2836 free (s);
2779 } 2837 }
2780 else 2838 else
2781#endif 2839#endif
2782 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2840 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2783 && cl) 2841 && cl)
2784 { 2842 {
2785 for (int i = 0; i < cr; i++) 2843 for (int i = 0; i < cr; i++)
2786 paste (cl[i], strlen (cl[i])); 2844 paste (cl[i], strlen (cl[i]));
2787 2845
… …
2796 if (selection_wait == Sel_normal) 2854 if (selection_wait == Sel_normal)
2797 selection_wait = Sel_none; 2855 selection_wait = Sel_none;
2798} 2856}
2799 2857
2800void 2858void
2801rxvt_term::incr_cb (time_watcher &w) NOTHROW 2859rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2802{ 2860{
2803 selection_wait = Sel_none; 2861 selection_wait = Sel_none;
2804 2862
2805 incr_buf_size = 0; 2863 incr_buf_size = 0;
2806 free (incr_buf); 2864 free (incr_buf);
… …
2817 selection_paste (win, prop, true); 2875 selection_paste (win, prop, true);
2818} 2876}
2819 2877
2820/* ------------------------------------------------------------------------- */ 2878/* ------------------------------------------------------------------------- */
2821/* 2879/*
2822 * Request the current selection: 2880 * Request the current selection:
2823 * Order: > internal selection if available 2881 * Order: > internal selection if available
2824 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2882 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2825 * > CUT_BUFFER0 2883 * > CUT_BUFFER0
2826 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2884 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2827 * will auto fallback to CUT_BUFFER0 2885 * will auto fallback to CUT_BUFFER0
… …
2829 */ 2887 */
2830void 2888void
2831rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2889rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2832{ 2890{
2833 if (selection.text && selnum == Sel_Primary) 2891 if (selection.text && selnum == Sel_Primary)
2892 {
2834 { /* internal selection */ 2893 /* internal selection */
2835 char *str = rxvt_wcstombs (selection.text, selection.len); 2894 char *str = rxvt_wcstombs (selection.text, selection.len);
2836 paste (str, strlen (str)); 2895 paste (str, strlen (str));
2837 free (str); 2896 free (str);
2838 return; 2897 return;
2839 } 2898 }
… …
2869 else if (selnum == Sel_Secondary) 2928 else if (selnum == Sel_Secondary)
2870 sel = XA_SECONDARY; 2929 sel = XA_SECONDARY;
2871 else 2930 else
2872 sel = xa[XA_CLIPBOARD]; 2931 sel = xa[XA_CLIPBOARD];
2873 2932
2874 if (XGetSelectionOwner (display->display, sel) != None) 2933 if (XGetSelectionOwner (dpy, sel) != None)
2875 { 2934 {
2876 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2935 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2877 vt, selection_request_time); 2936 vt, selection_request_time);
2878 return 1; 2937 return 1;
2879 } 2938 }
2880 2939
2881 return 0; 2940 return 0;
… …
2944 3003
2945 int end_col; 3004 int end_col;
2946 3005
2947 for (; row <= selection.end.row; row++, col = 0) 3006 for (; row <= selection.end.row; row++, col = 0)
2948 { 3007 {
2949#if ENABLE_FRILLS 3008#if !ENABLE_MINIMAL
2950 if (selection.rect) 3009 if (selection.rect)
2951 { 3010 {
2952 col = selection.beg.col; 3011 col = selection.beg.col;
2953 end_col = ncol + 1; 3012 end_col = ncol + 1;
2954 } 3013 }
… …
2957 end_col = ROW(row).l; 3016 end_col = ROW(row).l;
2958 3017
2959 col = max (col, 0); 3018 col = max (col, 0);
2960 3019
2961 if (row == selection.end.row 3020 if (row == selection.end.row
2962#if ENABLE_FRILLS 3021#if !ENABLE_MINIMAL
2963 || selection.rect 3022 || selection.rect
2964#endif 3023#endif
2965 ) 3024 )
2966 min_it (end_col, selection.end.col); 3025 min_it (end_col, selection.end.col);
2967 3026
… …
2990#endif 3049#endif
2991 else 3050 else
2992 new_selection_text[ofs++] = *t++; 3051 new_selection_text[ofs++] = *t++;
2993 } 3052 }
2994 3053
2995#if ENABLE_FRILLS 3054#if !ENABLE_MINIMAL
2996 if (selection.rect) 3055 if (selection.rect)
2997 { 3056 {
2998 while (ofs 3057 while (ofs
2999 && new_selection_text[ofs - 1] != C0_LF 3058 && new_selection_text[ofs - 1] != C0_LF
3000 && unicode::is_space (new_selection_text[ofs - 1])) 3059 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3034bool 3093bool
3035rxvt_term::selection_grab (Time tm) NOTHROW 3094rxvt_term::selection_grab (Time tm) NOTHROW
3036{ 3095{
3037 selection_time = tm; 3096 selection_time = tm;
3038 3097
3039 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3098 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3040 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3099 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3041 { 3100 {
3042 display->set_selection_owner (this); 3101 display->set_selection_owner (this);
3043 return true; 3102 return true;
3044 } 3103 }
3045 else 3104 else
… …
3049 } 3108 }
3050 3109
3051#if 0 3110#if 0
3052 XTextProperty ct; 3111 XTextProperty ct;
3053 3112
3054 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3113 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3055 { 3114 {
3056 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3115 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3057 XFree (ct.value); 3116 XFree (ct.value);
3058 } 3117 }
3059#endif 3118#endif
… …
3105 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3164 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3106 3165
3107 while (selection.mark.col > 0 3166 while (selection.mark.col > 0
3108 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3167 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3109 --selection.mark.col; 3168 --selection.mark.col;
3110 3169
3111 if (selection.op) 3170 if (selection.op)
3171 {
3112 { /* clear the old selection */ 3172 /* clear the old selection */
3113 selection.beg.row = selection.end.row = selection.mark.row; 3173 selection.beg.row = selection.end.row = selection.mark.row;
3114 selection.beg.col = selection.end.col = selection.mark.col; 3174 selection.beg.col = selection.end.col = selection.mark.col;
3115 } 3175 }
3116 3176
3117 selection.op = SELECTION_INIT; 3177 selection.op = SELECTION_INIT;
… …
3306 * a point/word/line which is either the start or end of the selection 3366 * a point/word/line which is either the start or end of the selection
3307 * and it was decided by whichever point/word/line was `fixed' at the 3367 * and it was decided by whichever point/word/line was `fixed' at the
3308 * time of the most recent button3 press 3368 * time of the most recent button3 press
3309 */ 3369 */
3310 if (button3 && buttonpress) 3370 if (button3 && buttonpress)
3371 {
3311 { /* button3 press */ 3372 /* button3 press */
3312 /* 3373 /*
3313 * first determine which edge of the selection we are closest to 3374 * first determine which edge of the selection we are closest to
3314 */ 3375 */
3315 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3376 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3316 || (!ROWCOL_IS_AFTER (pos, selection.end) 3377 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3334 selection.mark.row = selection.beg.row; 3395 selection.mark.row = selection.beg.row;
3335 selection.mark.col = selection.beg.col; 3396 selection.mark.col = selection.beg.col;
3336 } 3397 }
3337 } 3398 }
3338 else 3399 else
3400 {
3339 { /* button1 drag or button3 drag */ 3401 /* button1 drag or button3 drag */
3340 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3402 if (ROWCOL_IS_AFTER (selection.mark, pos))
3341 { 3403 {
3342 if (selection.mark.row == selection.end.row 3404 if (selection.mark.row == selection.end.row
3343 && selection.mark.col == selection.end.col 3405 && selection.mark.col == selection.end.col
3344 && clickchange 3406 && clickchange
… …
3361 3423
3362 if (selection.clicks == 1) 3424 if (selection.clicks == 1)
3363 { 3425 {
3364 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3426 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3365 && !ROW(selection.beg.row).is_longer () 3427 && !ROW(selection.beg.row).is_longer ()
3366#if ENABLE_FRILLS 3428#if !ENABLE_MINIMAL
3367 && !selection.rect 3429 && !selection.rect
3368#endif 3430#endif
3369 ) 3431 )
3370 selection.beg.col = ncol; 3432 selection.beg.col = ncol;
3371 3433
3372 if ( 3434 if (
3373 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3435 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3374 && !ROW(selection.end.row).is_longer () 3436 && !ROW(selection.end.row).is_longer ()
3375#if ENABLE_FRILLS 3437#if !ENABLE_MINIMAL
3376 && !selection.rect 3438 && !selection.rect
3377#endif 3439#endif
3378 ) 3440 )
3379 selection.end.col = ncol; 3441 selection.end.col = ncol;
3380 } 3442 }
… …
3387 selection_delimit_word (DN, &selection.end, &selection.end); 3449 selection_delimit_word (DN, &selection.end, &selection.end);
3388 } 3450 }
3389 else if (selection.clicks == 3) 3451 else if (selection.clicks == 3)
3390 { 3452 {
3391#if ENABLE_FRILLS 3453#if ENABLE_FRILLS
3392 if (OPTION (Opt_tripleclickwords)) 3454 if (option (Opt_tripleclickwords))
3393 { 3455 {
3394 selection_delimit_word (UP, &selection.beg, &selection.beg); 3456 selection_delimit_word (UP, &selection.beg, &selection.beg);
3395 3457
3396 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3458 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3397 { 3459 {
3398 if (!ROW(end_row).is_longer ()) 3460 if (!ROW(end_row).is_longer ())
3399 { 3461 {
3400 selection.end.row = end_row; 3462 selection.end.row = end_row;
3401 selection.end.col = ROW(end_row).l; 3463 selection.end.col = ROW(end_row).l;
3464# if !ENABLE_MINIMAL
3402 selection_remove_trailing_spaces (); 3465 selection_remove_trailing_spaces ();
3466# endif
3403 break; 3467 break;
3404 } 3468 }
3405 } 3469 }
3406 } 3470 }
3407 else 3471 else
… …
3423 selection.end.row++; 3487 selection.end.row++;
3424 } 3488 }
3425 } 3489 }
3426 3490
3427 if (button3 && buttonpress) 3491 if (button3 && buttonpress)
3492 {
3428 { /* mark may need to be changed */ 3493 /* mark may need to be changed */
3429 if (closeto == LEFT) 3494 if (closeto == LEFT)
3430 { 3495 {
3431 selection.mark.row = selection.end.row; 3496 selection.mark.row = selection.end.row;
3432 selection.mark.col = selection.end.col - (selection.clicks == 2); 3497 selection.mark.col = selection.end.col - (selection.clicks == 2);
3433 } 3498 }
… …
3436 selection.mark.row = selection.beg.row; 3501 selection.mark.row = selection.beg.row;
3437 selection.mark.col = selection.beg.col; 3502 selection.mark.col = selection.beg.col;
3438 } 3503 }
3439 } 3504 }
3440 3505
3441#if ENABLE_FRILLS 3506#if !ENABLE_MINIMAL
3442 if (selection.rect && selection.beg.col > selection.end.col) 3507 if (selection.rect && selection.beg.col > selection.end.col)
3443 ::swap (selection.beg.col, selection.end.col); 3508 ::swap (selection.beg.col, selection.end.col);
3444#endif 3509#endif
3445} 3510}
3446 3511
3447#if ENABLE_FRILLS 3512#if !ENABLE_MINIMAL
3448void 3513void
3449rxvt_term::selection_remove_trailing_spaces () NOTHROW 3514rxvt_term::selection_remove_trailing_spaces () NOTHROW
3450{ 3515{
3451 int32_t end_col, end_row; 3516 int32_t end_col, end_row;
3452 text_t *stp; 3517 text_t *stp;
… …
3507 */ 3572 */
3508void 3573void
3509rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3574rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3510{ 3575{
3511 XSelectionEvent ev; 3576 XSelectionEvent ev;
3512 dDisp;
3513 3577
3514 ev.type = SelectionNotify; 3578 ev.type = SelectionNotify;
3515 ev.property = None; 3579 ev.property = None;
3516 ev.display = rq.display; 3580 ev.display = rq.display;
3517 ev.requestor = rq.requestor; 3581 ev.requestor = rq.requestor;
… …
3531 *target++ = xa[XA_COMPOUND_TEXT]; 3595 *target++ = xa[XA_COMPOUND_TEXT];
3532#if X_HAVE_UTF8_STRING 3596#if X_HAVE_UTF8_STRING
3533 *target++ = xa[XA_UTF8_STRING]; 3597 *target++ = xa[XA_UTF8_STRING];
3534#endif 3598#endif
3535 3599
3536 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3600 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3537 32, PropModeReplace, 3601 32, PropModeReplace,
3538 (unsigned char *)target_list, target - target_list); 3602 (unsigned char *)target_list, target - target_list);
3539 ev.property = rq.property; 3603 ev.property = rq.property;
3540 } 3604 }
3541#if TODO // TODO 3605#if TODO // TODO
… …
3544 /* TODO: Handle MULTIPLE */ 3608 /* TODO: Handle MULTIPLE */
3545 } 3609 }
3546#endif 3610#endif
3547 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3611 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3548 { 3612 {
3549 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3613 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3550 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3614 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3551 ev.property = rq.property; 3615 ev.property = rq.property;
3552 } 3616 }
3553 else if (rq.target == XA_STRING 3617 else if (rq.target == XA_STRING
3554 || rq.target == xa[XA_TEXT] 3618 || rq.target == xa[XA_TEXT]
… …
3578 style = enc_string; 3642 style = enc_string;
3579 else if (target == xa[XA_TEXT]) 3643 else if (target == xa[XA_TEXT])
3580 style = enc_text; 3644 style = enc_text;
3581 else if (target == xa[XA_COMPOUND_TEXT]) 3645 else if (target == xa[XA_COMPOUND_TEXT])
3582 style = enc_compound_text; 3646 style = enc_compound_text;
3583#if ENABLE_FRILLS 3647#if !ENABLE_MINIMAL
3584 else if (target == xa[XA_UTF8_STRING]) 3648 else if (target == xa[XA_UTF8_STRING])
3585 style = enc_utf8; 3649 style = enc_utf8;
3586#endif 3650#endif
3587 else 3651 else
3588 { 3652 {
… …
3599 { 3663 {
3600 cl = L""; 3664 cl = L"";
3601 selectlen = 0; 3665 selectlen = 0;
3602 } 3666 }
3603 3667
3604#if ENABLE_FRILLS 3668#if !ENABLE_MINIMAL
3605 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3669 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3606 // so recode it manually 3670 // so recode it manually
3607 if (style == enc_utf8) 3671 if (style == enc_utf8)
3608 { 3672 {
3609 freect = 1; 3673 freect = 1;
… …
3612 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3676 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3613 ct.nitems = strlen ((char *)ct.value); 3677 ct.nitems = strlen ((char *)ct.value);
3614 } 3678 }
3615 else 3679 else
3616#endif 3680#endif
3617 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3681 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3618 freect = 1; 3682 freect = 1;
3619 else 3683 else
3620 { 3684 {
3621 /* if we failed to convert then send it raw */ 3685 /* if we failed to convert then send it raw */
3622 ct.value = (unsigned char *)cl; 3686 ct.value = (unsigned char *)cl;
3623 ct.nitems = selectlen; 3687 ct.nitems = selectlen;
3624 ct.encoding = target; 3688 ct.encoding = target;
3625 } 3689 }
3626 3690
3627 XChangeProperty (disp, rq.requestor, rq.property, 3691 XChangeProperty (dpy, rq.requestor, rq.property,
3628 ct.encoding, 8, PropModeReplace, 3692 ct.encoding, 8, PropModeReplace,
3629 ct.value, (int)ct.nitems); 3693 ct.value, (int)ct.nitems);
3630 ev.property = rq.property; 3694 ev.property = rq.property;
3631 3695
3632 if (freect) 3696 if (freect)
3633 XFree (ct.value); 3697 XFree (ct.value);
3634 } 3698 }
3635 3699
3636 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3700 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3637}
3638
3639/* ------------------------------------------------------------------------- *
3640 * MOUSE ROUTINES *
3641 * ------------------------------------------------------------------------- */
3642
3643/*
3644 * return col/row values corresponding to x/y pixel values
3645 */
3646void
3647rxvt_term::pixel_position (int *x, int *y) NOTHROW
3648{
3649 *x = Pixel2Col (*x);
3650 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3651 *y = Pixel2Row (*y);
3652 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3653} 3701}
3654 3702
3655/* ------------------------------------------------------------------------- */ 3703/* ------------------------------------------------------------------------- */
3656#ifdef USE_XIM 3704#ifdef USE_XIM
3657void 3705void
3658rxvt_term::im_set_position (XPoint &pos) NOTHROW 3706rxvt_term::im_set_position (XPoint &pos) NOTHROW
3659{ 3707{
3660 XWindowAttributes xwa; 3708 XWindowAttributes xwa;
3661 3709
3662 XGetWindowAttributes (display->display, vt, &xwa); 3710 XGetWindowAttributes (dpy, vt, &xwa);
3663 3711
3664 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3712 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3665 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3713 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3666} 3714}
3667#endif 3715#endif
… …
3685 h += 2; min_it (h, nrow); 3733 h += 2; min_it (h, nrow);
3686 3734
3687 x -= 1; clamp_it (x, 0, ncol - w); 3735 x -= 1; clamp_it (x, 0, ncol - w);
3688 y -= 1; clamp_it (y, 0, nrow - h); 3736 y -= 1; clamp_it (y, 0, nrow - h);
3689 3737
3690 ov_x = x; ov_y = y; 3738 ov.x = x; ov.y = y;
3691 ov_w = w; ov_h = h; 3739 ov.w = w; ov.h = h;
3692 3740
3693 ov_text = new text_t *[h]; 3741 ov.text = new text_t *[h];
3694 ov_rend = new rend_t *[h]; 3742 ov.rend = new rend_t *[h];
3695 3743
3696 for (y = 0; y < h; y++) 3744 for (y = 0; y < h; y++)
3697 { 3745 {
3698 text_t *tp = ov_text[y] = new text_t[w]; 3746 text_t *tp = ov.text[y] = new text_t[w];
3699 rend_t *rp = ov_rend[y] = new rend_t[w]; 3747 rend_t *rp = ov.rend[y] = new rend_t[w];
3700 3748
3701 text_t t0, t1, t2; 3749 text_t t0, t1, t2;
3702 rend_t r = OVERLAY_RSTYLE; 3750 rend_t r = OVERLAY_RSTYLE;
3703 3751
3704 if (y == 0) 3752 if (y == 0)
… …
3723} 3771}
3724 3772
3725void 3773void
3726rxvt_term::scr_overlay_off () NOTHROW 3774rxvt_term::scr_overlay_off () NOTHROW
3727{ 3775{
3728 if (!ov_text) 3776 if (!ov.text)
3729 return; 3777 return;
3730 3778
3731 want_refresh = 1; 3779 want_refresh = 1;
3732 3780
3733 for (int y = 0; y < ov_h; y++) 3781 for (int y = 0; y < ov.h; y++)
3734 { 3782 {
3735 delete [] ov_text[y]; 3783 delete [] ov.text[y];
3736 delete [] ov_rend[y]; 3784 delete [] ov.rend[y];
3737 } 3785 }
3738 3786
3739 delete [] ov_text; ov_text = 0; 3787 delete [] ov.text; ov.text = 0;
3740 delete [] ov_rend; ov_rend = 0; 3788 delete [] ov.rend; ov.rend = 0;
3741} 3789}
3742 3790
3743void 3791void
3744rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3792rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3745{ 3793{
3746 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3794 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3747 return; 3795 return;
3748 3796
3749 x++, y++; 3797 x++, y++;
3750 3798
3751 ov_text[y][x] = text; 3799 ov.text[y][x] = text;
3752 ov_rend[y][x] = rend; 3800 ov.rend[y][x] = rend;
3753} 3801}
3754 3802
3755void 3803void
3756rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3804rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3757{ 3805{
… …
3763rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3811rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3764{ 3812{
3765 while (*s) 3813 while (*s)
3766 { 3814 {
3767 text_t t = *s++; 3815 text_t t = *s++;
3768 int width = wcwidth (t); 3816 int width = WCWIDTH (t);
3769 3817
3770 while (width--) 3818 while (width--)
3771 { 3819 {
3772 scr_overlay_set (x++, y, t); 3820 scr_overlay_set (x++, y, t);
3773 t = NOCHAR; 3821 t = NOCHAR;
… …
3776} 3824}
3777 3825
3778void 3826void
3779rxvt_term::scr_swap_overlay () NOTHROW 3827rxvt_term::scr_swap_overlay () NOTHROW
3780{ 3828{
3781 if (!ov_text) 3829 if (!ov.text)
3782 return; 3830 return;
3783 3831
3832 // hide cursor if it is within the overlay area
3833 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3834 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3835 screen.flags &= ~Screen_VisibleCursor;
3836
3784 // swap screen mem with overlay 3837 // swap screen mem with overlay
3785 for (int y = ov_h; y--; ) 3838 for (int y = ov.h; y--; )
3786 { 3839 {
3787 text_t *t1 = ov_text[y]; 3840 text_t *t1 = ov.text[y];
3788 rend_t *r1 = ov_rend[y]; 3841 rend_t *r1 = ov.rend[y];
3789 3842
3790 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3843 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3791 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3844 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3792 3845
3793 for (int x = ov_w; x--; ) 3846 for (int x = ov.w; x--; )
3794 { 3847 {
3795 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3848 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3796 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3849 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3797 } 3850 }
3798 } 3851 }

Diff Legend

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