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.253 by root, Fri Jan 27 18:36:43 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 (xdisp, 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 (xdisp, 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 (xdisp, 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;
… …
640 l.touch (); 645 l.touch ();
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--; )
650 {
651 line_t &l = ROW(nrow - 1 - i);
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 {
657 scr_blank_line (l, 0, l.l, rstyle);
658 l.l = 0;
659 l.f = 0;
660 }
661 else
645 scr_blank_screen_mem (ROW(nrow - 1 - i), rstyle); 662 scr_blank_screen_mem (l, rstyle);
663 }
646 664
647 // now copy lines below the scroll region bottom to the 665 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 666 // bottom of the screen again, so they look as if they
649 // hadn't moved. 667 // hadn't moved.
650 for (int i = nrow; --i > row2; ) 668 for (int i = nrow; --i > row2; )
… …
653 line_t &l2 = ROW(i); 671 line_t &l2 = ROW(i);
654 672
655 ::swap (l1, l2); 673 ::swap (l1, l2);
656 l2.touch (); 674 l2.touch ();
657 } 675 }
658 676
659 // move and/or clear selection, if any 677 // move and/or clear selection, if any
660 if (selection.op && current_screen == selection.screen) 678 if (selection.op && current_screen == selection.screen)
661 { 679 {
662 selection.beg.row -= count; 680 selection.beg.row -= count;
663 selection.end.row -= count; 681 selection.end.row -= count;
… …
671 selection.op = SELECTION_CLEAR; 689 selection.op = SELECTION_CLEAR;
672 } 690 }
673 } 691 }
674 692
675 // finally move the view window, if desired 693 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 694 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 695 && view_start != 0
678 && view_start != -saveLines) 696 && view_start != -saveLines)
679 scr_page (UP, count); 697 scr_page (UP, count);
680 698
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 699 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
699 { 717 {
700 /* move selected region too */ 718 /* move selected region too */
701 selection.beg.row -= count; 719 selection.beg.row -= count;
702 selection.end.row -= count; 720 selection.end.row -= count;
703 selection.mark.row -= count; 721 selection.mark.row -= count;
704 722
705 selection_check (0); 723 selection_check (0);
706 } 724 }
707 } 725 }
708 726
709 // use a simple and robust scrolling algorithm, this 727 // use a simple and robust scrolling algorithm, this
… …
761 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 779 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
762 screen.cur.row -= minlines; 780 screen.cur.row -= minlines;
763 } 781 }
764 } 782 }
765 783
766#ifdef DEBUG_STRICT
767 assert (screen.cur.col < ncol); 784 assert (screen.cur.col < ncol);
768 assert (screen.cur.row < nrow 785 assert (screen.cur.row < nrow
769 && screen.cur.row >= top_row); 786 && screen.cur.row >= top_row);
770#endif
771 int row = screen.cur.row; 787 int row = screen.cur.row;
772 788
773 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 789 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
774 790
775 line_t *line = &ROW(row); 791 line_t *line = &ROW(row);
776 792
777 while (str < strend) 793 while (str < strend)
778 { 794 {
779 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 795 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
780 796
781 if (c < 0x20) 797 if (expect_false (c < 0x20))
782 if (c == C0_LF) 798 if (c == C0_LF)
783 { 799 {
784 max_it (line->l, screen.cur.col); 800 max_it (line->l, screen.cur.col);
785 801
786 screen.flags &= ~Screen_WrapNext; 802 screen.flags &= ~Screen_WrapNext;
… …
805 { 821 {
806 scr_tab (1, true); 822 scr_tab (1, true);
807 continue; 823 continue;
808 } 824 }
809 825
826 if (expect_false (
810 if (checksel /* see if we're writing within selection */ 827 checksel /* see if we're writing within selection */
811 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 828 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
812 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 829 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
830 ))
813 { 831 {
814 checksel = 0; 832 checksel = 0;
815 /* 833 /*
816 * If we wrote anywhere in the selected area, kill the selection 834 * If we wrote anywhere in the selected area, kill the selection
817 * XXX: should we kill the mark too? Possibly, but maybe that 835 * XXX: should we kill the mark too? Possibly, but maybe that
818 * should be a similar check. 836 * should be a similar check.
819 */ 837 */
820 CLEAR_SELECTION (); 838 CLEAR_SELECTION ();
821 } 839 }
822 840
823 if (screen.flags & Screen_WrapNext) 841 if (expect_false (screen.flags & Screen_WrapNext))
824 { 842 {
825 scr_do_wrap (); 843 scr_do_wrap ();
826 844
827 line->l = ncol; 845 line->l = ncol;
828 line->is_longer (1); 846 line->is_longer (1);
829 847
830 row = screen.cur.row; 848 row = screen.cur.row;
831 line = &ROW(row); /* _must_ refresh */ 849 line = &ROW(row); /* _must_ refresh */
832 } 850 }
833 851
834 // some utf-8 decoders "decode" surrogate characters: let's fix this. 852 // some utf-8 decoders "decode" surrogate characters: let's fix this.
835 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 853 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
836 c = 0xfffd; 854 c = 0xfffd;
837 855
838 // 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
839 // further replacements, as wcwidth might return -1 for the line 857 // further replacements, as wcwidth might return -1 for the line
840 // drawing characters below as they might be invalid in the current 858 // drawing characters below as they might be invalid in the current
841 // locale. 859 // locale.
842 int width = WCWIDTH (c); 860 int width = WCWIDTH (c);
843 861
844 if (charsets [screen.charset] == '0') // DEC SPECIAL 862 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
845 { 863 {
846 // vt100 special graphics and line drawing 864 // vt100 special graphics and line drawing
847 // 5f-7e standard vt100 865 // 5f-7e standard vt100
848 // 40-5e rxvt extension for extra curses acs chars 866 // 40-5e rxvt extension for extra curses acs chars
849 static uint16_t vt100_0[62] = { // 41 .. 7e 867 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
862 c = vt100_0[c - 0x41]; 880 c = vt100_0[c - 0x41];
863 width = 1; // vt100 line drawing characters are always single-width 881 width = 1; // vt100 line drawing characters are always single-width
864 } 882 }
865 } 883 }
866 884
867 if (screen.flags & Screen_Insert) 885 if (expect_false (screen.flags & Screen_Insert))
868 scr_insdel_chars (width, INSERT); 886 scr_insdel_chars (width, INSERT);
869 887
870 if (width != 0) 888 if (width != 0)
871 { 889 {
872#if !UNICODE_3 890#if !UNICODE_3
… …
878 c = 0xfffd; 896 c = 0xfffd;
879# endif 897# endif
880#endif 898#endif
881 899
882 // nuke the character at this position, if required 900 // nuke the character at this position, if required
901 if (expect_false (
883 if (line->t[screen.cur.col] == NOCHAR 902 line->t[screen.cur.col] == NOCHAR
884 || (screen.cur.col < ncol - 1 903 || (screen.cur.col < ncol - 1
885 && 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))
886 { 912 {
887 int col = screen.cur.col; 913 // ... artificially enlargen the previous one
888
889 // find begin
890 while (col > 0 && line->t[col] == NOCHAR)
891 col--;
892
893 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
894
895 // found begin, nuke
896 do {
897 line->t[col] = ' ';
898 line->r[col] = rend;
899 col++;
900 } while (col < ncol && line->t[col] == NOCHAR);
901 }
902
903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904
905 // if the character doesn't fit into the remaining columns...
906 if (screen.cur.col > ncol - width && ncol >= width)
907 {
908 // ...output spaces
909 c = ' '; 914 c = NOCHAR;
910 // and try the same character next loop iteration 915 // and try the same character next loop iteration
911 --str; 916 --str;
912 } 917 }
913 918
914 line->touch (); 919 line->touch ();
… …
916 do 921 do
917 { 922 {
918 line->t[screen.cur.col] = c; 923 line->t[screen.cur.col] = c;
919 line->r[screen.cur.col] = rend; 924 line->r[screen.cur.col] = rend;
920 925
921 if (screen.cur.col < ncol - 1) 926 if (expect_true (screen.cur.col < ncol - 1))
922 screen.cur.col++; 927 screen.cur.col++;
923 else 928 else
924 { 929 {
925 line->l = ncol; 930 line->l = ncol;
926 if (screen.flags & Screen_Autowrap) 931 if (screen.flags & Screen_Autowrap)
… …
928 break; 933 break;
929 } 934 }
930 935
931 c = NOCHAR; 936 c = NOCHAR;
932 } 937 }
933 while (--width > 0); 938 while (expect_false (--width > 0));
934 939
935 // pad with spaces when overwriting wide character with smaller one 940 // pad with spaces when overwriting wide character with smaller one
936 if (!width) 941 if (expect_false (!width))
937 { 942 {
938 line->touch (); 943 line->touch ();
939 944
940 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++)
941 { 946 {
942 line->t[c] = ' '; 947 line->t[c] = ' ';
943 line->r[c] = rend; 948 line->r[c] = rend;
944 } 949 }
945 } 950 }
946 } 951 }
952#if ENABLE_COMBINING
947 else // width == 0 953 else // width == 0
948 { 954 {
949#if ENABLE_COMBINING 955 if (c != 0xfeff) // ignore BOM
950 // handle combining characters
951 // we just tag the accent on the previous on-screen character.
952 // this is arguably not correct, but also arguably not wrong.
953 // we don't handle double-width characters nicely yet.
954 line_t *linep;
955 text_t *tp;
956 rend_t *rp;
957
958 if (screen.cur.col > 0)
959 { 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 {
960 linep = line; 967 linep = line;
961 tp = line->t + screen.cur.col - 1; 968 tp = line->t + screen.cur.col - 1;
962 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));
963 } 993 }
964 else if (screen.cur.row > 0
965 && ROW(screen.cur.row - 1).is_longer ())
966 {
967 linep = &ROW(screen.cur.row - 1);
968 tp = line->t + ncol - 1;
969 rp = line->r + ncol - 1;
970 } 994 }
971 else
972 continue;
973
974 linep->touch ();
975
976 while (*tp == NOCHAR && tp > linep->t)
977 tp--, rp--;
978
979 // first try to find a precomposed character
980 unicode_t n = rxvt_compose (*tp, c);
981 if (n == NOCHAR)
982 n = rxvt_composite.compose (*tp, c);
983
984 *tp = n;
985 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
986#endif 995#endif
987 }
988 } 996 }
989 997
990 max_it (line->l, screen.cur.col); 998 max_it (line->l, screen.cur.col);
991 999
992#ifdef DEBUG_STRICT
993 assert (screen.cur.row >= 0); 1000 assert (screen.cur.row >= 0);
994#endif
995} 1001}
996 1002
997/* ------------------------------------------------------------------------- */ 1003/* ------------------------------------------------------------------------- */
998/* 1004/*
999 * 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
1000 * XTERM_SEQ: CTRL-H 1006 * XTERM_SEQ: CTRL-H
1001 */ 1007 */
1002void 1008void
1003rxvt_term::scr_backspace () NOTHROW 1009rxvt_term::scr_backspace () NOTHROW
1004{ 1010{
1005 want_refresh = 1;
1006
1007 if (screen.cur.col == 0) 1011 if (screen.cur.col == 0)
1008 { 1012 {
1009 if (screen.cur.row > 0) 1013 if (screen.cur.row > 0)
1010 { 1014 {
1011#ifdef TERMCAP_HAS_BW 1015#ifdef TERMCAP_HAS_BW
1012 screen.cur.col = ncol - 1; 1016 screen.cur.col = ncol - 1;
1013 screen.cur.row--; 1017 --screen.cur.row;
1014 return; 1018
1019 want_refresh = 1;
1015#endif 1020#endif
1016 } 1021 }
1017 } 1022 }
1018 else if (!(screen.flags & Screen_WrapNext)) 1023 else
1019 scr_gotorc (0, -1, RELATIVE); 1024 scr_gotorc (0, -1, RELATIVE);
1020
1021 screen.flags &= ~Screen_WrapNext;
1022} 1025}
1023 1026
1024/* ------------------------------------------------------------------------- */ 1027/* ------------------------------------------------------------------------- */
1025/* 1028/*
1026 * Process Horizontal Tab 1029 * Process Horizontal Tab
… …
1049 x = i; 1052 x = i;
1050 1053
1051 if (!--count) 1054 if (!--count)
1052 break; 1055 break;
1053 } 1056 }
1054 else 1057 else
1055 ht &= l.t[i] == ' ' 1058 ht &= l.t[i] == ' '
1056 && RS_SAME (l.r[i], base_rend); 1059 && RS_SAME (l.r[i], base_rend);
1057 1060
1058 if (count) 1061 if (count)
1059 x = ncol - 1; 1062 x = ncol - 1;
1060 1063
1061 // store horizontal tab commands as characters inside the text 1064 // store horizontal tab commands as characters inside the text
1062 // buffer so they can be selected and pasted. 1065 // buffer so they can be selected and pasted.
1063 if (ht && OPTION (Opt_pastableTabs)) 1066 if (ht && option (Opt_pastableTabs))
1064 { 1067 {
1065 base_rend = SET_FONT (base_rend, 0); 1068 base_rend = SET_FONT (base_rend, 0);
1066 1069
1067 l.touch (x); 1070 l.touch (x);
1068 1071
… …
1101 * Process DEC Back Index 1104 * Process DEC Back Index
1102 * XTERM_SEQ: ESC 6 1105 * XTERM_SEQ: ESC 6
1103 * 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
1104 * in that row right. Clear left column. 1107 * in that row right. Clear left column.
1105 */ 1108 */
1106#if ENABLE_FRILLS 1109#if !ENABLE_MINIMAL
1107void 1110void
1108rxvt_term::scr_backindex () NOTHROW 1111rxvt_term::scr_backindex () NOTHROW
1109{ 1112{
1110 if (screen.cur.col > 0) 1113 if (screen.cur.col > 0)
1111 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1114 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1118 * Process DEC Forward Index 1121 * Process DEC Forward Index
1119 * XTERM_SEQ: ESC 9 1122 * XTERM_SEQ: ESC 9
1120 * 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
1121 * in that row left. Clear right column. 1124 * in that row left. Clear right column.
1122 */ 1125 */
1123#if ENABLE_FRILLS 1126#if !ENABLE_MINIMAL
1124void 1127void
1125rxvt_term::scr_forwardindex () NOTHROW 1128rxvt_term::scr_forwardindex () NOTHROW
1126{ 1129{
1127 if (screen.cur.col < ncol - 1) 1130 if (screen.cur.col < ncol - 1)
1128 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1131 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1175 } 1178 }
1176 } 1179 }
1177 else 1180 else
1178 { 1181 {
1179 if (screen.flags & Screen_Relative) 1182 if (screen.flags & Screen_Relative)
1183 {
1180 { /* relative origin mode */ 1184 /* relative origin mode */
1181 screen.cur.row = row + screen.tscroll; 1185 screen.cur.row = row + screen.tscroll;
1182 min_it (screen.cur.row, screen.bscroll); 1186 min_it (screen.cur.row, screen.bscroll);
1183 } 1187 }
1184 else 1188 else
1185 screen.cur.row = row; 1189 screen.cur.row = row;
… …
1218/* 1222/*
1219 * Erase part or whole of a line 1223 * Erase part or whole of a line
1220 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1224 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1221 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1225 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1222 * 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
1223 */ 1228 */
1224void 1229void
1225rxvt_term::scr_erase_line (int mode) NOTHROW 1230rxvt_term::scr_erase_line (int mode) NOTHROW
1226{ 1231{
1227 unsigned int col, num; 1232 unsigned int col, num;
… …
1236 line.touch (); 1241 line.touch ();
1237 line.is_longer (0); 1242 line.is_longer (0);
1238 1243
1239 switch (mode) 1244 switch (mode)
1240 { 1245 {
1246 case 3:
1247 if (screen.flags & Screen_WrapNext)
1248 return;
1249
1250 /* fall through */
1251
1241 case 0: /* erase to end of line */ 1252 case 0: /* erase to end of line */
1242 col = screen.cur.col; 1253 col = screen.cur.col;
1243 num = ncol - col; 1254 num = ncol - col;
1244 min_it (line.l, col); 1255 min_it (line.l, col);
1256
1245 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1246 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1247 CLEAR_SELECTION (); 1259 CLEAR_SELECTION ();
1248 break; 1260 break;
1261
1249 case 1: /* erase to beginning of line */ 1262 case 1: /* erase to beginning of line */
1250 col = 0; 1263 col = 0;
1251 num = screen.cur.col + 1; 1264 num = screen.cur.col + 1;
1265
1252 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1266 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1253 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1267 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1254 CLEAR_SELECTION (); 1268 CLEAR_SELECTION ();
1255 break; 1269 break;
1270
1256 case 2: /* erase whole line */ 1271 case 2: /* erase whole line */
1257 col = 0; 1272 col = 0;
1258 num = ncol; 1273 num = ncol;
1259 line.l = 0; 1274 line.l = 0;
1260 if (selection.beg.row <= screen.cur.row 1275 if (selection.beg.row <= screen.cur.row
… …
1318 if (row >= nrow) /* Out Of Bounds */ 1333 if (row >= nrow) /* Out Of Bounds */
1319 return; 1334 return;
1320 1335
1321 min_it (num, nrow - row); 1336 min_it (num, nrow - row);
1322 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.
1323 if (rstyle & (RS_RVid | RS_Uline)) 1341 if (rstyle & (RS_RVid | RS_Uline))
1324 ren = (rend_t) ~RS_None; 1342 ren = (rend_t) ~RS_None;
1325 else if (GET_BASEBG (rstyle) == Color_bg) 1343 else if (GET_BASEBG (rstyle) == Color_bg)
1326 { 1344 {
1327 ren = DEFAULT_RSTYLE; 1345 ren = DEFAULT_RSTYLE;
1328 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);
1329 } 1351 }
1330 else 1352 else
1331 { 1353 {
1332 ren = rstyle & (RS_fgMask | RS_bgMask); 1354 ren = rstyle & (RS_fgMask | RS_bgMask);
1355
1356 if (mapped && !view_start)
1357 {
1333 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1334 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1359 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1335 ERASE_ROWS (row, num); 1360 XFillRectangle (dpy, vt, gc,
1361 0, Row2Pixel (row - view_start),
1362 (unsigned int)width,
1363 (unsigned int)Height2Pixel (num));
1336 gcvalue.foreground = pix_colors[Color_fg]; 1364 gcvalue.foreground = pix_colors[Color_fg];
1337 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1365 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1366 }
1338 } 1367 }
1339 1368
1340 for (; num--; row++) 1369 for (; num--; row++)
1341 { 1370 {
1342 scr_blank_screen_mem (ROW(row), rstyle); 1371 scr_blank_screen_mem (ROW(row), rstyle);
1372
1373 if (!view_start)
1343 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1374 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1344 } 1375 }
1345} 1376}
1346 1377
1347#if ENABLE_FRILLS 1378#if !ENABLE_MINIMAL
1348void 1379void
1349rxvt_term::scr_erase_savelines () NOTHROW 1380rxvt_term::scr_erase_savelines () NOTHROW
1350{ 1381{
1351 want_refresh = 1; 1382 want_refresh = 1;
1352 ZERO_SCROLLBACK (); 1383 ZERO_SCROLLBACK ();
… …
1422 * Insert/Delete <count> characters from the current position 1453 * Insert/Delete <count> characters from the current position
1423 */ 1454 */
1424void 1455void
1425rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1456rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1426{ 1457{
1427 int col, row;
1428 rend_t tr;
1429
1430 want_refresh = 1; 1458 want_refresh = 1;
1431 ZERO_SCROLLBACK (); 1459 ZERO_SCROLLBACK ();
1432 1460
1433 if (count <= 0) 1461 if (count <= 0)
1434 return; 1462 return;
… …
1436 scr_do_wrap (); 1464 scr_do_wrap ();
1437 1465
1438 selection_check (1); 1466 selection_check (1);
1439 min_it (count, ncol - screen.cur.col); 1467 min_it (count, ncol - screen.cur.col);
1440 1468
1441 row = screen.cur.row; 1469 int row = screen.cur.row;
1442 1470
1443 line_t *line = &ROW(row); 1471 line_t *line = &ROW(row);
1444 1472
1445 line->touch (); 1473 line->touch ();
1446 line->is_longer (0); 1474 line->is_longer (0);
1447 1475
1476 // nuke wide spanning the start
1477 if (line->t[screen.cur.col] == NOCHAR)
1478 scr_kill_char (*line, screen.cur.col);
1479
1448 switch (insdel) 1480 switch (insdel)
1449 { 1481 {
1450 case INSERT: 1482 case INSERT:
1451 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--)
1452 { 1489 {
1453 line->t[col] = line->t[col - count]; 1490 line->t[col] = line->t[col - count];
1454 line->r[col] = line->r[col - count]; 1491 line->r[col] = line->r[col - count];
1455 } 1492 }
1456
1457 line->l = min (line->l + count, ncol);
1458 1493
1459 if (selection.op && current_screen == selection.screen 1494 if (selection.op && current_screen == selection.screen
1460 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1495 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1461 { 1496 {
1462 if (selection.end.row != screen.cur.row 1497 if (selection.end.row != screen.cur.row
1463 || (selection.end.col + count >= ncol)) 1498 || (selection.end.col + count >= ncol))
1464 CLEAR_SELECTION (); 1499 CLEAR_SELECTION ();
1465 else 1500 else
1501 {
1466 { /* shift selection */ 1502 /* shift selection */
1467 selection.beg.col += count; 1503 selection.beg.col += count;
1468 selection.mark.col += count; /* XXX: yes? */ 1504 selection.mark.col += count; /* XXX: yes? */
1469 selection.end.col += count; 1505 selection.end.col += count;
1470 } 1506 }
1471 } 1507 }
… …
1476 case ERASE: 1512 case ERASE:
1477 screen.cur.col += count; /* don't worry if > ncol */ 1513 screen.cur.col += count; /* don't worry if > ncol */
1478 selection_check (1); 1514 selection_check (1);
1479 screen.cur.col -= count; 1515 screen.cur.col -= count;
1480 1516
1481 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
1482 scr_blank_line (*line, screen.cur.col, count, rstyle); 1521 scr_blank_line (*line, screen.cur.col, count, rstyle);
1483 break; 1522 break;
1484 1523
1485 case DELETE: 1524 case DELETE:
1486 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1525 line->l = max (line->l - count, 0);
1487 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
1488 for (col = screen.cur.col; (col + count) < ncol; col++) 1531 for (int col = screen.cur.col; (col + count) < ncol; col++)
1489 { 1532 {
1490 line->t[col] = line->t[col + count]; 1533 line->t[col] = line->t[col + count];
1491 line->r[col] = line->r[col + count]; 1534 line->r[col] = line->r[col + count];
1492 } 1535 }
1493 1536
1494 line->l = max (line->l - count, 0);
1495 scr_blank_line (*line, ncol - count, count, tr); 1537 scr_blank_line (*line, ncol - count, count, rstyle);
1496 1538
1497 if (selection.op && current_screen == selection.screen 1539 if (selection.op && current_screen == selection.screen
1498 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1540 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1499 { 1541 {
1500 if (selection.end.row != screen.cur.row 1542 if (selection.end.row != screen.cur.row
… …
1610 */ 1652 */
1611void 1653void
1612rxvt_term::scr_set_tab (int mode) NOTHROW 1654rxvt_term::scr_set_tab (int mode) NOTHROW
1613{ 1655{
1614 if (mode < 0) 1656 if (mode < 0)
1615 memset (tabs, 0, ncol * sizeof (char)); 1657 memset (tabs, 0, ncol);
1616 else if (screen.cur.col < ncol) 1658 else if (screen.cur.col < ncol)
1617 tabs [screen.cur.col] = !!mode; 1659 tabs [screen.cur.col] = !!mode;
1618} 1660}
1619 1661
1620/* ------------------------------------------------------------------------- */ 1662/* ------------------------------------------------------------------------- */
… …
1635 if (rvideo_state != on) 1677 if (rvideo_state != on)
1636 { 1678 {
1637 rvideo_state = on; 1679 rvideo_state = on;
1638 1680
1639 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1681 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1640#if XPM_BACKGROUND 1682#ifdef HAVE_BG_PIXMAP
1641 if (bgPixmap.pixmap == None) 1683 if (bgPixmap.pixmap == None)
1642#endif 1684#endif
1643#if TRANSPARENT
1644 if (!OPTION (Opt_transparent) || am_transparent == 0)
1645#endif
1646 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 1685 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1647 1686
1648 XGCValues gcvalue; 1687 XGCValues gcvalue;
1649 gcvalue.foreground = pix_colors[Color_fg]; 1688 gcvalue.foreground = pix_colors[Color_fg];
1650 gcvalue.background = pix_colors[Color_bg]; 1689 gcvalue.background = pix_colors[Color_bg];
1651 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); 1690 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1652 1691
1653 scr_clear (); 1692 scr_clear ();
1654 scr_touch (true); 1693 scr_touch (true);
1655 } 1694 }
1656} 1695}
… …
1741{ 1780{
1742 bool found = false; 1781 bool found = false;
1743 1782
1744 for (int i = 0; i < nrow; i++) 1783 for (int i = 0; i < nrow; i++)
1745 { 1784 {
1746 int col = 0;
1747 rend_t *drp = drawn_buf[i].r; 1785 rend_t *drp = drawn_buf[i].r;
1748 1786
1749 for (; col < ncol; col++, drp++) 1787 for (int col = 0; col < ncol; col++, drp++)
1750 if ((*drp & mask) == value) 1788 if ((*drp & mask) == value)
1751 { 1789 {
1752 found = true; 1790 found = true;
1753 *drp = ~value; 1791 *drp = ~value;
1754 } 1792 }
… …
1794 for (i = PART_BEG; i < RC_COUNT; i++) 1832 for (i = PART_BEG; i < RC_COUNT; i++)
1795 { 1833 {
1796 min_it (rc[i].col, ncol - 1); 1834 min_it (rc[i].col, ncol - 1);
1797 min_it (rc[i].row, nrow - 1); 1835 min_it (rc[i].row, nrow - 1);
1798 } 1836 }
1799 1837// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1800 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++)
1801 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);
1802 1840
1803 num_scr_allow = 0; 1841 num_scr_allow = 0;
1804 1842
… …
1859 return true; 1897 return true;
1860} 1898}
1861 1899
1862#ifndef NO_BELL 1900#ifndef NO_BELL
1863void 1901void
1864rxvt_term::bell_cb (time_watcher &w) 1902rxvt_term::bell_cb (ev::timer &w, int revents)
1865{ 1903{
1866 rvideo_bell = false; 1904 rvideo_bell = false;
1867 scr_rvideo_mode (rvideo_mode); 1905 scr_rvideo_mode (rvideo_mode);
1906 refresh_check ();
1868} 1907}
1869#endif 1908#endif
1870 1909
1871/* ------------------------------------------------------------------------- */ 1910/* ------------------------------------------------------------------------- */
1872void 1911void
… …
1874{ 1913{
1875#ifndef NO_BELL 1914#ifndef NO_BELL
1876 1915
1877# ifndef NO_MAPALERT 1916# ifndef NO_MAPALERT
1878# ifdef MAPALERT_OPTION 1917# ifdef MAPALERT_OPTION
1879 if (OPTION (Opt_mapAlert)) 1918 if (option (Opt_mapAlert))
1880# endif 1919# endif
1881 XMapWindow (xdisp, parent[0]); 1920 XMapWindow (dpy, parent[0]);
1882# endif 1921# endif
1883 1922
1923# if ENABLE_FRILLS
1924 if (option (Opt_urgentOnBell))
1925 set_urgency (1);
1926# endif
1927
1884 if (OPTION (Opt_visualBell)) 1928 if (option (Opt_visualBell))
1885 { 1929 {
1886 rvideo_bell = true; 1930 rvideo_bell = true;
1887 scr_rvideo_mode (rvideo_mode); 1931 scr_rvideo_mode (rvideo_mode);
1888 display->flush (); 1932 flush ();
1889 1933
1890 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1934 bell_ev.start (VISUAL_BELL_DURATION);
1891 } 1935 }
1892 else 1936 else
1893 XBell (xdisp, 0); 1937 XBell (dpy, 0);
1894 1938 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1895#endif 1939#endif
1896} 1940}
1897 1941
1898/* ------------------------------------------------------------------------- */ 1942/* ------------------------------------------------------------------------- */
1899/* ARGSUSED */ 1943/* ARGSUSED */
1900void 1944void
1901rxvt_term::scr_printscreen (int fullhist) NOTHROW 1945rxvt_term::scr_printscreen (int fullhist) NOTHROW
1902{ 1946{
1903#ifdef PRINTPIPE 1947#ifdef PRINTPIPE
1904 int nrows, row_start; 1948 int nrows, row_start;
1905 FILE *fd; 1949 FILE *fd = popen_printer ();
1906 1950
1907 if ((fd = popen_printer ()) == NULL) 1951 if (!fd)
1908 return; 1952 return;
1909 1953
1910 if (fullhist) 1954 if (fullhist)
1911 { 1955 {
1912 nrows = nrow - top_row; 1956 nrows = nrow - top_row;
… …
1918 row_start = view_start; 1962 row_start = view_start;
1919 } 1963 }
1920 1964
1921 wctomb (0, 0); 1965 wctomb (0, 0);
1922 1966
1923 for (int r1 = 0; r1 < nrows; r1++) 1967 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1924 { 1968 {
1925 text_t *tp = ROW(r1).t; 1969 text_t *tp = ROW(r1).t;
1926 int len = ROW(r1).l; 1970 int len = ROW(r1).l;
1927 1971
1928 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
… …
1957 * screen.text/screen.rend contain what the screen will change to. 2001 * screen.text/screen.rend contain what the screen will change to.
1958 */ 2002 */
1959void 2003void
1960rxvt_term::scr_refresh () NOTHROW 2004rxvt_term::scr_refresh () NOTHROW
1961{ 2005{
1962 unsigned char must_clear, /* use draw_string not draw_image_string */
1963 showcursor; /* show the cursor */
1964 int16_t col, row, /* column/row we're processing */ 2006 int16_t col, row, /* column/row we're processing */
1965 ocrow; /* old cursor row */ 2007 ocrow; /* old cursor row */
1966 int i; /* tmp */ 2008 int i; /* tmp */
1967#ifndef NO_CURSORCOLOR 2009#ifndef NO_CURSORCOLOR
1968 rend_t cc1; /* store colours at cursor position (s) */ 2010 rend_t cc1; /* store colours at cursor position (s) */
1969#endif 2011#endif
1970 rend_t *crp; // cursor rendition pointer 2012 rend_t *crp; // cursor rendition pointer
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
1971 2015
1972 want_refresh = 0; /* screen is current */ 2016 want_refresh = 0; /* screen is current */
1973 2017
1974 if (refresh_type == NO_REFRESH || !mapped) 2018 if (refresh_type == NO_REFRESH || !mapped)
1975 return; 2019 return;
1976 2020
1977 /* 2021 /*
1978 * A: set up vars 2022 * A: set up vars
1979 */ 2023 */
1980 must_clear = 0;
1981 refresh_count = 0; 2024 refresh_count = 0;
1982 2025
1983#if XPM_BACKGROUND 2026 unsigned int old_screen_flags = screen.flags;
2027 char have_bg = 0;
2028#ifdef HAVE_BG_PIXMAP
1984 must_clear |= bgPixmap.pixmap != None; 2029 have_bg = bgPixmap.pixmap != None;
1985#endif
1986#if TRANSPARENT
1987 must_clear |= OPTION (Opt_transparent) && am_transparent;
1988#endif 2030#endif
1989 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2031 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1990 2032
1991 /* 2033 /*
1992 * B: reverse any characters which are selected 2034 * B: reverse any characters which are selected
1993 */ 2035 */
1994 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;
1995 2044
1996 /* 2045 /*
1997 * C: set the cursor character (s) 2046 * C: set the cursor character (s)
1998 */ 2047 */
1999 { 2048 {
2000 unsigned char setoldcursor; 2049 unsigned char setoldcursor;
2001 rend_t ccol1, /* Cursor colour */
2002 ccol2; /* Cursor colour2 */
2003 2050
2004 showcursor = (screen.flags & Screen_VisibleCursor);
2005#ifdef CURSOR_BLINK 2051#ifdef CURSOR_BLINK
2006 if (hidden_cursor) 2052 if (hidden_cursor)
2007 showcursor = 0; 2053 showcursor = 0;
2008#endif 2054#endif
2009 2055
… …
2014 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2060 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2015 col--; 2061 col--;
2016 2062
2017 crp = &ROW(screen.cur.row).r[col]; 2063 crp = &ROW(screen.cur.row).r[col];
2018 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
2019 if (showcursor && focus) 2088 if (showcursor && focus)
2020 { 2089 {
2021 if (OPTION (Opt_cursorUnderline)) 2090 if (option (Opt_cursorUnderline))
2022 *crp ^= RS_Uline; 2091 *crp ^= RS_Uline;
2023 else 2092 else
2024 { 2093 {
2025 *crp ^= RS_RVid; 2094 *crp ^= RS_RVid;
2026
2027#ifndef NO_CURSORCOLOR
2028 cc1 = *crp & (RS_fgMask | RS_bgMask);
2029 if (ISSET_PIXCOLOR (Color_cursor))
2030 ccol1 = Color_cursor;
2031 else
2032#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2033 ccol1 = fgcolor_of (rstyle);
2034#else
2035 ccol1 = Color_fg;
2036#endif
2037 if (ISSET_PIXCOLOR (Color_cursor2))
2038 ccol2 = Color_cursor2;
2039 else
2040#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2041 ccol2 = bgcolor_of (rstyle);
2042#else
2043 ccol2 = Color_bg;
2044#endif
2045 *crp = SET_FGCOLOR (*crp, ccol1); 2095 *crp = SET_FGCOLOR (*crp, ccol1);
2046 *crp = SET_BGCOLOR (*crp, ccol2); 2096 *crp = SET_BGCOLOR (*crp, ccol2);
2047#endif
2048 } 2097 }
2049 } 2098 }
2050 } 2099 }
2051 2100
2052 /* make sure no outline cursor is left around */ 2101 /* make sure no outline cursor is left around */
… …
2079 oldcursor.col = screen.cur.col; 2128 oldcursor.col = screen.cur.col;
2080 } 2129 }
2081 } 2130 }
2082 } 2131 }
2083 2132
2084 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2085#if ENABLE_OVERLAY
2086 scr_swap_overlay ();
2087#endif
2088
2089#ifndef NO_SLOW_LINK_SUPPORT 2133#ifndef NO_SLOW_LINK_SUPPORT
2090 /* 2134 /*
2091 * D: CopyArea pass - very useful for slower links 2135 * D: CopyArea pass - very useful for slower links
2092 * This has been deliberately kept simple. 2136 * This has been deliberately kept simple.
2093 */ 2137 */
2094 if (!display->is_local 2138 if (!display->is_local
2095 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2139 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2096 && abs (num_scr) < nrow && !must_clear) 2140 && abs (num_scr) < nrow && !have_bg)
2097 { 2141 {
2098 int16_t nits; 2142 int16_t nits;
2143 int i = num_scr;
2099 int j; 2144 int j;
2100 int len, wlen; 2145 int len, wlen;
2101 dLocal (int, num_scr); 2146 dLocal (int, num_scr);
2102 2147
2103 j = nrow; 2148 j = nrow;
2104 wlen = len = -1; 2149 wlen = len = -1;
2105 row = i > 0 ? 0 : j - 1; 2150 row = i > 0 ? 0 : j - 1;
2151
2106 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2152 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2107 { 2153 {
2108 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2154 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2109 { 2155 {
2110 line_t s = ROW(view_start + row); 2156 line_t s = ROW(view_start + row);
… …
2131 wlen = row; 2177 wlen = row;
2132 continue; 2178 continue;
2133 } 2179 }
2134 } 2180 }
2135 2181
2136 if (len != -1) 2182 if (len >= 0)
2137 { 2183 {
2138 /* also comes here at end if needed because of >= above */ 2184 /* also comes here at end if needed because of >= above */
2139 if (wlen < len) 2185 if (wlen < len)
2140 ::swap (wlen, len); 2186 ::swap (wlen, len);
2141 2187
2188 XGCValues gcv;
2189
2190 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2142 XCopyArea (xdisp, vt, vt, 2191 XCopyArea (dpy, vt, vt,
2143 gc, 0, Row2Pixel (len + i), 2192 gc, 0, Row2Pixel (len + i),
2144 (unsigned int)this->width, 2193 (unsigned int)this->width,
2145 (unsigned int)Height2Pixel (wlen - len + 1), 2194 (unsigned int)Height2Pixel (wlen - len + 1),
2146 0, Row2Pixel (len)); 2195 0, Row2Pixel (len));
2196 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2197
2147 len = -1; 2198 len = -1;
2148 } 2199 }
2149 } 2200 }
2150 } 2201 }
2151#endif 2202#endif
… …
2175 continue; 2226 continue;
2176 2227
2177 // redraw one or more characters 2228 // redraw one or more characters
2178 2229
2179 // seek to the beginning of wide characters 2230 // seek to the beginning of wide characters
2180 while (stp[col] == NOCHAR && col > 0) 2231 while (expect_false (stp[col] == NOCHAR && col > 0))
2181 --col; 2232 --col;
2182 2233
2183 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2234 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2184 text_t *text = stp + col; 2235 text_t *text = stp + col;
2185 int count = 1; 2236 int count = 1;
… …
2192 for (i = 0; ++col < ncol; ) 2243 for (i = 0; ++col < ncol; )
2193 { 2244 {
2194 if (stp[col] == NOCHAR) 2245 if (stp[col] == NOCHAR)
2195 { 2246 {
2196 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2197 drp[col] = rend; 2248 drp[col] = srp[col];
2249
2198 count++; 2250 count++;
2199 i++; 2251 i++;
2200 2252
2201 continue; 2253 continue;
2202 } 2254 }
… …
2207 count++; 2259 count++;
2208 2260
2209 if (stp[col] != dtp[col] 2261 if (stp[col] != dtp[col]
2210 || !RS_SAME (srp[col], drp[col])) 2262 || !RS_SAME (srp[col], drp[col]))
2211 { 2263 {
2212 if (must_clear && (i++ > count / 2)) 2264 if (have_bg && (i++ > count / 2))
2213 break; 2265 break;
2214 2266
2215 dtp[col] = stp[col]; 2267 dtp[col] = stp[col];
2216 drp[col] = rend; 2268 drp[col] = rend;
2217 i = 0; 2269 i = 0;
2218 } 2270 }
2219 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2271 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2220 break; 2272 break;
2221 } 2273 }
2222 2274
2223 col--; /* went one too far. move back */ 2275 col--; /* went one too far. move back */
2224 count -= i; /* dump any matching trailing chars */ 2276 count -= i; /* dump any matching trailing chars */
2225 2277
2226 // sometimes we optimize away the trailing NOCHAR's, add them back 2278 // sometimes we optimize away the trailing NOCHAR's, add them back
2227 while (i && text[count] == NOCHAR) 2279 while (expect_false (i && text[count] == NOCHAR))
2228 count++, i--; 2280 count++, i--;
2229 2281
2230 /* 2282 /*
2231 * Determine the attributes for the string 2283 * Determine the attributes for the string
2232 */ 2284 */
2233 int fore = fgcolor_of (rend); // desired foreground 2285 int fore = fgcolor_of (rend); // desired foreground
2234 int back = bgcolor_of (rend); // desired background 2286 int back = bgcolor_of (rend); // desired background
2235 2287
2236 // 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
2237 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)))
2238 { 2290 {
2239#if ENABLE_STYLES
2240 // "careful" (too wide) character handling
2241
2242 // include previous careful character(s) if possible, looks nicer (best effort...)
2243 while (text > stp
2244 && srp[text - stp - 1] & RS_Careful
2245 && RS_SAME (rend, srp[text - stp - 1]))
2246 text--, count++, xpixel -= fwidth;
2247
2248 // force redraw after "careful" characters to avoid pixel droppings
2249 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2250 drp[col + i + 1] = ~srp[col + i + 1];
2251
2252 // force redraw before "careful" characters to avoid pixel droppings
2253 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2254 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2255#endif
2256
2257 bool invert = rend & RS_RVid; 2291 bool invert = rend & RS_RVid;
2258 2292
2259#ifndef NO_BOLD_UNDERLINE_REVERSE 2293#ifndef NO_BOLD_UNDERLINE_REVERSE
2260 if (rend & RS_Bold
2261 && fore == Color_fg) 2294 if (rend & RS_Bold && fore == Color_fg)
2262 { 2295 {
2263 if (ISSET_PIXCOLOR (Color_BD)) 2296 if (ISSET_PIXCOLOR (Color_BD))
2264 fore = Color_BD; 2297 fore = Color_BD;
2265# if !ENABLE_STYLES 2298# if !ENABLE_STYLES
2266 else 2299 else
2267 invert = !invert; 2300 invert = !invert;
2268# endif 2301# endif
2269 } 2302 }
2270 2303
2271 if (rend & RS_Italic 2304 if (rend & RS_Italic && fore == Color_fg)
2272 && fore == Color_fg)
2273 { 2305 {
2274 if (ISSET_PIXCOLOR (Color_IT)) 2306 if (ISSET_PIXCOLOR (Color_IT))
2275 fore = Color_IT; 2307 fore = Color_IT;
2276# if !ENABLE_STYLES 2308# if !ENABLE_STYLES
2277 else 2309 else
2278 invert = !invert; 2310 invert = !invert;
2279# endif 2311# endif
2280 } 2312 }
2281 2313
2282 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2283 fore = Color_UL; 2315 fore = Color_UL;
2284#endif 2316#endif
2285 2317
2286 if (invert) 2318 if (invert)
2287 { 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 */
2288 ::swap (fore, back); 2326 ::swap (fore, back);
2327#ifdef OPTION_HC
2328 else if (ISSET_PIXCOLOR (Color_HC))
2329 back = Color_HC;
2330#endif
2289 2331
2290#ifndef NO_BOLD_UNDERLINE_REVERSE 2332#ifndef NO_BOLD_UNDERLINE_REVERSE
2333# ifndef OPTION_HC
2291 if (ISSET_PIXCOLOR (Color_RV)) 2334 if (ISSET_PIXCOLOR (Color_RV))
2292 back = Color_RV; 2335 back = Color_RV;
2293 2336# endif
2294 if (fore == back) 2337 if (fore == back)
2295 { 2338 {
2296 fore = Color_bg; 2339 fore = Color_bg;
2297 back = Color_fg; 2340 back = Color_fg;
2298 } 2341 }
… …
2300 } 2343 }
2301 2344
2302#ifdef TEXT_BLINK 2345#ifdef TEXT_BLINK
2303 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2346 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2304 { 2347 {
2305 if (!text_blink_ev.active) 2348 if (!text_blink_ev.is_active ())
2306 { 2349 {
2307 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2350 text_blink_ev.again ();
2308 hidden_text = 0; 2351 hidden_text = 0;
2309 } 2352 }
2310 else if (hidden_text) 2353 else if (hidden_text)
2311 fore = back; 2354 fore = back;
2312 } 2355 }
2313#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
2314 } 2375 }
2315 2376
2316 /* 2377 /*
2317 * Actually do the drawing of the string here 2378 * Actually do the drawing of the string here
2318 */ 2379 */
2319 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2380 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2320 2381
2321 if (back == fore) 2382 if (expect_true (have_bg && back == Color_bg))
2322 font->clear_rect (*drawable, xpixel, ypixel,
2323 fwidth * count, fheight,
2324 back);
2325 else if (back == Color_bg)
2326 { 2383 {
2327 if (must_clear) 2384 // this is very ugly, maybe push it into ->draw?
2328 {
2329 CLEAR_CHARS (xpixel, ypixel, count);
2330 2385
2331 for (i = 0; i < count; i++) /* don't draw empty strings */ 2386 for (i = 0; i < count; i++) /* don't draw empty strings */
2332 if (text[i] != ' ') 2387 if (text[i] != ' ')
2333 { 2388 {
2334 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2389 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2335 break; 2390 goto did_clear;
2336 }
2337 } 2391 }
2338 else 2392
2339 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2393 CLEAR_CHARS (xpixel, ypixel, count);
2394 did_clear: ;
2340 } 2395 }
2341 else 2396 else
2342 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2397 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2343 2398
2344 if (rend & RS_Uline && font->descent > 1 && fore != back) 2399 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2345 { 2400 {
2346#if ENABLE_FRILLS 2401#if ENABLE_FRILLS
2347 if (ISSET_PIXCOLOR (Color_underline)) 2402 if (ISSET_PIXCOLOR (Color_underline))
2348 XSetForeground (xdisp, gc, pix_colors[Color_underline]); 2403 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2349 else 2404 else
2350#endif 2405#endif
2351 XSetForeground (xdisp, gc, pix_colors[fore]); 2406 XSetForeground (dpy, gc, pix_colors[fore]);
2352 2407
2353 XDrawLine (xdisp, drawBuffer, gc, 2408 XDrawLine (dpy, vt, gc,
2354 xpixel, ypixel + font->ascent + 1, 2409 xpixel, ypixel + font->ascent + 1,
2355 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2410 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2356 } 2411 }
2357 } /* for (col....) */ 2412 } /* for (col....) */
2358 } /* for (row....) */ 2413 } /* for (row....) */
2359 2414
2360#if ENABLE_OVERLAY
2361 scr_swap_overlay ();
2362#endif
2363 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2364
2365 /* 2415 /*
2366 * G: cleanup cursor and display outline cursor if necessary 2416 * G: cleanup cursor and display outline cursor if necessary
2367 */ 2417 */
2368 if (showcursor) 2418 if (showcursor)
2369 { 2419 {
2370 if (focus) 2420 if (focus)
2371 { 2421 {
2372 if (OPTION (Opt_cursorUnderline)) 2422 if (option (Opt_cursorUnderline))
2373 *crp ^= RS_Uline; 2423 *crp ^= RS_Uline;
2374 else 2424 else
2375 { 2425 {
2376 *crp ^= RS_RVid; 2426 *crp ^= RS_RVid;
2377#ifndef NO_CURSORCOLOR 2427#ifndef NO_CURSORCOLOR
… …
2391 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2441 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2392 cursorwidth++; 2442 cursorwidth++;
2393 2443
2394#ifndef NO_CURSORCOLOR 2444#ifndef NO_CURSORCOLOR
2395 if (ISSET_PIXCOLOR (Color_cursor)) 2445 if (ISSET_PIXCOLOR (Color_cursor))
2396 XSetForeground (xdisp, gc, pix_colors[Color_cursor]); 2446 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2447 else
2397#endif 2448#endif
2449 XSetForeground (dpy, gc, pix_colors[ccol1]);
2398 2450
2399 XDrawRectangle (xdisp, drawBuffer, gc, 2451 XDrawRectangle (dpy, vt, gc,
2400 Col2Pixel (col), 2452 Col2Pixel (col),
2401 Row2Pixel (oldcursor.row), 2453 Row2Pixel (oldcursor.row),
2402 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2454 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2403 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2455 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2404 } 2456 }
2405 } 2457 }
2406 2458
2407 /* 2459 /*
2408 * H: cleanup selection 2460 * H: cleanup selection
2409 */ 2461 */
2462#if ENABLE_OVERLAY
2463 scr_swap_overlay ();
2464#endif
2465 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2466
2410 scr_reverse_selection (); 2467 scr_reverse_selection ();
2411 2468
2469 screen.flags = old_screen_flags;
2412 num_scr = 0; 2470 num_scr = 0;
2413 num_scr_allow = 1; 2471 num_scr_allow = 1;
2414} 2472}
2415 2473
2416void 2474void
… …
2439} 2497}
2440 2498
2441void 2499void
2442rxvt_term::scr_recolour () NOTHROW 2500rxvt_term::scr_recolour () NOTHROW
2443{ 2501{
2444 if (1 2502#ifdef HAVE_BG_PIXMAP
2445#if TRANSPARENT 2503 bgPixmap.apply ();
2446 && !am_transparent 2504#else
2447#endif 2505
2448#if XPM_BACKGROUND
2449 && !bgPixmap.pixmap
2450#endif
2451 )
2452 {
2453 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2506 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2454 XClearWindow (xdisp, parent[0]); 2507 XClearWindow (dpy, parent[0]);
2455 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2508 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2456#if HAVE_SCROLLBARS 2509
2457 if (scrollBar.win) 2510 if (scrollBar.win)
2458 { 2511 {
2459 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2512 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2460 scrollBar.setIdle (); 2513 scrollBar.state = STATE_IDLE;
2461 scrollbar_show (0); 2514 scrollBar.show (0);
2462 }
2463#endif
2464 } 2515 }
2465 2516
2517#endif
2518
2519 /* bgPixmap.apply () does not do the following : */
2466 scr_clear (); 2520 scr_clear ();
2467 scr_touch (true); 2521 scr_touch (true);
2468 want_refresh = 1; 2522 want_refresh = 1;
2469} 2523}
2470 2524
… …
2477 2531
2478 num_scr_allow = 0; 2532 num_scr_allow = 0;
2479 want_refresh = 1; 2533 want_refresh = 1;
2480 2534
2481 if (really) 2535 if (really)
2482 XClearWindow (xdisp, vt); 2536 XClearWindow (dpy, vt);
2483} 2537}
2484 2538
2485void 2539void
2486rxvt_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
2487{ 2541{
… …
2536{ 2590{
2537 if (selection.op 2591 if (selection.op
2538 && current_screen == selection.screen 2592 && current_screen == selection.screen
2539 && selection.end.row >= view_start) 2593 && selection.end.row >= view_start)
2540 { 2594 {
2541#if ENABLE_FRILLS 2595#if !ENABLE_MINIMAL
2542 if (selection.rect) 2596 if (selection.rect)
2543 scr_xor_rect (selection.beg.row, selection.beg.col, 2597 scr_xor_rect (selection.beg.row, selection.beg.col,
2544 selection.end.row, selection.end.col, 2598 selection.end.row, selection.end.col,
2545 RS_RVid, RS_RVid | RS_Uline); 2599 RS_RVid, RS_RVid | RS_Uline);
2546 else 2600 else
… …
2562{ 2616{
2563 int row, wrote; 2617 int row, wrote;
2564 unsigned int width, towrite; 2618 unsigned int width, towrite;
2565 char r1[] = "\n"; 2619 char r1[] = "\n";
2566 2620
2567 for (row = saveLines - nsaved; 2621 for (row = saveLines + top_row;
2568 row < saveLines + nrow - 1; row++) 2622 row < saveLines + nrow - 1; row++)
2569 { 2623 {
2570 width = row_buf[row].l >= 0 ? row_buf[row].l 2624 width = row_buf[row].l >= 0 ? row_buf[row].l
2571 : ncol; 2625 : ncol;
2572 for (towrite = width; towrite; towrite -= wrote) 2626 for (towrite = width; towrite; towrite -= wrote)
… …
2623 /* convert normal newline chars into common keyboard Return key sequence */ 2677 /* convert normal newline chars into common keyboard Return key sequence */
2624 for (unsigned int i = 0; i < len; i++) 2678 for (unsigned int i = 0; i < len; i++)
2625 if (data[i] == C0_LF) 2679 if (data[i] == C0_LF)
2626 data[i] = C0_CR; 2680 data[i] = C0_CR;
2627 2681
2682 if (priv_modes & PrivMode_BracketPaste)
2683 tt_printf ("\e[200~");
2684
2628 tt_write (data, len); 2685 tt_write (data, len);
2686
2687 if (priv_modes & PrivMode_BracketPaste)
2688 tt_printf ("\e[201~");
2629} 2689}
2630 2690
2631/* ------------------------------------------------------------------------- */ 2691/* ------------------------------------------------------------------------- */
2632/* 2692/*
2633 * Respond to a notification that a primary selection has been sent 2693 * Respond to a notification that a primary selection has been sent
… …
2662 } 2722 }
2663 2723
2664 unsigned long bytes_after; 2724 unsigned long bytes_after;
2665 XTextProperty ct; 2725 XTextProperty ct;
2666 2726
2667 if (XGetWindowProperty (xdisp, win, prop, 2727 if (XGetWindowProperty (dpy, win, prop,
2668 0, PROP_SIZE / 4, 2728 0, PROP_SIZE / 4,
2669 delete_prop, AnyPropertyType, 2729 delete_prop, AnyPropertyType,
2670 &ct.encoding, &ct.format, 2730 &ct.encoding, &ct.format,
2671 &ct.nitems, &bytes_after, 2731 &ct.nitems, &bytes_after,
2672 &ct.value) != Success) 2732 &ct.value) != Success)
… …
2681 if (bytes_after) 2741 if (bytes_after)
2682 { 2742 {
2683 // fetch and append remaining data 2743 // fetch and append remaining data
2684 XTextProperty ct2; 2744 XTextProperty ct2;
2685 2745
2686 if (XGetWindowProperty (xdisp, win, prop, 2746 if (XGetWindowProperty (dpy, win, prop,
2687 ct.nitems / 4, (bytes_after + 3) / 4, 2747 ct.nitems / 4, (bytes_after + 3) / 4,
2688 delete_prop, AnyPropertyType, 2748 delete_prop, AnyPropertyType,
2689 &ct2.encoding, &ct2.format, 2749 &ct2.encoding, &ct2.format,
2690 &ct2.nitems, &bytes_after, 2750 &ct2.nitems, &bytes_after,
2691 &ct2.value) != Success) 2751 &ct2.value) != Success)
… …
2704 2764
2705 if (ct.encoding == xa[XA_INCR]) 2765 if (ct.encoding == xa[XA_INCR])
2706 { 2766 {
2707 // INCR selection, start handshake 2767 // INCR selection, start handshake
2708 if (!delete_prop) 2768 if (!delete_prop)
2709 XDeleteProperty (xdisp, win, prop); 2769 XDeleteProperty (dpy, win, prop);
2710 2770
2711 selection_wait = Sel_incr; 2771 selection_wait = Sel_incr;
2712 incr_buf_fill = 0; 2772 incr_buf_fill = 0;
2713 incr_ev.start (NOW + 10); 2773 incr_ev.start (10);
2714 2774
2715 goto bailout; 2775 goto bailout;
2716 } 2776 }
2717 2777
2718 if (ct.nitems == 0) 2778 if (ct.nitems == 0)
… …
2727 ct.nitems = incr_buf_fill; 2787 ct.nitems = incr_buf_fill;
2728 incr_buf = 0; 2788 incr_buf = 0;
2729 incr_buf_size = 0; 2789 incr_buf_size = 0;
2730 incr_ev.stop (); 2790 incr_ev.stop ();
2731 } 2791 }
2732 else 2792 else
2733 { 2793 {
2734 if (selection_wait == Sel_normal 2794 if (selection_wait == Sel_normal
2735 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2795 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2736 { 2796 {
2737 /* 2797 /*
… …
2744 goto bailout; 2804 goto bailout;
2745 } 2805 }
2746 } 2806 }
2747 else if (selection_wait == Sel_incr) 2807 else if (selection_wait == Sel_incr)
2748 { 2808 {
2749 incr_ev.start (NOW + 10); 2809 incr_ev.start (10);
2750 2810
2751 while (incr_buf_fill + ct.nitems > incr_buf_size) 2811 while (incr_buf_fill + ct.nitems > incr_buf_size)
2752 { 2812 {
2753 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;
2754 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2814 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2761 } 2821 }
2762 2822
2763 char **cl; 2823 char **cl;
2764 int cr; 2824 int cr;
2765 2825
2766#if ENABLE_FRILLS 2826#if !ENABLE_MINIMAL
2767 // 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
2768 // so recode it manually 2828 // so recode it manually
2769 if (ct.encoding == xa[XA_UTF8_STRING]) 2829 if (ct.encoding == xa[XA_UTF8_STRING])
2770 { 2830 {
2771 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2831 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2775 paste (s, strlen (s)); 2835 paste (s, strlen (s));
2776 free (s); 2836 free (s);
2777 } 2837 }
2778 else 2838 else
2779#endif 2839#endif
2780 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 2840 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2781 && cl) 2841 && cl)
2782 { 2842 {
2783 for (int i = 0; i < cr; i++) 2843 for (int i = 0; i < cr; i++)
2784 paste (cl[i], strlen (cl[i])); 2844 paste (cl[i], strlen (cl[i]));
2785 2845
… …
2794 if (selection_wait == Sel_normal) 2854 if (selection_wait == Sel_normal)
2795 selection_wait = Sel_none; 2855 selection_wait = Sel_none;
2796} 2856}
2797 2857
2798void 2858void
2799rxvt_term::incr_cb (time_watcher &w) NOTHROW 2859rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2800{ 2860{
2801 selection_wait = Sel_none; 2861 selection_wait = Sel_none;
2802 2862
2803 incr_buf_size = 0; 2863 incr_buf_size = 0;
2804 free (incr_buf); 2864 free (incr_buf);
… …
2815 selection_paste (win, prop, true); 2875 selection_paste (win, prop, true);
2816} 2876}
2817 2877
2818/* ------------------------------------------------------------------------- */ 2878/* ------------------------------------------------------------------------- */
2819/* 2879/*
2820 * Request the current selection: 2880 * Request the current selection:
2821 * Order: > internal selection if available 2881 * Order: > internal selection if available
2822 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2882 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2823 * > CUT_BUFFER0 2883 * > CUT_BUFFER0
2824 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2884 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2825 * will auto fallback to CUT_BUFFER0 2885 * will auto fallback to CUT_BUFFER0
… …
2827 */ 2887 */
2828void 2888void
2829rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2889rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2830{ 2890{
2831 if (selection.text && selnum == Sel_Primary) 2891 if (selection.text && selnum == Sel_Primary)
2892 {
2832 { /* internal selection */ 2893 /* internal selection */
2833 char *str = rxvt_wcstombs (selection.text, selection.len); 2894 char *str = rxvt_wcstombs (selection.text, selection.len);
2834 paste (str, strlen (str)); 2895 paste (str, strlen (str));
2835 free (str); 2896 free (str);
2836 return; 2897 return;
2837 } 2898 }
… …
2867 else if (selnum == Sel_Secondary) 2928 else if (selnum == Sel_Secondary)
2868 sel = XA_SECONDARY; 2929 sel = XA_SECONDARY;
2869 else 2930 else
2870 sel = xa[XA_CLIPBOARD]; 2931 sel = xa[XA_CLIPBOARD];
2871 2932
2872 if (XGetSelectionOwner (xdisp, sel) != None) 2933 if (XGetSelectionOwner (dpy, sel) != None)
2873 { 2934 {
2874 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], 2935 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2875 vt, selection_request_time); 2936 vt, selection_request_time);
2876 return 1; 2937 return 1;
2877 } 2938 }
2878 2939
2879 return 0; 2940 return 0;
… …
2942 3003
2943 int end_col; 3004 int end_col;
2944 3005
2945 for (; row <= selection.end.row; row++, col = 0) 3006 for (; row <= selection.end.row; row++, col = 0)
2946 { 3007 {
2947#if ENABLE_FRILLS 3008#if !ENABLE_MINIMAL
2948 if (selection.rect) 3009 if (selection.rect)
2949 { 3010 {
2950 col = selection.beg.col; 3011 col = selection.beg.col;
2951 end_col = ncol + 1; 3012 end_col = ncol + 1;
2952 } 3013 }
… …
2955 end_col = ROW(row).l; 3016 end_col = ROW(row).l;
2956 3017
2957 col = max (col, 0); 3018 col = max (col, 0);
2958 3019
2959 if (row == selection.end.row 3020 if (row == selection.end.row
2960#if ENABLE_FRILLS 3021#if !ENABLE_MINIMAL
2961 || selection.rect 3022 || selection.rect
2962#endif 3023#endif
2963 ) 3024 )
2964 min_it (end_col, selection.end.col); 3025 min_it (end_col, selection.end.col);
2965 3026
… …
2988#endif 3049#endif
2989 else 3050 else
2990 new_selection_text[ofs++] = *t++; 3051 new_selection_text[ofs++] = *t++;
2991 } 3052 }
2992 3053
2993#if ENABLE_FRILLS 3054#if !ENABLE_MINIMAL
2994 if (selection.rect) 3055 if (selection.rect)
2995 { 3056 {
2996 while (ofs 3057 while (ofs
2997 && new_selection_text[ofs - 1] != C0_LF 3058 && new_selection_text[ofs - 1] != C0_LF
2998 && unicode::is_space (new_selection_text[ofs - 1])) 3059 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3032bool 3093bool
3033rxvt_term::selection_grab (Time tm) NOTHROW 3094rxvt_term::selection_grab (Time tm) NOTHROW
3034{ 3095{
3035 selection_time = tm; 3096 selection_time = tm;
3036 3097
3037 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); 3098 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3038 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) 3099 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3039 { 3100 {
3040 display->set_selection_owner (this); 3101 display->set_selection_owner (this);
3041 return true; 3102 return true;
3042 } 3103 }
3043 else 3104 else
… …
3047 } 3108 }
3048 3109
3049#if 0 3110#if 0
3050 XTextProperty ct; 3111 XTextProperty ct;
3051 3112
3052 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 3113 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3053 { 3114 {
3054 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3115 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3055 XFree (ct.value); 3116 XFree (ct.value);
3056 } 3117 }
3057#endif 3118#endif
… …
3103 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3164 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3104 3165
3105 while (selection.mark.col > 0 3166 while (selection.mark.col > 0
3106 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3167 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3107 --selection.mark.col; 3168 --selection.mark.col;
3108 3169
3109 if (selection.op) 3170 if (selection.op)
3171 {
3110 { /* clear the old selection */ 3172 /* clear the old selection */
3111 selection.beg.row = selection.end.row = selection.mark.row; 3173 selection.beg.row = selection.end.row = selection.mark.row;
3112 selection.beg.col = selection.end.col = selection.mark.col; 3174 selection.beg.col = selection.end.col = selection.mark.col;
3113 } 3175 }
3114 3176
3115 selection.op = SELECTION_INIT; 3177 selection.op = SELECTION_INIT;
… …
3304 * 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
3305 * 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
3306 * time of the most recent button3 press 3368 * time of the most recent button3 press
3307 */ 3369 */
3308 if (button3 && buttonpress) 3370 if (button3 && buttonpress)
3371 {
3309 { /* button3 press */ 3372 /* button3 press */
3310 /* 3373 /*
3311 * first determine which edge of the selection we are closest to 3374 * first determine which edge of the selection we are closest to
3312 */ 3375 */
3313 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3376 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3314 || (!ROWCOL_IS_AFTER (pos, selection.end) 3377 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3332 selection.mark.row = selection.beg.row; 3395 selection.mark.row = selection.beg.row;
3333 selection.mark.col = selection.beg.col; 3396 selection.mark.col = selection.beg.col;
3334 } 3397 }
3335 } 3398 }
3336 else 3399 else
3400 {
3337 { /* button1 drag or button3 drag */ 3401 /* button1 drag or button3 drag */
3338 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3402 if (ROWCOL_IS_AFTER (selection.mark, pos))
3339 { 3403 {
3340 if (selection.mark.row == selection.end.row 3404 if (selection.mark.row == selection.end.row
3341 && selection.mark.col == selection.end.col 3405 && selection.mark.col == selection.end.col
3342 && clickchange 3406 && clickchange
… …
3359 3423
3360 if (selection.clicks == 1) 3424 if (selection.clicks == 1)
3361 { 3425 {
3362 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
3363 && !ROW(selection.beg.row).is_longer () 3427 && !ROW(selection.beg.row).is_longer ()
3364#if ENABLE_FRILLS 3428#if !ENABLE_MINIMAL
3365 && !selection.rect 3429 && !selection.rect
3366#endif 3430#endif
3367 ) 3431 )
3368 selection.beg.col = ncol; 3432 selection.beg.col = ncol;
3369 3433
3370 if ( 3434 if (
3371 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3435 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3372 && !ROW(selection.end.row).is_longer () 3436 && !ROW(selection.end.row).is_longer ()
3373#if ENABLE_FRILLS 3437#if !ENABLE_MINIMAL
3374 && !selection.rect 3438 && !selection.rect
3375#endif 3439#endif
3376 ) 3440 )
3377 selection.end.col = ncol; 3441 selection.end.col = ncol;
3378 } 3442 }
… …
3385 selection_delimit_word (DN, &selection.end, &selection.end); 3449 selection_delimit_word (DN, &selection.end, &selection.end);
3386 } 3450 }
3387 else if (selection.clicks == 3) 3451 else if (selection.clicks == 3)
3388 { 3452 {
3389#if ENABLE_FRILLS 3453#if ENABLE_FRILLS
3390 if (OPTION (Opt_tripleclickwords)) 3454 if (option (Opt_tripleclickwords))
3391 { 3455 {
3392 selection_delimit_word (UP, &selection.beg, &selection.beg); 3456 selection_delimit_word (UP, &selection.beg, &selection.beg);
3393 3457
3394 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++)
3395 { 3459 {
3396 if (!ROW(end_row).is_longer ()) 3460 if (!ROW(end_row).is_longer ())
3397 { 3461 {
3398 selection.end.row = end_row; 3462 selection.end.row = end_row;
3399 selection.end.col = ROW(end_row).l; 3463 selection.end.col = ROW(end_row).l;
3464# if !ENABLE_MINIMAL
3400 selection_remove_trailing_spaces (); 3465 selection_remove_trailing_spaces ();
3466# endif
3401 break; 3467 break;
3402 } 3468 }
3403 } 3469 }
3404 } 3470 }
3405 else 3471 else
… …
3421 selection.end.row++; 3487 selection.end.row++;
3422 } 3488 }
3423 } 3489 }
3424 3490
3425 if (button3 && buttonpress) 3491 if (button3 && buttonpress)
3492 {
3426 { /* mark may need to be changed */ 3493 /* mark may need to be changed */
3427 if (closeto == LEFT) 3494 if (closeto == LEFT)
3428 { 3495 {
3429 selection.mark.row = selection.end.row; 3496 selection.mark.row = selection.end.row;
3430 selection.mark.col = selection.end.col - (selection.clicks == 2); 3497 selection.mark.col = selection.end.col - (selection.clicks == 2);
3431 } 3498 }
… …
3434 selection.mark.row = selection.beg.row; 3501 selection.mark.row = selection.beg.row;
3435 selection.mark.col = selection.beg.col; 3502 selection.mark.col = selection.beg.col;
3436 } 3503 }
3437 } 3504 }
3438 3505
3439#if ENABLE_FRILLS 3506#if !ENABLE_MINIMAL
3440 if (selection.rect && selection.beg.col > selection.end.col) 3507 if (selection.rect && selection.beg.col > selection.end.col)
3441 ::swap (selection.beg.col, selection.end.col); 3508 ::swap (selection.beg.col, selection.end.col);
3442#endif 3509#endif
3443} 3510}
3444 3511
3445#if ENABLE_FRILLS 3512#if !ENABLE_MINIMAL
3446void 3513void
3447rxvt_term::selection_remove_trailing_spaces () NOTHROW 3514rxvt_term::selection_remove_trailing_spaces () NOTHROW
3448{ 3515{
3449 int32_t end_col, end_row; 3516 int32_t end_col, end_row;
3450 text_t *stp; 3517 text_t *stp;
… …
3528 *target++ = xa[XA_COMPOUND_TEXT]; 3595 *target++ = xa[XA_COMPOUND_TEXT];
3529#if X_HAVE_UTF8_STRING 3596#if X_HAVE_UTF8_STRING
3530 *target++ = xa[XA_UTF8_STRING]; 3597 *target++ = xa[XA_UTF8_STRING];
3531#endif 3598#endif
3532 3599
3533 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3600 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3534 32, PropModeReplace, 3601 32, PropModeReplace,
3535 (unsigned char *)target_list, target - target_list); 3602 (unsigned char *)target_list, target - target_list);
3536 ev.property = rq.property; 3603 ev.property = rq.property;
3537 } 3604 }
3538#if TODO // TODO 3605#if TODO // TODO
… …
3541 /* TODO: Handle MULTIPLE */ 3608 /* TODO: Handle MULTIPLE */
3542 } 3609 }
3543#endif 3610#endif
3544 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3611 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3545 { 3612 {
3546 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3613 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3547 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3614 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3548 ev.property = rq.property; 3615 ev.property = rq.property;
3549 } 3616 }
3550 else if (rq.target == XA_STRING 3617 else if (rq.target == XA_STRING
3551 || rq.target == xa[XA_TEXT] 3618 || rq.target == xa[XA_TEXT]
… …
3575 style = enc_string; 3642 style = enc_string;
3576 else if (target == xa[XA_TEXT]) 3643 else if (target == xa[XA_TEXT])
3577 style = enc_text; 3644 style = enc_text;
3578 else if (target == xa[XA_COMPOUND_TEXT]) 3645 else if (target == xa[XA_COMPOUND_TEXT])
3579 style = enc_compound_text; 3646 style = enc_compound_text;
3580#if ENABLE_FRILLS 3647#if !ENABLE_MINIMAL
3581 else if (target == xa[XA_UTF8_STRING]) 3648 else if (target == xa[XA_UTF8_STRING])
3582 style = enc_utf8; 3649 style = enc_utf8;
3583#endif 3650#endif
3584 else 3651 else
3585 { 3652 {
… …
3596 { 3663 {
3597 cl = L""; 3664 cl = L"";
3598 selectlen = 0; 3665 selectlen = 0;
3599 } 3666 }
3600 3667
3601#if ENABLE_FRILLS 3668#if !ENABLE_MINIMAL
3602 // 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
3603 // so recode it manually 3670 // so recode it manually
3604 if (style == enc_utf8) 3671 if (style == enc_utf8)
3605 { 3672 {
3606 freect = 1; 3673 freect = 1;
… …
3609 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3676 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3610 ct.nitems = strlen ((char *)ct.value); 3677 ct.nitems = strlen ((char *)ct.value);
3611 } 3678 }
3612 else 3679 else
3613#endif 3680#endif
3614 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3681 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3615 freect = 1; 3682 freect = 1;
3616 else 3683 else
3617 { 3684 {
3618 /* if we failed to convert then send it raw */ 3685 /* if we failed to convert then send it raw */
3619 ct.value = (unsigned char *)cl; 3686 ct.value = (unsigned char *)cl;
3620 ct.nitems = selectlen; 3687 ct.nitems = selectlen;
3621 ct.encoding = target; 3688 ct.encoding = target;
3622 } 3689 }
3623 3690
3624 XChangeProperty (xdisp, rq.requestor, rq.property, 3691 XChangeProperty (dpy, rq.requestor, rq.property,
3625 ct.encoding, 8, PropModeReplace, 3692 ct.encoding, 8, PropModeReplace,
3626 ct.value, (int)ct.nitems); 3693 ct.value, (int)ct.nitems);
3627 ev.property = rq.property; 3694 ev.property = rq.property;
3628 3695
3629 if (freect) 3696 if (freect)
3630 XFree (ct.value); 3697 XFree (ct.value);
3631 } 3698 }
3632 3699
3633 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3700 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3634}
3635
3636/* ------------------------------------------------------------------------- *
3637 * MOUSE ROUTINES *
3638 * ------------------------------------------------------------------------- */
3639
3640/*
3641 * return col/row values corresponding to x/y pixel values
3642 */
3643void
3644rxvt_term::pixel_position (int *x, int *y) NOTHROW
3645{
3646 *x = Pixel2Col (*x);
3647 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3648 *y = Pixel2Row (*y);
3649 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3650} 3701}
3651 3702
3652/* ------------------------------------------------------------------------- */ 3703/* ------------------------------------------------------------------------- */
3653#ifdef USE_XIM 3704#ifdef USE_XIM
3654void 3705void
3655rxvt_term::im_set_position (XPoint &pos) NOTHROW 3706rxvt_term::im_set_position (XPoint &pos) NOTHROW
3656{ 3707{
3657 XWindowAttributes xwa; 3708 XWindowAttributes xwa;
3658 3709
3659 XGetWindowAttributes (xdisp, vt, &xwa); 3710 XGetWindowAttributes (dpy, vt, &xwa);
3660 3711
3661 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3712 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3662 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3713 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3663} 3714}
3664#endif 3715#endif
… …
3682 h += 2; min_it (h, nrow); 3733 h += 2; min_it (h, nrow);
3683 3734
3684 x -= 1; clamp_it (x, 0, ncol - w); 3735 x -= 1; clamp_it (x, 0, ncol - w);
3685 y -= 1; clamp_it (y, 0, nrow - h); 3736 y -= 1; clamp_it (y, 0, nrow - h);
3686 3737
3687 ov_x = x; ov_y = y; 3738 ov.x = x; ov.y = y;
3688 ov_w = w; ov_h = h; 3739 ov.w = w; ov.h = h;
3689 3740
3690 ov_text = new text_t *[h]; 3741 ov.text = new text_t *[h];
3691 ov_rend = new rend_t *[h]; 3742 ov.rend = new rend_t *[h];
3692 3743
3693 for (y = 0; y < h; y++) 3744 for (y = 0; y < h; y++)
3694 { 3745 {
3695 text_t *tp = ov_text[y] = new text_t[w]; 3746 text_t *tp = ov.text[y] = new text_t[w];
3696 rend_t *rp = ov_rend[y] = new rend_t[w]; 3747 rend_t *rp = ov.rend[y] = new rend_t[w];
3697 3748
3698 text_t t0, t1, t2; 3749 text_t t0, t1, t2;
3699 rend_t r = OVERLAY_RSTYLE; 3750 rend_t r = OVERLAY_RSTYLE;
3700 3751
3701 if (y == 0) 3752 if (y == 0)
… …
3720} 3771}
3721 3772
3722void 3773void
3723rxvt_term::scr_overlay_off () NOTHROW 3774rxvt_term::scr_overlay_off () NOTHROW
3724{ 3775{
3725 if (!ov_text) 3776 if (!ov.text)
3726 return; 3777 return;
3727 3778
3728 want_refresh = 1; 3779 want_refresh = 1;
3729 3780
3730 for (int y = 0; y < ov_h; y++) 3781 for (int y = 0; y < ov.h; y++)
3731 { 3782 {
3732 delete [] ov_text[y]; 3783 delete [] ov.text[y];
3733 delete [] ov_rend[y]; 3784 delete [] ov.rend[y];
3734 } 3785 }
3735 3786
3736 delete [] ov_text; ov_text = 0; 3787 delete [] ov.text; ov.text = 0;
3737 delete [] ov_rend; ov_rend = 0; 3788 delete [] ov.rend; ov.rend = 0;
3738} 3789}
3739 3790
3740void 3791void
3741rxvt_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
3742{ 3793{
3743 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3794 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3744 return; 3795 return;
3745 3796
3746 x++, y++; 3797 x++, y++;
3747 3798
3748 ov_text[y][x] = text; 3799 ov.text[y][x] = text;
3749 ov_rend[y][x] = rend; 3800 ov.rend[y][x] = rend;
3750} 3801}
3751 3802
3752void 3803void
3753rxvt_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
3754{ 3805{
… …
3773} 3824}
3774 3825
3775void 3826void
3776rxvt_term::scr_swap_overlay () NOTHROW 3827rxvt_term::scr_swap_overlay () NOTHROW
3777{ 3828{
3778 if (!ov_text) 3829 if (!ov.text)
3779 return; 3830 return;
3780 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
3781 // swap screen mem with overlay 3837 // swap screen mem with overlay
3782 for (int y = ov_h; y--; ) 3838 for (int y = ov.h; y--; )
3783 { 3839 {
3784 text_t *t1 = ov_text[y]; 3840 text_t *t1 = ov.text[y];
3785 rend_t *r1 = ov_rend[y]; 3841 rend_t *r1 = ov.rend[y];
3786 3842
3787 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;
3788 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;
3789 3845
3790 for (int x = ov_w; x--; ) 3846 for (int x = ov.w; x--; )
3791 { 3847 {
3792 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3848 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3793 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));
3794 } 3850 }
3795 } 3851 }

Diff Legend

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