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.37 by pcg, Tue Feb 24 23:58:13 2004 UTC vs.
Revision 1.85 by root, Sun Aug 8 16:43:21 2004 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.c 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
6 * 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;
… …
705 if (j > 0) 705 if (j > 0)
706 { 706 {
707 /* A: scroll up */ 707 /* A: scroll up */
708 708
709 /* A1: Copy lines that will get clobbered by the rotation */ 709 /* A1: Copy lines that will get clobbered by the rotation */
710 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
711 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
712
713 /* A2: Rotate lines */
714 i = row2 - row1 - count + 1;
715 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
716 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
717 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
718
719 j = row2 - count + 1, i = count;
720 }
721 else /* if (j < 0) */
722 {
723 /* B: scroll down */
724
725 /* B1: Copy lines that will get clobbered by the rotation */
710 for (i = 0, j = row1; i < count; i++, j++) 726 for (i = 0, j = row2; i < count; i++, j--)
711 { 727 {
712 buf_text[i] = screen.text[j]; 728 buf_text[i] = screen.text[j];
713 buf_rend[i] = screen.rend[j]; 729 buf_rend[i] = screen.rend[j];
714 } 730 }
731
715 /* A2: Rotate lines */ 732 /* B2: Rotate lines */
716 for (j = row1, i = j + count; i <= row2; i++, j++) 733 for (j = row2, i = j - count; i >= row1; i--, j--)
717 { 734 {
718 screen.tlen[j] = screen.tlen[i]; 735 screen.tlen[j] = screen.tlen[i];
719 screen.text[j] = screen.text[i]; 736 screen.text[j] = screen.text[i];
720 screen.rend[j] = screen.rend[i]; 737 screen.rend[j] = screen.rend[i];
721 } 738 }
722 j = row2 - count + 1, i = count;
723 }
724 else /* if (j < 0) */
725 {
726 /* B: scroll down */
727 739
728 /* B1: Copy lines that will get clobbered by the rotation */
729 for (i = 0, j = row2; i < count; i++, j--)
730 {
731 buf_text[i] = screen.text[j];
732 buf_rend[i] = screen.rend[j];
733 }
734 /* B2: Rotate lines */
735 for (j = row2, i = j - count; i >= row1; i--, j--)
736 {
737 screen.tlen[j] = screen.tlen[i];
738 screen.text[j] = screen.text[i];
739 screen.rend[j] = screen.rend[i];
740 }
741 j = row1, i = count; 740 j = row1, i = count;
742 count = -count; 741 count = -count;
743 } 742 }
744 743
745 /* C: Resurrect lines */ 744 /* C: Resurrect lines */
745 memset (screen.tlen + j, 0, i * sizeof (int16_t));
746 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
747 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
748 if (!spec) /* line length may not equal TermWin.ncol */
746 for (; i--; j++) 749 for (; i--; j++)
747 {
748 screen.tlen[j] = 0;
749 screen.text[j] = buf_text[i];
750 screen.rend[j] = buf_rend[i];
751
752 if (!spec) /* line length may not equal TermWin.ncol */
753 scr_blank_screen_mem (screen.text, screen.rend, 750 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
754 (unsigned int)j, rstyle);
755 }
756 751
757 return count; 752 return count;
758} 753}
759 754
760/* ------------------------------------------------------------------------- */ 755/* ------------------------------------------------------------------------- */
761/* 756/*
762 * Add text given in <str> of length <len> to screen struct 757 * Add text given in <str> of length <len> to screen struct
763 */ 758 */
764void 759void
765rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) 760rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
766{ 761{
767 unsigned char checksel, clearsel; 762 unsigned char checksel, clearsel;
768 uint32_t c; 763 unicode_t c;
769 int i, row, last_col; 764 int i, row, last_col;
770 text_t *stp; 765 text_t *stp;
771 rend_t *srp; 766 rend_t *srp;
772 767
773 if (len <= 0) /* sanity */ 768 if (len <= 0) /* sanity */
774 return; 769 return;
775 770
776 want_refresh = 1; 771 want_refresh = 1;
… …
778 773
779 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len)); 774 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
780 ZERO_SCROLLBACK (); 775 ZERO_SCROLLBACK ();
781 if (nlines > 0) 776 if (nlines > 0)
782 { 777 {
783 nlines += (screen.cur.row - screen.bscroll); 778 nlines += screen.cur.row - screen.bscroll;
784 if ((nlines > 0) 779 if ((nlines > 0)
785 && (screen.tscroll == 0) 780 && (screen.tscroll == 0)
786 && (screen.bscroll == (TermWin.nrow - 1))) 781 && (screen.bscroll == (TermWin.nrow - 1)))
787 { 782 {
788 /* _at least_ this many lines need to be scrolled */ 783 /* _at least_ this many lines need to be scrolled */
… …
791 } 786 }
792 } 787 }
793#ifdef DEBUG_STRICT 788#ifdef DEBUG_STRICT
794 assert (screen.cur.col < last_col); 789 assert (screen.cur.col < last_col);
795 assert ((screen.cur.row < TermWin.nrow) 790 assert ((screen.cur.row < TermWin.nrow)
796 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 791 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
797#else /* drive with your eyes closed */ 792#else /* drive with your eyes closed */
798 MIN_IT (screen.cur.col, last_col - 1); 793 MIN_IT (screen.cur.col, last_col - 1);
799 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 794 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
800 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 795 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
801#endif 796#endif
802 row = screen.cur.row + TermWin.saveLines; 797 row = screen.cur.row + TermWin.saveLines;
803 798
804 checksel = (selection.op 799 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
805 && current_screen == selection.screen) ? 1 : 0;
806 clearsel = 0; 800 clearsel = 0;
807 801
808 stp = screen.text[row]; 802 stp = screen.text[row];
809 srp = screen.rend[row]; 803 srp = screen.rend[row];
810 804
811 for (i = 0; i < len;) 805 while (len--)
812 { 806 {
813 c = str[i++]; 807 c = *str++;
808
809 if (c < 0x20)
814 switch (c) 810 switch (c)
815 { 811 {
816 case '\t': 812 case C0_HT:
817 scr_tab (1); 813 scr_tab (1);
818 continue; 814 continue;
819 case '\n': 815
816 case C0_LF:
820 if (screen.tlen[row] != -1) /* XXX: think about this */ 817 if (screen.tlen[row] != -1) /* XXX: think about this */
821 MAX_IT (screen.tlen[row], screen.cur.col); 818 MAX_IT (screen.tlen[row], screen.cur.col);
819
822 screen.flags &= ~Screen_WrapNext; 820 screen.flags &= ~Screen_WrapNext;
821
823 if (screen.cur.row == screen.bscroll) 822 if (screen.cur.row == screen.bscroll)
824 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 823 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
825 else if (screen.cur.row < (TermWin.nrow - 1)) 824 else if (screen.cur.row < (TermWin.nrow - 1))
826 row = (++screen.cur.row) + TermWin.saveLines; 825 row = (++screen.cur.row) + TermWin.saveLines;
826
827 stp = screen.text[row]; /* _must_ refresh */ 827 stp = screen.text[row]; /* _must_ refresh */
828 srp = screen.rend[row]; /* _must_ refresh */ 828 srp = screen.rend[row]; /* _must_ refresh */
829 continue; 829 continue;
830 case '\r': 830
831 case C0_CR:
831 if (screen.tlen[row] != -1) /* XXX: think about this */ 832 if (screen.tlen[row] != -1) /* XXX: think about this */
832 MAX_IT (screen.tlen[row], screen.cur.col); 833 MAX_IT (screen.tlen[row], screen.cur.col);
834
833 screen.flags &= ~Screen_WrapNext; 835 screen.flags &= ~Screen_WrapNext;
834 screen.cur.col = 0; 836 screen.cur.col = 0;
835 continue; 837 continue;
836 default:
837 if (c == 127)
838 continue; /* yummmm..... */
839 break;
840 } 838 }
841 839
842 if (checksel /* see if we're writing within selection */ 840 if (checksel /* see if we're writing within selection */
843 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 841 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
844 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 842 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
845 { 843 {
846 checksel = 0; 844 checksel = 0;
847 clearsel = 1; 845 clearsel = 1;
848 } 846 }
847
849 if (screen.flags & Screen_WrapNext) 848 if (screen.flags & Screen_WrapNext)
850 { 849 {
851 screen.tlen[row] = -1; 850 screen.tlen[row] = -1;
852 if (screen.cur.row == screen.bscroll) 851 if (screen.cur.row == screen.bscroll)
853 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 852 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
854 else if (screen.cur.row < (TermWin.nrow - 1)) 853 else if (screen.cur.row < (TermWin.nrow - 1))
855 row = (++screen.cur.row) + TermWin.saveLines; 854 row = (++screen.cur.row) + TermWin.saveLines;
855
856 stp = screen.text[row]; /* _must_ refresh */ 856 stp = screen.text[row]; /* _must_ refresh */
857 srp = screen.rend[row]; /* _must_ refresh */ 857 srp = screen.rend[row]; /* _must_ refresh */
858 screen.cur.col = 0; 858 screen.cur.col = 0;
859 screen.flags &= ~Screen_WrapNext; 859 screen.flags &= ~Screen_WrapNext;
860 } 860 }
861
861 if (screen.flags & Screen_Insert) 862 if (screen.flags & Screen_Insert)
862 scr_insdel_chars (1, INSERT); 863 scr_insdel_chars (1, INSERT);
863 864
865 // rely on wcwidth to tell us the character width, at least for non-latin1
866 // do wcwidth before further replacements, as wcwidth says that line-drawing
867 // characters have width -1 (DOH!) on GNU/Linux sometimes.
868 int width = c < 0x100 ? 1 : wcwidth (c);
869
864 if (charsets[screen.charset] == '0') // DEC SPECIAL 870 if (charsets[screen.charset] == '0') // DEC SPECIAL
865 switch (c)
866 { 871 {
867 // dunno where these come from
868#if 0
869 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break;
870 case '.': c = 0x2193; break; case '0': c = 0x25ae; break;
871#endif
872 // vt100 special graphics and line drawing 872 // vt100 special graphics and line drawing
873 case '`': c = 0x25c6; break; case '_': c = 0x0020; break; 873 static uint16_t vt100_0[32] = { // 5f .. 7e
874 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; 874 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
875 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; 875 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
876 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; 876 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
877 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; 877 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
878 case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break;
879 case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break;
880 case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break;
881 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break;
882 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break;
883 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
884 } 878 };
885 879
886 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 880 if (c >= 0x5f && c <= 0x7e)
887 // rely on wcwidth to tell us the character width, at least for non-ascii 881 {
888 int width = c <= 128 ? 1 : wcwidth (c); 882 c = vt100_0[c - 0x5f];
883 width = 1;
884 }
885 }
889 886
890 // width -1 characters (e.g. combining chars) are ignored currently.
891 if (width > 0) 887 if (width != 0)
888 {
889#if !UNICODE_3 && ENABLE_COMBINING
890 // trim characters we can't store directly :(
891 if (c >= 0x10000)
892 c = rxvt_composite.compose (c); // map to lower 16 bits
893#endif
894 bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0);
895 rend_t rend = SET_FONT (rstyle,
896 c > 0x7f || bold || c < 0x20
897 ? TermWin.fontset->find_font (c, bold)
898 : TermWin.ascii_map [c - 0x20]);
899
892 do 900 do
893 { 901 {
894 stp[screen.cur.col] = c; 902 stp[screen.cur.col] = c;
895 srp[screen.cur.col] = rend; 903 srp[screen.cur.col] = rend;
896 904
897 if (screen.cur.col < last_col - 1) 905 if (screen.cur.col < last_col - 1)
898 screen.cur.col++; 906 screen.cur.col++;
899 else 907 else
900 { 908 {
901 screen.tlen[row] = last_col; 909 screen.tlen[row] = last_col;
902 if (screen.flags & Screen_Autowrap) 910 if (screen.flags & Screen_Autowrap)
903 screen.flags |= Screen_WrapNext; 911 screen.flags |= Screen_WrapNext;
904 break; 912 break;
905 } 913 }
906 914
907 c = NOCHAR; 915 c = NOCHAR;
908 } 916 }
909 while (--width > 0); 917 while (--width > 0);
918
919 // pad with spaces when overwriting wide character with smaller one
920 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
921 {
922 stp[c] = ' ';
923 srp[c] = rend;
924 }
925 }
926 else if (width == 0)
927 {
928#if ENABLE_COMBINING
929 // handle combining characters
930 // we just tag the accent on the previous on-screen character.
931 // this is arguably not correct, but also arguably not wrong.
932 // we don't handle double-width characters nicely yet.
933
934 text_t *tp;
935 rend_t *rp;
936
937 if (screen.cur.col > 0)
938 {
939 tp = stp + screen.cur.col - 1;
940 rp = srp + screen.cur.col - 1;
941 }
942 else if (screen.cur.row > 0
943 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
944 {
945 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
946 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
947 }
910 else 948 else
911 (void)0; /* handle combining character etc. here. */ 949 continue;
950
951 // handle double-width-chars by making them look extremely ugly
952 if (*tp == NOCHAR)
953 *tp = ' '; // hack //D //TODO //--tp, --rp;
954
955 // first try to find a precomposed character
956 unicode_t n = rxvt_compose (*tp, c);
957 if (n == NOCHAR)
958 n = rxvt_composite.compose (*tp, c);
959
960 *tp = n;
961 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
962#endif
963 }
912 } 964 }
913 965
914 if (screen.tlen[row] != -1) /* XXX: think about this */ 966 if (screen.tlen[row] != -1) /* XXX: think about this */
915 MAX_IT (screen.tlen[row], screen.cur.col); 967 MAX_IT (screen.tlen[row], screen.cur.col);
916 968
… …
936 */ 988 */
937void 989void
938rxvt_term::scr_backspace () 990rxvt_term::scr_backspace ()
939{ 991{
940 want_refresh = 1; 992 want_refresh = 1;
993
941 if (screen.cur.col == 0) 994 if (screen.cur.col == 0)
942 { 995 {
943 if (screen.cur.row > 0) 996 if (screen.cur.row > 0)
944 { 997 {
945#ifdef TERMCAP_HAS_BW 998#ifdef TERMCAP_HAS_BW
… …
950 1003
951 } 1004 }
952 } 1005 }
953 else if ((screen.flags & Screen_WrapNext) == 0) 1006 else if ((screen.flags & Screen_WrapNext) == 0)
954 scr_gotorc (0, -1, RELATIVE); 1007 scr_gotorc (0, -1, RELATIVE);
1008
955 screen.flags &= ~Screen_WrapNext; 1009 screen.flags &= ~Screen_WrapNext;
956} 1010}
957 1011
958/* ------------------------------------------------------------------------- */ 1012/* ------------------------------------------------------------------------- */
959/* 1013/*
… …
962 * XTERM_SEQ: CTRL-I 1016 * XTERM_SEQ: CTRL-I
963 */ 1017 */
964void 1018void
965rxvt_term::scr_tab (int count) 1019rxvt_term::scr_tab (int count)
966{ 1020{
967 int i, x; 1021 int i, x;
968 1022
969 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); 1023 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
970 want_refresh = 1; 1024 want_refresh = 1;
971 i = x = screen.cur.col; 1025 i = x = screen.cur.col;
1026
972 if (count == 0) 1027 if (count == 0)
973 return; 1028 return;
974 else if (count > 0) 1029 else if (count > 0)
975 { 1030 {
976 for (; ++i < TermWin.ncol; ) 1031 for (; ++i < TermWin.ncol; )
… …
978 { 1033 {
979 x = i; 1034 x = i;
980 if (!--count) 1035 if (!--count)
981 break; 1036 break;
982 } 1037 }
1038
983 if (count) 1039 if (count)
984 x = TermWin.ncol - 1; 1040 x = TermWin.ncol - 1;
985 } 1041 }
986 else /* if (count < 0) */ 1042 else /* if (count < 0) */
987 { 1043 {
… …
990 { 1046 {
991 x = i; 1047 x = i;
992 if (!++count) 1048 if (!++count)
993 break; 1049 break;
994 } 1050 }
1051
995 if (count) 1052 if (count)
996 x = 0; 1053 x = 0;
997 } 1054 }
1055
998 if (x != screen.cur.col) 1056 if (x != screen.cur.col)
999 scr_gotorc (0, x, R_RELATIVE); 1057 scr_gotorc (0, x, R_RELATIVE);
1000} 1058}
1001 1059
1002/* ------------------------------------------------------------------------- */ 1060/* ------------------------------------------------------------------------- */
… …
1059 want_refresh = 1; 1117 want_refresh = 1;
1060 ZERO_SCROLLBACK (); 1118 ZERO_SCROLLBACK ();
1061 1119
1062 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); 1120 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col));
1063 1121
1064 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1122 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1065 : col);
1066 MAX_IT (screen.cur.col, 0); 1123 MAX_IT (screen.cur.col, 0);
1067 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1124 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1068 1125
1069 screen.flags &= ~Screen_WrapNext; 1126 screen.flags &= ~Screen_WrapNext;
1070 if (relative & R_RELATIVE) 1127 if (relative & R_RELATIVE)
… …
1096 else 1153 else
1097 screen.cur.row = row; 1154 screen.cur.row = row;
1098 } 1155 }
1099 MAX_IT (screen.cur.row, 0); 1156 MAX_IT (screen.cur.row, 0);
1100 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1157 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1158
1159 while (screen.cur.col > 0
1160 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1161 screen.cur.col--;
1101} 1162}
1102 1163
1103/* ------------------------------------------------------------------------- */ 1164/* ------------------------------------------------------------------------- */
1104/* 1165/*
1105 * direction should be UP or DN 1166 * direction should be UP or DN
1106 */ 1167 */
1107void 1168void
1108rxvt_term::scr_index (enum page_dirn direction) 1169rxvt_term::scr_index (enum page_dirn direction)
1109{ 1170{
1110 int dirn; 1171 int dirn;
1111 1172
1112 want_refresh = 1; 1173 want_refresh = 1;
1113 dirn = ((direction == UP) ? 1 : -1); 1174 dirn = ((direction == UP) ? 1 : -1);
1114 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); 1175 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1115 1176
… …
1175 default: 1236 default:
1176 return; 1237 return;
1177 } 1238 }
1178 1239
1179 if (screen.text[row]) 1240 if (screen.text[row])
1180 scr_blank_line (& (screen.text[row][col]), 1241 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1181 & (screen.rend[row][col]), num, rstyle);
1182 else 1242 else
1183 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1243 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1184} 1244}
1185 1245
1186/* ------------------------------------------------------------------------- */ 1246/* ------------------------------------------------------------------------- */
… …
1191 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1251 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1192 */ 1252 */
1193void 1253void
1194rxvt_term::scr_erase_screen (int mode) 1254rxvt_term::scr_erase_screen (int mode)
1195{ 1255{
1196 int num; 1256 int num;
1197 int32_t row, row_offset; 1257 int32_t row, row_offset;
1198 rend_t ren; 1258 rend_t ren;
1199 XGCValues gcvalue; 1259 XGCValues gcvalue;
1200 1260
1201 want_refresh = 1; 1261 want_refresh = 1;
1202 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); 1262 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1203 ZERO_SCROLLBACK (); 1263 ZERO_SCROLLBACK ();
1204 row_offset = (int32_t)TermWin.saveLines; 1264 row_offset = (int32_t)TermWin.saveLines;
… …
1223 num = TermWin.nrow; 1283 num = TermWin.nrow;
1224 break; 1284 break;
1225 default: 1285 default:
1226 return; 1286 return;
1227 } 1287 }
1228 refresh_type |= REFRESH_BOUNDS; 1288
1229 if (selection.op && current_screen == selection.screen 1289 if (selection.op && current_screen == selection.screen
1230 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1290 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1231 || (selection.end.row >= row 1291 || (selection.end.row >= row
1232 && selection.end.row <= row + num))) 1292 && selection.end.row <= row + num)))
1233 CLEAR_SELECTION (); 1293 CLEAR_SELECTION ();
1294
1234 if (row >= TermWin.nrow) /* Out Of Bounds */ 1295 if (row >= TermWin.nrow) /* Out Of Bounds */
1235 return; 1296 return;
1297
1236 MIN_IT (num, (TermWin.nrow - row)); 1298 MIN_IT (num, (TermWin.nrow - row));
1299
1237 if (rstyle & (RS_RVid | RS_Uline)) 1300 if (rstyle & (RS_RVid | RS_Uline))
1238 ren = (rend_t) ~RS_None; 1301 ren = (rend_t) ~RS_None;
1239 else if (GET_BASEBG (rstyle) == Color_bg) 1302 else if (GET_BASEBG (rstyle) == Color_bg)
1240 { 1303 {
1241 ren = DEFAULT_RSTYLE; 1304 ren = DEFAULT_RSTYLE;
… …
1248 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1311 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1249 ERASE_ROWS (row, num); 1312 ERASE_ROWS (row, num);
1250 gcvalue.foreground = PixColors[Color_fg]; 1313 gcvalue.foreground = PixColors[Color_fg];
1251 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1314 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1252 } 1315 }
1316
1253 for (; num--; row++) 1317 for (; num--; row++)
1254 { 1318 {
1255 scr_blank_screen_mem (screen.text, screen.rend, 1319 scr_blank_screen_mem (screen.text, screen.rend,
1256 (unsigned int) (row + row_offset), rstyle); 1320 (unsigned int) (row + row_offset), rstyle);
1257 screen.tlen[row + row_offset] = 0; 1321 screen.tlen[row + row_offset] = 0;
… …
1291 * Insert/Delete <count> lines 1355 * Insert/Delete <count> lines
1292 */ 1356 */
1293void 1357void
1294rxvt_term::scr_insdel_lines (int count, int insdel) 1358rxvt_term::scr_insdel_lines (int count, int insdel)
1295{ 1359{
1296 int end; 1360 int end;
1297 1361
1298 ZERO_SCROLLBACK (); 1362 ZERO_SCROLLBACK ();
1299 1363
1300 selection_check (1); 1364 selection_check (1);
1301 1365
… …
1320 * Insert/Delete <count> characters from the current position 1384 * Insert/Delete <count> characters from the current position
1321 */ 1385 */
1322void 1386void
1323rxvt_term::scr_insdel_chars (int count, int insdel) 1387rxvt_term::scr_insdel_chars (int count, int insdel)
1324{ 1388{
1325 int col, row; 1389 int col, row;
1326 rend_t tr; 1390 rend_t tr;
1327 text_t *stp; 1391 text_t *stp;
1328 rend_t *srp; 1392 rend_t *srp;
1329 int16_t *slp; 1393 int16_t *slp;
1330 1394
1331 want_refresh = 1; 1395 want_refresh = 1;
1332 ZERO_SCROLLBACK (); 1396 ZERO_SCROLLBACK ();
1333 1397
1334 if (count <= 0) 1398 if (count <= 0)
… …
1341 screen.flags &= ~Screen_WrapNext; 1405 screen.flags &= ~Screen_WrapNext;
1342 1406
1343 stp = screen.text[row]; 1407 stp = screen.text[row];
1344 srp = screen.rend[row]; 1408 srp = screen.rend[row];
1345 slp = & (screen.tlen[row]); 1409 slp = & (screen.tlen[row]);
1410
1346 switch (insdel) 1411 switch (insdel)
1347 { 1412 {
1348 case INSERT: 1413 case INSERT:
1349 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1414 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1350 col--) 1415 col--)
1351 { 1416 {
1352 stp[col] = stp[col - count]; 1417 stp[col] = stp[col - count];
1353 srp[col] = srp[col - count]; 1418 srp[col] = srp[col - count];
1354 } 1419 }
1420
1355 if (*slp != -1) 1421 if (*slp != -1)
1356 { 1422 {
1357 *slp += count; 1423 *slp += count;
1358 MIN_IT (*slp, TermWin.ncol); 1424 MIN_IT (*slp, TermWin.ncol);
1359 } 1425 }
1426
1360 if (selection.op && current_screen == selection.screen 1427 if (selection.op && current_screen == selection.screen
1361 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1428 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1362 { 1429 {
1363 if (selection.end.row != screen.cur.row 1430 if (selection.end.row != screen.cur.row
1364 || (selection.end.col + count >= TermWin.ncol)) 1431 || (selection.end.col + count >= TermWin.ncol))
… …
1368 selection.beg.col += count; 1435 selection.beg.col += count;
1369 selection.mark.col += count; /* XXX: yes? */ 1436 selection.mark.col += count; /* XXX: yes? */
1370 selection.end.col += count; 1437 selection.end.col += count;
1371 } 1438 }
1372 } 1439 }
1440
1373 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1441 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1374 (unsigned int)count, rstyle); 1442 (unsigned int)count, rstyle);
1375 break; 1443 break;
1444
1376 case ERASE: 1445 case ERASE:
1377 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1446 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1378 selection_check (1); 1447 selection_check (1);
1379 screen.cur.col -= count; 1448 screen.cur.col -= count;
1380 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1449 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1381 (unsigned int)count, rstyle); 1450 (unsigned int)count, rstyle);
1382 break; 1451 break;
1452
1383 case DELETE: 1453 case DELETE:
1384 tr = srp[TermWin.ncol - 1]
1385 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1454 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1455
1386 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1456 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1387 { 1457 {
1388 stp[col] = stp[col + count]; 1458 stp[col] = stp[col + count];
1389 srp[col] = srp[col + count]; 1459 srp[col] = srp[col + count];
1390 } 1460 }
1461
1391 scr_blank_line (& (stp[TermWin.ncol - count]), 1462 scr_blank_line (& (stp[TermWin.ncol - count]),
1392 & (srp[TermWin.ncol - count]), 1463 & (srp[TermWin.ncol - count]),
1393 (unsigned int)count, tr); 1464 (unsigned int)count, tr);
1465
1394 if (*slp == -1) /* break line continuation */ 1466 if (*slp == -1) /* break line continuation */
1395 *slp = TermWin.ncol; 1467 *slp = TermWin.ncol;
1468
1396 *slp -= count; 1469 *slp -= count;
1397 MAX_IT (*slp, 0); 1470 MAX_IT (*slp, 0);
1471
1398 if (selection.op && current_screen == selection.screen 1472 if (selection.op && current_screen == selection.screen
1399 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1400 { 1474 {
1401 if (selection.end.row != screen.cur.row 1475 if (selection.end.row != screen.cur.row
1402 || (screen.cur.col >= selection.beg.col - count) 1476 || (screen.cur.col >= selection.beg.col - count)
… …
1408 selection.beg.col -= count; 1482 selection.beg.col -= count;
1409 selection.mark.col -= count; /* XXX: yes? */ 1483 selection.mark.col -= count; /* XXX: yes? */
1410 selection.end.col -= count; 1484 selection.end.col -= count;
1411 } 1485 }
1412 } 1486 }
1487
1413 break; 1488 break;
1414 } 1489 }
1415} 1490}
1416 1491
1417/* ------------------------------------------------------------------------- */ 1492/* ------------------------------------------------------------------------- */
… …
1422void 1497void
1423rxvt_term::scr_scroll_region (int top, int bot) 1498rxvt_term::scr_scroll_region (int top, int bot)
1424{ 1499{
1425 MAX_IT (top, 0); 1500 MAX_IT (top, 0);
1426 MIN_IT (bot, (int)TermWin.nrow - 1); 1501 MIN_IT (bot, (int)TermWin.nrow - 1);
1502
1427 if (top > bot) 1503 if (top > bot)
1428 return; 1504 return;
1505
1429 screen.tscroll = top; 1506 screen.tscroll = top;
1430 screen.bscroll = bot; 1507 screen.bscroll = bot;
1431 scr_gotorc (0, 0, 0); 1508 scr_gotorc (0, 0, 0);
1432} 1509}
1433 1510
… …
1439 */ 1516 */
1440void 1517void
1441rxvt_term::scr_cursor_visible (int mode) 1518rxvt_term::scr_cursor_visible (int mode)
1442{ 1519{
1443 want_refresh = 1; 1520 want_refresh = 1;
1521
1444 if (mode) 1522 if (mode)
1445 screen.flags |= Screen_VisibleCursor; 1523 screen.flags |= Screen_VisibleCursor;
1446 else 1524 else
1447 screen.flags &= ~Screen_VisibleCursor; 1525 screen.flags &= ~Screen_VisibleCursor;
1448} 1526}
… …
1662 row_col_t rc[RC_COUNT]; 1740 row_col_t rc[RC_COUNT];
1663 1741
1664 if (drawn_text == NULL) /* sanity check */ 1742 if (drawn_text == NULL) /* sanity check */
1665 return; 1743 return;
1666 1744
1745#ifndef NO_SLOW_LINK_SUPPORT
1746 if (refresh_type == FAST_REFRESH && !display->is_local)
1747 {
1748 y = 0;
1749 height = TermWin.height;
1750 }
1751#endif
1752
1667#ifdef DEBUG_STRICT 1753#ifdef DEBUG_STRICT
1668 x = max (x, (int)TermWin.int_bwidth); 1754 x = max (x, 0);
1669 x = min (x, (int)TermWin.width); 1755 x = min (x, (int)TermWin.width);
1670 y = max (y, (int)TermWin.int_bwidth); 1756 y = max (y, 0);
1671 y = min (y, (int)TermWin.height); 1757 y = min (y, (int)TermWin.height);
1672#endif 1758#endif
1673 1759
1674 /* round down */ 1760 /* round down */
1675 rc[PART_BEG].col = Pixel2Col (x); 1761 rc[PART_BEG].col = Pixel2Col (x);
… …
1686 } 1772 }
1687 1773
1688 D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); 1774 D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row));
1689 1775
1690 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1776 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1691 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, 1777 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1692 (rc[PART_END].col - rc[PART_BEG].col + 1));
1693 1778
1694 if (refresh) 1779 if (refresh)
1695 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1780 scr_refresh (SLOW_REFRESH);
1696} 1781}
1697 1782
1698/* ------------------------------------------------------------------------- */ 1783/* ------------------------------------------------------------------------- */
1699/* 1784/*
1700 * Refresh the entire screen 1785 * Refresh the entire screen
… …
1735 * direction should be UP or DN 1820 * direction should be UP or DN
1736 */ 1821 */
1737int 1822int
1738rxvt_term::scr_page (enum page_dirn direction, int nlines) 1823rxvt_term::scr_page (enum page_dirn direction, int nlines)
1739{ 1824{
1740 int n; 1825 int n;
1741 uint16_t oldviewstart; 1826 uint16_t oldviewstart;
1742 1827
1743 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); 1828 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1744#ifdef DEBUG_STRICT 1829#ifdef DEBUG_STRICT
1745 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1830 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1746#endif 1831#endif
… …
1764 if (TermWin.view_start != oldviewstart) 1849 if (TermWin.view_start != oldviewstart)
1765 { 1850 {
1766 want_refresh = 1; 1851 want_refresh = 1;
1767 num_scr -= (TermWin.view_start - oldviewstart); 1852 num_scr -= (TermWin.view_start - oldviewstart);
1768 } 1853 }
1854
1769 return (int) (TermWin.view_start - oldviewstart); 1855 return (int) (TermWin.view_start - oldviewstart);
1770} 1856}
1771 1857
1772/* ------------------------------------------------------------------------- */ 1858/* ------------------------------------------------------------------------- */
1773void 1859void
… …
1841 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1927 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1842 1928
1843void 1929void
1844rxvt_term::scr_refresh (unsigned char refresh_type) 1930rxvt_term::scr_refresh (unsigned char refresh_type)
1845{ 1931{
1846 unsigned char clearfirst, /* first character writes before cell */
1847 clearlast, /* last character writes beyond cell */
1848 must_clear, /* use draw_string not draw_image_string */ 1932 unsigned char must_clear, /* use draw_string not draw_image_string */
1849 rvid, /* reverse video this position */ 1933 rvid, /* reverse video this position */
1850 showcursor; /* show the cursor */ 1934 showcursor; /* show the cursor */
1851 int16_t col, row, /* column/row we're processing */ 1935 int16_t col, row, /* column/row we're processing */
1852 ocrow; /* old cursor row */ 1936 ocrow; /* old cursor row */
1853 int i, /* tmp */ 1937 int i, /* tmp */
… …
1862 return; 1946 return;
1863 1947
1864 /* 1948 /*
1865 * A: set up vars 1949 * A: set up vars
1866 */ 1950 */
1867 clearfirst = clearlast = must_clear = 0; 1951 must_clear = 0;
1868 1952
1869 refresh_count = 0; 1953 refresh_count = 0;
1870 1954
1871 row_offset = TermWin.saveLines - TermWin.view_start; 1955 row_offset = TermWin.saveLines - TermWin.view_start;
1872
1873 if ((refresh_type & REFRESH_BOUNDS))
1874 {
1875 clearfirst = clearlast = 1;
1876 refresh_type &= ~REFRESH_BOUNDS;
1877 }
1878 1956
1879#ifdef XPM_BACKGROUND 1957#ifdef XPM_BACKGROUND
1880 must_clear |= (bgPixmap.pixmap != None); 1958 must_clear |= (bgPixmap.pixmap != None);
1881#endif 1959#endif
1882#ifdef TRANSPARENT 1960#ifdef TRANSPARENT
… …
1891 1969
1892 /* 1970 /*
1893 * C: set the cursor character (s) 1971 * C: set the cursor character (s)
1894 */ 1972 */
1895 { 1973 {
1896 unsigned char setoldcursor; 1974 unsigned char setoldcursor;
1897 rend_t ccol1, /* Cursor colour */ 1975 rend_t ccol1, /* Cursor colour */
1898 ccol2; /* Cursor colour2 */ 1976 ccol2; /* Cursor colour2 */
1899 1977
1900 showcursor = (screen.flags & Screen_VisibleCursor); 1978 showcursor = (screen.flags & Screen_VisibleCursor);
1901#ifdef CURSOR_BLINK 1979#ifdef CURSOR_BLINK
1902 if (hidden_cursor) 1980 if (hidden_cursor)
1903 showcursor = 0; 1981 showcursor = 0;
1904#endif 1982#endif
1905 1983
1906 if (showcursor) 1984 if (showcursor)
1907 { 1985 {
1908 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1986 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]);
1909 [screen.cur.col]);
1910 1987
1911 if (showcursor && TermWin.focus) 1988 if (showcursor && TermWin.focus)
1912 { 1989 {
1913 *srp ^= RS_RVid; 1990 *srp ^= RS_RVid;
1914#ifndef NO_CURSORCOLOR 1991#ifndef NO_CURSORCOLOR
… …
1942 if (screen.cur.row + TermWin.view_start != ocrow 2019 if (screen.cur.row + TermWin.view_start != ocrow
1943 || screen.cur.col != oldcursor.col) 2020 || screen.cur.col != oldcursor.col)
1944 { 2021 {
1945 if (ocrow < TermWin.nrow 2022 if (ocrow < TermWin.nrow
1946 && oldcursor.col < TermWin.ncol) 2023 && oldcursor.col < TermWin.ncol)
1947 {
1948 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2024 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
1949 } 2025
1950 if (TermWin.focus || !showcursor) 2026 if (TermWin.focus || !showcursor)
1951 oldcursor.row = -1; 2027 oldcursor.row = -1;
1952 else 2028 else
1953 setoldcursor = 1; 2029 setoldcursor = 1;
1954 } 2030 }
1955 } 2031 }
1956 else if (!TermWin.focus) 2032 else if (!TermWin.focus)
1957 setoldcursor = 1; 2033 setoldcursor = 1;
2034
1958 if (setoldcursor) 2035 if (setoldcursor)
1959 { 2036 {
1960 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2037 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
1961 oldcursor.row = -1; 2038 oldcursor.row = -1;
1962 else 2039 else
… …
1971 /* 2048 /*
1972 * D: CopyArea pass - very useful for slower links 2049 * D: CopyArea pass - very useful for slower links
1973 * This has been deliberately kept simple. 2050 * This has been deliberately kept simple.
1974 */ 2051 */
1975 i = num_scr; 2052 i = num_scr;
2053 if (!display->is_local
1976 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2054 && refresh_type == FAST_REFRESH && num_scr_allow && i
1977 && abs (i) < TermWin.nrow && !must_clear) 2055 && abs (i) < TermWin.nrow && !must_clear)
1978 { 2056 {
1979 int16_t nits; 2057 int16_t nits;
1980 int j; 2058 int j;
1981 rend_t *drp2; 2059 rend_t *drp2;
1982 text_t *dtp2; 2060 text_t *dtp2;
1983 int len, wlen; 2061 int len, wlen;
1984 2062
1985 j = TermWin.nrow; 2063 j = TermWin.nrow;
1986 wlen = len = -1; 2064 wlen = len = -1;
1987 row = i > 0 ? 0 : j - 1; 2065 row = i > 0 ? 0 : j - 1;
1988 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2066 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
… …
2052 int ypixel = (int)Row2Pixel (row); 2130 int ypixel = (int)Row2Pixel (row);
2053 2131
2054 for (col = 0; col < TermWin.ncol; col++) 2132 for (col = 0; col < TermWin.ncol; col++)
2055 { 2133 {
2056 /* compare new text with old - if exactly the same then continue */ 2134 /* compare new text with old - if exactly the same then continue */
2135 if (stp[col] == dtp[col] /* Must match characters to skip. */
2136 && (srp[col] == drp[col] /* Either rendition the same or */
2137 || (stp[col] == ' ' /* space w/ no background change */
2138 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2139 continue;
2140
2141 // redraw one or more characters
2142
2143 // seek to the beginning if wide characters
2144 while (stp[col] == NOCHAR && col > 0)
2145 --col;
2146
2057 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2147 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2058
2059 if (stp[col] == dtp[col] /* Must match characters to skip. */
2060 && (rend == drp[col] /* Either rendition the same or */
2061 || (stp[col] == ' ' /* space w/ no background change */
2062 && GET_BGATTR (rend) == GET_BGATTR (drp[col]))))
2063 continue;
2064
2065 text_t *text = stp + col; 2148 text_t *text = stp + col;
2066 int count = 1; 2149 int count = 1;
2067 2150
2068 /* redraw one or more characters */
2069
2070 dtp[col] = stp[col]; 2151 dtp[col] = stp[col];
2071 drp[col] = rend; 2152 drp[col] = rend;
2072
2073 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2074 continue;
2075 2153
2076 int xpixel = Col2Pixel (col); 2154 int xpixel = Col2Pixel (col);
2077 2155
2078 // this loop looks very messy, it can probably be optimized 2156 // this loop looks very messy, it can probably be optimized
2079 // and cleaned a bit by you? 2157 // and cleaned a bit by you?
… …
2123 rend = GET_ATTR (rend); 2201 rend = GET_ATTR (rend);
2124 2202
2125 rvid = !!(rend & RS_RVid); 2203 rvid = !!(rend & RS_RVid);
2126 2204
2127#ifndef NO_BOLD_UNDERLINE_REVERSE 2205#ifndef NO_BOLD_UNDERLINE_REVERSE
2128 if (rend & RS_Bold && fore == Color_fg) 2206 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold))
2129 { 2207 {
2130 if (ISSET_PIXCOLOR (Color_BD)) 2208 if (ISSET_PIXCOLOR (Color_BD))
2131 fore = Color_BD; 2209 fore = Color_BD;
2132 else 2210 else
2133 rvid = !rvid; 2211 rvid = !rvid;
2134 } 2212 }
2135 2213
2136 if (rend & RS_Uline) 2214 if (rend & RS_Uline)
2137 {
2138 if (ISSET_PIXCOLOR (Color_UL)) 2215 if (ISSET_PIXCOLOR (Color_UL))
2139 fore = Color_UL; 2216 fore = Color_UL;
2140 }
2141#endif 2217#endif
2142 2218
2143 if (rvid) 2219 if (rvid)
2144 { 2220 {
2145 SWAP_IT (fore, back, int); 2221 SWAP_IT (fore, back, int);
… …
2153 back = Color_RV; 2229 back = Color_RV;
2154#endif 2230#endif
2155 } 2231 }
2156 2232
2157#ifdef TEXT_BLINK 2233#ifdef TEXT_BLINK
2158 if (rend & RS_Blink) 2234 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2159 { 2235 {
2160 if (!text_blink_ev.active) 2236 if (!text_blink_ev.active)
2161 { 2237 {
2162 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2238 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2163 hidden_text = 0; 2239 hidden_text = 0;
… …
2193 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2269 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2194 } 2270 }
2195 else 2271 else
2196 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2272 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2197 2273
2198 if ((rend & RS_Uline) && (font->descent > 1)) 2274 if (rend & RS_Uline && font->descent > 1 && fore != back)
2199 XDrawLine (display->display, drawBuffer, TermWin.gc, 2275 XDrawLine (display->display, drawBuffer, TermWin.gc,
2200 xpixel, ypixel + font->ascent + 1, 2276 xpixel, ypixel + font->ascent + 1,
2201 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2277 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2202 } /* for (col....) */ 2278 } /* for (col....) */
2203 } /* for (row....) */ 2279 } /* for (row....) */
2204 2280
2205 /* 2281 /*
2206 * G: cleanup cursor and display outline cursor if necessary 2282 * G: cleanup cursor and display outline cursor if necessary
… …
2226 while (oldcursor.col + cursorwidth < TermWin.ncol 2302 while (oldcursor.col + cursorwidth < TermWin.ncol
2227 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2303 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2228 cursorwidth++; 2304 cursorwidth++;
2229 2305
2230 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2306 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2231 Col2Pixel (oldcursor.col), 2307 Col2Pixel (oldcursor.col),
2232 Row2Pixel (oldcursor.row), 2308 Row2Pixel (oldcursor.row),
2233 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2309 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2234 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2310 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2235 } 2311 }
2236 } 2312 }
2237 2313
2238 /* 2314 /*
2239 * H: cleanup selection 2315 * H: cleanup selection
2240 */ 2316 */
2241 scr_reverse_selection (); 2317 scr_reverse_selection ();
2242 2318
2243 /*
2244 * I: other general cleanup
2245 */
2246 if (clearfirst && TermWin.int_bwidth)
2247 /*
2248 * clear the whole screen height, note that width == 0 is treated
2249 * specially by XClearArea
2250 */
2251 XClearArea (display->display, TermWin.vt, 0, 0,
2252 (unsigned int)TermWin.int_bwidth,
2253 (unsigned int)TermWin_TotalHeight (), False);
2254 if (clearlast && TermWin.int_bwidth)
2255 /*
2256 * clear the whole screen height, note that width == 0 is treated
2257 * specially by XClearArea
2258 */
2259 XClearArea (display->display, TermWin.vt,
2260 TermWin.width + TermWin.int_bwidth, 0,
2261 (unsigned int)TermWin.int_bwidth,
2262 (unsigned int)TermWin_TotalHeight (), False);
2263 if (refresh_type & SMOOTH_REFRESH) 2319 if (refresh_type & SMOOTH_REFRESH)
2264 XSync (display->display, False); 2320 XFlush (display->display);
2265 2321
2266 num_scr = 0; 2322 num_scr = 0;
2267 num_scr_allow = 1; 2323 num_scr_allow = 1;
2268 want_refresh = 0; /* screen is current */ 2324 want_refresh = 0; /* screen is current */
2269} 2325}
… …
2291 } 2347 }
2292} 2348}
2293 2349
2294/* ------------------------------------------------------------------------- */ 2350/* ------------------------------------------------------------------------- */
2295void 2351void
2296rxvt_term::scr_clear () 2352rxvt_term::scr_clear (bool really)
2297{ 2353{
2298 if (!TermWin.mapped) 2354 if (!TermWin.mapped)
2299 return; 2355 return;
2300 2356
2301 num_scr_allow = 0; 2357 num_scr_allow = 0;
2302 want_refresh = 1; 2358 want_refresh = 1;
2359
2303#ifdef TRANSPARENT 2360#ifdef TRANSPARENT
2304 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2361 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2305 { 2362 {
2306 int i; 2363 int i;
2307 2364
… …
2314 if (TermWin.parent[i] != None) 2371 if (TermWin.parent[i] != None)
2315 XClearWindow (display->display, TermWin.parent[i]); 2372 XClearWindow (display->display, TermWin.parent[i]);
2316 } 2373 }
2317#endif 2374#endif
2318 2375
2376 if (really)
2319 XClearWindow (display->display, TermWin.vt); 2377 XClearWindow (display->display, TermWin.vt);
2320} 2378}
2321 2379
2322/* ------------------------------------------------------------------------- */ 2380/* ------------------------------------------------------------------------- */
2323void 2381void
2324rxvt_term::scr_reverse_selection () 2382rxvt_term::scr_reverse_selection ()
2325{ 2383{
2326 int i, col, row, end_row;
2327 rend_t *srp;
2328
2329 if (selection.op && current_screen == selection.screen) 2384 if (selection.op && current_screen == selection.screen)
2330 { 2385 {
2331 end_row = TermWin.saveLines - TermWin.view_start; 2386 int end_row = TermWin.saveLines - TermWin.view_start;
2332 i = selection.beg.row + TermWin.saveLines; 2387 int i = selection.beg.row + TermWin.saveLines;
2333 row = selection.end.row + TermWin.saveLines; 2388 int col, row = selection.end.row + TermWin.saveLines;
2389 rend_t *srp;
2390
2334 if (i >= end_row) 2391 if (i >= end_row)
2335 col = selection.beg.col; 2392 col = selection.beg.col;
2336 else 2393 else
2337 { 2394 {
2338 col = 0; 2395 col = 0;
2339 i = end_row; 2396 i = end_row;
2340 } 2397 }
2398
2341 end_row += TermWin.nrow; 2399 end_row += TermWin.nrow;
2342 for (; i < row && i < end_row; i++, col = 0) 2400 for (; i < row && i < end_row; i++, col = 0)
2343 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2401 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2344 srp[col] ^= RS_RVid; 2402 srp[col] ^= RS_RVid;
2403
2345 if (i == row && i < end_row) 2404 if (i == row && i < end_row)
2346 for (srp = screen.rend[i]; col < selection.end.col; col++) 2405 for (srp = screen.rend[i]; col < selection.end.col; col++)
2347 srp[col] ^= RS_RVid; 2406 srp[col] ^= RS_RVid;
2348 } 2407 }
2349} 2408}
… …
2437 { 2496 {
2438 n = min (len - i, PROP_SIZE); 2497 n = min (len - i, PROP_SIZE);
2439 MEMCPY (ds, data + i, n); 2498 MEMCPY (ds, data + i, n);
2440 2499
2441 for (j = 0; j < n; j++) 2500 for (j = 0; j < n; j++)
2442 if (ds[j] == '\n') 2501 if (ds[j] == C0_LF)
2443 ds[j] = '\r'; 2502 ds[j] = C0_CR;
2444 2503
2445 tt_write (ds, (int)n); 2504 tt_write (ds, (int)n);
2446 } 2505 }
2447 2506
2448 free (ds); 2507 free (ds);
… …
2488 } 2547 }
2489 2548
2490 for (;;) 2549 for (;;)
2491 { 2550 {
2492 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2551 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2493 (long) (PROP_SIZE / 4), delete_prop, 2552 (long) (PROP_SIZE / 4), delete_prop,
2494 AnyPropertyType, &ct.encoding, &ct.format, 2553 AnyPropertyType, &ct.encoding, &ct.format,
2495 &ct.nitems, &bytes_after, 2554 &ct.nitems, &bytes_after,
2496 &ct.value) != Success) 2555 &ct.value) != Success)
2497 break; 2556 break;
2498 2557
2499 if (ct.encoding == 0) 2558 if (ct.encoding == 0)
2500 { 2559 {
2501 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2560 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
… …
2509 } 2568 }
2510 2569
2511 if (ct.nitems == 0) 2570 if (ct.nitems == 0)
2512 { 2571 {
2513 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2572 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2573
2514 if (selection_wait == Sel_normal && nread == 0) 2574 if (selection_wait == Sel_normal && nread == 0
2575 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2515 { 2576 {
2516 /* 2577 /*
2517 * pass through again trying CUT_BUFFER0 if we've come from 2578 * pass through again trying CUT_BUFFER0 if we've come from
2518 * XConvertSelection () but nothing was presented 2579 * XConvertSelection () but nothing was presented
2519 */ 2580 */
… …
2527 2588
2528 nread += ct.nitems; 2589 nread += ct.nitems;
2529 2590
2530 char **cl; 2591 char **cl;
2531 int cr; 2592 int cr;
2532 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2593 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2533 &cr) >= 0 && cl)
2534 { 2594 {
2535 for (int i = 0; i < cr; i++) 2595 for (int i = 0; i < cr; i++)
2536 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2596 paste ((unsigned char *)cl[i], STRLEN (cl[i]));
2537 2597
2538 XFreeStringList (cl); 2598 XFreeStringList (cl);
… …
2559void 2619void
2560rxvt_term::incr_cb (time_watcher &w) 2620rxvt_term::incr_cb (time_watcher &w)
2561{ 2621{
2562 selection_wait = Sel_none; 2622 selection_wait = Sel_none;
2563 2623
2564 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2624 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2565} 2625}
2566 2626
2567/* 2627/*
2568 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2628 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2569 */ 2629 */
… …
2572{ 2632{
2573 int reget_time = 0; 2633 int reget_time = 0;
2574 2634
2575 if (prop == None) 2635 if (prop == None)
2576 return; 2636 return;
2637
2577 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); 2638 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2578 if (selection_wait == Sel_normal) 2639 if (selection_wait == Sel_normal)
2579 { 2640 {
2580 int a, afmt; 2641 int a, afmt;
2581 Atom atype; 2642 Atom atype;
2582 unsigned long bytes_after, nitems; 2643 unsigned long bytes_after, nitems;
2583 unsigned char *s = NULL; 2644 unsigned char *s = NULL;
2584 2645
2585 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, 2646 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2586 xa[XA_INCR], &atype, &afmt, &nitems, 2647 xa[XA_INCR], &atype, &afmt, &nitems,
2587 &bytes_after, &s); 2648 &bytes_after, &s);
2588 if (s) 2649 if (s)
2589 XFree (s); 2650 XFree (s);
2590 if (a != Success) 2651 if (a != Success)
2591 return; 2652 return;
2653
2592#ifndef __CYGWIN32__ 2654#ifndef __CYGWIN32__
2593 if (atype == xa[XA_INCR]) 2655 if (atype == xa[XA_INCR])
2594 { /* start an INCR transfer */ 2656 { /* start an INCR transfer */
2595 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); 2657 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2596 XDeleteProperty (display->display, win, prop); 2658 XDeleteProperty (display->display, win, prop);
… …
2602 2664
2603 } 2665 }
2604 else if (selection_wait == Sel_incr) 2666 else if (selection_wait == Sel_incr)
2605 { 2667 {
2606 reget_time = 1; 2668 reget_time = 1;
2669
2607 if (selection_paste (win, prop, True) == -1) 2670 if (selection_paste (win, prop, True) == -1)
2608 { 2671 {
2609 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); 2672 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2610 selection_wait = Sel_none; 2673 selection_wait = Sel_none;
2611 incr_ev.stop (); 2674 incr_ev.stop ();
2612 } 2675 }
2613 } 2676 }
2614 if (reget_time) /* received more data so reget time */ 2677 if (reget_time) /* received more data so reget time */
2615 incr_ev.start (NOW + 10); 2678 incr_ev.start (NOW + 10);
2616} 2679}
2680
2617/* ------------------------------------------------------------------------- */ 2681/* ------------------------------------------------------------------------- */
2618/* 2682/*
2619 * Request the current selection: 2683 * Request the current selection:
2620 * Order: > internal selection if available 2684 * Order: > internal selection if available
2621 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2685 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2626 */ 2690 */
2627void 2691void
2628rxvt_term::selection_request (Time tm, int x, int y) 2692rxvt_term::selection_request (Time tm, int x, int y)
2629{ 2693{
2630 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); 2694 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2695
2631 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2696 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2632 return; /* outside window */ 2697 return; /* outside window */
2633 2698
2634 if (selection.text != NULL) 2699 if (selection.text)
2635 { /* internal selection */ 2700 { /* internal selection */
2636 D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); 2701 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2637 paste (selection.text, selection.len); 2702 char *str = rxvt_wcstombs (selection.text, selection.len);
2703 paste ((unsigned char *)str, strlen (str));
2704 free (str);
2638 return; 2705 return;
2639 } 2706 }
2640 else 2707 else
2641 { 2708 {
2642 int i; 2709 int i;
2643 2710
2644 selection_request_time = tm; 2711 selection_request_time = tm;
2645 selection_wait = Sel_normal; 2712 selection_wait = Sel_normal;
2713
2646 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2714 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2647 { 2715 {
2648#if X_HAVE_UTF8_STRING 2716#if X_HAVE_UTF8_STRING
2649 selection_type = Sel_UTF8String; 2717 selection_type = Sel_UTF8String;
2650 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2718 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2655 return; 2723 return;
2656#endif 2724#endif
2657 2725
2658 } 2726 }
2659 } 2727 }
2728
2660 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2729 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2661 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2730 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2662 selection_paste (display->root, XA_CUT_BUFFER0, False); 2731 selection_paste (display->root, XA_CUT_BUFFER0, False);
2663} 2732}
2664 2733
2665int 2734int
2666rxvt_term::selection_request_other (Atom target, int selnum) 2735rxvt_term::selection_request_other (Atom target, int selnum)
2667{ 2736{
2668 Atom sel; 2737 Atom sel;
2669#ifdef DEBUG_SELECT 2738#ifdef DEBUG_SELECT
2670 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2739 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2671#endif 2740#endif
2672 2741
2673 selection_type |= selnum; 2742 selection_type |= selnum;
2743
2674 if (selnum == Sel_Primary) 2744 if (selnum == Sel_Primary)
2675 sel = XA_PRIMARY; 2745 sel = XA_PRIMARY;
2676 else if (selnum == Sel_Secondary) 2746 else if (selnum == Sel_Secondary)
2677 sel = XA_SECONDARY; 2747 sel = XA_SECONDARY;
2678 else 2748 else
2679 sel = xa[XA_CLIPBOARD]; 2749 sel = xa[XA_CLIPBOARD];
2750
2680 if (XGetSelectionOwner (display->display, sel) != None) 2751 if (XGetSelectionOwner (display->display, sel) != None)
2681 { 2752 {
2682 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2753 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2683 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2754 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2684 TermWin.vt, selection_request_time); 2755 TermWin.vt, selection_request_time);
2685 return 1; 2756 return 1;
2686 } 2757 }
2758
2687 return 0; 2759 return 0;
2688} 2760}
2689 2761
2690/* ------------------------------------------------------------------------- */ 2762/* ------------------------------------------------------------------------- */
2691/* 2763/*
… …
2700 want_refresh = 1; 2772 want_refresh = 1;
2701 free (selection.text); 2773 free (selection.text);
2702 selection.text = NULL; 2774 selection.text = NULL;
2703 selection.len = 0; 2775 selection.len = 0;
2704 CLEAR_SELECTION (); 2776 CLEAR_SELECTION ();
2777
2778 if (display->selection_owner == this)
2779 display->selection_owner = 0;
2705} 2780}
2706 2781
2707/* ------------------------------------------------------------------------- */ 2782/* ------------------------------------------------------------------------- */
2708/* 2783/*
2709 * Copy a selection into the cut buffer 2784 * Copy a selection into the cut buffer
2710 * EXT: button 1 or 3 release 2785 * EXT: button 1 or 3 release
2711 */ 2786 */
2712void 2787void
2713rxvt_term::selection_make (Time tm) 2788rxvt_term::selection_make (Time tm)
2714{ 2789{
2715 int i, col, end_col, row, end_row; 2790 int i, col, end_col, row, end_row;
2716 unsigned char *new_selection_text; 2791 wchar_t *new_selection_text;
2717 char *str;
2718 text_t *t; 2792 text_t *t;
2719#ifdef ACS_ASCII
2720 rend_t *re;
2721#endif
2722 2793
2723 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); 2794 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2724 switch (selection.op) 2795 switch (selection.op)
2725 { 2796 {
2726 case SELECTION_CONT: 2797 case SELECTION_CONT:
… …
2732 selection.op = SELECTION_DONE; 2803 selection.op = SELECTION_DONE;
2733 /* FALLTHROUGH */ 2804 /* FALLTHROUGH */
2734 default: 2805 default:
2735 return; 2806 return;
2736 } 2807 }
2808
2737 selection.op = SELECTION_DONE; 2809 selection.op = SELECTION_DONE;
2738 2810
2739 if (selection.clicks == 4) 2811 if (selection.clicks == 4)
2740 return; /* nothing selected, go away */ 2812 return; /* nothing selected, go away */
2741 2813
2742 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2814 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2743 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); 2815 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2744
2745 new_selection_text = (unsigned char *)str;
2746 2816
2747 col = selection.beg.col; 2817 col = selection.beg.col;
2748 MAX_IT (col, 0); 2818 MAX_IT (col, 0);
2749 row = selection.beg.row + TermWin.saveLines; 2819 row = selection.beg.row + TermWin.saveLines;
2750 end_row = selection.end.row + TermWin.saveLines; 2820 end_row = selection.end.row + TermWin.saveLines;
2821 int ofs = 0;
2822 int extra = 0;
2751 2823
2752 for (; row <= end_row; row++, col = 0) 2824 for (; row <= end_row; row++, col = 0)
2753 { 2825 {
2754 t = & (screen.text[row][col]); 2826 t = &(screen.text[row][col]);
2755 2827
2756 end_col = screen.tlen[row]; 2828 end_col = screen.tlen[row];
2757 2829
2758 if (end_col == -1) 2830 if (end_col == -1)
2759 end_col = TermWin.ncol; 2831 end_col = TermWin.ncol;
2760 2832
2761 if (row == end_row) 2833 if (row == end_row)
2762 MIN_IT (end_col, selection.end.col); 2834 MIN_IT (end_col, selection.end.col);
2763 2835
2764 for (; col < end_col; col++) 2836 for (; col < end_col; col++)
2837 {
2765 if (*t == NOCHAR) 2838 if (*t == NOCHAR)
2766 t++; 2839 t++;
2840#if ENABLE_COMBINING
2841 else if (IS_COMPOSE (*t))
2842 {
2843 int len = rxvt_composite.expand (*t, 0);
2844
2845 extra -= (len - 1);
2846
2847 if (extra < 0)
2848 {
2849 extra += i;
2850 i += i;
2851 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2852 }
2853
2854 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2855 }
2856#endif
2767 else 2857 else
2768 { 2858 new_selection_text[ofs++] = *t++;
2769 int len = wctomb (str, *t++);
2770 if (len > 0)
2771 str += len;
2772 } 2859 }
2773 2860
2774 if (screen.tlen[row] != -1 && row != end_row) 2861 if (screen.tlen[row] != -1 && row != end_row)
2775 *str++ = '\n'; 2862 new_selection_text[ofs++] = C0_LF;
2776 } 2863 }
2777 2864
2778#ifndef NO_OLD_SELECTION
2779 if (selection_style == OLD_SELECT)
2780 if (end_col == TermWin.ncol)
2781 *str++ = '\n';
2782#endif
2783#ifndef NO_NEW_SELECTION
2784 if (selection_style != OLD_SELECT)
2785 if (end_col != selection.end.col) 2865 if (end_col != selection.end.col)
2786 *str++ = '\n'; 2866 new_selection_text[ofs++] = C0_LF;
2787#endif
2788 *str = '\0';
2789 2867
2790 i = str - (char *)new_selection_text; 2868 new_selection_text[ofs] = 0;
2869
2791 if (i == 0) 2870 if (ofs == 0)
2792 { 2871 {
2793 free (new_selection_text); 2872 free (new_selection_text);
2794 return; 2873 return;
2795 } 2874 }
2796 2875
2797 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2798 if (str - (char *)new_selection_text > 1024)
2799 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2800
2801 selection.len = i;
2802
2803 if (selection.text)
2804 free (selection.text); 2876 free (selection.text);
2805 2877
2806 selection.text = new_selection_text; 2878 // we usually allocate much more than necessary, so realloc it smaller again
2879 selection.len = ofs;
2880 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2807 2881
2808 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2882 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2809 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2883 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2810 display->set_selection_owner (this); 2884 display->set_selection_owner (this);
2811 else 2885 else
2812 rxvt_print_error ("can't get primary selection"); 2886 rxvt_warn ("can't get primary selection, ignoring.\n");
2813 2887
2814 { 2888#if 0
2815 XTextProperty ct; 2889 XTextProperty ct;
2816 char *cl = (char *)selection.text;
2817 2890
2818 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2891 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2819 { 2892 {
2820 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2821 PropModeReplace, ct.value, ct.nitems);
2822 XFree (ct.value);
2823 }
2824 else
2825 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2893 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2826 PropModeReplace, selection.text, (int)selection.len); 2894 PropModeReplace, ct.value, ct.nitems);
2895 XFree (ct.value);
2827 } 2896 }
2897#endif
2828 2898
2829 selection_time = tm; 2899 selection_time = tm;
2830 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); 2900 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2831} 2901}
2832 2902
… …
2861rxvt_term::selection_start_colrow (int col, int row) 2931rxvt_term::selection_start_colrow (int col, int row)
2862{ 2932{
2863 want_refresh = 1; 2933 want_refresh = 1;
2864 selection.mark.col = col; 2934 selection.mark.col = col;
2865 selection.mark.row = row - TermWin.view_start; 2935 selection.mark.row = row - TermWin.view_start;
2936
2866 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2937 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2867 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2938 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2868 MAX_IT (selection.mark.col, 0); 2939 MAX_IT (selection.mark.col, 0);
2869 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2940 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2870 2941
2942 while (selection.mark.col > 0
2943 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2944 --selection.mark.col;
2945
2871 if (selection.op) 2946 if (selection.op)
2872 { /* clear the old selection */ 2947 { /* clear the old selection */
2873 selection.beg.row = selection.end.row = selection.mark.row; 2948 selection.beg.row = selection.end.row = selection.mark.row;
2874 selection.beg.col = selection.end.col = selection.mark.col; 2949 selection.beg.col = selection.end.col = selection.mark.col;
2875 } 2950 }
2951
2876 selection.op = SELECTION_INIT; 2952 selection.op = SELECTION_INIT;
2877 selection.screen = current_screen; 2953 selection.screen = current_screen;
2878} 2954}
2879 2955
2880/* ------------------------------------------------------------------------- */ 2956/* ------------------------------------------------------------------------- */
… …
2882 * Word select: select text for 2 clicks 2958 * Word select: select text for 2 clicks
2883 * We now only find out the boundary in one direction 2959 * We now only find out the boundary in one direction
2884 */ 2960 */
2885 2961
2886/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2962/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2887#define DELIMIT_TEXT(x) \ 2963#define DELIMIT_TEXT(x) \
2888 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 2964 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x)))
2889#define DELIMIT_REND(x) 1 2965#define DELIMIT_REND(x) 1
2890 2966
2891void 2967void
2892rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2968rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2893{ 2969{
2894 int col, row, dirnadd, tcol, trow, w1, w2; 2970 int col, row, dirnadd, tcol, trow, w1, w2;
2895 row_col_t bound; 2971 row_col_t bound;
2896 text_t *stp; 2972 text_t *stp;
2897 rend_t *srp; 2973 rend_t *srp;
2898 2974
2899 if (dirn == UP) 2975 if (dirn == UP)
2900 { 2976 {
2901 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 2977 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2902 bound.col = 0; 2978 bound.col = 0;
… …
2906 { 2982 {
2907 bound.row = TermWin.saveLines + TermWin.nrow; 2983 bound.row = TermWin.saveLines + TermWin.nrow;
2908 bound.col = TermWin.ncol - 1; 2984 bound.col = TermWin.ncol - 1;
2909 dirnadd = 1; 2985 dirnadd = 1;
2910 } 2986 }
2987
2911 row = mark->row + TermWin.saveLines; 2988 row = mark->row + TermWin.saveLines;
2912 col = mark->col; 2989 col = mark->col;
2913 MAX_IT (col, 0); 2990 MAX_IT (col, 0);
2914 /* find the edge of a word */ 2991 /* find the edge of a word */
2915 stp = & (screen.text[row][col]); 2992 stp = & (screen.text[row][col]);
2916 w1 = DELIMIT_TEXT (*stp); 2993 w1 = DELIMIT_TEXT (*stp);
2917 2994
2918 if (selection_style != NEW_SELECT)
2919 {
2920 if (w1 == 1)
2921 {
2922 stp += dirnadd;
2923 if (DELIMIT_TEXT (*stp) == 1)
2924 goto Old_Word_Selection_You_Die;
2925 col += dirnadd;
2926 }
2927 w1 = 0;
2928 }
2929 srp = (&screen.rend[row][col]); 2995 srp = (&screen.rend[row][col]);
2930 w2 = DELIMIT_REND (*srp); 2996 w2 = DELIMIT_REND (*srp);
2931 2997
2932 for (;;) 2998 for (;;)
2933 { 2999 {
2934 for (; col != bound.col; col += dirnadd) 3000 for (; col != bound.col; col += dirnadd)
2935 { 3001 {
2936 stp += dirnadd; 3002 stp += dirnadd;
3003 srp += dirnadd;
3004
3005 if (*stp == NOCHAR)
3006 continue;
3007
2937 if (DELIMIT_TEXT (*stp) != w1) 3008 if (DELIMIT_TEXT (*stp) != w1)
2938 break; 3009 break;
2939 srp += dirnadd;
2940 if (DELIMIT_REND (*srp) != w2) 3010 if (DELIMIT_REND (*srp) != w2)
2941 break; 3011 break;
2942 } 3012 }
3013
2943 if ((col == bound.col) && (row != bound.row)) 3014 if ((col == bound.col) && (row != bound.row))
2944 { 3015 {
2945 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3016 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2946 { 3017 {
2947 trow = row + dirnadd; 3018 trow = row + dirnadd;
2948 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3019 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3020
2949 if (screen.text[trow] == NULL) 3021 if (screen.text[trow] == NULL)
2950 break; 3022 break;
3023
2951 stp = & (screen.text[trow][tcol]); 3024 stp = & (screen.text[trow][tcol]);
2952 srp = & (screen.rend[trow][tcol]); 3025 srp = & (screen.rend[trow][tcol]);
3026
2953 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3027 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2954 break; 3028 break;
3029
2955 row = trow; 3030 row = trow;
2956 col = tcol; 3031 col = tcol;
2957 continue; 3032 continue;
2958 } 3033 }
2959 } 3034 }
2960 break; 3035 break;
2961 } 3036 }
3037
2962Old_Word_Selection_You_Die: 3038Old_Word_Selection_You_Die:
2963 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); 3039 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col));
2964 3040
2965 if (dirn == DN) 3041 if (dirn == DN)
2966 col++; /* put us on one past the end */ 3042 col++; /* put us on one past the end */
… …
2988 MAX_IT (row, 0); 3064 MAX_IT (row, 0);
2989 MIN_IT (row, (int)TermWin.nrow - 1); 3065 MIN_IT (row, (int)TermWin.nrow - 1);
2990 MAX_IT (col, 0); 3066 MAX_IT (col, 0);
2991 MIN_IT (col, (int)TermWin.ncol); 3067 MIN_IT (col, (int)TermWin.ncol);
2992 3068
2993#ifndef NO_NEW_SELECTION
2994 /* 3069 /*
2995 * If we're selecting characters (single click) then we must check first 3070 * If we're selecting characters (single click) then we must check first
2996 * if we are at the same place as the original mark. If we are then 3071 * if we are at the same place as the original mark. If we are then
2997 * select nothing. Otherwise, if we're to the right of the mark, you have to 3072 * select nothing. Otherwise, if we're to the right of the mark, you have to
2998 * be _past_ a character for it to be selected. 3073 * be _past_ a character for it to be selected.
2999 */ 3074 */
3000 if (selection_style != OLD_SELECT)
3001 {
3002 if (((selection.clicks % 3) == 1) && !flag 3075 if (((selection.clicks % 3) == 1) && !flag
3003 && (col == selection.mark.col 3076 && (col == selection.mark.col
3004 && (row == selection.mark.row + TermWin.view_start))) 3077 && (row == selection.mark.row + TermWin.view_start)))
3005 { 3078 {
3006 /* select nothing */ 3079 /* select nothing */
3007 selection.beg.row = selection.end.row = 0; 3080 selection.beg.row = selection.end.row = 0;
3008 selection.beg.col = selection.end.col = 0; 3081 selection.beg.col = selection.end.col = 0;
3009 selection.clicks = 4; 3082 selection.clicks = 4;
3010 want_refresh = 1; 3083 want_refresh = 1;
3011 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); 3084 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3012 return; 3085 return;
3013 }
3014 } 3086 }
3015#endif 3087
3016 if (selection.clicks == 4) 3088 if (selection.clicks == 4)
3017 selection.clicks = 1; 3089 selection.clicks = 1;
3018 3090
3019 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3091 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3020 flag == 1 ? 1 : 0, /* ? button press */ 3092 flag == 1 ? 1 : 0, /* ? button press */
… …
3026 * Extend the selection to the specified col/row 3098 * Extend the selection to the specified col/row
3027 */ 3099 */
3028void 3100void
3029rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3101rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3030{ 3102{
3031 int16_t ncol = TermWin.ncol; 3103 int16_t ncol = TermWin.ncol;
3032 int end_col; 3104 int end_col;
3033 row_col_t pos; 3105 row_col_t pos;
3034 enum { 3106 enum {
3035 LEFT, RIGHT 3107 LEFT, RIGHT
3036 } closeto = RIGHT; 3108 } closeto = RIGHT;
3037 3109
3038 D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); 3110 D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op));
… …
3074 pos.col = col; 3146 pos.col = col;
3075 pos.row = row; 3147 pos.row = row;
3076 3148
3077 pos.row -= TermWin.view_start; /* adjust for scroll */ 3149 pos.row -= TermWin.view_start; /* adjust for scroll */
3078 3150
3079#ifndef NO_OLD_SELECTION
3080 /*
3081 * This mimics some of the selection behaviour of version 2.20 and before.
3082 * There are no ``selection modes'', button3 is always character extension.
3083 * Note: button3 drag is always available, c.f. v2.20
3084 * Selection always terminates (left or right as appropriate) at the mark.
3085 */
3086 if (selection_style == OLD_SELECT)
3087 {
3088 if (selection.clicks == 1 || button3)
3089 {
3090 if (hate_those_clicks)
3091 {
3092 hate_those_clicks = 0;
3093 if (selection.clicks == 1)
3094 {
3095 selection.beg.row = selection.mark.row;
3096 selection.beg.col = selection.mark.col;
3097 }
3098 else
3099 {
3100 selection.mark.row = selection.beg.row;
3101 selection.mark.col = selection.beg.col;
3102 }
3103 }
3104 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3105 {
3106 selection.end.row = selection.mark.row;
3107 selection.end.col = selection.mark.col + 1;
3108 selection.beg.row = pos.row;
3109 selection.beg.col = pos.col;
3110 }
3111 else
3112 {
3113 selection.beg.row = selection.mark.row;
3114 selection.beg.col = selection.mark.col;
3115 selection.end.row = pos.row;
3116 selection.end.col = pos.col + 1;
3117 }
3118 }
3119 else if (selection.clicks == 2)
3120 {
3121 selection_delimit_word (UP, & (selection.mark),
3122 & (selection.beg));
3123 selection_delimit_word (DN, & (selection.mark),
3124 & (selection.end));
3125 hate_those_clicks = 1;
3126 }
3127 else if (selection.clicks == 3)
3128 {
3129 selection.beg.row = selection.end.row = selection.mark.row;
3130 selection.beg.col = 0;
3131 selection.end.col = ncol;
3132 hate_those_clicks = 1;
3133 }
3134 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));
3135 return;
3136 }
3137#endif /* ! NO_OLD_SELECTION */
3138#ifndef NO_NEW_SELECTION
3139 /* selection_style must not be OLD_SELECT to get here */
3140 /* 3151 /*
3141 * This is mainly xterm style selection with a couple of differences, mainly 3152 * This is mainly xterm style selection with a couple of differences, mainly
3142 * in the way button3 drag extension works. 3153 * in the way button3 drag extension works.
3143 * We're either doing: button1 drag; button3 press; or button3 drag 3154 * We're either doing: button1 drag; button3 press; or button3 drag
3144 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3155 * a) button1 drag : select around a midpoint/word/line - that point/word/line
… …
3149 * a point/word/line which is either the start or end of the selection 3160 * a point/word/line which is either the start or end of the selection
3150 * and it was decided by whichever point/word/line was `fixed' at the 3161 * and it was decided by whichever point/word/line was `fixed' at the
3151 * time of the most recent button3 press 3162 * time of the most recent button3 press
3152 */ 3163 */
3153 if (button3 && buttonpress) 3164 if (button3 && buttonpress)
3154 { /* button3 press */ 3165 { /* button3 press */
3155 /* 3166 /*
3156 * first determine which edge of the selection we are closest to 3167 * first determine which edge of the selection we are closest to
3157 */ 3168 */
3158 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3169 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3159 || (!ROWCOL_IS_AFTER (pos, selection.end) 3170 || (!ROWCOL_IS_AFTER (pos, selection.end)
3160 && (((pos.col - selection.beg.col) 3171 && (((pos.col - selection.beg.col)
3161 + ((pos.row - selection.beg.row) * ncol)) 3172 + ((pos.row - selection.beg.row) * ncol))
3162 < ((selection.end.col - pos.col) 3173 < ((selection.end.col - pos.col)
3163 + ((selection.end.row - pos.row) * ncol))))) 3174 + ((selection.end.row - pos.row) * ncol)))))
3164 closeto = LEFT; 3175 closeto = LEFT;
3176
3165 if (closeto == LEFT) 3177 if (closeto == LEFT)
3166 { 3178 {
3167 selection.beg.row = pos.row; 3179 selection.beg.row = pos.row;
3168 selection.beg.col = pos.col; 3180 selection.beg.col = pos.col;
3169 selection.mark.row = selection.end.row; 3181 selection.mark.row = selection.end.row;
3170 selection.mark.col = selection.end.col 3182 selection.mark.col = selection.end.col - (selection.clicks == 2);
3171 - (selection.clicks == 2);
3172 } 3183 }
3173 else 3184 else
3174 { 3185 {
3175 selection.end.row = pos.row; 3186 selection.end.row = pos.row;
3176 selection.end.col = pos.col; 3187 selection.end.col = pos.col;
3177 selection.mark.row = selection.beg.row; 3188 selection.mark.row = selection.beg.row;
3178 selection.mark.col = selection.beg.col; 3189 selection.mark.col = selection.beg.col;
3179 } 3190 }
3180 } 3191 }
3181 else 3192 else
3182 { /* button1 drag or button3 drag */ 3193 { /* button1 drag or button3 drag */
3183 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3194 if (ROWCOL_IS_AFTER (selection.mark, pos))
3184 { 3195 {
3185 if ((selection.mark.row == selection.end.row) 3196 if ((selection.mark.row == selection.end.row)
3186 && (selection.mark.col == selection.end.col) 3197 && (selection.mark.col == selection.end.col)
3187 && clickchange && selection.clicks == 2) 3198 && clickchange && selection.clicks == 2)
3188 selection.mark.col--; 3199 selection.mark.col--;
3200
3189 selection.beg.row = pos.row; 3201 selection.beg.row = pos.row;
3190 selection.beg.col = pos.col; 3202 selection.beg.col = pos.col;
3191 selection.end.row = selection.mark.row; 3203 selection.end.row = selection.mark.row;
3192 selection.end.col = selection.mark.col 3204 selection.end.col = selection.mark.col + (selection.clicks == 2);
3193 + (selection.clicks == 2);
3194 } 3205 }
3195 else 3206 else
3196 { 3207 {
3197 selection.beg.row = selection.mark.row; 3208 selection.beg.row = selection.mark.row;
3198 selection.beg.col = selection.mark.col; 3209 selection.beg.col = selection.mark.col;
… …
3202 } 3213 }
3203 3214
3204 if (selection.clicks == 1) 3215 if (selection.clicks == 1)
3205 { 3216 {
3206 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3217 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3218
3207 if (end_col != -1 && selection.beg.col > end_col) 3219 if (end_col != -1 && selection.beg.col > end_col)
3208 { 3220 {
3209#if 1 3221#if 1
3210 selection.beg.col = ncol; 3222 selection.beg.col = ncol;
3211#else 3223#else
3212 if (selection.beg.row != selection.end.row) 3224 if (selection.beg.row != selection.end.row)
3213 selection.beg.col = ncol; 3225 selection.beg.col = ncol;
3214 else 3226 else
3215 selection.beg.col = selection.mark.col; 3227 selection.beg.col = selection.mark.col;
3216#endif 3228#endif
3217
3218 } 3229 }
3230
3219 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3231 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3232
3220 if (end_col != -1 && selection.end.col > end_col) 3233 if (end_col != -1 && selection.end.col > end_col)
3221 selection.end.col = ncol; 3234 selection.end.col = ncol;
3222
3223 } 3235 }
3224 else if (selection.clicks == 2) 3236 else if (selection.clicks == 2)
3225 { 3237 {
3226 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3238 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3227 selection.end.col--; 3239 selection.end.col--;
3240
3228 selection_delimit_word (UP, & (selection.beg), 3241 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3229 & (selection.beg));
3230 selection_delimit_word (DN, & (selection.end), 3242 selection_delimit_word (DN, & (selection.end), & (selection.end));
3231 & (selection.end));
3232 } 3243 }
3233 else if (selection.clicks == 3) 3244 else if (selection.clicks == 3)
3234 { 3245 {
3235#ifndef NO_FRILLS 3246#ifndef NO_FRILLS
3236 if ((Options & Opt_tripleclickwords)) 3247 if ((Options & Opt_tripleclickwords))
3237 { 3248 {
3238 int end_row; 3249 int end_row;
3239 3250
3240 selection_delimit_word (UP, & (selection.beg), 3251 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3241 & (selection.beg));
3242 end_row = screen.tlen[selection.mark.row 3252 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3243 + TermWin.saveLines]; 3253
3244 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3254 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3245 end_row++)
3246 { 3255 {
3247 end_col = screen.tlen[end_row + TermWin.saveLines]; 3256 end_col = screen.tlen[end_row + TermWin.saveLines];
3257
3248 if (end_col != -1) 3258 if (end_col != -1)
3249 { 3259 {
3250 selection.end.row = end_row; 3260 selection.end.row = end_row;
3251 selection.end.col = end_col; 3261 selection.end.col = end_col;
3252 selection_remove_trailing_spaces (); 3262 selection_remove_trailing_spaces ();
… …
3254 } 3264 }
3255 } 3265 }
3256 } 3266 }
3257 else 3267 else
3258#endif 3268#endif
3259
3260 { 3269 {
3261 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3270 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3262 selection.mark.col++; 3271 selection.mark.col++;
3263 selection.beg.col = 0; 3272 selection.beg.col = 0;
3264 selection.end.col = ncol; 3273 selection.end.col = ncol;
3265 } 3274 }
3266 } 3275 }
3276
3267 if (button3 && buttonpress) 3277 if (button3 && buttonpress)
3268 { /* mark may need to be changed */ 3278 { /* mark may need to be changed */
3269 if (closeto == LEFT) 3279 if (closeto == LEFT)
3270 { 3280 {
3271 selection.mark.row = selection.end.row; 3281 selection.mark.row = selection.end.row;
3272 selection.mark.col = selection.end.col 3282 selection.mark.col = selection.end.col
3273 - (selection.clicks == 2); 3283 - (selection.clicks == 2);
… …
3277 selection.mark.row = selection.beg.row; 3287 selection.mark.row = selection.beg.row;
3278 selection.mark.col = selection.beg.col; 3288 selection.mark.col = selection.beg.col;
3279 } 3289 }
3280 } 3290 }
3281 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); 3291 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3282#endif /* ! NO_NEW_SELECTION */
3283} 3292}
3284 3293
3285#ifndef NO_FRILLS 3294#ifndef NO_FRILLS
3286void 3295void
3287rxvt_term::selection_remove_trailing_spaces () 3296rxvt_term::selection_remove_trailing_spaces ()
… …
3361 ev.target = rq.target; 3370 ev.target = rq.target;
3362 ev.time = rq.time; 3371 ev.time = rq.time;
3363 3372
3364 if (rq.target == xa[XA_TARGETS]) 3373 if (rq.target == xa[XA_TARGETS])
3365 { 3374 {
3366 Atom32 target_list[5]; 3375 Atom32 target_list[6];
3367 Atom32 *target = target_list; 3376 Atom32 *target = target_list;
3368 3377
3369 *target++ = (Atom32) xa[XA_TARGETS]; 3378 *target++ = (Atom32) xa[XA_TARGETS];
3379 *target++ = (Atom32) xa[XA_TIMESTAMP];
3370 *target++ = (Atom32) XA_STRING; 3380 *target++ = (Atom32) XA_STRING;
3371 *target++ = (Atom32) xa[XA_TEXT]; 3381 *target++ = (Atom32) xa[XA_TEXT];
3372 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3382 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3373#if X_HAVE_UTF8_STRING 3383#if X_HAVE_UTF8_STRING
3374 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3384 *target++ = (Atom32) xa[XA_UTF8_STRING];
3375#endif 3385#endif
3386
3376 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3387 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3377 (8 * sizeof (target_list[0])), PropModeReplace, 3388 (8 * sizeof (target_list[0])), PropModeReplace,
3378 (unsigned char *)target_list, 3389 (unsigned char *)target_list,
3379 target - target_list); 3390 target - target_list);
3380 ev.property = rq.property; 3391 ev.property = rq.property;
3381 } 3392 }
3382 else if (rq.target == xa[XA_MULTIPLE]) 3393 else if (rq.target == xa[XA_MULTIPLE])
3383 { 3394 {
3384 /* TODO: Handle MULTIPLE */ 3395 /* TODO: Handle MULTIPLE */
3385 } 3396 }
3386 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3397 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3387 { 3398 {
3388 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3399 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3389 (8 * sizeof (Time)), PropModeReplace, 3400 (8 * sizeof (Time)), PropModeReplace,
3390 (unsigned char *)&selection_time, 1); 3401 (unsigned char *)&selection_time, 1);
3391 ev.property = rq.property; 3402 ev.property = rq.property;
3392 } 3403 }
3393 else if (rq.target == XA_STRING 3404 else if (rq.target == XA_STRING
3394 || rq.target == xa[XA_TEXT] 3405 || rq.target == xa[XA_TEXT]
3395 || rq.target == xa[XA_COMPOUND_TEXT] 3406 || rq.target == xa[XA_COMPOUND_TEXT]
3396 || rq.target == xa[XA_UTF8_STRING] 3407 || rq.target == xa[XA_UTF8_STRING]
3397 ) 3408 )
3398 { 3409 {
3399 short freect = 0; 3410 short freect = 0;
3400 int selectlen; 3411 int selectlen;
3401 char *cl; 3412 wchar_t *cl;
3402 3413
3403 target = rq.target; 3414 target = rq.target;
3404 3415
3405 if (target == XA_STRING) 3416 if (target == XA_STRING)
3406 // we actually don't do XA_STRING, but who cares, as i18n clients 3417 // we actually don't do XA_STRING, but who cares, as i18n clients
3407 // will ask for another format anyways. 3418 // will ask for another format anyways.
3408 style = XStringStyle; 3419 style = XStringStyle;
3409 else if (target == xa[XA_TEXT]) 3420 else if (target == xa[XA_TEXT])
3410 style = XTextStyle; 3421 style = XStdICCTextStyle;
3411 else if (target == xa[XA_COMPOUND_TEXT]) 3422 else if (target == xa[XA_COMPOUND_TEXT])
3412 style = XCompoundTextStyle; 3423 style = XCompoundTextStyle;
3413#if X_HAVE_UTF8_STRING 3424#if X_HAVE_UTF8_STRING
3414 else if (target == xa[XA_UTF8_STRING]) 3425 else if (target == xa[XA_UTF8_STRING])
3415 style = XUTF8StringStyle; 3426 style = XUTF8StringStyle;
… …
3420 style = XCompoundTextStyle; 3431 style = XCompoundTextStyle;
3421 } 3432 }
3422 3433
3423 if (selection.text) 3434 if (selection.text)
3424 { 3435 {
3425 cl = (char *)selection.text; 3436 cl = selection.text;
3426 selectlen = selection.len; 3437 selectlen = selection.len;
3427 } 3438 }
3428 else 3439 else
3429 { 3440 {
3430 cl = ""; 3441 cl = L"";
3431 selectlen = 0; 3442 selectlen = 0;
3432 } 3443 }
3433 3444
3445 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3446 // manually for XUTF8StringStyle.
3434 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3447 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3435 freect = 1; 3448 freect = 1;
3436 else 3449 else
3437 { 3450 {
3438 /* if we failed to convert then send it raw */ 3451 /* if we failed to convert then send it raw */
3439 ct.value = (unsigned char *)cl; 3452 ct.value = (unsigned char *)cl;
… …
3446 ev.property = rq.property; 3459 ev.property = rq.property;
3447 3460
3448 if (freect) 3461 if (freect)
3449 XFree (ct.value); 3462 XFree (ct.value);
3450 } 3463 }
3464
3451 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3465 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3452} 3466}
3453 3467
3454/* ------------------------------------------------------------------------- * 3468/* ------------------------------------------------------------------------- *
3455 * MOUSE ROUTINES * 3469 * MOUSE ROUTINES *
… …
3479 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3493 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace;
3480} 3494}
3481 3495
3482#endif 3496#endif
3483/* ------------------------------------------------------------------------- */ 3497/* ------------------------------------------------------------------------- */
3484
3485/* ------------------------------------------------------------------------- *
3486 * DEBUG ROUTINES *
3487 * ------------------------------------------------------------------------- */
3488#if 0
3489void
3490rxvt_debug_colors (void)
3491{
3492 int color;
3493 const char *name[] =
3494 {
3495 "fg", "bg",
3496 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3497 };
3498
3499 fprintf (stderr, "Color ( ");
3500 if (rstyle & RS_RVid)
3501 fprintf (stderr, "rvid ");
3502 if (rstyle & RS_Bold)
3503 fprintf (stderr, "bold ");
3504 if (rstyle & RS_Blink)
3505 fprintf (stderr, "blink ");
3506 if (rstyle & RS_Uline)
3507 fprintf (stderr, "uline ");
3508 fprintf (stderr, "): ");
3509
3510 color = GET_FGCOLOR (rstyle);
3511#ifndef NO_BRIGHTCOLOR
3512 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3513 {
3514 color -= (minBrightCOLOR - minCOLOR);
3515 fprintf (stderr, "bright ");
3516 }
3517#endif
3518 fprintf (stderr, "%s on ", name[color]);
3519
3520 color = GET_BGCOLOR (rstyle);
3521#ifndef NO_BRIGHTCOLOR
3522 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3523 {
3524 color -= (minBrightCOLOR - minCOLOR);
3525 fprintf (stderr, "bright ");
3526 }
3527#endif
3528 fprintf (stderr, "%s\n", name[color]);
3529}
3530#endif

Diff Legend

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