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.41 by pcg, Sun Feb 29 15:31:56 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 */
776 return; 777 return;
777 778
778 want_refresh = 1; 779 want_refresh = 1;
… …
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 {
848 checksel = 0; 853 checksel = 0;
849 clearsel = 1; 854 clearsel = 1;
850 } 855 }
856
851 if (screen.flags & Screen_WrapNext) 857 if (screen.flags & Screen_WrapNext)
852 { 858 {
853 screen.tlen[row] = -1; 859 screen.tlen[row] = -1;
854 if (screen.cur.row == screen.bscroll) 860 if (screen.cur.row == screen.bscroll)
855 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 861 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
856 else if (screen.cur.row < (TermWin.nrow - 1)) 862 else if (screen.cur.row < (TermWin.nrow - 1))
857 row = (++screen.cur.row) + TermWin.saveLines; 863 row = (++screen.cur.row) + TermWin.saveLines;
864
858 stp = screen.text[row]; /* _must_ refresh */ 865 stp = screen.text[row]; /* _must_ refresh */
859 srp = screen.rend[row]; /* _must_ refresh */ 866 srp = screen.rend[row]; /* _must_ refresh */
860 screen.cur.col = 0; 867 screen.cur.col = 0;
861 screen.flags &= ~Screen_WrapNext; 868 screen.flags &= ~Screen_WrapNext;
862 } 869 }
870
863 if (screen.flags & Screen_Insert) 871 if (screen.flags & Screen_Insert)
864 scr_insdel_chars (1, INSERT); 872 scr_insdel_chars (1, INSERT);
865 873
874 // rely on wcwidth to tell us the character width, at least for non-latin1
875 // do wcwidth before further replacements, as wcwidth says that line-drawing
876 // characters have width -1 (DOH!) on GNU/Linux sometimes.
877 int width = c < 0x100 ? 1 : wcwidth (c);
878
866 if (charsets[screen.charset] == '0') // DEC SPECIAL 879 if (charsets[screen.charset] == '0') // DEC SPECIAL
867 switch (c)
868 { 880 {
869 // dunno where these come from
870#if 0
871 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break;
872 case '.': c = 0x2193; break; case '0': c = 0x25ae; break;
873#endif
874 // vt100 special graphics and line drawing 881 // vt100 special graphics and line drawing
875 case '`': c = 0x25c6; break; case '_': c = 0x0020; break; 882 static uint16_t vt100_0[32] = { // 5f .. 7e
876 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; 883 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
877 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; 884 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
878 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; 885 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
879 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; 886 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
880 case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break;
881 case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break;
882 case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break;
883 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break;
884 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break;
885 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
886 } 887 };
887 888
888 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 889 if (c >= 0x5f && c <= 0x7e)
889 // rely on wcwidth to tell us the character width, at least for non-ascii 890 {
890 int width = c <= 128 ? 1 : wcwidth (c); 891 c = vt100_0[c - 0x5f];
892 width = 1;
893 }
894 }
891 895
892 // width -1 characters (e.g. combining chars) are ignored currently.
893 if (width > 0) 896 if (width != 0)
897 {
898#if !UNICODE_3 && ENABLE_COMBINING
899 // trim characters we can't store directly :(
900 if (c >= 0x10000)
901 c = rxvt_composite.compose (c); // map to lower 16 bits
902#endif
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]);
908
894 do 909 do
895 { 910 {
896 stp[screen.cur.col] = c; 911 stp[screen.cur.col] = c;
897 srp[screen.cur.col] = rend; 912 srp[screen.cur.col] = rend;
898 913
899 if (screen.cur.col < last_col - 1) 914 if (screen.cur.col < last_col - 1)
900 screen.cur.col++; 915 screen.cur.col++;
901 else 916 else
902 { 917 {
903 screen.tlen[row] = last_col; 918 screen.tlen[row] = last_col;
904 if (screen.flags & Screen_Autowrap) 919 if (screen.flags & Screen_Autowrap)
905 screen.flags |= Screen_WrapNext; 920 screen.flags |= Screen_WrapNext;
906 break; 921 break;
907 } 922 }
908 923
909 c = NOCHAR; 924 c = NOCHAR;
910 } 925 }
911 while (--width > 0); 926 while (--width > 0);
927
928 // pad with spaces when overwriting wide character with smaller one
929 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
930 {
931 stp[c] = ' ';
932 srp[c] = rend;
933 }
934 }
935 else if (width == 0)
936 {
937#if ENABLE_COMBINING
938 // handle combining characters
939 // we just tag the accent on the previous on-screen character.
940 // this is arguably not correct, but also arguably not wrong.
941 // we don't handle double-width characters nicely yet.
942
943 text_t *tp;
944 rend_t *rp;
945
946 if (screen.cur.col > 0)
947 {
948 tp = stp + screen.cur.col - 1;
949 rp = srp + screen.cur.col - 1;
950 }
951 else if (screen.cur.row > 0
952 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
953 {
954 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
955 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
956 }
912 else 957 else
913 (void)0; /* handle combining character etc. here. */ 958 continue;
959
960 // handle double-width-chars by making them look extremely ugly
961 if (*tp == NOCHAR)
962 *tp = ' '; // hack //D //TODO //--tp, --rp;
963
964 // first try to find a precomposed character
965 unicode_t n = rxvt_compose (*tp, c);
966 if (n == NOCHAR)
967 n = rxvt_composite.compose (*tp, c);
968
969 *tp = n;
970 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
971#endif
972 }
914 } 973 }
915 974
916 if (screen.tlen[row] != -1) /* XXX: think about this */ 975 if (screen.tlen[row] != -1) /* XXX: think about this */
917 MAX_IT (screen.tlen[row], screen.cur.col); 976 MAX_IT (screen.tlen[row], screen.cur.col);
918 977
… …
938 */ 997 */
939void 998void
940rxvt_term::scr_backspace () 999rxvt_term::scr_backspace ()
941{ 1000{
942 want_refresh = 1; 1001 want_refresh = 1;
1002
943 if (screen.cur.col == 0) 1003 if (screen.cur.col == 0)
944 { 1004 {
945 if (screen.cur.row > 0) 1005 if (screen.cur.row > 0)
946 { 1006 {
947#ifdef TERMCAP_HAS_BW 1007#ifdef TERMCAP_HAS_BW
… …
952 1012
953 } 1013 }
954 } 1014 }
955 else if ((screen.flags & Screen_WrapNext) == 0) 1015 else if ((screen.flags & Screen_WrapNext) == 0)
956 scr_gotorc (0, -1, RELATIVE); 1016 scr_gotorc (0, -1, RELATIVE);
1017
957 screen.flags &= ~Screen_WrapNext; 1018 screen.flags &= ~Screen_WrapNext;
958} 1019}
959 1020
960/* ------------------------------------------------------------------------- */ 1021/* ------------------------------------------------------------------------- */
961/* 1022/*
… …
964 * XTERM_SEQ: CTRL-I 1025 * XTERM_SEQ: CTRL-I
965 */ 1026 */
966void 1027void
967rxvt_term::scr_tab (int count) 1028rxvt_term::scr_tab (int count)
968{ 1029{
969 int i, x; 1030 int i, x;
970 1031
971 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); 1032 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
972 want_refresh = 1; 1033 want_refresh = 1;
973 i = x = screen.cur.col; 1034 i = x = screen.cur.col;
1035
974 if (count == 0) 1036 if (count == 0)
975 return; 1037 return;
976 else if (count > 0) 1038 else if (count > 0)
977 { 1039 {
978 for (; ++i < TermWin.ncol; ) 1040 for (; ++i < TermWin.ncol; )
… …
980 { 1042 {
981 x = i; 1043 x = i;
982 if (!--count) 1044 if (!--count)
983 break; 1045 break;
984 } 1046 }
1047
985 if (count) 1048 if (count)
986 x = TermWin.ncol - 1; 1049 x = TermWin.ncol - 1;
987 } 1050 }
988 else /* if (count < 0) */ 1051 else /* if (count < 0) */
989 { 1052 {
… …
992 { 1055 {
993 x = i; 1056 x = i;
994 if (!++count) 1057 if (!++count)
995 break; 1058 break;
996 } 1059 }
1060
997 if (count) 1061 if (count)
998 x = 0; 1062 x = 0;
999 } 1063 }
1064
1000 if (x != screen.cur.col) 1065 if (x != screen.cur.col)
1001 scr_gotorc (0, x, R_RELATIVE); 1066 scr_gotorc (0, x, R_RELATIVE);
1002} 1067}
1003 1068
1004/* ------------------------------------------------------------------------- */ 1069/* ------------------------------------------------------------------------- */
… …
1061 want_refresh = 1; 1126 want_refresh = 1;
1062 ZERO_SCROLLBACK (); 1127 ZERO_SCROLLBACK ();
1063 1128
1064 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));
1065 1130
1066 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1131 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1067 : col);
1068 MAX_IT (screen.cur.col, 0); 1132 MAX_IT (screen.cur.col, 0);
1069 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1133 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1070 1134
1071 screen.flags &= ~Screen_WrapNext; 1135 screen.flags &= ~Screen_WrapNext;
1072 if (relative & R_RELATIVE) 1136 if (relative & R_RELATIVE)
… …
1098 else 1162 else
1099 screen.cur.row = row; 1163 screen.cur.row = row;
1100 } 1164 }
1101 MAX_IT (screen.cur.row, 0); 1165 MAX_IT (screen.cur.row, 0);
1102 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1166 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1167
1168 while (screen.cur.col > 0
1169 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1170 screen.cur.col--;
1103} 1171}
1104 1172
1105/* ------------------------------------------------------------------------- */ 1173/* ------------------------------------------------------------------------- */
1106/* 1174/*
1107 * direction should be UP or DN 1175 * direction should be UP or DN
1108 */ 1176 */
1109void 1177void
1110rxvt_term::scr_index (enum page_dirn direction) 1178rxvt_term::scr_index (enum page_dirn direction)
1111{ 1179{
1112 int dirn; 1180 int dirn;
1113 1181
1114 want_refresh = 1; 1182 want_refresh = 1;
1115 dirn = ((direction == UP) ? 1 : -1); 1183 dirn = ((direction == UP) ? 1 : -1);
1116 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); 1184 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1117 1185
… …
1177 default: 1245 default:
1178 return; 1246 return;
1179 } 1247 }
1180 1248
1181 if (screen.text[row]) 1249 if (screen.text[row])
1182 scr_blank_line (& (screen.text[row][col]), 1250 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1183 & (screen.rend[row][col]), num, rstyle);
1184 else 1251 else
1185 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1252 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1186} 1253}
1187 1254
1188/* ------------------------------------------------------------------------- */ 1255/* ------------------------------------------------------------------------- */
… …
1193 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1260 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1194 */ 1261 */
1195void 1262void
1196rxvt_term::scr_erase_screen (int mode) 1263rxvt_term::scr_erase_screen (int mode)
1197{ 1264{
1198 int num; 1265 int num;
1199 int32_t row, row_offset; 1266 int32_t row, row_offset;
1200 rend_t ren; 1267 rend_t ren;
1201 XGCValues gcvalue; 1268 XGCValues gcvalue;
1202 1269
1203 want_refresh = 1; 1270 want_refresh = 1;
1204 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));
1205 ZERO_SCROLLBACK (); 1272 ZERO_SCROLLBACK ();
1206 row_offset = (int32_t)TermWin.saveLines; 1273 row_offset = (int32_t)TermWin.saveLines;
… …
1225 num = TermWin.nrow; 1292 num = TermWin.nrow;
1226 break; 1293 break;
1227 default: 1294 default:
1228 return; 1295 return;
1229 } 1296 }
1230 refresh_type |= REFRESH_BOUNDS; 1297
1231 if (selection.op && current_screen == selection.screen 1298 if (selection.op && current_screen == selection.screen
1232 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1299 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1233 || (selection.end.row >= row 1300 || (selection.end.row >= row
1234 && selection.end.row <= row + num))) 1301 && selection.end.row <= row + num)))
1235 CLEAR_SELECTION (); 1302 CLEAR_SELECTION ();
1303
1236 if (row >= TermWin.nrow) /* Out Of Bounds */ 1304 if (row >= TermWin.nrow) /* Out Of Bounds */
1237 return; 1305 return;
1306
1238 MIN_IT (num, (TermWin.nrow - row)); 1307 MIN_IT (num, (TermWin.nrow - row));
1308
1239 if (rstyle & (RS_RVid | RS_Uline)) 1309 if (rstyle & (RS_RVid | RS_Uline))
1240 ren = (rend_t) ~RS_None; 1310 ren = (rend_t) ~RS_None;
1241 else if (GET_BASEBG (rstyle) == Color_bg) 1311 else if (GET_BASEBG (rstyle) == Color_bg)
1242 { 1312 {
1243 ren = DEFAULT_RSTYLE; 1313 ren = DEFAULT_RSTYLE;
… …
1250 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1320 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1251 ERASE_ROWS (row, num); 1321 ERASE_ROWS (row, num);
1252 gcvalue.foreground = PixColors[Color_fg]; 1322 gcvalue.foreground = PixColors[Color_fg];
1253 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1323 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1254 } 1324 }
1325
1255 for (; num--; row++) 1326 for (; num--; row++)
1256 { 1327 {
1257 scr_blank_screen_mem (screen.text, screen.rend, 1328 scr_blank_screen_mem (screen.text, screen.rend,
1258 (unsigned int) (row + row_offset), rstyle); 1329 (unsigned int) (row + row_offset), rstyle);
1259 screen.tlen[row + row_offset] = 0; 1330 screen.tlen[row + row_offset] = 0;
… …
1293 * Insert/Delete <count> lines 1364 * Insert/Delete <count> lines
1294 */ 1365 */
1295void 1366void
1296rxvt_term::scr_insdel_lines (int count, int insdel) 1367rxvt_term::scr_insdel_lines (int count, int insdel)
1297{ 1368{
1298 int end; 1369 int end;
1299 1370
1300 ZERO_SCROLLBACK (); 1371 ZERO_SCROLLBACK ();
1301 1372
1302 selection_check (1); 1373 selection_check (1);
1303 1374
… …
1322 * Insert/Delete <count> characters from the current position 1393 * Insert/Delete <count> characters from the current position
1323 */ 1394 */
1324void 1395void
1325rxvt_term::scr_insdel_chars (int count, int insdel) 1396rxvt_term::scr_insdel_chars (int count, int insdel)
1326{ 1397{
1327 int col, row; 1398 int col, row;
1328 rend_t tr; 1399 rend_t tr;
1329 text_t *stp; 1400 text_t *stp;
1330 rend_t *srp; 1401 rend_t *srp;
1331 int16_t *slp; 1402 int16_t *slp;
1332 1403
1333 want_refresh = 1; 1404 want_refresh = 1;
1334 ZERO_SCROLLBACK (); 1405 ZERO_SCROLLBACK ();
1335 1406
1336 if (count <= 0) 1407 if (count <= 0)
… …
1343 screen.flags &= ~Screen_WrapNext; 1414 screen.flags &= ~Screen_WrapNext;
1344 1415
1345 stp = screen.text[row]; 1416 stp = screen.text[row];
1346 srp = screen.rend[row]; 1417 srp = screen.rend[row];
1347 slp = & (screen.tlen[row]); 1418 slp = & (screen.tlen[row]);
1419
1348 switch (insdel) 1420 switch (insdel)
1349 { 1421 {
1350 case INSERT: 1422 case INSERT:
1351 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1423 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1352 col--) 1424 col--)
1353 { 1425 {
1354 stp[col] = stp[col - count]; 1426 stp[col] = stp[col - count];
1355 srp[col] = srp[col - count]; 1427 srp[col] = srp[col - count];
1356 } 1428 }
1429
1357 if (*slp != -1) 1430 if (*slp != -1)
1358 { 1431 {
1359 *slp += count; 1432 *slp += count;
1360 MIN_IT (*slp, TermWin.ncol); 1433 MIN_IT (*slp, TermWin.ncol);
1361 } 1434 }
1435
1362 if (selection.op && current_screen == selection.screen 1436 if (selection.op && current_screen == selection.screen
1363 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1437 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1364 { 1438 {
1365 if (selection.end.row != screen.cur.row 1439 if (selection.end.row != screen.cur.row
1366 || (selection.end.col + count >= TermWin.ncol)) 1440 || (selection.end.col + count >= TermWin.ncol))
… …
1370 selection.beg.col += count; 1444 selection.beg.col += count;
1371 selection.mark.col += count; /* XXX: yes? */ 1445 selection.mark.col += count; /* XXX: yes? */
1372 selection.end.col += count; 1446 selection.end.col += count;
1373 } 1447 }
1374 } 1448 }
1449
1375 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1450 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1376 (unsigned int)count, rstyle); 1451 (unsigned int)count, rstyle);
1377 break; 1452 break;
1453
1378 case ERASE: 1454 case ERASE:
1379 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1455 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1380 selection_check (1); 1456 selection_check (1);
1381 screen.cur.col -= count; 1457 screen.cur.col -= count;
1382 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1458 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1383 (unsigned int)count, rstyle); 1459 (unsigned int)count, rstyle);
1384 break; 1460 break;
1461
1385 case DELETE: 1462 case DELETE:
1386 tr = srp[TermWin.ncol - 1]
1387 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1463 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1464
1388 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1465 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1389 { 1466 {
1390 stp[col] = stp[col + count]; 1467 stp[col] = stp[col + count];
1391 srp[col] = srp[col + count]; 1468 srp[col] = srp[col + count];
1392 } 1469 }
1470
1393 scr_blank_line (& (stp[TermWin.ncol - count]), 1471 scr_blank_line (& (stp[TermWin.ncol - count]),
1394 & (srp[TermWin.ncol - count]), 1472 & (srp[TermWin.ncol - count]),
1395 (unsigned int)count, tr); 1473 (unsigned int)count, tr);
1474
1396 if (*slp == -1) /* break line continuation */ 1475 if (*slp == -1) /* break line continuation */
1397 *slp = TermWin.ncol; 1476 *slp = TermWin.ncol;
1477
1398 *slp -= count; 1478 *slp -= count;
1399 MAX_IT (*slp, 0); 1479 MAX_IT (*slp, 0);
1480
1400 if (selection.op && current_screen == selection.screen 1481 if (selection.op && current_screen == selection.screen
1401 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1482 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1402 { 1483 {
1403 if (selection.end.row != screen.cur.row 1484 if (selection.end.row != screen.cur.row
1404 || (screen.cur.col >= selection.beg.col - count) 1485 || (screen.cur.col >= selection.beg.col - count)
… …
1410 selection.beg.col -= count; 1491 selection.beg.col -= count;
1411 selection.mark.col -= count; /* XXX: yes? */ 1492 selection.mark.col -= count; /* XXX: yes? */
1412 selection.end.col -= count; 1493 selection.end.col -= count;
1413 } 1494 }
1414 } 1495 }
1496
1415 break; 1497 break;
1416 } 1498 }
1417} 1499}
1418 1500
1419/* ------------------------------------------------------------------------- */ 1501/* ------------------------------------------------------------------------- */
… …
1424void 1506void
1425rxvt_term::scr_scroll_region (int top, int bot) 1507rxvt_term::scr_scroll_region (int top, int bot)
1426{ 1508{
1427 MAX_IT (top, 0); 1509 MAX_IT (top, 0);
1428 MIN_IT (bot, (int)TermWin.nrow - 1); 1510 MIN_IT (bot, (int)TermWin.nrow - 1);
1511
1429 if (top > bot) 1512 if (top > bot)
1430 return; 1513 return;
1514
1431 screen.tscroll = top; 1515 screen.tscroll = top;
1432 screen.bscroll = bot; 1516 screen.bscroll = bot;
1433 scr_gotorc (0, 0, 0); 1517 scr_gotorc (0, 0, 0);
1434} 1518}
1435 1519
… …
1441 */ 1525 */
1442void 1526void
1443rxvt_term::scr_cursor_visible (int mode) 1527rxvt_term::scr_cursor_visible (int mode)
1444{ 1528{
1445 want_refresh = 1; 1529 want_refresh = 1;
1530
1446 if (mode) 1531 if (mode)
1447 screen.flags |= Screen_VisibleCursor; 1532 screen.flags |= Screen_VisibleCursor;
1448 else 1533 else
1449 screen.flags &= ~Screen_VisibleCursor; 1534 screen.flags &= ~Screen_VisibleCursor;
1450} 1535}
… …
1664 row_col_t rc[RC_COUNT]; 1749 row_col_t rc[RC_COUNT];
1665 1750
1666 if (drawn_text == NULL) /* sanity check */ 1751 if (drawn_text == NULL) /* sanity check */
1667 return; 1752 return;
1668 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
1669#ifdef DEBUG_STRICT 1762#ifdef DEBUG_STRICT
1670 x = max (x, (int)TermWin.int_bwidth); 1763 x = max (x, 0);
1671 x = min (x, (int)TermWin.width); 1764 x = min (x, (int)TermWin.width);
1672 y = max (y, (int)TermWin.int_bwidth); 1765 y = max (y, 0);
1673 y = min (y, (int)TermWin.height); 1766 y = min (y, (int)TermWin.height);
1674#endif 1767#endif
1675 1768
1676 /* round down */ 1769 /* round down */
1677 rc[PART_BEG].col = Pixel2Col (x); 1770 rc[PART_BEG].col = Pixel2Col (x);
… …
1688 } 1781 }
1689 1782
1690 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));
1691 1784
1692 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++)
1693 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);
1694 (rc[PART_END].col - rc[PART_BEG].col + 1));
1695 1787
1696 if (refresh) 1788 if (refresh)
1697 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1789 scr_refresh (SLOW_REFRESH);
1698} 1790}
1699 1791
1700/* ------------------------------------------------------------------------- */ 1792/* ------------------------------------------------------------------------- */
1701/* 1793/*
1702 * Refresh the entire screen 1794 * Refresh the entire screen
… …
1737 * direction should be UP or DN 1829 * direction should be UP or DN
1738 */ 1830 */
1739int 1831int
1740rxvt_term::scr_page (enum page_dirn direction, int nlines) 1832rxvt_term::scr_page (enum page_dirn direction, int nlines)
1741{ 1833{
1742 int n; 1834 int n;
1743 uint16_t oldviewstart; 1835 uint16_t oldviewstart;
1744 1836
1745 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));
1746#ifdef DEBUG_STRICT 1838#ifdef DEBUG_STRICT
1747 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1839 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1748#endif 1840#endif
… …
1766 if (TermWin.view_start != oldviewstart) 1858 if (TermWin.view_start != oldviewstart)
1767 { 1859 {
1768 want_refresh = 1; 1860 want_refresh = 1;
1769 num_scr -= (TermWin.view_start - oldviewstart); 1861 num_scr -= (TermWin.view_start - oldviewstart);
1770 } 1862 }
1863
1771 return (int) (TermWin.view_start - oldviewstart); 1864 return (int) (TermWin.view_start - oldviewstart);
1772} 1865}
1773 1866
1774/* ------------------------------------------------------------------------- */ 1867/* ------------------------------------------------------------------------- */
1775void 1868void
… …
1843 ((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)
1844 1937
1845void 1938void
1846rxvt_term::scr_refresh (unsigned char refresh_type) 1939rxvt_term::scr_refresh (unsigned char refresh_type)
1847{ 1940{
1848 unsigned char clearfirst, /* first character writes before cell */
1849 clearlast, /* last character writes beyond cell */
1850 must_clear, /* use draw_string not draw_image_string */ 1941 unsigned char must_clear, /* use draw_string not draw_image_string */
1851 rvid, /* reverse video this position */ 1942 rvid, /* reverse video this position */
1852 showcursor; /* show the cursor */ 1943 showcursor; /* show the cursor */
1853 int16_t col, row, /* column/row we're processing */ 1944 int16_t col, row, /* column/row we're processing */
1854 ocrow; /* old cursor row */ 1945 ocrow; /* old cursor row */
1855 int i, /* tmp */ 1946 int i, /* tmp */
… …
1864 return; 1955 return;
1865 1956
1866 /* 1957 /*
1867 * A: set up vars 1958 * A: set up vars
1868 */ 1959 */
1869 clearfirst = clearlast = must_clear = 0; 1960 must_clear = 0;
1870 1961
1871 refresh_count = 0; 1962 refresh_count = 0;
1872 1963
1873 row_offset = TermWin.saveLines - TermWin.view_start; 1964 row_offset = TermWin.saveLines - TermWin.view_start;
1874
1875 if ((refresh_type & REFRESH_BOUNDS))
1876 {
1877 clearfirst = clearlast = 1;
1878 refresh_type &= ~REFRESH_BOUNDS;
1879 }
1880 1965
1881#ifdef XPM_BACKGROUND 1966#ifdef XPM_BACKGROUND
1882 must_clear |= (bgPixmap.pixmap != None); 1967 must_clear |= (bgPixmap.pixmap != None);
1883#endif 1968#endif
1884#ifdef TRANSPARENT 1969#ifdef TRANSPARENT
… …
1893 1978
1894 /* 1979 /*
1895 * C: set the cursor character (s) 1980 * C: set the cursor character (s)
1896 */ 1981 */
1897 { 1982 {
1898 unsigned char setoldcursor; 1983 unsigned char setoldcursor;
1899 rend_t ccol1, /* Cursor colour */ 1984 rend_t ccol1, /* Cursor colour */
1900 ccol2; /* Cursor colour2 */ 1985 ccol2; /* Cursor colour2 */
1901 1986
1902 showcursor = (screen.flags & Screen_VisibleCursor); 1987 showcursor = (screen.flags & Screen_VisibleCursor);
1903#ifdef CURSOR_BLINK 1988#ifdef CURSOR_BLINK
1904 if (hidden_cursor) 1989 if (hidden_cursor)
1905 showcursor = 0; 1990 showcursor = 0;
1906#endif 1991#endif
1907 1992
1908 if (showcursor) 1993 if (showcursor)
1909 { 1994 {
1910 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1995 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]);
1911 [screen.cur.col]);
1912 1996
1913 if (showcursor && TermWin.focus) 1997 if (showcursor && TermWin.focus)
1914 { 1998 {
1915 *srp ^= RS_RVid; 1999 *srp ^= RS_RVid;
1916#ifndef NO_CURSORCOLOR 2000#ifndef NO_CURSORCOLOR
… …
1944 if (screen.cur.row + TermWin.view_start != ocrow 2028 if (screen.cur.row + TermWin.view_start != ocrow
1945 || screen.cur.col != oldcursor.col) 2029 || screen.cur.col != oldcursor.col)
1946 { 2030 {
1947 if (ocrow < TermWin.nrow 2031 if (ocrow < TermWin.nrow
1948 && oldcursor.col < TermWin.ncol) 2032 && oldcursor.col < TermWin.ncol)
1949 {
1950 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2033 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
1951 } 2034
1952 if (TermWin.focus || !showcursor) 2035 if (TermWin.focus || !showcursor)
1953 oldcursor.row = -1; 2036 oldcursor.row = -1;
1954 else 2037 else
1955 setoldcursor = 1; 2038 setoldcursor = 1;
1956 } 2039 }
1957 } 2040 }
1958 else if (!TermWin.focus) 2041 else if (!TermWin.focus)
1959 setoldcursor = 1; 2042 setoldcursor = 1;
2043
1960 if (setoldcursor) 2044 if (setoldcursor)
1961 { 2045 {
1962 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2046 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
1963 oldcursor.row = -1; 2047 oldcursor.row = -1;
1964 else 2048 else
… …
1973 /* 2057 /*
1974 * D: CopyArea pass - very useful for slower links 2058 * D: CopyArea pass - very useful for slower links
1975 * This has been deliberately kept simple. 2059 * This has been deliberately kept simple.
1976 */ 2060 */
1977 i = num_scr; 2061 i = num_scr;
2062 if (!display->is_local
1978 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2063 && refresh_type == FAST_REFRESH && num_scr_allow && i
1979 && abs (i) < TermWin.nrow && !must_clear) 2064 && abs (i) < TermWin.nrow && !must_clear)
1980 { 2065 {
1981 int16_t nits; 2066 int16_t nits;
1982 int j; 2067 int j;
1983 rend_t *drp2; 2068 rend_t *drp2;
1984 text_t *dtp2; 2069 text_t *dtp2;
1985 int len, wlen; 2070 int len, wlen;
1986 2071
1987 j = TermWin.nrow; 2072 j = TermWin.nrow;
1988 wlen = len = -1; 2073 wlen = len = -1;
1989 row = i > 0 ? 0 : j - 1; 2074 row = i > 0 ? 0 : j - 1;
1990 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2075 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
… …
2054 int ypixel = (int)Row2Pixel (row); 2139 int ypixel = (int)Row2Pixel (row);
2055 2140
2056 for (col = 0; col < TermWin.ncol; col++) 2141 for (col = 0; col < TermWin.ncol; col++)
2057 { 2142 {
2058 /* compare new text with old - if exactly the same then continue */ 2143 /* compare new text with old - if exactly the same then continue */
2144 if (stp[col] == dtp[col] /* Must match characters to skip. */
2145 && (srp[col] == drp[col] /* Either rendition the same or */
2146 || (stp[col] == ' ' /* space w/ no background change */
2147 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2148 continue;
2149
2150 // redraw one or more characters
2151
2152 // seek to the beginning if wide characters
2153 while (stp[col] == NOCHAR && col > 0)
2154 --col;
2155
2059 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2156 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2060
2061 if (stp[col] == dtp[col] /* Must match characters to skip. */
2062 && (rend == drp[col] /* Either rendition the same or */
2063 || (stp[col] == ' ' /* space w/ no background change */
2064 && GET_BGATTR (rend) == GET_BGATTR (drp[col]))))
2065 continue;
2066
2067 text_t *text = stp + col; 2157 text_t *text = stp + col;
2068 int count = 1; 2158 int count = 1;
2069 2159
2070 /* redraw one or more characters */
2071
2072 dtp[col] = stp[col]; 2160 dtp[col] = stp[col];
2073 drp[col] = rend; 2161 drp[col] = rend;
2074
2075 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2076 continue;
2077 2162
2078 int xpixel = Col2Pixel (col); 2163 int xpixel = Col2Pixel (col);
2079 2164
2080 // this loop looks very messy, it can probably be optimized 2165 // this loop looks very messy, it can probably be optimized
2081 // and cleaned a bit by you? 2166 // and cleaned a bit by you?
… …
2125 rend = GET_ATTR (rend); 2210 rend = GET_ATTR (rend);
2126 2211
2127 rvid = !!(rend & RS_RVid); 2212 rvid = !!(rend & RS_RVid);
2128 2213
2129#ifndef NO_BOLD_UNDERLINE_REVERSE 2214#ifndef NO_BOLD_UNDERLINE_REVERSE
2130 if (rend & RS_Bold && fore == Color_fg) 2215 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold))
2131 { 2216 {
2132 if (ISSET_PIXCOLOR (Color_BD)) 2217 if (ISSET_PIXCOLOR (Color_BD))
2133 fore = Color_BD; 2218 fore = Color_BD;
2134 else 2219 else
2135 rvid = !rvid; 2220 rvid = !rvid;
2136 } 2221 }
2137 2222
2138 if (rend & RS_Uline) 2223 if (rend & RS_Uline)
2139 {
2140 if (ISSET_PIXCOLOR (Color_UL)) 2224 if (ISSET_PIXCOLOR (Color_UL))
2141 fore = Color_UL; 2225 fore = Color_UL;
2142 }
2143#endif 2226#endif
2144 2227
2145 if (rvid) 2228 if (rvid)
2146 { 2229 {
2147 SWAP_IT (fore, back, int); 2230 SWAP_IT (fore, back, int);
… …
2155 back = Color_RV; 2238 back = Color_RV;
2156#endif 2239#endif
2157 } 2240 }
2158 2241
2159#ifdef TEXT_BLINK 2242#ifdef TEXT_BLINK
2160 if (rend & RS_Blink && back == Color_bg) 2243 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2161 { 2244 {
2162 if (!text_blink_ev.active) 2245 if (!text_blink_ev.active)
2163 { 2246 {
2164 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2247 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2165 hidden_text = 0; 2248 hidden_text = 0;
… …
2195 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2278 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2196 } 2279 }
2197 else 2280 else
2198 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2281 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2199 2282
2200 if ((rend & RS_Uline) && (font->descent > 1)) 2283 if (rend & RS_Uline && font->descent > 1 && fore != back)
2201 XDrawLine (display->display, drawBuffer, TermWin.gc, 2284 XDrawLine (display->display, drawBuffer, TermWin.gc,
2202 xpixel, ypixel + font->ascent + 1, 2285 xpixel, ypixel + font->ascent + 1,
2203 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2286 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2204 } /* for (col....) */ 2287 } /* for (col....) */
2205 } /* for (row....) */ 2288 } /* for (row....) */
2206 2289
2207 /* 2290 /*
2208 * G: cleanup cursor and display outline cursor if necessary 2291 * G: cleanup cursor and display outline cursor if necessary
… …
2228 while (oldcursor.col + cursorwidth < TermWin.ncol 2311 while (oldcursor.col + cursorwidth < TermWin.ncol
2229 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2312 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2230 cursorwidth++; 2313 cursorwidth++;
2231 2314
2232 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2315 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2233 Col2Pixel (oldcursor.col), 2316 Col2Pixel (oldcursor.col),
2234 Row2Pixel (oldcursor.row), 2317 Row2Pixel (oldcursor.row),
2235 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2318 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2236 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2319 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2237 } 2320 }
2238 } 2321 }
2239 2322
2240 /* 2323 /*
2241 * H: cleanup selection 2324 * H: cleanup selection
2242 */ 2325 */
2243 scr_reverse_selection (); 2326 scr_reverse_selection ();
2244 2327
2245 /*
2246 * I: other general cleanup
2247 */
2248 if (clearfirst && TermWin.int_bwidth)
2249 /*
2250 * clear the whole screen height, note that width == 0 is treated
2251 * specially by XClearArea
2252 */
2253 XClearArea (display->display, TermWin.vt, 0, 0,
2254 (unsigned int)TermWin.int_bwidth,
2255 (unsigned int)TermWin_TotalHeight (), False);
2256 if (clearlast && TermWin.int_bwidth)
2257 /*
2258 * clear the whole screen height, note that width == 0 is treated
2259 * specially by XClearArea
2260 */
2261 XClearArea (display->display, TermWin.vt,
2262 TermWin.width + TermWin.int_bwidth, 0,
2263 (unsigned int)TermWin.int_bwidth,
2264 (unsigned int)TermWin_TotalHeight (), False);
2265 if (refresh_type & SMOOTH_REFRESH) 2328 if (refresh_type & SMOOTH_REFRESH)
2266 XSync (display->display, False); 2329 XFlush (display->display);
2267 2330
2268 num_scr = 0; 2331 num_scr = 0;
2269 num_scr_allow = 1; 2332 num_scr_allow = 1;
2270 want_refresh = 0; /* screen is current */ 2333 want_refresh = 0; /* screen is current */
2271} 2334}
… …
2293 } 2356 }
2294} 2357}
2295 2358
2296/* ------------------------------------------------------------------------- */ 2359/* ------------------------------------------------------------------------- */
2297void 2360void
2298rxvt_term::scr_clear () 2361rxvt_term::scr_clear (bool really)
2299{ 2362{
2300 if (!TermWin.mapped) 2363 if (!TermWin.mapped)
2301 return; 2364 return;
2302 2365
2303 num_scr_allow = 0; 2366 num_scr_allow = 0;
2304 want_refresh = 1; 2367 want_refresh = 1;
2368
2305#ifdef TRANSPARENT 2369#ifdef TRANSPARENT
2306 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2370 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2307 { 2371 {
2308 int i; 2372 int i;
2309 2373
… …
2316 if (TermWin.parent[i] != None) 2380 if (TermWin.parent[i] != None)
2317 XClearWindow (display->display, TermWin.parent[i]); 2381 XClearWindow (display->display, TermWin.parent[i]);
2318 } 2382 }
2319#endif 2383#endif
2320 2384
2385 if (really)
2321 XClearWindow (display->display, TermWin.vt); 2386 XClearWindow (display->display, TermWin.vt);
2322} 2387}
2323 2388
2324/* ------------------------------------------------------------------------- */ 2389/* ------------------------------------------------------------------------- */
2325void 2390void
2326rxvt_term::scr_reverse_selection () 2391rxvt_term::scr_reverse_selection ()
2327{ 2392{
2328 int i, col, row, end_row;
2329 rend_t *srp;
2330
2331 if (selection.op && current_screen == selection.screen) 2393 if (selection.op && current_screen == selection.screen)
2332 { 2394 {
2333 end_row = TermWin.saveLines - TermWin.view_start; 2395 int end_row = TermWin.saveLines - TermWin.view_start;
2334 i = selection.beg.row + TermWin.saveLines; 2396 int i = selection.beg.row + TermWin.saveLines;
2335 row = selection.end.row + TermWin.saveLines; 2397 int col, row = selection.end.row + TermWin.saveLines;
2398 rend_t *srp;
2399
2336 if (i >= end_row) 2400 if (i >= end_row)
2337 col = selection.beg.col; 2401 col = selection.beg.col;
2338 else 2402 else
2339 { 2403 {
2340 col = 0; 2404 col = 0;
2341 i = end_row; 2405 i = end_row;
2342 } 2406 }
2407
2343 end_row += TermWin.nrow; 2408 end_row += TermWin.nrow;
2344 for (; i < row && i < end_row; i++, col = 0) 2409 for (; i < row && i < end_row; i++, col = 0)
2345 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2410 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2346 srp[col] ^= RS_RVid; 2411 srp[col] ^= RS_RVid;
2412
2347 if (i == row && i < end_row) 2413 if (i == row && i < end_row)
2348 for (srp = screen.rend[i]; col < selection.end.col; col++) 2414 for (srp = screen.rend[i]; col < selection.end.col; col++)
2349 srp[col] ^= RS_RVid; 2415 srp[col] ^= RS_RVid;
2350 } 2416 }
2351} 2417}
… …
2439 { 2505 {
2440 n = min (len - i, PROP_SIZE); 2506 n = min (len - i, PROP_SIZE);
2441 MEMCPY (ds, data + i, n); 2507 MEMCPY (ds, data + i, n);
2442 2508
2443 for (j = 0; j < n; j++) 2509 for (j = 0; j < n; j++)
2444 if (ds[j] == '\n') 2510 if (ds[j] == C0_LF)
2445 ds[j] = '\r'; 2511 ds[j] = C0_CR;
2446 2512
2447 tt_write (ds, (int)n); 2513 tt_write (ds, (int)n);
2448 } 2514 }
2449 2515
2450 free (ds); 2516 free (ds);
… …
2501 if (ct.encoding == 0) 2567 if (ct.encoding == 0)
2502 { 2568 {
2503 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2569 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
2504 break; 2570 break;
2505 } 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);
2578 break;
2579 }
2506 2580
2507 if (ct.value == NULL) 2581 if (ct.value == NULL)
2508 { 2582 {
2509 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!")); 2583 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2510 continue; 2584 continue;
2511 } 2585 }
2512 2586
2513 if (ct.nitems == 0) 2587 if (ct.nitems == 0)
2514 { 2588 {
2515 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2589 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2590
2516 if (selection_wait == Sel_normal && nread == 0 2591 if (selection_wait == Sel_normal && nread == 0
2517 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2592 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2518 { 2593 {
2519 /* 2594 /*
2520 * pass through again trying CUT_BUFFER0 if we've come from 2595 * pass through again trying CUT_BUFFER0 if we've come from
… …
2530 2605
2531 nread += ct.nitems; 2606 nread += ct.nitems;
2532 2607
2533 char **cl; 2608 char **cl;
2534 int cr; 2609 int cr;
2535 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2610 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2536 &cr) >= 0 && cl)
2537 { 2611 {
2538 for (int i = 0; i < cr; i++) 2612 for (int i = 0; i < cr; i++)
2539 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2613 paste ((unsigned char *)cl[i], STRLEN (cl[i]));
2540 2614
2541 XFreeStringList (cl); 2615 XFreeStringList (cl);
… …
2562void 2636void
2563rxvt_term::incr_cb (time_watcher &w) 2637rxvt_term::incr_cb (time_watcher &w)
2564{ 2638{
2565 selection_wait = Sel_none; 2639 selection_wait = Sel_none;
2566 2640
2567 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2641 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2568} 2642}
2569 2643
2570/* 2644/*
2571 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2645 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2572 */ 2646 */
2573void 2647void
2574rxvt_term::selection_property (Window win, Atom prop) 2648rxvt_term::selection_property (Window win, Atom prop)
2575{ 2649{
2576 int reget_time = 0; 2650 if (prop == None || selection_wait != Sel_incr)
2577
2578 if (prop == None)
2579 return; 2651 return;
2580 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2581 if (selection_wait == Sel_normal)
2582 {
2583 int a, afmt;
2584 Atom atype;
2585 unsigned long bytes_after, nitems;
2586 unsigned char *s = NULL;
2587 2652
2588 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2589 xa[XA_INCR], &atype, &afmt, &nitems,
2590 &bytes_after, &s);
2591 if (s)
2592 XFree (s);
2593 if (a != Success)
2594 return;
2595#ifndef __CYGWIN32__
2596 if (atype == xa[XA_INCR])
2597 { /* start an INCR transfer */
2598 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2599 XDeleteProperty (display->display, win, prop);
2600 XFlush (display->display);
2601 reget_time = 1;
2602 selection_wait = Sel_incr;
2603 }
2604#endif
2605
2606 }
2607 else if (selection_wait == Sel_incr)
2608 {
2609 reget_time = 1;
2610 if (selection_paste (win, prop, True) == -1) 2653 if (selection_paste (win, prop, 1) > 0)
2611 {
2612 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2613 selection_wait = Sel_none;
2614 incr_ev.stop ();
2615 }
2616 }
2617 if (reget_time) /* received more data so reget time */
2618 incr_ev.start (NOW + 10); 2654 incr_ev.start (NOW + 10);
2655 else
2656 {
2657 selection_wait = Sel_none;
2658 incr_ev.stop ();
2659 }
2619} 2660}
2661
2620/* ------------------------------------------------------------------------- */ 2662/* ------------------------------------------------------------------------- */
2621/* 2663/*
2622 * Request the current selection: 2664 * Request the current selection:
2623 * Order: > internal selection if available 2665 * Order: > internal selection if available
2624 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2666 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2629 */ 2671 */
2630void 2672void
2631rxvt_term::selection_request (Time tm, int x, int y) 2673rxvt_term::selection_request (Time tm, int x, int y)
2632{ 2674{
2633 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); 2675 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2676
2634 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2677 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2635 return; /* outside window */ 2678 return; /* outside window */
2636 2679
2637 if (selection.text != NULL) 2680 if (selection.text)
2638 { /* internal selection */ 2681 { /* internal selection */
2639 D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); 2682 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2640 paste (selection.text, selection.len); 2683 char *str = rxvt_wcstombs (selection.text, selection.len);
2684 paste ((unsigned char *)str, strlen (str));
2685 free (str);
2641 return; 2686 return;
2642 } 2687 }
2643 else 2688 else
2644 { 2689 {
2645 int i; 2690 int i;
2646 2691
2647 selection_request_time = tm; 2692 selection_request_time = tm;
2648 selection_wait = Sel_normal; 2693 selection_wait = Sel_normal;
2694
2649 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2695 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2650 { 2696 {
2651#if X_HAVE_UTF8_STRING 2697#if X_HAVE_UTF8_STRING
2652 selection_type = Sel_UTF8String; 2698 selection_type = Sel_UTF8String;
2653 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2699 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2658 return; 2704 return;
2659#endif 2705#endif
2660 2706
2661 } 2707 }
2662 } 2708 }
2709
2663 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2710 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2664 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2711 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2665 selection_paste (display->root, XA_CUT_BUFFER0, False); 2712 selection_paste (display->root, XA_CUT_BUFFER0, False);
2666} 2713}
2667 2714
2668int 2715int
2669rxvt_term::selection_request_other (Atom target, int selnum) 2716rxvt_term::selection_request_other (Atom target, int selnum)
2670{ 2717{
2671 Atom sel; 2718 Atom sel;
2672#ifdef DEBUG_SELECT 2719#ifdef DEBUG_SELECT
2673 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2720 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2674#endif 2721#endif
2675 2722
2676 selection_type |= selnum; 2723 selection_type |= selnum;
2724
2677 if (selnum == Sel_Primary) 2725 if (selnum == Sel_Primary)
2678 sel = XA_PRIMARY; 2726 sel = XA_PRIMARY;
2679 else if (selnum == Sel_Secondary) 2727 else if (selnum == Sel_Secondary)
2680 sel = XA_SECONDARY; 2728 sel = XA_SECONDARY;
2681 else 2729 else
2682 sel = xa[XA_CLIPBOARD]; 2730 sel = xa[XA_CLIPBOARD];
2731
2683 if (XGetSelectionOwner (display->display, sel) != None) 2732 if (XGetSelectionOwner (display->display, sel) != None)
2684 { 2733 {
2685 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2734 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2686 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2735 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2687 TermWin.vt, selection_request_time); 2736 TermWin.vt, selection_request_time);
2688 return 1; 2737 return 1;
2689 } 2738 }
2739
2690 return 0; 2740 return 0;
2691} 2741}
2692 2742
2693/* ------------------------------------------------------------------------- */ 2743/* ------------------------------------------------------------------------- */
2694/* 2744/*
… …
2703 want_refresh = 1; 2753 want_refresh = 1;
2704 free (selection.text); 2754 free (selection.text);
2705 selection.text = NULL; 2755 selection.text = NULL;
2706 selection.len = 0; 2756 selection.len = 0;
2707 CLEAR_SELECTION (); 2757 CLEAR_SELECTION ();
2758
2759 if (display->selection_owner == this)
2760 display->selection_owner = 0;
2708} 2761}
2709 2762
2710/* ------------------------------------------------------------------------- */ 2763/* ------------------------------------------------------------------------- */
2711/* 2764/*
2712 * Copy a selection into the cut buffer 2765 * Copy a selection into the cut buffer
2713 * EXT: button 1 or 3 release 2766 * EXT: button 1 or 3 release
2714 */ 2767 */
2715void 2768void
2716rxvt_term::selection_make (Time tm) 2769rxvt_term::selection_make (Time tm)
2717{ 2770{
2718 int i, col, end_col, row, end_row; 2771 int i, col, end_col, row, end_row;
2719 unsigned char *new_selection_text; 2772 wchar_t *new_selection_text;
2720 char *str;
2721 text_t *t; 2773 text_t *t;
2722#ifdef ACS_ASCII
2723 rend_t *re;
2724#endif
2725 2774
2726 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); 2775 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2727 switch (selection.op) 2776 switch (selection.op)
2728 { 2777 {
2729 case SELECTION_CONT: 2778 case SELECTION_CONT:
… …
2741 selection.op = SELECTION_DONE; 2790 selection.op = SELECTION_DONE;
2742 2791
2743 if (selection.clicks == 4) 2792 if (selection.clicks == 4)
2744 return; /* nothing selected, go away */ 2793 return; /* nothing selected, go away */
2745 2794
2746 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2795 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2747 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); 2796 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2748
2749 new_selection_text = (unsigned char *)str;
2750 2797
2751 col = selection.beg.col; 2798 col = selection.beg.col;
2752 MAX_IT (col, 0); 2799 MAX_IT (col, 0);
2753 row = selection.beg.row + TermWin.saveLines; 2800 row = selection.beg.row + TermWin.saveLines;
2754 end_row = selection.end.row + TermWin.saveLines; 2801 end_row = selection.end.row + TermWin.saveLines;
2802 int ofs = 0;
2803 int extra = 0;
2755 2804
2756 for (; row <= end_row; row++, col = 0) 2805 for (; row <= end_row; row++, col = 0)
2757 { 2806 {
2758 t = & (screen.text[row][col]); 2807 t = &(screen.text[row][col]);
2759 2808
2760 end_col = screen.tlen[row]; 2809 end_col = screen.tlen[row];
2761 2810
2762 if (end_col == -1) 2811 if (end_col == -1)
2763 end_col = TermWin.ncol; 2812 end_col = TermWin.ncol;
2764 2813
2765 if (row == end_row) 2814 if (row == end_row)
2766 MIN_IT (end_col, selection.end.col); 2815 MIN_IT (end_col, selection.end.col);
2767 2816
2768 for (; col < end_col; col++) 2817 for (; col < end_col; col++)
2818 {
2769 if (*t == NOCHAR) 2819 if (*t == NOCHAR)
2770 t++; 2820 t++;
2821#if ENABLE_COMBINING
2822 else if (IS_COMPOSE (*t))
2823 {
2824 int len = rxvt_composite.expand (*t, 0);
2825
2826 extra -= (len - 1);
2827
2828 if (extra < 0)
2829 {
2830 extra += i;
2831 i += i;
2832 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2833 }
2834
2835 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2836 }
2837#endif
2771 else 2838 else
2772 { 2839 new_selection_text[ofs++] = *t++;
2773 int len = wctomb (str, *t++);
2774 if (len > 0)
2775 str += len;
2776 } 2840 }
2777 2841
2778 if (screen.tlen[row] != -1 && row != end_row) 2842 if (screen.tlen[row] != -1 && row != end_row)
2779 *str++ = '\n'; 2843 new_selection_text[ofs++] = C0_LF;
2780 } 2844 }
2781 2845
2782#ifndef NO_OLD_SELECTION
2783 if (selection_style == OLD_SELECT)
2784 if (end_col == TermWin.ncol)
2785 *str++ = '\n';
2786#endif
2787#ifndef NO_NEW_SELECTION
2788 if (selection_style != OLD_SELECT)
2789 if (end_col != selection.end.col) 2846 if (end_col != selection.end.col)
2790 *str++ = '\n'; 2847 new_selection_text[ofs++] = C0_LF;
2791#endif
2792 *str = '\0';
2793 2848
2794 i = str - (char *)new_selection_text; 2849 new_selection_text[ofs] = 0;
2850
2795 if (i == 0) 2851 if (ofs == 0)
2796 { 2852 {
2797 free (new_selection_text); 2853 free (new_selection_text);
2798 return; 2854 return;
2799 } 2855 }
2800 2856
2801 // due to MB_CUR_MAX, selection wastage is usually high, so realloc
2802 if (str - (char *)new_selection_text > 1024)
2803 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2804
2805 selection.len = i;
2806
2807 if (selection.text)
2808 free (selection.text); 2857 free (selection.text);
2809 2858
2810 selection.text = new_selection_text; 2859 // we usually allocate much more than necessary, so realloc it smaller again
2860 selection.len = ofs;
2861 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2811 2862
2812 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2863 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2813 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2864 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2814 display->set_selection_owner (this); 2865 display->set_selection_owner (this);
2815 else 2866 else
2816 rxvt_print_error ("can't get primary selection"); 2867 rxvt_warn ("can't get primary selection, ignoring.\n");
2817 2868
2818 { 2869#if 0
2819 XTextProperty ct; 2870 XTextProperty ct;
2820 char *cl = (char *)selection.text;
2821 2871
2822 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2872 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2823 { 2873 {
2824 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2825 PropModeReplace, ct.value, ct.nitems);
2826 XFree (ct.value);
2827 }
2828 else
2829 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2874 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2830 PropModeReplace, selection.text, (int)selection.len); 2875 PropModeReplace, ct.value, ct.nitems);
2876 XFree (ct.value);
2831 } 2877 }
2878#endif
2832 2879
2833 selection_time = tm; 2880 selection_time = tm;
2834 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); 2881 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2835} 2882}
2836 2883
… …
2865rxvt_term::selection_start_colrow (int col, int row) 2912rxvt_term::selection_start_colrow (int col, int row)
2866{ 2913{
2867 want_refresh = 1; 2914 want_refresh = 1;
2868 selection.mark.col = col; 2915 selection.mark.col = col;
2869 selection.mark.row = row - TermWin.view_start; 2916 selection.mark.row = row - TermWin.view_start;
2917
2870 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2918 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2871 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2919 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2872 MAX_IT (selection.mark.col, 0); 2920 MAX_IT (selection.mark.col, 0);
2873 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2921 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2874 2922
2923 while (selection.mark.col > 0
2924 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2925 --selection.mark.col;
2926
2875 if (selection.op) 2927 if (selection.op)
2876 { /* clear the old selection */ 2928 { /* clear the old selection */
2877 selection.beg.row = selection.end.row = selection.mark.row; 2929 selection.beg.row = selection.end.row = selection.mark.row;
2878 selection.beg.col = selection.end.col = selection.mark.col; 2930 selection.beg.col = selection.end.col = selection.mark.col;
2879 } 2931 }
2932
2880 selection.op = SELECTION_INIT; 2933 selection.op = SELECTION_INIT;
2881 selection.screen = current_screen; 2934 selection.screen = current_screen;
2882} 2935}
2883 2936
2884/* ------------------------------------------------------------------------- */ 2937/* ------------------------------------------------------------------------- */
… …
2886 * Word select: select text for 2 clicks 2939 * Word select: select text for 2 clicks
2887 * We now only find out the boundary in one direction 2940 * We now only find out the boundary in one direction
2888 */ 2941 */
2889 2942
2890/* 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 */
2891#define DELIMIT_TEXT(x) \ 2944#define DELIMIT_TEXT(x) \
2892 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 2945 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x)))
2893#define DELIMIT_REND(x) 1 2946#define DELIMIT_REND(x) 1
2894 2947
2895void 2948void
2896rxvt_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)
2897{ 2950{
2898 int col, row, dirnadd, tcol, trow, w1, w2; 2951 int col, row, dirnadd, tcol, trow, w1, w2;
2899 row_col_t bound; 2952 row_col_t bound;
2900 text_t *stp; 2953 text_t *stp;
2901 rend_t *srp; 2954 rend_t *srp;
2902 2955
2903 if (dirn == UP) 2956 if (dirn == UP)
2904 { 2957 {
2905 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 2958 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2906 bound.col = 0; 2959 bound.col = 0;
… …
2910 { 2963 {
2911 bound.row = TermWin.saveLines + TermWin.nrow; 2964 bound.row = TermWin.saveLines + TermWin.nrow;
2912 bound.col = TermWin.ncol - 1; 2965 bound.col = TermWin.ncol - 1;
2913 dirnadd = 1; 2966 dirnadd = 1;
2914 } 2967 }
2968
2915 row = mark->row + TermWin.saveLines; 2969 row = mark->row + TermWin.saveLines;
2916 col = mark->col; 2970 col = mark->col;
2917 MAX_IT (col, 0); 2971 MAX_IT (col, 0);
2918 /* find the edge of a word */ 2972 /* find the edge of a word */
2919 stp = & (screen.text[row][col]); 2973 stp = & (screen.text[row][col]);
2920 w1 = DELIMIT_TEXT (*stp); 2974 w1 = DELIMIT_TEXT (*stp);
2921 2975
2922 if (selection_style != NEW_SELECT)
2923 {
2924 if (w1 == 1)
2925 {
2926 stp += dirnadd;
2927 if (DELIMIT_TEXT (*stp) == 1)
2928 goto Old_Word_Selection_You_Die;
2929 col += dirnadd;
2930 }
2931 w1 = 0;
2932 }
2933 srp = (&screen.rend[row][col]); 2976 srp = (&screen.rend[row][col]);
2934 w2 = DELIMIT_REND (*srp); 2977 w2 = DELIMIT_REND (*srp);
2935 2978
2936 for (;;) 2979 for (;;)
2937 { 2980 {
2938 for (; col != bound.col; col += dirnadd) 2981 for (; col != bound.col; col += dirnadd)
2939 { 2982 {
2940 stp += dirnadd; 2983 stp += dirnadd;
2984 srp += dirnadd;
2985
2986 if (*stp == NOCHAR)
2987 continue;
2988
2941 if (DELIMIT_TEXT (*stp) != w1) 2989 if (DELIMIT_TEXT (*stp) != w1)
2942 break; 2990 break;
2943 srp += dirnadd;
2944 if (DELIMIT_REND (*srp) != w2) 2991 if (DELIMIT_REND (*srp) != w2)
2945 break; 2992 break;
2946 } 2993 }
2994
2947 if ((col == bound.col) && (row != bound.row)) 2995 if ((col == bound.col) && (row != bound.row))
2948 { 2996 {
2949 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 2997 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2950 { 2998 {
2951 trow = row + dirnadd; 2999 trow = row + dirnadd;
2952 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3000 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3001
2953 if (screen.text[trow] == NULL) 3002 if (screen.text[trow] == NULL)
2954 break; 3003 break;
3004
2955 stp = & (screen.text[trow][tcol]); 3005 stp = & (screen.text[trow][tcol]);
2956 srp = & (screen.rend[trow][tcol]); 3006 srp = & (screen.rend[trow][tcol]);
3007
2957 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3008 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2958 break; 3009 break;
3010
2959 row = trow; 3011 row = trow;
2960 col = tcol; 3012 col = tcol;
2961 continue; 3013 continue;
2962 } 3014 }
2963 } 3015 }
2964 break; 3016 break;
2965 } 3017 }
3018
2966Old_Word_Selection_You_Die: 3019Old_Word_Selection_You_Die:
2967 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));
2968 3021
2969 if (dirn == DN) 3022 if (dirn == DN)
2970 col++; /* put us on one past the end */ 3023 col++; /* put us on one past the end */
… …
2992 MAX_IT (row, 0); 3045 MAX_IT (row, 0);
2993 MIN_IT (row, (int)TermWin.nrow - 1); 3046 MIN_IT (row, (int)TermWin.nrow - 1);
2994 MAX_IT (col, 0); 3047 MAX_IT (col, 0);
2995 MIN_IT (col, (int)TermWin.ncol); 3048 MIN_IT (col, (int)TermWin.ncol);
2996 3049
2997#ifndef NO_NEW_SELECTION
2998 /* 3050 /*
2999 * 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
3000 * 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
3001 * 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
3002 * be _past_ a character for it to be selected. 3054 * be _past_ a character for it to be selected.
3003 */ 3055 */
3004 if (selection_style != OLD_SELECT)
3005 {
3006 if (((selection.clicks % 3) == 1) && !flag 3056 if (((selection.clicks % 3) == 1) && !flag
3007 && (col == selection.mark.col 3057 && (col == selection.mark.col
3008 && (row == selection.mark.row + TermWin.view_start))) 3058 && (row == selection.mark.row + TermWin.view_start)))
3009 { 3059 {
3010 /* select nothing */ 3060 /* select nothing */
3011 selection.beg.row = selection.end.row = 0; 3061 selection.beg.row = selection.end.row = 0;
3012 selection.beg.col = selection.end.col = 0; 3062 selection.beg.col = selection.end.col = 0;
3013 selection.clicks = 4; 3063 selection.clicks = 4;
3014 want_refresh = 1; 3064 want_refresh = 1;
3015 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); 3065 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3016 return; 3066 return;
3017 }
3018 } 3067 }
3019#endif 3068
3020 if (selection.clicks == 4) 3069 if (selection.clicks == 4)
3021 selection.clicks = 1; 3070 selection.clicks = 1;
3022 3071
3023 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3072 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3024 flag == 1 ? 1 : 0, /* ? button press */ 3073 flag == 1 ? 1 : 0, /* ? button press */
… …
3030 * Extend the selection to the specified col/row 3079 * Extend the selection to the specified col/row
3031 */ 3080 */
3032void 3081void
3033rxvt_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)
3034{ 3083{
3035 int16_t ncol = TermWin.ncol; 3084 int16_t ncol = TermWin.ncol;
3036 int end_col; 3085 int end_col;
3037 row_col_t pos; 3086 row_col_t pos;
3038 enum { 3087 enum {
3039 LEFT, RIGHT 3088 LEFT, RIGHT
3040 } closeto = RIGHT; 3089 } closeto = RIGHT;
3041 3090
3042 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));
… …
3078 pos.col = col; 3127 pos.col = col;
3079 pos.row = row; 3128 pos.row = row;
3080 3129
3081 pos.row -= TermWin.view_start; /* adjust for scroll */ 3130 pos.row -= TermWin.view_start; /* adjust for scroll */
3082 3131
3083#ifndef NO_OLD_SELECTION
3084 /*
3085 * This mimics some of the selection behaviour of version 2.20 and before.
3086 * There are no ``selection modes'', button3 is always character extension.
3087 * Note: button3 drag is always available, c.f. v2.20
3088 * Selection always terminates (left or right as appropriate) at the mark.
3089 */
3090 if (selection_style == OLD_SELECT)
3091 {
3092 if (selection.clicks == 1 || button3)
3093 {
3094 if (hate_those_clicks)
3095 {
3096 hate_those_clicks = 0;
3097 if (selection.clicks == 1)
3098 {
3099 selection.beg.row = selection.mark.row;
3100 selection.beg.col = selection.mark.col;
3101 }
3102 else
3103 {
3104 selection.mark.row = selection.beg.row;
3105 selection.mark.col = selection.beg.col;
3106 }
3107 }
3108 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3109 {
3110 selection.end.row = selection.mark.row;
3111 selection.end.col = selection.mark.col + 1;
3112 selection.beg.row = pos.row;
3113 selection.beg.col = pos.col;
3114 }
3115 else
3116 {
3117 selection.beg.row = selection.mark.row;
3118 selection.beg.col = selection.mark.col;
3119 selection.end.row = pos.row;
3120 selection.end.col = pos.col + 1;
3121 }
3122 }
3123 else if (selection.clicks == 2)
3124 {
3125 selection_delimit_word (UP, & (selection.mark),
3126 & (selection.beg));
3127 selection_delimit_word (DN, & (selection.mark),
3128 & (selection.end));
3129 hate_those_clicks = 1;
3130 }
3131 else if (selection.clicks == 3)
3132 {
3133 selection.beg.row = selection.end.row = selection.mark.row;
3134 selection.beg.col = 0;
3135 selection.end.col = ncol;
3136 hate_those_clicks = 1;
3137 }
3138 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));
3139 return;
3140 }
3141#endif /* ! NO_OLD_SELECTION */
3142#ifndef NO_NEW_SELECTION
3143 /* selection_style must not be OLD_SELECT to get here */
3144 /* 3132 /*
3145 * 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
3146 * in the way button3 drag extension works. 3134 * in the way button3 drag extension works.
3147 * We're either doing: button1 drag; button3 press; or button3 drag 3135 * We're either doing: button1 drag; button3 press; or button3 drag
3148 * 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
… …
3153 * 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
3154 * 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
3155 * time of the most recent button3 press 3143 * time of the most recent button3 press
3156 */ 3144 */
3157 if (button3 && buttonpress) 3145 if (button3 && buttonpress)
3158 { /* button3 press */ 3146 { /* button3 press */
3159 /* 3147 /*
3160 * first determine which edge of the selection we are closest to 3148 * first determine which edge of the selection we are closest to
3161 */ 3149 */
3162 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3150 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3163 || (!ROWCOL_IS_AFTER (pos, selection.end) 3151 || (!ROWCOL_IS_AFTER (pos, selection.end)
3164 && (((pos.col - selection.beg.col) 3152 && (((pos.col - selection.beg.col)
3165 + ((pos.row - selection.beg.row) * ncol)) 3153 + ((pos.row - selection.beg.row) * ncol))
3166 < ((selection.end.col - pos.col) 3154 < ((selection.end.col - pos.col)
3167 + ((selection.end.row - pos.row) * ncol))))) 3155 + ((selection.end.row - pos.row) * ncol)))))
3168 closeto = LEFT; 3156 closeto = LEFT;
3157
3169 if (closeto == LEFT) 3158 if (closeto == LEFT)
3170 { 3159 {
3171 selection.beg.row = pos.row; 3160 selection.beg.row = pos.row;
3172 selection.beg.col = pos.col; 3161 selection.beg.col = pos.col;
3173 selection.mark.row = selection.end.row; 3162 selection.mark.row = selection.end.row;
3174 selection.mark.col = selection.end.col 3163 selection.mark.col = selection.end.col - (selection.clicks == 2);
3175 - (selection.clicks == 2);
3176 } 3164 }
3177 else 3165 else
3178 { 3166 {
3179 selection.end.row = pos.row; 3167 selection.end.row = pos.row;
3180 selection.end.col = pos.col; 3168 selection.end.col = pos.col;
3181 selection.mark.row = selection.beg.row; 3169 selection.mark.row = selection.beg.row;
3182 selection.mark.col = selection.beg.col; 3170 selection.mark.col = selection.beg.col;
3183 } 3171 }
3184 } 3172 }
3185 else 3173 else
3186 { /* button1 drag or button3 drag */ 3174 { /* button1 drag or button3 drag */
3187 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3175 if (ROWCOL_IS_AFTER (selection.mark, pos))
3188 { 3176 {
3189 if ((selection.mark.row == selection.end.row) 3177 if ((selection.mark.row == selection.end.row)
3190 && (selection.mark.col == selection.end.col) 3178 && (selection.mark.col == selection.end.col)
3191 && clickchange && selection.clicks == 2) 3179 && clickchange && selection.clicks == 2)
3192 selection.mark.col--; 3180 selection.mark.col--;
3181
3193 selection.beg.row = pos.row; 3182 selection.beg.row = pos.row;
3194 selection.beg.col = pos.col; 3183 selection.beg.col = pos.col;
3195 selection.end.row = selection.mark.row; 3184 selection.end.row = selection.mark.row;
3196 selection.end.col = selection.mark.col 3185 selection.end.col = selection.mark.col + (selection.clicks == 2);
3197 + (selection.clicks == 2);
3198 } 3186 }
3199 else 3187 else
3200 { 3188 {
3201 selection.beg.row = selection.mark.row; 3189 selection.beg.row = selection.mark.row;
3202 selection.beg.col = selection.mark.col; 3190 selection.beg.col = selection.mark.col;
… …
3206 } 3194 }
3207 3195
3208 if (selection.clicks == 1) 3196 if (selection.clicks == 1)
3209 { 3197 {
3210 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3198 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3199
3211 if (end_col != -1 && selection.beg.col > end_col) 3200 if (end_col != -1 && selection.beg.col > end_col)
3212 { 3201 {
3213#if 1 3202#if 1
3214 selection.beg.col = ncol; 3203 selection.beg.col = ncol;
3215#else 3204#else
3216 if (selection.beg.row != selection.end.row) 3205 if (selection.beg.row != selection.end.row)
3217 selection.beg.col = ncol; 3206 selection.beg.col = ncol;
3218 else 3207 else
3219 selection.beg.col = selection.mark.col; 3208 selection.beg.col = selection.mark.col;
3220#endif 3209#endif
3221
3222 } 3210 }
3211
3223 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3212 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3213
3224 if (end_col != -1 && selection.end.col > end_col) 3214 if (end_col != -1 && selection.end.col > end_col)
3225 selection.end.col = ncol; 3215 selection.end.col = ncol;
3226
3227 } 3216 }
3228 else if (selection.clicks == 2) 3217 else if (selection.clicks == 2)
3229 { 3218 {
3230 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3219 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3231 selection.end.col--; 3220 selection.end.col--;
3221
3232 selection_delimit_word (UP, & (selection.beg), 3222 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3233 & (selection.beg));
3234 selection_delimit_word (DN, & (selection.end), 3223 selection_delimit_word (DN, & (selection.end), & (selection.end));
3235 & (selection.end));
3236 } 3224 }
3237 else if (selection.clicks == 3) 3225 else if (selection.clicks == 3)
3238 { 3226 {
3239#ifndef NO_FRILLS 3227#ifndef NO_FRILLS
3240 if ((Options & Opt_tripleclickwords)) 3228 if ((Options & Opt_tripleclickwords))
3241 { 3229 {
3242 int end_row; 3230 int end_row;
3243 3231
3244 selection_delimit_word (UP, & (selection.beg), 3232 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3245 & (selection.beg));
3246 end_row = screen.tlen[selection.mark.row 3233 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3247 + TermWin.saveLines]; 3234
3248 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3235 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3249 end_row++)
3250 { 3236 {
3251 end_col = screen.tlen[end_row + TermWin.saveLines]; 3237 end_col = screen.tlen[end_row + TermWin.saveLines];
3238
3252 if (end_col != -1) 3239 if (end_col != -1)
3253 { 3240 {
3254 selection.end.row = end_row; 3241 selection.end.row = end_row;
3255 selection.end.col = end_col; 3242 selection.end.col = end_col;
3256 selection_remove_trailing_spaces (); 3243 selection_remove_trailing_spaces ();
… …
3258 } 3245 }
3259 } 3246 }
3260 } 3247 }
3261 else 3248 else
3262#endif 3249#endif
3263
3264 { 3250 {
3265 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3251 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3266 selection.mark.col++; 3252 selection.mark.col++;
3267 selection.beg.col = 0; 3253 selection.beg.col = 0;
3268 selection.end.col = ncol; 3254 selection.end.col = ncol;
3269 } 3255 }
3270 } 3256 }
3257
3271 if (button3 && buttonpress) 3258 if (button3 && buttonpress)
3272 { /* mark may need to be changed */ 3259 { /* mark may need to be changed */
3273 if (closeto == LEFT) 3260 if (closeto == LEFT)
3274 { 3261 {
3275 selection.mark.row = selection.end.row; 3262 selection.mark.row = selection.end.row;
3276 selection.mark.col = selection.end.col 3263 selection.mark.col = selection.end.col
3277 - (selection.clicks == 2); 3264 - (selection.clicks == 2);
… …
3281 selection.mark.row = selection.beg.row; 3268 selection.mark.row = selection.beg.row;
3282 selection.mark.col = selection.beg.col; 3269 selection.mark.col = selection.beg.col;
3283 } 3270 }
3284 } 3271 }
3285 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));
3286#endif /* ! NO_NEW_SELECTION */
3287} 3273}
3288 3274
3289#ifndef NO_FRILLS 3275#ifndef NO_FRILLS
3290void 3276void
3291rxvt_term::selection_remove_trailing_spaces () 3277rxvt_term::selection_remove_trailing_spaces ()
… …
3365 ev.target = rq.target; 3351 ev.target = rq.target;
3366 ev.time = rq.time; 3352 ev.time = rq.time;
3367 3353
3368 if (rq.target == xa[XA_TARGETS]) 3354 if (rq.target == xa[XA_TARGETS])
3369 { 3355 {
3370 Atom32 target_list[5]; 3356 Atom32 target_list[6];
3371 Atom32 *target = target_list; 3357 Atom32 *target = target_list;
3372 3358
3373 *target++ = (Atom32) xa[XA_TARGETS]; 3359 *target++ = (Atom32) xa[XA_TARGETS];
3360 *target++ = (Atom32) xa[XA_TIMESTAMP];
3374 *target++ = (Atom32) XA_STRING; 3361 *target++ = (Atom32) XA_STRING;
3375 *target++ = (Atom32) xa[XA_TEXT]; 3362 *target++ = (Atom32) xa[XA_TEXT];
3376 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3363 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3377#if X_HAVE_UTF8_STRING 3364#if X_HAVE_UTF8_STRING
3378 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3365 *target++ = (Atom32) xa[XA_UTF8_STRING];
3379#endif 3366#endif
3367
3380 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3368 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3381 (8 * sizeof (target_list[0])), PropModeReplace, 3369 (8 * sizeof (target_list[0])), PropModeReplace,
3382 (unsigned char *)target_list, 3370 (unsigned char *)target_list,
3383 target - target_list); 3371 target - target_list);
3384 ev.property = rq.property; 3372 ev.property = rq.property;
3385 } 3373 }
3374#if TODO // TODO
3386 else if (rq.target == xa[XA_MULTIPLE]) 3375 else if (rq.target == xa[XA_MULTIPLE])
3387 { 3376 {
3388 /* TODO: Handle MULTIPLE */ 3377 /* TODO: Handle MULTIPLE */
3389 } 3378 }
3379#endif
3390 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3380 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3391 { 3381 {
3392 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3382 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3393 (8 * sizeof (Time)), PropModeReplace, 3383 (8 * sizeof (Time)), PropModeReplace,
3394 (unsigned char *)&selection_time, 1); 3384 (unsigned char *)&selection_time, 1);
3395 ev.property = rq.property; 3385 ev.property = rq.property;
3396 } 3386 }
3397 else if (rq.target == XA_STRING 3387 else if (rq.target == XA_STRING
3398 || rq.target == xa[XA_TEXT] 3388 || rq.target == xa[XA_TEXT]
3399 || rq.target == xa[XA_COMPOUND_TEXT] 3389 || rq.target == xa[XA_COMPOUND_TEXT]
3400 || rq.target == xa[XA_UTF8_STRING] 3390 || rq.target == xa[XA_UTF8_STRING]
3401 ) 3391 )
3402 { 3392 {
3403 short freect = 0; 3393 short freect = 0;
3404 int selectlen; 3394 int selectlen;
3405 char *cl; 3395 wchar_t *cl;
3406 3396
3407 target = rq.target; 3397 target = rq.target;
3408 3398
3409 if (target == XA_STRING) 3399 if (target == XA_STRING)
3410 // we actually don't do XA_STRING, but who cares, as i18n clients 3400 // we actually don't do XA_STRING, but who cares, as i18n clients
3411 // will ask for another format anyways. 3401 // will ask for another format anyways.
3412 style = XStringStyle; 3402 style = XStringStyle;
3413 else if (target == xa[XA_TEXT]) 3403 else if (target == xa[XA_TEXT])
3414 style = XTextStyle; 3404 style = XStdICCTextStyle;
3415 else if (target == xa[XA_COMPOUND_TEXT]) 3405 else if (target == xa[XA_COMPOUND_TEXT])
3416 style = XCompoundTextStyle; 3406 style = XCompoundTextStyle;
3417#if X_HAVE_UTF8_STRING 3407#if X_HAVE_UTF8_STRING
3418 else if (target == xa[XA_UTF8_STRING]) 3408 else if (target == xa[XA_UTF8_STRING])
3419 style = XUTF8StringStyle; 3409 style = XUTF8StringStyle;
… …
3424 style = XCompoundTextStyle; 3414 style = XCompoundTextStyle;
3425 } 3415 }
3426 3416
3427 if (selection.text) 3417 if (selection.text)
3428 { 3418 {
3429 cl = (char *)selection.text; 3419 cl = selection.text;
3430 selectlen = selection.len; 3420 selectlen = selection.len;
3431 } 3421 }
3432 else 3422 else
3433 { 3423 {
3434 cl = ""; 3424 cl = L"";
3435 selectlen = 0; 3425 selectlen = 0;
3436 } 3426 }
3437 3427
3428 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3429 // manually for XUTF8StringStyle.
3438 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3430 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3439 freect = 1; 3431 freect = 1;
3440 else 3432 else
3441 { 3433 {
3442 /* if we failed to convert then send it raw */ 3434 /* if we failed to convert then send it raw */
3443 ct.value = (unsigned char *)cl; 3435 ct.value = (unsigned char *)cl;
… …
3450 ev.property = rq.property; 3442 ev.property = rq.property;
3451 3443
3452 if (freect) 3444 if (freect)
3453 XFree (ct.value); 3445 XFree (ct.value);
3454 } 3446 }
3447
3455 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3448 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3456} 3449}
3457 3450
3458/* ------------------------------------------------------------------------- * 3451/* ------------------------------------------------------------------------- *
3459 * MOUSE ROUTINES * 3452 * MOUSE ROUTINES *
… …
3483 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3476 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace;
3484} 3477}
3485 3478
3486#endif 3479#endif
3487/* ------------------------------------------------------------------------- */ 3480/* ------------------------------------------------------------------------- */
3488
3489/* ------------------------------------------------------------------------- *
3490 * DEBUG ROUTINES *
3491 * ------------------------------------------------------------------------- */
3492#if 0
3493void
3494rxvt_debug_colors (void)
3495{
3496 int color;
3497 const char *name[] =
3498 {
3499 "fg", "bg",
3500 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3501 };
3502
3503 fprintf (stderr, "Color ( ");
3504 if (rstyle & RS_RVid)
3505 fprintf (stderr, "rvid ");
3506 if (rstyle & RS_Bold)
3507 fprintf (stderr, "bold ");
3508 if (rstyle & RS_Blink)
3509 fprintf (stderr, "blink ");
3510 if (rstyle & RS_Uline)
3511 fprintf (stderr, "uline ");
3512 fprintf (stderr, "): ");
3513
3514 color = GET_FGCOLOR (rstyle);
3515#ifndef NO_BRIGHTCOLOR
3516 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3517 {
3518 color -= (minBrightCOLOR - minCOLOR);
3519 fprintf (stderr, "bright ");
3520 }
3521#endif
3522 fprintf (stderr, "%s on ", name[color]);
3523
3524 color = GET_BGCOLOR (rstyle);
3525#ifndef NO_BRIGHTCOLOR
3526 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3527 {
3528 color -= (minBrightCOLOR - minCOLOR);
3529 fprintf (stderr, "bright ");
3530 }
3531#endif
3532 fprintf (stderr, "%s\n", name[color]);
3533}
3534#endif

Diff Legend

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