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.54 by pcg, Thu Mar 11 00:53:19 2004 UTC vs.
Revision 1.89 by root, Fri Aug 13 22:38:57 2004 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.c 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
7 * 7 *
… …
29#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
30#include "screen.intpro" /* PROTOS for internal routines */ 30#include "screen.intpro" /* PROTOS for internal routines */
31 31
32#include <X11/Xmd.h> /* get the typedef for CARD32 */ 32#include <X11/Xmd.h> /* get the typedef for CARD32 */
33 33
34#include <stdint.h> 34#include <inttypes.h>
35#include <wchar.h> 35#include <wchar.h>
36 36
37#include "salloc.C" // HACK, should be a seperate compile! 37#include "salloc.C" // HACK, should be a seperate compile!
38 38
39inline void fill_text (text_t *start, text_t value, int len) 39inline void fill_text (text_t *start, text_t value, int len)
… …
48 48
49/* ------------------------------------------------------------------------- * 49/* ------------------------------------------------------------------------- *
50 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 50 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
51 * ------------------------------------------------------------------------- */ 51 * ------------------------------------------------------------------------- */
52#define ZERO_SCROLLBACK() \ 52#define ZERO_SCROLLBACK() \
53 if ((Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ 53 if (Options & Opt_scrollTtyOutput) \
54 TermWin.view_start = 0 54 TermWin.view_start = 0
55#define CLEAR_SELECTION() \ 55#define CLEAR_SELECTION() \
56 selection.beg.row = selection.beg.col \ 56 selection.beg.row = selection.beg.col \
57 = selection.end.row = selection.end.col = 0 57 = selection.end.row = selection.end.col = 0
58#define CLEAR_ALL_SELECTION() \ 58#define CLEAR_ALL_SELECTION() \
59 selection.beg.row = selection.beg.col \ 59 selection.beg.row = selection.beg.col \
60 = selection.mark.row = selection.mark.col \ 60 = selection.mark.row = selection.mark.col \
61 = selection.end.row = selection.end.col = 0 61 = selection.end.row = selection.end.col = 0
62 62
63#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 63#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
64 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 64 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
65#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 65#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
66 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 66 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
67#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ 67#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \
68 (((A) == (C)) && ((B) > (D))) 68 (((A) == (C)) && ((B) > (D)))
69#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ 69#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \
70 (((A) == (C)) && ((B) >= (D))) 70 (((A) == (C)) && ((B) >= (D)))
71#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ 71#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \
72 (((A) == (C)) && ((B) < (D))) 72 (((A) == (C)) && ((B) < (D)))
73#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ 73#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \
74 (((A) == (C)) && ((B) <= (D))) 74 (((A) == (C)) && ((B) <= (D)))
75 75
76/* these must be row_col_t */ 76/* these must be row_col_t */
77#define ROWCOL_IS_AFTER(X, Y) \ 77#define ROWCOL_IS_AFTER(X, Y) \
78 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col) 78 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col)
79#define ROWCOL_IS_BEFORE(X, Y) \ 79#define ROWCOL_IS_BEFORE(X, Y) \
80 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 80 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
81#define ROWCOL_IN_ROW_AFTER(X, Y) \ 81#define ROWCOL_IN_ROW_AFTER(X, Y) \
82 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col) 82 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col)
83#define ROWCOL_IN_ROW_BEFORE(X, Y) \ 83#define ROWCOL_IN_ROW_BEFORE(X, Y) \
84 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 85#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
86 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 86 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
87#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 87#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
88 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 88 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
89 89
90/* 90/*
91 * CLEAR_ROWS : clear <num> rows starting from row <row> 91 * CLEAR_ROWS : clear <num> rows starting from row <row>
92 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 92 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
93 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 93 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
94 */ 94 */
95#define drawBuffer TermWin.vt 95#define drawBuffer TermWin.vt
96 96
97#define CLEAR_ROWS(row, num) \ 97#define CLEAR_ROWS(row, num) \
98 if (TermWin.mapped) \ 98 if (TermWin.mapped) \
99 XClearArea (display->display, drawBuffer, TermWin.int_bwidth, \ 99 XClearArea (display->display, drawBuffer, 0, \
100 Row2Pixel (row), (unsigned int)TermWin.width, \ 100 Row2Pixel (row), (unsigned int)TermWin.width, \
101 (unsigned int)Height2Pixel (num), False) 101 (unsigned int)Height2Pixel (num), False)
102 102
103#define CLEAR_CHARS(x, y, num) \ 103#define CLEAR_CHARS(x, y, num) \
104 if (TermWin.mapped) \ 104 if (TermWin.mapped) \
105 XClearArea (display->display, drawBuffer, x, y, \ 105 XClearArea (display->display, drawBuffer, x, y, \
106 (unsigned int)Width2Pixel (num), \ 106 (unsigned int)Width2Pixel (num), \
107 (unsigned int)Height2Pixel (1), False) 107 (unsigned int)Height2Pixel (1), False)
108 108
109#define ERASE_ROWS(row, num) \ 109#define ERASE_ROWS(row, num) \
110 XFillRectangle (display->display, drawBuffer, TermWin.gc, \ 110 XFillRectangle (display->display, drawBuffer, TermWin.gc, \
111 TermWin.int_bwidth, Row2Pixel (row), \ 111 0, Row2Pixel (row), \
112 (unsigned int)TermWin.width, \ 112 (unsigned int)TermWin.width, \
113 (unsigned int)Height2Pixel (num)) 113 (unsigned int)Height2Pixel (num))
114 114
115/* ------------------------------------------------------------------------- * 115/* ------------------------------------------------------------------------- *
116 * SCREEN `COMMON' ROUTINES * 116 * SCREEN `COMMON' ROUTINES *
117 * ------------------------------------------------------------------------- */ 117 * ------------------------------------------------------------------------- */
118/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
119void 119void
120rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)
121{ 121{
122 efs &= ~RS_baseattrMask; 122 efs &= ~RS_baseattrMask;
123 efs = SET_FONT (efs, TermWin.fontset->find_font (' ')); 123 efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]);
124 124
125 while (width--) 125 while (width--)
126 { 126 {
127 *et++ = ' '; 127 *et++ = ' ';
128 *er++ = efs; 128 *er++ = efs;
… …
172 nrow = TermWin.nrow; 172 nrow = TermWin.nrow;
173 173
174 if (ncol == prev_ncol && nrow == prev_nrow) 174 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 175 return;
176 176
177 // we need at least two lines for wrapping to work correctly
178 if (nrow + TermWin.saveLines < 2)
179 {
180 TermWin.saveLines++;
181 prev_nrow--;
182 TermWin.nscrolled++;
183 }
184
177 want_refresh = 1; 185 want_refresh = 1;
178 186
187 prev_total_rows = prev_nrow + TermWin.saveLines;
179 total_rows = nrow + TermWin.saveLines; 188 total_rows = nrow + TermWin.saveLines;
180 prev_total_rows = prev_nrow + TermWin.saveLines;
181 189
182 screen.tscroll = 0; 190 screen.tscroll = 0;
183 screen.bscroll = nrow - 1; 191 screen.bscroll = nrow - 1;
184 192
185 if (!talloc) 193 if (!talloc)
186 { 194 {
187 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 195 talloc = new rxvt_salloc (ncol * sizeof (text_t));
188 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 196 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
189 } 197 }
190 198
191 if (prev_nrow == 0) 199 if (!screen.text)
192 { 200 {
193 /* 201 /*
194 * first time called so just malloc everything : don't rely on realloc 202 * first time called so just malloc everything: don't rely on realloc
195 * Note: this is still needed so that all the scrollback lines are NULL 203 * Note: this is still needed so that all the scrollback lines are NULL
196 */ 204 */
197 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 205 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
198 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 206 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
199 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 207 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
… …
256 scr_scroll_text (0, (int)prev_nrow - 1, k, 1); 264 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
257 265
258 for (p = nrow; p < prev_nrow; p++) 266 for (p = nrow; p < prev_nrow; p++)
259 { 267 {
260 q = p + TermWin.saveLines; 268 q = p + TermWin.saveLines;
269
261 if (screen.text[q]) 270 if (screen.text[q])
262 { 271 {
263#ifdef DEBUG_STRICT 272#ifdef DEBUG_STRICT
264 assert (screen.rend[q]); 273 assert (screen.rend[q]);
265#endif 274#endif
266 talloc->free (screen.text[q]); 275 talloc->free (screen.text[q]);
267 ralloc->free (screen.rend[q]); 276 ralloc->free (screen.rend[q]);
268 } 277 }
278
269 if (swap.text[p]) 279 if (swap.text[p])
270 { 280 {
271#ifdef DEBUG_STRICT 281#ifdef DEBUG_STRICT
272 assert (swap.rend[p]); 282 assert (swap.rend[p]);
273#endif 283#endif
274 talloc->free (swap.text[p]); 284 talloc->free (swap.text[p]);
275 ralloc->free (swap.rend[p]); 285 ralloc->free (swap.rend[p]);
276 } 286 }
287
277#ifdef DEBUG_STRICT 288#ifdef DEBUG_STRICT
278 assert (drawn_text[p] && drawn_rend[p]); 289 assert (drawn_text[p] && drawn_rend[p]);
279#endif 290#endif
280 talloc->free (drawn_text[p]); 291 talloc->free (drawn_text[p]);
281 ralloc->free (drawn_rend[p]); 292 ralloc->free (drawn_rend[p]);
… …
311 swap.tlen[p] = 0; 322 swap.tlen[p] = 0;
312 swap.text[p] = NULL; 323 swap.text[p] = NULL;
313 swap.rend[p] = NULL; 324 swap.rend[p] = NULL;
314 drawn_text[p] = NULL; 325 drawn_text[p] = NULL;
315 drawn_rend[p] = NULL; 326 drawn_rend[p] = NULL;
316 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); 327 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
317 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); 328 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
318 } 329 }
319 330
320 if (k > 0) 331 if (k > 0)
321 { 332 {
… …
336 } 347 }
337 348
338 /* resize columns */ 349 /* resize columns */
339 if (ncol != prev_ncol) 350 if (ncol != prev_ncol)
340 { 351 {
341 int common = min (prev_ncol, ncol);
342 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); 352 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
343 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); 353 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
344 354
345 for (p = 0; p < total_rows; p++) 355 for (p = 0; p < total_rows; p++)
346 { 356 {
347 if (screen.text[p]) 357 if (screen.text[p])
348 { 358 {
349 text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t; 359 screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t));
350 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, screen.rend[p], common * sizeof (rend_t)); screen.rend[p] = r; 360 screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
351 361
352 MIN_IT (screen.tlen[p], (int16_t)ncol); 362 MIN_IT (screen.tlen[p], (int16_t)ncol);
353 363
354 if (ncol > prev_ncol) 364 if (ncol > prev_ncol)
355 scr_blank_line (& (screen.text[p][prev_ncol]), 365 scr_blank_line (&screen.text[p][prev_ncol],
356 & (screen.rend[p][prev_ncol]), 366 &screen.rend[p][prev_ncol],
357 ncol - prev_ncol, 367 ncol - prev_ncol, setrstyle);
358 setrstyle);
359 } 368 }
360 } 369 }
361 370
362 for (p = 0; p < nrow; p++) 371 for (p = 0; p < nrow; p++)
363 { 372 {
364 text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t; 373 drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t));
365 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, drawn_rend[p], common * sizeof (rend_t)); drawn_rend[p] = r; 374 drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
366 375
367 if (ncol > prev_ncol) 376 if (ncol > prev_ncol)
368 scr_blank_line (& (drawn_text[p][prev_ncol]), 377 scr_blank_line (&drawn_text[p][prev_ncol],
369 & (drawn_rend[p][prev_ncol]), 378 &drawn_rend[p][prev_ncol],
370 ncol - prev_ncol, setrstyle); 379 ncol - prev_ncol, setrstyle);
371 380
372 if (swap.text[p]) 381 if (swap.text[p])
373 { 382 {
374 text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t; 383 swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t));
375 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, swap.rend[p], common * sizeof (rend_t)); swap.rend[p] = r; 384 swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
376 385
377 MIN_IT (swap.tlen[p], (int16_t)ncol); 386 MIN_IT (swap.tlen[p], (int16_t)ncol);
378 387
379 if (ncol > prev_ncol) 388 if (ncol > prev_ncol)
380 scr_blank_line (& (swap.text[p][prev_ncol]), 389 scr_blank_line (&swap.text[p][prev_ncol],
381 & (swap.rend[p][prev_ncol]), 390 &swap.rend[p][prev_ncol],
382 ncol - prev_ncol, setrstyle); 391 ncol - prev_ncol, setrstyle);
383 } 392 }
384 393
385 } 394 }
386 395
… …
438{ 447{
439 uint16_t total_rows; 448 uint16_t total_rows;
440 int i; 449 int i;
441 450
442 total_rows = TermWin.nrow + TermWin.saveLines; 451 total_rows = TermWin.nrow + TermWin.saveLines;
443
444#ifdef DEBUG_STRICT
445 for (i = 0; i < total_rows; i++)
446 {
447 if (screen.text[i])
448 /* then so is screen.rend[i] */
449 assert (screen.rend[i]);
450 }
451#endif
452 452
453 delete talloc; talloc = 0; 453 delete talloc; talloc = 0;
454 delete ralloc; ralloc = 0; 454 delete ralloc; ralloc = 0;
455 455
456 free (screen.text); 456 free (screen.text);
… …
485 485
486 scr_release (); 486 scr_release ();
487 prev_nrow = prev_ncol = 0; 487 prev_nrow = prev_ncol = 0;
488 scr_reset (); 488 scr_reset ();
489 489
490 scr_clear (); 490 scr_clear (true);
491 scr_refresh (SLOW_REFRESH); 491 scr_refresh (SLOW_REFRESH);
492} 492}
493 493
494/* ------------------------------------------------------------------------- * 494/* ------------------------------------------------------------------------- *
495 * PROCESS SCREEN COMMANDS * 495 * PROCESS SCREEN COMMANDS *
… …
500 * XTERM_SEQ: Restore cursor: ESC 8 500 * XTERM_SEQ: Restore cursor: ESC 8
501 */ 501 */
502void 502void
503rxvt_term::scr_cursor (int mode) 503rxvt_term::scr_cursor (int mode)
504{ 504{
505 screen_t *s; 505 screen_t *s;
506 506
507 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); 507 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
508 508
509#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 509#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
510 if (current_screen == SECONDARY) 510 if (current_screen == SECONDARY)
511 s = & (swap); 511 s = &swap;
512 else 512 else
513#endif 513#endif
514 s = & (screen); 514 s = &screen;
515
515 switch (mode) 516 switch (mode)
516 { 517 {
517 case SAVE: 518 case SAVE:
518 s->s_cur.row = s->cur.row; 519 s->s_cur.row = s->cur.row;
519 s->s_cur.col = s->cur.col; 520 s->s_cur.col = s->cur.col;
520 s->s_rstyle = rstyle; 521 s->s_rstyle = rstyle;
521 s->s_charset = s->charset; 522 s->s_charset = s->charset;
522 s->s_charset_char = charsets[s->charset]; 523 s->s_charset_char = charsets[s->charset];
523 break; 524 break;
525
524 case RESTORE: 526 case RESTORE:
525 want_refresh = 1; 527 want_refresh = 1;
526 s->cur.row = s->s_cur.row; 528 s->cur.row = s->s_cur.row;
527 s->cur.col = s->s_cur.col; 529 s->cur.col = s->s_cur.col;
528 s->flags &= ~Screen_WrapNext; 530 s->flags &= ~Screen_WrapNext;
… …
530 s->charset = s->s_charset; 532 s->charset = s->s_charset;
531 charsets[s->charset] = s->s_charset_char; 533 charsets[s->charset] = s->s_charset_char;
532 set_font_style (); 534 set_font_style ();
533 break; 535 break;
534 } 536 }
537
535 /* boundary check in case screen size changed between SAVE and RESTORE */ 538 /* boundary check in case screen size changed between SAVE and RESTORE */
536 MIN_IT (s->cur.row, TermWin.nrow - 1); 539 MIN_IT (s->cur.row, TermWin.nrow - 1);
537 MIN_IT (s->cur.col, TermWin.ncol - 1); 540 MIN_IT (s->cur.col, TermWin.ncol - 1);
538#ifdef DEBUG_STRICT 541#ifdef DEBUG_STRICT
539 assert (s->cur.row >= 0); 542 assert (s->cur.row >= 0);
… …
551 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 554 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
552 */ 555 */
553int 556int
554rxvt_term::scr_change_screen (int scrn) 557rxvt_term::scr_change_screen (int scrn)
555{ 558{
556 int i; 559 int i;
557#if NSCREENS 560#if NSCREENS
558 int offset; 561 int offset;
559#endif 562#endif
560 563
561 want_refresh = 1; 564 want_refresh = 1;
562 565
563 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); 566 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
564 567
565 TermWin.view_start = 0; 568 TermWin.view_start = 0;
566 569
567 if (current_screen == scrn) 570 if (current_screen == scrn)
568 return current_screen; 571 return scrn;
569 572
570 selection_check (2); /* check for boundary cross */ 573 selection_check (2); /* check for boundary cross */
571 574
572 SWAP_IT (current_screen, scrn, int); 575 SWAP_IT (current_screen, scrn, int);
573#if NSCREENS 576#if NSCREENS
577 if (Options & Opt_secondaryScreen)
578 {
574 num_scr = 0; 579 num_scr = 0;
575 offset = TermWin.saveLines; 580 offset = TermWin.saveLines;
576 for (i = prev_nrow; i--;) 581 for (i = prev_nrow; i--;)
577 { 582 {
578 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 583 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
579 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 584 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
580 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 585 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
581 } 586 }
582 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 587 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
583 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 588 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
584# ifdef DEBUG_STRICT 589# ifdef DEBUG_STRICT
585 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); 590 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
586 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); 591 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
587# else /* drive with your eyes closed */ 592# else /* drive with your eyes closed */
588 MAX_IT (screen.cur.row, 0); 593 MAX_IT (screen.cur.row, 0);
589 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 594 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
590 MAX_IT (screen.cur.col, 0); 595 MAX_IT (screen.cur.col, 0);
591 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); 596 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
592# endif 597# endif
593 SWAP_IT (screen.charset, swap.charset, int16_t); 598 SWAP_IT (screen.charset, swap.charset, int16_t);
594 SWAP_IT (screen.flags, swap.flags, int); 599 SWAP_IT (screen.flags, swap.flags, int);
595 screen.flags |= Screen_VisibleCursor; 600 screen.flags |= Screen_VisibleCursor;
596 swap.flags |= Screen_VisibleCursor; 601 swap.flags |= Screen_VisibleCursor;
597#else 602 }
598# ifdef SCROLL_ON_NO_SECONDARY 603 else
604#endif
605 if (Options & Opt_secondaryScroll)
599 if (current_screen == PRIMARY) 606 //if (current_screen == PRIMARY)
600 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 607 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
601# endif
602#endif
603 return scrn; 608 return scrn;
604} 609}
605 610
606/* ------------------------------------------------------------------------- */ 611/* ------------------------------------------------------------------------- */
607/* 612/*
… …
649 return 0; 654 return 0;
650 655
651 want_refresh = 1; 656 want_refresh = 1;
652 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); 657 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
653 658
654 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) 659 if (row1 == 0 && count > 0
660 && (current_screen == PRIMARY || Options & Opt_secondaryScroll))
655 { 661 {
656 nscrolled = (long)TermWin.nscrolled + (long)count; 662 nscrolled = (long)TermWin.nscrolled + (long)count;
657 663
658 if (nscrolled > (long)TermWin.saveLines) 664 if (nscrolled > (long)TermWin.saveLines)
659 TermWin.nscrolled = TermWin.saveLines; 665 TermWin.nscrolled = TermWin.saveLines;
… …
707 if (j > 0) 713 if (j > 0)
708 { 714 {
709 /* A: scroll up */ 715 /* A: scroll up */
710 716
711 /* A1: Copy lines that will get clobbered by the rotation */ 717 /* A1: Copy lines that will get clobbered by the rotation */
718 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
719 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
720
721 /* A2: Rotate lines */
722 i = row2 - row1 - count + 1;
723 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
724 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
725 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
726
727 j = row2 - count + 1, i = count;
728 }
729 else /* if (j < 0) */
730 {
731 /* B: scroll down */
732
733 /* B1: Copy lines that will get clobbered by the rotation */
712 for (i = 0, j = row1; i < count; i++, j++) 734 for (i = 0, j = row2; i < count; i++, j--)
713 { 735 {
714 buf_text[i] = screen.text[j]; 736 buf_text[i] = screen.text[j];
715 buf_rend[i] = screen.rend[j]; 737 buf_rend[i] = screen.rend[j];
716 } 738 }
739
717 /* A2: Rotate lines */ 740 /* B2: Rotate lines */
718 for (j = row1, i = j + count; i <= row2; i++, j++) 741 for (j = row2, i = j - count; i >= row1; i--, j--)
719 { 742 {
720 screen.tlen[j] = screen.tlen[i]; 743 screen.tlen[j] = screen.tlen[i];
721 screen.text[j] = screen.text[i]; 744 screen.text[j] = screen.text[i];
722 screen.rend[j] = screen.rend[i]; 745 screen.rend[j] = screen.rend[i];
723 } 746 }
724 j = row2 - count + 1, i = count;
725 }
726 else /* if (j < 0) */
727 {
728 /* B: scroll down */
729 747
730 /* B1: Copy lines that will get clobbered by the rotation */
731 for (i = 0, j = row2; i < count; i++, j--)
732 {
733 buf_text[i] = screen.text[j];
734 buf_rend[i] = screen.rend[j];
735 }
736 /* B2: Rotate lines */
737 for (j = row2, i = j - count; i >= row1; i--, j--)
738 {
739 screen.tlen[j] = screen.tlen[i];
740 screen.text[j] = screen.text[i];
741 screen.rend[j] = screen.rend[i];
742 }
743 j = row1, i = count; 748 j = row1, i = count;
744 count = -count; 749 count = -count;
745 } 750 }
746 751
747 /* C: Resurrect lines */ 752 /* C: Resurrect lines */
753 memset (screen.tlen + j, 0, i * sizeof (int16_t));
754 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
755 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
756 if (!spec) /* line length may not equal TermWin.ncol */
748 for (; i--; j++) 757 for (; i--; j++)
749 {
750 screen.tlen[j] = 0;
751 screen.text[j] = buf_text[i];
752 screen.rend[j] = buf_rend[i];
753
754 if (!spec) /* line length may not equal TermWin.ncol */
755 scr_blank_screen_mem (screen.text, screen.rend, 758 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
756 (unsigned int)j, rstyle);
757 }
758 759
759 return count; 760 return count;
760} 761}
761 762
762/* ------------------------------------------------------------------------- */ 763/* ------------------------------------------------------------------------- */
763/* 764/*
764 * Add text given in <str> of length <len> to screen struct 765 * Add text given in <str> of length <len> to screen struct
765 */ 766 */
766void 767void
767rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) 768rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
768{ 769{
769 unsigned char checksel, clearsel; 770 unsigned char checksel, clearsel;
770 uint32_t c; 771 unicode_t c;
771 int i, row, last_col; 772 int i, row, last_col;
772 text_t *stp; 773 text_t *stp;
773 rend_t *srp; 774 rend_t *srp;
774 775
775 if (len <= 0) /* sanity */ 776 if (len <= 0) /* sanity */
… …
780 781
781 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len)); 782 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
782 ZERO_SCROLLBACK (); 783 ZERO_SCROLLBACK ();
783 if (nlines > 0) 784 if (nlines > 0)
784 { 785 {
785 nlines += (screen.cur.row - screen.bscroll); 786 nlines += screen.cur.row - screen.bscroll;
786 if ((nlines > 0) 787 if ((nlines > 0)
787 && (screen.tscroll == 0) 788 && (screen.tscroll == 0)
788 && (screen.bscroll == (TermWin.nrow - 1))) 789 && (screen.bscroll == (TermWin.nrow - 1)))
789 { 790 {
790 /* _at least_ this many lines need to be scrolled */ 791 /* _at least_ this many lines need to be scrolled */
791 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 792 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
792 screen.cur.row -= nlines; 793 screen.cur.row -= nlines;
793 } 794 }
794 } 795 }
796
795#ifdef DEBUG_STRICT 797#ifdef DEBUG_STRICT
796 assert (screen.cur.col < last_col); 798 assert (screen.cur.col < last_col);
797 assert ((screen.cur.row < TermWin.nrow) 799 assert ((screen.cur.row < TermWin.nrow)
798 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 800 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
799#else /* drive with your eyes closed */ 801#else /* drive with your eyes closed */
800 MIN_IT (screen.cur.col, last_col - 1); 802 MIN_IT (screen.cur.col, last_col - 1);
801 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 803 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
802 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 804 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
803#endif 805#endif
804 row = screen.cur.row + TermWin.saveLines; 806 row = screen.cur.row + TermWin.saveLines;
805 807
806 checksel = (selection.op 808 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807 && current_screen == selection.screen) ? 1 : 0;
808 clearsel = 0; 809 clearsel = 0;
809 810
810 stp = screen.text[row]; 811 stp = screen.text[row];
811 srp = screen.rend[row]; 812 srp = screen.rend[row];
812 813
813 for (i = 0; i < len;) 814 while (len--)
814 { 815 {
815 c = str[i++]; 816 c = *str++;
817
818 if (c < 0x20)
816 switch (c) 819 switch (c)
817 { 820 {
818 case '\t': 821 case C0_HT:
819 scr_tab (1); 822 scr_tab (1);
820 continue; 823 continue;
821 case '\n': 824
825 case C0_LF:
822 if (screen.tlen[row] != -1) /* XXX: think about this */ 826 if (screen.tlen[row] != -1) /* XXX: think about this */
823 MAX_IT (screen.tlen[row], screen.cur.col); 827 MAX_IT (screen.tlen[row], screen.cur.col);
828
824 screen.flags &= ~Screen_WrapNext; 829 screen.flags &= ~Screen_WrapNext;
830
825 if (screen.cur.row == screen.bscroll) 831 if (screen.cur.row == screen.bscroll)
826 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 832 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
827 else if (screen.cur.row < (TermWin.nrow - 1)) 833 else if (screen.cur.row < (TermWin.nrow - 1))
828 row = (++screen.cur.row) + TermWin.saveLines; 834 row = (++screen.cur.row) + TermWin.saveLines;
835
829 stp = screen.text[row]; /* _must_ refresh */ 836 stp = screen.text[row]; /* _must_ refresh */
830 srp = screen.rend[row]; /* _must_ refresh */ 837 srp = screen.rend[row]; /* _must_ refresh */
831 continue; 838 continue;
832 case '\r': 839
840 case C0_CR:
833 if (screen.tlen[row] != -1) /* XXX: think about this */ 841 if (screen.tlen[row] != -1) /* XXX: think about this */
834 MAX_IT (screen.tlen[row], screen.cur.col); 842 MAX_IT (screen.tlen[row], screen.cur.col);
843
835 screen.flags &= ~Screen_WrapNext; 844 screen.flags &= ~Screen_WrapNext;
836 screen.cur.col = 0; 845 screen.cur.col = 0;
837 continue; 846 continue;
838 default:
839 if (c == 127)
840 continue; /* yummmm..... */
841 break;
842 } 847 }
843 848
844 if (checksel /* see if we're writing within selection */ 849 if (checksel /* see if we're writing within selection */
845 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 850 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
846 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 851 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
847 { 852 {
… …
864 } 869 }
865 870
866 if (screen.flags & Screen_Insert) 871 if (screen.flags & Screen_Insert)
867 scr_insdel_chars (1, INSERT); 872 scr_insdel_chars (1, INSERT);
868 873
869 if (IS_COMPOSE (c))
870 c = REPLACEMENT_CHAR;
871
872 // rely on wcwidth to tell us the character width, at least for non-latin1 874 // rely on wcwidth to tell us the character width, at least for non-latin1
873 // do wcwidth before further replacements, as wcwidth says that line-drawing 875 // do wcwidth before further replacements, as wcwidth says that line-drawing
874 // characters have width -1 (DOH!) on gnu/linux sometimes. 876 // characters have width -1 (DOH!) on GNU/Linux sometimes.
875 int width = c < 256 ? 1 : wcwidth (c); 877 int width = c < 0x100 ? 1 : wcwidth (c);
876 878
877 if (charsets[screen.charset] == '0') // DEC SPECIAL 879 if (charsets[screen.charset] == '0') // DEC SPECIAL
878 switch (c)
879 { 880 {
880 // vt100 special graphics and line drawing 881 // vt100 special graphics and line drawing
881 case '`': c = 0x25c6; break; case '_': c = 0x0020; break; 882 static uint16_t vt100_0[32] = { // 5f .. 7e
882 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; 883 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
883 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; 884 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
884 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; 885 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
885 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; 886 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
886 case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break;
887 case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break;
888 case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break;
889 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break;
890 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break;
891 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
892 } 887 };
888
889 if (c >= 0x5f && c <= 0x7e)
890 {
891 c = vt100_0[c - 0x5f];
892 width = 1;
893 }
893 894 }
894 895
895 if (width > 0) 896 if (width != 0)
896 { 897 {
897#if !UNICODE_3 898#if !UNICODE_3 && ENABLE_COMBINING
898 // trim characters we can't store directly :( 899 // trim characters we can't store directly :(
899 if (c >= 0x10000) 900 if (c >= 0x10000)
900 c = rxvt_composite.compose (c); // map to lower 16 bits 901 c = rxvt_composite.compose (c); // map to lower 16 bits
901#endif 902#endif
902 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 903 bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0);
904 rend_t rend = SET_FONT (rstyle,
905 c > 0x7f || bold || c < 0x20
906 ? TermWin.fontset->find_font (c, bold)
907 : TermWin.ascii_map [c - 0x20]);
903 908
904 do 909 do
905 { 910 {
906 stp[screen.cur.col] = c; 911 stp[screen.cur.col] = c;
907 srp[screen.cur.col] = rend; 912 srp[screen.cur.col] = rend;
… …
927 srp[c] = rend; 932 srp[c] = rend;
928 } 933 }
929 } 934 }
930 else if (width == 0) 935 else if (width == 0)
931 { 936 {
932#if ENCODING_COMPOSE 937#if ENABLE_COMBINING
933 // handle combining characters 938 // handle combining characters
934 // we just tag the accent on the previous on-screen character. 939 // we just tag the accent on the previous on-screen character.
935 // this is arguably not correct, but also arguably not wrong. 940 // this is arguably not correct, but also arguably not wrong.
936 // we don't handle double-width characters nicely yet. 941 // we don't handle double-width characters nicely yet.
937 942
… …
955 // handle double-width-chars by making them look extremely ugly 960 // handle double-width-chars by making them look extremely ugly
956 if (*tp == NOCHAR) 961 if (*tp == NOCHAR)
957 *tp = ' '; // hack //D //TODO //--tp, --rp; 962 *tp = ' '; // hack //D //TODO //--tp, --rp;
958 963
959 // first try to find a precomposed character 964 // first try to find a precomposed character
960 uint32_t n = rxvt_compose (*tp, c); 965 unicode_t n = rxvt_compose (*tp, c);
961 if (n == NOCHAR) 966 if (n == NOCHAR)
962 n = rxvt_composite.compose (*tp, c); 967 n = rxvt_composite.compose (*tp, c);
963 968
964 *tp = n; 969 *tp = n;
965 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 970 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
… …
992 */ 997 */
993void 998void
994rxvt_term::scr_backspace () 999rxvt_term::scr_backspace ()
995{ 1000{
996 want_refresh = 1; 1001 want_refresh = 1;
1002
997 if (screen.cur.col == 0) 1003 if (screen.cur.col == 0)
998 { 1004 {
999 if (screen.cur.row > 0) 1005 if (screen.cur.row > 0)
1000 { 1006 {
1001#ifdef TERMCAP_HAS_BW 1007#ifdef TERMCAP_HAS_BW
… …
1006 1012
1007 } 1013 }
1008 } 1014 }
1009 else if ((screen.flags & Screen_WrapNext) == 0) 1015 else if ((screen.flags & Screen_WrapNext) == 0)
1010 scr_gotorc (0, -1, RELATIVE); 1016 scr_gotorc (0, -1, RELATIVE);
1017
1011 screen.flags &= ~Screen_WrapNext; 1018 screen.flags &= ~Screen_WrapNext;
1012} 1019}
1013 1020
1014/* ------------------------------------------------------------------------- */ 1021/* ------------------------------------------------------------------------- */
1015/* 1022/*
… …
1018 * XTERM_SEQ: CTRL-I 1025 * XTERM_SEQ: CTRL-I
1019 */ 1026 */
1020void 1027void
1021rxvt_term::scr_tab (int count) 1028rxvt_term::scr_tab (int count)
1022{ 1029{
1023 int i, x; 1030 int i, x;
1024 1031
1025 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); 1032 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1026 want_refresh = 1; 1033 want_refresh = 1;
1027 i = x = screen.cur.col; 1034 i = x = screen.cur.col;
1035
1028 if (count == 0) 1036 if (count == 0)
1029 return; 1037 return;
1030 else if (count > 0) 1038 else if (count > 0)
1031 { 1039 {
1032 for (; ++i < TermWin.ncol; ) 1040 for (; ++i < TermWin.ncol; )
… …
1034 { 1042 {
1035 x = i; 1043 x = i;
1036 if (!--count) 1044 if (!--count)
1037 break; 1045 break;
1038 } 1046 }
1047
1039 if (count) 1048 if (count)
1040 x = TermWin.ncol - 1; 1049 x = TermWin.ncol - 1;
1041 } 1050 }
1042 else /* if (count < 0) */ 1051 else /* if (count < 0) */
1043 { 1052 {
… …
1046 { 1055 {
1047 x = i; 1056 x = i;
1048 if (!++count) 1057 if (!++count)
1049 break; 1058 break;
1050 } 1059 }
1060
1051 if (count) 1061 if (count)
1052 x = 0; 1062 x = 0;
1053 } 1063 }
1064
1054 if (x != screen.cur.col) 1065 if (x != screen.cur.col)
1055 scr_gotorc (0, x, R_RELATIVE); 1066 scr_gotorc (0, x, R_RELATIVE);
1056} 1067}
1057 1068
1058/* ------------------------------------------------------------------------- */ 1069/* ------------------------------------------------------------------------- */
… …
1115 want_refresh = 1; 1126 want_refresh = 1;
1116 ZERO_SCROLLBACK (); 1127 ZERO_SCROLLBACK ();
1117 1128
1118 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)); 1129 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));
1119 1130
1120 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1131 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1121 : col);
1122 MAX_IT (screen.cur.col, 0); 1132 MAX_IT (screen.cur.col, 0);
1123 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1133 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1124 1134
1125 screen.flags &= ~Screen_WrapNext; 1135 screen.flags &= ~Screen_WrapNext;
1126 if (relative & R_RELATIVE) 1136 if (relative & R_RELATIVE)
… …
1165 * direction should be UP or DN 1175 * direction should be UP or DN
1166 */ 1176 */
1167void 1177void
1168rxvt_term::scr_index (enum page_dirn direction) 1178rxvt_term::scr_index (enum page_dirn direction)
1169{ 1179{
1170 int dirn; 1180 int dirn;
1171 1181
1172 want_refresh = 1; 1182 want_refresh = 1;
1173 dirn = ((direction == UP) ? 1 : -1); 1183 dirn = ((direction == UP) ? 1 : -1);
1174 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); 1184 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1175 1185
… …
1235 default: 1245 default:
1236 return; 1246 return;
1237 } 1247 }
1238 1248
1239 if (screen.text[row]) 1249 if (screen.text[row])
1240 scr_blank_line (& (screen.text[row][col]), 1250 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1241 & (screen.rend[row][col]), num, rstyle);
1242 else 1251 else
1243 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1252 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1244} 1253}
1245 1254
1246/* ------------------------------------------------------------------------- */ 1255/* ------------------------------------------------------------------------- */
… …
1251 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1260 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1252 */ 1261 */
1253void 1262void
1254rxvt_term::scr_erase_screen (int mode) 1263rxvt_term::scr_erase_screen (int mode)
1255{ 1264{
1256 int num; 1265 int num;
1257 int32_t row, row_offset; 1266 int32_t row, row_offset;
1258 rend_t ren; 1267 rend_t ren;
1259 XGCValues gcvalue; 1268 XGCValues gcvalue;
1260 1269
1261 want_refresh = 1; 1270 want_refresh = 1;
1262 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); 1271 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1263 ZERO_SCROLLBACK (); 1272 ZERO_SCROLLBACK ();
1264 row_offset = (int32_t)TermWin.saveLines; 1273 row_offset = (int32_t)TermWin.saveLines;
… …
1283 num = TermWin.nrow; 1292 num = TermWin.nrow;
1284 break; 1293 break;
1285 default: 1294 default:
1286 return; 1295 return;
1287 } 1296 }
1288 refresh_type |= REFRESH_BOUNDS; 1297
1289 if (selection.op && current_screen == selection.screen 1298 if (selection.op && current_screen == selection.screen
1290 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1299 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1291 || (selection.end.row >= row 1300 || (selection.end.row >= row
1292 && selection.end.row <= row + num))) 1301 && selection.end.row <= row + num)))
1293 CLEAR_SELECTION (); 1302 CLEAR_SELECTION ();
1303
1294 if (row >= TermWin.nrow) /* Out Of Bounds */ 1304 if (row >= TermWin.nrow) /* Out Of Bounds */
1295 return; 1305 return;
1306
1296 MIN_IT (num, (TermWin.nrow - row)); 1307 MIN_IT (num, (TermWin.nrow - row));
1308
1297 if (rstyle & (RS_RVid | RS_Uline)) 1309 if (rstyle & (RS_RVid | RS_Uline))
1298 ren = (rend_t) ~RS_None; 1310 ren = (rend_t) ~RS_None;
1299 else if (GET_BASEBG (rstyle) == Color_bg) 1311 else if (GET_BASEBG (rstyle) == Color_bg)
1300 { 1312 {
1301 ren = DEFAULT_RSTYLE; 1313 ren = DEFAULT_RSTYLE;
… …
1308 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1320 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1309 ERASE_ROWS (row, num); 1321 ERASE_ROWS (row, num);
1310 gcvalue.foreground = PixColors[Color_fg]; 1322 gcvalue.foreground = PixColors[Color_fg];
1311 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1323 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1312 } 1324 }
1325
1313 for (; num--; row++) 1326 for (; num--; row++)
1314 { 1327 {
1315 scr_blank_screen_mem (screen.text, screen.rend, 1328 scr_blank_screen_mem (screen.text, screen.rend,
1316 (unsigned int) (row + row_offset), rstyle); 1329 (unsigned int) (row + row_offset), rstyle);
1317 screen.tlen[row + row_offset] = 0; 1330 screen.tlen[row + row_offset] = 0;
… …
1351 * Insert/Delete <count> lines 1364 * Insert/Delete <count> lines
1352 */ 1365 */
1353void 1366void
1354rxvt_term::scr_insdel_lines (int count, int insdel) 1367rxvt_term::scr_insdel_lines (int count, int insdel)
1355{ 1368{
1356 int end; 1369 int end;
1357 1370
1358 ZERO_SCROLLBACK (); 1371 ZERO_SCROLLBACK ();
1359 1372
1360 selection_check (1); 1373 selection_check (1);
1361 1374
… …
1380 * Insert/Delete <count> characters from the current position 1393 * Insert/Delete <count> characters from the current position
1381 */ 1394 */
1382void 1395void
1383rxvt_term::scr_insdel_chars (int count, int insdel) 1396rxvt_term::scr_insdel_chars (int count, int insdel)
1384{ 1397{
1385 int col, row; 1398 int col, row;
1386 rend_t tr; 1399 rend_t tr;
1387 text_t *stp; 1400 text_t *stp;
1388 rend_t *srp; 1401 rend_t *srp;
1389 int16_t *slp; 1402 int16_t *slp;
1390 1403
1391 want_refresh = 1; 1404 want_refresh = 1;
1392 ZERO_SCROLLBACK (); 1405 ZERO_SCROLLBACK ();
1393 1406
1394 if (count <= 0) 1407 if (count <= 0)
… …
1401 screen.flags &= ~Screen_WrapNext; 1414 screen.flags &= ~Screen_WrapNext;
1402 1415
1403 stp = screen.text[row]; 1416 stp = screen.text[row];
1404 srp = screen.rend[row]; 1417 srp = screen.rend[row];
1405 slp = & (screen.tlen[row]); 1418 slp = & (screen.tlen[row]);
1419
1406 switch (insdel) 1420 switch (insdel)
1407 { 1421 {
1408 case INSERT: 1422 case INSERT:
1409 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1423 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1410 col--) 1424 col--)
1411 { 1425 {
1412 stp[col] = stp[col - count]; 1426 stp[col] = stp[col - count];
1413 srp[col] = srp[col - count]; 1427 srp[col] = srp[col - count];
1414 } 1428 }
1429
1415 if (*slp != -1) 1430 if (*slp != -1)
1416 { 1431 {
1417 *slp += count; 1432 *slp += count;
1418 MIN_IT (*slp, TermWin.ncol); 1433 MIN_IT (*slp, TermWin.ncol);
1419 } 1434 }
1435
1420 if (selection.op && current_screen == selection.screen 1436 if (selection.op && current_screen == selection.screen
1421 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1437 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1422 { 1438 {
1423 if (selection.end.row != screen.cur.row 1439 if (selection.end.row != screen.cur.row
1424 || (selection.end.col + count >= TermWin.ncol)) 1440 || (selection.end.col + count >= TermWin.ncol))
… …
1428 selection.beg.col += count; 1444 selection.beg.col += count;
1429 selection.mark.col += count; /* XXX: yes? */ 1445 selection.mark.col += count; /* XXX: yes? */
1430 selection.end.col += count; 1446 selection.end.col += count;
1431 } 1447 }
1432 } 1448 }
1449
1433 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1450 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1434 (unsigned int)count, rstyle); 1451 (unsigned int)count, rstyle);
1435 break; 1452 break;
1453
1436 case ERASE: 1454 case ERASE:
1437 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1455 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1438 selection_check (1); 1456 selection_check (1);
1439 screen.cur.col -= count; 1457 screen.cur.col -= count;
1440 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1458 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1441 (unsigned int)count, rstyle); 1459 (unsigned int)count, rstyle);
1442 break; 1460 break;
1461
1443 case DELETE: 1462 case DELETE:
1444 tr = srp[TermWin.ncol - 1]
1445 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1463 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1464
1446 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1465 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1447 { 1466 {
1448 stp[col] = stp[col + count]; 1467 stp[col] = stp[col + count];
1449 srp[col] = srp[col + count]; 1468 srp[col] = srp[col + count];
1450 } 1469 }
1470
1451 scr_blank_line (& (stp[TermWin.ncol - count]), 1471 scr_blank_line (& (stp[TermWin.ncol - count]),
1452 & (srp[TermWin.ncol - count]), 1472 & (srp[TermWin.ncol - count]),
1453 (unsigned int)count, tr); 1473 (unsigned int)count, tr);
1474
1454 if (*slp == -1) /* break line continuation */ 1475 if (*slp == -1) /* break line continuation */
1455 *slp = TermWin.ncol; 1476 *slp = TermWin.ncol;
1477
1456 *slp -= count; 1478 *slp -= count;
1457 MAX_IT (*slp, 0); 1479 MAX_IT (*slp, 0);
1480
1458 if (selection.op && current_screen == selection.screen 1481 if (selection.op && current_screen == selection.screen
1459 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1482 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1460 { 1483 {
1461 if (selection.end.row != screen.cur.row 1484 if (selection.end.row != screen.cur.row
1462 || (screen.cur.col >= selection.beg.col - count) 1485 || (screen.cur.col >= selection.beg.col - count)
… …
1468 selection.beg.col -= count; 1491 selection.beg.col -= count;
1469 selection.mark.col -= count; /* XXX: yes? */ 1492 selection.mark.col -= count; /* XXX: yes? */
1470 selection.end.col -= count; 1493 selection.end.col -= count;
1471 } 1494 }
1472 } 1495 }
1496
1473 break; 1497 break;
1474 } 1498 }
1475} 1499}
1476 1500
1477/* ------------------------------------------------------------------------- */ 1501/* ------------------------------------------------------------------------- */
… …
1482void 1506void
1483rxvt_term::scr_scroll_region (int top, int bot) 1507rxvt_term::scr_scroll_region (int top, int bot)
1484{ 1508{
1485 MAX_IT (top, 0); 1509 MAX_IT (top, 0);
1486 MIN_IT (bot, (int)TermWin.nrow - 1); 1510 MIN_IT (bot, (int)TermWin.nrow - 1);
1511
1487 if (top > bot) 1512 if (top > bot)
1488 return; 1513 return;
1514
1489 screen.tscroll = top; 1515 screen.tscroll = top;
1490 screen.bscroll = bot; 1516 screen.bscroll = bot;
1491 scr_gotorc (0, 0, 0); 1517 scr_gotorc (0, 0, 0);
1492} 1518}
1493 1519
… …
1499 */ 1525 */
1500void 1526void
1501rxvt_term::scr_cursor_visible (int mode) 1527rxvt_term::scr_cursor_visible (int mode)
1502{ 1528{
1503 want_refresh = 1; 1529 want_refresh = 1;
1530
1504 if (mode) 1531 if (mode)
1505 screen.flags |= Screen_VisibleCursor; 1532 screen.flags |= Screen_VisibleCursor;
1506 else 1533 else
1507 screen.flags &= ~Screen_VisibleCursor; 1534 screen.flags &= ~Screen_VisibleCursor;
1508} 1535}
… …
1722 row_col_t rc[RC_COUNT]; 1749 row_col_t rc[RC_COUNT];
1723 1750
1724 if (drawn_text == NULL) /* sanity check */ 1751 if (drawn_text == NULL) /* sanity check */
1725 return; 1752 return;
1726 1753
1754#ifndef NO_SLOW_LINK_SUPPORT
1755 if (refresh_type == FAST_REFRESH && !display->is_local)
1756 {
1757 y = 0;
1758 height = TermWin.height;
1759 }
1760#endif
1761
1727#ifdef DEBUG_STRICT 1762#ifdef DEBUG_STRICT
1728 x = max (x, (int)TermWin.int_bwidth); 1763 x = max (x, 0);
1729 x = min (x, (int)TermWin.width); 1764 x = min (x, (int)TermWin.width);
1730 y = max (y, (int)TermWin.int_bwidth); 1765 y = max (y, 0);
1731 y = min (y, (int)TermWin.height); 1766 y = min (y, (int)TermWin.height);
1732#endif 1767#endif
1733 1768
1734 /* round down */ 1769 /* round down */
1735 rc[PART_BEG].col = Pixel2Col (x); 1770 rc[PART_BEG].col = Pixel2Col (x);
… …
1746 } 1781 }
1747 1782
1748 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)); 1783 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));
1749 1784
1750 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1785 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1751 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, 1786 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1752 (rc[PART_END].col - rc[PART_BEG].col + 1));
1753 1787
1754 if (refresh) 1788 if (refresh)
1755 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1789 scr_refresh (SLOW_REFRESH);
1756} 1790}
1757 1791
1758/* ------------------------------------------------------------------------- */ 1792/* ------------------------------------------------------------------------- */
1759/* 1793/*
1760 * Refresh the entire screen 1794 * Refresh the entire screen
… …
1795 * direction should be UP or DN 1829 * direction should be UP or DN
1796 */ 1830 */
1797int 1831int
1798rxvt_term::scr_page (enum page_dirn direction, int nlines) 1832rxvt_term::scr_page (enum page_dirn direction, int nlines)
1799{ 1833{
1800 int n; 1834 int n;
1801 uint16_t oldviewstart; 1835 uint16_t oldviewstart;
1802 1836
1803 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); 1837 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1804#ifdef DEBUG_STRICT 1838#ifdef DEBUG_STRICT
1805 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1839 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1806#endif 1840#endif
… …
1824 if (TermWin.view_start != oldviewstart) 1858 if (TermWin.view_start != oldviewstart)
1825 { 1859 {
1826 want_refresh = 1; 1860 want_refresh = 1;
1827 num_scr -= (TermWin.view_start - oldviewstart); 1861 num_scr -= (TermWin.view_start - oldviewstart);
1828 } 1862 }
1863
1829 return (int) (TermWin.view_start - oldviewstart); 1864 return (int) (TermWin.view_start - oldviewstart);
1830} 1865}
1831 1866
1832/* ------------------------------------------------------------------------- */ 1867/* ------------------------------------------------------------------------- */
1833void 1868void
… …
1901 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1936 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1902 1937
1903void 1938void
1904rxvt_term::scr_refresh (unsigned char refresh_type) 1939rxvt_term::scr_refresh (unsigned char refresh_type)
1905{ 1940{
1906 unsigned char clearfirst, /* first character writes before cell */
1907 clearlast, /* last character writes beyond cell */
1908 must_clear, /* use draw_string not draw_image_string */ 1941 unsigned char must_clear, /* use draw_string not draw_image_string */
1909 rvid, /* reverse video this position */ 1942 rvid, /* reverse video this position */
1910 showcursor; /* show the cursor */ 1943 showcursor; /* show the cursor */
1911 int16_t col, row, /* column/row we're processing */ 1944 int16_t col, row, /* column/row we're processing */
1912 ocrow; /* old cursor row */ 1945 ocrow; /* old cursor row */
1913 int i, /* tmp */ 1946 int i, /* tmp */
… …
1922 return; 1955 return;
1923 1956
1924 /* 1957 /*
1925 * A: set up vars 1958 * A: set up vars
1926 */ 1959 */
1927 clearfirst = clearlast = must_clear = 0; 1960 must_clear = 0;
1928 1961
1929 refresh_count = 0; 1962 refresh_count = 0;
1930 1963
1931 row_offset = TermWin.saveLines - TermWin.view_start; 1964 row_offset = TermWin.saveLines - TermWin.view_start;
1932
1933 if ((refresh_type & REFRESH_BOUNDS))
1934 {
1935 clearfirst = clearlast = 1;
1936 refresh_type &= ~REFRESH_BOUNDS;
1937 }
1938 1965
1939#ifdef XPM_BACKGROUND 1966#ifdef XPM_BACKGROUND
1940 must_clear |= (bgPixmap.pixmap != None); 1967 must_clear |= (bgPixmap.pixmap != None);
1941#endif 1968#endif
1942#ifdef TRANSPARENT 1969#ifdef TRANSPARENT
… …
1951 1978
1952 /* 1979 /*
1953 * C: set the cursor character (s) 1980 * C: set the cursor character (s)
1954 */ 1981 */
1955 { 1982 {
1956 unsigned char setoldcursor; 1983 unsigned char setoldcursor;
1957 rend_t ccol1, /* Cursor colour */ 1984 rend_t ccol1, /* Cursor colour */
1958 ccol2; /* Cursor colour2 */ 1985 ccol2; /* Cursor colour2 */
1959 1986
1960 showcursor = (screen.flags & Screen_VisibleCursor); 1987 showcursor = (screen.flags & Screen_VisibleCursor);
1961#ifdef CURSOR_BLINK 1988#ifdef CURSOR_BLINK
1962 if (hidden_cursor) 1989 if (hidden_cursor)
1963 showcursor = 0; 1990 showcursor = 0;
1964#endif 1991#endif
1965 1992
1966 if (showcursor) 1993 if (showcursor)
1967 { 1994 {
1968 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1995 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]);
1969 [screen.cur.col]);
1970 1996
1971 if (showcursor && TermWin.focus) 1997 if (showcursor && TermWin.focus)
1972 { 1998 {
1973 *srp ^= RS_RVid; 1999 *srp ^= RS_RVid;
1974#ifndef NO_CURSORCOLOR 2000#ifndef NO_CURSORCOLOR
… …
2002 if (screen.cur.row + TermWin.view_start != ocrow 2028 if (screen.cur.row + TermWin.view_start != ocrow
2003 || screen.cur.col != oldcursor.col) 2029 || screen.cur.col != oldcursor.col)
2004 { 2030 {
2005 if (ocrow < TermWin.nrow 2031 if (ocrow < TermWin.nrow
2006 && oldcursor.col < TermWin.ncol) 2032 && oldcursor.col < TermWin.ncol)
2007 {
2008 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2033 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
2009 } 2034
2010 if (TermWin.focus || !showcursor) 2035 if (TermWin.focus || !showcursor)
2011 oldcursor.row = -1; 2036 oldcursor.row = -1;
2012 else 2037 else
2013 setoldcursor = 1; 2038 setoldcursor = 1;
2014 } 2039 }
2015 } 2040 }
2016 else if (!TermWin.focus) 2041 else if (!TermWin.focus)
2017 setoldcursor = 1; 2042 setoldcursor = 1;
2043
2018 if (setoldcursor) 2044 if (setoldcursor)
2019 { 2045 {
2020 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2046 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
2021 oldcursor.row = -1; 2047 oldcursor.row = -1;
2022 else 2048 else
… …
2031 /* 2057 /*
2032 * D: CopyArea pass - very useful for slower links 2058 * D: CopyArea pass - very useful for slower links
2033 * This has been deliberately kept simple. 2059 * This has been deliberately kept simple.
2034 */ 2060 */
2035 i = num_scr; 2061 i = num_scr;
2062 if (!display->is_local
2036 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2063 && refresh_type == FAST_REFRESH && num_scr_allow && i
2037 && abs (i) < TermWin.nrow && !must_clear) 2064 && abs (i) < TermWin.nrow && !must_clear)
2038 { 2065 {
2039 int16_t nits; 2066 int16_t nits;
2040 int j; 2067 int j;
2041 rend_t *drp2; 2068 rend_t *drp2;
2042 text_t *dtp2; 2069 text_t *dtp2;
2043 int len, wlen; 2070 int len, wlen;
2044 2071
2045 j = TermWin.nrow; 2072 j = TermWin.nrow;
2046 wlen = len = -1; 2073 wlen = len = -1;
2047 row = i > 0 ? 0 : j - 1; 2074 row = i > 0 ? 0 : j - 1;
2048 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2075 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
… …
2183 rend = GET_ATTR (rend); 2210 rend = GET_ATTR (rend);
2184 2211
2185 rvid = !!(rend & RS_RVid); 2212 rvid = !!(rend & RS_RVid);
2186 2213
2187#ifndef NO_BOLD_UNDERLINE_REVERSE 2214#ifndef NO_BOLD_UNDERLINE_REVERSE
2188 if (rend & RS_Bold && fore == Color_fg) 2215 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold))
2189 { 2216 {
2190 if (ISSET_PIXCOLOR (Color_BD)) 2217 if (ISSET_PIXCOLOR (Color_BD))
2191 fore = Color_BD; 2218 fore = Color_BD;
2192 else 2219 else
2193 rvid = !rvid; 2220 rvid = !rvid;
2194 } 2221 }
2195 2222
2196 if (rend & RS_Uline) 2223 if (rend & RS_Uline)
2197 {
2198 if (ISSET_PIXCOLOR (Color_UL)) 2224 if (ISSET_PIXCOLOR (Color_UL))
2199 fore = Color_UL; 2225 fore = Color_UL;
2200 }
2201#endif 2226#endif
2202 2227
2203 if (rvid) 2228 if (rvid)
2204 { 2229 {
2205 SWAP_IT (fore, back, int); 2230 SWAP_IT (fore, back, int);
… …
2213 back = Color_RV; 2238 back = Color_RV;
2214#endif 2239#endif
2215 } 2240 }
2216 2241
2217#ifdef TEXT_BLINK 2242#ifdef TEXT_BLINK
2218 if (rend & RS_Blink && back == Color_bg) 2243 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2219 { 2244 {
2220 if (!text_blink_ev.active) 2245 if (!text_blink_ev.active)
2221 { 2246 {
2222 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2247 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2223 hidden_text = 0; 2248 hidden_text = 0;
… …
2253 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2278 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2254 } 2279 }
2255 else 2280 else
2256 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2281 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2257 2282
2258 if ((rend & RS_Uline) && (font->descent > 1)) 2283 if (rend & RS_Uline && font->descent > 1 && fore != back)
2259 XDrawLine (display->display, drawBuffer, TermWin.gc, 2284 XDrawLine (display->display, drawBuffer, TermWin.gc,
2260 xpixel, ypixel + font->ascent + 1, 2285 xpixel, ypixel + font->ascent + 1,
2261 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2286 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2262 } /* for (col....) */ 2287 } /* for (col....) */
2263 } /* for (row....) */ 2288 } /* for (row....) */
… …
2298 /* 2323 /*
2299 * H: cleanup selection 2324 * H: cleanup selection
2300 */ 2325 */
2301 scr_reverse_selection (); 2326 scr_reverse_selection ();
2302 2327
2303 /*
2304 * I: other general cleanup
2305 */
2306 if (clearfirst && TermWin.int_bwidth)
2307 /*
2308 * clear the whole screen height, note that width == 0 is treated
2309 * specially by XClearArea
2310 */
2311 XClearArea (display->display, TermWin.vt, 0, 0,
2312 (unsigned int)TermWin.int_bwidth,
2313 (unsigned int)TermWin_TotalHeight (), False);
2314
2315 if (clearlast && TermWin.int_bwidth)
2316 /*
2317 * clear the whole screen height, note that width == 0 is treated
2318 * specially by XClearArea
2319 */
2320 XClearArea (display->display, TermWin.vt,
2321 TermWin.width + TermWin.int_bwidth, 0,
2322 (unsigned int)TermWin.int_bwidth,
2323 (unsigned int)TermWin_TotalHeight (), False);
2324
2325 if (refresh_type & SMOOTH_REFRESH) 2328 if (refresh_type & SMOOTH_REFRESH)
2326 XSync (display->display, False); 2329 XFlush (display->display);
2327 2330
2328 num_scr = 0; 2331 num_scr = 0;
2329 num_scr_allow = 1; 2332 num_scr_allow = 1;
2330 want_refresh = 0; /* screen is current */ 2333 want_refresh = 0; /* screen is current */
2331} 2334}
… …
2502 { 2505 {
2503 n = min (len - i, PROP_SIZE); 2506 n = min (len - i, PROP_SIZE);
2504 MEMCPY (ds, data + i, n); 2507 MEMCPY (ds, data + i, n);
2505 2508
2506 for (j = 0; j < n; j++) 2509 for (j = 0; j < n; j++)
2507 if (ds[j] == '\n') 2510 if (ds[j] == C0_LF)
2508 ds[j] = '\r'; 2511 ds[j] = C0_CR;
2509 2512
2510 tt_write (ds, (int)n); 2513 tt_write (ds, (int)n);
2511 } 2514 }
2512 2515
2513 free (ds); 2516 free (ds);
… …
2562 break; 2565 break;
2563 2566
2564 if (ct.encoding == 0) 2567 if (ct.encoding == 0)
2565 { 2568 {
2566 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2569 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
2570 break;
2571 }
2572 else if (ct.encoding == xa[XA_INCR])
2573 {
2574 // INCR selection, start handshake
2575 XDeleteProperty (display->display, win, prop);
2576 selection_wait = Sel_incr;
2577 incr_ev.start (NOW + 10);
2567 break; 2578 break;
2568 } 2579 }
2569 2580
2570 if (ct.value == NULL) 2581 if (ct.value == NULL)
2571 { 2582 {
… …
2594 2605
2595 nread += ct.nitems; 2606 nread += ct.nitems;
2596 2607
2597 char **cl; 2608 char **cl;
2598 int cr; 2609 int cr;
2599 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2610 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2600 &cr) >= 0 && cl)
2601 { 2611 {
2602 for (int i = 0; i < cr; i++) 2612 for (int i = 0; i < cr; i++)
2603 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2613 paste ((unsigned char *)cl[i], STRLEN (cl[i]));
2604 2614
2605 XFreeStringList (cl); 2615 XFreeStringList (cl);
… …
2626void 2636void
2627rxvt_term::incr_cb (time_watcher &w) 2637rxvt_term::incr_cb (time_watcher &w)
2628{ 2638{
2629 selection_wait = Sel_none; 2639 selection_wait = Sel_none;
2630 2640
2631 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2641 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2632} 2642}
2633 2643
2634/* 2644/*
2635 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2645 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2636 */ 2646 */
2637void 2647void
2638rxvt_term::selection_property (Window win, Atom prop) 2648rxvt_term::selection_property (Window win, Atom prop)
2639{ 2649{
2640 int reget_time = 0; 2650 if (prop == None || selection_wait != Sel_incr)
2641
2642 if (prop == None)
2643 return; 2651 return;
2644 2652
2645 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2646 if (selection_wait == Sel_normal)
2647 {
2648 int a, afmt;
2649 Atom atype;
2650 unsigned long bytes_after, nitems;
2651 unsigned char *s = NULL;
2652
2653 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2654 xa[XA_INCR], &atype, &afmt, &nitems,
2655 &bytes_after, &s);
2656 if (s)
2657 XFree (s);
2658 if (a != Success)
2659 return;
2660
2661#ifndef __CYGWIN32__
2662 if (atype == xa[XA_INCR])
2663 { /* start an INCR transfer */
2664 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2665 XDeleteProperty (display->display, win, prop);
2666 XFlush (display->display);
2667 reget_time = 1;
2668 selection_wait = Sel_incr;
2669 }
2670#endif
2671
2672 }
2673 else if (selection_wait == Sel_incr)
2674 {
2675 reget_time = 1;
2676
2677 if (selection_paste (win, prop, True) == -1) 2653 if (selection_paste (win, prop, 1) > 0)
2678 {
2679 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2680 selection_wait = Sel_none;
2681 incr_ev.stop ();
2682 }
2683 }
2684 if (reget_time) /* received more data so reget time */
2685 incr_ev.start (NOW + 10); 2654 incr_ev.start (NOW + 10);
2655 else
2656 {
2657 selection_wait = Sel_none;
2658 incr_ev.stop ();
2659 }
2686} 2660}
2687 2661
2688/* ------------------------------------------------------------------------- */ 2662/* ------------------------------------------------------------------------- */
2689/* 2663/*
2690 * Request the current selection: 2664 * Request the current selection:
… …
2715 { 2689 {
2716 int i; 2690 int i;
2717 2691
2718 selection_request_time = tm; 2692 selection_request_time = tm;
2719 selection_wait = Sel_normal; 2693 selection_wait = Sel_normal;
2694
2720 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2695 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2721 { 2696 {
2722#if X_HAVE_UTF8_STRING 2697#if X_HAVE_UTF8_STRING
2723 selection_type = Sel_UTF8String; 2698 selection_type = Sel_UTF8String;
2724 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2699 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2778 want_refresh = 1; 2753 want_refresh = 1;
2779 free (selection.text); 2754 free (selection.text);
2780 selection.text = NULL; 2755 selection.text = NULL;
2781 selection.len = 0; 2756 selection.len = 0;
2782 CLEAR_SELECTION (); 2757 CLEAR_SELECTION ();
2758
2759 if (display->selection_owner == this)
2760 display->selection_owner = 0;
2783} 2761}
2784 2762
2785/* ------------------------------------------------------------------------- */ 2763/* ------------------------------------------------------------------------- */
2786/* 2764/*
2787 * Copy a selection into the cut buffer 2765 * Copy a selection into the cut buffer
… …
2838 2816
2839 for (; col < end_col; col++) 2817 for (; col < end_col; col++)
2840 { 2818 {
2841 if (*t == NOCHAR) 2819 if (*t == NOCHAR)
2842 t++; 2820 t++;
2821#if ENABLE_COMBINING
2843 else if (IS_COMPOSE (*t)) 2822 else if (IS_COMPOSE (*t))
2844 { 2823 {
2845 int len = rxvt_composite.expand (*t, 0); 2824 int len = rxvt_composite.expand (*t, 0);
2846 2825
2847 extra -= (len - 1); 2826 extra -= (len - 1);
… …
2853 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2832 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2854 } 2833 }
2855 2834
2856 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2835 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2857 } 2836 }
2837#endif
2858 else 2838 else
2859 new_selection_text[ofs++] = *t++; 2839 new_selection_text[ofs++] = *t++;
2860 } 2840 }
2861 2841
2862 if (screen.tlen[row] != -1 && row != end_row) 2842 if (screen.tlen[row] != -1 && row != end_row)
2863 new_selection_text[ofs++] = L'\n'; 2843 new_selection_text[ofs++] = C0_LF;
2864 } 2844 }
2865 2845
2866#ifndef NO_OLD_SELECTION
2867 if (selection_style == OLD_SELECT)
2868 if (end_col == TermWin.ncol)
2869 new_selection_text[ofs++] = L'\n';
2870#endif
2871#ifndef NO_NEW_SELECTION
2872 if (selection_style != OLD_SELECT)
2873 if (end_col != selection.end.col) 2846 if (end_col != selection.end.col)
2874 new_selection_text[ofs++] = L'\n'; 2847 new_selection_text[ofs++] = C0_LF;
2875#endif 2848
2876 new_selection_text[ofs] = 0; 2849 new_selection_text[ofs] = 0;
2877 2850
2878 if (ofs == 0) 2851 if (ofs == 0)
2879 { 2852 {
2880 free (new_selection_text); 2853 free (new_selection_text);
… …
2889 2862
2890 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2863 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2891 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2864 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2892 display->set_selection_owner (this); 2865 display->set_selection_owner (this);
2893 else 2866 else
2894 rxvt_print_error ("can't get primary selection"); 2867 rxvt_warn ("can't get primary selection, ignoring.\n");
2895 2868
2896#if 0 2869#if 0
2897 XTextProperty ct; 2870 XTextProperty ct;
2898 2871
2899 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 2872 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
… …
2939rxvt_term::selection_start_colrow (int col, int row) 2912rxvt_term::selection_start_colrow (int col, int row)
2940{ 2913{
2941 want_refresh = 1; 2914 want_refresh = 1;
2942 selection.mark.col = col; 2915 selection.mark.col = col;
2943 selection.mark.row = row - TermWin.view_start; 2916 selection.mark.row = row - TermWin.view_start;
2917
2944 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2918 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2945 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2919 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2946 MAX_IT (selection.mark.col, 0); 2920 MAX_IT (selection.mark.col, 0);
2947 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2921 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2948 2922
2923 while (selection.mark.col > 0
2924 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2925 --selection.mark.col;
2926
2949 if (selection.op) 2927 if (selection.op)
2950 { /* clear the old selection */ 2928 { /* clear the old selection */
2951 selection.beg.row = selection.end.row = selection.mark.row; 2929 selection.beg.row = selection.end.row = selection.mark.row;
2952 selection.beg.col = selection.end.col = selection.mark.col; 2930 selection.beg.col = selection.end.col = selection.mark.col;
2953 } 2931 }
2932
2954 selection.op = SELECTION_INIT; 2933 selection.op = SELECTION_INIT;
2955 selection.screen = current_screen; 2934 selection.screen = current_screen;
2956} 2935}
2957 2936
2958/* ------------------------------------------------------------------------- */ 2937/* ------------------------------------------------------------------------- */
… …
2960 * Word select: select text for 2 clicks 2939 * Word select: select text for 2 clicks
2961 * We now only find out the boundary in one direction 2940 * We now only find out the boundary in one direction
2962 */ 2941 */
2963 2942
2964/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2943/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2965#define DELIMIT_TEXT(x) \ 2944#define DELIMIT_TEXT(x) \
2966 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 2945 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x)))
2967#define DELIMIT_REND(x) 1 2946#define DELIMIT_REND(x) 1
2968 2947
2969void 2948void
2970rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2949rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2971{ 2950{
2972 int col, row, dirnadd, tcol, trow, w1, w2; 2951 int col, row, dirnadd, tcol, trow, w1, w2;
2973 row_col_t bound; 2952 row_col_t bound;
2974 text_t *stp; 2953 text_t *stp;
2975 rend_t *srp; 2954 rend_t *srp;
2976 2955
2977 if (dirn == UP) 2956 if (dirn == UP)
2978 { 2957 {
2979 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 2958 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2980 bound.col = 0; 2959 bound.col = 0;
… …
2984 { 2963 {
2985 bound.row = TermWin.saveLines + TermWin.nrow; 2964 bound.row = TermWin.saveLines + TermWin.nrow;
2986 bound.col = TermWin.ncol - 1; 2965 bound.col = TermWin.ncol - 1;
2987 dirnadd = 1; 2966 dirnadd = 1;
2988 } 2967 }
2968
2989 row = mark->row + TermWin.saveLines; 2969 row = mark->row + TermWin.saveLines;
2990 col = mark->col; 2970 col = mark->col;
2991 MAX_IT (col, 0); 2971 MAX_IT (col, 0);
2992 /* find the edge of a word */ 2972 /* find the edge of a word */
2993 stp = & (screen.text[row][col]); 2973 stp = & (screen.text[row][col]);
2994 w1 = DELIMIT_TEXT (*stp); 2974 w1 = DELIMIT_TEXT (*stp);
2995 2975
2996 if (selection_style != NEW_SELECT)
2997 {
2998 if (w1 == 1)
2999 {
3000 stp += dirnadd;
3001 if (DELIMIT_TEXT (*stp) == 1)
3002 goto Old_Word_Selection_You_Die;
3003 col += dirnadd;
3004 }
3005 w1 = 0;
3006 }
3007 srp = (&screen.rend[row][col]); 2976 srp = (&screen.rend[row][col]);
3008 w2 = DELIMIT_REND (*srp); 2977 w2 = DELIMIT_REND (*srp);
3009 2978
3010 for (;;) 2979 for (;;)
3011 { 2980 {
3012 for (; col != bound.col; col += dirnadd) 2981 for (; col != bound.col; col += dirnadd)
3013 { 2982 {
3014 stp += dirnadd; 2983 stp += dirnadd;
2984 srp += dirnadd;
2985
2986 if (*stp == NOCHAR)
2987 continue;
2988
3015 if (DELIMIT_TEXT (*stp) != w1) 2989 if (DELIMIT_TEXT (*stp) != w1)
3016 break; 2990 break;
3017 srp += dirnadd;
3018 if (DELIMIT_REND (*srp) != w2) 2991 if (DELIMIT_REND (*srp) != w2)
3019 break; 2992 break;
3020 } 2993 }
2994
3021 if ((col == bound.col) && (row != bound.row)) 2995 if ((col == bound.col) && (row != bound.row))
3022 { 2996 {
3023 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 2997 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
3024 { 2998 {
3025 trow = row + dirnadd; 2999 trow = row + dirnadd;
3026 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3000 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3001
3027 if (screen.text[trow] == NULL) 3002 if (screen.text[trow] == NULL)
3028 break; 3003 break;
3004
3029 stp = & (screen.text[trow][tcol]); 3005 stp = & (screen.text[trow][tcol]);
3030 srp = & (screen.rend[trow][tcol]); 3006 srp = & (screen.rend[trow][tcol]);
3007
3031 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3008 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3032 break; 3009 break;
3010
3033 row = trow; 3011 row = trow;
3034 col = tcol; 3012 col = tcol;
3035 continue; 3013 continue;
3036 } 3014 }
3037 } 3015 }
3038 break; 3016 break;
3039 } 3017 }
3018
3040Old_Word_Selection_You_Die: 3019Old_Word_Selection_You_Die:
3041 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)); 3020 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));
3042 3021
3043 if (dirn == DN) 3022 if (dirn == DN)
3044 col++; /* put us on one past the end */ 3023 col++; /* put us on one past the end */
… …
3066 MAX_IT (row, 0); 3045 MAX_IT (row, 0);
3067 MIN_IT (row, (int)TermWin.nrow - 1); 3046 MIN_IT (row, (int)TermWin.nrow - 1);
3068 MAX_IT (col, 0); 3047 MAX_IT (col, 0);
3069 MIN_IT (col, (int)TermWin.ncol); 3048 MIN_IT (col, (int)TermWin.ncol);
3070 3049
3071#ifndef NO_NEW_SELECTION
3072 /* 3050 /*
3073 * If we're selecting characters (single click) then we must check first 3051 * If we're selecting characters (single click) then we must check first
3074 * if we are at the same place as the original mark. If we are then 3052 * if we are at the same place as the original mark. If we are then
3075 * select nothing. Otherwise, if we're to the right of the mark, you have to 3053 * select nothing. Otherwise, if we're to the right of the mark, you have to
3076 * be _past_ a character for it to be selected. 3054 * be _past_ a character for it to be selected.
3077 */ 3055 */
3078 if (selection_style != OLD_SELECT)
3079 {
3080 if (((selection.clicks % 3) == 1) && !flag 3056 if (((selection.clicks % 3) == 1) && !flag
3081 && (col == selection.mark.col 3057 && (col == selection.mark.col
3082 && (row == selection.mark.row + TermWin.view_start))) 3058 && (row == selection.mark.row + TermWin.view_start)))
3083 { 3059 {
3084 /* select nothing */ 3060 /* select nothing */
3085 selection.beg.row = selection.end.row = 0; 3061 selection.beg.row = selection.end.row = 0;
3086 selection.beg.col = selection.end.col = 0; 3062 selection.beg.col = selection.end.col = 0;
3087 selection.clicks = 4; 3063 selection.clicks = 4;
3088 want_refresh = 1; 3064 want_refresh = 1;
3089 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); 3065 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3090 return; 3066 return;
3091 }
3092 } 3067 }
3093#endif 3068
3094 if (selection.clicks == 4) 3069 if (selection.clicks == 4)
3095 selection.clicks = 1; 3070 selection.clicks = 1;
3096 3071
3097 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3072 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3098 flag == 1 ? 1 : 0, /* ? button press */ 3073 flag == 1 ? 1 : 0, /* ? button press */
… …
3104 * Extend the selection to the specified col/row 3079 * Extend the selection to the specified col/row
3105 */ 3080 */
3106void 3081void
3107rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3082rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3108{ 3083{
3109 int16_t ncol = TermWin.ncol; 3084 int16_t ncol = TermWin.ncol;
3110 int end_col; 3085 int end_col;
3111 row_col_t pos; 3086 row_col_t pos;
3112 enum { 3087 enum {
3113 LEFT, RIGHT 3088 LEFT, RIGHT
3114 } closeto = RIGHT; 3089 } closeto = RIGHT;
3115 3090
3116 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)); 3091 D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op));
… …
3152 pos.col = col; 3127 pos.col = col;
3153 pos.row = row; 3128 pos.row = row;
3154 3129
3155 pos.row -= TermWin.view_start; /* adjust for scroll */ 3130 pos.row -= TermWin.view_start; /* adjust for scroll */
3156 3131
3157#ifndef NO_OLD_SELECTION
3158 /*
3159 * This mimics some of the selection behaviour of version 2.20 and before.
3160 * There are no ``selection modes'', button3 is always character extension.
3161 * Note: button3 drag is always available, c.f. v2.20
3162 * Selection always terminates (left or right as appropriate) at the mark.
3163 */
3164 if (selection_style == OLD_SELECT)
3165 {
3166 if (selection.clicks == 1 || button3)
3167 {
3168 if (hate_those_clicks)
3169 {
3170 hate_those_clicks = 0;
3171 if (selection.clicks == 1)
3172 {
3173 selection.beg.row = selection.mark.row;
3174 selection.beg.col = selection.mark.col;
3175 }
3176 else
3177 {
3178 selection.mark.row = selection.beg.row;
3179 selection.mark.col = selection.beg.col;
3180 }
3181 }
3182 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3183 {
3184 selection.end.row = selection.mark.row;
3185 selection.end.col = selection.mark.col + 1;
3186 selection.beg.row = pos.row;
3187 selection.beg.col = pos.col;
3188 }
3189 else
3190 {
3191 selection.beg.row = selection.mark.row;
3192 selection.beg.col = selection.mark.col;
3193 selection.end.row = pos.row;
3194 selection.end.col = pos.col + 1;
3195 }
3196 }
3197 else if (selection.clicks == 2)
3198 {
3199 selection_delimit_word (UP, & (selection.mark),
3200 & (selection.beg));
3201 selection_delimit_word (DN, & (selection.mark),
3202 & (selection.end));
3203 hate_those_clicks = 1;
3204 }
3205 else if (selection.clicks == 3)
3206 {
3207 selection.beg.row = selection.end.row = selection.mark.row;
3208 selection.beg.col = 0;
3209 selection.end.col = ncol;
3210 hate_those_clicks = 1;
3211 }
3212 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));
3213 return;
3214 }
3215#endif /* ! NO_OLD_SELECTION */
3216#ifndef NO_NEW_SELECTION
3217 /* selection_style must not be OLD_SELECT to get here */
3218 /* 3132 /*
3219 * This is mainly xterm style selection with a couple of differences, mainly 3133 * This is mainly xterm style selection with a couple of differences, mainly
3220 * in the way button3 drag extension works. 3134 * in the way button3 drag extension works.
3221 * We're either doing: button1 drag; button3 press; or button3 drag 3135 * We're either doing: button1 drag; button3 press; or button3 drag
3222 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3136 * a) button1 drag : select around a midpoint/word/line - that point/word/line
… …
3227 * a point/word/line which is either the start or end of the selection 3141 * a point/word/line which is either the start or end of the selection
3228 * and it was decided by whichever point/word/line was `fixed' at the 3142 * and it was decided by whichever point/word/line was `fixed' at the
3229 * time of the most recent button3 press 3143 * time of the most recent button3 press
3230 */ 3144 */
3231 if (button3 && buttonpress) 3145 if (button3 && buttonpress)
3232 { /* button3 press */ 3146 { /* button3 press */
3233 /* 3147 /*
3234 * first determine which edge of the selection we are closest to 3148 * first determine which edge of the selection we are closest to
3235 */ 3149 */
3236 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3150 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3237 || (!ROWCOL_IS_AFTER (pos, selection.end) 3151 || (!ROWCOL_IS_AFTER (pos, selection.end)
3238 && (((pos.col - selection.beg.col) 3152 && (((pos.col - selection.beg.col)
3239 + ((pos.row - selection.beg.row) * ncol)) 3153 + ((pos.row - selection.beg.row) * ncol))
3240 < ((selection.end.col - pos.col) 3154 < ((selection.end.col - pos.col)
3241 + ((selection.end.row - pos.row) * ncol))))) 3155 + ((selection.end.row - pos.row) * ncol)))))
3242 closeto = LEFT; 3156 closeto = LEFT;
3157
3243 if (closeto == LEFT) 3158 if (closeto == LEFT)
3244 { 3159 {
3245 selection.beg.row = pos.row; 3160 selection.beg.row = pos.row;
3246 selection.beg.col = pos.col; 3161 selection.beg.col = pos.col;
3247 selection.mark.row = selection.end.row; 3162 selection.mark.row = selection.end.row;
3248 selection.mark.col = selection.end.col 3163 selection.mark.col = selection.end.col - (selection.clicks == 2);
3249 - (selection.clicks == 2);
3250 } 3164 }
3251 else 3165 else
3252 { 3166 {
3253 selection.end.row = pos.row; 3167 selection.end.row = pos.row;
3254 selection.end.col = pos.col; 3168 selection.end.col = pos.col;
3255 selection.mark.row = selection.beg.row; 3169 selection.mark.row = selection.beg.row;
3256 selection.mark.col = selection.beg.col; 3170 selection.mark.col = selection.beg.col;
3257 } 3171 }
3258 } 3172 }
3259 else 3173 else
3260 { /* button1 drag or button3 drag */ 3174 { /* button1 drag or button3 drag */
3261 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3175 if (ROWCOL_IS_AFTER (selection.mark, pos))
3262 { 3176 {
3263 if ((selection.mark.row == selection.end.row) 3177 if ((selection.mark.row == selection.end.row)
3264 && (selection.mark.col == selection.end.col) 3178 && (selection.mark.col == selection.end.col)
3265 && clickchange && selection.clicks == 2) 3179 && clickchange && selection.clicks == 2)
3266 selection.mark.col--; 3180 selection.mark.col--;
3181
3267 selection.beg.row = pos.row; 3182 selection.beg.row = pos.row;
3268 selection.beg.col = pos.col; 3183 selection.beg.col = pos.col;
3269 selection.end.row = selection.mark.row; 3184 selection.end.row = selection.mark.row;
3270 selection.end.col = selection.mark.col 3185 selection.end.col = selection.mark.col + (selection.clicks == 2);
3271 + (selection.clicks == 2);
3272 } 3186 }
3273 else 3187 else
3274 { 3188 {
3275 selection.beg.row = selection.mark.row; 3189 selection.beg.row = selection.mark.row;
3276 selection.beg.col = selection.mark.col; 3190 selection.beg.col = selection.mark.col;
… …
3280 } 3194 }
3281 3195
3282 if (selection.clicks == 1) 3196 if (selection.clicks == 1)
3283 { 3197 {
3284 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3198 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3199
3285 if (end_col != -1 && selection.beg.col > end_col) 3200 if (end_col != -1 && selection.beg.col > end_col)
3286 { 3201 {
3287#if 1 3202#if 1
3288 selection.beg.col = ncol; 3203 selection.beg.col = ncol;
3289#else 3204#else
3290 if (selection.beg.row != selection.end.row) 3205 if (selection.beg.row != selection.end.row)
3291 selection.beg.col = ncol; 3206 selection.beg.col = ncol;
3292 else 3207 else
3293 selection.beg.col = selection.mark.col; 3208 selection.beg.col = selection.mark.col;
3294#endif 3209#endif
3295
3296 } 3210 }
3211
3297 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3212 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3213
3298 if (end_col != -1 && selection.end.col > end_col) 3214 if (end_col != -1 && selection.end.col > end_col)
3299 selection.end.col = ncol; 3215 selection.end.col = ncol;
3300
3301 } 3216 }
3302 else if (selection.clicks == 2) 3217 else if (selection.clicks == 2)
3303 { 3218 {
3304 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3219 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3305 selection.end.col--; 3220 selection.end.col--;
3221
3306 selection_delimit_word (UP, & (selection.beg), 3222 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3307 & (selection.beg));
3308 selection_delimit_word (DN, & (selection.end), 3223 selection_delimit_word (DN, & (selection.end), & (selection.end));
3309 & (selection.end));
3310 } 3224 }
3311 else if (selection.clicks == 3) 3225 else if (selection.clicks == 3)
3312 { 3226 {
3313#ifndef NO_FRILLS 3227#ifndef NO_FRILLS
3314 if ((Options & Opt_tripleclickwords)) 3228 if ((Options & Opt_tripleclickwords))
3315 { 3229 {
3316 int end_row; 3230 int end_row;
3317 3231
3318 selection_delimit_word (UP, & (selection.beg), 3232 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3319 & (selection.beg));
3320 end_row = screen.tlen[selection.mark.row 3233 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3321 + TermWin.saveLines]; 3234
3322 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3235 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3323 end_row++)
3324 { 3236 {
3325 end_col = screen.tlen[end_row + TermWin.saveLines]; 3237 end_col = screen.tlen[end_row + TermWin.saveLines];
3238
3326 if (end_col != -1) 3239 if (end_col != -1)
3327 { 3240 {
3328 selection.end.row = end_row; 3241 selection.end.row = end_row;
3329 selection.end.col = end_col; 3242 selection.end.col = end_col;
3330 selection_remove_trailing_spaces (); 3243 selection_remove_trailing_spaces ();
… …
3332 } 3245 }
3333 } 3246 }
3334 } 3247 }
3335 else 3248 else
3336#endif 3249#endif
3337
3338 { 3250 {
3339 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3251 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3340 selection.mark.col++; 3252 selection.mark.col++;
3341 selection.beg.col = 0; 3253 selection.beg.col = 0;
3342 selection.end.col = ncol; 3254 selection.end.col = ncol;
3343 } 3255 }
3344 } 3256 }
3257
3345 if (button3 && buttonpress) 3258 if (button3 && buttonpress)
3346 { /* mark may need to be changed */ 3259 { /* mark may need to be changed */
3347 if (closeto == LEFT) 3260 if (closeto == LEFT)
3348 { 3261 {
3349 selection.mark.row = selection.end.row; 3262 selection.mark.row = selection.end.row;
3350 selection.mark.col = selection.end.col 3263 selection.mark.col = selection.end.col
3351 - (selection.clicks == 2); 3264 - (selection.clicks == 2);
… …
3355 selection.mark.row = selection.beg.row; 3268 selection.mark.row = selection.beg.row;
3356 selection.mark.col = selection.beg.col; 3269 selection.mark.col = selection.beg.col;
3357 } 3270 }
3358 } 3271 }
3359 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)); 3272 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));
3360#endif /* ! NO_NEW_SELECTION */
3361} 3273}
3362 3274
3363#ifndef NO_FRILLS 3275#ifndef NO_FRILLS
3364void 3276void
3365rxvt_term::selection_remove_trailing_spaces () 3277rxvt_term::selection_remove_trailing_spaces ()
… …
3457 (8 * sizeof (target_list[0])), PropModeReplace, 3369 (8 * sizeof (target_list[0])), PropModeReplace,
3458 (unsigned char *)target_list, 3370 (unsigned char *)target_list,
3459 target - target_list); 3371 target - target_list);
3460 ev.property = rq.property; 3372 ev.property = rq.property;
3461 } 3373 }
3374#if TODO // TODO
3462 else if (rq.target == xa[XA_MULTIPLE]) 3375 else if (rq.target == xa[XA_MULTIPLE])
3463 { 3376 {
3464 /* TODO: Handle MULTIPLE */ 3377 /* TODO: Handle MULTIPLE */
3465 } 3378 }
3379#endif
3466 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3380 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3467 { 3381 {
3468 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3382 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3469 (8 * sizeof (Time)), PropModeReplace, 3383 (8 * sizeof (Time)), PropModeReplace,
3470 (unsigned char *)&selection_time, 1); 3384 (unsigned char *)&selection_time, 1);
3471 ev.property = rq.property; 3385 ev.property = rq.property;
3472 } 3386 }
3473 else if (rq.target == XA_STRING 3387 else if (rq.target == XA_STRING
3474 || rq.target == xa[XA_TEXT] 3388 || rq.target == xa[XA_TEXT]
3475 || rq.target == xa[XA_COMPOUND_TEXT] 3389 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3562 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3476 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace;
3563} 3477}
3564 3478
3565#endif 3479#endif
3566/* ------------------------------------------------------------------------- */ 3480/* ------------------------------------------------------------------------- */
3567
3568/* ------------------------------------------------------------------------- *
3569 * DEBUG ROUTINES *
3570 * ------------------------------------------------------------------------- */
3571#if 0
3572void
3573rxvt_debug_colors (void)
3574{
3575 int color;
3576 const char *name[] =
3577 {
3578 "fg", "bg",
3579 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3580 };
3581
3582 fprintf (stderr, "Color ( ");
3583 if (rstyle & RS_RVid)
3584 fprintf (stderr, "rvid ");
3585 if (rstyle & RS_Bold)
3586 fprintf (stderr, "bold ");
3587 if (rstyle & RS_Blink)
3588 fprintf (stderr, "blink ");
3589 if (rstyle & RS_Uline)
3590 fprintf (stderr, "uline ");
3591 fprintf (stderr, "): ");
3592
3593 color = GET_FGCOLOR (rstyle);
3594#ifndef NO_BRIGHTCOLOR
3595 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3596 {
3597 color -= (minBrightCOLOR - minCOLOR);
3598 fprintf (stderr, "bright ");
3599 }
3600#endif
3601 fprintf (stderr, "%s on ", name[color]);
3602
3603 color = GET_BGCOLOR (rstyle);
3604#ifndef NO_BRIGHTCOLOR
3605 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3606 {
3607 color -= (minBrightCOLOR - minCOLOR);
3608 fprintf (stderr, "bright ");
3609 }
3610#endif
3611 fprintf (stderr, "%s\n", name[color]);
3612}
3613#endif

Diff Legend

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