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.250 by root, Wed Jan 25 13:24:45 2006 UTC vs.
Revision 1.331 by sf-exg, Wed Jan 6 17:52:43 2010 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 86
89/* 87/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 89 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 91 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 95
114/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
117 99
… …
126 width = ncol; 108 width = ncol;
127 } 109 }
128 110
129 l.touch (); 111 l.touch ();
130 112
131 efs &= ~RS_baseattrMask; 113 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 114 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 115
134 text_t *et = l.t + col; 116 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 117 rend_t *er = l.r + col;
136 118
… …
148{ 130{
149 scr_blank_line (l, 0, ncol, efs); 131 scr_blank_line (l, 0, ncol, efs);
150 132
151 l.l = 0; 133 l.l = 0;
152 l.f = 0; 134 l.f = 0;
135}
136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
153} 154}
154 155
155/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
158 159
159void 160void
160rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
161{ 162{
162#if ENABLE_OVERLAY
163 scr_overlay_off ();
164#endif
165
166 view_start = 0; 163 view_start = 0;
167 num_scr = 0; 164 num_scr = 0;
168 165
169 if (ncol == 0) 166 if (ncol == 0)
170 ncol = 80; 167 ncol = 80;
… …
172 if (nrow == 0) 169 if (nrow == 0)
173 nrow = 24; 170 nrow = 24;
174 171
175 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 173 return;
177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180 174
181 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
182 while (nrow + saveLines < 2) 176 while (nrow + saveLines < 2)
183 { 177 {
184 //TODO//FIXME 178 //TODO//FIXME
… …
237 selection.text = NULL; 231 selection.text = NULL;
238 selection.len = 0; 232 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 233 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 234 selection.screen = PRIMARY;
241 selection.clicks = 0; 235 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false;
243 } 236 }
244 else 237 else
245 { 238 {
246 /* 239 /*
247 * add or delete rows as appropriate 240 * add or delete rows as appropriate
… …
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 269 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 270 }
278 271
279 line_t *old_buf = row_buf; 272 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 273 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 274
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 275 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 276 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 277 int q = total_rows; // rewrapped row
285 278
286 if (top_row) 279 if (top_row)
287 { 280 {
288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 281 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm. 282 // to come up with a lean and mean algorithm.
283 // TODO: maybe optimise when width didn't change
290 284
291 row_col_t ocur = screen.cur; 285 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293 287
294 do 288 do
295 { 289 {
296 p = MOD (p - 1, prev_total_rows); 290 p = MOD (p - 1, prev_total_rows);
297#ifdef DEBUG_STRICT
298 assert (old_buf [MOD (p, prev_total_rows)].t); 291 assert (old_buf [MOD (p, prev_total_rows)].t);
299#endif
300 int plines = 1; 292 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l; 293 int llen = old_buf [MOD (p, prev_total_rows)].l;
302 294
303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 295 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
304 { 296 {
… …
330 int qcol = 0; 322 int qcol = 0;
331 323
332 // see below for cursor adjustment rationale 324 // see below for cursor adjustment rationale
333 if (p == ocur.row) 325 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 326 screen.cur.row = q - (total_rows - nrow);
335 327
336 // fill a single destination line 328 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 329 while (lofs < llen && qcol < ncol)
338 { 330 {
339 int prow = lofs / prev_ncol; 331 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 332 int pcol = lofs % prev_ncol;
… …
366 } 358 }
367 while (p != pend && q > 0); 359 while (p != pend && q > 0);
368 360
369 term_start = total_rows - nrow; 361 term_start = total_rows - nrow;
370 top_row = q - term_start; 362 top_row = q - term_start;
371 363
372 // make sure all terminal lines exist 364 // make sure all terminal lines exist
373 while (top_row > 0) 365 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 366 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 367 }
376 else 368 else
377 { 369 {
378 // if no scrollback exists (yet), wing, instead of wrap 370 // if no scrollback exists (yet), wing, instead of wrap
379 371
380 for (int row = min (nrow, prev_nrow); row--; ) 372 for (int row = min (nrow, prev_nrow); row--; )
381 { 373 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 374 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 375 line_t &qline = row_buf [row];
384 376
… …
398 delete old_ta; 390 delete old_ta;
399 delete old_ra; 391 delete old_ra;
400 392
401 clamp_it (screen.cur.row, 0, nrow - 1); 393 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1); 394 clamp_it (screen.cur.col, 0, ncol - 1);
395 }
403 396
404 free (tabs); 397 free (tabs);
405 } 398 tabs = (char *)rxvt_malloc (ncol);
399
400 for (int col = ncol; --col; )
401 tabs [col] = col % TABSIZE == 0;
406 402
407 CLEAR_ALL_SELECTION (); 403 CLEAR_ALL_SELECTION ();
408 404
409 prev_nrow = nrow; 405 prev_nrow = nrow;
410 prev_ncol = ncol; 406 prev_ncol = ncol;
411
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
413
414 for (int col = ncol; col--; )
415 tabs [col] = col % TABSIZE == 0;
416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419 407
420 tt_winch (); 408 tt_winch ();
421 409
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 410 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 411}
… …
435 delete ralloc; ralloc = 0; 423 delete ralloc; ralloc = 0;
436 424
437 free (row_buf); 425 free (row_buf);
438 free (swap_buf); 426 free (swap_buf);
439 free (drawn_buf); 427 free (drawn_buf);
428 row_buf = 0; // signal that we freed all the arrays above
429
440 free (tabs); 430 free (tabs);
441 431 tabs = 0;
442 row_buf = 0; // signal that we freed all the arrays
443 } 432 }
444} 433}
445 434
446/* ------------------------------------------------------------------------- */ 435/* ------------------------------------------------------------------------- */
447/* 436/*
448 * Hard reset 437 * Hard/Soft reset
449 */ 438 */
450void 439void
451rxvt_term::scr_poweron () 440rxvt_term::scr_poweron ()
452{ 441{
453 scr_release (); 442 scr_release ();
454 prev_nrow = prev_ncol = 0; 443 prev_nrow = prev_ncol = 0;
444 rvideo_mode = false;
445 scr_soft_reset ();
455 scr_reset (); 446 scr_reset ();
456 447
457 scr_clear (true); 448 scr_clear (true);
458 scr_refresh (); 449 scr_refresh ();
450}
451
452void
453rxvt_term::scr_soft_reset ()
454{
455 /* only affects modes, nothing drastic such as clearing the screen */
456#if ENABLE_OVERLAY
457 scr_overlay_off ();
458#endif
459
460 if (current_screen != PRIMARY)
461 scr_swap_screen ();
462
463 scr_scroll_region (0, MAX_ROWS - 1);
464 scr_rendition (0, ~RS_None);
465 scr_insert_mode (0);
459} 466}
460 467
461/* ------------------------------------------------------------------------- * 468/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 469 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 470 * ------------------------------------------------------------------------- */
… …
501 } 508 }
502 509
503 /* boundary check in case screen size changed between SAVE and RESTORE */ 510 /* boundary check in case screen size changed between SAVE and RESTORE */
504 min_it (s->cur.row, nrow - 1); 511 min_it (s->cur.row, nrow - 1);
505 min_it (s->cur.col, ncol - 1); 512 min_it (s->cur.col, ncol - 1);
506#ifdef DEBUG_STRICT
507 assert (s->cur.row >= 0); 513 assert (s->cur.row >= 0);
508 assert (s->cur.col >= 0); 514 assert (s->cur.col >= 0);
509#endif
510} 515}
511 516
512void 517void
513rxvt_term::scr_swap_screen () 518rxvt_term::scr_swap_screen ()
514{ 519{
515 if (!OPTION (Opt_secondaryScreen)) 520 if (!option (Opt_secondaryScreen))
516 return; 521 return;
517 522
518 for (int i = prev_nrow; i--; ) 523 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 524 ::swap (ROW(i), swap_buf [i]);
520 525
… …
542 selection_check (2); /* check for boundary cross */ 547 selection_check (2); /* check for boundary cross */
543 548
544 int i = current_screen; current_screen = scrn; scrn = i; 549 int i = current_screen; current_screen = scrn; scrn = i;
545 550
546#if NSCREENS 551#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 552 if (option (Opt_secondaryScreen))
548 { 553 {
549 num_scr = 0; 554 num_scr = 0;
550 555
551 scr_swap_screen (); 556 scr_swap_screen ();
552 557
… …
555 screen.flags |= Screen_VisibleCursor; 560 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 561 swap.flags |= Screen_VisibleCursor;
557 } 562 }
558 else 563 else
559#endif 564#endif
560 if (OPTION (Opt_secondaryScroll)) 565 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 566 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 567}
563 568
564// clear WrapNext indicator, solidifying position on next line 569// clear WrapNext indicator, solidifying position on next line
565void 570void
… …
598/* 603/*
599 * Change the rendition style for following text 604 * Change the rendition style for following text
600 */ 605 */
601void 606void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 607rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 608{
604 if (set) 609 if (set)
605 rstyle |= style; 610 rstyle |= style;
606 else if (style == ~RS_None) 611 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 612 rstyle = DEFAULT_RSTYLE;
608 else 613 else
609 rstyle &= ~style; 614 rstyle &= ~style;
610 } 615}
611 616
612/* ------------------------------------------------------------------------- */ 617/* ------------------------------------------------------------------------- */
613/* 618/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 619 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 620 * count positive ==> scroll up
… …
624 want_refresh = 1; 629 want_refresh = 1;
625 num_scr += count; 630 num_scr += count;
626 631
627 if (count > 0 632 if (count > 0
628 && row1 == 0 633 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 634 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 635 {
631 top_row = max (top_row - count, -saveLines); 636 top_row = max (top_row - count, -saveLines);
632 637
633 // scroll everything up 'count' lines 638 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 639 term_start = (term_start + count) % total_rows;
… …
641 } 646 }
642 647
643 // erase newly scrolled-in lines 648 // erase newly scrolled-in lines
644 for (int i = count; i--; ) 649 for (int i = count; i--; )
645 { 650 {
646 // basically this is a slightly optimized scr_blank_screen_mem
647 // it is worth the effort on slower machines
648 line_t &l = ROW(nrow - 1 - i); 651 line_t &l = ROW(nrow - 1 - i);
649 652
653 // optimize if already cleared, can be significant on slow machines
654 // could be rolled into scr_blank_screen_mem
655 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
656 {
650 scr_blank_line (l, 0, l.l, rstyle); 657 scr_blank_line (l, 0, l.l, rstyle);
651
652 l.l = 0; 658 l.l = 0;
653 l.f = 0; 659 l.f = 0;
660 }
661 else
662 scr_blank_screen_mem (l, rstyle);
654 } 663 }
655 664
656 // now copy lines below the scroll region bottom to the 665 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they 666 // bottom of the screen again, so they look as if they
658 // hadn't moved. 667 // hadn't moved.
… …
662 line_t &l2 = ROW(i); 671 line_t &l2 = ROW(i);
663 672
664 ::swap (l1, l2); 673 ::swap (l1, l2);
665 l2.touch (); 674 l2.touch ();
666 } 675 }
667 676
668 // move and/or clear selection, if any 677 // move and/or clear selection, if any
669 if (selection.op && current_screen == selection.screen) 678 if (selection.op && current_screen == selection.screen)
670 { 679 {
671 selection.beg.row -= count; 680 selection.beg.row -= count;
672 selection.end.row -= count; 681 selection.end.row -= count;
… …
680 selection.op = SELECTION_CLEAR; 689 selection.op = SELECTION_CLEAR;
681 } 690 }
682 } 691 }
683 692
684 // finally move the view window, if desired 693 // finally move the view window, if desired
685 if (OPTION (Opt_scrollWithBuffer) 694 if (option (Opt_scrollWithBuffer)
686 && view_start != 0 695 && view_start != 0
687 && view_start != -saveLines) 696 && view_start != -saveLines)
688 scr_page (UP, count); 697 scr_page (UP, count);
689 698
690 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 699 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
708 { 717 {
709 /* move selected region too */ 718 /* move selected region too */
710 selection.beg.row -= count; 719 selection.beg.row -= count;
711 selection.end.row -= count; 720 selection.end.row -= count;
712 selection.mark.row -= count; 721 selection.mark.row -= count;
713 722
714 selection_check (0); 723 selection_check (0);
715 } 724 }
716 } 725 }
717 726
718 // use a simple and robust scrolling algorithm, this 727 // use a simple and robust scrolling algorithm, this
… …
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, do wcwidth before 856 // rely on wcwidth to tell us the character width, do wcwidth before
848 // further replacements, as wcwidth might return -1 for the line 857 // further replacements, as wcwidth might return -1 for the line
849 // 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 = 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 1938 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1904#endif 1939#endif
1905} 1940}
1906 1941
1907/* ------------------------------------------------------------------------- */ 1942/* ------------------------------------------------------------------------- */
1908/* ARGSUSED */ 1943/* ARGSUSED */
1909void 1944void
1910rxvt_term::scr_printscreen (int fullhist) NOTHROW 1945rxvt_term::scr_printscreen (int fullhist) NOTHROW
1911{ 1946{
1912#ifdef PRINTPIPE 1947#ifdef PRINTPIPE
1913 int nrows, row_start; 1948 int nrows, row_start;
1914 FILE *fd; 1949 FILE *fd = popen_printer ();
1915 1950
1916 if ((fd = popen_printer ()) == NULL) 1951 if (!fd)
1917 return; 1952 return;
1918 1953
1919 if (fullhist) 1954 if (fullhist)
1920 { 1955 {
1921 nrows = nrow - top_row; 1956 nrows = nrow - top_row;
… …
1927 row_start = view_start; 1962 row_start = view_start;
1928 } 1963 }
1929 1964
1930 wctomb (0, 0); 1965 wctomb (0, 0);
1931 1966
1932 for (int r1 = 0; r1 < nrows; r1++) 1967 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1933 { 1968 {
1934 text_t *tp = ROW(r1).t; 1969 text_t *tp = ROW(r1).t;
1935 int len = ROW(r1).l; 1970 int len = ROW(r1).l;
1936 1971
1937 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1972 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1966 * screen.text/screen.rend contain what the screen will change to. 2001 * screen.text/screen.rend contain what the screen will change to.
1967 */ 2002 */
1968void 2003void
1969rxvt_term::scr_refresh () NOTHROW 2004rxvt_term::scr_refresh () NOTHROW
1970{ 2005{
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 */ 2006 int16_t col, row, /* column/row we're processing */
1974 ocrow; /* old cursor row */ 2007 ocrow; /* old cursor row */
1975 int i; /* tmp */ 2008 int i; /* tmp */
1976#ifndef NO_CURSORCOLOR 2009#ifndef NO_CURSORCOLOR
1977 rend_t cc1; /* store colours at cursor position (s) */ 2010 rend_t cc1; /* store colours at cursor position (s) */
1978#endif 2011#endif
1979 rend_t *crp; // cursor rendition pointer 2012 rend_t *crp; // cursor rendition pointer
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
1980 2015
1981 want_refresh = 0; /* screen is current */ 2016 want_refresh = 0; /* screen is current */
1982 2017
1983 if (refresh_type == NO_REFRESH || !mapped) 2018 if (refresh_type == NO_REFRESH || !mapped)
1984 return; 2019 return;
1985 2020
1986 /* 2021 /*
1987 * A: set up vars 2022 * A: set up vars
1988 */ 2023 */
1989 must_clear = 0;
1990 refresh_count = 0; 2024 refresh_count = 0;
1991 2025
1992#if XPM_BACKGROUND 2026 unsigned int old_screen_flags = screen.flags;
2027 char have_bg = 0;
2028#ifdef HAVE_BG_PIXMAP
1993 must_clear |= bgPixmap.pixmap != None; 2029 have_bg = bgPixmap.pixmap != None;
1994#endif
1995#if TRANSPARENT
1996 must_clear |= OPTION (Opt_transparent) && am_transparent;
1997#endif 2030#endif
1998 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2031 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1999 2032
2000 /* 2033 /*
2001 * B: reverse any characters which are selected 2034 * B: reverse any characters which are selected
2002 */ 2035 */
2003 scr_reverse_selection (); 2036 scr_reverse_selection ();
2037
2038 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2039#if ENABLE_OVERLAY
2040 scr_swap_overlay ();
2041#endif
2042
2043 char showcursor = screen.flags & Screen_VisibleCursor;
2004 2044
2005 /* 2045 /*
2006 * C: set the cursor character (s) 2046 * C: set the cursor character (s)
2007 */ 2047 */
2008 { 2048 {
2009 unsigned char setoldcursor; 2049 unsigned char setoldcursor;
2010 rend_t ccol1, /* Cursor colour */
2011 ccol2; /* Cursor colour2 */
2012 2050
2013 showcursor = (screen.flags & Screen_VisibleCursor);
2014#ifdef CURSOR_BLINK 2051#ifdef CURSOR_BLINK
2015 if (hidden_cursor) 2052 if (hidden_cursor)
2016 showcursor = 0; 2053 showcursor = 0;
2017#endif 2054#endif
2018 2055
… …
2023 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2060 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2024 col--; 2061 col--;
2025 2062
2026 crp = &ROW(screen.cur.row).r[col]; 2063 crp = &ROW(screen.cur.row).r[col];
2027 2064
2065#ifndef NO_CURSORCOLOR
2066 cc1 = *crp & (RS_fgMask | RS_bgMask);
2067 if (ISSET_PIXCOLOR (Color_cursor))
2068 ccol1 = Color_cursor;
2069 else
2070#endif
2071#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2072 ccol1 = fgcolor_of (rstyle);
2073#else
2074 ccol1 = Color_fg;
2075#endif
2076
2077#ifndef NO_CURSORCOLOR
2078 if (ISSET_PIXCOLOR (Color_cursor2))
2079 ccol2 = Color_cursor2;
2080 else
2081#endif
2082#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2083 ccol2 = bgcolor_of (rstyle);
2084#else
2085 ccol2 = Color_bg;
2086#endif
2087
2028 if (showcursor && focus) 2088 if (showcursor && focus)
2029 { 2089 {
2030 if (OPTION (Opt_cursorUnderline)) 2090 if (option (Opt_cursorUnderline))
2031 *crp ^= RS_Uline; 2091 *crp ^= RS_Uline;
2032 else 2092 else
2033 { 2093 {
2034 *crp ^= RS_RVid; 2094 *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); 2095 *crp = SET_FGCOLOR (*crp, ccol1);
2055 *crp = SET_BGCOLOR (*crp, ccol2); 2096 *crp = SET_BGCOLOR (*crp, ccol2);
2056#endif
2057 } 2097 }
2058 } 2098 }
2059 } 2099 }
2060 2100
2061 /* make sure no outline cursor is left around */ 2101 /* make sure no outline cursor is left around */
… …
2088 oldcursor.col = screen.cur.col; 2128 oldcursor.col = screen.cur.col;
2089 } 2129 }
2090 } 2130 }
2091 } 2131 }
2092 2132
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 2133#ifndef NO_SLOW_LINK_SUPPORT
2099 /* 2134 /*
2100 * D: CopyArea pass - very useful for slower links 2135 * D: CopyArea pass - very useful for slower links
2101 * This has been deliberately kept simple. 2136 * This has been deliberately kept simple.
2102 */ 2137 */
2103 if (!display->is_local 2138 if (!display->is_local
2104 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2139 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2105 && abs (num_scr) < nrow && !must_clear) 2140 && abs (num_scr) < nrow && !have_bg)
2106 { 2141 {
2107 int16_t nits; 2142 int16_t nits;
2143 int i = num_scr;
2108 int j; 2144 int j;
2109 int len, wlen; 2145 int len, wlen;
2110 dLocal (int, num_scr); 2146 dLocal (int, num_scr);
2111 2147
2112 j = nrow; 2148 j = nrow;
2113 wlen = len = -1; 2149 wlen = len = -1;
2114 row = i > 0 ? 0 : j - 1; 2150 row = i > 0 ? 0 : j - 1;
2151
2115 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2152 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2116 { 2153 {
2117 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2154 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2118 { 2155 {
2119 line_t s = ROW(view_start + row); 2156 line_t s = ROW(view_start + row);
… …
2140 wlen = row; 2177 wlen = row;
2141 continue; 2178 continue;
2142 } 2179 }
2143 } 2180 }
2144 2181
2145 if (len != -1) 2182 if (len >= 0)
2146 { 2183 {
2147 /* also comes here at end if needed because of >= above */ 2184 /* also comes here at end if needed because of >= above */
2148 if (wlen < len) 2185 if (wlen < len)
2149 ::swap (wlen, len); 2186 ::swap (wlen, len);
2150 2187
2188 XGCValues gcv;
2189
2190 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2151 XCopyArea (display->display, vt, vt, 2191 XCopyArea (dpy, vt, vt,
2152 gc, 0, Row2Pixel (len + i), 2192 gc, 0, Row2Pixel (len + i),
2153 (unsigned int)this->width, 2193 (unsigned int)this->width,
2154 (unsigned int)Height2Pixel (wlen - len + 1), 2194 (unsigned int)Height2Pixel (wlen - len + 1),
2155 0, Row2Pixel (len)); 2195 0, Row2Pixel (len));
2196 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2197
2156 len = -1; 2198 len = -1;
2157 } 2199 }
2158 } 2200 }
2159 } 2201 }
2160#endif 2202#endif
… …
2184 continue; 2226 continue;
2185 2227
2186 // redraw one or more characters 2228 // redraw one or more characters
2187 2229
2188 // seek to the beginning of wide characters 2230 // seek to the beginning of wide characters
2189 while (stp[col] == NOCHAR && col > 0) 2231 while (expect_false (stp[col] == NOCHAR && col > 0))
2190 --col; 2232 --col;
2191 2233
2192 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2234 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2193 text_t *text = stp + col; 2235 text_t *text = stp + col;
2194 int count = 1; 2236 int count = 1;
… …
2201 for (i = 0; ++col < ncol; ) 2243 for (i = 0; ++col < ncol; )
2202 { 2244 {
2203 if (stp[col] == NOCHAR) 2245 if (stp[col] == NOCHAR)
2204 { 2246 {
2205 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2206 drp[col] = rend; 2248 drp[col] = srp[col];
2249
2207 count++; 2250 count++;
2208 i++; 2251 i++;
2209 2252
2210 continue; 2253 continue;
2211 } 2254 }
… …
2216 count++; 2259 count++;
2217 2260
2218 if (stp[col] != dtp[col] 2261 if (stp[col] != dtp[col]
2219 || !RS_SAME (srp[col], drp[col])) 2262 || !RS_SAME (srp[col], drp[col]))
2220 { 2263 {
2221 if (must_clear && (i++ > count / 2)) 2264 if (have_bg && (i++ > count / 2))
2222 break; 2265 break;
2223 2266
2224 dtp[col] = stp[col]; 2267 dtp[col] = stp[col];
2225 drp[col] = rend; 2268 drp[col] = rend;
2226 i = 0; 2269 i = 0;
2227 } 2270 }
2228 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2271 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2229 break; 2272 break;
2230 } 2273 }
2231 2274
2232 col--; /* went one too far. move back */ 2275 col--; /* went one too far. move back */
2233 count -= i; /* dump any matching trailing chars */ 2276 count -= i; /* dump any matching trailing chars */
2234 2277
2235 // sometimes we optimize away the trailing NOCHAR's, add them back 2278 // sometimes we optimize away the trailing NOCHAR's, add them back
2236 while (i && text[count] == NOCHAR) 2279 while (expect_false (i && text[count] == NOCHAR))
2237 count++, i--; 2280 count++, i--;
2238 2281
2239 /* 2282 /*
2240 * Determine the attributes for the string 2283 * Determine the attributes for the string
2241 */ 2284 */
2242 int fore = fgcolor_of (rend); // desired foreground 2285 int fore = fgcolor_of (rend); // desired foreground
2243 int back = bgcolor_of (rend); // desired background 2286 int back = bgcolor_of (rend); // desired background
2244 2287
2245 // only do special processing if any attributes are set, which is unlikely 2288 // only do special processing if any attributes are set, which is unlikely
2246 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2289 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2247 { 2290 {
2248#if ENABLE_STYLES
2249 // "careful" (too wide) character handling
2250
2251 // include previous careful character(s) if possible, looks nicer (best effort...)
2252 while (text > stp
2253 && srp[text - stp - 1] & RS_Careful
2254 && RS_SAME (rend, srp[text - stp - 1]))
2255 text--, count++, xpixel -= fwidth;
2256
2257 // force redraw after "careful" characters to avoid pixel droppings
2258 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2259 drp[col + i + 1] = ~srp[col + i + 1];
2260
2261 // force redraw before "careful" characters to avoid pixel droppings
2262 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2263 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2264#endif
2265
2266 bool invert = rend & RS_RVid; 2291 bool invert = rend & RS_RVid;
2267 2292
2268#ifndef NO_BOLD_UNDERLINE_REVERSE 2293#ifndef NO_BOLD_UNDERLINE_REVERSE
2269 if (rend & RS_Bold
2270 && fore == Color_fg) 2294 if (rend & RS_Bold && fore == Color_fg)
2271 { 2295 {
2272 if (ISSET_PIXCOLOR (Color_BD)) 2296 if (ISSET_PIXCOLOR (Color_BD))
2273 fore = Color_BD; 2297 fore = Color_BD;
2274# if !ENABLE_STYLES 2298# if !ENABLE_STYLES
2275 else 2299 else
2276 invert = !invert; 2300 invert = !invert;
2277# endif 2301# endif
2278 } 2302 }
2279 2303
2280 if (rend & RS_Italic 2304 if (rend & RS_Italic && fore == Color_fg)
2281 && fore == Color_fg)
2282 { 2305 {
2283 if (ISSET_PIXCOLOR (Color_IT)) 2306 if (ISSET_PIXCOLOR (Color_IT))
2284 fore = Color_IT; 2307 fore = Color_IT;
2285# if !ENABLE_STYLES 2308# if !ENABLE_STYLES
2286 else 2309 else
2287 invert = !invert; 2310 invert = !invert;
2288# endif 2311# endif
2289 } 2312 }
2290 2313
2291 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2292 fore = Color_UL; 2315 fore = Color_UL;
2293#endif 2316#endif
2294 2317
2295 if (invert) 2318 if (invert)
2296 { 2319 {
2320#ifdef OPTION_HC
2321 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2322 || !ISSET_PIXCOLOR (Color_HC))
2323#endif
2324 /* invert the column if no highlightColor is set or it is the
2325 * current cursor column */
2297 ::swap (fore, back); 2326 ::swap (fore, back);
2327#ifdef OPTION_HC
2328 else if (ISSET_PIXCOLOR (Color_HC))
2329 back = Color_HC;
2330#endif
2298 2331
2299#ifndef NO_BOLD_UNDERLINE_REVERSE 2332#ifndef NO_BOLD_UNDERLINE_REVERSE
2333# ifndef OPTION_HC
2300 if (ISSET_PIXCOLOR (Color_RV)) 2334 if (ISSET_PIXCOLOR (Color_RV))
2301 back = Color_RV; 2335 back = Color_RV;
2302 2336# endif
2303 if (fore == back) 2337 if (fore == back)
2304 { 2338 {
2305 fore = Color_bg; 2339 fore = Color_bg;
2306 back = Color_fg; 2340 back = Color_fg;
2307 } 2341 }
… …
2309 } 2343 }
2310 2344
2311#ifdef TEXT_BLINK 2345#ifdef TEXT_BLINK
2312 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2346 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2313 { 2347 {
2314 if (!text_blink_ev.active) 2348 if (!text_blink_ev.is_active ())
2315 { 2349 {
2316 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2350 text_blink_ev.again ();
2317 hidden_text = 0; 2351 hidden_text = 0;
2318 } 2352 }
2319 else if (hidden_text) 2353 else if (hidden_text)
2320 fore = back; 2354 fore = back;
2321 } 2355 }
2322#endif 2356#endif
2357
2358#if ENABLE_STYLES
2359 // "careful" (too wide) character handling
2360
2361 // include previous careful character(s) if possible, looks nicer (best effort...)
2362 while (text > stp
2363 && srp[text - stp - 1] & RS_Careful
2364 && RS_SAME (rend, srp[text - stp - 1]))
2365 text--, count++, xpixel -= fwidth;
2366
2367 // force redraw after "careful" characters to avoid pixel droppings
2368 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2369 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2370
2371 // force redraw before "careful" characters to avoid pixel droppings
2372 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2373 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2374#endif
2323 } 2375 }
2324 2376
2325 /* 2377 /*
2326 * Actually do the drawing of the string here 2378 * Actually do the drawing of the string here
2327 */ 2379 */
2328 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2380 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2329 2381
2330 if (back == fore) 2382 if (expect_true (have_bg && back == Color_bg))
2331 font->clear_rect (*drawable, xpixel, ypixel,
2332 fwidth * count, fheight,
2333 back);
2334 else if (back == Color_bg)
2335 { 2383 {
2336 if (must_clear) 2384 // this is very ugly, maybe push it into ->draw?
2337 {
2338 CLEAR_CHARS (xpixel, ypixel, count);
2339 2385
2340 for (i = 0; i < count; i++) /* don't draw empty strings */ 2386 for (i = 0; i < count; i++) /* don't draw empty strings */
2341 if (text[i] != ' ') 2387 if (text[i] != ' ')
2342 { 2388 {
2343 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2389 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2344 break; 2390 goto did_clear;
2345 }
2346 } 2391 }
2347 else 2392
2348 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2393 CLEAR_CHARS (xpixel, ypixel, count);
2394 did_clear: ;
2349 } 2395 }
2350 else 2396 else
2351 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2397 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2352 2398
2353 if (rend & RS_Uline && font->descent > 1 && fore != back) 2399 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2354 { 2400 {
2355#if ENABLE_FRILLS 2401#if ENABLE_FRILLS
2356 if (ISSET_PIXCOLOR (Color_underline)) 2402 if (ISSET_PIXCOLOR (Color_underline))
2357 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2403 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2358 else 2404 else
2359#endif 2405#endif
2360 XSetForeground (display->display, gc, pix_colors[fore]); 2406 XSetForeground (dpy, gc, pix_colors[fore]);
2361 2407
2362 XDrawLine (display->display, drawBuffer, gc, 2408 XDrawLine (dpy, vt, gc,
2363 xpixel, ypixel + font->ascent + 1, 2409 xpixel, ypixel + font->ascent + 1,
2364 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2410 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2365 } 2411 }
2366 } /* for (col....) */ 2412 } /* for (col....) */
2367 } /* for (row....) */ 2413 } /* for (row....) */
2368 2414
2369#if ENABLE_OVERLAY
2370 scr_swap_overlay ();
2371#endif
2372 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2373
2374 /* 2415 /*
2375 * G: cleanup cursor and display outline cursor if necessary 2416 * G: cleanup cursor and display outline cursor if necessary
2376 */ 2417 */
2377 if (showcursor) 2418 if (showcursor)
2378 { 2419 {
2379 if (focus) 2420 if (focus)
2380 { 2421 {
2381 if (OPTION (Opt_cursorUnderline)) 2422 if (option (Opt_cursorUnderline))
2382 *crp ^= RS_Uline; 2423 *crp ^= RS_Uline;
2383 else 2424 else
2384 { 2425 {
2385 *crp ^= RS_RVid; 2426 *crp ^= RS_RVid;
2386#ifndef NO_CURSORCOLOR 2427#ifndef NO_CURSORCOLOR
… …
2400 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2441 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2401 cursorwidth++; 2442 cursorwidth++;
2402 2443
2403#ifndef NO_CURSORCOLOR 2444#ifndef NO_CURSORCOLOR
2404 if (ISSET_PIXCOLOR (Color_cursor)) 2445 if (ISSET_PIXCOLOR (Color_cursor))
2405 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2446 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2447 else
2406#endif 2448#endif
2449 XSetForeground (dpy, gc, pix_colors[ccol1]);
2407 2450
2408 XDrawRectangle (display->display, drawBuffer, gc, 2451 XDrawRectangle (dpy, vt, gc,
2409 Col2Pixel (col), 2452 Col2Pixel (col),
2410 Row2Pixel (oldcursor.row), 2453 Row2Pixel (oldcursor.row),
2411 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2454 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2412 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2455 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2413 } 2456 }
2414 } 2457 }
2415 2458
2416 /* 2459 /*
2417 * H: cleanup selection 2460 * H: cleanup selection
2418 */ 2461 */
2462#if ENABLE_OVERLAY
2463 scr_swap_overlay ();
2464#endif
2465 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2466
2419 scr_reverse_selection (); 2467 scr_reverse_selection ();
2420 2468
2469 screen.flags = old_screen_flags;
2421 num_scr = 0; 2470 num_scr = 0;
2422 num_scr_allow = 1; 2471 num_scr_allow = 1;
2423} 2472}
2424 2473
2425void 2474void
… …
2448} 2497}
2449 2498
2450void 2499void
2451rxvt_term::scr_recolour () NOTHROW 2500rxvt_term::scr_recolour () NOTHROW
2452{ 2501{
2453 if (1 2502#ifdef HAVE_BG_PIXMAP
2454#if TRANSPARENT 2503 bgPixmap.apply ();
2455 && !am_transparent 2504#else
2456#endif 2505
2457#if XPM_BACKGROUND
2458 && !bgPixmap.pixmap
2459#endif
2460 )
2461 {
2462 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2506 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2463 XClearWindow (display->display, parent[0]); 2507 XClearWindow (dpy, parent[0]);
2464 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2508 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2465#if HAVE_SCROLLBARS 2509
2466 if (scrollBar.win) 2510 if (scrollBar.win)
2467 { 2511 {
2468 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2512 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2469 scrollBar.setIdle (); 2513 scrollBar.state = STATE_IDLE;
2470 scrollbar_show (0); 2514 scrollBar.show (0);
2471 }
2472#endif
2473 } 2515 }
2474 2516
2517#endif
2518
2519 /* bgPixmap.apply () does not do the following : */
2475 scr_clear (); 2520 scr_clear ();
2476 scr_touch (true); 2521 scr_touch (true);
2477 want_refresh = 1; 2522 want_refresh = 1;
2478} 2523}
2479 2524
… …
2486 2531
2487 num_scr_allow = 0; 2532 num_scr_allow = 0;
2488 want_refresh = 1; 2533 want_refresh = 1;
2489 2534
2490 if (really) 2535 if (really)
2491 XClearWindow (display->display, vt); 2536 XClearWindow (dpy, vt);
2492} 2537}
2493 2538
2494void 2539void
2495rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2540rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2496{ 2541{
… …
2545{ 2590{
2546 if (selection.op 2591 if (selection.op
2547 && current_screen == selection.screen 2592 && current_screen == selection.screen
2548 && selection.end.row >= view_start) 2593 && selection.end.row >= view_start)
2549 { 2594 {
2550#if ENABLE_FRILLS 2595#if !ENABLE_MINIMAL
2551 if (selection.rect) 2596 if (selection.rect)
2552 scr_xor_rect (selection.beg.row, selection.beg.col, 2597 scr_xor_rect (selection.beg.row, selection.beg.col,
2553 selection.end.row, selection.end.col, 2598 selection.end.row, selection.end.col,
2554 RS_RVid, RS_RVid | RS_Uline); 2599 RS_RVid, RS_RVid | RS_Uline);
2555 else 2600 else
… …
2571{ 2616{
2572 int row, wrote; 2617 int row, wrote;
2573 unsigned int width, towrite; 2618 unsigned int width, towrite;
2574 char r1[] = "\n"; 2619 char r1[] = "\n";
2575 2620
2576 for (row = saveLines - nsaved; 2621 for (row = saveLines + top_row;
2577 row < saveLines + nrow - 1; row++) 2622 row < saveLines + nrow - 1; row++)
2578 { 2623 {
2579 width = row_buf[row].l >= 0 ? row_buf[row].l 2624 width = row_buf[row].l >= 0 ? row_buf[row].l
2580 : ncol; 2625 : ncol;
2581 for (towrite = width; towrite; towrite -= wrote) 2626 for (towrite = width; towrite; towrite -= wrote)
… …
2632 /* convert normal newline chars into common keyboard Return key sequence */ 2677 /* convert normal newline chars into common keyboard Return key sequence */
2633 for (unsigned int i = 0; i < len; i++) 2678 for (unsigned int i = 0; i < len; i++)
2634 if (data[i] == C0_LF) 2679 if (data[i] == C0_LF)
2635 data[i] = C0_CR; 2680 data[i] = C0_CR;
2636 2681
2682 if (priv_modes & PrivMode_BracketPaste)
2683 tt_printf ("\e[200~");
2684
2637 tt_write (data, len); 2685 tt_write (data, len);
2686
2687 if (priv_modes & PrivMode_BracketPaste)
2688 tt_printf ("\e[201~");
2638} 2689}
2639 2690
2640/* ------------------------------------------------------------------------- */ 2691/* ------------------------------------------------------------------------- */
2641/* 2692/*
2642 * Respond to a notification that a primary selection has been sent 2693 * Respond to a notification that a primary selection has been sent
… …
2671 } 2722 }
2672 2723
2673 unsigned long bytes_after; 2724 unsigned long bytes_after;
2674 XTextProperty ct; 2725 XTextProperty ct;
2675 2726
2676 if (XGetWindowProperty (display->display, win, prop, 2727 if (XGetWindowProperty (dpy, win, prop,
2677 0, PROP_SIZE / 4, 2728 0, PROP_SIZE / 4,
2678 delete_prop, AnyPropertyType, 2729 delete_prop, AnyPropertyType,
2679 &ct.encoding, &ct.format, 2730 &ct.encoding, &ct.format,
2680 &ct.nitems, &bytes_after, 2731 &ct.nitems, &bytes_after,
2681 &ct.value) != Success) 2732 &ct.value) != Success)
… …
2690 if (bytes_after) 2741 if (bytes_after)
2691 { 2742 {
2692 // fetch and append remaining data 2743 // fetch and append remaining data
2693 XTextProperty ct2; 2744 XTextProperty ct2;
2694 2745
2695 if (XGetWindowProperty (display->display, win, prop, 2746 if (XGetWindowProperty (dpy, win, prop,
2696 ct.nitems / 4, (bytes_after + 3) / 4, 2747 ct.nitems / 4, (bytes_after + 3) / 4,
2697 delete_prop, AnyPropertyType, 2748 delete_prop, AnyPropertyType,
2698 &ct2.encoding, &ct2.format, 2749 &ct2.encoding, &ct2.format,
2699 &ct2.nitems, &bytes_after, 2750 &ct2.nitems, &bytes_after,
2700 &ct2.value) != Success) 2751 &ct2.value) != Success)
… …
2713 2764
2714 if (ct.encoding == xa[XA_INCR]) 2765 if (ct.encoding == xa[XA_INCR])
2715 { 2766 {
2716 // INCR selection, start handshake 2767 // INCR selection, start handshake
2717 if (!delete_prop) 2768 if (!delete_prop)
2718 XDeleteProperty (display->display, win, prop); 2769 XDeleteProperty (dpy, win, prop);
2719 2770
2720 selection_wait = Sel_incr; 2771 selection_wait = Sel_incr;
2721 incr_buf_fill = 0; 2772 incr_buf_fill = 0;
2722 incr_ev.start (NOW + 10); 2773 incr_ev.start (10);
2723 2774
2724 goto bailout; 2775 goto bailout;
2725 } 2776 }
2726 2777
2727 if (ct.nitems == 0) 2778 if (ct.nitems == 0)
… …
2736 ct.nitems = incr_buf_fill; 2787 ct.nitems = incr_buf_fill;
2737 incr_buf = 0; 2788 incr_buf = 0;
2738 incr_buf_size = 0; 2789 incr_buf_size = 0;
2739 incr_ev.stop (); 2790 incr_ev.stop ();
2740 } 2791 }
2741 else 2792 else
2742 { 2793 {
2743 if (selection_wait == Sel_normal 2794 if (selection_wait == Sel_normal
2744 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2795 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2745 { 2796 {
2746 /* 2797 /*
… …
2753 goto bailout; 2804 goto bailout;
2754 } 2805 }
2755 } 2806 }
2756 else if (selection_wait == Sel_incr) 2807 else if (selection_wait == Sel_incr)
2757 { 2808 {
2758 incr_ev.start (NOW + 10); 2809 incr_ev.start (10);
2759 2810
2760 while (incr_buf_fill + ct.nitems > incr_buf_size) 2811 while (incr_buf_fill + ct.nitems > incr_buf_size)
2761 { 2812 {
2762 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2813 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2763 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2814 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2770 } 2821 }
2771 2822
2772 char **cl; 2823 char **cl;
2773 int cr; 2824 int cr;
2774 2825
2775#if ENABLE_FRILLS 2826#if !ENABLE_MINIMAL
2776 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2827 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2777 // so recode it manually 2828 // so recode it manually
2778 if (ct.encoding == xa[XA_UTF8_STRING]) 2829 if (ct.encoding == xa[XA_UTF8_STRING])
2779 { 2830 {
2780 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2831 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2784 paste (s, strlen (s)); 2835 paste (s, strlen (s));
2785 free (s); 2836 free (s);
2786 } 2837 }
2787 else 2838 else
2788#endif 2839#endif
2789 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2840 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2790 && cl) 2841 && cl)
2791 { 2842 {
2792 for (int i = 0; i < cr; i++) 2843 for (int i = 0; i < cr; i++)
2793 paste (cl[i], strlen (cl[i])); 2844 paste (cl[i], strlen (cl[i]));
2794 2845
… …
2803 if (selection_wait == Sel_normal) 2854 if (selection_wait == Sel_normal)
2804 selection_wait = Sel_none; 2855 selection_wait = Sel_none;
2805} 2856}
2806 2857
2807void 2858void
2808rxvt_term::incr_cb (time_watcher &w) NOTHROW 2859rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2809{ 2860{
2810 selection_wait = Sel_none; 2861 selection_wait = Sel_none;
2811 2862
2812 incr_buf_size = 0; 2863 incr_buf_size = 0;
2813 free (incr_buf); 2864 free (incr_buf);
… …
2824 selection_paste (win, prop, true); 2875 selection_paste (win, prop, true);
2825} 2876}
2826 2877
2827/* ------------------------------------------------------------------------- */ 2878/* ------------------------------------------------------------------------- */
2828/* 2879/*
2829 * Request the current selection: 2880 * Request the current selection:
2830 * Order: > internal selection if available 2881 * Order: > internal selection if available
2831 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2882 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2832 * > CUT_BUFFER0 2883 * > CUT_BUFFER0
2833 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2884 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2834 * will auto fallback to CUT_BUFFER0 2885 * will auto fallback to CUT_BUFFER0
… …
2836 */ 2887 */
2837void 2888void
2838rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2889rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2839{ 2890{
2840 if (selection.text && selnum == Sel_Primary) 2891 if (selection.text && selnum == Sel_Primary)
2892 {
2841 { /* internal selection */ 2893 /* internal selection */
2842 char *str = rxvt_wcstombs (selection.text, selection.len); 2894 char *str = rxvt_wcstombs (selection.text, selection.len);
2843 paste (str, strlen (str)); 2895 paste (str, strlen (str));
2844 free (str); 2896 free (str);
2845 return; 2897 return;
2846 } 2898 }
… …
2876 else if (selnum == Sel_Secondary) 2928 else if (selnum == Sel_Secondary)
2877 sel = XA_SECONDARY; 2929 sel = XA_SECONDARY;
2878 else 2930 else
2879 sel = xa[XA_CLIPBOARD]; 2931 sel = xa[XA_CLIPBOARD];
2880 2932
2881 if (XGetSelectionOwner (display->display, sel) != None) 2933 if (XGetSelectionOwner (dpy, sel) != None)
2882 { 2934 {
2883 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2935 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2884 vt, selection_request_time); 2936 vt, selection_request_time);
2885 return 1; 2937 return 1;
2886 } 2938 }
2887 2939
2888 return 0; 2940 return 0;
… …
2951 3003
2952 int end_col; 3004 int end_col;
2953 3005
2954 for (; row <= selection.end.row; row++, col = 0) 3006 for (; row <= selection.end.row; row++, col = 0)
2955 { 3007 {
2956#if ENABLE_FRILLS 3008#if !ENABLE_MINIMAL
2957 if (selection.rect) 3009 if (selection.rect)
2958 { 3010 {
2959 col = selection.beg.col; 3011 col = selection.beg.col;
2960 end_col = ncol + 1; 3012 end_col = ncol + 1;
2961 } 3013 }
… …
2964 end_col = ROW(row).l; 3016 end_col = ROW(row).l;
2965 3017
2966 col = max (col, 0); 3018 col = max (col, 0);
2967 3019
2968 if (row == selection.end.row 3020 if (row == selection.end.row
2969#if ENABLE_FRILLS 3021#if !ENABLE_MINIMAL
2970 || selection.rect 3022 || selection.rect
2971#endif 3023#endif
2972 ) 3024 )
2973 min_it (end_col, selection.end.col); 3025 min_it (end_col, selection.end.col);
2974 3026
… …
2997#endif 3049#endif
2998 else 3050 else
2999 new_selection_text[ofs++] = *t++; 3051 new_selection_text[ofs++] = *t++;
3000 } 3052 }
3001 3053
3002#if ENABLE_FRILLS 3054#if !ENABLE_MINIMAL
3003 if (selection.rect) 3055 if (selection.rect)
3004 { 3056 {
3005 while (ofs 3057 while (ofs
3006 && new_selection_text[ofs - 1] != C0_LF 3058 && new_selection_text[ofs - 1] != C0_LF
3007 && unicode::is_space (new_selection_text[ofs - 1])) 3059 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3041bool 3093bool
3042rxvt_term::selection_grab (Time tm) NOTHROW 3094rxvt_term::selection_grab (Time tm) NOTHROW
3043{ 3095{
3044 selection_time = tm; 3096 selection_time = tm;
3045 3097
3046 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3098 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3047 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3099 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3048 { 3100 {
3049 display->set_selection_owner (this); 3101 display->set_selection_owner (this);
3050 return true; 3102 return true;
3051 } 3103 }
3052 else 3104 else
… …
3056 } 3108 }
3057 3109
3058#if 0 3110#if 0
3059 XTextProperty ct; 3111 XTextProperty ct;
3060 3112
3061 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3113 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3062 { 3114 {
3063 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3115 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3064 XFree (ct.value); 3116 XFree (ct.value);
3065 } 3117 }
3066#endif 3118#endif
… …
3112 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3164 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3113 3165
3114 while (selection.mark.col > 0 3166 while (selection.mark.col > 0
3115 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3167 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3116 --selection.mark.col; 3168 --selection.mark.col;
3117 3169
3118 if (selection.op) 3170 if (selection.op)
3171 {
3119 { /* clear the old selection */ 3172 /* clear the old selection */
3120 selection.beg.row = selection.end.row = selection.mark.row; 3173 selection.beg.row = selection.end.row = selection.mark.row;
3121 selection.beg.col = selection.end.col = selection.mark.col; 3174 selection.beg.col = selection.end.col = selection.mark.col;
3122 } 3175 }
3123 3176
3124 selection.op = SELECTION_INIT; 3177 selection.op = SELECTION_INIT;
… …
3313 * a point/word/line which is either the start or end of the selection 3366 * a point/word/line which is either the start or end of the selection
3314 * and it was decided by whichever point/word/line was `fixed' at the 3367 * and it was decided by whichever point/word/line was `fixed' at the
3315 * time of the most recent button3 press 3368 * time of the most recent button3 press
3316 */ 3369 */
3317 if (button3 && buttonpress) 3370 if (button3 && buttonpress)
3371 {
3318 { /* button3 press */ 3372 /* button3 press */
3319 /* 3373 /*
3320 * first determine which edge of the selection we are closest to 3374 * first determine which edge of the selection we are closest to
3321 */ 3375 */
3322 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3376 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3323 || (!ROWCOL_IS_AFTER (pos, selection.end) 3377 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3341 selection.mark.row = selection.beg.row; 3395 selection.mark.row = selection.beg.row;
3342 selection.mark.col = selection.beg.col; 3396 selection.mark.col = selection.beg.col;
3343 } 3397 }
3344 } 3398 }
3345 else 3399 else
3400 {
3346 { /* button1 drag or button3 drag */ 3401 /* button1 drag or button3 drag */
3347 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3402 if (ROWCOL_IS_AFTER (selection.mark, pos))
3348 { 3403 {
3349 if (selection.mark.row == selection.end.row 3404 if (selection.mark.row == selection.end.row
3350 && selection.mark.col == selection.end.col 3405 && selection.mark.col == selection.end.col
3351 && clickchange 3406 && clickchange
… …
3368 3423
3369 if (selection.clicks == 1) 3424 if (selection.clicks == 1)
3370 { 3425 {
3371 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3426 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3372 && !ROW(selection.beg.row).is_longer () 3427 && !ROW(selection.beg.row).is_longer ()
3373#if ENABLE_FRILLS 3428#if !ENABLE_MINIMAL
3374 && !selection.rect 3429 && !selection.rect
3375#endif 3430#endif
3376 ) 3431 )
3377 selection.beg.col = ncol; 3432 selection.beg.col = ncol;
3378 3433
3379 if ( 3434 if (
3380 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3435 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3381 && !ROW(selection.end.row).is_longer () 3436 && !ROW(selection.end.row).is_longer ()
3382#if ENABLE_FRILLS 3437#if !ENABLE_MINIMAL
3383 && !selection.rect 3438 && !selection.rect
3384#endif 3439#endif
3385 ) 3440 )
3386 selection.end.col = ncol; 3441 selection.end.col = ncol;
3387 } 3442 }
… …
3394 selection_delimit_word (DN, &selection.end, &selection.end); 3449 selection_delimit_word (DN, &selection.end, &selection.end);
3395 } 3450 }
3396 else if (selection.clicks == 3) 3451 else if (selection.clicks == 3)
3397 { 3452 {
3398#if ENABLE_FRILLS 3453#if ENABLE_FRILLS
3399 if (OPTION (Opt_tripleclickwords)) 3454 if (option (Opt_tripleclickwords))
3400 { 3455 {
3401 selection_delimit_word (UP, &selection.beg, &selection.beg); 3456 selection_delimit_word (UP, &selection.beg, &selection.beg);
3402 3457
3403 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3458 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3404 { 3459 {
3405 if (!ROW(end_row).is_longer ()) 3460 if (!ROW(end_row).is_longer ())
3406 { 3461 {
3407 selection.end.row = end_row; 3462 selection.end.row = end_row;
3408 selection.end.col = ROW(end_row).l; 3463 selection.end.col = ROW(end_row).l;
3464# if !ENABLE_MINIMAL
3409 selection_remove_trailing_spaces (); 3465 selection_remove_trailing_spaces ();
3466# endif
3410 break; 3467 break;
3411 } 3468 }
3412 } 3469 }
3413 } 3470 }
3414 else 3471 else
… …
3430 selection.end.row++; 3487 selection.end.row++;
3431 } 3488 }
3432 } 3489 }
3433 3490
3434 if (button3 && buttonpress) 3491 if (button3 && buttonpress)
3492 {
3435 { /* mark may need to be changed */ 3493 /* mark may need to be changed */
3436 if (closeto == LEFT) 3494 if (closeto == LEFT)
3437 { 3495 {
3438 selection.mark.row = selection.end.row; 3496 selection.mark.row = selection.end.row;
3439 selection.mark.col = selection.end.col - (selection.clicks == 2); 3497 selection.mark.col = selection.end.col - (selection.clicks == 2);
3440 } 3498 }
… …
3443 selection.mark.row = selection.beg.row; 3501 selection.mark.row = selection.beg.row;
3444 selection.mark.col = selection.beg.col; 3502 selection.mark.col = selection.beg.col;
3445 } 3503 }
3446 } 3504 }
3447 3505
3448#if ENABLE_FRILLS 3506#if !ENABLE_MINIMAL
3449 if (selection.rect && selection.beg.col > selection.end.col) 3507 if (selection.rect && selection.beg.col > selection.end.col)
3450 ::swap (selection.beg.col, selection.end.col); 3508 ::swap (selection.beg.col, selection.end.col);
3451#endif 3509#endif
3452} 3510}
3453 3511
3454#if ENABLE_FRILLS 3512#if !ENABLE_MINIMAL
3455void 3513void
3456rxvt_term::selection_remove_trailing_spaces () NOTHROW 3514rxvt_term::selection_remove_trailing_spaces () NOTHROW
3457{ 3515{
3458 int32_t end_col, end_row; 3516 int32_t end_col, end_row;
3459 text_t *stp; 3517 text_t *stp;
… …
3514 */ 3572 */
3515void 3573void
3516rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3574rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3517{ 3575{
3518 XSelectionEvent ev; 3576 XSelectionEvent ev;
3519 dDisp;
3520 3577
3521 ev.type = SelectionNotify; 3578 ev.type = SelectionNotify;
3522 ev.property = None; 3579 ev.property = None;
3523 ev.display = rq.display; 3580 ev.display = rq.display;
3524 ev.requestor = rq.requestor; 3581 ev.requestor = rq.requestor;
… …
3538 *target++ = xa[XA_COMPOUND_TEXT]; 3595 *target++ = xa[XA_COMPOUND_TEXT];
3539#if X_HAVE_UTF8_STRING 3596#if X_HAVE_UTF8_STRING
3540 *target++ = xa[XA_UTF8_STRING]; 3597 *target++ = xa[XA_UTF8_STRING];
3541#endif 3598#endif
3542 3599
3543 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3600 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3544 32, PropModeReplace, 3601 32, PropModeReplace,
3545 (unsigned char *)target_list, target - target_list); 3602 (unsigned char *)target_list, target - target_list);
3546 ev.property = rq.property; 3603 ev.property = rq.property;
3547 } 3604 }
3548#if TODO // TODO 3605#if TODO // TODO
… …
3551 /* TODO: Handle MULTIPLE */ 3608 /* TODO: Handle MULTIPLE */
3552 } 3609 }
3553#endif 3610#endif
3554 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3611 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3555 { 3612 {
3556 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3613 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3557 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3614 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3558 ev.property = rq.property; 3615 ev.property = rq.property;
3559 } 3616 }
3560 else if (rq.target == XA_STRING 3617 else if (rq.target == XA_STRING
3561 || rq.target == xa[XA_TEXT] 3618 || rq.target == xa[XA_TEXT]
… …
3585 style = enc_string; 3642 style = enc_string;
3586 else if (target == xa[XA_TEXT]) 3643 else if (target == xa[XA_TEXT])
3587 style = enc_text; 3644 style = enc_text;
3588 else if (target == xa[XA_COMPOUND_TEXT]) 3645 else if (target == xa[XA_COMPOUND_TEXT])
3589 style = enc_compound_text; 3646 style = enc_compound_text;
3590#if ENABLE_FRILLS 3647#if !ENABLE_MINIMAL
3591 else if (target == xa[XA_UTF8_STRING]) 3648 else if (target == xa[XA_UTF8_STRING])
3592 style = enc_utf8; 3649 style = enc_utf8;
3593#endif 3650#endif
3594 else 3651 else
3595 { 3652 {
… …
3606 { 3663 {
3607 cl = L""; 3664 cl = L"";
3608 selectlen = 0; 3665 selectlen = 0;
3609 } 3666 }
3610 3667
3611#if ENABLE_FRILLS 3668#if !ENABLE_MINIMAL
3612 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3669 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3613 // so recode it manually 3670 // so recode it manually
3614 if (style == enc_utf8) 3671 if (style == enc_utf8)
3615 { 3672 {
3616 freect = 1; 3673 freect = 1;
… …
3619 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3676 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3620 ct.nitems = strlen ((char *)ct.value); 3677 ct.nitems = strlen ((char *)ct.value);
3621 } 3678 }
3622 else 3679 else
3623#endif 3680#endif
3624 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3681 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3625 freect = 1; 3682 freect = 1;
3626 else 3683 else
3627 { 3684 {
3628 /* if we failed to convert then send it raw */ 3685 /* if we failed to convert then send it raw */
3629 ct.value = (unsigned char *)cl; 3686 ct.value = (unsigned char *)cl;
3630 ct.nitems = selectlen; 3687 ct.nitems = selectlen;
3631 ct.encoding = target; 3688 ct.encoding = target;
3632 } 3689 }
3633 3690
3634 XChangeProperty (disp, rq.requestor, rq.property, 3691 XChangeProperty (dpy, rq.requestor, rq.property,
3635 ct.encoding, 8, PropModeReplace, 3692 ct.encoding, 8, PropModeReplace,
3636 ct.value, (int)ct.nitems); 3693 ct.value, (int)ct.nitems);
3637 ev.property = rq.property; 3694 ev.property = rq.property;
3638 3695
3639 if (freect) 3696 if (freect)
3640 XFree (ct.value); 3697 XFree (ct.value);
3641 } 3698 }
3642 3699
3643 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3700 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3644}
3645
3646/* ------------------------------------------------------------------------- *
3647 * MOUSE ROUTINES *
3648 * ------------------------------------------------------------------------- */
3649
3650/*
3651 * return col/row values corresponding to x/y pixel values
3652 */
3653void
3654rxvt_term::pixel_position (int *x, int *y) NOTHROW
3655{
3656 *x = Pixel2Col (*x);
3657 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3658 *y = Pixel2Row (*y);
3659 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3660} 3701}
3661 3702
3662/* ------------------------------------------------------------------------- */ 3703/* ------------------------------------------------------------------------- */
3663#ifdef USE_XIM 3704#ifdef USE_XIM
3664void 3705void
3665rxvt_term::im_set_position (XPoint &pos) NOTHROW 3706rxvt_term::im_set_position (XPoint &pos) NOTHROW
3666{ 3707{
3667 XWindowAttributes xwa; 3708 XWindowAttributes xwa;
3668 3709
3669 XGetWindowAttributes (display->display, vt, &xwa); 3710 XGetWindowAttributes (dpy, vt, &xwa);
3670 3711
3671 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3712 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3672 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3713 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3673} 3714}
3674#endif 3715#endif
… …
3692 h += 2; min_it (h, nrow); 3733 h += 2; min_it (h, nrow);
3693 3734
3694 x -= 1; clamp_it (x, 0, ncol - w); 3735 x -= 1; clamp_it (x, 0, ncol - w);
3695 y -= 1; clamp_it (y, 0, nrow - h); 3736 y -= 1; clamp_it (y, 0, nrow - h);
3696 3737
3697 ov_x = x; ov_y = y; 3738 ov.x = x; ov.y = y;
3698 ov_w = w; ov_h = h; 3739 ov.w = w; ov.h = h;
3699 3740
3700 ov_text = new text_t *[h]; 3741 ov.text = new text_t *[h];
3701 ov_rend = new rend_t *[h]; 3742 ov.rend = new rend_t *[h];
3702 3743
3703 for (y = 0; y < h; y++) 3744 for (y = 0; y < h; y++)
3704 { 3745 {
3705 text_t *tp = ov_text[y] = new text_t[w]; 3746 text_t *tp = ov.text[y] = new text_t[w];
3706 rend_t *rp = ov_rend[y] = new rend_t[w]; 3747 rend_t *rp = ov.rend[y] = new rend_t[w];
3707 3748
3708 text_t t0, t1, t2; 3749 text_t t0, t1, t2;
3709 rend_t r = OVERLAY_RSTYLE; 3750 rend_t r = OVERLAY_RSTYLE;
3710 3751
3711 if (y == 0) 3752 if (y == 0)
… …
3730} 3771}
3731 3772
3732void 3773void
3733rxvt_term::scr_overlay_off () NOTHROW 3774rxvt_term::scr_overlay_off () NOTHROW
3734{ 3775{
3735 if (!ov_text) 3776 if (!ov.text)
3736 return; 3777 return;
3737 3778
3738 want_refresh = 1; 3779 want_refresh = 1;
3739 3780
3740 for (int y = 0; y < ov_h; y++) 3781 for (int y = 0; y < ov.h; y++)
3741 { 3782 {
3742 delete [] ov_text[y]; 3783 delete [] ov.text[y];
3743 delete [] ov_rend[y]; 3784 delete [] ov.rend[y];
3744 } 3785 }
3745 3786
3746 delete [] ov_text; ov_text = 0; 3787 delete [] ov.text; ov.text = 0;
3747 delete [] ov_rend; ov_rend = 0; 3788 delete [] ov.rend; ov.rend = 0;
3748} 3789}
3749 3790
3750void 3791void
3751rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3792rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3752{ 3793{
3753 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3794 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3754 return; 3795 return;
3755 3796
3756 x++, y++; 3797 x++, y++;
3757 3798
3758 ov_text[y][x] = text; 3799 ov.text[y][x] = text;
3759 ov_rend[y][x] = rend; 3800 ov.rend[y][x] = rend;
3760} 3801}
3761 3802
3762void 3803void
3763rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3804rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3764{ 3805{
… …
3783} 3824}
3784 3825
3785void 3826void
3786rxvt_term::scr_swap_overlay () NOTHROW 3827rxvt_term::scr_swap_overlay () NOTHROW
3787{ 3828{
3788 if (!ov_text) 3829 if (!ov.text)
3789 return; 3830 return;
3790 3831
3832 // hide cursor if it is within the overlay area
3833 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3834 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3835 screen.flags &= ~Screen_VisibleCursor;
3836
3791 // swap screen mem with overlay 3837 // swap screen mem with overlay
3792 for (int y = ov_h; y--; ) 3838 for (int y = ov.h; y--; )
3793 { 3839 {
3794 text_t *t1 = ov_text[y]; 3840 text_t *t1 = ov.text[y];
3795 rend_t *r1 = ov_rend[y]; 3841 rend_t *r1 = ov.rend[y];
3796 3842
3797 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3843 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3798 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3844 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3799 3845
3800 for (int x = ov_w; x--; ) 3846 for (int x = ov.w; x--; )
3801 { 3847 {
3802 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3848 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3803 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3849 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3804 } 3850 }
3805 } 3851 }

Diff Legend

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