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.68 by pcg, Sun Apr 4 14:35:00 2004 UTC vs.
Revision 1.85 by root, Sun Aug 8 16:43:21 2004 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.c 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * 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;
… …
189 } 189 }
190 190
191 if (prev_nrow == 0) 191 if (prev_nrow == 0)
192 { 192 {
193 /* 193 /*
194 * first time called so just malloc everything : don't rely on realloc 194 * first time called so just malloc everything: don't rely on realloc
195 * Note: this is still needed so that all the scrollback lines are NULL 195 * Note: this is still needed so that all the scrollback lines are NULL
196 */ 196 */
197 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 197 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
198 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 198 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
199 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 199 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
… …
256 scr_scroll_text (0, (int)prev_nrow - 1, k, 1); 256 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
257 257
258 for (p = nrow; p < prev_nrow; p++) 258 for (p = nrow; p < prev_nrow; p++)
259 { 259 {
260 q = p + TermWin.saveLines; 260 q = p + TermWin.saveLines;
261
261 if (screen.text[q]) 262 if (screen.text[q])
262 { 263 {
263#ifdef DEBUG_STRICT 264#ifdef DEBUG_STRICT
264 assert (screen.rend[q]); 265 assert (screen.rend[q]);
265#endif 266#endif
266 talloc->free (screen.text[q]); 267 talloc->free (screen.text[q]);
267 ralloc->free (screen.rend[q]); 268 ralloc->free (screen.rend[q]);
268 } 269 }
270
269 if (swap.text[p]) 271 if (swap.text[p])
270 { 272 {
271#ifdef DEBUG_STRICT 273#ifdef DEBUG_STRICT
272 assert (swap.rend[p]); 274 assert (swap.rend[p]);
273#endif 275#endif
274 talloc->free (swap.text[p]); 276 talloc->free (swap.text[p]);
275 ralloc->free (swap.rend[p]); 277 ralloc->free (swap.rend[p]);
276 } 278 }
279
277#ifdef DEBUG_STRICT 280#ifdef DEBUG_STRICT
278 assert (drawn_text[p] && drawn_rend[p]); 281 assert (drawn_text[p] && drawn_rend[p]);
279#endif 282#endif
280 talloc->free (drawn_text[p]); 283 talloc->free (drawn_text[p]);
281 ralloc->free (drawn_rend[p]); 284 ralloc->free (drawn_rend[p]);
… …
311 swap.tlen[p] = 0; 314 swap.tlen[p] = 0;
312 swap.text[p] = NULL; 315 swap.text[p] = NULL;
313 swap.rend[p] = NULL; 316 swap.rend[p] = NULL;
314 drawn_text[p] = NULL; 317 drawn_text[p] = NULL;
315 drawn_rend[p] = NULL; 318 drawn_rend[p] = NULL;
316 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); 319 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
317 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); 320 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
318 } 321 }
319 322
320 if (k > 0) 323 if (k > 0)
321 { 324 {
… …
336 } 339 }
337 340
338 /* resize columns */ 341 /* resize columns */
339 if (ncol != prev_ncol) 342 if (ncol != prev_ncol)
340 { 343 {
341 int common = min (prev_ncol, ncol);
342 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); 344 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
343 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); 345 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
344 346
345 for (p = 0; p < total_rows; p++) 347 for (p = 0; p < total_rows; p++)
346 { 348 {
347 if (screen.text[p]) 349 if (screen.text[p])
348 { 350 {
349 text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t; 351 screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t));
350 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, screen.rend[p], common * sizeof (rend_t)); screen.rend[p] = r; 352 screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
351 353
352 MIN_IT (screen.tlen[p], (int16_t)ncol); 354 MIN_IT (screen.tlen[p], (int16_t)ncol);
353 355
354 if (ncol > prev_ncol) 356 if (ncol > prev_ncol)
355 scr_blank_line (& (screen.text[p][prev_ncol]), 357 scr_blank_line (&screen.text[p][prev_ncol],
356 & (screen.rend[p][prev_ncol]), 358 &screen.rend[p][prev_ncol],
357 ncol - prev_ncol, 359 ncol - prev_ncol, setrstyle);
358 setrstyle);
359 } 360 }
360 } 361 }
361 362
362 for (p = 0; p < nrow; p++) 363 for (p = 0; p < nrow; p++)
363 { 364 {
364 text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t; 365 drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t));
365 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, drawn_rend[p], common * sizeof (rend_t)); drawn_rend[p] = r; 366 drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
366 367
367 if (ncol > prev_ncol) 368 if (ncol > prev_ncol)
368 scr_blank_line (& (drawn_text[p][prev_ncol]), 369 scr_blank_line (&drawn_text[p][prev_ncol],
369 & (drawn_rend[p][prev_ncol]), 370 &drawn_rend[p][prev_ncol],
370 ncol - prev_ncol, setrstyle); 371 ncol - prev_ncol, setrstyle);
371 372
372 if (swap.text[p]) 373 if (swap.text[p])
373 { 374 {
374 text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t; 375 swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t));
375 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, swap.rend[p], common * sizeof (rend_t)); swap.rend[p] = r; 376 swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
376 377
377 MIN_IT (swap.tlen[p], (int16_t)ncol); 378 MIN_IT (swap.tlen[p], (int16_t)ncol);
378 379
379 if (ncol > prev_ncol) 380 if (ncol > prev_ncol)
380 scr_blank_line (& (swap.text[p][prev_ncol]), 381 scr_blank_line (&swap.text[p][prev_ncol],
381 & (swap.rend[p][prev_ncol]), 382 &swap.rend[p][prev_ncol],
382 ncol - prev_ncol, setrstyle); 383 ncol - prev_ncol, setrstyle);
383 } 384 }
384 385
385 } 386 }
386 387
… …
476 477
477 scr_release (); 478 scr_release ();
478 prev_nrow = prev_ncol = 0; 479 prev_nrow = prev_ncol = 0;
479 scr_reset (); 480 scr_reset ();
480 481
481 scr_clear (); 482 scr_clear (true);
482 scr_refresh (SLOW_REFRESH); 483 scr_refresh (SLOW_REFRESH);
483} 484}
484 485
485/* ------------------------------------------------------------------------- * 486/* ------------------------------------------------------------------------- *
486 * PROCESS SCREEN COMMANDS * 487 * PROCESS SCREEN COMMANDS *
… …
511 s->s_cur.col = s->cur.col; 512 s->s_cur.col = s->cur.col;
512 s->s_rstyle = rstyle; 513 s->s_rstyle = rstyle;
513 s->s_charset = s->charset; 514 s->s_charset = s->charset;
514 s->s_charset_char = charsets[s->charset]; 515 s->s_charset_char = charsets[s->charset];
515 break; 516 break;
517
516 case RESTORE: 518 case RESTORE:
517 want_refresh = 1; 519 want_refresh = 1;
518 s->cur.row = s->s_cur.row; 520 s->cur.row = s->s_cur.row;
519 s->cur.col = s->s_cur.col; 521 s->cur.col = s->s_cur.col;
520 s->flags &= ~Screen_WrapNext; 522 s->flags &= ~Screen_WrapNext;
… …
703 if (j > 0) 705 if (j > 0)
704 { 706 {
705 /* A: scroll up */ 707 /* A: scroll up */
706 708
707 /* A1: Copy lines that will get clobbered by the rotation */ 709 /* A1: Copy lines that will get clobbered by the rotation */
710 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
711 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
712
713 /* A2: Rotate lines */
714 i = row2 - row1 - count + 1;
715 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
716 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
717 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
718
719 j = row2 - count + 1, i = count;
720 }
721 else /* if (j < 0) */
722 {
723 /* B: scroll down */
724
725 /* B1: Copy lines that will get clobbered by the rotation */
708 for (i = 0, j = row1; i < count; i++, j++) 726 for (i = 0, j = row2; i < count; i++, j--)
709 { 727 {
710 buf_text[i] = screen.text[j]; 728 buf_text[i] = screen.text[j];
711 buf_rend[i] = screen.rend[j]; 729 buf_rend[i] = screen.rend[j];
712 } 730 }
731
713 /* A2: Rotate lines */ 732 /* B2: Rotate lines */
714 for (j = row1, i = j + count; i <= row2; i++, j++) 733 for (j = row2, i = j - count; i >= row1; i--, j--)
715 { 734 {
716 screen.tlen[j] = screen.tlen[i]; 735 screen.tlen[j] = screen.tlen[i];
717 screen.text[j] = screen.text[i]; 736 screen.text[j] = screen.text[i];
718 screen.rend[j] = screen.rend[i]; 737 screen.rend[j] = screen.rend[i];
719 } 738 }
720 j = row2 - count + 1, i = count;
721 }
722 else /* if (j < 0) */
723 {
724 /* B: scroll down */
725 739
726 /* B1: Copy lines that will get clobbered by the rotation */
727 for (i = 0, j = row2; i < count; i++, j--)
728 {
729 buf_text[i] = screen.text[j];
730 buf_rend[i] = screen.rend[j];
731 }
732 /* B2: Rotate lines */
733 for (j = row2, i = j - count; i >= row1; i--, j--)
734 {
735 screen.tlen[j] = screen.tlen[i];
736 screen.text[j] = screen.text[i];
737 screen.rend[j] = screen.rend[i];
738 }
739 j = row1, i = count; 740 j = row1, i = count;
740 count = -count; 741 count = -count;
741 } 742 }
742 743
743 /* C: Resurrect lines */ 744 /* C: Resurrect lines */
745 memset (screen.tlen + j, 0, i * sizeof (int16_t));
746 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
747 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
748 if (!spec) /* line length may not equal TermWin.ncol */
744 for (; i--; j++) 749 for (; i--; j++)
745 {
746 screen.tlen[j] = 0;
747 screen.text[j] = buf_text[i];
748 screen.rend[j] = buf_rend[i];
749
750 if (!spec) /* line length may not equal TermWin.ncol */
751 scr_blank_screen_mem (screen.text, screen.rend, 750 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
752 (unsigned int)j, rstyle);
753 }
754 751
755 return count; 752 return count;
756} 753}
757 754
758/* ------------------------------------------------------------------------- */ 755/* ------------------------------------------------------------------------- */
… …
776 773
777 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len)); 774 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
778 ZERO_SCROLLBACK (); 775 ZERO_SCROLLBACK ();
779 if (nlines > 0) 776 if (nlines > 0)
780 { 777 {
781 nlines += (screen.cur.row - screen.bscroll); 778 nlines += screen.cur.row - screen.bscroll;
782 if ((nlines > 0) 779 if ((nlines > 0)
783 && (screen.tscroll == 0) 780 && (screen.tscroll == 0)
784 && (screen.bscroll == (TermWin.nrow - 1))) 781 && (screen.bscroll == (TermWin.nrow - 1)))
785 { 782 {
786 /* _at least_ this many lines need to be scrolled */ 783 /* _at least_ this many lines need to be scrolled */
… …
789 } 786 }
790 } 787 }
791#ifdef DEBUG_STRICT 788#ifdef DEBUG_STRICT
792 assert (screen.cur.col < last_col); 789 assert (screen.cur.col < last_col);
793 assert ((screen.cur.row < TermWin.nrow) 790 assert ((screen.cur.row < TermWin.nrow)
794 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 791 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
795#else /* drive with your eyes closed */ 792#else /* drive with your eyes closed */
796 MIN_IT (screen.cur.col, last_col - 1); 793 MIN_IT (screen.cur.col, last_col - 1);
797 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 794 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
798 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 795 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
799#endif 796#endif
… …
810 c = *str++; 807 c = *str++;
811 808
812 if (c < 0x20) 809 if (c < 0x20)
813 switch (c) 810 switch (c)
814 { 811 {
815 case '\t': 812 case C0_HT:
816 scr_tab (1); 813 scr_tab (1);
817 continue; 814 continue;
818 815
819 case '\n': 816 case C0_LF:
820 if (screen.tlen[row] != -1) /* XXX: think about this */ 817 if (screen.tlen[row] != -1) /* XXX: think about this */
821 MAX_IT (screen.tlen[row], screen.cur.col); 818 MAX_IT (screen.tlen[row], screen.cur.col);
822 819
823 screen.flags &= ~Screen_WrapNext; 820 screen.flags &= ~Screen_WrapNext;
824 821
… …
829 826
830 stp = screen.text[row]; /* _must_ refresh */ 827 stp = screen.text[row]; /* _must_ refresh */
831 srp = screen.rend[row]; /* _must_ refresh */ 828 srp = screen.rend[row]; /* _must_ refresh */
832 continue; 829 continue;
833 830
834 case '\r': 831 case C0_CR:
835 if (screen.tlen[row] != -1) /* XXX: think about this */ 832 if (screen.tlen[row] != -1) /* XXX: think about this */
836 MAX_IT (screen.tlen[row], screen.cur.col); 833 MAX_IT (screen.tlen[row], screen.cur.col);
837 834
838 screen.flags &= ~Screen_WrapNext; 835 screen.flags &= ~Screen_WrapNext;
839 screen.cur.col = 0; 836 screen.cur.col = 0;
… …
866 scr_insdel_chars (1, INSERT); 863 scr_insdel_chars (1, INSERT);
867 864
868 // rely on wcwidth to tell us the character width, at least for non-latin1 865 // rely on wcwidth to tell us the character width, at least for non-latin1
869 // do wcwidth before further replacements, as wcwidth says that line-drawing 866 // do wcwidth before further replacements, as wcwidth says that line-drawing
870 // characters have width -1 (DOH!) on GNU/Linux sometimes. 867 // characters have width -1 (DOH!) on GNU/Linux sometimes.
871 int width = c < 256 ? 1 : wcwidth (c); 868 int width = c < 0x100 ? 1 : wcwidth (c);
872 869
873 if (charsets[screen.charset] == '0') // DEC SPECIAL 870 if (charsets[screen.charset] == '0') // DEC SPECIAL
874 { 871 {
875 // vt100 special graphics and line drawing 872 // vt100 special graphics and line drawing
876 static uint16_t vt100_0[32] = { // 5f .. 7e 873 static uint16_t vt100_0[32] = { // 5f .. 7e
… …
885 c = vt100_0[c - 0x5f]; 882 c = vt100_0[c - 0x5f];
886 width = 1; 883 width = 1;
887 } 884 }
888 } 885 }
889 886
890 if (width > 0) 887 if (width != 0)
891 { 888 {
892#if !UNICODE_3 && ENABLE_COMBINING 889#if !UNICODE_3 && ENABLE_COMBINING
893 // trim characters we can't store directly :( 890 // trim characters we can't store directly :(
894 if (c >= 0x10000) 891 if (c >= 0x10000)
895 c = rxvt_composite.compose (c); // map to lower 16 bits 892 c = rxvt_composite.compose (c); // map to lower 16 bits
896#endif 893#endif
897 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 894 bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0);
895 rend_t rend = SET_FONT (rstyle,
896 c > 0x7f || bold || c < 0x20
897 ? TermWin.fontset->find_font (c, bold)
898 : TermWin.ascii_map [c - 0x20]);
898 899
899 do 900 do
900 { 901 {
901 stp[screen.cur.col] = c; 902 stp[screen.cur.col] = c;
902 srp[screen.cur.col] = rend; 903 srp[screen.cur.col] = rend;
… …
987 */ 988 */
988void 989void
989rxvt_term::scr_backspace () 990rxvt_term::scr_backspace ()
990{ 991{
991 want_refresh = 1; 992 want_refresh = 1;
993
992 if (screen.cur.col == 0) 994 if (screen.cur.col == 0)
993 { 995 {
994 if (screen.cur.row > 0) 996 if (screen.cur.row > 0)
995 { 997 {
996#ifdef TERMCAP_HAS_BW 998#ifdef TERMCAP_HAS_BW
… …
1001 1003
1002 } 1004 }
1003 } 1005 }
1004 else if ((screen.flags & Screen_WrapNext) == 0) 1006 else if ((screen.flags & Screen_WrapNext) == 0)
1005 scr_gotorc (0, -1, RELATIVE); 1007 scr_gotorc (0, -1, RELATIVE);
1008
1006 screen.flags &= ~Screen_WrapNext; 1009 screen.flags &= ~Screen_WrapNext;
1007} 1010}
1008 1011
1009/* ------------------------------------------------------------------------- */ 1012/* ------------------------------------------------------------------------- */
1010/* 1013/*
… …
1114 want_refresh = 1; 1117 want_refresh = 1;
1115 ZERO_SCROLLBACK (); 1118 ZERO_SCROLLBACK ();
1116 1119
1117 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); 1120 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col));
1118 1121
1119 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1122 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1120 : col);
1121 MAX_IT (screen.cur.col, 0); 1123 MAX_IT (screen.cur.col, 0);
1122 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1124 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1123 1125
1124 screen.flags &= ~Screen_WrapNext; 1126 screen.flags &= ~Screen_WrapNext;
1125 if (relative & R_RELATIVE) 1127 if (relative & R_RELATIVE)
… …
1164 * direction should be UP or DN 1166 * direction should be UP or DN
1165 */ 1167 */
1166void 1168void
1167rxvt_term::scr_index (enum page_dirn direction) 1169rxvt_term::scr_index (enum page_dirn direction)
1168{ 1170{
1169 int dirn; 1171 int dirn;
1170 1172
1171 want_refresh = 1; 1173 want_refresh = 1;
1172 dirn = ((direction == UP) ? 1 : -1); 1174 dirn = ((direction == UP) ? 1 : -1);
1173 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); 1175 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1174 1176
… …
1234 default: 1236 default:
1235 return; 1237 return;
1236 } 1238 }
1237 1239
1238 if (screen.text[row]) 1240 if (screen.text[row])
1239 scr_blank_line (& (screen.text[row][col]), 1241 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1240 & (screen.rend[row][col]), num, rstyle);
1241 else 1242 else
1242 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1243 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1243} 1244}
1244 1245
1245/* ------------------------------------------------------------------------- */ 1246/* ------------------------------------------------------------------------- */
… …
1283 break; 1284 break;
1284 default: 1285 default:
1285 return; 1286 return;
1286 } 1287 }
1287 1288
1288 refresh_type |= REFRESH_BOUNDS;
1289
1290 if (selection.op && current_screen == selection.screen 1289 if (selection.op && current_screen == selection.screen
1291 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1290 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1292 || (selection.end.row >= row 1291 || (selection.end.row >= row
1293 && selection.end.row <= row + num))) 1292 && selection.end.row <= row + num)))
1294 CLEAR_SELECTION (); 1293 CLEAR_SELECTION ();
… …
1517 */ 1516 */
1518void 1517void
1519rxvt_term::scr_cursor_visible (int mode) 1518rxvt_term::scr_cursor_visible (int mode)
1520{ 1519{
1521 want_refresh = 1; 1520 want_refresh = 1;
1521
1522 if (mode) 1522 if (mode)
1523 screen.flags |= Screen_VisibleCursor; 1523 screen.flags |= Screen_VisibleCursor;
1524 else 1524 else
1525 screen.flags &= ~Screen_VisibleCursor; 1525 screen.flags &= ~Screen_VisibleCursor;
1526} 1526}
… …
1740 row_col_t rc[RC_COUNT]; 1740 row_col_t rc[RC_COUNT];
1741 1741
1742 if (drawn_text == NULL) /* sanity check */ 1742 if (drawn_text == NULL) /* sanity check */
1743 return; 1743 return;
1744 1744
1745#ifndef NO_SLOW_LINK_SUPPORT
1746 if (refresh_type == FAST_REFRESH && !display->is_local)
1747 {
1748 y = 0;
1749 height = TermWin.height;
1750 }
1751#endif
1752
1745#ifdef DEBUG_STRICT 1753#ifdef DEBUG_STRICT
1746 x = max (x, (int)TermWin.int_bwidth); 1754 x = max (x, 0);
1747 x = min (x, (int)TermWin.width); 1755 x = min (x, (int)TermWin.width);
1748 y = max (y, (int)TermWin.int_bwidth); 1756 y = max (y, 0);
1749 y = min (y, (int)TermWin.height); 1757 y = min (y, (int)TermWin.height);
1750#endif 1758#endif
1751 1759
1752 /* round down */ 1760 /* round down */
1753 rc[PART_BEG].col = Pixel2Col (x); 1761 rc[PART_BEG].col = Pixel2Col (x);
… …
1764 } 1772 }
1765 1773
1766 D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); 1774 D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row));
1767 1775
1768 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1776 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1769 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, 1777 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1770 (rc[PART_END].col - rc[PART_BEG].col + 1));
1771 1778
1772 if (refresh) 1779 if (refresh)
1773 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1780 scr_refresh (SLOW_REFRESH);
1774} 1781}
1775 1782
1776/* ------------------------------------------------------------------------- */ 1783/* ------------------------------------------------------------------------- */
1777/* 1784/*
1778 * Refresh the entire screen 1785 * Refresh the entire screen
… …
1813 * direction should be UP or DN 1820 * direction should be UP or DN
1814 */ 1821 */
1815int 1822int
1816rxvt_term::scr_page (enum page_dirn direction, int nlines) 1823rxvt_term::scr_page (enum page_dirn direction, int nlines)
1817{ 1824{
1818 int n; 1825 int n;
1819 uint16_t oldviewstart; 1826 uint16_t oldviewstart;
1820 1827
1821 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); 1828 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1822#ifdef DEBUG_STRICT 1829#ifdef DEBUG_STRICT
1823 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1830 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1824#endif 1831#endif
… …
1842 if (TermWin.view_start != oldviewstart) 1849 if (TermWin.view_start != oldviewstart)
1843 { 1850 {
1844 want_refresh = 1; 1851 want_refresh = 1;
1845 num_scr -= (TermWin.view_start - oldviewstart); 1852 num_scr -= (TermWin.view_start - oldviewstart);
1846 } 1853 }
1854
1847 return (int) (TermWin.view_start - oldviewstart); 1855 return (int) (TermWin.view_start - oldviewstart);
1848} 1856}
1849 1857
1850/* ------------------------------------------------------------------------- */ 1858/* ------------------------------------------------------------------------- */
1851void 1859void
… …
1919 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1927 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1920 1928
1921void 1929void
1922rxvt_term::scr_refresh (unsigned char refresh_type) 1930rxvt_term::scr_refresh (unsigned char refresh_type)
1923{ 1931{
1924 unsigned char clearfirst, /* first character writes before cell */
1925 clearlast, /* last character writes beyond cell */
1926 must_clear, /* use draw_string not draw_image_string */ 1932 unsigned char must_clear, /* use draw_string not draw_image_string */
1927 rvid, /* reverse video this position */ 1933 rvid, /* reverse video this position */
1928 showcursor; /* show the cursor */ 1934 showcursor; /* show the cursor */
1929 int16_t col, row, /* column/row we're processing */ 1935 int16_t col, row, /* column/row we're processing */
1930 ocrow; /* old cursor row */ 1936 ocrow; /* old cursor row */
1931 int i, /* tmp */ 1937 int i, /* tmp */
… …
1940 return; 1946 return;
1941 1947
1942 /* 1948 /*
1943 * A: set up vars 1949 * A: set up vars
1944 */ 1950 */
1945 clearfirst = clearlast = must_clear = 0; 1951 must_clear = 0;
1946 1952
1947 refresh_count = 0; 1953 refresh_count = 0;
1948 1954
1949 row_offset = TermWin.saveLines - TermWin.view_start; 1955 row_offset = TermWin.saveLines - TermWin.view_start;
1950
1951 if ((refresh_type & REFRESH_BOUNDS))
1952 {
1953 clearfirst = clearlast = 1;
1954 refresh_type &= ~REFRESH_BOUNDS;
1955 }
1956 1956
1957#ifdef XPM_BACKGROUND 1957#ifdef XPM_BACKGROUND
1958 must_clear |= (bgPixmap.pixmap != None); 1958 must_clear |= (bgPixmap.pixmap != None);
1959#endif 1959#endif
1960#ifdef TRANSPARENT 1960#ifdef TRANSPARENT
… …
2048 /* 2048 /*
2049 * D: CopyArea pass - very useful for slower links 2049 * D: CopyArea pass - very useful for slower links
2050 * This has been deliberately kept simple. 2050 * This has been deliberately kept simple.
2051 */ 2051 */
2052 i = num_scr; 2052 i = num_scr;
2053 if (!display->is_local
2053 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2054 && refresh_type == FAST_REFRESH && num_scr_allow && i
2054 && abs (i) < TermWin.nrow && !must_clear) 2055 && abs (i) < TermWin.nrow && !must_clear)
2055 { 2056 {
2056 int16_t nits; 2057 int16_t nits;
2057 int j; 2058 int j;
2058 rend_t *drp2; 2059 rend_t *drp2;
… …
2200 rend = GET_ATTR (rend); 2201 rend = GET_ATTR (rend);
2201 2202
2202 rvid = !!(rend & RS_RVid); 2203 rvid = !!(rend & RS_RVid);
2203 2204
2204#ifndef NO_BOLD_UNDERLINE_REVERSE 2205#ifndef NO_BOLD_UNDERLINE_REVERSE
2205 if (rend & RS_Bold && fore == Color_fg) 2206 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold))
2206 { 2207 {
2207 if (ISSET_PIXCOLOR (Color_BD)) 2208 if (ISSET_PIXCOLOR (Color_BD))
2208 fore = Color_BD; 2209 fore = Color_BD;
2209 else 2210 else
2210 rvid = !rvid; 2211 rvid = !rvid;
… …
2228 back = Color_RV; 2229 back = Color_RV;
2229#endif 2230#endif
2230 } 2231 }
2231 2232
2232#ifdef TEXT_BLINK 2233#ifdef TEXT_BLINK
2233 if (rend & RS_Blink && back == Color_bg) 2234 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2234 { 2235 {
2235 if (!text_blink_ev.active) 2236 if (!text_blink_ev.active)
2236 { 2237 {
2237 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2238 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2238 hidden_text = 0; 2239 hidden_text = 0;
… …
2268 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2269 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2269 } 2270 }
2270 else 2271 else
2271 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2272 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2272 2273
2273 if ((rend & RS_Uline) && (font->descent > 1)) 2274 if (rend & RS_Uline && font->descent > 1 && fore != back)
2274 XDrawLine (display->display, drawBuffer, TermWin.gc, 2275 XDrawLine (display->display, drawBuffer, TermWin.gc,
2275 xpixel, ypixel + font->ascent + 1, 2276 xpixel, ypixel + font->ascent + 1,
2276 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2277 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2277 } /* for (col....) */ 2278 } /* for (col....) */
2278 } /* for (row....) */ 2279 } /* for (row....) */
… …
2313 /* 2314 /*
2314 * H: cleanup selection 2315 * H: cleanup selection
2315 */ 2316 */
2316 scr_reverse_selection (); 2317 scr_reverse_selection ();
2317 2318
2318 /*
2319 * I: other general cleanup
2320 */
2321 if (clearfirst && TermWin.int_bwidth)
2322 /*
2323 * clear the whole screen height, note that width == 0 is treated
2324 * specially by XClearArea
2325 */
2326 XClearArea (display->display, TermWin.vt, 0, 0,
2327 (unsigned int)TermWin.int_bwidth,
2328 (unsigned int)TermWin_TotalHeight (), False);
2329
2330 if (clearlast && TermWin.int_bwidth)
2331 /*
2332 * clear the whole screen height, note that width == 0 is treated
2333 * specially by XClearArea
2334 */
2335 XClearArea (display->display, TermWin.vt,
2336 TermWin.width + TermWin.int_bwidth, 0,
2337 (unsigned int)TermWin.int_bwidth,
2338 (unsigned int)TermWin_TotalHeight (), False);
2339
2340 if (refresh_type & SMOOTH_REFRESH) 2319 if (refresh_type & SMOOTH_REFRESH)
2341 XSync (display->display, False); 2320 XFlush (display->display);
2342 2321
2343 num_scr = 0; 2322 num_scr = 0;
2344 num_scr_allow = 1; 2323 num_scr_allow = 1;
2345 want_refresh = 0; /* screen is current */ 2324 want_refresh = 0; /* screen is current */
2346} 2325}
… …
2517 { 2496 {
2518 n = min (len - i, PROP_SIZE); 2497 n = min (len - i, PROP_SIZE);
2519 MEMCPY (ds, data + i, n); 2498 MEMCPY (ds, data + i, n);
2520 2499
2521 for (j = 0; j < n; j++) 2500 for (j = 0; j < n; j++)
2522 if (ds[j] == '\n') 2501 if (ds[j] == C0_LF)
2523 ds[j] = '\r'; 2502 ds[j] = C0_CR;
2524 2503
2525 tt_write (ds, (int)n); 2504 tt_write (ds, (int)n);
2526 } 2505 }
2527 2506
2528 free (ds); 2507 free (ds);
… …
2609 2588
2610 nread += ct.nitems; 2589 nread += ct.nitems;
2611 2590
2612 char **cl; 2591 char **cl;
2613 int cr; 2592 int cr;
2614 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2593 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2615 &cr) >= 0 && cl)
2616 { 2594 {
2617 for (int i = 0; i < cr; i++) 2595 for (int i = 0; i < cr; i++)
2618 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2596 paste ((unsigned char *)cl[i], STRLEN (cl[i]));
2619 2597
2620 XFreeStringList (cl); 2598 XFreeStringList (cl);
… …
2879 else 2857 else
2880 new_selection_text[ofs++] = *t++; 2858 new_selection_text[ofs++] = *t++;
2881 } 2859 }
2882 2860
2883 if (screen.tlen[row] != -1 && row != end_row) 2861 if (screen.tlen[row] != -1 && row != end_row)
2884 new_selection_text[ofs++] = L'\n'; 2862 new_selection_text[ofs++] = C0_LF;
2885 } 2863 }
2886 2864
2887 if (end_col != selection.end.col) 2865 if (end_col != selection.end.col)
2888 new_selection_text[ofs++] = L'\n'; 2866 new_selection_text[ofs++] = C0_LF;
2889 2867
2890 new_selection_text[ofs] = 0; 2868 new_selection_text[ofs] = 0;
2891 2869
2892 if (ofs == 0) 2870 if (ofs == 0)
2893 { 2871 {
… …
3120 * Extend the selection to the specified col/row 3098 * Extend the selection to the specified col/row
3121 */ 3099 */
3122void 3100void
3123rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3101rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3124{ 3102{
3125 int16_t ncol = TermWin.ncol; 3103 int16_t ncol = TermWin.ncol;
3126 int end_col; 3104 int end_col;
3127 row_col_t pos; 3105 row_col_t pos;
3128 enum { 3106 enum {
3129 LEFT, RIGHT 3107 LEFT, RIGHT
3130 } closeto = RIGHT; 3108 } closeto = RIGHT;
3131 3109
3132 D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); 3110 D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op));
… …
3515 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3493 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace;
3516} 3494}
3517 3495
3518#endif 3496#endif
3519/* ------------------------------------------------------------------------- */ 3497/* ------------------------------------------------------------------------- */
3520
3521/* ------------------------------------------------------------------------- *
3522 * DEBUG ROUTINES *
3523 * ------------------------------------------------------------------------- */
3524#if 0
3525void
3526rxvt_debug_colors (void)
3527{
3528 int color;
3529 const char *name[] =
3530 {
3531 "fg", "bg",
3532 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3533 };
3534
3535 fprintf (stderr, "Color ( ");
3536 if (rstyle & RS_RVid)
3537 fprintf (stderr, "rvid ");
3538 if (rstyle & RS_Bold)
3539 fprintf (stderr, "bold ");
3540 if (rstyle & RS_Blink)
3541 fprintf (stderr, "blink ");
3542 if (rstyle & RS_Uline)
3543 fprintf (stderr, "uline ");
3544 fprintf (stderr, "): ");
3545
3546 color = GET_FGCOLOR (rstyle);
3547#ifndef NO_BRIGHTCOLOR
3548 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3549 {
3550 color -= (minBrightCOLOR - minCOLOR);
3551 fprintf (stderr, "bright ");
3552 }
3553#endif
3554 fprintf (stderr, "%s on ", name[color]);
3555
3556 color = GET_BGCOLOR (rstyle);
3557#ifndef NO_BRIGHTCOLOR
3558 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3559 {
3560 color -= (minBrightCOLOR - minCOLOR);
3561 fprintf (stderr, "bright ");
3562 }
3563#endif
3564 fprintf (stderr, "%s\n", name[color]);
3565}
3566#endif

Diff Legend

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