ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.247 by root, Sun Jan 22 20:39:47 2006 UTC vs.
Revision 1.366 by sf-exg, Fri Jan 28 00:08:58 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 (display->display, 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 (display->display, 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 (display->display, 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;
… …
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--; )
645 { 655 {
646 // basically this is a slightly optimized scr_blank_screen_mem
647 // it is worth the effort on slower machines
648 line_t &l = ROW(nrow - 1 - i); 656 line_t &l = ROW(nrow - 1 - i);
649 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 {
650 scr_blank_line (l, 0, l.l, rstyle); 662 scr_blank_line (l, 0, l.l, rstyle);
651
652 l.l = 0; 663 l.l = 0;
653 l.f = 0; 664 l.f = 0;
665 }
666 else
667 scr_blank_screen_mem (l, rstyle);
654 } 668 }
655 669
656 // now copy lines below the scroll region bottom to the 670 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they 671 // bottom of the screen again, so they look as if they
658 // hadn't moved. 672 // hadn't moved.
… …
662 line_t &l2 = ROW(i); 676 line_t &l2 = ROW(i);
663 677
664 ::swap (l1, l2); 678 ::swap (l1, l2);
665 l2.touch (); 679 l2.touch ();
666 } 680 }
667 681
668 // move and/or clear selection, if any 682 // move and/or clear selection, if any
669 if (selection.op && current_screen == selection.screen) 683 if (selection.op && current_screen == selection.screen)
670 { 684 {
671 selection.beg.row -= count; 685 selection.beg.row -= count;
672 selection.end.row -= count; 686 selection.end.row -= count;
… …
680 selection.op = SELECTION_CLEAR; 694 selection.op = SELECTION_CLEAR;
681 } 695 }
682 } 696 }
683 697
684 // finally move the view window, if desired 698 // finally move the view window, if desired
685 if (OPTION (Opt_scrollWithBuffer) 699 if (option (Opt_scrollWithBuffer)
686 && view_start != 0 700 && view_start != 0
687 && view_start != -saveLines) 701 && view_start != -saveLines)
688 scr_page (UP, count); 702 scr_page (UP, count);
689 703
690 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 704 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
708 { 722 {
709 /* move selected region too */ 723 /* move selected region too */
710 selection.beg.row -= count; 724 selection.beg.row -= count;
711 selection.end.row -= count; 725 selection.end.row -= count;
712 selection.mark.row -= count; 726 selection.mark.row -= count;
713 727
714 selection_check (0); 728 selection_check (0);
715 } 729 }
716 } 730 }
717 731
718 // use a simple and robust scrolling algorithm, this 732 // use a simple and robust scrolling algorithm, this
… …
758 ZERO_SCROLLBACK (); 772 ZERO_SCROLLBACK ();
759 773
760 if (minlines > 0) 774 if (minlines > 0)
761 { 775 {
762 minlines += screen.cur.row - screen.bscroll; 776 minlines += screen.cur.row - screen.bscroll;
777 min_it (minlines, screen.cur.row - top_row);
763 778
764 if (minlines > 0 779 if (minlines > 0
765 && screen.tscroll == 0 780 && screen.tscroll == 0
766 && screen.bscroll == nrow - 1) 781 && screen.bscroll == nrow - 1)
767 { 782 {
… …
769 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
770 screen.cur.row -= minlines; 785 screen.cur.row -= minlines;
771 } 786 }
772 } 787 }
773 788
774#ifdef DEBUG_STRICT
775 assert (screen.cur.col < ncol); 789 assert (screen.cur.col < ncol);
776 assert (screen.cur.row < nrow 790 assert (screen.cur.row < nrow
777 && screen.cur.row >= top_row); 791 && screen.cur.row >= top_row);
778#endif
779 int row = screen.cur.row; 792 int row = screen.cur.row;
780 793
781 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 794 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
782 795
783 line_t *line = &ROW(row); 796 line_t *line = &ROW(row);
784 797
785 while (str < strend) 798 while (str < strend)
786 { 799 {
787 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 800 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
788 801
789 if (c < 0x20) 802 if (expect_false (c < 0x20))
790 if (c == C0_LF) 803 if (c == C0_LF)
791 { 804 {
792 max_it (line->l, screen.cur.col); 805 max_it (line->l, screen.cur.col);
793 806
794 screen.flags &= ~Screen_WrapNext; 807 screen.flags &= ~Screen_WrapNext;
… …
813 { 826 {
814 scr_tab (1, true); 827 scr_tab (1, true);
815 continue; 828 continue;
816 } 829 }
817 830
831 if (expect_false (
818 if (checksel /* see if we're writing within selection */ 832 checksel /* see if we're writing within selection */
819 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 833 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
820 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 834 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
835 ))
821 { 836 {
822 checksel = 0; 837 checksel = 0;
823 /* 838 /*
824 * If we wrote anywhere in the selected area, kill the selection 839 * If we wrote anywhere in the selected area, kill the selection
825 * XXX: should we kill the mark too? Possibly, but maybe that 840 * XXX: should we kill the mark too? Possibly, but maybe that
826 * should be a similar check. 841 * should be a similar check.
827 */ 842 */
828 CLEAR_SELECTION (); 843 CLEAR_SELECTION ();
829 } 844 }
830 845
831 if (screen.flags & Screen_WrapNext) 846 if (expect_false (screen.flags & Screen_WrapNext))
832 { 847 {
833 scr_do_wrap (); 848 scr_do_wrap ();
834 849
835 line->l = ncol; 850 line->l = ncol;
836 line->is_longer (1); 851 line->is_longer (1);
837 852
838 row = screen.cur.row; 853 row = screen.cur.row;
839 line = &ROW(row); /* _must_ refresh */ 854 line = &ROW(row); /* _must_ refresh */
840 } 855 }
841 856
842 // some utf-8 decoders "decode" surrogate characters: let's fix this. 857 // some utf-8 decoders "decode" surrogate characters: let's fix this.
843 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 858 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
844 c = 0xfffd; 859 c = 0xfffd;
845 860
846 // rely on wcwidth to tell us the character width, at least for non-latin1 861 // rely on wcwidth to tell us the character width, do wcwidth before
847 // do wcwidth before further replacements, as wcwidth might return -1 862 // further replacements, as wcwidth might return -1 for the line
848 // for the line drawing characters below as they might be invalid in the current 863 // drawing characters below as they might be invalid in the current
849 // locale. 864 // locale.
850 int width = c < 0x100 ? 1 : wcwidth (c); 865 int width = WCWIDTH (c);
851 866
852 if (charsets [screen.charset] == '0') // DEC SPECIAL 867 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
853 { 868 {
854 // vt100 special graphics and line drawing 869 // vt100 special graphics and line drawing
855 // 5f-7e standard vt100 870 // 5f-7e standard vt100
856 // 40-5e rxvt extension for extra curses acs chars 871 // 40-5e rxvt extension for extra curses acs chars
857 static uint16_t vt100_0[62] = { // 41 .. 7e 872 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
870 c = vt100_0[c - 0x41]; 885 c = vt100_0[c - 0x41];
871 width = 1; // vt100 line drawing characters are always single-width 886 width = 1; // vt100 line drawing characters are always single-width
872 } 887 }
873 } 888 }
874 889
875 if (screen.flags & Screen_Insert) 890 if (expect_false (screen.flags & Screen_Insert))
876 scr_insdel_chars (width, INSERT); 891 scr_insdel_chars (width, INSERT);
877 892
878 if (width != 0) 893 if (width != 0)
879 { 894 {
880#if !UNICODE_3 895#if !UNICODE_3
… …
885# else 900# else
886 c = 0xfffd; 901 c = 0xfffd;
887# endif 902# endif
888#endif 903#endif
889 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
890 // 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.
891 if (line->t[screen.cur.col] == NOCHAR 925 if (expect_false (line->t[screen.cur.col] == NOCHAR))
892 || (screen.cur.col < ncol - 1 926 scr_kill_char (*line, screen.cur.col);
893 && line->t[screen.cur.col + 1] == NOCHAR))
894 {
895 int col = screen.cur.col;
896
897 // find begin
898 while (col > 0 && line->t[col] == NOCHAR)
899 col--;
900
901 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
902
903 // found begin, nuke
904 do {
905 line->t[col] = ' ';
906 line->r[col] = rend;
907 col++;
908 } while (col < ncol && line->t[col] == NOCHAR);
909 }
910
911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912
913 // if the character doesn't fit into the remaining columns...
914 if (screen.cur.col > ncol - width && ncol >= width)
915 {
916 // ...output spaces
917 c = ' ';
918 // and try the same character next loop iteration
919 --str;
920 }
921 927
922 line->touch (); 928 line->touch ();
923 929
924 do 930 do
925 { 931 {
926 line->t[screen.cur.col] = c; 932 line->t[screen.cur.col] = c;
927 line->r[screen.cur.col] = rend; 933 line->r[screen.cur.col] = rend;
928 934
929 if (screen.cur.col < ncol - 1) 935 if (expect_true (screen.cur.col < ncol - 1))
930 screen.cur.col++; 936 screen.cur.col++;
931 else 937 else
932 { 938 {
933 line->l = ncol; 939 line->l = ncol;
934 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
935 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
936 break; 942
943 goto end_of_line;
937 } 944 }
938 945
939 c = NOCHAR; 946 c = NOCHAR;
940 } 947 }
941 while (--width > 0); 948 while (expect_false (--width > 0));
942 949
943 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
944 if (!width) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
945 { 952 {
946 line->touch (); 953 line->t[c] = ' ';
954 line->r[c] = rend;
955 }
947 956
948 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)
949 { 974 {
950 line->t[c] = ' ';
951 line->r[c] = rend; 975 linep = line;
976 tp = line->t + screen.cur.col - 1;
977 rp = line->r + screen.cur.col - 1;
952 } 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));
953 } 1001 }
954 } 1002 }
955 else // width == 0
956 {
957#if ENABLE_COMBINING
958 // handle combining characters
959 // we just tag the accent on the previous on-screen character.
960 // this is arguably not correct, but also arguably not wrong.
961 // we don't handle double-width characters nicely yet.
962 line_t *linep;
963 text_t *tp;
964 rend_t *rp;
965
966 if (screen.cur.col > 0)
967 {
968 linep = line;
969 tp = line->t + screen.cur.col - 1;
970 rp = line->r + screen.cur.col - 1;
971 }
972 else if (screen.cur.row > 0
973 && ROW(screen.cur.row - 1).is_longer ())
974 {
975 linep = &ROW(screen.cur.row - 1);
976 tp = line->t + ncol - 1;
977 rp = line->r + ncol - 1;
978 }
979 else
980 continue;
981
982 linep->touch ();
983
984 while (*tp == NOCHAR && tp > linep->t)
985 tp--, rp--;
986
987 // first try to find a precomposed character
988 unicode_t n = rxvt_compose (*tp, c);
989 if (n == NOCHAR)
990 n = rxvt_composite.compose (*tp, c);
991
992 *tp = n;
993 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
994#endif 1003#endif
995 }
996 } 1004 }
997 1005
998 max_it (line->l, screen.cur.col); 1006 max_it (line->l, screen.cur.col);
999 1007
1000#ifdef DEBUG_STRICT
1001 assert (screen.cur.row >= 0); 1008 assert (screen.cur.row >= 0);
1002#endif
1003} 1009}
1004 1010
1005/* ------------------------------------------------------------------------- */ 1011/* ------------------------------------------------------------------------- */
1006/* 1012/*
1007 * 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
1008 * XTERM_SEQ: CTRL-H 1014 * XTERM_SEQ: CTRL-H
1009 */ 1015 */
1010void 1016void
1011rxvt_term::scr_backspace () NOTHROW 1017rxvt_term::scr_backspace () NOTHROW
1012{ 1018{
1013 want_refresh = 1;
1014
1015 if (screen.cur.col == 0) 1019 if (screen.cur.col == 0)
1016 { 1020 {
1017 if (screen.cur.row > 0) 1021 if (screen.cur.row > 0)
1018 { 1022 {
1019#ifdef TERMCAP_HAS_BW 1023#ifdef TERMCAP_HAS_BW
1020 screen.cur.col = ncol - 1; 1024 screen.cur.col = ncol - 1;
1021 screen.cur.row--; 1025 --screen.cur.row;
1022 return; 1026
1027 want_refresh = 1;
1023#endif 1028#endif
1024 } 1029 }
1025 } 1030 }
1026 else if (!(screen.flags & Screen_WrapNext)) 1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1033 else
1027 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1028
1029 screen.flags &= ~Screen_WrapNext;
1030} 1035}
1031 1036
1032/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
1033/* 1038/*
1034 * Process Horizontal Tab 1039 * Process Horizontal Tab
… …
1057 x = i; 1062 x = i;
1058 1063
1059 if (!--count) 1064 if (!--count)
1060 break; 1065 break;
1061 } 1066 }
1062 else 1067 else
1063 ht &= l.t[i] == ' ' 1068 ht &= l.t[i] == ' '
1064 && RS_SAME (l.r[i], base_rend); 1069 && RS_SAME (l.r[i], base_rend);
1065 1070
1066 if (count) 1071 if (count)
1067 x = ncol - 1; 1072 x = ncol - 1;
1068 1073
1069 // store horizontal tab commands as characters inside the text 1074 // store horizontal tab commands as characters inside the text
1070 // buffer so they can be selected and pasted. 1075 // buffer so they can be selected and pasted.
1071 if (ht && OPTION (Opt_pastableTabs)) 1076 if (ht && option (Opt_pastableTabs))
1072 { 1077 {
1073 base_rend = SET_FONT (base_rend, 0); 1078 base_rend = SET_FONT (base_rend, 0);
1074 1079
1075 l.touch (x); 1080 l.touch (x);
1076 1081
… …
1109 * Process DEC Back Index 1114 * Process DEC Back Index
1110 * XTERM_SEQ: ESC 6 1115 * XTERM_SEQ: ESC 6
1111 * 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
1112 * in that row right. Clear left column. 1117 * in that row right. Clear left column.
1113 */ 1118 */
1114#if ENABLE_FRILLS 1119#if !ENABLE_MINIMAL
1115void 1120void
1116rxvt_term::scr_backindex () NOTHROW 1121rxvt_term::scr_backindex () NOTHROW
1117{ 1122{
1118 if (screen.cur.col > 0) 1123 if (screen.cur.col > 0)
1119 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1126 * Process DEC Forward Index 1131 * Process DEC Forward Index
1127 * XTERM_SEQ: ESC 9 1132 * XTERM_SEQ: ESC 9
1128 * 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
1129 * in that row left. Clear right column. 1134 * in that row left. Clear right column.
1130 */ 1135 */
1131#if ENABLE_FRILLS 1136#if !ENABLE_MINIMAL
1132void 1137void
1133rxvt_term::scr_forwardindex () NOTHROW 1138rxvt_term::scr_forwardindex () NOTHROW
1134{ 1139{
1135 if (screen.cur.col < ncol - 1) 1140 if (screen.cur.col < ncol - 1)
1136 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1183 } 1188 }
1184 } 1189 }
1185 else 1190 else
1186 { 1191 {
1187 if (screen.flags & Screen_Relative) 1192 if (screen.flags & Screen_Relative)
1193 {
1188 { /* relative origin mode */ 1194 /* relative origin mode */
1189 screen.cur.row = row + screen.tscroll; 1195 screen.cur.row = row + screen.tscroll;
1190 min_it (screen.cur.row, screen.bscroll); 1196 min_it (screen.cur.row, screen.bscroll);
1191 } 1197 }
1192 else 1198 else
1193 screen.cur.row = row; 1199 screen.cur.row = row;
… …
1226/* 1232/*
1227 * Erase part or whole of a line 1233 * Erase part or whole of a line
1228 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1234 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1229 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1235 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1230 * 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
1231 */ 1238 */
1232void 1239void
1233rxvt_term::scr_erase_line (int mode) NOTHROW 1240rxvt_term::scr_erase_line (int mode) NOTHROW
1234{ 1241{
1235 unsigned int col, num; 1242 unsigned int col, num;
… …
1244 line.touch (); 1251 line.touch ();
1245 line.is_longer (0); 1252 line.is_longer (0);
1246 1253
1247 switch (mode) 1254 switch (mode)
1248 { 1255 {
1256 case 3:
1257 if (screen.flags & Screen_WrapNext)
1258 return;
1259
1260 /* fall through */
1261
1249 case 0: /* erase to end of line */ 1262 case 0: /* erase to end of line */
1250 col = screen.cur.col; 1263 col = screen.cur.col;
1251 num = ncol - col; 1264 num = ncol - col;
1252 min_it (line.l, col); 1265 min_it (line.l, col);
1266
1253 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1267 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1254 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1268 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1255 CLEAR_SELECTION (); 1269 CLEAR_SELECTION ();
1256 break; 1270 break;
1271
1257 case 1: /* erase to beginning of line */ 1272 case 1: /* erase to beginning of line */
1258 col = 0; 1273 col = 0;
1259 num = screen.cur.col + 1; 1274 num = screen.cur.col + 1;
1275
1260 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1276 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1261 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1277 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1262 CLEAR_SELECTION (); 1278 CLEAR_SELECTION ();
1263 break; 1279 break;
1280
1264 case 2: /* erase whole line */ 1281 case 2: /* erase whole line */
1265 col = 0; 1282 col = 0;
1266 num = ncol; 1283 num = ncol;
1267 line.l = 0; 1284 line.l = 0;
1268 if (selection.beg.row <= screen.cur.row 1285 if (selection.beg.row <= screen.cur.row
… …
1326 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1327 return; 1344 return;
1328 1345
1329 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1330 1347
1331 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1332 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1333 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1334 { 1351 {
1335 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1336 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);
1337 } 1358 }
1338 else 1359 else
1339 { 1360 {
1340 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1362
1363 if (mapped)
1364 {
1341 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1342 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1343 ERASE_ROWS (row, num); 1367 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start),
1369 (unsigned int)width,
1370 (unsigned int)Height2Pixel (num));
1344 gcvalue.foreground = pix_colors[Color_fg]; 1371 gcvalue.foreground = pix_colors[Color_fg];
1345 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1372 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 }
1346 } 1374 }
1347 1375
1348 for (; num--; row++) 1376 for (; num--; row++)
1349 { 1377 {
1350 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1379
1380 if (row - view_start < nrow)
1351 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1352 } 1382 }
1353} 1383}
1354 1384
1355#if ENABLE_FRILLS 1385#if !ENABLE_MINIMAL
1356void 1386void
1357rxvt_term::scr_erase_savelines () NOTHROW 1387rxvt_term::scr_erase_savelines () NOTHROW
1358{ 1388{
1359 want_refresh = 1; 1389 want_refresh = 1;
1360 ZERO_SCROLLBACK (); 1390 ZERO_SCROLLBACK ();
… …
1430 * Insert/Delete <count> characters from the current position 1460 * Insert/Delete <count> characters from the current position
1431 */ 1461 */
1432void 1462void
1433rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1463rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1434{ 1464{
1435 int col, row;
1436 rend_t tr;
1437
1438 want_refresh = 1; 1465 want_refresh = 1;
1439 ZERO_SCROLLBACK (); 1466 ZERO_SCROLLBACK ();
1440 1467
1441 if (count <= 0) 1468 if (count <= 0)
1442 return; 1469 return;
… …
1444 scr_do_wrap (); 1471 scr_do_wrap ();
1445 1472
1446 selection_check (1); 1473 selection_check (1);
1447 min_it (count, ncol - screen.cur.col); 1474 min_it (count, ncol - screen.cur.col);
1448 1475
1449 row = screen.cur.row; 1476 int row = screen.cur.row;
1450 1477
1451 line_t *line = &ROW(row); 1478 line_t *line = &ROW(row);
1452 1479
1453 line->touch (); 1480 line->touch ();
1454 line->is_longer (0); 1481 line->is_longer (0);
1455 1482
1483 // nuke wide spanning the start
1484 if (line->t[screen.cur.col] == NOCHAR)
1485 scr_kill_char (*line, screen.cur.col);
1486
1456 switch (insdel) 1487 switch (insdel)
1457 { 1488 {
1458 case INSERT: 1489 case INSERT:
1459 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--)
1460 { 1496 {
1461 line->t[col] = line->t[col - count]; 1497 line->t[col] = line->t[col - count];
1462 line->r[col] = line->r[col - count]; 1498 line->r[col] = line->r[col - count];
1463 } 1499 }
1464
1465 line->l = min (line->l + count, ncol);
1466 1500
1467 if (selection.op && current_screen == selection.screen 1501 if (selection.op && current_screen == selection.screen
1468 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1502 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1469 { 1503 {
1470 if (selection.end.row != screen.cur.row 1504 if (selection.end.row != screen.cur.row
1471 || (selection.end.col + count >= ncol)) 1505 || (selection.end.col + count >= ncol))
1472 CLEAR_SELECTION (); 1506 CLEAR_SELECTION ();
1473 else 1507 else
1508 {
1474 { /* shift selection */ 1509 /* shift selection */
1475 selection.beg.col += count; 1510 selection.beg.col += count;
1476 selection.mark.col += count; /* XXX: yes? */ 1511 selection.mark.col += count; /* XXX: yes? */
1477 selection.end.col += count; 1512 selection.end.col += count;
1478 } 1513 }
1479 } 1514 }
… …
1484 case ERASE: 1519 case ERASE:
1485 screen.cur.col += count; /* don't worry if > ncol */ 1520 screen.cur.col += count; /* don't worry if > ncol */
1486 selection_check (1); 1521 selection_check (1);
1487 screen.cur.col -= count; 1522 screen.cur.col -= count;
1488 1523
1489 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
1490 scr_blank_line (*line, screen.cur.col, count, rstyle); 1528 scr_blank_line (*line, screen.cur.col, count, rstyle);
1491 break; 1529 break;
1492 1530
1493 case DELETE: 1531 case DELETE:
1494 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1532 line->l = max (line->l - count, 0);
1495 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
1496 for (col = screen.cur.col; (col + count) < ncol; col++) 1538 for (int col = screen.cur.col; (col + count) < ncol; col++)
1497 { 1539 {
1498 line->t[col] = line->t[col + count]; 1540 line->t[col] = line->t[col + count];
1499 line->r[col] = line->r[col + count]; 1541 line->r[col] = line->r[col + count];
1500 } 1542 }
1501 1543
1502 line->l = max (line->l - count, 0);
1503 scr_blank_line (*line, ncol - count, count, tr); 1544 scr_blank_line (*line, ncol - count, count, rstyle);
1504 1545
1505 if (selection.op && current_screen == selection.screen 1546 if (selection.op && current_screen == selection.screen
1506 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1507 { 1548 {
1508 if (selection.end.row != screen.cur.row 1549 if (selection.end.row != screen.cur.row
… …
1618 */ 1659 */
1619void 1660void
1620rxvt_term::scr_set_tab (int mode) NOTHROW 1661rxvt_term::scr_set_tab (int mode) NOTHROW
1621{ 1662{
1622 if (mode < 0) 1663 if (mode < 0)
1623 memset (tabs, 0, ncol * sizeof (char)); 1664 memset (tabs, 0, ncol);
1624 else if (screen.cur.col < ncol) 1665 else if (screen.cur.col < ncol)
1625 tabs [screen.cur.col] = !!mode; 1666 tabs [screen.cur.col] = !!mode;
1626} 1667}
1627 1668
1628/* ------------------------------------------------------------------------- */ 1669/* ------------------------------------------------------------------------- */
… …
1643 if (rvideo_state != on) 1684 if (rvideo_state != on)
1644 { 1685 {
1645 rvideo_state = on; 1686 rvideo_state = on;
1646 1687
1647 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1648#if XPM_BACKGROUND 1689#ifdef HAVE_BG_PIXMAP
1649 if (bgPixmap.pixmap == None) 1690 if (bg_pixmap == None)
1650#endif 1691#endif
1651#if TRANSPARENT
1652 if (!OPTION (Opt_transparent) || am_transparent == 0)
1653#endif
1654 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1655 1693
1656 XGCValues gcvalue; 1694 XGCValues gcvalue;
1657 gcvalue.foreground = pix_colors[Color_fg]; 1695 gcvalue.foreground = pix_colors[Color_fg];
1658 gcvalue.background = pix_colors[Color_bg]; 1696 gcvalue.background = pix_colors[Color_bg];
1659 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); 1697 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1660 1698
1661 scr_clear (); 1699 scr_clear ();
1662 scr_touch (true); 1700 scr_touch (true);
1663 } 1701 }
1664} 1702}
… …
1749{ 1787{
1750 bool found = false; 1788 bool found = false;
1751 1789
1752 for (int i = 0; i < nrow; i++) 1790 for (int i = 0; i < nrow; i++)
1753 { 1791 {
1754 int col = 0;
1755 rend_t *drp = drawn_buf[i].r; 1792 rend_t *drp = drawn_buf[i].r;
1756 1793
1757 for (; col < ncol; col++, drp++) 1794 for (int col = 0; col < ncol; col++, drp++)
1758 if ((*drp & mask) == value) 1795 if ((*drp & mask) == value)
1759 { 1796 {
1760 found = true; 1797 found = true;
1761 *drp = ~value; 1798 *drp = ~value;
1762 } 1799 }
… …
1867 return true; 1904 return true;
1868} 1905}
1869 1906
1870#ifndef NO_BELL 1907#ifndef NO_BELL
1871void 1908void
1872rxvt_term::bell_cb (time_watcher &w) 1909rxvt_term::bell_cb (ev::timer &w, int revents)
1873{ 1910{
1874 rvideo_bell = false; 1911 rvideo_bell = false;
1875 scr_rvideo_mode (rvideo_mode); 1912 scr_rvideo_mode (rvideo_mode);
1913 refresh_check ();
1876} 1914}
1877#endif 1915#endif
1878 1916
1879/* ------------------------------------------------------------------------- */ 1917/* ------------------------------------------------------------------------- */
1880void 1918void
… …
1882{ 1920{
1883#ifndef NO_BELL 1921#ifndef NO_BELL
1884 1922
1885# ifndef NO_MAPALERT 1923# ifndef NO_MAPALERT
1886# ifdef MAPALERT_OPTION 1924# ifdef MAPALERT_OPTION
1887 if (OPTION (Opt_mapAlert)) 1925 if (option (Opt_mapAlert))
1888# endif 1926# endif
1889 XMapWindow (display->display, parent[0]); 1927 XMapWindow (dpy, parent[0]);
1890# endif 1928# endif
1891 1929
1930# if ENABLE_FRILLS
1931 if (option (Opt_urgentOnBell))
1932 set_urgency (1);
1933# endif
1934
1892 if (OPTION (Opt_visualBell)) 1935 if (option (Opt_visualBell))
1893 { 1936 {
1894 rvideo_bell = true; 1937 rvideo_bell = true;
1895 scr_rvideo_mode (rvideo_mode); 1938 scr_rvideo_mode (rvideo_mode);
1896 display->flush (); 1939 flush ();
1897 1940
1898 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1899 } 1942 }
1900 else 1943 else
1901 XBell (display->display, 0); 1944 XBell (dpy, 0);
1902 1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1903#endif 1946#endif
1904} 1947}
1905 1948
1906/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1907/* ARGSUSED */ 1950/* ARGSUSED */
1908void 1951void
1909rxvt_term::scr_printscreen (int fullhist) NOTHROW 1952rxvt_term::scr_printscreen (int fullhist) NOTHROW
1910{ 1953{
1911#ifdef PRINTPIPE 1954#ifdef PRINTPIPE
1912 int nrows, row_start; 1955 int nrows, row_start;
1913 FILE *fd; 1956 FILE *fd = popen_printer ();
1914 1957
1915 if ((fd = popen_printer ()) == NULL) 1958 if (!fd)
1916 return; 1959 return;
1917 1960
1918 if (fullhist) 1961 if (fullhist)
1919 { 1962 {
1920 nrows = nrow - top_row; 1963 nrows = nrow - top_row;
… …
1926 row_start = view_start; 1969 row_start = view_start;
1927 } 1970 }
1928 1971
1929 wctomb (0, 0); 1972 wctomb (0, 0);
1930 1973
1931 for (int r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1932 { 1975 {
1933 text_t *tp = ROW(r1).t; 1976 text_t *tp = ROW(r1).t;
1934 int len = ROW(r1).l; 1977 int len = ROW(r1).l;
1935 1978
1936 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
… …
1965 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
1966 */ 2009 */
1967void 2010void
1968rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
1969{ 2012{
1970 unsigned char must_clear, /* use draw_string not draw_image_string */
1971 showcursor; /* show the cursor */
1972 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
1973 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
1974 int i; /* tmp */ 2015 int i; /* tmp */
1975#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
1976 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
1977#endif 2018#endif
1978 rend_t *crp; // cursor rendition pointer 2019 rend_t *crp; // cursor rendition pointer
2020 rend_t ccol1, /* Cursor colour */
2021 ccol2; /* Cursor colour2 */
1979 2022
1980 want_refresh = 0; /* screen is current */ 2023 want_refresh = 0; /* screen is current */
1981 2024
1982 if (refresh_type == NO_REFRESH || !mapped) 2025 if (refresh_type == NO_REFRESH || !mapped)
1983 return; 2026 return;
1984 2027
1985 /* 2028 /*
1986 * A: set up vars 2029 * A: set up vars
1987 */ 2030 */
1988 must_clear = 0;
1989 refresh_count = 0; 2031 refresh_count = 0;
1990 2032
1991#if XPM_BACKGROUND 2033 unsigned int old_screen_flags = screen.flags;
1992 must_clear |= bgPixmap.pixmap != None; 2034 char have_bg = 0;
1993#endif 2035#ifdef HAVE_BG_PIXMAP
1994#if TRANSPARENT 2036 have_bg = bg_pixmap != None;
1995 must_clear |= OPTION (Opt_transparent) && am_transparent;
1996#endif 2037#endif
1997 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1998 2039
1999 /* 2040 /*
2000 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2001 */ 2042 */
2002 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;
2003 2051
2004 /* 2052 /*
2005 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2006 */ 2054 */
2007 { 2055 {
2008 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2009 rend_t ccol1, /* Cursor colour */
2010 ccol2; /* Cursor colour2 */
2011 2057
2012 showcursor = (screen.flags & Screen_VisibleCursor);
2013#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2014 if (hidden_cursor) 2059 if (hidden_cursor)
2015 showcursor = 0; 2060 showcursor = 0;
2016#endif 2061#endif
2017 2062
… …
2022 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2067 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2023 col--; 2068 col--;
2024 2069
2025 crp = &ROW(screen.cur.row).r[col]; 2070 crp = &ROW(screen.cur.row).r[col];
2026 2071
2027 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)
2028 { 2096 {
2029 if (OPTION (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2030 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2031 else 2099 else
2032 { 2100 {
2033 *crp ^= RS_RVid; 2101 *crp ^= RS_RVid;
2034
2035#ifndef NO_CURSORCOLOR
2036 cc1 = *crp & (RS_fgMask | RS_bgMask);
2037 if (ISSET_PIXCOLOR (Color_cursor))
2038 ccol1 = Color_cursor;
2039 else
2040#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2041 ccol1 = fgcolor_of (rstyle);
2042#else
2043 ccol1 = Color_fg;
2044#endif
2045 if (ISSET_PIXCOLOR (Color_cursor2))
2046 ccol2 = Color_cursor2;
2047 else
2048#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2049 ccol2 = bgcolor_of (rstyle);
2050#else
2051 ccol2 = Color_bg;
2052#endif
2053 *crp = SET_FGCOLOR (*crp, ccol1); 2102 *crp = SET_FGCOLOR (*crp, ccol1);
2054 *crp = SET_BGCOLOR (*crp, ccol2); 2103 *crp = SET_BGCOLOR (*crp, ccol2);
2055#endif
2056 } 2104 }
2057 } 2105 }
2058 } 2106 }
2059 2107
2060 /* make sure no outline cursor is left around */ 2108 /* make sure no outline cursor is left around */
… …
2087 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2088 } 2136 }
2089 } 2137 }
2090 } 2138 }
2091 2139
2092 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2093#if ENABLE_OVERLAY
2094 scr_swap_overlay ();
2095#endif
2096
2097#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2098 /* 2141 /*
2099 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2100 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2101 */ 2144 */
2102 if (!display->is_local 2145 if (!display->is_local
2103 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2146 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2104 && abs (num_scr) < nrow && !must_clear) 2147 && abs (num_scr) < nrow && !have_bg)
2105 { 2148 {
2106 int16_t nits; 2149 int16_t nits;
2150 int i = num_scr;
2107 int j; 2151 int j;
2108 int len, wlen; 2152 int len, wlen;
2109 dLocal (int, num_scr); 2153 dLocal (int, num_scr);
2110 2154
2111 j = nrow; 2155 j = nrow;
2112 wlen = len = -1; 2156 wlen = len = -1;
2113 row = i > 0 ? 0 : j - 1; 2157 row = i > 0 ? 0 : j - 1;
2158
2114 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2159 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2115 { 2160 {
2116 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2161 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2117 { 2162 {
2118 line_t s = ROW(view_start + row); 2163 line_t s = ROW(view_start + row);
… …
2139 wlen = row; 2184 wlen = row;
2140 continue; 2185 continue;
2141 } 2186 }
2142 } 2187 }
2143 2188
2144 if (len != -1) 2189 if (len >= 0)
2145 { 2190 {
2146 /* also comes here at end if needed because of >= above */ 2191 /* also comes here at end if needed because of >= above */
2147 if (wlen < len) 2192 if (wlen < len)
2148 ::swap (wlen, len); 2193 ::swap (wlen, len);
2149 2194
2195 XGCValues gcv;
2196
2197 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2150 XCopyArea (display->display, vt, vt, 2198 XCopyArea (dpy, vt, vt,
2151 gc, 0, Row2Pixel (len + i), 2199 gc, 0, Row2Pixel (len + i),
2152 (unsigned int)this->width, 2200 (unsigned int)this->width,
2153 (unsigned int)Height2Pixel (wlen - len + 1), 2201 (unsigned int)Height2Pixel (wlen - len + 1),
2154 0, Row2Pixel (len)); 2202 0, Row2Pixel (len));
2203 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2204
2155 len = -1; 2205 len = -1;
2156 } 2206 }
2157 } 2207 }
2158 } 2208 }
2159#endif 2209#endif
… …
2183 continue; 2233 continue;
2184 2234
2185 // redraw one or more characters 2235 // redraw one or more characters
2186 2236
2187 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2188 while (stp[col] == NOCHAR && col > 0) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2189 --col; 2239 --col;
2190 2240
2191 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2192 text_t *text = stp + col; 2242 text_t *text = stp + col;
2193 int count = 1; 2243 int count = 1;
2194 2244
2195 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2196 drp[col] = rend; 2246 drp[col] = rend;
… …
2200 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2201 { 2251 {
2202 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2203 { 2253 {
2204 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2205 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2206 count++; 2257 count++;
2207 i++; 2258 i++;
2208 2259
2209 continue; 2260 continue;
2210 } 2261 }
… …
2215 count++; 2266 count++;
2216 2267
2217 if (stp[col] != dtp[col] 2268 if (stp[col] != dtp[col]
2218 || !RS_SAME (srp[col], drp[col])) 2269 || !RS_SAME (srp[col], drp[col]))
2219 { 2270 {
2220 if (must_clear && (i++ > count / 2)) 2271 if (have_bg && (i++ > count / 2))
2221 break; 2272 break;
2222 2273
2223 dtp[col] = stp[col]; 2274 dtp[col] = stp[col];
2224 drp[col] = rend; 2275 drp[col] = rend;
2225 i = 0; 2276 i = 0;
2226 } 2277 }
2227 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2278 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2228 break; 2279 break;
2229 } 2280 }
2230 2281
2231 col--; /* went one too far. move back */ 2282 col--; /* went one too far. move back */
2232 count -= i; /* dump any matching trailing chars */ 2283 count -= i; /* dump any matching trailing chars */
2233 2284
2234 // sometimes we optimize away the trailing NOCHAR's, add them back 2285 // sometimes we optimize away the trailing NOCHAR's, add them back
2235 while (i && text[count] == NOCHAR) 2286 while (expect_false (i && text[count] == NOCHAR))
2236 count++, i--; 2287 count++, i--;
2237 2288
2238 /* 2289 /*
2239 * Determine the attributes for the string 2290 * Determine the attributes for the string
2240 */ 2291 */
2241 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2242 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2243 2294
2244 // 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
2245 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)))
2246 { 2297 {
2247#if ENABLE_STYLES
2248 // force redraw after "careful" characters to avoid pixel droppings
2249 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2250 drp[col + 1] = ~srp[col + 1];
2251
2252 // include previous careful character(s) if possible, looks nicer (best effort...)
2253 while (text > stp
2254 && srp[text - stp - 1] & RS_Careful
2255 && RS_SAME (rend, srp[text - stp - 1]))
2256 text--, count++, xpixel -= fwidth;
2257#endif
2258
2259 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2260 2299
2261#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2262 if (rend & RS_Bold
2263 && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
2264 { 2302 {
2265 if (ISSET_PIXCOLOR (Color_BD)) 2303 if (ISSET_PIXCOLOR (Color_BD))
2266 fore = Color_BD; 2304 fore = Color_BD;
2267# if !ENABLE_STYLES 2305# if !ENABLE_STYLES
2268 else 2306 else
2269 invert = !invert; 2307 invert = !invert;
2270# endif 2308# endif
2271 } 2309 }
2272 2310
2273 if (rend & RS_Italic 2311 if (rend & RS_Italic && fore == Color_fg)
2274 && fore == Color_fg)
2275 { 2312 {
2276 if (ISSET_PIXCOLOR (Color_IT)) 2313 if (ISSET_PIXCOLOR (Color_IT))
2277 fore = Color_IT; 2314 fore = Color_IT;
2278# if !ENABLE_STYLES 2315# if !ENABLE_STYLES
2279 else 2316 else
2280 invert = !invert; 2317 invert = !invert;
2281# endif 2318# endif
2282 } 2319 }
2283 2320
2284 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2285 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 }
2286#endif 2343#endif
2287 2344
2288 if (invert) 2345 if (invert)
2289 { 2346 {
2290 ::swap (fore, back); 2347 ::swap (fore, back);
2291 2348
2292#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2293 if (ISSET_PIXCOLOR (Color_RV))
2294 back = Color_RV;
2295
2296 if (fore == back) 2350 if (fore == back)
2297 { 2351 {
2298 fore = Color_bg; 2352 fore = Color_bg;
2299 back = Color_fg; 2353 back = Color_fg;
2300 } 2354 }
… …
2302 } 2356 }
2303 2357
2304#ifdef TEXT_BLINK 2358#ifdef TEXT_BLINK
2305 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2359 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2306 { 2360 {
2307 if (!text_blink_ev.active) 2361 if (!text_blink_ev.is_active ())
2308 { 2362 {
2309 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2363 text_blink_ev.again ();
2310 hidden_text = 0; 2364 hidden_text = 0;
2311 } 2365 }
2312 else if (hidden_text) 2366 else if (hidden_text)
2313 fore = back; 2367 fore = back;
2314 } 2368 }
2315#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
2316 } 2388 }
2317 2389
2318 /* 2390 /*
2319 * Actually do the drawing of the string here 2391 * Actually do the drawing of the string here
2320 */ 2392 */
2321 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2322 2394
2323 if (back == fore) 2395 if (expect_true (have_bg && back == Color_bg))
2324 font->clear_rect (*drawable, xpixel, ypixel,
2325 fwidth * count, fheight,
2326 back);
2327 else if (back == Color_bg)
2328 { 2396 {
2329 if (must_clear) 2397 // this is very ugly, maybe push it into ->draw?
2330 {
2331 CLEAR_CHARS (xpixel, ypixel, count);
2332 2398
2333 for (i = 0; i < count; i++) /* don't draw empty strings */ 2399 for (i = 0; i < count; i++) /* don't draw empty strings */
2334 if (text[i] != ' ') 2400 if (text[i] != ' ')
2335 { 2401 {
2336 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2402 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2337 break; 2403 goto did_clear;
2338 }
2339 } 2404 }
2340 else 2405
2341 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2406 CLEAR_CHARS (xpixel, ypixel, count);
2407 did_clear: ;
2342 } 2408 }
2343 else 2409 else
2344 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2345 2411
2346 if (rend & RS_Uline && font->descent > 1 && fore != back) 2412 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2347 { 2413 {
2348#if ENABLE_FRILLS 2414#if ENABLE_FRILLS
2349 if (ISSET_PIXCOLOR (Color_underline)) 2415 if (ISSET_PIXCOLOR (Color_underline))
2350 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2416 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2351 else 2417 else
2352#endif 2418#endif
2353 XSetForeground (display->display, gc, pix_colors[fore]); 2419 XSetForeground (dpy, gc, pix_colors[fore]);
2354 2420
2355 XDrawLine (display->display, drawBuffer, gc, 2421 XDrawLine (dpy, vt, gc,
2356 xpixel, ypixel + font->ascent + 1, 2422 xpixel, ypixel + font->ascent + 1,
2357 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2423 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2358 } 2424 }
2359 } /* for (col....) */ 2425 } /* for (col....) */
2360 } /* for (row....) */ 2426 } /* for (row....) */
2361 2427
2362#if ENABLE_OVERLAY
2363 scr_swap_overlay ();
2364#endif
2365 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2366
2367 /* 2428 /*
2368 * G: cleanup cursor and display outline cursor if necessary 2429 * G: cleanup cursor and display outline cursor if necessary
2369 */ 2430 */
2370 if (showcursor) 2431 if (showcursor)
2371 { 2432 {
2372 if (focus) 2433 if (focus)
2373 { 2434 {
2374 if (OPTION (Opt_cursorUnderline)) 2435 if (option (Opt_cursorUnderline))
2375 *crp ^= RS_Uline; 2436 *crp ^= RS_Uline;
2376 else 2437 else
2377 { 2438 {
2378 *crp ^= RS_RVid; 2439 *crp ^= RS_RVid;
2379#ifndef NO_CURSORCOLOR 2440#ifndef NO_CURSORCOLOR
… …
2393 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2454 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2394 cursorwidth++; 2455 cursorwidth++;
2395 2456
2396#ifndef NO_CURSORCOLOR 2457#ifndef NO_CURSORCOLOR
2397 if (ISSET_PIXCOLOR (Color_cursor)) 2458 if (ISSET_PIXCOLOR (Color_cursor))
2398 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2459 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2460 else
2399#endif 2461#endif
2462 XSetForeground (dpy, gc, pix_colors[ccol1]);
2400 2463
2401 XDrawRectangle (display->display, drawBuffer, gc, 2464 XDrawRectangle (dpy, vt, gc,
2402 Col2Pixel (col), 2465 Col2Pixel (col),
2403 Row2Pixel (oldcursor.row), 2466 Row2Pixel (oldcursor.row),
2404 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2467 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2405 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2468 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2406 } 2469 }
2407 } 2470 }
2408 2471
2409 /* 2472 /*
2410 * H: cleanup selection 2473 * H: cleanup selection
2411 */ 2474 */
2475#if ENABLE_OVERLAY
2476 scr_swap_overlay ();
2477#endif
2478 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2479
2412 scr_reverse_selection (); 2480 scr_reverse_selection ();
2413 2481
2482 screen.flags = old_screen_flags;
2414 num_scr = 0; 2483 num_scr = 0;
2415 num_scr_allow = 1; 2484 num_scr_allow = 1;
2416} 2485}
2417 2486
2418void 2487void
… …
2439 scr_remap_chars (swap_buf [i]); 2508 scr_remap_chars (swap_buf [i]);
2440 } 2509 }
2441} 2510}
2442 2511
2443void 2512void
2444rxvt_term::scr_recolour () NOTHROW 2513rxvt_term::scr_recolour (bool refresh) NOTHROW
2445{ 2514{
2446 if (1 2515 bool transparent = false;
2447#if TRANSPARENT 2516
2448 && !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
2449#endif 2529# endif
2450#if XPM_BACKGROUND
2451 && !bgPixmap.pixmap
2452#endif
2453 ) 2530 {
2531 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2532 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2533 }
2454 { 2534 }
2535 else
2536#endif
2537 {
2455 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2538 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2456 XClearWindow (display->display, parent[0]);
2457 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2539 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2458#if HAVE_SCROLLBARS 2540 }
2541
2542 XClearWindow (dpy, parent[0]);
2543
2459 if (scrollBar.win) 2544 if (scrollBar.win)
2460 { 2545 {
2546 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else
2461 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2462 scrollBar.setIdle (); 2550 scrollBar.state = STATE_IDLE;
2463 scrollbar_show (0); 2551 scrollBar.show (0);
2464 } 2552 }
2465#endif 2553
2554 if (refresh)
2466 } 2555 {
2467
2468 scr_clear (); 2556 scr_clear ();
2469 scr_touch (true); 2557 scr_touch (true);
2558 }
2470 want_refresh = 1; 2559 want_refresh = 1;
2471} 2560}
2472 2561
2473/* ------------------------------------------------------------------------- */ 2562/* ------------------------------------------------------------------------- */
2474void 2563void
… …
2479 2568
2480 num_scr_allow = 0; 2569 num_scr_allow = 0;
2481 want_refresh = 1; 2570 want_refresh = 1;
2482 2571
2483 if (really) 2572 if (really)
2484 XClearWindow (display->display, vt); 2573 XClearWindow (dpy, vt);
2485} 2574}
2486 2575
2487void 2576void
2488rxvt_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
2489{ 2578{
… …
2538{ 2627{
2539 if (selection.op 2628 if (selection.op
2540 && current_screen == selection.screen 2629 && current_screen == selection.screen
2541 && selection.end.row >= view_start) 2630 && selection.end.row >= view_start)
2542 { 2631 {
2543#if ENABLE_FRILLS 2632#if !ENABLE_MINIMAL
2544 if (selection.rect) 2633 if (selection.rect)
2545 scr_xor_rect (selection.beg.row, selection.beg.col, 2634 scr_xor_rect (selection.beg.row, selection.beg.col,
2546 selection.end.row, selection.end.col, 2635 selection.end.row, selection.end.col,
2547 RS_RVid, RS_RVid | RS_Uline); 2636 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2548 else 2637 else
2549#endif 2638#endif
2550 scr_xor_span (selection.beg.row, selection.beg.col, 2639 scr_xor_span (selection.beg.row, selection.beg.col,
2551 selection.end.row, selection.end.col, 2640 selection.end.row, selection.end.col,
2552 RS_RVid); 2641 RS_Sel | RS_RVid);
2553 } 2642 }
2554} 2643}
2555 2644
2556/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2557/* 2646/*
… …
2562void 2651void
2563rxvt_term::scr_dump (int fd) NOTHROW 2652rxvt_term::scr_dump (int fd) NOTHROW
2564{ 2653{
2565 int row, wrote; 2654 int row, wrote;
2566 unsigned int width, towrite; 2655 unsigned int width, towrite;
2567 char r1[] = "\n"; 2656 const char r1[] = "\n";
2568 2657
2569 for (row = saveLines - nsaved; 2658 for (row = saveLines + top_row;
2570 row < saveLines + nrow - 1; row++) 2659 row < saveLines + nrow - 1; row++)
2571 { 2660 {
2572 width = row_buf[row].l >= 0 ? row_buf[row].l 2661 width = row_buf[row].l >= 0 ? row_buf[row].l
2573 : ncol; 2662 : ncol;
2574 for (towrite = width; towrite; towrite -= wrote) 2663 for (towrite = width; towrite; towrite -= wrote)
… …
2618/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2619/* 2708/*
2620 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2621 */ 2710 */
2622void 2711void
2623rxvt_term::paste (char *data, unsigned int len) NOTHROW 2712rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2624{ 2713{
2625 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2626 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2627 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2628 data[i] = C0_CR; 2717 data[i] = C0_CR;
2629 2718
2719 if (priv_modes & PrivMode_BracketPaste)
2720 tt_printf ("\e[200~");
2721
2630 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);
2631} 2735}
2632 2736
2633/* ------------------------------------------------------------------------- */ 2737/* ------------------------------------------------------------------------- */
2634/* 2738/*
2635 * Respond to a notification that a primary selection has been sent 2739 * Respond to a notification that a primary selection has been sent
… …
2664 } 2768 }
2665 2769
2666 unsigned long bytes_after; 2770 unsigned long bytes_after;
2667 XTextProperty ct; 2771 XTextProperty ct;
2668 2772
2669 if (XGetWindowProperty (display->display, win, prop, 2773 if (XGetWindowProperty (dpy, win, prop,
2670 0, PROP_SIZE / 4, 2774 0, PROP_SIZE / 4,
2671 delete_prop, AnyPropertyType, 2775 delete_prop, AnyPropertyType,
2672 &ct.encoding, &ct.format, 2776 &ct.encoding, &ct.format,
2673 &ct.nitems, &bytes_after, 2777 &ct.nitems, &bytes_after,
2674 &ct.value) != Success) 2778 &ct.value) != Success)
… …
2683 if (bytes_after) 2787 if (bytes_after)
2684 { 2788 {
2685 // fetch and append remaining data 2789 // fetch and append remaining data
2686 XTextProperty ct2; 2790 XTextProperty ct2;
2687 2791
2688 if (XGetWindowProperty (display->display, win, prop, 2792 if (XGetWindowProperty (dpy, win, prop,
2689 ct.nitems / 4, (bytes_after + 3) / 4, 2793 ct.nitems / 4, (bytes_after + 3) / 4,
2690 delete_prop, AnyPropertyType, 2794 delete_prop, AnyPropertyType,
2691 &ct2.encoding, &ct2.format, 2795 &ct2.encoding, &ct2.format,
2692 &ct2.nitems, &bytes_after, 2796 &ct2.nitems, &bytes_after,
2693 &ct2.value) != Success) 2797 &ct2.value) != Success)
2694 goto bailout; 2798 goto bailout;
2695 2799
2696 // realloc should be compatible to XFree, here, and elsewhere, too 2800 // realloc should be compatible to XFree, here, and elsewhere, too
2697 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); 2801 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2698 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); 2802 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2699 ct.nitems += ct2.nitems; 2803 ct.nitems += ct2.nitems;
2700 2804
2701 XFree (ct2.value); 2805 XFree (ct2.value);
2702 } 2806 }
… …
2706 2810
2707 if (ct.encoding == xa[XA_INCR]) 2811 if (ct.encoding == xa[XA_INCR])
2708 { 2812 {
2709 // INCR selection, start handshake 2813 // INCR selection, start handshake
2710 if (!delete_prop) 2814 if (!delete_prop)
2711 XDeleteProperty (display->display, win, prop); 2815 XDeleteProperty (dpy, win, prop);
2712 2816
2713 selection_wait = Sel_incr; 2817 selection_wait = Sel_incr;
2714 incr_buf_fill = 0; 2818 incr_buf_fill = 0;
2715 incr_ev.start (NOW + 10); 2819 incr_ev.start (10);
2716 2820
2717 goto bailout; 2821 goto bailout;
2718 } 2822 }
2719 2823
2720 if (ct.nitems == 0) 2824 if (ct.nitems == 0)
… …
2729 ct.nitems = incr_buf_fill; 2833 ct.nitems = incr_buf_fill;
2730 incr_buf = 0; 2834 incr_buf = 0;
2731 incr_buf_size = 0; 2835 incr_buf_size = 0;
2732 incr_ev.stop (); 2836 incr_ev.stop ();
2733 } 2837 }
2734 else 2838 else
2735 { 2839 {
2736 if (selection_wait == Sel_normal 2840 if (selection_wait == Sel_normal
2737 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2841 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2738 { 2842 {
2739 /* 2843 /*
… …
2746 goto bailout; 2850 goto bailout;
2747 } 2851 }
2748 } 2852 }
2749 else if (selection_wait == Sel_incr) 2853 else if (selection_wait == Sel_incr)
2750 { 2854 {
2751 incr_ev.start (NOW + 10); 2855 incr_ev.start (10);
2752 2856
2753 while (incr_buf_fill + ct.nitems > incr_buf_size) 2857 while (incr_buf_fill + ct.nitems > incr_buf_size)
2754 { 2858 {
2755 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2859 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2756 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2860 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2757 } 2861 }
2758 2862
2759 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2863 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2760 incr_buf_fill += ct.nitems; 2864 incr_buf_fill += ct.nitems;
2761 2865
… …
2763 } 2867 }
2764 2868
2765 char **cl; 2869 char **cl;
2766 int cr; 2870 int cr;
2767 2871
2768#if ENABLE_FRILLS 2872#if !ENABLE_MINIMAL
2769 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2873 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2770 // so recode it manually 2874 // so recode it manually
2771 if (ct.encoding == xa[XA_UTF8_STRING]) 2875 if (ct.encoding == xa[XA_UTF8_STRING])
2772 { 2876 {
2773 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2877 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2777 paste (s, strlen (s)); 2881 paste (s, strlen (s));
2778 free (s); 2882 free (s);
2779 } 2883 }
2780 else 2884 else
2781#endif 2885#endif
2782 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2886 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2783 && cl) 2887 && cl)
2784 { 2888 {
2785 for (int i = 0; i < cr; i++) 2889 for (int i = 0; i < cr; i++)
2786 paste (cl[i], strlen (cl[i])); 2890 paste (cl[i], strlen (cl[i]));
2787 2891
… …
2796 if (selection_wait == Sel_normal) 2900 if (selection_wait == Sel_normal)
2797 selection_wait = Sel_none; 2901 selection_wait = Sel_none;
2798} 2902}
2799 2903
2800void 2904void
2801rxvt_term::incr_cb (time_watcher &w) NOTHROW 2905rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2802{ 2906{
2803 selection_wait = Sel_none; 2907 selection_wait = Sel_none;
2804 2908
2805 incr_buf_size = 0; 2909 incr_buf_size = 0;
2806 free (incr_buf); 2910 free (incr_buf);
… …
2817 selection_paste (win, prop, true); 2921 selection_paste (win, prop, true);
2818} 2922}
2819 2923
2820/* ------------------------------------------------------------------------- */ 2924/* ------------------------------------------------------------------------- */
2821/* 2925/*
2822 * Request the current selection: 2926 * Request the current selection:
2823 * Order: > internal selection if available 2927 * Order: > internal selection if available
2824 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2928 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2825 * > CUT_BUFFER0 2929 * > CUT_BUFFER0
2826 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2930 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2827 * will auto fallback to CUT_BUFFER0 2931 * will auto fallback to CUT_BUFFER0
… …
2829 */ 2933 */
2830void 2934void
2831rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2935rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2832{ 2936{
2833 if (selection.text && selnum == Sel_Primary) 2937 if (selection.text && selnum == Sel_Primary)
2938 {
2834 { /* internal selection */ 2939 /* internal selection */
2835 char *str = rxvt_wcstombs (selection.text, selection.len); 2940 char *str = rxvt_wcstombs (selection.text, selection.len);
2836 paste (str, strlen (str)); 2941 paste (str, strlen (str));
2837 free (str); 2942 free (str);
2838 return; 2943 return;
2839 } 2944 }
… …
2843 selection_wait = Sel_normal; 2948 selection_wait = Sel_normal;
2844 2949
2845#if X_HAVE_UTF8_STRING 2950#if X_HAVE_UTF8_STRING
2846 selection_type = Sel_UTF8String; 2951 selection_type = Sel_UTF8String;
2847 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2952 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2848 return; 2953 return;
2849#else 2954#else
2850 selection_type = Sel_CompoundText; 2955 selection_type = Sel_CompoundText;
2851 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2956 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2852 return; 2957 return;
2853#endif 2958#endif
2854 } 2959 }
2855 2960
2856 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2961 selection_wait = Sel_none; /* don't loop in selection_paste () */
2857 selection_paste (display->root, XA_CUT_BUFFER0, false); 2962 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2869 else if (selnum == Sel_Secondary) 2974 else if (selnum == Sel_Secondary)
2870 sel = XA_SECONDARY; 2975 sel = XA_SECONDARY;
2871 else 2976 else
2872 sel = xa[XA_CLIPBOARD]; 2977 sel = xa[XA_CLIPBOARD];
2873 2978
2874 if (XGetSelectionOwner (display->display, sel) != None) 2979 if (XGetSelectionOwner (dpy, sel) != None)
2875 { 2980 {
2876 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2981 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2877 vt, selection_request_time); 2982 vt, selection_request_time);
2878 return 1; 2983 return 1;
2879 } 2984 }
2880 2985
2881 return 0; 2986 return 0;
… …
2885/* 2990/*
2886 * Clear all selected text 2991 * Clear all selected text
2887 * EXT: SelectionClear 2992 * EXT: SelectionClear
2888 */ 2993 */
2889void 2994void
2890rxvt_term::selection_clear () NOTHROW 2995rxvt_term::selection_clear (bool clipboard) NOTHROW
2891{ 2996{
2997 if (!clipboard)
2998 {
2892 want_refresh = 1; 2999 want_refresh = 1;
2893 free (selection.text); 3000 free (selection.text);
2894 selection.text = NULL; 3001 selection.text = NULL;
2895 selection.len = 0; 3002 selection.len = 0;
2896 CLEAR_SELECTION (); 3003 CLEAR_SELECTION ();
2897 3004
2898 if (display->selection_owner == this) 3005 if (display->selection_owner == this)
2899 display->selection_owner = 0; 3006 display->selection_owner = 0;
3007 }
3008 else
3009 {
3010 free (selection.clip_text);
3011 selection.clip_text = NULL;
3012 selection.clip_len = 0;
3013
3014 if (display->clipboard_owner == this)
3015 display->clipboard_owner = 0;
3016 }
2900} 3017}
2901 3018
2902/* ------------------------------------------------------------------------- */ 3019/* ------------------------------------------------------------------------- */
2903/* 3020/*
2904 * Copy a selection into the cut buffer 3021 * Copy a selection into the cut buffer
2905 * EXT: button 1 or 3 release 3022 * EXT: button 1 or 3 release
2906 */ 3023 */
2907void 3024void
2908rxvt_term::selection_make (Time tm) 3025rxvt_term::selection_make (Time tm)
2909{ 3026{
2910 int i; 3027 int size;
2911 wchar_t *new_selection_text; 3028 wchar_t *new_selection_text;
2912 text_t *t; 3029 text_t *t;
2913 3030
2914 switch (selection.op) 3031 switch (selection.op)
2915 { 3032 {
… …
2931 return; /* nothing selected, go away */ 3048 return; /* nothing selected, go away */
2932 3049
2933 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3050 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2934 return; 3051 return;
2935 3052
2936 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3053 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2937 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3054 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2938 3055
2939 int ofs = 0; 3056 int ofs = 0;
2940 int extra = 0; 3057 int extra = 0;
2941 3058
2942 int col = selection.beg.col; 3059 int col = selection.beg.col;
… …
2944 3061
2945 int end_col; 3062 int end_col;
2946 3063
2947 for (; row <= selection.end.row; row++, col = 0) 3064 for (; row <= selection.end.row; row++, col = 0)
2948 { 3065 {
2949#if ENABLE_FRILLS 3066#if !ENABLE_MINIMAL
2950 if (selection.rect) 3067 if (selection.rect)
2951 { 3068 {
2952 col = selection.beg.col; 3069 col = selection.beg.col;
2953 end_col = ncol + 1; 3070 end_col = selection.end.col;
2954 } 3071 }
2955 else 3072 else
2956#endif 3073#endif
2957 end_col = ROW(row).l; 3074 end_col = ROW(row).l;
2958 3075
2959 col = max (col, 0); 3076 col = max (col, 0);
2960 3077
2961 if (row == selection.end.row 3078 if (row == selection.end.row)
2962#if ENABLE_FRILLS
2963 || selection.rect
2964#endif
2965 )
2966 min_it (end_col, selection.end.col); 3079 min_it (end_col, selection.end.col);
2967 3080
2968 t = ROW(row).t + col; 3081 t = ROW(row).t + col;
2969 3082
2970 for (; col < end_col; col++) 3083 for (; col < end_col; col++)
… …
2978 3091
2979 extra -= (len - 1); 3092 extra -= (len - 1);
2980 3093
2981 if (extra < 0) 3094 if (extra < 0)
2982 { 3095 {
2983 extra += i; 3096 extra += size;
2984 i += i; 3097 size += size;
2985 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3098 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
2986 } 3099 }
2987 3100
2988 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3101 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2989 } 3102 }
2990#endif 3103#endif
2991 else 3104 else
2992 new_selection_text[ofs++] = *t++; 3105 new_selection_text[ofs++] = *t++;
2993 } 3106 }
2994 3107
2995#if ENABLE_FRILLS 3108#if !ENABLE_MINIMAL
2996 if (selection.rect) 3109 if (selection.rect)
2997 { 3110 {
2998 while (ofs 3111 while (ofs
2999 && new_selection_text[ofs - 1] != C0_LF 3112 && new_selection_text[ofs - 1] != C0_LF
3000 && unicode::is_space (new_selection_text[ofs - 1])) 3113 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3002 3115
3003 new_selection_text[ofs++] = C0_LF; 3116 new_selection_text[ofs++] = C0_LF;
3004 } 3117 }
3005 else 3118 else
3006#endif 3119#endif
3007 if (!ROW(row).is_longer () && row != selection.end.row) 3120 if (!ROW(row).is_longer ()
3121 && (row != selection.end.row || end_col != selection.end.col)
3122 && (row != selection.beg.row || selection.beg.col < ncol))
3008 new_selection_text[ofs++] = C0_LF; 3123 new_selection_text[ofs++] = C0_LF;
3009 } 3124 }
3010
3011 if (end_col != selection.end.col)
3012 new_selection_text[ofs++] = C0_LF;
3013 3125
3014 new_selection_text[ofs] = 0; 3126 new_selection_text[ofs] = 0;
3015 3127
3016 if (ofs == 0) 3128 if (ofs == 0)
3017 { 3129 {
… …
3030 3142
3031 selection_grab (tm); 3143 selection_grab (tm);
3032} 3144}
3033 3145
3034bool 3146bool
3035rxvt_term::selection_grab (Time tm) NOTHROW 3147rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3036{ 3148{
3149 Atom sel;
3150
3151 if (!clipboard)
3152 {
3037 selection_time = tm; 3153 selection_time = tm;
3038 3154 sel = XA_PRIMARY;
3039 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3040 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3041 { 3155 }
3156 else
3157 {
3158 clipboard_time = tm;
3159 sel = xa[XA_CLIPBOARD];
3160 }
3161
3162 XSetSelectionOwner (dpy, sel, vt, tm);
3163 if (XGetSelectionOwner (dpy, sel) == vt)
3164 {
3042 display->set_selection_owner (this); 3165 display->set_selection_owner (this, clipboard);
3043 return true; 3166 return true;
3044 } 3167 }
3045 else 3168 else
3046 { 3169 {
3047 selection_clear (); 3170 selection_clear (clipboard);
3048 return false; 3171 return false;
3049 } 3172 }
3050 3173
3051#if 0 3174#if 0
3052 XTextProperty ct; 3175 XTextProperty ct;
3053 3176
3054 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3177 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3055 { 3178 {
3056 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3179 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3057 XFree (ct.value); 3180 XFree (ct.value);
3058 } 3181 }
3059#endif 3182#endif
… …
3105 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3228 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3106 3229
3107 while (selection.mark.col > 0 3230 while (selection.mark.col > 0
3108 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3231 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3109 --selection.mark.col; 3232 --selection.mark.col;
3110 3233
3111 if (selection.op) 3234 if (selection.op)
3235 {
3112 { /* clear the old selection */ 3236 /* clear the old selection */
3113 selection.beg.row = selection.end.row = selection.mark.row; 3237 selection.beg.row = selection.end.row = selection.mark.row;
3114 selection.beg.col = selection.end.col = selection.mark.col; 3238 selection.beg.col = selection.end.col = selection.mark.col;
3115 } 3239 }
3116 3240
3117 selection.op = SELECTION_INIT; 3241 selection.op = SELECTION_INIT;
… …
3306 * a point/word/line which is either the start or end of the selection 3430 * a point/word/line which is either the start or end of the selection
3307 * and it was decided by whichever point/word/line was `fixed' at the 3431 * and it was decided by whichever point/word/line was `fixed' at the
3308 * time of the most recent button3 press 3432 * time of the most recent button3 press
3309 */ 3433 */
3310 if (button3 && buttonpress) 3434 if (button3 && buttonpress)
3435 {
3311 { /* button3 press */ 3436 /* button3 press */
3312 /* 3437 /*
3313 * first determine which edge of the selection we are closest to 3438 * first determine which edge of the selection we are closest to
3314 */ 3439 */
3315 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3440 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3316 || (!ROWCOL_IS_AFTER (pos, selection.end) 3441 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3334 selection.mark.row = selection.beg.row; 3459 selection.mark.row = selection.beg.row;
3335 selection.mark.col = selection.beg.col; 3460 selection.mark.col = selection.beg.col;
3336 } 3461 }
3337 } 3462 }
3338 else 3463 else
3464 {
3339 { /* button1 drag or button3 drag */ 3465 /* button1 drag or button3 drag */
3340 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3466 if (ROWCOL_IS_AFTER (selection.mark, pos))
3341 { 3467 {
3342 if (selection.mark.row == selection.end.row 3468 if (selection.mark.row == selection.end.row
3343 && selection.mark.col == selection.end.col 3469 && selection.mark.col == selection.end.col
3344 && clickchange 3470 && clickchange
… …
3361 3487
3362 if (selection.clicks == 1) 3488 if (selection.clicks == 1)
3363 { 3489 {
3364 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3490 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3365 && !ROW(selection.beg.row).is_longer () 3491 && !ROW(selection.beg.row).is_longer ()
3366#if ENABLE_FRILLS 3492#if !ENABLE_MINIMAL
3367 && !selection.rect 3493 && !selection.rect
3368#endif 3494#endif
3369 ) 3495 )
3370 selection.beg.col = ncol; 3496 selection.beg.col = ncol;
3371 3497
3372 if ( 3498 if (
3373 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3499 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3374 && !ROW(selection.end.row).is_longer () 3500 && !ROW(selection.end.row).is_longer ()
3375#if ENABLE_FRILLS 3501#if !ENABLE_MINIMAL
3376 && !selection.rect 3502 && !selection.rect
3377#endif 3503#endif
3378 ) 3504 )
3379 selection.end.col = ncol; 3505 selection.end.col = ncol;
3380 } 3506 }
… …
3387 selection_delimit_word (DN, &selection.end, &selection.end); 3513 selection_delimit_word (DN, &selection.end, &selection.end);
3388 } 3514 }
3389 else if (selection.clicks == 3) 3515 else if (selection.clicks == 3)
3390 { 3516 {
3391#if ENABLE_FRILLS 3517#if ENABLE_FRILLS
3392 if (OPTION (Opt_tripleclickwords)) 3518 if (option (Opt_tripleclickwords))
3393 { 3519 {
3394 selection_delimit_word (UP, &selection.beg, &selection.beg); 3520 selection_delimit_word (UP, &selection.beg, &selection.beg);
3395 3521
3396 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3522 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3397 { 3523 {
3398 if (!ROW(end_row).is_longer ()) 3524 if (!ROW(end_row).is_longer ())
3399 { 3525 {
3400 selection.end.row = end_row; 3526 selection.end.row = end_row;
3401 selection.end.col = ROW(end_row).l; 3527 selection.end.col = ROW(end_row).l;
3528# if !ENABLE_MINIMAL
3402 selection_remove_trailing_spaces (); 3529 selection_remove_trailing_spaces ();
3530# endif
3403 break; 3531 break;
3404 } 3532 }
3405 } 3533 }
3406 } 3534 }
3407 else 3535 else
… …
3423 selection.end.row++; 3551 selection.end.row++;
3424 } 3552 }
3425 } 3553 }
3426 3554
3427 if (button3 && buttonpress) 3555 if (button3 && buttonpress)
3556 {
3428 { /* mark may need to be changed */ 3557 /* mark may need to be changed */
3429 if (closeto == LEFT) 3558 if (closeto == LEFT)
3430 { 3559 {
3431 selection.mark.row = selection.end.row; 3560 selection.mark.row = selection.end.row;
3432 selection.mark.col = selection.end.col - (selection.clicks == 2); 3561 selection.mark.col = selection.end.col - (selection.clicks == 2);
3433 } 3562 }
… …
3436 selection.mark.row = selection.beg.row; 3565 selection.mark.row = selection.beg.row;
3437 selection.mark.col = selection.beg.col; 3566 selection.mark.col = selection.beg.col;
3438 } 3567 }
3439 } 3568 }
3440 3569
3441#if ENABLE_FRILLS 3570#if !ENABLE_MINIMAL
3442 if (selection.rect && selection.beg.col > selection.end.col) 3571 if (selection.rect && selection.beg.col > selection.end.col)
3443 ::swap (selection.beg.col, selection.end.col); 3572 ::swap (selection.beg.col, selection.end.col);
3444#endif 3573#endif
3445} 3574}
3446 3575
3447#if ENABLE_FRILLS 3576#if !ENABLE_MINIMAL
3448void 3577void
3449rxvt_term::selection_remove_trailing_spaces () NOTHROW 3578rxvt_term::selection_remove_trailing_spaces () NOTHROW
3450{ 3579{
3451 int32_t end_col, end_row; 3580 int32_t end_col, end_row;
3452 text_t *stp; 3581 text_t *stp;
… …
3507 */ 3636 */
3508void 3637void
3509rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3638rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3510{ 3639{
3511 XSelectionEvent ev; 3640 XSelectionEvent ev;
3512 dDisp;
3513 3641
3514 ev.type = SelectionNotify; 3642 ev.type = SelectionNotify;
3515 ev.property = None; 3643 ev.property = None;
3516 ev.display = rq.display; 3644 ev.display = rq.display;
3517 ev.requestor = rq.requestor; 3645 ev.requestor = rq.requestor;
… …
3531 *target++ = xa[XA_COMPOUND_TEXT]; 3659 *target++ = xa[XA_COMPOUND_TEXT];
3532#if X_HAVE_UTF8_STRING 3660#if X_HAVE_UTF8_STRING
3533 *target++ = xa[XA_UTF8_STRING]; 3661 *target++ = xa[XA_UTF8_STRING];
3534#endif 3662#endif
3535 3663
3536 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3664 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3537 32, PropModeReplace, 3665 32, PropModeReplace,
3538 (unsigned char *)target_list, target - target_list); 3666 (unsigned char *)target_list, target - target_list);
3539 ev.property = rq.property; 3667 ev.property = rq.property;
3540 } 3668 }
3541#if TODO // TODO 3669#if TODO // TODO
3542 else if (rq.target == xa[XA_MULTIPLE]) 3670 else if (rq.target == xa[XA_MULTIPLE])
3543 { 3671 {
3544 /* TODO: Handle MULTIPLE */ 3672 /* TODO: Handle MULTIPLE */
3545 } 3673 }
3546#endif 3674#endif
3547 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3675 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3548 { 3676 {
3549 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3677 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3550 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3678 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3679 ev.property = rq.property;
3680 }
3681 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3682 {
3683 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3684 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3551 ev.property = rq.property; 3685 ev.property = rq.property;
3552 } 3686 }
3553 else if (rq.target == XA_STRING 3687 else if (rq.target == XA_STRING
3554 || rq.target == xa[XA_TEXT] 3688 || rq.target == xa[XA_TEXT]
3555 || rq.target == xa[XA_COMPOUND_TEXT] 3689 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3578 style = enc_string; 3712 style = enc_string;
3579 else if (target == xa[XA_TEXT]) 3713 else if (target == xa[XA_TEXT])
3580 style = enc_text; 3714 style = enc_text;
3581 else if (target == xa[XA_COMPOUND_TEXT]) 3715 else if (target == xa[XA_COMPOUND_TEXT])
3582 style = enc_compound_text; 3716 style = enc_compound_text;
3583#if ENABLE_FRILLS 3717#if !ENABLE_MINIMAL
3584 else if (target == xa[XA_UTF8_STRING]) 3718 else if (target == xa[XA_UTF8_STRING])
3585 style = enc_utf8; 3719 style = enc_utf8;
3586#endif 3720#endif
3587 else 3721 else
3588 { 3722 {
3589 target = xa[XA_COMPOUND_TEXT]; 3723 target = xa[XA_COMPOUND_TEXT];
3590 style = enc_compound_text; 3724 style = enc_compound_text;
3591 } 3725 }
3592 3726
3593 if (selection.text) 3727 if (rq.selection == XA_PRIMARY && selection.text)
3594 { 3728 {
3595 cl = selection.text; 3729 cl = selection.text;
3596 selectlen = selection.len; 3730 selectlen = selection.len;
3597 } 3731 }
3732 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3733 {
3734 cl = selection.clip_text;
3735 selectlen = selection.clip_len;
3736 }
3598 else 3737 else
3599 { 3738 {
3600 cl = L""; 3739 cl = L"";
3601 selectlen = 0; 3740 selectlen = 0;
3602 } 3741 }
3603 3742
3604#if ENABLE_FRILLS 3743#if !ENABLE_MINIMAL
3605 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3744 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3606 // so recode it manually 3745 // so recode it manually
3607 if (style == enc_utf8) 3746 if (style == enc_utf8)
3608 { 3747 {
3609 freect = 1; 3748 freect = 1;
… …
3612 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3751 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3613 ct.nitems = strlen ((char *)ct.value); 3752 ct.nitems = strlen ((char *)ct.value);
3614 } 3753 }
3615 else 3754 else
3616#endif 3755#endif
3617 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3756 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3618 freect = 1; 3757 freect = 1;
3619 else 3758 else
3620 { 3759 {
3621 /* if we failed to convert then send it raw */ 3760 /* if we failed to convert then send it raw */
3622 ct.value = (unsigned char *)cl; 3761 ct.value = (unsigned char *)cl;
3623 ct.nitems = selectlen; 3762 ct.nitems = selectlen;
3624 ct.encoding = target; 3763 ct.encoding = target;
3625 } 3764 }
3626 3765
3627 XChangeProperty (disp, rq.requestor, rq.property, 3766 XChangeProperty (dpy, rq.requestor, rq.property,
3628 ct.encoding, 8, PropModeReplace, 3767 ct.encoding, 8, PropModeReplace,
3629 ct.value, (int)ct.nitems); 3768 ct.value, (int)ct.nitems);
3630 ev.property = rq.property; 3769 ev.property = rq.property;
3631 3770
3632 if (freect) 3771 if (freect)
3633 XFree (ct.value); 3772 XFree (ct.value);
3634 } 3773 }
3635 3774
3636 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3775 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3637}
3638
3639/* ------------------------------------------------------------------------- *
3640 * MOUSE ROUTINES *
3641 * ------------------------------------------------------------------------- */
3642
3643/*
3644 * return col/row values corresponding to x/y pixel values
3645 */
3646void
3647rxvt_term::pixel_position (int *x, int *y) NOTHROW
3648{
3649 *x = Pixel2Col (*x);
3650 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3651 *y = Pixel2Row (*y);
3652 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3653} 3776}
3654 3777
3655/* ------------------------------------------------------------------------- */ 3778/* ------------------------------------------------------------------------- */
3656#ifdef USE_XIM 3779#ifdef USE_XIM
3657void 3780void
3658rxvt_term::im_set_position (XPoint &pos) NOTHROW 3781rxvt_term::im_set_position (XPoint &pos) NOTHROW
3659{ 3782{
3660 XWindowAttributes xwa; 3783 XWindowAttributes xwa;
3661 3784
3662 XGetWindowAttributes (display->display, vt, &xwa); 3785 XGetWindowAttributes (dpy, vt, &xwa);
3663 3786
3664 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3787 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3665 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3788 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3666} 3789}
3667#endif 3790#endif
… …
3685 h += 2; min_it (h, nrow); 3808 h += 2; min_it (h, nrow);
3686 3809
3687 x -= 1; clamp_it (x, 0, ncol - w); 3810 x -= 1; clamp_it (x, 0, ncol - w);
3688 y -= 1; clamp_it (y, 0, nrow - h); 3811 y -= 1; clamp_it (y, 0, nrow - h);
3689 3812
3690 ov_x = x; ov_y = y; 3813 ov.x = x; ov.y = y;
3691 ov_w = w; ov_h = h; 3814 ov.w = w; ov.h = h;
3692 3815
3693 ov_text = new text_t *[h]; 3816 ov.text = new text_t *[h];
3694 ov_rend = new rend_t *[h]; 3817 ov.rend = new rend_t *[h];
3695 3818
3696 for (y = 0; y < h; y++) 3819 for (y = 0; y < h; y++)
3697 { 3820 {
3698 text_t *tp = ov_text[y] = new text_t[w]; 3821 text_t *tp = ov.text[y] = new text_t[w];
3699 rend_t *rp = ov_rend[y] = new rend_t[w]; 3822 rend_t *rp = ov.rend[y] = new rend_t[w];
3700 3823
3701 text_t t0, t1, t2; 3824 text_t t0, t1, t2;
3702 rend_t r = OVERLAY_RSTYLE; 3825 rend_t r = OVERLAY_RSTYLE;
3703 3826
3704 if (y == 0) 3827 if (y == 0)
… …
3723} 3846}
3724 3847
3725void 3848void
3726rxvt_term::scr_overlay_off () NOTHROW 3849rxvt_term::scr_overlay_off () NOTHROW
3727{ 3850{
3728 if (!ov_text) 3851 if (!ov.text)
3729 return; 3852 return;
3730 3853
3731 want_refresh = 1; 3854 want_refresh = 1;
3732 3855
3733 for (int y = 0; y < ov_h; y++) 3856 for (int y = 0; y < ov.h; y++)
3734 { 3857 {
3735 delete [] ov_text[y]; 3858 delete [] ov.text[y];
3736 delete [] ov_rend[y]; 3859 delete [] ov.rend[y];
3737 } 3860 }
3738 3861
3739 delete [] ov_text; ov_text = 0; 3862 delete [] ov.text; ov.text = 0;
3740 delete [] ov_rend; ov_rend = 0; 3863 delete [] ov.rend; ov.rend = 0;
3741} 3864}
3742 3865
3743void 3866void
3744rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3867rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3745{ 3868{
3746 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3869 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3747 return; 3870 return;
3748 3871
3749 x++, y++; 3872 x++, y++;
3750 3873
3751 ov_text[y][x] = text; 3874 ov.text[y][x] = text;
3752 ov_rend[y][x] = rend; 3875 ov.rend[y][x] = rend;
3753} 3876}
3754 3877
3755void 3878void
3756rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3879rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3757{ 3880{
… …
3763rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3886rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3764{ 3887{
3765 while (*s) 3888 while (*s)
3766 { 3889 {
3767 text_t t = *s++; 3890 text_t t = *s++;
3768 int width = wcwidth (t); 3891 int width = WCWIDTH (t);
3769 3892
3770 while (width--) 3893 while (width--)
3771 { 3894 {
3772 scr_overlay_set (x++, y, t); 3895 scr_overlay_set (x++, y, t);
3773 t = NOCHAR; 3896 t = NOCHAR;
… …
3776} 3899}
3777 3900
3778void 3901void
3779rxvt_term::scr_swap_overlay () NOTHROW 3902rxvt_term::scr_swap_overlay () NOTHROW
3780{ 3903{
3781 if (!ov_text) 3904 if (!ov.text)
3782 return; 3905 return;
3783 3906
3907 // hide cursor if it is within the overlay area
3908 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3909 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3910 screen.flags &= ~Screen_VisibleCursor;
3911
3784 // swap screen mem with overlay 3912 // swap screen mem with overlay
3785 for (int y = ov_h; y--; ) 3913 for (int y = ov.h; y--; )
3786 { 3914 {
3787 text_t *t1 = ov_text[y]; 3915 text_t *t1 = ov.text[y];
3788 rend_t *r1 = ov_rend[y]; 3916 rend_t *r1 = ov.rend[y];
3789 3917
3790 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3918 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3791 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3919 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3792 3920
3793 for (int x = ov_w; x--; ) 3921 for (int x = ov.w; x--; )
3794 { 3922 {
3795 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3923 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3796 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3924 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3797 } 3925 }
3798 } 3926 }

Diff Legend

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