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.66 by pcg, Sun Mar 28 02:07:08 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
… …
476 485
477 scr_release (); 486 scr_release ();
478 prev_nrow = prev_ncol = 0; 487 prev_nrow = prev_ncol = 0;
479 scr_reset (); 488 scr_reset ();
480 489
481 scr_clear (); 490 scr_clear (true);
482 scr_refresh (SLOW_REFRESH); 491 scr_refresh (SLOW_REFRESH);
483} 492}
484 493
485/* ------------------------------------------------------------------------- * 494/* ------------------------------------------------------------------------- *
486 * PROCESS SCREEN COMMANDS * 495 * PROCESS SCREEN COMMANDS *
… …
511 s->s_cur.col = s->cur.col; 520 s->s_cur.col = s->cur.col;
512 s->s_rstyle = rstyle; 521 s->s_rstyle = rstyle;
513 s->s_charset = s->charset; 522 s->s_charset = s->charset;
514 s->s_charset_char = charsets[s->charset]; 523 s->s_charset_char = charsets[s->charset];
515 break; 524 break;
525
516 case RESTORE: 526 case RESTORE:
517 want_refresh = 1; 527 want_refresh = 1;
518 s->cur.row = s->s_cur.row; 528 s->cur.row = s->s_cur.row;
519 s->cur.col = s->s_cur.col; 529 s->cur.col = s->s_cur.col;
520 s->flags &= ~Screen_WrapNext; 530 s->flags &= ~Screen_WrapNext;
… …
556 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); 566 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
557 567
558 TermWin.view_start = 0; 568 TermWin.view_start = 0;
559 569
560 if (current_screen == scrn) 570 if (current_screen == scrn)
561 return current_screen; 571 return scrn;
562 572
563 selection_check (2); /* check for boundary cross */ 573 selection_check (2); /* check for boundary cross */
564 574
565 SWAP_IT (current_screen, scrn, int); 575 SWAP_IT (current_screen, scrn, int);
566#if NSCREENS 576#if NSCREENS
577 if (Options & Opt_secondaryScreen)
578 {
567 num_scr = 0; 579 num_scr = 0;
568 offset = TermWin.saveLines; 580 offset = TermWin.saveLines;
569 for (i = prev_nrow; i--;) 581 for (i = prev_nrow; i--;)
570 { 582 {
571 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 583 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
572 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 584 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
573 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 585 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
574 } 586 }
575 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 587 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
576 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 588 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
577# ifdef DEBUG_STRICT 589# ifdef DEBUG_STRICT
578 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); 590 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
579 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); 591 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
580# else /* drive with your eyes closed */ 592# else /* drive with your eyes closed */
581 MAX_IT (screen.cur.row, 0); 593 MAX_IT (screen.cur.row, 0);
582 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 594 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
583 MAX_IT (screen.cur.col, 0); 595 MAX_IT (screen.cur.col, 0);
584 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); 596 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
585# endif 597# endif
586 SWAP_IT (screen.charset, swap.charset, int16_t); 598 SWAP_IT (screen.charset, swap.charset, int16_t);
587 SWAP_IT (screen.flags, swap.flags, int); 599 SWAP_IT (screen.flags, swap.flags, int);
588 screen.flags |= Screen_VisibleCursor; 600 screen.flags |= Screen_VisibleCursor;
589 swap.flags |= Screen_VisibleCursor; 601 swap.flags |= Screen_VisibleCursor;
590#else 602 }
591# ifdef SCROLL_ON_NO_SECONDARY 603 else
604#endif
605 if (Options & Opt_secondaryScroll)
592 if (current_screen == PRIMARY) 606 //if (current_screen == PRIMARY)
593 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 607 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
594# endif
595#endif
596 return scrn; 608 return scrn;
597} 609}
598 610
599/* ------------------------------------------------------------------------- */ 611/* ------------------------------------------------------------------------- */
600/* 612/*
… …
642 return 0; 654 return 0;
643 655
644 want_refresh = 1; 656 want_refresh = 1;
645 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"));
646 658
647 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) 659 if (row1 == 0 && count > 0
660 && (current_screen == PRIMARY || Options & Opt_secondaryScroll))
648 { 661 {
649 nscrolled = (long)TermWin.nscrolled + (long)count; 662 nscrolled = (long)TermWin.nscrolled + (long)count;
650 663
651 if (nscrolled > (long)TermWin.saveLines) 664 if (nscrolled > (long)TermWin.saveLines)
652 TermWin.nscrolled = TermWin.saveLines; 665 TermWin.nscrolled = TermWin.saveLines;
… …
700 if (j > 0) 713 if (j > 0)
701 { 714 {
702 /* A: scroll up */ 715 /* A: scroll up */
703 716
704 /* 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 */
705 for (i = 0, j = row1; i < count; i++, j++) 734 for (i = 0, j = row2; i < count; i++, j--)
706 { 735 {
707 buf_text[i] = screen.text[j]; 736 buf_text[i] = screen.text[j];
708 buf_rend[i] = screen.rend[j]; 737 buf_rend[i] = screen.rend[j];
709 } 738 }
739
710 /* A2: Rotate lines */ 740 /* B2: Rotate lines */
711 for (j = row1, i = j + count; i <= row2; i++, j++) 741 for (j = row2, i = j - count; i >= row1; i--, j--)
712 { 742 {
713 screen.tlen[j] = screen.tlen[i]; 743 screen.tlen[j] = screen.tlen[i];
714 screen.text[j] = screen.text[i]; 744 screen.text[j] = screen.text[i];
715 screen.rend[j] = screen.rend[i]; 745 screen.rend[j] = screen.rend[i];
716 } 746 }
717 j = row2 - count + 1, i = count;
718 }
719 else /* if (j < 0) */
720 {
721 /* B: scroll down */
722 747
723 /* B1: Copy lines that will get clobbered by the rotation */
724 for (i = 0, j = row2; i < count; i++, j--)
725 {
726 buf_text[i] = screen.text[j];
727 buf_rend[i] = screen.rend[j];
728 }
729 /* B2: Rotate lines */
730 for (j = row2, i = j - count; i >= row1; i--, j--)
731 {
732 screen.tlen[j] = screen.tlen[i];
733 screen.text[j] = screen.text[i];
734 screen.rend[j] = screen.rend[i];
735 }
736 j = row1, i = count; 748 j = row1, i = count;
737 count = -count; 749 count = -count;
738 } 750 }
739 751
740 /* 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 */
741 for (; i--; j++) 757 for (; i--; j++)
742 {
743 screen.tlen[j] = 0;
744 screen.text[j] = buf_text[i];
745 screen.rend[j] = buf_rend[i];
746
747 if (!spec) /* line length may not equal TermWin.ncol */
748 scr_blank_screen_mem (screen.text, screen.rend, 758 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
749 (unsigned int)j, rstyle);
750 }
751 759
752 return count; 760 return count;
753} 761}
754 762
755/* ------------------------------------------------------------------------- */ 763/* ------------------------------------------------------------------------- */
… …
773 781
774 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len)); 782 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
775 ZERO_SCROLLBACK (); 783 ZERO_SCROLLBACK ();
776 if (nlines > 0) 784 if (nlines > 0)
777 { 785 {
778 nlines += (screen.cur.row - screen.bscroll); 786 nlines += screen.cur.row - screen.bscroll;
779 if ((nlines > 0) 787 if ((nlines > 0)
780 && (screen.tscroll == 0) 788 && (screen.tscroll == 0)
781 && (screen.bscroll == (TermWin.nrow - 1))) 789 && (screen.bscroll == (TermWin.nrow - 1)))
782 { 790 {
783 /* _at least_ this many lines need to be scrolled */ 791 /* _at least_ this many lines need to be scrolled */
784 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 792 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
785 screen.cur.row -= nlines; 793 screen.cur.row -= nlines;
786 } 794 }
787 } 795 }
796
788#ifdef DEBUG_STRICT 797#ifdef DEBUG_STRICT
789 assert (screen.cur.col < last_col); 798 assert (screen.cur.col < last_col);
790 assert ((screen.cur.row < TermWin.nrow) 799 assert ((screen.cur.row < TermWin.nrow)
791 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 800 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
792#else /* drive with your eyes closed */ 801#else /* drive with your eyes closed */
793 MIN_IT (screen.cur.col, last_col - 1); 802 MIN_IT (screen.cur.col, last_col - 1);
794 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 803 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
795 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 804 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
796#endif 805#endif
… …
807 c = *str++; 816 c = *str++;
808 817
809 if (c < 0x20) 818 if (c < 0x20)
810 switch (c) 819 switch (c)
811 { 820 {
812 case '\t': 821 case C0_HT:
813 scr_tab (1); 822 scr_tab (1);
814 continue; 823 continue;
815 824
816 case '\n': 825 case C0_LF:
817 if (screen.tlen[row] != -1) /* XXX: think about this */ 826 if (screen.tlen[row] != -1) /* XXX: think about this */
818 MAX_IT (screen.tlen[row], screen.cur.col); 827 MAX_IT (screen.tlen[row], screen.cur.col);
819 828
820 screen.flags &= ~Screen_WrapNext; 829 screen.flags &= ~Screen_WrapNext;
821 830
… …
826 835
827 stp = screen.text[row]; /* _must_ refresh */ 836 stp = screen.text[row]; /* _must_ refresh */
828 srp = screen.rend[row]; /* _must_ refresh */ 837 srp = screen.rend[row]; /* _must_ refresh */
829 continue; 838 continue;
830 839
831 case '\r': 840 case C0_CR:
832 if (screen.tlen[row] != -1) /* XXX: think about this */ 841 if (screen.tlen[row] != -1) /* XXX: think about this */
833 MAX_IT (screen.tlen[row], screen.cur.col); 842 MAX_IT (screen.tlen[row], screen.cur.col);
834 843
835 screen.flags &= ~Screen_WrapNext; 844 screen.flags &= ~Screen_WrapNext;
836 screen.cur.col = 0; 845 screen.cur.col = 0;
… …
863 scr_insdel_chars (1, INSERT); 872 scr_insdel_chars (1, INSERT);
864 873
865 // rely on wcwidth to tell us the character width, at least for non-latin1 874 // rely on wcwidth to tell us the character width, at least for non-latin1
866 // do wcwidth before further replacements, as wcwidth says that line-drawing 875 // do wcwidth before further replacements, as wcwidth says that line-drawing
867 // characters have width -1 (DOH!) on GNU/Linux sometimes. 876 // characters have width -1 (DOH!) on GNU/Linux sometimes.
868 int width = c < 256 ? 1 : wcwidth (c); 877 int width = c < 0x100 ? 1 : wcwidth (c);
869 878
870 if (charsets[screen.charset] == '0') // DEC SPECIAL 879 if (charsets[screen.charset] == '0') // DEC SPECIAL
871 { 880 {
872 // vt100 special graphics and line drawing 881 // vt100 special graphics and line drawing
873 static uint16_t vt100_0[32] = { // 5f .. 7e 882 static uint16_t vt100_0[32] = { // 5f .. 7e
… …
882 c = vt100_0[c - 0x5f]; 891 c = vt100_0[c - 0x5f];
883 width = 1; 892 width = 1;
884 } 893 }
885 } 894 }
886 895
887 if (width > 0) 896 if (width != 0)
888 { 897 {
889#if !UNICODE_3 && ENABLE_COMBINING 898#if !UNICODE_3 && ENABLE_COMBINING
890 // trim characters we can't store directly :( 899 // trim characters we can't store directly :(
891 if (c >= 0x10000) 900 if (c >= 0x10000)
892 c = rxvt_composite.compose (c); // map to lower 16 bits 901 c = rxvt_composite.compose (c); // map to lower 16 bits
893#endif 902#endif
894 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 903 bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0);
904 rend_t rend = SET_FONT (rstyle,
905 c > 0x7f || bold || c < 0x20
906 ? TermWin.fontset->find_font (c, bold)
907 : TermWin.ascii_map [c - 0x20]);
895 908
896 do 909 do
897 { 910 {
898 stp[screen.cur.col] = c; 911 stp[screen.cur.col] = c;
899 srp[screen.cur.col] = rend; 912 srp[screen.cur.col] = rend;
… …
984 */ 997 */
985void 998void
986rxvt_term::scr_backspace () 999rxvt_term::scr_backspace ()
987{ 1000{
988 want_refresh = 1; 1001 want_refresh = 1;
1002
989 if (screen.cur.col == 0) 1003 if (screen.cur.col == 0)
990 { 1004 {
991 if (screen.cur.row > 0) 1005 if (screen.cur.row > 0)
992 { 1006 {
993#ifdef TERMCAP_HAS_BW 1007#ifdef TERMCAP_HAS_BW
… …
998 1012
999 } 1013 }
1000 } 1014 }
1001 else if ((screen.flags & Screen_WrapNext) == 0) 1015 else if ((screen.flags & Screen_WrapNext) == 0)
1002 scr_gotorc (0, -1, RELATIVE); 1016 scr_gotorc (0, -1, RELATIVE);
1017
1003 screen.flags &= ~Screen_WrapNext; 1018 screen.flags &= ~Screen_WrapNext;
1004} 1019}
1005 1020
1006/* ------------------------------------------------------------------------- */ 1021/* ------------------------------------------------------------------------- */
1007/* 1022/*
… …
1111 want_refresh = 1; 1126 want_refresh = 1;
1112 ZERO_SCROLLBACK (); 1127 ZERO_SCROLLBACK ();
1113 1128
1114 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));
1115 1130
1116 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1131 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1117 : col);
1118 MAX_IT (screen.cur.col, 0); 1132 MAX_IT (screen.cur.col, 0);
1119 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1133 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1120 1134
1121 screen.flags &= ~Screen_WrapNext; 1135 screen.flags &= ~Screen_WrapNext;
1122 if (relative & R_RELATIVE) 1136 if (relative & R_RELATIVE)
… …
1161 * direction should be UP or DN 1175 * direction should be UP or DN
1162 */ 1176 */
1163void 1177void
1164rxvt_term::scr_index (enum page_dirn direction) 1178rxvt_term::scr_index (enum page_dirn direction)
1165{ 1179{
1166 int dirn; 1180 int dirn;
1167 1181
1168 want_refresh = 1; 1182 want_refresh = 1;
1169 dirn = ((direction == UP) ? 1 : -1); 1183 dirn = ((direction == UP) ? 1 : -1);
1170 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); 1184 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1171 1185
… …
1231 default: 1245 default:
1232 return; 1246 return;
1233 } 1247 }
1234 1248
1235 if (screen.text[row]) 1249 if (screen.text[row])
1236 scr_blank_line (& (screen.text[row][col]), 1250 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1237 & (screen.rend[row][col]), num, rstyle);
1238 else 1251 else
1239 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1252 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1240} 1253}
1241 1254
1242/* ------------------------------------------------------------------------- */ 1255/* ------------------------------------------------------------------------- */
… …
1280 break; 1293 break;
1281 default: 1294 default:
1282 return; 1295 return;
1283 } 1296 }
1284 1297
1285 refresh_type |= REFRESH_BOUNDS;
1286
1287 if (selection.op && current_screen == selection.screen 1298 if (selection.op && current_screen == selection.screen
1288 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1299 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1289 || (selection.end.row >= row 1300 || (selection.end.row >= row
1290 && selection.end.row <= row + num))) 1301 && selection.end.row <= row + num)))
1291 CLEAR_SELECTION (); 1302 CLEAR_SELECTION ();
… …
1514 */ 1525 */
1515void 1526void
1516rxvt_term::scr_cursor_visible (int mode) 1527rxvt_term::scr_cursor_visible (int mode)
1517{ 1528{
1518 want_refresh = 1; 1529 want_refresh = 1;
1530
1519 if (mode) 1531 if (mode)
1520 screen.flags |= Screen_VisibleCursor; 1532 screen.flags |= Screen_VisibleCursor;
1521 else 1533 else
1522 screen.flags &= ~Screen_VisibleCursor; 1534 screen.flags &= ~Screen_VisibleCursor;
1523} 1535}
… …
1737 row_col_t rc[RC_COUNT]; 1749 row_col_t rc[RC_COUNT];
1738 1750
1739 if (drawn_text == NULL) /* sanity check */ 1751 if (drawn_text == NULL) /* sanity check */
1740 return; 1752 return;
1741 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
1742#ifdef DEBUG_STRICT 1762#ifdef DEBUG_STRICT
1743 x = max (x, (int)TermWin.int_bwidth); 1763 x = max (x, 0);
1744 x = min (x, (int)TermWin.width); 1764 x = min (x, (int)TermWin.width);
1745 y = max (y, (int)TermWin.int_bwidth); 1765 y = max (y, 0);
1746 y = min (y, (int)TermWin.height); 1766 y = min (y, (int)TermWin.height);
1747#endif 1767#endif
1748 1768
1749 /* round down */ 1769 /* round down */
1750 rc[PART_BEG].col = Pixel2Col (x); 1770 rc[PART_BEG].col = Pixel2Col (x);
… …
1761 } 1781 }
1762 1782
1763 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));
1764 1784
1765 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++)
1766 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);
1767 (rc[PART_END].col - rc[PART_BEG].col + 1));
1768 1787
1769 if (refresh) 1788 if (refresh)
1770 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1789 scr_refresh (SLOW_REFRESH);
1771} 1790}
1772 1791
1773/* ------------------------------------------------------------------------- */ 1792/* ------------------------------------------------------------------------- */
1774/* 1793/*
1775 * Refresh the entire screen 1794 * Refresh the entire screen
… …
1810 * direction should be UP or DN 1829 * direction should be UP or DN
1811 */ 1830 */
1812int 1831int
1813rxvt_term::scr_page (enum page_dirn direction, int nlines) 1832rxvt_term::scr_page (enum page_dirn direction, int nlines)
1814{ 1833{
1815 int n; 1834 int n;
1816 uint16_t oldviewstart; 1835 uint16_t oldviewstart;
1817 1836
1818 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));
1819#ifdef DEBUG_STRICT 1838#ifdef DEBUG_STRICT
1820 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1839 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1821#endif 1840#endif
… …
1839 if (TermWin.view_start != oldviewstart) 1858 if (TermWin.view_start != oldviewstart)
1840 { 1859 {
1841 want_refresh = 1; 1860 want_refresh = 1;
1842 num_scr -= (TermWin.view_start - oldviewstart); 1861 num_scr -= (TermWin.view_start - oldviewstart);
1843 } 1862 }
1863
1844 return (int) (TermWin.view_start - oldviewstart); 1864 return (int) (TermWin.view_start - oldviewstart);
1845} 1865}
1846 1866
1847/* ------------------------------------------------------------------------- */ 1867/* ------------------------------------------------------------------------- */
1848void 1868void
… …
1916 ((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)
1917 1937
1918void 1938void
1919rxvt_term::scr_refresh (unsigned char refresh_type) 1939rxvt_term::scr_refresh (unsigned char refresh_type)
1920{ 1940{
1921 unsigned char clearfirst, /* first character writes before cell */
1922 clearlast, /* last character writes beyond cell */
1923 must_clear, /* use draw_string not draw_image_string */ 1941 unsigned char must_clear, /* use draw_string not draw_image_string */
1924 rvid, /* reverse video this position */ 1942 rvid, /* reverse video this position */
1925 showcursor; /* show the cursor */ 1943 showcursor; /* show the cursor */
1926 int16_t col, row, /* column/row we're processing */ 1944 int16_t col, row, /* column/row we're processing */
1927 ocrow; /* old cursor row */ 1945 ocrow; /* old cursor row */
1928 int i, /* tmp */ 1946 int i, /* tmp */
… …
1937 return; 1955 return;
1938 1956
1939 /* 1957 /*
1940 * A: set up vars 1958 * A: set up vars
1941 */ 1959 */
1942 clearfirst = clearlast = must_clear = 0; 1960 must_clear = 0;
1943 1961
1944 refresh_count = 0; 1962 refresh_count = 0;
1945 1963
1946 row_offset = TermWin.saveLines - TermWin.view_start; 1964 row_offset = TermWin.saveLines - TermWin.view_start;
1947
1948 if ((refresh_type & REFRESH_BOUNDS))
1949 {
1950 clearfirst = clearlast = 1;
1951 refresh_type &= ~REFRESH_BOUNDS;
1952 }
1953 1965
1954#ifdef XPM_BACKGROUND 1966#ifdef XPM_BACKGROUND
1955 must_clear |= (bgPixmap.pixmap != None); 1967 must_clear |= (bgPixmap.pixmap != None);
1956#endif 1968#endif
1957#ifdef TRANSPARENT 1969#ifdef TRANSPARENT
… …
2045 /* 2057 /*
2046 * D: CopyArea pass - very useful for slower links 2058 * D: CopyArea pass - very useful for slower links
2047 * This has been deliberately kept simple. 2059 * This has been deliberately kept simple.
2048 */ 2060 */
2049 i = num_scr; 2061 i = num_scr;
2062 if (!display->is_local
2050 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2063 && refresh_type == FAST_REFRESH && num_scr_allow && i
2051 && abs (i) < TermWin.nrow && !must_clear) 2064 && abs (i) < TermWin.nrow && !must_clear)
2052 { 2065 {
2053 int16_t nits; 2066 int16_t nits;
2054 int j; 2067 int j;
2055 rend_t *drp2; 2068 rend_t *drp2;
… …
2197 rend = GET_ATTR (rend); 2210 rend = GET_ATTR (rend);
2198 2211
2199 rvid = !!(rend & RS_RVid); 2212 rvid = !!(rend & RS_RVid);
2200 2213
2201#ifndef NO_BOLD_UNDERLINE_REVERSE 2214#ifndef NO_BOLD_UNDERLINE_REVERSE
2202 if (rend & RS_Bold && fore == Color_fg) 2215 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold))
2203 { 2216 {
2204 if (ISSET_PIXCOLOR (Color_BD)) 2217 if (ISSET_PIXCOLOR (Color_BD))
2205 fore = Color_BD; 2218 fore = Color_BD;
2206 else 2219 else
2207 rvid = !rvid; 2220 rvid = !rvid;
… …
2225 back = Color_RV; 2238 back = Color_RV;
2226#endif 2239#endif
2227 } 2240 }
2228 2241
2229#ifdef TEXT_BLINK 2242#ifdef TEXT_BLINK
2230 if (rend & RS_Blink && back == Color_bg) 2243 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2231 { 2244 {
2232 if (!text_blink_ev.active) 2245 if (!text_blink_ev.active)
2233 { 2246 {
2234 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2247 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2235 hidden_text = 0; 2248 hidden_text = 0;
… …
2265 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2278 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2266 } 2279 }
2267 else 2280 else
2268 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2281 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2269 2282
2270 if ((rend & RS_Uline) && (font->descent > 1)) 2283 if (rend & RS_Uline && font->descent > 1 && fore != back)
2271 XDrawLine (display->display, drawBuffer, TermWin.gc, 2284 XDrawLine (display->display, drawBuffer, TermWin.gc,
2272 xpixel, ypixel + font->ascent + 1, 2285 xpixel, ypixel + font->ascent + 1,
2273 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2286 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2274 } /* for (col....) */ 2287 } /* for (col....) */
2275 } /* for (row....) */ 2288 } /* for (row....) */
… …
2310 /* 2323 /*
2311 * H: cleanup selection 2324 * H: cleanup selection
2312 */ 2325 */
2313 scr_reverse_selection (); 2326 scr_reverse_selection ();
2314 2327
2315 /*
2316 * I: other general cleanup
2317 */
2318 if (clearfirst && TermWin.int_bwidth)
2319 /*
2320 * clear the whole screen height, note that width == 0 is treated
2321 * specially by XClearArea
2322 */
2323 XClearArea (display->display, TermWin.vt, 0, 0,
2324 (unsigned int)TermWin.int_bwidth,
2325 (unsigned int)TermWin_TotalHeight (), False);
2326
2327 if (clearlast && TermWin.int_bwidth)
2328 /*
2329 * clear the whole screen height, note that width == 0 is treated
2330 * specially by XClearArea
2331 */
2332 XClearArea (display->display, TermWin.vt,
2333 TermWin.width + TermWin.int_bwidth, 0,
2334 (unsigned int)TermWin.int_bwidth,
2335 (unsigned int)TermWin_TotalHeight (), False);
2336
2337 if (refresh_type & SMOOTH_REFRESH) 2328 if (refresh_type & SMOOTH_REFRESH)
2338 XSync (display->display, False); 2329 XFlush (display->display);
2339 2330
2340 num_scr = 0; 2331 num_scr = 0;
2341 num_scr_allow = 1; 2332 num_scr_allow = 1;
2342 want_refresh = 0; /* screen is current */ 2333 want_refresh = 0; /* screen is current */
2343} 2334}
… …
2514 { 2505 {
2515 n = min (len - i, PROP_SIZE); 2506 n = min (len - i, PROP_SIZE);
2516 MEMCPY (ds, data + i, n); 2507 MEMCPY (ds, data + i, n);
2517 2508
2518 for (j = 0; j < n; j++) 2509 for (j = 0; j < n; j++)
2519 if (ds[j] == '\n') 2510 if (ds[j] == C0_LF)
2520 ds[j] = '\r'; 2511 ds[j] = C0_CR;
2521 2512
2522 tt_write (ds, (int)n); 2513 tt_write (ds, (int)n);
2523 } 2514 }
2524 2515
2525 free (ds); 2516 free (ds);
… …
2574 break; 2565 break;
2575 2566
2576 if (ct.encoding == 0) 2567 if (ct.encoding == 0)
2577 { 2568 {
2578 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2569 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
2570 break;
2571 }
2572 else if (ct.encoding == xa[XA_INCR])
2573 {
2574 // INCR selection, start handshake
2575 XDeleteProperty (display->display, win, prop);
2576 selection_wait = Sel_incr;
2577 incr_ev.start (NOW + 10);
2579 break; 2578 break;
2580 } 2579 }
2581 2580
2582 if (ct.value == NULL) 2581 if (ct.value == NULL)
2583 { 2582 {
… …
2606 2605
2607 nread += ct.nitems; 2606 nread += ct.nitems;
2608 2607
2609 char **cl; 2608 char **cl;
2610 int cr; 2609 int cr;
2611 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2610 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2612 &cr) >= 0 && cl)
2613 { 2611 {
2614 for (int i = 0; i < cr; i++) 2612 for (int i = 0; i < cr; i++)
2615 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2613 paste ((unsigned char *)cl[i], STRLEN (cl[i]));
2616 2614
2617 XFreeStringList (cl); 2615 XFreeStringList (cl);
… …
2647 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2645 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2648 */ 2646 */
2649void 2647void
2650rxvt_term::selection_property (Window win, Atom prop) 2648rxvt_term::selection_property (Window win, Atom prop)
2651{ 2649{
2652 int reget_time = 0; 2650 if (prop == None || selection_wait != Sel_incr)
2653
2654 if (prop == None)
2655 return; 2651 return;
2656 2652
2657 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2658 if (selection_wait == Sel_normal)
2659 {
2660 int a, afmt;
2661 Atom atype;
2662 unsigned long bytes_after, nitems;
2663 unsigned char *s = NULL;
2664
2665 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2666 xa[XA_INCR], &atype, &afmt, &nitems,
2667 &bytes_after, &s);
2668 if (s)
2669 XFree (s);
2670 if (a != Success)
2671 return;
2672
2673#ifndef __CYGWIN32__
2674 if (atype == xa[XA_INCR])
2675 { /* start an INCR transfer */
2676 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2677 XDeleteProperty (display->display, win, prop);
2678 XFlush (display->display);
2679 reget_time = 1;
2680 selection_wait = Sel_incr;
2681 }
2682#endif
2683
2684 }
2685 else if (selection_wait == Sel_incr)
2686 {
2687 reget_time = 1;
2688
2689 if (selection_paste (win, prop, True) == -1) 2653 if (selection_paste (win, prop, 1) > 0)
2690 {
2691 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2692 selection_wait = Sel_none;
2693 incr_ev.stop ();
2694 }
2695 }
2696 if (reget_time) /* received more data so reget time */
2697 incr_ev.start (NOW + 10); 2654 incr_ev.start (NOW + 10);
2655 else
2656 {
2657 selection_wait = Sel_none;
2658 incr_ev.stop ();
2659 }
2698} 2660}
2699 2661
2700/* ------------------------------------------------------------------------- */ 2662/* ------------------------------------------------------------------------- */
2701/* 2663/*
2702 * Request the current selection: 2664 * Request the current selection:
… …
2876 else 2838 else
2877 new_selection_text[ofs++] = *t++; 2839 new_selection_text[ofs++] = *t++;
2878 } 2840 }
2879 2841
2880 if (screen.tlen[row] != -1 && row != end_row) 2842 if (screen.tlen[row] != -1 && row != end_row)
2881 new_selection_text[ofs++] = L'\n'; 2843 new_selection_text[ofs++] = C0_LF;
2882 } 2844 }
2883 2845
2884 if (end_col != selection.end.col) 2846 if (end_col != selection.end.col)
2885 new_selection_text[ofs++] = L'\n'; 2847 new_selection_text[ofs++] = C0_LF;
2886 2848
2887 new_selection_text[ofs] = 0; 2849 new_selection_text[ofs] = 0;
2888 2850
2889 if (ofs == 0) 2851 if (ofs == 0)
2890 { 2852 {
… …
3117 * Extend the selection to the specified col/row 3079 * Extend the selection to the specified col/row
3118 */ 3080 */
3119void 3081void
3120rxvt_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)
3121{ 3083{
3122 int16_t ncol = TermWin.ncol; 3084 int16_t ncol = TermWin.ncol;
3123 int end_col; 3085 int end_col;
3124 row_col_t pos; 3086 row_col_t pos;
3125 enum { 3087 enum {
3126 LEFT, RIGHT 3088 LEFT, RIGHT
3127 } closeto = RIGHT; 3089 } closeto = RIGHT;
3128 3090
3129 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));
… …
3407 (8 * sizeof (target_list[0])), PropModeReplace, 3369 (8 * sizeof (target_list[0])), PropModeReplace,
3408 (unsigned char *)target_list, 3370 (unsigned char *)target_list,
3409 target - target_list); 3371 target - target_list);
3410 ev.property = rq.property; 3372 ev.property = rq.property;
3411 } 3373 }
3374#if TODO // TODO
3412 else if (rq.target == xa[XA_MULTIPLE]) 3375 else if (rq.target == xa[XA_MULTIPLE])
3413 { 3376 {
3414 /* TODO: Handle MULTIPLE */ 3377 /* TODO: Handle MULTIPLE */
3415 } 3378 }
3379#endif
3416 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3380 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3417 { 3381 {
3418 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3382 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3419 (8 * sizeof (Time)), PropModeReplace, 3383 (8 * sizeof (Time)), PropModeReplace,
3420 (unsigned char *)&selection_time, 1); 3384 (unsigned char *)&selection_time, 1);
… …
3512 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3476 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace;
3513} 3477}
3514 3478
3515#endif 3479#endif
3516/* ------------------------------------------------------------------------- */ 3480/* ------------------------------------------------------------------------- */
3517
3518/* ------------------------------------------------------------------------- *
3519 * DEBUG ROUTINES *
3520 * ------------------------------------------------------------------------- */
3521#if 0
3522void
3523rxvt_debug_colors (void)
3524{
3525 int color;
3526 const char *name[] =
3527 {
3528 "fg", "bg",
3529 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3530 };
3531
3532 fprintf (stderr, "Color ( ");
3533 if (rstyle & RS_RVid)
3534 fprintf (stderr, "rvid ");
3535 if (rstyle & RS_Bold)
3536 fprintf (stderr, "bold ");
3537 if (rstyle & RS_Blink)
3538 fprintf (stderr, "blink ");
3539 if (rstyle & RS_Uline)
3540 fprintf (stderr, "uline ");
3541 fprintf (stderr, "): ");
3542
3543 color = GET_FGCOLOR (rstyle);
3544#ifndef NO_BRIGHTCOLOR
3545 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3546 {
3547 color -= (minBrightCOLOR - minCOLOR);
3548 fprintf (stderr, "bright ");
3549 }
3550#endif
3551 fprintf (stderr, "%s on ", name[color]);
3552
3553 color = GET_BGCOLOR (rstyle);
3554#ifndef NO_BRIGHTCOLOR
3555 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3556 {
3557 color -= (minBrightCOLOR - minCOLOR);
3558 fprintf (stderr, "bright ");
3559 }
3560#endif
3561 fprintf (stderr, "%s\n", name[color]);
3562}
3563#endif

Diff Legend

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