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.59 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.129 by root, Wed Aug 25 03:52:09 2004 UTC

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

Diff Legend

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