ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.43 by pcg, Wed Mar 3 02:59:53 2004 UTC vs.
Revision 1.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)
894 { 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
895 do 909 do
896 { 910 {
897 stp[screen.cur.col] = c; 911 stp[screen.cur.col] = c;
898 srp[screen.cur.col] = rend; 912 srp[screen.cur.col] = rend;
899 913
… …
910 c = NOCHAR; 924 c = NOCHAR;
911 } 925 }
912 while (--width > 0); 926 while (--width > 0);
913 927
914 // pad with spaces when overwriting wide character with smaller one 928 // pad with spaces when overwriting wide character with smaller one
915 for (int c = screen.cur.col; stp[c] == NOCHAR && c < last_col; c++) 929 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
916 { 930 {
917 stp[c] = ' '; 931 stp[c] = ' ';
918 srp[c] = rend; 932 srp[c] = rend;
919 } 933 }
920 } 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 }
921 else 957 else
922 (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 }
923 } 973 }
924 974
925 if (screen.tlen[row] != -1) /* XXX: think about this */ 975 if (screen.tlen[row] != -1) /* XXX: think about this */
926 MAX_IT (screen.tlen[row], screen.cur.col); 976 MAX_IT (screen.tlen[row], screen.cur.col);
927 977
… …
947 */ 997 */
948void 998void
949rxvt_term::scr_backspace () 999rxvt_term::scr_backspace ()
950{ 1000{
951 want_refresh = 1; 1001 want_refresh = 1;
1002
952 if (screen.cur.col == 0) 1003 if (screen.cur.col == 0)
953 { 1004 {
954 if (screen.cur.row > 0) 1005 if (screen.cur.row > 0)
955 { 1006 {
956#ifdef TERMCAP_HAS_BW 1007#ifdef TERMCAP_HAS_BW
… …
961 1012
962 } 1013 }
963 } 1014 }
964 else if ((screen.flags & Screen_WrapNext) == 0) 1015 else if ((screen.flags & Screen_WrapNext) == 0)
965 scr_gotorc (0, -1, RELATIVE); 1016 scr_gotorc (0, -1, RELATIVE);
1017
966 screen.flags &= ~Screen_WrapNext; 1018 screen.flags &= ~Screen_WrapNext;
967} 1019}
968 1020
969/* ------------------------------------------------------------------------- */ 1021/* ------------------------------------------------------------------------- */
970/* 1022/*
… …
973 * XTERM_SEQ: CTRL-I 1025 * XTERM_SEQ: CTRL-I
974 */ 1026 */
975void 1027void
976rxvt_term::scr_tab (int count) 1028rxvt_term::scr_tab (int count)
977{ 1029{
978 int i, x; 1030 int i, x;
979 1031
980 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); 1032 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
981 want_refresh = 1; 1033 want_refresh = 1;
982 i = x = screen.cur.col; 1034 i = x = screen.cur.col;
1035
983 if (count == 0) 1036 if (count == 0)
984 return; 1037 return;
985 else if (count > 0) 1038 else if (count > 0)
986 { 1039 {
987 for (; ++i < TermWin.ncol; ) 1040 for (; ++i < TermWin.ncol; )
… …
989 { 1042 {
990 x = i; 1043 x = i;
991 if (!--count) 1044 if (!--count)
992 break; 1045 break;
993 } 1046 }
1047
994 if (count) 1048 if (count)
995 x = TermWin.ncol - 1; 1049 x = TermWin.ncol - 1;
996 } 1050 }
997 else /* if (count < 0) */ 1051 else /* if (count < 0) */
998 { 1052 {
… …
1001 { 1055 {
1002 x = i; 1056 x = i;
1003 if (!++count) 1057 if (!++count)
1004 break; 1058 break;
1005 } 1059 }
1060
1006 if (count) 1061 if (count)
1007 x = 0; 1062 x = 0;
1008 } 1063 }
1064
1009 if (x != screen.cur.col) 1065 if (x != screen.cur.col)
1010 scr_gotorc (0, x, R_RELATIVE); 1066 scr_gotorc (0, x, R_RELATIVE);
1011} 1067}
1012 1068
1013/* ------------------------------------------------------------------------- */ 1069/* ------------------------------------------------------------------------- */
… …
1070 want_refresh = 1; 1126 want_refresh = 1;
1071 ZERO_SCROLLBACK (); 1127 ZERO_SCROLLBACK ();
1072 1128
1073 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); 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));
1074 1130
1075 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1131 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1076 : col);
1077 MAX_IT (screen.cur.col, 0); 1132 MAX_IT (screen.cur.col, 0);
1078 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1133 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1079 1134
1080 screen.flags &= ~Screen_WrapNext; 1135 screen.flags &= ~Screen_WrapNext;
1081 if (relative & R_RELATIVE) 1136 if (relative & R_RELATIVE)
… …
1120 * direction should be UP or DN 1175 * direction should be UP or DN
1121 */ 1176 */
1122void 1177void
1123rxvt_term::scr_index (enum page_dirn direction) 1178rxvt_term::scr_index (enum page_dirn direction)
1124{ 1179{
1125 int dirn; 1180 int dirn;
1126 1181
1127 want_refresh = 1; 1182 want_refresh = 1;
1128 dirn = ((direction == UP) ? 1 : -1); 1183 dirn = ((direction == UP) ? 1 : -1);
1129 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); 1184 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1130 1185
… …
1190 default: 1245 default:
1191 return; 1246 return;
1192 } 1247 }
1193 1248
1194 if (screen.text[row]) 1249 if (screen.text[row])
1195 scr_blank_line (& (screen.text[row][col]), 1250 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1196 & (screen.rend[row][col]), num, rstyle);
1197 else 1251 else
1198 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1252 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1199} 1253}
1200 1254
1201/* ------------------------------------------------------------------------- */ 1255/* ------------------------------------------------------------------------- */
… …
1206 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1260 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1207 */ 1261 */
1208void 1262void
1209rxvt_term::scr_erase_screen (int mode) 1263rxvt_term::scr_erase_screen (int mode)
1210{ 1264{
1211 int num; 1265 int num;
1212 int32_t row, row_offset; 1266 int32_t row, row_offset;
1213 rend_t ren; 1267 rend_t ren;
1214 XGCValues gcvalue; 1268 XGCValues gcvalue;
1215 1269
1216 want_refresh = 1; 1270 want_refresh = 1;
1217 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));
1218 ZERO_SCROLLBACK (); 1272 ZERO_SCROLLBACK ();
1219 row_offset = (int32_t)TermWin.saveLines; 1273 row_offset = (int32_t)TermWin.saveLines;
… …
1238 num = TermWin.nrow; 1292 num = TermWin.nrow;
1239 break; 1293 break;
1240 default: 1294 default:
1241 return; 1295 return;
1242 } 1296 }
1243 refresh_type |= REFRESH_BOUNDS; 1297
1244 if (selection.op && current_screen == selection.screen 1298 if (selection.op && current_screen == selection.screen
1245 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1299 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1246 || (selection.end.row >= row 1300 || (selection.end.row >= row
1247 && selection.end.row <= row + num))) 1301 && selection.end.row <= row + num)))
1248 CLEAR_SELECTION (); 1302 CLEAR_SELECTION ();
1303
1249 if (row >= TermWin.nrow) /* Out Of Bounds */ 1304 if (row >= TermWin.nrow) /* Out Of Bounds */
1250 return; 1305 return;
1306
1251 MIN_IT (num, (TermWin.nrow - row)); 1307 MIN_IT (num, (TermWin.nrow - row));
1308
1252 if (rstyle & (RS_RVid | RS_Uline)) 1309 if (rstyle & (RS_RVid | RS_Uline))
1253 ren = (rend_t) ~RS_None; 1310 ren = (rend_t) ~RS_None;
1254 else if (GET_BASEBG (rstyle) == Color_bg) 1311 else if (GET_BASEBG (rstyle) == Color_bg)
1255 { 1312 {
1256 ren = DEFAULT_RSTYLE; 1313 ren = DEFAULT_RSTYLE;
… …
1263 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1320 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1264 ERASE_ROWS (row, num); 1321 ERASE_ROWS (row, num);
1265 gcvalue.foreground = PixColors[Color_fg]; 1322 gcvalue.foreground = PixColors[Color_fg];
1266 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1323 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1267 } 1324 }
1325
1268 for (; num--; row++) 1326 for (; num--; row++)
1269 { 1327 {
1270 scr_blank_screen_mem (screen.text, screen.rend, 1328 scr_blank_screen_mem (screen.text, screen.rend,
1271 (unsigned int) (row + row_offset), rstyle); 1329 (unsigned int) (row + row_offset), rstyle);
1272 screen.tlen[row + row_offset] = 0; 1330 screen.tlen[row + row_offset] = 0;
… …
1306 * Insert/Delete <count> lines 1364 * Insert/Delete <count> lines
1307 */ 1365 */
1308void 1366void
1309rxvt_term::scr_insdel_lines (int count, int insdel) 1367rxvt_term::scr_insdel_lines (int count, int insdel)
1310{ 1368{
1311 int end; 1369 int end;
1312 1370
1313 ZERO_SCROLLBACK (); 1371 ZERO_SCROLLBACK ();
1314 1372
1315 selection_check (1); 1373 selection_check (1);
1316 1374
… …
1335 * Insert/Delete <count> characters from the current position 1393 * Insert/Delete <count> characters from the current position
1336 */ 1394 */
1337void 1395void
1338rxvt_term::scr_insdel_chars (int count, int insdel) 1396rxvt_term::scr_insdel_chars (int count, int insdel)
1339{ 1397{
1340 int col, row; 1398 int col, row;
1341 rend_t tr; 1399 rend_t tr;
1342 text_t *stp; 1400 text_t *stp;
1343 rend_t *srp; 1401 rend_t *srp;
1344 int16_t *slp; 1402 int16_t *slp;
1345 1403
1346 want_refresh = 1; 1404 want_refresh = 1;
1347 ZERO_SCROLLBACK (); 1405 ZERO_SCROLLBACK ();
1348 1406
1349 if (count <= 0) 1407 if (count <= 0)
… …
1356 screen.flags &= ~Screen_WrapNext; 1414 screen.flags &= ~Screen_WrapNext;
1357 1415
1358 stp = screen.text[row]; 1416 stp = screen.text[row];
1359 srp = screen.rend[row]; 1417 srp = screen.rend[row];
1360 slp = & (screen.tlen[row]); 1418 slp = & (screen.tlen[row]);
1419
1361 switch (insdel) 1420 switch (insdel)
1362 { 1421 {
1363 case INSERT: 1422 case INSERT:
1364 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1423 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1365 col--) 1424 col--)
1366 { 1425 {
1367 stp[col] = stp[col - count]; 1426 stp[col] = stp[col - count];
1368 srp[col] = srp[col - count]; 1427 srp[col] = srp[col - count];
1369 } 1428 }
1429
1370 if (*slp != -1) 1430 if (*slp != -1)
1371 { 1431 {
1372 *slp += count; 1432 *slp += count;
1373 MIN_IT (*slp, TermWin.ncol); 1433 MIN_IT (*slp, TermWin.ncol);
1374 } 1434 }
1435
1375 if (selection.op && current_screen == selection.screen 1436 if (selection.op && current_screen == selection.screen
1376 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1437 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1377 { 1438 {
1378 if (selection.end.row != screen.cur.row 1439 if (selection.end.row != screen.cur.row
1379 || (selection.end.col + count >= TermWin.ncol)) 1440 || (selection.end.col + count >= TermWin.ncol))
… …
1383 selection.beg.col += count; 1444 selection.beg.col += count;
1384 selection.mark.col += count; /* XXX: yes? */ 1445 selection.mark.col += count; /* XXX: yes? */
1385 selection.end.col += count; 1446 selection.end.col += count;
1386 } 1447 }
1387 } 1448 }
1449
1388 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1450 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1389 (unsigned int)count, rstyle); 1451 (unsigned int)count, rstyle);
1390 break; 1452 break;
1453
1391 case ERASE: 1454 case ERASE:
1392 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1455 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1393 selection_check (1); 1456 selection_check (1);
1394 screen.cur.col -= count; 1457 screen.cur.col -= count;
1395 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1458 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1396 (unsigned int)count, rstyle); 1459 (unsigned int)count, rstyle);
1397 break; 1460 break;
1461
1398 case DELETE: 1462 case DELETE:
1399 tr = srp[TermWin.ncol - 1]
1400 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1463 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1464
1401 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1465 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1402 { 1466 {
1403 stp[col] = stp[col + count]; 1467 stp[col] = stp[col + count];
1404 srp[col] = srp[col + count]; 1468 srp[col] = srp[col + count];
1405 } 1469 }
1470
1406 scr_blank_line (& (stp[TermWin.ncol - count]), 1471 scr_blank_line (& (stp[TermWin.ncol - count]),
1407 & (srp[TermWin.ncol - count]), 1472 & (srp[TermWin.ncol - count]),
1408 (unsigned int)count, tr); 1473 (unsigned int)count, tr);
1474
1409 if (*slp == -1) /* break line continuation */ 1475 if (*slp == -1) /* break line continuation */
1410 *slp = TermWin.ncol; 1476 *slp = TermWin.ncol;
1477
1411 *slp -= count; 1478 *slp -= count;
1412 MAX_IT (*slp, 0); 1479 MAX_IT (*slp, 0);
1480
1413 if (selection.op && current_screen == selection.screen 1481 if (selection.op && current_screen == selection.screen
1414 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1482 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1415 { 1483 {
1416 if (selection.end.row != screen.cur.row 1484 if (selection.end.row != screen.cur.row
1417 || (screen.cur.col >= selection.beg.col - count) 1485 || (screen.cur.col >= selection.beg.col - count)
… …
1423 selection.beg.col -= count; 1491 selection.beg.col -= count;
1424 selection.mark.col -= count; /* XXX: yes? */ 1492 selection.mark.col -= count; /* XXX: yes? */
1425 selection.end.col -= count; 1493 selection.end.col -= count;
1426 } 1494 }
1427 } 1495 }
1496
1428 break; 1497 break;
1429 } 1498 }
1430} 1499}
1431 1500
1432/* ------------------------------------------------------------------------- */ 1501/* ------------------------------------------------------------------------- */
… …
1437void 1506void
1438rxvt_term::scr_scroll_region (int top, int bot) 1507rxvt_term::scr_scroll_region (int top, int bot)
1439{ 1508{
1440 MAX_IT (top, 0); 1509 MAX_IT (top, 0);
1441 MIN_IT (bot, (int)TermWin.nrow - 1); 1510 MIN_IT (bot, (int)TermWin.nrow - 1);
1511
1442 if (top > bot) 1512 if (top > bot)
1443 return; 1513 return;
1514
1444 screen.tscroll = top; 1515 screen.tscroll = top;
1445 screen.bscroll = bot; 1516 screen.bscroll = bot;
1446 scr_gotorc (0, 0, 0); 1517 scr_gotorc (0, 0, 0);
1447} 1518}
1448 1519
… …
1454 */ 1525 */
1455void 1526void
1456rxvt_term::scr_cursor_visible (int mode) 1527rxvt_term::scr_cursor_visible (int mode)
1457{ 1528{
1458 want_refresh = 1; 1529 want_refresh = 1;
1530
1459 if (mode) 1531 if (mode)
1460 screen.flags |= Screen_VisibleCursor; 1532 screen.flags |= Screen_VisibleCursor;
1461 else 1533 else
1462 screen.flags &= ~Screen_VisibleCursor; 1534 screen.flags &= ~Screen_VisibleCursor;
1463} 1535}
… …
1677 row_col_t rc[RC_COUNT]; 1749 row_col_t rc[RC_COUNT];
1678 1750
1679 if (drawn_text == NULL) /* sanity check */ 1751 if (drawn_text == NULL) /* sanity check */
1680 return; 1752 return;
1681 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
1682#ifdef DEBUG_STRICT 1762#ifdef DEBUG_STRICT
1683 x = max (x, (int)TermWin.int_bwidth); 1763 x = max (x, 0);
1684 x = min (x, (int)TermWin.width); 1764 x = min (x, (int)TermWin.width);
1685 y = max (y, (int)TermWin.int_bwidth); 1765 y = max (y, 0);
1686 y = min (y, (int)TermWin.height); 1766 y = min (y, (int)TermWin.height);
1687#endif 1767#endif
1688 1768
1689 /* round down */ 1769 /* round down */
1690 rc[PART_BEG].col = Pixel2Col (x); 1770 rc[PART_BEG].col = Pixel2Col (x);
… …
1701 } 1781 }
1702 1782
1703 D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); 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));
1704 1784
1705 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++)
1706 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);
1707 (rc[PART_END].col - rc[PART_BEG].col + 1));
1708 1787
1709 if (refresh) 1788 if (refresh)
1710 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1789 scr_refresh (SLOW_REFRESH);
1711} 1790}
1712 1791
1713/* ------------------------------------------------------------------------- */ 1792/* ------------------------------------------------------------------------- */
1714/* 1793/*
1715 * Refresh the entire screen 1794 * Refresh the entire screen
… …
1750 * direction should be UP or DN 1829 * direction should be UP or DN
1751 */ 1830 */
1752int 1831int
1753rxvt_term::scr_page (enum page_dirn direction, int nlines) 1832rxvt_term::scr_page (enum page_dirn direction, int nlines)
1754{ 1833{
1755 int n; 1834 int n;
1756 uint16_t oldviewstart; 1835 uint16_t oldviewstart;
1757 1836
1758 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));
1759#ifdef DEBUG_STRICT 1838#ifdef DEBUG_STRICT
1760 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1839 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1761#endif 1840#endif
… …
1779 if (TermWin.view_start != oldviewstart) 1858 if (TermWin.view_start != oldviewstart)
1780 { 1859 {
1781 want_refresh = 1; 1860 want_refresh = 1;
1782 num_scr -= (TermWin.view_start - oldviewstart); 1861 num_scr -= (TermWin.view_start - oldviewstart);
1783 } 1862 }
1863
1784 return (int) (TermWin.view_start - oldviewstart); 1864 return (int) (TermWin.view_start - oldviewstart);
1785} 1865}
1786 1866
1787/* ------------------------------------------------------------------------- */ 1867/* ------------------------------------------------------------------------- */
1788void 1868void
… …
1856 ((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)
1857 1937
1858void 1938void
1859rxvt_term::scr_refresh (unsigned char refresh_type) 1939rxvt_term::scr_refresh (unsigned char refresh_type)
1860{ 1940{
1861 unsigned char clearfirst, /* first character writes before cell */
1862 clearlast, /* last character writes beyond cell */
1863 must_clear, /* use draw_string not draw_image_string */ 1941 unsigned char must_clear, /* use draw_string not draw_image_string */
1864 rvid, /* reverse video this position */ 1942 rvid, /* reverse video this position */
1865 showcursor; /* show the cursor */ 1943 showcursor; /* show the cursor */
1866 int16_t col, row, /* column/row we're processing */ 1944 int16_t col, row, /* column/row we're processing */
1867 ocrow; /* old cursor row */ 1945 ocrow; /* old cursor row */
1868 int i, /* tmp */ 1946 int i, /* tmp */
… …
1877 return; 1955 return;
1878 1956
1879 /* 1957 /*
1880 * A: set up vars 1958 * A: set up vars
1881 */ 1959 */
1882 clearfirst = clearlast = must_clear = 0; 1960 must_clear = 0;
1883 1961
1884 refresh_count = 0; 1962 refresh_count = 0;
1885 1963
1886 row_offset = TermWin.saveLines - TermWin.view_start; 1964 row_offset = TermWin.saveLines - TermWin.view_start;
1887
1888 if ((refresh_type & REFRESH_BOUNDS))
1889 {
1890 clearfirst = clearlast = 1;
1891 refresh_type &= ~REFRESH_BOUNDS;
1892 }
1893 1965
1894#ifdef XPM_BACKGROUND 1966#ifdef XPM_BACKGROUND
1895 must_clear |= (bgPixmap.pixmap != None); 1967 must_clear |= (bgPixmap.pixmap != None);
1896#endif 1968#endif
1897#ifdef TRANSPARENT 1969#ifdef TRANSPARENT
… …
1906 1978
1907 /* 1979 /*
1908 * C: set the cursor character (s) 1980 * C: set the cursor character (s)
1909 */ 1981 */
1910 { 1982 {
1911 unsigned char setoldcursor; 1983 unsigned char setoldcursor;
1912 rend_t ccol1, /* Cursor colour */ 1984 rend_t ccol1, /* Cursor colour */
1913 ccol2; /* Cursor colour2 */ 1985 ccol2; /* Cursor colour2 */
1914 1986
1915 showcursor = (screen.flags & Screen_VisibleCursor); 1987 showcursor = (screen.flags & Screen_VisibleCursor);
1916#ifdef CURSOR_BLINK 1988#ifdef CURSOR_BLINK
1917 if (hidden_cursor) 1989 if (hidden_cursor)
1918 showcursor = 0; 1990 showcursor = 0;
1919#endif 1991#endif
1920 1992
1921 if (showcursor) 1993 if (showcursor)
1922 { 1994 {
1923 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1995 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]);
1924 [screen.cur.col]);
1925 1996
1926 if (showcursor && TermWin.focus) 1997 if (showcursor && TermWin.focus)
1927 { 1998 {
1928 *srp ^= RS_RVid; 1999 *srp ^= RS_RVid;
1929#ifndef NO_CURSORCOLOR 2000#ifndef NO_CURSORCOLOR
… …
1957 if (screen.cur.row + TermWin.view_start != ocrow 2028 if (screen.cur.row + TermWin.view_start != ocrow
1958 || screen.cur.col != oldcursor.col) 2029 || screen.cur.col != oldcursor.col)
1959 { 2030 {
1960 if (ocrow < TermWin.nrow 2031 if (ocrow < TermWin.nrow
1961 && oldcursor.col < TermWin.ncol) 2032 && oldcursor.col < TermWin.ncol)
1962 {
1963 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2033 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
1964 } 2034
1965 if (TermWin.focus || !showcursor) 2035 if (TermWin.focus || !showcursor)
1966 oldcursor.row = -1; 2036 oldcursor.row = -1;
1967 else 2037 else
1968 setoldcursor = 1; 2038 setoldcursor = 1;
1969 } 2039 }
1970 } 2040 }
1971 else if (!TermWin.focus) 2041 else if (!TermWin.focus)
1972 setoldcursor = 1; 2042 setoldcursor = 1;
2043
1973 if (setoldcursor) 2044 if (setoldcursor)
1974 { 2045 {
1975 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2046 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
1976 oldcursor.row = -1; 2047 oldcursor.row = -1;
1977 else 2048 else
… …
1986 /* 2057 /*
1987 * D: CopyArea pass - very useful for slower links 2058 * D: CopyArea pass - very useful for slower links
1988 * This has been deliberately kept simple. 2059 * This has been deliberately kept simple.
1989 */ 2060 */
1990 i = num_scr; 2061 i = num_scr;
2062 if (!display->is_local
1991 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2063 && refresh_type == FAST_REFRESH && num_scr_allow && i
1992 && abs (i) < TermWin.nrow && !must_clear) 2064 && abs (i) < TermWin.nrow && !must_clear)
1993 { 2065 {
1994 int16_t nits; 2066 int16_t nits;
1995 int j; 2067 int j;
1996 rend_t *drp2; 2068 rend_t *drp2;
1997 text_t *dtp2; 2069 text_t *dtp2;
1998 int len, wlen; 2070 int len, wlen;
1999 2071
2000 j = TermWin.nrow; 2072 j = TermWin.nrow;
2001 wlen = len = -1; 2073 wlen = len = -1;
2002 row = i > 0 ? 0 : j - 1; 2074 row = i > 0 ? 0 : j - 1;
2003 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2075 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
… …
2138 rend = GET_ATTR (rend); 2210 rend = GET_ATTR (rend);
2139 2211
2140 rvid = !!(rend & RS_RVid); 2212 rvid = !!(rend & RS_RVid);
2141 2213
2142#ifndef NO_BOLD_UNDERLINE_REVERSE 2214#ifndef NO_BOLD_UNDERLINE_REVERSE
2143 if (rend & RS_Bold && fore == Color_fg) 2215 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold))
2144 { 2216 {
2145 if (ISSET_PIXCOLOR (Color_BD)) 2217 if (ISSET_PIXCOLOR (Color_BD))
2146 fore = Color_BD; 2218 fore = Color_BD;
2147 else 2219 else
2148 rvid = !rvid; 2220 rvid = !rvid;
2149 } 2221 }
2150 2222
2151 if (rend & RS_Uline) 2223 if (rend & RS_Uline)
2152 {
2153 if (ISSET_PIXCOLOR (Color_UL)) 2224 if (ISSET_PIXCOLOR (Color_UL))
2154 fore = Color_UL; 2225 fore = Color_UL;
2155 }
2156#endif 2226#endif
2157 2227
2158 if (rvid) 2228 if (rvid)
2159 { 2229 {
2160 SWAP_IT (fore, back, int); 2230 SWAP_IT (fore, back, int);
… …
2168 back = Color_RV; 2238 back = Color_RV;
2169#endif 2239#endif
2170 } 2240 }
2171 2241
2172#ifdef TEXT_BLINK 2242#ifdef TEXT_BLINK
2173 if (rend & RS_Blink && back == Color_bg) 2243 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2174 { 2244 {
2175 if (!text_blink_ev.active) 2245 if (!text_blink_ev.active)
2176 { 2246 {
2177 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2247 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2178 hidden_text = 0; 2248 hidden_text = 0;
… …
2208 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2278 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2209 } 2279 }
2210 else 2280 else
2211 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2281 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2212 2282
2213 if ((rend & RS_Uline) && (font->descent > 1)) 2283 if (rend & RS_Uline && font->descent > 1 && fore != back)
2214 XDrawLine (display->display, drawBuffer, TermWin.gc, 2284 XDrawLine (display->display, drawBuffer, TermWin.gc,
2215 xpixel, ypixel + font->ascent + 1, 2285 xpixel, ypixel + font->ascent + 1,
2216 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2286 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2217 } /* for (col....) */ 2287 } /* for (col....) */
2218 } /* for (row....) */ 2288 } /* for (row....) */
… …
2253 /* 2323 /*
2254 * H: cleanup selection 2324 * H: cleanup selection
2255 */ 2325 */
2256 scr_reverse_selection (); 2326 scr_reverse_selection ();
2257 2327
2258 /*
2259 * I: other general cleanup
2260 */
2261 if (clearfirst && TermWin.int_bwidth)
2262 /*
2263 * clear the whole screen height, note that width == 0 is treated
2264 * specially by XClearArea
2265 */
2266 XClearArea (display->display, TermWin.vt, 0, 0,
2267 (unsigned int)TermWin.int_bwidth,
2268 (unsigned int)TermWin_TotalHeight (), False);
2269
2270 if (clearlast && TermWin.int_bwidth)
2271 /*
2272 * clear the whole screen height, note that width == 0 is treated
2273 * specially by XClearArea
2274 */
2275 XClearArea (display->display, TermWin.vt,
2276 TermWin.width + TermWin.int_bwidth, 0,
2277 (unsigned int)TermWin.int_bwidth,
2278 (unsigned int)TermWin_TotalHeight (), False);
2279
2280 if (refresh_type & SMOOTH_REFRESH) 2328 if (refresh_type & SMOOTH_REFRESH)
2281 XSync (display->display, False); 2329 XFlush (display->display);
2282 2330
2283 num_scr = 0; 2331 num_scr = 0;
2284 num_scr_allow = 1; 2332 num_scr_allow = 1;
2285 want_refresh = 0; /* screen is current */ 2333 want_refresh = 0; /* screen is current */
2286} 2334}
… …
2457 { 2505 {
2458 n = min (len - i, PROP_SIZE); 2506 n = min (len - i, PROP_SIZE);
2459 MEMCPY (ds, data + i, n); 2507 MEMCPY (ds, data + i, n);
2460 2508
2461 for (j = 0; j < n; j++) 2509 for (j = 0; j < n; j++)
2462 if (ds[j] == '\n') 2510 if (ds[j] == C0_LF)
2463 ds[j] = '\r'; 2511 ds[j] = C0_CR;
2464 2512
2465 tt_write (ds, (int)n); 2513 tt_write (ds, (int)n);
2466 } 2514 }
2467 2515
2468 free (ds); 2516 free (ds);
… …
2519 if (ct.encoding == 0) 2567 if (ct.encoding == 0)
2520 { 2568 {
2521 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2569 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
2522 break; 2570 break;
2523 } 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 }
2524 2580
2525 if (ct.value == NULL) 2581 if (ct.value == NULL)
2526 { 2582 {
2527 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!")); 2583 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2528 continue; 2584 continue;
2529 } 2585 }
2530 2586
2531 if (ct.nitems == 0) 2587 if (ct.nitems == 0)
2532 { 2588 {
2533 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2589 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2590
2534 if (selection_wait == Sel_normal && nread == 0 2591 if (selection_wait == Sel_normal && nread == 0
2535 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2592 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2536 { 2593 {
2537 /* 2594 /*
2538 * pass through again trying CUT_BUFFER0 if we've come from 2595 * pass through again trying CUT_BUFFER0 if we've come from
… …
2548 2605
2549 nread += ct.nitems; 2606 nread += ct.nitems;
2550 2607
2551 char **cl; 2608 char **cl;
2552 int cr; 2609 int cr;
2553 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2610 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2554 &cr) >= 0 && cl)
2555 { 2611 {
2556 for (int i = 0; i < cr; i++) 2612 for (int i = 0; i < cr; i++)
2557 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2613 paste ((unsigned char *)cl[i], STRLEN (cl[i]));
2558 2614
2559 XFreeStringList (cl); 2615 XFreeStringList (cl);
… …
2580void 2636void
2581rxvt_term::incr_cb (time_watcher &w) 2637rxvt_term::incr_cb (time_watcher &w)
2582{ 2638{
2583 selection_wait = Sel_none; 2639 selection_wait = Sel_none;
2584 2640
2585 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2641 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2586} 2642}
2587 2643
2588/* 2644/*
2589 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2645 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2590 */ 2646 */
2591void 2647void
2592rxvt_term::selection_property (Window win, Atom prop) 2648rxvt_term::selection_property (Window win, Atom prop)
2593{ 2649{
2594 int reget_time = 0; 2650 if (prop == None || selection_wait != Sel_incr)
2595
2596 if (prop == None)
2597 return; 2651 return;
2598 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2599 if (selection_wait == Sel_normal)
2600 {
2601 int a, afmt;
2602 Atom atype;
2603 unsigned long bytes_after, nitems;
2604 unsigned char *s = NULL;
2605 2652
2606 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2607 xa[XA_INCR], &atype, &afmt, &nitems,
2608 &bytes_after, &s);
2609 if (s)
2610 XFree (s);
2611 if (a != Success)
2612 return;
2613#ifndef __CYGWIN32__
2614 if (atype == xa[XA_INCR])
2615 { /* start an INCR transfer */
2616 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2617 XDeleteProperty (display->display, win, prop);
2618 XFlush (display->display);
2619 reget_time = 1;
2620 selection_wait = Sel_incr;
2621 }
2622#endif
2623
2624 }
2625 else if (selection_wait == Sel_incr)
2626 {
2627 reget_time = 1;
2628 if (selection_paste (win, prop, True) == -1) 2653 if (selection_paste (win, prop, 1) > 0)
2629 {
2630 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2631 selection_wait = Sel_none;
2632 incr_ev.stop ();
2633 }
2634 }
2635 if (reget_time) /* received more data so reget time */
2636 incr_ev.start (NOW + 10); 2654 incr_ev.start (NOW + 10);
2655 else
2656 {
2657 selection_wait = Sel_none;
2658 incr_ev.stop ();
2659 }
2637} 2660}
2661
2638/* ------------------------------------------------------------------------- */ 2662/* ------------------------------------------------------------------------- */
2639/* 2663/*
2640 * Request the current selection: 2664 * Request the current selection:
2641 * Order: > internal selection if available 2665 * Order: > internal selection if available
2642 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2666 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2647 */ 2671 */
2648void 2672void
2649rxvt_term::selection_request (Time tm, int x, int y) 2673rxvt_term::selection_request (Time tm, int x, int y)
2650{ 2674{
2651 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
2652 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2677 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2653 return; /* outside window */ 2678 return; /* outside window */
2654 2679
2655 if (selection.text != NULL) 2680 if (selection.text)
2656 { /* internal selection */ 2681 { /* internal selection */
2657 D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); 2682 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2658 paste (selection.text, selection.len); 2683 char *str = rxvt_wcstombs (selection.text, selection.len);
2684 paste ((unsigned char *)str, strlen (str));
2685 free (str);
2659 return; 2686 return;
2660 } 2687 }
2661 else 2688 else
2662 { 2689 {
2663 int i; 2690 int i;
2664 2691
2665 selection_request_time = tm; 2692 selection_request_time = tm;
2666 selection_wait = Sel_normal; 2693 selection_wait = Sel_normal;
2694
2667 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2695 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2668 { 2696 {
2669#if X_HAVE_UTF8_STRING 2697#if X_HAVE_UTF8_STRING
2670 selection_type = Sel_UTF8String; 2698 selection_type = Sel_UTF8String;
2671 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2699 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2676 return; 2704 return;
2677#endif 2705#endif
2678 2706
2679 } 2707 }
2680 } 2708 }
2709
2681 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2710 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2682 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2711 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2683 selection_paste (display->root, XA_CUT_BUFFER0, False); 2712 selection_paste (display->root, XA_CUT_BUFFER0, False);
2684} 2713}
2685 2714
2686int 2715int
2687rxvt_term::selection_request_other (Atom target, int selnum) 2716rxvt_term::selection_request_other (Atom target, int selnum)
2688{ 2717{
2689 Atom sel; 2718 Atom sel;
2690#ifdef DEBUG_SELECT 2719#ifdef DEBUG_SELECT
2691 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2720 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2692#endif 2721#endif
2693 2722
2694 selection_type |= selnum; 2723 selection_type |= selnum;
2724
2695 if (selnum == Sel_Primary) 2725 if (selnum == Sel_Primary)
2696 sel = XA_PRIMARY; 2726 sel = XA_PRIMARY;
2697 else if (selnum == Sel_Secondary) 2727 else if (selnum == Sel_Secondary)
2698 sel = XA_SECONDARY; 2728 sel = XA_SECONDARY;
2699 else 2729 else
2700 sel = xa[XA_CLIPBOARD]; 2730 sel = xa[XA_CLIPBOARD];
2731
2701 if (XGetSelectionOwner (display->display, sel) != None) 2732 if (XGetSelectionOwner (display->display, sel) != None)
2702 { 2733 {
2703 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]));
2704 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2735 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2705 TermWin.vt, selection_request_time); 2736 TermWin.vt, selection_request_time);
2706 return 1; 2737 return 1;
2707 } 2738 }
2739
2708 return 0; 2740 return 0;
2709} 2741}
2710 2742
2711/* ------------------------------------------------------------------------- */ 2743/* ------------------------------------------------------------------------- */
2712/* 2744/*
… …
2721 want_refresh = 1; 2753 want_refresh = 1;
2722 free (selection.text); 2754 free (selection.text);
2723 selection.text = NULL; 2755 selection.text = NULL;
2724 selection.len = 0; 2756 selection.len = 0;
2725 CLEAR_SELECTION (); 2757 CLEAR_SELECTION ();
2758
2759 if (display->selection_owner == this)
2760 display->selection_owner = 0;
2726} 2761}
2727 2762
2728/* ------------------------------------------------------------------------- */ 2763/* ------------------------------------------------------------------------- */
2729/* 2764/*
2730 * Copy a selection into the cut buffer 2765 * Copy a selection into the cut buffer
… …
2732 */ 2767 */
2733void 2768void
2734rxvt_term::selection_make (Time tm) 2769rxvt_term::selection_make (Time tm)
2735{ 2770{
2736 int i, col, end_col, row, end_row; 2771 int i, col, end_col, row, end_row;
2737 unsigned char *new_selection_text; 2772 wchar_t *new_selection_text;
2738 char *str;
2739 text_t *t; 2773 text_t *t;
2740 2774
2741 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));
2742 switch (selection.op) 2776 switch (selection.op)
2743 { 2777 {
… …
2756 selection.op = SELECTION_DONE; 2790 selection.op = SELECTION_DONE;
2757 2791
2758 if (selection.clicks == 4) 2792 if (selection.clicks == 4)
2759 return; /* nothing selected, go away */ 2793 return; /* nothing selected, go away */
2760 2794
2761 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2795 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2762 str = (char *)rxvt_malloc ((i + 2) * MB_CUR_MAX + 1); 2796 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2763
2764 new_selection_text = (unsigned char *)str;
2765 2797
2766 col = selection.beg.col; 2798 col = selection.beg.col;
2767 MAX_IT (col, 0); 2799 MAX_IT (col, 0);
2768 row = selection.beg.row + TermWin.saveLines; 2800 row = selection.beg.row + TermWin.saveLines;
2769 end_row = selection.end.row + TermWin.saveLines; 2801 end_row = selection.end.row + TermWin.saveLines;
2770 struct mbstate mbs; 2802 int ofs = 0;
2803 int extra = 0;
2771 2804
2772 for (; row <= end_row; row++, col = 0) 2805 for (; row <= end_row; row++, col = 0)
2773 { 2806 {
2774 t = & (screen.text[row][col]); 2807 t = &(screen.text[row][col]);
2775 2808
2776 end_col = screen.tlen[row]; 2809 end_col = screen.tlen[row];
2777 2810
2778 if (end_col == -1) 2811 if (end_col == -1)
2779 end_col = TermWin.ncol; 2812 end_col = TermWin.ncol;
2780 2813
2781 if (row == end_row) 2814 if (row == end_row)
2782 MIN_IT (end_col, selection.end.col); 2815 MIN_IT (end_col, selection.end.col);
2783 2816
2784 for (; col < end_col; col++) 2817 for (; col < end_col; col++)
2818 {
2785 if (*t == NOCHAR) 2819 if (*t == NOCHAR)
2786 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
2787 else 2838 else
2788 { 2839 new_selection_text[ofs++] = *t++;
2789 int len = wcrtomb (str, *t++, mbs);
2790 if (len > 0)
2791 str += len;
2792 } 2840 }
2793 2841
2794 if (screen.tlen[row] != -1 && row != end_row) 2842 if (screen.tlen[row] != -1 && row != end_row)
2795 *str++ = '\n'; 2843 new_selection_text[ofs++] = C0_LF;
2796 } 2844 }
2797 2845
2798#ifndef NO_OLD_SELECTION
2799 if (selection_style == OLD_SELECT)
2800 if (end_col == TermWin.ncol)
2801 *str++ = '\n';
2802#endif
2803#ifndef NO_NEW_SELECTION
2804 if (selection_style != OLD_SELECT)
2805 if (end_col != selection.end.col) 2846 if (end_col != selection.end.col)
2806 *str++ = '\n'; 2847 new_selection_text[ofs++] = C0_LF;
2807#endif
2808 *str = '\0';
2809 2848
2810 i = str - (char *)new_selection_text; 2849 new_selection_text[ofs] = 0;
2850
2811 if (i == 0) 2851 if (ofs == 0)
2812 { 2852 {
2813 free (new_selection_text); 2853 free (new_selection_text);
2814 return; 2854 return;
2815 } 2855 }
2816 2856
2817 // due to MB_CUR_MAX, selection wastage is usually high, so realloc
2818 if (str - (char *)new_selection_text > 1024)
2819 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2820
2821 selection.len = i;
2822
2823 if (selection.text)
2824 free (selection.text); 2857 free (selection.text);
2825 2858
2826 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));
2827 2862
2828 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2863 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2829 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2864 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2830 display->set_selection_owner (this); 2865 display->set_selection_owner (this);
2831 else 2866 else
2832 rxvt_print_error ("can't get primary selection"); 2867 rxvt_warn ("can't get primary selection, ignoring.\n");
2833 2868
2834 { 2869#if 0
2835 XTextProperty ct; 2870 XTextProperty ct;
2836 char *cl = (char *)selection.text;
2837 2871
2838 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2872 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2839 { 2873 {
2840 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2841 PropModeReplace, ct.value, ct.nitems);
2842 XFree (ct.value);
2843 }
2844 else
2845 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2874 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2846 PropModeReplace, selection.text, (int)selection.len); 2875 PropModeReplace, ct.value, ct.nitems);
2876 XFree (ct.value);
2847 } 2877 }
2878#endif
2848 2879
2849 selection_time = tm; 2880 selection_time = tm;
2850 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); 2881 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2851} 2882}
2852 2883
… …
2881rxvt_term::selection_start_colrow (int col, int row) 2912rxvt_term::selection_start_colrow (int col, int row)
2882{ 2913{
2883 want_refresh = 1; 2914 want_refresh = 1;
2884 selection.mark.col = col; 2915 selection.mark.col = col;
2885 selection.mark.row = row - TermWin.view_start; 2916 selection.mark.row = row - TermWin.view_start;
2917
2886 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2918 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2887 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2919 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2888 MAX_IT (selection.mark.col, 0); 2920 MAX_IT (selection.mark.col, 0);
2889 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2921 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2890 2922
2923 while (selection.mark.col > 0
2924 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2925 --selection.mark.col;
2926
2891 if (selection.op) 2927 if (selection.op)
2892 { /* clear the old selection */ 2928 { /* clear the old selection */
2893 selection.beg.row = selection.end.row = selection.mark.row; 2929 selection.beg.row = selection.end.row = selection.mark.row;
2894 selection.beg.col = selection.end.col = selection.mark.col; 2930 selection.beg.col = selection.end.col = selection.mark.col;
2895 } 2931 }
2932
2896 selection.op = SELECTION_INIT; 2933 selection.op = SELECTION_INIT;
2897 selection.screen = current_screen; 2934 selection.screen = current_screen;
2898} 2935}
2899 2936
2900/* ------------------------------------------------------------------------- */ 2937/* ------------------------------------------------------------------------- */
… …
2902 * Word select: select text for 2 clicks 2939 * Word select: select text for 2 clicks
2903 * We now only find out the boundary in one direction 2940 * We now only find out the boundary in one direction
2904 */ 2941 */
2905 2942
2906/* 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 */
2907#define DELIMIT_TEXT(x) \ 2944#define DELIMIT_TEXT(x) \
2908 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 2945 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x)))
2909#define DELIMIT_REND(x) 1 2946#define DELIMIT_REND(x) 1
2910 2947
2911void 2948void
2912rxvt_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)
2913{ 2950{
2914 int col, row, dirnadd, tcol, trow, w1, w2; 2951 int col, row, dirnadd, tcol, trow, w1, w2;
2915 row_col_t bound; 2952 row_col_t bound;
2916 text_t *stp; 2953 text_t *stp;
2917 rend_t *srp; 2954 rend_t *srp;
2918 2955
2919 if (dirn == UP) 2956 if (dirn == UP)
2920 { 2957 {
2921 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 2958 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2922 bound.col = 0; 2959 bound.col = 0;
… …
2926 { 2963 {
2927 bound.row = TermWin.saveLines + TermWin.nrow; 2964 bound.row = TermWin.saveLines + TermWin.nrow;
2928 bound.col = TermWin.ncol - 1; 2965 bound.col = TermWin.ncol - 1;
2929 dirnadd = 1; 2966 dirnadd = 1;
2930 } 2967 }
2968
2931 row = mark->row + TermWin.saveLines; 2969 row = mark->row + TermWin.saveLines;
2932 col = mark->col; 2970 col = mark->col;
2933 MAX_IT (col, 0); 2971 MAX_IT (col, 0);
2934 /* find the edge of a word */ 2972 /* find the edge of a word */
2935 stp = & (screen.text[row][col]); 2973 stp = & (screen.text[row][col]);
2936 w1 = DELIMIT_TEXT (*stp); 2974 w1 = DELIMIT_TEXT (*stp);
2937 2975
2938 if (selection_style != NEW_SELECT)
2939 {
2940 if (w1 == 1)
2941 {
2942 stp += dirnadd;
2943 if (DELIMIT_TEXT (*stp) == 1)
2944 goto Old_Word_Selection_You_Die;
2945 col += dirnadd;
2946 }
2947 w1 = 0;
2948 }
2949 srp = (&screen.rend[row][col]); 2976 srp = (&screen.rend[row][col]);
2950 w2 = DELIMIT_REND (*srp); 2977 w2 = DELIMIT_REND (*srp);
2951 2978
2952 for (;;) 2979 for (;;)
2953 { 2980 {
2954 for (; col != bound.col; col += dirnadd) 2981 for (; col != bound.col; col += dirnadd)
2955 { 2982 {
2956 stp += dirnadd; 2983 stp += dirnadd;
2984 srp += dirnadd;
2985
2986 if (*stp == NOCHAR)
2987 continue;
2988
2957 if (DELIMIT_TEXT (*stp) != w1) 2989 if (DELIMIT_TEXT (*stp) != w1)
2958 break; 2990 break;
2959 srp += dirnadd;
2960 if (DELIMIT_REND (*srp) != w2) 2991 if (DELIMIT_REND (*srp) != w2)
2961 break; 2992 break;
2962 } 2993 }
2994
2963 if ((col == bound.col) && (row != bound.row)) 2995 if ((col == bound.col) && (row != bound.row))
2964 { 2996 {
2965 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 2997 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2966 { 2998 {
2967 trow = row + dirnadd; 2999 trow = row + dirnadd;
2968 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3000 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3001
2969 if (screen.text[trow] == NULL) 3002 if (screen.text[trow] == NULL)
2970 break; 3003 break;
3004
2971 stp = & (screen.text[trow][tcol]); 3005 stp = & (screen.text[trow][tcol]);
2972 srp = & (screen.rend[trow][tcol]); 3006 srp = & (screen.rend[trow][tcol]);
3007
2973 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3008 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2974 break; 3009 break;
3010
2975 row = trow; 3011 row = trow;
2976 col = tcol; 3012 col = tcol;
2977 continue; 3013 continue;
2978 } 3014 }
2979 } 3015 }
2980 break; 3016 break;
2981 } 3017 }
3018
2982Old_Word_Selection_You_Die: 3019Old_Word_Selection_You_Die:
2983 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); 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));
2984 3021
2985 if (dirn == DN) 3022 if (dirn == DN)
2986 col++; /* put us on one past the end */ 3023 col++; /* put us on one past the end */
… …
3008 MAX_IT (row, 0); 3045 MAX_IT (row, 0);
3009 MIN_IT (row, (int)TermWin.nrow - 1); 3046 MIN_IT (row, (int)TermWin.nrow - 1);
3010 MAX_IT (col, 0); 3047 MAX_IT (col, 0);
3011 MIN_IT (col, (int)TermWin.ncol); 3048 MIN_IT (col, (int)TermWin.ncol);
3012 3049
3013#ifndef NO_NEW_SELECTION
3014 /* 3050 /*
3015 * 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
3016 * 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
3017 * 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
3018 * be _past_ a character for it to be selected. 3054 * be _past_ a character for it to be selected.
3019 */ 3055 */
3020 if (selection_style != OLD_SELECT)
3021 {
3022 if (((selection.clicks % 3) == 1) && !flag 3056 if (((selection.clicks % 3) == 1) && !flag
3023 && (col == selection.mark.col 3057 && (col == selection.mark.col
3024 && (row == selection.mark.row + TermWin.view_start))) 3058 && (row == selection.mark.row + TermWin.view_start)))
3025 { 3059 {
3026 /* select nothing */ 3060 /* select nothing */
3027 selection.beg.row = selection.end.row = 0; 3061 selection.beg.row = selection.end.row = 0;
3028 selection.beg.col = selection.end.col = 0; 3062 selection.beg.col = selection.end.col = 0;
3029 selection.clicks = 4; 3063 selection.clicks = 4;
3030 want_refresh = 1; 3064 want_refresh = 1;
3031 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); 3065 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3032 return; 3066 return;
3033 }
3034 } 3067 }
3035#endif 3068
3036 if (selection.clicks == 4) 3069 if (selection.clicks == 4)
3037 selection.clicks = 1; 3070 selection.clicks = 1;
3038 3071
3039 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3072 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3040 flag == 1 ? 1 : 0, /* ? button press */ 3073 flag == 1 ? 1 : 0, /* ? button press */
… …
3046 * Extend the selection to the specified col/row 3079 * Extend the selection to the specified col/row
3047 */ 3080 */
3048void 3081void
3049rxvt_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)
3050{ 3083{
3051 int16_t ncol = TermWin.ncol; 3084 int16_t ncol = TermWin.ncol;
3052 int end_col; 3085 int end_col;
3053 row_col_t pos; 3086 row_col_t pos;
3054 enum { 3087 enum {
3055 LEFT, RIGHT 3088 LEFT, RIGHT
3056 } closeto = RIGHT; 3089 } closeto = RIGHT;
3057 3090
3058 D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); 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));
… …
3094 pos.col = col; 3127 pos.col = col;
3095 pos.row = row; 3128 pos.row = row;
3096 3129
3097 pos.row -= TermWin.view_start; /* adjust for scroll */ 3130 pos.row -= TermWin.view_start; /* adjust for scroll */
3098 3131
3099#ifndef NO_OLD_SELECTION
3100 /*
3101 * This mimics some of the selection behaviour of version 2.20 and before.
3102 * There are no ``selection modes'', button3 is always character extension.
3103 * Note: button3 drag is always available, c.f. v2.20
3104 * Selection always terminates (left or right as appropriate) at the mark.
3105 */
3106 if (selection_style == OLD_SELECT)
3107 {
3108 if (selection.clicks == 1 || button3)
3109 {
3110 if (hate_those_clicks)
3111 {
3112 hate_those_clicks = 0;
3113 if (selection.clicks == 1)
3114 {
3115 selection.beg.row = selection.mark.row;
3116 selection.beg.col = selection.mark.col;
3117 }
3118 else
3119 {
3120 selection.mark.row = selection.beg.row;
3121 selection.mark.col = selection.beg.col;
3122 }
3123 }
3124 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3125 {
3126 selection.end.row = selection.mark.row;
3127 selection.end.col = selection.mark.col + 1;
3128 selection.beg.row = pos.row;
3129 selection.beg.col = pos.col;
3130 }
3131 else
3132 {
3133 selection.beg.row = selection.mark.row;
3134 selection.beg.col = selection.mark.col;
3135 selection.end.row = pos.row;
3136 selection.end.col = pos.col + 1;
3137 }
3138 }
3139 else if (selection.clicks == 2)
3140 {
3141 selection_delimit_word (UP, & (selection.mark),
3142 & (selection.beg));
3143 selection_delimit_word (DN, & (selection.mark),
3144 & (selection.end));
3145 hate_those_clicks = 1;
3146 }
3147 else if (selection.clicks == 3)
3148 {
3149 selection.beg.row = selection.end.row = selection.mark.row;
3150 selection.beg.col = 0;
3151 selection.end.col = ncol;
3152 hate_those_clicks = 1;
3153 }
3154 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3155 return;
3156 }
3157#endif /* ! NO_OLD_SELECTION */
3158#ifndef NO_NEW_SELECTION
3159 /* selection_style must not be OLD_SELECT to get here */
3160 /* 3132 /*
3161 * 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
3162 * in the way button3 drag extension works. 3134 * in the way button3 drag extension works.
3163 * We're either doing: button1 drag; button3 press; or button3 drag 3135 * We're either doing: button1 drag; button3 press; or button3 drag
3164 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3136 * a) button1 drag : select around a midpoint/word/line - that point/word/line
… …
3169 * a point/word/line which is either the start or end of the selection 3141 * a point/word/line which is either the start or end of the selection
3170 * and it was decided by whichever point/word/line was `fixed' at the 3142 * and it was decided by whichever point/word/line was `fixed' at the
3171 * time of the most recent button3 press 3143 * time of the most recent button3 press
3172 */ 3144 */
3173 if (button3 && buttonpress) 3145 if (button3 && buttonpress)
3174 { /* button3 press */ 3146 { /* button3 press */
3175 /* 3147 /*
3176 * first determine which edge of the selection we are closest to 3148 * first determine which edge of the selection we are closest to
3177 */ 3149 */
3178 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3150 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3179 || (!ROWCOL_IS_AFTER (pos, selection.end) 3151 || (!ROWCOL_IS_AFTER (pos, selection.end)
3180 && (((pos.col - selection.beg.col) 3152 && (((pos.col - selection.beg.col)
3181 + ((pos.row - selection.beg.row) * ncol)) 3153 + ((pos.row - selection.beg.row) * ncol))
3182 < ((selection.end.col - pos.col) 3154 < ((selection.end.col - pos.col)
3183 + ((selection.end.row - pos.row) * ncol))))) 3155 + ((selection.end.row - pos.row) * ncol)))))
3184 closeto = LEFT; 3156 closeto = LEFT;
3157
3185 if (closeto == LEFT) 3158 if (closeto == LEFT)
3186 { 3159 {
3187 selection.beg.row = pos.row; 3160 selection.beg.row = pos.row;
3188 selection.beg.col = pos.col; 3161 selection.beg.col = pos.col;
3189 selection.mark.row = selection.end.row; 3162 selection.mark.row = selection.end.row;
3190 selection.mark.col = selection.end.col 3163 selection.mark.col = selection.end.col - (selection.clicks == 2);
3191 - (selection.clicks == 2);
3192 } 3164 }
3193 else 3165 else
3194 { 3166 {
3195 selection.end.row = pos.row; 3167 selection.end.row = pos.row;
3196 selection.end.col = pos.col; 3168 selection.end.col = pos.col;
3197 selection.mark.row = selection.beg.row; 3169 selection.mark.row = selection.beg.row;
3198 selection.mark.col = selection.beg.col; 3170 selection.mark.col = selection.beg.col;
3199 } 3171 }
3200 } 3172 }
3201 else 3173 else
3202 { /* button1 drag or button3 drag */ 3174 { /* button1 drag or button3 drag */
3203 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3175 if (ROWCOL_IS_AFTER (selection.mark, pos))
3204 { 3176 {
3205 if ((selection.mark.row == selection.end.row) 3177 if ((selection.mark.row == selection.end.row)
3206 && (selection.mark.col == selection.end.col) 3178 && (selection.mark.col == selection.end.col)
3207 && clickchange && selection.clicks == 2) 3179 && clickchange && selection.clicks == 2)
3208 selection.mark.col--; 3180 selection.mark.col--;
3181
3209 selection.beg.row = pos.row; 3182 selection.beg.row = pos.row;
3210 selection.beg.col = pos.col; 3183 selection.beg.col = pos.col;
3211 selection.end.row = selection.mark.row; 3184 selection.end.row = selection.mark.row;
3212 selection.end.col = selection.mark.col 3185 selection.end.col = selection.mark.col + (selection.clicks == 2);
3213 + (selection.clicks == 2);
3214 } 3186 }
3215 else 3187 else
3216 { 3188 {
3217 selection.beg.row = selection.mark.row; 3189 selection.beg.row = selection.mark.row;
3218 selection.beg.col = selection.mark.col; 3190 selection.beg.col = selection.mark.col;
… …
3222 } 3194 }
3223 3195
3224 if (selection.clicks == 1) 3196 if (selection.clicks == 1)
3225 { 3197 {
3226 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3198 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3199
3227 if (end_col != -1 && selection.beg.col > end_col) 3200 if (end_col != -1 && selection.beg.col > end_col)
3228 { 3201 {
3229#if 1 3202#if 1
3230 selection.beg.col = ncol; 3203 selection.beg.col = ncol;
3231#else 3204#else
3232 if (selection.beg.row != selection.end.row) 3205 if (selection.beg.row != selection.end.row)
3233 selection.beg.col = ncol; 3206 selection.beg.col = ncol;
3234 else 3207 else
3235 selection.beg.col = selection.mark.col; 3208 selection.beg.col = selection.mark.col;
3236#endif 3209#endif
3237
3238 } 3210 }
3211
3239 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3212 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3213
3240 if (end_col != -1 && selection.end.col > end_col) 3214 if (end_col != -1 && selection.end.col > end_col)
3241 selection.end.col = ncol; 3215 selection.end.col = ncol;
3242
3243 } 3216 }
3244 else if (selection.clicks == 2) 3217 else if (selection.clicks == 2)
3245 { 3218 {
3246 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3219 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3247 selection.end.col--; 3220 selection.end.col--;
3221
3248 selection_delimit_word (UP, & (selection.beg), 3222 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3249 & (selection.beg));
3250 selection_delimit_word (DN, & (selection.end), 3223 selection_delimit_word (DN, & (selection.end), & (selection.end));
3251 & (selection.end));
3252 } 3224 }
3253 else if (selection.clicks == 3) 3225 else if (selection.clicks == 3)
3254 { 3226 {
3255#ifndef NO_FRILLS 3227#ifndef NO_FRILLS
3256 if ((Options & Opt_tripleclickwords)) 3228 if ((Options & Opt_tripleclickwords))
3257 { 3229 {
3258 int end_row; 3230 int end_row;
3259 3231
3260 selection_delimit_word (UP, & (selection.beg), 3232 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3261 & (selection.beg));
3262 end_row = screen.tlen[selection.mark.row 3233 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3263 + TermWin.saveLines]; 3234
3264 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3235 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3265 end_row++)
3266 { 3236 {
3267 end_col = screen.tlen[end_row + TermWin.saveLines]; 3237 end_col = screen.tlen[end_row + TermWin.saveLines];
3238
3268 if (end_col != -1) 3239 if (end_col != -1)
3269 { 3240 {
3270 selection.end.row = end_row; 3241 selection.end.row = end_row;
3271 selection.end.col = end_col; 3242 selection.end.col = end_col;
3272 selection_remove_trailing_spaces (); 3243 selection_remove_trailing_spaces ();
… …
3274 } 3245 }
3275 } 3246 }
3276 } 3247 }
3277 else 3248 else
3278#endif 3249#endif
3279
3280 { 3250 {
3281 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3251 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3282 selection.mark.col++; 3252 selection.mark.col++;
3283 selection.beg.col = 0; 3253 selection.beg.col = 0;
3284 selection.end.col = ncol; 3254 selection.end.col = ncol;
3285 } 3255 }
3286 } 3256 }
3257
3287 if (button3 && buttonpress) 3258 if (button3 && buttonpress)
3288 { /* mark may need to be changed */ 3259 { /* mark may need to be changed */
3289 if (closeto == LEFT) 3260 if (closeto == LEFT)
3290 { 3261 {
3291 selection.mark.row = selection.end.row; 3262 selection.mark.row = selection.end.row;
3292 selection.mark.col = selection.end.col 3263 selection.mark.col = selection.end.col
3293 - (selection.clicks == 2); 3264 - (selection.clicks == 2);
… …
3297 selection.mark.row = selection.beg.row; 3268 selection.mark.row = selection.beg.row;
3298 selection.mark.col = selection.beg.col; 3269 selection.mark.col = selection.beg.col;
3299 } 3270 }
3300 } 3271 }
3301 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); 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));
3302#endif /* ! NO_NEW_SELECTION */
3303} 3273}
3304 3274
3305#ifndef NO_FRILLS 3275#ifndef NO_FRILLS
3306void 3276void
3307rxvt_term::selection_remove_trailing_spaces () 3277rxvt_term::selection_remove_trailing_spaces ()
… …
3381 ev.target = rq.target; 3351 ev.target = rq.target;
3382 ev.time = rq.time; 3352 ev.time = rq.time;
3383 3353
3384 if (rq.target == xa[XA_TARGETS]) 3354 if (rq.target == xa[XA_TARGETS])
3385 { 3355 {
3386 Atom32 target_list[5]; 3356 Atom32 target_list[6];
3387 Atom32 *target = target_list; 3357 Atom32 *target = target_list;
3388 3358
3389 *target++ = (Atom32) xa[XA_TARGETS]; 3359 *target++ = (Atom32) xa[XA_TARGETS];
3360 *target++ = (Atom32) xa[XA_TIMESTAMP];
3390 *target++ = (Atom32) XA_STRING; 3361 *target++ = (Atom32) XA_STRING;
3391 *target++ = (Atom32) xa[XA_TEXT]; 3362 *target++ = (Atom32) xa[XA_TEXT];
3392 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3363 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3393#if X_HAVE_UTF8_STRING 3364#if X_HAVE_UTF8_STRING
3394 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3365 *target++ = (Atom32) xa[XA_UTF8_STRING];
3395#endif 3366#endif
3367
3396 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3368 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3397 (8 * sizeof (target_list[0])), PropModeReplace, 3369 (8 * sizeof (target_list[0])), PropModeReplace,
3398 (unsigned char *)target_list, 3370 (unsigned char *)target_list,
3399 target - target_list); 3371 target - target_list);
3400 ev.property = rq.property; 3372 ev.property = rq.property;
3401 } 3373 }
3374#if TODO // TODO
3402 else if (rq.target == xa[XA_MULTIPLE]) 3375 else if (rq.target == xa[XA_MULTIPLE])
3403 { 3376 {
3404 /* TODO: Handle MULTIPLE */ 3377 /* TODO: Handle MULTIPLE */
3405 } 3378 }
3379#endif
3406 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3380 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3407 { 3381 {
3408 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3382 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3409 (8 * sizeof (Time)), PropModeReplace, 3383 (8 * sizeof (Time)), PropModeReplace,
3410 (unsigned char *)&selection_time, 1); 3384 (unsigned char *)&selection_time, 1);
3411 ev.property = rq.property; 3385 ev.property = rq.property;
3412 } 3386 }
3413 else if (rq.target == XA_STRING 3387 else if (rq.target == XA_STRING
3414 || rq.target == xa[XA_TEXT] 3388 || rq.target == xa[XA_TEXT]
3415 || rq.target == xa[XA_COMPOUND_TEXT] 3389 || rq.target == xa[XA_COMPOUND_TEXT]
3416 || rq.target == xa[XA_UTF8_STRING] 3390 || rq.target == xa[XA_UTF8_STRING]
3417 ) 3391 )
3418 { 3392 {
3419 short freect = 0; 3393 short freect = 0;
3420 int selectlen; 3394 int selectlen;
3421 char *cl; 3395 wchar_t *cl;
3422 3396
3423 target = rq.target; 3397 target = rq.target;
3424 3398
3425 if (target == XA_STRING) 3399 if (target == XA_STRING)
3426 // 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
3427 // will ask for another format anyways. 3401 // will ask for another format anyways.
3428 style = XStringStyle; 3402 style = XStringStyle;
3429 else if (target == xa[XA_TEXT]) 3403 else if (target == xa[XA_TEXT])
3430 style = XTextStyle; 3404 style = XStdICCTextStyle;
3431 else if (target == xa[XA_COMPOUND_TEXT]) 3405 else if (target == xa[XA_COMPOUND_TEXT])
3432 style = XCompoundTextStyle; 3406 style = XCompoundTextStyle;
3433#if X_HAVE_UTF8_STRING 3407#if X_HAVE_UTF8_STRING
3434 else if (target == xa[XA_UTF8_STRING]) 3408 else if (target == xa[XA_UTF8_STRING])
3435 style = XUTF8StringStyle; 3409 style = XUTF8StringStyle;
… …
3440 style = XCompoundTextStyle; 3414 style = XCompoundTextStyle;
3441 } 3415 }
3442 3416
3443 if (selection.text) 3417 if (selection.text)
3444 { 3418 {
3445 cl = (char *)selection.text; 3419 cl = selection.text;
3446 selectlen = selection.len; 3420 selectlen = selection.len;
3447 } 3421 }
3448 else 3422 else
3449 { 3423 {
3450 cl = ""; 3424 cl = L"";
3451 selectlen = 0; 3425 selectlen = 0;
3452 } 3426 }
3453 3427
3428 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3429 // manually for XUTF8StringStyle.
3454 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3430 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3455 freect = 1; 3431 freect = 1;
3456 else 3432 else
3457 { 3433 {
3458 /* if we failed to convert then send it raw */ 3434 /* if we failed to convert then send it raw */
3459 ct.value = (unsigned char *)cl; 3435 ct.value = (unsigned char *)cl;
… …
3466 ev.property = rq.property; 3442 ev.property = rq.property;
3467 3443
3468 if (freect) 3444 if (freect)
3469 XFree (ct.value); 3445 XFree (ct.value);
3470 } 3446 }
3447
3471 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3448 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3472} 3449}
3473 3450
3474/* ------------------------------------------------------------------------- * 3451/* ------------------------------------------------------------------------- *
3475 * MOUSE ROUTINES * 3452 * MOUSE ROUTINES *
… …
3499 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3476 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace;
3500} 3477}
3501 3478
3502#endif 3479#endif
3503/* ------------------------------------------------------------------------- */ 3480/* ------------------------------------------------------------------------- */
3504
3505/* ------------------------------------------------------------------------- *
3506 * DEBUG ROUTINES *
3507 * ------------------------------------------------------------------------- */
3508#if 0
3509void
3510rxvt_debug_colors (void)
3511{
3512 int color;
3513 const char *name[] =
3514 {
3515 "fg", "bg",
3516 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3517 };
3518
3519 fprintf (stderr, "Color ( ");
3520 if (rstyle & RS_RVid)
3521 fprintf (stderr, "rvid ");
3522 if (rstyle & RS_Bold)
3523 fprintf (stderr, "bold ");
3524 if (rstyle & RS_Blink)
3525 fprintf (stderr, "blink ");
3526 if (rstyle & RS_Uline)
3527 fprintf (stderr, "uline ");
3528 fprintf (stderr, "): ");
3529
3530 color = GET_FGCOLOR (rstyle);
3531#ifndef NO_BRIGHTCOLOR
3532 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3533 {
3534 color -= (minBrightCOLOR - minCOLOR);
3535 fprintf (stderr, "bright ");
3536 }
3537#endif
3538 fprintf (stderr, "%s on ", name[color]);
3539
3540 color = GET_BGCOLOR (rstyle);
3541#ifndef NO_BRIGHTCOLOR
3542 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3543 {
3544 color -= (minBrightCOLOR - minCOLOR);
3545 fprintf (stderr, "bright ");
3546 }
3547#endif
3548 fprintf (stderr, "%s\n", name[color]);
3549}
3550#endif

Diff Legend

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