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.43 by pcg, Wed Mar 3 02:59:53 2004 UTC vs.
Revision 1.77 by root, Mon Jul 26 14:57:12 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 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
7 * 7 *
… …
48 48
49/* ------------------------------------------------------------------------- * 49/* ------------------------------------------------------------------------- *
50 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 50 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
51 * ------------------------------------------------------------------------- */ 51 * ------------------------------------------------------------------------- */
52#define ZERO_SCROLLBACK() \ 52#define ZERO_SCROLLBACK() \
53 if ((Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ 53 if (Options & Opt_scrollTtyOutput) \
54 TermWin.view_start = 0 54 TermWin.view_start = 0
55#define CLEAR_SELECTION() \ 55#define CLEAR_SELECTION() \
56 selection.beg.row = selection.beg.col \ 56 selection.beg.row = selection.beg.col \
57 = selection.end.row = selection.end.col = 0 57 = selection.end.row = selection.end.col = 0
58#define CLEAR_ALL_SELECTION() \ 58#define CLEAR_ALL_SELECTION() \
59 selection.beg.row = selection.beg.col \ 59 selection.beg.row = selection.beg.col \
60 = selection.mark.row = selection.mark.col \ 60 = selection.mark.row = selection.mark.col \
61 = selection.end.row = selection.end.col = 0 61 = selection.end.row = selection.end.col = 0
62 62
63#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 63#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
64 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 64 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
65#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 65#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
66 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 66 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
67#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ 67#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \
68 (((A) == (C)) && ((B) > (D))) 68 (((A) == (C)) && ((B) > (D)))
69#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ 69#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \
70 (((A) == (C)) && ((B) >= (D))) 70 (((A) == (C)) && ((B) >= (D)))
71#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ 71#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \
72 (((A) == (C)) && ((B) < (D))) 72 (((A) == (C)) && ((B) < (D)))
73#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ 73#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \
74 (((A) == (C)) && ((B) <= (D))) 74 (((A) == (C)) && ((B) <= (D)))
75 75
76/* these must be row_col_t */ 76/* these must be row_col_t */
77#define ROWCOL_IS_AFTER(X, Y) \ 77#define ROWCOL_IS_AFTER(X, Y) \
78 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col) 78 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col)
79#define ROWCOL_IS_BEFORE(X, Y) \ 79#define ROWCOL_IS_BEFORE(X, Y) \
80 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 80 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
81#define ROWCOL_IN_ROW_AFTER(X, Y) \ 81#define ROWCOL_IN_ROW_AFTER(X, Y) \
82 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col) 82 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col)
83#define ROWCOL_IN_ROW_BEFORE(X, Y) \ 83#define ROWCOL_IN_ROW_BEFORE(X, Y) \
84 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 85#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
86 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 86 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
87#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 87#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
88 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 88 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
89 89
90/* 90/*
91 * CLEAR_ROWS : clear <num> rows starting from row <row> 91 * CLEAR_ROWS : clear <num> rows starting from row <row>
92 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 92 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
93 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 93 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
94 */ 94 */
95#define drawBuffer TermWin.vt 95#define drawBuffer TermWin.vt
96 96
97#define CLEAR_ROWS(row, num) \ 97#define CLEAR_ROWS(row, num) \
98 if (TermWin.mapped) \ 98 if (TermWin.mapped) \
99 XClearArea (display->display, drawBuffer, TermWin.int_bwidth, \ 99 XClearArea (display->display, drawBuffer, 0, \
100 Row2Pixel (row), (unsigned int)TermWin.width, \ 100 Row2Pixel (row), (unsigned int)TermWin.width, \
101 (unsigned int)Height2Pixel (num), False) 101 (unsigned int)Height2Pixel (num), False)
102 102
103#define CLEAR_CHARS(x, y, num) \ 103#define CLEAR_CHARS(x, y, num) \
104 if (TermWin.mapped) \ 104 if (TermWin.mapped) \
105 XClearArea (display->display, drawBuffer, x, y, \ 105 XClearArea (display->display, drawBuffer, x, y, \
106 (unsigned int)Width2Pixel (num), \ 106 (unsigned int)Width2Pixel (num), \
107 (unsigned int)Height2Pixel (1), False) 107 (unsigned int)Height2Pixel (1), False)
108 108
109#define ERASE_ROWS(row, num) \ 109#define ERASE_ROWS(row, num) \
110 XFillRectangle (display->display, drawBuffer, TermWin.gc, \ 110 XFillRectangle (display->display, drawBuffer, TermWin.gc, \
111 TermWin.int_bwidth, Row2Pixel (row), \ 111 0, Row2Pixel (row), \
112 (unsigned int)TermWin.width, \ 112 (unsigned int)TermWin.width, \
113 (unsigned int)Height2Pixel (num)) 113 (unsigned int)Height2Pixel (num))
114 114
115/* ------------------------------------------------------------------------- * 115/* ------------------------------------------------------------------------- *
116 * SCREEN `COMMON' ROUTINES * 116 * SCREEN `COMMON' ROUTINES *
117 * ------------------------------------------------------------------------- */ 117 * ------------------------------------------------------------------------- */
… …
189 } 189 }
190 190
191 if (prev_nrow == 0) 191 if (prev_nrow == 0)
192 { 192 {
193 /* 193 /*
194 * 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
195 * 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
196 */ 196 */
197 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 197 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
198 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 198 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
199 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 199 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
… …
256 scr_scroll_text (0, (int)prev_nrow - 1, k, 1); 256 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
257 257
258 for (p = nrow; p < prev_nrow; p++) 258 for (p = nrow; p < prev_nrow; p++)
259 { 259 {
260 q = p + TermWin.saveLines; 260 q = p + TermWin.saveLines;
261
261 if (screen.text[q]) 262 if (screen.text[q])
262 { 263 {
263#ifdef DEBUG_STRICT 264#ifdef DEBUG_STRICT
264 assert (screen.rend[q]); 265 assert (screen.rend[q]);
265#endif 266#endif
266 talloc->free (screen.text[q]); 267 talloc->free (screen.text[q]);
267 ralloc->free (screen.rend[q]); 268 ralloc->free (screen.rend[q]);
268 } 269 }
270
269 if (swap.text[p]) 271 if (swap.text[p])
270 { 272 {
271#ifdef DEBUG_STRICT 273#ifdef DEBUG_STRICT
272 assert (swap.rend[p]); 274 assert (swap.rend[p]);
273#endif 275#endif
274 talloc->free (swap.text[p]); 276 talloc->free (swap.text[p]);
275 ralloc->free (swap.rend[p]); 277 ralloc->free (swap.rend[p]);
276 } 278 }
279
277#ifdef DEBUG_STRICT 280#ifdef DEBUG_STRICT
278 assert (drawn_text[p] && drawn_rend[p]); 281 assert (drawn_text[p] && drawn_rend[p]);
279#endif 282#endif
280 talloc->free (drawn_text[p]); 283 talloc->free (drawn_text[p]);
281 ralloc->free (drawn_rend[p]); 284 ralloc->free (drawn_rend[p]);
… …
311 swap.tlen[p] = 0; 314 swap.tlen[p] = 0;
312 swap.text[p] = NULL; 315 swap.text[p] = NULL;
313 swap.rend[p] = NULL; 316 swap.rend[p] = NULL;
314 drawn_text[p] = NULL; 317 drawn_text[p] = NULL;
315 drawn_rend[p] = NULL; 318 drawn_rend[p] = NULL;
316 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); 319 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
317 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); 320 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
318 } 321 }
319 322
320 if (k > 0) 323 if (k > 0)
321 { 324 {
… …
336 } 339 }
337 340
338 /* resize columns */ 341 /* resize columns */
339 if (ncol != prev_ncol) 342 if (ncol != prev_ncol)
340 { 343 {
341 int common = min (prev_ncol, ncol);
342 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); 344 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
343 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); 345 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
344 346
345 for (p = 0; p < total_rows; p++) 347 for (p = 0; p < total_rows; p++)
346 { 348 {
347 if (screen.text[p]) 349 if (screen.text[p])
348 { 350 {
349 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));
350 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));
351 353
352 MIN_IT (screen.tlen[p], (int16_t)ncol); 354 MIN_IT (screen.tlen[p], (int16_t)ncol);
353 355
354 if (ncol > prev_ncol) 356 if (ncol > prev_ncol)
355 scr_blank_line (& (screen.text[p][prev_ncol]), 357 scr_blank_line (&screen.text[p][prev_ncol],
356 & (screen.rend[p][prev_ncol]), 358 &screen.rend[p][prev_ncol],
357 ncol - prev_ncol, 359 ncol - prev_ncol, setrstyle);
358 setrstyle);
359 } 360 }
360 } 361 }
361 362
362 for (p = 0; p < nrow; p++) 363 for (p = 0; p < nrow; p++)
363 { 364 {
364 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));
365 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));
366 367
367 if (ncol > prev_ncol) 368 if (ncol > prev_ncol)
368 scr_blank_line (& (drawn_text[p][prev_ncol]), 369 scr_blank_line (&drawn_text[p][prev_ncol],
369 & (drawn_rend[p][prev_ncol]), 370 &drawn_rend[p][prev_ncol],
370 ncol - prev_ncol, setrstyle); 371 ncol - prev_ncol, setrstyle);
371 372
372 if (swap.text[p]) 373 if (swap.text[p])
373 { 374 {
374 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));
375 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));
376 377
377 MIN_IT (swap.tlen[p], (int16_t)ncol); 378 MIN_IT (swap.tlen[p], (int16_t)ncol);
378 379
379 if (ncol > prev_ncol) 380 if (ncol > prev_ncol)
380 scr_blank_line (& (swap.text[p][prev_ncol]), 381 scr_blank_line (&swap.text[p][prev_ncol],
381 & (swap.rend[p][prev_ncol]), 382 &swap.rend[p][prev_ncol],
382 ncol - prev_ncol, setrstyle); 383 ncol - prev_ncol, setrstyle);
383 } 384 }
384 385
385 } 386 }
386 387
… …
438{ 439{
439 uint16_t total_rows; 440 uint16_t total_rows;
440 int i; 441 int i;
441 442
442 total_rows = TermWin.nrow + TermWin.saveLines; 443 total_rows = TermWin.nrow + TermWin.saveLines;
443
444#ifdef DEBUG_STRICT
445 for (i = 0; i < total_rows; i++)
446 {
447 if (screen.text[i])
448 /* then so is screen.rend[i] */
449 assert (screen.rend[i]);
450 }
451#endif
452 444
453 delete talloc; talloc = 0; 445 delete talloc; talloc = 0;
454 delete ralloc; ralloc = 0; 446 delete ralloc; ralloc = 0;
455 447
456 free (screen.text); 448 free (screen.text);
… …
485 477
486 scr_release (); 478 scr_release ();
487 prev_nrow = prev_ncol = 0; 479 prev_nrow = prev_ncol = 0;
488 scr_reset (); 480 scr_reset ();
489 481
490 scr_clear (); 482 scr_clear (true);
491 scr_refresh (SLOW_REFRESH); 483 scr_refresh (SLOW_REFRESH);
492} 484}
493 485
494/* ------------------------------------------------------------------------- * 486/* ------------------------------------------------------------------------- *
495 * PROCESS SCREEN COMMANDS * 487 * PROCESS SCREEN COMMANDS *
… …
500 * XTERM_SEQ: Restore cursor: ESC 8 492 * XTERM_SEQ: Restore cursor: ESC 8
501 */ 493 */
502void 494void
503rxvt_term::scr_cursor (int mode) 495rxvt_term::scr_cursor (int mode)
504{ 496{
505 screen_t *s; 497 screen_t *s;
506 498
507 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); 499 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
508 500
509#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 501#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
510 if (current_screen == SECONDARY) 502 if (current_screen == SECONDARY)
511 s = & (swap); 503 s = &swap;
512 else 504 else
513#endif 505#endif
514 s = & (screen); 506 s = &screen;
507
515 switch (mode) 508 switch (mode)
516 { 509 {
517 case SAVE: 510 case SAVE:
518 s->s_cur.row = s->cur.row; 511 s->s_cur.row = s->cur.row;
519 s->s_cur.col = s->cur.col; 512 s->s_cur.col = s->cur.col;
520 s->s_rstyle = rstyle; 513 s->s_rstyle = rstyle;
521 s->s_charset = s->charset; 514 s->s_charset = s->charset;
522 s->s_charset_char = charsets[s->charset]; 515 s->s_charset_char = charsets[s->charset];
523 break; 516 break;
517
524 case RESTORE: 518 case RESTORE:
525 want_refresh = 1; 519 want_refresh = 1;
526 s->cur.row = s->s_cur.row; 520 s->cur.row = s->s_cur.row;
527 s->cur.col = s->s_cur.col; 521 s->cur.col = s->s_cur.col;
528 s->flags &= ~Screen_WrapNext; 522 s->flags &= ~Screen_WrapNext;
… …
530 s->charset = s->s_charset; 524 s->charset = s->s_charset;
531 charsets[s->charset] = s->s_charset_char; 525 charsets[s->charset] = s->s_charset_char;
532 set_font_style (); 526 set_font_style ();
533 break; 527 break;
534 } 528 }
529
535 /* boundary check in case screen size changed between SAVE and RESTORE */ 530 /* boundary check in case screen size changed between SAVE and RESTORE */
536 MIN_IT (s->cur.row, TermWin.nrow - 1); 531 MIN_IT (s->cur.row, TermWin.nrow - 1);
537 MIN_IT (s->cur.col, TermWin.ncol - 1); 532 MIN_IT (s->cur.col, TermWin.ncol - 1);
538#ifdef DEBUG_STRICT 533#ifdef DEBUG_STRICT
539 assert (s->cur.row >= 0); 534 assert (s->cur.row >= 0);
… …
551 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 546 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
552 */ 547 */
553int 548int
554rxvt_term::scr_change_screen (int scrn) 549rxvt_term::scr_change_screen (int scrn)
555{ 550{
556 int i; 551 int i;
557#if NSCREENS 552#if NSCREENS
558 int offset; 553 int offset;
559#endif 554#endif
560 555
561 want_refresh = 1; 556 want_refresh = 1;
562 557
563 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); 558 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
564 559
565 TermWin.view_start = 0; 560 TermWin.view_start = 0;
566 561
567 if (current_screen == scrn) 562 if (current_screen == scrn)
568 return current_screen; 563 return scrn;
569 564
570 selection_check (2); /* check for boundary cross */ 565 selection_check (2); /* check for boundary cross */
571 566
572 SWAP_IT (current_screen, scrn, int); 567 SWAP_IT (current_screen, scrn, int);
573#if NSCREENS 568#if NSCREENS
569 if (Options & Opt_secondaryScreen)
570 {
574 num_scr = 0; 571 num_scr = 0;
575 offset = TermWin.saveLines; 572 offset = TermWin.saveLines;
576 for (i = prev_nrow; i--;) 573 for (i = prev_nrow; i--;)
577 { 574 {
578 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 575 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
579 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 576 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
580 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 577 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
581 } 578 }
582 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 579 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
583 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 580 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
584# ifdef DEBUG_STRICT 581# ifdef DEBUG_STRICT
585 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); 582 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
586 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); 583 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
587# else /* drive with your eyes closed */ 584# else /* drive with your eyes closed */
588 MAX_IT (screen.cur.row, 0); 585 MAX_IT (screen.cur.row, 0);
589 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 586 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
590 MAX_IT (screen.cur.col, 0); 587 MAX_IT (screen.cur.col, 0);
591 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); 588 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
592# endif 589# endif
593 SWAP_IT (screen.charset, swap.charset, int16_t); 590 SWAP_IT (screen.charset, swap.charset, int16_t);
594 SWAP_IT (screen.flags, swap.flags, int); 591 SWAP_IT (screen.flags, swap.flags, int);
595 screen.flags |= Screen_VisibleCursor; 592 screen.flags |= Screen_VisibleCursor;
596 swap.flags |= Screen_VisibleCursor; 593 swap.flags |= Screen_VisibleCursor;
597#else 594 }
598# ifdef SCROLL_ON_NO_SECONDARY 595 else
596#endif
597 if (Options & Opt_secondaryScroll)
599 if (current_screen == PRIMARY) 598 //if (current_screen == PRIMARY)
600 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 599 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
601# endif
602#endif
603 return scrn; 600 return scrn;
604} 601}
605 602
606/* ------------------------------------------------------------------------- */ 603/* ------------------------------------------------------------------------- */
607/* 604/*
… …
649 return 0; 646 return 0;
650 647
651 want_refresh = 1; 648 want_refresh = 1;
652 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"));
653 650
654 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) 651 if (row1 == 0 && count > 0
652 && (current_screen == PRIMARY || Options & Opt_secondaryScroll))
655 { 653 {
656 nscrolled = (long)TermWin.nscrolled + (long)count; 654 nscrolled = (long)TermWin.nscrolled + (long)count;
657 655
658 if (nscrolled > (long)TermWin.saveLines) 656 if (nscrolled > (long)TermWin.saveLines)
659 TermWin.nscrolled = TermWin.saveLines; 657 TermWin.nscrolled = TermWin.saveLines;
… …
712 for (i = 0, j = row1; i < count; i++, j++) 710 for (i = 0, j = row1; i < count; i++, j++)
713 { 711 {
714 buf_text[i] = screen.text[j]; 712 buf_text[i] = screen.text[j];
715 buf_rend[i] = screen.rend[j]; 713 buf_rend[i] = screen.rend[j];
716 } 714 }
715
717 /* A2: Rotate lines */ 716 /* A2: Rotate lines */
718 for (j = row1, i = j + count; i <= row2; i++, j++) 717 for (j = row1, i = j + count; i <= row2; i++, j++)
719 { 718 {
720 screen.tlen[j] = screen.tlen[i]; 719 screen.tlen[j] = screen.tlen[i];
721 screen.text[j] = screen.text[i]; 720 screen.text[j] = screen.text[i];
722 screen.rend[j] = screen.rend[i]; 721 screen.rend[j] = screen.rend[i];
723 } 722 }
723
724 j = row2 - count + 1, i = count; 724 j = row2 - count + 1, i = count;
725 } 725 }
726 else /* if (j < 0) */ 726 else /* if (j < 0) */
727 { 727 {
728 /* B: scroll down */ 728 /* B: scroll down */
… …
731 for (i = 0, j = row2; i < count; i++, j--) 731 for (i = 0, j = row2; i < count; i++, j--)
732 { 732 {
733 buf_text[i] = screen.text[j]; 733 buf_text[i] = screen.text[j];
734 buf_rend[i] = screen.rend[j]; 734 buf_rend[i] = screen.rend[j];
735 } 735 }
736
736 /* B2: Rotate lines */ 737 /* B2: Rotate lines */
737 for (j = row2, i = j - count; i >= row1; i--, j--) 738 for (j = row2, i = j - count; i >= row1; i--, j--)
738 { 739 {
739 screen.tlen[j] = screen.tlen[i]; 740 screen.tlen[j] = screen.tlen[i];
740 screen.text[j] = screen.text[i]; 741 screen.text[j] = screen.text[i];
741 screen.rend[j] = screen.rend[i]; 742 screen.rend[j] = screen.rend[i];
742 } 743 }
744
743 j = row1, i = count; 745 j = row1, i = count;
744 count = -count; 746 count = -count;
745 } 747 }
746 748
747 /* C: Resurrect lines */ 749 /* C: Resurrect lines */
… …
750 screen.tlen[j] = 0; 752 screen.tlen[j] = 0;
751 screen.text[j] = buf_text[i]; 753 screen.text[j] = buf_text[i];
752 screen.rend[j] = buf_rend[i]; 754 screen.rend[j] = buf_rend[i];
753 755
754 if (!spec) /* line length may not equal TermWin.ncol */ 756 if (!spec) /* line length may not equal TermWin.ncol */
755 scr_blank_screen_mem (screen.text, screen.rend, 757 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
756 (unsigned int)j, rstyle);
757 } 758 }
758 759
759 return count; 760 return count;
760} 761}
761 762
762/* ------------------------------------------------------------------------- */ 763/* ------------------------------------------------------------------------- */
763/* 764/*
764 * Add text given in <str> of length <len> to screen struct 765 * Add text given in <str> of length <len> to screen struct
765 */ 766 */
766void 767void
767rxvt_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)
768{ 769{
769 unsigned char checksel, clearsel; 770 unsigned char checksel, clearsel;
770 uint32_t c; 771 unicode_t c;
771 int i, row, last_col; 772 int i, row, last_col;
772 text_t *stp; 773 text_t *stp;
773 rend_t *srp; 774 rend_t *srp;
774 775
775 if (len <= 0) /* sanity */ 776 if (len <= 0) /* sanity */
776 return; 777 return;
777 778
778 want_refresh = 1; 779 want_refresh = 1;
… …
801 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 802 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
802 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 803 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
803#endif 804#endif
804 row = screen.cur.row + TermWin.saveLines; 805 row = screen.cur.row + TermWin.saveLines;
805 806
806 checksel = (selection.op 807 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807 && current_screen == selection.screen) ? 1 : 0;
808 clearsel = 0; 808 clearsel = 0;
809 809
810 stp = screen.text[row]; 810 stp = screen.text[row];
811 srp = screen.rend[row]; 811 srp = screen.rend[row];
812 812
813 for (i = 0; i < len;) 813 while (len--)
814 { 814 {
815 c = str[i++]; 815 c = *str++;
816
817 if (c < 0x20)
816 switch (c) 818 switch (c)
817 { 819 {
818 case '\t': 820 case C0_HT:
819 scr_tab (1); 821 scr_tab (1);
820 continue; 822 continue;
821 case '\n': 823
824 case C0_LF:
822 if (screen.tlen[row] != -1) /* XXX: think about this */ 825 if (screen.tlen[row] != -1) /* XXX: think about this */
823 MAX_IT (screen.tlen[row], screen.cur.col); 826 MAX_IT (screen.tlen[row], screen.cur.col);
827
824 screen.flags &= ~Screen_WrapNext; 828 screen.flags &= ~Screen_WrapNext;
829
825 if (screen.cur.row == screen.bscroll) 830 if (screen.cur.row == screen.bscroll)
826 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 831 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
827 else if (screen.cur.row < (TermWin.nrow - 1)) 832 else if (screen.cur.row < (TermWin.nrow - 1))
828 row = (++screen.cur.row) + TermWin.saveLines; 833 row = (++screen.cur.row) + TermWin.saveLines;
834
829 stp = screen.text[row]; /* _must_ refresh */ 835 stp = screen.text[row]; /* _must_ refresh */
830 srp = screen.rend[row]; /* _must_ refresh */ 836 srp = screen.rend[row]; /* _must_ refresh */
831 continue; 837 continue;
832 case '\r': 838
839 case C0_CR:
833 if (screen.tlen[row] != -1) /* XXX: think about this */ 840 if (screen.tlen[row] != -1) /* XXX: think about this */
834 MAX_IT (screen.tlen[row], screen.cur.col); 841 MAX_IT (screen.tlen[row], screen.cur.col);
842
835 screen.flags &= ~Screen_WrapNext; 843 screen.flags &= ~Screen_WrapNext;
836 screen.cur.col = 0; 844 screen.cur.col = 0;
837 continue; 845 continue;
838 default:
839 if (c == 127)
840 continue; /* yummmm..... */
841 break;
842 } 846 }
843 847
844 if (checksel /* see if we're writing within selection */ 848 if (checksel /* see if we're writing within selection */
845 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 849 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
846 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 850 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
847 { 851 {
848 checksel = 0; 852 checksel = 0;
849 clearsel = 1; 853 clearsel = 1;
850 } 854 }
855
851 if (screen.flags & Screen_WrapNext) 856 if (screen.flags & Screen_WrapNext)
852 { 857 {
853 screen.tlen[row] = -1; 858 screen.tlen[row] = -1;
854 if (screen.cur.row == screen.bscroll) 859 if (screen.cur.row == screen.bscroll)
855 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 860 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
856 else if (screen.cur.row < (TermWin.nrow - 1)) 861 else if (screen.cur.row < (TermWin.nrow - 1))
857 row = (++screen.cur.row) + TermWin.saveLines; 862 row = (++screen.cur.row) + TermWin.saveLines;
863
858 stp = screen.text[row]; /* _must_ refresh */ 864 stp = screen.text[row]; /* _must_ refresh */
859 srp = screen.rend[row]; /* _must_ refresh */ 865 srp = screen.rend[row]; /* _must_ refresh */
860 screen.cur.col = 0; 866 screen.cur.col = 0;
861 screen.flags &= ~Screen_WrapNext; 867 screen.flags &= ~Screen_WrapNext;
862 } 868 }
869
863 if (screen.flags & Screen_Insert) 870 if (screen.flags & Screen_Insert)
864 scr_insdel_chars (1, INSERT); 871 scr_insdel_chars (1, INSERT);
865 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
866 if (charsets[screen.charset] == '0') // DEC SPECIAL 878 if (charsets[screen.charset] == '0') // DEC SPECIAL
867 switch (c)
868 { 879 {
869 // dunno where these come from
870#if 0
871 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break;
872 case '.': c = 0x2193; break; case '0': c = 0x25ae; break;
873#endif
874 // vt100 special graphics and line drawing 880 // vt100 special graphics and line drawing
875 case '`': c = 0x25c6; break; case '_': c = 0x0020; break; 881 static uint16_t vt100_0[32] = { // 5f .. 7e
876 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; 882 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
877 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; 883 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
878 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; 884 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
879 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; 885 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
880 case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break;
881 case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break;
882 case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break;
883 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break;
884 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break;
885 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
886 } 886 };
887 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
902 bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0);
888 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 903 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c, bold));
889 // rely on wcwidth to tell us the character width, at least for non-ascii
890 int width = c <= 128 ? 1 : wcwidth (c);
891 904
892 // width -1 characters (e.g. combining chars) are ignored currently.
893 if (width > 0)
894 {
895 do 905 do
896 { 906 {
897 stp[screen.cur.col] = c; 907 stp[screen.cur.col] = c;
898 srp[screen.cur.col] = rend; 908 srp[screen.cur.col] = rend;
899 909
… …
910 c = NOCHAR; 920 c = NOCHAR;
911 } 921 }
912 while (--width > 0); 922 while (--width > 0);
913 923
914 // pad with spaces when overwriting wide character with smaller one 924 // pad with spaces when overwriting wide character with smaller one
915 for (int c = screen.cur.col; stp[c] == NOCHAR && c < last_col; c++) 925 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
916 { 926 {
917 stp[c] = ' '; 927 stp[c] = ' ';
918 srp[c] = rend; 928 srp[c] = rend;
919 } 929 }
920 } 930 }
931 else if (width == 0)
932 {
933#if ENABLE_COMBINING
934 // handle combining characters
935 // we just tag the accent on the previous on-screen character.
936 // this is arguably not correct, but also arguably not wrong.
937 // we don't handle double-width characters nicely yet.
938
939 text_t *tp;
940 rend_t *rp;
941
942 if (screen.cur.col > 0)
943 {
944 tp = stp + screen.cur.col - 1;
945 rp = srp + screen.cur.col - 1;
946 }
947 else if (screen.cur.row > 0
948 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
949 {
950 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
951 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
952 }
921 else 953 else
922 (void)0; /* handle combining character etc. here. */ 954 continue;
955
956 // handle double-width-chars by making them look extremely ugly
957 if (*tp == NOCHAR)
958 *tp = ' '; // hack //D //TODO //--tp, --rp;
959
960 // first try to find a precomposed character
961 unicode_t n = rxvt_compose (*tp, c);
962 if (n == NOCHAR)
963 n = rxvt_composite.compose (*tp, c);
964
965 *tp = n;
966 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
967#endif
968 }
923 } 969 }
924 970
925 if (screen.tlen[row] != -1) /* XXX: think about this */ 971 if (screen.tlen[row] != -1) /* XXX: think about this */
926 MAX_IT (screen.tlen[row], screen.cur.col); 972 MAX_IT (screen.tlen[row], screen.cur.col);
927 973
… …
947 */ 993 */
948void 994void
949rxvt_term::scr_backspace () 995rxvt_term::scr_backspace ()
950{ 996{
951 want_refresh = 1; 997 want_refresh = 1;
998
952 if (screen.cur.col == 0) 999 if (screen.cur.col == 0)
953 { 1000 {
954 if (screen.cur.row > 0) 1001 if (screen.cur.row > 0)
955 { 1002 {
956#ifdef TERMCAP_HAS_BW 1003#ifdef TERMCAP_HAS_BW
… …
961 1008
962 } 1009 }
963 } 1010 }
964 else if ((screen.flags & Screen_WrapNext) == 0) 1011 else if ((screen.flags & Screen_WrapNext) == 0)
965 scr_gotorc (0, -1, RELATIVE); 1012 scr_gotorc (0, -1, RELATIVE);
1013
966 screen.flags &= ~Screen_WrapNext; 1014 screen.flags &= ~Screen_WrapNext;
967} 1015}
968 1016
969/* ------------------------------------------------------------------------- */ 1017/* ------------------------------------------------------------------------- */
970/* 1018/*
… …
973 * XTERM_SEQ: CTRL-I 1021 * XTERM_SEQ: CTRL-I
974 */ 1022 */
975void 1023void
976rxvt_term::scr_tab (int count) 1024rxvt_term::scr_tab (int count)
977{ 1025{
978 int i, x; 1026 int i, x;
979 1027
980 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); 1028 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
981 want_refresh = 1; 1029 want_refresh = 1;
982 i = x = screen.cur.col; 1030 i = x = screen.cur.col;
1031
983 if (count == 0) 1032 if (count == 0)
984 return; 1033 return;
985 else if (count > 0) 1034 else if (count > 0)
986 { 1035 {
987 for (; ++i < TermWin.ncol; ) 1036 for (; ++i < TermWin.ncol; )
… …
989 { 1038 {
990 x = i; 1039 x = i;
991 if (!--count) 1040 if (!--count)
992 break; 1041 break;
993 } 1042 }
1043
994 if (count) 1044 if (count)
995 x = TermWin.ncol - 1; 1045 x = TermWin.ncol - 1;
996 } 1046 }
997 else /* if (count < 0) */ 1047 else /* if (count < 0) */
998 { 1048 {
… …
1001 { 1051 {
1002 x = i; 1052 x = i;
1003 if (!++count) 1053 if (!++count)
1004 break; 1054 break;
1005 } 1055 }
1056
1006 if (count) 1057 if (count)
1007 x = 0; 1058 x = 0;
1008 } 1059 }
1060
1009 if (x != screen.cur.col) 1061 if (x != screen.cur.col)
1010 scr_gotorc (0, x, R_RELATIVE); 1062 scr_gotorc (0, x, R_RELATIVE);
1011} 1063}
1012 1064
1013/* ------------------------------------------------------------------------- */ 1065/* ------------------------------------------------------------------------- */
… …
1070 want_refresh = 1; 1122 want_refresh = 1;
1071 ZERO_SCROLLBACK (); 1123 ZERO_SCROLLBACK ();
1072 1124
1073 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)); 1125 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));
1074 1126
1075 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1127 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1076 : col);
1077 MAX_IT (screen.cur.col, 0); 1128 MAX_IT (screen.cur.col, 0);
1078 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1129 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1079 1130
1080 screen.flags &= ~Screen_WrapNext; 1131 screen.flags &= ~Screen_WrapNext;
1081 if (relative & R_RELATIVE) 1132 if (relative & R_RELATIVE)
… …
1120 * direction should be UP or DN 1171 * direction should be UP or DN
1121 */ 1172 */
1122void 1173void
1123rxvt_term::scr_index (enum page_dirn direction) 1174rxvt_term::scr_index (enum page_dirn direction)
1124{ 1175{
1125 int dirn; 1176 int dirn;
1126 1177
1127 want_refresh = 1; 1178 want_refresh = 1;
1128 dirn = ((direction == UP) ? 1 : -1); 1179 dirn = ((direction == UP) ? 1 : -1);
1129 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); 1180 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1130 1181
… …
1190 default: 1241 default:
1191 return; 1242 return;
1192 } 1243 }
1193 1244
1194 if (screen.text[row]) 1245 if (screen.text[row])
1195 scr_blank_line (& (screen.text[row][col]), 1246 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1196 & (screen.rend[row][col]), num, rstyle);
1197 else 1247 else
1198 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1248 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1199} 1249}
1200 1250
1201/* ------------------------------------------------------------------------- */ 1251/* ------------------------------------------------------------------------- */
… …
1206 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1256 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1207 */ 1257 */
1208void 1258void
1209rxvt_term::scr_erase_screen (int mode) 1259rxvt_term::scr_erase_screen (int mode)
1210{ 1260{
1211 int num; 1261 int num;
1212 int32_t row, row_offset; 1262 int32_t row, row_offset;
1213 rend_t ren; 1263 rend_t ren;
1214 XGCValues gcvalue; 1264 XGCValues gcvalue;
1215 1265
1216 want_refresh = 1; 1266 want_refresh = 1;
1217 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); 1267 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1218 ZERO_SCROLLBACK (); 1268 ZERO_SCROLLBACK ();
1219 row_offset = (int32_t)TermWin.saveLines; 1269 row_offset = (int32_t)TermWin.saveLines;
… …
1238 num = TermWin.nrow; 1288 num = TermWin.nrow;
1239 break; 1289 break;
1240 default: 1290 default:
1241 return; 1291 return;
1242 } 1292 }
1293
1243 refresh_type |= REFRESH_BOUNDS; 1294 refresh_type |= REFRESH_BOUNDS;
1295
1244 if (selection.op && current_screen == selection.screen 1296 if (selection.op && current_screen == selection.screen
1245 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1297 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1246 || (selection.end.row >= row 1298 || (selection.end.row >= row
1247 && selection.end.row <= row + num))) 1299 && selection.end.row <= row + num)))
1248 CLEAR_SELECTION (); 1300 CLEAR_SELECTION ();
1301
1249 if (row >= TermWin.nrow) /* Out Of Bounds */ 1302 if (row >= TermWin.nrow) /* Out Of Bounds */
1250 return; 1303 return;
1304
1251 MIN_IT (num, (TermWin.nrow - row)); 1305 MIN_IT (num, (TermWin.nrow - row));
1306
1252 if (rstyle & (RS_RVid | RS_Uline)) 1307 if (rstyle & (RS_RVid | RS_Uline))
1253 ren = (rend_t) ~RS_None; 1308 ren = (rend_t) ~RS_None;
1254 else if (GET_BASEBG (rstyle) == Color_bg) 1309 else if (GET_BASEBG (rstyle) == Color_bg)
1255 { 1310 {
1256 ren = DEFAULT_RSTYLE; 1311 ren = DEFAULT_RSTYLE;
… …
1263 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1318 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1264 ERASE_ROWS (row, num); 1319 ERASE_ROWS (row, num);
1265 gcvalue.foreground = PixColors[Color_fg]; 1320 gcvalue.foreground = PixColors[Color_fg];
1266 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1321 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1267 } 1322 }
1323
1268 for (; num--; row++) 1324 for (; num--; row++)
1269 { 1325 {
1270 scr_blank_screen_mem (screen.text, screen.rend, 1326 scr_blank_screen_mem (screen.text, screen.rend,
1271 (unsigned int) (row + row_offset), rstyle); 1327 (unsigned int) (row + row_offset), rstyle);
1272 screen.tlen[row + row_offset] = 0; 1328 screen.tlen[row + row_offset] = 0;
… …
1306 * Insert/Delete <count> lines 1362 * Insert/Delete <count> lines
1307 */ 1363 */
1308void 1364void
1309rxvt_term::scr_insdel_lines (int count, int insdel) 1365rxvt_term::scr_insdel_lines (int count, int insdel)
1310{ 1366{
1311 int end; 1367 int end;
1312 1368
1313 ZERO_SCROLLBACK (); 1369 ZERO_SCROLLBACK ();
1314 1370
1315 selection_check (1); 1371 selection_check (1);
1316 1372
… …
1335 * Insert/Delete <count> characters from the current position 1391 * Insert/Delete <count> characters from the current position
1336 */ 1392 */
1337void 1393void
1338rxvt_term::scr_insdel_chars (int count, int insdel) 1394rxvt_term::scr_insdel_chars (int count, int insdel)
1339{ 1395{
1340 int col, row; 1396 int col, row;
1341 rend_t tr; 1397 rend_t tr;
1342 text_t *stp; 1398 text_t *stp;
1343 rend_t *srp; 1399 rend_t *srp;
1344 int16_t *slp; 1400 int16_t *slp;
1345 1401
1346 want_refresh = 1; 1402 want_refresh = 1;
1347 ZERO_SCROLLBACK (); 1403 ZERO_SCROLLBACK ();
1348 1404
1349 if (count <= 0) 1405 if (count <= 0)
… …
1356 screen.flags &= ~Screen_WrapNext; 1412 screen.flags &= ~Screen_WrapNext;
1357 1413
1358 stp = screen.text[row]; 1414 stp = screen.text[row];
1359 srp = screen.rend[row]; 1415 srp = screen.rend[row];
1360 slp = & (screen.tlen[row]); 1416 slp = & (screen.tlen[row]);
1417
1361 switch (insdel) 1418 switch (insdel)
1362 { 1419 {
1363 case INSERT: 1420 case INSERT:
1364 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1421 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1365 col--) 1422 col--)
1366 { 1423 {
1367 stp[col] = stp[col - count]; 1424 stp[col] = stp[col - count];
1368 srp[col] = srp[col - count]; 1425 srp[col] = srp[col - count];
1369 } 1426 }
1427
1370 if (*slp != -1) 1428 if (*slp != -1)
1371 { 1429 {
1372 *slp += count; 1430 *slp += count;
1373 MIN_IT (*slp, TermWin.ncol); 1431 MIN_IT (*slp, TermWin.ncol);
1374 } 1432 }
1433
1375 if (selection.op && current_screen == selection.screen 1434 if (selection.op && current_screen == selection.screen
1376 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1435 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1377 { 1436 {
1378 if (selection.end.row != screen.cur.row 1437 if (selection.end.row != screen.cur.row
1379 || (selection.end.col + count >= TermWin.ncol)) 1438 || (selection.end.col + count >= TermWin.ncol))
… …
1383 selection.beg.col += count; 1442 selection.beg.col += count;
1384 selection.mark.col += count; /* XXX: yes? */ 1443 selection.mark.col += count; /* XXX: yes? */
1385 selection.end.col += count; 1444 selection.end.col += count;
1386 } 1445 }
1387 } 1446 }
1447
1388 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1448 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1389 (unsigned int)count, rstyle); 1449 (unsigned int)count, rstyle);
1390 break; 1450 break;
1451
1391 case ERASE: 1452 case ERASE:
1392 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1453 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1393 selection_check (1); 1454 selection_check (1);
1394 screen.cur.col -= count; 1455 screen.cur.col -= count;
1395 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1456 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1396 (unsigned int)count, rstyle); 1457 (unsigned int)count, rstyle);
1397 break; 1458 break;
1459
1398 case DELETE: 1460 case DELETE:
1399 tr = srp[TermWin.ncol - 1]
1400 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1461 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1462
1401 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1463 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1402 { 1464 {
1403 stp[col] = stp[col + count]; 1465 stp[col] = stp[col + count];
1404 srp[col] = srp[col + count]; 1466 srp[col] = srp[col + count];
1405 } 1467 }
1468
1406 scr_blank_line (& (stp[TermWin.ncol - count]), 1469 scr_blank_line (& (stp[TermWin.ncol - count]),
1407 & (srp[TermWin.ncol - count]), 1470 & (srp[TermWin.ncol - count]),
1408 (unsigned int)count, tr); 1471 (unsigned int)count, tr);
1472
1409 if (*slp == -1) /* break line continuation */ 1473 if (*slp == -1) /* break line continuation */
1410 *slp = TermWin.ncol; 1474 *slp = TermWin.ncol;
1475
1411 *slp -= count; 1476 *slp -= count;
1412 MAX_IT (*slp, 0); 1477 MAX_IT (*slp, 0);
1478
1413 if (selection.op && current_screen == selection.screen 1479 if (selection.op && current_screen == selection.screen
1414 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1480 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1415 { 1481 {
1416 if (selection.end.row != screen.cur.row 1482 if (selection.end.row != screen.cur.row
1417 || (screen.cur.col >= selection.beg.col - count) 1483 || (screen.cur.col >= selection.beg.col - count)
… …
1423 selection.beg.col -= count; 1489 selection.beg.col -= count;
1424 selection.mark.col -= count; /* XXX: yes? */ 1490 selection.mark.col -= count; /* XXX: yes? */
1425 selection.end.col -= count; 1491 selection.end.col -= count;
1426 } 1492 }
1427 } 1493 }
1494
1428 break; 1495 break;
1429 } 1496 }
1430} 1497}
1431 1498
1432/* ------------------------------------------------------------------------- */ 1499/* ------------------------------------------------------------------------- */
… …
1437void 1504void
1438rxvt_term::scr_scroll_region (int top, int bot) 1505rxvt_term::scr_scroll_region (int top, int bot)
1439{ 1506{
1440 MAX_IT (top, 0); 1507 MAX_IT (top, 0);
1441 MIN_IT (bot, (int)TermWin.nrow - 1); 1508 MIN_IT (bot, (int)TermWin.nrow - 1);
1509
1442 if (top > bot) 1510 if (top > bot)
1443 return; 1511 return;
1512
1444 screen.tscroll = top; 1513 screen.tscroll = top;
1445 screen.bscroll = bot; 1514 screen.bscroll = bot;
1446 scr_gotorc (0, 0, 0); 1515 scr_gotorc (0, 0, 0);
1447} 1516}
1448 1517
… …
1454 */ 1523 */
1455void 1524void
1456rxvt_term::scr_cursor_visible (int mode) 1525rxvt_term::scr_cursor_visible (int mode)
1457{ 1526{
1458 want_refresh = 1; 1527 want_refresh = 1;
1528
1459 if (mode) 1529 if (mode)
1460 screen.flags |= Screen_VisibleCursor; 1530 screen.flags |= Screen_VisibleCursor;
1461 else 1531 else
1462 screen.flags &= ~Screen_VisibleCursor; 1532 screen.flags &= ~Screen_VisibleCursor;
1463} 1533}
… …
1678 1748
1679 if (drawn_text == NULL) /* sanity check */ 1749 if (drawn_text == NULL) /* sanity check */
1680 return; 1750 return;
1681 1751
1682#ifdef DEBUG_STRICT 1752#ifdef DEBUG_STRICT
1683 x = max (x, (int)TermWin.int_bwidth); 1753 x = max (x, 0);
1684 x = min (x, (int)TermWin.width); 1754 x = min (x, (int)TermWin.width);
1685 y = max (y, (int)TermWin.int_bwidth); 1755 y = max (y, 0);
1686 y = min (y, (int)TermWin.height); 1756 y = min (y, (int)TermWin.height);
1687#endif 1757#endif
1688 1758
1689 /* round down */ 1759 /* round down */
1690 rc[PART_BEG].col = Pixel2Col (x); 1760 rc[PART_BEG].col = Pixel2Col (x);
… …
1701 } 1771 }
1702 1772
1703 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)); 1773 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));
1704 1774
1705 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1775 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1706 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, 1776 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1707 (rc[PART_END].col - rc[PART_BEG].col + 1));
1708 1777
1709 if (refresh) 1778 if (refresh)
1710 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1779 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS);
1711} 1780}
1712 1781
… …
1779 if (TermWin.view_start != oldviewstart) 1848 if (TermWin.view_start != oldviewstart)
1780 { 1849 {
1781 want_refresh = 1; 1850 want_refresh = 1;
1782 num_scr -= (TermWin.view_start - oldviewstart); 1851 num_scr -= (TermWin.view_start - oldviewstart);
1783 } 1852 }
1853
1784 return (int) (TermWin.view_start - oldviewstart); 1854 return (int) (TermWin.view_start - oldviewstart);
1785} 1855}
1786 1856
1787/* ------------------------------------------------------------------------- */ 1857/* ------------------------------------------------------------------------- */
1788void 1858void
… …
1906 1976
1907 /* 1977 /*
1908 * C: set the cursor character (s) 1978 * C: set the cursor character (s)
1909 */ 1979 */
1910 { 1980 {
1911 unsigned char setoldcursor; 1981 unsigned char setoldcursor;
1912 rend_t ccol1, /* Cursor colour */ 1982 rend_t ccol1, /* Cursor colour */
1913 ccol2; /* Cursor colour2 */ 1983 ccol2; /* Cursor colour2 */
1914 1984
1915 showcursor = (screen.flags & Screen_VisibleCursor); 1985 showcursor = (screen.flags & Screen_VisibleCursor);
1916#ifdef CURSOR_BLINK 1986#ifdef CURSOR_BLINK
1917 if (hidden_cursor) 1987 if (hidden_cursor)
1918 showcursor = 0; 1988 showcursor = 0;
1919#endif 1989#endif
1920 1990
1921 if (showcursor) 1991 if (showcursor)
1922 { 1992 {
1923 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1993 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]);
1924 [screen.cur.col]);
1925 1994
1926 if (showcursor && TermWin.focus) 1995 if (showcursor && TermWin.focus)
1927 { 1996 {
1928 *srp ^= RS_RVid; 1997 *srp ^= RS_RVid;
1929#ifndef NO_CURSORCOLOR 1998#ifndef NO_CURSORCOLOR
… …
1957 if (screen.cur.row + TermWin.view_start != ocrow 2026 if (screen.cur.row + TermWin.view_start != ocrow
1958 || screen.cur.col != oldcursor.col) 2027 || screen.cur.col != oldcursor.col)
1959 { 2028 {
1960 if (ocrow < TermWin.nrow 2029 if (ocrow < TermWin.nrow
1961 && oldcursor.col < TermWin.ncol) 2030 && oldcursor.col < TermWin.ncol)
1962 {
1963 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2031 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
1964 } 2032
1965 if (TermWin.focus || !showcursor) 2033 if (TermWin.focus || !showcursor)
1966 oldcursor.row = -1; 2034 oldcursor.row = -1;
1967 else 2035 else
1968 setoldcursor = 1; 2036 setoldcursor = 1;
1969 } 2037 }
1970 } 2038 }
1971 else if (!TermWin.focus) 2039 else if (!TermWin.focus)
1972 setoldcursor = 1; 2040 setoldcursor = 1;
2041
1973 if (setoldcursor) 2042 if (setoldcursor)
1974 { 2043 {
1975 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2044 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
1976 oldcursor.row = -1; 2045 oldcursor.row = -1;
1977 else 2046 else
… …
1989 */ 2058 */
1990 i = num_scr; 2059 i = num_scr;
1991 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2060 if (refresh_type == FAST_REFRESH && num_scr_allow && i
1992 && abs (i) < TermWin.nrow && !must_clear) 2061 && abs (i) < TermWin.nrow && !must_clear)
1993 { 2062 {
1994 int16_t nits; 2063 int16_t nits;
1995 int j; 2064 int j;
1996 rend_t *drp2; 2065 rend_t *drp2;
1997 text_t *dtp2; 2066 text_t *dtp2;
1998 int len, wlen; 2067 int len, wlen;
1999 2068
2000 j = TermWin.nrow; 2069 j = TermWin.nrow;
2001 wlen = len = -1; 2070 wlen = len = -1;
2002 row = i > 0 ? 0 : j - 1; 2071 row = i > 0 ? 0 : j - 1;
2003 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2072 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
… …
2138 rend = GET_ATTR (rend); 2207 rend = GET_ATTR (rend);
2139 2208
2140 rvid = !!(rend & RS_RVid); 2209 rvid = !!(rend & RS_RVid);
2141 2210
2142#ifndef NO_BOLD_UNDERLINE_REVERSE 2211#ifndef NO_BOLD_UNDERLINE_REVERSE
2143 if (rend & RS_Bold && fore == Color_fg) 2212 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold))
2144 { 2213 {
2145 if (ISSET_PIXCOLOR (Color_BD)) 2214 if (ISSET_PIXCOLOR (Color_BD))
2146 fore = Color_BD; 2215 fore = Color_BD;
2147 else 2216 else
2148 rvid = !rvid; 2217 rvid = !rvid;
2149 } 2218 }
2150 2219
2151 if (rend & RS_Uline) 2220 if (rend & RS_Uline)
2152 {
2153 if (ISSET_PIXCOLOR (Color_UL)) 2221 if (ISSET_PIXCOLOR (Color_UL))
2154 fore = Color_UL; 2222 fore = Color_UL;
2155 }
2156#endif 2223#endif
2157 2224
2158 if (rvid) 2225 if (rvid)
2159 { 2226 {
2160 SWAP_IT (fore, back, int); 2227 SWAP_IT (fore, back, int);
… …
2256 scr_reverse_selection (); 2323 scr_reverse_selection ();
2257 2324
2258 /* 2325 /*
2259 * I: other general cleanup 2326 * I: other general cleanup
2260 */ 2327 */
2328#if 0
2261 if (clearfirst && TermWin.int_bwidth) 2329 if (clearfirst && TermWin.int_bwidth)
2262 /* 2330 /*
2263 * clear the whole screen height, note that width == 0 is treated 2331 * clear the whole screen height, note that width == 0 is treated
2264 * specially by XClearArea 2332 * specially by XClearArea
2265 */ 2333 */
… …
2274 */ 2342 */
2275 XClearArea (display->display, TermWin.vt, 2343 XClearArea (display->display, TermWin.vt,
2276 TermWin.width + TermWin.int_bwidth, 0, 2344 TermWin.width + TermWin.int_bwidth, 0,
2277 (unsigned int)TermWin.int_bwidth, 2345 (unsigned int)TermWin.int_bwidth,
2278 (unsigned int)TermWin_TotalHeight (), False); 2346 (unsigned int)TermWin_TotalHeight (), False);
2347#endif
2279 2348
2280 if (refresh_type & SMOOTH_REFRESH) 2349 if (refresh_type & SMOOTH_REFRESH)
2281 XSync (display->display, False); 2350 XSync (display->display, False);
2282 2351
2283 num_scr = 0; 2352 num_scr = 0;
… …
2457 { 2526 {
2458 n = min (len - i, PROP_SIZE); 2527 n = min (len - i, PROP_SIZE);
2459 MEMCPY (ds, data + i, n); 2528 MEMCPY (ds, data + i, n);
2460 2529
2461 for (j = 0; j < n; j++) 2530 for (j = 0; j < n; j++)
2462 if (ds[j] == '\n') 2531 if (ds[j] == C0_LF)
2463 ds[j] = '\r'; 2532 ds[j] = C0_CR;
2464 2533
2465 tt_write (ds, (int)n); 2534 tt_write (ds, (int)n);
2466 } 2535 }
2467 2536
2468 free (ds); 2537 free (ds);
… …
2529 } 2598 }
2530 2599
2531 if (ct.nitems == 0) 2600 if (ct.nitems == 0)
2532 { 2601 {
2533 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2602 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2603
2534 if (selection_wait == Sel_normal && nread == 0 2604 if (selection_wait == Sel_normal && nread == 0
2535 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2605 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2536 { 2606 {
2537 /* 2607 /*
2538 * pass through again trying CUT_BUFFER0 if we've come from 2608 * pass through again trying CUT_BUFFER0 if we've come from
… …
2548 2618
2549 nread += ct.nitems; 2619 nread += ct.nitems;
2550 2620
2551 char **cl; 2621 char **cl;
2552 int cr; 2622 int cr;
2553 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2623 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2554 &cr) >= 0 && cl)
2555 { 2624 {
2556 for (int i = 0; i < cr; i++) 2625 for (int i = 0; i < cr; i++)
2557 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2626 paste ((unsigned char *)cl[i], STRLEN (cl[i]));
2558 2627
2559 XFreeStringList (cl); 2628 XFreeStringList (cl);
… …
2580void 2649void
2581rxvt_term::incr_cb (time_watcher &w) 2650rxvt_term::incr_cb (time_watcher &w)
2582{ 2651{
2583 selection_wait = Sel_none; 2652 selection_wait = Sel_none;
2584 2653
2585 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2654 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2586} 2655}
2587 2656
2588/* 2657/*
2589 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2658 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2590 */ 2659 */
… …
2593{ 2662{
2594 int reget_time = 0; 2663 int reget_time = 0;
2595 2664
2596 if (prop == None) 2665 if (prop == None)
2597 return; 2666 return;
2667
2598 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); 2668 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2599 if (selection_wait == Sel_normal) 2669 if (selection_wait == Sel_normal)
2600 { 2670 {
2601 int a, afmt; 2671 int a, afmt;
2602 Atom atype; 2672 Atom atype;
2603 unsigned long bytes_after, nitems; 2673 unsigned long bytes_after, nitems;
2604 unsigned char *s = NULL; 2674 unsigned char *s = NULL;
2605 2675
2606 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, 2676 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2607 xa[XA_INCR], &atype, &afmt, &nitems, 2677 xa[XA_INCR], &atype, &afmt, &nitems,
2608 &bytes_after, &s); 2678 &bytes_after, &s);
2609 if (s) 2679 if (s)
2610 XFree (s); 2680 XFree (s);
2611 if (a != Success) 2681 if (a != Success)
2612 return; 2682 return;
2683
2613#ifndef __CYGWIN32__ 2684#ifndef __CYGWIN32__
2614 if (atype == xa[XA_INCR]) 2685 if (atype == xa[XA_INCR])
2615 { /* start an INCR transfer */ 2686 { /* start an INCR transfer */
2616 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); 2687 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2617 XDeleteProperty (display->display, win, prop); 2688 XDeleteProperty (display->display, win, prop);
… …
2623 2694
2624 } 2695 }
2625 else if (selection_wait == Sel_incr) 2696 else if (selection_wait == Sel_incr)
2626 { 2697 {
2627 reget_time = 1; 2698 reget_time = 1;
2699
2628 if (selection_paste (win, prop, True) == -1) 2700 if (selection_paste (win, prop, True) == -1)
2629 { 2701 {
2630 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); 2702 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2631 selection_wait = Sel_none; 2703 selection_wait = Sel_none;
2632 incr_ev.stop (); 2704 incr_ev.stop ();
2633 } 2705 }
2634 } 2706 }
2635 if (reget_time) /* received more data so reget time */ 2707 if (reget_time) /* received more data so reget time */
2636 incr_ev.start (NOW + 10); 2708 incr_ev.start (NOW + 10);
2637} 2709}
2710
2638/* ------------------------------------------------------------------------- */ 2711/* ------------------------------------------------------------------------- */
2639/* 2712/*
2640 * Request the current selection: 2713 * Request the current selection:
2641 * Order: > internal selection if available 2714 * Order: > internal selection if available
2642 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2715 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2647 */ 2720 */
2648void 2721void
2649rxvt_term::selection_request (Time tm, int x, int y) 2722rxvt_term::selection_request (Time tm, int x, int y)
2650{ 2723{
2651 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); 2724 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2725
2652 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2726 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2653 return; /* outside window */ 2727 return; /* outside window */
2654 2728
2655 if (selection.text != NULL) 2729 if (selection.text)
2656 { /* internal selection */ 2730 { /* internal selection */
2657 D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); 2731 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2658 paste (selection.text, selection.len); 2732 char *str = rxvt_wcstombs (selection.text, selection.len);
2733 paste ((unsigned char *)str, strlen (str));
2734 free (str);
2659 return; 2735 return;
2660 } 2736 }
2661 else 2737 else
2662 { 2738 {
2663 int i; 2739 int i;
2664 2740
2665 selection_request_time = tm; 2741 selection_request_time = tm;
2666 selection_wait = Sel_normal; 2742 selection_wait = Sel_normal;
2743
2667 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2744 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2668 { 2745 {
2669#if X_HAVE_UTF8_STRING 2746#if X_HAVE_UTF8_STRING
2670 selection_type = Sel_UTF8String; 2747 selection_type = Sel_UTF8String;
2671 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2748 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2676 return; 2753 return;
2677#endif 2754#endif
2678 2755
2679 } 2756 }
2680 } 2757 }
2758
2681 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2759 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2682 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2760 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2683 selection_paste (display->root, XA_CUT_BUFFER0, False); 2761 selection_paste (display->root, XA_CUT_BUFFER0, False);
2684} 2762}
2685 2763
2686int 2764int
2687rxvt_term::selection_request_other (Atom target, int selnum) 2765rxvt_term::selection_request_other (Atom target, int selnum)
2688{ 2766{
2689 Atom sel; 2767 Atom sel;
2690#ifdef DEBUG_SELECT 2768#ifdef DEBUG_SELECT
2691 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2769 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2692#endif 2770#endif
2693 2771
2694 selection_type |= selnum; 2772 selection_type |= selnum;
2773
2695 if (selnum == Sel_Primary) 2774 if (selnum == Sel_Primary)
2696 sel = XA_PRIMARY; 2775 sel = XA_PRIMARY;
2697 else if (selnum == Sel_Secondary) 2776 else if (selnum == Sel_Secondary)
2698 sel = XA_SECONDARY; 2777 sel = XA_SECONDARY;
2699 else 2778 else
2700 sel = xa[XA_CLIPBOARD]; 2779 sel = xa[XA_CLIPBOARD];
2780
2701 if (XGetSelectionOwner (display->display, sel) != None) 2781 if (XGetSelectionOwner (display->display, sel) != None)
2702 { 2782 {
2703 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2783 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2704 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2784 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2705 TermWin.vt, selection_request_time); 2785 TermWin.vt, selection_request_time);
2706 return 1; 2786 return 1;
2707 } 2787 }
2788
2708 return 0; 2789 return 0;
2709} 2790}
2710 2791
2711/* ------------------------------------------------------------------------- */ 2792/* ------------------------------------------------------------------------- */
2712/* 2793/*
… …
2721 want_refresh = 1; 2802 want_refresh = 1;
2722 free (selection.text); 2803 free (selection.text);
2723 selection.text = NULL; 2804 selection.text = NULL;
2724 selection.len = 0; 2805 selection.len = 0;
2725 CLEAR_SELECTION (); 2806 CLEAR_SELECTION ();
2807
2808 if (display->selection_owner == this)
2809 display->selection_owner = 0;
2726} 2810}
2727 2811
2728/* ------------------------------------------------------------------------- */ 2812/* ------------------------------------------------------------------------- */
2729/* 2813/*
2730 * Copy a selection into the cut buffer 2814 * Copy a selection into the cut buffer
… …
2732 */ 2816 */
2733void 2817void
2734rxvt_term::selection_make (Time tm) 2818rxvt_term::selection_make (Time tm)
2735{ 2819{
2736 int i, col, end_col, row, end_row; 2820 int i, col, end_col, row, end_row;
2737 unsigned char *new_selection_text; 2821 wchar_t *new_selection_text;
2738 char *str;
2739 text_t *t; 2822 text_t *t;
2740 2823
2741 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); 2824 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2742 switch (selection.op) 2825 switch (selection.op)
2743 { 2826 {
… …
2756 selection.op = SELECTION_DONE; 2839 selection.op = SELECTION_DONE;
2757 2840
2758 if (selection.clicks == 4) 2841 if (selection.clicks == 4)
2759 return; /* nothing selected, go away */ 2842 return; /* nothing selected, go away */
2760 2843
2761 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2844 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2762 str = (char *)rxvt_malloc ((i + 2) * MB_CUR_MAX + 1); 2845 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2763
2764 new_selection_text = (unsigned char *)str;
2765 2846
2766 col = selection.beg.col; 2847 col = selection.beg.col;
2767 MAX_IT (col, 0); 2848 MAX_IT (col, 0);
2768 row = selection.beg.row + TermWin.saveLines; 2849 row = selection.beg.row + TermWin.saveLines;
2769 end_row = selection.end.row + TermWin.saveLines; 2850 end_row = selection.end.row + TermWin.saveLines;
2770 struct mbstate mbs; 2851 int ofs = 0;
2852 int extra = 0;
2771 2853
2772 for (; row <= end_row; row++, col = 0) 2854 for (; row <= end_row; row++, col = 0)
2773 { 2855 {
2774 t = & (screen.text[row][col]); 2856 t = &(screen.text[row][col]);
2775 2857
2776 end_col = screen.tlen[row]; 2858 end_col = screen.tlen[row];
2777 2859
2778 if (end_col == -1) 2860 if (end_col == -1)
2779 end_col = TermWin.ncol; 2861 end_col = TermWin.ncol;
2780 2862
2781 if (row == end_row) 2863 if (row == end_row)
2782 MIN_IT (end_col, selection.end.col); 2864 MIN_IT (end_col, selection.end.col);
2783 2865
2784 for (; col < end_col; col++) 2866 for (; col < end_col; col++)
2867 {
2785 if (*t == NOCHAR) 2868 if (*t == NOCHAR)
2786 t++; 2869 t++;
2870#if ENABLE_COMBINING
2871 else if (IS_COMPOSE (*t))
2872 {
2873 int len = rxvt_composite.expand (*t, 0);
2874
2875 extra -= (len - 1);
2876
2877 if (extra < 0)
2878 {
2879 extra += i;
2880 i += i;
2881 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2882 }
2883
2884 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2885 }
2886#endif
2787 else 2887 else
2788 { 2888 new_selection_text[ofs++] = *t++;
2789 int len = wcrtomb (str, *t++, mbs);
2790 if (len > 0)
2791 str += len;
2792 } 2889 }
2793 2890
2794 if (screen.tlen[row] != -1 && row != end_row) 2891 if (screen.tlen[row] != -1 && row != end_row)
2795 *str++ = '\n'; 2892 new_selection_text[ofs++] = C0_LF;
2796 } 2893 }
2797 2894
2798#ifndef NO_OLD_SELECTION
2799 if (selection_style == OLD_SELECT)
2800 if (end_col == TermWin.ncol)
2801 *str++ = '\n';
2802#endif
2803#ifndef NO_NEW_SELECTION
2804 if (selection_style != OLD_SELECT)
2805 if (end_col != selection.end.col) 2895 if (end_col != selection.end.col)
2806 *str++ = '\n'; 2896 new_selection_text[ofs++] = C0_LF;
2807#endif
2808 *str = '\0';
2809 2897
2810 i = str - (char *)new_selection_text; 2898 new_selection_text[ofs] = 0;
2899
2811 if (i == 0) 2900 if (ofs == 0)
2812 { 2901 {
2813 free (new_selection_text); 2902 free (new_selection_text);
2814 return; 2903 return;
2815 } 2904 }
2816 2905
2817 // due to MB_CUR_MAX, selection wastage is usually high, so realloc
2818 if (str - (char *)new_selection_text > 1024)
2819 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2820
2821 selection.len = i;
2822
2823 if (selection.text)
2824 free (selection.text); 2906 free (selection.text);
2825 2907
2826 selection.text = new_selection_text; 2908 // we usually allocate much more than necessary, so realloc it smaller again
2909 selection.len = ofs;
2910 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2827 2911
2828 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2912 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2829 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2913 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2830 display->set_selection_owner (this); 2914 display->set_selection_owner (this);
2831 else 2915 else
2832 rxvt_print_error ("can't get primary selection"); 2916 rxvt_warn ("can't get primary selection, ignoring.\n");
2833 2917
2834 { 2918#if 0
2835 XTextProperty ct; 2919 XTextProperty ct;
2836 char *cl = (char *)selection.text;
2837 2920
2838 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2921 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2839 { 2922 {
2840 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2841 PropModeReplace, ct.value, ct.nitems);
2842 XFree (ct.value);
2843 }
2844 else
2845 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2923 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2846 PropModeReplace, selection.text, (int)selection.len); 2924 PropModeReplace, ct.value, ct.nitems);
2925 XFree (ct.value);
2847 } 2926 }
2927#endif
2848 2928
2849 selection_time = tm; 2929 selection_time = tm;
2850 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); 2930 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2851} 2931}
2852 2932
… …
2881rxvt_term::selection_start_colrow (int col, int row) 2961rxvt_term::selection_start_colrow (int col, int row)
2882{ 2962{
2883 want_refresh = 1; 2963 want_refresh = 1;
2884 selection.mark.col = col; 2964 selection.mark.col = col;
2885 selection.mark.row = row - TermWin.view_start; 2965 selection.mark.row = row - TermWin.view_start;
2966
2886 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2967 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2887 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2968 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2888 MAX_IT (selection.mark.col, 0); 2969 MAX_IT (selection.mark.col, 0);
2889 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2970 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2890 2971
2972 while (selection.mark.col > 0
2973 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2974 --selection.mark.col;
2975
2891 if (selection.op) 2976 if (selection.op)
2892 { /* clear the old selection */ 2977 { /* clear the old selection */
2893 selection.beg.row = selection.end.row = selection.mark.row; 2978 selection.beg.row = selection.end.row = selection.mark.row;
2894 selection.beg.col = selection.end.col = selection.mark.col; 2979 selection.beg.col = selection.end.col = selection.mark.col;
2895 } 2980 }
2981
2896 selection.op = SELECTION_INIT; 2982 selection.op = SELECTION_INIT;
2897 selection.screen = current_screen; 2983 selection.screen = current_screen;
2898} 2984}
2899 2985
2900/* ------------------------------------------------------------------------- */ 2986/* ------------------------------------------------------------------------- */
… …
2902 * Word select: select text for 2 clicks 2988 * Word select: select text for 2 clicks
2903 * We now only find out the boundary in one direction 2989 * We now only find out the boundary in one direction
2904 */ 2990 */
2905 2991
2906/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2992/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2907#define DELIMIT_TEXT(x) \ 2993#define DELIMIT_TEXT(x) \
2908 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 2994 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x)))
2909#define DELIMIT_REND(x) 1 2995#define DELIMIT_REND(x) 1
2910 2996
2911void 2997void
2912rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2998rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2913{ 2999{
2914 int col, row, dirnadd, tcol, trow, w1, w2; 3000 int col, row, dirnadd, tcol, trow, w1, w2;
2915 row_col_t bound; 3001 row_col_t bound;
2916 text_t *stp; 3002 text_t *stp;
2917 rend_t *srp; 3003 rend_t *srp;
2918 3004
2919 if (dirn == UP) 3005 if (dirn == UP)
2920 { 3006 {
2921 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3007 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2922 bound.col = 0; 3008 bound.col = 0;
… …
2926 { 3012 {
2927 bound.row = TermWin.saveLines + TermWin.nrow; 3013 bound.row = TermWin.saveLines + TermWin.nrow;
2928 bound.col = TermWin.ncol - 1; 3014 bound.col = TermWin.ncol - 1;
2929 dirnadd = 1; 3015 dirnadd = 1;
2930 } 3016 }
3017
2931 row = mark->row + TermWin.saveLines; 3018 row = mark->row + TermWin.saveLines;
2932 col = mark->col; 3019 col = mark->col;
2933 MAX_IT (col, 0); 3020 MAX_IT (col, 0);
2934 /* find the edge of a word */ 3021 /* find the edge of a word */
2935 stp = & (screen.text[row][col]); 3022 stp = & (screen.text[row][col]);
2936 w1 = DELIMIT_TEXT (*stp); 3023 w1 = DELIMIT_TEXT (*stp);
2937 3024
2938 if (selection_style != NEW_SELECT)
2939 {
2940 if (w1 == 1)
2941 {
2942 stp += dirnadd;
2943 if (DELIMIT_TEXT (*stp) == 1)
2944 goto Old_Word_Selection_You_Die;
2945 col += dirnadd;
2946 }
2947 w1 = 0;
2948 }
2949 srp = (&screen.rend[row][col]); 3025 srp = (&screen.rend[row][col]);
2950 w2 = DELIMIT_REND (*srp); 3026 w2 = DELIMIT_REND (*srp);
2951 3027
2952 for (;;) 3028 for (;;)
2953 { 3029 {
2954 for (; col != bound.col; col += dirnadd) 3030 for (; col != bound.col; col += dirnadd)
2955 { 3031 {
2956 stp += dirnadd; 3032 stp += dirnadd;
3033 srp += dirnadd;
3034
3035 if (*stp == NOCHAR)
3036 continue;
3037
2957 if (DELIMIT_TEXT (*stp) != w1) 3038 if (DELIMIT_TEXT (*stp) != w1)
2958 break; 3039 break;
2959 srp += dirnadd;
2960 if (DELIMIT_REND (*srp) != w2) 3040 if (DELIMIT_REND (*srp) != w2)
2961 break; 3041 break;
2962 } 3042 }
3043
2963 if ((col == bound.col) && (row != bound.row)) 3044 if ((col == bound.col) && (row != bound.row))
2964 { 3045 {
2965 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3046 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2966 { 3047 {
2967 trow = row + dirnadd; 3048 trow = row + dirnadd;
2968 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3049 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3050
2969 if (screen.text[trow] == NULL) 3051 if (screen.text[trow] == NULL)
2970 break; 3052 break;
3053
2971 stp = & (screen.text[trow][tcol]); 3054 stp = & (screen.text[trow][tcol]);
2972 srp = & (screen.rend[trow][tcol]); 3055 srp = & (screen.rend[trow][tcol]);
3056
2973 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3057 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2974 break; 3058 break;
3059
2975 row = trow; 3060 row = trow;
2976 col = tcol; 3061 col = tcol;
2977 continue; 3062 continue;
2978 } 3063 }
2979 } 3064 }
2980 break; 3065 break;
2981 } 3066 }
3067
2982Old_Word_Selection_You_Die: 3068Old_Word_Selection_You_Die:
2983 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)); 3069 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));
2984 3070
2985 if (dirn == DN) 3071 if (dirn == DN)
2986 col++; /* put us on one past the end */ 3072 col++; /* put us on one past the end */
… …
3008 MAX_IT (row, 0); 3094 MAX_IT (row, 0);
3009 MIN_IT (row, (int)TermWin.nrow - 1); 3095 MIN_IT (row, (int)TermWin.nrow - 1);
3010 MAX_IT (col, 0); 3096 MAX_IT (col, 0);
3011 MIN_IT (col, (int)TermWin.ncol); 3097 MIN_IT (col, (int)TermWin.ncol);
3012 3098
3013#ifndef NO_NEW_SELECTION
3014 /* 3099 /*
3015 * If we're selecting characters (single click) then we must check first 3100 * If we're selecting characters (single click) then we must check first
3016 * if we are at the same place as the original mark. If we are then 3101 * if we are at the same place as the original mark. If we are then
3017 * select nothing. Otherwise, if we're to the right of the mark, you have to 3102 * select nothing. Otherwise, if we're to the right of the mark, you have to
3018 * be _past_ a character for it to be selected. 3103 * be _past_ a character for it to be selected.
3019 */ 3104 */
3020 if (selection_style != OLD_SELECT)
3021 {
3022 if (((selection.clicks % 3) == 1) && !flag 3105 if (((selection.clicks % 3) == 1) && !flag
3023 && (col == selection.mark.col 3106 && (col == selection.mark.col
3024 && (row == selection.mark.row + TermWin.view_start))) 3107 && (row == selection.mark.row + TermWin.view_start)))
3025 { 3108 {
3026 /* select nothing */ 3109 /* select nothing */
3027 selection.beg.row = selection.end.row = 0; 3110 selection.beg.row = selection.end.row = 0;
3028 selection.beg.col = selection.end.col = 0; 3111 selection.beg.col = selection.end.col = 0;
3029 selection.clicks = 4; 3112 selection.clicks = 4;
3030 want_refresh = 1; 3113 want_refresh = 1;
3031 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); 3114 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3032 return; 3115 return;
3033 }
3034 } 3116 }
3035#endif 3117
3036 if (selection.clicks == 4) 3118 if (selection.clicks == 4)
3037 selection.clicks = 1; 3119 selection.clicks = 1;
3038 3120
3039 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3121 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3040 flag == 1 ? 1 : 0, /* ? button press */ 3122 flag == 1 ? 1 : 0, /* ? button press */
… …
3046 * Extend the selection to the specified col/row 3128 * Extend the selection to the specified col/row
3047 */ 3129 */
3048void 3130void
3049rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3131rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3050{ 3132{
3051 int16_t ncol = TermWin.ncol; 3133 int16_t ncol = TermWin.ncol;
3052 int end_col; 3134 int end_col;
3053 row_col_t pos; 3135 row_col_t pos;
3054 enum { 3136 enum {
3055 LEFT, RIGHT 3137 LEFT, RIGHT
3056 } closeto = RIGHT; 3138 } closeto = RIGHT;
3057 3139
3058 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)); 3140 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));
… …
3094 pos.col = col; 3176 pos.col = col;
3095 pos.row = row; 3177 pos.row = row;
3096 3178
3097 pos.row -= TermWin.view_start; /* adjust for scroll */ 3179 pos.row -= TermWin.view_start; /* adjust for scroll */
3098 3180
3099#ifndef NO_OLD_SELECTION
3100 /*
3101 * This mimics some of the selection behaviour of version 2.20 and before.
3102 * There are no ``selection modes'', button3 is always character extension.
3103 * Note: button3 drag is always available, c.f. v2.20
3104 * Selection always terminates (left or right as appropriate) at the mark.
3105 */
3106 if (selection_style == OLD_SELECT)
3107 {
3108 if (selection.clicks == 1 || button3)
3109 {
3110 if (hate_those_clicks)
3111 {
3112 hate_those_clicks = 0;
3113 if (selection.clicks == 1)
3114 {
3115 selection.beg.row = selection.mark.row;
3116 selection.beg.col = selection.mark.col;
3117 }
3118 else
3119 {
3120 selection.mark.row = selection.beg.row;
3121 selection.mark.col = selection.beg.col;
3122 }
3123 }
3124 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3125 {
3126 selection.end.row = selection.mark.row;
3127 selection.end.col = selection.mark.col + 1;
3128 selection.beg.row = pos.row;
3129 selection.beg.col = pos.col;
3130 }
3131 else
3132 {
3133 selection.beg.row = selection.mark.row;
3134 selection.beg.col = selection.mark.col;
3135 selection.end.row = pos.row;
3136 selection.end.col = pos.col + 1;
3137 }
3138 }
3139 else if (selection.clicks == 2)
3140 {
3141 selection_delimit_word (UP, & (selection.mark),
3142 & (selection.beg));
3143 selection_delimit_word (DN, & (selection.mark),
3144 & (selection.end));
3145 hate_those_clicks = 1;
3146 }
3147 else if (selection.clicks == 3)
3148 {
3149 selection.beg.row = selection.end.row = selection.mark.row;
3150 selection.beg.col = 0;
3151 selection.end.col = ncol;
3152 hate_those_clicks = 1;
3153 }
3154 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));
3155 return;
3156 }
3157#endif /* ! NO_OLD_SELECTION */
3158#ifndef NO_NEW_SELECTION
3159 /* selection_style must not be OLD_SELECT to get here */
3160 /* 3181 /*
3161 * This is mainly xterm style selection with a couple of differences, mainly 3182 * This is mainly xterm style selection with a couple of differences, mainly
3162 * in the way button3 drag extension works. 3183 * in the way button3 drag extension works.
3163 * We're either doing: button1 drag; button3 press; or button3 drag 3184 * We're either doing: button1 drag; button3 press; or button3 drag
3164 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3185 * a) button1 drag : select around a midpoint/word/line - that point/word/line
… …
3169 * a point/word/line which is either the start or end of the selection 3190 * a point/word/line which is either the start or end of the selection
3170 * and it was decided by whichever point/word/line was `fixed' at the 3191 * and it was decided by whichever point/word/line was `fixed' at the
3171 * time of the most recent button3 press 3192 * time of the most recent button3 press
3172 */ 3193 */
3173 if (button3 && buttonpress) 3194 if (button3 && buttonpress)
3174 { /* button3 press */ 3195 { /* button3 press */
3175 /* 3196 /*
3176 * first determine which edge of the selection we are closest to 3197 * first determine which edge of the selection we are closest to
3177 */ 3198 */
3178 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3199 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3179 || (!ROWCOL_IS_AFTER (pos, selection.end) 3200 || (!ROWCOL_IS_AFTER (pos, selection.end)
3180 && (((pos.col - selection.beg.col) 3201 && (((pos.col - selection.beg.col)
3181 + ((pos.row - selection.beg.row) * ncol)) 3202 + ((pos.row - selection.beg.row) * ncol))
3182 < ((selection.end.col - pos.col) 3203 < ((selection.end.col - pos.col)
3183 + ((selection.end.row - pos.row) * ncol))))) 3204 + ((selection.end.row - pos.row) * ncol)))))
3184 closeto = LEFT; 3205 closeto = LEFT;
3206
3185 if (closeto == LEFT) 3207 if (closeto == LEFT)
3186 { 3208 {
3187 selection.beg.row = pos.row; 3209 selection.beg.row = pos.row;
3188 selection.beg.col = pos.col; 3210 selection.beg.col = pos.col;
3189 selection.mark.row = selection.end.row; 3211 selection.mark.row = selection.end.row;
3190 selection.mark.col = selection.end.col 3212 selection.mark.col = selection.end.col - (selection.clicks == 2);
3191 - (selection.clicks == 2);
3192 } 3213 }
3193 else 3214 else
3194 { 3215 {
3195 selection.end.row = pos.row; 3216 selection.end.row = pos.row;
3196 selection.end.col = pos.col; 3217 selection.end.col = pos.col;
3197 selection.mark.row = selection.beg.row; 3218 selection.mark.row = selection.beg.row;
3198 selection.mark.col = selection.beg.col; 3219 selection.mark.col = selection.beg.col;
3199 } 3220 }
3200 } 3221 }
3201 else 3222 else
3202 { /* button1 drag or button3 drag */ 3223 { /* button1 drag or button3 drag */
3203 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3224 if (ROWCOL_IS_AFTER (selection.mark, pos))
3204 { 3225 {
3205 if ((selection.mark.row == selection.end.row) 3226 if ((selection.mark.row == selection.end.row)
3206 && (selection.mark.col == selection.end.col) 3227 && (selection.mark.col == selection.end.col)
3207 && clickchange && selection.clicks == 2) 3228 && clickchange && selection.clicks == 2)
3208 selection.mark.col--; 3229 selection.mark.col--;
3230
3209 selection.beg.row = pos.row; 3231 selection.beg.row = pos.row;
3210 selection.beg.col = pos.col; 3232 selection.beg.col = pos.col;
3211 selection.end.row = selection.mark.row; 3233 selection.end.row = selection.mark.row;
3212 selection.end.col = selection.mark.col 3234 selection.end.col = selection.mark.col + (selection.clicks == 2);
3213 + (selection.clicks == 2);
3214 } 3235 }
3215 else 3236 else
3216 { 3237 {
3217 selection.beg.row = selection.mark.row; 3238 selection.beg.row = selection.mark.row;
3218 selection.beg.col = selection.mark.col; 3239 selection.beg.col = selection.mark.col;
… …
3222 } 3243 }
3223 3244
3224 if (selection.clicks == 1) 3245 if (selection.clicks == 1)
3225 { 3246 {
3226 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3247 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3248
3227 if (end_col != -1 && selection.beg.col > end_col) 3249 if (end_col != -1 && selection.beg.col > end_col)
3228 { 3250 {
3229#if 1 3251#if 1
3230 selection.beg.col = ncol; 3252 selection.beg.col = ncol;
3231#else 3253#else
3232 if (selection.beg.row != selection.end.row) 3254 if (selection.beg.row != selection.end.row)
3233 selection.beg.col = ncol; 3255 selection.beg.col = ncol;
3234 else 3256 else
3235 selection.beg.col = selection.mark.col; 3257 selection.beg.col = selection.mark.col;
3236#endif 3258#endif
3237
3238 } 3259 }
3260
3239 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3261 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3262
3240 if (end_col != -1 && selection.end.col > end_col) 3263 if (end_col != -1 && selection.end.col > end_col)
3241 selection.end.col = ncol; 3264 selection.end.col = ncol;
3242
3243 } 3265 }
3244 else if (selection.clicks == 2) 3266 else if (selection.clicks == 2)
3245 { 3267 {
3246 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3268 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3247 selection.end.col--; 3269 selection.end.col--;
3270
3248 selection_delimit_word (UP, & (selection.beg), 3271 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3249 & (selection.beg));
3250 selection_delimit_word (DN, & (selection.end), 3272 selection_delimit_word (DN, & (selection.end), & (selection.end));
3251 & (selection.end));
3252 } 3273 }
3253 else if (selection.clicks == 3) 3274 else if (selection.clicks == 3)
3254 { 3275 {
3255#ifndef NO_FRILLS 3276#ifndef NO_FRILLS
3256 if ((Options & Opt_tripleclickwords)) 3277 if ((Options & Opt_tripleclickwords))
3257 { 3278 {
3258 int end_row; 3279 int end_row;
3259 3280
3260 selection_delimit_word (UP, & (selection.beg), 3281 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3261 & (selection.beg));
3262 end_row = screen.tlen[selection.mark.row 3282 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3263 + TermWin.saveLines]; 3283
3264 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3284 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3265 end_row++)
3266 { 3285 {
3267 end_col = screen.tlen[end_row + TermWin.saveLines]; 3286 end_col = screen.tlen[end_row + TermWin.saveLines];
3287
3268 if (end_col != -1) 3288 if (end_col != -1)
3269 { 3289 {
3270 selection.end.row = end_row; 3290 selection.end.row = end_row;
3271 selection.end.col = end_col; 3291 selection.end.col = end_col;
3272 selection_remove_trailing_spaces (); 3292 selection_remove_trailing_spaces ();
… …
3274 } 3294 }
3275 } 3295 }
3276 } 3296 }
3277 else 3297 else
3278#endif 3298#endif
3279
3280 { 3299 {
3281 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3300 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3282 selection.mark.col++; 3301 selection.mark.col++;
3283 selection.beg.col = 0; 3302 selection.beg.col = 0;
3284 selection.end.col = ncol; 3303 selection.end.col = ncol;
3285 } 3304 }
3286 } 3305 }
3306
3287 if (button3 && buttonpress) 3307 if (button3 && buttonpress)
3288 { /* mark may need to be changed */ 3308 { /* mark may need to be changed */
3289 if (closeto == LEFT) 3309 if (closeto == LEFT)
3290 { 3310 {
3291 selection.mark.row = selection.end.row; 3311 selection.mark.row = selection.end.row;
3292 selection.mark.col = selection.end.col 3312 selection.mark.col = selection.end.col
3293 - (selection.clicks == 2); 3313 - (selection.clicks == 2);
… …
3297 selection.mark.row = selection.beg.row; 3317 selection.mark.row = selection.beg.row;
3298 selection.mark.col = selection.beg.col; 3318 selection.mark.col = selection.beg.col;
3299 } 3319 }
3300 } 3320 }
3301 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)); 3321 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));
3302#endif /* ! NO_NEW_SELECTION */
3303} 3322}
3304 3323
3305#ifndef NO_FRILLS 3324#ifndef NO_FRILLS
3306void 3325void
3307rxvt_term::selection_remove_trailing_spaces () 3326rxvt_term::selection_remove_trailing_spaces ()
… …
3381 ev.target = rq.target; 3400 ev.target = rq.target;
3382 ev.time = rq.time; 3401 ev.time = rq.time;
3383 3402
3384 if (rq.target == xa[XA_TARGETS]) 3403 if (rq.target == xa[XA_TARGETS])
3385 { 3404 {
3386 Atom32 target_list[5]; 3405 Atom32 target_list[6];
3387 Atom32 *target = target_list; 3406 Atom32 *target = target_list;
3388 3407
3389 *target++ = (Atom32) xa[XA_TARGETS]; 3408 *target++ = (Atom32) xa[XA_TARGETS];
3409 *target++ = (Atom32) xa[XA_TIMESTAMP];
3390 *target++ = (Atom32) XA_STRING; 3410 *target++ = (Atom32) XA_STRING;
3391 *target++ = (Atom32) xa[XA_TEXT]; 3411 *target++ = (Atom32) xa[XA_TEXT];
3392 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3412 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3393#if X_HAVE_UTF8_STRING 3413#if X_HAVE_UTF8_STRING
3394 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3414 *target++ = (Atom32) xa[XA_UTF8_STRING];
3395#endif 3415#endif
3416
3396 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3417 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3397 (8 * sizeof (target_list[0])), PropModeReplace, 3418 (8 * sizeof (target_list[0])), PropModeReplace,
3398 (unsigned char *)target_list, 3419 (unsigned char *)target_list,
3399 target - target_list); 3420 target - target_list);
3400 ev.property = rq.property; 3421 ev.property = rq.property;
3401 } 3422 }
3402 else if (rq.target == xa[XA_MULTIPLE]) 3423 else if (rq.target == xa[XA_MULTIPLE])
3403 { 3424 {
3404 /* TODO: Handle MULTIPLE */ 3425 /* TODO: Handle MULTIPLE */
3405 } 3426 }
3406 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3427 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3407 { 3428 {
3408 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3429 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3409 (8 * sizeof (Time)), PropModeReplace, 3430 (8 * sizeof (Time)), PropModeReplace,
3410 (unsigned char *)&selection_time, 1); 3431 (unsigned char *)&selection_time, 1);
3411 ev.property = rq.property; 3432 ev.property = rq.property;
3412 } 3433 }
3413 else if (rq.target == XA_STRING 3434 else if (rq.target == XA_STRING
3414 || rq.target == xa[XA_TEXT] 3435 || rq.target == xa[XA_TEXT]
3415 || rq.target == xa[XA_COMPOUND_TEXT] 3436 || rq.target == xa[XA_COMPOUND_TEXT]
3416 || rq.target == xa[XA_UTF8_STRING] 3437 || rq.target == xa[XA_UTF8_STRING]
3417 ) 3438 )
3418 { 3439 {
3419 short freect = 0; 3440 short freect = 0;
3420 int selectlen; 3441 int selectlen;
3421 char *cl; 3442 wchar_t *cl;
3422 3443
3423 target = rq.target; 3444 target = rq.target;
3424 3445
3425 if (target == XA_STRING) 3446 if (target == XA_STRING)
3426 // we actually don't do XA_STRING, but who cares, as i18n clients 3447 // we actually don't do XA_STRING, but who cares, as i18n clients
3427 // will ask for another format anyways. 3448 // will ask for another format anyways.
3428 style = XStringStyle; 3449 style = XStringStyle;
3429 else if (target == xa[XA_TEXT]) 3450 else if (target == xa[XA_TEXT])
3430 style = XTextStyle; 3451 style = XStdICCTextStyle;
3431 else if (target == xa[XA_COMPOUND_TEXT]) 3452 else if (target == xa[XA_COMPOUND_TEXT])
3432 style = XCompoundTextStyle; 3453 style = XCompoundTextStyle;
3433#if X_HAVE_UTF8_STRING 3454#if X_HAVE_UTF8_STRING
3434 else if (target == xa[XA_UTF8_STRING]) 3455 else if (target == xa[XA_UTF8_STRING])
3435 style = XUTF8StringStyle; 3456 style = XUTF8StringStyle;
… …
3440 style = XCompoundTextStyle; 3461 style = XCompoundTextStyle;
3441 } 3462 }
3442 3463
3443 if (selection.text) 3464 if (selection.text)
3444 { 3465 {
3445 cl = (char *)selection.text; 3466 cl = selection.text;
3446 selectlen = selection.len; 3467 selectlen = selection.len;
3447 } 3468 }
3448 else 3469 else
3449 { 3470 {
3450 cl = ""; 3471 cl = L"";
3451 selectlen = 0; 3472 selectlen = 0;
3452 } 3473 }
3453 3474
3475 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3476 // manually for XUTF8StringStyle.
3454 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3477 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3455 freect = 1; 3478 freect = 1;
3456 else 3479 else
3457 { 3480 {
3458 /* if we failed to convert then send it raw */ 3481 /* if we failed to convert then send it raw */
3459 ct.value = (unsigned char *)cl; 3482 ct.value = (unsigned char *)cl;
… …
3466 ev.property = rq.property; 3489 ev.property = rq.property;
3467 3490
3468 if (freect) 3491 if (freect)
3469 XFree (ct.value); 3492 XFree (ct.value);
3470 } 3493 }
3494
3471 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3495 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3472} 3496}
3473 3497
3474/* ------------------------------------------------------------------------- * 3498/* ------------------------------------------------------------------------- *
3475 * MOUSE ROUTINES * 3499 * MOUSE ROUTINES *
… …
3499 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3523 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace;
3500} 3524}
3501 3525
3502#endif 3526#endif
3503/* ------------------------------------------------------------------------- */ 3527/* ------------------------------------------------------------------------- */
3504
3505/* ------------------------------------------------------------------------- *
3506 * DEBUG ROUTINES *
3507 * ------------------------------------------------------------------------- */
3508#if 0
3509void
3510rxvt_debug_colors (void)
3511{
3512 int color;
3513 const char *name[] =
3514 {
3515 "fg", "bg",
3516 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3517 };
3518
3519 fprintf (stderr, "Color ( ");
3520 if (rstyle & RS_RVid)
3521 fprintf (stderr, "rvid ");
3522 if (rstyle & RS_Bold)
3523 fprintf (stderr, "bold ");
3524 if (rstyle & RS_Blink)
3525 fprintf (stderr, "blink ");
3526 if (rstyle & RS_Uline)
3527 fprintf (stderr, "uline ");
3528 fprintf (stderr, "): ");
3529
3530 color = GET_FGCOLOR (rstyle);
3531#ifndef NO_BRIGHTCOLOR
3532 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3533 {
3534 color -= (minBrightCOLOR - minCOLOR);
3535 fprintf (stderr, "bright ");
3536 }
3537#endif
3538 fprintf (stderr, "%s on ", name[color]);
3539
3540 color = GET_BGCOLOR (rstyle);
3541#ifndef NO_BRIGHTCOLOR
3542 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3543 {
3544 color -= (minBrightCOLOR - minCOLOR);
3545 fprintf (stderr, "bright ");
3546 }
3547#endif
3548 fprintf (stderr, "%s\n", name[color]);
3549}
3550#endif

Diff Legend

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