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.85 by root, Sun Aug 8 16:43:21 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 *
… …
29#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
30#include "screen.intpro" /* PROTOS for internal routines */ 30#include "screen.intpro" /* PROTOS for internal routines */
31 31
32#include <X11/Xmd.h> /* get the typedef for CARD32 */ 32#include <X11/Xmd.h> /* get the typedef for CARD32 */
33 33
34#include <stdint.h> 34#include <inttypes.h>
35#include <wchar.h> 35#include <wchar.h>
36 36
37#include "salloc.C" // HACK, should be a seperate compile! 37#include "salloc.C" // HACK, should be a seperate compile!
38 38
39inline void fill_text (text_t *start, text_t value, int len) 39inline void fill_text (text_t *start, text_t value, int len)
… …
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 * ------------------------------------------------------------------------- */
118/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
119void 119void
120rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)
121{ 121{
122 efs &= ~RS_baseattrMask; 122 efs &= ~RS_baseattrMask;
123 efs = SET_FONT (efs, TermWin.fontset->find_font (' ')); 123 efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]);
124 124
125 while (width--) 125 while (width--)
126 { 126 {
127 *et++ = ' '; 127 *et++ = ' ';
128 *er++ = efs; 128 *er++ = efs;
… …
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;
… …
707 if (j > 0) 705 if (j > 0)
708 { 706 {
709 /* A: scroll up */ 707 /* A: scroll up */
710 708
711 /* A1: Copy lines that will get clobbered by the rotation */ 709 /* A1: Copy lines that will get clobbered by the rotation */
710 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
711 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
712
713 /* A2: Rotate lines */
714 i = row2 - row1 - count + 1;
715 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
716 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
717 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
718
719 j = row2 - count + 1, i = count;
720 }
721 else /* if (j < 0) */
722 {
723 /* B: scroll down */
724
725 /* B1: Copy lines that will get clobbered by the rotation */
712 for (i = 0, j = row1; i < count; i++, j++) 726 for (i = 0, j = row2; i < count; i++, j--)
713 { 727 {
714 buf_text[i] = screen.text[j]; 728 buf_text[i] = screen.text[j];
715 buf_rend[i] = screen.rend[j]; 729 buf_rend[i] = screen.rend[j];
716 } 730 }
731
717 /* A2: Rotate lines */ 732 /* B2: Rotate lines */
718 for (j = row1, i = j + count; i <= row2; i++, j++) 733 for (j = row2, i = j - count; i >= row1; i--, j--)
719 { 734 {
720 screen.tlen[j] = screen.tlen[i]; 735 screen.tlen[j] = screen.tlen[i];
721 screen.text[j] = screen.text[i]; 736 screen.text[j] = screen.text[i];
722 screen.rend[j] = screen.rend[i]; 737 screen.rend[j] = screen.rend[i];
723 } 738 }
724 j = row2 - count + 1, i = count;
725 }
726 else /* if (j < 0) */
727 {
728 /* B: scroll down */
729 739
730 /* B1: Copy lines that will get clobbered by the rotation */
731 for (i = 0, j = row2; i < count; i++, j--)
732 {
733 buf_text[i] = screen.text[j];
734 buf_rend[i] = screen.rend[j];
735 }
736 /* B2: Rotate lines */
737 for (j = row2, i = j - count; i >= row1; i--, j--)
738 {
739 screen.tlen[j] = screen.tlen[i];
740 screen.text[j] = screen.text[i];
741 screen.rend[j] = screen.rend[i];
742 }
743 j = row1, i = count; 740 j = row1, i = count;
744 count = -count; 741 count = -count;
745 } 742 }
746 743
747 /* C: Resurrect lines */ 744 /* C: Resurrect lines */
745 memset (screen.tlen + j, 0, i * sizeof (int16_t));
746 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
747 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
748 if (!spec) /* line length may not equal TermWin.ncol */
748 for (; i--; j++) 749 for (; i--; j++)
749 {
750 screen.tlen[j] = 0;
751 screen.text[j] = buf_text[i];
752 screen.rend[j] = buf_rend[i];
753
754 if (!spec) /* line length may not equal TermWin.ncol */
755 scr_blank_screen_mem (screen.text, screen.rend, 750 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
756 (unsigned int)j, rstyle);
757 }
758 751
759 return count; 752 return count;
760} 753}
761 754
762/* ------------------------------------------------------------------------- */ 755/* ------------------------------------------------------------------------- */
763/* 756/*
764 * Add text given in <str> of length <len> to screen struct 757 * Add text given in <str> of length <len> to screen struct
765 */ 758 */
766void 759void
767rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) 760rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
768{ 761{
769 unsigned char checksel, clearsel; 762 unsigned char checksel, clearsel;
770 uint32_t c; 763 unicode_t c;
771 int i, row, last_col; 764 int i, row, last_col;
772 text_t *stp; 765 text_t *stp;
773 rend_t *srp; 766 rend_t *srp;
774 767
775 if (len <= 0) /* sanity */ 768 if (len <= 0) /* sanity */
776 return; 769 return;
777 770
778 want_refresh = 1; 771 want_refresh = 1;
… …
780 773
781 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len)); 774 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
782 ZERO_SCROLLBACK (); 775 ZERO_SCROLLBACK ();
783 if (nlines > 0) 776 if (nlines > 0)
784 { 777 {
785 nlines += (screen.cur.row - screen.bscroll); 778 nlines += screen.cur.row - screen.bscroll;
786 if ((nlines > 0) 779 if ((nlines > 0)
787 && (screen.tscroll == 0) 780 && (screen.tscroll == 0)
788 && (screen.bscroll == (TermWin.nrow - 1))) 781 && (screen.bscroll == (TermWin.nrow - 1)))
789 { 782 {
790 /* _at least_ this many lines need to be scrolled */ 783 /* _at least_ this many lines need to be scrolled */
… …
793 } 786 }
794 } 787 }
795#ifdef DEBUG_STRICT 788#ifdef DEBUG_STRICT
796 assert (screen.cur.col < last_col); 789 assert (screen.cur.col < last_col);
797 assert ((screen.cur.row < TermWin.nrow) 790 assert ((screen.cur.row < TermWin.nrow)
798 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 791 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
799#else /* drive with your eyes closed */ 792#else /* drive with your eyes closed */
800 MIN_IT (screen.cur.col, last_col - 1); 793 MIN_IT (screen.cur.col, last_col - 1);
801 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 794 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
802 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 795 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
803#endif 796#endif
804 row = screen.cur.row + TermWin.saveLines; 797 row = screen.cur.row + TermWin.saveLines;
805 798
806 checksel = (selection.op 799 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807 && current_screen == selection.screen) ? 1 : 0;
808 clearsel = 0; 800 clearsel = 0;
809 801
810 stp = screen.text[row]; 802 stp = screen.text[row];
811 srp = screen.rend[row]; 803 srp = screen.rend[row];
812 804
813 for (i = 0; i < len;) 805 while (len--)
814 { 806 {
815 c = str[i++]; 807 c = *str++;
808
809 if (c < 0x20)
816 switch (c) 810 switch (c)
817 { 811 {
818 case '\t': 812 case C0_HT:
819 scr_tab (1); 813 scr_tab (1);
820 continue; 814 continue;
821 case '\n': 815
816 case C0_LF:
822 if (screen.tlen[row] != -1) /* XXX: think about this */ 817 if (screen.tlen[row] != -1) /* XXX: think about this */
823 MAX_IT (screen.tlen[row], screen.cur.col); 818 MAX_IT (screen.tlen[row], screen.cur.col);
819
824 screen.flags &= ~Screen_WrapNext; 820 screen.flags &= ~Screen_WrapNext;
821
825 if (screen.cur.row == screen.bscroll) 822 if (screen.cur.row == screen.bscroll)
826 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 823 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
827 else if (screen.cur.row < (TermWin.nrow - 1)) 824 else if (screen.cur.row < (TermWin.nrow - 1))
828 row = (++screen.cur.row) + TermWin.saveLines; 825 row = (++screen.cur.row) + TermWin.saveLines;
826
829 stp = screen.text[row]; /* _must_ refresh */ 827 stp = screen.text[row]; /* _must_ refresh */
830 srp = screen.rend[row]; /* _must_ refresh */ 828 srp = screen.rend[row]; /* _must_ refresh */
831 continue; 829 continue;
832 case '\r': 830
831 case C0_CR:
833 if (screen.tlen[row] != -1) /* XXX: think about this */ 832 if (screen.tlen[row] != -1) /* XXX: think about this */
834 MAX_IT (screen.tlen[row], screen.cur.col); 833 MAX_IT (screen.tlen[row], screen.cur.col);
834
835 screen.flags &= ~Screen_WrapNext; 835 screen.flags &= ~Screen_WrapNext;
836 screen.cur.col = 0; 836 screen.cur.col = 0;
837 continue; 837 continue;
838 default:
839 if (c == 127)
840 continue; /* yummmm..... */
841 break;
842 } 838 }
843 839
844 if (checksel /* see if we're writing within selection */ 840 if (checksel /* see if we're writing within selection */
845 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 841 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
846 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 842 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
847 { 843 {
848 checksel = 0; 844 checksel = 0;
849 clearsel = 1; 845 clearsel = 1;
850 } 846 }
847
851 if (screen.flags & Screen_WrapNext) 848 if (screen.flags & Screen_WrapNext)
852 { 849 {
853 screen.tlen[row] = -1; 850 screen.tlen[row] = -1;
854 if (screen.cur.row == screen.bscroll) 851 if (screen.cur.row == screen.bscroll)
855 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 852 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
856 else if (screen.cur.row < (TermWin.nrow - 1)) 853 else if (screen.cur.row < (TermWin.nrow - 1))
857 row = (++screen.cur.row) + TermWin.saveLines; 854 row = (++screen.cur.row) + TermWin.saveLines;
855
858 stp = screen.text[row]; /* _must_ refresh */ 856 stp = screen.text[row]; /* _must_ refresh */
859 srp = screen.rend[row]; /* _must_ refresh */ 857 srp = screen.rend[row]; /* _must_ refresh */
860 screen.cur.col = 0; 858 screen.cur.col = 0;
861 screen.flags &= ~Screen_WrapNext; 859 screen.flags &= ~Screen_WrapNext;
862 } 860 }
861
863 if (screen.flags & Screen_Insert) 862 if (screen.flags & Screen_Insert)
864 scr_insdel_chars (1, INSERT); 863 scr_insdel_chars (1, INSERT);
865 864
865 // rely on wcwidth to tell us the character width, at least for non-latin1
866 // do wcwidth before further replacements, as wcwidth says that line-drawing
867 // characters have width -1 (DOH!) on GNU/Linux sometimes.
868 int width = c < 0x100 ? 1 : wcwidth (c);
869
866 if (charsets[screen.charset] == '0') // DEC SPECIAL 870 if (charsets[screen.charset] == '0') // DEC SPECIAL
867 switch (c)
868 { 871 {
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 872 // vt100 special graphics and line drawing
875 case '`': c = 0x25c6; break; case '_': c = 0x0020; break; 873 static uint16_t vt100_0[32] = { // 5f .. 7e
876 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; 874 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
877 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; 875 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
878 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; 876 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
879 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; 877 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 } 878 };
887 879
888 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 880 if (c >= 0x5f && c <= 0x7e)
889 // rely on wcwidth to tell us the character width, at least for non-ascii 881 {
890 int width = c <= 128 ? 1 : wcwidth (c); 882 c = vt100_0[c - 0x5f];
883 width = 1;
884 }
885 }
891 886
892 // width -1 characters (e.g. combining chars) are ignored currently.
893 if (width > 0) 887 if (width != 0)
894 { 888 {
889#if !UNICODE_3 && ENABLE_COMBINING
890 // trim characters we can't store directly :(
891 if (c >= 0x10000)
892 c = rxvt_composite.compose (c); // map to lower 16 bits
893#endif
894 bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0);
895 rend_t rend = SET_FONT (rstyle,
896 c > 0x7f || bold || c < 0x20
897 ? TermWin.fontset->find_font (c, bold)
898 : TermWin.ascii_map [c - 0x20]);
899
895 do 900 do
896 { 901 {
897 stp[screen.cur.col] = c; 902 stp[screen.cur.col] = c;
898 srp[screen.cur.col] = rend; 903 srp[screen.cur.col] = rend;
899 904
… …
910 c = NOCHAR; 915 c = NOCHAR;
911 } 916 }
912 while (--width > 0); 917 while (--width > 0);
913 918
914 // pad with spaces when overwriting wide character with smaller one 919 // pad with spaces when overwriting wide character with smaller one
915 for (int c = screen.cur.col; stp[c] == NOCHAR && c < last_col; c++) 920 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
916 { 921 {
917 stp[c] = ' '; 922 stp[c] = ' ';
918 srp[c] = rend; 923 srp[c] = rend;
919 } 924 }
920 } 925 }
926 else if (width == 0)
927 {
928#if ENABLE_COMBINING
929 // handle combining characters
930 // we just tag the accent on the previous on-screen character.
931 // this is arguably not correct, but also arguably not wrong.
932 // we don't handle double-width characters nicely yet.
933
934 text_t *tp;
935 rend_t *rp;
936
937 if (screen.cur.col > 0)
938 {
939 tp = stp + screen.cur.col - 1;
940 rp = srp + screen.cur.col - 1;
941 }
942 else if (screen.cur.row > 0
943 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
944 {
945 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
946 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
947 }
921 else 948 else
922 (void)0; /* handle combining character etc. here. */ 949 continue;
950
951 // handle double-width-chars by making them look extremely ugly
952 if (*tp == NOCHAR)
953 *tp = ' '; // hack //D //TODO //--tp, --rp;
954
955 // first try to find a precomposed character
956 unicode_t n = rxvt_compose (*tp, c);
957 if (n == NOCHAR)
958 n = rxvt_composite.compose (*tp, c);
959
960 *tp = n;
961 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
962#endif
963 }
923 } 964 }
924 965
925 if (screen.tlen[row] != -1) /* XXX: think about this */ 966 if (screen.tlen[row] != -1) /* XXX: think about this */
926 MAX_IT (screen.tlen[row], screen.cur.col); 967 MAX_IT (screen.tlen[row], screen.cur.col);
927 968
… …
947 */ 988 */
948void 989void
949rxvt_term::scr_backspace () 990rxvt_term::scr_backspace ()
950{ 991{
951 want_refresh = 1; 992 want_refresh = 1;
993
952 if (screen.cur.col == 0) 994 if (screen.cur.col == 0)
953 { 995 {
954 if (screen.cur.row > 0) 996 if (screen.cur.row > 0)
955 { 997 {
956#ifdef TERMCAP_HAS_BW 998#ifdef TERMCAP_HAS_BW
… …
961 1003
962 } 1004 }
963 } 1005 }
964 else if ((screen.flags & Screen_WrapNext) == 0) 1006 else if ((screen.flags & Screen_WrapNext) == 0)
965 scr_gotorc (0, -1, RELATIVE); 1007 scr_gotorc (0, -1, RELATIVE);
1008
966 screen.flags &= ~Screen_WrapNext; 1009 screen.flags &= ~Screen_WrapNext;
967} 1010}
968 1011
969/* ------------------------------------------------------------------------- */ 1012/* ------------------------------------------------------------------------- */
970/* 1013/*
… …
973 * XTERM_SEQ: CTRL-I 1016 * XTERM_SEQ: CTRL-I
974 */ 1017 */
975void 1018void
976rxvt_term::scr_tab (int count) 1019rxvt_term::scr_tab (int count)
977{ 1020{
978 int i, x; 1021 int i, x;
979 1022
980 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); 1023 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
981 want_refresh = 1; 1024 want_refresh = 1;
982 i = x = screen.cur.col; 1025 i = x = screen.cur.col;
1026
983 if (count == 0) 1027 if (count == 0)
984 return; 1028 return;
985 else if (count > 0) 1029 else if (count > 0)
986 { 1030 {
987 for (; ++i < TermWin.ncol; ) 1031 for (; ++i < TermWin.ncol; )
… …
989 { 1033 {
990 x = i; 1034 x = i;
991 if (!--count) 1035 if (!--count)
992 break; 1036 break;
993 } 1037 }
1038
994 if (count) 1039 if (count)
995 x = TermWin.ncol - 1; 1040 x = TermWin.ncol - 1;
996 } 1041 }
997 else /* if (count < 0) */ 1042 else /* if (count < 0) */
998 { 1043 {
… …
1001 { 1046 {
1002 x = i; 1047 x = i;
1003 if (!++count) 1048 if (!++count)
1004 break; 1049 break;
1005 } 1050 }
1051
1006 if (count) 1052 if (count)
1007 x = 0; 1053 x = 0;
1008 } 1054 }
1055
1009 if (x != screen.cur.col) 1056 if (x != screen.cur.col)
1010 scr_gotorc (0, x, R_RELATIVE); 1057 scr_gotorc (0, x, R_RELATIVE);
1011} 1058}
1012 1059
1013/* ------------------------------------------------------------------------- */ 1060/* ------------------------------------------------------------------------- */
… …
1070 want_refresh = 1; 1117 want_refresh = 1;
1071 ZERO_SCROLLBACK (); 1118 ZERO_SCROLLBACK ();
1072 1119
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)); 1120 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 1121
1075 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1122 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1076 : col);
1077 MAX_IT (screen.cur.col, 0); 1123 MAX_IT (screen.cur.col, 0);
1078 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1124 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1079 1125
1080 screen.flags &= ~Screen_WrapNext; 1126 screen.flags &= ~Screen_WrapNext;
1081 if (relative & R_RELATIVE) 1127 if (relative & R_RELATIVE)
… …
1120 * direction should be UP or DN 1166 * direction should be UP or DN
1121 */ 1167 */
1122void 1168void
1123rxvt_term::scr_index (enum page_dirn direction) 1169rxvt_term::scr_index (enum page_dirn direction)
1124{ 1170{
1125 int dirn; 1171 int dirn;
1126 1172
1127 want_refresh = 1; 1173 want_refresh = 1;
1128 dirn = ((direction == UP) ? 1 : -1); 1174 dirn = ((direction == UP) ? 1 : -1);
1129 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); 1175 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1130 1176
… …
1190 default: 1236 default:
1191 return; 1237 return;
1192 } 1238 }
1193 1239
1194 if (screen.text[row]) 1240 if (screen.text[row])
1195 scr_blank_line (& (screen.text[row][col]), 1241 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1196 & (screen.rend[row][col]), num, rstyle);
1197 else 1242 else
1198 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1243 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1199} 1244}
1200 1245
1201/* ------------------------------------------------------------------------- */ 1246/* ------------------------------------------------------------------------- */
… …
1206 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1251 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1207 */ 1252 */
1208void 1253void
1209rxvt_term::scr_erase_screen (int mode) 1254rxvt_term::scr_erase_screen (int mode)
1210{ 1255{
1211 int num; 1256 int num;
1212 int32_t row, row_offset; 1257 int32_t row, row_offset;
1213 rend_t ren; 1258 rend_t ren;
1214 XGCValues gcvalue; 1259 XGCValues gcvalue;
1215 1260
1216 want_refresh = 1; 1261 want_refresh = 1;
1217 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); 1262 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1218 ZERO_SCROLLBACK (); 1263 ZERO_SCROLLBACK ();
1219 row_offset = (int32_t)TermWin.saveLines; 1264 row_offset = (int32_t)TermWin.saveLines;
… …
1238 num = TermWin.nrow; 1283 num = TermWin.nrow;
1239 break; 1284 break;
1240 default: 1285 default:
1241 return; 1286 return;
1242 } 1287 }
1243 refresh_type |= REFRESH_BOUNDS; 1288
1244 if (selection.op && current_screen == selection.screen 1289 if (selection.op && current_screen == selection.screen
1245 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1290 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1246 || (selection.end.row >= row 1291 || (selection.end.row >= row
1247 && selection.end.row <= row + num))) 1292 && selection.end.row <= row + num)))
1248 CLEAR_SELECTION (); 1293 CLEAR_SELECTION ();
1294
1249 if (row >= TermWin.nrow) /* Out Of Bounds */ 1295 if (row >= TermWin.nrow) /* Out Of Bounds */
1250 return; 1296 return;
1297
1251 MIN_IT (num, (TermWin.nrow - row)); 1298 MIN_IT (num, (TermWin.nrow - row));
1299
1252 if (rstyle & (RS_RVid | RS_Uline)) 1300 if (rstyle & (RS_RVid | RS_Uline))
1253 ren = (rend_t) ~RS_None; 1301 ren = (rend_t) ~RS_None;
1254 else if (GET_BASEBG (rstyle) == Color_bg) 1302 else if (GET_BASEBG (rstyle) == Color_bg)
1255 { 1303 {
1256 ren = DEFAULT_RSTYLE; 1304 ren = DEFAULT_RSTYLE;
… …
1263 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1311 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1264 ERASE_ROWS (row, num); 1312 ERASE_ROWS (row, num);
1265 gcvalue.foreground = PixColors[Color_fg]; 1313 gcvalue.foreground = PixColors[Color_fg];
1266 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1314 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1267 } 1315 }
1316
1268 for (; num--; row++) 1317 for (; num--; row++)
1269 { 1318 {
1270 scr_blank_screen_mem (screen.text, screen.rend, 1319 scr_blank_screen_mem (screen.text, screen.rend,
1271 (unsigned int) (row + row_offset), rstyle); 1320 (unsigned int) (row + row_offset), rstyle);
1272 screen.tlen[row + row_offset] = 0; 1321 screen.tlen[row + row_offset] = 0;
… …
1306 * Insert/Delete <count> lines 1355 * Insert/Delete <count> lines
1307 */ 1356 */
1308void 1357void
1309rxvt_term::scr_insdel_lines (int count, int insdel) 1358rxvt_term::scr_insdel_lines (int count, int insdel)
1310{ 1359{
1311 int end; 1360 int end;
1312 1361
1313 ZERO_SCROLLBACK (); 1362 ZERO_SCROLLBACK ();
1314 1363
1315 selection_check (1); 1364 selection_check (1);
1316 1365
… …
1335 * Insert/Delete <count> characters from the current position 1384 * Insert/Delete <count> characters from the current position
1336 */ 1385 */
1337void 1386void
1338rxvt_term::scr_insdel_chars (int count, int insdel) 1387rxvt_term::scr_insdel_chars (int count, int insdel)
1339{ 1388{
1340 int col, row; 1389 int col, row;
1341 rend_t tr; 1390 rend_t tr;
1342 text_t *stp; 1391 text_t *stp;
1343 rend_t *srp; 1392 rend_t *srp;
1344 int16_t *slp; 1393 int16_t *slp;
1345 1394
1346 want_refresh = 1; 1395 want_refresh = 1;
1347 ZERO_SCROLLBACK (); 1396 ZERO_SCROLLBACK ();
1348 1397
1349 if (count <= 0) 1398 if (count <= 0)
… …
1356 screen.flags &= ~Screen_WrapNext; 1405 screen.flags &= ~Screen_WrapNext;
1357 1406
1358 stp = screen.text[row]; 1407 stp = screen.text[row];
1359 srp = screen.rend[row]; 1408 srp = screen.rend[row];
1360 slp = & (screen.tlen[row]); 1409 slp = & (screen.tlen[row]);
1410
1361 switch (insdel) 1411 switch (insdel)
1362 { 1412 {
1363 case INSERT: 1413 case INSERT:
1364 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1414 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1365 col--) 1415 col--)
1366 { 1416 {
1367 stp[col] = stp[col - count]; 1417 stp[col] = stp[col - count];
1368 srp[col] = srp[col - count]; 1418 srp[col] = srp[col - count];
1369 } 1419 }
1420
1370 if (*slp != -1) 1421 if (*slp != -1)
1371 { 1422 {
1372 *slp += count; 1423 *slp += count;
1373 MIN_IT (*slp, TermWin.ncol); 1424 MIN_IT (*slp, TermWin.ncol);
1374 } 1425 }
1426
1375 if (selection.op && current_screen == selection.screen 1427 if (selection.op && current_screen == selection.screen
1376 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1428 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1377 { 1429 {
1378 if (selection.end.row != screen.cur.row 1430 if (selection.end.row != screen.cur.row
1379 || (selection.end.col + count >= TermWin.ncol)) 1431 || (selection.end.col + count >= TermWin.ncol))
… …
1383 selection.beg.col += count; 1435 selection.beg.col += count;
1384 selection.mark.col += count; /* XXX: yes? */ 1436 selection.mark.col += count; /* XXX: yes? */
1385 selection.end.col += count; 1437 selection.end.col += count;
1386 } 1438 }
1387 } 1439 }
1440
1388 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1441 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1389 (unsigned int)count, rstyle); 1442 (unsigned int)count, rstyle);
1390 break; 1443 break;
1444
1391 case ERASE: 1445 case ERASE:
1392 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1446 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1393 selection_check (1); 1447 selection_check (1);
1394 screen.cur.col -= count; 1448 screen.cur.col -= count;
1395 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1449 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1396 (unsigned int)count, rstyle); 1450 (unsigned int)count, rstyle);
1397 break; 1451 break;
1452
1398 case DELETE: 1453 case DELETE:
1399 tr = srp[TermWin.ncol - 1]
1400 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1454 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1455
1401 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1456 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1402 { 1457 {
1403 stp[col] = stp[col + count]; 1458 stp[col] = stp[col + count];
1404 srp[col] = srp[col + count]; 1459 srp[col] = srp[col + count];
1405 } 1460 }
1461
1406 scr_blank_line (& (stp[TermWin.ncol - count]), 1462 scr_blank_line (& (stp[TermWin.ncol - count]),
1407 & (srp[TermWin.ncol - count]), 1463 & (srp[TermWin.ncol - count]),
1408 (unsigned int)count, tr); 1464 (unsigned int)count, tr);
1465
1409 if (*slp == -1) /* break line continuation */ 1466 if (*slp == -1) /* break line continuation */
1410 *slp = TermWin.ncol; 1467 *slp = TermWin.ncol;
1468
1411 *slp -= count; 1469 *slp -= count;
1412 MAX_IT (*slp, 0); 1470 MAX_IT (*slp, 0);
1471
1413 if (selection.op && current_screen == selection.screen 1472 if (selection.op && current_screen == selection.screen
1414 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1415 { 1474 {
1416 if (selection.end.row != screen.cur.row 1475 if (selection.end.row != screen.cur.row
1417 || (screen.cur.col >= selection.beg.col - count) 1476 || (screen.cur.col >= selection.beg.col - count)
… …
1423 selection.beg.col -= count; 1482 selection.beg.col -= count;
1424 selection.mark.col -= count; /* XXX: yes? */ 1483 selection.mark.col -= count; /* XXX: yes? */
1425 selection.end.col -= count; 1484 selection.end.col -= count;
1426 } 1485 }
1427 } 1486 }
1487
1428 break; 1488 break;
1429 } 1489 }
1430} 1490}
1431 1491
1432/* ------------------------------------------------------------------------- */ 1492/* ------------------------------------------------------------------------- */
… …
1437void 1497void
1438rxvt_term::scr_scroll_region (int top, int bot) 1498rxvt_term::scr_scroll_region (int top, int bot)
1439{ 1499{
1440 MAX_IT (top, 0); 1500 MAX_IT (top, 0);
1441 MIN_IT (bot, (int)TermWin.nrow - 1); 1501 MIN_IT (bot, (int)TermWin.nrow - 1);
1502
1442 if (top > bot) 1503 if (top > bot)
1443 return; 1504 return;
1505
1444 screen.tscroll = top; 1506 screen.tscroll = top;
1445 screen.bscroll = bot; 1507 screen.bscroll = bot;
1446 scr_gotorc (0, 0, 0); 1508 scr_gotorc (0, 0, 0);
1447} 1509}
1448 1510
… …
1454 */ 1516 */
1455void 1517void
1456rxvt_term::scr_cursor_visible (int mode) 1518rxvt_term::scr_cursor_visible (int mode)
1457{ 1519{
1458 want_refresh = 1; 1520 want_refresh = 1;
1521
1459 if (mode) 1522 if (mode)
1460 screen.flags |= Screen_VisibleCursor; 1523 screen.flags |= Screen_VisibleCursor;
1461 else 1524 else
1462 screen.flags &= ~Screen_VisibleCursor; 1525 screen.flags &= ~Screen_VisibleCursor;
1463} 1526}
… …
1677 row_col_t rc[RC_COUNT]; 1740 row_col_t rc[RC_COUNT];
1678 1741
1679 if (drawn_text == NULL) /* sanity check */ 1742 if (drawn_text == NULL) /* sanity check */
1680 return; 1743 return;
1681 1744
1745#ifndef NO_SLOW_LINK_SUPPORT
1746 if (refresh_type == FAST_REFRESH && !display->is_local)
1747 {
1748 y = 0;
1749 height = TermWin.height;
1750 }
1751#endif
1752
1682#ifdef DEBUG_STRICT 1753#ifdef DEBUG_STRICT
1683 x = max (x, (int)TermWin.int_bwidth); 1754 x = max (x, 0);
1684 x = min (x, (int)TermWin.width); 1755 x = min (x, (int)TermWin.width);
1685 y = max (y, (int)TermWin.int_bwidth); 1756 y = max (y, 0);
1686 y = min (y, (int)TermWin.height); 1757 y = min (y, (int)TermWin.height);
1687#endif 1758#endif
1688 1759
1689 /* round down */ 1760 /* round down */
1690 rc[PART_BEG].col = Pixel2Col (x); 1761 rc[PART_BEG].col = Pixel2Col (x);
… …
1701 } 1772 }
1702 1773
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)); 1774 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 1775
1705 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1776 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1706 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, 1777 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 1778
1709 if (refresh) 1779 if (refresh)
1710 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1780 scr_refresh (SLOW_REFRESH);
1711} 1781}
1712 1782
1713/* ------------------------------------------------------------------------- */ 1783/* ------------------------------------------------------------------------- */
1714/* 1784/*
1715 * Refresh the entire screen 1785 * Refresh the entire screen
… …
1750 * direction should be UP or DN 1820 * direction should be UP or DN
1751 */ 1821 */
1752int 1822int
1753rxvt_term::scr_page (enum page_dirn direction, int nlines) 1823rxvt_term::scr_page (enum page_dirn direction, int nlines)
1754{ 1824{
1755 int n; 1825 int n;
1756 uint16_t oldviewstart; 1826 uint16_t oldviewstart;
1757 1827
1758 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); 1828 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1759#ifdef DEBUG_STRICT 1829#ifdef DEBUG_STRICT
1760 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1830 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1761#endif 1831#endif
… …
1779 if (TermWin.view_start != oldviewstart) 1849 if (TermWin.view_start != oldviewstart)
1780 { 1850 {
1781 want_refresh = 1; 1851 want_refresh = 1;
1782 num_scr -= (TermWin.view_start - oldviewstart); 1852 num_scr -= (TermWin.view_start - oldviewstart);
1783 } 1853 }
1854
1784 return (int) (TermWin.view_start - oldviewstart); 1855 return (int) (TermWin.view_start - oldviewstart);
1785} 1856}
1786 1857
1787/* ------------------------------------------------------------------------- */ 1858/* ------------------------------------------------------------------------- */
1788void 1859void
… …
1856 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1927 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1857 1928
1858void 1929void
1859rxvt_term::scr_refresh (unsigned char refresh_type) 1930rxvt_term::scr_refresh (unsigned char refresh_type)
1860{ 1931{
1861 unsigned char clearfirst, /* first character writes before cell */
1862 clearlast, /* last character writes beyond cell */
1863 must_clear, /* use draw_string not draw_image_string */ 1932 unsigned char must_clear, /* use draw_string not draw_image_string */
1864 rvid, /* reverse video this position */ 1933 rvid, /* reverse video this position */
1865 showcursor; /* show the cursor */ 1934 showcursor; /* show the cursor */
1866 int16_t col, row, /* column/row we're processing */ 1935 int16_t col, row, /* column/row we're processing */
1867 ocrow; /* old cursor row */ 1936 ocrow; /* old cursor row */
1868 int i, /* tmp */ 1937 int i, /* tmp */
… …
1877 return; 1946 return;
1878 1947
1879 /* 1948 /*
1880 * A: set up vars 1949 * A: set up vars
1881 */ 1950 */
1882 clearfirst = clearlast = must_clear = 0; 1951 must_clear = 0;
1883 1952
1884 refresh_count = 0; 1953 refresh_count = 0;
1885 1954
1886 row_offset = TermWin.saveLines - TermWin.view_start; 1955 row_offset = TermWin.saveLines - TermWin.view_start;
1887
1888 if ((refresh_type & REFRESH_BOUNDS))
1889 {
1890 clearfirst = clearlast = 1;
1891 refresh_type &= ~REFRESH_BOUNDS;
1892 }
1893 1956
1894#ifdef XPM_BACKGROUND 1957#ifdef XPM_BACKGROUND
1895 must_clear |= (bgPixmap.pixmap != None); 1958 must_clear |= (bgPixmap.pixmap != None);
1896#endif 1959#endif
1897#ifdef TRANSPARENT 1960#ifdef TRANSPARENT
… …
1906 1969
1907 /* 1970 /*
1908 * C: set the cursor character (s) 1971 * C: set the cursor character (s)
1909 */ 1972 */
1910 { 1973 {
1911 unsigned char setoldcursor; 1974 unsigned char setoldcursor;
1912 rend_t ccol1, /* Cursor colour */ 1975 rend_t ccol1, /* Cursor colour */
1913 ccol2; /* Cursor colour2 */ 1976 ccol2; /* Cursor colour2 */
1914 1977
1915 showcursor = (screen.flags & Screen_VisibleCursor); 1978 showcursor = (screen.flags & Screen_VisibleCursor);
1916#ifdef CURSOR_BLINK 1979#ifdef CURSOR_BLINK
1917 if (hidden_cursor) 1980 if (hidden_cursor)
1918 showcursor = 0; 1981 showcursor = 0;
1919#endif 1982#endif
1920 1983
1921 if (showcursor) 1984 if (showcursor)
1922 { 1985 {
1923 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1986 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]);
1924 [screen.cur.col]);
1925 1987
1926 if (showcursor && TermWin.focus) 1988 if (showcursor && TermWin.focus)
1927 { 1989 {
1928 *srp ^= RS_RVid; 1990 *srp ^= RS_RVid;
1929#ifndef NO_CURSORCOLOR 1991#ifndef NO_CURSORCOLOR
… …
1957 if (screen.cur.row + TermWin.view_start != ocrow 2019 if (screen.cur.row + TermWin.view_start != ocrow
1958 || screen.cur.col != oldcursor.col) 2020 || screen.cur.col != oldcursor.col)
1959 { 2021 {
1960 if (ocrow < TermWin.nrow 2022 if (ocrow < TermWin.nrow
1961 && oldcursor.col < TermWin.ncol) 2023 && oldcursor.col < TermWin.ncol)
1962 {
1963 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2024 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
1964 } 2025
1965 if (TermWin.focus || !showcursor) 2026 if (TermWin.focus || !showcursor)
1966 oldcursor.row = -1; 2027 oldcursor.row = -1;
1967 else 2028 else
1968 setoldcursor = 1; 2029 setoldcursor = 1;
1969 } 2030 }
1970 } 2031 }
1971 else if (!TermWin.focus) 2032 else if (!TermWin.focus)
1972 setoldcursor = 1; 2033 setoldcursor = 1;
2034
1973 if (setoldcursor) 2035 if (setoldcursor)
1974 { 2036 {
1975 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2037 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
1976 oldcursor.row = -1; 2038 oldcursor.row = -1;
1977 else 2039 else
… …
1986 /* 2048 /*
1987 * D: CopyArea pass - very useful for slower links 2049 * D: CopyArea pass - very useful for slower links
1988 * This has been deliberately kept simple. 2050 * This has been deliberately kept simple.
1989 */ 2051 */
1990 i = num_scr; 2052 i = num_scr;
2053 if (!display->is_local
1991 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2054 && refresh_type == FAST_REFRESH && num_scr_allow && i
1992 && abs (i) < TermWin.nrow && !must_clear) 2055 && abs (i) < TermWin.nrow && !must_clear)
1993 { 2056 {
1994 int16_t nits; 2057 int16_t nits;
1995 int j; 2058 int j;
1996 rend_t *drp2; 2059 rend_t *drp2;
1997 text_t *dtp2; 2060 text_t *dtp2;
1998 int len, wlen; 2061 int len, wlen;
1999 2062
2000 j = TermWin.nrow; 2063 j = TermWin.nrow;
2001 wlen = len = -1; 2064 wlen = len = -1;
2002 row = i > 0 ? 0 : j - 1; 2065 row = i > 0 ? 0 : j - 1;
2003 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2066 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
… …
2138 rend = GET_ATTR (rend); 2201 rend = GET_ATTR (rend);
2139 2202
2140 rvid = !!(rend & RS_RVid); 2203 rvid = !!(rend & RS_RVid);
2141 2204
2142#ifndef NO_BOLD_UNDERLINE_REVERSE 2205#ifndef NO_BOLD_UNDERLINE_REVERSE
2143 if (rend & RS_Bold && fore == Color_fg) 2206 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold))
2144 { 2207 {
2145 if (ISSET_PIXCOLOR (Color_BD)) 2208 if (ISSET_PIXCOLOR (Color_BD))
2146 fore = Color_BD; 2209 fore = Color_BD;
2147 else 2210 else
2148 rvid = !rvid; 2211 rvid = !rvid;
2149 } 2212 }
2150 2213
2151 if (rend & RS_Uline) 2214 if (rend & RS_Uline)
2152 {
2153 if (ISSET_PIXCOLOR (Color_UL)) 2215 if (ISSET_PIXCOLOR (Color_UL))
2154 fore = Color_UL; 2216 fore = Color_UL;
2155 }
2156#endif 2217#endif
2157 2218
2158 if (rvid) 2219 if (rvid)
2159 { 2220 {
2160 SWAP_IT (fore, back, int); 2221 SWAP_IT (fore, back, int);
… …
2168 back = Color_RV; 2229 back = Color_RV;
2169#endif 2230#endif
2170 } 2231 }
2171 2232
2172#ifdef TEXT_BLINK 2233#ifdef TEXT_BLINK
2173 if (rend & RS_Blink && back == Color_bg) 2234 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2174 { 2235 {
2175 if (!text_blink_ev.active) 2236 if (!text_blink_ev.active)
2176 { 2237 {
2177 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2238 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2178 hidden_text = 0; 2239 hidden_text = 0;
… …
2208 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2269 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2209 } 2270 }
2210 else 2271 else
2211 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2272 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2212 2273
2213 if ((rend & RS_Uline) && (font->descent > 1)) 2274 if (rend & RS_Uline && font->descent > 1 && fore != back)
2214 XDrawLine (display->display, drawBuffer, TermWin.gc, 2275 XDrawLine (display->display, drawBuffer, TermWin.gc,
2215 xpixel, ypixel + font->ascent + 1, 2276 xpixel, ypixel + font->ascent + 1,
2216 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2277 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2217 } /* for (col....) */ 2278 } /* for (col....) */
2218 } /* for (row....) */ 2279 } /* for (row....) */
… …
2253 /* 2314 /*
2254 * H: cleanup selection 2315 * H: cleanup selection
2255 */ 2316 */
2256 scr_reverse_selection (); 2317 scr_reverse_selection ();
2257 2318
2258 /*
2259 * I: other general cleanup
2260 */
2261 if (clearfirst && TermWin.int_bwidth)
2262 /*
2263 * clear the whole screen height, note that width == 0 is treated
2264 * specially by XClearArea
2265 */
2266 XClearArea (display->display, TermWin.vt, 0, 0,
2267 (unsigned int)TermWin.int_bwidth,
2268 (unsigned int)TermWin_TotalHeight (), False);
2269
2270 if (clearlast && TermWin.int_bwidth)
2271 /*
2272 * clear the whole screen height, note that width == 0 is treated
2273 * specially by XClearArea
2274 */
2275 XClearArea (display->display, TermWin.vt,
2276 TermWin.width + TermWin.int_bwidth, 0,
2277 (unsigned int)TermWin.int_bwidth,
2278 (unsigned int)TermWin_TotalHeight (), False);
2279
2280 if (refresh_type & SMOOTH_REFRESH) 2319 if (refresh_type & SMOOTH_REFRESH)
2281 XSync (display->display, False); 2320 XFlush (display->display);
2282 2321
2283 num_scr = 0; 2322 num_scr = 0;
2284 num_scr_allow = 1; 2323 num_scr_allow = 1;
2285 want_refresh = 0; /* screen is current */ 2324 want_refresh = 0; /* screen is current */
2286} 2325}
… …
2457 { 2496 {
2458 n = min (len - i, PROP_SIZE); 2497 n = min (len - i, PROP_SIZE);
2459 MEMCPY (ds, data + i, n); 2498 MEMCPY (ds, data + i, n);
2460 2499
2461 for (j = 0; j < n; j++) 2500 for (j = 0; j < n; j++)
2462 if (ds[j] == '\n') 2501 if (ds[j] == C0_LF)
2463 ds[j] = '\r'; 2502 ds[j] = C0_CR;
2464 2503
2465 tt_write (ds, (int)n); 2504 tt_write (ds, (int)n);
2466 } 2505 }
2467 2506
2468 free (ds); 2507 free (ds);
… …
2529 } 2568 }
2530 2569
2531 if (ct.nitems == 0) 2570 if (ct.nitems == 0)
2532 { 2571 {
2533 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2572 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2573
2534 if (selection_wait == Sel_normal && nread == 0 2574 if (selection_wait == Sel_normal && nread == 0
2535 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2575 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2536 { 2576 {
2537 /* 2577 /*
2538 * pass through again trying CUT_BUFFER0 if we've come from 2578 * pass through again trying CUT_BUFFER0 if we've come from
… …
2548 2588
2549 nread += ct.nitems; 2589 nread += ct.nitems;
2550 2590
2551 char **cl; 2591 char **cl;
2552 int cr; 2592 int cr;
2553 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2593 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2554 &cr) >= 0 && cl)
2555 { 2594 {
2556 for (int i = 0; i < cr; i++) 2595 for (int i = 0; i < cr; i++)
2557 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2596 paste ((unsigned char *)cl[i], STRLEN (cl[i]));
2558 2597
2559 XFreeStringList (cl); 2598 XFreeStringList (cl);
… …
2580void 2619void
2581rxvt_term::incr_cb (time_watcher &w) 2620rxvt_term::incr_cb (time_watcher &w)
2582{ 2621{
2583 selection_wait = Sel_none; 2622 selection_wait = Sel_none;
2584 2623
2585 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2624 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2586} 2625}
2587 2626
2588/* 2627/*
2589 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2628 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2590 */ 2629 */
… …
2593{ 2632{
2594 int reget_time = 0; 2633 int reget_time = 0;
2595 2634
2596 if (prop == None) 2635 if (prop == None)
2597 return; 2636 return;
2637
2598 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); 2638 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2599 if (selection_wait == Sel_normal) 2639 if (selection_wait == Sel_normal)
2600 { 2640 {
2601 int a, afmt; 2641 int a, afmt;
2602 Atom atype; 2642 Atom atype;
2603 unsigned long bytes_after, nitems; 2643 unsigned long bytes_after, nitems;
2604 unsigned char *s = NULL; 2644 unsigned char *s = NULL;
2605 2645
2606 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, 2646 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2607 xa[XA_INCR], &atype, &afmt, &nitems, 2647 xa[XA_INCR], &atype, &afmt, &nitems,
2608 &bytes_after, &s); 2648 &bytes_after, &s);
2609 if (s) 2649 if (s)
2610 XFree (s); 2650 XFree (s);
2611 if (a != Success) 2651 if (a != Success)
2612 return; 2652 return;
2653
2613#ifndef __CYGWIN32__ 2654#ifndef __CYGWIN32__
2614 if (atype == xa[XA_INCR]) 2655 if (atype == xa[XA_INCR])
2615 { /* start an INCR transfer */ 2656 { /* start an INCR transfer */
2616 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); 2657 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2617 XDeleteProperty (display->display, win, prop); 2658 XDeleteProperty (display->display, win, prop);
… …
2623 2664
2624 } 2665 }
2625 else if (selection_wait == Sel_incr) 2666 else if (selection_wait == Sel_incr)
2626 { 2667 {
2627 reget_time = 1; 2668 reget_time = 1;
2669
2628 if (selection_paste (win, prop, True) == -1) 2670 if (selection_paste (win, prop, True) == -1)
2629 { 2671 {
2630 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); 2672 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2631 selection_wait = Sel_none; 2673 selection_wait = Sel_none;
2632 incr_ev.stop (); 2674 incr_ev.stop ();
2633 } 2675 }
2634 } 2676 }
2635 if (reget_time) /* received more data so reget time */ 2677 if (reget_time) /* received more data so reget time */
2636 incr_ev.start (NOW + 10); 2678 incr_ev.start (NOW + 10);
2637} 2679}
2680
2638/* ------------------------------------------------------------------------- */ 2681/* ------------------------------------------------------------------------- */
2639/* 2682/*
2640 * Request the current selection: 2683 * Request the current selection:
2641 * Order: > internal selection if available 2684 * Order: > internal selection if available
2642 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2685 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2647 */ 2690 */
2648void 2691void
2649rxvt_term::selection_request (Time tm, int x, int y) 2692rxvt_term::selection_request (Time tm, int x, int y)
2650{ 2693{
2651 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); 2694 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2695
2652 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2696 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2653 return; /* outside window */ 2697 return; /* outside window */
2654 2698
2655 if (selection.text != NULL) 2699 if (selection.text)
2656 { /* internal selection */ 2700 { /* internal selection */
2657 D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); 2701 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2658 paste (selection.text, selection.len); 2702 char *str = rxvt_wcstombs (selection.text, selection.len);
2703 paste ((unsigned char *)str, strlen (str));
2704 free (str);
2659 return; 2705 return;
2660 } 2706 }
2661 else 2707 else
2662 { 2708 {
2663 int i; 2709 int i;
2664 2710
2665 selection_request_time = tm; 2711 selection_request_time = tm;
2666 selection_wait = Sel_normal; 2712 selection_wait = Sel_normal;
2713
2667 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2714 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2668 { 2715 {
2669#if X_HAVE_UTF8_STRING 2716#if X_HAVE_UTF8_STRING
2670 selection_type = Sel_UTF8String; 2717 selection_type = Sel_UTF8String;
2671 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2718 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2676 return; 2723 return;
2677#endif 2724#endif
2678 2725
2679 } 2726 }
2680 } 2727 }
2728
2681 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2729 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2682 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2730 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2683 selection_paste (display->root, XA_CUT_BUFFER0, False); 2731 selection_paste (display->root, XA_CUT_BUFFER0, False);
2684} 2732}
2685 2733
2686int 2734int
2687rxvt_term::selection_request_other (Atom target, int selnum) 2735rxvt_term::selection_request_other (Atom target, int selnum)
2688{ 2736{
2689 Atom sel; 2737 Atom sel;
2690#ifdef DEBUG_SELECT 2738#ifdef DEBUG_SELECT
2691 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2739 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2692#endif 2740#endif
2693 2741
2694 selection_type |= selnum; 2742 selection_type |= selnum;
2743
2695 if (selnum == Sel_Primary) 2744 if (selnum == Sel_Primary)
2696 sel = XA_PRIMARY; 2745 sel = XA_PRIMARY;
2697 else if (selnum == Sel_Secondary) 2746 else if (selnum == Sel_Secondary)
2698 sel = XA_SECONDARY; 2747 sel = XA_SECONDARY;
2699 else 2748 else
2700 sel = xa[XA_CLIPBOARD]; 2749 sel = xa[XA_CLIPBOARD];
2750
2701 if (XGetSelectionOwner (display->display, sel) != None) 2751 if (XGetSelectionOwner (display->display, sel) != None)
2702 { 2752 {
2703 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2753 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2704 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2754 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2705 TermWin.vt, selection_request_time); 2755 TermWin.vt, selection_request_time);
2706 return 1; 2756 return 1;
2707 } 2757 }
2758
2708 return 0; 2759 return 0;
2709} 2760}
2710 2761
2711/* ------------------------------------------------------------------------- */ 2762/* ------------------------------------------------------------------------- */
2712/* 2763/*
… …
2721 want_refresh = 1; 2772 want_refresh = 1;
2722 free (selection.text); 2773 free (selection.text);
2723 selection.text = NULL; 2774 selection.text = NULL;
2724 selection.len = 0; 2775 selection.len = 0;
2725 CLEAR_SELECTION (); 2776 CLEAR_SELECTION ();
2777
2778 if (display->selection_owner == this)
2779 display->selection_owner = 0;
2726} 2780}
2727 2781
2728/* ------------------------------------------------------------------------- */ 2782/* ------------------------------------------------------------------------- */
2729/* 2783/*
2730 * Copy a selection into the cut buffer 2784 * Copy a selection into the cut buffer
… …
2732 */ 2786 */
2733void 2787void
2734rxvt_term::selection_make (Time tm) 2788rxvt_term::selection_make (Time tm)
2735{ 2789{
2736 int i, col, end_col, row, end_row; 2790 int i, col, end_col, row, end_row;
2737 unsigned char *new_selection_text; 2791 wchar_t *new_selection_text;
2738 char *str;
2739 text_t *t; 2792 text_t *t;
2740 2793
2741 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); 2794 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2742 switch (selection.op) 2795 switch (selection.op)
2743 { 2796 {
… …
2756 selection.op = SELECTION_DONE; 2809 selection.op = SELECTION_DONE;
2757 2810
2758 if (selection.clicks == 4) 2811 if (selection.clicks == 4)
2759 return; /* nothing selected, go away */ 2812 return; /* nothing selected, go away */
2760 2813
2761 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2814 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2762 str = (char *)rxvt_malloc ((i + 2) * MB_CUR_MAX + 1); 2815 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2763
2764 new_selection_text = (unsigned char *)str;
2765 2816
2766 col = selection.beg.col; 2817 col = selection.beg.col;
2767 MAX_IT (col, 0); 2818 MAX_IT (col, 0);
2768 row = selection.beg.row + TermWin.saveLines; 2819 row = selection.beg.row + TermWin.saveLines;
2769 end_row = selection.end.row + TermWin.saveLines; 2820 end_row = selection.end.row + TermWin.saveLines;
2770 struct mbstate mbs; 2821 int ofs = 0;
2822 int extra = 0;
2771 2823
2772 for (; row <= end_row; row++, col = 0) 2824 for (; row <= end_row; row++, col = 0)
2773 { 2825 {
2774 t = & (screen.text[row][col]); 2826 t = &(screen.text[row][col]);
2775 2827
2776 end_col = screen.tlen[row]; 2828 end_col = screen.tlen[row];
2777 2829
2778 if (end_col == -1) 2830 if (end_col == -1)
2779 end_col = TermWin.ncol; 2831 end_col = TermWin.ncol;
2780 2832
2781 if (row == end_row) 2833 if (row == end_row)
2782 MIN_IT (end_col, selection.end.col); 2834 MIN_IT (end_col, selection.end.col);
2783 2835
2784 for (; col < end_col; col++) 2836 for (; col < end_col; col++)
2837 {
2785 if (*t == NOCHAR) 2838 if (*t == NOCHAR)
2786 t++; 2839 t++;
2840#if ENABLE_COMBINING
2841 else if (IS_COMPOSE (*t))
2842 {
2843 int len = rxvt_composite.expand (*t, 0);
2844
2845 extra -= (len - 1);
2846
2847 if (extra < 0)
2848 {
2849 extra += i;
2850 i += i;
2851 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2852 }
2853
2854 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2855 }
2856#endif
2787 else 2857 else
2788 { 2858 new_selection_text[ofs++] = *t++;
2789 int len = wcrtomb (str, *t++, mbs);
2790 if (len > 0)
2791 str += len;
2792 } 2859 }
2793 2860
2794 if (screen.tlen[row] != -1 && row != end_row) 2861 if (screen.tlen[row] != -1 && row != end_row)
2795 *str++ = '\n'; 2862 new_selection_text[ofs++] = C0_LF;
2796 } 2863 }
2797 2864
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) 2865 if (end_col != selection.end.col)
2806 *str++ = '\n'; 2866 new_selection_text[ofs++] = C0_LF;
2807#endif
2808 *str = '\0';
2809 2867
2810 i = str - (char *)new_selection_text; 2868 new_selection_text[ofs] = 0;
2869
2811 if (i == 0) 2870 if (ofs == 0)
2812 { 2871 {
2813 free (new_selection_text); 2872 free (new_selection_text);
2814 return; 2873 return;
2815 } 2874 }
2816 2875
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); 2876 free (selection.text);
2825 2877
2826 selection.text = new_selection_text; 2878 // we usually allocate much more than necessary, so realloc it smaller again
2879 selection.len = ofs;
2880 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2827 2881
2828 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2882 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2829 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2883 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2830 display->set_selection_owner (this); 2884 display->set_selection_owner (this);
2831 else 2885 else
2832 rxvt_print_error ("can't get primary selection"); 2886 rxvt_warn ("can't get primary selection, ignoring.\n");
2833 2887
2834 { 2888#if 0
2835 XTextProperty ct; 2889 XTextProperty ct;
2836 char *cl = (char *)selection.text;
2837 2890
2838 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2891 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2839 { 2892 {
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, 2893 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2846 PropModeReplace, selection.text, (int)selection.len); 2894 PropModeReplace, ct.value, ct.nitems);
2895 XFree (ct.value);
2847 } 2896 }
2897#endif
2848 2898
2849 selection_time = tm; 2899 selection_time = tm;
2850 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); 2900 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2851} 2901}
2852 2902
… …
2881rxvt_term::selection_start_colrow (int col, int row) 2931rxvt_term::selection_start_colrow (int col, int row)
2882{ 2932{
2883 want_refresh = 1; 2933 want_refresh = 1;
2884 selection.mark.col = col; 2934 selection.mark.col = col;
2885 selection.mark.row = row - TermWin.view_start; 2935 selection.mark.row = row - TermWin.view_start;
2936
2886 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2937 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2887 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2938 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2888 MAX_IT (selection.mark.col, 0); 2939 MAX_IT (selection.mark.col, 0);
2889 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2940 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2890 2941
2942 while (selection.mark.col > 0
2943 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2944 --selection.mark.col;
2945
2891 if (selection.op) 2946 if (selection.op)
2892 { /* clear the old selection */ 2947 { /* clear the old selection */
2893 selection.beg.row = selection.end.row = selection.mark.row; 2948 selection.beg.row = selection.end.row = selection.mark.row;
2894 selection.beg.col = selection.end.col = selection.mark.col; 2949 selection.beg.col = selection.end.col = selection.mark.col;
2895 } 2950 }
2951
2896 selection.op = SELECTION_INIT; 2952 selection.op = SELECTION_INIT;
2897 selection.screen = current_screen; 2953 selection.screen = current_screen;
2898} 2954}
2899 2955
2900/* ------------------------------------------------------------------------- */ 2956/* ------------------------------------------------------------------------- */
… …
2902 * Word select: select text for 2 clicks 2958 * Word select: select text for 2 clicks
2903 * We now only find out the boundary in one direction 2959 * We now only find out the boundary in one direction
2904 */ 2960 */
2905 2961
2906/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2962/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2907#define DELIMIT_TEXT(x) \ 2963#define DELIMIT_TEXT(x) \
2908 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 2964 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x)))
2909#define DELIMIT_REND(x) 1 2965#define DELIMIT_REND(x) 1
2910 2966
2911void 2967void
2912rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2968rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2913{ 2969{
2914 int col, row, dirnadd, tcol, trow, w1, w2; 2970 int col, row, dirnadd, tcol, trow, w1, w2;
2915 row_col_t bound; 2971 row_col_t bound;
2916 text_t *stp; 2972 text_t *stp;
2917 rend_t *srp; 2973 rend_t *srp;
2918 2974
2919 if (dirn == UP) 2975 if (dirn == UP)
2920 { 2976 {
2921 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 2977 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2922 bound.col = 0; 2978 bound.col = 0;
… …
2926 { 2982 {
2927 bound.row = TermWin.saveLines + TermWin.nrow; 2983 bound.row = TermWin.saveLines + TermWin.nrow;
2928 bound.col = TermWin.ncol - 1; 2984 bound.col = TermWin.ncol - 1;
2929 dirnadd = 1; 2985 dirnadd = 1;
2930 } 2986 }
2987
2931 row = mark->row + TermWin.saveLines; 2988 row = mark->row + TermWin.saveLines;
2932 col = mark->col; 2989 col = mark->col;
2933 MAX_IT (col, 0); 2990 MAX_IT (col, 0);
2934 /* find the edge of a word */ 2991 /* find the edge of a word */
2935 stp = & (screen.text[row][col]); 2992 stp = & (screen.text[row][col]);
2936 w1 = DELIMIT_TEXT (*stp); 2993 w1 = DELIMIT_TEXT (*stp);
2937 2994
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]); 2995 srp = (&screen.rend[row][col]);
2950 w2 = DELIMIT_REND (*srp); 2996 w2 = DELIMIT_REND (*srp);
2951 2997
2952 for (;;) 2998 for (;;)
2953 { 2999 {
2954 for (; col != bound.col; col += dirnadd) 3000 for (; col != bound.col; col += dirnadd)
2955 { 3001 {
2956 stp += dirnadd; 3002 stp += dirnadd;
3003 srp += dirnadd;
3004
3005 if (*stp == NOCHAR)
3006 continue;
3007
2957 if (DELIMIT_TEXT (*stp) != w1) 3008 if (DELIMIT_TEXT (*stp) != w1)
2958 break; 3009 break;
2959 srp += dirnadd;
2960 if (DELIMIT_REND (*srp) != w2) 3010 if (DELIMIT_REND (*srp) != w2)
2961 break; 3011 break;
2962 } 3012 }
3013
2963 if ((col == bound.col) && (row != bound.row)) 3014 if ((col == bound.col) && (row != bound.row))
2964 { 3015 {
2965 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3016 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2966 { 3017 {
2967 trow = row + dirnadd; 3018 trow = row + dirnadd;
2968 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3019 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3020
2969 if (screen.text[trow] == NULL) 3021 if (screen.text[trow] == NULL)
2970 break; 3022 break;
3023
2971 stp = & (screen.text[trow][tcol]); 3024 stp = & (screen.text[trow][tcol]);
2972 srp = & (screen.rend[trow][tcol]); 3025 srp = & (screen.rend[trow][tcol]);
3026
2973 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3027 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2974 break; 3028 break;
3029
2975 row = trow; 3030 row = trow;
2976 col = tcol; 3031 col = tcol;
2977 continue; 3032 continue;
2978 } 3033 }
2979 } 3034 }
2980 break; 3035 break;
2981 } 3036 }
3037
2982Old_Word_Selection_You_Die: 3038Old_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)); 3039 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 3040
2985 if (dirn == DN) 3041 if (dirn == DN)
2986 col++; /* put us on one past the end */ 3042 col++; /* put us on one past the end */
… …
3008 MAX_IT (row, 0); 3064 MAX_IT (row, 0);
3009 MIN_IT (row, (int)TermWin.nrow - 1); 3065 MIN_IT (row, (int)TermWin.nrow - 1);
3010 MAX_IT (col, 0); 3066 MAX_IT (col, 0);
3011 MIN_IT (col, (int)TermWin.ncol); 3067 MIN_IT (col, (int)TermWin.ncol);
3012 3068
3013#ifndef NO_NEW_SELECTION
3014 /* 3069 /*
3015 * If we're selecting characters (single click) then we must check first 3070 * 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 3071 * 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 3072 * 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. 3073 * be _past_ a character for it to be selected.
3019 */ 3074 */
3020 if (selection_style != OLD_SELECT)
3021 {
3022 if (((selection.clicks % 3) == 1) && !flag 3075 if (((selection.clicks % 3) == 1) && !flag
3023 && (col == selection.mark.col 3076 && (col == selection.mark.col
3024 && (row == selection.mark.row + TermWin.view_start))) 3077 && (row == selection.mark.row + TermWin.view_start)))
3025 { 3078 {
3026 /* select nothing */ 3079 /* select nothing */
3027 selection.beg.row = selection.end.row = 0; 3080 selection.beg.row = selection.end.row = 0;
3028 selection.beg.col = selection.end.col = 0; 3081 selection.beg.col = selection.end.col = 0;
3029 selection.clicks = 4; 3082 selection.clicks = 4;
3030 want_refresh = 1; 3083 want_refresh = 1;
3031 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); 3084 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3032 return; 3085 return;
3033 }
3034 } 3086 }
3035#endif 3087
3036 if (selection.clicks == 4) 3088 if (selection.clicks == 4)
3037 selection.clicks = 1; 3089 selection.clicks = 1;
3038 3090
3039 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3091 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3040 flag == 1 ? 1 : 0, /* ? button press */ 3092 flag == 1 ? 1 : 0, /* ? button press */
… …
3046 * Extend the selection to the specified col/row 3098 * Extend the selection to the specified col/row
3047 */ 3099 */
3048void 3100void
3049rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3101rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3050{ 3102{
3051 int16_t ncol = TermWin.ncol; 3103 int16_t ncol = TermWin.ncol;
3052 int end_col; 3104 int end_col;
3053 row_col_t pos; 3105 row_col_t pos;
3054 enum { 3106 enum {
3055 LEFT, RIGHT 3107 LEFT, RIGHT
3056 } closeto = RIGHT; 3108 } closeto = RIGHT;
3057 3109
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)); 3110 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; 3146 pos.col = col;
3095 pos.row = row; 3147 pos.row = row;
3096 3148
3097 pos.row -= TermWin.view_start; /* adjust for scroll */ 3149 pos.row -= TermWin.view_start; /* adjust for scroll */
3098 3150
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 /* 3151 /*
3161 * This is mainly xterm style selection with a couple of differences, mainly 3152 * This is mainly xterm style selection with a couple of differences, mainly
3162 * in the way button3 drag extension works. 3153 * in the way button3 drag extension works.
3163 * We're either doing: button1 drag; button3 press; or button3 drag 3154 * 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 3155 * 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 3160 * 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 3161 * and it was decided by whichever point/word/line was `fixed' at the
3171 * time of the most recent button3 press 3162 * time of the most recent button3 press
3172 */ 3163 */
3173 if (button3 && buttonpress) 3164 if (button3 && buttonpress)
3174 { /* button3 press */ 3165 { /* button3 press */
3175 /* 3166 /*
3176 * first determine which edge of the selection we are closest to 3167 * first determine which edge of the selection we are closest to
3177 */ 3168 */
3178 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3169 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3179 || (!ROWCOL_IS_AFTER (pos, selection.end) 3170 || (!ROWCOL_IS_AFTER (pos, selection.end)
3180 && (((pos.col - selection.beg.col) 3171 && (((pos.col - selection.beg.col)
3181 + ((pos.row - selection.beg.row) * ncol)) 3172 + ((pos.row - selection.beg.row) * ncol))
3182 < ((selection.end.col - pos.col) 3173 < ((selection.end.col - pos.col)
3183 + ((selection.end.row - pos.row) * ncol))))) 3174 + ((selection.end.row - pos.row) * ncol)))))
3184 closeto = LEFT; 3175 closeto = LEFT;
3176
3185 if (closeto == LEFT) 3177 if (closeto == LEFT)
3186 { 3178 {
3187 selection.beg.row = pos.row; 3179 selection.beg.row = pos.row;
3188 selection.beg.col = pos.col; 3180 selection.beg.col = pos.col;
3189 selection.mark.row = selection.end.row; 3181 selection.mark.row = selection.end.row;
3190 selection.mark.col = selection.end.col 3182 selection.mark.col = selection.end.col - (selection.clicks == 2);
3191 - (selection.clicks == 2);
3192 } 3183 }
3193 else 3184 else
3194 { 3185 {
3195 selection.end.row = pos.row; 3186 selection.end.row = pos.row;
3196 selection.end.col = pos.col; 3187 selection.end.col = pos.col;
3197 selection.mark.row = selection.beg.row; 3188 selection.mark.row = selection.beg.row;
3198 selection.mark.col = selection.beg.col; 3189 selection.mark.col = selection.beg.col;
3199 } 3190 }
3200 } 3191 }
3201 else 3192 else
3202 { /* button1 drag or button3 drag */ 3193 { /* button1 drag or button3 drag */
3203 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3194 if (ROWCOL_IS_AFTER (selection.mark, pos))
3204 { 3195 {
3205 if ((selection.mark.row == selection.end.row) 3196 if ((selection.mark.row == selection.end.row)
3206 && (selection.mark.col == selection.end.col) 3197 && (selection.mark.col == selection.end.col)
3207 && clickchange && selection.clicks == 2) 3198 && clickchange && selection.clicks == 2)
3208 selection.mark.col--; 3199 selection.mark.col--;
3200
3209 selection.beg.row = pos.row; 3201 selection.beg.row = pos.row;
3210 selection.beg.col = pos.col; 3202 selection.beg.col = pos.col;
3211 selection.end.row = selection.mark.row; 3203 selection.end.row = selection.mark.row;
3212 selection.end.col = selection.mark.col 3204 selection.end.col = selection.mark.col + (selection.clicks == 2);
3213 + (selection.clicks == 2);
3214 } 3205 }
3215 else 3206 else
3216 { 3207 {
3217 selection.beg.row = selection.mark.row; 3208 selection.beg.row = selection.mark.row;
3218 selection.beg.col = selection.mark.col; 3209 selection.beg.col = selection.mark.col;
… …
3222 } 3213 }
3223 3214
3224 if (selection.clicks == 1) 3215 if (selection.clicks == 1)
3225 { 3216 {
3226 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3217 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3218
3227 if (end_col != -1 && selection.beg.col > end_col) 3219 if (end_col != -1 && selection.beg.col > end_col)
3228 { 3220 {
3229#if 1 3221#if 1
3230 selection.beg.col = ncol; 3222 selection.beg.col = ncol;
3231#else 3223#else
3232 if (selection.beg.row != selection.end.row) 3224 if (selection.beg.row != selection.end.row)
3233 selection.beg.col = ncol; 3225 selection.beg.col = ncol;
3234 else 3226 else
3235 selection.beg.col = selection.mark.col; 3227 selection.beg.col = selection.mark.col;
3236#endif 3228#endif
3237
3238 } 3229 }
3230
3239 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3231 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3232
3240 if (end_col != -1 && selection.end.col > end_col) 3233 if (end_col != -1 && selection.end.col > end_col)
3241 selection.end.col = ncol; 3234 selection.end.col = ncol;
3242
3243 } 3235 }
3244 else if (selection.clicks == 2) 3236 else if (selection.clicks == 2)
3245 { 3237 {
3246 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3238 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3247 selection.end.col--; 3239 selection.end.col--;
3240
3248 selection_delimit_word (UP, & (selection.beg), 3241 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3249 & (selection.beg));
3250 selection_delimit_word (DN, & (selection.end), 3242 selection_delimit_word (DN, & (selection.end), & (selection.end));
3251 & (selection.end));
3252 } 3243 }
3253 else if (selection.clicks == 3) 3244 else if (selection.clicks == 3)
3254 { 3245 {
3255#ifndef NO_FRILLS 3246#ifndef NO_FRILLS
3256 if ((Options & Opt_tripleclickwords)) 3247 if ((Options & Opt_tripleclickwords))
3257 { 3248 {
3258 int end_row; 3249 int end_row;
3259 3250
3260 selection_delimit_word (UP, & (selection.beg), 3251 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3261 & (selection.beg));
3262 end_row = screen.tlen[selection.mark.row 3252 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3263 + TermWin.saveLines]; 3253
3264 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3254 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3265 end_row++)
3266 { 3255 {
3267 end_col = screen.tlen[end_row + TermWin.saveLines]; 3256 end_col = screen.tlen[end_row + TermWin.saveLines];
3257
3268 if (end_col != -1) 3258 if (end_col != -1)
3269 { 3259 {
3270 selection.end.row = end_row; 3260 selection.end.row = end_row;
3271 selection.end.col = end_col; 3261 selection.end.col = end_col;
3272 selection_remove_trailing_spaces (); 3262 selection_remove_trailing_spaces ();
… …
3274 } 3264 }
3275 } 3265 }
3276 } 3266 }
3277 else 3267 else
3278#endif 3268#endif
3279
3280 { 3269 {
3281 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3270 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3282 selection.mark.col++; 3271 selection.mark.col++;
3283 selection.beg.col = 0; 3272 selection.beg.col = 0;
3284 selection.end.col = ncol; 3273 selection.end.col = ncol;
3285 } 3274 }
3286 } 3275 }
3276
3287 if (button3 && buttonpress) 3277 if (button3 && buttonpress)
3288 { /* mark may need to be changed */ 3278 { /* mark may need to be changed */
3289 if (closeto == LEFT) 3279 if (closeto == LEFT)
3290 { 3280 {
3291 selection.mark.row = selection.end.row; 3281 selection.mark.row = selection.end.row;
3292 selection.mark.col = selection.end.col 3282 selection.mark.col = selection.end.col
3293 - (selection.clicks == 2); 3283 - (selection.clicks == 2);
… …
3297 selection.mark.row = selection.beg.row; 3287 selection.mark.row = selection.beg.row;
3298 selection.mark.col = selection.beg.col; 3288 selection.mark.col = selection.beg.col;
3299 } 3289 }
3300 } 3290 }
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)); 3291 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} 3292}
3304 3293
3305#ifndef NO_FRILLS 3294#ifndef NO_FRILLS
3306void 3295void
3307rxvt_term::selection_remove_trailing_spaces () 3296rxvt_term::selection_remove_trailing_spaces ()
… …
3381 ev.target = rq.target; 3370 ev.target = rq.target;
3382 ev.time = rq.time; 3371 ev.time = rq.time;
3383 3372
3384 if (rq.target == xa[XA_TARGETS]) 3373 if (rq.target == xa[XA_TARGETS])
3385 { 3374 {
3386 Atom32 target_list[5]; 3375 Atom32 target_list[6];
3387 Atom32 *target = target_list; 3376 Atom32 *target = target_list;
3388 3377
3389 *target++ = (Atom32) xa[XA_TARGETS]; 3378 *target++ = (Atom32) xa[XA_TARGETS];
3379 *target++ = (Atom32) xa[XA_TIMESTAMP];
3390 *target++ = (Atom32) XA_STRING; 3380 *target++ = (Atom32) XA_STRING;
3391 *target++ = (Atom32) xa[XA_TEXT]; 3381 *target++ = (Atom32) xa[XA_TEXT];
3392 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3382 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3393#if X_HAVE_UTF8_STRING 3383#if X_HAVE_UTF8_STRING
3394 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3384 *target++ = (Atom32) xa[XA_UTF8_STRING];
3395#endif 3385#endif
3386
3396 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3387 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3397 (8 * sizeof (target_list[0])), PropModeReplace, 3388 (8 * sizeof (target_list[0])), PropModeReplace,
3398 (unsigned char *)target_list, 3389 (unsigned char *)target_list,
3399 target - target_list); 3390 target - target_list);
3400 ev.property = rq.property; 3391 ev.property = rq.property;
3401 } 3392 }
3402 else if (rq.target == xa[XA_MULTIPLE]) 3393 else if (rq.target == xa[XA_MULTIPLE])
3403 { 3394 {
3404 /* TODO: Handle MULTIPLE */ 3395 /* TODO: Handle MULTIPLE */
3405 } 3396 }
3406 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3397 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3407 { 3398 {
3408 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3399 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3409 (8 * sizeof (Time)), PropModeReplace, 3400 (8 * sizeof (Time)), PropModeReplace,
3410 (unsigned char *)&selection_time, 1); 3401 (unsigned char *)&selection_time, 1);
3411 ev.property = rq.property; 3402 ev.property = rq.property;
3412 } 3403 }
3413 else if (rq.target == XA_STRING 3404 else if (rq.target == XA_STRING
3414 || rq.target == xa[XA_TEXT] 3405 || rq.target == xa[XA_TEXT]
3415 || rq.target == xa[XA_COMPOUND_TEXT] 3406 || rq.target == xa[XA_COMPOUND_TEXT]
3416 || rq.target == xa[XA_UTF8_STRING] 3407 || rq.target == xa[XA_UTF8_STRING]
3417 ) 3408 )
3418 { 3409 {
3419 short freect = 0; 3410 short freect = 0;
3420 int selectlen; 3411 int selectlen;
3421 char *cl; 3412 wchar_t *cl;
3422 3413
3423 target = rq.target; 3414 target = rq.target;
3424 3415
3425 if (target == XA_STRING) 3416 if (target == XA_STRING)
3426 // we actually don't do XA_STRING, but who cares, as i18n clients 3417 // we actually don't do XA_STRING, but who cares, as i18n clients
3427 // will ask for another format anyways. 3418 // will ask for another format anyways.
3428 style = XStringStyle; 3419 style = XStringStyle;
3429 else if (target == xa[XA_TEXT]) 3420 else if (target == xa[XA_TEXT])
3430 style = XTextStyle; 3421 style = XStdICCTextStyle;
3431 else if (target == xa[XA_COMPOUND_TEXT]) 3422 else if (target == xa[XA_COMPOUND_TEXT])
3432 style = XCompoundTextStyle; 3423 style = XCompoundTextStyle;
3433#if X_HAVE_UTF8_STRING 3424#if X_HAVE_UTF8_STRING
3434 else if (target == xa[XA_UTF8_STRING]) 3425 else if (target == xa[XA_UTF8_STRING])
3435 style = XUTF8StringStyle; 3426 style = XUTF8StringStyle;
… …
3440 style = XCompoundTextStyle; 3431 style = XCompoundTextStyle;
3441 } 3432 }
3442 3433
3443 if (selection.text) 3434 if (selection.text)
3444 { 3435 {
3445 cl = (char *)selection.text; 3436 cl = selection.text;
3446 selectlen = selection.len; 3437 selectlen = selection.len;
3447 } 3438 }
3448 else 3439 else
3449 { 3440 {
3450 cl = ""; 3441 cl = L"";
3451 selectlen = 0; 3442 selectlen = 0;
3452 } 3443 }
3453 3444
3445 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3446 // manually for XUTF8StringStyle.
3454 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3447 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3455 freect = 1; 3448 freect = 1;
3456 else 3449 else
3457 { 3450 {
3458 /* if we failed to convert then send it raw */ 3451 /* if we failed to convert then send it raw */
3459 ct.value = (unsigned char *)cl; 3452 ct.value = (unsigned char *)cl;
… …
3466 ev.property = rq.property; 3459 ev.property = rq.property;
3467 3460
3468 if (freect) 3461 if (freect)
3469 XFree (ct.value); 3462 XFree (ct.value);
3470 } 3463 }
3464
3471 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3465 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3472} 3466}
3473 3467
3474/* ------------------------------------------------------------------------- * 3468/* ------------------------------------------------------------------------- *
3475 * MOUSE ROUTINES * 3469 * MOUSE ROUTINES *
… …
3499 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3493 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace;
3500} 3494}
3501 3495
3502#endif 3496#endif
3503/* ------------------------------------------------------------------------- */ 3497/* ------------------------------------------------------------------------- */
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