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.57 by pcg, Sun Mar 14 17:33:08 2004 UTC vs.
Revision 1.149 by root, Mon Dec 13 06:44:18 2004 UTC

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

Diff Legend

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