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.368 by sf-exg, Tue Feb 1 00:41:01 2011 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 separate compile!
36 34
35static inline void
37inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
38{ 37{
39 while (len--) 38 while (len--)
40 *start++ = value; 39 *start++ = value;
41} 40}
42 41
… …
47 46
48/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 50#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 51 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 52 view_start = 0
54#define CLEAR_SELECTION() \ 53#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 54 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 55 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 56#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 84 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) \ 85#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) 86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 87
89/* 88/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 89 * 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 */ 90 */
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) \ 91#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 92 if (mapped) \
104 XClearArea (xdisp, drawBuffer, x, y, \ 93 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 94 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 95 (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 96
114/* ------------------------------------------------------------------------- * 97/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 98 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 99 * ------------------------------------------------------------------------- */
117 100
… …
126 width = ncol; 109 width = ncol;
127 } 110 }
128 111
129 l.touch (); 112 l.touch ();
130 113
131 efs &= ~RS_baseattrMask; 114 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 115 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 116
134 text_t *et = l.t + col; 117 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 118 rend_t *er = l.r + col;
136 119
… …
148{ 131{
149 scr_blank_line (l, 0, ncol, efs); 132 scr_blank_line (l, 0, ncol, efs);
150 133
151 l.l = 0; 134 l.l = 0;
152 l.f = 0; 135 l.f = 0;
136}
137
138// nuke a single wide character at the given column
139void
140rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
141{
142 // find begin
143 while (col > 0 && l.t[col] == NOCHAR)
144 col--;
145
146 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148
149 l.touch ();
150
151 // found start, nuke
152 do {
153 l.t[col] = ' ';
154 l.r[col] = rend;
155 col++;
156 } while (col < ncol && l.t[col] == NOCHAR);
153} 157}
154 158
155/* ------------------------------------------------------------------------- * 159/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 160 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 161 * ------------------------------------------------------------------------- */
158 162
159void 163void
160rxvt_term::scr_reset () 164rxvt_term::scr_reset ()
161{ 165{
162#if ENABLE_OVERLAY
163 scr_overlay_off ();
164#endif
165
166 view_start = 0; 166 view_start = 0;
167 num_scr = 0; 167 num_scr = 0;
168 168
169 if (ncol == 0) 169 if (ncol == 0)
170 ncol = 80; 170 ncol = 80;
… …
172 if (nrow == 0) 172 if (nrow == 0)
173 nrow = 24; 173 nrow = 24;
174 174
175 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 176 return;
177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180 177
181 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
182 while (nrow + saveLines < 2) 179 while (nrow + saveLines < 2)
183 { 180 {
184 //TODO//FIXME 181 //TODO//FIXME
… …
237 selection.text = NULL; 234 selection.text = NULL;
238 selection.len = 0; 235 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
241 selection.clicks = 0; 238 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false; 239 selection.clip_text = NULL;
240 selection.clip_len = 0;
243 } 241 }
244 else 242 else
245 { 243 {
246 /* 244 /*
247 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 275 }
278 276
279 line_t *old_buf = row_buf; 277 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 279
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
285 283
286 if (top_row) 284 if (top_row)
287 { 285 {
288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
288 // TODO: maybe optimise when width didn't change
290 289
291 row_col_t ocur = screen.cur; 290 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 291 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293 292
294 do 293 do
295 { 294 {
296 p = MOD (p - 1, prev_total_rows); 295 p = MOD (p - 1, prev_total_rows);
297#ifdef DEBUG_STRICT
298 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
299#endif
300 int plines = 1; 297 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l; 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
302 299
303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
304 { 301 {
… …
330 int qcol = 0; 327 int qcol = 0;
331 328
332 // see below for cursor adjustment rationale 329 // see below for cursor adjustment rationale
333 if (p == ocur.row) 330 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 331 screen.cur.row = q - (total_rows - nrow);
335 332
336 // fill a single destination line 333 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 334 while (lofs < llen && qcol < ncol)
338 { 335 {
339 int prow = lofs / prev_ncol; 336 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 337 int pcol = lofs % prev_ncol;
… …
366 } 363 }
367 while (p != pend && q > 0); 364 while (p != pend && q > 0);
368 365
369 term_start = total_rows - nrow; 366 term_start = total_rows - nrow;
370 top_row = q - term_start; 367 top_row = q - term_start;
371 368
372 // make sure all terminal lines exist 369 // make sure all terminal lines exist
373 while (top_row > 0) 370 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 371 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 372 }
376 else 373 else
377 { 374 {
378 // if no scrollback exists (yet), wing, instead of wrap 375 // if no scrollback exists (yet), wing, instead of wrap
379 376
380 for (int row = min (nrow, prev_nrow); row--; ) 377 for (int row = min (nrow, prev_nrow); row--; )
381 { 378 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 380 line_t &qline = row_buf [row];
384 381
… …
398 delete old_ta; 395 delete old_ta;
399 delete old_ra; 396 delete old_ra;
400 397
401 clamp_it (screen.cur.row, 0, nrow - 1); 398 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1); 399 clamp_it (screen.cur.col, 0, ncol - 1);
400 }
403 401
404 free (tabs); 402 free (tabs);
405 } 403 tabs = (char *)rxvt_malloc (ncol);
404
405 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0;
406 407
407 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
408 409
409 prev_nrow = nrow; 410 prev_nrow = nrow;
410 prev_ncol = ncol; 411 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 412
420 tt_winch (); 413 tt_winch ();
421 414
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 415 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 416}
… …
435 delete ralloc; ralloc = 0; 428 delete ralloc; ralloc = 0;
436 429
437 free (row_buf); 430 free (row_buf);
438 free (swap_buf); 431 free (swap_buf);
439 free (drawn_buf); 432 free (drawn_buf);
433 row_buf = 0; // signal that we freed all the arrays above
434
440 free (tabs); 435 free (tabs);
441 436 tabs = 0;
442 row_buf = 0; // signal that we freed all the arrays
443 } 437 }
444} 438}
445 439
446/* ------------------------------------------------------------------------- */ 440/* ------------------------------------------------------------------------- */
447/* 441/*
448 * Hard reset 442 * Hard/Soft reset
449 */ 443 */
450void 444void
451rxvt_term::scr_poweron () 445rxvt_term::scr_poweron ()
452{ 446{
453 scr_release (); 447 scr_release ();
454 prev_nrow = prev_ncol = 0; 448 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false;
450 scr_soft_reset ();
455 scr_reset (); 451 scr_reset ();
456 452
457 scr_clear (true); 453 scr_clear (true);
458 scr_refresh (); 454 scr_refresh ();
455}
456
457void
458rxvt_term::scr_soft_reset ()
459{
460 /* only affects modes, nothing drastic such as clearing the screen */
461#if ENABLE_OVERLAY
462 scr_overlay_off ();
463#endif
464
465 if (current_screen != PRIMARY)
466 scr_swap_screen ();
467
468 scr_scroll_region (0, MAX_ROWS - 1);
469 scr_rendition (0, ~RS_None);
470 scr_insert_mode (0);
459} 471}
460 472
461/* ------------------------------------------------------------------------- * 473/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 474 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 475 * ------------------------------------------------------------------------- */
… …
501 } 513 }
502 514
503 /* boundary check in case screen size changed between SAVE and RESTORE */ 515 /* boundary check in case screen size changed between SAVE and RESTORE */
504 min_it (s->cur.row, nrow - 1); 516 min_it (s->cur.row, nrow - 1);
505 min_it (s->cur.col, ncol - 1); 517 min_it (s->cur.col, ncol - 1);
506#ifdef DEBUG_STRICT
507 assert (s->cur.row >= 0); 518 assert (s->cur.row >= 0);
508 assert (s->cur.col >= 0); 519 assert (s->cur.col >= 0);
509#endif
510} 520}
511 521
512void 522void
513rxvt_term::scr_swap_screen () 523rxvt_term::scr_swap_screen ()
514{ 524{
515 if (!OPTION (Opt_secondaryScreen)) 525 if (!option (Opt_secondaryScreen))
516 return; 526 return;
517 527
518 for (int i = prev_nrow; i--; ) 528 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 529 ::swap (ROW(i), swap_buf [i]);
520 530
… …
539 want_refresh = 1; 549 want_refresh = 1;
540 view_start = 0; 550 view_start = 0;
541 551
542 selection_check (2); /* check for boundary cross */ 552 selection_check (2); /* check for boundary cross */
543 553
544 int i = current_screen; current_screen = scrn; scrn = i; 554 current_screen = scrn;
545 555
546#if NSCREENS 556#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 557 if (option (Opt_secondaryScreen))
548 { 558 {
549 num_scr = 0; 559 num_scr = 0;
550 560
551 scr_swap_screen (); 561 scr_swap_screen ();
552 562
… …
555 screen.flags |= Screen_VisibleCursor; 565 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 566 swap.flags |= Screen_VisibleCursor;
557 } 567 }
558 else 568 else
559#endif 569#endif
560 if (OPTION (Opt_secondaryScroll)) 570 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 571 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 572}
563 573
564// clear WrapNext indicator, solidifying position on next line 574// clear WrapNext indicator, solidifying position on next line
565void 575void
… …
598/* 608/*
599 * Change the rendition style for following text 609 * Change the rendition style for following text
600 */ 610 */
601void 611void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 612rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 613{
604 if (set) 614 if (set)
605 rstyle |= style; 615 rstyle |= style;
606 else if (style == ~RS_None) 616 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 617 rstyle = DEFAULT_RSTYLE;
608 else 618 else
609 rstyle &= ~style; 619 rstyle &= ~style;
610 } 620}
611 621
612/* ------------------------------------------------------------------------- */ 622/* ------------------------------------------------------------------------- */
613/* 623/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 624 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 625 * count positive ==> scroll up
… …
624 want_refresh = 1; 634 want_refresh = 1;
625 num_scr += count; 635 num_scr += count;
626 636
627 if (count > 0 637 if (count > 0
628 && row1 == 0 638 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 639 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 640 {
631 top_row = max (top_row - count, -saveLines); 641 top_row = max (top_row - count, -saveLines);
632 642
633 // scroll everything up 'count' lines 643 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 644 term_start = (term_start + count) % total_rows;
… …
640 l.touch (); 650 l.touch ();
641 } 651 }
642 652
643 // erase newly scrolled-in lines 653 // erase newly scrolled-in lines
644 for (int i = count; i--; ) 654 for (int i = count; i--; )
655 {
656 line_t &l = ROW(nrow - 1 - i);
657
658 // optimize if already cleared, can be significant on slow machines
659 // could be rolled into scr_blank_screen_mem
660 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
661 {
662 scr_blank_line (l, 0, l.l, rstyle);
663 l.l = 0;
664 l.f = 0;
665 }
666 else
645 scr_blank_screen_mem (ROW(nrow - 1 - i), rstyle); 667 scr_blank_screen_mem (l, rstyle);
668 }
646 669
647 // now copy lines below the scroll region bottom to the 670 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 671 // bottom of the screen again, so they look as if they
649 // hadn't moved. 672 // hadn't moved.
650 for (int i = nrow; --i > row2; ) 673 for (int i = nrow; --i > row2; )
… …
653 line_t &l2 = ROW(i); 676 line_t &l2 = ROW(i);
654 677
655 ::swap (l1, l2); 678 ::swap (l1, l2);
656 l2.touch (); 679 l2.touch ();
657 } 680 }
658 681
659 // move and/or clear selection, if any 682 // move and/or clear selection, if any
660 if (selection.op && current_screen == selection.screen) 683 if (selection.op && current_screen == selection.screen)
661 { 684 {
662 selection.beg.row -= count; 685 selection.beg.row -= count;
663 selection.end.row -= count; 686 selection.end.row -= count;
… …
671 selection.op = SELECTION_CLEAR; 694 selection.op = SELECTION_CLEAR;
672 } 695 }
673 } 696 }
674 697
675 // finally move the view window, if desired 698 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 699 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 700 && view_start != 0
678 && view_start != -saveLines) 701 && view_start != -saveLines)
679 scr_page (UP, count); 702 scr_page (UP, count);
680 703
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 704 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
699 { 722 {
700 /* move selected region too */ 723 /* move selected region too */
701 selection.beg.row -= count; 724 selection.beg.row -= count;
702 selection.end.row -= count; 725 selection.end.row -= count;
703 selection.mark.row -= count; 726 selection.mark.row -= count;
704 727
705 selection_check (0); 728 selection_check (0);
706 } 729 }
707 } 730 }
708 731
709 // use a simple and robust scrolling algorithm, this 732 // use a simple and robust scrolling algorithm, this
… …
761 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
762 screen.cur.row -= minlines; 785 screen.cur.row -= minlines;
763 } 786 }
764 } 787 }
765 788
766#ifdef DEBUG_STRICT
767 assert (screen.cur.col < ncol); 789 assert (screen.cur.col < ncol);
768 assert (screen.cur.row < nrow 790 assert (screen.cur.row < nrow
769 && screen.cur.row >= top_row); 791 && screen.cur.row >= top_row);
770#endif
771 int row = screen.cur.row; 792 int row = screen.cur.row;
772 793
773 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 794 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
774 795
775 line_t *line = &ROW(row); 796 line_t *line = &ROW(row);
776 797
777 while (str < strend) 798 while (str < strend)
778 { 799 {
779 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 800 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
780 801
781 if (c < 0x20) 802 if (expect_false (c < 0x20))
782 if (c == C0_LF) 803 if (c == C0_LF)
783 { 804 {
784 max_it (line->l, screen.cur.col); 805 max_it (line->l, screen.cur.col);
785 806
786 screen.flags &= ~Screen_WrapNext; 807 screen.flags &= ~Screen_WrapNext;
… …
805 { 826 {
806 scr_tab (1, true); 827 scr_tab (1, true);
807 continue; 828 continue;
808 } 829 }
809 830
831 if (expect_false (
810 if (checksel /* see if we're writing within selection */ 832 checksel /* see if we're writing within selection */
811 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 833 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
812 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 834 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
835 ))
813 { 836 {
814 checksel = 0; 837 checksel = 0;
815 /* 838 /*
816 * If we wrote anywhere in the selected area, kill the selection 839 * If we wrote anywhere in the selected area, kill the selection
817 * XXX: should we kill the mark too? Possibly, but maybe that 840 * XXX: should we kill the mark too? Possibly, but maybe that
818 * should be a similar check. 841 * should be a similar check.
819 */ 842 */
820 CLEAR_SELECTION (); 843 CLEAR_SELECTION ();
821 } 844 }
822 845
823 if (screen.flags & Screen_WrapNext) 846 if (expect_false (screen.flags & Screen_WrapNext))
824 { 847 {
825 scr_do_wrap (); 848 scr_do_wrap ();
826 849
827 line->l = ncol; 850 line->l = ncol;
828 line->is_longer (1); 851 line->is_longer (1);
829 852
830 row = screen.cur.row; 853 row = screen.cur.row;
831 line = &ROW(row); /* _must_ refresh */ 854 line = &ROW(row); /* _must_ refresh */
832 } 855 }
833 856
834 // some utf-8 decoders "decode" surrogate characters: let's fix this. 857 // some utf-8 decoders "decode" surrogate characters: let's fix this.
835 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 858 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
836 c = 0xfffd; 859 c = 0xfffd;
837 860
838 // rely on wcwidth to tell us the character width, do wcwidth before 861 // rely on wcwidth to tell us the character width, do wcwidth before
839 // further replacements, as wcwidth might return -1 for the line 862 // further replacements, as wcwidth might return -1 for the line
840 // drawing characters below as they might be invalid in the current 863 // drawing characters below as they might be invalid in the current
841 // locale. 864 // locale.
842 int width = WCWIDTH (c); 865 int width = WCWIDTH (c);
843 866
844 if (charsets [screen.charset] == '0') // DEC SPECIAL 867 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
845 { 868 {
846 // vt100 special graphics and line drawing 869 // vt100 special graphics and line drawing
847 // 5f-7e standard vt100 870 // 5f-7e standard vt100
848 // 40-5e rxvt extension for extra curses acs chars 871 // 40-5e rxvt extension for extra curses acs chars
849 static uint16_t vt100_0[62] = { // 41 .. 7e 872 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
862 c = vt100_0[c - 0x41]; 885 c = vt100_0[c - 0x41];
863 width = 1; // vt100 line drawing characters are always single-width 886 width = 1; // vt100 line drawing characters are always single-width
864 } 887 }
865 } 888 }
866 889
867 if (screen.flags & Screen_Insert) 890 if (expect_false (screen.flags & Screen_Insert))
868 scr_insdel_chars (width, INSERT); 891 scr_insdel_chars (width, INSERT);
869 892
870 if (width != 0) 893 if (width != 0)
871 { 894 {
872#if !UNICODE_3 895#if !UNICODE_3
… …
877# else 900# else
878 c = 0xfffd; 901 c = 0xfffd;
879# endif 902# endif
880#endif 903#endif
881 904
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906
907 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
909 {
910 if (screen.flags & Screen_Autowrap)
911 {
912 // ... artificially enlargen the previous one
913 c = NOCHAR;
914 // and try the same character next loop iteration
915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
919 }
920
882 // nuke the character at this position, if required 921 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself,
924 // only its tail.
883 if (line->t[screen.cur.col] == NOCHAR 925 if (expect_false (line->t[screen.cur.col] == NOCHAR))
884 || (screen.cur.col < ncol - 1 926 scr_kill_char (*line, screen.cur.col);
885 && line->t[screen.cur.col + 1] == NOCHAR))
886 {
887 int col = screen.cur.col;
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 = ' ';
910 // and try the same character next loop iteration
911 --str;
912 }
913 927
914 line->touch (); 928 line->touch ();
915 929
916 do 930 do
917 { 931 {
918 line->t[screen.cur.col] = c; 932 line->t[screen.cur.col] = c;
919 line->r[screen.cur.col] = rend; 933 line->r[screen.cur.col] = rend;
920 934
921 if (screen.cur.col < ncol - 1) 935 if (expect_true (screen.cur.col < ncol - 1))
922 screen.cur.col++; 936 screen.cur.col++;
923 else 937 else
924 { 938 {
925 line->l = ncol; 939 line->l = ncol;
926 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
927 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
928 break; 942
943 goto end_of_line;
929 } 944 }
930 945
931 c = NOCHAR; 946 c = NOCHAR;
932 } 947 }
933 while (--width > 0); 948 while (expect_false (--width > 0));
934 949
935 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
936 if (!width) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
937 { 952 {
938 line->touch (); 953 line->t[c] = ' ';
954 line->r[c] = rend;
955 }
939 956
940 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 957end_of_line:
958 ;
959 }
960#if ENABLE_COMBINING
961 else // width == 0
962 {
963 if (c != 0xfeff) // ignore BOM
964 {
965 // handle combining characters
966 // we just tag the accent on the previous on-screen character.
967 // this is arguably not correct, but also arguably not wrong.
968 // we don't handle double-width characters nicely yet.
969 line_t *linep;
970 text_t *tp;
971 rend_t *rp;
972
973 if (screen.cur.col > 0)
941 { 974 {
942 line->t[c] = ' ';
943 line->r[c] = rend; 975 linep = line;
976 tp = line->t + screen.cur.col - 1;
977 rp = line->r + screen.cur.col - 1;
944 } 978 }
979 else if (screen.cur.row > 0
980 && ROW(screen.cur.row - 1).is_longer ())
981 {
982 linep = &ROW(screen.cur.row - 1);
983 tp = line->t + ncol - 1;
984 rp = line->r + ncol - 1;
985 }
986 else
987 continue;
988
989 linep->touch ();
990
991 while (*tp == NOCHAR && tp > linep->t)
992 tp--, rp--;
993
994 // first try to find a precomposed character
995 unicode_t n = rxvt_compose (*tp, c);
996 if (n == NOCHAR)
997 n = rxvt_composite.compose (*tp, c);
998
999 *tp = n;
1000 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
945 } 1001 }
946 } 1002 }
947 else // width == 0
948 {
949#if ENABLE_COMBINING
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 {
960 linep = line;
961 tp = line->t + screen.cur.col - 1;
962 rp = line->r + screen.cur.col - 1;
963 }
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 }
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 1003#endif
987 }
988 } 1004 }
989 1005
990 max_it (line->l, screen.cur.col); 1006 max_it (line->l, screen.cur.col);
991 1007
992#ifdef DEBUG_STRICT
993 assert (screen.cur.row >= 0); 1008 assert (screen.cur.row >= 0);
994#endif
995} 1009}
996 1010
997/* ------------------------------------------------------------------------- */ 1011/* ------------------------------------------------------------------------- */
998/* 1012/*
999 * Process Backspace. Move back the cursor back a position, wrap if have to 1013 * Process Backspace. Move back the cursor back a position, wrap if have to
1000 * XTERM_SEQ: CTRL-H 1014 * XTERM_SEQ: CTRL-H
1001 */ 1015 */
1002void 1016void
1003rxvt_term::scr_backspace () NOTHROW 1017rxvt_term::scr_backspace () NOTHROW
1004{ 1018{
1005 want_refresh = 1;
1006
1007 if (screen.cur.col == 0) 1019 if (screen.cur.col == 0)
1008 { 1020 {
1009 if (screen.cur.row > 0) 1021 if (screen.cur.row > 0)
1010 { 1022 {
1011#ifdef TERMCAP_HAS_BW 1023#ifdef TERMCAP_HAS_BW
1012 screen.cur.col = ncol - 1; 1024 screen.cur.col = ncol - 1;
1013 screen.cur.row--; 1025 --screen.cur.row;
1014 return; 1026
1027 want_refresh = 1;
1015#endif 1028#endif
1016 } 1029 }
1017 } 1030 }
1018 else if (!(screen.flags & Screen_WrapNext)) 1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1033 else
1019 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1020
1021 screen.flags &= ~Screen_WrapNext;
1022} 1035}
1023 1036
1024/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
1025/* 1038/*
1026 * Process Horizontal Tab 1039 * Process Horizontal Tab
… …
1049 x = i; 1062 x = i;
1050 1063
1051 if (!--count) 1064 if (!--count)
1052 break; 1065 break;
1053 } 1066 }
1054 else 1067 else
1055 ht &= l.t[i] == ' ' 1068 ht &= l.t[i] == ' '
1056 && RS_SAME (l.r[i], base_rend); 1069 && RS_SAME (l.r[i], base_rend);
1057 1070
1058 if (count) 1071 if (count)
1059 x = ncol - 1; 1072 x = ncol - 1;
1060 1073
1061 // store horizontal tab commands as characters inside the text 1074 // store horizontal tab commands as characters inside the text
1062 // buffer so they can be selected and pasted. 1075 // buffer so they can be selected and pasted.
1063 if (ht && OPTION (Opt_pastableTabs)) 1076 if (ht && option (Opt_pastableTabs))
1064 { 1077 {
1065 base_rend = SET_FONT (base_rend, 0); 1078 base_rend = SET_FONT (base_rend, 0);
1066 1079
1067 l.touch (x); 1080 l.touch (x);
1068 1081
… …
1101 * Process DEC Back Index 1114 * Process DEC Back Index
1102 * XTERM_SEQ: ESC 6 1115 * XTERM_SEQ: ESC 6
1103 * Move cursor left in row. If we're at the left boundary, shift everything 1116 * Move cursor left in row. If we're at the left boundary, shift everything
1104 * in that row right. Clear left column. 1117 * in that row right. Clear left column.
1105 */ 1118 */
1106#if ENABLE_FRILLS 1119#if !ENABLE_MINIMAL
1107void 1120void
1108rxvt_term::scr_backindex () NOTHROW 1121rxvt_term::scr_backindex () NOTHROW
1109{ 1122{
1110 if (screen.cur.col > 0) 1123 if (screen.cur.col > 0)
1111 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1118 * Process DEC Forward Index 1131 * Process DEC Forward Index
1119 * XTERM_SEQ: ESC 9 1132 * XTERM_SEQ: ESC 9
1120 * Move cursor right in row. If we're at the right boundary, shift everything 1133 * Move cursor right in row. If we're at the right boundary, shift everything
1121 * in that row left. Clear right column. 1134 * in that row left. Clear right column.
1122 */ 1135 */
1123#if ENABLE_FRILLS 1136#if !ENABLE_MINIMAL
1124void 1137void
1125rxvt_term::scr_forwardindex () NOTHROW 1138rxvt_term::scr_forwardindex () NOTHROW
1126{ 1139{
1127 if (screen.cur.col < ncol - 1) 1140 if (screen.cur.col < ncol - 1)
1128 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1175 } 1188 }
1176 } 1189 }
1177 else 1190 else
1178 { 1191 {
1179 if (screen.flags & Screen_Relative) 1192 if (screen.flags & Screen_Relative)
1193 {
1180 { /* relative origin mode */ 1194 /* relative origin mode */
1181 screen.cur.row = row + screen.tscroll; 1195 screen.cur.row = row + screen.tscroll;
1182 min_it (screen.cur.row, screen.bscroll); 1196 min_it (screen.cur.row, screen.bscroll);
1183 } 1197 }
1184 else 1198 else
1185 screen.cur.row = row; 1199 screen.cur.row = row;
… …
1218/* 1232/*
1219 * Erase part or whole of a line 1233 * Erase part or whole of a line
1220 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1234 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1221 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1235 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1222 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1236 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1237 * extension: clear to right unless wrapped: ESC [ 3 K
1223 */ 1238 */
1224void 1239void
1225rxvt_term::scr_erase_line (int mode) NOTHROW 1240rxvt_term::scr_erase_line (int mode) NOTHROW
1226{ 1241{
1227 unsigned int col, num; 1242 unsigned int col, num;
… …
1236 line.touch (); 1251 line.touch ();
1237 line.is_longer (0); 1252 line.is_longer (0);
1238 1253
1239 switch (mode) 1254 switch (mode)
1240 { 1255 {
1256 case 3:
1257 if (screen.flags & Screen_WrapNext)
1258 return;
1259
1260 /* fall through */
1261
1241 case 0: /* erase to end of line */ 1262 case 0: /* erase to end of line */
1242 col = screen.cur.col; 1263 col = screen.cur.col;
1243 num = ncol - col; 1264 num = ncol - col;
1244 min_it (line.l, col); 1265 min_it (line.l, col);
1266
1245 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1267 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1246 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1268 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1247 CLEAR_SELECTION (); 1269 CLEAR_SELECTION ();
1248 break; 1270 break;
1271
1249 case 1: /* erase to beginning of line */ 1272 case 1: /* erase to beginning of line */
1250 col = 0; 1273 col = 0;
1251 num = screen.cur.col + 1; 1274 num = screen.cur.col + 1;
1275
1252 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1276 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1253 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1277 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1254 CLEAR_SELECTION (); 1278 CLEAR_SELECTION ();
1255 break; 1279 break;
1280
1256 case 2: /* erase whole line */ 1281 case 2: /* erase whole line */
1257 col = 0; 1282 col = 0;
1258 num = ncol; 1283 num = ncol;
1259 line.l = 0; 1284 line.l = 0;
1260 if (selection.beg.row <= screen.cur.row 1285 if (selection.beg.row <= screen.cur.row
… …
1318 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1319 return; 1344 return;
1320 1345
1321 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1322 1347
1323 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1324 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1325 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1326 { 1351 {
1327 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1328 CLEAR_ROWS (row, num); 1353
1354 if (mapped)
1355 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width,
1357 (unsigned int)Height2Pixel (num), False);
1329 } 1358 }
1330 else 1359 else
1331 { 1360 {
1332 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1362
1363 if (mapped)
1364 {
1333 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1334 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1335 ERASE_ROWS (row, num); 1367 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start),
1369 (unsigned int)width,
1370 (unsigned int)Height2Pixel (num));
1336 gcvalue.foreground = pix_colors[Color_fg]; 1371 gcvalue.foreground = pix_colors[Color_fg];
1337 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1372 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 }
1338 } 1374 }
1339 1375
1340 for (; num--; row++) 1376 for (; num--; row++)
1341 { 1377 {
1342 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1379
1380 if (row - view_start < nrow)
1343 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1344 } 1382 }
1345} 1383}
1346 1384
1347#if ENABLE_FRILLS 1385#if !ENABLE_MINIMAL
1348void 1386void
1349rxvt_term::scr_erase_savelines () NOTHROW 1387rxvt_term::scr_erase_savelines () NOTHROW
1350{ 1388{
1351 want_refresh = 1; 1389 want_refresh = 1;
1352 ZERO_SCROLLBACK (); 1390 ZERO_SCROLLBACK ();
… …
1422 * Insert/Delete <count> characters from the current position 1460 * Insert/Delete <count> characters from the current position
1423 */ 1461 */
1424void 1462void
1425rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1463rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1426{ 1464{
1427 int col, row;
1428 rend_t tr;
1429
1430 want_refresh = 1; 1465 want_refresh = 1;
1431 ZERO_SCROLLBACK (); 1466 ZERO_SCROLLBACK ();
1432 1467
1433 if (count <= 0) 1468 if (count <= 0)
1434 return; 1469 return;
… …
1436 scr_do_wrap (); 1471 scr_do_wrap ();
1437 1472
1438 selection_check (1); 1473 selection_check (1);
1439 min_it (count, ncol - screen.cur.col); 1474 min_it (count, ncol - screen.cur.col);
1440 1475
1441 row = screen.cur.row; 1476 int row = screen.cur.row;
1442 1477
1443 line_t *line = &ROW(row); 1478 line_t *line = &ROW(row);
1444 1479
1445 line->touch (); 1480 line->touch ();
1446 line->is_longer (0); 1481 line->is_longer (0);
1447 1482
1483 // nuke wide spanning the start
1484 if (line->t[screen.cur.col] == NOCHAR)
1485 scr_kill_char (*line, screen.cur.col);
1486
1448 switch (insdel) 1487 switch (insdel)
1449 { 1488 {
1450 case INSERT: 1489 case INSERT:
1451 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1490 line->l = min (line->l + count, ncol);
1491
1492 if (line->t[screen.cur.col] == NOCHAR)
1493 scr_kill_char (*line, screen.cur.col);
1494
1495 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1452 { 1496 {
1453 line->t[col] = line->t[col - count]; 1497 line->t[col] = line->t[col - count];
1454 line->r[col] = line->r[col - count]; 1498 line->r[col] = line->r[col - count];
1455 } 1499 }
1456
1457 line->l = min (line->l + count, ncol);
1458 1500
1459 if (selection.op && current_screen == selection.screen 1501 if (selection.op && current_screen == selection.screen
1460 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1502 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1461 { 1503 {
1462 if (selection.end.row != screen.cur.row 1504 if (selection.end.row != screen.cur.row
1463 || (selection.end.col + count >= ncol)) 1505 || (selection.end.col + count >= ncol))
1464 CLEAR_SELECTION (); 1506 CLEAR_SELECTION ();
1465 else 1507 else
1508 {
1466 { /* shift selection */ 1509 /* shift selection */
1467 selection.beg.col += count; 1510 selection.beg.col += count;
1468 selection.mark.col += count; /* XXX: yes? */ 1511 selection.mark.col += count; /* XXX: yes? */
1469 selection.end.col += count; 1512 selection.end.col += count;
1470 } 1513 }
1471 } 1514 }
… …
1476 case ERASE: 1519 case ERASE:
1477 screen.cur.col += count; /* don't worry if > ncol */ 1520 screen.cur.col += count; /* don't worry if > ncol */
1478 selection_check (1); 1521 selection_check (1);
1479 screen.cur.col -= count; 1522 screen.cur.col -= count;
1480 1523
1481 line->l = max (line->l - count, 0); 1524 // nuke wide char after the end
1525 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1526 scr_kill_char (*line, screen.cur.col + count);
1527
1482 scr_blank_line (*line, screen.cur.col, count, rstyle); 1528 scr_blank_line (*line, screen.cur.col, count, rstyle);
1483 break; 1529 break;
1484 1530
1485 case DELETE: 1531 case DELETE:
1486 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1532 line->l = max (line->l - count, 0);
1487 1533
1534 // nuke wide char spanning the end
1535 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1536 scr_kill_char (*line, screen.cur.col + count);
1537
1488 for (col = screen.cur.col; (col + count) < ncol; col++) 1538 for (int col = screen.cur.col; (col + count) < ncol; col++)
1489 { 1539 {
1490 line->t[col] = line->t[col + count]; 1540 line->t[col] = line->t[col + count];
1491 line->r[col] = line->r[col + count]; 1541 line->r[col] = line->r[col + count];
1492 } 1542 }
1493 1543
1494 line->l = max (line->l - count, 0);
1495 scr_blank_line (*line, ncol - count, count, tr); 1544 scr_blank_line (*line, ncol - count, count, rstyle);
1496 1545
1497 if (selection.op && current_screen == selection.screen 1546 if (selection.op && current_screen == selection.screen
1498 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1499 { 1548 {
1500 if (selection.end.row != screen.cur.row 1549 if (selection.end.row != screen.cur.row
… …
1610 */ 1659 */
1611void 1660void
1612rxvt_term::scr_set_tab (int mode) NOTHROW 1661rxvt_term::scr_set_tab (int mode) NOTHROW
1613{ 1662{
1614 if (mode < 0) 1663 if (mode < 0)
1615 memset (tabs, 0, ncol * sizeof (char)); 1664 memset (tabs, 0, ncol);
1616 else if (screen.cur.col < ncol) 1665 else if (screen.cur.col < ncol)
1617 tabs [screen.cur.col] = !!mode; 1666 tabs [screen.cur.col] = !!mode;
1618} 1667}
1619 1668
1620/* ------------------------------------------------------------------------- */ 1669/* ------------------------------------------------------------------------- */
… …
1635 if (rvideo_state != on) 1684 if (rvideo_state != on)
1636 { 1685 {
1637 rvideo_state = on; 1686 rvideo_state = on;
1638 1687
1639 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1640#if XPM_BACKGROUND 1689#ifdef HAVE_BG_PIXMAP
1641 if (bgPixmap.pixmap == None) 1690 if (bg_pixmap == None)
1642#endif 1691#endif
1643#if TRANSPARENT
1644 if (!OPTION (Opt_transparent) || am_transparent == 0)
1645#endif
1646 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1647 1693
1648 XGCValues gcvalue; 1694 XGCValues gcvalue;
1649 gcvalue.foreground = pix_colors[Color_fg]; 1695 gcvalue.foreground = pix_colors[Color_fg];
1650 gcvalue.background = pix_colors[Color_bg]; 1696 gcvalue.background = pix_colors[Color_bg];
1651 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); 1697 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1652 1698
1653 scr_clear (); 1699 scr_clear ();
1654 scr_touch (true); 1700 scr_touch (true);
1655 } 1701 }
1656} 1702}
… …
1741{ 1787{
1742 bool found = false; 1788 bool found = false;
1743 1789
1744 for (int i = 0; i < nrow; i++) 1790 for (int i = 0; i < nrow; i++)
1745 { 1791 {
1746 int col = 0;
1747 rend_t *drp = drawn_buf[i].r; 1792 rend_t *drp = drawn_buf[i].r;
1748 1793
1749 for (; col < ncol; col++, drp++) 1794 for (int col = 0; col < ncol; col++, drp++)
1750 if ((*drp & mask) == value) 1795 if ((*drp & mask) == value)
1751 { 1796 {
1752 found = true; 1797 found = true;
1753 *drp = ~value; 1798 *drp = ~value;
1754 } 1799 }
… …
1859 return true; 1904 return true;
1860} 1905}
1861 1906
1862#ifndef NO_BELL 1907#ifndef NO_BELL
1863void 1908void
1864rxvt_term::bell_cb (time_watcher &w) 1909rxvt_term::bell_cb (ev::timer &w, int revents)
1865{ 1910{
1866 rvideo_bell = false; 1911 rvideo_bell = false;
1867 scr_rvideo_mode (rvideo_mode); 1912 scr_rvideo_mode (rvideo_mode);
1913 refresh_check ();
1868} 1914}
1869#endif 1915#endif
1870 1916
1871/* ------------------------------------------------------------------------- */ 1917/* ------------------------------------------------------------------------- */
1872void 1918void
… …
1874{ 1920{
1875#ifndef NO_BELL 1921#ifndef NO_BELL
1876 1922
1877# ifndef NO_MAPALERT 1923# ifndef NO_MAPALERT
1878# ifdef MAPALERT_OPTION 1924# ifdef MAPALERT_OPTION
1879 if (OPTION (Opt_mapAlert)) 1925 if (option (Opt_mapAlert))
1880# endif 1926# endif
1881 XMapWindow (xdisp, parent[0]); 1927 XMapWindow (dpy, parent[0]);
1882# endif 1928# endif
1883 1929
1930# if ENABLE_FRILLS
1931 if (option (Opt_urgentOnBell))
1932 set_urgency (1);
1933# endif
1934
1884 if (OPTION (Opt_visualBell)) 1935 if (option (Opt_visualBell))
1885 { 1936 {
1886 rvideo_bell = true; 1937 rvideo_bell = true;
1887 scr_rvideo_mode (rvideo_mode); 1938 scr_rvideo_mode (rvideo_mode);
1888 display->flush (); 1939 flush ();
1889 1940
1890 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1891 } 1942 }
1892 else 1943 else
1893 XBell (xdisp, 0); 1944 XBell (dpy, 0);
1894 1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1895#endif 1946#endif
1896} 1947}
1897 1948
1898/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1899/* ARGSUSED */ 1950/* ARGSUSED */
1900void 1951void
1901rxvt_term::scr_printscreen (int fullhist) NOTHROW 1952rxvt_term::scr_printscreen (int fullhist) NOTHROW
1902{ 1953{
1903#ifdef PRINTPIPE 1954#ifdef PRINTPIPE
1904 int nrows, row_start; 1955 int nrows, row_start;
1905 FILE *fd; 1956 FILE *fd = popen_printer ();
1906 1957
1907 if ((fd = popen_printer ()) == NULL) 1958 if (!fd)
1908 return; 1959 return;
1909 1960
1910 if (fullhist) 1961 if (fullhist)
1911 { 1962 {
1912 nrows = nrow - top_row; 1963 nrows = nrow - top_row;
… …
1918 row_start = view_start; 1969 row_start = view_start;
1919 } 1970 }
1920 1971
1921 wctomb (0, 0); 1972 wctomb (0, 0);
1922 1973
1923 for (int r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1924 { 1975 {
1925 text_t *tp = ROW(r1).t; 1976 text_t *tp = ROW(r1).t;
1926 int len = ROW(r1).l; 1977 int len = ROW(r1).l;
1927 1978
1928 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1957 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
1958 */ 2009 */
1959void 2010void
1960rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
1961{ 2012{
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 */ 2013 int16_t col, row, /* column/row we're processing */
1965 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
1966 int i; /* tmp */ 2015 int i; /* tmp */
1967#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
1968 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
1969#endif 2018#endif
1970 rend_t *crp; // cursor rendition pointer 2019 rend_t *crp; // cursor rendition pointer
2020 rend_t ccol1, /* Cursor colour */
2021 ccol2; /* Cursor colour2 */
1971 2022
1972 want_refresh = 0; /* screen is current */ 2023 want_refresh = 0; /* screen is current */
1973 2024
1974 if (refresh_type == NO_REFRESH || !mapped) 2025 if (refresh_type == NO_REFRESH || !mapped)
1975 return; 2026 return;
1976 2027
1977 /* 2028 /*
1978 * A: set up vars 2029 * A: set up vars
1979 */ 2030 */
1980 must_clear = 0;
1981 refresh_count = 0; 2031 refresh_count = 0;
1982 2032
1983#if XPM_BACKGROUND 2033 unsigned int old_screen_flags = screen.flags;
1984 must_clear |= bgPixmap.pixmap != None; 2034 char have_bg = 0;
1985#endif 2035#ifdef HAVE_BG_PIXMAP
1986#if TRANSPARENT 2036 have_bg = bg_pixmap != None;
1987 must_clear |= OPTION (Opt_transparent) && am_transparent;
1988#endif 2037#endif
1989 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1990 2039
1991 /* 2040 /*
1992 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
1993 */ 2042 */
1994 scr_reverse_selection (); 2043 scr_reverse_selection ();
2044
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY
2047 scr_swap_overlay ();
2048#endif
2049
2050 char showcursor = screen.flags & Screen_VisibleCursor;
1995 2051
1996 /* 2052 /*
1997 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
1998 */ 2054 */
1999 { 2055 {
2000 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2001 rend_t ccol1, /* Cursor colour */
2002 ccol2; /* Cursor colour2 */
2003 2057
2004 showcursor = (screen.flags & Screen_VisibleCursor);
2005#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2006 if (hidden_cursor) 2059 if (hidden_cursor)
2007 showcursor = 0; 2060 showcursor = 0;
2008#endif 2061#endif
2009 2062
… …
2014 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2067 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2015 col--; 2068 col--;
2016 2069
2017 crp = &ROW(screen.cur.row).r[col]; 2070 crp = &ROW(screen.cur.row).r[col];
2018 2071
2019 if (showcursor && focus) 2072#ifndef NO_CURSORCOLOR
2073 cc1 = *crp & (RS_fgMask | RS_bgMask);
2074 if (ISSET_PIXCOLOR (Color_cursor))
2075 ccol1 = Color_cursor;
2076 else
2077#endif
2078#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2079 ccol1 = fgcolor_of (rstyle);
2080#else
2081 ccol1 = Color_fg;
2082#endif
2083
2084#ifndef NO_CURSORCOLOR
2085 if (ISSET_PIXCOLOR (Color_cursor2))
2086 ccol2 = Color_cursor2;
2087 else
2088#endif
2089#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2090 ccol2 = bgcolor_of (rstyle);
2091#else
2092 ccol2 = Color_bg;
2093#endif
2094
2095 if (focus)
2020 { 2096 {
2021 if (OPTION (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2022 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2023 else 2099 else
2024 { 2100 {
2025 *crp ^= RS_RVid; 2101 *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); 2102 *crp = SET_FGCOLOR (*crp, ccol1);
2046 *crp = SET_BGCOLOR (*crp, ccol2); 2103 *crp = SET_BGCOLOR (*crp, ccol2);
2047#endif
2048 } 2104 }
2049 } 2105 }
2050 } 2106 }
2051 2107
2052 /* make sure no outline cursor is left around */ 2108 /* make sure no outline cursor is left around */
… …
2079 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2080 } 2136 }
2081 } 2137 }
2082 } 2138 }
2083 2139
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 2140#ifndef NO_SLOW_LINK_SUPPORT
2090 /* 2141 /*
2091 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2092 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2093 */ 2144 */
2094 if (!display->is_local 2145 if (!display->is_local
2095 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2146 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2096 && abs (num_scr) < nrow && !must_clear) 2147 && abs (num_scr) < nrow && !have_bg)
2097 { 2148 {
2098 int16_t nits; 2149 int16_t nits;
2150 int i = num_scr;
2099 int j; 2151 int j;
2100 int len, wlen; 2152 int len, wlen;
2101 dLocal (int, num_scr); 2153 dLocal (int, num_scr);
2102 2154
2103 j = nrow; 2155 j = nrow;
2104 wlen = len = -1; 2156 wlen = len = -1;
2105 row = i > 0 ? 0 : j - 1; 2157 row = i > 0 ? 0 : j - 1;
2158
2106 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2159 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2107 { 2160 {
2108 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2161 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2109 { 2162 {
2110 line_t s = ROW(view_start + row); 2163 line_t s = ROW(view_start + row);
… …
2131 wlen = row; 2184 wlen = row;
2132 continue; 2185 continue;
2133 } 2186 }
2134 } 2187 }
2135 2188
2136 if (len != -1) 2189 if (len >= 0)
2137 { 2190 {
2138 /* also comes here at end if needed because of >= above */ 2191 /* also comes here at end if needed because of >= above */
2139 if (wlen < len) 2192 if (wlen < len)
2140 ::swap (wlen, len); 2193 ::swap (wlen, len);
2141 2194
2195 XGCValues gcv;
2196
2197 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2142 XCopyArea (xdisp, vt, vt, 2198 XCopyArea (dpy, vt, vt,
2143 gc, 0, Row2Pixel (len + i), 2199 gc, 0, Row2Pixel (len + i),
2144 (unsigned int)this->width, 2200 (unsigned int)this->width,
2145 (unsigned int)Height2Pixel (wlen - len + 1), 2201 (unsigned int)Height2Pixel (wlen - len + 1),
2146 0, Row2Pixel (len)); 2202 0, Row2Pixel (len));
2203 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2204
2147 len = -1; 2205 len = -1;
2148 } 2206 }
2149 } 2207 }
2150 } 2208 }
2151#endif 2209#endif
… …
2175 continue; 2233 continue;
2176 2234
2177 // redraw one or more characters 2235 // redraw one or more characters
2178 2236
2179 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2180 while (stp[col] == NOCHAR && col > 0) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2181 --col; 2239 --col;
2182 2240
2183 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2184 text_t *text = stp + col; 2242 text_t *text = stp + col;
2185 int count = 1; 2243 int count = 1;
2186 2244
2187 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2188 drp[col] = rend; 2246 drp[col] = rend;
… …
2192 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2193 { 2251 {
2194 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2195 { 2253 {
2196 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2197 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2198 count++; 2257 count++;
2199 i++; 2258 i++;
2200 2259
2201 continue; 2260 continue;
2202 } 2261 }
… …
2207 count++; 2266 count++;
2208 2267
2209 if (stp[col] != dtp[col] 2268 if (stp[col] != dtp[col]
2210 || !RS_SAME (srp[col], drp[col])) 2269 || !RS_SAME (srp[col], drp[col]))
2211 { 2270 {
2212 if (must_clear && (i++ > count / 2)) 2271 if (have_bg && (i++ > count / 2))
2213 break; 2272 break;
2214 2273
2215 dtp[col] = stp[col]; 2274 dtp[col] = stp[col];
2216 drp[col] = rend; 2275 drp[col] = rend;
2217 i = 0; 2276 i = 0;
2218 } 2277 }
2219 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2278 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2220 break; 2279 break;
2221 } 2280 }
2222 2281
2223 col--; /* went one too far. move back */ 2282 col--; /* went one too far. move back */
2224 count -= i; /* dump any matching trailing chars */ 2283 count -= i; /* dump any matching trailing chars */
2225 2284
2226 // sometimes we optimize away the trailing NOCHAR's, add them back 2285 // sometimes we optimize away the trailing NOCHAR's, add them back
2227 while (i && text[count] == NOCHAR) 2286 while (expect_false (i && text[count] == NOCHAR))
2228 count++, i--; 2287 count++, i--;
2229 2288
2230 /* 2289 /*
2231 * Determine the attributes for the string 2290 * Determine the attributes for the string
2232 */ 2291 */
2233 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2234 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2235 2294
2236 // only do special processing if any attributes are set, which is unlikely 2295 // 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)) 2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2238 { 2297 {
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; 2298 bool invert = rend & RS_RVid;
2258 2299
2259#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2260 if (rend & RS_Bold
2261 && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
2262 { 2302 {
2263 if (ISSET_PIXCOLOR (Color_BD)) 2303 if (ISSET_PIXCOLOR (Color_BD))
2264 fore = Color_BD; 2304 fore = Color_BD;
2265# if !ENABLE_STYLES 2305# if !ENABLE_STYLES
2266 else 2306 else
2267 invert = !invert; 2307 invert = !invert;
2268# endif 2308# endif
2269 } 2309 }
2270 2310
2271 if (rend & RS_Italic 2311 if (rend & RS_Italic && fore == Color_fg)
2272 && fore == Color_fg)
2273 { 2312 {
2274 if (ISSET_PIXCOLOR (Color_IT)) 2313 if (ISSET_PIXCOLOR (Color_IT))
2275 fore = Color_IT; 2314 fore = Color_IT;
2276# if !ENABLE_STYLES 2315# if !ENABLE_STYLES
2277 else 2316 else
2278 invert = !invert; 2317 invert = !invert;
2279# endif 2318# endif
2280 } 2319 }
2281 2320
2282 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2283 fore = Color_UL; 2322 fore = Color_UL;
2323#endif
2324
2325#ifdef OPTION_HC
2326 if (rend & RS_Sel)
2327 {
2328 /* invert the column if no highlightColor is set or it is the
2329 * current cursor column */
2330 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2331 && ISSET_PIXCOLOR (Color_HC))
2332 {
2333 if (ISSET_PIXCOLOR (Color_HTC))
2334 fore = Color_HTC;
2335 // if invert is 0 reverse video is set so we use bg color as fg color
2336 else if (!invert)
2337 fore = back;
2338
2339 back = Color_HC;
2340 invert = 0;
2341 }
2342 }
2284#endif 2343#endif
2285 2344
2286 if (invert) 2345 if (invert)
2287 { 2346 {
2288 ::swap (fore, back); 2347 ::swap (fore, back);
2289 2348
2290#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2291 if (ISSET_PIXCOLOR (Color_RV))
2292 back = Color_RV;
2293
2294 if (fore == back) 2350 if (fore == back)
2295 { 2351 {
2296 fore = Color_bg; 2352 fore = Color_bg;
2297 back = Color_fg; 2353 back = Color_fg;
2298 } 2354 }
… …
2300 } 2356 }
2301 2357
2302#ifdef TEXT_BLINK 2358#ifdef TEXT_BLINK
2303 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2359 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2304 { 2360 {
2305 if (!text_blink_ev.active) 2361 if (!text_blink_ev.is_active ())
2306 { 2362 {
2307 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2363 text_blink_ev.again ();
2308 hidden_text = 0; 2364 hidden_text = 0;
2309 } 2365 }
2310 else if (hidden_text) 2366 else if (hidden_text)
2311 fore = back; 2367 fore = back;
2312 } 2368 }
2313#endif 2369#endif
2370
2371#if ENABLE_STYLES
2372 // "careful" (too wide) character handling
2373
2374 // include previous careful character(s) if possible, looks nicer (best effort...)
2375 while (text > stp
2376 && srp[text - stp - 1] & RS_Careful
2377 && RS_SAME (rend, srp[text - stp - 1]))
2378 text--, count++, xpixel -= fwidth;
2379
2380 // force redraw after "careful" characters to avoid pixel droppings
2381 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2382 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2383
2384 // force redraw before "careful" characters to avoid pixel droppings
2385 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2386 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2387#endif
2314 } 2388 }
2315 2389
2316 /* 2390 /*
2317 * Actually do the drawing of the string here 2391 * Actually do the drawing of the string here
2318 */ 2392 */
2319 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2320 2394
2321 if (back == fore) 2395 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 { 2396 {
2327 if (must_clear) 2397 // this is very ugly, maybe push it into ->draw?
2328 {
2329 CLEAR_CHARS (xpixel, ypixel, count);
2330 2398
2331 for (i = 0; i < count; i++) /* don't draw empty strings */ 2399 for (i = 0; i < count; i++) /* don't draw empty strings */
2332 if (text[i] != ' ') 2400 if (text[i] != ' ')
2333 { 2401 {
2334 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2402 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2335 break; 2403 goto did_clear;
2336 }
2337 } 2404 }
2338 else 2405
2339 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2406 CLEAR_CHARS (xpixel, ypixel, count);
2407 did_clear: ;
2340 } 2408 }
2341 else 2409 else
2342 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2343 2411
2344 if (rend & RS_Uline && font->descent > 1 && fore != back) 2412 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2345 { 2413 {
2346#if ENABLE_FRILLS 2414#if ENABLE_FRILLS
2347 if (ISSET_PIXCOLOR (Color_underline)) 2415 if (ISSET_PIXCOLOR (Color_underline))
2348 XSetForeground (xdisp, gc, pix_colors[Color_underline]); 2416 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2349 else 2417 else
2350#endif 2418#endif
2351 XSetForeground (xdisp, gc, pix_colors[fore]); 2419 XSetForeground (dpy, gc, pix_colors[fore]);
2352 2420
2353 XDrawLine (xdisp, drawBuffer, gc, 2421 XDrawLine (dpy, vt, gc,
2354 xpixel, ypixel + font->ascent + 1, 2422 xpixel, ypixel + font->ascent + 1,
2355 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2423 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2356 } 2424 }
2357 } /* for (col....) */ 2425 } /* for (col....) */
2358 } /* for (row....) */ 2426 } /* for (row....) */
2359 2427
2360#if ENABLE_OVERLAY
2361 scr_swap_overlay ();
2362#endif
2363 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2364
2365 /* 2428 /*
2366 * G: cleanup cursor and display outline cursor if necessary 2429 * G: cleanup cursor and display outline cursor if necessary
2367 */ 2430 */
2368 if (showcursor) 2431 if (showcursor)
2369 { 2432 {
2370 if (focus) 2433 if (focus)
2371 { 2434 {
2372 if (OPTION (Opt_cursorUnderline)) 2435 if (option (Opt_cursorUnderline))
2373 *crp ^= RS_Uline; 2436 *crp ^= RS_Uline;
2374 else 2437 else
2375 { 2438 {
2376 *crp ^= RS_RVid; 2439 *crp ^= RS_RVid;
2377#ifndef NO_CURSORCOLOR 2440#ifndef NO_CURSORCOLOR
… …
2391 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2454 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2392 cursorwidth++; 2455 cursorwidth++;
2393 2456
2394#ifndef NO_CURSORCOLOR 2457#ifndef NO_CURSORCOLOR
2395 if (ISSET_PIXCOLOR (Color_cursor)) 2458 if (ISSET_PIXCOLOR (Color_cursor))
2396 XSetForeground (xdisp, gc, pix_colors[Color_cursor]); 2459 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2460 else
2397#endif 2461#endif
2462 XSetForeground (dpy, gc, pix_colors[ccol1]);
2398 2463
2399 XDrawRectangle (xdisp, drawBuffer, gc, 2464 XDrawRectangle (dpy, vt, gc,
2400 Col2Pixel (col), 2465 Col2Pixel (col),
2401 Row2Pixel (oldcursor.row), 2466 Row2Pixel (oldcursor.row),
2402 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2467 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2403 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2468 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2404 } 2469 }
2405 } 2470 }
2406 2471
2407 /* 2472 /*
2408 * H: cleanup selection 2473 * H: cleanup selection
2409 */ 2474 */
2475#if ENABLE_OVERLAY
2476 scr_swap_overlay ();
2477#endif
2478 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2479
2410 scr_reverse_selection (); 2480 scr_reverse_selection ();
2411 2481
2482 screen.flags = old_screen_flags;
2412 num_scr = 0; 2483 num_scr = 0;
2413 num_scr_allow = 1; 2484 num_scr_allow = 1;
2414} 2485}
2415 2486
2416void 2487void
… …
2437 scr_remap_chars (swap_buf [i]); 2508 scr_remap_chars (swap_buf [i]);
2438 } 2509 }
2439} 2510}
2440 2511
2441void 2512void
2442rxvt_term::scr_recolour () NOTHROW 2513rxvt_term::scr_recolour (bool refresh) NOTHROW
2443{ 2514{
2444 if (1 2515 bool transparent = false;
2445#if TRANSPARENT 2516
2446 && !am_transparent 2517#ifdef HAVE_BG_PIXMAP
2518 if (bg_pixmap != None)
2519 {
2520# ifdef ENABLE_TRANSPARENCY
2521 if (bg_flags & BG_IS_TRANSPARENT)
2522 {
2523 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2525
2526 transparent = true;
2527 }
2528 else
2447#endif 2529# endif
2448#if XPM_BACKGROUND
2449 && !bgPixmap.pixmap
2450#endif
2451 ) 2530 {
2531 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2532 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2533 }
2452 { 2534 }
2535 else
2536#endif
2537 {
2453 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2538 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2454 XClearWindow (xdisp, parent[0]);
2455 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2539 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2456#if HAVE_SCROLLBARS 2540 }
2541
2542 XClearWindow (dpy, parent[0]);
2543
2457 if (scrollBar.win) 2544 if (scrollBar.win)
2458 { 2545 {
2546 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else
2459 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2460 scrollBar.setIdle (); 2550 scrollBar.state = STATE_IDLE;
2461 scrollbar_show (0); 2551 scrollBar.show (0);
2462 } 2552 }
2463#endif 2553
2554 if (refresh)
2464 } 2555 {
2465
2466 scr_clear (); 2556 scr_clear ();
2467 scr_touch (true); 2557 scr_touch (true);
2558 }
2468 want_refresh = 1; 2559 want_refresh = 1;
2469} 2560}
2470 2561
2471/* ------------------------------------------------------------------------- */ 2562/* ------------------------------------------------------------------------- */
2472void 2563void
… …
2477 2568
2478 num_scr_allow = 0; 2569 num_scr_allow = 0;
2479 want_refresh = 1; 2570 want_refresh = 1;
2480 2571
2481 if (really) 2572 if (really)
2482 XClearWindow (xdisp, vt); 2573 XClearWindow (dpy, vt);
2483} 2574}
2484 2575
2485void 2576void
2486rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2577rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2487{ 2578{
… …
2536{ 2627{
2537 if (selection.op 2628 if (selection.op
2538 && current_screen == selection.screen 2629 && current_screen == selection.screen
2539 && selection.end.row >= view_start) 2630 && selection.end.row >= view_start)
2540 { 2631 {
2541#if ENABLE_FRILLS 2632#if !ENABLE_MINIMAL
2542 if (selection.rect) 2633 if (selection.rect)
2543 scr_xor_rect (selection.beg.row, selection.beg.col, 2634 scr_xor_rect (selection.beg.row, selection.beg.col,
2544 selection.end.row, selection.end.col, 2635 selection.end.row, selection.end.col,
2545 RS_RVid, RS_RVid | RS_Uline); 2636 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2546 else 2637 else
2547#endif 2638#endif
2548 scr_xor_span (selection.beg.row, selection.beg.col, 2639 scr_xor_span (selection.beg.row, selection.beg.col,
2549 selection.end.row, selection.end.col, 2640 selection.end.row, selection.end.col,
2550 RS_RVid); 2641 RS_Sel | RS_RVid);
2551 } 2642 }
2552} 2643}
2553 2644
2554/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2555/* 2646/*
… …
2560void 2651void
2561rxvt_term::scr_dump (int fd) NOTHROW 2652rxvt_term::scr_dump (int fd) NOTHROW
2562{ 2653{
2563 int row, wrote; 2654 int row, wrote;
2564 unsigned int width, towrite; 2655 unsigned int width, towrite;
2565 char r1[] = "\n"; 2656 const char r1[] = "\n";
2566 2657
2567 for (row = saveLines - nsaved; 2658 for (row = saveLines + top_row;
2568 row < saveLines + nrow - 1; row++) 2659 row < saveLines + nrow - 1; row++)
2569 { 2660 {
2570 width = row_buf[row].l >= 0 ? row_buf[row].l 2661 width = row_buf[row].l >= 0 ? row_buf[row].l
2571 : ncol; 2662 : ncol;
2572 for (towrite = width; towrite; towrite -= wrote) 2663 for (towrite = width; towrite; towrite -= wrote)
… …
2616/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2617/* 2708/*
2618 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2619 */ 2710 */
2620void 2711void
2621rxvt_term::paste (char *data, unsigned int len) NOTHROW 2712rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2622{ 2713{
2623 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2624 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2625 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2626 data[i] = C0_CR; 2717 data[i] = C0_CR;
2627 2718
2719 if (priv_modes & PrivMode_BracketPaste)
2720 tt_printf ("\e[200~");
2721
2628 tt_write (data, len); 2722 tt_write (data, len);
2723
2724 if (priv_modes & PrivMode_BracketPaste)
2725 tt_printf ("\e[201~");
2726}
2727
2728void
2729rxvt_term::paste (char *data, unsigned int len) NOTHROW
2730{
2731 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2732 return;
2733
2734 tt_paste (data, len);
2629} 2735}
2630 2736
2631/* ------------------------------------------------------------------------- */ 2737/* ------------------------------------------------------------------------- */
2632/* 2738/*
2633 * Respond to a notification that a primary selection has been sent 2739 * Respond to a notification that a primary selection has been sent
… …
2636void 2742void
2637rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2743rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2638{ 2744{
2639 if (prop == None) /* check for failed XConvertSelection */ 2745 if (prop == None) /* check for failed XConvertSelection */
2640 { 2746 {
2747 int selnum = selection_type & Sel_whereMask;
2748
2749 if (selnum == Sel_direct)
2750 selection_type = 0;
2751
2641 if ((selection_type & Sel_CompoundText)) 2752 if ((selection_type & Sel_CompoundText))
2642 { 2753 {
2643 int selnum = selection_type & Sel_whereMask;
2644
2645 selection_type = 0; 2754 selection_type = 0;
2646 if (selnum != Sel_direct)
2647 selection_request_other (XA_STRING, selnum); 2755 selection_request_other (XA_STRING, selnum);
2648 } 2756 }
2649 2757
2650 if ((selection_type & Sel_UTF8String)) 2758 if ((selection_type & Sel_UTF8String))
2651 { 2759 {
2652 int selnum = selection_type & Sel_whereMask;
2653
2654 selection_type = Sel_CompoundText; 2760 selection_type = Sel_CompoundText;
2655 if (selnum != Sel_direct)
2656 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2761 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2657 else
2658 selection_type = 0;
2659 } 2762 }
2660 2763
2661 return; 2764 return;
2662 } 2765 }
2663 2766
2664 unsigned long bytes_after; 2767 unsigned long bytes_after;
2665 XTextProperty ct; 2768 XTextProperty ct;
2666 2769
2667 if (XGetWindowProperty (xdisp, win, prop, 2770 if (XGetWindowProperty (dpy, win, prop,
2668 0, PROP_SIZE / 4, 2771 0, PROP_SIZE / 4,
2669 delete_prop, AnyPropertyType, 2772 delete_prop, AnyPropertyType,
2670 &ct.encoding, &ct.format, 2773 &ct.encoding, &ct.format,
2671 &ct.nitems, &bytes_after, 2774 &ct.nitems, &bytes_after,
2672 &ct.value) != Success) 2775 &ct.value) != Success)
… …
2681 if (bytes_after) 2784 if (bytes_after)
2682 { 2785 {
2683 // fetch and append remaining data 2786 // fetch and append remaining data
2684 XTextProperty ct2; 2787 XTextProperty ct2;
2685 2788
2686 if (XGetWindowProperty (xdisp, win, prop, 2789 if (XGetWindowProperty (dpy, win, prop,
2687 ct.nitems / 4, (bytes_after + 3) / 4, 2790 ct.nitems / 4, (bytes_after + 3) / 4,
2688 delete_prop, AnyPropertyType, 2791 delete_prop, AnyPropertyType,
2689 &ct2.encoding, &ct2.format, 2792 &ct2.encoding, &ct2.format,
2690 &ct2.nitems, &bytes_after, 2793 &ct2.nitems, &bytes_after,
2691 &ct2.value) != Success) 2794 &ct2.value) != Success)
2692 goto bailout; 2795 goto bailout;
2693 2796
2694 // realloc should be compatible to XFree, here, and elsewhere, too 2797 // realloc should be compatible to XFree, here, and elsewhere, too
2695 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); 2798 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2696 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); 2799 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2697 ct.nitems += ct2.nitems; 2800 ct.nitems += ct2.nitems;
2698 2801
2699 XFree (ct2.value); 2802 XFree (ct2.value);
2700 } 2803 }
… …
2704 2807
2705 if (ct.encoding == xa[XA_INCR]) 2808 if (ct.encoding == xa[XA_INCR])
2706 { 2809 {
2707 // INCR selection, start handshake 2810 // INCR selection, start handshake
2708 if (!delete_prop) 2811 if (!delete_prop)
2709 XDeleteProperty (xdisp, win, prop); 2812 XDeleteProperty (dpy, win, prop);
2710 2813
2711 selection_wait = Sel_incr; 2814 selection_wait = Sel_incr;
2712 incr_buf_fill = 0; 2815 incr_buf_fill = 0;
2713 incr_ev.start (NOW + 10); 2816 incr_ev.start (10);
2714 2817
2715 goto bailout; 2818 goto bailout;
2716 } 2819 }
2717 2820
2718 if (ct.nitems == 0) 2821 if (ct.nitems == 0)
… …
2727 ct.nitems = incr_buf_fill; 2830 ct.nitems = incr_buf_fill;
2728 incr_buf = 0; 2831 incr_buf = 0;
2729 incr_buf_size = 0; 2832 incr_buf_size = 0;
2730 incr_ev.stop (); 2833 incr_ev.stop ();
2731 } 2834 }
2732 else 2835 else
2733 { 2836 {
2734 if (selection_wait == Sel_normal 2837 if (selection_wait == Sel_normal
2735 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2838 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2736 { 2839 {
2737 /* 2840 /*
2738 * pass through again trying CUT_BUFFER0 if we've come from 2841 * pass through again trying CUT_BUFFER0 if we've come from
2739 * XConvertSelection () but nothing was presented 2842 * XConvertSelection () but nothing was presented
2740 */ 2843 */
2741 selection_paste (display->root, XA_CUT_BUFFER0, False); 2844 selection_paste (display->root, XA_CUT_BUFFER0, false);
2742 } 2845 }
2743 2846
2744 goto bailout; 2847 goto bailout;
2745 } 2848 }
2746 } 2849 }
2747 else if (selection_wait == Sel_incr) 2850 else if (selection_wait == Sel_incr)
2748 { 2851 {
2749 incr_ev.start (NOW + 10); 2852 incr_ev.start (10);
2750 2853
2751 while (incr_buf_fill + ct.nitems > incr_buf_size) 2854 while (incr_buf_fill + ct.nitems > incr_buf_size)
2752 { 2855 {
2753 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2856 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2754 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2857 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2755 } 2858 }
2756 2859
2757 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2860 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2758 incr_buf_fill += ct.nitems; 2861 incr_buf_fill += ct.nitems;
2759 2862
… …
2761 } 2864 }
2762 2865
2763 char **cl; 2866 char **cl;
2764 int cr; 2867 int cr;
2765 2868
2766#if ENABLE_FRILLS 2869#if !ENABLE_MINIMAL
2767 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2870 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2768 // so recode it manually 2871 // so recode it manually
2769 if (ct.encoding == xa[XA_UTF8_STRING]) 2872 if (ct.encoding == xa[XA_UTF8_STRING])
2770 { 2873 {
2771 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2874 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2775 paste (s, strlen (s)); 2878 paste (s, strlen (s));
2776 free (s); 2879 free (s);
2777 } 2880 }
2778 else 2881 else
2779#endif 2882#endif
2780 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 2883 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2781 && cl) 2884 && cl)
2782 { 2885 {
2783 for (int i = 0; i < cr; i++) 2886 for (int i = 0; i < cr; i++)
2784 paste (cl[i], strlen (cl[i])); 2887 paste (cl[i], strlen (cl[i]));
2785 2888
… …
2794 if (selection_wait == Sel_normal) 2897 if (selection_wait == Sel_normal)
2795 selection_wait = Sel_none; 2898 selection_wait = Sel_none;
2796} 2899}
2797 2900
2798void 2901void
2799rxvt_term::incr_cb (time_watcher &w) NOTHROW 2902rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2800{ 2903{
2801 selection_wait = Sel_none; 2904 selection_wait = Sel_none;
2802 2905
2803 incr_buf_size = 0; 2906 incr_buf_size = 0;
2804 free (incr_buf); 2907 free (incr_buf);
… …
2815 selection_paste (win, prop, true); 2918 selection_paste (win, prop, true);
2816} 2919}
2817 2920
2818/* ------------------------------------------------------------------------- */ 2921/* ------------------------------------------------------------------------- */
2819/* 2922/*
2820 * Request the current selection: 2923 * Request the current selection:
2821 * Order: > internal selection if available 2924 * Order: > internal selection if available
2822 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2925 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2823 * > CUT_BUFFER0 2926 * > CUT_BUFFER0
2824 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2927 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2825 * will auto fallback to CUT_BUFFER0 2928 * will auto fallback to CUT_BUFFER0
… …
2827 */ 2930 */
2828void 2931void
2829rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2932rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2830{ 2933{
2831 if (selection.text && selnum == Sel_Primary) 2934 if (selection.text && selnum == Sel_Primary)
2935 {
2832 { /* internal selection */ 2936 /* internal selection */
2833 char *str = rxvt_wcstombs (selection.text, selection.len); 2937 char *str = rxvt_wcstombs (selection.text, selection.len);
2834 paste (str, strlen (str)); 2938 paste (str, strlen (str));
2835 free (str); 2939 free (str);
2836 return; 2940 return;
2837 } 2941 }
… …
2841 selection_wait = Sel_normal; 2945 selection_wait = Sel_normal;
2842 2946
2843#if X_HAVE_UTF8_STRING 2947#if X_HAVE_UTF8_STRING
2844 selection_type = Sel_UTF8String; 2948 selection_type = Sel_UTF8String;
2845 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2949 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2846 return; 2950 return;
2847#else 2951#else
2848 selection_type = Sel_CompoundText; 2952 selection_type = Sel_CompoundText;
2849 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2953 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2850 return; 2954 return;
2851#endif 2955#endif
2852 } 2956 }
2853 2957
2854 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2958 selection_wait = Sel_none; /* don't loop in selection_paste () */
2855 selection_paste (display->root, XA_CUT_BUFFER0, false); 2959 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2867 else if (selnum == Sel_Secondary) 2971 else if (selnum == Sel_Secondary)
2868 sel = XA_SECONDARY; 2972 sel = XA_SECONDARY;
2869 else 2973 else
2870 sel = xa[XA_CLIPBOARD]; 2974 sel = xa[XA_CLIPBOARD];
2871 2975
2872 if (XGetSelectionOwner (xdisp, sel) != None) 2976 if (XGetSelectionOwner (dpy, sel) != None)
2873 { 2977 {
2874 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], 2978 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2875 vt, selection_request_time); 2979 vt, selection_request_time);
2876 return 1; 2980 return 1;
2877 } 2981 }
2878 2982
2879 return 0; 2983 return 0;
… …
2883/* 2987/*
2884 * Clear all selected text 2988 * Clear all selected text
2885 * EXT: SelectionClear 2989 * EXT: SelectionClear
2886 */ 2990 */
2887void 2991void
2888rxvt_term::selection_clear () NOTHROW 2992rxvt_term::selection_clear (bool clipboard) NOTHROW
2889{ 2993{
2994 if (!clipboard)
2995 {
2890 want_refresh = 1; 2996 want_refresh = 1;
2891 free (selection.text); 2997 free (selection.text);
2892 selection.text = NULL; 2998 selection.text = NULL;
2893 selection.len = 0; 2999 selection.len = 0;
2894 CLEAR_SELECTION (); 3000 CLEAR_SELECTION ();
2895 3001
2896 if (display->selection_owner == this) 3002 if (display->selection_owner == this)
2897 display->selection_owner = 0; 3003 display->selection_owner = 0;
3004 }
3005 else
3006 {
3007 free (selection.clip_text);
3008 selection.clip_text = NULL;
3009 selection.clip_len = 0;
3010
3011 if (display->clipboard_owner == this)
3012 display->clipboard_owner = 0;
3013 }
2898} 3014}
2899 3015
2900/* ------------------------------------------------------------------------- */ 3016/* ------------------------------------------------------------------------- */
2901/* 3017/*
2902 * Copy a selection into the cut buffer 3018 * Copy a selection into the cut buffer
2903 * EXT: button 1 or 3 release 3019 * EXT: button 1 or 3 release
2904 */ 3020 */
2905void 3021void
2906rxvt_term::selection_make (Time tm) 3022rxvt_term::selection_make (Time tm)
2907{ 3023{
2908 int i; 3024 int size;
2909 wchar_t *new_selection_text; 3025 wchar_t *new_selection_text;
2910 text_t *t; 3026 text_t *t;
2911 3027
2912 switch (selection.op) 3028 switch (selection.op)
2913 { 3029 {
… …
2929 return; /* nothing selected, go away */ 3045 return; /* nothing selected, go away */
2930 3046
2931 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3047 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2932 return; 3048 return;
2933 3049
2934 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3050 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2935 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3051 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2936 3052
2937 int ofs = 0; 3053 int ofs = 0;
2938 int extra = 0; 3054 int extra = 0;
2939 3055
2940 int col = selection.beg.col; 3056 int col = selection.beg.col;
… …
2942 3058
2943 int end_col; 3059 int end_col;
2944 3060
2945 for (; row <= selection.end.row; row++, col = 0) 3061 for (; row <= selection.end.row; row++, col = 0)
2946 { 3062 {
2947#if ENABLE_FRILLS 3063#if !ENABLE_MINIMAL
2948 if (selection.rect) 3064 if (selection.rect)
2949 { 3065 {
2950 col = selection.beg.col; 3066 col = selection.beg.col;
2951 end_col = ncol + 1; 3067 end_col = selection.end.col;
2952 } 3068 }
2953 else 3069 else
2954#endif 3070#endif
2955 end_col = ROW(row).l; 3071 end_col = ROW(row).l;
2956 3072
2957 col = max (col, 0); 3073 col = max (col, 0);
2958 3074
2959 if (row == selection.end.row 3075 if (row == selection.end.row)
2960#if ENABLE_FRILLS
2961 || selection.rect
2962#endif
2963 )
2964 min_it (end_col, selection.end.col); 3076 min_it (end_col, selection.end.col);
2965 3077
2966 t = ROW(row).t + col; 3078 t = ROW(row).t + col;
2967 3079
2968 for (; col < end_col; col++) 3080 for (; col < end_col; col++)
… …
2976 3088
2977 extra -= (len - 1); 3089 extra -= (len - 1);
2978 3090
2979 if (extra < 0) 3091 if (extra < 0)
2980 { 3092 {
2981 extra += i; 3093 extra += size;
2982 i += i; 3094 size += size;
2983 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3095 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
2984 } 3096 }
2985 3097
2986 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3098 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2987 } 3099 }
2988#endif 3100#endif
2989 else 3101 else
2990 new_selection_text[ofs++] = *t++; 3102 new_selection_text[ofs++] = *t++;
2991 } 3103 }
2992 3104
2993#if ENABLE_FRILLS 3105#if !ENABLE_MINIMAL
2994 if (selection.rect) 3106 if (selection.rect)
2995 { 3107 {
2996 while (ofs 3108 while (ofs
2997 && new_selection_text[ofs - 1] != C0_LF 3109 && new_selection_text[ofs - 1] != C0_LF
2998 && unicode::is_space (new_selection_text[ofs - 1])) 3110 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3000 3112
3001 new_selection_text[ofs++] = C0_LF; 3113 new_selection_text[ofs++] = C0_LF;
3002 } 3114 }
3003 else 3115 else
3004#endif 3116#endif
3005 if (!ROW(row).is_longer () && row != selection.end.row) 3117 if (!ROW(row).is_longer ()
3118 && (row != selection.end.row || end_col != selection.end.col)
3119 && (row != selection.beg.row || selection.beg.col < ncol))
3006 new_selection_text[ofs++] = C0_LF; 3120 new_selection_text[ofs++] = C0_LF;
3007 } 3121 }
3008
3009 if (end_col != selection.end.col)
3010 new_selection_text[ofs++] = C0_LF;
3011 3122
3012 new_selection_text[ofs] = 0; 3123 new_selection_text[ofs] = 0;
3013 3124
3014 if (ofs == 0) 3125 if (ofs == 0)
3015 { 3126 {
… …
3028 3139
3029 selection_grab (tm); 3140 selection_grab (tm);
3030} 3141}
3031 3142
3032bool 3143bool
3033rxvt_term::selection_grab (Time tm) NOTHROW 3144rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3034{ 3145{
3146 Atom sel;
3147
3148 if (!clipboard)
3149 {
3035 selection_time = tm; 3150 selection_time = tm;
3036 3151 sel = XA_PRIMARY;
3037 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);
3038 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)
3039 { 3152 }
3153 else
3154 {
3155 clipboard_time = tm;
3156 sel = xa[XA_CLIPBOARD];
3157 }
3158
3159 XSetSelectionOwner (dpy, sel, vt, tm);
3160 if (XGetSelectionOwner (dpy, sel) == vt)
3161 {
3040 display->set_selection_owner (this); 3162 display->set_selection_owner (this, clipboard);
3041 return true; 3163 return true;
3042 } 3164 }
3043 else 3165 else
3044 { 3166 {
3045 selection_clear (); 3167 selection_clear (clipboard);
3046 return false; 3168 return false;
3047 } 3169 }
3048 3170
3049#if 0 3171#if 0
3050 XTextProperty ct; 3172 XTextProperty ct;
3051 3173
3052 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 3174 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3053 { 3175 {
3054 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3176 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3055 XFree (ct.value); 3177 XFree (ct.value);
3056 } 3178 }
3057#endif 3179#endif
… …
3103 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3225 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3104 3226
3105 while (selection.mark.col > 0 3227 while (selection.mark.col > 0
3106 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3228 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3107 --selection.mark.col; 3229 --selection.mark.col;
3108 3230
3109 if (selection.op) 3231 if (selection.op)
3232 {
3110 { /* clear the old selection */ 3233 /* clear the old selection */
3111 selection.beg.row = selection.end.row = selection.mark.row; 3234 selection.beg.row = selection.end.row = selection.mark.row;
3112 selection.beg.col = selection.end.col = selection.mark.col; 3235 selection.beg.col = selection.end.col = selection.mark.col;
3113 } 3236 }
3114 3237
3115 selection.op = SELECTION_INIT; 3238 selection.op = SELECTION_INIT;
… …
3304 * a point/word/line which is either the start or end of the selection 3427 * 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 3428 * and it was decided by whichever point/word/line was `fixed' at the
3306 * time of the most recent button3 press 3429 * time of the most recent button3 press
3307 */ 3430 */
3308 if (button3 && buttonpress) 3431 if (button3 && buttonpress)
3432 {
3309 { /* button3 press */ 3433 /* button3 press */
3310 /* 3434 /*
3311 * first determine which edge of the selection we are closest to 3435 * first determine which edge of the selection we are closest to
3312 */ 3436 */
3313 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3437 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3314 || (!ROWCOL_IS_AFTER (pos, selection.end) 3438 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3332 selection.mark.row = selection.beg.row; 3456 selection.mark.row = selection.beg.row;
3333 selection.mark.col = selection.beg.col; 3457 selection.mark.col = selection.beg.col;
3334 } 3458 }
3335 } 3459 }
3336 else 3460 else
3461 {
3337 { /* button1 drag or button3 drag */ 3462 /* button1 drag or button3 drag */
3338 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3463 if (ROWCOL_IS_AFTER (selection.mark, pos))
3339 { 3464 {
3340 if (selection.mark.row == selection.end.row 3465 if (selection.mark.row == selection.end.row
3341 && selection.mark.col == selection.end.col 3466 && selection.mark.col == selection.end.col
3342 && clickchange 3467 && clickchange
… …
3359 3484
3360 if (selection.clicks == 1) 3485 if (selection.clicks == 1)
3361 { 3486 {
3362 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3487 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3363 && !ROW(selection.beg.row).is_longer () 3488 && !ROW(selection.beg.row).is_longer ()
3364#if ENABLE_FRILLS 3489#if !ENABLE_MINIMAL
3365 && !selection.rect 3490 && !selection.rect
3366#endif 3491#endif
3367 ) 3492 )
3368 selection.beg.col = ncol; 3493 selection.beg.col = ncol;
3369 3494
3370 if ( 3495 if (
3371 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3496 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3372 && !ROW(selection.end.row).is_longer () 3497 && !ROW(selection.end.row).is_longer ()
3373#if ENABLE_FRILLS 3498#if !ENABLE_MINIMAL
3374 && !selection.rect 3499 && !selection.rect
3375#endif 3500#endif
3376 ) 3501 )
3377 selection.end.col = ncol; 3502 selection.end.col = ncol;
3378 } 3503 }
… …
3385 selection_delimit_word (DN, &selection.end, &selection.end); 3510 selection_delimit_word (DN, &selection.end, &selection.end);
3386 } 3511 }
3387 else if (selection.clicks == 3) 3512 else if (selection.clicks == 3)
3388 { 3513 {
3389#if ENABLE_FRILLS 3514#if ENABLE_FRILLS
3390 if (OPTION (Opt_tripleclickwords)) 3515 if (option (Opt_tripleclickwords))
3391 { 3516 {
3392 selection_delimit_word (UP, &selection.beg, &selection.beg); 3517 selection_delimit_word (UP, &selection.beg, &selection.beg);
3393 3518
3394 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3519 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3395 { 3520 {
3396 if (!ROW(end_row).is_longer ()) 3521 if (!ROW(end_row).is_longer ())
3397 { 3522 {
3398 selection.end.row = end_row; 3523 selection.end.row = end_row;
3399 selection.end.col = ROW(end_row).l; 3524 selection.end.col = ROW(end_row).l;
3525# if !ENABLE_MINIMAL
3400 selection_remove_trailing_spaces (); 3526 selection_remove_trailing_spaces ();
3527# endif
3401 break; 3528 break;
3402 } 3529 }
3403 } 3530 }
3404 } 3531 }
3405 else 3532 else
… …
3421 selection.end.row++; 3548 selection.end.row++;
3422 } 3549 }
3423 } 3550 }
3424 3551
3425 if (button3 && buttonpress) 3552 if (button3 && buttonpress)
3553 {
3426 { /* mark may need to be changed */ 3554 /* mark may need to be changed */
3427 if (closeto == LEFT) 3555 if (closeto == LEFT)
3428 { 3556 {
3429 selection.mark.row = selection.end.row; 3557 selection.mark.row = selection.end.row;
3430 selection.mark.col = selection.end.col - (selection.clicks == 2); 3558 selection.mark.col = selection.end.col - (selection.clicks == 2);
3431 } 3559 }
… …
3434 selection.mark.row = selection.beg.row; 3562 selection.mark.row = selection.beg.row;
3435 selection.mark.col = selection.beg.col; 3563 selection.mark.col = selection.beg.col;
3436 } 3564 }
3437 } 3565 }
3438 3566
3439#if ENABLE_FRILLS 3567#if !ENABLE_MINIMAL
3440 if (selection.rect && selection.beg.col > selection.end.col) 3568 if (selection.rect && selection.beg.col > selection.end.col)
3441 ::swap (selection.beg.col, selection.end.col); 3569 ::swap (selection.beg.col, selection.end.col);
3442#endif 3570#endif
3443} 3571}
3444 3572
3445#if ENABLE_FRILLS 3573#if !ENABLE_MINIMAL
3446void 3574void
3447rxvt_term::selection_remove_trailing_spaces () NOTHROW 3575rxvt_term::selection_remove_trailing_spaces () NOTHROW
3448{ 3576{
3449 int32_t end_col, end_row; 3577 int32_t end_col, end_row;
3450 text_t *stp; 3578 text_t *stp;
… …
3528 *target++ = xa[XA_COMPOUND_TEXT]; 3656 *target++ = xa[XA_COMPOUND_TEXT];
3529#if X_HAVE_UTF8_STRING 3657#if X_HAVE_UTF8_STRING
3530 *target++ = xa[XA_UTF8_STRING]; 3658 *target++ = xa[XA_UTF8_STRING];
3531#endif 3659#endif
3532 3660
3533 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3661 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3534 32, PropModeReplace, 3662 32, PropModeReplace,
3535 (unsigned char *)target_list, target - target_list); 3663 (unsigned char *)target_list, target - target_list);
3536 ev.property = rq.property; 3664 ev.property = rq.property;
3537 } 3665 }
3538#if TODO // TODO 3666#if TODO // TODO
3539 else if (rq.target == xa[XA_MULTIPLE]) 3667 else if (rq.target == xa[XA_MULTIPLE])
3540 { 3668 {
3541 /* TODO: Handle MULTIPLE */ 3669 /* TODO: Handle MULTIPLE */
3542 } 3670 }
3543#endif 3671#endif
3544 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3672 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3545 { 3673 {
3546 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3674 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3547 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3675 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3676 ev.property = rq.property;
3677 }
3678 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3679 {
3680 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3681 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3548 ev.property = rq.property; 3682 ev.property = rq.property;
3549 } 3683 }
3550 else if (rq.target == XA_STRING 3684 else if (rq.target == XA_STRING
3551 || rq.target == xa[XA_TEXT] 3685 || rq.target == xa[XA_TEXT]
3552 || rq.target == xa[XA_COMPOUND_TEXT] 3686 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3575 style = enc_string; 3709 style = enc_string;
3576 else if (target == xa[XA_TEXT]) 3710 else if (target == xa[XA_TEXT])
3577 style = enc_text; 3711 style = enc_text;
3578 else if (target == xa[XA_COMPOUND_TEXT]) 3712 else if (target == xa[XA_COMPOUND_TEXT])
3579 style = enc_compound_text; 3713 style = enc_compound_text;
3580#if ENABLE_FRILLS 3714#if !ENABLE_MINIMAL
3581 else if (target == xa[XA_UTF8_STRING]) 3715 else if (target == xa[XA_UTF8_STRING])
3582 style = enc_utf8; 3716 style = enc_utf8;
3583#endif 3717#endif
3584 else 3718 else
3585 { 3719 {
3586 target = xa[XA_COMPOUND_TEXT]; 3720 target = xa[XA_COMPOUND_TEXT];
3587 style = enc_compound_text; 3721 style = enc_compound_text;
3588 } 3722 }
3589 3723
3590 if (selection.text) 3724 if (rq.selection == XA_PRIMARY && selection.text)
3591 { 3725 {
3592 cl = selection.text; 3726 cl = selection.text;
3593 selectlen = selection.len; 3727 selectlen = selection.len;
3594 } 3728 }
3729 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3730 {
3731 cl = selection.clip_text;
3732 selectlen = selection.clip_len;
3733 }
3595 else 3734 else
3596 { 3735 {
3597 cl = L""; 3736 cl = L"";
3598 selectlen = 0; 3737 selectlen = 0;
3599 } 3738 }
3600 3739
3601#if ENABLE_FRILLS 3740#if !ENABLE_MINIMAL
3602 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3741 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3603 // so recode it manually 3742 // so recode it manually
3604 if (style == enc_utf8) 3743 if (style == enc_utf8)
3605 { 3744 {
3606 freect = 1; 3745 freect = 1;
… …
3609 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3748 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3610 ct.nitems = strlen ((char *)ct.value); 3749 ct.nitems = strlen ((char *)ct.value);
3611 } 3750 }
3612 else 3751 else
3613#endif 3752#endif
3614 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3753 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3615 freect = 1; 3754 freect = 1;
3616 else 3755 else
3617 { 3756 {
3618 /* if we failed to convert then send it raw */ 3757 /* if we failed to convert then send it raw */
3619 ct.value = (unsigned char *)cl; 3758 ct.value = (unsigned char *)cl;
3620 ct.nitems = selectlen; 3759 ct.nitems = selectlen;
3621 ct.encoding = target; 3760 ct.encoding = target;
3622 } 3761 }
3623 3762
3624 XChangeProperty (xdisp, rq.requestor, rq.property, 3763 XChangeProperty (dpy, rq.requestor, rq.property,
3625 ct.encoding, 8, PropModeReplace, 3764 ct.encoding, 8, PropModeReplace,
3626 ct.value, (int)ct.nitems); 3765 ct.value, (int)ct.nitems);
3627 ev.property = rq.property; 3766 ev.property = rq.property;
3628 3767
3629 if (freect) 3768 if (freect)
3630 XFree (ct.value); 3769 XFree (ct.value);
3631 } 3770 }
3632 3771
3633 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3772 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} 3773}
3651 3774
3652/* ------------------------------------------------------------------------- */ 3775/* ------------------------------------------------------------------------- */
3653#ifdef USE_XIM 3776#ifdef USE_XIM
3654void 3777void
3655rxvt_term::im_set_position (XPoint &pos) NOTHROW 3778rxvt_term::im_set_position (XPoint &pos) NOTHROW
3656{ 3779{
3657 XWindowAttributes xwa; 3780 XWindowAttributes xwa;
3658 3781
3659 XGetWindowAttributes (xdisp, vt, &xwa); 3782 XGetWindowAttributes (dpy, vt, &xwa);
3660 3783
3661 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3784 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3662 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3785 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3663} 3786}
3664#endif 3787#endif
… …
3682 h += 2; min_it (h, nrow); 3805 h += 2; min_it (h, nrow);
3683 3806
3684 x -= 1; clamp_it (x, 0, ncol - w); 3807 x -= 1; clamp_it (x, 0, ncol - w);
3685 y -= 1; clamp_it (y, 0, nrow - h); 3808 y -= 1; clamp_it (y, 0, nrow - h);
3686 3809
3687 ov_x = x; ov_y = y; 3810 ov.x = x; ov.y = y;
3688 ov_w = w; ov_h = h; 3811 ov.w = w; ov.h = h;
3689 3812
3690 ov_text = new text_t *[h]; 3813 ov.text = new text_t *[h];
3691 ov_rend = new rend_t *[h]; 3814 ov.rend = new rend_t *[h];
3692 3815
3693 for (y = 0; y < h; y++) 3816 for (y = 0; y < h; y++)
3694 { 3817 {
3695 text_t *tp = ov_text[y] = new text_t[w]; 3818 text_t *tp = ov.text[y] = new text_t[w];
3696 rend_t *rp = ov_rend[y] = new rend_t[w]; 3819 rend_t *rp = ov.rend[y] = new rend_t[w];
3697 3820
3698 text_t t0, t1, t2; 3821 text_t t0, t1, t2;
3699 rend_t r = OVERLAY_RSTYLE; 3822 rend_t r = OVERLAY_RSTYLE;
3700 3823
3701 if (y == 0) 3824 if (y == 0)
… …
3720} 3843}
3721 3844
3722void 3845void
3723rxvt_term::scr_overlay_off () NOTHROW 3846rxvt_term::scr_overlay_off () NOTHROW
3724{ 3847{
3725 if (!ov_text) 3848 if (!ov.text)
3726 return; 3849 return;
3727 3850
3728 want_refresh = 1; 3851 want_refresh = 1;
3729 3852
3730 for (int y = 0; y < ov_h; y++) 3853 for (int y = 0; y < ov.h; y++)
3731 { 3854 {
3732 delete [] ov_text[y]; 3855 delete [] ov.text[y];
3733 delete [] ov_rend[y]; 3856 delete [] ov.rend[y];
3734 } 3857 }
3735 3858
3736 delete [] ov_text; ov_text = 0; 3859 delete [] ov.text; ov.text = 0;
3737 delete [] ov_rend; ov_rend = 0; 3860 delete [] ov.rend; ov.rend = 0;
3738} 3861}
3739 3862
3740void 3863void
3741rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3864rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3742{ 3865{
3743 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3866 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3744 return; 3867 return;
3745 3868
3746 x++, y++; 3869 x++, y++;
3747 3870
3748 ov_text[y][x] = text; 3871 ov.text[y][x] = text;
3749 ov_rend[y][x] = rend; 3872 ov.rend[y][x] = rend;
3750} 3873}
3751 3874
3752void 3875void
3753rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3876rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3754{ 3877{
… …
3773} 3896}
3774 3897
3775void 3898void
3776rxvt_term::scr_swap_overlay () NOTHROW 3899rxvt_term::scr_swap_overlay () NOTHROW
3777{ 3900{
3778 if (!ov_text) 3901 if (!ov.text)
3779 return; 3902 return;
3780 3903
3904 // hide cursor if it is within the overlay area
3905 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3906 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3907 screen.flags &= ~Screen_VisibleCursor;
3908
3781 // swap screen mem with overlay 3909 // swap screen mem with overlay
3782 for (int y = ov_h; y--; ) 3910 for (int y = ov.h; y--; )
3783 { 3911 {
3784 text_t *t1 = ov_text[y]; 3912 text_t *t1 = ov.text[y];
3785 rend_t *r1 = ov_rend[y]; 3913 rend_t *r1 = ov.rend[y];
3786 3914
3787 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3915 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; 3916 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3789 3917
3790 for (int x = ov_w; x--; ) 3918 for (int x = ov.w; x--; )
3791 { 3919 {
3792 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3920 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3793 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3921 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3794 } 3922 }
3795 } 3923 }

Diff Legend

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