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

Diff Legend

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