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.66 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.141 by root, Wed Dec 1 02:12:18 2004 UTC

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

Diff Legend

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