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.136 by root, Tue Sep 7 21:05:41 2004 UTC

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