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.30 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.74 by pcg, Sun May 9 18:19:49 2004 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
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-2004 Marc Lehmann <pcg@goof.com>
6 * 7 *
7 * 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
8 * 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
9 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 * (at your option) any later version. 11 * (at your option) any later version.
… …
16 * 17 *
17 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 *--------------------------------------------------------------------------*/ 21 *--------------------------------------------------------------------------*/
22
21/* 23/*
22 * We handle _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
23 */ 25 */
24 26
25#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
26#define INTERN_SCREEN 28#define INTERN_SCREEN
27#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
… …
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 32#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 33
32#include <stdint.h> 34#include <stdint.h>
33#include <wchar.h> 35#include <wchar.h>
34 36
35#include "salloc.C" // HACK!! 37#include "salloc.C" // HACK, should be a seperate compile!
36 38
37inline void fill_text (text_t *start, text_t value, int len) 39inline void fill_text (text_t *start, text_t value, int len)
38{ 40{
39 while (len--) 41 while (len--)
40 *start++ = value; 42 *start++ = value;
… …
187 } 189 }
188 190
189 if (prev_nrow == 0) 191 if (prev_nrow == 0)
190 { 192 {
191 /* 193 /*
192 * first time called so just malloc everything : don't rely on realloc 194 * first time called so just malloc everything: don't rely on realloc
193 * Note: this is still needed so that all the scrollback lines are NULL 195 * Note: this is still needed so that all the scrollback lines are NULL
194 */ 196 */
195 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 197 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
196 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 198 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
197 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 199 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
… …
254 scr_scroll_text (0, (int)prev_nrow - 1, k, 1); 256 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
255 257
256 for (p = nrow; p < prev_nrow; p++) 258 for (p = nrow; p < prev_nrow; p++)
257 { 259 {
258 q = p + TermWin.saveLines; 260 q = p + TermWin.saveLines;
261
259 if (screen.text[q]) 262 if (screen.text[q])
260 { 263 {
261#ifdef DEBUG_STRICT 264#ifdef DEBUG_STRICT
262 assert (screen.rend[q]); 265 assert (screen.rend[q]);
263#endif 266#endif
264 talloc->free (screen.text[q]); 267 talloc->free (screen.text[q]);
265 ralloc->free (screen.rend[q]); 268 ralloc->free (screen.rend[q]);
266 } 269 }
270
267 if (swap.text[p]) 271 if (swap.text[p])
268 { 272 {
269#ifdef DEBUG_STRICT 273#ifdef DEBUG_STRICT
270 assert (swap.rend[p]); 274 assert (swap.rend[p]);
271#endif 275#endif
272 talloc->free (swap.text[p]); 276 talloc->free (swap.text[p]);
273 ralloc->free (swap.rend[p]); 277 ralloc->free (swap.rend[p]);
274 } 278 }
279
275#ifdef DEBUG_STRICT 280#ifdef DEBUG_STRICT
276 assert (drawn_text[p] && drawn_rend[p]); 281 assert (drawn_text[p] && drawn_rend[p]);
277#endif 282#endif
278 talloc->free (drawn_text[p]); 283 talloc->free (drawn_text[p]);
279 ralloc->free (drawn_rend[p]); 284 ralloc->free (drawn_rend[p]);
… …
309 swap.tlen[p] = 0; 314 swap.tlen[p] = 0;
310 swap.text[p] = NULL; 315 swap.text[p] = NULL;
311 swap.rend[p] = NULL; 316 swap.rend[p] = NULL;
312 drawn_text[p] = NULL; 317 drawn_text[p] = NULL;
313 drawn_rend[p] = NULL; 318 drawn_rend[p] = NULL;
314 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); 319 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
315 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); 320 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
316 } 321 }
317 322
318 if (k > 0) 323 if (k > 0)
319 { 324 {
… …
334 } 339 }
335 340
336 /* resize columns */ 341 /* resize columns */
337 if (ncol != prev_ncol) 342 if (ncol != prev_ncol)
338 { 343 {
339 int common = min (prev_ncol, ncol);
340 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); 344 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
341 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); 345 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
342 346
343 for (p = 0; p < total_rows; p++) 347 for (p = 0; p < total_rows; p++)
344 { 348 {
345 if (screen.text[p]) 349 if (screen.text[p])
346 { 350 {
347 text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t; 351 screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t));
348 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, screen.rend[p], common * sizeof (rend_t)); screen.rend[p] = r; 352 screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
349 353
350 MIN_IT (screen.tlen[p], (int16_t)ncol); 354 MIN_IT (screen.tlen[p], (int16_t)ncol);
351 355
352 if (ncol > prev_ncol) 356 if (ncol > prev_ncol)
353 scr_blank_line (& (screen.text[p][prev_ncol]), 357 scr_blank_line (&screen.text[p][prev_ncol],
354 & (screen.rend[p][prev_ncol]), 358 &screen.rend[p][prev_ncol],
355 ncol - prev_ncol, 359 ncol - prev_ncol, setrstyle);
356 setrstyle);
357 } 360 }
358 } 361 }
359 362
360 for (p = 0; p < nrow; p++) 363 for (p = 0; p < nrow; p++)
361 { 364 {
362 text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t; 365 drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t));
363 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, drawn_rend[p], common * sizeof (rend_t)); drawn_rend[p] = r; 366 drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
364 367
365 if (ncol > prev_ncol) 368 if (ncol > prev_ncol)
366 scr_blank_line (& (drawn_text[p][prev_ncol]), 369 scr_blank_line (&drawn_text[p][prev_ncol],
367 & (drawn_rend[p][prev_ncol]), 370 &drawn_rend[p][prev_ncol],
368 ncol - prev_ncol, setrstyle); 371 ncol - prev_ncol, setrstyle);
369 372
370 if (swap.text[p]) 373 if (swap.text[p])
371 { 374 {
372 text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t; 375 swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t));
373 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, swap.rend[p], common * sizeof (rend_t)); swap.rend[p] = r; 376 swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
374 377
375 MIN_IT (swap.tlen[p], (int16_t)ncol); 378 MIN_IT (swap.tlen[p], (int16_t)ncol);
376 379
377 if (ncol > prev_ncol) 380 if (ncol > prev_ncol)
378 scr_blank_line (& (swap.text[p][prev_ncol]), 381 scr_blank_line (&swap.text[p][prev_ncol],
379 & (swap.rend[p][prev_ncol]), 382 &swap.rend[p][prev_ncol],
380 ncol - prev_ncol, setrstyle); 383 ncol - prev_ncol, setrstyle);
381 } 384 }
382 385
383 } 386 }
384 387
… …
436{ 439{
437 uint16_t total_rows; 440 uint16_t total_rows;
438 int i; 441 int i;
439 442
440 total_rows = TermWin.nrow + TermWin.saveLines; 443 total_rows = TermWin.nrow + TermWin.saveLines;
441
442#ifdef DEBUG_STRICT
443 for (i = 0; i < total_rows; i++)
444 {
445 if (screen.text[i])
446 /* then so is screen.rend[i] */
447 assert (screen.rend[i]);
448 }
449#endif
450 444
451 delete talloc; talloc = 0; 445 delete talloc; talloc = 0;
452 delete ralloc; ralloc = 0; 446 delete ralloc; ralloc = 0;
453 447
454 free (screen.text); 448 free (screen.text);
… …
483 477
484 scr_release (); 478 scr_release ();
485 prev_nrow = prev_ncol = 0; 479 prev_nrow = prev_ncol = 0;
486 scr_reset (); 480 scr_reset ();
487 481
488 scr_clear (); 482 scr_clear (true);
489 scr_refresh (SLOW_REFRESH); 483 scr_refresh (SLOW_REFRESH);
490#ifdef RXVT_GRAPHICS
491 Gr_reset ();
492#endif
493} 484}
494 485
495/* ------------------------------------------------------------------------- * 486/* ------------------------------------------------------------------------- *
496 * PROCESS SCREEN COMMANDS * 487 * PROCESS SCREEN COMMANDS *
497 * ------------------------------------------------------------------------- */ 488 * ------------------------------------------------------------------------- */
… …
501 * XTERM_SEQ: Restore cursor: ESC 8 492 * XTERM_SEQ: Restore cursor: ESC 8
502 */ 493 */
503void 494void
504rxvt_term::scr_cursor (int mode) 495rxvt_term::scr_cursor (int mode)
505{ 496{
506 screen_t *s; 497 screen_t *s;
507 498
508 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); 499 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
509 500
510#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 501#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
511 if (current_screen == SECONDARY) 502 if (current_screen == SECONDARY)
512 s = & (swap); 503 s = &swap;
513 else 504 else
514#endif 505#endif
515 s = & (screen); 506 s = &screen;
507
516 switch (mode) 508 switch (mode)
517 { 509 {
518 case SAVE: 510 case SAVE:
519 s->s_cur.row = s->cur.row; 511 s->s_cur.row = s->cur.row;
520 s->s_cur.col = s->cur.col; 512 s->s_cur.col = s->cur.col;
521 s->s_rstyle = rstyle; 513 s->s_rstyle = rstyle;
522 s->s_charset = s->charset; 514 s->s_charset = s->charset;
523 s->s_charset_char = charsets[s->charset]; 515 s->s_charset_char = charsets[s->charset];
524 break; 516 break;
517
525 case RESTORE: 518 case RESTORE:
526 want_refresh = 1; 519 want_refresh = 1;
527 s->cur.row = s->s_cur.row; 520 s->cur.row = s->s_cur.row;
528 s->cur.col = s->s_cur.col; 521 s->cur.col = s->s_cur.col;
529 s->flags &= ~Screen_WrapNext; 522 s->flags &= ~Screen_WrapNext;
… …
531 s->charset = s->s_charset; 524 s->charset = s->s_charset;
532 charsets[s->charset] = s->s_charset_char; 525 charsets[s->charset] = s->s_charset_char;
533 set_font_style (); 526 set_font_style ();
534 break; 527 break;
535 } 528 }
529
536 /* boundary check in case screen size changed between SAVE and RESTORE */ 530 /* boundary check in case screen size changed between SAVE and RESTORE */
537 MIN_IT (s->cur.row, TermWin.nrow - 1); 531 MIN_IT (s->cur.row, TermWin.nrow - 1);
538 MIN_IT (s->cur.col, TermWin.ncol - 1); 532 MIN_IT (s->cur.col, TermWin.ncol - 1);
539#ifdef DEBUG_STRICT 533#ifdef DEBUG_STRICT
540 assert (s->cur.row >= 0); 534 assert (s->cur.row >= 0);
… …
552 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 546 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
553 */ 547 */
554int 548int
555rxvt_term::scr_change_screen (int scrn) 549rxvt_term::scr_change_screen (int scrn)
556{ 550{
557 int i; 551 int i;
558#if NSCREENS 552#if NSCREENS
559 int offset; 553 int offset;
560#endif 554#endif
561 555
562 want_refresh = 1; 556 want_refresh = 1;
563 557
564 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); 558 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
565 559
566 TermWin.view_start = 0; 560 TermWin.view_start = 0;
567 561
568 if (current_screen == scrn) 562 if (current_screen == scrn)
569 return current_screen; 563 return scrn;
570 564
571 selection_check (2); /* check for boundary cross */ 565 selection_check (2); /* check for boundary cross */
572 566
573 SWAP_IT (current_screen, scrn, int); 567 SWAP_IT (current_screen, scrn, int);
574#if NSCREENS 568#if NSCREENS
569 if (Options & Opt_secondaryScreen)
570 {
575 num_scr = 0; 571 num_scr = 0;
576 offset = TermWin.saveLines; 572 offset = TermWin.saveLines;
577 for (i = prev_nrow; i--;) 573 for (i = prev_nrow; i--;)
578 { 574 {
579 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 575 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
580 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 576 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
581 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 577 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
582 } 578 }
583 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 579 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
584 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 580 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
585# ifdef DEBUG_STRICT 581# ifdef DEBUG_STRICT
586 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); 582 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
587 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); 583 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
588# else /* drive with your eyes closed */ 584# else /* drive with your eyes closed */
589 MAX_IT (screen.cur.row, 0); 585 MAX_IT (screen.cur.row, 0);
590 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 586 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
591 MAX_IT (screen.cur.col, 0); 587 MAX_IT (screen.cur.col, 0);
592 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); 588 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
593# endif 589# endif
594 SWAP_IT (screen.charset, swap.charset, int16_t); 590 SWAP_IT (screen.charset, swap.charset, int16_t);
595 SWAP_IT (screen.flags, swap.flags, int); 591 SWAP_IT (screen.flags, swap.flags, int);
596 screen.flags |= Screen_VisibleCursor; 592 screen.flags |= Screen_VisibleCursor;
597 swap.flags |= Screen_VisibleCursor; 593 swap.flags |= Screen_VisibleCursor;
598
599# ifdef RXVT_GRAPHICS
600
601 if (Gr_Displayed ())
602 { 594 }
603 Gr_scroll (0); 595 else
604 Gr_ChangeScreen ();
605 }
606# endif 596#endif
607#else 597 if (Options & Opt_secondaryScroll)
608# ifdef SCROLL_ON_NO_SECONDARY
609# ifdef RXVT_GRAPHICS
610 if (Gr_Displayed ())
611 Gr_ClearScreen ();
612# endif
613 if (current_screen == PRIMARY 598 //if (current_screen == PRIMARY)
614# ifdef RXVT_GRAPHICS
615 && !Gr_Displayed ()
616# endif
617 )
618 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 599 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
619# endif
620#endif
621 return scrn; 600 return scrn;
622} 601}
623 602
624/* ------------------------------------------------------------------------- */ 603/* ------------------------------------------------------------------------- */
625/* 604/*
… …
667 return 0; 646 return 0;
668 647
669 want_refresh = 1; 648 want_refresh = 1;
670 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); 649 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
671 650
672 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) 651 if (row1 == 0 && count > 0
652 && (current_screen == PRIMARY || Options & Opt_secondaryScroll))
673 { 653 {
674 nscrolled = (long)TermWin.nscrolled + (long)count; 654 nscrolled = (long)TermWin.nscrolled + (long)count;
675 655
676 if (nscrolled > (long)TermWin.saveLines) 656 if (nscrolled > (long)TermWin.saveLines)
677 TermWin.nscrolled = TermWin.saveLines; 657 TermWin.nscrolled = TermWin.saveLines;
… …
730 for (i = 0, j = row1; i < count; i++, j++) 710 for (i = 0, j = row1; i < count; i++, j++)
731 { 711 {
732 buf_text[i] = screen.text[j]; 712 buf_text[i] = screen.text[j];
733 buf_rend[i] = screen.rend[j]; 713 buf_rend[i] = screen.rend[j];
734 } 714 }
715
735 /* A2: Rotate lines */ 716 /* A2: Rotate lines */
736 for (j = row1, i = j + count; i <= row2; i++, j++) 717 for (j = row1, i = j + count; i <= row2; i++, j++)
737 { 718 {
738 screen.tlen[j] = screen.tlen[i]; 719 screen.tlen[j] = screen.tlen[i];
739 screen.text[j] = screen.text[i]; 720 screen.text[j] = screen.text[i];
740 screen.rend[j] = screen.rend[i]; 721 screen.rend[j] = screen.rend[i];
741 } 722 }
723
742 j = row2 - count + 1, i = count; 724 j = row2 - count + 1, i = count;
743 } 725 }
744 else /* if (j < 0) */ 726 else /* if (j < 0) */
745 { 727 {
746 /* B: scroll down */ 728 /* B: scroll down */
… …
749 for (i = 0, j = row2; i < count; i++, j--) 731 for (i = 0, j = row2; i < count; i++, j--)
750 { 732 {
751 buf_text[i] = screen.text[j]; 733 buf_text[i] = screen.text[j];
752 buf_rend[i] = screen.rend[j]; 734 buf_rend[i] = screen.rend[j];
753 } 735 }
736
754 /* B2: Rotate lines */ 737 /* B2: Rotate lines */
755 for (j = row2, i = j - count; i >= row1; i--, j--) 738 for (j = row2, i = j - count; i >= row1; i--, j--)
756 { 739 {
757 screen.tlen[j] = screen.tlen[i]; 740 screen.tlen[j] = screen.tlen[i];
758 screen.text[j] = screen.text[i]; 741 screen.text[j] = screen.text[i];
759 screen.rend[j] = screen.rend[i]; 742 screen.rend[j] = screen.rend[i];
760 } 743 }
744
761 j = row1, i = count; 745 j = row1, i = count;
762 count = -count; 746 count = -count;
763 } 747 }
764 748
765 /* C: Resurrect lines */ 749 /* C: Resurrect lines */
… …
768 screen.tlen[j] = 0; 752 screen.tlen[j] = 0;
769 screen.text[j] = buf_text[i]; 753 screen.text[j] = buf_text[i];
770 screen.rend[j] = buf_rend[i]; 754 screen.rend[j] = buf_rend[i];
771 755
772 if (!spec) /* line length may not equal TermWin.ncol */ 756 if (!spec) /* line length may not equal TermWin.ncol */
773 scr_blank_screen_mem (screen.text, screen.rend, 757 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
774 (unsigned int)j, rstyle);
775 } 758 }
776
777#ifdef RXVT_GRAPHICS
778 if (Gr_Displayed ())
779 Gr_scroll (count);
780#endif
781 759
782 return count; 760 return count;
783} 761}
784 762
785/* ------------------------------------------------------------------------- */ 763/* ------------------------------------------------------------------------- */
786/* 764/*
787 * Add text given in <str> of length <len> to screen struct 765 * Add text given in <str> of length <len> to screen struct
788 */ 766 */
789void 767void
790rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) 768rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
791{ 769{
792 unsigned char checksel, clearsel; 770 unsigned char checksel, clearsel;
793 uint32_t c; 771 unicode_t c;
794 int i, row, last_col; 772 int i, row, last_col;
795 text_t *stp; 773 text_t *stp;
796 rend_t *srp; 774 rend_t *srp;
797 775
798 if (len <= 0) /* sanity */ 776 if (len <= 0) /* sanity */
799 return; 777 return;
800 778
801 want_refresh = 1; 779 want_refresh = 1;
… …
824 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 802 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
825 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 803 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
826#endif 804#endif
827 row = screen.cur.row + TermWin.saveLines; 805 row = screen.cur.row + TermWin.saveLines;
828 806
829 checksel = (selection.op 807 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
830 && current_screen == selection.screen) ? 1 : 0;
831 clearsel = 0; 808 clearsel = 0;
832 809
833 stp = screen.text[row]; 810 stp = screen.text[row];
834 srp = screen.rend[row]; 811 srp = screen.rend[row];
835 812
836 for (i = 0; i < len;) 813 while (len--)
837 { 814 {
838 c = str[i++]; 815 c = *str++;
816
817 if (c < 0x20)
839 switch (c) 818 switch (c)
840 { 819 {
841 case '\t': 820 case C0_HT:
842 scr_tab (1); 821 scr_tab (1);
843 continue; 822 continue;
844 case '\n': 823
824 case C0_LF:
845 if (screen.tlen[row] != -1) /* XXX: think about this */ 825 if (screen.tlen[row] != -1) /* XXX: think about this */
846 MAX_IT (screen.tlen[row], screen.cur.col); 826 MAX_IT (screen.tlen[row], screen.cur.col);
827
847 screen.flags &= ~Screen_WrapNext; 828 screen.flags &= ~Screen_WrapNext;
829
848 if (screen.cur.row == screen.bscroll) 830 if (screen.cur.row == screen.bscroll)
849 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 831 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
850 else if (screen.cur.row < (TermWin.nrow - 1)) 832 else if (screen.cur.row < (TermWin.nrow - 1))
851 row = (++screen.cur.row) + TermWin.saveLines; 833 row = (++screen.cur.row) + TermWin.saveLines;
834
852 stp = screen.text[row]; /* _must_ refresh */ 835 stp = screen.text[row]; /* _must_ refresh */
853 srp = screen.rend[row]; /* _must_ refresh */ 836 srp = screen.rend[row]; /* _must_ refresh */
854 continue; 837 continue;
855 case '\r': 838
839 case C0_CR:
856 if (screen.tlen[row] != -1) /* XXX: think about this */ 840 if (screen.tlen[row] != -1) /* XXX: think about this */
857 MAX_IT (screen.tlen[row], screen.cur.col); 841 MAX_IT (screen.tlen[row], screen.cur.col);
842
858 screen.flags &= ~Screen_WrapNext; 843 screen.flags &= ~Screen_WrapNext;
859 screen.cur.col = 0; 844 screen.cur.col = 0;
860 continue; 845 continue;
861 default:
862 if (c == 127)
863 continue; /* yummmm..... */
864 break;
865 } 846 }
866 847
867 if (checksel /* see if we're writing within selection */ 848 if (checksel /* see if we're writing within selection */
868 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 849 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
869 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 850 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
870 { 851 {
871 checksel = 0; 852 checksel = 0;
872 clearsel = 1; 853 clearsel = 1;
873 } 854 }
855
874 if (screen.flags & Screen_WrapNext) 856 if (screen.flags & Screen_WrapNext)
875 { 857 {
876 screen.tlen[row] = -1; 858 screen.tlen[row] = -1;
877 if (screen.cur.row == screen.bscroll) 859 if (screen.cur.row == screen.bscroll)
878 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 860 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
879 else if (screen.cur.row < (TermWin.nrow - 1)) 861 else if (screen.cur.row < (TermWin.nrow - 1))
880 row = (++screen.cur.row) + TermWin.saveLines; 862 row = (++screen.cur.row) + TermWin.saveLines;
863
881 stp = screen.text[row]; /* _must_ refresh */ 864 stp = screen.text[row]; /* _must_ refresh */
882 srp = screen.rend[row]; /* _must_ refresh */ 865 srp = screen.rend[row]; /* _must_ refresh */
883 screen.cur.col = 0; 866 screen.cur.col = 0;
884 screen.flags &= ~Screen_WrapNext; 867 screen.flags &= ~Screen_WrapNext;
885 } 868 }
869
886 if (screen.flags & Screen_Insert) 870 if (screen.flags & Screen_Insert)
887 scr_insdel_chars (1, INSERT); 871 scr_insdel_chars (1, INSERT);
888 872
873 // rely on wcwidth to tell us the character width, at least for non-latin1
874 // do wcwidth before further replacements, as wcwidth says that line-drawing
875 // characters have width -1 (DOH!) on GNU/Linux sometimes.
876 int width = c < 256 ? 1 : wcwidth (c);
877
889 if (charsets[screen.charset] == '0') // DEC SPECIAL 878 if (charsets[screen.charset] == '0') // DEC SPECIAL
890 switch (c)
891 { 879 {
892 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; 880 // vt100 special graphics and line drawing
893 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break; 881 static uint16_t vt100_0[32] = { // 5f .. 7e
894 case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break; 882 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
895 case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break; 883 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
896 case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break; 884 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
897 case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break; 885 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
898 case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break;
899 case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break;
900 case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break;
901 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break;
902 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
903 } 886 };
904 887
888 if (c >= 0x5f && c <= 0x7e)
889 {
890 c = vt100_0[c - 0x5f];
891 width = 1;
892 }
893 }
894
895 if (width != 0)
896 {
897#if !UNICODE_3 && ENABLE_COMBINING
898 // trim characters we can't store directly :(
899 if (c >= 0x10000)
900 c = rxvt_composite.compose (c); // map to lower 16 bits
901#endif
905 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 902 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
906 // rely on wcwidth to tell us the character width, at least for non-ascii
907 int width = c <= 128 ? 1 : wcwidth (c);
908 903
909 // width -1 characters (e.g. combining chars) are ignored currently.
910 if (width > 0)
911 do 904 do
912 { 905 {
913 stp[screen.cur.col] = c; 906 stp[screen.cur.col] = c;
914 srp[screen.cur.col] = rend; 907 srp[screen.cur.col] = rend;
915 908
916 if (screen.cur.col < last_col - 1) 909 if (screen.cur.col < last_col - 1)
917 screen.cur.col++; 910 screen.cur.col++;
918 else 911 else
919 { 912 {
920 screen.tlen[row] = last_col; 913 screen.tlen[row] = last_col;
921 if (screen.flags & Screen_Autowrap) 914 if (screen.flags & Screen_Autowrap)
922 screen.flags |= Screen_WrapNext; 915 screen.flags |= Screen_WrapNext;
923 break; 916 break;
924 } 917 }
925 918
926 c = NOCHAR; 919 c = NOCHAR;
927 } 920 }
928 while (--width > 0); 921 while (--width > 0);
922
923 // pad with spaces when overwriting wide character with smaller one
924 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
925 {
926 stp[c] = ' ';
927 srp[c] = rend;
928 }
929 }
930 else if (width == 0)
931 {
932#if ENABLE_COMBINING
933 // handle combining characters
934 // we just tag the accent on the previous on-screen character.
935 // this is arguably not correct, but also arguably not wrong.
936 // we don't handle double-width characters nicely yet.
937
938 text_t *tp;
939 rend_t *rp;
940
941 if (screen.cur.col > 0)
942 {
943 tp = stp + screen.cur.col - 1;
944 rp = srp + screen.cur.col - 1;
945 }
946 else if (screen.cur.row > 0
947 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
948 {
949 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
950 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
951 }
929 else 952 else
930 (void)0; /* handle combining character etc. here. */ 953 continue;
954
955 // handle double-width-chars by making them look extremely ugly
956 if (*tp == NOCHAR)
957 *tp = ' '; // hack //D //TODO //--tp, --rp;
958
959 // first try to find a precomposed character
960 unicode_t n = rxvt_compose (*tp, c);
961 if (n == NOCHAR)
962 n = rxvt_composite.compose (*tp, c);
963
964 *tp = n;
965 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
966#endif
967 }
931 } 968 }
932 969
933 if (screen.tlen[row] != -1) /* XXX: think about this */ 970 if (screen.tlen[row] != -1) /* XXX: think about this */
934 MAX_IT (screen.tlen[row], screen.cur.col); 971 MAX_IT (screen.tlen[row], screen.cur.col);
935 972
… …
955 */ 992 */
956void 993void
957rxvt_term::scr_backspace () 994rxvt_term::scr_backspace ()
958{ 995{
959 want_refresh = 1; 996 want_refresh = 1;
997
960 if (screen.cur.col == 0) 998 if (screen.cur.col == 0)
961 { 999 {
962 if (screen.cur.row > 0) 1000 if (screen.cur.row > 0)
963 { 1001 {
964#ifdef TERMCAP_HAS_BW 1002#ifdef TERMCAP_HAS_BW
… …
969 1007
970 } 1008 }
971 } 1009 }
972 else if ((screen.flags & Screen_WrapNext) == 0) 1010 else if ((screen.flags & Screen_WrapNext) == 0)
973 scr_gotorc (0, -1, RELATIVE); 1011 scr_gotorc (0, -1, RELATIVE);
1012
974 screen.flags &= ~Screen_WrapNext; 1013 screen.flags &= ~Screen_WrapNext;
975} 1014}
976 1015
977/* ------------------------------------------------------------------------- */ 1016/* ------------------------------------------------------------------------- */
978/* 1017/*
… …
981 * XTERM_SEQ: CTRL-I 1020 * XTERM_SEQ: CTRL-I
982 */ 1021 */
983void 1022void
984rxvt_term::scr_tab (int count) 1023rxvt_term::scr_tab (int count)
985{ 1024{
986 int i, x; 1025 int i, x;
987 1026
988 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); 1027 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
989 want_refresh = 1; 1028 want_refresh = 1;
990 i = x = screen.cur.col; 1029 i = x = screen.cur.col;
1030
991 if (count == 0) 1031 if (count == 0)
992 return; 1032 return;
993 else if (count > 0) 1033 else if (count > 0)
994 { 1034 {
995 for (; ++i < TermWin.ncol; ) 1035 for (; ++i < TermWin.ncol; )
… …
997 { 1037 {
998 x = i; 1038 x = i;
999 if (!--count) 1039 if (!--count)
1000 break; 1040 break;
1001 } 1041 }
1042
1002 if (count) 1043 if (count)
1003 x = TermWin.ncol - 1; 1044 x = TermWin.ncol - 1;
1004 } 1045 }
1005 else /* if (count < 0) */ 1046 else /* if (count < 0) */
1006 { 1047 {
… …
1009 { 1050 {
1010 x = i; 1051 x = i;
1011 if (!++count) 1052 if (!++count)
1012 break; 1053 break;
1013 } 1054 }
1055
1014 if (count) 1056 if (count)
1015 x = 0; 1057 x = 0;
1016 } 1058 }
1059
1017 if (x != screen.cur.col) 1060 if (x != screen.cur.col)
1018 scr_gotorc (0, x, R_RELATIVE); 1061 scr_gotorc (0, x, R_RELATIVE);
1019} 1062}
1020 1063
1021/* ------------------------------------------------------------------------- */ 1064/* ------------------------------------------------------------------------- */
… …
1075void 1118void
1076rxvt_term::scr_gotorc (int row, int col, int relative) 1119rxvt_term::scr_gotorc (int row, int col, int relative)
1077{ 1120{
1078 want_refresh = 1; 1121 want_refresh = 1;
1079 ZERO_SCROLLBACK (); 1122 ZERO_SCROLLBACK ();
1080#ifdef RXVT_GRAPHICS
1081 if (Gr_Displayed ())
1082 Gr_scroll (0);
1083#endif
1084 1123
1085 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); 1124 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col));
1086 1125
1087 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1126 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1088 : col);
1089 MAX_IT (screen.cur.col, 0); 1127 MAX_IT (screen.cur.col, 0);
1090 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1128 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1091 1129
1092 screen.flags &= ~Screen_WrapNext; 1130 screen.flags &= ~Screen_WrapNext;
1093 if (relative & R_RELATIVE) 1131 if (relative & R_RELATIVE)
… …
1119 else 1157 else
1120 screen.cur.row = row; 1158 screen.cur.row = row;
1121 } 1159 }
1122 MAX_IT (screen.cur.row, 0); 1160 MAX_IT (screen.cur.row, 0);
1123 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1161 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1162
1163 while (screen.cur.col > 0
1164 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1165 screen.cur.col--;
1124} 1166}
1125 1167
1126/* ------------------------------------------------------------------------- */ 1168/* ------------------------------------------------------------------------- */
1127/* 1169/*
1128 * direction should be UP or DN 1170 * direction should be UP or DN
1129 */ 1171 */
1130void 1172void
1131rxvt_term::scr_index (enum page_dirn direction) 1173rxvt_term::scr_index (enum page_dirn direction)
1132{ 1174{
1133 int dirn; 1175 int dirn;
1134 1176
1135 want_refresh = 1; 1177 want_refresh = 1;
1136 dirn = ((direction == UP) ? 1 : -1); 1178 dirn = ((direction == UP) ? 1 : -1);
1137 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); 1179 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1138 1180
1139 ZERO_SCROLLBACK (); 1181 ZERO_SCROLLBACK ();
1140
1141#ifdef RXVT_GRAPHICS
1142 if (Gr_Displayed ())
1143 Gr_scroll (0);
1144#endif
1145 1182
1146 screen.flags &= ~Screen_WrapNext; 1183 screen.flags &= ~Screen_WrapNext;
1147 if ((screen.cur.row == screen.bscroll && direction == UP) 1184 if ((screen.cur.row == screen.bscroll && direction == UP)
1148 || (screen.cur.row == screen.tscroll && direction == DN)) 1185 || (screen.cur.row == screen.tscroll && direction == DN))
1149 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1186 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
… …
1167 unsigned int row, col, num; 1204 unsigned int row, col, num;
1168 1205
1169 want_refresh = 1; 1206 want_refresh = 1;
1170 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row)); 1207 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1171 ZERO_SCROLLBACK (); 1208 ZERO_SCROLLBACK ();
1172
1173#ifdef RXVT_GRAPHICS
1174 if (Gr_Displayed ())
1175 Gr_scroll (0);
1176#endif
1177 1209
1178 selection_check (1); 1210 selection_check (1);
1179 1211
1180 screen.flags &= ~Screen_WrapNext; 1212 screen.flags &= ~Screen_WrapNext;
1181 1213
… …
1208 default: 1240 default:
1209 return; 1241 return;
1210 } 1242 }
1211 1243
1212 if (screen.text[row]) 1244 if (screen.text[row])
1213 scr_blank_line (& (screen.text[row][col]), 1245 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1214 & (screen.rend[row][col]), num, rstyle);
1215 else 1246 else
1216 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1247 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1217} 1248}
1218 1249
1219/* ------------------------------------------------------------------------- */ 1250/* ------------------------------------------------------------------------- */
… …
1224 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1255 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1225 */ 1256 */
1226void 1257void
1227rxvt_term::scr_erase_screen (int mode) 1258rxvt_term::scr_erase_screen (int mode)
1228{ 1259{
1229 int num; 1260 int num;
1230 int32_t row, row_offset; 1261 int32_t row, row_offset;
1231 rend_t ren; 1262 rend_t ren;
1232 XGCValues gcvalue; 1263 XGCValues gcvalue;
1233 1264
1234 want_refresh = 1; 1265 want_refresh = 1;
1235 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); 1266 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1236 ZERO_SCROLLBACK (); 1267 ZERO_SCROLLBACK ();
1237 row_offset = (int32_t)TermWin.saveLines; 1268 row_offset = (int32_t)TermWin.saveLines;
… …
1250 row = 0; 1281 row = 0;
1251 num = screen.cur.row; 1282 num = screen.cur.row;
1252 break; 1283 break;
1253 case 2: /* erase whole screen */ 1284 case 2: /* erase whole screen */
1254 selection_check (3); 1285 selection_check (3);
1255#ifdef RXVT_GRAPHICS
1256 Gr_ClearScreen ();
1257#endif
1258 row = 0; 1286 row = 0;
1259 num = TermWin.nrow; 1287 num = TermWin.nrow;
1260 break; 1288 break;
1261 default: 1289 default:
1262 return; 1290 return;
1263 } 1291 }
1292
1264 refresh_type |= REFRESH_BOUNDS; 1293 refresh_type |= REFRESH_BOUNDS;
1294
1265 if (selection.op && current_screen == selection.screen 1295 if (selection.op && current_screen == selection.screen
1266 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1296 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1267 || (selection.end.row >= row 1297 || (selection.end.row >= row
1268 && selection.end.row <= row + num))) 1298 && selection.end.row <= row + num)))
1269 CLEAR_SELECTION (); 1299 CLEAR_SELECTION ();
1300
1270 if (row >= TermWin.nrow) /* Out Of Bounds */ 1301 if (row >= TermWin.nrow) /* Out Of Bounds */
1271 return; 1302 return;
1303
1272 MIN_IT (num, (TermWin.nrow - row)); 1304 MIN_IT (num, (TermWin.nrow - row));
1305
1273 if (rstyle & (RS_RVid | RS_Uline)) 1306 if (rstyle & (RS_RVid | RS_Uline))
1274 ren = (rend_t) ~RS_None; 1307 ren = (rend_t) ~RS_None;
1275 else if (GET_BASEBG (rstyle) == Color_bg) 1308 else if (GET_BASEBG (rstyle) == Color_bg)
1276 { 1309 {
1277 ren = DEFAULT_RSTYLE; 1310 ren = DEFAULT_RSTYLE;
… …
1284 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1317 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1285 ERASE_ROWS (row, num); 1318 ERASE_ROWS (row, num);
1286 gcvalue.foreground = PixColors[Color_fg]; 1319 gcvalue.foreground = PixColors[Color_fg];
1287 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1320 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1288 } 1321 }
1322
1289 for (; num--; row++) 1323 for (; num--; row++)
1290 { 1324 {
1291 scr_blank_screen_mem (screen.text, screen.rend, 1325 scr_blank_screen_mem (screen.text, screen.rend,
1292 (unsigned int) (row + row_offset), rstyle); 1326 (unsigned int) (row + row_offset), rstyle);
1293 screen.tlen[row + row_offset] = 0; 1327 screen.tlen[row + row_offset] = 0;
… …
1327 * Insert/Delete <count> lines 1361 * Insert/Delete <count> lines
1328 */ 1362 */
1329void 1363void
1330rxvt_term::scr_insdel_lines (int count, int insdel) 1364rxvt_term::scr_insdel_lines (int count, int insdel)
1331{ 1365{
1332 int end; 1366 int end;
1333 1367
1334 ZERO_SCROLLBACK (); 1368 ZERO_SCROLLBACK ();
1335
1336#ifdef RXVT_GRAPHICS
1337 if (Gr_Displayed ())
1338 Gr_scroll (0);
1339#endif
1340 1369
1341 selection_check (1); 1370 selection_check (1);
1342 1371
1343 if (screen.cur.row > screen.bscroll) 1372 if (screen.cur.row > screen.bscroll)
1344 return; 1373 return;
… …
1361 * Insert/Delete <count> characters from the current position 1390 * Insert/Delete <count> characters from the current position
1362 */ 1391 */
1363void 1392void
1364rxvt_term::scr_insdel_chars (int count, int insdel) 1393rxvt_term::scr_insdel_chars (int count, int insdel)
1365{ 1394{
1366 int col, row; 1395 int col, row;
1367 rend_t tr; 1396 rend_t tr;
1368 text_t *stp; 1397 text_t *stp;
1369 rend_t *srp; 1398 rend_t *srp;
1370 int16_t *slp; 1399 int16_t *slp;
1371 1400
1372 want_refresh = 1; 1401 want_refresh = 1;
1373 ZERO_SCROLLBACK (); 1402 ZERO_SCROLLBACK ();
1374
1375#ifdef RXVT_GRAPHICS
1376 if (Gr_Displayed ())
1377 Gr_scroll (0);
1378#endif
1379 1403
1380 if (count <= 0) 1404 if (count <= 0)
1381 return; 1405 return;
1382 1406
1383 selection_check (1); 1407 selection_check (1);
… …
1387 screen.flags &= ~Screen_WrapNext; 1411 screen.flags &= ~Screen_WrapNext;
1388 1412
1389 stp = screen.text[row]; 1413 stp = screen.text[row];
1390 srp = screen.rend[row]; 1414 srp = screen.rend[row];
1391 slp = & (screen.tlen[row]); 1415 slp = & (screen.tlen[row]);
1416
1392 switch (insdel) 1417 switch (insdel)
1393 { 1418 {
1394 case INSERT: 1419 case INSERT:
1395 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1420 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1396 col--) 1421 col--)
1397 { 1422 {
1398 stp[col] = stp[col - count]; 1423 stp[col] = stp[col - count];
1399 srp[col] = srp[col - count]; 1424 srp[col] = srp[col - count];
1400 } 1425 }
1426
1401 if (*slp != -1) 1427 if (*slp != -1)
1402 { 1428 {
1403 *slp += count; 1429 *slp += count;
1404 MIN_IT (*slp, TermWin.ncol); 1430 MIN_IT (*slp, TermWin.ncol);
1405 } 1431 }
1432
1406 if (selection.op && current_screen == selection.screen 1433 if (selection.op && current_screen == selection.screen
1407 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1434 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1408 { 1435 {
1409 if (selection.end.row != screen.cur.row 1436 if (selection.end.row != screen.cur.row
1410 || (selection.end.col + count >= TermWin.ncol)) 1437 || (selection.end.col + count >= TermWin.ncol))
… …
1414 selection.beg.col += count; 1441 selection.beg.col += count;
1415 selection.mark.col += count; /* XXX: yes? */ 1442 selection.mark.col += count; /* XXX: yes? */
1416 selection.end.col += count; 1443 selection.end.col += count;
1417 } 1444 }
1418 } 1445 }
1446
1419 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1447 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1420 (unsigned int)count, rstyle); 1448 (unsigned int)count, rstyle);
1421 break; 1449 break;
1450
1422 case ERASE: 1451 case ERASE:
1423 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1452 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1424 selection_check (1); 1453 selection_check (1);
1425 screen.cur.col -= count; 1454 screen.cur.col -= count;
1426 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1455 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1427 (unsigned int)count, rstyle); 1456 (unsigned int)count, rstyle);
1428 break; 1457 break;
1458
1429 case DELETE: 1459 case DELETE:
1430 tr = srp[TermWin.ncol - 1]
1431 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1460 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1461
1432 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1462 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1433 { 1463 {
1434 stp[col] = stp[col + count]; 1464 stp[col] = stp[col + count];
1435 srp[col] = srp[col + count]; 1465 srp[col] = srp[col + count];
1436 } 1466 }
1467
1437 scr_blank_line (& (stp[TermWin.ncol - count]), 1468 scr_blank_line (& (stp[TermWin.ncol - count]),
1438 & (srp[TermWin.ncol - count]), 1469 & (srp[TermWin.ncol - count]),
1439 (unsigned int)count, tr); 1470 (unsigned int)count, tr);
1471
1440 if (*slp == -1) /* break line continuation */ 1472 if (*slp == -1) /* break line continuation */
1441 *slp = TermWin.ncol; 1473 *slp = TermWin.ncol;
1474
1442 *slp -= count; 1475 *slp -= count;
1443 MAX_IT (*slp, 0); 1476 MAX_IT (*slp, 0);
1477
1444 if (selection.op && current_screen == selection.screen 1478 if (selection.op && current_screen == selection.screen
1445 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1479 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1446 { 1480 {
1447 if (selection.end.row != screen.cur.row 1481 if (selection.end.row != screen.cur.row
1448 || (screen.cur.col >= selection.beg.col - count) 1482 || (screen.cur.col >= selection.beg.col - count)
… …
1454 selection.beg.col -= count; 1488 selection.beg.col -= count;
1455 selection.mark.col -= count; /* XXX: yes? */ 1489 selection.mark.col -= count; /* XXX: yes? */
1456 selection.end.col -= count; 1490 selection.end.col -= count;
1457 } 1491 }
1458 } 1492 }
1493
1459 break; 1494 break;
1460 } 1495 }
1461} 1496}
1462 1497
1463/* ------------------------------------------------------------------------- */ 1498/* ------------------------------------------------------------------------- */
… …
1468void 1503void
1469rxvt_term::scr_scroll_region (int top, int bot) 1504rxvt_term::scr_scroll_region (int top, int bot)
1470{ 1505{
1471 MAX_IT (top, 0); 1506 MAX_IT (top, 0);
1472 MIN_IT (bot, (int)TermWin.nrow - 1); 1507 MIN_IT (bot, (int)TermWin.nrow - 1);
1508
1473 if (top > bot) 1509 if (top > bot)
1474 return; 1510 return;
1511
1475 screen.tscroll = top; 1512 screen.tscroll = top;
1476 screen.bscroll = bot; 1513 screen.bscroll = bot;
1477 scr_gotorc (0, 0, 0); 1514 scr_gotorc (0, 0, 0);
1478} 1515}
1479 1516
… …
1485 */ 1522 */
1486void 1523void
1487rxvt_term::scr_cursor_visible (int mode) 1524rxvt_term::scr_cursor_visible (int mode)
1488{ 1525{
1489 want_refresh = 1; 1526 want_refresh = 1;
1527
1490 if (mode) 1528 if (mode)
1491 screen.flags |= Screen_VisibleCursor; 1529 screen.flags |= Screen_VisibleCursor;
1492 else 1530 else
1493 screen.flags &= ~Screen_VisibleCursor; 1531 screen.flags &= ~Screen_VisibleCursor;
1494} 1532}
… …
1732 } 1770 }
1733 1771
1734 D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); 1772 D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row));
1735 1773
1736 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1774 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1737 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, 1775 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1738 (rc[PART_END].col - rc[PART_BEG].col + 1));
1739 1776
1740 if (refresh) 1777 if (refresh)
1741 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1778 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS);
1742} 1779}
1743 1780
… …
1808rxvt_term::scr_changeview (uint16_t oldviewstart) 1845rxvt_term::scr_changeview (uint16_t oldviewstart)
1809{ 1846{
1810 if (TermWin.view_start != oldviewstart) 1847 if (TermWin.view_start != oldviewstart)
1811 { 1848 {
1812 want_refresh = 1; 1849 want_refresh = 1;
1813#ifdef RXVT_GRAPHICS
1814 if (Gr_Displayed ())
1815 Gr_scroll (0);
1816#endif
1817 num_scr -= (TermWin.view_start - oldviewstart); 1850 num_scr -= (TermWin.view_start - oldviewstart);
1818 } 1851 }
1852
1819 return (int) (TermWin.view_start - oldviewstart); 1853 return (int) (TermWin.view_start - oldviewstart);
1820} 1854}
1821 1855
1822/* ------------------------------------------------------------------------- */ 1856/* ------------------------------------------------------------------------- */
1823void 1857void
… …
1891 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1925 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1892 1926
1893void 1927void
1894rxvt_term::scr_refresh (unsigned char refresh_type) 1928rxvt_term::scr_refresh (unsigned char refresh_type)
1895{ 1929{
1896 unsigned char clearfirst, /* first character writes before cell */ 1930 unsigned char clearfirst, /* first character writes before cell */
1897 clearlast, /* last character writes beyond cell */ 1931 clearlast, /* last character writes beyond cell */
1898 must_clear, /* use draw_string not draw_image_string */ 1932 must_clear, /* use draw_string not draw_image_string */
1899 rvid, /* reverse video this position */ 1933 rvid, /* reverse video this position */
1900 showcursor; /* show the cursor */ 1934 showcursor; /* show the cursor */
1901 int16_t col, row, /* column/row we're processing */ 1935 int16_t col, row, /* column/row we're processing */
1902 ocrow; /* old cursor row */ 1936 ocrow; /* old cursor row */
1903 int cursorwidth;
1904 int i, /* tmp */ 1937 int i, /* tmp */
1905 row_offset; /* basic offset in screen structure */ 1938 row_offset; /* basic offset in screen structure */
1906#ifndef NO_CURSORCOLOR 1939#ifndef NO_CURSORCOLOR
1907 rend_t cc1; /* store colours at cursor position (s) */ 1940 rend_t cc1; /* store colours at cursor position (s) */
1908#endif 1941#endif
1909 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1942 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
1910 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 1943 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1911 1944
1912 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1945 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1913 return; 1946 return;
1914 1947
1915 /* 1948 /*
… …
1942 1975
1943 /* 1976 /*
1944 * C: set the cursor character (s) 1977 * C: set the cursor character (s)
1945 */ 1978 */
1946 { 1979 {
1947 unsigned char setoldcursor; 1980 unsigned char setoldcursor;
1948 rend_t ccol1, /* Cursor colour */ 1981 rend_t ccol1, /* Cursor colour */
1949 ccol2; /* Cursor colour2 */ 1982 ccol2; /* Cursor colour2 */
1950 1983
1951 showcursor = (screen.flags & Screen_VisibleCursor); 1984 showcursor = (screen.flags & Screen_VisibleCursor);
1952 cursorwidth = 0;
1953#ifdef CURSOR_BLINK 1985#ifdef CURSOR_BLINK
1954 if (hidden_cursor) 1986 if (hidden_cursor)
1955 showcursor = 0; 1987 showcursor = 0;
1956#endif 1988#endif
1957 1989
1958 cursorwidth = 0;
1959
1960 if (showcursor) 1990 if (showcursor)
1961 { 1991 {
1962 cursorwidth++;
1963
1964 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1992 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]);
1965 [screen.cur.col]);
1966 1993
1967 if (showcursor && TermWin.focus) 1994 if (showcursor && TermWin.focus)
1968 { 1995 {
1969 *srp ^= RS_RVid; 1996 *srp ^= RS_RVid;
1970#ifndef NO_CURSORCOLOR 1997#ifndef NO_CURSORCOLOR
… …
1986 ccol2 = Color_bg; 2013 ccol2 = Color_bg;
1987#endif 2014#endif
1988 *srp = SET_FGCOLOR (*srp, ccol1); 2015 *srp = SET_FGCOLOR (*srp, ccol1);
1989 *srp = SET_BGCOLOR (*srp, ccol2); 2016 *srp = SET_BGCOLOR (*srp, ccol2);
1990#endif 2017#endif
1991
1992 } 2018 }
1993 } 2019 }
1994 2020
1995 /* make sure no outline cursor is left around */ 2021 /* make sure no outline cursor is left around */
1996 setoldcursor = 0; 2022 setoldcursor = 0;
… …
1999 if (screen.cur.row + TermWin.view_start != ocrow 2025 if (screen.cur.row + TermWin.view_start != ocrow
2000 || screen.cur.col != oldcursor.col) 2026 || screen.cur.col != oldcursor.col)
2001 { 2027 {
2002 if (ocrow < TermWin.nrow 2028 if (ocrow < TermWin.nrow
2003 && oldcursor.col < TermWin.ncol) 2029 && oldcursor.col < TermWin.ncol)
2004 {
2005 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2030 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
2006 } 2031
2007 if (TermWin.focus || !showcursor) 2032 if (TermWin.focus || !showcursor)
2008 oldcursor.row = -1; 2033 oldcursor.row = -1;
2009 else 2034 else
2010 setoldcursor = 1; 2035 setoldcursor = 1;
2011 } 2036 }
2012 } 2037 }
2013 else if (!TermWin.focus) 2038 else if (!TermWin.focus)
2014 setoldcursor = 1; 2039 setoldcursor = 1;
2040
2015 if (setoldcursor) 2041 if (setoldcursor)
2016 { 2042 {
2017 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2043 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
2018 oldcursor.row = -1; 2044 oldcursor.row = -1;
2019 else 2045 else
… …
2031 */ 2057 */
2032 i = num_scr; 2058 i = num_scr;
2033 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2059 if (refresh_type == FAST_REFRESH && num_scr_allow && i
2034 && abs (i) < TermWin.nrow && !must_clear) 2060 && abs (i) < TermWin.nrow && !must_clear)
2035 { 2061 {
2036 int16_t nits; 2062 int16_t nits;
2037 int j; 2063 int j;
2038 rend_t *drp2; 2064 rend_t *drp2;
2039 text_t *dtp2; 2065 text_t *dtp2;
2040 int len, wlen; 2066 int len, wlen;
2041 2067
2042 j = TermWin.nrow; 2068 j = TermWin.nrow;
2043 wlen = len = -1; 2069 wlen = len = -1;
2044 row = i > 0 ? 0 : j - 1; 2070 row = i > 0 ? 0 : j - 1;
2045 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2071 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
… …
2109 int ypixel = (int)Row2Pixel (row); 2135 int ypixel = (int)Row2Pixel (row);
2110 2136
2111 for (col = 0; col < TermWin.ncol; col++) 2137 for (col = 0; col < TermWin.ncol; col++)
2112 { 2138 {
2113 /* compare new text with old - if exactly the same then continue */ 2139 /* compare new text with old - if exactly the same then continue */
2140 if (stp[col] == dtp[col] /* Must match characters to skip. */
2141 && (srp[col] == drp[col] /* Either rendition the same or */
2142 || (stp[col] == ' ' /* space w/ no background change */
2143 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2144 continue;
2145
2146 // redraw one or more characters
2147
2148 // seek to the beginning if wide characters
2149 while (stp[col] == NOCHAR && col > 0)
2150 --col;
2151
2114 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2152 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2115
2116 if (stp[col] == dtp[col] /* Must match characters to skip. */
2117 && (rend == drp[col] /* Either rendition the same or */
2118 || (stp[col] == ' ' /* space w/ no background change */
2119 && GET_BGATTR (rend) == GET_BGATTR (drp[col]))))
2120 continue;
2121
2122 text_t *text = stp + col; 2153 text_t *text = stp + col;
2123 int count = 1; 2154 int count = 1;
2124 2155
2125 /* redraw one or more characters */
2126
2127 dtp[col] = stp[col]; 2156 dtp[col] = stp[col];
2128 drp[col] = rend; 2157 drp[col] = rend;
2129
2130 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2131 continue;
2132 2158
2133 int xpixel = Col2Pixel (col); 2159 int xpixel = Col2Pixel (col);
2134 2160
2135 // this loop looks very messy, it can probably be optimized 2161 // this loop looks very messy, it can probably be optimized
2136 // and cleaned a bit by you? 2162 // and cleaned a bit by you?
… …
2177 int fore = GET_FGCOLOR (rend); // desired foreground 2203 int fore = GET_FGCOLOR (rend); // desired foreground
2178 int back = GET_BGCOLOR (rend); // desired background 2204 int back = GET_BGCOLOR (rend); // desired background
2179 2205
2180 rend = GET_ATTR (rend); 2206 rend = GET_ATTR (rend);
2181 2207
2182 rvid = !! (rend & RS_RVid); 2208 rvid = !!(rend & RS_RVid);
2209
2210#ifndef NO_BOLD_UNDERLINE_REVERSE
2211 if (rend & RS_Bold && fore == Color_fg)
2212 {
2213 if (ISSET_PIXCOLOR (Color_BD))
2214 fore = Color_BD;
2215 else
2216 rvid = !rvid;
2217 }
2218
2219 if (rend & RS_Uline)
2220 if (ISSET_PIXCOLOR (Color_UL))
2221 fore = Color_UL;
2222#endif
2223
2183 if (rvid) 2224 if (rvid)
2184 { 2225 {
2185 SWAP_IT (fore, back, int); 2226 SWAP_IT (fore, back, int);
2186 2227
2187#ifndef NO_BOLD_UNDERLINE_REVERSE 2228#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2190 && !ISSET_PIXCOLOR (Color_cursor) 2231 && !ISSET_PIXCOLOR (Color_cursor)
2191# endif 2232# endif
2192 ) 2233 )
2193 back = Color_RV; 2234 back = Color_RV;
2194#endif 2235#endif
2195
2196 } 2236 }
2237
2197#ifdef TEXT_BLINK 2238#ifdef TEXT_BLINK
2198 if (rend & RS_Blink) 2239 if (rend & RS_Blink && back == Color_bg)
2199 { 2240 {
2200 if (!text_blink_ev.active) 2241 if (!text_blink_ev.active)
2201 { 2242 {
2202 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2243 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2203 hidden_text = 0; 2244 hidden_text = 0;
2204 } 2245 }
2205 else if (hidden_text) 2246 else if (hidden_text)
2206 fore = back; 2247 fore = back;
2207 } 2248 }
2208#endif 2249#endif
2209#ifndef NO_BOLD_UNDERLINE_REVERSE
2210 else if (rend & RS_Bold)
2211 {
2212 if (ISSET_PIXCOLOR (Color_BD))
2213 fore = Color_BD;
2214 else if (fore == Color_fg)
2215 fore = Color_White;
2216 }
2217 else if (rend & RS_Uline)
2218 {
2219 if (ISSET_PIXCOLOR (Color_UL))
2220 fore = Color_UL;
2221 }
2222#endif
2223 2250
2224 /* 2251 /*
2225 * Actually do the drawing of the string here 2252 * Actually do the drawing of the string here
2226 */ 2253 */
2227 rxvt_font *font = (*TermWin.fontset)[fid]; 2254 rxvt_font *font = (*TermWin.fontset)[fid];
2228 2255
2229 if (back == fore) 2256 if (back == fore)
2230 font->clear_rect (xpixel, ypixel, 2257 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2231 TermWin.fwidth * count, TermWin.fheight, 2258 TermWin.fwidth * count, TermWin.fheight,
2232 back); 2259 back);
2233 else if (back == Color_bg) 2260 else if (back == Color_bg)
2234 { 2261 {
2235 if (must_clear) 2262 if (must_clear)
… …
2237 CLEAR_CHARS (xpixel, ypixel, count); 2264 CLEAR_CHARS (xpixel, ypixel, count);
2238 2265
2239 for (i = 0; i < count; i++) /* don't draw empty strings */ 2266 for (i = 0; i < count; i++) /* don't draw empty strings */
2240 if (text[i] != ' ') 2267 if (text[i] != ' ')
2241 { 2268 {
2242 font->draw (xpixel, ypixel, text, count, fore, -1); 2269 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1);
2243 break; 2270 break;
2244 } 2271 }
2245 } 2272 }
2246 else 2273 else
2247 font->draw (xpixel, ypixel, text, count, fore, Color_bg); 2274 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2248 } 2275 }
2249 else 2276 else
2250 font->draw (xpixel, ypixel, text, count, fore, back); 2277 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2251 2278
2252 if ((rend & RS_Uline) && (font->descent > 1)) 2279 if ((rend & RS_Uline) && (font->descent > 1))
2253 XDrawLine (display->display, drawBuffer, TermWin.gc, 2280 XDrawLine (display->display, drawBuffer, TermWin.gc,
2254 xpixel, ypixel + font->ascent + 1, 2281 xpixel, ypixel + font->ascent + 1,
2255 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2282 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2256 } /* for (col....) */ 2283 } /* for (col....) */
2257 } /* for (row....) */ 2284 } /* for (row....) */
2258 2285
2259 /* 2286 /*
2260 * G: cleanup cursor and display outline cursor if necessary 2287 * G: cleanup cursor and display outline cursor if necessary
… …
2267 [screen.cur.col]); 2294 [screen.cur.col]);
2268 *srp ^= RS_RVid; 2295 *srp ^= RS_RVid;
2269#ifndef NO_CURSORCOLOR 2296#ifndef NO_CURSORCOLOR
2270 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2297 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2271#endif 2298#endif
2272
2273 } 2299 }
2274 else if (oldcursor.row >= 0) 2300 else if (oldcursor.row >= 0)
2275 { 2301 {
2276#ifndef NO_CURSORCOLOR 2302#ifndef NO_CURSORCOLOR
2277 if (ISSET_PIXCOLOR (Color_cursor)) 2303 if (ISSET_PIXCOLOR (Color_cursor))
2278 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2304 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]);
2279#endif 2305#endif
2306 int cursorwidth = 1;
2307 while (oldcursor.col + cursorwidth < TermWin.ncol
2308 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2309 cursorwidth++;
2310
2280 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2311 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2281 Col2Pixel (oldcursor.col), 2312 Col2Pixel (oldcursor.col),
2282 Row2Pixel (oldcursor.row), 2313 Row2Pixel (oldcursor.row),
2283 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2314 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2284 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2315 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2285 } 2316 }
2286 } 2317 }
2287 2318
2288 /* 2319 /*
2289 * H: cleanup selection 2320 * H: cleanup selection
… …
2297 /* 2328 /*
2298 * clear the whole screen height, note that width == 0 is treated 2329 * clear the whole screen height, note that width == 0 is treated
2299 * specially by XClearArea 2330 * specially by XClearArea
2300 */ 2331 */
2301 XClearArea (display->display, TermWin.vt, 0, 0, 2332 XClearArea (display->display, TermWin.vt, 0, 0,
2302 (unsigned int)TermWin.int_bwidth, 2333 (unsigned int)TermWin.int_bwidth,
2303 (unsigned int)TermWin_TotalHeight (), False); 2334 (unsigned int)TermWin_TotalHeight (), False);
2335
2304 if (clearlast && TermWin.int_bwidth) 2336 if (clearlast && TermWin.int_bwidth)
2305 /* 2337 /*
2306 * clear the whole screen height, note that width == 0 is treated 2338 * clear the whole screen height, note that width == 0 is treated
2307 * specially by XClearArea 2339 * specially by XClearArea
2308 */ 2340 */
2309 XClearArea (display->display, TermWin.vt, 2341 XClearArea (display->display, TermWin.vt,
2310 TermWin.width + TermWin.int_bwidth, 0, 2342 TermWin.width + TermWin.int_bwidth, 0,
2311 (unsigned int)TermWin.int_bwidth, 2343 (unsigned int)TermWin.int_bwidth,
2312 (unsigned int)TermWin_TotalHeight (), False); 2344 (unsigned int)TermWin_TotalHeight (), False);
2345
2313 if (refresh_type & SMOOTH_REFRESH) 2346 if (refresh_type & SMOOTH_REFRESH)
2314 XSync (display->display, False); 2347 XSync (display->display, False);
2315 2348
2316 num_scr = 0; 2349 num_scr = 0;
2317 num_scr_allow = 1; 2350 num_scr_allow = 1;
2318 want_refresh = 0; /* screen is current */ 2351 want_refresh = 0; /* screen is current */
2319} 2352}
2320 2353
2321/* ------------------------------------------------------------------------- */
2322void 2354void
2355rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2356{
2357 if (!rp || !tp)
2358 return;
2359
2360 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2361 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
2362}
2363
2364void
2323rxvt_term::scr_clear () 2365rxvt_term::scr_remap_chars ()
2366{
2367 for (int i = TermWin.nrow + TermWin.saveLines; i--; )
2368 scr_remap_chars (screen.text[i], screen.rend[i]);
2369
2370 for (int i = TermWin.nrow; i--; )
2371 {
2372 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2373 scr_remap_chars (swap.text[i], swap.rend[i]);
2374 }
2375}
2376
2377/* ------------------------------------------------------------------------- */
2378void
2379rxvt_term::scr_clear (bool really)
2324{ 2380{
2325 if (!TermWin.mapped) 2381 if (!TermWin.mapped)
2326 return; 2382 return;
2327 2383
2328 num_scr_allow = 0; 2384 num_scr_allow = 0;
2329 want_refresh = 1; 2385 want_refresh = 1;
2386
2330#ifdef TRANSPARENT 2387#ifdef TRANSPARENT
2331 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2388 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2332 { 2389 {
2333 int i; 2390 int i;
2334 2391
… …
2341 if (TermWin.parent[i] != None) 2398 if (TermWin.parent[i] != None)
2342 XClearWindow (display->display, TermWin.parent[i]); 2399 XClearWindow (display->display, TermWin.parent[i]);
2343 } 2400 }
2344#endif 2401#endif
2345 2402
2403 if (really)
2346 XClearWindow (display->display, TermWin.vt); 2404 XClearWindow (display->display, TermWin.vt);
2347} 2405}
2348 2406
2349/* ------------------------------------------------------------------------- */ 2407/* ------------------------------------------------------------------------- */
2350void 2408void
2351rxvt_term::scr_reverse_selection () 2409rxvt_term::scr_reverse_selection ()
2352{ 2410{
2353 int i, col, row, end_row;
2354 rend_t *srp;
2355
2356 if (selection.op && current_screen == selection.screen) 2411 if (selection.op && current_screen == selection.screen)
2357 { 2412 {
2358 end_row = TermWin.saveLines - TermWin.view_start; 2413 int end_row = TermWin.saveLines - TermWin.view_start;
2359 i = selection.beg.row + TermWin.saveLines; 2414 int i = selection.beg.row + TermWin.saveLines;
2360 row = selection.end.row + TermWin.saveLines; 2415 int col, row = selection.end.row + TermWin.saveLines;
2416 rend_t *srp;
2417
2361 if (i >= end_row) 2418 if (i >= end_row)
2362 col = selection.beg.col; 2419 col = selection.beg.col;
2363 else 2420 else
2364 { 2421 {
2365 col = 0; 2422 col = 0;
2366 i = end_row; 2423 i = end_row;
2367 } 2424 }
2425
2368 end_row += TermWin.nrow; 2426 end_row += TermWin.nrow;
2369 for (; i < row && i < end_row; i++, col = 0) 2427 for (; i < row && i < end_row; i++, col = 0)
2370 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2428 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2371 srp[col] ^= RS_RVid; 2429 srp[col] ^= RS_RVid;
2430
2372 if (i == row && i < end_row) 2431 if (i == row && i < end_row)
2373 for (srp = screen.rend[i]; col < selection.end.col; col++) 2432 for (srp = screen.rend[i]; col < selection.end.col; col++)
2374 srp[col] ^= RS_RVid; 2433 srp[col] ^= RS_RVid;
2375 } 2434 }
2376} 2435}
… …
2464 { 2523 {
2465 n = min (len - i, PROP_SIZE); 2524 n = min (len - i, PROP_SIZE);
2466 MEMCPY (ds, data + i, n); 2525 MEMCPY (ds, data + i, n);
2467 2526
2468 for (j = 0; j < n; j++) 2527 for (j = 0; j < n; j++)
2469 if (ds[j] == '\n') 2528 if (ds[j] == C0_LF)
2470 ds[j] = '\r'; 2529 ds[j] = C0_CR;
2471 2530
2472 tt_write (ds, (int)n); 2531 tt_write (ds, (int)n);
2473 } 2532 }
2474 2533
2475 free (ds); 2534 free (ds);
… …
2515 } 2574 }
2516 2575
2517 for (;;) 2576 for (;;)
2518 { 2577 {
2519 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2578 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2520 (long) (PROP_SIZE / 4), delete_prop, 2579 (long) (PROP_SIZE / 4), delete_prop,
2521 AnyPropertyType, &ct.encoding, &ct.format, 2580 AnyPropertyType, &ct.encoding, &ct.format,
2522 &ct.nitems, &bytes_after, 2581 &ct.nitems, &bytes_after,
2523 &ct.value) != Success) 2582 &ct.value) != Success)
2524 break; 2583 break;
2525 2584
2526 if (ct.encoding == 0) 2585 if (ct.encoding == 0)
2527 { 2586 {
2528 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2587 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
… …
2536 } 2595 }
2537 2596
2538 if (ct.nitems == 0) 2597 if (ct.nitems == 0)
2539 { 2598 {
2540 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2599 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2600
2541 if (selection_wait == Sel_normal && nread == 0) 2601 if (selection_wait == Sel_normal && nread == 0
2602 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2542 { 2603 {
2543 /* 2604 /*
2544 * pass through again trying CUT_BUFFER0 if we've come from 2605 * pass through again trying CUT_BUFFER0 if we've come from
2545 * XConvertSelection () but nothing was presented 2606 * XConvertSelection () but nothing was presented
2546 */ 2607 */
… …
2554 2615
2555 nread += ct.nitems; 2616 nread += ct.nitems;
2556 2617
2557 char **cl; 2618 char **cl;
2558 int cr; 2619 int cr;
2559 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2620 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2560 &cr) >= 0 && cl)
2561 { 2621 {
2562 for (int i = 0; i < cr; i++) 2622 for (int i = 0; i < cr; i++)
2563 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2623 paste ((unsigned char *)cl[i], STRLEN (cl[i]));
2564 2624
2565 XFreeStringList (cl); 2625 XFreeStringList (cl);
… …
2586void 2646void
2587rxvt_term::incr_cb (time_watcher &w) 2647rxvt_term::incr_cb (time_watcher &w)
2588{ 2648{
2589 selection_wait = Sel_none; 2649 selection_wait = Sel_none;
2590 2650
2591 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2651 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2592} 2652}
2593 2653
2594/* 2654/*
2595 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2655 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2596 */ 2656 */
… …
2599{ 2659{
2600 int reget_time = 0; 2660 int reget_time = 0;
2601 2661
2602 if (prop == None) 2662 if (prop == None)
2603 return; 2663 return;
2664
2604 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); 2665 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2605 if (selection_wait == Sel_normal) 2666 if (selection_wait == Sel_normal)
2606 { 2667 {
2607 int a, afmt; 2668 int a, afmt;
2608 Atom atype; 2669 Atom atype;
2609 unsigned long bytes_after, nitems; 2670 unsigned long bytes_after, nitems;
2610 unsigned char *s = NULL; 2671 unsigned char *s = NULL;
2611 2672
2612 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, 2673 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2613 xa[XA_INCR], &atype, &afmt, &nitems, 2674 xa[XA_INCR], &atype, &afmt, &nitems,
2614 &bytes_after, &s); 2675 &bytes_after, &s);
2615 if (s) 2676 if (s)
2616 XFree (s); 2677 XFree (s);
2617 if (a != Success) 2678 if (a != Success)
2618 return; 2679 return;
2680
2619#ifndef __CYGWIN32__ 2681#ifndef __CYGWIN32__
2620 if (atype == xa[XA_INCR]) 2682 if (atype == xa[XA_INCR])
2621 { /* start an INCR transfer */ 2683 { /* start an INCR transfer */
2622 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); 2684 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2623 XDeleteProperty (display->display, win, prop); 2685 XDeleteProperty (display->display, win, prop);
… …
2629 2691
2630 } 2692 }
2631 else if (selection_wait == Sel_incr) 2693 else if (selection_wait == Sel_incr)
2632 { 2694 {
2633 reget_time = 1; 2695 reget_time = 1;
2696
2634 if (selection_paste (win, prop, True) == -1) 2697 if (selection_paste (win, prop, True) == -1)
2635 { 2698 {
2636 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); 2699 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2637 selection_wait = Sel_none; 2700 selection_wait = Sel_none;
2638 incr_ev.stop (); 2701 incr_ev.stop ();
2639 } 2702 }
2640 } 2703 }
2641 if (reget_time) /* received more data so reget time */ 2704 if (reget_time) /* received more data so reget time */
2642 incr_ev.start (NOW + 10); 2705 incr_ev.start (NOW + 10);
2643} 2706}
2707
2644/* ------------------------------------------------------------------------- */ 2708/* ------------------------------------------------------------------------- */
2645/* 2709/*
2646 * Request the current selection: 2710 * Request the current selection:
2647 * Order: > internal selection if available 2711 * Order: > internal selection if available
2648 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2712 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2653 */ 2717 */
2654void 2718void
2655rxvt_term::selection_request (Time tm, int x, int y) 2719rxvt_term::selection_request (Time tm, int x, int y)
2656{ 2720{
2657 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); 2721 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2722
2658 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2723 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2659 return; /* outside window */ 2724 return; /* outside window */
2660 2725
2661 if (selection.text != NULL) 2726 if (selection.text)
2662 { /* internal selection */ 2727 { /* internal selection */
2663 D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); 2728 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2664 paste (selection.text, selection.len); 2729 char *str = rxvt_wcstombs (selection.text, selection.len);
2730 paste ((unsigned char *)str, strlen (str));
2731 free (str);
2665 return; 2732 return;
2666 } 2733 }
2667 else 2734 else
2668 { 2735 {
2669 int i; 2736 int i;
2670 2737
2671 selection_request_time = tm; 2738 selection_request_time = tm;
2672 selection_wait = Sel_normal; 2739 selection_wait = Sel_normal;
2740
2673 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2741 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2674 { 2742 {
2675#if X_HAVE_UTF8_STRING 2743#if X_HAVE_UTF8_STRING
2676 selection_type = Sel_UTF8String; 2744 selection_type = Sel_UTF8String;
2677 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2745 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2682 return; 2750 return;
2683#endif 2751#endif
2684 2752
2685 } 2753 }
2686 } 2754 }
2755
2687 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2756 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2688 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2757 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2689 selection_paste (display->root, XA_CUT_BUFFER0, False); 2758 selection_paste (display->root, XA_CUT_BUFFER0, False);
2690} 2759}
2691 2760
2692int 2761int
2693rxvt_term::selection_request_other (Atom target, int selnum) 2762rxvt_term::selection_request_other (Atom target, int selnum)
2694{ 2763{
2695 Atom sel; 2764 Atom sel;
2696#ifdef DEBUG_SELECT 2765#ifdef DEBUG_SELECT
2697 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2766 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2698#endif 2767#endif
2699 2768
2700 selection_type |= selnum; 2769 selection_type |= selnum;
2770
2701 if (selnum == Sel_Primary) 2771 if (selnum == Sel_Primary)
2702 sel = XA_PRIMARY; 2772 sel = XA_PRIMARY;
2703 else if (selnum == Sel_Secondary) 2773 else if (selnum == Sel_Secondary)
2704 sel = XA_SECONDARY; 2774 sel = XA_SECONDARY;
2705 else 2775 else
2706 sel = xa[XA_CLIPBOARD]; 2776 sel = xa[XA_CLIPBOARD];
2777
2707 if (XGetSelectionOwner (display->display, sel) != None) 2778 if (XGetSelectionOwner (display->display, sel) != None)
2708 { 2779 {
2709 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2780 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2710 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2781 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2711 TermWin.vt, selection_request_time); 2782 TermWin.vt, selection_request_time);
2712 return 1; 2783 return 1;
2713 } 2784 }
2785
2714 return 0; 2786 return 0;
2715} 2787}
2716 2788
2717/* ------------------------------------------------------------------------- */ 2789/* ------------------------------------------------------------------------- */
2718/* 2790/*
… …
2723rxvt_term::selection_clear () 2795rxvt_term::selection_clear ()
2724{ 2796{
2725 D_SELECT ((stderr, "rxvt_selection_clear ()")); 2797 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2726 2798
2727 want_refresh = 1; 2799 want_refresh = 1;
2728 if (selection.text)
2729 free (selection.text); 2800 free (selection.text);
2730 selection.text = NULL; 2801 selection.text = NULL;
2731 selection.len = 0; 2802 selection.len = 0;
2732 CLEAR_SELECTION (); 2803 CLEAR_SELECTION ();
2804
2805 if (display->selection_owner == this)
2806 display->selection_owner = 0;
2733} 2807}
2734 2808
2735/* ------------------------------------------------------------------------- */ 2809/* ------------------------------------------------------------------------- */
2736/* 2810/*
2737 * Copy a selection into the cut buffer 2811 * Copy a selection into the cut buffer
2738 * EXT: button 1 or 3 release 2812 * EXT: button 1 or 3 release
2739 */ 2813 */
2740void 2814void
2741rxvt_term::selection_make (Time tm) 2815rxvt_term::selection_make (Time tm)
2742{ 2816{
2743 int i, col, end_col, row, end_row; 2817 int i, col, end_col, row, end_row;
2744 unsigned char *new_selection_text; 2818 wchar_t *new_selection_text;
2745 char *str;
2746 text_t *t; 2819 text_t *t;
2747#ifdef ACS_ASCII
2748 rend_t *re;
2749#endif
2750 2820
2751 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); 2821 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2752 switch (selection.op) 2822 switch (selection.op)
2753 { 2823 {
2754 case SELECTION_CONT: 2824 case SELECTION_CONT:
… …
2760 selection.op = SELECTION_DONE; 2830 selection.op = SELECTION_DONE;
2761 /* FALLTHROUGH */ 2831 /* FALLTHROUGH */
2762 default: 2832 default:
2763 return; 2833 return;
2764 } 2834 }
2835
2765 selection.op = SELECTION_DONE; 2836 selection.op = SELECTION_DONE;
2766 2837
2767 if (selection.clicks == 4) 2838 if (selection.clicks == 4)
2768 return; /* nothing selected, go away */ 2839 return; /* nothing selected, go away */
2769 2840
2770 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2841 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2771 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); 2842 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2772
2773 new_selection_text = (unsigned char *)str;
2774 2843
2775 col = selection.beg.col; 2844 col = selection.beg.col;
2776 MAX_IT (col, 0); 2845 MAX_IT (col, 0);
2777 row = selection.beg.row + TermWin.saveLines; 2846 row = selection.beg.row + TermWin.saveLines;
2778 end_row = selection.end.row + TermWin.saveLines; 2847 end_row = selection.end.row + TermWin.saveLines;
2848 int ofs = 0;
2849 int extra = 0;
2779 2850
2780 for (; row <= end_row; row++, col = 0) 2851 for (; row <= end_row; row++, col = 0)
2781 { 2852 {
2782 t = & (screen.text[row][col]); 2853 t = &(screen.text[row][col]);
2783 2854
2784 end_col = screen.tlen[row]; 2855 end_col = screen.tlen[row];
2785 2856
2786 if (end_col == -1) 2857 if (end_col == -1)
2787 end_col = TermWin.ncol; 2858 end_col = TermWin.ncol;
2788 2859
2789 if (row == end_row) 2860 if (row == end_row)
2790 MIN_IT (end_col, selection.end.col); 2861 MIN_IT (end_col, selection.end.col);
2791 2862
2792 for (; col < end_col; col++) 2863 for (; col < end_col; col++)
2864 {
2793 if (*t == NOCHAR) 2865 if (*t == NOCHAR)
2794 t++; 2866 t++;
2867#if ENABLE_COMBINING
2868 else if (IS_COMPOSE (*t))
2869 {
2870 int len = rxvt_composite.expand (*t, 0);
2871
2872 extra -= (len - 1);
2873
2874 if (extra < 0)
2875 {
2876 extra += i;
2877 i += i;
2878 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2879 }
2880
2881 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2882 }
2883#endif
2795 else 2884 else
2796 { 2885 new_selection_text[ofs++] = *t++;
2797 int len = wctomb (str, *t++);
2798 if (len > 0)
2799 str += len;
2800 } 2886 }
2801 2887
2802 if (screen.tlen[row] != -1 && row != end_row) 2888 if (screen.tlen[row] != -1 && row != end_row)
2803 *str++ = '\n'; 2889 new_selection_text[ofs++] = C0_LF;
2804 } 2890 }
2805 2891
2806#ifndef NO_OLD_SELECTION
2807 if (selection_style == OLD_SELECT)
2808 if (end_col == TermWin.ncol)
2809 *str++ = '\n';
2810#endif
2811#ifndef NO_NEW_SELECTION
2812 if (selection_style != OLD_SELECT)
2813 if (end_col != selection.end.col) 2892 if (end_col != selection.end.col)
2814 *str++ = '\n'; 2893 new_selection_text[ofs++] = C0_LF;
2815#endif
2816 *str = '\0';
2817 2894
2818 i = str - (char *)new_selection_text; 2895 new_selection_text[ofs] = 0;
2896
2819 if (i == 0) 2897 if (ofs == 0)
2820 { 2898 {
2821 free (new_selection_text); 2899 free (new_selection_text);
2822 return; 2900 return;
2823 } 2901 }
2824 2902
2825 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2826 if (str - (char *)new_selection_text > 1024)
2827 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2828
2829 selection.len = i;
2830
2831 if (selection.text)
2832 free (selection.text); 2903 free (selection.text);
2833 2904
2834 selection.text = new_selection_text; 2905 // we usually allocate much more than necessary, so realloc it smaller again
2906 selection.len = ofs;
2907 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2835 2908
2836 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2909 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2837 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2910 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2838 display->set_selection_owner (this); 2911 display->set_selection_owner (this);
2839 else 2912 else
2840 rxvt_print_error ("can't get primary selection"); 2913 rxvt_warn ("can't get primary selection, ignoring.\n");
2841 2914
2842 { 2915#if 0
2843 XTextProperty ct; 2916 XTextProperty ct;
2844 char *cl = (char *)selection.text;
2845 2917
2846 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2918 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2847 { 2919 {
2848 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2849 PropModeReplace, ct.value, ct.nitems);
2850 XFree (ct.value);
2851 }
2852 else
2853 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2920 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2854 PropModeReplace, selection.text, (int)selection.len); 2921 PropModeReplace, ct.value, ct.nitems);
2922 XFree (ct.value);
2855 } 2923 }
2924#endif
2856 2925
2857 selection_time = tm; 2926 selection_time = tm;
2858 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); 2927 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2859} 2928}
2860 2929
… …
2889rxvt_term::selection_start_colrow (int col, int row) 2958rxvt_term::selection_start_colrow (int col, int row)
2890{ 2959{
2891 want_refresh = 1; 2960 want_refresh = 1;
2892 selection.mark.col = col; 2961 selection.mark.col = col;
2893 selection.mark.row = row - TermWin.view_start; 2962 selection.mark.row = row - TermWin.view_start;
2963
2894 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2964 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2895 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2965 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2896 MAX_IT (selection.mark.col, 0); 2966 MAX_IT (selection.mark.col, 0);
2897 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2967 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2898 2968
2969 while (selection.mark.col > 0
2970 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2971 --selection.mark.col;
2972
2899 if (selection.op) 2973 if (selection.op)
2900 { /* clear the old selection */ 2974 { /* clear the old selection */
2901 selection.beg.row = selection.end.row = selection.mark.row; 2975 selection.beg.row = selection.end.row = selection.mark.row;
2902 selection.beg.col = selection.end.col = selection.mark.col; 2976 selection.beg.col = selection.end.col = selection.mark.col;
2903 } 2977 }
2978
2904 selection.op = SELECTION_INIT; 2979 selection.op = SELECTION_INIT;
2905 selection.screen = current_screen; 2980 selection.screen = current_screen;
2906} 2981}
2907 2982
2908/* ------------------------------------------------------------------------- */ 2983/* ------------------------------------------------------------------------- */
… …
2910 * Word select: select text for 2 clicks 2985 * Word select: select text for 2 clicks
2911 * We now only find out the boundary in one direction 2986 * We now only find out the boundary in one direction
2912 */ 2987 */
2913 2988
2914/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2989/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2915#define DELIMIT_TEXT(x) \ 2990#define DELIMIT_TEXT(x) \
2916 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 2991 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x)))
2917#define DELIMIT_REND(x) 1 2992#define DELIMIT_REND(x) 1
2918 2993
2919void 2994void
2920rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2995rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2921{ 2996{
2922 int col, row, dirnadd, tcol, trow, w1, w2; 2997 int col, row, dirnadd, tcol, trow, w1, w2;
2923 row_col_t bound; 2998 row_col_t bound;
2924 text_t *stp; 2999 text_t *stp;
2925 rend_t *srp; 3000 rend_t *srp;
2926 3001
2927 if (dirn == UP) 3002 if (dirn == UP)
2928 { 3003 {
2929 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3004 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2930 bound.col = 0; 3005 bound.col = 0;
… …
2934 { 3009 {
2935 bound.row = TermWin.saveLines + TermWin.nrow; 3010 bound.row = TermWin.saveLines + TermWin.nrow;
2936 bound.col = TermWin.ncol - 1; 3011 bound.col = TermWin.ncol - 1;
2937 dirnadd = 1; 3012 dirnadd = 1;
2938 } 3013 }
3014
2939 row = mark->row + TermWin.saveLines; 3015 row = mark->row + TermWin.saveLines;
2940 col = mark->col; 3016 col = mark->col;
2941 MAX_IT (col, 0); 3017 MAX_IT (col, 0);
2942 /* find the edge of a word */ 3018 /* find the edge of a word */
2943 stp = & (screen.text[row][col]); 3019 stp = & (screen.text[row][col]);
2944 w1 = DELIMIT_TEXT (*stp); 3020 w1 = DELIMIT_TEXT (*stp);
2945 3021
2946 if (selection_style != NEW_SELECT)
2947 {
2948 if (w1 == 1)
2949 {
2950 stp += dirnadd;
2951 if (DELIMIT_TEXT (*stp) == 1)
2952 goto Old_Word_Selection_You_Die;
2953 col += dirnadd;
2954 }
2955 w1 = 0;
2956 }
2957 srp = (&screen.rend[row][col]); 3022 srp = (&screen.rend[row][col]);
2958 w2 = DELIMIT_REND (*srp); 3023 w2 = DELIMIT_REND (*srp);
2959 3024
2960 for (;;) 3025 for (;;)
2961 { 3026 {
2962 for (; col != bound.col; col += dirnadd) 3027 for (; col != bound.col; col += dirnadd)
2963 { 3028 {
2964 stp += dirnadd; 3029 stp += dirnadd;
3030 srp += dirnadd;
3031
3032 if (*stp == NOCHAR)
3033 continue;
3034
2965 if (DELIMIT_TEXT (*stp) != w1) 3035 if (DELIMIT_TEXT (*stp) != w1)
2966 break; 3036 break;
2967 srp += dirnadd;
2968 if (DELIMIT_REND (*srp) != w2) 3037 if (DELIMIT_REND (*srp) != w2)
2969 break; 3038 break;
2970 } 3039 }
3040
2971 if ((col == bound.col) && (row != bound.row)) 3041 if ((col == bound.col) && (row != bound.row))
2972 { 3042 {
2973 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3043 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2974 { 3044 {
2975 trow = row + dirnadd; 3045 trow = row + dirnadd;
2976 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3046 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3047
2977 if (screen.text[trow] == NULL) 3048 if (screen.text[trow] == NULL)
2978 break; 3049 break;
3050
2979 stp = & (screen.text[trow][tcol]); 3051 stp = & (screen.text[trow][tcol]);
2980 srp = & (screen.rend[trow][tcol]); 3052 srp = & (screen.rend[trow][tcol]);
3053
2981 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3054 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2982 break; 3055 break;
3056
2983 row = trow; 3057 row = trow;
2984 col = tcol; 3058 col = tcol;
2985 continue; 3059 continue;
2986 } 3060 }
2987 } 3061 }
2988 break; 3062 break;
2989 } 3063 }
3064
2990Old_Word_Selection_You_Die: 3065Old_Word_Selection_You_Die:
2991 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); 3066 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col));
2992 3067
2993 if (dirn == DN) 3068 if (dirn == DN)
2994 col++; /* put us on one past the end */ 3069 col++; /* put us on one past the end */
… …
3016 MAX_IT (row, 0); 3091 MAX_IT (row, 0);
3017 MIN_IT (row, (int)TermWin.nrow - 1); 3092 MIN_IT (row, (int)TermWin.nrow - 1);
3018 MAX_IT (col, 0); 3093 MAX_IT (col, 0);
3019 MIN_IT (col, (int)TermWin.ncol); 3094 MIN_IT (col, (int)TermWin.ncol);
3020 3095
3021#ifndef NO_NEW_SELECTION
3022 /* 3096 /*
3023 * If we're selecting characters (single click) then we must check first 3097 * If we're selecting characters (single click) then we must check first
3024 * if we are at the same place as the original mark. If we are then 3098 * if we are at the same place as the original mark. If we are then
3025 * select nothing. Otherwise, if we're to the right of the mark, you have to 3099 * select nothing. Otherwise, if we're to the right of the mark, you have to
3026 * be _past_ a character for it to be selected. 3100 * be _past_ a character for it to be selected.
3027 */ 3101 */
3028 if (selection_style != OLD_SELECT)
3029 {
3030 if (((selection.clicks % 3) == 1) && !flag 3102 if (((selection.clicks % 3) == 1) && !flag
3031 && (col == selection.mark.col 3103 && (col == selection.mark.col
3032 && (row == selection.mark.row + TermWin.view_start))) 3104 && (row == selection.mark.row + TermWin.view_start)))
3033 { 3105 {
3034 /* select nothing */ 3106 /* select nothing */
3035 selection.beg.row = selection.end.row = 0; 3107 selection.beg.row = selection.end.row = 0;
3036 selection.beg.col = selection.end.col = 0; 3108 selection.beg.col = selection.end.col = 0;
3037 selection.clicks = 4; 3109 selection.clicks = 4;
3038 want_refresh = 1; 3110 want_refresh = 1;
3039 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); 3111 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3040 return; 3112 return;
3041 }
3042 } 3113 }
3043#endif 3114
3044 if (selection.clicks == 4) 3115 if (selection.clicks == 4)
3045 selection.clicks = 1; 3116 selection.clicks = 1;
3046 3117
3047 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3118 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3048 flag == 1 ? 1 : 0, /* ? button press */ 3119 flag == 1 ? 1 : 0, /* ? button press */
… …
3054 * Extend the selection to the specified col/row 3125 * Extend the selection to the specified col/row
3055 */ 3126 */
3056void 3127void
3057rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3128rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3058{ 3129{
3059 int16_t ncol = TermWin.ncol; 3130 int16_t ncol = TermWin.ncol;
3060 int end_col; 3131 int end_col;
3061 row_col_t pos; 3132 row_col_t pos;
3062 enum { 3133 enum {
3063 LEFT, RIGHT 3134 LEFT, RIGHT
3064 } closeto = RIGHT; 3135 } closeto = RIGHT;
3065 3136
3066 D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); 3137 D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op));
… …
3102 pos.col = col; 3173 pos.col = col;
3103 pos.row = row; 3174 pos.row = row;
3104 3175
3105 pos.row -= TermWin.view_start; /* adjust for scroll */ 3176 pos.row -= TermWin.view_start; /* adjust for scroll */
3106 3177
3107#ifndef NO_OLD_SELECTION
3108 /*
3109 * This mimics some of the selection behaviour of version 2.20 and before.
3110 * There are no ``selection modes'', button3 is always character extension.
3111 * Note: button3 drag is always available, c.f. v2.20
3112 * Selection always terminates (left or right as appropriate) at the mark.
3113 */
3114 if (selection_style == OLD_SELECT)
3115 {
3116 if (selection.clicks == 1 || button3)
3117 {
3118 if (hate_those_clicks)
3119 {
3120 hate_those_clicks = 0;
3121 if (selection.clicks == 1)
3122 {
3123 selection.beg.row = selection.mark.row;
3124 selection.beg.col = selection.mark.col;
3125 }
3126 else
3127 {
3128 selection.mark.row = selection.beg.row;
3129 selection.mark.col = selection.beg.col;
3130 }
3131 }
3132 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3133 {
3134 selection.end.row = selection.mark.row;
3135 selection.end.col = selection.mark.col + 1;
3136 selection.beg.row = pos.row;
3137 selection.beg.col = pos.col;
3138 }
3139 else
3140 {
3141 selection.beg.row = selection.mark.row;
3142 selection.beg.col = selection.mark.col;
3143 selection.end.row = pos.row;
3144 selection.end.col = pos.col + 1;
3145 }
3146 }
3147 else if (selection.clicks == 2)
3148 {
3149 selection_delimit_word (UP, & (selection.mark),
3150 & (selection.beg));
3151 selection_delimit_word (DN, & (selection.mark),
3152 & (selection.end));
3153 hate_those_clicks = 1;
3154 }
3155 else if (selection.clicks == 3)
3156 {
3157 selection.beg.row = selection.end.row = selection.mark.row;
3158 selection.beg.col = 0;
3159 selection.end.col = ncol;
3160 hate_those_clicks = 1;
3161 }
3162 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3163 return;
3164 }
3165#endif /* ! NO_OLD_SELECTION */
3166#ifndef NO_NEW_SELECTION
3167 /* selection_style must not be OLD_SELECT to get here */
3168 /* 3178 /*
3169 * This is mainly xterm style selection with a couple of differences, mainly 3179 * This is mainly xterm style selection with a couple of differences, mainly
3170 * in the way button3 drag extension works. 3180 * in the way button3 drag extension works.
3171 * We're either doing: button1 drag; button3 press; or button3 drag 3181 * We're either doing: button1 drag; button3 press; or button3 drag
3172 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3182 * a) button1 drag : select around a midpoint/word/line - that point/word/line
… …
3177 * a point/word/line which is either the start or end of the selection 3187 * a point/word/line which is either the start or end of the selection
3178 * and it was decided by whichever point/word/line was `fixed' at the 3188 * and it was decided by whichever point/word/line was `fixed' at the
3179 * time of the most recent button3 press 3189 * time of the most recent button3 press
3180 */ 3190 */
3181 if (button3 && buttonpress) 3191 if (button3 && buttonpress)
3182 { /* button3 press */ 3192 { /* button3 press */
3183 /* 3193 /*
3184 * first determine which edge of the selection we are closest to 3194 * first determine which edge of the selection we are closest to
3185 */ 3195 */
3186 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3196 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3187 || (!ROWCOL_IS_AFTER (pos, selection.end) 3197 || (!ROWCOL_IS_AFTER (pos, selection.end)
3188 && (((pos.col - selection.beg.col) 3198 && (((pos.col - selection.beg.col)
3189 + ((pos.row - selection.beg.row) * ncol)) 3199 + ((pos.row - selection.beg.row) * ncol))
3190 < ((selection.end.col - pos.col) 3200 < ((selection.end.col - pos.col)
3191 + ((selection.end.row - pos.row) * ncol))))) 3201 + ((selection.end.row - pos.row) * ncol)))))
3192 closeto = LEFT; 3202 closeto = LEFT;
3203
3193 if (closeto == LEFT) 3204 if (closeto == LEFT)
3194 { 3205 {
3195 selection.beg.row = pos.row; 3206 selection.beg.row = pos.row;
3196 selection.beg.col = pos.col; 3207 selection.beg.col = pos.col;
3197 selection.mark.row = selection.end.row; 3208 selection.mark.row = selection.end.row;
3198 selection.mark.col = selection.end.col 3209 selection.mark.col = selection.end.col - (selection.clicks == 2);
3199 - (selection.clicks == 2);
3200 } 3210 }
3201 else 3211 else
3202 { 3212 {
3203 selection.end.row = pos.row; 3213 selection.end.row = pos.row;
3204 selection.end.col = pos.col; 3214 selection.end.col = pos.col;
3205 selection.mark.row = selection.beg.row; 3215 selection.mark.row = selection.beg.row;
3206 selection.mark.col = selection.beg.col; 3216 selection.mark.col = selection.beg.col;
3207 } 3217 }
3208 } 3218 }
3209 else 3219 else
3210 { /* button1 drag or button3 drag */ 3220 { /* button1 drag or button3 drag */
3211 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3221 if (ROWCOL_IS_AFTER (selection.mark, pos))
3212 { 3222 {
3213 if ((selection.mark.row == selection.end.row) 3223 if ((selection.mark.row == selection.end.row)
3214 && (selection.mark.col == selection.end.col) 3224 && (selection.mark.col == selection.end.col)
3215 && clickchange && selection.clicks == 2) 3225 && clickchange && selection.clicks == 2)
3216 selection.mark.col--; 3226 selection.mark.col--;
3227
3217 selection.beg.row = pos.row; 3228 selection.beg.row = pos.row;
3218 selection.beg.col = pos.col; 3229 selection.beg.col = pos.col;
3219 selection.end.row = selection.mark.row; 3230 selection.end.row = selection.mark.row;
3220 selection.end.col = selection.mark.col 3231 selection.end.col = selection.mark.col + (selection.clicks == 2);
3221 + (selection.clicks == 2);
3222 } 3232 }
3223 else 3233 else
3224 { 3234 {
3225 selection.beg.row = selection.mark.row; 3235 selection.beg.row = selection.mark.row;
3226 selection.beg.col = selection.mark.col; 3236 selection.beg.col = selection.mark.col;
… …
3230 } 3240 }
3231 3241
3232 if (selection.clicks == 1) 3242 if (selection.clicks == 1)
3233 { 3243 {
3234 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3244 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3245
3235 if (end_col != -1 && selection.beg.col > end_col) 3246 if (end_col != -1 && selection.beg.col > end_col)
3236 { 3247 {
3237#if 1 3248#if 1
3238 selection.beg.col = ncol; 3249 selection.beg.col = ncol;
3239#else 3250#else
3240 if (selection.beg.row != selection.end.row) 3251 if (selection.beg.row != selection.end.row)
3241 selection.beg.col = ncol; 3252 selection.beg.col = ncol;
3242 else 3253 else
3243 selection.beg.col = selection.mark.col; 3254 selection.beg.col = selection.mark.col;
3244#endif 3255#endif
3245
3246 } 3256 }
3257
3247 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3258 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3259
3248 if (end_col != -1 && selection.end.col > end_col) 3260 if (end_col != -1 && selection.end.col > end_col)
3249 selection.end.col = ncol; 3261 selection.end.col = ncol;
3250
3251 } 3262 }
3252 else if (selection.clicks == 2) 3263 else if (selection.clicks == 2)
3253 { 3264 {
3254 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3265 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3255 selection.end.col--; 3266 selection.end.col--;
3267
3256 selection_delimit_word (UP, & (selection.beg), 3268 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3257 & (selection.beg));
3258 selection_delimit_word (DN, & (selection.end), 3269 selection_delimit_word (DN, & (selection.end), & (selection.end));
3259 & (selection.end));
3260 } 3270 }
3261 else if (selection.clicks == 3) 3271 else if (selection.clicks == 3)
3262 { 3272 {
3263#ifndef NO_FRILLS 3273#ifndef NO_FRILLS
3264 if ((Options & Opt_tripleclickwords)) 3274 if ((Options & Opt_tripleclickwords))
3265 { 3275 {
3266 int end_row; 3276 int end_row;
3267 3277
3268 selection_delimit_word (UP, & (selection.beg), 3278 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3269 & (selection.beg));
3270 end_row = screen.tlen[selection.mark.row 3279 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3271 + TermWin.saveLines]; 3280
3272 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3281 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3273 end_row++)
3274 { 3282 {
3275 end_col = screen.tlen[end_row + TermWin.saveLines]; 3283 end_col = screen.tlen[end_row + TermWin.saveLines];
3284
3276 if (end_col != -1) 3285 if (end_col != -1)
3277 { 3286 {
3278 selection.end.row = end_row; 3287 selection.end.row = end_row;
3279 selection.end.col = end_col; 3288 selection.end.col = end_col;
3280 selection_remove_trailing_spaces (); 3289 selection_remove_trailing_spaces ();
… …
3282 } 3291 }
3283 } 3292 }
3284 } 3293 }
3285 else 3294 else
3286#endif 3295#endif
3287
3288 { 3296 {
3289 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3297 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3290 selection.mark.col++; 3298 selection.mark.col++;
3291 selection.beg.col = 0; 3299 selection.beg.col = 0;
3292 selection.end.col = ncol; 3300 selection.end.col = ncol;
3293 } 3301 }
3294 } 3302 }
3303
3295 if (button3 && buttonpress) 3304 if (button3 && buttonpress)
3296 { /* mark may need to be changed */ 3305 { /* mark may need to be changed */
3297 if (closeto == LEFT) 3306 if (closeto == LEFT)
3298 { 3307 {
3299 selection.mark.row = selection.end.row; 3308 selection.mark.row = selection.end.row;
3300 selection.mark.col = selection.end.col 3309 selection.mark.col = selection.end.col
3301 - (selection.clicks == 2); 3310 - (selection.clicks == 2);
… …
3305 selection.mark.row = selection.beg.row; 3314 selection.mark.row = selection.beg.row;
3306 selection.mark.col = selection.beg.col; 3315 selection.mark.col = selection.beg.col;
3307 } 3316 }
3308 } 3317 }
3309 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); 3318 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3310#endif /* ! NO_NEW_SELECTION */
3311} 3319}
3312 3320
3313#ifndef NO_FRILLS 3321#ifndef NO_FRILLS
3314void 3322void
3315rxvt_term::selection_remove_trailing_spaces () 3323rxvt_term::selection_remove_trailing_spaces ()
… …
3389 ev.target = rq.target; 3397 ev.target = rq.target;
3390 ev.time = rq.time; 3398 ev.time = rq.time;
3391 3399
3392 if (rq.target == xa[XA_TARGETS]) 3400 if (rq.target == xa[XA_TARGETS])
3393 { 3401 {
3394 Atom32 target_list[5]; 3402 Atom32 target_list[6];
3395 Atom32 *target = target_list; 3403 Atom32 *target = target_list;
3396 3404
3397 *target++ = (Atom32) xa[XA_TARGETS]; 3405 *target++ = (Atom32) xa[XA_TARGETS];
3406 *target++ = (Atom32) xa[XA_TIMESTAMP];
3398 *target++ = (Atom32) XA_STRING; 3407 *target++ = (Atom32) XA_STRING;
3399 *target++ = (Atom32) xa[XA_TEXT]; 3408 *target++ = (Atom32) xa[XA_TEXT];
3400 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3409 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3401#if X_HAVE_UTF8_STRING 3410#if X_HAVE_UTF8_STRING
3402 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3411 *target++ = (Atom32) xa[XA_UTF8_STRING];
3403#endif 3412#endif
3413
3404 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3414 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3405 (8 * sizeof (target_list[0])), PropModeReplace, 3415 (8 * sizeof (target_list[0])), PropModeReplace,
3406 (unsigned char *)target_list, 3416 (unsigned char *)target_list,
3407 target - target_list); 3417 target - target_list);
3408 ev.property = rq.property; 3418 ev.property = rq.property;
3409 } 3419 }
3410 else if (rq.target == xa[XA_MULTIPLE]) 3420 else if (rq.target == xa[XA_MULTIPLE])
3411 { 3421 {
3412 /* TODO: Handle MULTIPLE */ 3422 /* TODO: Handle MULTIPLE */
3413 } 3423 }
3414 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3424 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3415 { 3425 {
3416 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3426 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3417 (8 * sizeof (Time)), PropModeReplace, 3427 (8 * sizeof (Time)), PropModeReplace,
3418 (unsigned char *)&selection_time, 1); 3428 (unsigned char *)&selection_time, 1);
3419 ev.property = rq.property; 3429 ev.property = rq.property;
3420 } 3430 }
3421 else if (rq.target == XA_STRING 3431 else if (rq.target == XA_STRING
3422 || rq.target == xa[XA_TEXT] 3432 || rq.target == xa[XA_TEXT]
3423 || rq.target == xa[XA_COMPOUND_TEXT] 3433 || rq.target == xa[XA_COMPOUND_TEXT]
3424 || rq.target == xa[XA_UTF8_STRING] 3434 || rq.target == xa[XA_UTF8_STRING]
3425 ) 3435 )
3426 { 3436 {
3427 short freect = 0; 3437 short freect = 0;
3428 int selectlen; 3438 int selectlen;
3429 char *cl; 3439 wchar_t *cl;
3430 3440
3431 target = rq.target; 3441 target = rq.target;
3432 3442
3433 if (target == XA_STRING) 3443 if (target == XA_STRING)
3434 // we actually don't do XA_STRING, but who cares, as i18n clients 3444 // we actually don't do XA_STRING, but who cares, as i18n clients
3435 // will ask for another format anyways. 3445 // will ask for another format anyways.
3436 style = XStringStyle; 3446 style = XStringStyle;
3437 else if (target == xa[XA_TEXT]) 3447 else if (target == xa[XA_TEXT])
3438 style = XTextStyle; 3448 style = XStdICCTextStyle;
3439 else if (target == xa[XA_COMPOUND_TEXT]) 3449 else if (target == xa[XA_COMPOUND_TEXT])
3440 style = XCompoundTextStyle; 3450 style = XCompoundTextStyle;
3441#if X_HAVE_UTF8_STRING 3451#if X_HAVE_UTF8_STRING
3442 else if (target == xa[XA_UTF8_STRING]) 3452 else if (target == xa[XA_UTF8_STRING])
3443 style = XUTF8StringStyle; 3453 style = XUTF8StringStyle;
… …
3448 style = XCompoundTextStyle; 3458 style = XCompoundTextStyle;
3449 } 3459 }
3450 3460
3451 if (selection.text) 3461 if (selection.text)
3452 { 3462 {
3453 cl = (char *)selection.text; 3463 cl = selection.text;
3454 selectlen = selection.len; 3464 selectlen = selection.len;
3455 } 3465 }
3456 else 3466 else
3457 { 3467 {
3458 cl = ""; 3468 cl = L"";
3459 selectlen = 0; 3469 selectlen = 0;
3460 } 3470 }
3461 3471
3472 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3473 // manually for XUTF8StringStyle.
3462 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3474 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3463 freect = 1; 3475 freect = 1;
3464 else 3476 else
3465 { 3477 {
3466 /* if we failed to convert then send it raw */ 3478 /* if we failed to convert then send it raw */
3467 ct.value = (unsigned char *)cl; 3479 ct.value = (unsigned char *)cl;
… …
3474 ev.property = rq.property; 3486 ev.property = rq.property;
3475 3487
3476 if (freect) 3488 if (freect)
3477 XFree (ct.value); 3489 XFree (ct.value);
3478 } 3490 }
3491
3479 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3492 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3480} 3493}
3481 3494
3482/* ------------------------------------------------------------------------- * 3495/* ------------------------------------------------------------------------- *
3483 * MOUSE ROUTINES * 3496 * MOUSE ROUTINES *
… …
3507 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3520 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace;
3508} 3521}
3509 3522
3510#endif 3523#endif
3511/* ------------------------------------------------------------------------- */ 3524/* ------------------------------------------------------------------------- */
3512
3513/* ------------------------------------------------------------------------- *
3514 * DEBUG ROUTINES *
3515 * ------------------------------------------------------------------------- */
3516#if 0
3517void
3518rxvt_debug_colors (void)
3519{
3520 int color;
3521 const char *name[] =
3522 {
3523 "fg", "bg",
3524 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3525 };
3526
3527 fprintf (stderr, "Color ( ");
3528 if (rstyle & RS_RVid)
3529 fprintf (stderr, "rvid ");
3530 if (rstyle & RS_Bold)
3531 fprintf (stderr, "bold ");
3532 if (rstyle & RS_Blink)
3533 fprintf (stderr, "blink ");
3534 if (rstyle & RS_Uline)
3535 fprintf (stderr, "uline ");
3536 fprintf (stderr, "): ");
3537
3538 color = GET_FGCOLOR (rstyle);
3539#ifndef NO_BRIGHTCOLOR
3540 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3541 {
3542 color -= (minBrightCOLOR - minCOLOR);
3543 fprintf (stderr, "bright ");
3544 }
3545#endif
3546 fprintf (stderr, "%s on ", name[color]);
3547
3548 color = GET_BGCOLOR (rstyle);
3549#ifndef NO_BRIGHTCOLOR
3550 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3551 {
3552 color -= (minBrightCOLOR - minCOLOR);
3553 fprintf (stderr, "bright ");
3554 }
3555#endif
3556 fprintf (stderr, "%s\n", name[color]);
3557}
3558#endif

Diff Legend

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