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.248 by root, Sun Jan 22 20:58:33 2006 UTC vs.
Revision 1.329 by root, Sat Dec 26 10:24:04 2009 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 86
89/* 87/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 89 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 91 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 95
114/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
117 99
… …
126 width = ncol; 108 width = ncol;
127 } 109 }
128 110
129 l.touch (); 111 l.touch ();
130 112
131 efs &= ~RS_baseattrMask; 113 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 114 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 115
134 text_t *et = l.t + col; 116 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 117 rend_t *er = l.r + col;
136 118
… …
148{ 130{
149 scr_blank_line (l, 0, ncol, efs); 131 scr_blank_line (l, 0, ncol, efs);
150 132
151 l.l = 0; 133 l.l = 0;
152 l.f = 0; 134 l.f = 0;
135}
136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
153} 154}
154 155
155/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
158 159
159void 160void
160rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
161{ 162{
162#if ENABLE_OVERLAY
163 scr_overlay_off ();
164#endif
165
166 view_start = 0; 163 view_start = 0;
167 num_scr = 0; 164 num_scr = 0;
168 165
169 if (ncol == 0) 166 if (ncol == 0)
170 ncol = 80; 167 ncol = 80;
… …
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
… …
770 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 779 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
771 screen.cur.row -= minlines; 780 screen.cur.row -= minlines;
772 } 781 }
773 } 782 }
774 783
775#ifdef DEBUG_STRICT
776 assert (screen.cur.col < ncol); 784 assert (screen.cur.col < ncol);
777 assert (screen.cur.row < nrow 785 assert (screen.cur.row < nrow
778 && screen.cur.row >= top_row); 786 && screen.cur.row >= top_row);
779#endif
780 int row = screen.cur.row; 787 int row = screen.cur.row;
781 788
782 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 789 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
783 790
784 line_t *line = &ROW(row); 791 line_t *line = &ROW(row);
785 792
786 while (str < strend) 793 while (str < strend)
787 { 794 {
788 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 795 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
789 796
790 if (c < 0x20) 797 if (expect_false (c < 0x20))
791 if (c == C0_LF) 798 if (c == C0_LF)
792 { 799 {
793 max_it (line->l, screen.cur.col); 800 max_it (line->l, screen.cur.col);
794 801
795 screen.flags &= ~Screen_WrapNext; 802 screen.flags &= ~Screen_WrapNext;
… …
814 { 821 {
815 scr_tab (1, true); 822 scr_tab (1, true);
816 continue; 823 continue;
817 } 824 }
818 825
826 if (expect_false (
819 if (checksel /* see if we're writing within selection */ 827 checksel /* see if we're writing within selection */
820 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 828 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
821 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 829 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
830 ))
822 { 831 {
823 checksel = 0; 832 checksel = 0;
824 /* 833 /*
825 * If we wrote anywhere in the selected area, kill the selection 834 * If we wrote anywhere in the selected area, kill the selection
826 * XXX: should we kill the mark too? Possibly, but maybe that 835 * XXX: should we kill the mark too? Possibly, but maybe that
827 * should be a similar check. 836 * should be a similar check.
828 */ 837 */
829 CLEAR_SELECTION (); 838 CLEAR_SELECTION ();
830 } 839 }
831 840
832 if (screen.flags & Screen_WrapNext) 841 if (expect_false (screen.flags & Screen_WrapNext))
833 { 842 {
834 scr_do_wrap (); 843 scr_do_wrap ();
835 844
836 line->l = ncol; 845 line->l = ncol;
837 line->is_longer (1); 846 line->is_longer (1);
838 847
839 row = screen.cur.row; 848 row = screen.cur.row;
840 line = &ROW(row); /* _must_ refresh */ 849 line = &ROW(row); /* _must_ refresh */
841 } 850 }
842 851
843 // some utf-8 decoders "decode" surrogate characters: let's fix this. 852 // some utf-8 decoders "decode" surrogate characters: let's fix this.
844 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 853 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
845 c = 0xfffd; 854 c = 0xfffd;
846 855
847 // 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
848 // do wcwidth before further replacements, as wcwidth might return -1 857 // further replacements, as wcwidth might return -1 for the line
849 // 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
850 // locale. 859 // locale.
851 int width = c < 0x100 ? 1 : wcwidth (c); 860 int width = WCWIDTH (c);
852 861
853 if (charsets [screen.charset] == '0') // DEC SPECIAL 862 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
854 { 863 {
855 // vt100 special graphics and line drawing 864 // vt100 special graphics and line drawing
856 // 5f-7e standard vt100 865 // 5f-7e standard vt100
857 // 40-5e rxvt extension for extra curses acs chars 866 // 40-5e rxvt extension for extra curses acs chars
858 static uint16_t vt100_0[62] = { // 41 .. 7e 867 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
871 c = vt100_0[c - 0x41]; 880 c = vt100_0[c - 0x41];
872 width = 1; // vt100 line drawing characters are always single-width 881 width = 1; // vt100 line drawing characters are always single-width
873 } 882 }
874 } 883 }
875 884
876 if (screen.flags & Screen_Insert) 885 if (expect_false (screen.flags & Screen_Insert))
877 scr_insdel_chars (width, INSERT); 886 scr_insdel_chars (width, INSERT);
878 887
879 if (width != 0) 888 if (width != 0)
880 { 889 {
881#if !UNICODE_3 890#if !UNICODE_3
… …
887 c = 0xfffd; 896 c = 0xfffd;
888# endif 897# endif
889#endif 898#endif
890 899
891 // nuke the character at this position, if required 900 // nuke the character at this position, if required
901 if (expect_false (
892 if (line->t[screen.cur.col] == NOCHAR 902 line->t[screen.cur.col] == NOCHAR
893 || (screen.cur.col < ncol - 1 903 || (screen.cur.col < ncol - 1
894 && 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))
895 { 912 {
896 int col = screen.cur.col; 913 // ... artificially enlargen the previous one
897
898 // find begin
899 while (col > 0 && line->t[col] == NOCHAR)
900 col--;
901
902 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
903
904 // found begin, nuke
905 do {
906 line->t[col] = ' ';
907 line->r[col] = rend;
908 col++;
909 } while (col < ncol && line->t[col] == NOCHAR);
910 }
911
912 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
913
914 // if the character doesn't fit into the remaining columns...
915 if (screen.cur.col > ncol - width && ncol >= width)
916 {
917 // ...output spaces
918 c = ' '; 914 c = NOCHAR;
919 // and try the same character next loop iteration 915 // and try the same character next loop iteration
920 --str; 916 --str;
921 } 917 }
922 918
923 line->touch (); 919 line->touch ();
… …
925 do 921 do
926 { 922 {
927 line->t[screen.cur.col] = c; 923 line->t[screen.cur.col] = c;
928 line->r[screen.cur.col] = rend; 924 line->r[screen.cur.col] = rend;
929 925
930 if (screen.cur.col < ncol - 1) 926 if (expect_true (screen.cur.col < ncol - 1))
931 screen.cur.col++; 927 screen.cur.col++;
932 else 928 else
933 { 929 {
934 line->l = ncol; 930 line->l = ncol;
935 if (screen.flags & Screen_Autowrap) 931 if (screen.flags & Screen_Autowrap)
… …
937 break; 933 break;
938 } 934 }
939 935
940 c = NOCHAR; 936 c = NOCHAR;
941 } 937 }
942 while (--width > 0); 938 while (expect_false (--width > 0));
943 939
944 // pad with spaces when overwriting wide character with smaller one 940 // pad with spaces when overwriting wide character with smaller one
945 if (!width) 941 if (expect_false (!width))
946 { 942 {
947 line->touch (); 943 line->touch ();
948 944
949 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++)
950 { 946 {
951 line->t[c] = ' '; 947 line->t[c] = ' ';
952 line->r[c] = rend; 948 line->r[c] = rend;
953 } 949 }
954 } 950 }
955 } 951 }
952#if ENABLE_COMBINING
956 else // width == 0 953 else // width == 0
957 { 954 {
958#if ENABLE_COMBINING 955 if (c != 0xfeff) // ignore BOM
959 // handle combining characters
960 // we just tag the accent on the previous on-screen character.
961 // this is arguably not correct, but also arguably not wrong.
962 // we don't handle double-width characters nicely yet.
963 line_t *linep;
964 text_t *tp;
965 rend_t *rp;
966
967 if (screen.cur.col > 0)
968 { 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 {
969 linep = line; 967 linep = line;
970 tp = line->t + screen.cur.col - 1; 968 tp = line->t + screen.cur.col - 1;
971 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));
972 } 993 }
973 else if (screen.cur.row > 0
974 && ROW(screen.cur.row - 1).is_longer ())
975 {
976 linep = &ROW(screen.cur.row - 1);
977 tp = line->t + ncol - 1;
978 rp = line->r + ncol - 1;
979 } 994 }
980 else
981 continue;
982
983 linep->touch ();
984
985 while (*tp == NOCHAR && tp > linep->t)
986 tp--, rp--;
987
988 // first try to find a precomposed character
989 unicode_t n = rxvt_compose (*tp, c);
990 if (n == NOCHAR)
991 n = rxvt_composite.compose (*tp, c);
992
993 *tp = n;
994 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
995#endif 995#endif
996 }
997 } 996 }
998 997
999 max_it (line->l, screen.cur.col); 998 max_it (line->l, screen.cur.col);
1000 999
1001#ifdef DEBUG_STRICT
1002 assert (screen.cur.row >= 0); 1000 assert (screen.cur.row >= 0);
1003#endif
1004} 1001}
1005 1002
1006/* ------------------------------------------------------------------------- */ 1003/* ------------------------------------------------------------------------- */
1007/* 1004/*
1008 * 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
1009 * XTERM_SEQ: CTRL-H 1006 * XTERM_SEQ: CTRL-H
1010 */ 1007 */
1011void 1008void
1012rxvt_term::scr_backspace () NOTHROW 1009rxvt_term::scr_backspace () NOTHROW
1013{ 1010{
1014 want_refresh = 1;
1015
1016 if (screen.cur.col == 0) 1011 if (screen.cur.col == 0)
1017 { 1012 {
1018 if (screen.cur.row > 0) 1013 if (screen.cur.row > 0)
1019 { 1014 {
1020#ifdef TERMCAP_HAS_BW 1015#ifdef TERMCAP_HAS_BW
1021 screen.cur.col = ncol - 1; 1016 screen.cur.col = ncol - 1;
1022 screen.cur.row--; 1017 --screen.cur.row;
1023 return; 1018
1019 want_refresh = 1;
1024#endif 1020#endif
1025 } 1021 }
1026 } 1022 }
1027 else if (!(screen.flags & Screen_WrapNext)) 1023 else
1028 scr_gotorc (0, -1, RELATIVE); 1024 scr_gotorc (0, -1, RELATIVE);
1029
1030 screen.flags &= ~Screen_WrapNext;
1031} 1025}
1032 1026
1033/* ------------------------------------------------------------------------- */ 1027/* ------------------------------------------------------------------------- */
1034/* 1028/*
1035 * Process Horizontal Tab 1029 * Process Horizontal Tab
… …
1058 x = i; 1052 x = i;
1059 1053
1060 if (!--count) 1054 if (!--count)
1061 break; 1055 break;
1062 } 1056 }
1063 else 1057 else
1064 ht &= l.t[i] == ' ' 1058 ht &= l.t[i] == ' '
1065 && RS_SAME (l.r[i], base_rend); 1059 && RS_SAME (l.r[i], base_rend);
1066 1060
1067 if (count) 1061 if (count)
1068 x = ncol - 1; 1062 x = ncol - 1;
1069 1063
1070 // store horizontal tab commands as characters inside the text 1064 // store horizontal tab commands as characters inside the text
1071 // buffer so they can be selected and pasted. 1065 // buffer so they can be selected and pasted.
1072 if (ht && OPTION (Opt_pastableTabs)) 1066 if (ht && option (Opt_pastableTabs))
1073 { 1067 {
1074 base_rend = SET_FONT (base_rend, 0); 1068 base_rend = SET_FONT (base_rend, 0);
1075 1069
1076 l.touch (x); 1070 l.touch (x);
1077 1071
… …
1110 * Process DEC Back Index 1104 * Process DEC Back Index
1111 * XTERM_SEQ: ESC 6 1105 * XTERM_SEQ: ESC 6
1112 * 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
1113 * in that row right. Clear left column. 1107 * in that row right. Clear left column.
1114 */ 1108 */
1115#if ENABLE_FRILLS 1109#if !ENABLE_MINIMAL
1116void 1110void
1117rxvt_term::scr_backindex () NOTHROW 1111rxvt_term::scr_backindex () NOTHROW
1118{ 1112{
1119 if (screen.cur.col > 0) 1113 if (screen.cur.col > 0)
1120 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1114 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1127 * Process DEC Forward Index 1121 * Process DEC Forward Index
1128 * XTERM_SEQ: ESC 9 1122 * XTERM_SEQ: ESC 9
1129 * 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
1130 * in that row left. Clear right column. 1124 * in that row left. Clear right column.
1131 */ 1125 */
1132#if ENABLE_FRILLS 1126#if !ENABLE_MINIMAL
1133void 1127void
1134rxvt_term::scr_forwardindex () NOTHROW 1128rxvt_term::scr_forwardindex () NOTHROW
1135{ 1129{
1136 if (screen.cur.col < ncol - 1) 1130 if (screen.cur.col < ncol - 1)
1137 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1131 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1184 } 1178 }
1185 } 1179 }
1186 else 1180 else
1187 { 1181 {
1188 if (screen.flags & Screen_Relative) 1182 if (screen.flags & Screen_Relative)
1183 {
1189 { /* relative origin mode */ 1184 /* relative origin mode */
1190 screen.cur.row = row + screen.tscroll; 1185 screen.cur.row = row + screen.tscroll;
1191 min_it (screen.cur.row, screen.bscroll); 1186 min_it (screen.cur.row, screen.bscroll);
1192 } 1187 }
1193 else 1188 else
1194 screen.cur.row = row; 1189 screen.cur.row = row;
… …
1227/* 1222/*
1228 * Erase part or whole of a line 1223 * Erase part or whole of a line
1229 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1224 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1230 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1225 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1231 * 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
1232 */ 1228 */
1233void 1229void
1234rxvt_term::scr_erase_line (int mode) NOTHROW 1230rxvt_term::scr_erase_line (int mode) NOTHROW
1235{ 1231{
1236 unsigned int col, num; 1232 unsigned int col, num;
… …
1245 line.touch (); 1241 line.touch ();
1246 line.is_longer (0); 1242 line.is_longer (0);
1247 1243
1248 switch (mode) 1244 switch (mode)
1249 { 1245 {
1246 case 3:
1247 if (screen.flags & Screen_WrapNext)
1248 return;
1249
1250 /* fall through */
1251
1250 case 0: /* erase to end of line */ 1252 case 0: /* erase to end of line */
1251 col = screen.cur.col; 1253 col = screen.cur.col;
1252 num = ncol - col; 1254 num = ncol - col;
1253 min_it (line.l, col); 1255 min_it (line.l, col);
1256
1254 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1255 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1256 CLEAR_SELECTION (); 1259 CLEAR_SELECTION ();
1257 break; 1260 break;
1261
1258 case 1: /* erase to beginning of line */ 1262 case 1: /* erase to beginning of line */
1259 col = 0; 1263 col = 0;
1260 num = screen.cur.col + 1; 1264 num = screen.cur.col + 1;
1265
1261 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1266 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1262 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1267 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1263 CLEAR_SELECTION (); 1268 CLEAR_SELECTION ();
1264 break; 1269 break;
1270
1265 case 2: /* erase whole line */ 1271 case 2: /* erase whole line */
1266 col = 0; 1272 col = 0;
1267 num = ncol; 1273 num = ncol;
1268 line.l = 0; 1274 line.l = 0;
1269 if (selection.beg.row <= screen.cur.row 1275 if (selection.beg.row <= screen.cur.row
… …
1327 if (row >= nrow) /* Out Of Bounds */ 1333 if (row >= nrow) /* Out Of Bounds */
1328 return; 1334 return;
1329 1335
1330 min_it (num, nrow - row); 1336 min_it (num, nrow - row);
1331 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.
1332 if (rstyle & (RS_RVid | RS_Uline)) 1341 if (rstyle & (RS_RVid | RS_Uline))
1333 ren = (rend_t) ~RS_None; 1342 ren = (rend_t) ~RS_None;
1334 else if (GET_BASEBG (rstyle) == Color_bg) 1343 else if (GET_BASEBG (rstyle) == Color_bg)
1335 { 1344 {
1336 ren = DEFAULT_RSTYLE; 1345 ren = DEFAULT_RSTYLE;
1337 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);
1338 } 1351 }
1339 else 1352 else
1340 { 1353 {
1341 ren = rstyle & (RS_fgMask | RS_bgMask); 1354 ren = rstyle & (RS_fgMask | RS_bgMask);
1355
1356 if (mapped && !view_start)
1357 {
1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1343 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1359 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1344 ERASE_ROWS (row, num); 1360 XFillRectangle (dpy, vt, gc,
1361 0, Row2Pixel (row - view_start),
1362 (unsigned int)width,
1363 (unsigned int)Height2Pixel (num));
1345 gcvalue.foreground = pix_colors[Color_fg]; 1364 gcvalue.foreground = pix_colors[Color_fg];
1346 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1365 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1366 }
1347 } 1367 }
1348 1368
1349 for (; num--; row++) 1369 for (; num--; row++)
1350 { 1370 {
1351 scr_blank_screen_mem (ROW(row), rstyle); 1371 scr_blank_screen_mem (ROW(row), rstyle);
1372
1373 if (!view_start)
1352 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1374 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1353 } 1375 }
1354} 1376}
1355 1377
1356#if ENABLE_FRILLS 1378#if !ENABLE_MINIMAL
1357void 1379void
1358rxvt_term::scr_erase_savelines () NOTHROW 1380rxvt_term::scr_erase_savelines () NOTHROW
1359{ 1381{
1360 want_refresh = 1; 1382 want_refresh = 1;
1361 ZERO_SCROLLBACK (); 1383 ZERO_SCROLLBACK ();
… …
1431 * Insert/Delete <count> characters from the current position 1453 * Insert/Delete <count> characters from the current position
1432 */ 1454 */
1433void 1455void
1434rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1456rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1435{ 1457{
1436 int col, row;
1437 rend_t tr;
1438
1439 want_refresh = 1; 1458 want_refresh = 1;
1440 ZERO_SCROLLBACK (); 1459 ZERO_SCROLLBACK ();
1441 1460
1442 if (count <= 0) 1461 if (count <= 0)
1443 return; 1462 return;
… …
1445 scr_do_wrap (); 1464 scr_do_wrap ();
1446 1465
1447 selection_check (1); 1466 selection_check (1);
1448 min_it (count, ncol - screen.cur.col); 1467 min_it (count, ncol - screen.cur.col);
1449 1468
1450 row = screen.cur.row; 1469 int row = screen.cur.row;
1451 1470
1452 line_t *line = &ROW(row); 1471 line_t *line = &ROW(row);
1453 1472
1454 line->touch (); 1473 line->touch ();
1455 line->is_longer (0); 1474 line->is_longer (0);
1456 1475
1476 // nuke wide spanning the start
1477 if (line->t[screen.cur.col] == NOCHAR)
1478 scr_kill_char (*line, screen.cur.col);
1479
1457 switch (insdel) 1480 switch (insdel)
1458 { 1481 {
1459 case INSERT: 1482 case INSERT:
1460 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--)
1461 { 1489 {
1462 line->t[col] = line->t[col - count]; 1490 line->t[col] = line->t[col - count];
1463 line->r[col] = line->r[col - count]; 1491 line->r[col] = line->r[col - count];
1464 } 1492 }
1465
1466 line->l = min (line->l + count, ncol);
1467 1493
1468 if (selection.op && current_screen == selection.screen 1494 if (selection.op && current_screen == selection.screen
1469 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1495 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1470 { 1496 {
1471 if (selection.end.row != screen.cur.row 1497 if (selection.end.row != screen.cur.row
1472 || (selection.end.col + count >= ncol)) 1498 || (selection.end.col + count >= ncol))
1473 CLEAR_SELECTION (); 1499 CLEAR_SELECTION ();
1474 else 1500 else
1501 {
1475 { /* shift selection */ 1502 /* shift selection */
1476 selection.beg.col += count; 1503 selection.beg.col += count;
1477 selection.mark.col += count; /* XXX: yes? */ 1504 selection.mark.col += count; /* XXX: yes? */
1478 selection.end.col += count; 1505 selection.end.col += count;
1479 } 1506 }
1480 } 1507 }
… …
1485 case ERASE: 1512 case ERASE:
1486 screen.cur.col += count; /* don't worry if > ncol */ 1513 screen.cur.col += count; /* don't worry if > ncol */
1487 selection_check (1); 1514 selection_check (1);
1488 screen.cur.col -= count; 1515 screen.cur.col -= count;
1489 1516
1490 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
1491 scr_blank_line (*line, screen.cur.col, count, rstyle); 1521 scr_blank_line (*line, screen.cur.col, count, rstyle);
1492 break; 1522 break;
1493 1523
1494 case DELETE: 1524 case DELETE:
1495 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1525 line->l = max (line->l - count, 0);
1496 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
1497 for (col = screen.cur.col; (col + count) < ncol; col++) 1531 for (int col = screen.cur.col; (col + count) < ncol; col++)
1498 { 1532 {
1499 line->t[col] = line->t[col + count]; 1533 line->t[col] = line->t[col + count];
1500 line->r[col] = line->r[col + count]; 1534 line->r[col] = line->r[col + count];
1501 } 1535 }
1502 1536
1503 line->l = max (line->l - count, 0);
1504 scr_blank_line (*line, ncol - count, count, tr); 1537 scr_blank_line (*line, ncol - count, count, rstyle);
1505 1538
1506 if (selection.op && current_screen == selection.screen 1539 if (selection.op && current_screen == selection.screen
1507 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1540 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1508 { 1541 {
1509 if (selection.end.row != screen.cur.row 1542 if (selection.end.row != screen.cur.row
… …
1619 */ 1652 */
1620void 1653void
1621rxvt_term::scr_set_tab (int mode) NOTHROW 1654rxvt_term::scr_set_tab (int mode) NOTHROW
1622{ 1655{
1623 if (mode < 0) 1656 if (mode < 0)
1624 memset (tabs, 0, ncol * sizeof (char)); 1657 memset (tabs, 0, ncol);
1625 else if (screen.cur.col < ncol) 1658 else if (screen.cur.col < ncol)
1626 tabs [screen.cur.col] = !!mode; 1659 tabs [screen.cur.col] = !!mode;
1627} 1660}
1628 1661
1629/* ------------------------------------------------------------------------- */ 1662/* ------------------------------------------------------------------------- */
… …
1644 if (rvideo_state != on) 1677 if (rvideo_state != on)
1645 { 1678 {
1646 rvideo_state = on; 1679 rvideo_state = on;
1647 1680
1648 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1681 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1649#if XPM_BACKGROUND 1682#ifdef HAVE_BG_PIXMAP
1650 if (bgPixmap.pixmap == None) 1683 if (bgPixmap.pixmap == None)
1651#endif 1684#endif
1652#if TRANSPARENT
1653 if (!OPTION (Opt_transparent) || am_transparent == 0)
1654#endif
1655 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 1685 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1656 1686
1657 XGCValues gcvalue; 1687 XGCValues gcvalue;
1658 gcvalue.foreground = pix_colors[Color_fg]; 1688 gcvalue.foreground = pix_colors[Color_fg];
1659 gcvalue.background = pix_colors[Color_bg]; 1689 gcvalue.background = pix_colors[Color_bg];
1660 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); 1690 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1661 1691
1662 scr_clear (); 1692 scr_clear ();
1663 scr_touch (true); 1693 scr_touch (true);
1664 } 1694 }
1665} 1695}
… …
1750{ 1780{
1751 bool found = false; 1781 bool found = false;
1752 1782
1753 for (int i = 0; i < nrow; i++) 1783 for (int i = 0; i < nrow; i++)
1754 { 1784 {
1755 int col = 0;
1756 rend_t *drp = drawn_buf[i].r; 1785 rend_t *drp = drawn_buf[i].r;
1757 1786
1758 for (; col < ncol; col++, drp++) 1787 for (int col = 0; col < ncol; col++, drp++)
1759 if ((*drp & mask) == value) 1788 if ((*drp & mask) == value)
1760 { 1789 {
1761 found = true; 1790 found = true;
1762 *drp = ~value; 1791 *drp = ~value;
1763 } 1792 }
… …
1803 for (i = PART_BEG; i < RC_COUNT; i++) 1832 for (i = PART_BEG; i < RC_COUNT; i++)
1804 { 1833 {
1805 min_it (rc[i].col, ncol - 1); 1834 min_it (rc[i].col, ncol - 1);
1806 min_it (rc[i].row, nrow - 1); 1835 min_it (rc[i].row, nrow - 1);
1807 } 1836 }
1808 1837// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1809 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++)
1810 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);
1811 1840
1812 num_scr_allow = 0; 1841 num_scr_allow = 0;
1813 1842
… …
1868 return true; 1897 return true;
1869} 1898}
1870 1899
1871#ifndef NO_BELL 1900#ifndef NO_BELL
1872void 1901void
1873rxvt_term::bell_cb (time_watcher &w) 1902rxvt_term::bell_cb (ev::timer &w, int revents)
1874{ 1903{
1875 rvideo_bell = false; 1904 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode); 1905 scr_rvideo_mode (rvideo_mode);
1906 refresh_check ();
1877} 1907}
1878#endif 1908#endif
1879 1909
1880/* ------------------------------------------------------------------------- */ 1910/* ------------------------------------------------------------------------- */
1881void 1911void
… …
1883{ 1913{
1884#ifndef NO_BELL 1914#ifndef NO_BELL
1885 1915
1886# ifndef NO_MAPALERT 1916# ifndef NO_MAPALERT
1887# ifdef MAPALERT_OPTION 1917# ifdef MAPALERT_OPTION
1888 if (OPTION (Opt_mapAlert)) 1918 if (option (Opt_mapAlert))
1889# endif 1919# endif
1890 XMapWindow (display->display, parent[0]); 1920 XMapWindow (dpy, parent[0]);
1891# endif 1921# endif
1892 1922
1923# if ENABLE_FRILLS
1924 if (option (Opt_urgentOnBell))
1925 set_urgency (1);
1926# endif
1927
1893 if (OPTION (Opt_visualBell)) 1928 if (option (Opt_visualBell))
1894 { 1929 {
1895 rvideo_bell = true; 1930 rvideo_bell = true;
1896 scr_rvideo_mode (rvideo_mode); 1931 scr_rvideo_mode (rvideo_mode);
1897 display->flush (); 1932 flush ();
1898 1933
1899 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1934 bell_ev.start (VISUAL_BELL_DURATION);
1900 } 1935 }
1901 else 1936 else
1902 XBell (display->display, 0); 1937 XBell (dpy, 0);
1903
1904#endif 1938#endif
1905} 1939}
1906 1940
1907/* ------------------------------------------------------------------------- */ 1941/* ------------------------------------------------------------------------- */
1908/* ARGSUSED */ 1942/* ARGSUSED */
1909void 1943void
1910rxvt_term::scr_printscreen (int fullhist) NOTHROW 1944rxvt_term::scr_printscreen (int fullhist) NOTHROW
1911{ 1945{
1912#ifdef PRINTPIPE 1946#ifdef PRINTPIPE
1913 int nrows, row_start; 1947 int nrows, row_start;
1914 FILE *fd; 1948 FILE *fd = popen_printer ();
1915 1949
1916 if ((fd = popen_printer ()) == NULL) 1950 if (!fd)
1917 return; 1951 return;
1918 1952
1919 if (fullhist) 1953 if (fullhist)
1920 { 1954 {
1921 nrows = nrow - top_row; 1955 nrows = nrow - top_row;
… …
1966 * screen.text/screen.rend contain what the screen will change to. 2000 * screen.text/screen.rend contain what the screen will change to.
1967 */ 2001 */
1968void 2002void
1969rxvt_term::scr_refresh () NOTHROW 2003rxvt_term::scr_refresh () NOTHROW
1970{ 2004{
1971 unsigned char must_clear, /* use draw_string not draw_image_string */
1972 showcursor; /* show the cursor */
1973 int16_t col, row, /* column/row we're processing */ 2005 int16_t col, row, /* column/row we're processing */
1974 ocrow; /* old cursor row */ 2006 ocrow; /* old cursor row */
1975 int i; /* tmp */ 2007 int i; /* tmp */
1976#ifndef NO_CURSORCOLOR 2008#ifndef NO_CURSORCOLOR
1977 rend_t cc1; /* store colours at cursor position (s) */ 2009 rend_t cc1; /* store colours at cursor position (s) */
1978#endif 2010#endif
1979 rend_t *crp; // cursor rendition pointer 2011 rend_t *crp; // cursor rendition pointer
2012 rend_t ccol1, /* Cursor colour */
2013 ccol2; /* Cursor colour2 */
1980 2014
1981 want_refresh = 0; /* screen is current */ 2015 want_refresh = 0; /* screen is current */
1982 2016
1983 if (refresh_type == NO_REFRESH || !mapped) 2017 if (refresh_type == NO_REFRESH || !mapped)
1984 return; 2018 return;
1985 2019
1986 /* 2020 /*
1987 * A: set up vars 2021 * A: set up vars
1988 */ 2022 */
1989 must_clear = 0;
1990 refresh_count = 0; 2023 refresh_count = 0;
1991 2024
1992#if XPM_BACKGROUND 2025 unsigned int old_screen_flags = screen.flags;
2026 char have_bg = 0;
2027#ifdef HAVE_BG_PIXMAP
1993 must_clear |= bgPixmap.pixmap != None; 2028 have_bg = bgPixmap.pixmap != None;
1994#endif
1995#if TRANSPARENT
1996 must_clear |= OPTION (Opt_transparent) && am_transparent;
1997#endif 2029#endif
1998 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2030 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1999 2031
2000 /* 2032 /*
2001 * B: reverse any characters which are selected 2033 * B: reverse any characters which are selected
2002 */ 2034 */
2003 scr_reverse_selection (); 2035 scr_reverse_selection ();
2036
2037 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2038#if ENABLE_OVERLAY
2039 scr_swap_overlay ();
2040#endif
2041
2042 char showcursor = screen.flags & Screen_VisibleCursor;
2004 2043
2005 /* 2044 /*
2006 * C: set the cursor character (s) 2045 * C: set the cursor character (s)
2007 */ 2046 */
2008 { 2047 {
2009 unsigned char setoldcursor; 2048 unsigned char setoldcursor;
2010 rend_t ccol1, /* Cursor colour */
2011 ccol2; /* Cursor colour2 */
2012 2049
2013 showcursor = (screen.flags & Screen_VisibleCursor);
2014#ifdef CURSOR_BLINK 2050#ifdef CURSOR_BLINK
2015 if (hidden_cursor) 2051 if (hidden_cursor)
2016 showcursor = 0; 2052 showcursor = 0;
2017#endif 2053#endif
2018 2054
… …
2023 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2059 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2024 col--; 2060 col--;
2025 2061
2026 crp = &ROW(screen.cur.row).r[col]; 2062 crp = &ROW(screen.cur.row).r[col];
2027 2063
2064#ifndef NO_CURSORCOLOR
2065 cc1 = *crp & (RS_fgMask | RS_bgMask);
2066 if (ISSET_PIXCOLOR (Color_cursor))
2067 ccol1 = Color_cursor;
2068 else
2069#endif
2070#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2071 ccol1 = fgcolor_of (rstyle);
2072#else
2073 ccol1 = Color_fg;
2074#endif
2075
2076#ifndef NO_CURSORCOLOR
2077 if (ISSET_PIXCOLOR (Color_cursor2))
2078 ccol2 = Color_cursor2;
2079 else
2080#endif
2081#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2082 ccol2 = bgcolor_of (rstyle);
2083#else
2084 ccol2 = Color_bg;
2085#endif
2086
2028 if (showcursor && focus) 2087 if (showcursor && focus)
2029 { 2088 {
2030 if (OPTION (Opt_cursorUnderline)) 2089 if (option (Opt_cursorUnderline))
2031 *crp ^= RS_Uline; 2090 *crp ^= RS_Uline;
2032 else 2091 else
2033 { 2092 {
2034 *crp ^= RS_RVid; 2093 *crp ^= RS_RVid;
2035
2036#ifndef NO_CURSORCOLOR
2037 cc1 = *crp & (RS_fgMask | RS_bgMask);
2038 if (ISSET_PIXCOLOR (Color_cursor))
2039 ccol1 = Color_cursor;
2040 else
2041#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2042 ccol1 = fgcolor_of (rstyle);
2043#else
2044 ccol1 = Color_fg;
2045#endif
2046 if (ISSET_PIXCOLOR (Color_cursor2))
2047 ccol2 = Color_cursor2;
2048 else
2049#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2050 ccol2 = bgcolor_of (rstyle);
2051#else
2052 ccol2 = Color_bg;
2053#endif
2054 *crp = SET_FGCOLOR (*crp, ccol1); 2094 *crp = SET_FGCOLOR (*crp, ccol1);
2055 *crp = SET_BGCOLOR (*crp, ccol2); 2095 *crp = SET_BGCOLOR (*crp, ccol2);
2056#endif
2057 } 2096 }
2058 } 2097 }
2059 } 2098 }
2060 2099
2061 /* make sure no outline cursor is left around */ 2100 /* make sure no outline cursor is left around */
… …
2088 oldcursor.col = screen.cur.col; 2127 oldcursor.col = screen.cur.col;
2089 } 2128 }
2090 } 2129 }
2091 } 2130 }
2092 2131
2093 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2094#if ENABLE_OVERLAY
2095 scr_swap_overlay ();
2096#endif
2097
2098#ifndef NO_SLOW_LINK_SUPPORT 2132#ifndef NO_SLOW_LINK_SUPPORT
2099 /* 2133 /*
2100 * D: CopyArea pass - very useful for slower links 2134 * D: CopyArea pass - very useful for slower links
2101 * This has been deliberately kept simple. 2135 * This has been deliberately kept simple.
2102 */ 2136 */
2103 if (!display->is_local 2137 if (!display->is_local
2104 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2138 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2105 && abs (num_scr) < nrow && !must_clear) 2139 && abs (num_scr) < nrow && !have_bg)
2106 { 2140 {
2107 int16_t nits; 2141 int16_t nits;
2142 int i = num_scr;
2108 int j; 2143 int j;
2109 int len, wlen; 2144 int len, wlen;
2110 dLocal (int, num_scr); 2145 dLocal (int, num_scr);
2111 2146
2112 j = nrow; 2147 j = nrow;
2113 wlen = len = -1; 2148 wlen = len = -1;
2114 row = i > 0 ? 0 : j - 1; 2149 row = i > 0 ? 0 : j - 1;
2150
2115 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2151 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2116 { 2152 {
2117 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2153 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2118 { 2154 {
2119 line_t s = ROW(view_start + row); 2155 line_t s = ROW(view_start + row);
… …
2140 wlen = row; 2176 wlen = row;
2141 continue; 2177 continue;
2142 } 2178 }
2143 } 2179 }
2144 2180
2145 if (len != -1) 2181 if (len >= 0)
2146 { 2182 {
2147 /* also comes here at end if needed because of >= above */ 2183 /* also comes here at end if needed because of >= above */
2148 if (wlen < len) 2184 if (wlen < len)
2149 ::swap (wlen, len); 2185 ::swap (wlen, len);
2150 2186
2187 XGCValues gcv;
2188
2189 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2151 XCopyArea (display->display, vt, vt, 2190 XCopyArea (dpy, vt, vt,
2152 gc, 0, Row2Pixel (len + i), 2191 gc, 0, Row2Pixel (len + i),
2153 (unsigned int)this->width, 2192 (unsigned int)this->width,
2154 (unsigned int)Height2Pixel (wlen - len + 1), 2193 (unsigned int)Height2Pixel (wlen - len + 1),
2155 0, Row2Pixel (len)); 2194 0, Row2Pixel (len));
2195 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2196
2156 len = -1; 2197 len = -1;
2157 } 2198 }
2158 } 2199 }
2159 } 2200 }
2160#endif 2201#endif
… …
2184 continue; 2225 continue;
2185 2226
2186 // redraw one or more characters 2227 // redraw one or more characters
2187 2228
2188 // seek to the beginning of wide characters 2229 // seek to the beginning of wide characters
2189 while (stp[col] == NOCHAR && col > 0) 2230 while (expect_false (stp[col] == NOCHAR && col > 0))
2190 --col; 2231 --col;
2191 2232
2192 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2233 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2193 text_t *text = stp + col; 2234 text_t *text = stp + col;
2194 int count = 1; 2235 int count = 1;
… …
2201 for (i = 0; ++col < ncol; ) 2242 for (i = 0; ++col < ncol; )
2202 { 2243 {
2203 if (stp[col] == NOCHAR) 2244 if (stp[col] == NOCHAR)
2204 { 2245 {
2205 dtp[col] = stp[col]; 2246 dtp[col] = stp[col];
2206 drp[col] = rend; 2247 drp[col] = srp[col];
2248
2207 count++; 2249 count++;
2208 i++; 2250 i++;
2209 2251
2210 continue; 2252 continue;
2211 } 2253 }
… …
2216 count++; 2258 count++;
2217 2259
2218 if (stp[col] != dtp[col] 2260 if (stp[col] != dtp[col]
2219 || !RS_SAME (srp[col], drp[col])) 2261 || !RS_SAME (srp[col], drp[col]))
2220 { 2262 {
2221 if (must_clear && (i++ > count / 2)) 2263 if (have_bg && (i++ > count / 2))
2222 break; 2264 break;
2223 2265
2224 dtp[col] = stp[col]; 2266 dtp[col] = stp[col];
2225 drp[col] = rend; 2267 drp[col] = rend;
2226 i = 0; 2268 i = 0;
2227 } 2269 }
2228 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2270 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2229 break; 2271 break;
2230 } 2272 }
2231 2273
2232 col--; /* went one too far. move back */ 2274 col--; /* went one too far. move back */
2233 count -= i; /* dump any matching trailing chars */ 2275 count -= i; /* dump any matching trailing chars */
2234 2276
2235 // sometimes we optimize away the trailing NOCHAR's, add them back 2277 // sometimes we optimize away the trailing NOCHAR's, add them back
2236 while (i && text[count] == NOCHAR) 2278 while (expect_false (i && text[count] == NOCHAR))
2237 count++, i--; 2279 count++, i--;
2238 2280
2239 /* 2281 /*
2240 * Determine the attributes for the string 2282 * Determine the attributes for the string
2241 */ 2283 */
2242 int fore = fgcolor_of (rend); // desired foreground 2284 int fore = fgcolor_of (rend); // desired foreground
2243 int back = bgcolor_of (rend); // desired background 2285 int back = bgcolor_of (rend); // desired background
2244 2286
2245 // only do special processing if any attributes are set, which is unlikely 2287 // only do special processing if any attributes are set, which is unlikely
2246 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2288 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2247 { 2289 {
2248#if ENABLE_STYLES
2249 // force redraw after "careful" characters to avoid pixel droppings
2250 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2251 drp[col + 1] = ~srp[col + 1];
2252
2253 // include previous careful character(s) if possible, looks nicer (best effort...)
2254 while (text > stp
2255 && srp[text - stp - 1] & RS_Careful
2256 && RS_SAME (rend, srp[text - stp - 1]))
2257 text--, count++, xpixel -= fwidth;
2258#endif
2259
2260 bool invert = rend & RS_RVid; 2290 bool invert = rend & RS_RVid;
2261 2291
2262#ifndef NO_BOLD_UNDERLINE_REVERSE 2292#ifndef NO_BOLD_UNDERLINE_REVERSE
2263 if (rend & RS_Bold
2264 && fore == Color_fg) 2293 if (rend & RS_Bold && fore == Color_fg)
2265 { 2294 {
2266 if (ISSET_PIXCOLOR (Color_BD)) 2295 if (ISSET_PIXCOLOR (Color_BD))
2267 fore = Color_BD; 2296 fore = Color_BD;
2268# if !ENABLE_STYLES 2297# if !ENABLE_STYLES
2269 else 2298 else
2270 invert = !invert; 2299 invert = !invert;
2271# endif 2300# endif
2272 } 2301 }
2273 2302
2274 if (rend & RS_Italic 2303 if (rend & RS_Italic && fore == Color_fg)
2275 && fore == Color_fg)
2276 { 2304 {
2277 if (ISSET_PIXCOLOR (Color_IT)) 2305 if (ISSET_PIXCOLOR (Color_IT))
2278 fore = Color_IT; 2306 fore = Color_IT;
2279# if !ENABLE_STYLES 2307# if !ENABLE_STYLES
2280 else 2308 else
2281 invert = !invert; 2309 invert = !invert;
2282# endif 2310# endif
2283 } 2311 }
2284 2312
2285 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2313 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2286 fore = Color_UL; 2314 fore = Color_UL;
2287#endif 2315#endif
2288 2316
2289 if (invert) 2317 if (invert)
2290 { 2318 {
2319#ifdef OPTION_HC
2320 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2321 || !ISSET_PIXCOLOR (Color_HC))
2322#endif
2323 /* invert the column if no highlightColor is set or it is the
2324 * current cursor column */
2291 ::swap (fore, back); 2325 ::swap (fore, back);
2326#ifdef OPTION_HC
2327 else if (ISSET_PIXCOLOR (Color_HC))
2328 back = Color_HC;
2329#endif
2292 2330
2293#ifndef NO_BOLD_UNDERLINE_REVERSE 2331#ifndef NO_BOLD_UNDERLINE_REVERSE
2332# ifndef OPTION_HC
2294 if (ISSET_PIXCOLOR (Color_RV)) 2333 if (ISSET_PIXCOLOR (Color_RV))
2295 back = Color_RV; 2334 back = Color_RV;
2296 2335# endif
2297 if (fore == back) 2336 if (fore == back)
2298 { 2337 {
2299 fore = Color_bg; 2338 fore = Color_bg;
2300 back = Color_fg; 2339 back = Color_fg;
2301 } 2340 }
… …
2303 } 2342 }
2304 2343
2305#ifdef TEXT_BLINK 2344#ifdef TEXT_BLINK
2306 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2345 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2307 { 2346 {
2308 if (!text_blink_ev.active) 2347 if (!text_blink_ev.is_active ())
2309 { 2348 {
2310 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2349 text_blink_ev.again ();
2311 hidden_text = 0; 2350 hidden_text = 0;
2312 } 2351 }
2313 else if (hidden_text) 2352 else if (hidden_text)
2314 fore = back; 2353 fore = back;
2315 } 2354 }
2316#endif 2355#endif
2356
2357#if ENABLE_STYLES
2358 // "careful" (too wide) character handling
2359
2360 // include previous careful character(s) if possible, looks nicer (best effort...)
2361 while (text > stp
2362 && srp[text - stp - 1] & RS_Careful
2363 && RS_SAME (rend, srp[text - stp - 1]))
2364 text--, count++, xpixel -= fwidth;
2365
2366 // force redraw after "careful" characters to avoid pixel droppings
2367 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2368 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2369
2370 // force redraw before "careful" characters to avoid pixel droppings
2371 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2372 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2373#endif
2317 } 2374 }
2318 2375
2319 /* 2376 /*
2320 * Actually do the drawing of the string here 2377 * Actually do the drawing of the string here
2321 */ 2378 */
2322 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2379 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2323 2380
2324 if (back == fore) 2381 if (expect_true (have_bg && back == Color_bg))
2325 font->clear_rect (*drawable, xpixel, ypixel,
2326 fwidth * count, fheight,
2327 back);
2328 else if (back == Color_bg)
2329 { 2382 {
2330 if (must_clear) 2383 // this is very ugly, maybe push it into ->draw?
2331 {
2332 CLEAR_CHARS (xpixel, ypixel, count);
2333 2384
2334 for (i = 0; i < count; i++) /* don't draw empty strings */ 2385 for (i = 0; i < count; i++) /* don't draw empty strings */
2335 if (text[i] != ' ') 2386 if (text[i] != ' ')
2336 { 2387 {
2337 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2388 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2338 break; 2389 goto did_clear;
2339 }
2340 } 2390 }
2341 else 2391
2342 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2392 CLEAR_CHARS (xpixel, ypixel, count);
2393 did_clear: ;
2343 } 2394 }
2344 else 2395 else
2345 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2396 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2346 2397
2347 if (rend & RS_Uline && font->descent > 1 && fore != back) 2398 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2348 { 2399 {
2349#if ENABLE_FRILLS 2400#if ENABLE_FRILLS
2350 if (ISSET_PIXCOLOR (Color_underline)) 2401 if (ISSET_PIXCOLOR (Color_underline))
2351 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2402 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2352 else 2403 else
2353#endif 2404#endif
2354 XSetForeground (display->display, gc, pix_colors[fore]); 2405 XSetForeground (dpy, gc, pix_colors[fore]);
2355 2406
2356 XDrawLine (display->display, drawBuffer, gc, 2407 XDrawLine (dpy, vt, gc,
2357 xpixel, ypixel + font->ascent + 1, 2408 xpixel, ypixel + font->ascent + 1,
2358 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2409 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2359 } 2410 }
2360 } /* for (col....) */ 2411 } /* for (col....) */
2361 } /* for (row....) */ 2412 } /* for (row....) */
2362 2413
2363#if ENABLE_OVERLAY
2364 scr_swap_overlay ();
2365#endif
2366 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2367
2368 /* 2414 /*
2369 * G: cleanup cursor and display outline cursor if necessary 2415 * G: cleanup cursor and display outline cursor if necessary
2370 */ 2416 */
2371 if (showcursor) 2417 if (showcursor)
2372 { 2418 {
2373 if (focus) 2419 if (focus)
2374 { 2420 {
2375 if (OPTION (Opt_cursorUnderline)) 2421 if (option (Opt_cursorUnderline))
2376 *crp ^= RS_Uline; 2422 *crp ^= RS_Uline;
2377 else 2423 else
2378 { 2424 {
2379 *crp ^= RS_RVid; 2425 *crp ^= RS_RVid;
2380#ifndef NO_CURSORCOLOR 2426#ifndef NO_CURSORCOLOR
… …
2394 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2440 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2395 cursorwidth++; 2441 cursorwidth++;
2396 2442
2397#ifndef NO_CURSORCOLOR 2443#ifndef NO_CURSORCOLOR
2398 if (ISSET_PIXCOLOR (Color_cursor)) 2444 if (ISSET_PIXCOLOR (Color_cursor))
2399 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2445 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2446 else
2400#endif 2447#endif
2448 XSetForeground (dpy, gc, pix_colors[ccol1]);
2401 2449
2402 XDrawRectangle (display->display, drawBuffer, gc, 2450 XDrawRectangle (dpy, vt, gc,
2403 Col2Pixel (col), 2451 Col2Pixel (col),
2404 Row2Pixel (oldcursor.row), 2452 Row2Pixel (oldcursor.row),
2405 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2453 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2406 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2454 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2407 } 2455 }
2408 } 2456 }
2409 2457
2410 /* 2458 /*
2411 * H: cleanup selection 2459 * H: cleanup selection
2412 */ 2460 */
2461#if ENABLE_OVERLAY
2462 scr_swap_overlay ();
2463#endif
2464 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2465
2413 scr_reverse_selection (); 2466 scr_reverse_selection ();
2414 2467
2468 screen.flags = old_screen_flags;
2415 num_scr = 0; 2469 num_scr = 0;
2416 num_scr_allow = 1; 2470 num_scr_allow = 1;
2417} 2471}
2418 2472
2419void 2473void
… …
2442} 2496}
2443 2497
2444void 2498void
2445rxvt_term::scr_recolour () NOTHROW 2499rxvt_term::scr_recolour () NOTHROW
2446{ 2500{
2447 if (1 2501#ifdef HAVE_BG_PIXMAP
2448#if TRANSPARENT 2502 bgPixmap.apply ();
2449 && !am_transparent 2503#else
2450#endif 2504
2451#if XPM_BACKGROUND
2452 && !bgPixmap.pixmap
2453#endif
2454 )
2455 {
2456 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2505 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2457 XClearWindow (display->display, parent[0]); 2506 XClearWindow (dpy, parent[0]);
2458 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2507 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2459#if HAVE_SCROLLBARS 2508
2460 if (scrollBar.win) 2509 if (scrollBar.win)
2461 { 2510 {
2462 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2511 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2463 scrollBar.setIdle (); 2512 scrollBar.state = STATE_IDLE;
2464 scrollbar_show (0); 2513 scrollBar.show (0);
2465 }
2466#endif
2467 } 2514 }
2468 2515
2516#endif
2517
2518 /* bgPixmap.apply () does not do the following : */
2469 scr_clear (); 2519 scr_clear ();
2470 scr_touch (true); 2520 scr_touch (true);
2471 want_refresh = 1; 2521 want_refresh = 1;
2472} 2522}
2473 2523
… …
2480 2530
2481 num_scr_allow = 0; 2531 num_scr_allow = 0;
2482 want_refresh = 1; 2532 want_refresh = 1;
2483 2533
2484 if (really) 2534 if (really)
2485 XClearWindow (display->display, vt); 2535 XClearWindow (dpy, vt);
2486} 2536}
2487 2537
2488void 2538void
2489rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2539rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2490{ 2540{
… …
2539{ 2589{
2540 if (selection.op 2590 if (selection.op
2541 && current_screen == selection.screen 2591 && current_screen == selection.screen
2542 && selection.end.row >= view_start) 2592 && selection.end.row >= view_start)
2543 { 2593 {
2544#if ENABLE_FRILLS 2594#if !ENABLE_MINIMAL
2545 if (selection.rect) 2595 if (selection.rect)
2546 scr_xor_rect (selection.beg.row, selection.beg.col, 2596 scr_xor_rect (selection.beg.row, selection.beg.col,
2547 selection.end.row, selection.end.col, 2597 selection.end.row, selection.end.col,
2548 RS_RVid, RS_RVid | RS_Uline); 2598 RS_RVid, RS_RVid | RS_Uline);
2549 else 2599 else
… …
2565{ 2615{
2566 int row, wrote; 2616 int row, wrote;
2567 unsigned int width, towrite; 2617 unsigned int width, towrite;
2568 char r1[] = "\n"; 2618 char r1[] = "\n";
2569 2619
2570 for (row = saveLines - nsaved; 2620 for (row = saveLines + top_row;
2571 row < saveLines + nrow - 1; row++) 2621 row < saveLines + nrow - 1; row++)
2572 { 2622 {
2573 width = row_buf[row].l >= 0 ? row_buf[row].l 2623 width = row_buf[row].l >= 0 ? row_buf[row].l
2574 : ncol; 2624 : ncol;
2575 for (towrite = width; towrite; towrite -= wrote) 2625 for (towrite = width; towrite; towrite -= wrote)
… …
2626 /* convert normal newline chars into common keyboard Return key sequence */ 2676 /* convert normal newline chars into common keyboard Return key sequence */
2627 for (unsigned int i = 0; i < len; i++) 2677 for (unsigned int i = 0; i < len; i++)
2628 if (data[i] == C0_LF) 2678 if (data[i] == C0_LF)
2629 data[i] = C0_CR; 2679 data[i] = C0_CR;
2630 2680
2681 if (priv_modes & PrivMode_BracketPaste)
2682 tt_printf ("\e[200~");
2683
2631 tt_write (data, len); 2684 tt_write (data, len);
2685
2686 if (priv_modes & PrivMode_BracketPaste)
2687 tt_printf ("\e[201~");
2632} 2688}
2633 2689
2634/* ------------------------------------------------------------------------- */ 2690/* ------------------------------------------------------------------------- */
2635/* 2691/*
2636 * Respond to a notification that a primary selection has been sent 2692 * Respond to a notification that a primary selection has been sent
… …
2665 } 2721 }
2666 2722
2667 unsigned long bytes_after; 2723 unsigned long bytes_after;
2668 XTextProperty ct; 2724 XTextProperty ct;
2669 2725
2670 if (XGetWindowProperty (display->display, win, prop, 2726 if (XGetWindowProperty (dpy, win, prop,
2671 0, PROP_SIZE / 4, 2727 0, PROP_SIZE / 4,
2672 delete_prop, AnyPropertyType, 2728 delete_prop, AnyPropertyType,
2673 &ct.encoding, &ct.format, 2729 &ct.encoding, &ct.format,
2674 &ct.nitems, &bytes_after, 2730 &ct.nitems, &bytes_after,
2675 &ct.value) != Success) 2731 &ct.value) != Success)
… …
2684 if (bytes_after) 2740 if (bytes_after)
2685 { 2741 {
2686 // fetch and append remaining data 2742 // fetch and append remaining data
2687 XTextProperty ct2; 2743 XTextProperty ct2;
2688 2744
2689 if (XGetWindowProperty (display->display, win, prop, 2745 if (XGetWindowProperty (dpy, win, prop,
2690 ct.nitems / 4, (bytes_after + 3) / 4, 2746 ct.nitems / 4, (bytes_after + 3) / 4,
2691 delete_prop, AnyPropertyType, 2747 delete_prop, AnyPropertyType,
2692 &ct2.encoding, &ct2.format, 2748 &ct2.encoding, &ct2.format,
2693 &ct2.nitems, &bytes_after, 2749 &ct2.nitems, &bytes_after,
2694 &ct2.value) != Success) 2750 &ct2.value) != Success)
… …
2707 2763
2708 if (ct.encoding == xa[XA_INCR]) 2764 if (ct.encoding == xa[XA_INCR])
2709 { 2765 {
2710 // INCR selection, start handshake 2766 // INCR selection, start handshake
2711 if (!delete_prop) 2767 if (!delete_prop)
2712 XDeleteProperty (display->display, win, prop); 2768 XDeleteProperty (dpy, win, prop);
2713 2769
2714 selection_wait = Sel_incr; 2770 selection_wait = Sel_incr;
2715 incr_buf_fill = 0; 2771 incr_buf_fill = 0;
2716 incr_ev.start (NOW + 10); 2772 incr_ev.start (10);
2717 2773
2718 goto bailout; 2774 goto bailout;
2719 } 2775 }
2720 2776
2721 if (ct.nitems == 0) 2777 if (ct.nitems == 0)
… …
2730 ct.nitems = incr_buf_fill; 2786 ct.nitems = incr_buf_fill;
2731 incr_buf = 0; 2787 incr_buf = 0;
2732 incr_buf_size = 0; 2788 incr_buf_size = 0;
2733 incr_ev.stop (); 2789 incr_ev.stop ();
2734 } 2790 }
2735 else 2791 else
2736 { 2792 {
2737 if (selection_wait == Sel_normal 2793 if (selection_wait == Sel_normal
2738 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2794 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2739 { 2795 {
2740 /* 2796 /*
… …
2747 goto bailout; 2803 goto bailout;
2748 } 2804 }
2749 } 2805 }
2750 else if (selection_wait == Sel_incr) 2806 else if (selection_wait == Sel_incr)
2751 { 2807 {
2752 incr_ev.start (NOW + 10); 2808 incr_ev.start (10);
2753 2809
2754 while (incr_buf_fill + ct.nitems > incr_buf_size) 2810 while (incr_buf_fill + ct.nitems > incr_buf_size)
2755 { 2811 {
2756 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2812 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2757 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2813 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2764 } 2820 }
2765 2821
2766 char **cl; 2822 char **cl;
2767 int cr; 2823 int cr;
2768 2824
2769#if ENABLE_FRILLS 2825#if !ENABLE_MINIMAL
2770 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2826 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2771 // so recode it manually 2827 // so recode it manually
2772 if (ct.encoding == xa[XA_UTF8_STRING]) 2828 if (ct.encoding == xa[XA_UTF8_STRING])
2773 { 2829 {
2774 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2830 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2778 paste (s, strlen (s)); 2834 paste (s, strlen (s));
2779 free (s); 2835 free (s);
2780 } 2836 }
2781 else 2837 else
2782#endif 2838#endif
2783 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2839 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2784 && cl) 2840 && cl)
2785 { 2841 {
2786 for (int i = 0; i < cr; i++) 2842 for (int i = 0; i < cr; i++)
2787 paste (cl[i], strlen (cl[i])); 2843 paste (cl[i], strlen (cl[i]));
2788 2844
… …
2797 if (selection_wait == Sel_normal) 2853 if (selection_wait == Sel_normal)
2798 selection_wait = Sel_none; 2854 selection_wait = Sel_none;
2799} 2855}
2800 2856
2801void 2857void
2802rxvt_term::incr_cb (time_watcher &w) NOTHROW 2858rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2803{ 2859{
2804 selection_wait = Sel_none; 2860 selection_wait = Sel_none;
2805 2861
2806 incr_buf_size = 0; 2862 incr_buf_size = 0;
2807 free (incr_buf); 2863 free (incr_buf);
… …
2818 selection_paste (win, prop, true); 2874 selection_paste (win, prop, true);
2819} 2875}
2820 2876
2821/* ------------------------------------------------------------------------- */ 2877/* ------------------------------------------------------------------------- */
2822/* 2878/*
2823 * Request the current selection: 2879 * Request the current selection:
2824 * Order: > internal selection if available 2880 * Order: > internal selection if available
2825 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2881 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2826 * > CUT_BUFFER0 2882 * > CUT_BUFFER0
2827 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2883 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2828 * will auto fallback to CUT_BUFFER0 2884 * will auto fallback to CUT_BUFFER0
… …
2830 */ 2886 */
2831void 2887void
2832rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2888rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2833{ 2889{
2834 if (selection.text && selnum == Sel_Primary) 2890 if (selection.text && selnum == Sel_Primary)
2891 {
2835 { /* internal selection */ 2892 /* internal selection */
2836 char *str = rxvt_wcstombs (selection.text, selection.len); 2893 char *str = rxvt_wcstombs (selection.text, selection.len);
2837 paste (str, strlen (str)); 2894 paste (str, strlen (str));
2838 free (str); 2895 free (str);
2839 return; 2896 return;
2840 } 2897 }
… …
2870 else if (selnum == Sel_Secondary) 2927 else if (selnum == Sel_Secondary)
2871 sel = XA_SECONDARY; 2928 sel = XA_SECONDARY;
2872 else 2929 else
2873 sel = xa[XA_CLIPBOARD]; 2930 sel = xa[XA_CLIPBOARD];
2874 2931
2875 if (XGetSelectionOwner (display->display, sel) != None) 2932 if (XGetSelectionOwner (dpy, sel) != None)
2876 { 2933 {
2877 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2934 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2878 vt, selection_request_time); 2935 vt, selection_request_time);
2879 return 1; 2936 return 1;
2880 } 2937 }
2881 2938
2882 return 0; 2939 return 0;
… …
2945 3002
2946 int end_col; 3003 int end_col;
2947 3004
2948 for (; row <= selection.end.row; row++, col = 0) 3005 for (; row <= selection.end.row; row++, col = 0)
2949 { 3006 {
2950#if ENABLE_FRILLS 3007#if !ENABLE_MINIMAL
2951 if (selection.rect) 3008 if (selection.rect)
2952 { 3009 {
2953 col = selection.beg.col; 3010 col = selection.beg.col;
2954 end_col = ncol + 1; 3011 end_col = ncol + 1;
2955 } 3012 }
… …
2958 end_col = ROW(row).l; 3015 end_col = ROW(row).l;
2959 3016
2960 col = max (col, 0); 3017 col = max (col, 0);
2961 3018
2962 if (row == selection.end.row 3019 if (row == selection.end.row
2963#if ENABLE_FRILLS 3020#if !ENABLE_MINIMAL
2964 || selection.rect 3021 || selection.rect
2965#endif 3022#endif
2966 ) 3023 )
2967 min_it (end_col, selection.end.col); 3024 min_it (end_col, selection.end.col);
2968 3025
… …
2991#endif 3048#endif
2992 else 3049 else
2993 new_selection_text[ofs++] = *t++; 3050 new_selection_text[ofs++] = *t++;
2994 } 3051 }
2995 3052
2996#if ENABLE_FRILLS 3053#if !ENABLE_MINIMAL
2997 if (selection.rect) 3054 if (selection.rect)
2998 { 3055 {
2999 while (ofs 3056 while (ofs
3000 && new_selection_text[ofs - 1] != C0_LF 3057 && new_selection_text[ofs - 1] != C0_LF
3001 && unicode::is_space (new_selection_text[ofs - 1])) 3058 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3035bool 3092bool
3036rxvt_term::selection_grab (Time tm) NOTHROW 3093rxvt_term::selection_grab (Time tm) NOTHROW
3037{ 3094{
3038 selection_time = tm; 3095 selection_time = tm;
3039 3096
3040 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3097 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3041 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3098 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3042 { 3099 {
3043 display->set_selection_owner (this); 3100 display->set_selection_owner (this);
3044 return true; 3101 return true;
3045 } 3102 }
3046 else 3103 else
… …
3050 } 3107 }
3051 3108
3052#if 0 3109#if 0
3053 XTextProperty ct; 3110 XTextProperty ct;
3054 3111
3055 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3112 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3056 { 3113 {
3057 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3114 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3058 XFree (ct.value); 3115 XFree (ct.value);
3059 } 3116 }
3060#endif 3117#endif
… …
3106 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3163 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3107 3164
3108 while (selection.mark.col > 0 3165 while (selection.mark.col > 0
3109 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3166 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3110 --selection.mark.col; 3167 --selection.mark.col;
3111 3168
3112 if (selection.op) 3169 if (selection.op)
3170 {
3113 { /* clear the old selection */ 3171 /* clear the old selection */
3114 selection.beg.row = selection.end.row = selection.mark.row; 3172 selection.beg.row = selection.end.row = selection.mark.row;
3115 selection.beg.col = selection.end.col = selection.mark.col; 3173 selection.beg.col = selection.end.col = selection.mark.col;
3116 } 3174 }
3117 3175
3118 selection.op = SELECTION_INIT; 3176 selection.op = SELECTION_INIT;
… …
3307 * a point/word/line which is either the start or end of the selection 3365 * a point/word/line which is either the start or end of the selection
3308 * and it was decided by whichever point/word/line was `fixed' at the 3366 * and it was decided by whichever point/word/line was `fixed' at the
3309 * time of the most recent button3 press 3367 * time of the most recent button3 press
3310 */ 3368 */
3311 if (button3 && buttonpress) 3369 if (button3 && buttonpress)
3370 {
3312 { /* button3 press */ 3371 /* button3 press */
3313 /* 3372 /*
3314 * first determine which edge of the selection we are closest to 3373 * first determine which edge of the selection we are closest to
3315 */ 3374 */
3316 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3375 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3317 || (!ROWCOL_IS_AFTER (pos, selection.end) 3376 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3335 selection.mark.row = selection.beg.row; 3394 selection.mark.row = selection.beg.row;
3336 selection.mark.col = selection.beg.col; 3395 selection.mark.col = selection.beg.col;
3337 } 3396 }
3338 } 3397 }
3339 else 3398 else
3399 {
3340 { /* button1 drag or button3 drag */ 3400 /* button1 drag or button3 drag */
3341 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3401 if (ROWCOL_IS_AFTER (selection.mark, pos))
3342 { 3402 {
3343 if (selection.mark.row == selection.end.row 3403 if (selection.mark.row == selection.end.row
3344 && selection.mark.col == selection.end.col 3404 && selection.mark.col == selection.end.col
3345 && clickchange 3405 && clickchange
… …
3362 3422
3363 if (selection.clicks == 1) 3423 if (selection.clicks == 1)
3364 { 3424 {
3365 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3425 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3366 && !ROW(selection.beg.row).is_longer () 3426 && !ROW(selection.beg.row).is_longer ()
3367#if ENABLE_FRILLS 3427#if !ENABLE_MINIMAL
3368 && !selection.rect 3428 && !selection.rect
3369#endif 3429#endif
3370 ) 3430 )
3371 selection.beg.col = ncol; 3431 selection.beg.col = ncol;
3372 3432
3373 if ( 3433 if (
3374 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3434 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3375 && !ROW(selection.end.row).is_longer () 3435 && !ROW(selection.end.row).is_longer ()
3376#if ENABLE_FRILLS 3436#if !ENABLE_MINIMAL
3377 && !selection.rect 3437 && !selection.rect
3378#endif 3438#endif
3379 ) 3439 )
3380 selection.end.col = ncol; 3440 selection.end.col = ncol;
3381 } 3441 }
… …
3388 selection_delimit_word (DN, &selection.end, &selection.end); 3448 selection_delimit_word (DN, &selection.end, &selection.end);
3389 } 3449 }
3390 else if (selection.clicks == 3) 3450 else if (selection.clicks == 3)
3391 { 3451 {
3392#if ENABLE_FRILLS 3452#if ENABLE_FRILLS
3393 if (OPTION (Opt_tripleclickwords)) 3453 if (option (Opt_tripleclickwords))
3394 { 3454 {
3395 selection_delimit_word (UP, &selection.beg, &selection.beg); 3455 selection_delimit_word (UP, &selection.beg, &selection.beg);
3396 3456
3397 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3457 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3398 { 3458 {
3399 if (!ROW(end_row).is_longer ()) 3459 if (!ROW(end_row).is_longer ())
3400 { 3460 {
3401 selection.end.row = end_row; 3461 selection.end.row = end_row;
3402 selection.end.col = ROW(end_row).l; 3462 selection.end.col = ROW(end_row).l;
3463# if !ENABLE_MINIMAL
3403 selection_remove_trailing_spaces (); 3464 selection_remove_trailing_spaces ();
3465# endif
3404 break; 3466 break;
3405 } 3467 }
3406 } 3468 }
3407 } 3469 }
3408 else 3470 else
… …
3424 selection.end.row++; 3486 selection.end.row++;
3425 } 3487 }
3426 } 3488 }
3427 3489
3428 if (button3 && buttonpress) 3490 if (button3 && buttonpress)
3491 {
3429 { /* mark may need to be changed */ 3492 /* mark may need to be changed */
3430 if (closeto == LEFT) 3493 if (closeto == LEFT)
3431 { 3494 {
3432 selection.mark.row = selection.end.row; 3495 selection.mark.row = selection.end.row;
3433 selection.mark.col = selection.end.col - (selection.clicks == 2); 3496 selection.mark.col = selection.end.col - (selection.clicks == 2);
3434 } 3497 }
… …
3437 selection.mark.row = selection.beg.row; 3500 selection.mark.row = selection.beg.row;
3438 selection.mark.col = selection.beg.col; 3501 selection.mark.col = selection.beg.col;
3439 } 3502 }
3440 } 3503 }
3441 3504
3442#if ENABLE_FRILLS 3505#if !ENABLE_MINIMAL
3443 if (selection.rect && selection.beg.col > selection.end.col) 3506 if (selection.rect && selection.beg.col > selection.end.col)
3444 ::swap (selection.beg.col, selection.end.col); 3507 ::swap (selection.beg.col, selection.end.col);
3445#endif 3508#endif
3446} 3509}
3447 3510
3448#if ENABLE_FRILLS 3511#if !ENABLE_MINIMAL
3449void 3512void
3450rxvt_term::selection_remove_trailing_spaces () NOTHROW 3513rxvt_term::selection_remove_trailing_spaces () NOTHROW
3451{ 3514{
3452 int32_t end_col, end_row; 3515 int32_t end_col, end_row;
3453 text_t *stp; 3516 text_t *stp;
… …
3508 */ 3571 */
3509void 3572void
3510rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3573rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3511{ 3574{
3512 XSelectionEvent ev; 3575 XSelectionEvent ev;
3513 dDisp;
3514 3576
3515 ev.type = SelectionNotify; 3577 ev.type = SelectionNotify;
3516 ev.property = None; 3578 ev.property = None;
3517 ev.display = rq.display; 3579 ev.display = rq.display;
3518 ev.requestor = rq.requestor; 3580 ev.requestor = rq.requestor;
… …
3532 *target++ = xa[XA_COMPOUND_TEXT]; 3594 *target++ = xa[XA_COMPOUND_TEXT];
3533#if X_HAVE_UTF8_STRING 3595#if X_HAVE_UTF8_STRING
3534 *target++ = xa[XA_UTF8_STRING]; 3596 *target++ = xa[XA_UTF8_STRING];
3535#endif 3597#endif
3536 3598
3537 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3599 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3538 32, PropModeReplace, 3600 32, PropModeReplace,
3539 (unsigned char *)target_list, target - target_list); 3601 (unsigned char *)target_list, target - target_list);
3540 ev.property = rq.property; 3602 ev.property = rq.property;
3541 } 3603 }
3542#if TODO // TODO 3604#if TODO // TODO
… …
3545 /* TODO: Handle MULTIPLE */ 3607 /* TODO: Handle MULTIPLE */
3546 } 3608 }
3547#endif 3609#endif
3548 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3610 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3549 { 3611 {
3550 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3612 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3551 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3613 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3552 ev.property = rq.property; 3614 ev.property = rq.property;
3553 } 3615 }
3554 else if (rq.target == XA_STRING 3616 else if (rq.target == XA_STRING
3555 || rq.target == xa[XA_TEXT] 3617 || rq.target == xa[XA_TEXT]
… …
3579 style = enc_string; 3641 style = enc_string;
3580 else if (target == xa[XA_TEXT]) 3642 else if (target == xa[XA_TEXT])
3581 style = enc_text; 3643 style = enc_text;
3582 else if (target == xa[XA_COMPOUND_TEXT]) 3644 else if (target == xa[XA_COMPOUND_TEXT])
3583 style = enc_compound_text; 3645 style = enc_compound_text;
3584#if ENABLE_FRILLS 3646#if !ENABLE_MINIMAL
3585 else if (target == xa[XA_UTF8_STRING]) 3647 else if (target == xa[XA_UTF8_STRING])
3586 style = enc_utf8; 3648 style = enc_utf8;
3587#endif 3649#endif
3588 else 3650 else
3589 { 3651 {
… …
3600 { 3662 {
3601 cl = L""; 3663 cl = L"";
3602 selectlen = 0; 3664 selectlen = 0;
3603 } 3665 }
3604 3666
3605#if ENABLE_FRILLS 3667#if !ENABLE_MINIMAL
3606 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3668 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3607 // so recode it manually 3669 // so recode it manually
3608 if (style == enc_utf8) 3670 if (style == enc_utf8)
3609 { 3671 {
3610 freect = 1; 3672 freect = 1;
… …
3613 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3675 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3614 ct.nitems = strlen ((char *)ct.value); 3676 ct.nitems = strlen ((char *)ct.value);
3615 } 3677 }
3616 else 3678 else
3617#endif 3679#endif
3618 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3680 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3619 freect = 1; 3681 freect = 1;
3620 else 3682 else
3621 { 3683 {
3622 /* if we failed to convert then send it raw */ 3684 /* if we failed to convert then send it raw */
3623 ct.value = (unsigned char *)cl; 3685 ct.value = (unsigned char *)cl;
3624 ct.nitems = selectlen; 3686 ct.nitems = selectlen;
3625 ct.encoding = target; 3687 ct.encoding = target;
3626 } 3688 }
3627 3689
3628 XChangeProperty (disp, rq.requestor, rq.property, 3690 XChangeProperty (dpy, rq.requestor, rq.property,
3629 ct.encoding, 8, PropModeReplace, 3691 ct.encoding, 8, PropModeReplace,
3630 ct.value, (int)ct.nitems); 3692 ct.value, (int)ct.nitems);
3631 ev.property = rq.property; 3693 ev.property = rq.property;
3632 3694
3633 if (freect) 3695 if (freect)
3634 XFree (ct.value); 3696 XFree (ct.value);
3635 } 3697 }
3636 3698
3637 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3699 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3638}
3639
3640/* ------------------------------------------------------------------------- *
3641 * MOUSE ROUTINES *
3642 * ------------------------------------------------------------------------- */
3643
3644/*
3645 * return col/row values corresponding to x/y pixel values
3646 */
3647void
3648rxvt_term::pixel_position (int *x, int *y) NOTHROW
3649{
3650 *x = Pixel2Col (*x);
3651 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3652 *y = Pixel2Row (*y);
3653 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3654} 3700}
3655 3701
3656/* ------------------------------------------------------------------------- */ 3702/* ------------------------------------------------------------------------- */
3657#ifdef USE_XIM 3703#ifdef USE_XIM
3658void 3704void
3659rxvt_term::im_set_position (XPoint &pos) NOTHROW 3705rxvt_term::im_set_position (XPoint &pos) NOTHROW
3660{ 3706{
3661 XWindowAttributes xwa; 3707 XWindowAttributes xwa;
3662 3708
3663 XGetWindowAttributes (display->display, vt, &xwa); 3709 XGetWindowAttributes (dpy, vt, &xwa);
3664 3710
3665 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3711 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3666 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3712 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3667} 3713}
3668#endif 3714#endif
… …
3686 h += 2; min_it (h, nrow); 3732 h += 2; min_it (h, nrow);
3687 3733
3688 x -= 1; clamp_it (x, 0, ncol - w); 3734 x -= 1; clamp_it (x, 0, ncol - w);
3689 y -= 1; clamp_it (y, 0, nrow - h); 3735 y -= 1; clamp_it (y, 0, nrow - h);
3690 3736
3691 ov_x = x; ov_y = y; 3737 ov.x = x; ov.y = y;
3692 ov_w = w; ov_h = h; 3738 ov.w = w; ov.h = h;
3693 3739
3694 ov_text = new text_t *[h]; 3740 ov.text = new text_t *[h];
3695 ov_rend = new rend_t *[h]; 3741 ov.rend = new rend_t *[h];
3696 3742
3697 for (y = 0; y < h; y++) 3743 for (y = 0; y < h; y++)
3698 { 3744 {
3699 text_t *tp = ov_text[y] = new text_t[w]; 3745 text_t *tp = ov.text[y] = new text_t[w];
3700 rend_t *rp = ov_rend[y] = new rend_t[w]; 3746 rend_t *rp = ov.rend[y] = new rend_t[w];
3701 3747
3702 text_t t0, t1, t2; 3748 text_t t0, t1, t2;
3703 rend_t r = OVERLAY_RSTYLE; 3749 rend_t r = OVERLAY_RSTYLE;
3704 3750
3705 if (y == 0) 3751 if (y == 0)
… …
3724} 3770}
3725 3771
3726void 3772void
3727rxvt_term::scr_overlay_off () NOTHROW 3773rxvt_term::scr_overlay_off () NOTHROW
3728{ 3774{
3729 if (!ov_text) 3775 if (!ov.text)
3730 return; 3776 return;
3731 3777
3732 want_refresh = 1; 3778 want_refresh = 1;
3733 3779
3734 for (int y = 0; y < ov_h; y++) 3780 for (int y = 0; y < ov.h; y++)
3735 { 3781 {
3736 delete [] ov_text[y]; 3782 delete [] ov.text[y];
3737 delete [] ov_rend[y]; 3783 delete [] ov.rend[y];
3738 } 3784 }
3739 3785
3740 delete [] ov_text; ov_text = 0; 3786 delete [] ov.text; ov.text = 0;
3741 delete [] ov_rend; ov_rend = 0; 3787 delete [] ov.rend; ov.rend = 0;
3742} 3788}
3743 3789
3744void 3790void
3745rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3791rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3746{ 3792{
3747 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3793 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3748 return; 3794 return;
3749 3795
3750 x++, y++; 3796 x++, y++;
3751 3797
3752 ov_text[y][x] = text; 3798 ov.text[y][x] = text;
3753 ov_rend[y][x] = rend; 3799 ov.rend[y][x] = rend;
3754} 3800}
3755 3801
3756void 3802void
3757rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3803rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3758{ 3804{
… …
3764rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3810rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3765{ 3811{
3766 while (*s) 3812 while (*s)
3767 { 3813 {
3768 text_t t = *s++; 3814 text_t t = *s++;
3769 int width = wcwidth (t); 3815 int width = WCWIDTH (t);
3770 3816
3771 while (width--) 3817 while (width--)
3772 { 3818 {
3773 scr_overlay_set (x++, y, t); 3819 scr_overlay_set (x++, y, t);
3774 t = NOCHAR; 3820 t = NOCHAR;
… …
3777} 3823}
3778 3824
3779void 3825void
3780rxvt_term::scr_swap_overlay () NOTHROW 3826rxvt_term::scr_swap_overlay () NOTHROW
3781{ 3827{
3782 if (!ov_text) 3828 if (!ov.text)
3783 return; 3829 return;
3784 3830
3831 // hide cursor if it is within the overlay area
3832 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3833 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3834 screen.flags &= ~Screen_VisibleCursor;
3835
3785 // swap screen mem with overlay 3836 // swap screen mem with overlay
3786 for (int y = ov_h; y--; ) 3837 for (int y = ov.h; y--; )
3787 { 3838 {
3788 text_t *t1 = ov_text[y]; 3839 text_t *t1 = ov.text[y];
3789 rend_t *r1 = ov_rend[y]; 3840 rend_t *r1 = ov.rend[y];
3790 3841
3791 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3842 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3792 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3843 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3793 3844
3794 for (int x = ov_w; x--; ) 3845 for (int x = ov.w; x--; )
3795 { 3846 {
3796 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3847 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3797 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3848 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3798 } 3849 }
3799 } 3850 }

Diff Legend

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