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