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.54 by pcg, Thu Mar 11 00:53:19 2004 UTC vs.
Revision 1.139 by root, Sun Nov 21 18:51:13 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; 870 /*
871 * If we wrote anywhere in the selected area, kill the selection
872 * XXX: should we kill the mark too? Possibly, but maybe that
873 * should be a similar check.
874 */
875 CLEAR_SELECTION ();
850 } 876 }
851 877
852 if (screen.flags & Screen_WrapNext) 878 if (screen.flags & Screen_WrapNext)
853 { 879 {
854 screen.tlen[row] = -1; 880 screen.tlen[row] = -1;
855 if (screen.cur.row == screen.bscroll) 881
856 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
857 else if (screen.cur.row < (TermWin.nrow - 1))
858 row = (++screen.cur.row) + TermWin.saveLines; 882 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;
859 883
860 stp = screen.text[row]; /* _must_ refresh */ 884 stp = screen.text[row]; /* _must_ refresh */
861 srp = screen.rend[row]; /* _must_ refresh */ 885 srp = screen.rend[row]; /* _must_ refresh */
862 screen.cur.col = 0;
863 screen.flags &= ~Screen_WrapNext;
864 } 886 }
865 887
866 if (screen.flags & Screen_Insert) 888 if (screen.flags & Screen_Insert)
867 scr_insdel_chars (1, INSERT); 889 scr_insdel_chars (1, INSERT);
868 890
869 if (IS_COMPOSE (c))
870 c = REPLACEMENT_CHAR;
871
872 // rely on wcwidth to tell us the character width, at least for non-latin1 891 // rely on wcwidth to tell us the character width, at least for non-latin1
873 // do wcwidth before further replacements, as wcwidth says that line-drawing 892 // do wcwidth before further replacements, as wcwidth says that line-drawing
874 // characters have width -1 (DOH!) on gnu/linux sometimes. 893 // characters have width -1 (DOH!) on GNU/Linux sometimes.
875 int width = c < 256 ? 1 : wcwidth (c); 894 int width = c < 0x100 ? 1 : wcwidth (c);
876 895
877 if (charsets[screen.charset] == '0') // DEC SPECIAL 896 if (charsets[screen.charset] == '0') // DEC SPECIAL
878 switch (c)
879 { 897 {
880 // vt100 special graphics and line drawing 898 // vt100 special graphics and line drawing
881 case '`': c = 0x25c6; break; case '_': c = 0x0020; break; 899 // 5f-7e standard vt100
882 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; 900 // 40-5e rxvt extension for extra curses acs chars
883 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; 901 static uint16_t vt100_0[63] = { // 5f .. 7e
884 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; 902 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
885 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; 903 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
886 case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; 904 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
887 case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; 905 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
888 case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break; 906 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
889 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; 907 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
890 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; 908 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
891 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; 909 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
892 } 910 };
911
912 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40])
913 {
914 c = vt100_0[c - 0x40];
915 width = 1;
916 }
893 917 }
894 918
895 if (width > 0) 919 if (width != 0)
896 { 920 {
921 // some utf-8 decoders decode surrogate characters.
922 if (0xd800 <= c && c <= 0xdfff)
923 c = 0xfffd;
924
897#if !UNICODE_3 925#if !UNICODE_3
898 // trim characters we can't store directly :( 926 // trim characters we can't store directly :(
899 if (c >= 0x10000) 927 if (c >= 0x10000)
928# if ENABLE_COMBINING
900 c = rxvt_composite.compose (c); // map to lower 16 bits 929 c = rxvt_composite.compose (c); // map to lower 16 bits
930# else
931 c = 0xfffd;
901#endif 932# endif
933#endif
934
935 // nuke the character at this position, if required
936 if (stp[screen.cur.col] == NOCHAR
937 || (screen.cur.col < TermWin.ncol - 1
938 && stp[screen.cur.col + 1] == NOCHAR))
939 {
940 int col = screen.cur.col;
941
942 // find begin
943 while (col > 0 && stp[col] == NOCHAR)
944 col--;
945
946 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' '));
947
948 // found begin, nuke
949 do {
950 stp[col] = ' ';
951 srp[col] = rend;
952 col++;
953 } while (col < TermWin.ncol && stp[col] == NOCHAR);
954 }
955
902 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 956 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903 957
904 do 958 do
905 { 959 {
906 stp[screen.cur.col] = c; 960 stp[screen.cur.col] = c;
907 srp[screen.cur.col] = rend; 961 srp[screen.cur.col] = rend;
… …
927 srp[c] = rend; 981 srp[c] = rend;
928 } 982 }
929 } 983 }
930 else if (width == 0) 984 else if (width == 0)
931 { 985 {
932#if ENCODING_COMPOSE 986#if ENABLE_COMBINING
933 // handle combining characters 987 // handle combining characters
934 // we just tag the accent on the previous on-screen character. 988 // we just tag the accent on the previous on-screen character.
935 // this is arguably not correct, but also arguably not wrong. 989 // this is arguably not correct, but also arguably not wrong.
936 // we don't handle double-width characters nicely yet. 990 // we don't handle double-width characters nicely yet.
937 991
… …
940 994
941 if (screen.cur.col > 0) 995 if (screen.cur.col > 0)
942 { 996 {
943 tp = stp + screen.cur.col - 1; 997 tp = stp + screen.cur.col - 1;
944 rp = srp + screen.cur.col - 1; 998 rp = srp + screen.cur.col - 1;
999
1000 while (*tp == NOCHAR && tp > stp)
1001 tp--, rp--;
945 } 1002 }
946 else if (screen.cur.row > 0 1003 else if (screen.cur.row > 0
947 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 1004 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
948 { 1005 {
949 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1006 int line = screen.cur.row - 1 + TermWin.saveLines;
950 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 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--;
951 } 1013 }
952 else 1014 else
953 continue; 1015 continue;
954 1016
955 // handle double-width-chars by making them look extremely ugly
956 if (*tp == NOCHAR)
957 *tp = ' '; // hack //D //TODO //--tp, --rp;
958
959 // first try to find a precomposed character 1017 // first try to find a precomposed character
960 uint32_t n = rxvt_compose (*tp, c); 1018 unicode_t n = rxvt_compose (*tp, c);
961 if (n == NOCHAR) 1019 if (n == NOCHAR)
962 n = rxvt_composite.compose (*tp, c); 1020 n = rxvt_composite.compose (*tp, c);
963 1021
964 *tp = n; 1022 *tp = n;
965 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 1023 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
966#endif 1024#endif
967 } 1025 }
968 } 1026 }
969 1027
970 if (screen.tlen[row] != -1) /* XXX: think about this */ 1028 if (screen.tlen[row] != -1) /* XXX: think about this */
971 MAX_IT (screen.tlen[row], screen.cur.col); 1029 MAX_IT (screen.tlen[row], screen.cur.col);
972
973 /*
974 * If we wrote anywhere in the selected area, kill the selection
975 * XXX: should we kill the mark too? Possibly, but maybe that
976 * should be a similar check.
977 */
978 if (clearsel)
979 CLEAR_SELECTION ();
980 1030
981#ifdef DEBUG_STRICT 1031#ifdef DEBUG_STRICT
982 assert (screen.cur.row >= 0); 1032 assert (screen.cur.row >= 0);
983#else /* drive with your eyes closed */ 1033#else /* drive with your eyes closed */
984 MAX_IT (screen.cur.row, 0); 1034 MAX_IT (screen.cur.row, 0);
… …
992 */ 1042 */
993void 1043void
994rxvt_term::scr_backspace () 1044rxvt_term::scr_backspace ()
995{ 1045{
996 want_refresh = 1; 1046 want_refresh = 1;
1047
997 if (screen.cur.col == 0) 1048 if (screen.cur.col == 0)
998 { 1049 {
999 if (screen.cur.row > 0) 1050 if (screen.cur.row > 0)
1000 { 1051 {
1001#ifdef TERMCAP_HAS_BW 1052#ifdef TERMCAP_HAS_BW
1002 screen.cur.col = TermWin.ncol - 1; 1053 screen.cur.col = TermWin.ncol - 1;
1003 screen.cur.row--; 1054 screen.cur.row--;
1004 return; 1055 return;
1005#endif 1056#endif
1006
1007 } 1057 }
1008 } 1058 }
1009 else if ((screen.flags & Screen_WrapNext) == 0) 1059 else if (!(screen.flags & Screen_WrapNext))
1010 scr_gotorc (0, -1, RELATIVE); 1060 scr_gotorc (0, -1, RELATIVE);
1061
1011 screen.flags &= ~Screen_WrapNext; 1062 screen.flags &= ~Screen_WrapNext;
1012} 1063}
1013 1064
1014/* ------------------------------------------------------------------------- */ 1065/* ------------------------------------------------------------------------- */
1015/* 1066/*
1016 * Process Horizontal Tab 1067 * Process Horizontal Tab
1017 * count: +ve = forward; -ve = backwards 1068 * count: +ve = forward; -ve = backwards
1018 * XTERM_SEQ: CTRL-I 1069 * XTERM_SEQ: CTRL-I
1019 */ 1070 */
1020void 1071void
1021rxvt_term::scr_tab (int count) 1072rxvt_term::scr_tab (int count, bool ht)
1022{ 1073{
1023 int i, x; 1074 int i, x;
1024 1075
1025 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1026 want_refresh = 1; 1076 want_refresh = 1;
1027 i = x = screen.cur.col; 1077 i = x = screen.cur.col;
1078
1028 if (count == 0) 1079 if (count == 0)
1029 return; 1080 return;
1030 else if (count > 0) 1081 else if (count > 0)
1031 { 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
1032 for (; ++i < TermWin.ncol; ) 1089 for (; ++i < TermWin.ncol; )
1033 if (tabs[i]) 1090 if (tabs[i])
1034 { 1091 {
1035 x = i; 1092 x = i;
1036 if (!--count) 1093 if (!--count)
1037 break; 1094 break;
1038 } 1095 }
1096 else
1097 ht &= tp[i] == ' '
1098 && RS_SAME (rp[i], base_rend);
1099
1039 if (count) 1100 if (count)
1040 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)
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 }
1041 } 1123 }
1042 else /* if (count < 0) */ 1124 else /* if (count < 0) */
1043 { 1125 {
1044 for (; --i >= 0; ) 1126 for (; --i >= 0; )
1045 if (tabs[i]) 1127 if (tabs[i])
1046 { 1128 {
1047 x = i; 1129 x = i;
1048 if (!++count) 1130 if (!++count)
1049 break; 1131 break;
1050 } 1132 }
1133
1051 if (count) 1134 if (count)
1052 x = 0; 1135 x = 0;
1053 } 1136 }
1137
1054 if (x != screen.cur.col) 1138 if (x != screen.cur.col)
1055 scr_gotorc (0, x, R_RELATIVE); 1139 scr_gotorc (0, x, R_RELATIVE);
1056} 1140}
1057 1141
1058/* ------------------------------------------------------------------------- */ 1142/* ------------------------------------------------------------------------- */
… …
1060 * Process DEC Back Index 1144 * Process DEC Back Index
1061 * XTERM_SEQ: ESC 6 1145 * XTERM_SEQ: ESC 6
1062 * 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
1063 * in that row right. Clear left column. 1147 * in that row right. Clear left column.
1064 */ 1148 */
1065#ifndef NO_FRILLS 1149#if ENABLE_FRILLS
1066void 1150void
1067rxvt_term::scr_backindex () 1151rxvt_term::scr_backindex ()
1068{ 1152{
1069 if (screen.cur.col > 0) 1153 if (screen.cur.col > 0)
1070 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1154 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1071 else 1155 else
1072 { 1156 {
1073 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1157 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1074 return; /* um, yeah? */ 1158 return; /* um, yeah? */
1159
1075 scr_insdel_chars (1, INSERT); 1160 scr_insdel_chars (1, INSERT);
1076 } 1161 }
1077} 1162}
1078#endif 1163#endif
1079/* ------------------------------------------------------------------------- */ 1164/* ------------------------------------------------------------------------- */
… …
1081 * Process DEC Forward Index 1166 * Process DEC Forward Index
1082 * XTERM_SEQ: ESC 9 1167 * XTERM_SEQ: ESC 9
1083 * 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
1084 * in that row left. Clear right column. 1169 * in that row left. Clear right column.
1085 */ 1170 */
1086#ifndef NO_FRILLS 1171#if ENABLE_FRILLS
1087void 1172void
1088rxvt_term::scr_forwardindex () 1173rxvt_term::scr_forwardindex ()
1089{ 1174{
1090 int row; 1175 int row;
1091 1176
1092 if (screen.cur.col < TermWin.ncol - 1) 1177 if (screen.cur.col < TermWin.ncol - 1)
1093 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1178 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1094 else 1179 else
1095 { 1180 {
1096 row = screen.cur.row + TermWin.saveLines; 1181 row = screen.cur.row + TermWin.saveLines;
1182
1097 if (screen.tlen[row] == 0) 1183 if (screen.tlen[row] == 0)
1098 return; /* um, yeah? */ 1184 return; /* um, yeah? */
1099 else if (screen.tlen[row] == -1) 1185 else if (screen.tlen[row] == -1)
1100 screen.tlen[row] = TermWin.ncol; 1186 screen.tlen[row] = TermWin.ncol;
1187
1101 scr_gotorc (0, 0, R_RELATIVE); 1188 scr_gotorc (0, 0, R_RELATIVE);
1102 scr_insdel_chars (1, DELETE); 1189 scr_insdel_chars (1, DELETE);
1103 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1190 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1104 } 1191 }
1105} 1192}
… …
1113rxvt_term::scr_gotorc (int row, int col, int relative) 1200rxvt_term::scr_gotorc (int row, int col, int relative)
1114{ 1201{
1115 want_refresh = 1; 1202 want_refresh = 1;
1116 ZERO_SCROLLBACK (); 1203 ZERO_SCROLLBACK ();
1117 1204
1118 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));
1119
1120 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1205 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1121 : col);
1122 MAX_IT (screen.cur.col, 0); 1206 MAX_IT (screen.cur.col, 0);
1123 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1207 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1124 1208
1125 screen.flags &= ~Screen_WrapNext; 1209 screen.flags &= ~Screen_WrapNext;
1210
1126 if (relative & R_RELATIVE) 1211 if (relative & R_RELATIVE)
1127 { 1212 {
1128 if (row > 0) 1213 if (row > 0)
1129 { 1214 {
1130 if (screen.cur.row <= screen.bscroll 1215 if (screen.cur.row <= screen.bscroll
… …
1150 MIN_IT (screen.cur.row, screen.bscroll); 1235 MIN_IT (screen.cur.row, screen.bscroll);
1151 } 1236 }
1152 else 1237 else
1153 screen.cur.row = row; 1238 screen.cur.row = row;
1154 } 1239 }
1240
1155 MAX_IT (screen.cur.row, 0); 1241 MAX_IT (screen.cur.row, 0);
1156 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1242 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1157
1158 while (screen.cur.col > 0
1159 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1160 screen.cur.col--;
1161} 1243}
1162 1244
1163/* ------------------------------------------------------------------------- */ 1245/* ------------------------------------------------------------------------- */
1164/* 1246/*
1165 * direction should be UP or DN 1247 * direction should be UP or DN
1166 */ 1248 */
1167void 1249void
1168rxvt_term::scr_index (enum page_dirn direction) 1250rxvt_term::scr_index (enum page_dirn direction)
1169{ 1251{
1170 int dirn; 1252 int dirn;
1171 1253
1172 want_refresh = 1; 1254 want_refresh = 1;
1255 ZERO_SCROLLBACK ();
1256
1173 dirn = ((direction == UP) ? 1 : -1); 1257 dirn = ((direction == UP) ? 1 : -1);
1174 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1175
1176 ZERO_SCROLLBACK ();
1177 1258
1178 screen.flags &= ~Screen_WrapNext; 1259 screen.flags &= ~Screen_WrapNext;
1260
1179 if ((screen.cur.row == screen.bscroll && direction == UP) 1261 if ((screen.cur.row == screen.bscroll && direction == UP)
1180 || (screen.cur.row == screen.tscroll && direction == DN)) 1262 || (screen.cur.row == screen.tscroll && direction == DN))
1181 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1263 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1182 else 1264 else
1183 screen.cur.row += dirn; 1265 screen.cur.row += dirn;
1266
1184 MAX_IT (screen.cur.row, 0); 1267 MAX_IT (screen.cur.row, 0);
1185 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1268 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1186 selection_check (0); 1269 selection_check (0);
1187} 1270}
1188 1271
… …
1197rxvt_term::scr_erase_line (int mode) 1280rxvt_term::scr_erase_line (int mode)
1198{ 1281{
1199 unsigned int row, col, num; 1282 unsigned int row, col, num;
1200 1283
1201 want_refresh = 1; 1284 want_refresh = 1;
1202 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1203 ZERO_SCROLLBACK (); 1285 ZERO_SCROLLBACK ();
1204 1286
1205 selection_check (1); 1287 selection_check (1);
1206
1207 screen.flags &= ~Screen_WrapNext;
1208 1288
1209 row = TermWin.saveLines + screen.cur.row; 1289 row = TermWin.saveLines + screen.cur.row;
1210 switch (mode) 1290 switch (mode)
1211 { 1291 {
1212 case 0: /* erase to end of line */ 1292 case 0: /* erase to end of line */
… …
1235 default: 1315 default:
1236 return; 1316 return;
1237 } 1317 }
1238 1318
1239 if (screen.text[row]) 1319 if (screen.text[row])
1240 scr_blank_line (& (screen.text[row][col]), 1320 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1241 & (screen.rend[row][col]), num, rstyle);
1242 else 1321 else
1243 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1322 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1244} 1323}
1245 1324
1246/* ------------------------------------------------------------------------- */ 1325/* ------------------------------------------------------------------------- */
… …
1251 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1330 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1252 */ 1331 */
1253void 1332void
1254rxvt_term::scr_erase_screen (int mode) 1333rxvt_term::scr_erase_screen (int mode)
1255{ 1334{
1256 int num; 1335 int num;
1257 int32_t row, row_offset; 1336 int32_t row, row_offset;
1258 rend_t ren; 1337 rend_t ren;
1259 XGCValues gcvalue; 1338 XGCValues gcvalue;
1260 1339
1261 want_refresh = 1; 1340 want_refresh = 1;
1262 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1263 ZERO_SCROLLBACK (); 1341 ZERO_SCROLLBACK ();
1342
1264 row_offset = (int32_t)TermWin.saveLines; 1343 row_offset = (int32_t)TermWin.saveLines;
1265 1344
1266 switch (mode) 1345 switch (mode)
1267 { 1346 {
1268 case 0: /* erase to end of screen */ 1347 case 0: /* erase to end of screen */
… …
1283 num = TermWin.nrow; 1362 num = TermWin.nrow;
1284 break; 1363 break;
1285 default: 1364 default:
1286 return; 1365 return;
1287 } 1366 }
1288 refresh_type |= REFRESH_BOUNDS; 1367
1289 if (selection.op && current_screen == selection.screen 1368 if (selection.op && current_screen == selection.screen
1290 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1369 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1291 || (selection.end.row >= row 1370 || (selection.end.row >= row
1292 && selection.end.row <= row + num))) 1371 && selection.end.row <= row + num)))
1293 CLEAR_SELECTION (); 1372 CLEAR_SELECTION ();
1373
1294 if (row >= TermWin.nrow) /* Out Of Bounds */ 1374 if (row >= TermWin.nrow) /* Out Of Bounds */
1295 return; 1375 return;
1376
1296 MIN_IT (num, (TermWin.nrow - row)); 1377 MIN_IT (num, (TermWin.nrow - row));
1378
1297 if (rstyle & (RS_RVid | RS_Uline)) 1379 if (rstyle & (RS_RVid | RS_Uline))
1298 ren = (rend_t) ~RS_None; 1380 ren = (rend_t) ~RS_None;
1299 else if (GET_BASEBG (rstyle) == Color_bg) 1381 else if (GET_BASEBG (rstyle) == Color_bg)
1300 { 1382 {
1301 ren = DEFAULT_RSTYLE; 1383 ren = DEFAULT_RSTYLE;
1302 CLEAR_ROWS (row, num); 1384 CLEAR_ROWS (row, num);
1303 } 1385 }
1304 else 1386 else
1305 { 1387 {
1306 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1388 ren = rstyle & (RS_fgMask | RS_bgMask);
1307 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1389 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1308 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1390 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1309 ERASE_ROWS (row, num); 1391 ERASE_ROWS (row, num);
1310 gcvalue.foreground = PixColors[Color_fg]; 1392 gcvalue.foreground = pix_colors[Color_fg];
1311 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1393 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1312 } 1394 }
1395
1313 for (; num--; row++) 1396 for (; num--; row++)
1314 { 1397 {
1315 scr_blank_screen_mem (screen.text, screen.rend, 1398 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);
1316 (unsigned int) (row + row_offset), rstyle);
1317 screen.tlen[row + row_offset] = 0; 1399 screen.tlen[row + row_offset] = 0;
1318 scr_blank_line (drawn_text[row], drawn_rend[row], 1400 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1319 (unsigned int)TermWin.ncol, ren);
1320 } 1401 }
1321} 1402}
1322 1403
1323/* ------------------------------------------------------------------------- */ 1404/* ------------------------------------------------------------------------- */
1324/* 1405/*
… …
1330{ 1411{
1331 int i, j, k; 1412 int i, j, k;
1332 rend_t *r1, fs; 1413 rend_t *r1, fs;
1333 1414
1334 want_refresh = 1; 1415 want_refresh = 1;
1416 ZERO_SCROLLBACK ();
1417
1335 num_scr_allow = 0; 1418 num_scr_allow = 0;
1336 ZERO_SCROLLBACK ();
1337 selection_check (3); 1419 selection_check (3);
1338 1420
1339 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1421 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1340 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1422 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1341 { 1423 {
1342 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1424 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1343 fill_text (screen.text[k], 'E', TermWin.ncol); 1425 fill_text (screen.text[k], 'E', TermWin.ncol);
1344 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1426 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
… …
1351 * Insert/Delete <count> lines 1433 * Insert/Delete <count> lines
1352 */ 1434 */
1353void 1435void
1354rxvt_term::scr_insdel_lines (int count, int insdel) 1436rxvt_term::scr_insdel_lines (int count, int insdel)
1355{ 1437{
1356 int end; 1438 int end;
1357 1439
1358 ZERO_SCROLLBACK (); 1440 ZERO_SCROLLBACK ();
1359 1441
1360 selection_check (1); 1442 selection_check (1);
1361 1443
… …
1368 if (insdel == DELETE) 1450 if (insdel == DELETE)
1369 return; 1451 return;
1370 else if (insdel == INSERT) 1452 else if (insdel == INSERT)
1371 count = end; 1453 count = end;
1372 } 1454 }
1373 screen.flags &= ~Screen_WrapNext; 1455
1456 scr_do_wrap ();
1374 1457
1375 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1458 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1376} 1459}
1377 1460
1378/* ------------------------------------------------------------------------- */ 1461/* ------------------------------------------------------------------------- */
… …
1380 * Insert/Delete <count> characters from the current position 1463 * Insert/Delete <count> characters from the current position
1381 */ 1464 */
1382void 1465void
1383rxvt_term::scr_insdel_chars (int count, int insdel) 1466rxvt_term::scr_insdel_chars (int count, int insdel)
1384{ 1467{
1385 int col, row; 1468 int col, row;
1386 rend_t tr; 1469 rend_t tr;
1387 text_t *stp; 1470 text_t *stp;
1388 rend_t *srp; 1471 rend_t *srp;
1389 int16_t *slp; 1472 int16_t *slp;
1390 1473
1391 want_refresh = 1; 1474 want_refresh = 1;
1392 ZERO_SCROLLBACK (); 1475 ZERO_SCROLLBACK ();
1393 1476
1394 if (count <= 0) 1477 if (count <= 0)
1395 return; 1478 return;
1396 1479
1480 scr_do_wrap ();
1481
1397 selection_check (1); 1482 selection_check (1);
1398 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1483 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1399 1484
1400 row = screen.cur.row + TermWin.saveLines; 1485 row = screen.cur.row + TermWin.saveLines;
1401 screen.flags &= ~Screen_WrapNext;
1402 1486
1403 stp = screen.text[row]; 1487 stp = screen.text[row];
1404 srp = screen.rend[row]; 1488 srp = screen.rend[row];
1405 slp = & (screen.tlen[row]); 1489 slp = &screen.tlen[row];
1490
1406 switch (insdel) 1491 switch (insdel)
1407 { 1492 {
1408 case INSERT: 1493 case INSERT:
1409 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1494 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1410 col--)
1411 { 1495 {
1412 stp[col] = stp[col - count]; 1496 stp[col] = stp[col - count];
1413 srp[col] = srp[col - count]; 1497 srp[col] = srp[col - count];
1414 } 1498 }
1499
1415 if (*slp != -1) 1500 if (*slp != -1)
1416 { 1501 {
1417 *slp += count; 1502 *slp += count;
1418 MIN_IT (*slp, TermWin.ncol); 1503 MIN_IT (*slp, TermWin.ncol);
1419 } 1504 }
1505
1420 if (selection.op && current_screen == selection.screen 1506 if (selection.op && current_screen == selection.screen
1421 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1507 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1422 { 1508 {
1423 if (selection.end.row != screen.cur.row 1509 if (selection.end.row != screen.cur.row
1424 || (selection.end.col + count >= TermWin.ncol)) 1510 || (selection.end.col + count >= TermWin.ncol))
1425 CLEAR_SELECTION (); 1511 CLEAR_SELECTION ();
1426 else 1512 else
1427 { /* shift selection */ 1513 { /* shift selection */
1428 selection.beg.col += count; 1514 selection.beg.col += count;
1429 selection.mark.col += count; /* XXX: yes? */ 1515 selection.mark.col += count; /* XXX: yes? */
1430 selection.end.col += count; 1516 selection.end.col += count;
1431 } 1517 }
1432 } 1518 }
1519
1433 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1520 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1434 (unsigned int)count, rstyle); 1521 (unsigned int)count, rstyle);
1435 break; 1522 break;
1523
1436 case ERASE: 1524 case ERASE:
1437 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1525 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1438 selection_check (1); 1526 selection_check (1);
1439 screen.cur.col -= count; 1527 screen.cur.col -= count;
1440 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1528 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1441 (unsigned int)count, rstyle); 1529 (unsigned int)count, rstyle);
1442 break; 1530 break;
1531
1443 case DELETE: 1532 case DELETE:
1444 tr = srp[TermWin.ncol - 1]
1445 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1533 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1534
1446 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1535 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1447 { 1536 {
1448 stp[col] = stp[col + count]; 1537 stp[col] = stp[col + count];
1449 srp[col] = srp[col + count]; 1538 srp[col] = srp[col + count];
1450 } 1539 }
1540
1451 scr_blank_line (& (stp[TermWin.ncol - count]), 1541 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1452 & (srp[TermWin.ncol - count]),
1453 (unsigned int)count, tr); 1542 (unsigned int)count, tr);
1543
1454 if (*slp == -1) /* break line continuation */ 1544 if (*slp == -1) /* break line continuation */
1455 *slp = TermWin.ncol; 1545 *slp = TermWin.ncol;
1546
1456 *slp -= count; 1547 *slp -= count;
1457 MAX_IT (*slp, 0); 1548 MAX_IT (*slp, 0);
1549
1458 if (selection.op && current_screen == selection.screen 1550 if (selection.op && current_screen == selection.screen
1459 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1551 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1460 { 1552 {
1461 if (selection.end.row != screen.cur.row 1553 if (selection.end.row != screen.cur.row
1462 || (screen.cur.col >= selection.beg.col - count) 1554 || (screen.cur.col >= selection.beg.col - count)
1463 || selection.end.col >= TermWin.ncol) 1555 || selection.end.col >= TermWin.ncol)
1464 CLEAR_SELECTION (); 1556 CLEAR_SELECTION ();
1465 else 1557 else
1466 { 1558 {
1467 /* shift selection */ 1559 /* shift selection */
1468 selection.beg.col -= count; 1560 selection.beg.col -= count;
1469 selection.mark.col -= count; /* XXX: yes? */ 1561 selection.mark.col -= count; /* XXX: yes? */
1470 selection.end.col -= count; 1562 selection.end.col -= count;
1471 } 1563 }
1472 } 1564 }
1565
1473 break; 1566 break;
1474 } 1567 }
1475} 1568}
1476 1569
1477/* ------------------------------------------------------------------------- */ 1570/* ------------------------------------------------------------------------- */
… …
1482void 1575void
1483rxvt_term::scr_scroll_region (int top, int bot) 1576rxvt_term::scr_scroll_region (int top, int bot)
1484{ 1577{
1485 MAX_IT (top, 0); 1578 MAX_IT (top, 0);
1486 MIN_IT (bot, (int)TermWin.nrow - 1); 1579 MIN_IT (bot, (int)TermWin.nrow - 1);
1580
1487 if (top > bot) 1581 if (top > bot)
1488 return; 1582 return;
1583
1489 screen.tscroll = top; 1584 screen.tscroll = top;
1490 screen.bscroll = bot; 1585 screen.bscroll = bot;
1491 scr_gotorc (0, 0, 0); 1586 scr_gotorc (0, 0, 0);
1492} 1587}
1493 1588
… …
1499 */ 1594 */
1500void 1595void
1501rxvt_term::scr_cursor_visible (int mode) 1596rxvt_term::scr_cursor_visible (int mode)
1502{ 1597{
1503 want_refresh = 1; 1598 want_refresh = 1;
1599
1504 if (mode) 1600 if (mode)
1505 screen.flags |= Screen_VisibleCursor; 1601 screen.flags |= Screen_VisibleCursor;
1506 else 1602 else
1507 screen.flags &= ~Screen_VisibleCursor; 1603 screen.flags &= ~Screen_VisibleCursor;
1508} 1604}
… …
1517rxvt_term::scr_autowrap (int mode) 1613rxvt_term::scr_autowrap (int mode)
1518{ 1614{
1519 if (mode) 1615 if (mode)
1520 screen.flags |= Screen_Autowrap; 1616 screen.flags |= Screen_Autowrap;
1521 else 1617 else
1522 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1618 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1523} 1619}
1524 1620
1525/* ------------------------------------------------------------------------- */ 1621/* ------------------------------------------------------------------------- */
1526/* 1622/*
1527 * Set/unset margin origin mode 1623 * Set/unset margin origin mode
… …
1537{ 1633{
1538 if (mode) 1634 if (mode)
1539 screen.flags |= Screen_Relative; 1635 screen.flags |= Screen_Relative;
1540 else 1636 else
1541 screen.flags &= ~Screen_Relative; 1637 screen.flags &= ~Screen_Relative;
1638
1542 scr_gotorc (0, 0, 0); 1639 scr_gotorc (0, 0, 0);
1543} 1640}
1544 1641
1545/* ------------------------------------------------------------------------- */ 1642/* ------------------------------------------------------------------------- */
1546/* 1643/*
… …
1566 */ 1663 */
1567void 1664void
1568rxvt_term::scr_set_tab (int mode) 1665rxvt_term::scr_set_tab (int mode)
1569{ 1666{
1570 if (mode < 0) 1667 if (mode < 0)
1571 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1668 memset (tabs, 0, TermWin.ncol * sizeof (char));
1572 else if (screen.cur.col < TermWin.ncol) 1669 else if (screen.cur.col < TermWin.ncol)
1573 tabs[screen.cur.col] = (mode ? 1 : 0); 1670 tabs[screen.cur.col] = (mode ? 1 : 0);
1574} 1671}
1575 1672
1576/* ------------------------------------------------------------------------- */ 1673/* ------------------------------------------------------------------------- */
… …
1580 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1677 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1581 */ 1678 */
1582void 1679void
1583rxvt_term::scr_rvideo_mode (int mode) 1680rxvt_term::scr_rvideo_mode (int mode)
1584{ 1681{
1585 XGCValues gcvalue; 1682 XGCValues gcvalue;
1586 1683
1587 if (rvideo != mode) 1684 if (rvideo != mode)
1588 { 1685 {
1589 rvideo = mode; 1686 rvideo = mode;
1590 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1687 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1591#if defined(XPM_BACKGROUND) 1688#if XPM_BACKGROUND
1592 if (bgPixmap.pixmap == None) 1689 if (bgPixmap.pixmap == None)
1593#endif 1690#endif
1594#if defined(TRANSPARENT) 1691#if TRANSPARENT
1595 if (! (Options & Opt_transparent) || am_transparent == 0) 1692 if (! (options & Opt_transparent) || am_transparent == 0)
1596#endif 1693#endif
1597 XSetWindowBackground (display->display, TermWin.vt, 1694 XSetWindowBackground (display->display, TermWin.vt,
1598 PixColors[Color_bg]); 1695 pix_colors[Color_bg]);
1599 1696
1600 gcvalue.foreground = PixColors[Color_fg]; 1697 gcvalue.foreground = pix_colors[Color_fg];
1601 gcvalue.background = PixColors[Color_bg]; 1698 gcvalue.background = pix_colors[Color_bg];
1602 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1699 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1603 &gcvalue); 1700 &gcvalue);
1604 scr_clear (); 1701 scr_clear ();
1605 scr_touch (true); 1702 scr_touch (true);
1606 } 1703 }
… …
1654 * XTERM_SEQ: Invoke G2 character set: ESC N 1751 * XTERM_SEQ: Invoke G2 character set: ESC N
1655 * XTERM_SEQ: Invoke G3 character set: ESC O 1752 * XTERM_SEQ: Invoke G3 character set: ESC O
1656 */ 1753 */
1657void 1754void
1658rxvt_term::scr_charset_choose (int set) 1755rxvt_term::scr_charset_choose (int set)
1659 { 1756{
1660 screen.charset = set; 1757 screen.charset = set;
1661 set_font_style (); 1758 set_font_style ();
1662 } 1759}
1663 1760
1664/* ------------------------------------------------------------------------- */ 1761/* ------------------------------------------------------------------------- */
1665/* 1762/*
1666 * Set a font 1763 * Set a font
1667 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1764 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1670 * XTERM_SEQ: Set G3 character set: ESC + <C> 1767 * XTERM_SEQ: Set G3 character set: ESC + <C>
1671 * See set_font_style for possible values for <C> 1768 * See set_font_style for possible values for <C>
1672 */ 1769 */
1673void 1770void
1674rxvt_term::scr_charset_set (int set, unsigned int ch) 1771rxvt_term::scr_charset_set (int set, unsigned int ch)
1675 { 1772{
1676 charsets[set] = (unsigned char)ch; 1773 charsets[set] = (unsigned char)ch;
1677 set_font_style (); 1774 set_font_style ();
1678 } 1775}
1679 1776
1680 1777
1681/* ------------------------------------------------------------------------- * 1778/* ------------------------------------------------------------------------- *
1682 * MAJOR SCREEN MANIPULATION * 1779 * MAJOR SCREEN MANIPULATION *
1683 * ------------------------------------------------------------------------- */ 1780 * ------------------------------------------------------------------------- */
… …
1722 row_col_t rc[RC_COUNT]; 1819 row_col_t rc[RC_COUNT];
1723 1820
1724 if (drawn_text == NULL) /* sanity check */ 1821 if (drawn_text == NULL) /* sanity check */
1725 return; 1822 return;
1726 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
1727#ifdef DEBUG_STRICT 1832#ifdef DEBUG_STRICT
1728 x = max (x, (int)TermWin.int_bwidth); 1833 x = max (x, 0);
1729 x = min (x, (int)TermWin.width); 1834 x = min (x, (int)TermWin.width);
1730 y = max (y, (int)TermWin.int_bwidth); 1835 y = max (y, 0);
1731 y = min (y, (int)TermWin.height); 1836 y = min (y, (int)TermWin.height);
1732#endif 1837#endif
1733 1838
1734 /* round down */ 1839 /* round down */
1735 rc[PART_BEG].col = Pixel2Col (x); 1840 rc[PART_BEG].col = Pixel2Col (x);
… …
1743 { 1848 {
1744 MIN_IT (rc[i].col, TermWin.ncol - 1); 1849 MIN_IT (rc[i].col, TermWin.ncol - 1);
1745 MIN_IT (rc[i].row, TermWin.nrow - 1); 1850 MIN_IT (rc[i].row, TermWin.nrow - 1);
1746 } 1851 }
1747 1852
1748 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));
1749
1750 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++)
1751 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);
1752 (rc[PART_END].col - rc[PART_BEG].col + 1));
1753 1855
1754 if (refresh) 1856 if (refresh)
1755 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1857 scr_refresh (SLOW_REFRESH);
1756} 1858}
1757 1859
1758/* ------------------------------------------------------------------------- */ 1860/* ------------------------------------------------------------------------- */
1759/* 1861/*
1760 * Refresh the entire screen 1862 * Refresh the entire screen
… …
1772 */ 1874 */
1773int 1875int
1774rxvt_term::scr_move_to (int y, int len) 1876rxvt_term::scr_move_to (int y, int len)
1775{ 1877{
1776 long p = 0; 1878 long p = 0;
1777 uint16_t oldviewstart; 1879 unsigned int oldviewstart;
1778 1880
1779 oldviewstart = TermWin.view_start; 1881 oldviewstart = TermWin.view_start;
1882
1780 if (y < len) 1883 if (y < len)
1781 { 1884 {
1782 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1885 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1783 p -= (long) (TermWin.nrow - 1); 1886 p -= (long) (TermWin.nrow - 1);
1784 p = max (p, 0); 1887 p = max (p, 0);
1785 } 1888 }
1889
1786 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1890 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1787 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1788 1891
1789 return scr_changeview (oldviewstart); 1892 return scr_changeview (oldviewstart);
1790} 1893}
1791 1894
1792/* ------------------------------------------------------------------------- */ 1895/* ------------------------------------------------------------------------- */
… …
1795 * direction should be UP or DN 1898 * direction should be UP or DN
1796 */ 1899 */
1797int 1900int
1798rxvt_term::scr_page (enum page_dirn direction, int nlines) 1901rxvt_term::scr_page (enum page_dirn direction, int nlines)
1799{ 1902{
1800 int n; 1903 int n;
1801 uint16_t oldviewstart; 1904 unsigned int oldviewstart;
1802 1905
1803 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1804#ifdef DEBUG_STRICT 1906#ifdef DEBUG_STRICT
1805 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1907 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1806#endif 1908#endif
1807 oldviewstart = TermWin.view_start; 1909 oldviewstart = TermWin.view_start;
1808 if (direction == UP) 1910 if (direction == UP)
… …
1817 } 1919 }
1818 return scr_changeview (oldviewstart); 1920 return scr_changeview (oldviewstart);
1819} 1921}
1820 1922
1821int 1923int
1822rxvt_term::scr_changeview (uint16_t oldviewstart) 1924rxvt_term::scr_changeview (unsigned int oldviewstart)
1823{ 1925{
1824 if (TermWin.view_start != oldviewstart) 1926 if (TermWin.view_start != oldviewstart)
1825 { 1927 {
1826 want_refresh = 1; 1928 want_refresh = 1;
1827 num_scr -= (TermWin.view_start - oldviewstart); 1929 num_scr -= (TermWin.view_start - oldviewstart);
1828 } 1930 }
1931
1829 return (int) (TermWin.view_start - oldviewstart); 1932 return (int) (TermWin.view_start - oldviewstart);
1830} 1933}
1831 1934
1832/* ------------------------------------------------------------------------- */ 1935/* ------------------------------------------------------------------------- */
1833void 1936void
1834rxvt_term::scr_bell () 1937rxvt_term::scr_bell ()
1835{ 1938{
1836#ifndef NO_BELL 1939#ifndef NO_BELL
1837# ifndef NO_MAPALERT 1940# ifndef NO_MAPALERT
1838# ifdef MAPALERT_OPTION 1941# ifdef MAPALERT_OPTION
1839 if (Options & Opt_mapAlert) 1942 if (options & Opt_mapAlert)
1840# endif 1943# endif
1841 XMapWindow (display->display, TermWin.parent[0]); 1944 XMapWindow (display->display, TermWin.parent[0]);
1842# endif 1945# endif
1843 if (Options & Opt_visualBell) 1946 if (options & Opt_visualBell)
1844 { 1947 {
1845 scr_rvideo_mode (!rvideo); /* refresh also done */ 1948 scr_rvideo_mode (!rvideo); /* refresh also done */
1846 scr_rvideo_mode (!rvideo); /* refresh also done */ 1949 scr_rvideo_mode (!rvideo); /* refresh also done */
1847 } 1950 }
1848 else 1951 else
… …
1854/* ARGSUSED */ 1957/* ARGSUSED */
1855void 1958void
1856rxvt_term::scr_printscreen (int fullhist) 1959rxvt_term::scr_printscreen (int fullhist)
1857{ 1960{
1858#ifdef PRINTPIPE 1961#ifdef PRINTPIPE
1859 int i, r1, nrows, row_offset; 1962 int i, r1, nrows, row_offset;
1860 text_t *t; 1963 FILE *fd;
1861 FILE *fd;
1862 1964
1863 if ((fd = popen_printer ()) == NULL) 1965 if ((fd = popen_printer ()) == NULL)
1864 return; 1966 return;
1967
1865 nrows = TermWin.nrow; 1968 nrows = TermWin.nrow;
1866 row_offset = TermWin.saveLines; 1969 row_offset = TermWin.saveLines;
1970
1867 if (!fullhist) 1971 if (!fullhist)
1868 row_offset -= TermWin.view_start; 1972 row_offset -= TermWin.view_start;
1869 else 1973 else
1870 { 1974 {
1871 nrows += TermWin.nscrolled; 1975 nrows += TermWin.nscrolled;
1872 row_offset -= TermWin.nscrolled; 1976 row_offset -= TermWin.nscrolled;
1873 } 1977 }
1874 1978
1979 wctomb (0, 0);
1980
1875 for (r1 = 0; r1 < nrows; r1++) 1981 for (r1 = 0; r1 < nrows; r1++)
1876 { 1982 {
1877 t = screen.text[r1 + row_offset]; 1983 text_t *tp = screen.text[r1 + row_offset];
1878 for (i = TermWin.ncol - 1; i >= 0; i--) 1984 int len = screen.tlen[r1 + row_offset];
1879 if (!isspace (t[i])) 1985
1880 break; 1986 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1881 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);
1882 } 2005 }
2006
1883 pclose_printer (fd); 2007 pclose_printer (fd);
1884#endif 2008#endif
1885} 2009}
1886 2010
1887/* ------------------------------------------------------------------------- */ 2011/* ------------------------------------------------------------------------- */
… …
1901 ((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)
1902 2026
1903void 2027void
1904rxvt_term::scr_refresh (unsigned char refresh_type) 2028rxvt_term::scr_refresh (unsigned char refresh_type)
1905{ 2029{
1906 unsigned char clearfirst, /* first character writes before cell */
1907 clearlast, /* last character writes beyond cell */
1908 must_clear, /* use draw_string not draw_image_string */ 2030 unsigned char must_clear, /* use draw_string not draw_image_string */
1909 rvid, /* reverse video this position */
1910 showcursor; /* show the cursor */ 2031 showcursor; /* show the cursor */
1911 int16_t col, row, /* column/row we're processing */ 2032 int16_t col, row, /* column/row we're processing */
1912 ocrow; /* old cursor row */ 2033 ocrow; /* old cursor row */
1913 int i, /* tmp */ 2034 int i, /* tmp */
1914 row_offset; /* basic offset in screen structure */ 2035 row_offset; /* basic offset in screen structure */
1915#ifndef NO_CURSORCOLOR 2036#ifndef NO_CURSORCOLOR
1916 rend_t cc1; /* store colours at cursor position (s) */ 2037 rend_t cc1; /* store colours at cursor position (s) */
1917#endif 2038#endif
1918 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2039 rend_t *crp; // cursor rendition pointer
1919 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2040
2041 want_refresh = 0; /* screen is current */
1920 2042
1921 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2043 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1922 return; 2044 return;
1923 2045
1924 /* 2046 /*
1925 * A: set up vars 2047 * A: set up vars
1926 */ 2048 */
1927 clearfirst = clearlast = must_clear = 0; 2049 must_clear = 0;
1928
1929 refresh_count = 0; 2050 refresh_count = 0;
1930 2051
1931 row_offset = TermWin.saveLines - TermWin.view_start; 2052 row_offset = TermWin.saveLines - TermWin.view_start;
1932 2053
1933 if ((refresh_type & REFRESH_BOUNDS))
1934 {
1935 clearfirst = clearlast = 1;
1936 refresh_type &= ~REFRESH_BOUNDS;
1937 }
1938
1939#ifdef XPM_BACKGROUND 2054#if XPM_BACKGROUND
1940 must_clear |= (bgPixmap.pixmap != None); 2055 must_clear |= (bgPixmap.pixmap != None);
1941#endif 2056#endif
1942#ifdef TRANSPARENT 2057#if TRANSPARENT
1943 must_clear |= ((Options & Opt_transparent) && am_transparent); 2058 must_clear |= ((options & Opt_transparent) && am_transparent);
1944#endif 2059#endif
1945 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1946 2061
1947 /* 2062 /*
1948 * B: reverse any characters which are selected 2063 * B: reverse any characters which are selected
… …
1951 2066
1952 /* 2067 /*
1953 * C: set the cursor character (s) 2068 * C: set the cursor character (s)
1954 */ 2069 */
1955 { 2070 {
1956 unsigned char setoldcursor; 2071 unsigned char setoldcursor;
1957 rend_t ccol1, /* Cursor colour */ 2072 rend_t ccol1, /* Cursor colour */
1958 ccol2; /* Cursor colour2 */ 2073 ccol2; /* Cursor colour2 */
1959 2074
1960 showcursor = (screen.flags & Screen_VisibleCursor); 2075 showcursor = (screen.flags & Screen_VisibleCursor);
1961#ifdef CURSOR_BLINK 2076#ifdef CURSOR_BLINK
1962 if (hidden_cursor) 2077 if (hidden_cursor)
1963 showcursor = 0; 2078 showcursor = 0;
1964#endif 2079#endif
1965 2080
1966 if (showcursor) 2081 if (showcursor)
1967 { 2082 {
2083 int col = screen.cur.col;
2084
2085 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2086 col--;
2087
1968 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 2088 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1969 [screen.cur.col]);
1970 2089
1971 if (showcursor && TermWin.focus) 2090 if (showcursor && TermWin.focus)
1972 { 2091 {
1973 *srp ^= RS_RVid; 2092 *crp ^= RS_RVid;
1974#ifndef NO_CURSORCOLOR 2093#ifndef NO_CURSORCOLOR
1975 cc1 = *srp & (RS_fgMask | RS_bgMask); 2094 cc1 = *crp & (RS_fgMask | RS_bgMask);
1976 if (ISSET_PIXCOLOR (Color_cursor)) 2095 if (ISSET_PIXCOLOR (Color_cursor))
1977 ccol1 = Color_cursor; 2096 ccol1 = Color_cursor;
1978 else 2097 else
1979#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2098#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1980 ccol1 = GET_FGCOLOR (rstyle); 2099 ccol1 = GET_FGCOLOR (rstyle);
… …
1987#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2106#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1988 ccol2 = GET_BGCOLOR (rstyle); 2107 ccol2 = GET_BGCOLOR (rstyle);
1989#else 2108#else
1990 ccol2 = Color_bg; 2109 ccol2 = Color_bg;
1991#endif 2110#endif
1992 *srp = SET_FGCOLOR (*srp, ccol1); 2111 *crp = SET_FGCOLOR (*crp, ccol1);
1993 *srp = SET_BGCOLOR (*srp, ccol2); 2112 *crp = SET_BGCOLOR (*crp, ccol2);
1994#endif 2113#endif
1995 } 2114 }
1996 } 2115 }
1997 2116
1998 /* make sure no outline cursor is left around */ 2117 /* make sure no outline cursor is left around */
… …
2002 if (screen.cur.row + TermWin.view_start != ocrow 2121 if (screen.cur.row + TermWin.view_start != ocrow
2003 || screen.cur.col != oldcursor.col) 2122 || screen.cur.col != oldcursor.col)
2004 { 2123 {
2005 if (ocrow < TermWin.nrow 2124 if (ocrow < TermWin.nrow
2006 && oldcursor.col < TermWin.ncol) 2125 && oldcursor.col < TermWin.ncol)
2007 {
2008 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2126 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
2009 } 2127
2010 if (TermWin.focus || !showcursor) 2128 if (TermWin.focus || !showcursor)
2011 oldcursor.row = -1; 2129 oldcursor.row = -1;
2012 else 2130 else
2013 setoldcursor = 1; 2131 setoldcursor = 1;
2014 } 2132 }
2015 } 2133 }
2016 else if (!TermWin.focus) 2134 else if (!TermWin.focus)
2017 setoldcursor = 1; 2135 setoldcursor = 1;
2136
2018 if (setoldcursor) 2137 if (setoldcursor)
2019 { 2138 {
2020 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2139 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
2021 oldcursor.row = -1; 2140 oldcursor.row = -1;
2022 else 2141 else
… …
2025 oldcursor.col = screen.cur.col; 2144 oldcursor.col = screen.cur.col;
2026 } 2145 }
2027 } 2146 }
2028 } 2147 }
2029 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
2030#ifndef NO_SLOW_LINK_SUPPORT 2156#ifndef NO_SLOW_LINK_SUPPORT
2031 /* 2157 /*
2032 * D: CopyArea pass - very useful for slower links 2158 * D: CopyArea pass - very useful for slower links
2033 * This has been deliberately kept simple. 2159 * This has been deliberately kept simple.
2034 */ 2160 */
2035 i = num_scr; 2161 i = num_scr;
2162 if (!display->is_local
2036 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2163 && refresh_type == FAST_REFRESH && num_scr_allow && i
2037 && abs (i) < TermWin.nrow && !must_clear) 2164 && abs (i) < TermWin.nrow && !must_clear)
2038 { 2165 {
2039 int16_t nits; 2166 int16_t nits;
2040 int j; 2167 int j;
2041 rend_t *drp2;
2042 text_t *dtp2;
2043 int len, wlen; 2168 int len, wlen;
2044 2169
2045 j = TermWin.nrow; 2170 j = TermWin.nrow;
2046 wlen = len = -1; 2171 wlen = len = -1;
2047 row = i > 0 ? 0 : j - 1; 2172 row = i > 0 ? 0 : j - 1;
2048 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2173 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2049 { 2174 {
2050 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2175 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2051 { 2176 {
2052 stp = screen.text[row + row_offset]; 2177 text_t *stp = screen.text[row + row_offset];
2053 srp = screen.rend[row + row_offset]; 2178 rend_t *srp = screen.rend[row + row_offset];
2054 dtp = drawn_text[row]; 2179 text_t *dtp = drawn_text[row];
2055 dtp2 = drawn_text[row + i]; 2180 text_t *dtp2 = drawn_text[row + i];
2056 drp = drawn_rend[row]; 2181 rend_t *drp = drawn_rend[row];
2057 drp2 = drawn_rend[row + i]; 2182 rend_t *drp2 = drawn_rend[row + i];
2058 2183
2059 for (nits = 0, col = TermWin.ncol; col--; ) 2184 for (nits = 0, col = TermWin.ncol; col--; )
2060 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2185 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2061 nits--; 2186 nits--;
2062 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2187 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2082 { 2207 {
2083 /* also comes here at end if needed because of >= above */ 2208 /* also comes here at end if needed because of >= above */
2084 if (wlen < len) 2209 if (wlen < len)
2085 SWAP_IT (wlen, len, int); 2210 SWAP_IT (wlen, len, int);
2086 2211
2087 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2088 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2212 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2089 TermWin.gc, 0, Row2Pixel (len + i), 2213 TermWin.gc, 0, Row2Pixel (len + i),
2090 (unsigned int)TermWin_TotalWidth (), 2214 (unsigned int)TermWin_TotalWidth (),
2091 (unsigned int)Height2Pixel (wlen - len + 1), 2215 (unsigned int)Height2Pixel (wlen - len + 1),
2092 0, Row2Pixel (len)); 2216 0, Row2Pixel (len));
… …
2099 /* 2223 /*
2100 * E: main pass across every character 2224 * E: main pass across every character
2101 */ 2225 */
2102 for (row = 0; row < TermWin.nrow; row++) 2226 for (row = 0; row < TermWin.nrow; row++)
2103 { 2227 {
2104 stp = screen.text[row + row_offset]; 2228 text_t *stp = screen.text[row + row_offset];
2105 srp = screen.rend[row + row_offset]; 2229 rend_t *srp = screen.rend[row + row_offset];
2106 dtp = drawn_text[row]; 2230 text_t *dtp = drawn_text[row];
2107 drp = drawn_rend[row]; 2231 rend_t *drp = drawn_rend[row];
2108 2232
2109 /* 2233 /*
2110 * E2: OK, now the real pass 2234 * E2: OK, now the real pass
2111 */ 2235 */
2112 int ypixel = (int)Row2Pixel (row); 2236 int ypixel = (int)Row2Pixel (row);
2113 2237
2114 for (col = 0; col < TermWin.ncol; col++) 2238 for (col = 0; col < TermWin.ncol; col++)
2115 { 2239 {
2116 /* compare new text with old - if exactly the same then continue */ 2240 /* compare new text with old - if exactly the same then continue */
2117 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2241 if (stp[col] == dtp[col] /* Must match characters to skip. */
2118 && (srp[col] == drp[col] /* Either rendition the same or */ 2242 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2119 || (stp[col] == ' ' /* space w/ no background change */ 2243 || (stp[col] == ' ' /* space w/ no background change */
2120 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2244 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2121 continue; 2245 continue;
2122 2246
2123 // redraw one or more characters 2247 // redraw one or more characters
… …
2133 dtp[col] = stp[col]; 2257 dtp[col] = stp[col];
2134 drp[col] = rend; 2258 drp[col] = rend;
2135 2259
2136 int xpixel = Col2Pixel (col); 2260 int xpixel = Col2Pixel (col);
2137 2261
2138 // this loop looks very messy, it can probably be optimized
2139 // and cleaned a bit by you?
2140 for (i = 0; ++col < TermWin.ncol; ) 2262 for (i = 0; ++col < TermWin.ncol; )
2141 { 2263 {
2142 if (stp[col] == NOCHAR) 2264 if (stp[col] == NOCHAR)
2143 { 2265 {
2144 dtp[col] = stp[col]; 2266 dtp[col] = stp[col];
2145 drp[col] = rend; 2267 drp[col] = rend;
2146 count++; 2268 count++;
2147
2148 if (i) // only possible skip if char unchanged
2149 i++; 2269 i++;
2150 2270
2151 continue; 2271 continue;
2152 } 2272 }
2153 2273
2154 if (rend != srp[col]) 2274 if (!RS_SAME (rend, srp[col]))
2155 break; 2275 break;
2156 2276
2157 count++; 2277 count++;
2158 2278
2159 if (stp[col] != dtp[col] 2279 if (stp[col] != dtp[col]
2160 || srp[col] != drp[col]) 2280 || !RS_SAME (srp[col], drp[col]))
2161 { 2281 {
2162 if (must_clear && (i++ > (count / 2))) 2282 if (must_clear && (i++ > count / 2))
2163 break; 2283 break;
2164 2284
2165 dtp[col] = stp[col]; 2285 dtp[col] = stp[col];
2166 drp[col] = rend; 2286 drp[col] = rend;
2167 i = 0; 2287 i = 0;
2168 } 2288 }
2169 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2289 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2170 break; 2290 break;
2171 } 2291 }
2172 2292
2173 col--; /* went one too far. move back */ 2293 col--; /* went one too far. move back */
2174 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
2175 2311
2176 /* 2312 /*
2177 * Determine the attributes for the string 2313 * Determine the attributes for the string
2178 */ 2314 */
2179 int fid = GET_FONT (rend);
2180 int fore = GET_FGCOLOR (rend); // desired foreground 2315 int fore = GET_FGCOLOR (rend); // desired foreground
2181 int back = GET_BGCOLOR (rend); // desired background 2316 int back = GET_BGCOLOR (rend); // desired background
2182 2317
2183 rend = GET_ATTR (rend); 2318 // only do special processing if ana attributes are set, which is rare
2184 2319 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2185 rvid = !!(rend & RS_RVid); 2320 {
2321 bool invert = rend & RS_RVid;
2186 2322
2187#ifndef NO_BOLD_UNDERLINE_REVERSE 2323#ifndef NO_BOLD_UNDERLINE_REVERSE
2188 if (rend & RS_Bold && fore == Color_fg) 2324 if (rend & RS_Bold
2325 && fore == Color_fg)
2189 { 2326 {
2190 if (ISSET_PIXCOLOR (Color_BD)) 2327 if (ISSET_PIXCOLOR (Color_BD))
2191 fore = Color_BD; 2328 fore = Color_BD;
2329# if !ENABLE_STYLES
2192 else 2330 else
2193 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
2194 } 2372 }
2195
2196 if (rend & RS_Uline)
2197 {
2198 if (ISSET_PIXCOLOR (Color_UL))
2199 fore = Color_UL;
2200 }
2201#endif
2202
2203 if (rvid)
2204 {
2205 SWAP_IT (fore, back, int);
2206
2207#ifndef NO_BOLD_UNDERLINE_REVERSE
2208 if (ISSET_PIXCOLOR (Color_RV)
2209# ifndef NO_CURSORCOLOR
2210 && !ISSET_PIXCOLOR (Color_cursor)
2211# endif
2212 )
2213 back = Color_RV;
2214#endif
2215 }
2216
2217#ifdef TEXT_BLINK
2218 if (rend & RS_Blink && back == Color_bg)
2219 {
2220 if (!text_blink_ev.active)
2221 {
2222 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2223 hidden_text = 0;
2224 }
2225 else if (hidden_text)
2226 fore = back;
2227 }
2228#endif
2229 2373
2230 /* 2374 /*
2231 * Actually do the drawing of the string here 2375 * Actually do the drawing of the string here
2232 */ 2376 */
2233 rxvt_font *font = (*TermWin.fontset)[fid]; 2377 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2234 2378
2235 if (back == fore) 2379 if (back == fore)
2236 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2380 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2237 TermWin.fwidth * count, TermWin.fheight, 2381 TermWin.fwidth * count, TermWin.fheight,
2238 back); 2382 back);
… …
2253 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2397 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2254 } 2398 }
2255 else 2399 else
2256 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2400 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2257 2401
2258 if ((rend & RS_Uline) && (font->descent > 1)) 2402 if (rend & RS_Uline && font->descent > 1 && fore != back)
2259 XDrawLine (display->display, drawBuffer, TermWin.gc, 2403 XDrawLine (display->display, drawBuffer, TermWin.gc,
2260 xpixel, ypixel + font->ascent + 1, 2404 xpixel, ypixel + font->ascent + 1,
2261 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2262 } /* for (col....) */ 2406 } /* for (col....) */
2263 } /* for (row....) */ 2407 } /* for (row....) */
2264 2408
2409#if ENABLE_OVERLAY
2410 scr_swap_overlay ();
2411#endif
2412
2265 /* 2413 /*
2266 * G: cleanup cursor and display outline cursor if necessary 2414 * G: cleanup cursor and display outline cursor if necessary
2267 */ 2415 */
2268 if (showcursor) 2416 if (showcursor)
2269 { 2417 {
2270 if (TermWin.focus) 2418 if (TermWin.focus)
2271 { 2419 {
2272 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2273 [screen.cur.col]);
2274 *srp ^= RS_RVid; 2420 *crp ^= RS_RVid;
2275#ifndef NO_CURSORCOLOR 2421#ifndef NO_CURSORCOLOR
2276 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2422 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2277#endif 2423#endif
2278 } 2424 }
2279 else if (oldcursor.row >= 0) 2425 else if (oldcursor.row >= 0)
2280 { 2426 {
2281#ifndef NO_CURSORCOLOR 2427#ifndef NO_CURSORCOLOR
2282 if (ISSET_PIXCOLOR (Color_cursor)) 2428 if (ISSET_PIXCOLOR (Color_cursor))
2283 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2429 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2284#endif 2430#endif
2285 int cursorwidth = 1; 2431 int cursorwidth = 1;
2286 while (oldcursor.col + cursorwidth < TermWin.ncol 2432 while (oldcursor.col + cursorwidth < TermWin.ncol
2287 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2433 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2288 cursorwidth++; 2434 cursorwidth++;
… …
2298 /* 2444 /*
2299 * H: cleanup selection 2445 * H: cleanup selection
2300 */ 2446 */
2301 scr_reverse_selection (); 2447 scr_reverse_selection ();
2302 2448
2303 /*
2304 * I: other general cleanup
2305 */
2306 if (clearfirst && TermWin.int_bwidth)
2307 /*
2308 * clear the whole screen height, note that width == 0 is treated
2309 * specially by XClearArea
2310 */
2311 XClearArea (display->display, TermWin.vt, 0, 0,
2312 (unsigned int)TermWin.int_bwidth,
2313 (unsigned int)TermWin_TotalHeight (), False);
2314
2315 if (clearlast && TermWin.int_bwidth)
2316 /*
2317 * clear the whole screen height, note that width == 0 is treated
2318 * specially by XClearArea
2319 */
2320 XClearArea (display->display, TermWin.vt,
2321 TermWin.width + TermWin.int_bwidth, 0,
2322 (unsigned int)TermWin.int_bwidth,
2323 (unsigned int)TermWin_TotalHeight (), False);
2324
2325 if (refresh_type & SMOOTH_REFRESH) 2449 if (refresh_type & SMOOTH_REFRESH)
2326 XSync (display->display, False); 2450 XFlush (display->display);
2327 2451
2328 num_scr = 0; 2452 num_scr = 0;
2329 num_scr_allow = 1; 2453 num_scr_allow = 1;
2330 want_refresh = 0; /* screen is current */
2331} 2454}
2332 2455
2333void 2456void
2334rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2457rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2335{ 2458{
2336 if (!rp || !tp) 2459 if (!rp || !tp)
2337 return; 2460 return;
2338 2461
2339 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2462 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2340 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2463 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2341} 2464}
2342 2465
2343void 2466void
2344rxvt_term::scr_remap_chars () 2467rxvt_term::scr_remap_chars ()
2345{ 2468{
… …
2351 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2474 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2352 scr_remap_chars (swap.text[i], swap.rend[i]); 2475 scr_remap_chars (swap.text[i], swap.rend[i]);
2353 } 2476 }
2354} 2477}
2355 2478
2479void
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
2356/* ------------------------------------------------------------------------- */ 2509/* ------------------------------------------------------------------------- */
2357void 2510void
2358rxvt_term::scr_clear (bool really) 2511rxvt_term::scr_clear (bool really)
2359{ 2512{
2360 if (!TermWin.mapped) 2513 if (!TermWin.mapped)
2361 return; 2514 return;
2362 2515
2363 num_scr_allow = 0; 2516 num_scr_allow = 0;
2364 want_refresh = 1; 2517 want_refresh = 1;
2365 2518
2366#ifdef TRANSPARENT 2519#if TRANSPARENT
2367 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2520 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2368 { 2521 {
2369 int i; 2522 int i;
2370 2523
2371 if (! (Options & Opt_transparent_all)) 2524 if (!(options & Opt_transparent_all))
2372 i = 0; 2525 i = 0;
2373 else 2526 else
2374 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2527 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2375 2528
2376 while (i--) 2529 while (i--)
… …
2392 int end_row = TermWin.saveLines - TermWin.view_start; 2545 int end_row = TermWin.saveLines - TermWin.view_start;
2393 int i = selection.beg.row + TermWin.saveLines; 2546 int i = selection.beg.row + TermWin.saveLines;
2394 int col, row = selection.end.row + TermWin.saveLines; 2547 int col, row = selection.end.row + TermWin.saveLines;
2395 rend_t *srp; 2548 rend_t *srp;
2396 2549
2397 if (i >= end_row) 2550#if ENABLE_FRILLS
2398 col = selection.beg.col; 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 }
2399 else 2559 else
2560#endif
2561 {
2562 if (i >= end_row)
2563 col = selection.beg.col;
2564 else
2400 { 2565 {
2401 col = 0; 2566 col = 0;
2402 i = end_row; 2567 i = end_row;
2403 } 2568 }
2404 2569
2405 end_row += TermWin.nrow; 2570 end_row += TermWin.nrow;
2571
2406 for (; i < row && i < end_row; i++, col = 0) 2572 for (; i < row && i < end_row; i++, col = 0)
2407 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2573 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2408 srp[col] ^= RS_RVid; 2574 srp[col] ^= RS_RVid;
2409 2575
2410 if (i == row && i < end_row) 2576 if (i == row && i < end_row)
2411 for (srp = screen.rend[i]; col < selection.end.col; col++) 2577 for (srp = screen.rend[i]; col < selection.end.col; col++)
2412 srp[col] ^= RS_RVid; 2578 srp[col] ^= RS_RVid;
2579 }
2413 } 2580 }
2414} 2581}
2415 2582
2416/* ------------------------------------------------------------------------- */ 2583/* ------------------------------------------------------------------------- */
2417/* 2584/*
… …
2453 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2620 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2454 */ 2621 */
2455void 2622void
2456rxvt_term::selection_check (int check_more) 2623rxvt_term::selection_check (int check_more)
2457{ 2624{
2458 row_col_t pos; 2625 row_col_t pos;
2459 2626
2460 if (!selection.op) 2627 if (!selection.op)
2461 return; 2628 return;
2462 2629
2463 pos.row = pos.col = 0; 2630 pos.row = pos.col = 0;
… …
2490rxvt_term::paste (const unsigned char *data, unsigned int len) 2657rxvt_term::paste (const unsigned char *data, unsigned int len)
2491{ 2658{
2492 unsigned int i, j, n; 2659 unsigned int i, j, n;
2493 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); 2660 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2494 2661
2495#if 0
2496 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2497 ZERO_SCROLLBACK (r);
2498#endif
2499
2500 /* convert normal newline chars into common keyboard Return key sequence */ 2662 /* convert normal newline chars into common keyboard Return key sequence */
2501 for (i = 0; i < len; i += PROP_SIZE) 2663 for (i = 0; i < len; i += PROP_SIZE)
2502 { 2664 {
2503 n = min (len - i, PROP_SIZE); 2665 n = min (len - i, PROP_SIZE);
2504 MEMCPY (ds, data + i, n); 2666 memcpy (ds, data + i, n);
2505 2667
2506 for (j = 0; j < n; j++) 2668 for (j = 0; j < n; j++)
2507 if (ds[j] == '\n') 2669 if (ds[j] == C0_LF)
2508 ds[j] = '\r'; 2670 ds[j] = C0_CR;
2509 2671
2510 tt_write (ds, (int)n); 2672 tt_write (ds, (int)n);
2511 } 2673 }
2512 2674
2513 free (ds); 2675 free (ds);
… …
2522rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2684rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2523{ 2685{
2524 long nread = 0; 2686 long nread = 0;
2525 unsigned long bytes_after; 2687 unsigned long bytes_after;
2526 XTextProperty ct; 2688 XTextProperty ct;
2527
2528 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2529 2689
2530 if (prop == None) /* check for failed XConvertSelection */ 2690 if (prop == None) /* check for failed XConvertSelection */
2531 { 2691 {
2532 if ((selection_type & Sel_CompoundText)) 2692 if ((selection_type & Sel_CompoundText))
2533 { 2693 {
… …
2560 &ct.nitems, &bytes_after, 2720 &ct.nitems, &bytes_after,
2561 &ct.value) != Success) 2721 &ct.value) != Success)
2562 break; 2722 break;
2563 2723
2564 if (ct.encoding == 0) 2724 if (ct.encoding == 0)
2725 break;
2726
2727 if (ct.encoding == xa[XA_INCR])
2565 { 2728 {
2566 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);
2567 break; 2733 break;
2568 } 2734 }
2569 2735
2570 if (ct.value == NULL) 2736 if (ct.value == NULL)
2571 {
2572 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2573 continue; 2737 continue;
2574 }
2575 2738
2576 if (ct.nitems == 0) 2739 if (ct.nitems == 0)
2577 { 2740 {
2578 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2579
2580 if (selection_wait == Sel_normal && nread == 0 2741 if (selection_wait == Sel_normal && nread == 0
2581 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2742 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2582 { 2743 {
2583 /* 2744 /*
2584 * pass through again trying CUT_BUFFER0 if we've come from 2745 * pass through again trying CUT_BUFFER0 if we've come from
2585 * XConvertSelection () but nothing was presented 2746 * XConvertSelection () but nothing was presented
2586 */ 2747 */
2587 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2588 selection_paste (display->root, XA_CUT_BUFFER0, False); 2748 selection_paste (display->root, XA_CUT_BUFFER0, False);
2589 } 2749 }
2590 2750
2591 nread = -1; /* discount any previous stuff */ 2751 nread = -1; /* discount any previous stuff */
2592 break; 2752 break;
… …
2594 2754
2595 nread += ct.nitems; 2755 nread += ct.nitems;
2596 2756
2597 char **cl; 2757 char **cl;
2598 int cr; 2758 int cr;
2599 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2759 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2600 &cr) >= 0 && cl)
2601 { 2760 {
2602 for (int i = 0; i < cr; i++) 2761 for (int i = 0; i < cr; i++)
2603 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2762 paste ((unsigned char *)cl[i], strlen (cl[i]));
2604 2763
2605 XFreeStringList (cl); 2764 XFreeStringList (cl);
2606 } 2765 }
2607 else 2766 else
2608 paste (ct.value, ct.nitems); 2767 paste (ct.value, ct.nitems);
… …
2617 XFree (ct.value); 2776 XFree (ct.value);
2618 2777
2619 if (selection_wait == Sel_normal) 2778 if (selection_wait == Sel_normal)
2620 selection_wait = Sel_none; 2779 selection_wait = Sel_none;
2621 2780
2622 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2623 return (int)nread; 2781 return (int)nread;
2624} 2782}
2625 2783
2626void 2784void
2627rxvt_term::incr_cb (time_watcher &w) 2785rxvt_term::incr_cb (time_watcher &w)
2628{ 2786{
2629 selection_wait = Sel_none; 2787 selection_wait = Sel_none;
2630 2788
2631 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2789 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2632} 2790}
2633 2791
2634/* 2792/*
2635 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2793 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2636 */ 2794 */
2637void 2795void
2638rxvt_term::selection_property (Window win, Atom prop) 2796rxvt_term::selection_property (Window win, Atom prop)
2639{ 2797{
2640 int reget_time = 0; 2798 if (prop == None || selection_wait != Sel_incr)
2641
2642 if (prop == None)
2643 return; 2799 return;
2644 2800
2645 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2646 if (selection_wait == Sel_normal)
2647 {
2648 int a, afmt;
2649 Atom atype;
2650 unsigned long bytes_after, nitems;
2651 unsigned char *s = NULL;
2652
2653 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2654 xa[XA_INCR], &atype, &afmt, &nitems,
2655 &bytes_after, &s);
2656 if (s)
2657 XFree (s);
2658 if (a != Success)
2659 return;
2660
2661#ifndef __CYGWIN32__
2662 if (atype == xa[XA_INCR])
2663 { /* start an INCR transfer */
2664 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2665 XDeleteProperty (display->display, win, prop);
2666 XFlush (display->display);
2667 reget_time = 1;
2668 selection_wait = Sel_incr;
2669 }
2670#endif
2671
2672 }
2673 else if (selection_wait == Sel_incr)
2674 {
2675 reget_time = 1;
2676
2677 if (selection_paste (win, prop, True) == -1) 2801 if (selection_paste (win, prop, 1) > 0)
2678 {
2679 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2680 selection_wait = Sel_none;
2681 incr_ev.stop ();
2682 }
2683 }
2684 if (reget_time) /* received more data so reget time */
2685 incr_ev.start (NOW + 10); 2802 incr_ev.start (NOW + 10);
2803 else
2804 {
2805 selection_wait = Sel_none;
2806 incr_ev.stop ();
2807 }
2686} 2808}
2687 2809
2688/* ------------------------------------------------------------------------- */ 2810/* ------------------------------------------------------------------------- */
2689/* 2811/*
2690 * Request the current selection: 2812 * Request the current selection:
… …
2696 * EXT: button 2 release 2818 * EXT: button 2 release
2697 */ 2819 */
2698void 2820void
2699rxvt_term::selection_request (Time tm, int x, int y) 2821rxvt_term::selection_request (Time tm, int x, int y)
2700{ 2822{
2701 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2702
2703 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2823 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2704 return; /* outside window */ 2824 return; /* outside window */
2705 2825
2706 if (selection.text) 2826 if (selection.text)
2707 { /* internal selection */ 2827 { /* internal selection */
2708 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2709 char *str = rxvt_wcstombs (selection.text, selection.len); 2828 char *str = rxvt_wcstombs (selection.text, selection.len);
2710 paste ((unsigned char *)str, strlen (str)); 2829 paste ((unsigned char *)str, strlen (str));
2711 free (str); 2830 free (str);
2712 return; 2831 return;
2713 } 2832 }
… …
2715 { 2834 {
2716 int i; 2835 int i;
2717 2836
2718 selection_request_time = tm; 2837 selection_request_time = tm;
2719 selection_wait = Sel_normal; 2838 selection_wait = Sel_normal;
2839
2720 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2840 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2721 { 2841 {
2722#if X_HAVE_UTF8_STRING 2842#if X_HAVE_UTF8_STRING
2723 selection_type = Sel_UTF8String; 2843 selection_type = Sel_UTF8String;
2724 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2844 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2731 2851
2732 } 2852 }
2733 } 2853 }
2734 2854
2735 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2855 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2736 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2737 selection_paste (display->root, XA_CUT_BUFFER0, False); 2856 selection_paste (display->root, XA_CUT_BUFFER0, False);
2738} 2857}
2739 2858
2740int 2859int
2741rxvt_term::selection_request_other (Atom target, int selnum) 2860rxvt_term::selection_request_other (Atom target, int selnum)
… …
2754 else 2873 else
2755 sel = xa[XA_CLIPBOARD]; 2874 sel = xa[XA_CLIPBOARD];
2756 2875
2757 if (XGetSelectionOwner (display->display, sel) != None) 2876 if (XGetSelectionOwner (display->display, sel) != None)
2758 { 2877 {
2759 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2760 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2878 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2761 TermWin.vt, selection_request_time); 2879 TermWin.vt, selection_request_time);
2762 return 1; 2880 return 1;
2763 } 2881 }
2764 2882
… …
2771 * EXT: SelectionClear 2889 * EXT: SelectionClear
2772 */ 2890 */
2773void 2891void
2774rxvt_term::selection_clear () 2892rxvt_term::selection_clear ()
2775{ 2893{
2776 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2777
2778 want_refresh = 1; 2894 want_refresh = 1;
2779 free (selection.text); 2895 free (selection.text);
2780 selection.text = NULL; 2896 selection.text = NULL;
2781 selection.len = 0; 2897 selection.len = 0;
2782 CLEAR_SELECTION (); 2898 CLEAR_SELECTION ();
2899
2900 if (display->selection_owner == this)
2901 display->selection_owner = 0;
2783} 2902}
2784 2903
2785/* ------------------------------------------------------------------------- */ 2904/* ------------------------------------------------------------------------- */
2786/* 2905/*
2787 * Copy a selection into the cut buffer 2906 * Copy a selection into the cut buffer
… …
2792{ 2911{
2793 int i, col, end_col, row, end_row; 2912 int i, col, end_col, row, end_row;
2794 wchar_t *new_selection_text; 2913 wchar_t *new_selection_text;
2795 text_t *t; 2914 text_t *t;
2796 2915
2797 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2798 switch (selection.op) 2916 switch (selection.op)
2799 { 2917 {
2800 case SELECTION_CONT: 2918 case SELECTION_CONT:
2801 break; 2919 break;
2802 case SELECTION_INIT: 2920 case SELECTION_INIT:
… …
2816 2934
2817 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2935 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2818 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2936 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2819 2937
2820 col = selection.beg.col; 2938 col = selection.beg.col;
2821 MAX_IT (col, 0);
2822 row = selection.beg.row + TermWin.saveLines; 2939 row = selection.beg.row + TermWin.saveLines;
2823 end_row = selection.end.row + TermWin.saveLines; 2940 end_row = selection.end.row + TermWin.saveLines;
2824 int ofs = 0; 2941 int ofs = 0;
2825 int extra = 0; 2942 int extra = 0;
2826 2943
2827 for (; row <= end_row; row++, col = 0) 2944 for (; row <= end_row; row++, col = 0)
2828 { 2945 {
2829 t = &(screen.text[row][col]);
2830
2831 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);
2832 2957
2833 if (end_col == -1) 2958 if (end_col == -1)
2834 end_col = TermWin.ncol; 2959 end_col = TermWin.ncol;
2835 2960
2836 if (row == end_row) 2961 if (row == end_row || selection.rect)
2837 MIN_IT (end_col, selection.end.col); 2962 MIN_IT (end_col, selection.end.col);
2838 2963
2964 t = &screen.text[row][col];
2839 for (; col < end_col; col++) 2965 for (; col < end_col; col++)
2840 { 2966 {
2841 if (*t == NOCHAR) 2967 if (*t == NOCHAR)
2842 t++; 2968 t++;
2969#if ENABLE_COMBINING
2843 else if (IS_COMPOSE (*t)) 2970 else if (IS_COMPOSE (*t))
2844 { 2971 {
2845 int len = rxvt_composite.expand (*t, 0); 2972 int len = rxvt_composite.expand (*t, 0);
2846 2973
2847 extra -= (len - 1); 2974 extra -= (len - 1);
… …
2853 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2980 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2854 } 2981 }
2855 2982
2856 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2983 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2857 } 2984 }
2985#endif
2858 else 2986 else
2859 new_selection_text[ofs++] = *t++; 2987 new_selection_text[ofs++] = *t++;
2860 } 2988 }
2861 2989
2862 if (screen.tlen[row] != -1 && row != end_row) 2990 if (screen.tlen[row] != -1 && row != end_row)
2863 new_selection_text[ofs++] = L'\n'; 2991 new_selection_text[ofs++] = C0_LF;
2864 } 2992 }
2865 2993
2866#ifndef NO_OLD_SELECTION
2867 if (selection_style == OLD_SELECT)
2868 if (end_col == TermWin.ncol)
2869 new_selection_text[ofs++] = L'\n';
2870#endif
2871#ifndef NO_NEW_SELECTION
2872 if (selection_style != OLD_SELECT)
2873 if (end_col != selection.end.col) 2994 if (end_col != selection.end.col)
2874 new_selection_text[ofs++] = L'\n'; 2995 new_selection_text[ofs++] = C0_LF;
2875#endif 2996
2876 new_selection_text[ofs] = 0; 2997 new_selection_text[ofs] = 0;
2877 2998
2878 if (ofs == 0) 2999 if (ofs == 0)
2879 { 3000 {
2880 free (new_selection_text); 3001 free (new_selection_text);
… …
2889 3010
2890 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 3011 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2891 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 3012 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2892 display->set_selection_owner (this); 3013 display->set_selection_owner (this);
2893 else 3014 else
2894 rxvt_print_error ("can't get primary selection"); 3015 rxvt_warn ("can't get primary selection, ignoring.\n");
2895 3016
2896#if 0 3017#if 0
2897 XTextProperty ct; 3018 XTextProperty ct;
2898 3019
2899 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3020 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
… …
2903 XFree (ct.value); 3024 XFree (ct.value);
2904 } 3025 }
2905#endif 3026#endif
2906 3027
2907 selection_time = tm; 3028 selection_time = tm;
2908 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2909} 3029}
2910 3030
2911/* ------------------------------------------------------------------------- */ 3031/* ------------------------------------------------------------------------- */
2912/* 3032/*
2913 * 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
2914 * EXT: button 1 press 3034 * EXT: button 1 press
2915 */ 3035 */
2916void 3036void
2917rxvt_term::selection_click (int clicks, int x, int y) 3037rxvt_term::selection_click (int clicks, int x, int y)
2918{ 3038{
2919 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2920
2921 clicks = ((clicks - 1) % 3) + 1; 3039 clicks = ((clicks - 1) % 3) + 1;
2922 selection.clicks = clicks; /* save clicks so extend will work */ 3040 selection.clicks = clicks; /* save clicks so extend will work */
2923 3041
2924 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3042 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2925 3043
… …
2939rxvt_term::selection_start_colrow (int col, int row) 3057rxvt_term::selection_start_colrow (int col, int row)
2940{ 3058{
2941 want_refresh = 1; 3059 want_refresh = 1;
2942 selection.mark.col = col; 3060 selection.mark.col = col;
2943 selection.mark.row = row - TermWin.view_start; 3061 selection.mark.row = row - TermWin.view_start;
3062
2944 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3063 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2945 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3064 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2946 MAX_IT (selection.mark.col, 0); 3065 MAX_IT (selection.mark.col, 0);
2947 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 3066 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2948 3067
3068 while (selection.mark.col > 0
3069 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
3070 --selection.mark.col;
3071
2949 if (selection.op) 3072 if (selection.op)
2950 { /* clear the old selection */ 3073 { /* clear the old selection */
2951 selection.beg.row = selection.end.row = selection.mark.row; 3074 selection.beg.row = selection.end.row = selection.mark.row;
2952 selection.beg.col = selection.end.col = selection.mark.col; 3075 selection.beg.col = selection.end.col = selection.mark.col;
2953 } 3076 }
3077
2954 selection.op = SELECTION_INIT; 3078 selection.op = SELECTION_INIT;
2955 selection.screen = current_screen; 3079 selection.screen = current_screen;
2956} 3080}
2957 3081
2958/* ------------------------------------------------------------------------- */ 3082/* ------------------------------------------------------------------------- */
… …
2960 * Word select: select text for 2 clicks 3084 * Word select: select text for 2 clicks
2961 * We now only find out the boundary in one direction 3085 * We now only find out the boundary in one direction
2962 */ 3086 */
2963 3087
2964/* 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 */
2965#define DELIMIT_TEXT(x) \ 3089#define DELIMIT_TEXT(x) \
2966 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 3090 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2967#define DELIMIT_REND(x) 1 3091#define DELIMIT_REND(x) 1
2968 3092
2969void 3093void
2970rxvt_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)
2971{ 3095{
2972 int col, row, dirnadd, tcol, trow, w1, w2; 3096 int col, row, dirnadd, tcol, trow, w1, w2;
2973 row_col_t bound; 3097 row_col_t bound;
2974 text_t *stp; 3098 text_t *stp;
2975 rend_t *srp; 3099 rend_t *srp;
2976 3100
2977 if (dirn == UP) 3101 if (dirn == UP)
2978 { 3102 {
2979 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3103 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2980 bound.col = 0; 3104 bound.col = 0;
… …
2984 { 3108 {
2985 bound.row = TermWin.saveLines + TermWin.nrow; 3109 bound.row = TermWin.saveLines + TermWin.nrow;
2986 bound.col = TermWin.ncol - 1; 3110 bound.col = TermWin.ncol - 1;
2987 dirnadd = 1; 3111 dirnadd = 1;
2988 } 3112 }
3113
2989 row = mark->row + TermWin.saveLines; 3114 row = mark->row + TermWin.saveLines;
2990 col = mark->col; 3115 col = mark->col;
2991 MAX_IT (col, 0); 3116 MAX_IT (col, 0);
2992 /* find the edge of a word */ 3117 /* find the edge of a word */
2993 stp = & (screen.text[row][col]); 3118 stp = &screen.text[row][col];
2994 w1 = DELIMIT_TEXT (*stp); 3119 w1 = DELIMIT_TEXT (*stp);
2995 3120
2996 if (selection_style != NEW_SELECT) 3121 srp = &screen.rend[row][col];
3122 w2 = DELIMIT_REND (*srp);
3123
3124 for (;;)
2997 { 3125 {
2998 if (w1 == 1) 3126 for (; col != bound.col; col += dirnadd)
2999 { 3127 {
3000 stp += dirnadd; 3128 stp += dirnadd;
3001 if (DELIMIT_TEXT (*stp) == 1)
3002 goto Old_Word_Selection_You_Die;
3003 col += dirnadd;
3004 }
3005 w1 = 0;
3006 }
3007 srp = (&screen.rend[row][col]);
3008 w2 = DELIMIT_REND (*srp);
3009
3010 for (;;)
3011 {
3012 for (; col != bound.col; col += dirnadd)
3013 {
3014 stp += dirnadd; 3129 srp += dirnadd;
3130
3131 if (*stp == NOCHAR)
3132 continue;
3133
3015 if (DELIMIT_TEXT (*stp) != w1) 3134 if (DELIMIT_TEXT (*stp) != w1)
3016 break; 3135 break;
3017 srp += dirnadd;
3018 if (DELIMIT_REND (*srp) != w2) 3136 if (DELIMIT_REND (*srp) != w2)
3019 break; 3137 break;
3020 } 3138 }
3139
3021 if ((col == bound.col) && (row != bound.row)) 3140 if ((col == bound.col) && (row != bound.row))
3022 { 3141 {
3023 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3142 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
3024 { 3143 {
3025 trow = row + dirnadd; 3144 trow = row + dirnadd;
3026 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3145 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3146
3027 if (screen.text[trow] == NULL) 3147 if (screen.text[trow] == NULL)
3028 break; 3148 break;
3149
3029 stp = & (screen.text[trow][tcol]); 3150 stp = & (screen.text[trow][tcol]);
3030 srp = & (screen.rend[trow][tcol]); 3151 srp = & (screen.rend[trow][tcol]);
3152
3031 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3153 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3032 break; 3154 break;
3155
3033 row = trow; 3156 row = trow;
3034 col = tcol; 3157 col = tcol;
3035 continue; 3158 continue;
3036 } 3159 }
3037 } 3160 }
3038 break; 3161 break;
3039 } 3162 }
3163
3040Old_Word_Selection_You_Die: 3164Old_Word_Selection_You_Die:
3041 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));
3042
3043 if (dirn == DN) 3165 if (dirn == DN)
3044 col++; /* put us on one past the end */ 3166 col++; /* put us on one past the end */
3045 3167
3046 /* Poke the values back in */ 3168 /* Poke the values back in */
3047 ret->row = row - TermWin.saveLines; 3169 ret->row = row - TermWin.saveLines;
… …
3066 MAX_IT (row, 0); 3188 MAX_IT (row, 0);
3067 MIN_IT (row, (int)TermWin.nrow - 1); 3189 MIN_IT (row, (int)TermWin.nrow - 1);
3068 MAX_IT (col, 0); 3190 MAX_IT (col, 0);
3069 MIN_IT (col, (int)TermWin.ncol); 3191 MIN_IT (col, (int)TermWin.ncol);
3070 3192
3071#ifndef NO_NEW_SELECTION
3072 /* 3193 /*
3073 * 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
3074 * 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
3075 * 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
3076 * be _past_ a character for it to be selected. 3197 * be _past_ a character for it to be selected.
3077 */ 3198 */
3078 if (selection_style != OLD_SELECT)
3079 {
3080 if (((selection.clicks % 3) == 1) && !flag 3199 if (((selection.clicks % 3) == 1) && !flag
3081 && (col == selection.mark.col 3200 && (col == selection.mark.col
3082 && (row == selection.mark.row + TermWin.view_start))) 3201 && (row == selection.mark.row + TermWin.view_start)))
3083 { 3202 {
3084 /* select nothing */ 3203 /* select nothing */
3085 selection.beg.row = selection.end.row = 0; 3204 selection.beg.row = selection.end.row = 0;
3086 selection.beg.col = selection.end.col = 0; 3205 selection.beg.col = selection.end.col = 0;
3087 selection.clicks = 4; 3206 selection.clicks = 4;
3088 want_refresh = 1; 3207 want_refresh = 1;
3089 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3090 return; 3208 return;
3091 }
3092 } 3209 }
3093#endif 3210
3094 if (selection.clicks == 4) 3211 if (selection.clicks == 4)
3095 selection.clicks = 1; 3212 selection.clicks = 1;
3096 3213
3097 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3214 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3098 flag == 1 ? 1 : 0, /* ? button press */ 3215 flag == 1 ? 1 : 0, /* ? button press */
… …
3104 * Extend the selection to the specified col/row 3221 * Extend the selection to the specified col/row
3105 */ 3222 */
3106void 3223void
3107rxvt_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)
3108{ 3225{
3109 int16_t ncol = TermWin.ncol; 3226 int16_t ncol = TermWin.ncol;
3110 int end_col; 3227 int end_col;
3111 row_col_t pos; 3228 row_col_t pos;
3112 enum { 3229 enum {
3113 LEFT, RIGHT 3230 LEFT, RIGHT
3114 } closeto = RIGHT; 3231 } closeto = RIGHT;
3115 3232
3116 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));
3117 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));
3118
3119 want_refresh = 1; 3233 want_refresh = 1;
3234
3120 switch (selection.op) 3235 switch (selection.op)
3121 { 3236 {
3122 case SELECTION_INIT: 3237 case SELECTION_INIT:
3123 CLEAR_SELECTION (); 3238 CLEAR_SELECTION ();
3124 selection.op = SELECTION_BEGIN; 3239 selection.op = SELECTION_BEGIN;
… …
3137 selection_start_colrow (col, row); 3252 selection_start_colrow (col, row);
3138 /* FALLTHROUGH */ 3253 /* FALLTHROUGH */
3139 default: 3254 default:
3140 return; 3255 return;
3141 } 3256 }
3257
3142 if (selection.beg.col == selection.end.col 3258 if (selection.beg.col == selection.end.col
3143 && selection.beg.col != selection.mark.col 3259 && selection.beg.col != selection.mark.col
3144 && selection.beg.row == selection.end.row 3260 && selection.beg.row == selection.end.row
3145 && selection.beg.row != selection.mark.row) 3261 && selection.beg.row != selection.mark.row)
3146 { 3262 {
3147 selection.beg.col = selection.end.col = selection.mark.col; 3263 selection.beg.col = selection.end.col = selection.mark.col;
3148 selection.beg.row = selection.end.row = selection.mark.row; 3264 selection.beg.row = selection.end.row = selection.mark.row;
3149 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));
3150 } 3265 }
3151 3266
3152 pos.col = col; 3267 pos.col = col;
3153 pos.row = row; 3268 pos.row = row;
3154 3269
3155 pos.row -= TermWin.view_start; /* adjust for scroll */ 3270 pos.row -= TermWin.view_start; /* adjust for scroll */
3156 3271
3157#ifndef NO_OLD_SELECTION
3158 /*
3159 * This mimics some of the selection behaviour of version 2.20 and before.
3160 * There are no ``selection modes'', button3 is always character extension.
3161 * Note: button3 drag is always available, c.f. v2.20
3162 * Selection always terminates (left or right as appropriate) at the mark.
3163 */
3164 if (selection_style == OLD_SELECT)
3165 {
3166 if (selection.clicks == 1 || button3)
3167 {
3168 if (hate_those_clicks)
3169 {
3170 hate_those_clicks = 0;
3171 if (selection.clicks == 1)
3172 {
3173 selection.beg.row = selection.mark.row;
3174 selection.beg.col = selection.mark.col;
3175 }
3176 else
3177 {
3178 selection.mark.row = selection.beg.row;
3179 selection.mark.col = selection.beg.col;
3180 }
3181 }
3182 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3183 {
3184 selection.end.row = selection.mark.row;
3185 selection.end.col = selection.mark.col + 1;
3186 selection.beg.row = pos.row;
3187 selection.beg.col = pos.col;
3188 }
3189 else
3190 {
3191 selection.beg.row = selection.mark.row;
3192 selection.beg.col = selection.mark.col;
3193 selection.end.row = pos.row;
3194 selection.end.col = pos.col + 1;
3195 }
3196 }
3197 else if (selection.clicks == 2)
3198 {
3199 selection_delimit_word (UP, & (selection.mark),
3200 & (selection.beg));
3201 selection_delimit_word (DN, & (selection.mark),
3202 & (selection.end));
3203 hate_those_clicks = 1;
3204 }
3205 else if (selection.clicks == 3)
3206 {
3207 selection.beg.row = selection.end.row = selection.mark.row;
3208 selection.beg.col = 0;
3209 selection.end.col = ncol;
3210 hate_those_clicks = 1;
3211 }
3212 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));
3213 return;
3214 }
3215#endif /* ! NO_OLD_SELECTION */
3216#ifndef NO_NEW_SELECTION
3217 /* selection_style must not be OLD_SELECT to get here */
3218 /* 3272 /*
3219 * 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
3220 * in the way button3 drag extension works. 3274 * in the way button3 drag extension works.
3221 * We're either doing: button1 drag; button3 press; or button3 drag 3275 * We're either doing: button1 drag; button3 press; or button3 drag
3222 * 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
… …
3227 * 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
3228 * 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
3229 * time of the most recent button3 press 3283 * time of the most recent button3 press
3230 */ 3284 */
3231 if (button3 && buttonpress) 3285 if (button3 && buttonpress)
3232 { /* button3 press */ 3286 { /* button3 press */
3233 /* 3287 /*
3234 * first determine which edge of the selection we are closest to 3288 * first determine which edge of the selection we are closest to
3235 */ 3289 */
3236 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3290 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3237 || (!ROWCOL_IS_AFTER (pos, selection.end) 3291 || (!ROWCOL_IS_AFTER (pos, selection.end)
3238 && (((pos.col - selection.beg.col) 3292 && (((pos.col - selection.beg.col)
3239 + ((pos.row - selection.beg.row) * ncol)) 3293 + ((pos.row - selection.beg.row) * ncol))
3240 < ((selection.end.col - pos.col) 3294 < ((selection.end.col - pos.col)
3241 + ((selection.end.row - pos.row) * ncol))))) 3295 + ((selection.end.row - pos.row) * ncol)))))
3242 closeto = LEFT; 3296 closeto = LEFT;
3297
3243 if (closeto == LEFT) 3298 if (closeto == LEFT)
3244 { 3299 {
3245 selection.beg.row = pos.row; 3300 selection.beg.row = pos.row;
3246 selection.beg.col = pos.col; 3301 selection.beg.col = pos.col;
3247 selection.mark.row = selection.end.row; 3302 selection.mark.row = selection.end.row;
3248 selection.mark.col = selection.end.col 3303 selection.mark.col = selection.end.col - (selection.clicks == 2);
3249 - (selection.clicks == 2);
3250 } 3304 }
3251 else 3305 else
3252 { 3306 {
3253 selection.end.row = pos.row; 3307 selection.end.row = pos.row;
3254 selection.end.col = pos.col; 3308 selection.end.col = pos.col;
3255 selection.mark.row = selection.beg.row; 3309 selection.mark.row = selection.beg.row;
3256 selection.mark.col = selection.beg.col; 3310 selection.mark.col = selection.beg.col;
3257 } 3311 }
3258 } 3312 }
3259 else 3313 else
3260 { /* button1 drag or button3 drag */ 3314 { /* button1 drag or button3 drag */
3261 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3315 if (ROWCOL_IS_AFTER (selection.mark, pos))
3262 { 3316 {
3263 if ((selection.mark.row == selection.end.row) 3317 if (selection.mark.row == selection.end.row
3264 && (selection.mark.col == selection.end.col) 3318 && selection.mark.col == selection.end.col
3319 && clickchange
3265 && clickchange && selection.clicks == 2) 3320 && selection.clicks == 2)
3266 selection.mark.col--; 3321 selection.mark.col--;
3322
3267 selection.beg.row = pos.row; 3323 selection.beg.row = pos.row;
3268 selection.beg.col = pos.col; 3324 selection.beg.col = pos.col;
3269 selection.end.row = selection.mark.row; 3325 selection.end.row = selection.mark.row;
3270 selection.end.col = selection.mark.col 3326 selection.end.col = selection.mark.col + (selection.clicks == 2);
3271 + (selection.clicks == 2);
3272 } 3327 }
3273 else 3328 else
3274 { 3329 {
3275 selection.beg.row = selection.mark.row; 3330 selection.beg.row = selection.mark.row;
3276 selection.beg.col = selection.mark.col; 3331 selection.beg.col = selection.mark.col;
… …
3280 } 3335 }
3281 3336
3282 if (selection.clicks == 1) 3337 if (selection.clicks == 1)
3283 { 3338 {
3284 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3339 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3340
3285 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
3286 { 3346 )
3287#if 1
3288 selection.beg.col = ncol; 3347 selection.beg.col = ncol;
3289#else
3290 if (selection.beg.row != selection.end.row)
3291 selection.beg.col = ncol;
3292 else
3293 selection.beg.col = selection.mark.col;
3294#endif
3295 3348
3296 }
3297 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3349 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3298 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 )
3299 selection.end.col = ncol; 3358 selection.end.col = ncol;
3300
3301 } 3359 }
3302 else if (selection.clicks == 2) 3360 else if (selection.clicks == 2)
3303 { 3361 {
3304 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3362 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3305 selection.end.col--; 3363 selection.end.col--;
3364
3306 selection_delimit_word (UP, & (selection.beg), 3365 selection_delimit_word (UP, &selection.beg, &selection.beg);
3307 & (selection.beg));
3308 selection_delimit_word (DN, & (selection.end), 3366 selection_delimit_word (DN, &selection.end, &selection.end);
3309 & (selection.end));
3310 } 3367 }
3311 else if (selection.clicks == 3) 3368 else if (selection.clicks == 3)
3312 { 3369 {
3313#ifndef NO_FRILLS 3370#if ENABLE_FRILLS
3314 if ((Options & Opt_tripleclickwords)) 3371 if ((options & Opt_tripleclickwords))
3315 { 3372 {
3316 int end_row; 3373 int end_row;
3317 3374
3318 selection_delimit_word (UP, & (selection.beg), 3375 selection_delimit_word (UP, &selection.beg, &selection.beg);
3319 & (selection.beg));
3320 end_row = screen.tlen[selection.mark.row 3376 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3321 + TermWin.saveLines]; 3377
3322 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3378 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3323 end_row++)
3324 { 3379 {
3325 end_col = screen.tlen[end_row + TermWin.saveLines]; 3380 end_col = screen.tlen[end_row + TermWin.saveLines];
3381
3326 if (end_col != -1) 3382 if (end_col != -1)
3327 { 3383 {
3328 selection.end.row = end_row; 3384 selection.end.row = end_row;
3329 selection.end.col = end_col; 3385 selection.end.col = end_col;
3330 selection_remove_trailing_spaces (); 3386 selection_remove_trailing_spaces ();
… …
3332 } 3388 }
3333 } 3389 }
3334 } 3390 }
3335 else 3391 else
3336#endif 3392#endif
3337
3338 { 3393 {
3339 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3394 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3340 selection.mark.col++; 3395 selection.mark.col++;
3396
3341 selection.beg.col = 0; 3397 selection.beg.col = 0;
3342 selection.end.col = ncol; 3398 selection.end.col = ncol;
3343 } 3399 }
3344 } 3400 }
3401
3345 if (button3 && buttonpress) 3402 if (button3 && buttonpress)
3346 { /* mark may need to be changed */ 3403 { /* mark may need to be changed */
3347 if (closeto == LEFT) 3404 if (closeto == LEFT)
3348 { 3405 {
3349 selection.mark.row = selection.end.row; 3406 selection.mark.row = selection.end.row;
3350 selection.mark.col = selection.end.col 3407 selection.mark.col = selection.end.col - (selection.clicks == 2);
3351 - (selection.clicks == 2);
3352 } 3408 }
3353 else 3409 else
3354 { 3410 {
3355 selection.mark.row = selection.beg.row; 3411 selection.mark.row = selection.beg.row;
3356 selection.mark.col = selection.beg.col; 3412 selection.mark.col = selection.beg.col;
3357 } 3413 }
3358 } 3414 }
3359 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));
3360#endif /* ! NO_NEW_SELECTION */
3361}
3362 3415
3363#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
3364void 3423void
3365rxvt_term::selection_remove_trailing_spaces () 3424rxvt_term::selection_remove_trailing_spaces ()
3366{ 3425{
3367 int32_t end_col, end_row; 3426 int32_t end_col, end_row;
3368 text_t *stp; 3427 text_t *stp;
3369 3428
3370 end_col = selection.end.col; 3429 end_col = selection.end.col;
3371 end_row = selection.end.row; 3430 end_row = selection.end.row;
3431
3372 for ( ; end_row >= selection.beg.row; ) 3432 for ( ; end_row >= selection.beg.row; )
3373 { 3433 {
3374 stp = screen.text[end_row + TermWin.saveLines]; 3434 stp = screen.text[end_row + TermWin.saveLines];
3435
3375 while (--end_col >= 0) 3436 while (--end_col >= 0)
3376 { 3437 {
3377 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3438 if (stp[end_col] != ' '
3439 && stp[end_col] != '\t'
3440 && stp[end_col] != NOCHAR)
3378 break; 3441 break;
3379 } 3442 }
3443
3380 if (end_col >= 0 3444 if (end_col >= 0
3381 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3445 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3382 { 3446 {
3383 selection.end.col = end_col + 1; 3447 selection.end.col = end_col + 1;
3384 selection.end.row = end_row; 3448 selection.end.row = end_row;
3385 break; 3449 break;
3386 } 3450 }
3451
3387 end_row--; 3452 end_row--;
3388 end_col = TermWin.ncol; 3453 end_col = TermWin.ncol;
3389 } 3454 }
3455
3390 if (selection.mark.row > selection.end.row) 3456 if (selection.mark.row > selection.end.row)
3391 { 3457 {
3392 selection.mark.row = selection.end.row; 3458 selection.mark.row = selection.end.row;
3393 selection.mark.col = selection.end.col; 3459 selection.mark.col = selection.end.col;
3394 } 3460 }
… …
3407rxvt_term::selection_rotate (int x, int y) 3473rxvt_term::selection_rotate (int x, int y)
3408{ 3474{
3409 selection.clicks = selection.clicks % 3 + 1; 3475 selection.clicks = selection.clicks % 3 + 1;
3410 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3476 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3411} 3477}
3412
3413/* ------------------------------------------------------------------------- */
3414/*
3415 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3416 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3417 * the X11 protocol.
3418 */
3419typedef CARD32 Atom32;
3420 3478
3421/* ------------------------------------------------------------------------- */ 3479/* ------------------------------------------------------------------------- */
3422/* 3480/*
3423 * Respond to a request for our current selection 3481 * Respond to a request for our current selection
3424 * EXT: SelectionRequest 3482 * EXT: SelectionRequest
… …
3439 ev.target = rq.target; 3497 ev.target = rq.target;
3440 ev.time = rq.time; 3498 ev.time = rq.time;
3441 3499
3442 if (rq.target == xa[XA_TARGETS]) 3500 if (rq.target == xa[XA_TARGETS])
3443 { 3501 {
3444 Atom32 target_list[6]; 3502 Atom target_list[6];
3445 Atom32 *target = target_list; 3503 Atom *target = target_list;
3446 3504
3447 *target++ = (Atom32) xa[XA_TARGETS]; 3505 *target++ = xa[XA_TARGETS];
3448 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3506 *target++ = xa[XA_TIMESTAMP];
3449 *target++ = (Atom32) XA_STRING; 3507 *target++ = XA_STRING;
3450 *target++ = (Atom32) xa[XA_TEXT]; 3508 *target++ = xa[XA_TEXT];
3451 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3509 *target++ = xa[XA_COMPOUND_TEXT];
3452#if X_HAVE_UTF8_STRING 3510#if X_HAVE_UTF8_STRING
3453 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3511 *target++ = xa[XA_UTF8_STRING];
3454#endif 3512#endif
3455 3513
3456 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3514 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3457 (8 * sizeof (target_list[0])), PropModeReplace, 3515 32, PropModeReplace,
3458 (unsigned char *)target_list, 3516 (unsigned char *)target_list, target - target_list);
3459 target - target_list);
3460 ev.property = rq.property; 3517 ev.property = rq.property;
3461 } 3518 }
3519#if TODO // TODO
3462 else if (rq.target == xa[XA_MULTIPLE]) 3520 else if (rq.target == xa[XA_MULTIPLE])
3463 { 3521 {
3464 /* TODO: Handle MULTIPLE */ 3522 /* TODO: Handle MULTIPLE */
3465 } 3523 }
3524#endif
3466 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3525 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3467 { 3526 {
3468 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3527 XChangeProperty (display->display, rq.requestor, rq.property, rq.target,
3469 (8 * sizeof (Time)), PropModeReplace,
3470 (unsigned char *)&selection_time, 1); 3528 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3471 ev.property = rq.property; 3529 ev.property = rq.property;
3472 } 3530 }
3473 else if (rq.target == XA_STRING 3531 else if (rq.target == XA_STRING
3474 || rq.target == xa[XA_TEXT] 3532 || rq.target == xa[XA_TEXT]
3475 || rq.target == xa[XA_COMPOUND_TEXT] 3533 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3551} 3609}
3552 3610
3553/* ------------------------------------------------------------------------- */ 3611/* ------------------------------------------------------------------------- */
3554#ifdef USE_XIM 3612#ifdef USE_XIM
3555void 3613void
3556rxvt_term::im_set_position (XPoint *pos) 3614rxvt_term::im_set_position (XPoint &pos)
3557{ 3615{
3558 XWindowAttributes xwa; 3616 XWindowAttributes xwa;
3559 3617
3560 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3618 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3619
3561 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3620 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3562 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3621 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3563} 3622}
3564
3565#endif 3623#endif
3566/* ------------------------------------------------------------------------- */ 3624
3567 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
3568/* ------------------------------------------------------------------------- * 3747/* ------------------------------------------------------------------------- */
3569 * DEBUG ROUTINES *
3570 * ------------------------------------------------------------------------- */
3571#if 0
3572void
3573rxvt_debug_colors (void)
3574{
3575 int color;
3576 const char *name[] =
3577 {
3578 "fg", "bg",
3579 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3580 };
3581
3582 fprintf (stderr, "Color ( ");
3583 if (rstyle & RS_RVid)
3584 fprintf (stderr, "rvid ");
3585 if (rstyle & RS_Bold)
3586 fprintf (stderr, "bold ");
3587 if (rstyle & RS_Blink)
3588 fprintf (stderr, "blink ");
3589 if (rstyle & RS_Uline)
3590 fprintf (stderr, "uline ");
3591 fprintf (stderr, "): ");
3592
3593 color = GET_FGCOLOR (rstyle);
3594#ifndef NO_BRIGHTCOLOR
3595 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3596 {
3597 color -= (minBrightCOLOR - minCOLOR);
3598 fprintf (stderr, "bright ");
3599 }
3600#endif
3601 fprintf (stderr, "%s on ", name[color]);
3602
3603 color = GET_BGCOLOR (rstyle);
3604#ifndef NO_BRIGHTCOLOR
3605 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3606 {
3607 color -= (minBrightCOLOR - minCOLOR);
3608 fprintf (stderr, "bright ");
3609 }
3610#endif
3611 fprintf (stderr, "%s\n", name[color]);
3612}
3613#endif

Diff Legend

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