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

Diff Legend

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