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.149 by root, Mon Dec 13 06:44:18 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 *
… …
23/* 23/*
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#define INTERN_SCREEN
29#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
30#include "screen.intpro" /* PROTOS for internal routines */
31 29
32#include <X11/Xmd.h> /* get the typedef for CARD32 */ 30#include <X11/Xmd.h> /* get the typedef for CARD32 */
33 31
34#include <stdint.h> 32#include <inttypes.h>
35#include <wchar.h> 33#include <wchar.h>
36 34
37#include "salloc.C" // HACK, should be a seperate compile! 35#include "salloc.C" // HACK, should be a seperate compile!
38 36
39inline void fill_text (text_t *start, text_t value, int len) 37inline void fill_text (text_t *start, text_t value, int len)
… …
41 while (len--) 39 while (len--)
42 *start++ = value; 40 *start++ = value;
43} 41}
44 42
45/* ------------------------------------------------------------------------- */ 43/* ------------------------------------------------------------------------- */
46#define PROP_SIZE 16384 44#define PROP_SIZE 256*1024
45#define PASTE_SIZE 32768
47#define TABSIZE 8 /* default tab size */ 46#define TABSIZE 8 /* default tab size */
48 47
49/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
50 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
51 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
52#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
53 if ((Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ 52 if (options & Opt_scrollTtyOutput) \
54 TermWin.view_start = 0 53 TermWin.view_start = 0
55#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
56 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
57 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
58#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
59 selection.beg.row = selection.beg.col \ 58 selection.beg.row = selection.beg.col \
60 = selection.mark.row = selection.mark.col \ 59 = selection.mark.row = selection.mark.col \
61 = selection.end.row = selection.end.col = 0 60 = selection.end.row = selection.end.col = 0
62 61
63#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 62#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
64 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 63 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
65#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 64#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
66 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 65 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
67#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ 66#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \
68 (((A) == (C)) && ((B) > (D))) 67 (((A) == (C)) && ((B) > (D)))
69#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ 68#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \
70 (((A) == (C)) && ((B) >= (D))) 69 (((A) == (C)) && ((B) >= (D)))
71#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ 70#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \
72 (((A) == (C)) && ((B) < (D))) 71 (((A) == (C)) && ((B) < (D)))
73#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ 72#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \
74 (((A) == (C)) && ((B) <= (D))) 73 (((A) == (C)) && ((B) <= (D)))
75 74
76/* these must be row_col_t */ 75/* these must be row_col_t */
77#define ROWCOL_IS_AFTER(X, Y) \ 76#define ROWCOL_IS_AFTER(X, Y) \
78 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col) 77 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col)
79#define ROWCOL_IS_BEFORE(X, Y) \ 78#define ROWCOL_IS_BEFORE(X, Y) \
80 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 79 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
81#define ROWCOL_IN_ROW_AFTER(X, Y) \ 80#define ROWCOL_IN_ROW_AFTER(X, Y) \
82 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col) 81 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col)
83#define ROWCOL_IN_ROW_BEFORE(X, Y) \ 82#define ROWCOL_IN_ROW_BEFORE(X, Y) \
84 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 84#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) 85 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) \ 86#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) 87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
89 88
90/* 89/*
91 * CLEAR_ROWS : clear <num> rows starting from row <row> 90 * CLEAR_ROWS : clear <num> rows starting from row <row>
92 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 91 * 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 92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
94 */ 93 */
95#define drawBuffer TermWin.vt 94#define drawBuffer TermWin.vt
96 95
97#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
98 if (TermWin.mapped) \ 97 if (TermWin.mapped) \
99 XClearArea (display->display, drawBuffer, TermWin.int_bwidth, \ 98 XClearArea (display->display, drawBuffer, 0, \
100 Row2Pixel (row), (unsigned int)TermWin.width, \ 99 Row2Pixel (row), (unsigned int)TermWin.width, \
101 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
102 101
103#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
104 if (TermWin.mapped) \ 103 if (TermWin.mapped) \
105 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (display->display, drawBuffer, x, y, \
106 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
107 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
108 107
109#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
110 XFillRectangle (display->display, drawBuffer, TermWin.gc, \ 109 XFillRectangle (display->display, drawBuffer, TermWin.gc, \
111 TermWin.int_bwidth, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
112 (unsigned int)TermWin.width, \ 111 (unsigned int)TermWin.width, \
113 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
114 113
115/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
116 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
117 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
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, FONTSET (efs)->find_font (' '));
124 124
125 while (width--) 125 while (width--)
126 { 126 {
127 *et++ = ' '; 127 *et++ = ' ';
128 *er++ = efs; 128 *er++ = efs;
… …
155 unsigned int ncol, nrow, total_rows, prev_total_rows; 155 unsigned int ncol, nrow, total_rows, prev_total_rows;
156 unsigned int p, q; 156 unsigned int p, q;
157 int k; 157 int k;
158 rend_t setrstyle; 158 rend_t setrstyle;
159 159
160 D_SCREEN ((stderr, "rxvt_scr_reset ()")); 160#if ENABLE_OVERLAY
161 scr_overlay_off ();
162#endif
161 163
162 TermWin.view_start = 0; 164 TermWin.view_start = 0;
163 num_scr = 0; 165 num_scr = 0;
164 166
165 if (TermWin.ncol == 0) 167 if (TermWin.ncol == 0)
… …
172 nrow = TermWin.nrow; 174 nrow = TermWin.nrow;
173 175
174 if (ncol == prev_ncol && nrow == prev_nrow) 176 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 177 return;
176 178
179 // we need at least two lines for wrapping to work correctly
180 if (nrow + TermWin.saveLines < 2)
181 {
182 TermWin.saveLines++;
183 prev_nrow--;
184 TermWin.nscrolled++;
185 }
186
177 want_refresh = 1; 187 want_refresh = 1;
178 188
189 prev_total_rows = prev_nrow + TermWin.saveLines;
179 total_rows = nrow + TermWin.saveLines; 190 total_rows = nrow + TermWin.saveLines;
180 prev_total_rows = prev_nrow + TermWin.saveLines;
181 191
182 screen.tscroll = 0; 192 screen.tscroll = 0;
183 screen.bscroll = nrow - 1; 193 screen.bscroll = nrow - 1;
184 194
185 if (!talloc) 195 if (!talloc)
186 { 196 {
187 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 197 talloc = new rxvt_salloc (ncol * sizeof (text_t));
188 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 198 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
189 } 199 }
190 200
191 if (prev_nrow == 0) 201 if (!screen.text)
192 { 202 {
193 /* 203 /*
194 * first time called so just malloc everything : don't rely on realloc 204 * 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 205 * Note: this is still needed so that all the scrollback lines are NULL
196 */ 206 */
197 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 207 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
198 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 208 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
199 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 209 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
… …
214 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 224 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);
215 screen.tlen[q] = swap.tlen[p] = 0; 225 screen.tlen[q] = swap.tlen[p] = 0;
216 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 226 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);
217 } 227 }
218 228
219 MEMSET (charsets, 'B', sizeof (charsets)); 229 memset (charsets, 'B', sizeof (charsets));
220 TermWin.nscrolled = 0; /* no saved lines */ 230 TermWin.nscrolled = 0; /* no saved lines */
221 rstyle = DEFAULT_RSTYLE; 231 rstyle = DEFAULT_RSTYLE;
222 screen.flags = Screen_DefaultFlags; 232 screen.flags = Screen_DefaultFlags;
223 screen.cur.row = screen.cur.col = 0; 233 screen.cur.row = screen.cur.col = 0;
224 screen.charset = 0; 234 screen.charset = 0;
… …
256 scr_scroll_text (0, (int)prev_nrow - 1, k, 1); 266 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
257 267
258 for (p = nrow; p < prev_nrow; p++) 268 for (p = nrow; p < prev_nrow; p++)
259 { 269 {
260 q = p + TermWin.saveLines; 270 q = p + TermWin.saveLines;
271
261 if (screen.text[q]) 272 if (screen.text[q])
262 { 273 {
263#ifdef DEBUG_STRICT 274#ifdef DEBUG_STRICT
264 assert (screen.rend[q]); 275 assert (screen.rend[q]);
265#endif 276#endif
266 talloc->free (screen.text[q]); 277 talloc->free (screen.text[q]);
267 ralloc->free (screen.rend[q]); 278 ralloc->free (screen.rend[q]);
268 } 279 }
280
269 if (swap.text[p]) 281 if (swap.text[p])
270 { 282 {
271#ifdef DEBUG_STRICT 283#ifdef DEBUG_STRICT
272 assert (swap.rend[p]); 284 assert (swap.rend[p]);
273#endif 285#endif
274 talloc->free (swap.text[p]); 286 talloc->free (swap.text[p]);
275 ralloc->free (swap.rend[p]); 287 ralloc->free (swap.rend[p]);
276 } 288 }
289
277#ifdef DEBUG_STRICT 290#ifdef DEBUG_STRICT
278 assert (drawn_text[p] && drawn_rend[p]); 291 assert (drawn_text[p] && drawn_rend[p]);
279#endif 292#endif
280 talloc->free (drawn_text[p]); 293 talloc->free (drawn_text[p]);
281 ralloc->free (drawn_rend[p]); 294 ralloc->free (drawn_rend[p]);
… …
311 swap.tlen[p] = 0; 324 swap.tlen[p] = 0;
312 swap.text[p] = NULL; 325 swap.text[p] = NULL;
313 swap.rend[p] = NULL; 326 swap.rend[p] = NULL;
314 drawn_text[p] = NULL; 327 drawn_text[p] = NULL;
315 drawn_rend[p] = NULL; 328 drawn_rend[p] = NULL;
316 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); 329 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
317 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); 330 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
318 } 331 }
319 332
320 if (k > 0) 333 if (k > 0)
321 { 334 {
… …
336 } 349 }
337 350
338 /* resize columns */ 351 /* resize columns */
339 if (ncol != prev_ncol) 352 if (ncol != prev_ncol)
340 { 353 {
341 int common = min (prev_ncol, ncol);
342 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); 354 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
343 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); 355 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
344 356
345 for (p = 0; p < total_rows; p++) 357 for (p = 0; p < total_rows; p++)
346 { 358 {
347 if (screen.text[p]) 359 if (screen.text[p])
348 { 360 {
349 text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t; 361 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; 362 screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
351 363
352 MIN_IT (screen.tlen[p], (int16_t)ncol); 364 MIN_IT (screen.tlen[p], (int16_t)ncol);
353 365
354 if (ncol > prev_ncol) 366 if (ncol > prev_ncol)
355 scr_blank_line (& (screen.text[p][prev_ncol]), 367 scr_blank_line (&screen.text[p][prev_ncol],
356 & (screen.rend[p][prev_ncol]), 368 &screen.rend[p][prev_ncol],
357 ncol - prev_ncol, 369 ncol - prev_ncol, setrstyle);
358 setrstyle);
359 } 370 }
360 } 371 }
361 372
362 for (p = 0; p < nrow; p++) 373 for (p = 0; p < nrow; p++)
363 { 374 {
364 text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t; 375 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; 376 drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
366 377
367 if (ncol > prev_ncol) 378 if (ncol > prev_ncol)
368 scr_blank_line (& (drawn_text[p][prev_ncol]), 379 scr_blank_line (&drawn_text[p][prev_ncol],
369 & (drawn_rend[p][prev_ncol]), 380 &drawn_rend[p][prev_ncol],
370 ncol - prev_ncol, setrstyle); 381 ncol - prev_ncol, setrstyle);
371 382
372 if (swap.text[p]) 383 if (swap.text[p])
373 { 384 {
374 text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t; 385 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; 386 swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
376 387
377 MIN_IT (swap.tlen[p], (int16_t)ncol); 388 MIN_IT (swap.tlen[p], (int16_t)ncol);
378 389
379 if (ncol > prev_ncol) 390 if (ncol > prev_ncol)
380 scr_blank_line (& (swap.text[p][prev_ncol]), 391 scr_blank_line (&swap.text[p][prev_ncol],
381 & (swap.rend[p][prev_ncol]), 392 &swap.rend[p][prev_ncol],
382 ncol - prev_ncol, setrstyle); 393 ncol - prev_ncol, setrstyle);
383 } 394 }
384 395
385 } 396 }
386 397
… …
407} 418}
408 419
409void 420void
410rxvt_term::scr_reset_realloc () 421rxvt_term::scr_reset_realloc ()
411{ 422{
412 uint16_t total_rows, nrow; 423 unsigned int total_rows, nrow;
413 424
414 nrow = TermWin.nrow; 425 nrow = TermWin.nrow;
415 total_rows = nrow + TermWin.saveLines; 426 total_rows = nrow + TermWin.saveLines;
416 /* *INDENT-OFF* */ 427 /* *INDENT-OFF* */
417 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); 428 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
… …
434 * Free everything. That way malloc debugging can find leakage. 445 * Free everything. That way malloc debugging can find leakage.
435 */ 446 */
436void 447void
437rxvt_term::scr_release () 448rxvt_term::scr_release ()
438{ 449{
439 uint16_t total_rows; 450 unsigned int total_rows;
440 int i; 451 int i;
441 452
442 total_rows = TermWin.nrow + TermWin.saveLines; 453 total_rows = TermWin.nrow + TermWin.saveLines;
443 454
444 delete talloc; talloc = 0; 455 delete talloc; talloc = 0;
… …
470 * Hard reset 481 * Hard reset
471 */ 482 */
472void 483void
473rxvt_term::scr_poweron () 484rxvt_term::scr_poweron ()
474{ 485{
475 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
476
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 *
… …
492 */ 501 */
493void 502void
494rxvt_term::scr_cursor (int mode) 503rxvt_term::scr_cursor (int mode)
495{ 504{
496 screen_t *s; 505 screen_t *s;
497
498 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
499 506
500#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 507#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
501 if (current_screen == SECONDARY) 508 if (current_screen == SECONDARY)
502 s = &swap; 509 s = &swap;
503 else 510 else
… …
505 s = &screen; 512 s = &screen;
506 513
507 switch (mode) 514 switch (mode)
508 { 515 {
509 case SAVE: 516 case SAVE:
510 s->s_cur.row = s->cur.row; 517 s->s_cur.row = screen.cur.row;
511 s->s_cur.col = s->cur.col; 518 s->s_cur.col = screen.cur.col;
512 s->s_rstyle = rstyle; 519 s->s_rstyle = rstyle;
513 s->s_charset = s->charset; 520 s->s_charset = screen.charset;
514 s->s_charset_char = charsets[s->charset]; 521 s->s_charset_char = charsets[screen.charset];
515 break; 522 break;
523
516 case RESTORE: 524 case RESTORE:
517 want_refresh = 1; 525 want_refresh = 1;
518 s->cur.row = s->s_cur.row; 526 screen.cur.row = s->s_cur.row;
519 s->cur.col = s->s_cur.col; 527 screen.cur.col = s->s_cur.col;
520 s->flags &= ~Screen_WrapNext; 528 screen.flags &= ~Screen_WrapNext;
521 rstyle = s->s_rstyle; 529 rstyle = s->s_rstyle;
522 s->charset = s->s_charset; 530 screen.charset = s->s_charset;
523 charsets[s->charset] = s->s_charset_char; 531 charsets[screen.charset] = s->s_charset_char;
524 set_font_style (); 532 set_font_style ();
525 break; 533 break;
526 } 534 }
527 535
528 /* boundary check in case screen size changed between SAVE and RESTORE */ 536 /* boundary check in case screen size changed between SAVE and RESTORE */
… …
551 int offset; 559 int offset;
552#endif 560#endif
553 561
554 want_refresh = 1; 562 want_refresh = 1;
555 563
556 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
557
558 TermWin.view_start = 0; 564 TermWin.view_start = 0;
559 565
560 if (current_screen == scrn) 566 if (current_screen == scrn)
561 return scrn; 567 return scrn;
562 568
563 selection_check (2); /* check for boundary cross */ 569 selection_check (2); /* check for boundary cross */
564 570
565 SWAP_IT (current_screen, scrn, int); 571 SWAP_IT (current_screen, scrn, int);
572
573 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
574 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
575# ifdef DEBUG_STRICT
576 assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow);
577 assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol);
578# else /* drive with your eyes closed */
579 MAX_IT (screen.cur.row, 0);
580 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
581 MAX_IT (screen.cur.col, 0);
582 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
583# endif
584
566#if NSCREENS 585#if NSCREENS
567 if (Options & Opt_secondaryScreen) 586 if (options & Opt_secondaryScreen)
568 { 587 {
569 num_scr = 0; 588 num_scr = 0;
570 offset = TermWin.saveLines; 589 offset = TermWin.saveLines;
590
571 for (i = prev_nrow; i--;) 591 for (i = prev_nrow; i--;)
572 { 592 {
573 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 593 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
574 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 594 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
575 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 595 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
576 } 596 }
577 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 597
578 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
579# ifdef DEBUG_STRICT
580 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
581 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
582# else /* drive with your eyes closed */
583 MAX_IT (screen.cur.row, 0);
584 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
585 MAX_IT (screen.cur.col, 0);
586 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
587# endif
588 SWAP_IT (screen.charset, swap.charset, int16_t); 598 SWAP_IT (screen.charset, swap.charset, int16_t);
589 SWAP_IT (screen.flags, swap.flags, int); 599 SWAP_IT (screen.flags, swap.flags, int);
590 screen.flags |= Screen_VisibleCursor; 600 screen.flags |= Screen_VisibleCursor;
591 swap.flags |= Screen_VisibleCursor; 601 swap.flags |= Screen_VisibleCursor;
592 } 602 }
593 else 603 else
594#endif 604#endif
595 if (Options & Opt_secondaryScroll) 605 if (options & Opt_secondaryScroll)
596 //if (current_screen == PRIMARY)
597 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 606 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
607
598 return scrn; 608 return scrn;
599} 609}
600 610
611// clear WrapNext indicator, solidifying position on next line
612void
613rxvt_term::scr_do_wrap ()
614{
615 if (!(screen.flags & Screen_WrapNext))
616 return;
617
618 screen.flags &= ~Screen_WrapNext;
619
620 screen.cur.col = 0;
621
622 if (screen.cur.row == screen.bscroll)
623 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
624 else if (screen.cur.row < TermWin.nrow - 1)
625 screen.cur.row++;
626}
627
601/* ------------------------------------------------------------------------- */ 628/* ------------------------------------------------------------------------- */
602/* 629/*
603 * Change the colour for following text 630 * Change the colour for following text
604 */ 631 */
605void 632void
606rxvt_term::scr_color (unsigned int color, int fgbg) 633rxvt_term::scr_color (unsigned int color, int fgbg)
607{ 634{
608 color &= RS_fgMask; 635 if (color > maxTermCOLOR)
636 color = fgbg;
637
609 if (fgbg == Color_fg) 638 if (fgbg == Color_fg)
610 rstyle = SET_FGCOLOR (rstyle, color); 639 rstyle = SET_FGCOLOR (rstyle, color);
611 else 640 else
612 rstyle = SET_BGCOLOR (rstyle, color); 641 rstyle = SET_BGCOLOR (rstyle, color);
613} 642}
… …
642 671
643 if (count == 0 || (row1 > row2)) 672 if (count == 0 || (row1 > row2))
644 return 0; 673 return 0;
645 674
646 want_refresh = 1; 675 want_refresh = 1;
647 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
648 676
649 if (row1 == 0 && count > 0 677 if (row1 == 0 && count > 0
650 && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) 678 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
651 { 679 {
652 nscrolled = (long)TermWin.nscrolled + (long)count; 680 nscrolled = (long)TermWin.nscrolled + (long)count;
653 681
654 if (nscrolled > (long)TermWin.saveLines) 682 if (nscrolled > (long)TermWin.saveLines)
655 TermWin.nscrolled = TermWin.saveLines; 683 TermWin.nscrolled = TermWin.saveLines;
656 else 684 else
657 TermWin.nscrolled = (uint16_t)nscrolled; 685 TermWin.nscrolled = (unsigned int)nscrolled;
658 686
659 if ((Options & Opt_scrollWithBuffer) 687 if ((options & Opt_scrollWithBuffer)
660 && TermWin.view_start != 0 688 && TermWin.view_start != 0
661 && TermWin.view_start != TermWin.saveLines) 689 && TermWin.view_start != TermWin.saveLines)
662 scr_page (UP, count); 690 scr_page (UP, count);
663 } 691 }
664 else if (!spec) 692 else if (!spec)
… …
703 if (j > 0) 731 if (j > 0)
704 { 732 {
705 /* A: scroll up */ 733 /* A: scroll up */
706 734
707 /* A1: Copy lines that will get clobbered by the rotation */ 735 /* A1: Copy lines that will get clobbered by the rotation */
736 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
737 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
738
739 /* A2: Rotate lines */
740 i = row2 - row1 - count + 1;
741 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
742 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
743 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
744
745 j = row2 - count + 1, i = count;
746 }
747 else /* if (j < 0) */
748 {
749 /* B: scroll down */
750
751 /* B1: Copy lines that will get clobbered by the rotation */
708 for (i = 0, j = row1; i < count; i++, j++) 752 for (i = 0, j = row2; i < count; i++, j--)
709 { 753 {
710 buf_text[i] = screen.text[j]; 754 buf_text[i] = screen.text[j];
711 buf_rend[i] = screen.rend[j]; 755 buf_rend[i] = screen.rend[j];
712 } 756 }
757
713 /* A2: Rotate lines */ 758 /* B2: Rotate lines */
714 for (j = row1, i = j + count; i <= row2; i++, j++) 759 for (j = row2, i = j - count; i >= row1; i--, j--)
715 { 760 {
716 screen.tlen[j] = screen.tlen[i]; 761 screen.tlen[j] = screen.tlen[i];
717 screen.text[j] = screen.text[i]; 762 screen.text[j] = screen.text[i];
718 screen.rend[j] = screen.rend[i]; 763 screen.rend[j] = screen.rend[i];
719 } 764 }
720 j = row2 - count + 1, i = count;
721 }
722 else /* if (j < 0) */
723 {
724 /* B: scroll down */
725 765
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; 766 j = row1, i = count;
740 count = -count; 767 count = -count;
741 } 768 }
742 769
743 /* C: Resurrect lines */ 770 /* C: Resurrect lines */
771 memset (screen.tlen + j, 0, i * sizeof (int16_t));
772 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
773 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
774 if (!spec) /* line length may not equal TermWin.ncol */
744 for (; i--; j++) 775 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, 776 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
752 (unsigned int)j, rstyle);
753 }
754 777
755 return count; 778 return count;
756} 779}
757 780
758/* ------------------------------------------------------------------------- */ 781/* ------------------------------------------------------------------------- */
… …
760 * Add text given in <str> of length <len> to screen struct 783 * Add text given in <str> of length <len> to screen struct
761 */ 784 */
762void 785void
763rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 786rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
764{ 787{
765 unsigned char checksel, clearsel; 788 unsigned char checksel;
766 unicode_t c; 789 unicode_t c;
767 int i, row, last_col; 790 int i, row, last_col;
768 text_t *stp; 791 text_t *stp;
769 rend_t *srp; 792 rend_t *srp;
770 793
771 if (len <= 0) /* sanity */ 794 if (len <= 0) /* sanity */
772 return; 795 return;
773 796
774 want_refresh = 1; 797 want_refresh = 1;
798 ZERO_SCROLLBACK ();
775 last_col = TermWin.ncol; 799 last_col = TermWin.ncol;
776 800
777 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
778 ZERO_SCROLLBACK ();
779 if (nlines > 0) 801 if (nlines > 0)
780 { 802 {
781 nlines += (screen.cur.row - screen.bscroll); 803 nlines += screen.cur.row - screen.bscroll;
782 if ((nlines > 0) 804 if ((nlines > 0)
783 && (screen.tscroll == 0) 805 && (screen.tscroll == 0)
784 && (screen.bscroll == (TermWin.nrow - 1))) 806 && (screen.bscroll == (TermWin.nrow - 1)))
785 { 807 {
786 /* _at least_ this many lines need to be scrolled */ 808 /* _at least_ this many lines need to be scrolled */
787 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 809 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
788 screen.cur.row -= nlines; 810 screen.cur.row -= nlines;
789 } 811 }
790 } 812 }
813
791#ifdef DEBUG_STRICT 814#ifdef DEBUG_STRICT
792 assert (screen.cur.col < last_col); 815 assert (screen.cur.col < last_col);
793 assert ((screen.cur.row < TermWin.nrow) 816 assert ((screen.cur.row < TermWin.nrow)
794 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 817 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
795#else /* drive with your eyes closed */ 818#else /* drive with your eyes closed */
796 MIN_IT (screen.cur.col, last_col - 1); 819 MIN_IT (screen.cur.col, last_col - 1);
797 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 820 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
798 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 821 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
799#endif 822#endif
800 row = screen.cur.row + TermWin.saveLines; 823 row = screen.cur.row + TermWin.saveLines;
801 824
802 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 825 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
803 clearsel = 0;
804 826
805 stp = screen.text[row]; 827 stp = screen.text[row];
806 srp = screen.rend[row]; 828 srp = screen.rend[row];
807 829
808 while (len--) 830 while (len--)
… …
810 c = *str++; 832 c = *str++;
811 833
812 if (c < 0x20) 834 if (c < 0x20)
813 switch (c) 835 switch (c)
814 { 836 {
815 case '\t': 837 case C0_HT:
816 scr_tab (1); 838 scr_tab (1, true);
817 continue; 839 continue;
818 840
819 case '\n': 841 case C0_LF:
820 if (screen.tlen[row] != -1) /* XXX: think about this */ 842 if (screen.tlen[row] != -1) /* XXX: think about this */
821 MAX_IT (screen.tlen[row], screen.cur.col); 843 MAX_IT (screen.tlen[row], screen.cur.col);
822 844
823 screen.flags &= ~Screen_WrapNext; 845 screen.flags &= ~Screen_WrapNext;
824 846
… …
829 851
830 stp = screen.text[row]; /* _must_ refresh */ 852 stp = screen.text[row]; /* _must_ refresh */
831 srp = screen.rend[row]; /* _must_ refresh */ 853 srp = screen.rend[row]; /* _must_ refresh */
832 continue; 854 continue;
833 855
834 case '\r': 856 case C0_CR:
835 if (screen.tlen[row] != -1) /* XXX: think about this */ 857 if (screen.tlen[row] != -1) /* XXX: think about this */
836 MAX_IT (screen.tlen[row], screen.cur.col); 858 MAX_IT (screen.tlen[row], screen.cur.col);
837 859
838 screen.flags &= ~Screen_WrapNext; 860 screen.flags &= ~Screen_WrapNext;
839 screen.cur.col = 0; 861 screen.cur.col = 0;
… …
843 if (checksel /* see if we're writing within selection */ 865 if (checksel /* see if we're writing within selection */
844 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 866 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
845 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 867 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
846 { 868 {
847 checksel = 0; 869 checksel = 0;
848 clearsel = 1; 870 /*
871 * If we wrote anywhere in the selected area, kill the selection
872 * XXX: should we kill the mark too? Possibly, but maybe that
873 * should be a similar check.
874 */
875 CLEAR_SELECTION ();
849 } 876 }
850 877
851 if (screen.flags & Screen_WrapNext) 878 if (screen.flags & Screen_WrapNext)
852 { 879 {
853 screen.tlen[row] = -1; 880 screen.tlen[row] = -1;
854 if (screen.cur.row == screen.bscroll) 881
855 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
856 else if (screen.cur.row < (TermWin.nrow - 1))
857 row = (++screen.cur.row) + TermWin.saveLines; 882 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;
858 883
859 stp = screen.text[row]; /* _must_ refresh */ 884 stp = screen.text[row]; /* _must_ refresh */
860 srp = screen.rend[row]; /* _must_ refresh */ 885 srp = screen.rend[row]; /* _must_ refresh */
861 screen.cur.col = 0;
862 screen.flags &= ~Screen_WrapNext;
863 } 886 }
864
865 if (screen.flags & Screen_Insert)
866 scr_insdel_chars (1, INSERT);
867 887
868 // rely on wcwidth to tell us the character width, at least for non-latin1 888 // 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 889 // do wcwidth before further replacements, as wcwidth says that line-drawing
870 // characters have width -1 (DOH!) on GNU/Linux sometimes. 890 // characters have width -1 (DOH!) on GNU/Linux sometimes.
871 int width = c < 256 ? 1 : wcwidth (c); 891 int width = c < 0x100 ? 1 : wcwidth (c);
872 892
873 if (charsets[screen.charset] == '0') // DEC SPECIAL 893 if (charsets[screen.charset] == '0') // DEC SPECIAL
874 { 894 {
875 // vt100 special graphics and line drawing 895 // vt100 special graphics and line drawing
896 // 5f-7e standard vt100
897 // 40-5e rxvt extension for extra curses acs chars
876 static uint16_t vt100_0[32] = { // 5f .. 7e 898 static uint16_t vt100_0[63] = { // 40 .. 7e
899 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
901 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
902 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
877 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 903 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
878 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 904 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
879 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 905 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
880 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, 906 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
881 }; 907 };
882 908
883 if (c >= 0x5f && c <= 0x7e) 909 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40])
884 { 910 {
885 c = vt100_0[c - 0x5f]; 911 c = vt100_0[c - 0x40];
886 width = 1; 912 width = 1;
887 } 913 }
888 } 914 }
889 915
916 if (screen.flags & Screen_Insert)
917 scr_insdel_chars (width, INSERT);
918
890 if (width > 0) 919 if (width != 0)
891 { 920 {
892#if !UNICODE_3 && ENABLE_COMBINING 921 // some utf-8 decoders decode surrogate characters.
922 if (0xd800 <= c && c <= 0xdfff)
923 c = 0xfffd;
924
925#if !UNICODE_3
893 // trim characters we can't store directly :( 926 // trim characters we can't store directly :(
894 if (c >= 0x10000) 927 if (c >= 0x10000)
928# if ENABLE_COMBINING
895 c = rxvt_composite.compose (c); // map to lower 16 bits 929 c = rxvt_composite.compose (c); // map to lower 16 bits
930# else
931 c = 0xfffd;
896#endif 932# endif
933#endif
934
935 // nuke the character at this position, if required
936 if (stp[screen.cur.col] == NOCHAR
937 || (screen.cur.col < TermWin.ncol - 1
938 && stp[screen.cur.col + 1] == NOCHAR))
939 {
940 int col = screen.cur.col;
941
942 // find begin
943 while (col > 0 && stp[col] == NOCHAR)
944 col--;
945
946 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' '));
947
948 // found begin, nuke
949 do {
950 stp[col] = ' ';
951 srp[col] = rend;
952 col++;
953 } while (col < TermWin.ncol && stp[col] == NOCHAR);
954 }
955
897 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 956 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
898 957
899 do 958 do
900 { 959 {
901 stp[screen.cur.col] = c; 960 stp[screen.cur.col] = c;
902 srp[screen.cur.col] = rend; 961 srp[screen.cur.col] = rend;
… …
914 c = NOCHAR; 973 c = NOCHAR;
915 } 974 }
916 while (--width > 0); 975 while (--width > 0);
917 976
918 // pad with spaces when overwriting wide character with smaller one 977 // pad with spaces when overwriting wide character with smaller one
978 if (!width)
919 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 979 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
920 { 980 {
921 stp[c] = ' '; 981 stp[c] = ' ';
922 srp[c] = rend; 982 srp[c] = rend;
923 } 983 }
924 } 984 }
925 else if (width == 0) 985 else if (width == 0)
926 { 986 {
927#if ENABLE_COMBINING 987#if ENABLE_COMBINING
928 // handle combining characters 988 // handle combining characters
… …
935 995
936 if (screen.cur.col > 0) 996 if (screen.cur.col > 0)
937 { 997 {
938 tp = stp + screen.cur.col - 1; 998 tp = stp + screen.cur.col - 1;
939 rp = srp + screen.cur.col - 1; 999 rp = srp + screen.cur.col - 1;
1000
1001 while (*tp == NOCHAR && tp > stp)
1002 tp--, rp--;
940 } 1003 }
941 else if (screen.cur.row > 0 1004 else if (screen.cur.row > 0
942 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 1005 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
943 { 1006 {
944 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1007 int line = screen.cur.row - 1 + TermWin.saveLines;
945 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1008
1009 tp = screen.text[line] + last_col - 1;
1010 rp = screen.rend[line] + last_col - 1;
1011
1012 while (*tp == NOCHAR && tp > screen.text[line])
1013 tp--, rp--;
946 } 1014 }
947 else 1015 else
948 continue; 1016 continue;
949
950 // handle double-width-chars by making them look extremely ugly
951 if (*tp == NOCHAR)
952 *tp = ' '; // hack //D //TODO //--tp, --rp;
953 1017
954 // first try to find a precomposed character 1018 // first try to find a precomposed character
955 unicode_t n = rxvt_compose (*tp, c); 1019 unicode_t n = rxvt_compose (*tp, c);
956 if (n == NOCHAR) 1020 if (n == NOCHAR)
957 n = rxvt_composite.compose (*tp, c); 1021 n = rxvt_composite.compose (*tp, c);
958 1022
959 *tp = n; 1023 *tp = n;
960 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 1024 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
961#endif 1025#endif
962 } 1026 }
963 } 1027 }
964 1028
965 if (screen.tlen[row] != -1) /* XXX: think about this */ 1029 if (screen.tlen[row] != -1) /* XXX: think about this */
966 MAX_IT (screen.tlen[row], screen.cur.col); 1030 MAX_IT (screen.tlen[row], screen.cur.col);
967
968 /*
969 * If we wrote anywhere in the selected area, kill the selection
970 * XXX: should we kill the mark too? Possibly, but maybe that
971 * should be a similar check.
972 */
973 if (clearsel)
974 CLEAR_SELECTION ();
975 1031
976#ifdef DEBUG_STRICT 1032#ifdef DEBUG_STRICT
977 assert (screen.cur.row >= 0); 1033 assert (screen.cur.row >= 0);
978#else /* drive with your eyes closed */ 1034#else /* drive with your eyes closed */
979 MAX_IT (screen.cur.row, 0); 1035 MAX_IT (screen.cur.row, 0);
… …
987 */ 1043 */
988void 1044void
989rxvt_term::scr_backspace () 1045rxvt_term::scr_backspace ()
990{ 1046{
991 want_refresh = 1; 1047 want_refresh = 1;
1048
992 if (screen.cur.col == 0) 1049 if (screen.cur.col == 0)
993 { 1050 {
994 if (screen.cur.row > 0) 1051 if (screen.cur.row > 0)
995 { 1052 {
996#ifdef TERMCAP_HAS_BW 1053#ifdef TERMCAP_HAS_BW
997 screen.cur.col = TermWin.ncol - 1; 1054 screen.cur.col = TermWin.ncol - 1;
998 screen.cur.row--; 1055 screen.cur.row--;
999 return; 1056 return;
1000#endif 1057#endif
1001
1002 } 1058 }
1003 } 1059 }
1004 else if ((screen.flags & Screen_WrapNext) == 0) 1060 else if (!(screen.flags & Screen_WrapNext))
1005 scr_gotorc (0, -1, RELATIVE); 1061 scr_gotorc (0, -1, RELATIVE);
1062
1006 screen.flags &= ~Screen_WrapNext; 1063 screen.flags &= ~Screen_WrapNext;
1007} 1064}
1008 1065
1009/* ------------------------------------------------------------------------- */ 1066/* ------------------------------------------------------------------------- */
1010/* 1067/*
1011 * Process Horizontal Tab 1068 * Process Horizontal Tab
1012 * count: +ve = forward; -ve = backwards 1069 * count: +ve = forward; -ve = backwards
1013 * XTERM_SEQ: CTRL-I 1070 * XTERM_SEQ: CTRL-I
1014 */ 1071 */
1015void 1072void
1016rxvt_term::scr_tab (int count) 1073rxvt_term::scr_tab (int count, bool ht)
1017{ 1074{
1018 int i, x; 1075 int i, x;
1019 1076
1020 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1021 want_refresh = 1; 1077 want_refresh = 1;
1022 i = x = screen.cur.col; 1078 i = x = screen.cur.col;
1023 1079
1024 if (count == 0) 1080 if (count == 0)
1025 return; 1081 return;
1026 else if (count > 0) 1082 else if (count > 0)
1027 { 1083 {
1084 int row = TermWin.saveLines + screen.cur.row;
1085 text_t *tp = screen.text[row];
1086 rend_t *rp = screen.rend[row];
1087 rend_t base_rend = rp[i];
1088 ht &= tp[i] == ' ';
1089
1028 for (; ++i < TermWin.ncol; ) 1090 for (; ++i < TermWin.ncol; )
1029 if (tabs[i]) 1091 if (tabs[i])
1030 { 1092 {
1031 x = i; 1093 x = i;
1032 if (!--count) 1094 if (!--count)
1033 break; 1095 break;
1034 } 1096 }
1097 else
1098 ht &= tp[i] == ' '
1099 && RS_SAME (rp[i], base_rend);
1035 1100
1036 if (count) 1101 if (count)
1037 x = TermWin.ncol - 1; 1102 x = TermWin.ncol - 1;
1103
1104 // store horizontal tab commands as characters inside the text
1105 // buffer so they can be selected and pasted.
1106 if (ht && options & Opt_pastableTabs)
1107 {
1108 base_rend = SET_FONT (base_rend, 0);
1109
1110 if (screen.tlen[row] != -1) /* XXX: think about this */
1111 MAX_IT (screen.tlen[row], x);
1112
1113 i = screen.cur.col;
1114
1115 tp[i] = '\t';
1116 rp[i] = base_rend;
1117
1118 while (++i < x)
1119 {
1120 tp[i] = NOCHAR;
1121 rp[i] = base_rend;
1122 }
1123 }
1038 } 1124 }
1039 else /* if (count < 0) */ 1125 else /* if (count < 0) */
1040 { 1126 {
1041 for (; --i >= 0; ) 1127 for (; --i >= 0; )
1042 if (tabs[i]) 1128 if (tabs[i])
… …
1059 * Process DEC Back Index 1145 * Process DEC Back Index
1060 * XTERM_SEQ: ESC 6 1146 * XTERM_SEQ: ESC 6
1061 * Move cursor left in row. If we're at the left boundary, shift everything 1147 * Move cursor left in row. If we're at the left boundary, shift everything
1062 * in that row right. Clear left column. 1148 * in that row right. Clear left column.
1063 */ 1149 */
1064#ifndef NO_FRILLS 1150#if ENABLE_FRILLS
1065void 1151void
1066rxvt_term::scr_backindex () 1152rxvt_term::scr_backindex ()
1067{ 1153{
1068 if (screen.cur.col > 0) 1154 if (screen.cur.col > 0)
1069 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1155 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1070 else 1156 else
1071 { 1157 {
1072 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1158 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1073 return; /* um, yeah? */ 1159 return; /* um, yeah? */
1160
1074 scr_insdel_chars (1, INSERT); 1161 scr_insdel_chars (1, INSERT);
1075 } 1162 }
1076} 1163}
1077#endif 1164#endif
1078/* ------------------------------------------------------------------------- */ 1165/* ------------------------------------------------------------------------- */
… …
1080 * Process DEC Forward Index 1167 * Process DEC Forward Index
1081 * XTERM_SEQ: ESC 9 1168 * XTERM_SEQ: ESC 9
1082 * Move cursor right in row. If we're at the right boundary, shift everything 1169 * Move cursor right in row. If we're at the right boundary, shift everything
1083 * in that row left. Clear right column. 1170 * in that row left. Clear right column.
1084 */ 1171 */
1085#ifndef NO_FRILLS 1172#if ENABLE_FRILLS
1086void 1173void
1087rxvt_term::scr_forwardindex () 1174rxvt_term::scr_forwardindex ()
1088{ 1175{
1089 int row; 1176 int row;
1090 1177
1091 if (screen.cur.col < TermWin.ncol - 1) 1178 if (screen.cur.col < TermWin.ncol - 1)
1092 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1179 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1093 else 1180 else
1094 { 1181 {
1095 row = screen.cur.row + TermWin.saveLines; 1182 row = screen.cur.row + TermWin.saveLines;
1183
1096 if (screen.tlen[row] == 0) 1184 if (screen.tlen[row] == 0)
1097 return; /* um, yeah? */ 1185 return; /* um, yeah? */
1098 else if (screen.tlen[row] == -1) 1186 else if (screen.tlen[row] == -1)
1099 screen.tlen[row] = TermWin.ncol; 1187 screen.tlen[row] = TermWin.ncol;
1188
1100 scr_gotorc (0, 0, R_RELATIVE); 1189 scr_gotorc (0, 0, R_RELATIVE);
1101 scr_insdel_chars (1, DELETE); 1190 scr_insdel_chars (1, DELETE);
1102 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1191 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1103 } 1192 }
1104} 1193}
… …
1112rxvt_term::scr_gotorc (int row, int col, int relative) 1201rxvt_term::scr_gotorc (int row, int col, int relative)
1113{ 1202{
1114 want_refresh = 1; 1203 want_refresh = 1;
1115 ZERO_SCROLLBACK (); 1204 ZERO_SCROLLBACK ();
1116 1205
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));
1118
1119 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1206 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1120 : col);
1121 MAX_IT (screen.cur.col, 0); 1207 MAX_IT (screen.cur.col, 0);
1122 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1208 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1123 1209
1124 screen.flags &= ~Screen_WrapNext; 1210 screen.flags &= ~Screen_WrapNext;
1211
1125 if (relative & R_RELATIVE) 1212 if (relative & R_RELATIVE)
1126 { 1213 {
1127 if (row > 0) 1214 if (row > 0)
1128 { 1215 {
1129 if (screen.cur.row <= screen.bscroll 1216 if (screen.cur.row <= screen.bscroll
… …
1149 MIN_IT (screen.cur.row, screen.bscroll); 1236 MIN_IT (screen.cur.row, screen.bscroll);
1150 } 1237 }
1151 else 1238 else
1152 screen.cur.row = row; 1239 screen.cur.row = row;
1153 } 1240 }
1241
1154 MAX_IT (screen.cur.row, 0); 1242 MAX_IT (screen.cur.row, 0);
1155 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1243 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1156
1157 while (screen.cur.col > 0
1158 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1159 screen.cur.col--;
1160} 1244}
1161 1245
1162/* ------------------------------------------------------------------------- */ 1246/* ------------------------------------------------------------------------- */
1163/* 1247/*
1164 * direction should be UP or DN 1248 * direction should be UP or DN
1165 */ 1249 */
1166void 1250void
1167rxvt_term::scr_index (enum page_dirn direction) 1251rxvt_term::scr_index (enum page_dirn direction)
1168{ 1252{
1169 int dirn; 1253 int dirn;
1170 1254
1171 want_refresh = 1; 1255 want_refresh = 1;
1256 ZERO_SCROLLBACK ();
1257
1172 dirn = ((direction == UP) ? 1 : -1); 1258 dirn = ((direction == UP) ? 1 : -1);
1173 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1174
1175 ZERO_SCROLLBACK ();
1176 1259
1177 screen.flags &= ~Screen_WrapNext; 1260 screen.flags &= ~Screen_WrapNext;
1261
1178 if ((screen.cur.row == screen.bscroll && direction == UP) 1262 if ((screen.cur.row == screen.bscroll && direction == UP)
1179 || (screen.cur.row == screen.tscroll && direction == DN)) 1263 || (screen.cur.row == screen.tscroll && direction == DN))
1180 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1264 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1181 else 1265 else
1182 screen.cur.row += dirn; 1266 screen.cur.row += dirn;
1267
1183 MAX_IT (screen.cur.row, 0); 1268 MAX_IT (screen.cur.row, 0);
1184 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1269 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1185 selection_check (0); 1270 selection_check (0);
1186} 1271}
1187 1272
… …
1196rxvt_term::scr_erase_line (int mode) 1281rxvt_term::scr_erase_line (int mode)
1197{ 1282{
1198 unsigned int row, col, num; 1283 unsigned int row, col, num;
1199 1284
1200 want_refresh = 1; 1285 want_refresh = 1;
1201 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1202 ZERO_SCROLLBACK (); 1286 ZERO_SCROLLBACK ();
1203 1287
1204 selection_check (1); 1288 selection_check (1);
1205
1206 screen.flags &= ~Screen_WrapNext;
1207 1289
1208 row = TermWin.saveLines + screen.cur.row; 1290 row = TermWin.saveLines + screen.cur.row;
1209 switch (mode) 1291 switch (mode)
1210 { 1292 {
1211 case 0: /* erase to end of line */ 1293 case 0: /* erase to end of line */
… …
1234 default: 1316 default:
1235 return; 1317 return;
1236 } 1318 }
1237 1319
1238 if (screen.text[row]) 1320 if (screen.text[row])
1239 scr_blank_line (& (screen.text[row][col]), 1321 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1240 & (screen.rend[row][col]), num, rstyle);
1241 else 1322 else
1242 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1323 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1243} 1324}
1244 1325
1245/* ------------------------------------------------------------------------- */ 1326/* ------------------------------------------------------------------------- */
… …
1256 int32_t row, row_offset; 1337 int32_t row, row_offset;
1257 rend_t ren; 1338 rend_t ren;
1258 XGCValues gcvalue; 1339 XGCValues gcvalue;
1259 1340
1260 want_refresh = 1; 1341 want_refresh = 1;
1261 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1262 ZERO_SCROLLBACK (); 1342 ZERO_SCROLLBACK ();
1343
1263 row_offset = (int32_t)TermWin.saveLines; 1344 row_offset = (int32_t)TermWin.saveLines;
1264 1345
1265 switch (mode) 1346 switch (mode)
1266 { 1347 {
1267 case 0: /* erase to end of screen */ 1348 case 0: /* erase to end of screen */
… …
1283 break; 1364 break;
1284 default: 1365 default:
1285 return; 1366 return;
1286 } 1367 }
1287 1368
1288 refresh_type |= REFRESH_BOUNDS;
1289
1290 if (selection.op && current_screen == selection.screen 1369 if (selection.op && current_screen == selection.screen
1291 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1370 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1292 || (selection.end.row >= row 1371 || (selection.end.row >= row
1293 && selection.end.row <= row + num))) 1372 && selection.end.row <= row + num)))
1294 CLEAR_SELECTION (); 1373 CLEAR_SELECTION ();
… …
1305 ren = DEFAULT_RSTYLE; 1384 ren = DEFAULT_RSTYLE;
1306 CLEAR_ROWS (row, num); 1385 CLEAR_ROWS (row, num);
1307 } 1386 }
1308 else 1387 else
1309 { 1388 {
1310 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1389 ren = rstyle & (RS_fgMask | RS_bgMask);
1311 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1390 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1312 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1391 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1313 ERASE_ROWS (row, num); 1392 ERASE_ROWS (row, num);
1314 gcvalue.foreground = PixColors[Color_fg]; 1393 gcvalue.foreground = pix_colors[Color_fg];
1315 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1394 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1316 } 1395 }
1317 1396
1318 for (; num--; row++) 1397 for (; num--; row++)
1319 { 1398 {
1320 scr_blank_screen_mem (screen.text, screen.rend, 1399 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);
1321 (unsigned int) (row + row_offset), rstyle);
1322 screen.tlen[row + row_offset] = 0; 1400 screen.tlen[row + row_offset] = 0;
1323 scr_blank_line (drawn_text[row], drawn_rend[row], 1401 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1324 (unsigned int)TermWin.ncol, ren);
1325 } 1402 }
1326} 1403}
1327 1404
1328/* ------------------------------------------------------------------------- */ 1405/* ------------------------------------------------------------------------- */
1329/* 1406/*
… …
1335{ 1412{
1336 int i, j, k; 1413 int i, j, k;
1337 rend_t *r1, fs; 1414 rend_t *r1, fs;
1338 1415
1339 want_refresh = 1; 1416 want_refresh = 1;
1417 ZERO_SCROLLBACK ();
1418
1340 num_scr_allow = 0; 1419 num_scr_allow = 0;
1341 ZERO_SCROLLBACK ();
1342 selection_check (3); 1420 selection_check (3);
1343 1421
1344 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1422 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1345 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1423 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1346 { 1424 {
1347 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1425 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1348 fill_text (screen.text[k], 'E', TermWin.ncol); 1426 fill_text (screen.text[k], 'E', TermWin.ncol);
1349 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1427 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
… …
1373 if (insdel == DELETE) 1451 if (insdel == DELETE)
1374 return; 1452 return;
1375 else if (insdel == INSERT) 1453 else if (insdel == INSERT)
1376 count = end; 1454 count = end;
1377 } 1455 }
1378 screen.flags &= ~Screen_WrapNext; 1456
1457 scr_do_wrap ();
1379 1458
1380 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1459 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1381} 1460}
1382 1461
1383/* ------------------------------------------------------------------------- */ 1462/* ------------------------------------------------------------------------- */
… …
1397 ZERO_SCROLLBACK (); 1476 ZERO_SCROLLBACK ();
1398 1477
1399 if (count <= 0) 1478 if (count <= 0)
1400 return; 1479 return;
1401 1480
1481 scr_do_wrap ();
1482
1402 selection_check (1); 1483 selection_check (1);
1403 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1484 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1404 1485
1405 row = screen.cur.row + TermWin.saveLines; 1486 row = screen.cur.row + TermWin.saveLines;
1406 screen.flags &= ~Screen_WrapNext;
1407 1487
1408 stp = screen.text[row]; 1488 stp = screen.text[row];
1409 srp = screen.rend[row]; 1489 srp = screen.rend[row];
1410 slp = & (screen.tlen[row]); 1490 slp = &screen.tlen[row];
1411 1491
1412 switch (insdel) 1492 switch (insdel)
1413 { 1493 {
1414 case INSERT: 1494 case INSERT:
1415 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1495 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1416 col--)
1417 { 1496 {
1418 stp[col] = stp[col - count]; 1497 stp[col] = stp[col - count];
1419 srp[col] = srp[col - count]; 1498 srp[col] = srp[col - count];
1420 } 1499 }
1421 1500
… …
1431 if (selection.end.row != screen.cur.row 1510 if (selection.end.row != screen.cur.row
1432 || (selection.end.col + count >= TermWin.ncol)) 1511 || (selection.end.col + count >= TermWin.ncol))
1433 CLEAR_SELECTION (); 1512 CLEAR_SELECTION ();
1434 else 1513 else
1435 { /* shift selection */ 1514 { /* shift selection */
1436 selection.beg.col += count; 1515 selection.beg.col += count;
1437 selection.mark.col += count; /* XXX: yes? */ 1516 selection.mark.col += count; /* XXX: yes? */
1438 selection.end.col += count; 1517 selection.end.col += count;
1439 } 1518 }
1440 } 1519 }
1441 1520
1442 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1521 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1443 (unsigned int)count, rstyle); 1522 (unsigned int)count, rstyle);
1444 break; 1523 break;
1445 1524
1446 case ERASE: 1525 case ERASE:
1447 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1526 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1448 selection_check (1); 1527 selection_check (1);
1449 screen.cur.col -= count; 1528 screen.cur.col -= count;
1450 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1529 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1451 (unsigned int)count, rstyle); 1530 (unsigned int)count, rstyle);
1452 break; 1531 break;
1453 1532
1454 case DELETE: 1533 case DELETE:
1455 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1534 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1458 { 1537 {
1459 stp[col] = stp[col + count]; 1538 stp[col] = stp[col + count];
1460 srp[col] = srp[col + count]; 1539 srp[col] = srp[col + count];
1461 } 1540 }
1462 1541
1463 scr_blank_line (& (stp[TermWin.ncol - count]), 1542 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1464 & (srp[TermWin.ncol - count]),
1465 (unsigned int)count, tr); 1543 (unsigned int)count, tr);
1466 1544
1467 if (*slp == -1) /* break line continuation */ 1545 if (*slp == -1) /* break line continuation */
1468 *slp = TermWin.ncol; 1546 *slp = TermWin.ncol;
1469 1547
… …
1478 || selection.end.col >= TermWin.ncol) 1556 || selection.end.col >= TermWin.ncol)
1479 CLEAR_SELECTION (); 1557 CLEAR_SELECTION ();
1480 else 1558 else
1481 { 1559 {
1482 /* shift selection */ 1560 /* shift selection */
1483 selection.beg.col -= count; 1561 selection.beg.col -= count;
1484 selection.mark.col -= count; /* XXX: yes? */ 1562 selection.mark.col -= count; /* XXX: yes? */
1485 selection.end.col -= count; 1563 selection.end.col -= count;
1486 } 1564 }
1487 } 1565 }
1488 1566
1489 break; 1567 break;
1490 } 1568 }
… …
1517 */ 1595 */
1518void 1596void
1519rxvt_term::scr_cursor_visible (int mode) 1597rxvt_term::scr_cursor_visible (int mode)
1520{ 1598{
1521 want_refresh = 1; 1599 want_refresh = 1;
1600
1522 if (mode) 1601 if (mode)
1523 screen.flags |= Screen_VisibleCursor; 1602 screen.flags |= Screen_VisibleCursor;
1524 else 1603 else
1525 screen.flags &= ~Screen_VisibleCursor; 1604 screen.flags &= ~Screen_VisibleCursor;
1526} 1605}
… …
1535rxvt_term::scr_autowrap (int mode) 1614rxvt_term::scr_autowrap (int mode)
1536{ 1615{
1537 if (mode) 1616 if (mode)
1538 screen.flags |= Screen_Autowrap; 1617 screen.flags |= Screen_Autowrap;
1539 else 1618 else
1540 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1619 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1541} 1620}
1542 1621
1543/* ------------------------------------------------------------------------- */ 1622/* ------------------------------------------------------------------------- */
1544/* 1623/*
1545 * Set/unset margin origin mode 1624 * Set/unset margin origin mode
… …
1555{ 1634{
1556 if (mode) 1635 if (mode)
1557 screen.flags |= Screen_Relative; 1636 screen.flags |= Screen_Relative;
1558 else 1637 else
1559 screen.flags &= ~Screen_Relative; 1638 screen.flags &= ~Screen_Relative;
1639
1560 scr_gotorc (0, 0, 0); 1640 scr_gotorc (0, 0, 0);
1561} 1641}
1562 1642
1563/* ------------------------------------------------------------------------- */ 1643/* ------------------------------------------------------------------------- */
1564/* 1644/*
… …
1584 */ 1664 */
1585void 1665void
1586rxvt_term::scr_set_tab (int mode) 1666rxvt_term::scr_set_tab (int mode)
1587{ 1667{
1588 if (mode < 0) 1668 if (mode < 0)
1589 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1669 memset (tabs, 0, TermWin.ncol * sizeof (char));
1590 else if (screen.cur.col < TermWin.ncol) 1670 else if (screen.cur.col < TermWin.ncol)
1591 tabs[screen.cur.col] = (mode ? 1 : 0); 1671 tabs[screen.cur.col] = (mode ? 1 : 0);
1592} 1672}
1593 1673
1594/* ------------------------------------------------------------------------- */ 1674/* ------------------------------------------------------------------------- */
… …
1598 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1678 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1599 */ 1679 */
1600void 1680void
1601rxvt_term::scr_rvideo_mode (int mode) 1681rxvt_term::scr_rvideo_mode (int mode)
1602{ 1682{
1603 XGCValues gcvalue; 1683 XGCValues gcvalue;
1604 1684
1605 if (rvideo != mode) 1685 if (rvideo != mode)
1606 { 1686 {
1607 rvideo = mode; 1687 rvideo = mode;
1608 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1688 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1609#if defined(XPM_BACKGROUND) 1689#if XPM_BACKGROUND
1610 if (bgPixmap.pixmap == None) 1690 if (bgPixmap.pixmap == None)
1611#endif 1691#endif
1612#if defined(TRANSPARENT) 1692#if TRANSPARENT
1613 if (! (Options & Opt_transparent) || am_transparent == 0) 1693 if (! (options & Opt_transparent) || am_transparent == 0)
1614#endif 1694#endif
1615 XSetWindowBackground (display->display, TermWin.vt, 1695 XSetWindowBackground (display->display, TermWin.vt,
1616 PixColors[Color_bg]); 1696 pix_colors[Color_bg]);
1617 1697
1618 gcvalue.foreground = PixColors[Color_fg]; 1698 gcvalue.foreground = pix_colors[Color_fg];
1619 gcvalue.background = PixColors[Color_bg]; 1699 gcvalue.background = pix_colors[Color_bg];
1620 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1700 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1621 &gcvalue); 1701 &gcvalue);
1622 scr_clear (); 1702 scr_clear ();
1623 scr_touch (true); 1703 scr_touch (true);
1624 } 1704 }
… …
1672 * XTERM_SEQ: Invoke G2 character set: ESC N 1752 * XTERM_SEQ: Invoke G2 character set: ESC N
1673 * XTERM_SEQ: Invoke G3 character set: ESC O 1753 * XTERM_SEQ: Invoke G3 character set: ESC O
1674 */ 1754 */
1675void 1755void
1676rxvt_term::scr_charset_choose (int set) 1756rxvt_term::scr_charset_choose (int set)
1677 { 1757{
1678 screen.charset = set; 1758 screen.charset = set;
1679 set_font_style (); 1759 set_font_style ();
1680 } 1760}
1681 1761
1682/* ------------------------------------------------------------------------- */ 1762/* ------------------------------------------------------------------------- */
1683/* 1763/*
1684 * Set a font 1764 * Set a font
1685 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1765 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1688 * XTERM_SEQ: Set G3 character set: ESC + <C> 1768 * XTERM_SEQ: Set G3 character set: ESC + <C>
1689 * See set_font_style for possible values for <C> 1769 * See set_font_style for possible values for <C>
1690 */ 1770 */
1691void 1771void
1692rxvt_term::scr_charset_set (int set, unsigned int ch) 1772rxvt_term::scr_charset_set (int set, unsigned int ch)
1693 { 1773{
1694 charsets[set] = (unsigned char)ch; 1774 charsets[set] = (unsigned char)ch;
1695 set_font_style (); 1775 set_font_style ();
1696 } 1776}
1697 1777
1698 1778
1699/* ------------------------------------------------------------------------- * 1779/* ------------------------------------------------------------------------- *
1700 * MAJOR SCREEN MANIPULATION * 1780 * MAJOR SCREEN MANIPULATION *
1701 * ------------------------------------------------------------------------- */ 1781 * ------------------------------------------------------------------------- */
… …
1740 row_col_t rc[RC_COUNT]; 1820 row_col_t rc[RC_COUNT];
1741 1821
1742 if (drawn_text == NULL) /* sanity check */ 1822 if (drawn_text == NULL) /* sanity check */
1743 return; 1823 return;
1744 1824
1825#ifndef NO_SLOW_LINK_SUPPORT
1826 if (refresh_type == FAST_REFRESH && !display->is_local)
1827 {
1828 y = 0;
1829 height = TermWin.height;
1830 }
1831#endif
1832
1745#ifdef DEBUG_STRICT 1833#ifdef DEBUG_STRICT
1746 x = max (x, (int)TermWin.int_bwidth); 1834 x = max (x, 0);
1747 x = min (x, (int)TermWin.width); 1835 x = min (x, (int)TermWin.width);
1748 y = max (y, (int)TermWin.int_bwidth); 1836 y = max (y, 0);
1749 y = min (y, (int)TermWin.height); 1837 y = min (y, (int)TermWin.height);
1750#endif 1838#endif
1751 1839
1752 /* round down */ 1840 /* round down */
1753 rc[PART_BEG].col = Pixel2Col (x); 1841 rc[PART_BEG].col = Pixel2Col (x);
… …
1761 { 1849 {
1762 MIN_IT (rc[i].col, TermWin.ncol - 1); 1850 MIN_IT (rc[i].col, TermWin.ncol - 1);
1763 MIN_IT (rc[i].row, TermWin.nrow - 1); 1851 MIN_IT (rc[i].row, TermWin.nrow - 1);
1764 } 1852 }
1765 1853
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));
1767
1768 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1854 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1769 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, 1855 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 1856
1772 if (refresh) 1857 if (refresh)
1773 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1858 scr_refresh (SLOW_REFRESH);
1774} 1859}
1775 1860
1776/* ------------------------------------------------------------------------- */ 1861/* ------------------------------------------------------------------------- */
1777/* 1862/*
1778 * Refresh the entire screen 1863 * Refresh the entire screen
… …
1790 */ 1875 */
1791int 1876int
1792rxvt_term::scr_move_to (int y, int len) 1877rxvt_term::scr_move_to (int y, int len)
1793{ 1878{
1794 long p = 0; 1879 long p = 0;
1795 uint16_t oldviewstart; 1880 unsigned int oldviewstart;
1796 1881
1797 oldviewstart = TermWin.view_start; 1882 oldviewstart = TermWin.view_start;
1883
1798 if (y < len) 1884 if (y < len)
1799 { 1885 {
1800 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1886 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1801 p -= (long) (TermWin.nrow - 1); 1887 p -= (long) (TermWin.nrow - 1);
1802 p = max (p, 0); 1888 p = max (p, 0);
1803 } 1889 }
1890
1804 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1891 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1805 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1806 1892
1807 return scr_changeview (oldviewstart); 1893 return scr_changeview (oldviewstart);
1808} 1894}
1809 1895
1810/* ------------------------------------------------------------------------- */ 1896/* ------------------------------------------------------------------------- */
… …
1813 * direction should be UP or DN 1899 * direction should be UP or DN
1814 */ 1900 */
1815int 1901int
1816rxvt_term::scr_page (enum page_dirn direction, int nlines) 1902rxvt_term::scr_page (enum page_dirn direction, int nlines)
1817{ 1903{
1818 int n; 1904 int n;
1819 uint16_t oldviewstart; 1905 unsigned int oldviewstart;
1820 1906
1821 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1822#ifdef DEBUG_STRICT 1907#ifdef DEBUG_STRICT
1823 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1908 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1824#endif 1909#endif
1825 oldviewstart = TermWin.view_start; 1910 oldviewstart = TermWin.view_start;
1826 if (direction == UP) 1911 if (direction == UP)
… …
1835 } 1920 }
1836 return scr_changeview (oldviewstart); 1921 return scr_changeview (oldviewstart);
1837} 1922}
1838 1923
1839int 1924int
1840rxvt_term::scr_changeview (uint16_t oldviewstart) 1925rxvt_term::scr_changeview (unsigned int oldviewstart)
1841{ 1926{
1842 if (TermWin.view_start != oldviewstart) 1927 if (TermWin.view_start != oldviewstart)
1843 { 1928 {
1844 want_refresh = 1; 1929 want_refresh = 1;
1845 num_scr -= (TermWin.view_start - oldviewstart); 1930 num_scr -= (TermWin.view_start - oldviewstart);
1846 } 1931 }
1932
1847 return (int) (TermWin.view_start - oldviewstart); 1933 return (int) (TermWin.view_start - oldviewstart);
1848} 1934}
1849 1935
1850/* ------------------------------------------------------------------------- */ 1936/* ------------------------------------------------------------------------- */
1851void 1937void
1852rxvt_term::scr_bell () 1938rxvt_term::scr_bell ()
1853{ 1939{
1854#ifndef NO_BELL 1940#ifndef NO_BELL
1855# ifndef NO_MAPALERT 1941# ifndef NO_MAPALERT
1856# ifdef MAPALERT_OPTION 1942# ifdef MAPALERT_OPTION
1857 if (Options & Opt_mapAlert) 1943 if (options & Opt_mapAlert)
1858# endif 1944# endif
1859 XMapWindow (display->display, TermWin.parent[0]); 1945 XMapWindow (display->display, TermWin.parent[0]);
1860# endif 1946# endif
1861 if (Options & Opt_visualBell) 1947 if (options & Opt_visualBell)
1862 { 1948 {
1863 scr_rvideo_mode (!rvideo); /* refresh also done */ 1949 scr_rvideo_mode (!rvideo); /* refresh also done */
1864 scr_rvideo_mode (!rvideo); /* refresh also done */ 1950 scr_rvideo_mode (!rvideo); /* refresh also done */
1865 } 1951 }
1866 else 1952 else
… …
1872/* ARGSUSED */ 1958/* ARGSUSED */
1873void 1959void
1874rxvt_term::scr_printscreen (int fullhist) 1960rxvt_term::scr_printscreen (int fullhist)
1875{ 1961{
1876#ifdef PRINTPIPE 1962#ifdef PRINTPIPE
1877 int i, r1, nrows, row_offset; 1963 int i, r1, nrows, row_offset;
1878 text_t *t; 1964 FILE *fd;
1879 FILE *fd;
1880 1965
1881 if ((fd = popen_printer ()) == NULL) 1966 if ((fd = popen_printer ()) == NULL)
1882 return; 1967 return;
1968
1883 nrows = TermWin.nrow; 1969 nrows = TermWin.nrow;
1884 row_offset = TermWin.saveLines; 1970 row_offset = TermWin.saveLines;
1971
1885 if (!fullhist) 1972 if (!fullhist)
1886 row_offset -= TermWin.view_start; 1973 row_offset -= TermWin.view_start;
1887 else 1974 else
1888 { 1975 {
1889 nrows += TermWin.nscrolled; 1976 nrows += TermWin.nscrolled;
1890 row_offset -= TermWin.nscrolled; 1977 row_offset -= TermWin.nscrolled;
1891 } 1978 }
1892 1979
1980 wctomb (0, 0);
1981
1893 for (r1 = 0; r1 < nrows; r1++) 1982 for (r1 = 0; r1 < nrows; r1++)
1894 { 1983 {
1895 t = screen.text[r1 + row_offset]; 1984 text_t *tp = screen.text[r1 + row_offset];
1896 for (i = TermWin.ncol - 1; i >= 0; i--) 1985 int len = screen.tlen[r1 + row_offset];
1897 if (!isspace (t[i])) 1986
1898 break; 1987 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1899 fprintf (fd, "%.*s\n", (i + 1), t); 1988 {
1989 char mb[MB_LEN_MAX];
1990 text_t t = *tp++;
1991 if (t == NOCHAR)
1992 continue;
1993
1994 len = wctomb (mb, t);
1995
1996 if (len <= 0)
1997 {
1998 mb[0] = ' ';
1999 len = 1;
2000 }
2001
2002 fwrite (mb, 1, len, fd);
2003 }
2004
2005 fputc ('\n', fd);
1900 } 2006 }
2007
1901 pclose_printer (fd); 2008 pclose_printer (fd);
1902#endif 2009#endif
1903} 2010}
1904 2011
1905/* ------------------------------------------------------------------------- */ 2012/* ------------------------------------------------------------------------- */
… …
1919 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 2026 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1920 2027
1921void 2028void
1922rxvt_term::scr_refresh (unsigned char refresh_type) 2029rxvt_term::scr_refresh (unsigned char refresh_type)
1923{ 2030{
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 */ 2031 unsigned char must_clear, /* use draw_string not draw_image_string */
1927 rvid, /* reverse video this position */
1928 showcursor; /* show the cursor */ 2032 showcursor; /* show the cursor */
1929 int16_t col, row, /* column/row we're processing */ 2033 int16_t col, row, /* column/row we're processing */
1930 ocrow; /* old cursor row */ 2034 ocrow; /* old cursor row */
1931 int i, /* tmp */ 2035 int i, /* tmp */
1932 row_offset; /* basic offset in screen structure */ 2036 row_offset; /* basic offset in screen structure */
1933#ifndef NO_CURSORCOLOR 2037#ifndef NO_CURSORCOLOR
1934 rend_t cc1; /* store colours at cursor position (s) */ 2038 rend_t cc1; /* store colours at cursor position (s) */
1935#endif 2039#endif
1936 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2040 rend_t *crp; // cursor rendition pointer
1937 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2041
2042 want_refresh = 0; /* screen is current */
1938 2043
1939 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2044 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1940 return; 2045 return;
1941 2046
1942 /* 2047 /*
1943 * A: set up vars 2048 * A: set up vars
1944 */ 2049 */
1945 clearfirst = clearlast = must_clear = 0; 2050 must_clear = 0;
1946
1947 refresh_count = 0; 2051 refresh_count = 0;
1948 2052
1949 row_offset = TermWin.saveLines - TermWin.view_start; 2053 row_offset = TermWin.saveLines - TermWin.view_start;
1950 2054
1951 if ((refresh_type & REFRESH_BOUNDS))
1952 {
1953 clearfirst = clearlast = 1;
1954 refresh_type &= ~REFRESH_BOUNDS;
1955 }
1956
1957#ifdef XPM_BACKGROUND 2055#if XPM_BACKGROUND
1958 must_clear |= (bgPixmap.pixmap != None); 2056 must_clear |= (bgPixmap.pixmap != None);
1959#endif 2057#endif
1960#ifdef TRANSPARENT 2058#if TRANSPARENT
1961 must_clear |= ((Options & Opt_transparent) && am_transparent); 2059 must_clear |= ((options & Opt_transparent) && am_transparent);
1962#endif 2060#endif
1963 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2061 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1964 2062
1965 /* 2063 /*
1966 * B: reverse any characters which are selected 2064 * B: reverse any characters which are selected
… …
1981 showcursor = 0; 2079 showcursor = 0;
1982#endif 2080#endif
1983 2081
1984 if (showcursor) 2082 if (showcursor)
1985 { 2083 {
2084 int col = screen.cur.col;
2085
2086 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2087 col--;
2088
1986 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 2089 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1987 2090
1988 if (showcursor && TermWin.focus) 2091 if (showcursor && TermWin.focus)
1989 { 2092 {
1990 *srp ^= RS_RVid; 2093 *crp ^= RS_RVid;
1991#ifndef NO_CURSORCOLOR 2094#ifndef NO_CURSORCOLOR
1992 cc1 = *srp & (RS_fgMask | RS_bgMask); 2095 cc1 = *crp & (RS_fgMask | RS_bgMask);
1993 if (ISSET_PIXCOLOR (Color_cursor)) 2096 if (ISSET_PIXCOLOR (Color_cursor))
1994 ccol1 = Color_cursor; 2097 ccol1 = Color_cursor;
1995 else 2098 else
1996#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2099#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1997 ccol1 = GET_FGCOLOR (rstyle); 2100 ccol1 = GET_FGCOLOR (rstyle);
… …
2004#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2005 ccol2 = GET_BGCOLOR (rstyle); 2108 ccol2 = GET_BGCOLOR (rstyle);
2006#else 2109#else
2007 ccol2 = Color_bg; 2110 ccol2 = Color_bg;
2008#endif 2111#endif
2009 *srp = SET_FGCOLOR (*srp, ccol1); 2112 *crp = SET_FGCOLOR (*crp, ccol1);
2010 *srp = SET_BGCOLOR (*srp, ccol2); 2113 *crp = SET_BGCOLOR (*crp, ccol2);
2011#endif 2114#endif
2012 } 2115 }
2013 } 2116 }
2014 2117
2015 /* make sure no outline cursor is left around */ 2118 /* make sure no outline cursor is left around */
… …
2042 oldcursor.col = screen.cur.col; 2145 oldcursor.col = screen.cur.col;
2043 } 2146 }
2044 } 2147 }
2045 } 2148 }
2046 2149
2150#if ENABLE_OVERLAY
2151 scr_swap_overlay ();
2152#endif
2153
2154 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2155 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2156
2047#ifndef NO_SLOW_LINK_SUPPORT 2157#ifndef NO_SLOW_LINK_SUPPORT
2048 /* 2158 /*
2049 * D: CopyArea pass - very useful for slower links 2159 * D: CopyArea pass - very useful for slower links
2050 * This has been deliberately kept simple. 2160 * This has been deliberately kept simple.
2051 */ 2161 */
2052 i = num_scr; 2162 i = num_scr;
2163 if (!display->is_local
2053 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2164 && refresh_type == FAST_REFRESH && num_scr_allow && i
2054 && abs (i) < TermWin.nrow && !must_clear) 2165 && abs (i) < TermWin.nrow && !must_clear)
2055 { 2166 {
2056 int16_t nits; 2167 int16_t nits;
2057 int j; 2168 int j;
2058 rend_t *drp2;
2059 text_t *dtp2;
2060 int len, wlen; 2169 int len, wlen;
2061 2170
2062 j = TermWin.nrow; 2171 j = TermWin.nrow;
2063 wlen = len = -1; 2172 wlen = len = -1;
2064 row = i > 0 ? 0 : j - 1; 2173 row = i > 0 ? 0 : j - 1;
2065 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2174 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2066 { 2175 {
2067 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2176 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2068 { 2177 {
2069 stp = screen.text[row + row_offset]; 2178 text_t *stp = screen.text[row + row_offset];
2070 srp = screen.rend[row + row_offset]; 2179 rend_t *srp = screen.rend[row + row_offset];
2071 dtp = drawn_text[row]; 2180 text_t *dtp = drawn_text[row];
2072 dtp2 = drawn_text[row + i]; 2181 text_t *dtp2 = drawn_text[row + i];
2073 drp = drawn_rend[row]; 2182 rend_t *drp = drawn_rend[row];
2074 drp2 = drawn_rend[row + i]; 2183 rend_t *drp2 = drawn_rend[row + i];
2075 2184
2076 for (nits = 0, col = TermWin.ncol; col--; ) 2185 for (nits = 0, col = TermWin.ncol; col--; )
2077 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2186 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2078 nits--; 2187 nits--;
2079 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2188 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2099 { 2208 {
2100 /* also comes here at end if needed because of >= above */ 2209 /* also comes here at end if needed because of >= above */
2101 if (wlen < len) 2210 if (wlen < len)
2102 SWAP_IT (wlen, len, int); 2211 SWAP_IT (wlen, len, int);
2103 2212
2104 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2105 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2213 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2106 TermWin.gc, 0, Row2Pixel (len + i), 2214 TermWin.gc, 0, Row2Pixel (len + i),
2107 (unsigned int)TermWin_TotalWidth (), 2215 (unsigned int)TermWin_TotalWidth (),
2108 (unsigned int)Height2Pixel (wlen - len + 1), 2216 (unsigned int)Height2Pixel (wlen - len + 1),
2109 0, Row2Pixel (len)); 2217 0, Row2Pixel (len));
… …
2116 /* 2224 /*
2117 * E: main pass across every character 2225 * E: main pass across every character
2118 */ 2226 */
2119 for (row = 0; row < TermWin.nrow; row++) 2227 for (row = 0; row < TermWin.nrow; row++)
2120 { 2228 {
2121 stp = screen.text[row + row_offset]; 2229 text_t *stp = screen.text[row + row_offset];
2122 srp = screen.rend[row + row_offset]; 2230 rend_t *srp = screen.rend[row + row_offset];
2123 dtp = drawn_text[row]; 2231 text_t *dtp = drawn_text[row];
2124 drp = drawn_rend[row]; 2232 rend_t *drp = drawn_rend[row];
2125 2233
2126 /* 2234 /*
2127 * E2: OK, now the real pass 2235 * E2: OK, now the real pass
2128 */ 2236 */
2129 int ypixel = (int)Row2Pixel (row); 2237 int ypixel = (int)Row2Pixel (row);
2130 2238
2131 for (col = 0; col < TermWin.ncol; col++) 2239 for (col = 0; col < TermWin.ncol; col++)
2132 { 2240 {
2133 /* compare new text with old - if exactly the same then continue */ 2241 /* compare new text with old - if exactly the same then continue */
2134 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2242 if (stp[col] == dtp[col] /* Must match characters to skip. */
2135 && (srp[col] == drp[col] /* Either rendition the same or */ 2243 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2136 || (stp[col] == ' ' /* space w/ no background change */ 2244 || (stp[col] == ' ' /* space w/ no background change */
2137 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2245 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2138 continue; 2246 continue;
2139 2247
2140 // redraw one or more characters 2248 // redraw one or more characters
2141 2249
2142 // seek to the beginning if wide characters 2250 // seek to the beginning of wide characters
2143 while (stp[col] == NOCHAR && col > 0) 2251 while (stp[col] == NOCHAR && col > 0)
2144 --col; 2252 --col;
2145 2253
2146 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2254 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2147 text_t *text = stp + col; 2255 text_t *text = stp + col;
… …
2150 dtp[col] = stp[col]; 2258 dtp[col] = stp[col];
2151 drp[col] = rend; 2259 drp[col] = rend;
2152 2260
2153 int xpixel = Col2Pixel (col); 2261 int xpixel = Col2Pixel (col);
2154 2262
2155 // this loop looks very messy, it can probably be optimized
2156 // and cleaned a bit by you?
2157 for (i = 0; ++col < TermWin.ncol; ) 2263 for (i = 0; ++col < TermWin.ncol; )
2158 { 2264 {
2159 if (stp[col] == NOCHAR) 2265 if (stp[col] == NOCHAR)
2160 { 2266 {
2161 dtp[col] = stp[col]; 2267 dtp[col] = stp[col];
2162 drp[col] = rend; 2268 drp[col] = rend;
2163 count++; 2269 count++;
2164
2165 if (i) // only possible skip if char unchanged
2166 i++; 2270 i++;
2167 2271
2168 continue; 2272 continue;
2169 } 2273 }
2170 2274
2171 if (rend != srp[col]) 2275 if (!RS_SAME (rend, srp[col]))
2172 break; 2276 break;
2173 2277
2174 count++; 2278 count++;
2175 2279
2176 if (stp[col] != dtp[col] 2280 if (stp[col] != dtp[col]
2177 || srp[col] != drp[col]) 2281 || !RS_SAME (srp[col], drp[col]))
2178 { 2282 {
2179 if (must_clear && (i++ > (count / 2))) 2283 if (must_clear && (i++ > count / 2))
2180 break; 2284 break;
2181 2285
2182 dtp[col] = stp[col]; 2286 dtp[col] = stp[col];
2183 drp[col] = rend; 2287 drp[col] = rend;
2184 i = 0; 2288 i = 0;
2185 } 2289 }
2186 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2290 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2187 break; 2291 break;
2188 } 2292 }
2189 2293
2190 col--; /* went one too far. move back */ 2294 col--; /* went one too far. move back */
2191 count -= i; /* dump any matching trailing chars */ 2295 count -= i; /* dump any matching trailing chars */
2296
2297 // sometimes we optimize away the trailing NOCHAR's, add them back
2298 while (i && text[count] == NOCHAR)
2299 count++, i--;
2300
2301#if ENABLE_STYLES
2302 // force redraw after "careful" characters to avoid pixel droppings
2303 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2304 drp[col + 1] = ~srp[col + 1];
2305
2306 // include previous careful character(s) if possible, looks nicer (best effort...)
2307 while (text > stp
2308 && srp[text - stp - 1] & RS_Careful
2309 && RS_SAME (rend, srp[text - stp - 1]))
2310 text--, count++, xpixel -= TermWin.fwidth;
2311#endif
2192 2312
2193 /* 2313 /*
2194 * Determine the attributes for the string 2314 * Determine the attributes for the string
2195 */ 2315 */
2196 int fid = GET_FONT (rend);
2197 int fore = GET_FGCOLOR (rend); // desired foreground 2316 int fore = GET_FGCOLOR (rend); // desired foreground
2198 int back = GET_BGCOLOR (rend); // desired background 2317 int back = GET_BGCOLOR (rend); // desired background
2199 2318
2200 rend = GET_ATTR (rend); 2319 // only do special processing if ana attributes are set, which is rare
2201 2320 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2202 rvid = !!(rend & RS_RVid); 2321 {
2322 bool invert = rend & RS_RVid;
2203 2323
2204#ifndef NO_BOLD_UNDERLINE_REVERSE 2324#ifndef NO_BOLD_UNDERLINE_REVERSE
2205 if (rend & RS_Bold && fore == Color_fg) 2325 if (rend & RS_Bold
2326 && fore == Color_fg)
2206 { 2327 {
2207 if (ISSET_PIXCOLOR (Color_BD)) 2328 if (ISSET_PIXCOLOR (Color_BD))
2208 fore = Color_BD; 2329 fore = Color_BD;
2330# if !ENABLE_STYLES
2209 else 2331 else
2210 rvid = !rvid; 2332 invert = !invert;
2333# endif
2334 }
2335
2336 if (rend & RS_Italic
2337 && fore == Color_fg)
2338 {
2339 if (ISSET_PIXCOLOR (Color_IT))
2340 fore = Color_IT;
2341# if !ENABLE_STYLES
2342 else
2343 invert = !invert;
2344# endif
2345 }
2346
2347 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2348 fore = Color_UL;
2349#endif
2350
2351 if (invert)
2352 {
2353 SWAP_IT (fore, back, int);
2354
2355#ifndef NO_BOLD_UNDERLINE_REVERSE
2356 if (ISSET_PIXCOLOR (Color_RV))
2357 back = Color_RV;
2358#endif
2359 }
2360
2361#ifdef TEXT_BLINK
2362 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2363 {
2364 if (!text_blink_ev.active)
2365 {
2366 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2367 hidden_text = 0;
2368 }
2369 else if (hidden_text)
2370 fore = back;
2371 }
2372#endif
2211 } 2373 }
2212
2213 if (rend & RS_Uline)
2214 if (ISSET_PIXCOLOR (Color_UL))
2215 fore = Color_UL;
2216#endif
2217
2218 if (rvid)
2219 {
2220 SWAP_IT (fore, back, int);
2221
2222#ifndef NO_BOLD_UNDERLINE_REVERSE
2223 if (ISSET_PIXCOLOR (Color_RV)
2224# ifndef NO_CURSORCOLOR
2225 && !ISSET_PIXCOLOR (Color_cursor)
2226# endif
2227 )
2228 back = Color_RV;
2229#endif
2230 }
2231
2232#ifdef TEXT_BLINK
2233 if (rend & RS_Blink && back == Color_bg)
2234 {
2235 if (!text_blink_ev.active)
2236 {
2237 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2238 hidden_text = 0;
2239 }
2240 else if (hidden_text)
2241 fore = back;
2242 }
2243#endif
2244 2374
2245 /* 2375 /*
2246 * Actually do the drawing of the string here 2376 * Actually do the drawing of the string here
2247 */ 2377 */
2248 rxvt_font *font = (*TermWin.fontset)[fid]; 2378 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2249 2379
2250 if (back == fore) 2380 if (back == fore)
2251 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2381 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2252 TermWin.fwidth * count, TermWin.fheight, 2382 TermWin.fwidth * count, TermWin.fheight,
2253 back); 2383 back);
… …
2268 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2398 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2269 } 2399 }
2270 else 2400 else
2271 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2272 2402
2273 if ((rend & RS_Uline) && (font->descent > 1)) 2403 if (rend & RS_Uline && font->descent > 1 && fore != back)
2404 {
2405 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2274 XDrawLine (display->display, drawBuffer, TermWin.gc, 2406 XDrawLine (display->display, drawBuffer, TermWin.gc,
2275 xpixel, ypixel + font->ascent + 1, 2407 xpixel, ypixel + font->ascent + 1,
2276 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2408 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2409 }
2277 } /* for (col....) */ 2410 } /* for (col....) */
2278 } /* for (row....) */ 2411 } /* for (row....) */
2412
2413#if ENABLE_OVERLAY
2414 scr_swap_overlay ();
2415#endif
2279 2416
2280 /* 2417 /*
2281 * G: cleanup cursor and display outline cursor if necessary 2418 * G: cleanup cursor and display outline cursor if necessary
2282 */ 2419 */
2283 if (showcursor) 2420 if (showcursor)
2284 { 2421 {
2285 if (TermWin.focus) 2422 if (TermWin.focus)
2286 { 2423 {
2287 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2288 [screen.cur.col]);
2289 *srp ^= RS_RVid; 2424 *crp ^= RS_RVid;
2290#ifndef NO_CURSORCOLOR 2425#ifndef NO_CURSORCOLOR
2291 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2426 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2292#endif 2427#endif
2293 } 2428 }
2294 else if (oldcursor.row >= 0) 2429 else if (oldcursor.row >= 0)
2295 { 2430 {
2296#ifndef NO_CURSORCOLOR 2431#ifndef NO_CURSORCOLOR
2297 if (ISSET_PIXCOLOR (Color_cursor)) 2432 if (ISSET_PIXCOLOR (Color_cursor))
2298 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2433 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2299#endif 2434#endif
2300 int cursorwidth = 1; 2435 int cursorwidth = 1;
2301 while (oldcursor.col + cursorwidth < TermWin.ncol 2436 while (oldcursor.col + cursorwidth < TermWin.ncol
2302 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2437 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2303 cursorwidth++; 2438 cursorwidth++;
… …
2313 /* 2448 /*
2314 * H: cleanup selection 2449 * H: cleanup selection
2315 */ 2450 */
2316 scr_reverse_selection (); 2451 scr_reverse_selection ();
2317 2452
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) 2453 if (refresh_type & SMOOTH_REFRESH)
2341 XSync (display->display, False); 2454 XFlush (display->display);
2342 2455
2343 num_scr = 0; 2456 num_scr = 0;
2344 num_scr_allow = 1; 2457 num_scr_allow = 1;
2345 want_refresh = 0; /* screen is current */
2346} 2458}
2347 2459
2348void 2460void
2349rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2461rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2350{ 2462{
2351 if (!rp || !tp) 2463 if (!rp || !tp)
2352 return; 2464 return;
2353 2465
2354 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2466 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2355 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2467 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2356} 2468}
2357 2469
2358void 2470void
2359rxvt_term::scr_remap_chars () 2471rxvt_term::scr_remap_chars ()
2360{ 2472{
… …
2366 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2478 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2367 scr_remap_chars (swap.text[i], swap.rend[i]); 2479 scr_remap_chars (swap.text[i], swap.rend[i]);
2368 } 2480 }
2369} 2481}
2370 2482
2483void
2484rxvt_term::scr_recolour ()
2485{
2486 if (1
2487#if TRANSPARENT
2488 && !am_transparent
2489#endif
2490#if XPM_BACKGROUND
2491 && !bgPixmap.pixmap
2492#endif
2493 )
2494 {
2495 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);
2496 XClearWindow (display->display, TermWin.parent[0]);
2497 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
2498#if HAVE_SCROLLBARS
2499 if (scrollBar.win)
2500 {
2501 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2502 scrollBar.setIdle ();
2503 scrollbar_show (0);
2504 }
2505#endif
2506 }
2507
2508 scr_clear ();
2509 scr_touch (true);
2510 want_refresh = 1;
2511}
2512
2371/* ------------------------------------------------------------------------- */ 2513/* ------------------------------------------------------------------------- */
2372void 2514void
2373rxvt_term::scr_clear (bool really) 2515rxvt_term::scr_clear (bool really)
2374{ 2516{
2375 if (!TermWin.mapped) 2517 if (!TermWin.mapped)
2376 return; 2518 return;
2377 2519
2378 num_scr_allow = 0; 2520 num_scr_allow = 0;
2379 want_refresh = 1; 2521 want_refresh = 1;
2380 2522
2381#ifdef TRANSPARENT 2523#if TRANSPARENT
2382 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2524 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2383 { 2525 {
2384 int i; 2526 int i;
2385 2527
2386 if (! (Options & Opt_transparent_all)) 2528 if (!(options & Opt_transparent_all))
2387 i = 0; 2529 i = 0;
2388 else 2530 else
2389 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2531 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2390 2532
2391 while (i--) 2533 while (i--)
… …
2407 int end_row = TermWin.saveLines - TermWin.view_start; 2549 int end_row = TermWin.saveLines - TermWin.view_start;
2408 int i = selection.beg.row + TermWin.saveLines; 2550 int i = selection.beg.row + TermWin.saveLines;
2409 int col, row = selection.end.row + TermWin.saveLines; 2551 int col, row = selection.end.row + TermWin.saveLines;
2410 rend_t *srp; 2552 rend_t *srp;
2411 2553
2412 if (i >= end_row) 2554#if ENABLE_FRILLS
2413 col = selection.beg.col; 2555 if (selection.rect)
2556 {
2557 end_row += TermWin.nrow;
2558
2559 for (; i <= row && i <= end_row; i++)
2560 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2561 srp[col] ^= RS_RVid;
2562 }
2414 else 2563 else
2564#endif
2565 {
2566 if (i >= end_row)
2567 col = selection.beg.col;
2568 else
2415 { 2569 {
2416 col = 0; 2570 col = 0;
2417 i = end_row; 2571 i = end_row;
2418 } 2572 }
2419 2573
2420 end_row += TermWin.nrow; 2574 end_row += TermWin.nrow;
2575
2421 for (; i < row && i < end_row; i++, col = 0) 2576 for (; i < row && i < end_row; i++, col = 0)
2422 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2577 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2423 srp[col] ^= RS_RVid; 2578 srp[col] ^= RS_RVid;
2424 2579
2425 if (i == row && i < end_row) 2580 if (i == row && i < end_row)
2426 for (srp = screen.rend[i]; col < selection.end.col; col++) 2581 for (srp = screen.rend[i]; col < selection.end.col; col++)
2427 srp[col] ^= RS_RVid; 2582 srp[col] ^= RS_RVid;
2583 }
2428 } 2584 }
2429} 2585}
2430 2586
2431/* ------------------------------------------------------------------------- */ 2587/* ------------------------------------------------------------------------- */
2432/* 2588/*
… …
2468 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2624 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2469 */ 2625 */
2470void 2626void
2471rxvt_term::selection_check (int check_more) 2627rxvt_term::selection_check (int check_more)
2472{ 2628{
2473 row_col_t pos; 2629 row_col_t pos;
2474 2630
2475 if (!selection.op) 2631 if (!selection.op)
2476 return; 2632 return;
2477 2633
2478 pos.row = pos.col = 0; 2634 pos.row = pos.col = 0;
… …
2503 */ 2659 */
2504void 2660void
2505rxvt_term::paste (const unsigned char *data, unsigned int len) 2661rxvt_term::paste (const unsigned char *data, unsigned int len)
2506{ 2662{
2507 unsigned int i, j, n; 2663 unsigned int i, j, n;
2508 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); 2664 unsigned char *ds = (unsigned char *)rxvt_malloc (PASTE_SIZE);
2509
2510#if 0
2511 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2512 ZERO_SCROLLBACK (r);
2513#endif
2514 2665
2515 /* convert normal newline chars into common keyboard Return key sequence */ 2666 /* convert normal newline chars into common keyboard Return key sequence */
2516 for (i = 0; i < len; i += PROP_SIZE) 2667 for (i = 0; i < len; i += PASTE_SIZE)
2517 { 2668 {
2518 n = min (len - i, PROP_SIZE); 2669 n = min (len - i, PASTE_SIZE);
2519 MEMCPY (ds, data + i, n); 2670 memcpy (ds, data + i, n);
2520 2671
2521 for (j = 0; j < n; j++) 2672 for (j = 0; j < n; j++)
2522 if (ds[j] == '\n') 2673 if (ds[j] == C0_LF)
2523 ds[j] = '\r'; 2674 ds[j] = C0_CR;
2524 2675
2525 tt_write (ds, (int)n); 2676 tt_write (ds, (int)n);
2526 } 2677 }
2527 2678
2528 free (ds); 2679 free (ds);
… …
2531/* ------------------------------------------------------------------------- */ 2682/* ------------------------------------------------------------------------- */
2532/* 2683/*
2533 * Respond to a notification that a primary selection has been sent 2684 * Respond to a notification that a primary selection has been sent
2534 * EXT: SelectionNotify 2685 * EXT: SelectionNotify
2535 */ 2686 */
2536int 2687void
2537rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2688rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2538{ 2689{
2539 long nread = 0;
2540 unsigned long bytes_after;
2541 XTextProperty ct;
2542
2543 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2544
2545 if (prop == None) /* check for failed XConvertSelection */ 2690 if (prop == None) /* check for failed XConvertSelection */
2546 { 2691 {
2547 if ((selection_type & Sel_CompoundText)) 2692 if ((selection_type & Sel_CompoundText))
2548 { 2693 {
2549 int selnum = selection_type & Sel_whereMask; 2694 int selnum = selection_type & Sel_whereMask;
… …
2562 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2707 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2563 else 2708 else
2564 selection_type = 0; 2709 selection_type = 0;
2565 } 2710 }
2566 2711
2567 return 0; 2712 return;
2568 }
2569
2570 for (;;)
2571 { 2713 }
2714
2715 unsigned long bytes_after;
2716 XTextProperty ct;
2717
2718 if (XGetWindowProperty (display->display, win, prop,
2719 0, PROP_SIZE / 4,
2720 delete_prop, AnyPropertyType,
2721 &ct.encoding, &ct.format,
2722 &ct.nitems, &bytes_after,
2723 &ct.value) != Success)
2724 {
2725 ct.value = 0;
2726 goto bailout;
2727 }
2728
2729 if (ct.encoding == None)
2730 goto bailout;
2731
2732 if (bytes_after)
2733 {
2734 // fetch and append remaining data
2735 XTextProperty ct2;
2736
2572 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2737 if (XGetWindowProperty (display->display, win, prop,
2573 (long) (PROP_SIZE / 4), delete_prop, 2738 ct.nitems / 4, (bytes_after + 3) / 4,
2739 delete_prop, AnyPropertyType,
2574 AnyPropertyType, &ct.encoding, &ct.format, 2740 &ct2.encoding, &ct2.format,
2575 &ct.nitems, &bytes_after, 2741 &ct2.nitems, &bytes_after,
2576 &ct.value) != Success) 2742 &ct2.value) != Success)
2577 break; 2743 goto bailout;
2578 2744
2579 if (ct.encoding == 0) 2745 // realloc should be compatible to XFree, here, and elsewhere, too
2580 { 2746 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2581 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2747 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2582 break; 2748 ct.nitems += ct2.nitems;
2583 }
2584 2749
2750 XFree (ct2.value);
2751 }
2752
2585 if (ct.value == NULL) 2753 if (ct.value == 0)
2586 { 2754 goto bailout;
2587 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2588 continue;
2589 }
2590 2755
2756 if (ct.encoding == xa[XA_INCR])
2757 {
2758 // INCR selection, start handshake
2759 if (!delete_prop)
2760 XDeleteProperty (display->display, win, prop);
2761
2762 selection_wait = Sel_incr;
2763 incr_buf_fill = 0;
2764 incr_ev.start (NOW + 10);
2765
2766 goto bailout;
2767 }
2768
2591 if (ct.nitems == 0) 2769 if (ct.nitems == 0)
2770 {
2771 if (selection_wait == Sel_incr)
2772 {
2773 XFree (ct.value);
2774
2775 // finally complete, now paste the whole thing
2776 selection_wait = Sel_normal;
2777 ct.value = (unsigned char *)incr_buf;
2778 ct.nitems = incr_buf_fill;
2779 incr_buf = 0;
2780 incr_buf_size = 0;
2781 incr_ev.stop ();
2592 { 2782 }
2593 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2783 else
2594 2784 {
2595 if (selection_wait == Sel_normal && nread == 0 2785 if (selection_wait == Sel_normal
2596 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2786 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2597 { 2787 {
2598 /* 2788 /*
2599 * pass through again trying CUT_BUFFER0 if we've come from 2789 * pass through again trying CUT_BUFFER0 if we've come from
2600 * XConvertSelection () but nothing was presented 2790 * XConvertSelection () but nothing was presented
2601 */ 2791 */
2602 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2603 selection_paste (display->root, XA_CUT_BUFFER0, False); 2792 selection_paste (display->root, XA_CUT_BUFFER0, False);
2604 } 2793 }
2605 2794
2606 nread = -1; /* discount any previous stuff */ 2795 goto bailout;
2607 break; 2796 }
2797 }
2798 else if (selection_wait == Sel_incr)
2799 {
2800 incr_ev.start (NOW + 10);
2801
2802 while (incr_buf_fill + ct.nitems > incr_buf_size)
2608 } 2803 {
2804 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2805 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2806 }
2609 2807
2808 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2610 nread += ct.nitems; 2809 incr_buf_fill += ct.nitems;
2611 2810
2811 goto bailout;
2812 }
2813
2612 char **cl; 2814 char **cl;
2613 int cr; 2815 int cr;
2816
2817#if ENABLE_FRILLS
2818 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2819 // so recode it manually
2820 if (ct.encoding == xa[XA_UTF8_STRING])
2821 {
2822 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2823 char *s = rxvt_wcstombs (w);
2824 free (w);
2825 // TODO: strlen == only the first element will be converted. well...
2826 paste ((unsigned char *)s, strlen (s));
2827 free (s);
2828 }
2829 else
2830#endif
2614 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2831 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2615 &cr) >= 0 && cl) 2832 && cl)
2616 { 2833 {
2617 for (int i = 0; i < cr; i++) 2834 for (int i = 0; i < cr; i++)
2618 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2835 paste ((unsigned char *)cl[i], strlen (cl[i]));
2619 2836
2620 XFreeStringList (cl); 2837 XFreeStringList (cl);
2621 } 2838 }
2622 else 2839 else
2623 paste (ct.value, ct.nitems); 2840 paste (ct.value, ct.nitems); // paste raw
2624 2841
2625 if (bytes_after == 0) 2842bailout:
2626 break;
2627
2628 XFree (ct.value);
2629 }
2630
2631 if (ct.value)
2632 XFree (ct.value); 2843 XFree (ct.value);
2633 2844
2634 if (selection_wait == Sel_normal) 2845 if (selection_wait == Sel_normal)
2635 selection_wait = Sel_none; 2846 selection_wait = Sel_none;
2636
2637 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2638 return (int)nread;
2639} 2847}
2640 2848
2641void 2849void
2642rxvt_term::incr_cb (time_watcher &w) 2850rxvt_term::incr_cb (time_watcher &w)
2643{ 2851{
2644 selection_wait = Sel_none; 2852 selection_wait = Sel_none;
2645 2853
2854 incr_buf_size = 0;
2855 free (incr_buf);
2856
2646 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2857 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2647} 2858}
2648 2859
2649/*
2650 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2651 */
2652void 2860void
2653rxvt_term::selection_property (Window win, Atom prop) 2861rxvt_term::selection_property (Window win, Atom prop)
2654{ 2862{
2655 int reget_time = 0; 2863 if (prop == None || selection_wait != Sel_incr)
2656
2657 if (prop == None)
2658 return; 2864 return;
2659 2865
2660 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2661 if (selection_wait == Sel_normal)
2662 {
2663 int a, afmt;
2664 Atom atype;
2665 unsigned long bytes_after, nitems;
2666 unsigned char *s = NULL;
2667
2668 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2669 xa[XA_INCR], &atype, &afmt, &nitems,
2670 &bytes_after, &s);
2671 if (s)
2672 XFree (s);
2673 if (a != Success)
2674 return;
2675
2676#ifndef __CYGWIN32__
2677 if (atype == xa[XA_INCR])
2678 { /* start an INCR transfer */
2679 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2680 XDeleteProperty (display->display, win, prop);
2681 XFlush (display->display);
2682 reget_time = 1;
2683 selection_wait = Sel_incr;
2684 }
2685#endif
2686
2687 }
2688 else if (selection_wait == Sel_incr)
2689 {
2690 reget_time = 1;
2691
2692 if (selection_paste (win, prop, True) == -1) 2866 selection_paste (win, prop, true);
2693 {
2694 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2695 selection_wait = Sel_none;
2696 incr_ev.stop ();
2697 }
2698 }
2699 if (reget_time) /* received more data so reget time */
2700 incr_ev.start (NOW + 10);
2701} 2867}
2702 2868
2703/* ------------------------------------------------------------------------- */ 2869/* ------------------------------------------------------------------------- */
2704/* 2870/*
2705 * Request the current selection: 2871 * Request the current selection:
… …
2711 * EXT: button 2 release 2877 * EXT: button 2 release
2712 */ 2878 */
2713void 2879void
2714rxvt_term::selection_request (Time tm, int x, int y) 2880rxvt_term::selection_request (Time tm, int x, int y)
2715{ 2881{
2716 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2717
2718 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2882 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2719 return; /* outside window */ 2883 return; /* outside window */
2720 2884
2721 if (selection.text) 2885 if (selection.text)
2722 { /* internal selection */ 2886 { /* internal selection */
2723 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2724 char *str = rxvt_wcstombs (selection.text, selection.len); 2887 char *str = rxvt_wcstombs (selection.text, selection.len);
2725 paste ((unsigned char *)str, strlen (str)); 2888 paste ((unsigned char *)str, strlen (str));
2726 free (str); 2889 free (str);
2727 return; 2890 return;
2728 } 2891 }
… …
2742#else 2905#else
2743 selection_type = Sel_CompoundText; 2906 selection_type = Sel_CompoundText;
2744 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2907 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2745 return; 2908 return;
2746#endif 2909#endif
2747
2748 } 2910 }
2749 } 2911 }
2750 2912
2751 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2913 selection_wait = Sel_none; /* don't loop in selection_paste () */
2752 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2753 selection_paste (display->root, XA_CUT_BUFFER0, False); 2914 selection_paste (display->root, XA_CUT_BUFFER0, false);
2754} 2915}
2755 2916
2756int 2917int
2757rxvt_term::selection_request_other (Atom target, int selnum) 2918rxvt_term::selection_request_other (Atom target, int selnum)
2758{ 2919{
… …
2770 else 2931 else
2771 sel = xa[XA_CLIPBOARD]; 2932 sel = xa[XA_CLIPBOARD];
2772 2933
2773 if (XGetSelectionOwner (display->display, sel) != None) 2934 if (XGetSelectionOwner (display->display, sel) != None)
2774 { 2935 {
2775 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2776 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2936 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2777 TermWin.vt, selection_request_time); 2937 TermWin.vt, selection_request_time);
2778 return 1; 2938 return 1;
2779 } 2939 }
2780 2940
… …
2787 * EXT: SelectionClear 2947 * EXT: SelectionClear
2788 */ 2948 */
2789void 2949void
2790rxvt_term::selection_clear () 2950rxvt_term::selection_clear ()
2791{ 2951{
2792 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2793
2794 want_refresh = 1; 2952 want_refresh = 1;
2795 free (selection.text); 2953 free (selection.text);
2796 selection.text = NULL; 2954 selection.text = NULL;
2797 selection.len = 0; 2955 selection.len = 0;
2798 CLEAR_SELECTION (); 2956 CLEAR_SELECTION ();
… …
2811{ 2969{
2812 int i, col, end_col, row, end_row; 2970 int i, col, end_col, row, end_row;
2813 wchar_t *new_selection_text; 2971 wchar_t *new_selection_text;
2814 text_t *t; 2972 text_t *t;
2815 2973
2816 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2817 switch (selection.op) 2974 switch (selection.op)
2818 { 2975 {
2819 case SELECTION_CONT: 2976 case SELECTION_CONT:
2820 break; 2977 break;
2821 case SELECTION_INIT: 2978 case SELECTION_INIT:
… …
2835 2992
2836 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2993 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2837 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2994 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2838 2995
2839 col = selection.beg.col; 2996 col = selection.beg.col;
2840 MAX_IT (col, 0);
2841 row = selection.beg.row + TermWin.saveLines; 2997 row = selection.beg.row + TermWin.saveLines;
2842 end_row = selection.end.row + TermWin.saveLines; 2998 end_row = selection.end.row + TermWin.saveLines;
2843 int ofs = 0; 2999 int ofs = 0;
2844 int extra = 0; 3000 int extra = 0;
2845 3001
2846 for (; row <= end_row; row++, col = 0) 3002 for (; row <= end_row; row++, col = 0)
2847 { 3003 {
2848 t = &(screen.text[row][col]);
2849
2850 end_col = screen.tlen[row]; 3004 end_col = screen.tlen[row];
3005
3006#if ENABLE_FRILLS
3007 if (selection.rect)
3008 {
3009 col = selection.beg.col;
3010 end_col = TermWin.ncol + 1;
3011 }
3012#endif
3013
3014 MAX_IT (col, 0);
2851 3015
2852 if (end_col == -1) 3016 if (end_col == -1)
2853 end_col = TermWin.ncol; 3017 end_col = TermWin.ncol;
2854 3018
2855 if (row == end_row) 3019 if (row == end_row || selection.rect)
2856 MIN_IT (end_col, selection.end.col); 3020 MIN_IT (end_col, selection.end.col);
2857 3021
3022 t = &screen.text[row][col];
2858 for (; col < end_col; col++) 3023 for (; col < end_col; col++)
2859 { 3024 {
2860 if (*t == NOCHAR) 3025 if (*t == NOCHAR)
2861 t++; 3026 t++;
2862#if ENABLE_COMBINING 3027#if ENABLE_COMBINING
… …
2879 else 3044 else
2880 new_selection_text[ofs++] = *t++; 3045 new_selection_text[ofs++] = *t++;
2881 } 3046 }
2882 3047
2883 if (screen.tlen[row] != -1 && row != end_row) 3048 if (screen.tlen[row] != -1 && row != end_row)
2884 new_selection_text[ofs++] = L'\n'; 3049 new_selection_text[ofs++] = C0_LF;
2885 } 3050 }
2886 3051
2887 if (end_col != selection.end.col) 3052 if (end_col != selection.end.col)
2888 new_selection_text[ofs++] = L'\n'; 3053 new_selection_text[ofs++] = C0_LF;
2889 3054
2890 new_selection_text[ofs] = 0; 3055 new_selection_text[ofs] = 0;
2891 3056
2892 if (ofs == 0) 3057 if (ofs == 0)
2893 { 3058 {
… …
2910#if 0 3075#if 0
2911 XTextProperty ct; 3076 XTextProperty ct;
2912 3077
2913 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3078 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2914 { 3079 {
2915 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3080 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2916 PropModeReplace, ct.value, ct.nitems);
2917 XFree (ct.value); 3081 XFree (ct.value);
2918 } 3082 }
2919#endif 3083#endif
2920 3084
2921 selection_time = tm; 3085 selection_time = tm;
2922 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2923} 3086}
2924 3087
2925/* ------------------------------------------------------------------------- */ 3088/* ------------------------------------------------------------------------- */
2926/* 3089/*
2927 * Mark or select text based upon number of clicks: 1, 2, or 3 3090 * Mark or select text based upon number of clicks: 1, 2, or 3
2928 * EXT: button 1 press 3091 * EXT: button 1 press
2929 */ 3092 */
2930void 3093void
2931rxvt_term::selection_click (int clicks, int x, int y) 3094rxvt_term::selection_click (int clicks, int x, int y)
2932{ 3095{
2933 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2934
2935 clicks = ((clicks - 1) % 3) + 1; 3096 clicks = ((clicks - 1) % 3) + 1;
2936 selection.clicks = clicks; /* save clicks so extend will work */ 3097 selection.clicks = clicks; /* save clicks so extend will work */
2937 3098
2938 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3099 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2939 3100
… …
2981 * We now only find out the boundary in one direction 3142 * We now only find out the boundary in one direction
2982 */ 3143 */
2983 3144
2984/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3145/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2985#define DELIMIT_TEXT(x) \ 3146#define DELIMIT_TEXT(x) \
2986 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) 3147 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2987#define DELIMIT_REND(x) 1 3148#define DELIMIT_REND(x) 1
2988 3149
2989void 3150void
2990rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3151rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2991{ 3152{
… …
3009 3170
3010 row = mark->row + TermWin.saveLines; 3171 row = mark->row + TermWin.saveLines;
3011 col = mark->col; 3172 col = mark->col;
3012 MAX_IT (col, 0); 3173 MAX_IT (col, 0);
3013 /* find the edge of a word */ 3174 /* find the edge of a word */
3014 stp = & (screen.text[row][col]); 3175 stp = &screen.text[row][col];
3015 w1 = DELIMIT_TEXT (*stp); 3176 w1 = DELIMIT_TEXT (*stp);
3016 3177
3017 srp = (&screen.rend[row][col]); 3178 srp = &screen.rend[row][col];
3018 w2 = DELIMIT_REND (*srp); 3179 w2 = DELIMIT_REND (*srp);
3019 3180
3020 for (;;) 3181 for (;;)
3021 { 3182 {
3022 for (; col != bound.col; col += dirnadd) 3183 for (; col != bound.col; col += dirnadd)
… …
3056 } 3217 }
3057 break; 3218 break;
3058 } 3219 }
3059 3220
3060Old_Word_Selection_You_Die: 3221Old_Word_Selection_You_Die:
3061 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));
3062
3063 if (dirn == DN) 3222 if (dirn == DN)
3064 col++; /* put us on one past the end */ 3223 col++; /* put us on one past the end */
3065 3224
3066 /* Poke the values back in */ 3225 /* Poke the values back in */
3067 ret->row = row - TermWin.saveLines; 3226 ret->row = row - TermWin.saveLines;
… …
3101 /* select nothing */ 3260 /* select nothing */
3102 selection.beg.row = selection.end.row = 0; 3261 selection.beg.row = selection.end.row = 0;
3103 selection.beg.col = selection.end.col = 0; 3262 selection.beg.col = selection.end.col = 0;
3104 selection.clicks = 4; 3263 selection.clicks = 4;
3105 want_refresh = 1; 3264 want_refresh = 1;
3106 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3107 return; 3265 return;
3108 } 3266 }
3109 3267
3110 if (selection.clicks == 4) 3268 if (selection.clicks == 4)
3111 selection.clicks = 1; 3269 selection.clicks = 1;
… …
3120 * Extend the selection to the specified col/row 3278 * Extend the selection to the specified col/row
3121 */ 3279 */
3122void 3280void
3123rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3281rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3124{ 3282{
3125 int16_t ncol = TermWin.ncol; 3283 int16_t ncol = TermWin.ncol;
3126 int end_col; 3284 int end_col;
3127 row_col_t pos; 3285 row_col_t pos;
3128 enum { 3286 enum {
3129 LEFT, RIGHT 3287 LEFT, RIGHT
3130 } closeto = RIGHT; 3288 } closeto = RIGHT;
3131 3289
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));
3133 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT 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));
3134
3135 want_refresh = 1; 3290 want_refresh = 1;
3291
3136 switch (selection.op) 3292 switch (selection.op)
3137 { 3293 {
3138 case SELECTION_INIT: 3294 case SELECTION_INIT:
3139 CLEAR_SELECTION (); 3295 CLEAR_SELECTION ();
3140 selection.op = SELECTION_BEGIN; 3296 selection.op = SELECTION_BEGIN;
… …
3153 selection_start_colrow (col, row); 3309 selection_start_colrow (col, row);
3154 /* FALLTHROUGH */ 3310 /* FALLTHROUGH */
3155 default: 3311 default:
3156 return; 3312 return;
3157 } 3313 }
3314
3158 if (selection.beg.col == selection.end.col 3315 if (selection.beg.col == selection.end.col
3159 && selection.beg.col != selection.mark.col 3316 && selection.beg.col != selection.mark.col
3160 && selection.beg.row == selection.end.row 3317 && selection.beg.row == selection.end.row
3161 && selection.beg.row != selection.mark.row) 3318 && selection.beg.row != selection.mark.row)
3162 { 3319 {
3163 selection.beg.col = selection.end.col = selection.mark.col; 3320 selection.beg.col = selection.end.col = selection.mark.col;
3164 selection.beg.row = selection.end.row = selection.mark.row; 3321 selection.beg.row = selection.end.row = selection.mark.row;
3165 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT2 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));
3166 } 3322 }
3167 3323
3168 pos.col = col; 3324 pos.col = col;
3169 pos.row = row; 3325 pos.row = row;
3170 3326
… …
3213 } 3369 }
3214 else 3370 else
3215 { /* button1 drag or button3 drag */ 3371 { /* button1 drag or button3 drag */
3216 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3372 if (ROWCOL_IS_AFTER (selection.mark, pos))
3217 { 3373 {
3218 if ((selection.mark.row == selection.end.row) 3374 if (selection.mark.row == selection.end.row
3219 && (selection.mark.col == selection.end.col) 3375 && selection.mark.col == selection.end.col
3376 && clickchange
3220 && clickchange && selection.clicks == 2) 3377 && selection.clicks == 2)
3221 selection.mark.col--; 3378 selection.mark.col--;
3222 3379
3223 selection.beg.row = pos.row; 3380 selection.beg.row = pos.row;
3224 selection.beg.col = pos.col; 3381 selection.beg.col = pos.col;
3225 selection.end.row = selection.mark.row; 3382 selection.end.row = selection.mark.row;
… …
3236 3393
3237 if (selection.clicks == 1) 3394 if (selection.clicks == 1)
3238 { 3395 {
3239 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3396 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3240 3397
3241 if (end_col != -1 && selection.beg.col > end_col) 3398 if (selection.beg.col > end_col
3399 && end_col != -1
3400#if ENABLE_FRILLS
3401 && !selection.rect
3402#endif
3242 { 3403 )
3243#if 1
3244 selection.beg.col = ncol; 3404 selection.beg.col = ncol;
3245#else
3246 if (selection.beg.row != selection.end.row)
3247 selection.beg.col = ncol;
3248 else
3249 selection.beg.col = selection.mark.col;
3250#endif
3251 }
3252 3405
3253 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3406 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3254 3407
3255 if (end_col != -1 && selection.end.col > end_col) 3408 if (
3409 selection.end.col > end_col
3410 && end_col != -1
3411#if ENABLE_FRILLS
3412 && !selection.rect
3413#endif
3414 )
3256 selection.end.col = ncol; 3415 selection.end.col = ncol;
3257 } 3416 }
3258 else if (selection.clicks == 2) 3417 else if (selection.clicks == 2)
3259 { 3418 {
3260 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3419 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3261 selection.end.col--; 3420 selection.end.col--;
3262 3421
3263 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3264 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3422 selection_delimit_word (UP, &selection.beg, &selection.beg);
3423 selection_delimit_word (DN, &selection.end, &selection.end);
3265 } 3424 }
3266 else if (selection.clicks == 3) 3425 else if (selection.clicks == 3)
3267 { 3426 {
3268#ifndef NO_FRILLS 3427#if ENABLE_FRILLS
3269 if ((Options & Opt_tripleclickwords)) 3428 if ((options & Opt_tripleclickwords))
3270 { 3429 {
3271 int end_row; 3430 int end_row;
3272 3431
3273 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3432 selection_delimit_word (UP, &selection.beg, &selection.beg);
3274 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3433 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3275 3434
3276 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3435 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3277 { 3436 {
3278 end_col = screen.tlen[end_row + TermWin.saveLines]; 3437 end_col = screen.tlen[end_row + TermWin.saveLines];
… …
3289 else 3448 else
3290#endif 3449#endif
3291 { 3450 {
3292 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3451 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3293 selection.mark.col++; 3452 selection.mark.col++;
3453
3294 selection.beg.col = 0; 3454 selection.beg.col = 0;
3295 selection.end.col = ncol; 3455 selection.end.col = ncol;
3296 } 3456 }
3297 } 3457 }
3298 3458
3299 if (button3 && buttonpress) 3459 if (button3 && buttonpress)
3300 { /* mark may need to be changed */ 3460 { /* mark may need to be changed */
3301 if (closeto == LEFT) 3461 if (closeto == LEFT)
3302 { 3462 {
3303 selection.mark.row = selection.end.row; 3463 selection.mark.row = selection.end.row;
3304 selection.mark.col = selection.end.col 3464 selection.mark.col = selection.end.col - (selection.clicks == 2);
3305 - (selection.clicks == 2);
3306 } 3465 }
3307 else 3466 else
3308 { 3467 {
3309 selection.mark.row = selection.beg.row; 3468 selection.mark.row = selection.beg.row;
3310 selection.mark.col = selection.beg.col; 3469 selection.mark.col = selection.beg.col;
3311 } 3470 }
3312 } 3471 }
3313 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));
3314}
3315 3472
3316#ifndef NO_FRILLS 3473#if ENABLE_FRILLS
3474 if (selection.rect && selection.beg.col > selection.end.col)
3475 SWAP_IT (selection.beg.col, selection.end.col, int);
3476#endif
3477}
3478
3479#if ENABLE_FRILLS
3317void 3480void
3318rxvt_term::selection_remove_trailing_spaces () 3481rxvt_term::selection_remove_trailing_spaces ()
3319{ 3482{
3320 int32_t end_col, end_row; 3483 int32_t end_col, end_row;
3321 text_t *stp; 3484 text_t *stp;
3322 3485
3323 end_col = selection.end.col; 3486 end_col = selection.end.col;
3324 end_row = selection.end.row; 3487 end_row = selection.end.row;
3488
3325 for ( ; end_row >= selection.beg.row; ) 3489 for ( ; end_row >= selection.beg.row; )
3326 { 3490 {
3327 stp = screen.text[end_row + TermWin.saveLines]; 3491 stp = screen.text[end_row + TermWin.saveLines];
3492
3328 while (--end_col >= 0) 3493 while (--end_col >= 0)
3329 { 3494 {
3330 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3495 if (stp[end_col] != ' '
3496 && stp[end_col] != '\t'
3497 && stp[end_col] != NOCHAR)
3331 break; 3498 break;
3332 } 3499 }
3500
3333 if (end_col >= 0 3501 if (end_col >= 0
3334 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3502 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3335 { 3503 {
3336 selection.end.col = end_col + 1; 3504 selection.end.col = end_col + 1;
3337 selection.end.row = end_row; 3505 selection.end.row = end_row;
3338 break; 3506 break;
3339 } 3507 }
3508
3340 end_row--; 3509 end_row--;
3341 end_col = TermWin.ncol; 3510 end_col = TermWin.ncol;
3342 } 3511 }
3512
3343 if (selection.mark.row > selection.end.row) 3513 if (selection.mark.row > selection.end.row)
3344 { 3514 {
3345 selection.mark.row = selection.end.row; 3515 selection.mark.row = selection.end.row;
3346 selection.mark.col = selection.end.col; 3516 selection.mark.col = selection.end.col;
3347 } 3517 }
… …
3363 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3533 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3364} 3534}
3365 3535
3366/* ------------------------------------------------------------------------- */ 3536/* ------------------------------------------------------------------------- */
3367/* 3537/*
3368 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3369 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3370 * the X11 protocol.
3371 */
3372typedef CARD32 Atom32;
3373
3374/* ------------------------------------------------------------------------- */
3375/*
3376 * Respond to a request for our current selection 3538 * Respond to a request for our current selection
3377 * EXT: SelectionRequest 3539 * EXT: SelectionRequest
3378 */ 3540 */
3379void 3541void
3380rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3542rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3381{ 3543{
3382 XSelectionEvent ev; 3544 XSelectionEvent ev;
3383 XTextProperty ct;
3384 XICCEncodingStyle style;
3385 Atom target;
3386 3545
3387 ev.type = SelectionNotify; 3546 ev.type = SelectionNotify;
3388 ev.property = None; 3547 ev.property = None;
3389 ev.display = rq.display; 3548 ev.display = rq.display;
3390 ev.requestor = rq.requestor; 3549 ev.requestor = rq.requestor;
… …
3392 ev.target = rq.target; 3551 ev.target = rq.target;
3393 ev.time = rq.time; 3552 ev.time = rq.time;
3394 3553
3395 if (rq.target == xa[XA_TARGETS]) 3554 if (rq.target == xa[XA_TARGETS])
3396 { 3555 {
3397 Atom32 target_list[6]; 3556 Atom target_list[6];
3398 Atom32 *target = target_list; 3557 Atom *target = target_list;
3399 3558
3400 *target++ = (Atom32) xa[XA_TARGETS]; 3559 *target++ = xa[XA_TARGETS];
3401 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3560 *target++ = xa[XA_TIMESTAMP];
3402 *target++ = (Atom32) XA_STRING; 3561 *target++ = XA_STRING;
3403 *target++ = (Atom32) xa[XA_TEXT]; 3562 *target++ = xa[XA_TEXT];
3404 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3563 *target++ = xa[XA_COMPOUND_TEXT];
3405#if X_HAVE_UTF8_STRING 3564#if X_HAVE_UTF8_STRING
3406 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3565 *target++ = xa[XA_UTF8_STRING];
3407#endif 3566#endif
3408 3567
3409 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3568 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3410 (8 * sizeof (target_list[0])), PropModeReplace, 3569 32, PropModeReplace,
3411 (unsigned char *)target_list, 3570 (unsigned char *)target_list, target - target_list);
3412 target - target_list);
3413 ev.property = rq.property; 3571 ev.property = rq.property;
3414 } 3572 }
3573#if TODO // TODO
3415 else if (rq.target == xa[XA_MULTIPLE]) 3574 else if (rq.target == xa[XA_MULTIPLE])
3416 { 3575 {
3417 /* TODO: Handle MULTIPLE */ 3576 /* TODO: Handle MULTIPLE */
3418 } 3577 }
3578#endif
3419 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3579 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3420 { 3580 {
3421 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3581 XChangeProperty (display->display, rq.requestor, rq.property, rq.target,
3422 (8 * sizeof (Time)), PropModeReplace,
3423 (unsigned char *)&selection_time, 1); 3582 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3424 ev.property = rq.property; 3583 ev.property = rq.property;
3425 } 3584 }
3426 else if (rq.target == XA_STRING 3585 else if (rq.target == XA_STRING
3427 || rq.target == xa[XA_TEXT] 3586 || rq.target == xa[XA_TEXT]
3428 || rq.target == xa[XA_COMPOUND_TEXT] 3587 || rq.target == xa[XA_COMPOUND_TEXT]
3429 || rq.target == xa[XA_UTF8_STRING] 3588 || rq.target == xa[XA_UTF8_STRING]
3430 ) 3589 )
3431 { 3590 {
3591 XTextProperty ct;
3592 Atom target = rq.target;
3432 short freect = 0; 3593 short freect = 0;
3433 int selectlen; 3594 int selectlen;
3434 wchar_t *cl; 3595 wchar_t *cl;
3435 3596 enum {
3436 target = rq.target; 3597 enc_string = XStringStyle,
3598 enc_text = XStdICCTextStyle,
3599 enc_compound_text = XCompoundTextStyle,
3600#ifdef X_HAVE_UTF8_STRING
3601 enc_utf8 = XUTF8StringStyle,
3602#else
3603 enc_utf8 = -1,
3604#endif
3605 } style;
3437 3606
3438 if (target == XA_STRING) 3607 if (target == XA_STRING)
3439 // we actually don't do XA_STRING, but who cares, as i18n clients 3608 // we actually don't do XA_STRING, but who cares, as i18n clients
3440 // will ask for another format anyways. 3609 // will ask for another format anyways.
3441 style = XStringStyle; 3610 style = enc_string;
3442 else if (target == xa[XA_TEXT]) 3611 else if (target == xa[XA_TEXT])
3443 style = XStdICCTextStyle; 3612 style = enc_text;
3444 else if (target == xa[XA_COMPOUND_TEXT]) 3613 else if (target == xa[XA_COMPOUND_TEXT])
3445 style = XCompoundTextStyle; 3614 style = enc_compound_text;
3446#if X_HAVE_UTF8_STRING 3615#if ENABLE_FRILLS
3447 else if (target == xa[XA_UTF8_STRING]) 3616 else if (target == xa[XA_UTF8_STRING])
3448 style = XUTF8StringStyle; 3617 style = enc_utf8;
3449#endif 3618#endif
3450 else 3619 else
3451 { 3620 {
3452 target = xa[XA_COMPOUND_TEXT]; 3621 target = xa[XA_COMPOUND_TEXT];
3453 style = XCompoundTextStyle; 3622 style = enc_compound_text;
3454 } 3623 }
3455 3624
3456 if (selection.text) 3625 if (selection.text)
3457 { 3626 {
3458 cl = selection.text; 3627 cl = selection.text;
… …
3462 { 3631 {
3463 cl = L""; 3632 cl = L"";
3464 selectlen = 0; 3633 selectlen = 0;
3465 } 3634 }
3466 3635
3467 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3636#if ENABLE_FRILLS
3468 // manually for XUTF8StringStyle. 3637 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3638 // so recode it manually
3639 if (style == enc_utf8)
3640 {
3641 freect = 1;
3642 ct.encoding = target;
3643 ct.format = 8;
3644 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3645 ct.nitems = strlen ((char *)ct.value);
3646 }
3647 else
3648#endif
3469 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3649 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3470 freect = 1; 3650 freect = 1;
3471 else 3651 else
3472 { 3652 {
3473 /* if we failed to convert then send it raw */ 3653 /* if we failed to convert then send it raw */
3474 ct.value = (unsigned char *)cl; 3654 ct.value = (unsigned char *)cl;
3475 ct.nitems = selectlen; 3655 ct.nitems = selectlen;
3656 ct.encoding = target;
3476 } 3657 }
3477 3658
3478 XChangeProperty (display->display, rq.requestor, rq.property, 3659 XChangeProperty (display->display, rq.requestor, rq.property,
3479 target, 8, PropModeReplace, 3660 ct.encoding, 8, PropModeReplace,
3480 ct.value, (int)ct.nitems); 3661 ct.value, (int)ct.nitems);
3481 ev.property = rq.property; 3662 ev.property = rq.property;
3482 3663
3483 if (freect) 3664 if (freect)
3484 XFree (ct.value); 3665 XFree (ct.value);
… …
3504} 3685}
3505 3686
3506/* ------------------------------------------------------------------------- */ 3687/* ------------------------------------------------------------------------- */
3507#ifdef USE_XIM 3688#ifdef USE_XIM
3508void 3689void
3509rxvt_term::im_set_position (XPoint *pos) 3690rxvt_term::im_set_position (XPoint &pos)
3510{ 3691{
3511 XWindowAttributes xwa; 3692 XWindowAttributes xwa;
3512 3693
3513 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3694 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3695
3514 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3696 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3515 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3697 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3516} 3698}
3517
3518#endif 3699#endif
3519/* ------------------------------------------------------------------------- */ 3700
3520 3701#if ENABLE_OVERLAY
3702void
3703rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3704{
3705 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3706 return;
3707
3708 want_refresh = 1;
3709
3710 scr_overlay_off ();
3711
3712 if (x < 0) x = TermWin.ncol - w;
3713 if (y < 0) y = TermWin.nrow - h;
3714
3715 // make space for border
3716 w += 2; MIN_IT (w, TermWin.ncol);
3717 h += 2; MIN_IT (h, TermWin.nrow);
3718
3719 x -= 1; MAX_IT (x, 0);
3720 y -= 1; MAX_IT (y, 0);
3721
3722 MIN_IT (x, TermWin.ncol - w);
3723 MIN_IT (y, TermWin.nrow - h);
3724
3725 ov_x = x; ov_y = y;
3726 ov_w = w; ov_h = h;
3727
3728 ov_text = new text_t *[h];
3729 ov_rend = new rend_t *[h];
3730
3731 for (y = 0; y < h; y++)
3732 {
3733 text_t *tp = ov_text[y] = new text_t[w];
3734 rend_t *rp = ov_rend[y] = new rend_t[w];
3735
3736 text_t t0, t1, t2;
3737 rend_t r = OVERLAY_RSTYLE;
3738
3739 if (y == 0)
3740 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3741 else if (y < h - 1)
3742 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3743 else
3744 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3745
3746 *tp++ = t0;
3747 *rp++ = r;
3748
3749 for (x = w - 2; x > 0; --x)
3750 {
3751 *tp++ = t1;
3752 *rp++ = r;
3753 }
3754
3755 *tp = t2;
3756 *rp = r;
3757 }
3758}
3759
3760void
3761rxvt_term::scr_overlay_off ()
3762{
3763 if (!ov_text)
3764 return;
3765
3766 want_refresh = 1;
3767
3768 for (int y = 0; y < ov_h; y++)
3769 {
3770 delete [] ov_text[y];
3771 delete [] ov_rend[y];
3772 }
3773
3774 delete [] ov_text; ov_text = 0;
3775 delete [] ov_rend; ov_rend = 0;
3776}
3777
3778void
3779rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3780{
3781 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3782 return;
3783
3784 x++, y++;
3785
3786 ov_text[y][x] = text;
3787 ov_rend[y][x] = rend;
3788}
3789
3790void
3791rxvt_term::scr_overlay_set (int x, int y, const char *s)
3792{
3793 while (*s)
3794 scr_overlay_set (x++, y, *s++);
3795}
3796
3797void
3798rxvt_term::scr_swap_overlay ()
3799{
3800 if (!ov_text)
3801 return;
3802
3803 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3804
3805 // swap screen mem with overlay
3806 for (int y = ov_h; y--; )
3807 {
3808 text_t *t1 = ov_text[y];
3809 rend_t *r1 = ov_rend[y];
3810
3811 text_t *t2 = screen.text[y + row_offset] + ov_x;
3812 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3813
3814 for (int x = ov_w; x--; )
3815 {
3816 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3817 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3818 }
3819 }
3820}
3821
3822#endif
3521/* ------------------------------------------------------------------------- * 3823/* ------------------------------------------------------------------------- */
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