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

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

Diff Legend

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