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.252 by root, Wed Jan 25 21:09:21 2006 UTC vs.
Revision 1.412 by root, Wed Jan 18 12:26:59 2012 UTC

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

Diff Legend

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