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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.43 by pcg, Wed Mar 3 02:59:53 2004 UTC vs.
Revision 1.104 by root, Tue Aug 17 01:29:12 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 *
… …
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#define INTERN_SCREEN 28#define INTERN_SCREEN
29#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
30#include "screen.intpro" /* PROTOS for internal routines */
31 30
32#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
33 32
34#include <stdint.h> 33#include <inttypes.h>
35#include <wchar.h> 34#include <wchar.h>
36 35
37#include "salloc.C" // HACK, should be a seperate compile! 36#include "salloc.C" // HACK, should be a seperate compile!
38 37
39inline void fill_text (text_t *start, text_t value, int len) 38inline void fill_text (text_t *start, text_t value, int len)
… …
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 * ------------------------------------------------------------------------- */
118/* Fill part/all of a line with blanks. */ 117/* Fill part/all of a line with blanks. */
119void 118void
120rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 119rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)
121{ 120{
122 efs &= ~RS_baseattrMask; 121 efs &= ~RS_baseattrMask;
123 efs = SET_FONT (efs, TermWin.fontset->find_font (' ')); 122 efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]);
124 123
125 while (width--) 124 while (width--)
126 { 125 {
127 *et++ = ' '; 126 *et++ = ' ';
128 *er++ = efs; 127 *er++ = efs;
… …
155 unsigned int ncol, nrow, total_rows, prev_total_rows; 154 unsigned int ncol, nrow, total_rows, prev_total_rows;
156 unsigned int p, q; 155 unsigned int p, q;
157 int k; 156 int k;
158 rend_t setrstyle; 157 rend_t setrstyle;
159 158
160 D_SCREEN ((stderr, "rxvt_scr_reset ()")); 159#if ENABLE_OVERLAY
160 scr_overlay_off ();
161#endif
161 162
162 TermWin.view_start = 0; 163 TermWin.view_start = 0;
163 num_scr = 0; 164 num_scr = 0;
164 165
165 if (TermWin.ncol == 0) 166 if (TermWin.ncol == 0)
… …
172 nrow = TermWin.nrow; 173 nrow = TermWin.nrow;
173 174
174 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 176 return;
176 177
178 // we need at least two lines for wrapping to work correctly
179 if (nrow + TermWin.saveLines < 2)
180 {
181 TermWin.saveLines++;
182 prev_nrow--;
183 TermWin.nscrolled++;
184 }
185
177 want_refresh = 1; 186 want_refresh = 1;
178 187
188 prev_total_rows = prev_nrow + TermWin.saveLines;
179 total_rows = nrow + TermWin.saveLines; 189 total_rows = nrow + TermWin.saveLines;
180 prev_total_rows = prev_nrow + TermWin.saveLines;
181 190
182 screen.tscroll = 0; 191 screen.tscroll = 0;
183 screen.bscroll = nrow - 1; 192 screen.bscroll = nrow - 1;
184 193
185 if (!talloc) 194 if (!talloc)
186 { 195 {
187 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 196 talloc = new rxvt_salloc (ncol * sizeof (text_t));
188 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
189 } 198 }
190 199
191 if (prev_nrow == 0) 200 if (!screen.text)
192 { 201 {
193 /* 202 /*
194 * first time called so just malloc everything : don't rely on realloc 203 * 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 204 * Note: this is still needed so that all the scrollback lines are NULL
196 */ 205 */
197 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
198 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
199 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
… …
214 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 223 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);
215 screen.tlen[q] = swap.tlen[p] = 0; 224 screen.tlen[q] = swap.tlen[p] = 0;
216 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 225 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);
217 } 226 }
218 227
219 MEMSET (charsets, 'B', sizeof (charsets)); 228 memset (charsets, 'B', sizeof (charsets));
220 TermWin.nscrolled = 0; /* no saved lines */ 229 TermWin.nscrolled = 0; /* no saved lines */
221 rstyle = DEFAULT_RSTYLE; 230 rstyle = DEFAULT_RSTYLE;
222 screen.flags = Screen_DefaultFlags; 231 screen.flags = Screen_DefaultFlags;
223 screen.cur.row = screen.cur.col = 0; 232 screen.cur.row = screen.cur.col = 0;
224 screen.charset = 0; 233 screen.charset = 0;
… …
256 scr_scroll_text (0, (int)prev_nrow - 1, k, 1); 265 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
257 266
258 for (p = nrow; p < prev_nrow; p++) 267 for (p = nrow; p < prev_nrow; p++)
259 { 268 {
260 q = p + TermWin.saveLines; 269 q = p + TermWin.saveLines;
270
261 if (screen.text[q]) 271 if (screen.text[q])
262 { 272 {
263#ifdef DEBUG_STRICT 273#ifdef DEBUG_STRICT
264 assert (screen.rend[q]); 274 assert (screen.rend[q]);
265#endif 275#endif
266 talloc->free (screen.text[q]); 276 talloc->free (screen.text[q]);
267 ralloc->free (screen.rend[q]); 277 ralloc->free (screen.rend[q]);
268 } 278 }
279
269 if (swap.text[p]) 280 if (swap.text[p])
270 { 281 {
271#ifdef DEBUG_STRICT 282#ifdef DEBUG_STRICT
272 assert (swap.rend[p]); 283 assert (swap.rend[p]);
273#endif 284#endif
274 talloc->free (swap.text[p]); 285 talloc->free (swap.text[p]);
275 ralloc->free (swap.rend[p]); 286 ralloc->free (swap.rend[p]);
276 } 287 }
288
277#ifdef DEBUG_STRICT 289#ifdef DEBUG_STRICT
278 assert (drawn_text[p] && drawn_rend[p]); 290 assert (drawn_text[p] && drawn_rend[p]);
279#endif 291#endif
280 talloc->free (drawn_text[p]); 292 talloc->free (drawn_text[p]);
281 ralloc->free (drawn_rend[p]); 293 ralloc->free (drawn_rend[p]);
… …
311 swap.tlen[p] = 0; 323 swap.tlen[p] = 0;
312 swap.text[p] = NULL; 324 swap.text[p] = NULL;
313 swap.rend[p] = NULL; 325 swap.rend[p] = NULL;
314 drawn_text[p] = NULL; 326 drawn_text[p] = NULL;
315 drawn_rend[p] = NULL; 327 drawn_rend[p] = NULL;
316 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); 328 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
317 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); 329 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
318 } 330 }
319 331
320 if (k > 0) 332 if (k > 0)
321 { 333 {
… …
336 } 348 }
337 349
338 /* resize columns */ 350 /* resize columns */
339 if (ncol != prev_ncol) 351 if (ncol != prev_ncol)
340 { 352 {
341 int common = min (prev_ncol, ncol);
342 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); 353 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
343 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); 354 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
344 355
345 for (p = 0; p < total_rows; p++) 356 for (p = 0; p < total_rows; p++)
346 { 357 {
347 if (screen.text[p]) 358 if (screen.text[p])
348 { 359 {
349 text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t; 360 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; 361 screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
351 362
352 MIN_IT (screen.tlen[p], (int16_t)ncol); 363 MIN_IT (screen.tlen[p], (int16_t)ncol);
353 364
354 if (ncol > prev_ncol) 365 if (ncol > prev_ncol)
355 scr_blank_line (& (screen.text[p][prev_ncol]), 366 scr_blank_line (&screen.text[p][prev_ncol],
356 & (screen.rend[p][prev_ncol]), 367 &screen.rend[p][prev_ncol],
357 ncol - prev_ncol, 368 ncol - prev_ncol, setrstyle);
358 setrstyle);
359 } 369 }
360 } 370 }
361 371
362 for (p = 0; p < nrow; p++) 372 for (p = 0; p < nrow; p++)
363 { 373 {
364 text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t; 374 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; 375 drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
366 376
367 if (ncol > prev_ncol) 377 if (ncol > prev_ncol)
368 scr_blank_line (& (drawn_text[p][prev_ncol]), 378 scr_blank_line (&drawn_text[p][prev_ncol],
369 & (drawn_rend[p][prev_ncol]), 379 &drawn_rend[p][prev_ncol],
370 ncol - prev_ncol, setrstyle); 380 ncol - prev_ncol, setrstyle);
371 381
372 if (swap.text[p]) 382 if (swap.text[p])
373 { 383 {
374 text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t; 384 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; 385 swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
376 386
377 MIN_IT (swap.tlen[p], (int16_t)ncol); 387 MIN_IT (swap.tlen[p], (int16_t)ncol);
378 388
379 if (ncol > prev_ncol) 389 if (ncol > prev_ncol)
380 scr_blank_line (& (swap.text[p][prev_ncol]), 390 scr_blank_line (&swap.text[p][prev_ncol],
381 & (swap.rend[p][prev_ncol]), 391 &swap.rend[p][prev_ncol],
382 ncol - prev_ncol, setrstyle); 392 ncol - prev_ncol, setrstyle);
383 } 393 }
384 394
385 } 395 }
386 396
… …
438{ 448{
439 uint16_t total_rows; 449 uint16_t total_rows;
440 int i; 450 int i;
441 451
442 total_rows = TermWin.nrow + TermWin.saveLines; 452 total_rows = TermWin.nrow + TermWin.saveLines;
443
444#ifdef DEBUG_STRICT
445 for (i = 0; i < total_rows; i++)
446 {
447 if (screen.text[i])
448 /* then so is screen.rend[i] */
449 assert (screen.rend[i]);
450 }
451#endif
452 453
453 delete talloc; talloc = 0; 454 delete talloc; talloc = 0;
454 delete ralloc; ralloc = 0; 455 delete ralloc; ralloc = 0;
455 456
456 free (screen.text); 457 free (screen.text);
… …
479 * Hard reset 480 * Hard reset
480 */ 481 */
481void 482void
482rxvt_term::scr_poweron () 483rxvt_term::scr_poweron ()
483{ 484{
484 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
485
486 scr_release (); 485 scr_release ();
487 prev_nrow = prev_ncol = 0; 486 prev_nrow = prev_ncol = 0;
488 scr_reset (); 487 scr_reset ();
489 488
490 scr_clear (); 489 scr_clear (true);
491 scr_refresh (SLOW_REFRESH); 490 scr_refresh (SLOW_REFRESH);
492} 491}
493 492
494/* ------------------------------------------------------------------------- * 493/* ------------------------------------------------------------------------- *
495 * PROCESS SCREEN COMMANDS * 494 * PROCESS SCREEN COMMANDS *
… …
500 * XTERM_SEQ: Restore cursor: ESC 8 499 * XTERM_SEQ: Restore cursor: ESC 8
501 */ 500 */
502void 501void
503rxvt_term::scr_cursor (int mode) 502rxvt_term::scr_cursor (int mode)
504{ 503{
505 screen_t *s; 504 screen_t *s;
506
507 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
508 505
509#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 506#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
510 if (current_screen == SECONDARY) 507 if (current_screen == SECONDARY)
511 s = & (swap); 508 s = &swap;
512 else 509 else
513#endif 510#endif
514 s = & (screen); 511 s = &screen;
512
515 switch (mode) 513 switch (mode)
516 { 514 {
517 case SAVE: 515 case SAVE:
518 s->s_cur.row = s->cur.row; 516 s->s_cur.row = s->cur.row;
519 s->s_cur.col = s->cur.col; 517 s->s_cur.col = s->cur.col;
520 s->s_rstyle = rstyle; 518 s->s_rstyle = rstyle;
521 s->s_charset = s->charset; 519 s->s_charset = s->charset;
522 s->s_charset_char = charsets[s->charset]; 520 s->s_charset_char = charsets[s->charset];
523 break; 521 break;
522
524 case RESTORE: 523 case RESTORE:
525 want_refresh = 1; 524 want_refresh = 1;
526 s->cur.row = s->s_cur.row; 525 s->cur.row = s->s_cur.row;
527 s->cur.col = s->s_cur.col; 526 s->cur.col = s->s_cur.col;
528 s->flags &= ~Screen_WrapNext; 527 s->flags &= ~Screen_WrapNext;
… …
530 s->charset = s->s_charset; 529 s->charset = s->s_charset;
531 charsets[s->charset] = s->s_charset_char; 530 charsets[s->charset] = s->s_charset_char;
532 set_font_style (); 531 set_font_style ();
533 break; 532 break;
534 } 533 }
534
535 /* boundary check in case screen size changed between SAVE and RESTORE */ 535 /* boundary check in case screen size changed between SAVE and RESTORE */
536 MIN_IT (s->cur.row, TermWin.nrow - 1); 536 MIN_IT (s->cur.row, TermWin.nrow - 1);
537 MIN_IT (s->cur.col, TermWin.ncol - 1); 537 MIN_IT (s->cur.col, TermWin.ncol - 1);
538#ifdef DEBUG_STRICT 538#ifdef DEBUG_STRICT
539 assert (s->cur.row >= 0); 539 assert (s->cur.row >= 0);
… …
551 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 551 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
552 */ 552 */
553int 553int
554rxvt_term::scr_change_screen (int scrn) 554rxvt_term::scr_change_screen (int scrn)
555{ 555{
556 int i; 556 int i;
557#if NSCREENS 557#if NSCREENS
558 int offset; 558 int offset;
559#endif 559#endif
560 560
561 want_refresh = 1; 561 want_refresh = 1;
562 562
563 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
564
565 TermWin.view_start = 0; 563 TermWin.view_start = 0;
566 564
567 if (current_screen == scrn) 565 if (current_screen == scrn)
568 return current_screen; 566 return scrn;
569 567
570 selection_check (2); /* check for boundary cross */ 568 selection_check (2); /* check for boundary cross */
571 569
572 SWAP_IT (current_screen, scrn, int); 570 SWAP_IT (current_screen, scrn, int);
573#if NSCREENS 571#if NSCREENS
572 if (options & Opt_secondaryScreen)
573 {
574 num_scr = 0; 574 num_scr = 0;
575 offset = TermWin.saveLines; 575 offset = TermWin.saveLines;
576 for (i = prev_nrow; i--;) 576 for (i = prev_nrow; i--;)
577 { 577 {
578 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 578 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
579 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 579 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
580 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 580 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
581 } 581 }
582 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 582 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
583 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 583 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
584# ifdef DEBUG_STRICT 584# ifdef DEBUG_STRICT
585 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); 585 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
586 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); 586 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
587# else /* drive with your eyes closed */ 587# else /* drive with your eyes closed */
588 MAX_IT (screen.cur.row, 0); 588 MAX_IT (screen.cur.row, 0);
589 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 589 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
590 MAX_IT (screen.cur.col, 0); 590 MAX_IT (screen.cur.col, 0);
591 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); 591 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
592# endif 592# endif
593 SWAP_IT (screen.charset, swap.charset, int16_t); 593 SWAP_IT (screen.charset, swap.charset, int16_t);
594 SWAP_IT (screen.flags, swap.flags, int); 594 SWAP_IT (screen.flags, swap.flags, int);
595 screen.flags |= Screen_VisibleCursor; 595 screen.flags |= Screen_VisibleCursor;
596 swap.flags |= Screen_VisibleCursor; 596 swap.flags |= Screen_VisibleCursor;
597#else 597 }
598# ifdef SCROLL_ON_NO_SECONDARY 598 else
599#endif
600 if (options & Opt_secondaryScroll)
599 if (current_screen == PRIMARY) 601 //if (current_screen == PRIMARY)
600 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 602 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
601# endif
602#endif
603 return scrn; 603 return scrn;
604}
605
606// clear WrapNext indicator, solidifying position on next line
607void
608rxvt_term::scr_do_wrap ()
609{
610 if (!(screen.flags & Screen_WrapNext))
611 return;
612
613 screen.flags &= ~Screen_WrapNext;
614
615 screen.cur.col = 0;
616
617 if (screen.cur.row == screen.bscroll)
618 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
619 else if (screen.cur.row < TermWin.nrow - 1)
620 screen.cur.row++;
604} 621}
605 622
606/* ------------------------------------------------------------------------- */ 623/* ------------------------------------------------------------------------- */
607/* 624/*
608 * Change the colour for following text 625 * Change the colour for following text
… …
647 664
648 if (count == 0 || (row1 > row2)) 665 if (count == 0 || (row1 > row2))
649 return 0; 666 return 0;
650 667
651 want_refresh = 1; 668 want_refresh = 1;
652 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
653 669
654 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) 670 if (row1 == 0 && count > 0
671 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
655 { 672 {
656 nscrolled = (long)TermWin.nscrolled + (long)count; 673 nscrolled = (long)TermWin.nscrolled + (long)count;
657 674
658 if (nscrolled > (long)TermWin.saveLines) 675 if (nscrolled > (long)TermWin.saveLines)
659 TermWin.nscrolled = TermWin.saveLines; 676 TermWin.nscrolled = TermWin.saveLines;
660 else 677 else
661 TermWin.nscrolled = (uint16_t)nscrolled; 678 TermWin.nscrolled = (uint16_t)nscrolled;
662 679
663 if ((Options & Opt_scrollWithBuffer) 680 if ((options & Opt_scrollWithBuffer)
664 && TermWin.view_start != 0 681 && TermWin.view_start != 0
665 && TermWin.view_start != TermWin.saveLines) 682 && TermWin.view_start != TermWin.saveLines)
666 scr_page (UP, count); 683 scr_page (UP, count);
667 } 684 }
668 else if (!spec) 685 else if (!spec)
… …
707 if (j > 0) 724 if (j > 0)
708 { 725 {
709 /* A: scroll up */ 726 /* A: scroll up */
710 727
711 /* A1: Copy lines that will get clobbered by the rotation */ 728 /* A1: Copy lines that will get clobbered by the rotation */
729 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
730 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
731
732 /* A2: Rotate lines */
733 i = row2 - row1 - count + 1;
734 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
735 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
736 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
737
738 j = row2 - count + 1, i = count;
739 }
740 else /* if (j < 0) */
741 {
742 /* B: scroll down */
743
744 /* B1: Copy lines that will get clobbered by the rotation */
712 for (i = 0, j = row1; i < count; i++, j++) 745 for (i = 0, j = row2; i < count; i++, j--)
713 { 746 {
714 buf_text[i] = screen.text[j]; 747 buf_text[i] = screen.text[j];
715 buf_rend[i] = screen.rend[j]; 748 buf_rend[i] = screen.rend[j];
716 } 749 }
750
717 /* A2: Rotate lines */ 751 /* B2: Rotate lines */
718 for (j = row1, i = j + count; i <= row2; i++, j++) 752 for (j = row2, i = j - count; i >= row1; i--, j--)
719 { 753 {
720 screen.tlen[j] = screen.tlen[i]; 754 screen.tlen[j] = screen.tlen[i];
721 screen.text[j] = screen.text[i]; 755 screen.text[j] = screen.text[i];
722 screen.rend[j] = screen.rend[i]; 756 screen.rend[j] = screen.rend[i];
723 } 757 }
724 j = row2 - count + 1, i = count;
725 }
726 else /* if (j < 0) */
727 {
728 /* B: scroll down */
729 758
730 /* B1: Copy lines that will get clobbered by the rotation */
731 for (i = 0, j = row2; i < count; i++, j--)
732 {
733 buf_text[i] = screen.text[j];
734 buf_rend[i] = screen.rend[j];
735 }
736 /* B2: Rotate lines */
737 for (j = row2, i = j - count; i >= row1; i--, j--)
738 {
739 screen.tlen[j] = screen.tlen[i];
740 screen.text[j] = screen.text[i];
741 screen.rend[j] = screen.rend[i];
742 }
743 j = row1, i = count; 759 j = row1, i = count;
744 count = -count; 760 count = -count;
745 } 761 }
746 762
747 /* C: Resurrect lines */ 763 /* C: Resurrect lines */
764 memset (screen.tlen + j, 0, i * sizeof (int16_t));
765 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
766 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
767 if (!spec) /* line length may not equal TermWin.ncol */
748 for (; i--; j++) 768 for (; i--; j++)
749 {
750 screen.tlen[j] = 0;
751 screen.text[j] = buf_text[i];
752 screen.rend[j] = buf_rend[i];
753
754 if (!spec) /* line length may not equal TermWin.ncol */
755 scr_blank_screen_mem (screen.text, screen.rend, 769 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
756 (unsigned int)j, rstyle);
757 }
758 770
759 return count; 771 return count;
760} 772}
761 773
762/* ------------------------------------------------------------------------- */ 774/* ------------------------------------------------------------------------- */
763/* 775/*
764 * Add text given in <str> of length <len> to screen struct 776 * Add text given in <str> of length <len> to screen struct
765 */ 777 */
766void 778void
767rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) 779rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
768{ 780{
769 unsigned char checksel, clearsel; 781 unsigned char checksel;
770 uint32_t c; 782 unicode_t c;
771 int i, row, last_col; 783 int i, row, last_col;
772 text_t *stp; 784 text_t *stp;
773 rend_t *srp; 785 rend_t *srp;
774 786
775 if (len <= 0) /* sanity */ 787 if (len <= 0) /* sanity */
776 return; 788 return;
777 789
778 want_refresh = 1; 790 want_refresh = 1;
791 ZERO_SCROLLBACK ();
779 last_col = TermWin.ncol; 792 last_col = TermWin.ncol;
780 793
781 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
782 ZERO_SCROLLBACK ();
783 if (nlines > 0) 794 if (nlines > 0)
784 { 795 {
785 nlines += (screen.cur.row - screen.bscroll); 796 nlines += screen.cur.row - screen.bscroll;
786 if ((nlines > 0) 797 if ((nlines > 0)
787 && (screen.tscroll == 0) 798 && (screen.tscroll == 0)
788 && (screen.bscroll == (TermWin.nrow - 1))) 799 && (screen.bscroll == (TermWin.nrow - 1)))
789 { 800 {
790 /* _at least_ this many lines need to be scrolled */ 801 /* _at least_ this many lines need to be scrolled */
791 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 802 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
792 screen.cur.row -= nlines; 803 screen.cur.row -= nlines;
793 } 804 }
794 } 805 }
806
795#ifdef DEBUG_STRICT 807#ifdef DEBUG_STRICT
796 assert (screen.cur.col < last_col); 808 assert (screen.cur.col < last_col);
797 assert ((screen.cur.row < TermWin.nrow) 809 assert ((screen.cur.row < TermWin.nrow)
798 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 810 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
799#else /* drive with your eyes closed */ 811#else /* drive with your eyes closed */
800 MIN_IT (screen.cur.col, last_col - 1); 812 MIN_IT (screen.cur.col, last_col - 1);
801 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 813 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
802 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 814 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
803#endif 815#endif
804 row = screen.cur.row + TermWin.saveLines; 816 row = screen.cur.row + TermWin.saveLines;
805 817
806 checksel = (selection.op 818 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807 && current_screen == selection.screen) ? 1 : 0;
808 clearsel = 0;
809 819
810 stp = screen.text[row]; 820 stp = screen.text[row];
811 srp = screen.rend[row]; 821 srp = screen.rend[row];
812 822
813 for (i = 0; i < len;) 823 while (len--)
814 { 824 {
815 c = str[i++]; 825 c = *str++;
826
827 if (c < 0x20)
816 switch (c) 828 switch (c)
817 { 829 {
818 case '\t': 830 case C0_HT:
819 scr_tab (1); 831 scr_tab (1);
820 continue; 832 continue;
821 case '\n': 833
834 case C0_LF:
822 if (screen.tlen[row] != -1) /* XXX: think about this */ 835 if (screen.tlen[row] != -1) /* XXX: think about this */
823 MAX_IT (screen.tlen[row], screen.cur.col); 836 MAX_IT (screen.tlen[row], screen.cur.col);
837
824 screen.flags &= ~Screen_WrapNext; 838 screen.flags &= ~Screen_WrapNext;
839
825 if (screen.cur.row == screen.bscroll) 840 if (screen.cur.row == screen.bscroll)
826 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 841 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
827 else if (screen.cur.row < (TermWin.nrow - 1)) 842 else if (screen.cur.row < (TermWin.nrow - 1))
828 row = (++screen.cur.row) + TermWin.saveLines; 843 row = (++screen.cur.row) + TermWin.saveLines;
844
829 stp = screen.text[row]; /* _must_ refresh */ 845 stp = screen.text[row]; /* _must_ refresh */
830 srp = screen.rend[row]; /* _must_ refresh */ 846 srp = screen.rend[row]; /* _must_ refresh */
831 continue; 847 continue;
832 case '\r': 848
849 case C0_CR:
833 if (screen.tlen[row] != -1) /* XXX: think about this */ 850 if (screen.tlen[row] != -1) /* XXX: think about this */
834 MAX_IT (screen.tlen[row], screen.cur.col); 851 MAX_IT (screen.tlen[row], screen.cur.col);
852
835 screen.flags &= ~Screen_WrapNext; 853 screen.flags &= ~Screen_WrapNext;
836 screen.cur.col = 0; 854 screen.cur.col = 0;
837 continue; 855 continue;
838 default:
839 if (c == 127)
840 continue; /* yummmm..... */
841 break;
842 } 856 }
843 857
844 if (checksel /* see if we're writing within selection */ 858 if (checksel /* see if we're writing within selection */
845 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 859 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
846 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 860 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
847 { 861 {
848 checksel = 0; 862 checksel = 0;
849 clearsel = 1;
850 } 863 /*
864 * If we wrote anywhere in the selected area, kill the selection
865 * XXX: should we kill the mark too? Possibly, but maybe that
866 * should be a similar check.
867 */
868 CLEAR_SELECTION ();
869 }
870
851 if (screen.flags & Screen_WrapNext) 871 if (screen.flags & Screen_WrapNext)
852 { 872 {
853 screen.tlen[row] = -1; 873 screen.tlen[row] = -1;
854 if (screen.cur.row == screen.bscroll) 874
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; 875 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;
876
858 stp = screen.text[row]; /* _must_ refresh */ 877 stp = screen.text[row]; /* _must_ refresh */
859 srp = screen.rend[row]; /* _must_ refresh */ 878 srp = screen.rend[row]; /* _must_ refresh */
860 screen.cur.col = 0;
861 screen.flags &= ~Screen_WrapNext;
862 } 879 }
880
863 if (screen.flags & Screen_Insert) 881 if (screen.flags & Screen_Insert)
864 scr_insdel_chars (1, INSERT); 882 scr_insdel_chars (1, INSERT);
865 883
884 // rely on wcwidth to tell us the character width, at least for non-latin1
885 // do wcwidth before further replacements, as wcwidth says that line-drawing
886 // characters have width -1 (DOH!) on GNU/Linux sometimes.
887 int width = c < 0x100 ? 1 : wcwidth (c);
888
866 if (charsets[screen.charset] == '0') // DEC SPECIAL 889 if (charsets[screen.charset] == '0') // DEC SPECIAL
867 switch (c)
868 { 890 {
869 // dunno where these come from
870#if 0
871 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break;
872 case '.': c = 0x2193; break; case '0': c = 0x25ae; break;
873#endif
874 // vt100 special graphics and line drawing 891 // vt100 special graphics and line drawing
875 case '`': c = 0x25c6; break; case '_': c = 0x0020; break; 892 static uint16_t vt100_0[32] = { // 5f .. 7e
876 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; 893 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
877 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; 894 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
878 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; 895 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
879 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; 896 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
880 case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break;
881 case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break;
882 case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break;
883 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break;
884 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break;
885 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
886 } 897 };
887 898
888 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 899 if (c >= 0x5f && c <= 0x7e)
889 // rely on wcwidth to tell us the character width, at least for non-ascii 900 {
890 int width = c <= 128 ? 1 : wcwidth (c); 901 c = vt100_0[c - 0x5f];
902 width = 1;
903 }
904 }
891 905
892 // width -1 characters (e.g. combining chars) are ignored currently.
893 if (width > 0) 906 if (width != 0)
894 { 907 {
908#if !UNICODE_3
909 // trim characters we can't store directly :(
910 if (c >= 0x10000)
911# if ENABLE_COMBINING
912 c = rxvt_composite.compose (c); // map to lower 16 bits
913# else
914 c = 0xfffd;
915# endif
916#endif
917 bool bold = (options & Opt_realBold) && ((rstyle & RS_Bold) != 0);
918 rend_t rend = SET_FONT (rstyle,
919 c > 0x7f || bold || c < 0x20
920 ? TermWin.fontset->find_font (c, bold)
921 : TermWin.ascii_map [c - 0x20]);
922
895 do 923 do
896 { 924 {
897 stp[screen.cur.col] = c; 925 stp[screen.cur.col] = c;
898 srp[screen.cur.col] = rend; 926 srp[screen.cur.col] = rend;
899 927
… …
910 c = NOCHAR; 938 c = NOCHAR;
911 } 939 }
912 while (--width > 0); 940 while (--width > 0);
913 941
914 // pad with spaces when overwriting wide character with smaller one 942 // pad with spaces when overwriting wide character with smaller one
915 for (int c = screen.cur.col; stp[c] == NOCHAR && c < last_col; c++) 943 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
916 { 944 {
917 stp[c] = ' '; 945 stp[c] = ' ';
918 srp[c] = rend; 946 srp[c] = rend;
919 } 947 }
920 } 948 }
949 else if (width == 0)
950 {
951#if ENABLE_COMBINING
952 // handle combining characters
953 // we just tag the accent on the previous on-screen character.
954 // this is arguably not correct, but also arguably not wrong.
955 // we don't handle double-width characters nicely yet.
956
957 text_t *tp;
958 rend_t *rp;
959
960 if (screen.cur.col > 0)
961 {
962 tp = stp + screen.cur.col - 1;
963 rp = srp + screen.cur.col - 1;
964 }
965 else if (screen.cur.row > 0
966 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
967 {
968 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
969 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
970 }
921 else 971 else
922 (void)0; /* handle combining character etc. here. */ 972 continue;
973
974 // handle double-width-chars by making them look extremely ugly
975 if (*tp == NOCHAR)
976 *tp = ' '; // hack //D //TODO //--tp, --rp;
977
978 // first try to find a precomposed character
979 unicode_t n = rxvt_compose (*tp, c);
980 if (n == NOCHAR)
981 n = rxvt_composite.compose (*tp, c);
982
983 *tp = n;
984 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
985#endif
986 }
923 } 987 }
924 988
925 if (screen.tlen[row] != -1) /* XXX: think about this */ 989 if (screen.tlen[row] != -1) /* XXX: think about this */
926 MAX_IT (screen.tlen[row], screen.cur.col); 990 MAX_IT (screen.tlen[row], screen.cur.col);
927
928 /*
929 * If we wrote anywhere in the selected area, kill the selection
930 * XXX: should we kill the mark too? Possibly, but maybe that
931 * should be a similar check.
932 */
933 if (clearsel)
934 CLEAR_SELECTION ();
935 991
936#ifdef DEBUG_STRICT 992#ifdef DEBUG_STRICT
937 assert (screen.cur.row >= 0); 993 assert (screen.cur.row >= 0);
938#else /* drive with your eyes closed */ 994#else /* drive with your eyes closed */
939 MAX_IT (screen.cur.row, 0); 995 MAX_IT (screen.cur.row, 0);
… …
947 */ 1003 */
948void 1004void
949rxvt_term::scr_backspace () 1005rxvt_term::scr_backspace ()
950{ 1006{
951 want_refresh = 1; 1007 want_refresh = 1;
1008
952 if (screen.cur.col == 0) 1009 if (screen.cur.col == 0)
953 { 1010 {
954 if (screen.cur.row > 0) 1011 if (screen.cur.row > 0)
955 { 1012 {
956#ifdef TERMCAP_HAS_BW 1013#ifdef TERMCAP_HAS_BW
957 screen.cur.col = TermWin.ncol - 1; 1014 screen.cur.col = TermWin.ncol - 1;
958 screen.cur.row--; 1015 screen.cur.row--;
959 return; 1016 return;
960#endif 1017#endif
961
962 } 1018 }
963 } 1019 }
964 else if ((screen.flags & Screen_WrapNext) == 0) 1020 else if (!(screen.flags & Screen_WrapNext))
965 scr_gotorc (0, -1, RELATIVE); 1021 scr_gotorc (0, -1, RELATIVE);
1022
966 screen.flags &= ~Screen_WrapNext; 1023 screen.flags &= ~Screen_WrapNext;
967} 1024}
968 1025
969/* ------------------------------------------------------------------------- */ 1026/* ------------------------------------------------------------------------- */
970/* 1027/*
… …
973 * XTERM_SEQ: CTRL-I 1030 * XTERM_SEQ: CTRL-I
974 */ 1031 */
975void 1032void
976rxvt_term::scr_tab (int count) 1033rxvt_term::scr_tab (int count)
977{ 1034{
978 int i, x; 1035 int i, x;
979 1036
980 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
981 want_refresh = 1; 1037 want_refresh = 1;
982 i = x = screen.cur.col; 1038 i = x = screen.cur.col;
1039
983 if (count == 0) 1040 if (count == 0)
984 return; 1041 return;
985 else if (count > 0) 1042 else if (count > 0)
986 { 1043 {
987 for (; ++i < TermWin.ncol; ) 1044 for (; ++i < TermWin.ncol; )
… …
989 { 1046 {
990 x = i; 1047 x = i;
991 if (!--count) 1048 if (!--count)
992 break; 1049 break;
993 } 1050 }
1051
994 if (count) 1052 if (count)
995 x = TermWin.ncol - 1; 1053 x = TermWin.ncol - 1;
996 } 1054 }
997 else /* if (count < 0) */ 1055 else /* if (count < 0) */
998 { 1056 {
… …
1001 { 1059 {
1002 x = i; 1060 x = i;
1003 if (!++count) 1061 if (!++count)
1004 break; 1062 break;
1005 } 1063 }
1064
1006 if (count) 1065 if (count)
1007 x = 0; 1066 x = 0;
1008 } 1067 }
1068
1009 if (x != screen.cur.col) 1069 if (x != screen.cur.col)
1010 scr_gotorc (0, x, R_RELATIVE); 1070 scr_gotorc (0, x, R_RELATIVE);
1011} 1071}
1012 1072
1013/* ------------------------------------------------------------------------- */ 1073/* ------------------------------------------------------------------------- */
… …
1015 * Process DEC Back Index 1075 * Process DEC Back Index
1016 * XTERM_SEQ: ESC 6 1076 * XTERM_SEQ: ESC 6
1017 * Move cursor left in row. If we're at the left boundary, shift everything 1077 * Move cursor left in row. If we're at the left boundary, shift everything
1018 * in that row right. Clear left column. 1078 * in that row right. Clear left column.
1019 */ 1079 */
1020#ifndef NO_FRILLS 1080#if ENABLE_FRILLS
1021void 1081void
1022rxvt_term::scr_backindex () 1082rxvt_term::scr_backindex ()
1023{ 1083{
1024 if (screen.cur.col > 0) 1084 if (screen.cur.col > 0)
1025 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1085 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1026 else 1086 else
1027 { 1087 {
1028 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1088 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1029 return; /* um, yeah? */ 1089 return; /* um, yeah? */
1090
1030 scr_insdel_chars (1, INSERT); 1091 scr_insdel_chars (1, INSERT);
1031 } 1092 }
1032} 1093}
1033#endif 1094#endif
1034/* ------------------------------------------------------------------------- */ 1095/* ------------------------------------------------------------------------- */
… …
1036 * Process DEC Forward Index 1097 * Process DEC Forward Index
1037 * XTERM_SEQ: ESC 9 1098 * XTERM_SEQ: ESC 9
1038 * Move cursor right in row. If we're at the right boundary, shift everything 1099 * Move cursor right in row. If we're at the right boundary, shift everything
1039 * in that row left. Clear right column. 1100 * in that row left. Clear right column.
1040 */ 1101 */
1041#ifndef NO_FRILLS 1102#if ENABLE_FRILLS
1042void 1103void
1043rxvt_term::scr_forwardindex () 1104rxvt_term::scr_forwardindex ()
1044{ 1105{
1045 int row; 1106 int row;
1046 1107
1047 if (screen.cur.col < TermWin.ncol - 1) 1108 if (screen.cur.col < TermWin.ncol - 1)
1048 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1109 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1049 else 1110 else
1050 { 1111 {
1051 row = screen.cur.row + TermWin.saveLines; 1112 row = screen.cur.row + TermWin.saveLines;
1113
1052 if (screen.tlen[row] == 0) 1114 if (screen.tlen[row] == 0)
1053 return; /* um, yeah? */ 1115 return; /* um, yeah? */
1054 else if (screen.tlen[row] == -1) 1116 else if (screen.tlen[row] == -1)
1055 screen.tlen[row] = TermWin.ncol; 1117 screen.tlen[row] = TermWin.ncol;
1118
1056 scr_gotorc (0, 0, R_RELATIVE); 1119 scr_gotorc (0, 0, R_RELATIVE);
1057 scr_insdel_chars (1, DELETE); 1120 scr_insdel_chars (1, DELETE);
1058 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1121 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1059 } 1122 }
1060} 1123}
… …
1068rxvt_term::scr_gotorc (int row, int col, int relative) 1131rxvt_term::scr_gotorc (int row, int col, int relative)
1069{ 1132{
1070 want_refresh = 1; 1133 want_refresh = 1;
1071 ZERO_SCROLLBACK (); 1134 ZERO_SCROLLBACK ();
1072 1135
1073 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col));
1074
1075 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1136 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1076 : col);
1077 MAX_IT (screen.cur.col, 0); 1137 MAX_IT (screen.cur.col, 0);
1078 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1138 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1079 1139
1080 screen.flags &= ~Screen_WrapNext; 1140 screen.flags &= ~Screen_WrapNext;
1141
1081 if (relative & R_RELATIVE) 1142 if (relative & R_RELATIVE)
1082 { 1143 {
1083 if (row > 0) 1144 if (row > 0)
1084 { 1145 {
1085 if (screen.cur.row <= screen.bscroll 1146 if (screen.cur.row <= screen.bscroll
… …
1105 MIN_IT (screen.cur.row, screen.bscroll); 1166 MIN_IT (screen.cur.row, screen.bscroll);
1106 } 1167 }
1107 else 1168 else
1108 screen.cur.row = row; 1169 screen.cur.row = row;
1109 } 1170 }
1171
1110 MAX_IT (screen.cur.row, 0); 1172 MAX_IT (screen.cur.row, 0);
1111 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1173 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1112
1113 while (screen.cur.col > 0
1114 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1115 screen.cur.col--;
1116} 1174}
1117 1175
1118/* ------------------------------------------------------------------------- */ 1176/* ------------------------------------------------------------------------- */
1119/* 1177/*
1120 * direction should be UP or DN 1178 * direction should be UP or DN
1121 */ 1179 */
1122void 1180void
1123rxvt_term::scr_index (enum page_dirn direction) 1181rxvt_term::scr_index (enum page_dirn direction)
1124{ 1182{
1125 int dirn; 1183 int dirn;
1126 1184
1127 want_refresh = 1; 1185 want_refresh = 1;
1186 ZERO_SCROLLBACK ();
1187
1128 dirn = ((direction == UP) ? 1 : -1); 1188 dirn = ((direction == UP) ? 1 : -1);
1129 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1130
1131 ZERO_SCROLLBACK ();
1132 1189
1133 screen.flags &= ~Screen_WrapNext; 1190 screen.flags &= ~Screen_WrapNext;
1191
1134 if ((screen.cur.row == screen.bscroll && direction == UP) 1192 if ((screen.cur.row == screen.bscroll && direction == UP)
1135 || (screen.cur.row == screen.tscroll && direction == DN)) 1193 || (screen.cur.row == screen.tscroll && direction == DN))
1136 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1194 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1137 else 1195 else
1138 screen.cur.row += dirn; 1196 screen.cur.row += dirn;
1197
1139 MAX_IT (screen.cur.row, 0); 1198 MAX_IT (screen.cur.row, 0);
1140 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1199 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1141 selection_check (0); 1200 selection_check (0);
1142} 1201}
1143 1202
… …
1152rxvt_term::scr_erase_line (int mode) 1211rxvt_term::scr_erase_line (int mode)
1153{ 1212{
1154 unsigned int row, col, num; 1213 unsigned int row, col, num;
1155 1214
1156 want_refresh = 1; 1215 want_refresh = 1;
1157 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1158 ZERO_SCROLLBACK (); 1216 ZERO_SCROLLBACK ();
1159 1217
1160 selection_check (1); 1218 selection_check (1);
1161
1162 screen.flags &= ~Screen_WrapNext;
1163 1219
1164 row = TermWin.saveLines + screen.cur.row; 1220 row = TermWin.saveLines + screen.cur.row;
1165 switch (mode) 1221 switch (mode)
1166 { 1222 {
1167 case 0: /* erase to end of line */ 1223 case 0: /* erase to end of line */
… …
1190 default: 1246 default:
1191 return; 1247 return;
1192 } 1248 }
1193 1249
1194 if (screen.text[row]) 1250 if (screen.text[row])
1195 scr_blank_line (& (screen.text[row][col]), 1251 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1196 & (screen.rend[row][col]), num, rstyle);
1197 else 1252 else
1198 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1253 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1199} 1254}
1200 1255
1201/* ------------------------------------------------------------------------- */ 1256/* ------------------------------------------------------------------------- */
… …
1206 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1261 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1207 */ 1262 */
1208void 1263void
1209rxvt_term::scr_erase_screen (int mode) 1264rxvt_term::scr_erase_screen (int mode)
1210{ 1265{
1211 int num; 1266 int num;
1212 int32_t row, row_offset; 1267 int32_t row, row_offset;
1213 rend_t ren; 1268 rend_t ren;
1214 XGCValues gcvalue; 1269 XGCValues gcvalue;
1215 1270
1216 want_refresh = 1; 1271 want_refresh = 1;
1217 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1218 ZERO_SCROLLBACK (); 1272 ZERO_SCROLLBACK ();
1273
1219 row_offset = (int32_t)TermWin.saveLines; 1274 row_offset = (int32_t)TermWin.saveLines;
1220 1275
1221 switch (mode) 1276 switch (mode)
1222 { 1277 {
1223 case 0: /* erase to end of screen */ 1278 case 0: /* erase to end of screen */
… …
1238 num = TermWin.nrow; 1293 num = TermWin.nrow;
1239 break; 1294 break;
1240 default: 1295 default:
1241 return; 1296 return;
1242 } 1297 }
1243 refresh_type |= REFRESH_BOUNDS; 1298
1244 if (selection.op && current_screen == selection.screen 1299 if (selection.op && current_screen == selection.screen
1245 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1300 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1246 || (selection.end.row >= row 1301 || (selection.end.row >= row
1247 && selection.end.row <= row + num))) 1302 && selection.end.row <= row + num)))
1248 CLEAR_SELECTION (); 1303 CLEAR_SELECTION ();
1304
1249 if (row >= TermWin.nrow) /* Out Of Bounds */ 1305 if (row >= TermWin.nrow) /* Out Of Bounds */
1250 return; 1306 return;
1307
1251 MIN_IT (num, (TermWin.nrow - row)); 1308 MIN_IT (num, (TermWin.nrow - row));
1309
1252 if (rstyle & (RS_RVid | RS_Uline)) 1310 if (rstyle & (RS_RVid | RS_Uline))
1253 ren = (rend_t) ~RS_None; 1311 ren = (rend_t) ~RS_None;
1254 else if (GET_BASEBG (rstyle) == Color_bg) 1312 else if (GET_BASEBG (rstyle) == Color_bg)
1255 { 1313 {
1256 ren = DEFAULT_RSTYLE; 1314 ren = DEFAULT_RSTYLE;
1257 CLEAR_ROWS (row, num); 1315 CLEAR_ROWS (row, num);
1258 } 1316 }
1259 else 1317 else
1260 { 1318 {
1261 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1319 ren = (rstyle & (RS_fgMask | RS_bgMask));
1262 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1320 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1263 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1321 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1264 ERASE_ROWS (row, num); 1322 ERASE_ROWS (row, num);
1265 gcvalue.foreground = PixColors[Color_fg]; 1323 gcvalue.foreground = pix_colors[Color_fg];
1266 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1324 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1267 } 1325 }
1326
1268 for (; num--; row++) 1327 for (; num--; row++)
1269 { 1328 {
1270 scr_blank_screen_mem (screen.text, screen.rend, 1329 scr_blank_screen_mem (screen.text, screen.rend,
1271 (unsigned int) (row + row_offset), rstyle); 1330 (unsigned int) (row + row_offset), rstyle);
1272 screen.tlen[row + row_offset] = 0; 1331 screen.tlen[row + row_offset] = 0;
… …
1285{ 1344{
1286 int i, j, k; 1345 int i, j, k;
1287 rend_t *r1, fs; 1346 rend_t *r1, fs;
1288 1347
1289 want_refresh = 1; 1348 want_refresh = 1;
1349 ZERO_SCROLLBACK ();
1350
1290 num_scr_allow = 0; 1351 num_scr_allow = 0;
1291 ZERO_SCROLLBACK ();
1292 selection_check (3); 1352 selection_check (3);
1293 1353
1294 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1354 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E'));
1295 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1355 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1296 { 1356 {
… …
1306 * Insert/Delete <count> lines 1366 * Insert/Delete <count> lines
1307 */ 1367 */
1308void 1368void
1309rxvt_term::scr_insdel_lines (int count, int insdel) 1369rxvt_term::scr_insdel_lines (int count, int insdel)
1310{ 1370{
1311 int end; 1371 int end;
1312 1372
1313 ZERO_SCROLLBACK (); 1373 ZERO_SCROLLBACK ();
1314 1374
1315 selection_check (1); 1375 selection_check (1);
1316 1376
… …
1323 if (insdel == DELETE) 1383 if (insdel == DELETE)
1324 return; 1384 return;
1325 else if (insdel == INSERT) 1385 else if (insdel == INSERT)
1326 count = end; 1386 count = end;
1327 } 1387 }
1328 screen.flags &= ~Screen_WrapNext; 1388
1389 scr_do_wrap ();
1329 1390
1330 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1391 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1331} 1392}
1332 1393
1333/* ------------------------------------------------------------------------- */ 1394/* ------------------------------------------------------------------------- */
… …
1335 * Insert/Delete <count> characters from the current position 1396 * Insert/Delete <count> characters from the current position
1336 */ 1397 */
1337void 1398void
1338rxvt_term::scr_insdel_chars (int count, int insdel) 1399rxvt_term::scr_insdel_chars (int count, int insdel)
1339{ 1400{
1340 int col, row; 1401 int col, row;
1341 rend_t tr; 1402 rend_t tr;
1342 text_t *stp; 1403 text_t *stp;
1343 rend_t *srp; 1404 rend_t *srp;
1344 int16_t *slp; 1405 int16_t *slp;
1345 1406
1346 want_refresh = 1; 1407 want_refresh = 1;
1347 ZERO_SCROLLBACK (); 1408 ZERO_SCROLLBACK ();
1348 1409
1349 if (count <= 0) 1410 if (count <= 0)
1350 return; 1411 return;
1351 1412
1413 scr_do_wrap ();
1414
1352 selection_check (1); 1415 selection_check (1);
1353 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1416 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1354 1417
1355 row = screen.cur.row + TermWin.saveLines; 1418 row = screen.cur.row + TermWin.saveLines;
1356 screen.flags &= ~Screen_WrapNext;
1357 1419
1358 stp = screen.text[row]; 1420 stp = screen.text[row];
1359 srp = screen.rend[row]; 1421 srp = screen.rend[row];
1360 slp = & (screen.tlen[row]); 1422 slp = &screen.tlen[row];
1423
1361 switch (insdel) 1424 switch (insdel)
1362 { 1425 {
1363 case INSERT: 1426 case INSERT:
1364 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1427 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1365 col--) 1428 col--)
1366 { 1429 {
1367 stp[col] = stp[col - count]; 1430 stp[col] = stp[col - count];
1368 srp[col] = srp[col - count]; 1431 srp[col] = srp[col - count];
1369 } 1432 }
1433
1370 if (*slp != -1) 1434 if (*slp != -1)
1371 { 1435 {
1372 *slp += count; 1436 *slp += count;
1373 MIN_IT (*slp, TermWin.ncol); 1437 MIN_IT (*slp, TermWin.ncol);
1374 } 1438 }
1439
1375 if (selection.op && current_screen == selection.screen 1440 if (selection.op && current_screen == selection.screen
1376 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1441 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1377 { 1442 {
1378 if (selection.end.row != screen.cur.row 1443 if (selection.end.row != screen.cur.row
1379 || (selection.end.col + count >= TermWin.ncol)) 1444 || (selection.end.col + count >= TermWin.ncol))
… …
1383 selection.beg.col += count; 1448 selection.beg.col += count;
1384 selection.mark.col += count; /* XXX: yes? */ 1449 selection.mark.col += count; /* XXX: yes? */
1385 selection.end.col += count; 1450 selection.end.col += count;
1386 } 1451 }
1387 } 1452 }
1453
1388 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1454 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1389 (unsigned int)count, rstyle); 1455 (unsigned int)count, rstyle);
1390 break; 1456 break;
1457
1391 case ERASE: 1458 case ERASE:
1392 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1459 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1393 selection_check (1); 1460 selection_check (1);
1394 screen.cur.col -= count; 1461 screen.cur.col -= count;
1395 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1462 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1396 (unsigned int)count, rstyle); 1463 (unsigned int)count, rstyle);
1397 break; 1464 break;
1465
1398 case DELETE: 1466 case DELETE:
1399 tr = srp[TermWin.ncol - 1]
1400 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1467 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1468
1401 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1469 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1402 { 1470 {
1403 stp[col] = stp[col + count]; 1471 stp[col] = stp[col + count];
1404 srp[col] = srp[col + count]; 1472 srp[col] = srp[col + count];
1405 } 1473 }
1474
1406 scr_blank_line (& (stp[TermWin.ncol - count]), 1475 scr_blank_line (& (stp[TermWin.ncol - count]),
1407 & (srp[TermWin.ncol - count]), 1476 & (srp[TermWin.ncol - count]),
1408 (unsigned int)count, tr); 1477 (unsigned int)count, tr);
1478
1409 if (*slp == -1) /* break line continuation */ 1479 if (*slp == -1) /* break line continuation */
1410 *slp = TermWin.ncol; 1480 *slp = TermWin.ncol;
1481
1411 *slp -= count; 1482 *slp -= count;
1412 MAX_IT (*slp, 0); 1483 MAX_IT (*slp, 0);
1484
1413 if (selection.op && current_screen == selection.screen 1485 if (selection.op && current_screen == selection.screen
1414 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1486 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1415 { 1487 {
1416 if (selection.end.row != screen.cur.row 1488 if (selection.end.row != screen.cur.row
1417 || (screen.cur.col >= selection.beg.col - count) 1489 || (screen.cur.col >= selection.beg.col - count)
… …
1423 selection.beg.col -= count; 1495 selection.beg.col -= count;
1424 selection.mark.col -= count; /* XXX: yes? */ 1496 selection.mark.col -= count; /* XXX: yes? */
1425 selection.end.col -= count; 1497 selection.end.col -= count;
1426 } 1498 }
1427 } 1499 }
1500
1428 break; 1501 break;
1429 } 1502 }
1430} 1503}
1431 1504
1432/* ------------------------------------------------------------------------- */ 1505/* ------------------------------------------------------------------------- */
… …
1437void 1510void
1438rxvt_term::scr_scroll_region (int top, int bot) 1511rxvt_term::scr_scroll_region (int top, int bot)
1439{ 1512{
1440 MAX_IT (top, 0); 1513 MAX_IT (top, 0);
1441 MIN_IT (bot, (int)TermWin.nrow - 1); 1514 MIN_IT (bot, (int)TermWin.nrow - 1);
1515
1442 if (top > bot) 1516 if (top > bot)
1443 return; 1517 return;
1518
1444 screen.tscroll = top; 1519 screen.tscroll = top;
1445 screen.bscroll = bot; 1520 screen.bscroll = bot;
1446 scr_gotorc (0, 0, 0); 1521 scr_gotorc (0, 0, 0);
1447} 1522}
1448 1523
… …
1454 */ 1529 */
1455void 1530void
1456rxvt_term::scr_cursor_visible (int mode) 1531rxvt_term::scr_cursor_visible (int mode)
1457{ 1532{
1458 want_refresh = 1; 1533 want_refresh = 1;
1534
1459 if (mode) 1535 if (mode)
1460 screen.flags |= Screen_VisibleCursor; 1536 screen.flags |= Screen_VisibleCursor;
1461 else 1537 else
1462 screen.flags &= ~Screen_VisibleCursor; 1538 screen.flags &= ~Screen_VisibleCursor;
1463} 1539}
… …
1472rxvt_term::scr_autowrap (int mode) 1548rxvt_term::scr_autowrap (int mode)
1473{ 1549{
1474 if (mode) 1550 if (mode)
1475 screen.flags |= Screen_Autowrap; 1551 screen.flags |= Screen_Autowrap;
1476 else 1552 else
1477 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1553 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1478} 1554}
1479 1555
1480/* ------------------------------------------------------------------------- */ 1556/* ------------------------------------------------------------------------- */
1481/* 1557/*
1482 * Set/unset margin origin mode 1558 * Set/unset margin origin mode
… …
1521 */ 1597 */
1522void 1598void
1523rxvt_term::scr_set_tab (int mode) 1599rxvt_term::scr_set_tab (int mode)
1524{ 1600{
1525 if (mode < 0) 1601 if (mode < 0)
1526 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1602 memset (tabs, 0, TermWin.ncol * sizeof (char));
1527 else if (screen.cur.col < TermWin.ncol) 1603 else if (screen.cur.col < TermWin.ncol)
1528 tabs[screen.cur.col] = (mode ? 1 : 0); 1604 tabs[screen.cur.col] = (mode ? 1 : 0);
1529} 1605}
1530 1606
1531/* ------------------------------------------------------------------------- */ 1607/* ------------------------------------------------------------------------- */
… …
1535 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1611 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1536 */ 1612 */
1537void 1613void
1538rxvt_term::scr_rvideo_mode (int mode) 1614rxvt_term::scr_rvideo_mode (int mode)
1539{ 1615{
1540 XGCValues gcvalue; 1616 XGCValues gcvalue;
1541 1617
1542 if (rvideo != mode) 1618 if (rvideo != mode)
1543 { 1619 {
1544 rvideo = mode; 1620 rvideo = mode;
1545 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1621 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1546#if defined(XPM_BACKGROUND) 1622#if defined(XPM_BACKGROUND)
1547 if (bgPixmap.pixmap == None) 1623 if (bgPixmap.pixmap == None)
1548#endif 1624#endif
1549#if defined(TRANSPARENT) 1625#if defined(TRANSPARENT)
1550 if (! (Options & Opt_transparent) || am_transparent == 0) 1626 if (! (options & Opt_transparent) || am_transparent == 0)
1551#endif 1627#endif
1552 XSetWindowBackground (display->display, TermWin.vt, 1628 XSetWindowBackground (display->display, TermWin.vt,
1553 PixColors[Color_bg]); 1629 pix_colors[Color_bg]);
1554 1630
1555 gcvalue.foreground = PixColors[Color_fg]; 1631 gcvalue.foreground = pix_colors[Color_fg];
1556 gcvalue.background = PixColors[Color_bg]; 1632 gcvalue.background = pix_colors[Color_bg];
1557 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1633 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1558 &gcvalue); 1634 &gcvalue);
1559 scr_clear (); 1635 scr_clear ();
1560 scr_touch (true); 1636 scr_touch (true);
1561 } 1637 }
… …
1677 row_col_t rc[RC_COUNT]; 1753 row_col_t rc[RC_COUNT];
1678 1754
1679 if (drawn_text == NULL) /* sanity check */ 1755 if (drawn_text == NULL) /* sanity check */
1680 return; 1756 return;
1681 1757
1758#ifndef NO_SLOW_LINK_SUPPORT
1759 if (refresh_type == FAST_REFRESH && !display->is_local)
1760 {
1761 y = 0;
1762 height = TermWin.height;
1763 }
1764#endif
1765
1682#ifdef DEBUG_STRICT 1766#ifdef DEBUG_STRICT
1683 x = max (x, (int)TermWin.int_bwidth); 1767 x = max (x, 0);
1684 x = min (x, (int)TermWin.width); 1768 x = min (x, (int)TermWin.width);
1685 y = max (y, (int)TermWin.int_bwidth); 1769 y = max (y, 0);
1686 y = min (y, (int)TermWin.height); 1770 y = min (y, (int)TermWin.height);
1687#endif 1771#endif
1688 1772
1689 /* round down */ 1773 /* round down */
1690 rc[PART_BEG].col = Pixel2Col (x); 1774 rc[PART_BEG].col = Pixel2Col (x);
… …
1698 { 1782 {
1699 MIN_IT (rc[i].col, TermWin.ncol - 1); 1783 MIN_IT (rc[i].col, TermWin.ncol - 1);
1700 MIN_IT (rc[i].row, TermWin.nrow - 1); 1784 MIN_IT (rc[i].row, TermWin.nrow - 1);
1701 } 1785 }
1702 1786
1703 D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row));
1704
1705 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1787 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1706 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, 1788 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1707 (rc[PART_END].col - rc[PART_BEG].col + 1));
1708 1789
1709 if (refresh) 1790 if (refresh)
1710 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1791 scr_refresh (SLOW_REFRESH);
1711} 1792}
1712 1793
1713/* ------------------------------------------------------------------------- */ 1794/* ------------------------------------------------------------------------- */
1714/* 1795/*
1715 * Refresh the entire screen 1796 * Refresh the entire screen
… …
1730{ 1811{
1731 long p = 0; 1812 long p = 0;
1732 uint16_t oldviewstart; 1813 uint16_t oldviewstart;
1733 1814
1734 oldviewstart = TermWin.view_start; 1815 oldviewstart = TermWin.view_start;
1816
1735 if (y < len) 1817 if (y < len)
1736 { 1818 {
1737 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1819 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1738 p -= (long) (TermWin.nrow - 1); 1820 p -= (long) (TermWin.nrow - 1);
1739 p = max (p, 0); 1821 p = max (p, 0);
1740 } 1822 }
1823
1741 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1824 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled);
1742 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1743 1825
1744 return scr_changeview (oldviewstart); 1826 return scr_changeview (oldviewstart);
1745} 1827}
1746 1828
1747/* ------------------------------------------------------------------------- */ 1829/* ------------------------------------------------------------------------- */
… …
1750 * direction should be UP or DN 1832 * direction should be UP or DN
1751 */ 1833 */
1752int 1834int
1753rxvt_term::scr_page (enum page_dirn direction, int nlines) 1835rxvt_term::scr_page (enum page_dirn direction, int nlines)
1754{ 1836{
1755 int n; 1837 int n;
1756 uint16_t oldviewstart; 1838 uint16_t oldviewstart;
1757 1839
1758 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1759#ifdef DEBUG_STRICT 1840#ifdef DEBUG_STRICT
1760 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1841 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1761#endif 1842#endif
1762 oldviewstart = TermWin.view_start; 1843 oldviewstart = TermWin.view_start;
1763 if (direction == UP) 1844 if (direction == UP)
… …
1779 if (TermWin.view_start != oldviewstart) 1860 if (TermWin.view_start != oldviewstart)
1780 { 1861 {
1781 want_refresh = 1; 1862 want_refresh = 1;
1782 num_scr -= (TermWin.view_start - oldviewstart); 1863 num_scr -= (TermWin.view_start - oldviewstart);
1783 } 1864 }
1865
1784 return (int) (TermWin.view_start - oldviewstart); 1866 return (int) (TermWin.view_start - oldviewstart);
1785} 1867}
1786 1868
1787/* ------------------------------------------------------------------------- */ 1869/* ------------------------------------------------------------------------- */
1788void 1870void
1789rxvt_term::scr_bell () 1871rxvt_term::scr_bell ()
1790{ 1872{
1791#ifndef NO_BELL 1873#ifndef NO_BELL
1792# ifndef NO_MAPALERT 1874# ifndef NO_MAPALERT
1793# ifdef MAPALERT_OPTION 1875# ifdef MAPALERT_OPTION
1794 if (Options & Opt_mapAlert) 1876 if (options & Opt_mapAlert)
1795# endif 1877# endif
1796 XMapWindow (display->display, TermWin.parent[0]); 1878 XMapWindow (display->display, TermWin.parent[0]);
1797# endif 1879# endif
1798 if (Options & Opt_visualBell) 1880 if (options & Opt_visualBell)
1799 { 1881 {
1800 scr_rvideo_mode (!rvideo); /* refresh also done */ 1882 scr_rvideo_mode (!rvideo); /* refresh also done */
1801 scr_rvideo_mode (!rvideo); /* refresh also done */ 1883 scr_rvideo_mode (!rvideo); /* refresh also done */
1802 } 1884 }
1803 else 1885 else
… …
1809/* ARGSUSED */ 1891/* ARGSUSED */
1810void 1892void
1811rxvt_term::scr_printscreen (int fullhist) 1893rxvt_term::scr_printscreen (int fullhist)
1812{ 1894{
1813#ifdef PRINTPIPE 1895#ifdef PRINTPIPE
1814 int i, r1, nrows, row_offset; 1896 int i, r1, nrows, row_offset;
1815 text_t *t; 1897 FILE *fd;
1816 FILE *fd;
1817 1898
1818 if ((fd = popen_printer ()) == NULL) 1899 if ((fd = popen_printer ()) == NULL)
1819 return; 1900 return;
1901
1820 nrows = TermWin.nrow; 1902 nrows = TermWin.nrow;
1821 row_offset = TermWin.saveLines; 1903 row_offset = TermWin.saveLines;
1904
1822 if (!fullhist) 1905 if (!fullhist)
1823 row_offset -= TermWin.view_start; 1906 row_offset -= TermWin.view_start;
1824 else 1907 else
1825 { 1908 {
1826 nrows += TermWin.nscrolled; 1909 nrows += TermWin.nscrolled;
1827 row_offset -= TermWin.nscrolled; 1910 row_offset -= TermWin.nscrolled;
1828 } 1911 }
1829 1912
1913 wctomb (0, 0);
1914
1830 for (r1 = 0; r1 < nrows; r1++) 1915 for (r1 = 0; r1 < nrows; r1++)
1831 { 1916 {
1832 t = screen.text[r1 + row_offset]; 1917 text_t *tp = screen.text[r1 + row_offset];
1833 for (i = TermWin.ncol - 1; i >= 0; i--) 1918 int len = screen.tlen[r1 + row_offset];
1834 if (!isspace (t[i])) 1919
1835 break; 1920 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1836 fprintf (fd, "%.*s\n", (i + 1), t); 1921 {
1922 char mb[MB_LEN_MAX];
1923 text_t t = *tp++;
1924 if (t == NOCHAR)
1925 continue;
1926
1927 len = wctomb (mb, t);
1928
1929 if (len <= 0)
1930 {
1931 mb[0] = ' ';
1932 len = 1;
1933 }
1934
1935 fwrite (mb, 1, len, fd);
1936 }
1937
1938 fputc ('\n', fd);
1837 } 1939 }
1940
1838 pclose_printer (fd); 1941 pclose_printer (fd);
1839#endif 1942#endif
1840} 1943}
1841 1944
1842/* ------------------------------------------------------------------------- */ 1945/* ------------------------------------------------------------------------- */
… …
1856 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1959 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1857 1960
1858void 1961void
1859rxvt_term::scr_refresh (unsigned char refresh_type) 1962rxvt_term::scr_refresh (unsigned char refresh_type)
1860{ 1963{
1861 unsigned char clearfirst, /* first character writes before cell */
1862 clearlast, /* last character writes beyond cell */
1863 must_clear, /* use draw_string not draw_image_string */ 1964 unsigned char must_clear, /* use draw_string not draw_image_string */
1864 rvid, /* reverse video this position */ 1965 rvid, /* reverse video this position */
1865 showcursor; /* show the cursor */ 1966 showcursor; /* show the cursor */
1866 int16_t col, row, /* column/row we're processing */ 1967 int16_t col, row, /* column/row we're processing */
1867 ocrow; /* old cursor row */ 1968 ocrow; /* old cursor row */
1868 int i, /* tmp */ 1969 int i, /* tmp */
1869 row_offset; /* basic offset in screen structure */ 1970 row_offset; /* basic offset in screen structure */
1870#ifndef NO_CURSORCOLOR 1971#ifndef NO_CURSORCOLOR
1871 rend_t cc1; /* store colours at cursor position (s) */ 1972 rend_t cc1; /* store colours at cursor position (s) */
1872#endif 1973#endif
1873 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1974 rend_t *crp; // cursor rendition pointer
1874 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1875 1975
1876 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1976 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1877 return; 1977 return;
1878 1978
1879 /* 1979 /*
1880 * A: set up vars 1980 * A: set up vars
1881 */ 1981 */
1882 clearfirst = clearlast = must_clear = 0; 1982 must_clear = 0;
1883
1884 refresh_count = 0; 1983 refresh_count = 0;
1885 1984
1886 row_offset = TermWin.saveLines - TermWin.view_start; 1985 row_offset = TermWin.saveLines - TermWin.view_start;
1887
1888 if ((refresh_type & REFRESH_BOUNDS))
1889 {
1890 clearfirst = clearlast = 1;
1891 refresh_type &= ~REFRESH_BOUNDS;
1892 }
1893 1986
1894#ifdef XPM_BACKGROUND 1987#ifdef XPM_BACKGROUND
1895 must_clear |= (bgPixmap.pixmap != None); 1988 must_clear |= (bgPixmap.pixmap != None);
1896#endif 1989#endif
1897#ifdef TRANSPARENT 1990#ifdef TRANSPARENT
1898 must_clear |= ((Options & Opt_transparent) && am_transparent); 1991 must_clear |= ((options & Opt_transparent) && am_transparent);
1899#endif 1992#endif
1900 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1993 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1901 1994
1902 /* 1995 /*
1903 * B: reverse any characters which are selected 1996 * B: reverse any characters which are selected
1904 */ 1997 */
1905 scr_reverse_selection (); 1998 scr_reverse_selection ();
1999#if ENABLE_OVERLAY
2000 scr_swap_overlay ();
2001#endif
1906 2002
1907 /* 2003 /*
1908 * C: set the cursor character (s) 2004 * C: set the cursor character (s)
1909 */ 2005 */
1910 { 2006 {
1911 unsigned char setoldcursor; 2007 unsigned char setoldcursor;
1912 rend_t ccol1, /* Cursor colour */ 2008 rend_t ccol1, /* Cursor colour */
1913 ccol2; /* Cursor colour2 */ 2009 ccol2; /* Cursor colour2 */
1914 2010
1915 showcursor = (screen.flags & Screen_VisibleCursor); 2011 showcursor = (screen.flags & Screen_VisibleCursor);
1916#ifdef CURSOR_BLINK 2012#ifdef CURSOR_BLINK
1917 if (hidden_cursor) 2013 if (hidden_cursor)
1918 showcursor = 0; 2014 showcursor = 0;
1919#endif 2015#endif
1920 2016
1921 if (showcursor) 2017 if (showcursor)
1922 { 2018 {
2019 int col = screen.cur.col;
2020
2021 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2022 col--;
2023
1923 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 2024 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1924 [screen.cur.col]);
1925 2025
1926 if (showcursor && TermWin.focus) 2026 if (showcursor && TermWin.focus)
1927 { 2027 {
1928 *srp ^= RS_RVid; 2028 *crp ^= RS_RVid;
1929#ifndef NO_CURSORCOLOR 2029#ifndef NO_CURSORCOLOR
1930 cc1 = *srp & (RS_fgMask | RS_bgMask); 2030 cc1 = *crp & (RS_fgMask | RS_bgMask);
1931 if (ISSET_PIXCOLOR (Color_cursor)) 2031 if (ISSET_PIXCOLOR (Color_cursor))
1932 ccol1 = Color_cursor; 2032 ccol1 = Color_cursor;
1933 else 2033 else
1934#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2034#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1935 ccol1 = GET_FGCOLOR (rstyle); 2035 ccol1 = GET_FGCOLOR (rstyle);
… …
1942#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2042#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1943 ccol2 = GET_BGCOLOR (rstyle); 2043 ccol2 = GET_BGCOLOR (rstyle);
1944#else 2044#else
1945 ccol2 = Color_bg; 2045 ccol2 = Color_bg;
1946#endif 2046#endif
1947 *srp = SET_FGCOLOR (*srp, ccol1); 2047 *crp = SET_FGCOLOR (*crp, ccol1);
1948 *srp = SET_BGCOLOR (*srp, ccol2); 2048 *crp = SET_BGCOLOR (*crp, ccol2);
1949#endif 2049#endif
1950 } 2050 }
1951 } 2051 }
1952 2052
1953 /* make sure no outline cursor is left around */ 2053 /* make sure no outline cursor is left around */
… …
1957 if (screen.cur.row + TermWin.view_start != ocrow 2057 if (screen.cur.row + TermWin.view_start != ocrow
1958 || screen.cur.col != oldcursor.col) 2058 || screen.cur.col != oldcursor.col)
1959 { 2059 {
1960 if (ocrow < TermWin.nrow 2060 if (ocrow < TermWin.nrow
1961 && oldcursor.col < TermWin.ncol) 2061 && oldcursor.col < TermWin.ncol)
1962 {
1963 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2062 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
1964 } 2063
1965 if (TermWin.focus || !showcursor) 2064 if (TermWin.focus || !showcursor)
1966 oldcursor.row = -1; 2065 oldcursor.row = -1;
1967 else 2066 else
1968 setoldcursor = 1; 2067 setoldcursor = 1;
1969 } 2068 }
1970 } 2069 }
1971 else if (!TermWin.focus) 2070 else if (!TermWin.focus)
1972 setoldcursor = 1; 2071 setoldcursor = 1;
2072
1973 if (setoldcursor) 2073 if (setoldcursor)
1974 { 2074 {
1975 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2075 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
1976 oldcursor.row = -1; 2076 oldcursor.row = -1;
1977 else 2077 else
… …
1980 oldcursor.col = screen.cur.col; 2080 oldcursor.col = screen.cur.col;
1981 } 2081 }
1982 } 2082 }
1983 } 2083 }
1984 2084
2085 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2086 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1985#ifndef NO_SLOW_LINK_SUPPORT 2087#ifndef NO_SLOW_LINK_SUPPORT
1986 /* 2088 /*
1987 * D: CopyArea pass - very useful for slower links 2089 * D: CopyArea pass - very useful for slower links
1988 * This has been deliberately kept simple. 2090 * This has been deliberately kept simple.
1989 */ 2091 */
1990 i = num_scr; 2092 i = num_scr;
2093 if (!display->is_local
1991 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2094 && refresh_type == FAST_REFRESH && num_scr_allow && i
1992 && abs (i) < TermWin.nrow && !must_clear) 2095 && abs (i) < TermWin.nrow && !must_clear)
1993 { 2096 {
1994 int16_t nits; 2097 int16_t nits;
1995 int j; 2098 int j;
1996 rend_t *drp2;
1997 text_t *dtp2;
1998 int len, wlen; 2099 int len, wlen;
1999 2100
2000 j = TermWin.nrow; 2101 j = TermWin.nrow;
2001 wlen = len = -1; 2102 wlen = len = -1;
2002 row = i > 0 ? 0 : j - 1; 2103 row = i > 0 ? 0 : j - 1;
2003 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2104 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2004 { 2105 {
2005 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2106 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2006 { 2107 {
2007 stp = screen.text[row + row_offset]; 2108 text_t *stp = screen.text[row + row_offset];
2008 srp = screen.rend[row + row_offset]; 2109 rend_t *srp = screen.rend[row + row_offset];
2009 dtp = drawn_text[row]; 2110 text_t *dtp = drawn_text[row];
2010 dtp2 = drawn_text[row + i]; 2111 text_t *dtp2 = drawn_text[row + i];
2011 drp = drawn_rend[row]; 2112 rend_t *drp = drawn_rend[row];
2012 drp2 = drawn_rend[row + i]; 2113 rend_t *drp2 = drawn_rend[row + i];
2013 2114
2014 for (nits = 0, col = TermWin.ncol; col--; ) 2115 for (nits = 0, col = TermWin.ncol; col--; )
2015 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2116 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2016 nits--; 2117 nits--;
2017 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2118 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2037 { 2138 {
2038 /* also comes here at end if needed because of >= above */ 2139 /* also comes here at end if needed because of >= above */
2039 if (wlen < len) 2140 if (wlen < len)
2040 SWAP_IT (wlen, len, int); 2141 SWAP_IT (wlen, len, int);
2041 2142
2042 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2043 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2143 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2044 TermWin.gc, 0, Row2Pixel (len + i), 2144 TermWin.gc, 0, Row2Pixel (len + i),
2045 (unsigned int)TermWin_TotalWidth (), 2145 (unsigned int)TermWin_TotalWidth (),
2046 (unsigned int)Height2Pixel (wlen - len + 1), 2146 (unsigned int)Height2Pixel (wlen - len + 1),
2047 0, Row2Pixel (len)); 2147 0, Row2Pixel (len));
… …
2054 /* 2154 /*
2055 * E: main pass across every character 2155 * E: main pass across every character
2056 */ 2156 */
2057 for (row = 0; row < TermWin.nrow; row++) 2157 for (row = 0; row < TermWin.nrow; row++)
2058 { 2158 {
2059 stp = screen.text[row + row_offset]; 2159 text_t *stp = screen.text[row + row_offset];
2060 srp = screen.rend[row + row_offset]; 2160 rend_t *srp = screen.rend[row + row_offset];
2061 dtp = drawn_text[row]; 2161 text_t *dtp = drawn_text[row];
2062 drp = drawn_rend[row]; 2162 rend_t *drp = drawn_rend[row];
2063 2163
2064 /* 2164 /*
2065 * E2: OK, now the real pass 2165 * E2: OK, now the real pass
2066 */ 2166 */
2067 int ypixel = (int)Row2Pixel (row); 2167 int ypixel = (int)Row2Pixel (row);
… …
2097 if (stp[col] == NOCHAR) 2197 if (stp[col] == NOCHAR)
2098 { 2198 {
2099 dtp[col] = stp[col]; 2199 dtp[col] = stp[col];
2100 drp[col] = rend; 2200 drp[col] = rend;
2101 count++; 2201 count++;
2102
2103 if (i) // only possible skip if char unchanged
2104 i++; 2202 i++;
2105 2203
2106 continue; 2204 continue;
2107 } 2205 }
2108 2206
2109 if (rend != srp[col]) 2207 if (rend != srp[col])
… …
2112 count++; 2210 count++;
2113 2211
2114 if (stp[col] != dtp[col] 2212 if (stp[col] != dtp[col]
2115 || srp[col] != drp[col]) 2213 || srp[col] != drp[col])
2116 { 2214 {
2117 if (must_clear && (i++ > (count / 2))) 2215 if (must_clear && (i++ > count / 2))
2118 break; 2216 break;
2119 2217
2120 dtp[col] = stp[col]; 2218 dtp[col] = stp[col];
2121 drp[col] = rend; 2219 drp[col] = rend;
2122 i = 0; 2220 i = 0;
2123 } 2221 }
2124 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2222 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2125 break; 2223 break;
2126 } 2224 }
2127 2225
2128 col--; /* went one too far. move back */ 2226 col--; /* went one too far. move back */
2129 count -= i; /* dump any matching trailing chars */ 2227 count -= i; /* dump any matching trailing chars */
2228
2229 // sometimes we optimize away the trailing NOCHAR's, add them back
2230 while (i && text[count] == NOCHAR)
2231 count++, i--;
2130 2232
2131 /* 2233 /*
2132 * Determine the attributes for the string 2234 * Determine the attributes for the string
2133 */ 2235 */
2134 int fid = GET_FONT (rend); 2236 int fid = GET_FONT (rend);
… …
2138 rend = GET_ATTR (rend); 2240 rend = GET_ATTR (rend);
2139 2241
2140 rvid = !!(rend & RS_RVid); 2242 rvid = !!(rend & RS_RVid);
2141 2243
2142#ifndef NO_BOLD_UNDERLINE_REVERSE 2244#ifndef NO_BOLD_UNDERLINE_REVERSE
2143 if (rend & RS_Bold && fore == Color_fg) 2245 if (rend & RS_Bold && fore == Color_fg && !(options & Opt_realBold))
2144 { 2246 {
2145 if (ISSET_PIXCOLOR (Color_BD)) 2247 if (ISSET_PIXCOLOR (Color_BD))
2146 fore = Color_BD; 2248 fore = Color_BD;
2147 else 2249 else
2148 rvid = !rvid; 2250 rvid = !rvid;
2149 } 2251 }
2150 2252
2151 if (rend & RS_Uline) 2253 if (rend & RS_Uline)
2152 {
2153 if (ISSET_PIXCOLOR (Color_UL)) 2254 if (ISSET_PIXCOLOR (Color_UL))
2154 fore = Color_UL; 2255 fore = Color_UL;
2155 }
2156#endif 2256#endif
2157 2257
2158 if (rvid) 2258 if (rvid)
2159 { 2259 {
2160 SWAP_IT (fore, back, int); 2260 SWAP_IT (fore, back, int);
… …
2168 back = Color_RV; 2268 back = Color_RV;
2169#endif 2269#endif
2170 } 2270 }
2171 2271
2172#ifdef TEXT_BLINK 2272#ifdef TEXT_BLINK
2173 if (rend & RS_Blink && back == Color_bg) 2273 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2174 { 2274 {
2175 if (!text_blink_ev.active) 2275 if (!text_blink_ev.active)
2176 { 2276 {
2177 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2277 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2178 hidden_text = 0; 2278 hidden_text = 0;
… …
2208 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2308 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2209 } 2309 }
2210 else 2310 else
2211 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2311 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2212 2312
2213 if ((rend & RS_Uline) && (font->descent > 1)) 2313 if (rend & RS_Uline && font->descent > 1 && fore != back)
2214 XDrawLine (display->display, drawBuffer, TermWin.gc, 2314 XDrawLine (display->display, drawBuffer, TermWin.gc,
2215 xpixel, ypixel + font->ascent + 1, 2315 xpixel, ypixel + font->ascent + 1,
2216 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2316 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2217 } /* for (col....) */ 2317 } /* for (col....) */
2218 } /* for (row....) */ 2318 } /* for (row....) */
… …
2222 */ 2322 */
2223 if (showcursor) 2323 if (showcursor)
2224 { 2324 {
2225 if (TermWin.focus) 2325 if (TermWin.focus)
2226 { 2326 {
2227 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2228 [screen.cur.col]);
2229 *srp ^= RS_RVid; 2327 *crp ^= RS_RVid;
2230#ifndef NO_CURSORCOLOR 2328#ifndef NO_CURSORCOLOR
2231 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2329 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2232#endif 2330#endif
2233 } 2331 }
2234 else if (oldcursor.row >= 0) 2332 else if (oldcursor.row >= 0)
2235 { 2333 {
2236#ifndef NO_CURSORCOLOR 2334#ifndef NO_CURSORCOLOR
2237 if (ISSET_PIXCOLOR (Color_cursor)) 2335 if (ISSET_PIXCOLOR (Color_cursor))
2238 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2336 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2239#endif 2337#endif
2240 int cursorwidth = 1; 2338 int cursorwidth = 1;
2241 while (oldcursor.col + cursorwidth < TermWin.ncol 2339 while (oldcursor.col + cursorwidth < TermWin.ncol
2242 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2340 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2243 cursorwidth++; 2341 cursorwidth++;
… …
2251 } 2349 }
2252 2350
2253 /* 2351 /*
2254 * H: cleanup selection 2352 * H: cleanup selection
2255 */ 2353 */
2354#if ENABLE_OVERLAY
2355 scr_swap_overlay ();
2356#endif
2256 scr_reverse_selection (); 2357 scr_reverse_selection ();
2257 2358
2258 /*
2259 * I: other general cleanup
2260 */
2261 if (clearfirst && TermWin.int_bwidth)
2262 /*
2263 * clear the whole screen height, note that width == 0 is treated
2264 * specially by XClearArea
2265 */
2266 XClearArea (display->display, TermWin.vt, 0, 0,
2267 (unsigned int)TermWin.int_bwidth,
2268 (unsigned int)TermWin_TotalHeight (), False);
2269
2270 if (clearlast && TermWin.int_bwidth)
2271 /*
2272 * clear the whole screen height, note that width == 0 is treated
2273 * specially by XClearArea
2274 */
2275 XClearArea (display->display, TermWin.vt,
2276 TermWin.width + TermWin.int_bwidth, 0,
2277 (unsigned int)TermWin.int_bwidth,
2278 (unsigned int)TermWin_TotalHeight (), False);
2279
2280 if (refresh_type & SMOOTH_REFRESH) 2359 if (refresh_type & SMOOTH_REFRESH)
2281 XSync (display->display, False); 2360 XFlush (display->display);
2282 2361
2283 num_scr = 0; 2362 num_scr = 0;
2284 num_scr_allow = 1; 2363 num_scr_allow = 1;
2285 want_refresh = 0; /* screen is current */ 2364 want_refresh = 0; /* screen is current */
2286} 2365}
… …
2317 2396
2318 num_scr_allow = 0; 2397 num_scr_allow = 0;
2319 want_refresh = 1; 2398 want_refresh = 1;
2320 2399
2321#ifdef TRANSPARENT 2400#ifdef TRANSPARENT
2322 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2401 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2323 { 2402 {
2324 int i; 2403 int i;
2325 2404
2326 if (! (Options & Opt_transparent_all)) 2405 if (! (options & Opt_transparent_all))
2327 i = 0; 2406 i = 0;
2328 else 2407 else
2329 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2408 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2330 2409
2331 while (i--) 2410 while (i--)
… …
2408 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2487 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2409 */ 2488 */
2410void 2489void
2411rxvt_term::selection_check (int check_more) 2490rxvt_term::selection_check (int check_more)
2412{ 2491{
2413 row_col_t pos; 2492 row_col_t pos;
2414 2493
2415 if (!selection.op) 2494 if (!selection.op)
2416 return; 2495 return;
2417 2496
2418 pos.row = pos.col = 0; 2497 pos.row = pos.col = 0;
… …
2445rxvt_term::paste (const unsigned char *data, unsigned int len) 2524rxvt_term::paste (const unsigned char *data, unsigned int len)
2446{ 2525{
2447 unsigned int i, j, n; 2526 unsigned int i, j, n;
2448 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); 2527 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2449 2528
2450#if 0
2451 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2452 ZERO_SCROLLBACK (r);
2453#endif
2454
2455 /* convert normal newline chars into common keyboard Return key sequence */ 2529 /* convert normal newline chars into common keyboard Return key sequence */
2456 for (i = 0; i < len; i += PROP_SIZE) 2530 for (i = 0; i < len; i += PROP_SIZE)
2457 { 2531 {
2458 n = min (len - i, PROP_SIZE); 2532 n = min (len - i, PROP_SIZE);
2459 MEMCPY (ds, data + i, n); 2533 memcpy (ds, data + i, n);
2460 2534
2461 for (j = 0; j < n; j++) 2535 for (j = 0; j < n; j++)
2462 if (ds[j] == '\n') 2536 if (ds[j] == C0_LF)
2463 ds[j] = '\r'; 2537 ds[j] = C0_CR;
2464 2538
2465 tt_write (ds, (int)n); 2539 tt_write (ds, (int)n);
2466 } 2540 }
2467 2541
2468 free (ds); 2542 free (ds);
… …
2477rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2551rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2478{ 2552{
2479 long nread = 0; 2553 long nread = 0;
2480 unsigned long bytes_after; 2554 unsigned long bytes_after;
2481 XTextProperty ct; 2555 XTextProperty ct;
2482
2483 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2484 2556
2485 if (prop == None) /* check for failed XConvertSelection */ 2557 if (prop == None) /* check for failed XConvertSelection */
2486 { 2558 {
2487 if ((selection_type & Sel_CompoundText)) 2559 if ((selection_type & Sel_CompoundText))
2488 { 2560 {
… …
2515 &ct.nitems, &bytes_after, 2587 &ct.nitems, &bytes_after,
2516 &ct.value) != Success) 2588 &ct.value) != Success)
2517 break; 2589 break;
2518 2590
2519 if (ct.encoding == 0) 2591 if (ct.encoding == 0)
2592 break;
2593
2594 if (ct.encoding == xa[XA_INCR])
2520 { 2595 {
2521 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2596 // INCR selection, start handshake
2597 XDeleteProperty (display->display, win, prop);
2598 selection_wait = Sel_incr;
2599 incr_ev.start (NOW + 10);
2522 break; 2600 break;
2523 } 2601 }
2524 2602
2525 if (ct.value == NULL) 2603 if (ct.value == NULL)
2526 {
2527 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2528 continue; 2604 continue;
2529 }
2530 2605
2531 if (ct.nitems == 0) 2606 if (ct.nitems == 0)
2532 { 2607 {
2533 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2534 if (selection_wait == Sel_normal && nread == 0 2608 if (selection_wait == Sel_normal && nread == 0
2535 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2609 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2536 { 2610 {
2537 /* 2611 /*
2538 * pass through again trying CUT_BUFFER0 if we've come from 2612 * pass through again trying CUT_BUFFER0 if we've come from
2539 * XConvertSelection () but nothing was presented 2613 * XConvertSelection () but nothing was presented
2540 */ 2614 */
2541 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2542 selection_paste (display->root, XA_CUT_BUFFER0, False); 2615 selection_paste (display->root, XA_CUT_BUFFER0, False);
2543 } 2616 }
2544 2617
2545 nread = -1; /* discount any previous stuff */ 2618 nread = -1; /* discount any previous stuff */
2546 break; 2619 break;
… …
2548 2621
2549 nread += ct.nitems; 2622 nread += ct.nitems;
2550 2623
2551 char **cl; 2624 char **cl;
2552 int cr; 2625 int cr;
2553 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2626 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2554 &cr) >= 0 && cl)
2555 { 2627 {
2556 for (int i = 0; i < cr; i++) 2628 for (int i = 0; i < cr; i++)
2557 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2629 paste ((unsigned char *)cl[i], strlen (cl[i]));
2558 2630
2559 XFreeStringList (cl); 2631 XFreeStringList (cl);
2560 } 2632 }
2561 else 2633 else
2562 paste (ct.value, ct.nitems); 2634 paste (ct.value, ct.nitems);
… …
2571 XFree (ct.value); 2643 XFree (ct.value);
2572 2644
2573 if (selection_wait == Sel_normal) 2645 if (selection_wait == Sel_normal)
2574 selection_wait = Sel_none; 2646 selection_wait = Sel_none;
2575 2647
2576 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2577 return (int)nread; 2648 return (int)nread;
2578} 2649}
2579 2650
2580void 2651void
2581rxvt_term::incr_cb (time_watcher &w) 2652rxvt_term::incr_cb (time_watcher &w)
2582{ 2653{
2583 selection_wait = Sel_none; 2654 selection_wait = Sel_none;
2584 2655
2585 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2656 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2586} 2657}
2587 2658
2588/* 2659/*
2589 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2660 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2590 */ 2661 */
2591void 2662void
2592rxvt_term::selection_property (Window win, Atom prop) 2663rxvt_term::selection_property (Window win, Atom prop)
2593{ 2664{
2594 int reget_time = 0; 2665 if (prop == None || selection_wait != Sel_incr)
2595
2596 if (prop == None)
2597 return; 2666 return;
2598 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2599 if (selection_wait == Sel_normal)
2600 {
2601 int a, afmt;
2602 Atom atype;
2603 unsigned long bytes_after, nitems;
2604 unsigned char *s = NULL;
2605 2667
2606 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2607 xa[XA_INCR], &atype, &afmt, &nitems,
2608 &bytes_after, &s);
2609 if (s)
2610 XFree (s);
2611 if (a != Success)
2612 return;
2613#ifndef __CYGWIN32__
2614 if (atype == xa[XA_INCR])
2615 { /* start an INCR transfer */
2616 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2617 XDeleteProperty (display->display, win, prop);
2618 XFlush (display->display);
2619 reget_time = 1;
2620 selection_wait = Sel_incr;
2621 }
2622#endif
2623
2624 }
2625 else if (selection_wait == Sel_incr)
2626 {
2627 reget_time = 1;
2628 if (selection_paste (win, prop, True) == -1) 2668 if (selection_paste (win, prop, 1) > 0)
2629 {
2630 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2631 selection_wait = Sel_none;
2632 incr_ev.stop ();
2633 }
2634 }
2635 if (reget_time) /* received more data so reget time */
2636 incr_ev.start (NOW + 10); 2669 incr_ev.start (NOW + 10);
2670 else
2671 {
2672 selection_wait = Sel_none;
2673 incr_ev.stop ();
2674 }
2637} 2675}
2676
2638/* ------------------------------------------------------------------------- */ 2677/* ------------------------------------------------------------------------- */
2639/* 2678/*
2640 * Request the current selection: 2679 * Request the current selection:
2641 * Order: > internal selection if available 2680 * Order: > internal selection if available
2642 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2681 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2646 * EXT: button 2 release 2685 * EXT: button 2 release
2647 */ 2686 */
2648void 2687void
2649rxvt_term::selection_request (Time tm, int x, int y) 2688rxvt_term::selection_request (Time tm, int x, int y)
2650{ 2689{
2651 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2652 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2690 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2653 return; /* outside window */ 2691 return; /* outside window */
2654 2692
2655 if (selection.text != NULL) 2693 if (selection.text)
2656 { /* internal selection */ 2694 { /* internal selection */
2657 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2658 paste (selection.text, selection.len); 2695 char *str = rxvt_wcstombs (selection.text, selection.len);
2696 paste ((unsigned char *)str, strlen (str));
2697 free (str);
2659 return; 2698 return;
2660 } 2699 }
2661 else 2700 else
2662 { 2701 {
2663 int i; 2702 int i;
2664 2703
2665 selection_request_time = tm; 2704 selection_request_time = tm;
2666 selection_wait = Sel_normal; 2705 selection_wait = Sel_normal;
2706
2667 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2707 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2668 { 2708 {
2669#if X_HAVE_UTF8_STRING 2709#if X_HAVE_UTF8_STRING
2670 selection_type = Sel_UTF8String; 2710 selection_type = Sel_UTF8String;
2671 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2711 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2676 return; 2716 return;
2677#endif 2717#endif
2678 2718
2679 } 2719 }
2680 } 2720 }
2721
2681 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2722 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2682 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2683 selection_paste (display->root, XA_CUT_BUFFER0, False); 2723 selection_paste (display->root, XA_CUT_BUFFER0, False);
2684} 2724}
2685 2725
2686int 2726int
2687rxvt_term::selection_request_other (Atom target, int selnum) 2727rxvt_term::selection_request_other (Atom target, int selnum)
2688{ 2728{
2689 Atom sel; 2729 Atom sel;
2690#ifdef DEBUG_SELECT 2730#ifdef DEBUG_SELECT
2691 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2731 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2692#endif 2732#endif
2693 2733
2694 selection_type |= selnum; 2734 selection_type |= selnum;
2735
2695 if (selnum == Sel_Primary) 2736 if (selnum == Sel_Primary)
2696 sel = XA_PRIMARY; 2737 sel = XA_PRIMARY;
2697 else if (selnum == Sel_Secondary) 2738 else if (selnum == Sel_Secondary)
2698 sel = XA_SECONDARY; 2739 sel = XA_SECONDARY;
2699 else 2740 else
2700 sel = xa[XA_CLIPBOARD]; 2741 sel = xa[XA_CLIPBOARD];
2742
2701 if (XGetSelectionOwner (display->display, sel) != None) 2743 if (XGetSelectionOwner (display->display, sel) != None)
2702 { 2744 {
2703 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2704 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2745 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2705 TermWin.vt, selection_request_time); 2746 TermWin.vt, selection_request_time);
2706 return 1; 2747 return 1;
2707 } 2748 }
2749
2708 return 0; 2750 return 0;
2709} 2751}
2710 2752
2711/* ------------------------------------------------------------------------- */ 2753/* ------------------------------------------------------------------------- */
2712/* 2754/*
… …
2714 * EXT: SelectionClear 2756 * EXT: SelectionClear
2715 */ 2757 */
2716void 2758void
2717rxvt_term::selection_clear () 2759rxvt_term::selection_clear ()
2718{ 2760{
2719 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2720
2721 want_refresh = 1; 2761 want_refresh = 1;
2722 free (selection.text); 2762 free (selection.text);
2723 selection.text = NULL; 2763 selection.text = NULL;
2724 selection.len = 0; 2764 selection.len = 0;
2725 CLEAR_SELECTION (); 2765 CLEAR_SELECTION ();
2766
2767 if (display->selection_owner == this)
2768 display->selection_owner = 0;
2726} 2769}
2727 2770
2728/* ------------------------------------------------------------------------- */ 2771/* ------------------------------------------------------------------------- */
2729/* 2772/*
2730 * Copy a selection into the cut buffer 2773 * Copy a selection into the cut buffer
… …
2732 */ 2775 */
2733void 2776void
2734rxvt_term::selection_make (Time tm) 2777rxvt_term::selection_make (Time tm)
2735{ 2778{
2736 int i, col, end_col, row, end_row; 2779 int i, col, end_col, row, end_row;
2737 unsigned char *new_selection_text; 2780 wchar_t *new_selection_text;
2738 char *str;
2739 text_t *t; 2781 text_t *t;
2740 2782
2741 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2742 switch (selection.op) 2783 switch (selection.op)
2743 { 2784 {
2744 case SELECTION_CONT: 2785 case SELECTION_CONT:
2745 break; 2786 break;
2746 case SELECTION_INIT: 2787 case SELECTION_INIT:
… …
2756 selection.op = SELECTION_DONE; 2797 selection.op = SELECTION_DONE;
2757 2798
2758 if (selection.clicks == 4) 2799 if (selection.clicks == 4)
2759 return; /* nothing selected, go away */ 2800 return; /* nothing selected, go away */
2760 2801
2761 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2802 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2762 str = (char *)rxvt_malloc ((i + 2) * MB_CUR_MAX + 1); 2803 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2763
2764 new_selection_text = (unsigned char *)str;
2765 2804
2766 col = selection.beg.col; 2805 col = selection.beg.col;
2767 MAX_IT (col, 0); 2806 MAX_IT (col, 0);
2768 row = selection.beg.row + TermWin.saveLines; 2807 row = selection.beg.row + TermWin.saveLines;
2769 end_row = selection.end.row + TermWin.saveLines; 2808 end_row = selection.end.row + TermWin.saveLines;
2770 struct mbstate mbs; 2809 int ofs = 0;
2810 int extra = 0;
2771 2811
2772 for (; row <= end_row; row++, col = 0) 2812 for (; row <= end_row; row++, col = 0)
2773 { 2813 {
2774 t = & (screen.text[row][col]); 2814 t = &screen.text[row][col];
2775 2815
2776 end_col = screen.tlen[row]; 2816 end_col = screen.tlen[row];
2777 2817
2778 if (end_col == -1) 2818 if (end_col == -1)
2779 end_col = TermWin.ncol; 2819 end_col = TermWin.ncol;
2780 2820
2781 if (row == end_row) 2821 if (row == end_row)
2782 MIN_IT (end_col, selection.end.col); 2822 MIN_IT (end_col, selection.end.col);
2783 2823
2784 for (; col < end_col; col++) 2824 for (; col < end_col; col++)
2825 {
2785 if (*t == NOCHAR) 2826 if (*t == NOCHAR)
2786 t++; 2827 t++;
2828#if ENABLE_COMBINING
2829 else if (IS_COMPOSE (*t))
2830 {
2831 int len = rxvt_composite.expand (*t, 0);
2832
2833 extra -= (len - 1);
2834
2835 if (extra < 0)
2836 {
2837 extra += i;
2838 i += i;
2839 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2840 }
2841
2842 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2843 }
2844#endif
2787 else 2845 else
2788 { 2846 new_selection_text[ofs++] = *t++;
2789 int len = wcrtomb (str, *t++, mbs);
2790 if (len > 0)
2791 str += len;
2792 } 2847 }
2793 2848
2794 if (screen.tlen[row] != -1 && row != end_row) 2849 if (screen.tlen[row] != -1 && row != end_row)
2795 *str++ = '\n'; 2850 new_selection_text[ofs++] = C0_LF;
2796 } 2851 }
2797 2852
2798#ifndef NO_OLD_SELECTION
2799 if (selection_style == OLD_SELECT)
2800 if (end_col == TermWin.ncol)
2801 *str++ = '\n';
2802#endif
2803#ifndef NO_NEW_SELECTION
2804 if (selection_style != OLD_SELECT)
2805 if (end_col != selection.end.col) 2853 if (end_col != selection.end.col)
2806 *str++ = '\n'; 2854 new_selection_text[ofs++] = C0_LF;
2807#endif
2808 *str = '\0';
2809 2855
2810 i = str - (char *)new_selection_text; 2856 new_selection_text[ofs] = 0;
2857
2811 if (i == 0) 2858 if (ofs == 0)
2812 { 2859 {
2813 free (new_selection_text); 2860 free (new_selection_text);
2814 return; 2861 return;
2815 } 2862 }
2816 2863
2817 // due to MB_CUR_MAX, selection wastage is usually high, so realloc
2818 if (str - (char *)new_selection_text > 1024)
2819 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2820
2821 selection.len = i;
2822
2823 if (selection.text)
2824 free (selection.text); 2864 free (selection.text);
2825 2865
2826 selection.text = new_selection_text; 2866 // we usually allocate much more than necessary, so realloc it smaller again
2867 selection.len = ofs;
2868 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2827 2869
2828 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2870 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2829 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2871 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2830 display->set_selection_owner (this); 2872 display->set_selection_owner (this);
2831 else 2873 else
2832 rxvt_print_error ("can't get primary selection"); 2874 rxvt_warn ("can't get primary selection, ignoring.\n");
2833 2875
2834 { 2876#if 0
2835 XTextProperty ct; 2877 XTextProperty ct;
2836 char *cl = (char *)selection.text;
2837 2878
2838 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2879 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2839 { 2880 {
2840 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2841 PropModeReplace, ct.value, ct.nitems);
2842 XFree (ct.value);
2843 }
2844 else
2845 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2881 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2846 PropModeReplace, selection.text, (int)selection.len); 2882 PropModeReplace, ct.value, ct.nitems);
2883 XFree (ct.value);
2847 } 2884 }
2885#endif
2848 2886
2849 selection_time = tm; 2887 selection_time = tm;
2850 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2851} 2888}
2852 2889
2853/* ------------------------------------------------------------------------- */ 2890/* ------------------------------------------------------------------------- */
2854/* 2891/*
2855 * Mark or select text based upon number of clicks: 1, 2, or 3 2892 * Mark or select text based upon number of clicks: 1, 2, or 3
2856 * EXT: button 1 press 2893 * EXT: button 1 press
2857 */ 2894 */
2858void 2895void
2859rxvt_term::selection_click (int clicks, int x, int y) 2896rxvt_term::selection_click (int clicks, int x, int y)
2860{ 2897{
2861 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2862
2863 clicks = ((clicks - 1) % 3) + 1; 2898 clicks = ((clicks - 1) % 3) + 1;
2864 selection.clicks = clicks; /* save clicks so extend will work */ 2899 selection.clicks = clicks; /* save clicks so extend will work */
2865 2900
2866 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 2901 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2867 2902
… …
2881rxvt_term::selection_start_colrow (int col, int row) 2916rxvt_term::selection_start_colrow (int col, int row)
2882{ 2917{
2883 want_refresh = 1; 2918 want_refresh = 1;
2884 selection.mark.col = col; 2919 selection.mark.col = col;
2885 selection.mark.row = row - TermWin.view_start; 2920 selection.mark.row = row - TermWin.view_start;
2921
2886 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2922 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2887 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2923 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2888 MAX_IT (selection.mark.col, 0); 2924 MAX_IT (selection.mark.col, 0);
2889 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2925 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2890 2926
2927 while (selection.mark.col > 0
2928 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2929 --selection.mark.col;
2930
2891 if (selection.op) 2931 if (selection.op)
2892 { /* clear the old selection */ 2932 { /* clear the old selection */
2893 selection.beg.row = selection.end.row = selection.mark.row; 2933 selection.beg.row = selection.end.row = selection.mark.row;
2894 selection.beg.col = selection.end.col = selection.mark.col; 2934 selection.beg.col = selection.end.col = selection.mark.col;
2895 } 2935 }
2936
2896 selection.op = SELECTION_INIT; 2937 selection.op = SELECTION_INIT;
2897 selection.screen = current_screen; 2938 selection.screen = current_screen;
2898} 2939}
2899 2940
2900/* ------------------------------------------------------------------------- */ 2941/* ------------------------------------------------------------------------- */
… …
2902 * Word select: select text for 2 clicks 2943 * Word select: select text for 2 clicks
2903 * We now only find out the boundary in one direction 2944 * We now only find out the boundary in one direction
2904 */ 2945 */
2905 2946
2906/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2947/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2907#define DELIMIT_TEXT(x) \ 2948#define DELIMIT_TEXT(x) \
2908 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 2949 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2909#define DELIMIT_REND(x) 1 2950#define DELIMIT_REND(x) 1
2910 2951
2911void 2952void
2912rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2953rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2913{ 2954{
2914 int col, row, dirnadd, tcol, trow, w1, w2; 2955 int col, row, dirnadd, tcol, trow, w1, w2;
2915 row_col_t bound; 2956 row_col_t bound;
2916 text_t *stp; 2957 text_t *stp;
2917 rend_t *srp; 2958 rend_t *srp;
2918 2959
2919 if (dirn == UP) 2960 if (dirn == UP)
2920 { 2961 {
2921 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 2962 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2922 bound.col = 0; 2963 bound.col = 0;
… …
2926 { 2967 {
2927 bound.row = TermWin.saveLines + TermWin.nrow; 2968 bound.row = TermWin.saveLines + TermWin.nrow;
2928 bound.col = TermWin.ncol - 1; 2969 bound.col = TermWin.ncol - 1;
2929 dirnadd = 1; 2970 dirnadd = 1;
2930 } 2971 }
2972
2931 row = mark->row + TermWin.saveLines; 2973 row = mark->row + TermWin.saveLines;
2932 col = mark->col; 2974 col = mark->col;
2933 MAX_IT (col, 0); 2975 MAX_IT (col, 0);
2934 /* find the edge of a word */ 2976 /* find the edge of a word */
2935 stp = & (screen.text[row][col]); 2977 stp = &screen.text[row][col];
2936 w1 = DELIMIT_TEXT (*stp); 2978 w1 = DELIMIT_TEXT (*stp);
2937 2979
2938 if (selection_style != NEW_SELECT) 2980 srp = &screen.rend[row][col];
2981 w2 = DELIMIT_REND (*srp);
2982
2983 for (;;)
2939 { 2984 {
2940 if (w1 == 1) 2985 for (; col != bound.col; col += dirnadd)
2941 { 2986 {
2942 stp += dirnadd; 2987 stp += dirnadd;
2943 if (DELIMIT_TEXT (*stp) == 1)
2944 goto Old_Word_Selection_You_Die;
2945 col += dirnadd;
2946 }
2947 w1 = 0;
2948 }
2949 srp = (&screen.rend[row][col]);
2950 w2 = DELIMIT_REND (*srp);
2951
2952 for (;;)
2953 {
2954 for (; col != bound.col; col += dirnadd)
2955 {
2956 stp += dirnadd; 2988 srp += dirnadd;
2989
2990 if (*stp == NOCHAR)
2991 continue;
2992
2957 if (DELIMIT_TEXT (*stp) != w1) 2993 if (DELIMIT_TEXT (*stp) != w1)
2958 break; 2994 break;
2959 srp += dirnadd;
2960 if (DELIMIT_REND (*srp) != w2) 2995 if (DELIMIT_REND (*srp) != w2)
2961 break; 2996 break;
2962 } 2997 }
2998
2963 if ((col == bound.col) && (row != bound.row)) 2999 if ((col == bound.col) && (row != bound.row))
2964 { 3000 {
2965 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3001 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2966 { 3002 {
2967 trow = row + dirnadd; 3003 trow = row + dirnadd;
2968 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3004 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3005
2969 if (screen.text[trow] == NULL) 3006 if (screen.text[trow] == NULL)
2970 break; 3007 break;
3008
2971 stp = & (screen.text[trow][tcol]); 3009 stp = & (screen.text[trow][tcol]);
2972 srp = & (screen.rend[trow][tcol]); 3010 srp = & (screen.rend[trow][tcol]);
3011
2973 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3012 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2974 break; 3013 break;
3014
2975 row = trow; 3015 row = trow;
2976 col = tcol; 3016 col = tcol;
2977 continue; 3017 continue;
2978 } 3018 }
2979 } 3019 }
2980 break; 3020 break;
2981 } 3021 }
3022
2982Old_Word_Selection_You_Die: 3023Old_Word_Selection_You_Die:
2983 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col));
2984
2985 if (dirn == DN) 3024 if (dirn == DN)
2986 col++; /* put us on one past the end */ 3025 col++; /* put us on one past the end */
2987 3026
2988 /* Poke the values back in */ 3027 /* Poke the values back in */
2989 ret->row = row - TermWin.saveLines; 3028 ret->row = row - TermWin.saveLines;
… …
3008 MAX_IT (row, 0); 3047 MAX_IT (row, 0);
3009 MIN_IT (row, (int)TermWin.nrow - 1); 3048 MIN_IT (row, (int)TermWin.nrow - 1);
3010 MAX_IT (col, 0); 3049 MAX_IT (col, 0);
3011 MIN_IT (col, (int)TermWin.ncol); 3050 MIN_IT (col, (int)TermWin.ncol);
3012 3051
3013#ifndef NO_NEW_SELECTION
3014 /* 3052 /*
3015 * If we're selecting characters (single click) then we must check first 3053 * If we're selecting characters (single click) then we must check first
3016 * if we are at the same place as the original mark. If we are then 3054 * if we are at the same place as the original mark. If we are then
3017 * select nothing. Otherwise, if we're to the right of the mark, you have to 3055 * select nothing. Otherwise, if we're to the right of the mark, you have to
3018 * be _past_ a character for it to be selected. 3056 * be _past_ a character for it to be selected.
3019 */ 3057 */
3020 if (selection_style != OLD_SELECT)
3021 {
3022 if (((selection.clicks % 3) == 1) && !flag 3058 if (((selection.clicks % 3) == 1) && !flag
3023 && (col == selection.mark.col 3059 && (col == selection.mark.col
3024 && (row == selection.mark.row + TermWin.view_start))) 3060 && (row == selection.mark.row + TermWin.view_start)))
3025 { 3061 {
3026 /* select nothing */ 3062 /* select nothing */
3027 selection.beg.row = selection.end.row = 0; 3063 selection.beg.row = selection.end.row = 0;
3028 selection.beg.col = selection.end.col = 0; 3064 selection.beg.col = selection.end.col = 0;
3029 selection.clicks = 4; 3065 selection.clicks = 4;
3030 want_refresh = 1; 3066 want_refresh = 1;
3031 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3032 return; 3067 return;
3033 }
3034 } 3068 }
3035#endif 3069
3036 if (selection.clicks == 4) 3070 if (selection.clicks == 4)
3037 selection.clicks = 1; 3071 selection.clicks = 1;
3038 3072
3039 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3073 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3040 flag == 1 ? 1 : 0, /* ? button press */ 3074 flag == 1 ? 1 : 0, /* ? button press */
… …
3046 * Extend the selection to the specified col/row 3080 * Extend the selection to the specified col/row
3047 */ 3081 */
3048void 3082void
3049rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3083rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3050{ 3084{
3051 int16_t ncol = TermWin.ncol; 3085 int16_t ncol = TermWin.ncol;
3052 int end_col; 3086 int end_col;
3053 row_col_t pos; 3087 row_col_t pos;
3054 enum { 3088 enum {
3055 LEFT, RIGHT 3089 LEFT, RIGHT
3056 } closeto = RIGHT; 3090 } closeto = RIGHT;
3057
3058 D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op));
3059 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));
3060 3091
3061 want_refresh = 1; 3092 want_refresh = 1;
3062 switch (selection.op) 3093 switch (selection.op)
3063 { 3094 {
3064 case SELECTION_INIT: 3095 case SELECTION_INIT:
… …
3086 && selection.beg.row == selection.end.row 3117 && selection.beg.row == selection.end.row
3087 && selection.beg.row != selection.mark.row) 3118 && selection.beg.row != selection.mark.row)
3088 { 3119 {
3089 selection.beg.col = selection.end.col = selection.mark.col; 3120 selection.beg.col = selection.end.col = selection.mark.col;
3090 selection.beg.row = selection.end.row = selection.mark.row; 3121 selection.beg.row = selection.end.row = selection.mark.row;
3091 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));
3092 } 3122 }
3093 3123
3094 pos.col = col; 3124 pos.col = col;
3095 pos.row = row; 3125 pos.row = row;
3096 3126
3097 pos.row -= TermWin.view_start; /* adjust for scroll */ 3127 pos.row -= TermWin.view_start; /* adjust for scroll */
3098 3128
3099#ifndef NO_OLD_SELECTION
3100 /*
3101 * This mimics some of the selection behaviour of version 2.20 and before.
3102 * There are no ``selection modes'', button3 is always character extension.
3103 * Note: button3 drag is always available, c.f. v2.20
3104 * Selection always terminates (left or right as appropriate) at the mark.
3105 */
3106 if (selection_style == OLD_SELECT)
3107 {
3108 if (selection.clicks == 1 || button3)
3109 {
3110 if (hate_those_clicks)
3111 {
3112 hate_those_clicks = 0;
3113 if (selection.clicks == 1)
3114 {
3115 selection.beg.row = selection.mark.row;
3116 selection.beg.col = selection.mark.col;
3117 }
3118 else
3119 {
3120 selection.mark.row = selection.beg.row;
3121 selection.mark.col = selection.beg.col;
3122 }
3123 }
3124 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3125 {
3126 selection.end.row = selection.mark.row;
3127 selection.end.col = selection.mark.col + 1;
3128 selection.beg.row = pos.row;
3129 selection.beg.col = pos.col;
3130 }
3131 else
3132 {
3133 selection.beg.row = selection.mark.row;
3134 selection.beg.col = selection.mark.col;
3135 selection.end.row = pos.row;
3136 selection.end.col = pos.col + 1;
3137 }
3138 }
3139 else if (selection.clicks == 2)
3140 {
3141 selection_delimit_word (UP, & (selection.mark),
3142 & (selection.beg));
3143 selection_delimit_word (DN, & (selection.mark),
3144 & (selection.end));
3145 hate_those_clicks = 1;
3146 }
3147 else if (selection.clicks == 3)
3148 {
3149 selection.beg.row = selection.end.row = selection.mark.row;
3150 selection.beg.col = 0;
3151 selection.end.col = ncol;
3152 hate_those_clicks = 1;
3153 }
3154 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3155 return;
3156 }
3157#endif /* ! NO_OLD_SELECTION */
3158#ifndef NO_NEW_SELECTION
3159 /* selection_style must not be OLD_SELECT to get here */
3160 /* 3129 /*
3161 * This is mainly xterm style selection with a couple of differences, mainly 3130 * This is mainly xterm style selection with a couple of differences, mainly
3162 * in the way button3 drag extension works. 3131 * in the way button3 drag extension works.
3163 * We're either doing: button1 drag; button3 press; or button3 drag 3132 * We're either doing: button1 drag; button3 press; or button3 drag
3164 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3133 * a) button1 drag : select around a midpoint/word/line - that point/word/line
… …
3169 * a point/word/line which is either the start or end of the selection 3138 * a point/word/line which is either the start or end of the selection
3170 * and it was decided by whichever point/word/line was `fixed' at the 3139 * and it was decided by whichever point/word/line was `fixed' at the
3171 * time of the most recent button3 press 3140 * time of the most recent button3 press
3172 */ 3141 */
3173 if (button3 && buttonpress) 3142 if (button3 && buttonpress)
3174 { /* button3 press */ 3143 { /* button3 press */
3175 /* 3144 /*
3176 * first determine which edge of the selection we are closest to 3145 * first determine which edge of the selection we are closest to
3177 */ 3146 */
3178 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3147 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3179 || (!ROWCOL_IS_AFTER (pos, selection.end) 3148 || (!ROWCOL_IS_AFTER (pos, selection.end)
3180 && (((pos.col - selection.beg.col) 3149 && (((pos.col - selection.beg.col)
3181 + ((pos.row - selection.beg.row) * ncol)) 3150 + ((pos.row - selection.beg.row) * ncol))
3182 < ((selection.end.col - pos.col) 3151 < ((selection.end.col - pos.col)
3183 + ((selection.end.row - pos.row) * ncol))))) 3152 + ((selection.end.row - pos.row) * ncol)))))
3184 closeto = LEFT; 3153 closeto = LEFT;
3154
3185 if (closeto == LEFT) 3155 if (closeto == LEFT)
3186 { 3156 {
3187 selection.beg.row = pos.row; 3157 selection.beg.row = pos.row;
3188 selection.beg.col = pos.col; 3158 selection.beg.col = pos.col;
3189 selection.mark.row = selection.end.row; 3159 selection.mark.row = selection.end.row;
3190 selection.mark.col = selection.end.col 3160 selection.mark.col = selection.end.col - (selection.clicks == 2);
3191 - (selection.clicks == 2);
3192 } 3161 }
3193 else 3162 else
3194 { 3163 {
3195 selection.end.row = pos.row; 3164 selection.end.row = pos.row;
3196 selection.end.col = pos.col; 3165 selection.end.col = pos.col;
3197 selection.mark.row = selection.beg.row; 3166 selection.mark.row = selection.beg.row;
3198 selection.mark.col = selection.beg.col; 3167 selection.mark.col = selection.beg.col;
3199 } 3168 }
3200 } 3169 }
3201 else 3170 else
3202 { /* button1 drag or button3 drag */ 3171 { /* button1 drag or button3 drag */
3203 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3172 if (ROWCOL_IS_AFTER (selection.mark, pos))
3204 { 3173 {
3205 if ((selection.mark.row == selection.end.row) 3174 if ((selection.mark.row == selection.end.row)
3206 && (selection.mark.col == selection.end.col) 3175 && (selection.mark.col == selection.end.col)
3207 && clickchange && selection.clicks == 2) 3176 && clickchange && selection.clicks == 2)
3208 selection.mark.col--; 3177 selection.mark.col--;
3178
3209 selection.beg.row = pos.row; 3179 selection.beg.row = pos.row;
3210 selection.beg.col = pos.col; 3180 selection.beg.col = pos.col;
3211 selection.end.row = selection.mark.row; 3181 selection.end.row = selection.mark.row;
3212 selection.end.col = selection.mark.col 3182 selection.end.col = selection.mark.col + (selection.clicks == 2);
3213 + (selection.clicks == 2);
3214 } 3183 }
3215 else 3184 else
3216 { 3185 {
3217 selection.beg.row = selection.mark.row; 3186 selection.beg.row = selection.mark.row;
3218 selection.beg.col = selection.mark.col; 3187 selection.beg.col = selection.mark.col;
… …
3222 } 3191 }
3223 3192
3224 if (selection.clicks == 1) 3193 if (selection.clicks == 1)
3225 { 3194 {
3226 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3195 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3196
3227 if (end_col != -1 && selection.beg.col > end_col) 3197 if (end_col != -1 && selection.beg.col > end_col)
3228 { 3198 {
3229#if 1 3199#if 1
3230 selection.beg.col = ncol; 3200 selection.beg.col = ncol;
3231#else 3201#else
3232 if (selection.beg.row != selection.end.row) 3202 if (selection.beg.row != selection.end.row)
3233 selection.beg.col = ncol; 3203 selection.beg.col = ncol;
3234 else 3204 else
3235 selection.beg.col = selection.mark.col; 3205 selection.beg.col = selection.mark.col;
3236#endif 3206#endif
3237
3238 } 3207 }
3208
3239 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3209 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3210
3240 if (end_col != -1 && selection.end.col > end_col) 3211 if (end_col != -1 && selection.end.col > end_col)
3241 selection.end.col = ncol; 3212 selection.end.col = ncol;
3242
3243 } 3213 }
3244 else if (selection.clicks == 2) 3214 else if (selection.clicks == 2)
3245 { 3215 {
3246 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3216 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3247 selection.end.col--; 3217 selection.end.col--;
3218
3248 selection_delimit_word (UP, & (selection.beg), 3219 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3249 & (selection.beg));
3250 selection_delimit_word (DN, & (selection.end), 3220 selection_delimit_word (DN, & (selection.end), & (selection.end));
3251 & (selection.end));
3252 } 3221 }
3253 else if (selection.clicks == 3) 3222 else if (selection.clicks == 3)
3254 { 3223 {
3255#ifndef NO_FRILLS 3224#if ENABLE_FRILLS
3256 if ((Options & Opt_tripleclickwords)) 3225 if ((options & Opt_tripleclickwords))
3257 { 3226 {
3258 int end_row; 3227 int end_row;
3259 3228
3260 selection_delimit_word (UP, & (selection.beg), 3229 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3261 & (selection.beg));
3262 end_row = screen.tlen[selection.mark.row 3230 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3263 + TermWin.saveLines]; 3231
3264 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3232 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3265 end_row++)
3266 { 3233 {
3267 end_col = screen.tlen[end_row + TermWin.saveLines]; 3234 end_col = screen.tlen[end_row + TermWin.saveLines];
3235
3268 if (end_col != -1) 3236 if (end_col != -1)
3269 { 3237 {
3270 selection.end.row = end_row; 3238 selection.end.row = end_row;
3271 selection.end.col = end_col; 3239 selection.end.col = end_col;
3272 selection_remove_trailing_spaces (); 3240 selection_remove_trailing_spaces ();
… …
3274 } 3242 }
3275 } 3243 }
3276 } 3244 }
3277 else 3245 else
3278#endif 3246#endif
3279
3280 { 3247 {
3281 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3248 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3282 selection.mark.col++; 3249 selection.mark.col++;
3283 selection.beg.col = 0; 3250 selection.beg.col = 0;
3284 selection.end.col = ncol; 3251 selection.end.col = ncol;
3285 } 3252 }
3286 } 3253 }
3254
3287 if (button3 && buttonpress) 3255 if (button3 && buttonpress)
3288 { /* mark may need to be changed */ 3256 { /* mark may need to be changed */
3289 if (closeto == LEFT) 3257 if (closeto == LEFT)
3290 { 3258 {
3291 selection.mark.row = selection.end.row; 3259 selection.mark.row = selection.end.row;
3292 selection.mark.col = selection.end.col 3260 selection.mark.col = selection.end.col - (selection.clicks == 2);
3293 - (selection.clicks == 2);
3294 } 3261 }
3295 else 3262 else
3296 { 3263 {
3297 selection.mark.row = selection.beg.row; 3264 selection.mark.row = selection.beg.row;
3298 selection.mark.col = selection.beg.col; 3265 selection.mark.col = selection.beg.col;
3299 } 3266 }
3300 } 3267 }
3301 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3302#endif /* ! NO_NEW_SELECTION */
3303} 3268}
3304 3269
3305#ifndef NO_FRILLS 3270#if ENABLE_FRILLS
3306void 3271void
3307rxvt_term::selection_remove_trailing_spaces () 3272rxvt_term::selection_remove_trailing_spaces ()
3308{ 3273{
3309 int32_t end_col, end_row; 3274 int32_t end_col, end_row;
3310 text_t *stp; 3275 text_t *stp;
… …
3381 ev.target = rq.target; 3346 ev.target = rq.target;
3382 ev.time = rq.time; 3347 ev.time = rq.time;
3383 3348
3384 if (rq.target == xa[XA_TARGETS]) 3349 if (rq.target == xa[XA_TARGETS])
3385 { 3350 {
3386 Atom32 target_list[5]; 3351 Atom32 target_list[6];
3387 Atom32 *target = target_list; 3352 Atom32 *target = target_list;
3388 3353
3389 *target++ = (Atom32) xa[XA_TARGETS]; 3354 *target++ = (Atom32) xa[XA_TARGETS];
3355 *target++ = (Atom32) xa[XA_TIMESTAMP];
3390 *target++ = (Atom32) XA_STRING; 3356 *target++ = (Atom32) XA_STRING;
3391 *target++ = (Atom32) xa[XA_TEXT]; 3357 *target++ = (Atom32) xa[XA_TEXT];
3392 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3358 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3393#if X_HAVE_UTF8_STRING 3359#if X_HAVE_UTF8_STRING
3394 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3360 *target++ = (Atom32) xa[XA_UTF8_STRING];
3395#endif 3361#endif
3362
3396 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3363 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3397 (8 * sizeof (target_list[0])), PropModeReplace, 3364 (8 * sizeof (target_list[0])), PropModeReplace,
3398 (unsigned char *)target_list, 3365 (unsigned char *)target_list,
3399 target - target_list); 3366 target - target_list);
3400 ev.property = rq.property; 3367 ev.property = rq.property;
3401 } 3368 }
3369#if TODO // TODO
3402 else if (rq.target == xa[XA_MULTIPLE]) 3370 else if (rq.target == xa[XA_MULTIPLE])
3403 { 3371 {
3404 /* TODO: Handle MULTIPLE */ 3372 /* TODO: Handle MULTIPLE */
3405 } 3373 }
3374#endif
3406 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3375 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3407 { 3376 {
3408 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3377 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3409 (8 * sizeof (Time)), PropModeReplace, 3378 (8 * sizeof (Time)), PropModeReplace,
3410 (unsigned char *)&selection_time, 1); 3379 (unsigned char *)&selection_time, 1);
3411 ev.property = rq.property; 3380 ev.property = rq.property;
3412 } 3381 }
3413 else if (rq.target == XA_STRING 3382 else if (rq.target == XA_STRING
3414 || rq.target == xa[XA_TEXT] 3383 || rq.target == xa[XA_TEXT]
3415 || rq.target == xa[XA_COMPOUND_TEXT] 3384 || rq.target == xa[XA_COMPOUND_TEXT]
3416 || rq.target == xa[XA_UTF8_STRING] 3385 || rq.target == xa[XA_UTF8_STRING]
3417 ) 3386 )
3418 { 3387 {
3419 short freect = 0; 3388 short freect = 0;
3420 int selectlen; 3389 int selectlen;
3421 char *cl; 3390 wchar_t *cl;
3422 3391
3423 target = rq.target; 3392 target = rq.target;
3424 3393
3425 if (target == XA_STRING) 3394 if (target == XA_STRING)
3426 // we actually don't do XA_STRING, but who cares, as i18n clients 3395 // we actually don't do XA_STRING, but who cares, as i18n clients
3427 // will ask for another format anyways. 3396 // will ask for another format anyways.
3428 style = XStringStyle; 3397 style = XStringStyle;
3429 else if (target == xa[XA_TEXT]) 3398 else if (target == xa[XA_TEXT])
3430 style = XTextStyle; 3399 style = XStdICCTextStyle;
3431 else if (target == xa[XA_COMPOUND_TEXT]) 3400 else if (target == xa[XA_COMPOUND_TEXT])
3432 style = XCompoundTextStyle; 3401 style = XCompoundTextStyle;
3433#if X_HAVE_UTF8_STRING 3402#if X_HAVE_UTF8_STRING
3434 else if (target == xa[XA_UTF8_STRING]) 3403 else if (target == xa[XA_UTF8_STRING])
3435 style = XUTF8StringStyle; 3404 style = XUTF8StringStyle;
… …
3440 style = XCompoundTextStyle; 3409 style = XCompoundTextStyle;
3441 } 3410 }
3442 3411
3443 if (selection.text) 3412 if (selection.text)
3444 { 3413 {
3445 cl = (char *)selection.text; 3414 cl = selection.text;
3446 selectlen = selection.len; 3415 selectlen = selection.len;
3447 } 3416 }
3448 else 3417 else
3449 { 3418 {
3450 cl = ""; 3419 cl = L"";
3451 selectlen = 0; 3420 selectlen = 0;
3452 } 3421 }
3453 3422
3423 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3424 // manually for XUTF8StringStyle.
3454 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3425 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3455 freect = 1; 3426 freect = 1;
3456 else 3427 else
3457 { 3428 {
3458 /* if we failed to convert then send it raw */ 3429 /* if we failed to convert then send it raw */
3459 ct.value = (unsigned char *)cl; 3430 ct.value = (unsigned char *)cl;
… …
3466 ev.property = rq.property; 3437 ev.property = rq.property;
3467 3438
3468 if (freect) 3439 if (freect)
3469 XFree (ct.value); 3440 XFree (ct.value);
3470 } 3441 }
3442
3471 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3443 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3472} 3444}
3473 3445
3474/* ------------------------------------------------------------------------- * 3446/* ------------------------------------------------------------------------- *
3475 * MOUSE ROUTINES * 3447 * MOUSE ROUTINES *
… …
3488} 3460}
3489 3461
3490/* ------------------------------------------------------------------------- */ 3462/* ------------------------------------------------------------------------- */
3491#ifdef USE_XIM 3463#ifdef USE_XIM
3492void 3464void
3493rxvt_term::im_set_position (XPoint *pos) 3465rxvt_term::im_set_position (XPoint &pos)
3494{ 3466{
3495 XWindowAttributes xwa; 3467 XWindowAttributes xwa;
3496 3468
3497 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3469 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3470
3498 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3471 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3499 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3472 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3500} 3473}
3501
3502#endif 3474#endif
3503/* ------------------------------------------------------------------------- */ 3475
3504 3476#if ENABLE_OVERLAY
3477void
3478rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3479{
3480 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3481 return;
3482
3483 want_refresh = 1;
3484
3485 scr_overlay_off ();
3486
3487 if (x < 0) x = TermWin.ncol - w;
3488 if (y < 0) y = TermWin.nrow - h;
3489
3490 // make space for border
3491 w += 2; MIN_IT (w, TermWin.ncol);
3492 h += 2; MIN_IT (h, TermWin.nrow);
3493
3494 x -= 1; MAX_IT (x, 0);
3495 y -= 1; MAX_IT (y, 0);
3496
3497 MIN_IT (x, TermWin.ncol - w);
3498 MIN_IT (y, TermWin.nrow - h);
3499
3500 ov_x = x; ov_y = y;
3501 ov_w = w; ov_h = h;
3502
3503 ov_text = new text_t *[h];
3504 ov_rend = new rend_t *[h];
3505
3506 for (y = 0; y < h; y++)
3507 {
3508 text_t *tp = ov_text[y] = new text_t[w];
3509 rend_t *rp = ov_rend[y] = new rend_t[w];
3510
3511 text_t t0, t1, t2;
3512 rend_t r = SET_BGCOLOR (SET_FGCOLOR (RS_None, Color_bg), Color_fg);
3513
3514 if (y == 0)
3515 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3516 else if (y < h - 1)
3517 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3518 else
3519 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3520
3521 *tp++ = t0;
3522 *rp++ = r;
3523
3524 for (x = w - 2; x > 0; --x)
3525 {
3526 *tp++ = t1;
3527 *rp++ = r;
3528 }
3529
3530 *tp = t2;
3531 *rp = r;
3532 }
3533}
3534
3535void
3536rxvt_term::scr_overlay_off ()
3537{
3538 if (!ov_text)
3539 return;
3540
3541 want_refresh = 1;
3542
3543 for (int y = 0; y < ov_h; y++)
3544 {
3545 delete [] ov_text[y];
3546 delete [] ov_rend[y];
3547 }
3548
3549 delete [] ov_text; ov_text = 0;
3550 delete [] ov_rend; ov_rend = 0;
3551}
3552
3553void
3554rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3555{
3556 if (!ov_text || x >= ov_w - 2 || y >= ov_h)
3557 return;
3558
3559 x++, y++;
3560
3561 ov_text[y][x] = text;
3562 ov_rend[y][x] = rend;
3563}
3564
3565void
3566rxvt_term::scr_overlay_set (int x, int y, const char *s)
3567{
3568 while (*s)
3569 scr_overlay_set (x++, y, *s++);
3570}
3571
3572void
3573rxvt_term::scr_swap_overlay ()
3574{
3575 if (!ov_text)
3576 return;
3577
3578 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3579
3580 // swap screen mem with overlay
3581 for (int y = ov_h; y--; )
3582 {
3583 text_t *t1 = ov_text[y];
3584 rend_t *r1 = ov_rend[y];
3585
3586 text_t *t2 = screen.text[y + row_offset] + ov_x;
3587 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3588
3589 for (int x = ov_w; x--; )
3590 {
3591 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3592 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, TermWin.fontset->find_font (t, false));
3593 }
3594 }
3595}
3596
3597#endif
3505/* ------------------------------------------------------------------------- * 3598/* ------------------------------------------------------------------------- */
3506 * DEBUG ROUTINES *
3507 * ------------------------------------------------------------------------- */
3508#if 0
3509void
3510rxvt_debug_colors (void)
3511{
3512 int color;
3513 const char *name[] =
3514 {
3515 "fg", "bg",
3516 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3517 };
3518
3519 fprintf (stderr, "Color ( ");
3520 if (rstyle & RS_RVid)
3521 fprintf (stderr, "rvid ");
3522 if (rstyle & RS_Bold)
3523 fprintf (stderr, "bold ");
3524 if (rstyle & RS_Blink)
3525 fprintf (stderr, "blink ");
3526 if (rstyle & RS_Uline)
3527 fprintf (stderr, "uline ");
3528 fprintf (stderr, "): ");
3529
3530 color = GET_FGCOLOR (rstyle);
3531#ifndef NO_BRIGHTCOLOR
3532 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3533 {
3534 color -= (minBrightCOLOR - minCOLOR);
3535 fprintf (stderr, "bright ");
3536 }
3537#endif
3538 fprintf (stderr, "%s on ", name[color]);
3539
3540 color = GET_BGCOLOR (rstyle);
3541#ifndef NO_BRIGHTCOLOR
3542 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3543 {
3544 color -= (minBrightCOLOR - minCOLOR);
3545 fprintf (stderr, "bright ");
3546 }
3547#endif
3548 fprintf (stderr, "%s\n", name[color]);
3549}
3550#endif

Diff Legend

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