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.34 by pcg, Tue Feb 24 00:44:23 2004 UTC vs.
Revision 1.82 by root, Wed Aug 4 03:33:53 2004 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.c 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
6 * 7 *
7 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 * (at your option) any later version. 11 * (at your option) any later version.
… …
16 * 17 *
17 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 *--------------------------------------------------------------------------*/ 21 *--------------------------------------------------------------------------*/
22
21/* 23/*
22 * We handle _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
23 */ 25 */
24 26
25#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
26#define INTERN_SCREEN 28#define INTERN_SCREEN
27#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
28#include "screen.intpro" /* PROTOS for internal routines */ 30#include "screen.intpro" /* PROTOS for internal routines */
29 31
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 32#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 33
32#include <stdint.h> 34#include <inttypes.h>
33#include <wchar.h> 35#include <wchar.h>
34 36
35#include "salloc.C" // HACK!! 37#include "salloc.C" // HACK, should be a seperate compile!
36 38
37inline void fill_text (text_t *start, text_t value, int len) 39inline void fill_text (text_t *start, text_t value, int len)
38{ 40{
39 while (len--) 41 while (len--)
40 *start++ = value; 42 *start++ = value;
… …
46 48
47/* ------------------------------------------------------------------------- * 49/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 50 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 51 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 52#define ZERO_SCROLLBACK() \
51 if ((Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ 53 if (Options & Opt_scrollTtyOutput) \
52 TermWin.view_start = 0 54 TermWin.view_start = 0
53#define CLEAR_SELECTION() \ 55#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 56 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 57 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 58#define CLEAR_ALL_SELECTION() \
57 selection.beg.row = selection.beg.col \ 59 selection.beg.row = selection.beg.col \
58 = selection.mark.row = selection.mark.col \ 60 = selection.mark.row = selection.mark.col \
59 = selection.end.row = selection.end.col = 0 61 = selection.end.row = selection.end.col = 0
60 62
61#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 63#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
62 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 64 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
63#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 65#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
64 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 66 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
65#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ 67#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \
66 (((A) == (C)) && ((B) > (D))) 68 (((A) == (C)) && ((B) > (D)))
67#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) \
68 (((A) == (C)) && ((B) >= (D))) 70 (((A) == (C)) && ((B) >= (D)))
69#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ 71#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \
70 (((A) == (C)) && ((B) < (D))) 72 (((A) == (C)) && ((B) < (D)))
71#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) \
72 (((A) == (C)) && ((B) <= (D))) 74 (((A) == (C)) && ((B) <= (D)))
73 75
74/* these must be row_col_t */ 76/* these must be row_col_t */
75#define ROWCOL_IS_AFTER(X, Y) \ 77#define ROWCOL_IS_AFTER(X, Y) \
76 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)
77#define ROWCOL_IS_BEFORE(X, Y) \ 79#define ROWCOL_IS_BEFORE(X, Y) \
78 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)
79#define ROWCOL_IN_ROW_AFTER(X, Y) \ 81#define ROWCOL_IN_ROW_AFTER(X, Y) \
80 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)
81#define ROWCOL_IN_ROW_BEFORE(X, Y) \ 83#define ROWCOL_IN_ROW_BEFORE(X, Y) \
82 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)
83#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 85#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
84 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)
85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 87#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
86 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)
87 89
88/* 90/*
89 * CLEAR_ROWS : clear <num> rows starting from row <row> 91 * CLEAR_ROWS : clear <num> rows starting from row <row>
90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 92 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
91 * 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
92 */ 94 */
93#define drawBuffer TermWin.vt 95#define drawBuffer TermWin.vt
94 96
95#define CLEAR_ROWS(row, num) \ 97#define CLEAR_ROWS(row, num) \
96 if (TermWin.mapped) \ 98 if (TermWin.mapped) \
97 XClearArea (display->display, drawBuffer, TermWin.int_bwidth, \ 99 XClearArea (display->display, drawBuffer, 0, \
98 Row2Pixel (row), (unsigned int)TermWin.width, \ 100 Row2Pixel (row), (unsigned int)TermWin.width, \
99 (unsigned int)Height2Pixel (num), False) 101 (unsigned int)Height2Pixel (num), False)
100 102
101#define CLEAR_CHARS(x, y, num) \ 103#define CLEAR_CHARS(x, y, num) \
102 if (TermWin.mapped) \ 104 if (TermWin.mapped) \
103 XClearArea (display->display, drawBuffer, x, y, \ 105 XClearArea (display->display, drawBuffer, x, y, \
104 (unsigned int)Width2Pixel (num), \ 106 (unsigned int)Width2Pixel (num), \
105 (unsigned int)Height2Pixel (1), False) 107 (unsigned int)Height2Pixel (1), False)
106 108
107#define ERASE_ROWS(row, num) \ 109#define ERASE_ROWS(row, num) \
108 XFillRectangle (display->display, drawBuffer, TermWin.gc, \ 110 XFillRectangle (display->display, drawBuffer, TermWin.gc, \
109 TermWin.int_bwidth, Row2Pixel (row), \ 111 0, Row2Pixel (row), \
110 (unsigned int)TermWin.width, \ 112 (unsigned int)TermWin.width, \
111 (unsigned int)Height2Pixel (num)) 113 (unsigned int)Height2Pixel (num))
112 114
113/* ------------------------------------------------------------------------- * 115/* ------------------------------------------------------------------------- *
114 * SCREEN `COMMON' ROUTINES * 116 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 117 * ------------------------------------------------------------------------- */
116/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
117void 119void
118rxvt_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)
119{ 121{
120 efs &= ~RS_baseattrMask; 122 efs &= ~RS_baseattrMask;
121 efs = SET_FONT (efs, TermWin.fontset->find_font (' ')); 123 efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]);
122 124
123 while (width--) 125 while (width--)
124 { 126 {
125 *et++ = ' '; 127 *et++ = ' ';
126 *er++ = efs; 128 *er++ = efs;
… …
187 } 189 }
188 190
189 if (prev_nrow == 0) 191 if (prev_nrow == 0)
190 { 192 {
191 /* 193 /*
192 * first time called so just malloc everything : don't rely on realloc 194 * first time called so just malloc everything: don't rely on realloc
193 * Note: this is still needed so that all the scrollback lines are NULL 195 * Note: this is still needed so that all the scrollback lines are NULL
194 */ 196 */
195 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 197 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
196 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 198 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
197 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 199 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
… …
254 scr_scroll_text (0, (int)prev_nrow - 1, k, 1); 256 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
255 257
256 for (p = nrow; p < prev_nrow; p++) 258 for (p = nrow; p < prev_nrow; p++)
257 { 259 {
258 q = p + TermWin.saveLines; 260 q = p + TermWin.saveLines;
261
259 if (screen.text[q]) 262 if (screen.text[q])
260 { 263 {
261#ifdef DEBUG_STRICT 264#ifdef DEBUG_STRICT
262 assert (screen.rend[q]); 265 assert (screen.rend[q]);
263#endif 266#endif
264 talloc->free (screen.text[q]); 267 talloc->free (screen.text[q]);
265 ralloc->free (screen.rend[q]); 268 ralloc->free (screen.rend[q]);
266 } 269 }
270
267 if (swap.text[p]) 271 if (swap.text[p])
268 { 272 {
269#ifdef DEBUG_STRICT 273#ifdef DEBUG_STRICT
270 assert (swap.rend[p]); 274 assert (swap.rend[p]);
271#endif 275#endif
272 talloc->free (swap.text[p]); 276 talloc->free (swap.text[p]);
273 ralloc->free (swap.rend[p]); 277 ralloc->free (swap.rend[p]);
274 } 278 }
279
275#ifdef DEBUG_STRICT 280#ifdef DEBUG_STRICT
276 assert (drawn_text[p] && drawn_rend[p]); 281 assert (drawn_text[p] && drawn_rend[p]);
277#endif 282#endif
278 talloc->free (drawn_text[p]); 283 talloc->free (drawn_text[p]);
279 ralloc->free (drawn_rend[p]); 284 ralloc->free (drawn_rend[p]);
… …
309 swap.tlen[p] = 0; 314 swap.tlen[p] = 0;
310 swap.text[p] = NULL; 315 swap.text[p] = NULL;
311 swap.rend[p] = NULL; 316 swap.rend[p] = NULL;
312 drawn_text[p] = NULL; 317 drawn_text[p] = NULL;
313 drawn_rend[p] = NULL; 318 drawn_rend[p] = NULL;
314 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); 319 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
315 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); 320 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
316 } 321 }
317 322
318 if (k > 0) 323 if (k > 0)
319 { 324 {
… …
334 } 339 }
335 340
336 /* resize columns */ 341 /* resize columns */
337 if (ncol != prev_ncol) 342 if (ncol != prev_ncol)
338 { 343 {
339 int common = min (prev_ncol, ncol);
340 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); 344 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
341 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); 345 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
342 346
343 for (p = 0; p < total_rows; p++) 347 for (p = 0; p < total_rows; p++)
344 { 348 {
345 if (screen.text[p]) 349 if (screen.text[p])
346 { 350 {
347 text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t; 351 screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t));
348 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, screen.rend[p], common * sizeof (rend_t)); screen.rend[p] = r; 352 screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
349 353
350 MIN_IT (screen.tlen[p], (int16_t)ncol); 354 MIN_IT (screen.tlen[p], (int16_t)ncol);
351 355
352 if (ncol > prev_ncol) 356 if (ncol > prev_ncol)
353 scr_blank_line (& (screen.text[p][prev_ncol]), 357 scr_blank_line (&screen.text[p][prev_ncol],
354 & (screen.rend[p][prev_ncol]), 358 &screen.rend[p][prev_ncol],
355 ncol - prev_ncol, 359 ncol - prev_ncol, setrstyle);
356 setrstyle);
357 } 360 }
358 } 361 }
359 362
360 for (p = 0; p < nrow; p++) 363 for (p = 0; p < nrow; p++)
361 { 364 {
362 text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t; 365 drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t));
363 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, drawn_rend[p], common * sizeof (rend_t)); drawn_rend[p] = r; 366 drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
364 367
365 if (ncol > prev_ncol) 368 if (ncol > prev_ncol)
366 scr_blank_line (& (drawn_text[p][prev_ncol]), 369 scr_blank_line (&drawn_text[p][prev_ncol],
367 & (drawn_rend[p][prev_ncol]), 370 &drawn_rend[p][prev_ncol],
368 ncol - prev_ncol, setrstyle); 371 ncol - prev_ncol, setrstyle);
369 372
370 if (swap.text[p]) 373 if (swap.text[p])
371 { 374 {
372 text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t; 375 swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t));
373 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, swap.rend[p], common * sizeof (rend_t)); swap.rend[p] = r; 376 swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
374 377
375 MIN_IT (swap.tlen[p], (int16_t)ncol); 378 MIN_IT (swap.tlen[p], (int16_t)ncol);
376 379
377 if (ncol > prev_ncol) 380 if (ncol > prev_ncol)
378 scr_blank_line (& (swap.text[p][prev_ncol]), 381 scr_blank_line (&swap.text[p][prev_ncol],
379 & (swap.rend[p][prev_ncol]), 382 &swap.rend[p][prev_ncol],
380 ncol - prev_ncol, setrstyle); 383 ncol - prev_ncol, setrstyle);
381 } 384 }
382 385
383 } 386 }
384 387
… …
436{ 439{
437 uint16_t total_rows; 440 uint16_t total_rows;
438 int i; 441 int i;
439 442
440 total_rows = TermWin.nrow + TermWin.saveLines; 443 total_rows = TermWin.nrow + TermWin.saveLines;
441
442#ifdef DEBUG_STRICT
443 for (i = 0; i < total_rows; i++)
444 {
445 if (screen.text[i])
446 /* then so is screen.rend[i] */
447 assert (screen.rend[i]);
448 }
449#endif
450 444
451 delete talloc; talloc = 0; 445 delete talloc; talloc = 0;
452 delete ralloc; ralloc = 0; 446 delete ralloc; ralloc = 0;
453 447
454 free (screen.text); 448 free (screen.text);
… …
483 477
484 scr_release (); 478 scr_release ();
485 prev_nrow = prev_ncol = 0; 479 prev_nrow = prev_ncol = 0;
486 scr_reset (); 480 scr_reset ();
487 481
488 scr_clear (); 482 scr_clear (true);
489 scr_refresh (SLOW_REFRESH); 483 scr_refresh (SLOW_REFRESH);
490} 484}
491 485
492/* ------------------------------------------------------------------------- * 486/* ------------------------------------------------------------------------- *
493 * PROCESS SCREEN COMMANDS * 487 * PROCESS SCREEN COMMANDS *
… …
498 * XTERM_SEQ: Restore cursor: ESC 8 492 * XTERM_SEQ: Restore cursor: ESC 8
499 */ 493 */
500void 494void
501rxvt_term::scr_cursor (int mode) 495rxvt_term::scr_cursor (int mode)
502{ 496{
503 screen_t *s; 497 screen_t *s;
504 498
505 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); 499 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
506 500
507#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 501#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
508 if (current_screen == SECONDARY) 502 if (current_screen == SECONDARY)
509 s = & (swap); 503 s = &swap;
510 else 504 else
511#endif 505#endif
512 s = & (screen); 506 s = &screen;
507
513 switch (mode) 508 switch (mode)
514 { 509 {
515 case SAVE: 510 case SAVE:
516 s->s_cur.row = s->cur.row; 511 s->s_cur.row = s->cur.row;
517 s->s_cur.col = s->cur.col; 512 s->s_cur.col = s->cur.col;
518 s->s_rstyle = rstyle; 513 s->s_rstyle = rstyle;
519 s->s_charset = s->charset; 514 s->s_charset = s->charset;
520 s->s_charset_char = charsets[s->charset]; 515 s->s_charset_char = charsets[s->charset];
521 break; 516 break;
517
522 case RESTORE: 518 case RESTORE:
523 want_refresh = 1; 519 want_refresh = 1;
524 s->cur.row = s->s_cur.row; 520 s->cur.row = s->s_cur.row;
525 s->cur.col = s->s_cur.col; 521 s->cur.col = s->s_cur.col;
526 s->flags &= ~Screen_WrapNext; 522 s->flags &= ~Screen_WrapNext;
… …
528 s->charset = s->s_charset; 524 s->charset = s->s_charset;
529 charsets[s->charset] = s->s_charset_char; 525 charsets[s->charset] = s->s_charset_char;
530 set_font_style (); 526 set_font_style ();
531 break; 527 break;
532 } 528 }
529
533 /* boundary check in case screen size changed between SAVE and RESTORE */ 530 /* boundary check in case screen size changed between SAVE and RESTORE */
534 MIN_IT (s->cur.row, TermWin.nrow - 1); 531 MIN_IT (s->cur.row, TermWin.nrow - 1);
535 MIN_IT (s->cur.col, TermWin.ncol - 1); 532 MIN_IT (s->cur.col, TermWin.ncol - 1);
536#ifdef DEBUG_STRICT 533#ifdef DEBUG_STRICT
537 assert (s->cur.row >= 0); 534 assert (s->cur.row >= 0);
… …
549 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 546 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
550 */ 547 */
551int 548int
552rxvt_term::scr_change_screen (int scrn) 549rxvt_term::scr_change_screen (int scrn)
553{ 550{
554 int i; 551 int i;
555#if NSCREENS 552#if NSCREENS
556 int offset; 553 int offset;
557#endif 554#endif
558 555
559 want_refresh = 1; 556 want_refresh = 1;
560 557
561 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); 558 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
562 559
563 TermWin.view_start = 0; 560 TermWin.view_start = 0;
564 561
565 if (current_screen == scrn) 562 if (current_screen == scrn)
566 return current_screen; 563 return scrn;
567 564
568 selection_check (2); /* check for boundary cross */ 565 selection_check (2); /* check for boundary cross */
569 566
570 SWAP_IT (current_screen, scrn, int); 567 SWAP_IT (current_screen, scrn, int);
571#if NSCREENS 568#if NSCREENS
569 if (Options & Opt_secondaryScreen)
570 {
572 num_scr = 0; 571 num_scr = 0;
573 offset = TermWin.saveLines; 572 offset = TermWin.saveLines;
574 for (i = prev_nrow; i--;) 573 for (i = prev_nrow; i--;)
575 { 574 {
576 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 575 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
577 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 576 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
578 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 577 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
579 } 578 }
580 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 579 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
581 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 580 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
582# ifdef DEBUG_STRICT 581# ifdef DEBUG_STRICT
583 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); 582 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
584 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); 583 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
585# else /* drive with your eyes closed */ 584# else /* drive with your eyes closed */
586 MAX_IT (screen.cur.row, 0); 585 MAX_IT (screen.cur.row, 0);
587 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 586 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
588 MAX_IT (screen.cur.col, 0); 587 MAX_IT (screen.cur.col, 0);
589 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); 588 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
590# endif 589# endif
591 SWAP_IT (screen.charset, swap.charset, int16_t); 590 SWAP_IT (screen.charset, swap.charset, int16_t);
592 SWAP_IT (screen.flags, swap.flags, int); 591 SWAP_IT (screen.flags, swap.flags, int);
593 screen.flags |= Screen_VisibleCursor; 592 screen.flags |= Screen_VisibleCursor;
594 swap.flags |= Screen_VisibleCursor; 593 swap.flags |= Screen_VisibleCursor;
595#else 594 }
596# ifdef SCROLL_ON_NO_SECONDARY 595 else
596#endif
597 if (Options & Opt_secondaryScroll)
597 if (current_screen == PRIMARY) 598 //if (current_screen == PRIMARY)
598 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 599 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
599# endif
600#endif
601 return scrn; 600 return scrn;
602} 601}
603 602
604/* ------------------------------------------------------------------------- */ 603/* ------------------------------------------------------------------------- */
605/* 604/*
… …
647 return 0; 646 return 0;
648 647
649 want_refresh = 1; 648 want_refresh = 1;
650 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"));
651 650
652 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) 651 if (row1 == 0 && count > 0
652 && (current_screen == PRIMARY || Options & Opt_secondaryScroll))
653 { 653 {
654 nscrolled = (long)TermWin.nscrolled + (long)count; 654 nscrolled = (long)TermWin.nscrolled + (long)count;
655 655
656 if (nscrolled > (long)TermWin.saveLines) 656 if (nscrolled > (long)TermWin.saveLines)
657 TermWin.nscrolled = TermWin.saveLines; 657 TermWin.nscrolled = TermWin.saveLines;
… …
710 for (i = 0, j = row1; i < count; i++, j++) 710 for (i = 0, j = row1; i < count; i++, j++)
711 { 711 {
712 buf_text[i] = screen.text[j]; 712 buf_text[i] = screen.text[j];
713 buf_rend[i] = screen.rend[j]; 713 buf_rend[i] = screen.rend[j];
714 } 714 }
715
715 /* A2: Rotate lines */ 716 /* A2: Rotate lines */
716 for (j = row1, i = j + count; i <= row2; i++, j++) 717 for (j = row1, i = j + count; i <= row2; i++, j++)
717 { 718 {
718 screen.tlen[j] = screen.tlen[i]; 719 screen.tlen[j] = screen.tlen[i];
719 screen.text[j] = screen.text[i]; 720 screen.text[j] = screen.text[i];
720 screen.rend[j] = screen.rend[i]; 721 screen.rend[j] = screen.rend[i];
721 } 722 }
723
722 j = row2 - count + 1, i = count; 724 j = row2 - count + 1, i = count;
723 } 725 }
724 else /* if (j < 0) */ 726 else /* if (j < 0) */
725 { 727 {
726 /* B: scroll down */ 728 /* B: scroll down */
… …
729 for (i = 0, j = row2; i < count; i++, j--) 731 for (i = 0, j = row2; i < count; i++, j--)
730 { 732 {
731 buf_text[i] = screen.text[j]; 733 buf_text[i] = screen.text[j];
732 buf_rend[i] = screen.rend[j]; 734 buf_rend[i] = screen.rend[j];
733 } 735 }
736
734 /* B2: Rotate lines */ 737 /* B2: Rotate lines */
735 for (j = row2, i = j - count; i >= row1; i--, j--) 738 for (j = row2, i = j - count; i >= row1; i--, j--)
736 { 739 {
737 screen.tlen[j] = screen.tlen[i]; 740 screen.tlen[j] = screen.tlen[i];
738 screen.text[j] = screen.text[i]; 741 screen.text[j] = screen.text[i];
739 screen.rend[j] = screen.rend[i]; 742 screen.rend[j] = screen.rend[i];
740 } 743 }
744
741 j = row1, i = count; 745 j = row1, i = count;
742 count = -count; 746 count = -count;
743 } 747 }
744 748
745 /* C: Resurrect lines */ 749 /* C: Resurrect lines */
… …
748 screen.tlen[j] = 0; 752 screen.tlen[j] = 0;
749 screen.text[j] = buf_text[i]; 753 screen.text[j] = buf_text[i];
750 screen.rend[j] = buf_rend[i]; 754 screen.rend[j] = buf_rend[i];
751 755
752 if (!spec) /* line length may not equal TermWin.ncol */ 756 if (!spec) /* line length may not equal TermWin.ncol */
753 scr_blank_screen_mem (screen.text, screen.rend, 757 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
754 (unsigned int)j, rstyle);
755 } 758 }
756 759
757 return count; 760 return count;
758} 761}
759 762
760/* ------------------------------------------------------------------------- */ 763/* ------------------------------------------------------------------------- */
761/* 764/*
762 * Add text given in <str> of length <len> to screen struct 765 * Add text given in <str> of length <len> to screen struct
763 */ 766 */
764void 767void
765rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) 768rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
766{ 769{
767 unsigned char checksel, clearsel; 770 unsigned char checksel, clearsel;
768 uint32_t c; 771 unicode_t c;
769 int i, row, last_col; 772 int i, row, last_col;
770 text_t *stp; 773 text_t *stp;
771 rend_t *srp; 774 rend_t *srp;
772 775
773 if (len <= 0) /* sanity */ 776 if (len <= 0) /* sanity */
774 return; 777 return;
775 778
776 want_refresh = 1; 779 want_refresh = 1;
… …
791 } 794 }
792 } 795 }
793#ifdef DEBUG_STRICT 796#ifdef DEBUG_STRICT
794 assert (screen.cur.col < last_col); 797 assert (screen.cur.col < last_col);
795 assert ((screen.cur.row < TermWin.nrow) 798 assert ((screen.cur.row < TermWin.nrow)
796 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 799 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
797#else /* drive with your eyes closed */ 800#else /* drive with your eyes closed */
798 MIN_IT (screen.cur.col, last_col - 1); 801 MIN_IT (screen.cur.col, last_col - 1);
799 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 802 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
800 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 803 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
801#endif 804#endif
802 row = screen.cur.row + TermWin.saveLines; 805 row = screen.cur.row + TermWin.saveLines;
803 806
804 checksel = (selection.op 807 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
805 && current_screen == selection.screen) ? 1 : 0;
806 clearsel = 0; 808 clearsel = 0;
807 809
808 stp = screen.text[row]; 810 stp = screen.text[row];
809 srp = screen.rend[row]; 811 srp = screen.rend[row];
810 812
811 for (i = 0; i < len;) 813 while (len--)
812 { 814 {
813 c = str[i++]; 815 c = *str++;
816
817 if (c < 0x20)
814 switch (c) 818 switch (c)
815 { 819 {
816 case '\t': 820 case C0_HT:
817 scr_tab (1); 821 scr_tab (1);
818 continue; 822 continue;
819 case '\n': 823
824 case C0_LF:
820 if (screen.tlen[row] != -1) /* XXX: think about this */ 825 if (screen.tlen[row] != -1) /* XXX: think about this */
821 MAX_IT (screen.tlen[row], screen.cur.col); 826 MAX_IT (screen.tlen[row], screen.cur.col);
827
822 screen.flags &= ~Screen_WrapNext; 828 screen.flags &= ~Screen_WrapNext;
829
823 if (screen.cur.row == screen.bscroll) 830 if (screen.cur.row == screen.bscroll)
824 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 831 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
825 else if (screen.cur.row < (TermWin.nrow - 1)) 832 else if (screen.cur.row < (TermWin.nrow - 1))
826 row = (++screen.cur.row) + TermWin.saveLines; 833 row = (++screen.cur.row) + TermWin.saveLines;
834
827 stp = screen.text[row]; /* _must_ refresh */ 835 stp = screen.text[row]; /* _must_ refresh */
828 srp = screen.rend[row]; /* _must_ refresh */ 836 srp = screen.rend[row]; /* _must_ refresh */
829 continue; 837 continue;
830 case '\r': 838
839 case C0_CR:
831 if (screen.tlen[row] != -1) /* XXX: think about this */ 840 if (screen.tlen[row] != -1) /* XXX: think about this */
832 MAX_IT (screen.tlen[row], screen.cur.col); 841 MAX_IT (screen.tlen[row], screen.cur.col);
842
833 screen.flags &= ~Screen_WrapNext; 843 screen.flags &= ~Screen_WrapNext;
834 screen.cur.col = 0; 844 screen.cur.col = 0;
835 continue; 845 continue;
836 default:
837 if (c == 127)
838 continue; /* yummmm..... */
839 break;
840 } 846 }
841 847
842 if (checksel /* see if we're writing within selection */ 848 if (checksel /* see if we're writing within selection */
843 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 849 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
844 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 850 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
845 { 851 {
846 checksel = 0; 852 checksel = 0;
847 clearsel = 1; 853 clearsel = 1;
848 } 854 }
855
849 if (screen.flags & Screen_WrapNext) 856 if (screen.flags & Screen_WrapNext)
850 { 857 {
851 screen.tlen[row] = -1; 858 screen.tlen[row] = -1;
852 if (screen.cur.row == screen.bscroll) 859 if (screen.cur.row == screen.bscroll)
853 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 860 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
854 else if (screen.cur.row < (TermWin.nrow - 1)) 861 else if (screen.cur.row < (TermWin.nrow - 1))
855 row = (++screen.cur.row) + TermWin.saveLines; 862 row = (++screen.cur.row) + TermWin.saveLines;
863
856 stp = screen.text[row]; /* _must_ refresh */ 864 stp = screen.text[row]; /* _must_ refresh */
857 srp = screen.rend[row]; /* _must_ refresh */ 865 srp = screen.rend[row]; /* _must_ refresh */
858 screen.cur.col = 0; 866 screen.cur.col = 0;
859 screen.flags &= ~Screen_WrapNext; 867 screen.flags &= ~Screen_WrapNext;
860 } 868 }
869
861 if (screen.flags & Screen_Insert) 870 if (screen.flags & Screen_Insert)
862 scr_insdel_chars (1, INSERT); 871 scr_insdel_chars (1, INSERT);
863 872
873 // rely on wcwidth to tell us the character width, at least for non-latin1
874 // do wcwidth before further replacements, as wcwidth says that line-drawing
875 // characters have width -1 (DOH!) on GNU/Linux sometimes.
876 int width = c < 256 ? 1 : wcwidth (c);
877
864 if (charsets[screen.charset] == '0') // DEC SPECIAL 878 if (charsets[screen.charset] == '0') // DEC SPECIAL
865 switch (c)
866 { 879 {
867 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; 880 // vt100 special graphics and line drawing
868 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break; 881 static uint16_t vt100_0[32] = { // 5f .. 7e
869 case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break; 882 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
870 case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break; 883 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
871 case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break; 884 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
872 case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break; 885 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
873 case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break;
874 case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break;
875 case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break;
876 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break;
877 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
878 } 886 };
879 887
880 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 888 if (c >= 0x5f && c <= 0x7e)
881 // rely on wcwidth to tell us the character width, at least for non-ascii 889 {
882 int width = c <= 128 ? 1 : wcwidth (c); 890 c = vt100_0[c - 0x5f];
891 width = 1;
892 }
893 }
883 894
884 // width -1 characters (e.g. combining chars) are ignored currently.
885 if (width > 0) 895 if (width != 0)
896 {
897#if !UNICODE_3 && ENABLE_COMBINING
898 // trim characters we can't store directly :(
899 if (c >= 0x10000)
900 c = rxvt_composite.compose (c); // map to lower 16 bits
901#endif
902 bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0);
903 rend_t rend = SET_FONT (rstyle,
904 c > 0x7f || bold || c < 0x20
905 ? TermWin.fontset->find_font (c, bold)
906 : TermWin.ascii_map [c - 0x20]);
907
886 do 908 do
887 { 909 {
888 stp[screen.cur.col] = c; 910 stp[screen.cur.col] = c;
889 srp[screen.cur.col] = rend; 911 srp[screen.cur.col] = rend;
890 912
891 if (screen.cur.col < last_col - 1) 913 if (screen.cur.col < last_col - 1)
892 screen.cur.col++; 914 screen.cur.col++;
893 else 915 else
894 { 916 {
895 screen.tlen[row] = last_col; 917 screen.tlen[row] = last_col;
896 if (screen.flags & Screen_Autowrap) 918 if (screen.flags & Screen_Autowrap)
897 screen.flags |= Screen_WrapNext; 919 screen.flags |= Screen_WrapNext;
898 break; 920 break;
899 } 921 }
900 922
901 c = NOCHAR; 923 c = NOCHAR;
902 } 924 }
903 while (--width > 0); 925 while (--width > 0);
926
927 // pad with spaces when overwriting wide character with smaller one
928 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
929 {
930 stp[c] = ' ';
931 srp[c] = rend;
932 }
933 }
934 else if (width == 0)
935 {
936#if ENABLE_COMBINING
937 // handle combining characters
938 // we just tag the accent on the previous on-screen character.
939 // this is arguably not correct, but also arguably not wrong.
940 // we don't handle double-width characters nicely yet.
941
942 text_t *tp;
943 rend_t *rp;
944
945 if (screen.cur.col > 0)
946 {
947 tp = stp + screen.cur.col - 1;
948 rp = srp + screen.cur.col - 1;
949 }
950 else if (screen.cur.row > 0
951 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
952 {
953 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
954 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
955 }
904 else 956 else
905 (void)0; /* handle combining character etc. here. */ 957 continue;
958
959 // handle double-width-chars by making them look extremely ugly
960 if (*tp == NOCHAR)
961 *tp = ' '; // hack //D //TODO //--tp, --rp;
962
963 // first try to find a precomposed character
964 unicode_t n = rxvt_compose (*tp, c);
965 if (n == NOCHAR)
966 n = rxvt_composite.compose (*tp, c);
967
968 *tp = n;
969 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
970#endif
971 }
906 } 972 }
907 973
908 if (screen.tlen[row] != -1) /* XXX: think about this */ 974 if (screen.tlen[row] != -1) /* XXX: think about this */
909 MAX_IT (screen.tlen[row], screen.cur.col); 975 MAX_IT (screen.tlen[row], screen.cur.col);
910 976
… …
930 */ 996 */
931void 997void
932rxvt_term::scr_backspace () 998rxvt_term::scr_backspace ()
933{ 999{
934 want_refresh = 1; 1000 want_refresh = 1;
1001
935 if (screen.cur.col == 0) 1002 if (screen.cur.col == 0)
936 { 1003 {
937 if (screen.cur.row > 0) 1004 if (screen.cur.row > 0)
938 { 1005 {
939#ifdef TERMCAP_HAS_BW 1006#ifdef TERMCAP_HAS_BW
… …
944 1011
945 } 1012 }
946 } 1013 }
947 else if ((screen.flags & Screen_WrapNext) == 0) 1014 else if ((screen.flags & Screen_WrapNext) == 0)
948 scr_gotorc (0, -1, RELATIVE); 1015 scr_gotorc (0, -1, RELATIVE);
1016
949 screen.flags &= ~Screen_WrapNext; 1017 screen.flags &= ~Screen_WrapNext;
950} 1018}
951 1019
952/* ------------------------------------------------------------------------- */ 1020/* ------------------------------------------------------------------------- */
953/* 1021/*
… …
956 * XTERM_SEQ: CTRL-I 1024 * XTERM_SEQ: CTRL-I
957 */ 1025 */
958void 1026void
959rxvt_term::scr_tab (int count) 1027rxvt_term::scr_tab (int count)
960{ 1028{
961 int i, x; 1029 int i, x;
962 1030
963 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); 1031 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
964 want_refresh = 1; 1032 want_refresh = 1;
965 i = x = screen.cur.col; 1033 i = x = screen.cur.col;
1034
966 if (count == 0) 1035 if (count == 0)
967 return; 1036 return;
968 else if (count > 0) 1037 else if (count > 0)
969 { 1038 {
970 for (; ++i < TermWin.ncol; ) 1039 for (; ++i < TermWin.ncol; )
… …
972 { 1041 {
973 x = i; 1042 x = i;
974 if (!--count) 1043 if (!--count)
975 break; 1044 break;
976 } 1045 }
1046
977 if (count) 1047 if (count)
978 x = TermWin.ncol - 1; 1048 x = TermWin.ncol - 1;
979 } 1049 }
980 else /* if (count < 0) */ 1050 else /* if (count < 0) */
981 { 1051 {
… …
984 { 1054 {
985 x = i; 1055 x = i;
986 if (!++count) 1056 if (!++count)
987 break; 1057 break;
988 } 1058 }
1059
989 if (count) 1060 if (count)
990 x = 0; 1061 x = 0;
991 } 1062 }
1063
992 if (x != screen.cur.col) 1064 if (x != screen.cur.col)
993 scr_gotorc (0, x, R_RELATIVE); 1065 scr_gotorc (0, x, R_RELATIVE);
994} 1066}
995 1067
996/* ------------------------------------------------------------------------- */ 1068/* ------------------------------------------------------------------------- */
… …
1053 want_refresh = 1; 1125 want_refresh = 1;
1054 ZERO_SCROLLBACK (); 1126 ZERO_SCROLLBACK ();
1055 1127
1056 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)); 1128 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));
1057 1129
1058 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1130 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1059 : col);
1060 MAX_IT (screen.cur.col, 0); 1131 MAX_IT (screen.cur.col, 0);
1061 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1132 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1062 1133
1063 screen.flags &= ~Screen_WrapNext; 1134 screen.flags &= ~Screen_WrapNext;
1064 if (relative & R_RELATIVE) 1135 if (relative & R_RELATIVE)
… …
1090 else 1161 else
1091 screen.cur.row = row; 1162 screen.cur.row = row;
1092 } 1163 }
1093 MAX_IT (screen.cur.row, 0); 1164 MAX_IT (screen.cur.row, 0);
1094 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1165 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1166
1167 while (screen.cur.col > 0
1168 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1169 screen.cur.col--;
1095} 1170}
1096 1171
1097/* ------------------------------------------------------------------------- */ 1172/* ------------------------------------------------------------------------- */
1098/* 1173/*
1099 * direction should be UP or DN 1174 * direction should be UP or DN
1100 */ 1175 */
1101void 1176void
1102rxvt_term::scr_index (enum page_dirn direction) 1177rxvt_term::scr_index (enum page_dirn direction)
1103{ 1178{
1104 int dirn; 1179 int dirn;
1105 1180
1106 want_refresh = 1; 1181 want_refresh = 1;
1107 dirn = ((direction == UP) ? 1 : -1); 1182 dirn = ((direction == UP) ? 1 : -1);
1108 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); 1183 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1109 1184
… …
1169 default: 1244 default:
1170 return; 1245 return;
1171 } 1246 }
1172 1247
1173 if (screen.text[row]) 1248 if (screen.text[row])
1174 scr_blank_line (& (screen.text[row][col]), 1249 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1175 & (screen.rend[row][col]), num, rstyle);
1176 else 1250 else
1177 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1251 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1178} 1252}
1179 1253
1180/* ------------------------------------------------------------------------- */ 1254/* ------------------------------------------------------------------------- */
… …
1185 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1259 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1186 */ 1260 */
1187void 1261void
1188rxvt_term::scr_erase_screen (int mode) 1262rxvt_term::scr_erase_screen (int mode)
1189{ 1263{
1190 int num; 1264 int num;
1191 int32_t row, row_offset; 1265 int32_t row, row_offset;
1192 rend_t ren; 1266 rend_t ren;
1193 XGCValues gcvalue; 1267 XGCValues gcvalue;
1194 1268
1195 want_refresh = 1; 1269 want_refresh = 1;
1196 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); 1270 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1197 ZERO_SCROLLBACK (); 1271 ZERO_SCROLLBACK ();
1198 row_offset = (int32_t)TermWin.saveLines; 1272 row_offset = (int32_t)TermWin.saveLines;
… …
1217 num = TermWin.nrow; 1291 num = TermWin.nrow;
1218 break; 1292 break;
1219 default: 1293 default:
1220 return; 1294 return;
1221 } 1295 }
1296
1222 refresh_type |= REFRESH_BOUNDS; 1297 refresh_type |= REFRESH_BOUNDS;
1298
1223 if (selection.op && current_screen == selection.screen 1299 if (selection.op && current_screen == selection.screen
1224 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1300 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1225 || (selection.end.row >= row 1301 || (selection.end.row >= row
1226 && selection.end.row <= row + num))) 1302 && selection.end.row <= row + num)))
1227 CLEAR_SELECTION (); 1303 CLEAR_SELECTION ();
1304
1228 if (row >= TermWin.nrow) /* Out Of Bounds */ 1305 if (row >= TermWin.nrow) /* Out Of Bounds */
1229 return; 1306 return;
1307
1230 MIN_IT (num, (TermWin.nrow - row)); 1308 MIN_IT (num, (TermWin.nrow - row));
1309
1231 if (rstyle & (RS_RVid | RS_Uline)) 1310 if (rstyle & (RS_RVid | RS_Uline))
1232 ren = (rend_t) ~RS_None; 1311 ren = (rend_t) ~RS_None;
1233 else if (GET_BASEBG (rstyle) == Color_bg) 1312 else if (GET_BASEBG (rstyle) == Color_bg)
1234 { 1313 {
1235 ren = DEFAULT_RSTYLE; 1314 ren = DEFAULT_RSTYLE;
… …
1242 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1321 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1243 ERASE_ROWS (row, num); 1322 ERASE_ROWS (row, num);
1244 gcvalue.foreground = PixColors[Color_fg]; 1323 gcvalue.foreground = PixColors[Color_fg];
1245 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1324 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1246 } 1325 }
1326
1247 for (; num--; row++) 1327 for (; num--; row++)
1248 { 1328 {
1249 scr_blank_screen_mem (screen.text, screen.rend, 1329 scr_blank_screen_mem (screen.text, screen.rend,
1250 (unsigned int) (row + row_offset), rstyle); 1330 (unsigned int) (row + row_offset), rstyle);
1251 screen.tlen[row + row_offset] = 0; 1331 screen.tlen[row + row_offset] = 0;
… …
1285 * Insert/Delete <count> lines 1365 * Insert/Delete <count> lines
1286 */ 1366 */
1287void 1367void
1288rxvt_term::scr_insdel_lines (int count, int insdel) 1368rxvt_term::scr_insdel_lines (int count, int insdel)
1289{ 1369{
1290 int end; 1370 int end;
1291 1371
1292 ZERO_SCROLLBACK (); 1372 ZERO_SCROLLBACK ();
1293 1373
1294 selection_check (1); 1374 selection_check (1);
1295 1375
… …
1314 * Insert/Delete <count> characters from the current position 1394 * Insert/Delete <count> characters from the current position
1315 */ 1395 */
1316void 1396void
1317rxvt_term::scr_insdel_chars (int count, int insdel) 1397rxvt_term::scr_insdel_chars (int count, int insdel)
1318{ 1398{
1319 int col, row; 1399 int col, row;
1320 rend_t tr; 1400 rend_t tr;
1321 text_t *stp; 1401 text_t *stp;
1322 rend_t *srp; 1402 rend_t *srp;
1323 int16_t *slp; 1403 int16_t *slp;
1324 1404
1325 want_refresh = 1; 1405 want_refresh = 1;
1326 ZERO_SCROLLBACK (); 1406 ZERO_SCROLLBACK ();
1327 1407
1328 if (count <= 0) 1408 if (count <= 0)
… …
1335 screen.flags &= ~Screen_WrapNext; 1415 screen.flags &= ~Screen_WrapNext;
1336 1416
1337 stp = screen.text[row]; 1417 stp = screen.text[row];
1338 srp = screen.rend[row]; 1418 srp = screen.rend[row];
1339 slp = & (screen.tlen[row]); 1419 slp = & (screen.tlen[row]);
1420
1340 switch (insdel) 1421 switch (insdel)
1341 { 1422 {
1342 case INSERT: 1423 case INSERT:
1343 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1424 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1344 col--) 1425 col--)
1345 { 1426 {
1346 stp[col] = stp[col - count]; 1427 stp[col] = stp[col - count];
1347 srp[col] = srp[col - count]; 1428 srp[col] = srp[col - count];
1348 } 1429 }
1430
1349 if (*slp != -1) 1431 if (*slp != -1)
1350 { 1432 {
1351 *slp += count; 1433 *slp += count;
1352 MIN_IT (*slp, TermWin.ncol); 1434 MIN_IT (*slp, TermWin.ncol);
1353 } 1435 }
1436
1354 if (selection.op && current_screen == selection.screen 1437 if (selection.op && current_screen == selection.screen
1355 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1438 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1356 { 1439 {
1357 if (selection.end.row != screen.cur.row 1440 if (selection.end.row != screen.cur.row
1358 || (selection.end.col + count >= TermWin.ncol)) 1441 || (selection.end.col + count >= TermWin.ncol))
… …
1362 selection.beg.col += count; 1445 selection.beg.col += count;
1363 selection.mark.col += count; /* XXX: yes? */ 1446 selection.mark.col += count; /* XXX: yes? */
1364 selection.end.col += count; 1447 selection.end.col += count;
1365 } 1448 }
1366 } 1449 }
1450
1367 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1451 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1368 (unsigned int)count, rstyle); 1452 (unsigned int)count, rstyle);
1369 break; 1453 break;
1454
1370 case ERASE: 1455 case ERASE:
1371 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1456 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1372 selection_check (1); 1457 selection_check (1);
1373 screen.cur.col -= count; 1458 screen.cur.col -= count;
1374 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1459 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1375 (unsigned int)count, rstyle); 1460 (unsigned int)count, rstyle);
1376 break; 1461 break;
1462
1377 case DELETE: 1463 case DELETE:
1378 tr = srp[TermWin.ncol - 1]
1379 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1464 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1465
1380 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1466 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1381 { 1467 {
1382 stp[col] = stp[col + count]; 1468 stp[col] = stp[col + count];
1383 srp[col] = srp[col + count]; 1469 srp[col] = srp[col + count];
1384 } 1470 }
1471
1385 scr_blank_line (& (stp[TermWin.ncol - count]), 1472 scr_blank_line (& (stp[TermWin.ncol - count]),
1386 & (srp[TermWin.ncol - count]), 1473 & (srp[TermWin.ncol - count]),
1387 (unsigned int)count, tr); 1474 (unsigned int)count, tr);
1475
1388 if (*slp == -1) /* break line continuation */ 1476 if (*slp == -1) /* break line continuation */
1389 *slp = TermWin.ncol; 1477 *slp = TermWin.ncol;
1478
1390 *slp -= count; 1479 *slp -= count;
1391 MAX_IT (*slp, 0); 1480 MAX_IT (*slp, 0);
1481
1392 if (selection.op && current_screen == selection.screen 1482 if (selection.op && current_screen == selection.screen
1393 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1483 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1394 { 1484 {
1395 if (selection.end.row != screen.cur.row 1485 if (selection.end.row != screen.cur.row
1396 || (screen.cur.col >= selection.beg.col - count) 1486 || (screen.cur.col >= selection.beg.col - count)
… …
1402 selection.beg.col -= count; 1492 selection.beg.col -= count;
1403 selection.mark.col -= count; /* XXX: yes? */ 1493 selection.mark.col -= count; /* XXX: yes? */
1404 selection.end.col -= count; 1494 selection.end.col -= count;
1405 } 1495 }
1406 } 1496 }
1497
1407 break; 1498 break;
1408 } 1499 }
1409} 1500}
1410 1501
1411/* ------------------------------------------------------------------------- */ 1502/* ------------------------------------------------------------------------- */
… …
1416void 1507void
1417rxvt_term::scr_scroll_region (int top, int bot) 1508rxvt_term::scr_scroll_region (int top, int bot)
1418{ 1509{
1419 MAX_IT (top, 0); 1510 MAX_IT (top, 0);
1420 MIN_IT (bot, (int)TermWin.nrow - 1); 1511 MIN_IT (bot, (int)TermWin.nrow - 1);
1512
1421 if (top > bot) 1513 if (top > bot)
1422 return; 1514 return;
1515
1423 screen.tscroll = top; 1516 screen.tscroll = top;
1424 screen.bscroll = bot; 1517 screen.bscroll = bot;
1425 scr_gotorc (0, 0, 0); 1518 scr_gotorc (0, 0, 0);
1426} 1519}
1427 1520
… …
1433 */ 1526 */
1434void 1527void
1435rxvt_term::scr_cursor_visible (int mode) 1528rxvt_term::scr_cursor_visible (int mode)
1436{ 1529{
1437 want_refresh = 1; 1530 want_refresh = 1;
1531
1438 if (mode) 1532 if (mode)
1439 screen.flags |= Screen_VisibleCursor; 1533 screen.flags |= Screen_VisibleCursor;
1440 else 1534 else
1441 screen.flags &= ~Screen_VisibleCursor; 1535 screen.flags &= ~Screen_VisibleCursor;
1442} 1536}
… …
1656 row_col_t rc[RC_COUNT]; 1750 row_col_t rc[RC_COUNT];
1657 1751
1658 if (drawn_text == NULL) /* sanity check */ 1752 if (drawn_text == NULL) /* sanity check */
1659 return; 1753 return;
1660 1754
1755#ifndef NO_SLOW_LINK_SUPPORT
1756 if (refresh_type == FAST_REFRESH && !display->is_local)
1757 {
1758 y = 0;
1759 height = TermWin.height;
1760 }
1761#endif
1762
1661#ifdef DEBUG_STRICT 1763#ifdef DEBUG_STRICT
1662 x = max (x, (int)TermWin.int_bwidth); 1764 x = max (x, 0);
1663 x = min (x, (int)TermWin.width); 1765 x = min (x, (int)TermWin.width);
1664 y = max (y, (int)TermWin.int_bwidth); 1766 y = max (y, 0);
1665 y = min (y, (int)TermWin.height); 1767 y = min (y, (int)TermWin.height);
1666#endif 1768#endif
1667 1769
1668 /* round down */ 1770 /* round down */
1669 rc[PART_BEG].col = Pixel2Col (x); 1771 rc[PART_BEG].col = Pixel2Col (x);
… …
1680 } 1782 }
1681 1783
1682 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)); 1784 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));
1683 1785
1684 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1786 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1685 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, 1787 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1686 (rc[PART_END].col - rc[PART_BEG].col + 1));
1687 1788
1688 if (refresh) 1789 if (refresh)
1689 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1790 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS);
1690} 1791}
1691 1792
… …
1758 if (TermWin.view_start != oldviewstart) 1859 if (TermWin.view_start != oldviewstart)
1759 { 1860 {
1760 want_refresh = 1; 1861 want_refresh = 1;
1761 num_scr -= (TermWin.view_start - oldviewstart); 1862 num_scr -= (TermWin.view_start - oldviewstart);
1762 } 1863 }
1864
1763 return (int) (TermWin.view_start - oldviewstart); 1865 return (int) (TermWin.view_start - oldviewstart);
1764} 1866}
1765 1867
1766/* ------------------------------------------------------------------------- */ 1868/* ------------------------------------------------------------------------- */
1767void 1869void
… …
1835 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1937 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1836 1938
1837void 1939void
1838rxvt_term::scr_refresh (unsigned char refresh_type) 1940rxvt_term::scr_refresh (unsigned char refresh_type)
1839{ 1941{
1840 unsigned char clearfirst, /* first character writes before cell */ 1942 unsigned char clearfirst, /* first character writes before cell */
1841 clearlast, /* last character writes beyond cell */ 1943 clearlast, /* last character writes beyond cell */
1842 must_clear, /* use draw_string not draw_image_string */ 1944 must_clear, /* use draw_string not draw_image_string */
1843 rvid, /* reverse video this position */ 1945 rvid, /* reverse video this position */
1844 showcursor; /* show the cursor */ 1946 showcursor; /* show the cursor */
1845 int16_t col, row, /* column/row we're processing */ 1947 int16_t col, row, /* column/row we're processing */
1846 ocrow; /* old cursor row */ 1948 ocrow; /* old cursor row */
1847 int cursorwidth;
1848 int i, /* tmp */ 1949 int i, /* tmp */
1849 row_offset; /* basic offset in screen structure */ 1950 row_offset; /* basic offset in screen structure */
1850#ifndef NO_CURSORCOLOR 1951#ifndef NO_CURSORCOLOR
1851 rend_t cc1; /* store colours at cursor position (s) */ 1952 rend_t cc1; /* store colours at cursor position (s) */
1852#endif 1953#endif
1853 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1954 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
1854 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 1955 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1855 1956
1856 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1957 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1857 return; 1958 return;
1858 1959
1859 /* 1960 /*
… …
1886 1987
1887 /* 1988 /*
1888 * C: set the cursor character (s) 1989 * C: set the cursor character (s)
1889 */ 1990 */
1890 { 1991 {
1891 unsigned char setoldcursor; 1992 unsigned char setoldcursor;
1892 rend_t ccol1, /* Cursor colour */ 1993 rend_t ccol1, /* Cursor colour */
1893 ccol2; /* Cursor colour2 */ 1994 ccol2; /* Cursor colour2 */
1894 1995
1895 showcursor = (screen.flags & Screen_VisibleCursor); 1996 showcursor = (screen.flags & Screen_VisibleCursor);
1896 cursorwidth = 0;
1897#ifdef CURSOR_BLINK 1997#ifdef CURSOR_BLINK
1898 if (hidden_cursor) 1998 if (hidden_cursor)
1899 showcursor = 0; 1999 showcursor = 0;
1900#endif 2000#endif
1901 2001
1902 cursorwidth = 0;
1903
1904 if (showcursor) 2002 if (showcursor)
1905 { 2003 {
1906 cursorwidth++;
1907
1908 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 2004 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]);
1909 [screen.cur.col]);
1910 2005
1911 if (showcursor && TermWin.focus) 2006 if (showcursor && TermWin.focus)
1912 { 2007 {
1913 *srp ^= RS_RVid; 2008 *srp ^= RS_RVid;
1914#ifndef NO_CURSORCOLOR 2009#ifndef NO_CURSORCOLOR
… …
1930 ccol2 = Color_bg; 2025 ccol2 = Color_bg;
1931#endif 2026#endif
1932 *srp = SET_FGCOLOR (*srp, ccol1); 2027 *srp = SET_FGCOLOR (*srp, ccol1);
1933 *srp = SET_BGCOLOR (*srp, ccol2); 2028 *srp = SET_BGCOLOR (*srp, ccol2);
1934#endif 2029#endif
1935
1936 } 2030 }
1937 } 2031 }
1938 2032
1939 /* make sure no outline cursor is left around */ 2033 /* make sure no outline cursor is left around */
1940 setoldcursor = 0; 2034 setoldcursor = 0;
… …
1943 if (screen.cur.row + TermWin.view_start != ocrow 2037 if (screen.cur.row + TermWin.view_start != ocrow
1944 || screen.cur.col != oldcursor.col) 2038 || screen.cur.col != oldcursor.col)
1945 { 2039 {
1946 if (ocrow < TermWin.nrow 2040 if (ocrow < TermWin.nrow
1947 && oldcursor.col < TermWin.ncol) 2041 && oldcursor.col < TermWin.ncol)
1948 {
1949 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2042 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
1950 } 2043
1951 if (TermWin.focus || !showcursor) 2044 if (TermWin.focus || !showcursor)
1952 oldcursor.row = -1; 2045 oldcursor.row = -1;
1953 else 2046 else
1954 setoldcursor = 1; 2047 setoldcursor = 1;
1955 } 2048 }
1956 } 2049 }
1957 else if (!TermWin.focus) 2050 else if (!TermWin.focus)
1958 setoldcursor = 1; 2051 setoldcursor = 1;
2052
1959 if (setoldcursor) 2053 if (setoldcursor)
1960 { 2054 {
1961 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2055 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
1962 oldcursor.row = -1; 2056 oldcursor.row = -1;
1963 else 2057 else
… …
1972 /* 2066 /*
1973 * D: CopyArea pass - very useful for slower links 2067 * D: CopyArea pass - very useful for slower links
1974 * This has been deliberately kept simple. 2068 * This has been deliberately kept simple.
1975 */ 2069 */
1976 i = num_scr; 2070 i = num_scr;
2071 if (!display->is_local
1977 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2072 && refresh_type == FAST_REFRESH && num_scr_allow && i
1978 && abs (i) < TermWin.nrow && !must_clear) 2073 && abs (i) < TermWin.nrow && !must_clear)
1979 { 2074 {
1980 int16_t nits; 2075 int16_t nits;
1981 int j; 2076 int j;
1982 rend_t *drp2; 2077 rend_t *drp2;
1983 text_t *dtp2; 2078 text_t *dtp2;
1984 int len, wlen; 2079 int len, wlen;
1985 2080
1986 j = TermWin.nrow; 2081 j = TermWin.nrow;
1987 wlen = len = -1; 2082 wlen = len = -1;
1988 row = i > 0 ? 0 : j - 1; 2083 row = i > 0 ? 0 : j - 1;
1989 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2084 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
… …
2053 int ypixel = (int)Row2Pixel (row); 2148 int ypixel = (int)Row2Pixel (row);
2054 2149
2055 for (col = 0; col < TermWin.ncol; col++) 2150 for (col = 0; col < TermWin.ncol; col++)
2056 { 2151 {
2057 /* compare new text with old - if exactly the same then continue */ 2152 /* compare new text with old - if exactly the same then continue */
2153 if (stp[col] == dtp[col] /* Must match characters to skip. */
2154 && (srp[col] == drp[col] /* Either rendition the same or */
2155 || (stp[col] == ' ' /* space w/ no background change */
2156 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2157 continue;
2158
2159 // redraw one or more characters
2160
2161 // seek to the beginning if wide characters
2162 while (stp[col] == NOCHAR && col > 0)
2163 --col;
2164
2058 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2165 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2059
2060 if (stp[col] == dtp[col] /* Must match characters to skip. */
2061 && (rend == drp[col] /* Either rendition the same or */
2062 || (stp[col] == ' ' /* space w/ no background change */
2063 && GET_BGATTR (rend) == GET_BGATTR (drp[col]))))
2064 continue;
2065
2066 text_t *text = stp + col; 2166 text_t *text = stp + col;
2067 int count = 1; 2167 int count = 1;
2068 2168
2069 /* redraw one or more characters */
2070
2071 dtp[col] = stp[col]; 2169 dtp[col] = stp[col];
2072 drp[col] = rend; 2170 drp[col] = rend;
2073
2074 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2075 continue;
2076 2171
2077 int xpixel = Col2Pixel (col); 2172 int xpixel = Col2Pixel (col);
2078 2173
2079 // this loop looks very messy, it can probably be optimized 2174 // this loop looks very messy, it can probably be optimized
2080 // and cleaned a bit by you? 2175 // and cleaned a bit by you?
… …
2121 int fore = GET_FGCOLOR (rend); // desired foreground 2216 int fore = GET_FGCOLOR (rend); // desired foreground
2122 int back = GET_BGCOLOR (rend); // desired background 2217 int back = GET_BGCOLOR (rend); // desired background
2123 2218
2124 rend = GET_ATTR (rend); 2219 rend = GET_ATTR (rend);
2125 2220
2126 rvid = !! (rend & RS_RVid); 2221 rvid = !!(rend & RS_RVid);
2222
2223#ifndef NO_BOLD_UNDERLINE_REVERSE
2224 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold))
2225 {
2226 if (ISSET_PIXCOLOR (Color_BD))
2227 fore = Color_BD;
2228 else
2229 rvid = !rvid;
2230 }
2231
2232 if (rend & RS_Uline)
2233 if (ISSET_PIXCOLOR (Color_UL))
2234 fore = Color_UL;
2235#endif
2236
2127 if (rvid) 2237 if (rvid)
2128 { 2238 {
2129 SWAP_IT (fore, back, int); 2239 SWAP_IT (fore, back, int);
2130 2240
2131#ifndef NO_BOLD_UNDERLINE_REVERSE 2241#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2134 && !ISSET_PIXCOLOR (Color_cursor) 2244 && !ISSET_PIXCOLOR (Color_cursor)
2135# endif 2245# endif
2136 ) 2246 )
2137 back = Color_RV; 2247 back = Color_RV;
2138#endif 2248#endif
2139
2140 } 2249 }
2250
2141#ifdef TEXT_BLINK 2251#ifdef TEXT_BLINK
2142 if (rend & RS_Blink) 2252 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2143 { 2253 {
2144 if (!text_blink_ev.active) 2254 if (!text_blink_ev.active)
2145 { 2255 {
2146 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2256 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2147 hidden_text = 0; 2257 hidden_text = 0;
2148 } 2258 }
2149 else if (hidden_text) 2259 else if (hidden_text)
2150 fore = back; 2260 fore = back;
2151 }
2152#endif
2153#ifndef NO_BOLD_UNDERLINE_REVERSE
2154 else if (rend & RS_Bold)
2155 {
2156 if (ISSET_PIXCOLOR (Color_BD))
2157 fore = Color_BD;
2158 else if (fore == Color_fg)
2159 fore = Color_White;
2160 }
2161 else if (rend & RS_Uline)
2162 {
2163 if (ISSET_PIXCOLOR (Color_UL))
2164 fore = Color_UL;
2165 } 2261 }
2166#endif 2262#endif
2167 2263
2168 /* 2264 /*
2169 * Actually do the drawing of the string here 2265 * Actually do the drawing of the string here
… …
2191 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2287 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2192 } 2288 }
2193 else 2289 else
2194 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2290 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2195 2291
2196 if ((rend & RS_Uline) && (font->descent > 1)) 2292 if (rend & RS_Uline && font->descent > 1 && fore != back)
2197 XDrawLine (display->display, drawBuffer, TermWin.gc, 2293 XDrawLine (display->display, drawBuffer, TermWin.gc,
2198 xpixel, ypixel + font->ascent + 1, 2294 xpixel, ypixel + font->ascent + 1,
2199 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2295 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2200 } /* for (col....) */ 2296 } /* for (col....) */
2201 } /* for (row....) */ 2297 } /* for (row....) */
2202 2298
2203 /* 2299 /*
2204 * G: cleanup cursor and display outline cursor if necessary 2300 * G: cleanup cursor and display outline cursor if necessary
… …
2211 [screen.cur.col]); 2307 [screen.cur.col]);
2212 *srp ^= RS_RVid; 2308 *srp ^= RS_RVid;
2213#ifndef NO_CURSORCOLOR 2309#ifndef NO_CURSORCOLOR
2214 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2310 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2215#endif 2311#endif
2216
2217 } 2312 }
2218 else if (oldcursor.row >= 0) 2313 else if (oldcursor.row >= 0)
2219 { 2314 {
2220#ifndef NO_CURSORCOLOR 2315#ifndef NO_CURSORCOLOR
2221 if (ISSET_PIXCOLOR (Color_cursor)) 2316 if (ISSET_PIXCOLOR (Color_cursor))
2222 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2317 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]);
2223#endif 2318#endif
2319 int cursorwidth = 1;
2320 while (oldcursor.col + cursorwidth < TermWin.ncol
2321 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2322 cursorwidth++;
2323
2224 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2324 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2225 Col2Pixel (oldcursor.col), 2325 Col2Pixel (oldcursor.col),
2226 Row2Pixel (oldcursor.row), 2326 Row2Pixel (oldcursor.row),
2227 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2327 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2228 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2328 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2229 } 2329 }
2230 } 2330 }
2231 2331
2232 /* 2332 /*
2233 * H: cleanup selection 2333 * H: cleanup selection
… …
2235 scr_reverse_selection (); 2335 scr_reverse_selection ();
2236 2336
2237 /* 2337 /*
2238 * I: other general cleanup 2338 * I: other general cleanup
2239 */ 2339 */
2340#if 0
2240 if (clearfirst && TermWin.int_bwidth) 2341 if (clearfirst && TermWin.int_bwidth)
2241 /* 2342 /*
2242 * clear the whole screen height, note that width == 0 is treated 2343 * clear the whole screen height, note that width == 0 is treated
2243 * specially by XClearArea 2344 * specially by XClearArea
2244 */ 2345 */
2245 XClearArea (display->display, TermWin.vt, 0, 0, 2346 XClearArea (display->display, TermWin.vt, 0, 0,
2246 (unsigned int)TermWin.int_bwidth, 2347 (unsigned int)TermWin.int_bwidth,
2247 (unsigned int)TermWin_TotalHeight (), False); 2348 (unsigned int)TermWin_TotalHeight (), False);
2349
2248 if (clearlast && TermWin.int_bwidth) 2350 if (clearlast && TermWin.int_bwidth)
2249 /* 2351 /*
2250 * clear the whole screen height, note that width == 0 is treated 2352 * clear the whole screen height, note that width == 0 is treated
2251 * specially by XClearArea 2353 * specially by XClearArea
2252 */ 2354 */
2253 XClearArea (display->display, TermWin.vt, 2355 XClearArea (display->display, TermWin.vt,
2254 TermWin.width + TermWin.int_bwidth, 0, 2356 TermWin.width + TermWin.int_bwidth, 0,
2255 (unsigned int)TermWin.int_bwidth, 2357 (unsigned int)TermWin.int_bwidth,
2256 (unsigned int)TermWin_TotalHeight (), False); 2358 (unsigned int)TermWin_TotalHeight (), False);
2359#endif
2360
2257 if (refresh_type & SMOOTH_REFRESH) 2361 if (refresh_type & SMOOTH_REFRESH)
2258 XSync (display->display, False); 2362 XFlush (display->display);
2259 2363
2260 num_scr = 0; 2364 num_scr = 0;
2261 num_scr_allow = 1; 2365 num_scr_allow = 1;
2262 want_refresh = 0; /* screen is current */ 2366 want_refresh = 0; /* screen is current */
2263} 2367}
… …
2285 } 2389 }
2286} 2390}
2287 2391
2288/* ------------------------------------------------------------------------- */ 2392/* ------------------------------------------------------------------------- */
2289void 2393void
2290rxvt_term::scr_clear () 2394rxvt_term::scr_clear (bool really)
2291{ 2395{
2292 if (!TermWin.mapped) 2396 if (!TermWin.mapped)
2293 return; 2397 return;
2294 2398
2295 num_scr_allow = 0; 2399 num_scr_allow = 0;
2296 want_refresh = 1; 2400 want_refresh = 1;
2401
2297#ifdef TRANSPARENT 2402#ifdef TRANSPARENT
2298 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2403 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2299 { 2404 {
2300 int i; 2405 int i;
2301 2406
… …
2308 if (TermWin.parent[i] != None) 2413 if (TermWin.parent[i] != None)
2309 XClearWindow (display->display, TermWin.parent[i]); 2414 XClearWindow (display->display, TermWin.parent[i]);
2310 } 2415 }
2311#endif 2416#endif
2312 2417
2418 if (really)
2313 XClearWindow (display->display, TermWin.vt); 2419 XClearWindow (display->display, TermWin.vt);
2314} 2420}
2315 2421
2316/* ------------------------------------------------------------------------- */ 2422/* ------------------------------------------------------------------------- */
2317void 2423void
2318rxvt_term::scr_reverse_selection () 2424rxvt_term::scr_reverse_selection ()
2319{ 2425{
2320 int i, col, row, end_row;
2321 rend_t *srp;
2322
2323 if (selection.op && current_screen == selection.screen) 2426 if (selection.op && current_screen == selection.screen)
2324 { 2427 {
2325 end_row = TermWin.saveLines - TermWin.view_start; 2428 int end_row = TermWin.saveLines - TermWin.view_start;
2326 i = selection.beg.row + TermWin.saveLines; 2429 int i = selection.beg.row + TermWin.saveLines;
2327 row = selection.end.row + TermWin.saveLines; 2430 int col, row = selection.end.row + TermWin.saveLines;
2431 rend_t *srp;
2432
2328 if (i >= end_row) 2433 if (i >= end_row)
2329 col = selection.beg.col; 2434 col = selection.beg.col;
2330 else 2435 else
2331 { 2436 {
2332 col = 0; 2437 col = 0;
2333 i = end_row; 2438 i = end_row;
2334 } 2439 }
2440
2335 end_row += TermWin.nrow; 2441 end_row += TermWin.nrow;
2336 for (; i < row && i < end_row; i++, col = 0) 2442 for (; i < row && i < end_row; i++, col = 0)
2337 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2443 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2338 srp[col] ^= RS_RVid; 2444 srp[col] ^= RS_RVid;
2445
2339 if (i == row && i < end_row) 2446 if (i == row && i < end_row)
2340 for (srp = screen.rend[i]; col < selection.end.col; col++) 2447 for (srp = screen.rend[i]; col < selection.end.col; col++)
2341 srp[col] ^= RS_RVid; 2448 srp[col] ^= RS_RVid;
2342 } 2449 }
2343} 2450}
… …
2431 { 2538 {
2432 n = min (len - i, PROP_SIZE); 2539 n = min (len - i, PROP_SIZE);
2433 MEMCPY (ds, data + i, n); 2540 MEMCPY (ds, data + i, n);
2434 2541
2435 for (j = 0; j < n; j++) 2542 for (j = 0; j < n; j++)
2436 if (ds[j] == '\n') 2543 if (ds[j] == C0_LF)
2437 ds[j] = '\r'; 2544 ds[j] = C0_CR;
2438 2545
2439 tt_write (ds, (int)n); 2546 tt_write (ds, (int)n);
2440 } 2547 }
2441 2548
2442 free (ds); 2549 free (ds);
… …
2482 } 2589 }
2483 2590
2484 for (;;) 2591 for (;;)
2485 { 2592 {
2486 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2593 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2487 (long) (PROP_SIZE / 4), delete_prop, 2594 (long) (PROP_SIZE / 4), delete_prop,
2488 AnyPropertyType, &ct.encoding, &ct.format, 2595 AnyPropertyType, &ct.encoding, &ct.format,
2489 &ct.nitems, &bytes_after, 2596 &ct.nitems, &bytes_after,
2490 &ct.value) != Success) 2597 &ct.value) != Success)
2491 break; 2598 break;
2492 2599
2493 if (ct.encoding == 0) 2600 if (ct.encoding == 0)
2494 { 2601 {
2495 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2602 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
… …
2503 } 2610 }
2504 2611
2505 if (ct.nitems == 0) 2612 if (ct.nitems == 0)
2506 { 2613 {
2507 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2614 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2615
2508 if (selection_wait == Sel_normal && nread == 0) 2616 if (selection_wait == Sel_normal && nread == 0
2617 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2509 { 2618 {
2510 /* 2619 /*
2511 * pass through again trying CUT_BUFFER0 if we've come from 2620 * pass through again trying CUT_BUFFER0 if we've come from
2512 * XConvertSelection () but nothing was presented 2621 * XConvertSelection () but nothing was presented
2513 */ 2622 */
… …
2521 2630
2522 nread += ct.nitems; 2631 nread += ct.nitems;
2523 2632
2524 char **cl; 2633 char **cl;
2525 int cr; 2634 int cr;
2526 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2635 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2527 &cr) >= 0 && cl)
2528 { 2636 {
2529 for (int i = 0; i < cr; i++) 2637 for (int i = 0; i < cr; i++)
2530 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2638 paste ((unsigned char *)cl[i], STRLEN (cl[i]));
2531 2639
2532 XFreeStringList (cl); 2640 XFreeStringList (cl);
… …
2553void 2661void
2554rxvt_term::incr_cb (time_watcher &w) 2662rxvt_term::incr_cb (time_watcher &w)
2555{ 2663{
2556 selection_wait = Sel_none; 2664 selection_wait = Sel_none;
2557 2665
2558 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2666 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2559} 2667}
2560 2668
2561/* 2669/*
2562 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2670 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2563 */ 2671 */
… …
2566{ 2674{
2567 int reget_time = 0; 2675 int reget_time = 0;
2568 2676
2569 if (prop == None) 2677 if (prop == None)
2570 return; 2678 return;
2679
2571 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); 2680 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2572 if (selection_wait == Sel_normal) 2681 if (selection_wait == Sel_normal)
2573 { 2682 {
2574 int a, afmt; 2683 int a, afmt;
2575 Atom atype; 2684 Atom atype;
2576 unsigned long bytes_after, nitems; 2685 unsigned long bytes_after, nitems;
2577 unsigned char *s = NULL; 2686 unsigned char *s = NULL;
2578 2687
2579 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, 2688 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2580 xa[XA_INCR], &atype, &afmt, &nitems, 2689 xa[XA_INCR], &atype, &afmt, &nitems,
2581 &bytes_after, &s); 2690 &bytes_after, &s);
2582 if (s) 2691 if (s)
2583 XFree (s); 2692 XFree (s);
2584 if (a != Success) 2693 if (a != Success)
2585 return; 2694 return;
2695
2586#ifndef __CYGWIN32__ 2696#ifndef __CYGWIN32__
2587 if (atype == xa[XA_INCR]) 2697 if (atype == xa[XA_INCR])
2588 { /* start an INCR transfer */ 2698 { /* start an INCR transfer */
2589 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); 2699 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2590 XDeleteProperty (display->display, win, prop); 2700 XDeleteProperty (display->display, win, prop);
… …
2596 2706
2597 } 2707 }
2598 else if (selection_wait == Sel_incr) 2708 else if (selection_wait == Sel_incr)
2599 { 2709 {
2600 reget_time = 1; 2710 reget_time = 1;
2711
2601 if (selection_paste (win, prop, True) == -1) 2712 if (selection_paste (win, prop, True) == -1)
2602 { 2713 {
2603 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); 2714 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2604 selection_wait = Sel_none; 2715 selection_wait = Sel_none;
2605 incr_ev.stop (); 2716 incr_ev.stop ();
2606 } 2717 }
2607 } 2718 }
2608 if (reget_time) /* received more data so reget time */ 2719 if (reget_time) /* received more data so reget time */
2609 incr_ev.start (NOW + 10); 2720 incr_ev.start (NOW + 10);
2610} 2721}
2722
2611/* ------------------------------------------------------------------------- */ 2723/* ------------------------------------------------------------------------- */
2612/* 2724/*
2613 * Request the current selection: 2725 * Request the current selection:
2614 * Order: > internal selection if available 2726 * Order: > internal selection if available
2615 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2727 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2620 */ 2732 */
2621void 2733void
2622rxvt_term::selection_request (Time tm, int x, int y) 2734rxvt_term::selection_request (Time tm, int x, int y)
2623{ 2735{
2624 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); 2736 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2737
2625 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2738 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2626 return; /* outside window */ 2739 return; /* outside window */
2627 2740
2628 if (selection.text != NULL) 2741 if (selection.text)
2629 { /* internal selection */ 2742 { /* internal selection */
2630 D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); 2743 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2631 paste (selection.text, selection.len); 2744 char *str = rxvt_wcstombs (selection.text, selection.len);
2745 paste ((unsigned char *)str, strlen (str));
2746 free (str);
2632 return; 2747 return;
2633 } 2748 }
2634 else 2749 else
2635 { 2750 {
2636 int i; 2751 int i;
2637 2752
2638 selection_request_time = tm; 2753 selection_request_time = tm;
2639 selection_wait = Sel_normal; 2754 selection_wait = Sel_normal;
2755
2640 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2756 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2641 { 2757 {
2642#if X_HAVE_UTF8_STRING 2758#if X_HAVE_UTF8_STRING
2643 selection_type = Sel_UTF8String; 2759 selection_type = Sel_UTF8String;
2644 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2760 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2649 return; 2765 return;
2650#endif 2766#endif
2651 2767
2652 } 2768 }
2653 } 2769 }
2770
2654 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2771 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2655 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2772 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2656 selection_paste (display->root, XA_CUT_BUFFER0, False); 2773 selection_paste (display->root, XA_CUT_BUFFER0, False);
2657} 2774}
2658 2775
2659int 2776int
2660rxvt_term::selection_request_other (Atom target, int selnum) 2777rxvt_term::selection_request_other (Atom target, int selnum)
2661{ 2778{
2662 Atom sel; 2779 Atom sel;
2663#ifdef DEBUG_SELECT 2780#ifdef DEBUG_SELECT
2664 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2781 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2665#endif 2782#endif
2666 2783
2667 selection_type |= selnum; 2784 selection_type |= selnum;
2785
2668 if (selnum == Sel_Primary) 2786 if (selnum == Sel_Primary)
2669 sel = XA_PRIMARY; 2787 sel = XA_PRIMARY;
2670 else if (selnum == Sel_Secondary) 2788 else if (selnum == Sel_Secondary)
2671 sel = XA_SECONDARY; 2789 sel = XA_SECONDARY;
2672 else 2790 else
2673 sel = xa[XA_CLIPBOARD]; 2791 sel = xa[XA_CLIPBOARD];
2792
2674 if (XGetSelectionOwner (display->display, sel) != None) 2793 if (XGetSelectionOwner (display->display, sel) != None)
2675 { 2794 {
2676 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2795 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2677 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2796 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2678 TermWin.vt, selection_request_time); 2797 TermWin.vt, selection_request_time);
2679 return 1; 2798 return 1;
2680 } 2799 }
2800
2681 return 0; 2801 return 0;
2682} 2802}
2683 2803
2684/* ------------------------------------------------------------------------- */ 2804/* ------------------------------------------------------------------------- */
2685/* 2805/*
… …
2694 want_refresh = 1; 2814 want_refresh = 1;
2695 free (selection.text); 2815 free (selection.text);
2696 selection.text = NULL; 2816 selection.text = NULL;
2697 selection.len = 0; 2817 selection.len = 0;
2698 CLEAR_SELECTION (); 2818 CLEAR_SELECTION ();
2819
2820 if (display->selection_owner == this)
2821 display->selection_owner = 0;
2699} 2822}
2700 2823
2701/* ------------------------------------------------------------------------- */ 2824/* ------------------------------------------------------------------------- */
2702/* 2825/*
2703 * Copy a selection into the cut buffer 2826 * Copy a selection into the cut buffer
2704 * EXT: button 1 or 3 release 2827 * EXT: button 1 or 3 release
2705 */ 2828 */
2706void 2829void
2707rxvt_term::selection_make (Time tm) 2830rxvt_term::selection_make (Time tm)
2708{ 2831{
2709 int i, col, end_col, row, end_row; 2832 int i, col, end_col, row, end_row;
2710 unsigned char *new_selection_text; 2833 wchar_t *new_selection_text;
2711 char *str;
2712 text_t *t; 2834 text_t *t;
2713#ifdef ACS_ASCII
2714 rend_t *re;
2715#endif
2716 2835
2717 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); 2836 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2718 switch (selection.op) 2837 switch (selection.op)
2719 { 2838 {
2720 case SELECTION_CONT: 2839 case SELECTION_CONT:
… …
2726 selection.op = SELECTION_DONE; 2845 selection.op = SELECTION_DONE;
2727 /* FALLTHROUGH */ 2846 /* FALLTHROUGH */
2728 default: 2847 default:
2729 return; 2848 return;
2730 } 2849 }
2850
2731 selection.op = SELECTION_DONE; 2851 selection.op = SELECTION_DONE;
2732 2852
2733 if (selection.clicks == 4) 2853 if (selection.clicks == 4)
2734 return; /* nothing selected, go away */ 2854 return; /* nothing selected, go away */
2735 2855
2736 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2856 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2737 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); 2857 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2738
2739 new_selection_text = (unsigned char *)str;
2740 2858
2741 col = selection.beg.col; 2859 col = selection.beg.col;
2742 MAX_IT (col, 0); 2860 MAX_IT (col, 0);
2743 row = selection.beg.row + TermWin.saveLines; 2861 row = selection.beg.row + TermWin.saveLines;
2744 end_row = selection.end.row + TermWin.saveLines; 2862 end_row = selection.end.row + TermWin.saveLines;
2863 int ofs = 0;
2864 int extra = 0;
2745 2865
2746 for (; row <= end_row; row++, col = 0) 2866 for (; row <= end_row; row++, col = 0)
2747 { 2867 {
2748 t = & (screen.text[row][col]); 2868 t = &(screen.text[row][col]);
2749 2869
2750 end_col = screen.tlen[row]; 2870 end_col = screen.tlen[row];
2751 2871
2752 if (end_col == -1) 2872 if (end_col == -1)
2753 end_col = TermWin.ncol; 2873 end_col = TermWin.ncol;
2754 2874
2755 if (row == end_row) 2875 if (row == end_row)
2756 MIN_IT (end_col, selection.end.col); 2876 MIN_IT (end_col, selection.end.col);
2757 2877
2758 for (; col < end_col; col++) 2878 for (; col < end_col; col++)
2879 {
2759 if (*t == NOCHAR) 2880 if (*t == NOCHAR)
2760 t++; 2881 t++;
2882#if ENABLE_COMBINING
2883 else if (IS_COMPOSE (*t))
2884 {
2885 int len = rxvt_composite.expand (*t, 0);
2886
2887 extra -= (len - 1);
2888
2889 if (extra < 0)
2890 {
2891 extra += i;
2892 i += i;
2893 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2894 }
2895
2896 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2897 }
2898#endif
2761 else 2899 else
2762 { 2900 new_selection_text[ofs++] = *t++;
2763 int len = wctomb (str, *t++);
2764 if (len > 0)
2765 str += len;
2766 } 2901 }
2767 2902
2768 if (screen.tlen[row] != -1 && row != end_row) 2903 if (screen.tlen[row] != -1 && row != end_row)
2769 *str++ = '\n'; 2904 new_selection_text[ofs++] = C0_LF;
2770 } 2905 }
2771 2906
2772#ifndef NO_OLD_SELECTION
2773 if (selection_style == OLD_SELECT)
2774 if (end_col == TermWin.ncol)
2775 *str++ = '\n';
2776#endif
2777#ifndef NO_NEW_SELECTION
2778 if (selection_style != OLD_SELECT)
2779 if (end_col != selection.end.col) 2907 if (end_col != selection.end.col)
2780 *str++ = '\n'; 2908 new_selection_text[ofs++] = C0_LF;
2781#endif
2782 *str = '\0';
2783 2909
2784 i = str - (char *)new_selection_text; 2910 new_selection_text[ofs] = 0;
2911
2785 if (i == 0) 2912 if (ofs == 0)
2786 { 2913 {
2787 free (new_selection_text); 2914 free (new_selection_text);
2788 return; 2915 return;
2789 } 2916 }
2790 2917
2791 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2792 if (str - (char *)new_selection_text > 1024)
2793 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2794
2795 selection.len = i;
2796
2797 if (selection.text)
2798 free (selection.text); 2918 free (selection.text);
2799 2919
2800 selection.text = new_selection_text; 2920 // we usually allocate much more than necessary, so realloc it smaller again
2921 selection.len = ofs;
2922 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2801 2923
2802 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2924 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2803 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2925 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2804 display->set_selection_owner (this); 2926 display->set_selection_owner (this);
2805 else 2927 else
2806 rxvt_print_error ("can't get primary selection"); 2928 rxvt_warn ("can't get primary selection, ignoring.\n");
2807 2929
2808 { 2930#if 0
2809 XTextProperty ct; 2931 XTextProperty ct;
2810 char *cl = (char *)selection.text;
2811 2932
2812 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2933 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2813 { 2934 {
2814 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2815 PropModeReplace, ct.value, ct.nitems);
2816 XFree (ct.value);
2817 }
2818 else
2819 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2935 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2820 PropModeReplace, selection.text, (int)selection.len); 2936 PropModeReplace, ct.value, ct.nitems);
2937 XFree (ct.value);
2821 } 2938 }
2939#endif
2822 2940
2823 selection_time = tm; 2941 selection_time = tm;
2824 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); 2942 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2825} 2943}
2826 2944
… …
2855rxvt_term::selection_start_colrow (int col, int row) 2973rxvt_term::selection_start_colrow (int col, int row)
2856{ 2974{
2857 want_refresh = 1; 2975 want_refresh = 1;
2858 selection.mark.col = col; 2976 selection.mark.col = col;
2859 selection.mark.row = row - TermWin.view_start; 2977 selection.mark.row = row - TermWin.view_start;
2978
2860 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2979 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2861 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2980 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2862 MAX_IT (selection.mark.col, 0); 2981 MAX_IT (selection.mark.col, 0);
2863 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2982 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2864 2983
2984 while (selection.mark.col > 0
2985 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2986 --selection.mark.col;
2987
2865 if (selection.op) 2988 if (selection.op)
2866 { /* clear the old selection */ 2989 { /* clear the old selection */
2867 selection.beg.row = selection.end.row = selection.mark.row; 2990 selection.beg.row = selection.end.row = selection.mark.row;
2868 selection.beg.col = selection.end.col = selection.mark.col; 2991 selection.beg.col = selection.end.col = selection.mark.col;
2869 } 2992 }
2993
2870 selection.op = SELECTION_INIT; 2994 selection.op = SELECTION_INIT;
2871 selection.screen = current_screen; 2995 selection.screen = current_screen;
2872} 2996}
2873 2997
2874/* ------------------------------------------------------------------------- */ 2998/* ------------------------------------------------------------------------- */
… …
2876 * Word select: select text for 2 clicks 3000 * Word select: select text for 2 clicks
2877 * We now only find out the boundary in one direction 3001 * We now only find out the boundary in one direction
2878 */ 3002 */
2879 3003
2880/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3004/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2881#define DELIMIT_TEXT(x) \ 3005#define DELIMIT_TEXT(x) \
2882 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 3006 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x)))
2883#define DELIMIT_REND(x) 1 3007#define DELIMIT_REND(x) 1
2884 3008
2885void 3009void
2886rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3010rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2887{ 3011{
2888 int col, row, dirnadd, tcol, trow, w1, w2; 3012 int col, row, dirnadd, tcol, trow, w1, w2;
2889 row_col_t bound; 3013 row_col_t bound;
2890 text_t *stp; 3014 text_t *stp;
2891 rend_t *srp; 3015 rend_t *srp;
2892 3016
2893 if (dirn == UP) 3017 if (dirn == UP)
2894 { 3018 {
2895 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3019 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2896 bound.col = 0; 3020 bound.col = 0;
… …
2900 { 3024 {
2901 bound.row = TermWin.saveLines + TermWin.nrow; 3025 bound.row = TermWin.saveLines + TermWin.nrow;
2902 bound.col = TermWin.ncol - 1; 3026 bound.col = TermWin.ncol - 1;
2903 dirnadd = 1; 3027 dirnadd = 1;
2904 } 3028 }
3029
2905 row = mark->row + TermWin.saveLines; 3030 row = mark->row + TermWin.saveLines;
2906 col = mark->col; 3031 col = mark->col;
2907 MAX_IT (col, 0); 3032 MAX_IT (col, 0);
2908 /* find the edge of a word */ 3033 /* find the edge of a word */
2909 stp = & (screen.text[row][col]); 3034 stp = & (screen.text[row][col]);
2910 w1 = DELIMIT_TEXT (*stp); 3035 w1 = DELIMIT_TEXT (*stp);
2911 3036
2912 if (selection_style != NEW_SELECT)
2913 {
2914 if (w1 == 1)
2915 {
2916 stp += dirnadd;
2917 if (DELIMIT_TEXT (*stp) == 1)
2918 goto Old_Word_Selection_You_Die;
2919 col += dirnadd;
2920 }
2921 w1 = 0;
2922 }
2923 srp = (&screen.rend[row][col]); 3037 srp = (&screen.rend[row][col]);
2924 w2 = DELIMIT_REND (*srp); 3038 w2 = DELIMIT_REND (*srp);
2925 3039
2926 for (;;) 3040 for (;;)
2927 { 3041 {
2928 for (; col != bound.col; col += dirnadd) 3042 for (; col != bound.col; col += dirnadd)
2929 { 3043 {
2930 stp += dirnadd; 3044 stp += dirnadd;
3045 srp += dirnadd;
3046
3047 if (*stp == NOCHAR)
3048 continue;
3049
2931 if (DELIMIT_TEXT (*stp) != w1) 3050 if (DELIMIT_TEXT (*stp) != w1)
2932 break; 3051 break;
2933 srp += dirnadd;
2934 if (DELIMIT_REND (*srp) != w2) 3052 if (DELIMIT_REND (*srp) != w2)
2935 break; 3053 break;
2936 } 3054 }
3055
2937 if ((col == bound.col) && (row != bound.row)) 3056 if ((col == bound.col) && (row != bound.row))
2938 { 3057 {
2939 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3058 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2940 { 3059 {
2941 trow = row + dirnadd; 3060 trow = row + dirnadd;
2942 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3061 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3062
2943 if (screen.text[trow] == NULL) 3063 if (screen.text[trow] == NULL)
2944 break; 3064 break;
3065
2945 stp = & (screen.text[trow][tcol]); 3066 stp = & (screen.text[trow][tcol]);
2946 srp = & (screen.rend[trow][tcol]); 3067 srp = & (screen.rend[trow][tcol]);
3068
2947 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3069 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2948 break; 3070 break;
3071
2949 row = trow; 3072 row = trow;
2950 col = tcol; 3073 col = tcol;
2951 continue; 3074 continue;
2952 } 3075 }
2953 } 3076 }
2954 break; 3077 break;
2955 } 3078 }
3079
2956Old_Word_Selection_You_Die: 3080Old_Word_Selection_You_Die:
2957 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)); 3081 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));
2958 3082
2959 if (dirn == DN) 3083 if (dirn == DN)
2960 col++; /* put us on one past the end */ 3084 col++; /* put us on one past the end */
… …
2982 MAX_IT (row, 0); 3106 MAX_IT (row, 0);
2983 MIN_IT (row, (int)TermWin.nrow - 1); 3107 MIN_IT (row, (int)TermWin.nrow - 1);
2984 MAX_IT (col, 0); 3108 MAX_IT (col, 0);
2985 MIN_IT (col, (int)TermWin.ncol); 3109 MIN_IT (col, (int)TermWin.ncol);
2986 3110
2987#ifndef NO_NEW_SELECTION
2988 /* 3111 /*
2989 * If we're selecting characters (single click) then we must check first 3112 * If we're selecting characters (single click) then we must check first
2990 * if we are at the same place as the original mark. If we are then 3113 * if we are at the same place as the original mark. If we are then
2991 * select nothing. Otherwise, if we're to the right of the mark, you have to 3114 * select nothing. Otherwise, if we're to the right of the mark, you have to
2992 * be _past_ a character for it to be selected. 3115 * be _past_ a character for it to be selected.
2993 */ 3116 */
2994 if (selection_style != OLD_SELECT)
2995 {
2996 if (((selection.clicks % 3) == 1) && !flag 3117 if (((selection.clicks % 3) == 1) && !flag
2997 && (col == selection.mark.col 3118 && (col == selection.mark.col
2998 && (row == selection.mark.row + TermWin.view_start))) 3119 && (row == selection.mark.row + TermWin.view_start)))
2999 { 3120 {
3000 /* select nothing */ 3121 /* select nothing */
3001 selection.beg.row = selection.end.row = 0; 3122 selection.beg.row = selection.end.row = 0;
3002 selection.beg.col = selection.end.col = 0; 3123 selection.beg.col = selection.end.col = 0;
3003 selection.clicks = 4; 3124 selection.clicks = 4;
3004 want_refresh = 1; 3125 want_refresh = 1;
3005 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); 3126 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3006 return; 3127 return;
3007 }
3008 } 3128 }
3009#endif 3129
3010 if (selection.clicks == 4) 3130 if (selection.clicks == 4)
3011 selection.clicks = 1; 3131 selection.clicks = 1;
3012 3132
3013 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3133 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3014 flag == 1 ? 1 : 0, /* ? button press */ 3134 flag == 1 ? 1 : 0, /* ? button press */
… …
3020 * Extend the selection to the specified col/row 3140 * Extend the selection to the specified col/row
3021 */ 3141 */
3022void 3142void
3023rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3143rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3024{ 3144{
3025 int16_t ncol = TermWin.ncol; 3145 int16_t ncol = TermWin.ncol;
3026 int end_col; 3146 int end_col;
3027 row_col_t pos; 3147 row_col_t pos;
3028 enum { 3148 enum {
3029 LEFT, RIGHT 3149 LEFT, RIGHT
3030 } closeto = RIGHT; 3150 } closeto = RIGHT;
3031 3151
3032 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)); 3152 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));
… …
3068 pos.col = col; 3188 pos.col = col;
3069 pos.row = row; 3189 pos.row = row;
3070 3190
3071 pos.row -= TermWin.view_start; /* adjust for scroll */ 3191 pos.row -= TermWin.view_start; /* adjust for scroll */
3072 3192
3073#ifndef NO_OLD_SELECTION
3074 /*
3075 * This mimics some of the selection behaviour of version 2.20 and before.
3076 * There are no ``selection modes'', button3 is always character extension.
3077 * Note: button3 drag is always available, c.f. v2.20
3078 * Selection always terminates (left or right as appropriate) at the mark.
3079 */
3080 if (selection_style == OLD_SELECT)
3081 {
3082 if (selection.clicks == 1 || button3)
3083 {
3084 if (hate_those_clicks)
3085 {
3086 hate_those_clicks = 0;
3087 if (selection.clicks == 1)
3088 {
3089 selection.beg.row = selection.mark.row;
3090 selection.beg.col = selection.mark.col;
3091 }
3092 else
3093 {
3094 selection.mark.row = selection.beg.row;
3095 selection.mark.col = selection.beg.col;
3096 }
3097 }
3098 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3099 {
3100 selection.end.row = selection.mark.row;
3101 selection.end.col = selection.mark.col + 1;
3102 selection.beg.row = pos.row;
3103 selection.beg.col = pos.col;
3104 }
3105 else
3106 {
3107 selection.beg.row = selection.mark.row;
3108 selection.beg.col = selection.mark.col;
3109 selection.end.row = pos.row;
3110 selection.end.col = pos.col + 1;
3111 }
3112 }
3113 else if (selection.clicks == 2)
3114 {
3115 selection_delimit_word (UP, & (selection.mark),
3116 & (selection.beg));
3117 selection_delimit_word (DN, & (selection.mark),
3118 & (selection.end));
3119 hate_those_clicks = 1;
3120 }
3121 else if (selection.clicks == 3)
3122 {
3123 selection.beg.row = selection.end.row = selection.mark.row;
3124 selection.beg.col = 0;
3125 selection.end.col = ncol;
3126 hate_those_clicks = 1;
3127 }
3128 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));
3129 return;
3130 }
3131#endif /* ! NO_OLD_SELECTION */
3132#ifndef NO_NEW_SELECTION
3133 /* selection_style must not be OLD_SELECT to get here */
3134 /* 3193 /*
3135 * This is mainly xterm style selection with a couple of differences, mainly 3194 * This is mainly xterm style selection with a couple of differences, mainly
3136 * in the way button3 drag extension works. 3195 * in the way button3 drag extension works.
3137 * We're either doing: button1 drag; button3 press; or button3 drag 3196 * We're either doing: button1 drag; button3 press; or button3 drag
3138 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3197 * a) button1 drag : select around a midpoint/word/line - that point/word/line
… …
3143 * a point/word/line which is either the start or end of the selection 3202 * a point/word/line which is either the start or end of the selection
3144 * and it was decided by whichever point/word/line was `fixed' at the 3203 * and it was decided by whichever point/word/line was `fixed' at the
3145 * time of the most recent button3 press 3204 * time of the most recent button3 press
3146 */ 3205 */
3147 if (button3 && buttonpress) 3206 if (button3 && buttonpress)
3148 { /* button3 press */ 3207 { /* button3 press */
3149 /* 3208 /*
3150 * first determine which edge of the selection we are closest to 3209 * first determine which edge of the selection we are closest to
3151 */ 3210 */
3152 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3211 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3153 || (!ROWCOL_IS_AFTER (pos, selection.end) 3212 || (!ROWCOL_IS_AFTER (pos, selection.end)
3154 && (((pos.col - selection.beg.col) 3213 && (((pos.col - selection.beg.col)
3155 + ((pos.row - selection.beg.row) * ncol)) 3214 + ((pos.row - selection.beg.row) * ncol))
3156 < ((selection.end.col - pos.col) 3215 < ((selection.end.col - pos.col)
3157 + ((selection.end.row - pos.row) * ncol))))) 3216 + ((selection.end.row - pos.row) * ncol)))))
3158 closeto = LEFT; 3217 closeto = LEFT;
3218
3159 if (closeto == LEFT) 3219 if (closeto == LEFT)
3160 { 3220 {
3161 selection.beg.row = pos.row; 3221 selection.beg.row = pos.row;
3162 selection.beg.col = pos.col; 3222 selection.beg.col = pos.col;
3163 selection.mark.row = selection.end.row; 3223 selection.mark.row = selection.end.row;
3164 selection.mark.col = selection.end.col 3224 selection.mark.col = selection.end.col - (selection.clicks == 2);
3165 - (selection.clicks == 2);
3166 } 3225 }
3167 else 3226 else
3168 { 3227 {
3169 selection.end.row = pos.row; 3228 selection.end.row = pos.row;
3170 selection.end.col = pos.col; 3229 selection.end.col = pos.col;
3171 selection.mark.row = selection.beg.row; 3230 selection.mark.row = selection.beg.row;
3172 selection.mark.col = selection.beg.col; 3231 selection.mark.col = selection.beg.col;
3173 } 3232 }
3174 } 3233 }
3175 else 3234 else
3176 { /* button1 drag or button3 drag */ 3235 { /* button1 drag or button3 drag */
3177 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3236 if (ROWCOL_IS_AFTER (selection.mark, pos))
3178 { 3237 {
3179 if ((selection.mark.row == selection.end.row) 3238 if ((selection.mark.row == selection.end.row)
3180 && (selection.mark.col == selection.end.col) 3239 && (selection.mark.col == selection.end.col)
3181 && clickchange && selection.clicks == 2) 3240 && clickchange && selection.clicks == 2)
3182 selection.mark.col--; 3241 selection.mark.col--;
3242
3183 selection.beg.row = pos.row; 3243 selection.beg.row = pos.row;
3184 selection.beg.col = pos.col; 3244 selection.beg.col = pos.col;
3185 selection.end.row = selection.mark.row; 3245 selection.end.row = selection.mark.row;
3186 selection.end.col = selection.mark.col 3246 selection.end.col = selection.mark.col + (selection.clicks == 2);
3187 + (selection.clicks == 2);
3188 } 3247 }
3189 else 3248 else
3190 { 3249 {
3191 selection.beg.row = selection.mark.row; 3250 selection.beg.row = selection.mark.row;
3192 selection.beg.col = selection.mark.col; 3251 selection.beg.col = selection.mark.col;
… …
3196 } 3255 }
3197 3256
3198 if (selection.clicks == 1) 3257 if (selection.clicks == 1)
3199 { 3258 {
3200 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3259 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3260
3201 if (end_col != -1 && selection.beg.col > end_col) 3261 if (end_col != -1 && selection.beg.col > end_col)
3202 { 3262 {
3203#if 1 3263#if 1
3204 selection.beg.col = ncol; 3264 selection.beg.col = ncol;
3205#else 3265#else
3206 if (selection.beg.row != selection.end.row) 3266 if (selection.beg.row != selection.end.row)
3207 selection.beg.col = ncol; 3267 selection.beg.col = ncol;
3208 else 3268 else
3209 selection.beg.col = selection.mark.col; 3269 selection.beg.col = selection.mark.col;
3210#endif 3270#endif
3211
3212 } 3271 }
3272
3213 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3273 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3274
3214 if (end_col != -1 && selection.end.col > end_col) 3275 if (end_col != -1 && selection.end.col > end_col)
3215 selection.end.col = ncol; 3276 selection.end.col = ncol;
3216
3217 } 3277 }
3218 else if (selection.clicks == 2) 3278 else if (selection.clicks == 2)
3219 { 3279 {
3220 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3280 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3221 selection.end.col--; 3281 selection.end.col--;
3282
3222 selection_delimit_word (UP, & (selection.beg), 3283 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3223 & (selection.beg));
3224 selection_delimit_word (DN, & (selection.end), 3284 selection_delimit_word (DN, & (selection.end), & (selection.end));
3225 & (selection.end));
3226 } 3285 }
3227 else if (selection.clicks == 3) 3286 else if (selection.clicks == 3)
3228 { 3287 {
3229#ifndef NO_FRILLS 3288#ifndef NO_FRILLS
3230 if ((Options & Opt_tripleclickwords)) 3289 if ((Options & Opt_tripleclickwords))
3231 { 3290 {
3232 int end_row; 3291 int end_row;
3233 3292
3234 selection_delimit_word (UP, & (selection.beg), 3293 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3235 & (selection.beg));
3236 end_row = screen.tlen[selection.mark.row 3294 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3237 + TermWin.saveLines]; 3295
3238 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3296 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3239 end_row++)
3240 { 3297 {
3241 end_col = screen.tlen[end_row + TermWin.saveLines]; 3298 end_col = screen.tlen[end_row + TermWin.saveLines];
3299
3242 if (end_col != -1) 3300 if (end_col != -1)
3243 { 3301 {
3244 selection.end.row = end_row; 3302 selection.end.row = end_row;
3245 selection.end.col = end_col; 3303 selection.end.col = end_col;
3246 selection_remove_trailing_spaces (); 3304 selection_remove_trailing_spaces ();
… …
3248 } 3306 }
3249 } 3307 }
3250 } 3308 }
3251 else 3309 else
3252#endif 3310#endif
3253
3254 { 3311 {
3255 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3312 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3256 selection.mark.col++; 3313 selection.mark.col++;
3257 selection.beg.col = 0; 3314 selection.beg.col = 0;
3258 selection.end.col = ncol; 3315 selection.end.col = ncol;
3259 } 3316 }
3260 } 3317 }
3318
3261 if (button3 && buttonpress) 3319 if (button3 && buttonpress)
3262 { /* mark may need to be changed */ 3320 { /* mark may need to be changed */
3263 if (closeto == LEFT) 3321 if (closeto == LEFT)
3264 { 3322 {
3265 selection.mark.row = selection.end.row; 3323 selection.mark.row = selection.end.row;
3266 selection.mark.col = selection.end.col 3324 selection.mark.col = selection.end.col
3267 - (selection.clicks == 2); 3325 - (selection.clicks == 2);
… …
3271 selection.mark.row = selection.beg.row; 3329 selection.mark.row = selection.beg.row;
3272 selection.mark.col = selection.beg.col; 3330 selection.mark.col = selection.beg.col;
3273 } 3331 }
3274 } 3332 }
3275 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)); 3333 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));
3276#endif /* ! NO_NEW_SELECTION */
3277} 3334}
3278 3335
3279#ifndef NO_FRILLS 3336#ifndef NO_FRILLS
3280void 3337void
3281rxvt_term::selection_remove_trailing_spaces () 3338rxvt_term::selection_remove_trailing_spaces ()
… …
3355 ev.target = rq.target; 3412 ev.target = rq.target;
3356 ev.time = rq.time; 3413 ev.time = rq.time;
3357 3414
3358 if (rq.target == xa[XA_TARGETS]) 3415 if (rq.target == xa[XA_TARGETS])
3359 { 3416 {
3360 Atom32 target_list[5]; 3417 Atom32 target_list[6];
3361 Atom32 *target = target_list; 3418 Atom32 *target = target_list;
3362 3419
3363 *target++ = (Atom32) xa[XA_TARGETS]; 3420 *target++ = (Atom32) xa[XA_TARGETS];
3421 *target++ = (Atom32) xa[XA_TIMESTAMP];
3364 *target++ = (Atom32) XA_STRING; 3422 *target++ = (Atom32) XA_STRING;
3365 *target++ = (Atom32) xa[XA_TEXT]; 3423 *target++ = (Atom32) xa[XA_TEXT];
3366 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3424 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3367#if X_HAVE_UTF8_STRING 3425#if X_HAVE_UTF8_STRING
3368 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3426 *target++ = (Atom32) xa[XA_UTF8_STRING];
3369#endif 3427#endif
3428
3370 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3429 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3371 (8 * sizeof (target_list[0])), PropModeReplace, 3430 (8 * sizeof (target_list[0])), PropModeReplace,
3372 (unsigned char *)target_list, 3431 (unsigned char *)target_list,
3373 target - target_list); 3432 target - target_list);
3374 ev.property = rq.property; 3433 ev.property = rq.property;
3375 } 3434 }
3376 else if (rq.target == xa[XA_MULTIPLE]) 3435 else if (rq.target == xa[XA_MULTIPLE])
3377 { 3436 {
3378 /* TODO: Handle MULTIPLE */ 3437 /* TODO: Handle MULTIPLE */
3379 } 3438 }
3380 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3439 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3381 { 3440 {
3382 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3441 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3383 (8 * sizeof (Time)), PropModeReplace, 3442 (8 * sizeof (Time)), PropModeReplace,
3384 (unsigned char *)&selection_time, 1); 3443 (unsigned char *)&selection_time, 1);
3385 ev.property = rq.property; 3444 ev.property = rq.property;
3386 } 3445 }
3387 else if (rq.target == XA_STRING 3446 else if (rq.target == XA_STRING
3388 || rq.target == xa[XA_TEXT] 3447 || rq.target == xa[XA_TEXT]
3389 || rq.target == xa[XA_COMPOUND_TEXT] 3448 || rq.target == xa[XA_COMPOUND_TEXT]
3390 || rq.target == xa[XA_UTF8_STRING] 3449 || rq.target == xa[XA_UTF8_STRING]
3391 ) 3450 )
3392 { 3451 {
3393 short freect = 0; 3452 short freect = 0;
3394 int selectlen; 3453 int selectlen;
3395 char *cl; 3454 wchar_t *cl;
3396 3455
3397 target = rq.target; 3456 target = rq.target;
3398 3457
3399 if (target == XA_STRING) 3458 if (target == XA_STRING)
3400 // we actually don't do XA_STRING, but who cares, as i18n clients 3459 // we actually don't do XA_STRING, but who cares, as i18n clients
3401 // will ask for another format anyways. 3460 // will ask for another format anyways.
3402 style = XStringStyle; 3461 style = XStringStyle;
3403 else if (target == xa[XA_TEXT]) 3462 else if (target == xa[XA_TEXT])
3404 style = XTextStyle; 3463 style = XStdICCTextStyle;
3405 else if (target == xa[XA_COMPOUND_TEXT]) 3464 else if (target == xa[XA_COMPOUND_TEXT])
3406 style = XCompoundTextStyle; 3465 style = XCompoundTextStyle;
3407#if X_HAVE_UTF8_STRING 3466#if X_HAVE_UTF8_STRING
3408 else if (target == xa[XA_UTF8_STRING]) 3467 else if (target == xa[XA_UTF8_STRING])
3409 style = XUTF8StringStyle; 3468 style = XUTF8StringStyle;
… …
3414 style = XCompoundTextStyle; 3473 style = XCompoundTextStyle;
3415 } 3474 }
3416 3475
3417 if (selection.text) 3476 if (selection.text)
3418 { 3477 {
3419 cl = (char *)selection.text; 3478 cl = selection.text;
3420 selectlen = selection.len; 3479 selectlen = selection.len;
3421 } 3480 }
3422 else 3481 else
3423 { 3482 {
3424 cl = ""; 3483 cl = L"";
3425 selectlen = 0; 3484 selectlen = 0;
3426 } 3485 }
3427 3486
3487 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3488 // manually for XUTF8StringStyle.
3428 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3489 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3429 freect = 1; 3490 freect = 1;
3430 else 3491 else
3431 { 3492 {
3432 /* if we failed to convert then send it raw */ 3493 /* if we failed to convert then send it raw */
3433 ct.value = (unsigned char *)cl; 3494 ct.value = (unsigned char *)cl;
… …
3440 ev.property = rq.property; 3501 ev.property = rq.property;
3441 3502
3442 if (freect) 3503 if (freect)
3443 XFree (ct.value); 3504 XFree (ct.value);
3444 } 3505 }
3506
3445 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3507 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3446} 3508}
3447 3509
3448/* ------------------------------------------------------------------------- * 3510/* ------------------------------------------------------------------------- *
3449 * MOUSE ROUTINES * 3511 * MOUSE ROUTINES *
… …
3473 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3535 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace;
3474} 3536}
3475 3537
3476#endif 3538#endif
3477/* ------------------------------------------------------------------------- */ 3539/* ------------------------------------------------------------------------- */
3478
3479/* ------------------------------------------------------------------------- *
3480 * DEBUG ROUTINES *
3481 * ------------------------------------------------------------------------- */
3482#if 0
3483void
3484rxvt_debug_colors (void)
3485{
3486 int color;
3487 const char *name[] =
3488 {
3489 "fg", "bg",
3490 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3491 };
3492
3493 fprintf (stderr, "Color ( ");
3494 if (rstyle & RS_RVid)
3495 fprintf (stderr, "rvid ");
3496 if (rstyle & RS_Bold)
3497 fprintf (stderr, "bold ");
3498 if (rstyle & RS_Blink)
3499 fprintf (stderr, "blink ");
3500 if (rstyle & RS_Uline)
3501 fprintf (stderr, "uline ");
3502 fprintf (stderr, "): ");
3503
3504 color = GET_FGCOLOR (rstyle);
3505#ifndef NO_BRIGHTCOLOR
3506 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3507 {
3508 color -= (minBrightCOLOR - minCOLOR);
3509 fprintf (stderr, "bright ");
3510 }
3511#endif
3512 fprintf (stderr, "%s on ", name[color]);
3513
3514 color = GET_BGCOLOR (rstyle);
3515#ifndef NO_BRIGHTCOLOR
3516 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3517 {
3518 color -= (minBrightCOLOR - minCOLOR);
3519 fprintf (stderr, "bright ");
3520 }
3521#endif
3522 fprintf (stderr, "%s\n", name[color]);
3523}
3524#endif

Diff Legend

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