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.74 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.168 by root, Thu Aug 11 13:23:06 2005 UTC

… …
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>
36 33
37#include "salloc.C" // HACK, should be a seperate compile! 34#include "salloc.C" // HACK, should be a seperate compile!
38 35
39inline void fill_text (text_t *start, text_t value, int len) 36inline void fill_text (text_t *start, text_t value, int len)
40{ 37{
41 while (len--) 38 while (len--)
42 *start++ = value; 39 *start++ = value;
43} 40}
44 41
45/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
46#define PROP_SIZE 16384 43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
47#define TABSIZE 8 /* default tab size */ 45#define TABSIZE 8 /* default tab size */
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 *));
200 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
201 210
202 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); 211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
203 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); 212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
204 213
205 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
206 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
207 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); 216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
208 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); 217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
209 218
210 for (p = 0; p < nrow; p++) 219 for (p = 0; p < nrow; p++)
211 { 220 {
212 q = p + TermWin.saveLines; 221 q = p + TermWin.saveLines;
213 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
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;
… …
284 ralloc->free (drawn_rend[p]); 293 ralloc->free (drawn_rend[p]);
285 } 294 }
286 295
287 /* we have fewer rows so fix up cursor position */ 296 /* we have fewer rows so fix up cursor position */
288 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 297 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
289 MIN_IT (swap.cur.row, (int32_t)nrow - 1);
290 298
291 scr_reset_realloc (); /* realloc _last_ */ 299 scr_reset_realloc (); /* realloc _last_ */
292 } 300 }
293 else if (nrow > prev_nrow) 301 else if (nrow > prev_nrow)
294 { 302 {
… …
325 scr_scroll_text (0, (int)nrow - 1, -k, 1); 333 scr_scroll_text (0, (int)nrow - 1, -k, 1);
326 screen.cur.row += k; 334 screen.cur.row += k;
327 screen.s_cur.row += k; 335 screen.s_cur.row += k;
328 TermWin.nscrolled -= k; 336 TermWin.nscrolled -= k;
329 } 337 }
338
330#ifdef DEBUG_STRICT 339#ifdef DEBUG_STRICT
331 assert (screen.cur.row < TermWin.nrow); 340 assert (screen.cur.row < TermWin.nrow);
332 assert (swap.cur.row < TermWin.nrow);
333#else /* drive with your eyes closed */ 341#else /* drive with your eyes closed */
334
335 MIN_IT (screen.cur.row, nrow - 1); 342 MIN_IT (screen.cur.row, nrow - 1);
336 MIN_IT (swap.cur.row, nrow - 1);
337#endif 343#endif
338 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this 344 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
339 } 345 }
340 346
341 /* resize columns */ 347 /* resize columns */
… …
384 } 390 }
385 391
386 } 392 }
387 393
388 MIN_IT (screen.cur.col, (int16_t)ncol - 1); 394 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
389 MIN_IT (swap.cur.col, (int16_t)ncol - 1);
390 395
391 delete talloc; talloc = ta; 396 delete talloc; talloc = ta;
392 delete ralloc; ralloc = ra; 397 delete ralloc; ralloc = ra;
393 } 398 }
394 399
… …
408} 413}
409 414
410void 415void
411rxvt_term::scr_reset_realloc () 416rxvt_term::scr_reset_realloc ()
412{ 417{
413 uint16_t total_rows, nrow; 418 unsigned int total_rows, nrow;
414 419
415 nrow = TermWin.nrow; 420 nrow = TermWin.nrow;
416 total_rows = nrow + TermWin.saveLines; 421 total_rows = nrow + TermWin.saveLines;
417 /* *INDENT-OFF* */ 422 /* *INDENT-OFF* */
418 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); 423 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
… …
435 * Free everything. That way malloc debugging can find leakage. 440 * Free everything. That way malloc debugging can find leakage.
436 */ 441 */
437void 442void
438rxvt_term::scr_release () 443rxvt_term::scr_release ()
439{ 444{
440 uint16_t total_rows; 445 unsigned int total_rows;
441 int i; 446 int i;
442 447
443 total_rows = TermWin.nrow + TermWin.saveLines; 448 total_rows = TermWin.nrow + TermWin.saveLines;
444 449
445 delete talloc; talloc = 0; 450 delete talloc; talloc = 0;
… …
471 * Hard reset 476 * Hard reset
472 */ 477 */
473void 478void
474rxvt_term::scr_poweron () 479rxvt_term::scr_poweron ()
475{ 480{
476 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
477
478 scr_release (); 481 scr_release ();
479 prev_nrow = prev_ncol = 0; 482 prev_nrow = prev_ncol = 0;
480 scr_reset (); 483 scr_reset ();
481 484
482 scr_clear (true); 485 scr_clear (true);
… …
493 */ 496 */
494void 497void
495rxvt_term::scr_cursor (int mode) 498rxvt_term::scr_cursor (int mode)
496{ 499{
497 screen_t *s; 500 screen_t *s;
498
499 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
500 501
501#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 502#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
502 if (current_screen == SECONDARY) 503 if (current_screen == SECONDARY)
503 s = &swap; 504 s = &swap;
504 else 505 else
… …
506 s = &screen; 507 s = &screen;
507 508
508 switch (mode) 509 switch (mode)
509 { 510 {
510 case SAVE: 511 case SAVE:
511 s->s_cur.row = s->cur.row; 512 s->s_cur.row = screen.cur.row;
512 s->s_cur.col = s->cur.col; 513 s->s_cur.col = screen.cur.col;
513 s->s_rstyle = rstyle; 514 s->s_rstyle = rstyle;
514 s->s_charset = s->charset; 515 s->s_charset = screen.charset;
515 s->s_charset_char = charsets[s->charset]; 516 s->s_charset_char = charsets[screen.charset];
516 break; 517 break;
517 518
518 case RESTORE: 519 case RESTORE:
519 want_refresh = 1; 520 want_refresh = 1;
520 s->cur.row = s->s_cur.row; 521 screen.cur.row = s->s_cur.row;
521 s->cur.col = s->s_cur.col; 522 screen.cur.col = s->s_cur.col;
522 s->flags &= ~Screen_WrapNext; 523 screen.flags &= ~Screen_WrapNext;
523 rstyle = s->s_rstyle; 524 rstyle = s->s_rstyle;
524 s->charset = s->s_charset; 525 screen.charset = s->s_charset;
525 charsets[s->charset] = s->s_charset_char; 526 charsets[screen.charset] = s->s_charset_char;
526 set_font_style (); 527 set_font_style ();
527 break; 528 break;
528 } 529 }
529 530
530 /* boundary check in case screen size changed between SAVE and RESTORE */ 531 /* boundary check in case screen size changed between SAVE and RESTORE */
… …
553 int offset; 554 int offset;
554#endif 555#endif
555 556
556 want_refresh = 1; 557 want_refresh = 1;
557 558
558 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
559
560 TermWin.view_start = 0; 559 TermWin.view_start = 0;
561 560
562 if (current_screen == scrn) 561 if (current_screen == scrn)
563 return scrn; 562 return scrn;
564 563
565 selection_check (2); /* check for boundary cross */ 564 selection_check (2); /* check for boundary cross */
566 565
567 SWAP_IT (current_screen, scrn, int); 566 i = current_screen; current_screen = scrn; scrn = i;
567
568 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
569 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
570 MAX_IT (screen.cur.row, 0);
571 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
572 MAX_IT (screen.cur.col, 0);
573 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
574
568#if NSCREENS 575#if NSCREENS
569 if (Options & Opt_secondaryScreen) 576 if (options & Opt_secondaryScreen)
570 { 577 {
571 num_scr = 0; 578 num_scr = 0;
572 offset = TermWin.saveLines; 579 offset = TermWin.saveLines;
580
573 for (i = prev_nrow; i--;) 581 for (i = prev_nrow; i--;)
574 { 582 {
575 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 583 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
576 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 584 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
577 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 585 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
578 } 586 }
579 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 587
580 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
581# ifdef DEBUG_STRICT
582 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
583 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
584# else /* drive with your eyes closed */
585 MAX_IT (screen.cur.row, 0);
586 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
587 MAX_IT (screen.cur.col, 0);
588 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
589# endif
590 SWAP_IT (screen.charset, swap.charset, int16_t); 588 SWAP_IT (screen.charset, swap.charset, int16_t);
591 SWAP_IT (screen.flags, swap.flags, int); 589 SWAP_IT (screen.flags, swap.flags, int);
592 screen.flags |= Screen_VisibleCursor; 590 screen.flags |= Screen_VisibleCursor;
593 swap.flags |= Screen_VisibleCursor; 591 swap.flags |= Screen_VisibleCursor;
594 } 592 }
595 else 593 else
596#endif 594#endif
597 if (Options & Opt_secondaryScroll) 595 if (options & Opt_secondaryScroll)
598 //if (current_screen == PRIMARY)
599 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 596 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
597
600 return scrn; 598 return scrn;
601} 599}
602 600
601// clear WrapNext indicator, solidifying position on next line
602void
603rxvt_term::scr_do_wrap ()
604{
605 if (!(screen.flags & Screen_WrapNext))
606 return;
607
608 screen.flags &= ~Screen_WrapNext;
609
610 screen.cur.col = 0;
611
612 if (screen.cur.row == screen.bscroll)
613 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
614 else if (screen.cur.row < TermWin.nrow - 1)
615 screen.cur.row++;
616}
617
603/* ------------------------------------------------------------------------- */ 618/* ------------------------------------------------------------------------- */
604/* 619/*
605 * Change the colour for following text 620 * Change the colour for following text
606 */ 621 */
607void 622void
608rxvt_term::scr_color (unsigned int color, int fgbg) 623rxvt_term::scr_color (unsigned int color, int fgbg)
609{ 624{
610 color &= RS_fgMask; 625 if (color > maxTermCOLOR)
626 color = fgbg;
627
611 if (fgbg == Color_fg) 628 if (fgbg == Color_fg)
612 rstyle = SET_FGCOLOR (rstyle, color); 629 rstyle = SET_FGCOLOR (rstyle, color);
613 else 630 else
614 rstyle = SET_BGCOLOR (rstyle, color); 631 rstyle = SET_BGCOLOR (rstyle, color);
615} 632}
… …
644 661
645 if (count == 0 || (row1 > row2)) 662 if (count == 0 || (row1 > row2))
646 return 0; 663 return 0;
647 664
648 want_refresh = 1; 665 want_refresh = 1;
649 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
650 666
651 if (row1 == 0 && count > 0 667 if (row1 == 0 && count > 0
652 && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) 668 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
653 { 669 {
654 nscrolled = (long)TermWin.nscrolled + (long)count; 670 nscrolled = (long)TermWin.nscrolled + (long)count;
655 671
656 if (nscrolled > (long)TermWin.saveLines) 672 if (nscrolled > (long)TermWin.saveLines)
657 TermWin.nscrolled = TermWin.saveLines; 673 TermWin.nscrolled = TermWin.saveLines;
658 else 674 else
659 TermWin.nscrolled = (uint16_t)nscrolled; 675 TermWin.nscrolled = (unsigned int)nscrolled;
660 676
661 if ((Options & Opt_scrollWithBuffer) 677 if ((options & Opt_scrollWithBuffer)
662 && TermWin.view_start != 0 678 && TermWin.view_start != 0
663 && TermWin.view_start != TermWin.saveLines) 679 && TermWin.view_start != TermWin.saveLines)
664 scr_page (UP, count); 680 scr_page (UP, count);
665 } 681 }
666 else if (!spec) 682 else if (!spec)
… …
683 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 699 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
684 } 700 }
685 else if (j >= row1 && j <= row2) 701 else if (j >= row1 && j <= row2)
686 { 702 {
687 /* move selected region too */ 703 /* move selected region too */
688 selection.beg.row -= count; 704 selection.beg.row -= count;
689 selection.end.row -= count; 705 selection.end.row -= count;
690 selection.mark.row -= count; 706 selection.mark.row -= count;
691 } 707 }
692 } 708 }
693 709
694 selection_check (0); /* _after_ TermWin.nscrolled update */ 710 selection_check (0); /* _after_ TermWin.nscrolled update */
… …
702 i = row2 - row1 + 1; 718 i = row2 - row1 + 1;
703 MIN_IT (count, i); 719 MIN_IT (count, i);
704 720
705 if (j > 0) 721 if (j > 0)
706 { 722 {
707 /* A: scroll up */ 723 /* scroll up */
708 724
709 /* A1: Copy lines that will get clobbered by the rotation */ 725 /* Copy lines that will get clobbered by the rotation */
726 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
727 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
728
729 /* Rotate lines */
730 i = row2 - row1 - count + 1;
731 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
732 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
733 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
734
735 j = row2 - count + 1, i = count;
736 }
737 else /* if (j < 0) */
738 {
739 /* scroll down */
740
741 /* Copy lines that will get clobbered by the rotation */
710 for (i = 0, j = row1; i < count; i++, j++) 742 for (i = 0, j = row2; i < count; i++, j--)
711 { 743 {
712 buf_text[i] = screen.text[j]; 744 buf_text[i] = screen.text[j];
713 buf_rend[i] = screen.rend[j]; 745 buf_rend[i] = screen.rend[j];
714 } 746 }
715 747
716 /* A2: Rotate lines */ 748 /* Rotate lines */
717 for (j = row1, i = j + count; i <= row2; i++, j++) 749 for (j = row2, i = j - count; i >= row1; i--, j--)
718 { 750 {
719 screen.tlen[j] = screen.tlen[i]; 751 screen.tlen[j] = screen.tlen[i];
720 screen.text[j] = screen.text[i]; 752 screen.text[j] = screen.text[i];
721 screen.rend[j] = screen.rend[i]; 753 screen.rend[j] = screen.rend[i];
722 } 754 }
723 755
724 j = row2 - count + 1, i = count;
725 }
726 else /* if (j < 0) */
727 {
728 /* B: scroll down */
729
730 /* B1: Copy lines that will get clobbered by the rotation */
731 for (i = 0, j = row2; i < count; i++, j--)
732 {
733 buf_text[i] = screen.text[j];
734 buf_rend[i] = screen.rend[j];
735 }
736
737 /* B2: Rotate lines */
738 for (j = row2, i = j - count; i >= row1; i--, j--)
739 {
740 screen.tlen[j] = screen.tlen[i];
741 screen.text[j] = screen.text[i];
742 screen.rend[j] = screen.rend[i];
743 }
744
745 j = row1, i = count; 756 j = row1, i = count;
746 count = -count; 757 count = -count;
747 } 758 }
748 759
749 /* C: Resurrect lines */ 760 /* Resurrect lines */
761 memset (screen.tlen + j, 0, i * sizeof (int16_t));
762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
763 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
764 if (!spec) /* line length may not equal TermWin.ncol */
750 for (; i--; j++) 765 for (; i--; j++)
751 {
752 screen.tlen[j] = 0;
753 screen.text[j] = buf_text[i];
754 screen.rend[j] = buf_rend[i];
755
756 if (!spec) /* line length may not equal TermWin.ncol */
757 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); 766 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
758 }
759 767
760 return count; 768 return count;
761} 769}
762 770
763/* ------------------------------------------------------------------------- */ 771/* ------------------------------------------------------------------------- */
… …
765 * Add text given in <str> of length <len> to screen struct 773 * Add text given in <str> of length <len> to screen struct
766 */ 774 */
767void 775void
768rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 776rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
769{ 777{
778 if (len <= 0) /* sanity */
779 return;
780
770 unsigned char checksel, clearsel; 781 unsigned char checksel;
771 unicode_t c; 782 unicode_t c;
772 int i, row, last_col; 783 int i, row, last_col;
773 text_t *stp; 784 text_t *stp;
774 rend_t *srp; 785 rend_t *srp;
775 786 const unicode_t *strend = str + len;
776 if (len <= 0) /* sanity */
777 return;
778 787
779 want_refresh = 1; 788 want_refresh = 1;
789 ZERO_SCROLLBACK ();
780 last_col = TermWin.ncol; 790 last_col = TermWin.ncol;
781 791
782 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
783 ZERO_SCROLLBACK ();
784 if (nlines > 0) 792 if (nlines > 0)
785 { 793 {
786 nlines += (screen.cur.row - screen.bscroll); 794 nlines += screen.cur.row - screen.bscroll;
787 if ((nlines > 0) 795 if ((nlines > 0)
788 && (screen.tscroll == 0) 796 && (screen.tscroll == 0)
789 && (screen.bscroll == (TermWin.nrow - 1))) 797 && (screen.bscroll == (TermWin.nrow - 1)))
790 { 798 {
791 /* _at least_ this many lines need to be scrolled */ 799 /* _at least_ this many lines need to be scrolled */
792 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 800 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
793 screen.cur.row -= nlines; 801 screen.cur.row -= nlines;
794 } 802 }
795 } 803 }
804
796#ifdef DEBUG_STRICT 805#ifdef DEBUG_STRICT
797 assert (screen.cur.col < last_col); 806 assert (screen.cur.col < last_col);
798 assert ((screen.cur.row < TermWin.nrow) 807 assert ((screen.cur.row < TermWin.nrow)
799 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 808 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
800#else /* drive with your eyes closed */ 809#else /* drive with your eyes closed */
801 MIN_IT (screen.cur.col, last_col - 1); 810 MIN_IT (screen.cur.col, last_col - 1);
802 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 811 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
803 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 812 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
804#endif 813#endif
805 row = screen.cur.row + TermWin.saveLines; 814 row = screen.cur.row + TermWin.saveLines;
806 815
807 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 816 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
808 clearsel = 0;
809 817
810 stp = screen.text[row]; 818 stp = screen.text[row];
811 srp = screen.rend[row]; 819 srp = screen.rend[row];
812 820
813 while (len--) 821 while (str < strend)
814 { 822 {
815 c = *str++; 823 c = *str++;
816 824
817 if (c < 0x20) 825 if (c < 0x20)
818 switch (c) 826 if (c == C0_LF)
827 {
828 if (screen.tlen[row] != -1) /* XXX: think about this */
829 MAX_IT (screen.tlen[row], screen.cur.col);
830
831 screen.flags &= ~Screen_WrapNext;
832
833 if (screen.cur.row == screen.bscroll)
834 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
835 else if (screen.cur.row < (TermWin.nrow - 1))
836 row = (++screen.cur.row) + TermWin.saveLines;
837
838 stp = screen.text[row]; /* _must_ refresh */
839 srp = screen.rend[row]; /* _must_ refresh */
840 continue;
841 }
842 else if (c == C0_CR)
819 { 843 {
820 case C0_HT:
821 scr_tab (1);
822 continue;
823
824 case C0_LF:
825 if (screen.tlen[row] != -1) /* XXX: think about this */ 844 if (screen.tlen[row] != -1) /* XXX: think about this */
826 MAX_IT (screen.tlen[row], screen.cur.col); 845 MAX_IT (screen.tlen[row], screen.cur.col);
827 846
828 screen.flags &= ~Screen_WrapNext; 847 screen.flags &= ~Screen_WrapNext;
829
830 if (screen.cur.row == screen.bscroll)
831 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
832 else if (screen.cur.row < (TermWin.nrow - 1))
833 row = (++screen.cur.row) + TermWin.saveLines;
834
835 stp = screen.text[row]; /* _must_ refresh */
836 srp = screen.rend[row]; /* _must_ refresh */
837 continue;
838
839 case C0_CR:
840 if (screen.tlen[row] != -1) /* XXX: think about this */
841 MAX_IT (screen.tlen[row], screen.cur.col);
842
843 screen.flags &= ~Screen_WrapNext;
844 screen.cur.col = 0; 848 screen.cur.col = 0;
845 continue; 849 continue;
850 }
851 else if (c == C0_HT)
852 {
853 scr_tab (1, true);
854 continue;
846 } 855 }
847 856
848 if (checksel /* see if we're writing within selection */ 857 if (checksel /* see if we're writing within selection */
849 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 858 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
850 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 859 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
851 { 860 {
852 checksel = 0; 861 checksel = 0;
853 clearsel = 1; 862 /*
863 * If we wrote anywhere in the selected area, kill the selection
864 * XXX: should we kill the mark too? Possibly, but maybe that
865 * should be a similar check.
866 */
867 CLEAR_SELECTION ();
854 } 868 }
855 869
856 if (screen.flags & Screen_WrapNext) 870 if (screen.flags & Screen_WrapNext)
857 { 871 {
858 screen.tlen[row] = -1; 872 screen.tlen[row] = -1;
859 if (screen.cur.row == screen.bscroll) 873
860 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 874 scr_do_wrap ();
861 else if (screen.cur.row < (TermWin.nrow - 1)) 875
862 row = (++screen.cur.row) + TermWin.saveLines; 876 row = screen.cur.row + TermWin.saveLines;
863
864 stp = screen.text[row]; /* _must_ refresh */ 877 stp = screen.text[row]; /* _must_ refresh */
865 srp = screen.rend[row]; /* _must_ refresh */ 878 srp = screen.rend[row]; /* _must_ refresh */
866 screen.cur.col = 0; 879 }
867 screen.flags &= ~Screen_WrapNext; 880
881 // some utf-8 decoders "decode" surrogate characters: let's fix this.
882 if (IN_RANGE (c, 0xd800, 0xdfff))
883 c = 0xfffd;
884
885 // rely on wcwidth to tell us the character width, at least for non-latin1
886 // do wcwidth before further replacements, as wcwidth might return -1
887 // for the line drawing characters below as they might be invalid in the current
888 // locale.
889 int width = c < 0x100 ? 1 : wcwidth (c);
890
891 if (charsets[screen.charset] == '0') // DEC SPECIAL
892 {
893 // vt100 special graphics and line drawing
894 // 5f-7e standard vt100
895 // 40-5e rxvt extension for extra curses acs chars
896 static uint16_t vt100_0[62] = { // 41 .. 7e
897 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
898 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
899 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
900 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
901 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
902 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
903 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
904 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
905 };
906
907 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
908 {
909 c = vt100_0[c - 0x41];
910 width = 1; // vt100 line drawing characters are always single-width
911 }
868 } 912 }
869 913
870 if (screen.flags & Screen_Insert) 914 if (screen.flags & Screen_Insert)
871 scr_insdel_chars (1, INSERT); 915 scr_insdel_chars (width, INSERT);
872
873 // rely on wcwidth to tell us the character width, at least for non-latin1
874 // do wcwidth before further replacements, as wcwidth says that line-drawing
875 // characters have width -1 (DOH!) on GNU/Linux sometimes.
876 int width = c < 256 ? 1 : wcwidth (c);
877
878 if (charsets[screen.charset] == '0') // DEC SPECIAL
879 {
880 // vt100 special graphics and line drawing
881 static uint16_t vt100_0[32] = { // 5f .. 7e
882 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
883 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
884 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
885 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
886 };
887
888 if (c >= 0x5f && c <= 0x7e)
889 {
890 c = vt100_0[c - 0x5f];
891 width = 1;
892 }
893 }
894 916
895 if (width != 0) 917 if (width != 0)
896 { 918 {
897#if !UNICODE_3 && ENABLE_COMBINING 919#if !UNICODE_3
898 // trim characters we can't store directly :( 920 // trim characters we can't store directly :(
899 if (c >= 0x10000) 921 if (c >= 0x10000)
922# if ENABLE_COMBINING
900 c = rxvt_composite.compose (c); // map to lower 16 bits 923 c = rxvt_composite.compose (c); // map to lower 16 bits
924# else
925 c = 0xfffd;
901#endif 926# endif
927#endif
928
929 // nuke the character at this position, if required
930 if (stp[screen.cur.col] == NOCHAR
931 || (screen.cur.col < TermWin.ncol - 1
932 && stp[screen.cur.col + 1] == NOCHAR))
933 {
934 int col = screen.cur.col;
935
936 // find begin
937 while (col > 0 && stp[col] == NOCHAR)
938 col--;
939
940 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' '));
941
942 // found begin, nuke
943 do {
944 stp[col] = ' ';
945 srp[col] = rend;
946 col++;
947 } while (col < TermWin.ncol && stp[col] == NOCHAR);
948 }
949
902 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 950 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
951
952 // if the character doesn't fit into the remaining columns...
953 if (screen.cur.col > last_col - width && last_col >= width)
954 {
955 // ...output spaces
956 c = ' ';
957 // and try the same character next loop iteration
958 --str;
959 }
903 960
904 do 961 do
905 { 962 {
906 stp[screen.cur.col] = c; 963 stp[screen.cur.col] = c;
907 srp[screen.cur.col] = rend; 964 srp[screen.cur.col] = rend;
… …
919 c = NOCHAR; 976 c = NOCHAR;
920 } 977 }
921 while (--width > 0); 978 while (--width > 0);
922 979
923 // pad with spaces when overwriting wide character with smaller one 980 // pad with spaces when overwriting wide character with smaller one
981 if (!width)
924 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 982 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
925 { 983 {
926 stp[c] = ' '; 984 stp[c] = ' ';
927 srp[c] = rend; 985 srp[c] = rend;
928 } 986 }
929 } 987 }
930 else if (width == 0) 988 else // width == 0
931 { 989 {
932#if ENABLE_COMBINING 990#if ENABLE_COMBINING
933 // handle combining characters 991 // handle combining characters
934 // we just tag the accent on the previous on-screen character. 992 // we just tag the accent on the previous on-screen character.
935 // this is arguably not correct, but also arguably not wrong. 993 // this is arguably not correct, but also arguably not wrong.
936 // we don't handle double-width characters nicely yet. 994 // we don't handle double-width characters nicely yet.
937
938 text_t *tp; 995 text_t *tp;
939 rend_t *rp; 996 rend_t *rp;
940 997
941 if (screen.cur.col > 0) 998 if (screen.cur.col > 0)
942 { 999 {
943 tp = stp + screen.cur.col - 1; 1000 tp = stp + screen.cur.col - 1;
944 rp = srp + screen.cur.col - 1; 1001 rp = srp + screen.cur.col - 1;
1002
1003 while (*tp == NOCHAR && tp > stp)
1004 tp--, rp--;
945 } 1005 }
946 else if (screen.cur.row > 0 1006 else if (screen.cur.row > 0
947 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 1007 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
948 { 1008 {
949 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1009 int line = screen.cur.row - 1 + TermWin.saveLines;
950 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1010
1011 tp = screen.text[line] + last_col - 1;
1012 rp = screen.rend[line] + last_col - 1;
1013
1014 while (*tp == NOCHAR && tp > screen.text[line])
1015 tp--, rp--;
951 } 1016 }
952 else 1017 else
953 continue; 1018 continue;
954
955 // handle double-width-chars by making them look extremely ugly
956 if (*tp == NOCHAR)
957 *tp = ' '; // hack //D //TODO //--tp, --rp;
958 1019
959 // first try to find a precomposed character 1020 // first try to find a precomposed character
960 unicode_t n = rxvt_compose (*tp, c); 1021 unicode_t n = rxvt_compose (*tp, c);
961 if (n == NOCHAR) 1022 if (n == NOCHAR)
962 n = rxvt_composite.compose (*tp, c); 1023 n = rxvt_composite.compose (*tp, c);
963 1024
964 *tp = n; 1025 *tp = n;
965 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 1026 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
966#endif 1027#endif
967 } 1028 }
968 } 1029 }
969 1030
970 if (screen.tlen[row] != -1) /* XXX: think about this */ 1031 if (screen.tlen[row] != -1) /* XXX: think about this */
971 MAX_IT (screen.tlen[row], screen.cur.col); 1032 MAX_IT (screen.tlen[row], screen.cur.col);
972
973 /*
974 * If we wrote anywhere in the selected area, kill the selection
975 * XXX: should we kill the mark too? Possibly, but maybe that
976 * should be a similar check.
977 */
978 if (clearsel)
979 CLEAR_SELECTION ();
980 1033
981#ifdef DEBUG_STRICT 1034#ifdef DEBUG_STRICT
982 assert (screen.cur.row >= 0); 1035 assert (screen.cur.row >= 0);
983#else /* drive with your eyes closed */ 1036#else /* drive with your eyes closed */
984 MAX_IT (screen.cur.row, 0); 1037 MAX_IT (screen.cur.row, 0);
… …
1002#ifdef TERMCAP_HAS_BW 1055#ifdef TERMCAP_HAS_BW
1003 screen.cur.col = TermWin.ncol - 1; 1056 screen.cur.col = TermWin.ncol - 1;
1004 screen.cur.row--; 1057 screen.cur.row--;
1005 return; 1058 return;
1006#endif 1059#endif
1007
1008 } 1060 }
1009 } 1061 }
1010 else if ((screen.flags & Screen_WrapNext) == 0) 1062 else if (!(screen.flags & Screen_WrapNext))
1011 scr_gotorc (0, -1, RELATIVE); 1063 scr_gotorc (0, -1, RELATIVE);
1012 1064
1013 screen.flags &= ~Screen_WrapNext; 1065 screen.flags &= ~Screen_WrapNext;
1014} 1066}
1015 1067
… …
1018 * Process Horizontal Tab 1070 * Process Horizontal Tab
1019 * count: +ve = forward; -ve = backwards 1071 * count: +ve = forward; -ve = backwards
1020 * XTERM_SEQ: CTRL-I 1072 * XTERM_SEQ: CTRL-I
1021 */ 1073 */
1022void 1074void
1023rxvt_term::scr_tab (int count) 1075rxvt_term::scr_tab (int count, bool ht)
1024{ 1076{
1025 int i, x; 1077 int i, x;
1026 1078
1027 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1028 want_refresh = 1; 1079 want_refresh = 1;
1029 i = x = screen.cur.col; 1080 i = x = screen.cur.col;
1030 1081
1031 if (count == 0) 1082 if (count == 0)
1032 return; 1083 return;
1033 else if (count > 0) 1084 else if (count > 0)
1034 { 1085 {
1086 int row = TermWin.saveLines + screen.cur.row;
1087 text_t *tp = screen.text[row];
1088 rend_t *rp = screen.rend[row];
1089 rend_t base_rend = rp[i];
1090 ht &= tp[i] == ' ';
1091
1035 for (; ++i < TermWin.ncol; ) 1092 for (; ++i < TermWin.ncol; )
1036 if (tabs[i]) 1093 if (tabs[i])
1037 { 1094 {
1038 x = i; 1095 x = i;
1039 if (!--count) 1096 if (!--count)
1040 break; 1097 break;
1041 } 1098 }
1099 else
1100 ht &= tp[i] == ' '
1101 && RS_SAME (rp[i], base_rend);
1042 1102
1043 if (count) 1103 if (count)
1044 x = TermWin.ncol - 1; 1104 x = TermWin.ncol - 1;
1105
1106 // store horizontal tab commands as characters inside the text
1107 // buffer so they can be selected and pasted.
1108 if (ht && options & Opt_pastableTabs)
1109 {
1110 base_rend = SET_FONT (base_rend, 0);
1111
1112 if (screen.tlen[row] != -1) /* XXX: think about this */
1113 MAX_IT (screen.tlen[row], x);
1114
1115 i = screen.cur.col;
1116
1117 tp[i] = '\t';
1118 rp[i] = base_rend;
1119
1120 while (++i < x)
1121 {
1122 tp[i] = NOCHAR;
1123 rp[i] = base_rend;
1124 }
1125 }
1045 } 1126 }
1046 else /* if (count < 0) */ 1127 else /* if (count < 0) */
1047 { 1128 {
1048 for (; --i >= 0; ) 1129 for (; --i >= 0; )
1049 if (tabs[i]) 1130 if (tabs[i])
… …
1066 * Process DEC Back Index 1147 * Process DEC Back Index
1067 * XTERM_SEQ: ESC 6 1148 * XTERM_SEQ: ESC 6
1068 * Move cursor left in row. If we're at the left boundary, shift everything 1149 * Move cursor left in row. If we're at the left boundary, shift everything
1069 * in that row right. Clear left column. 1150 * in that row right. Clear left column.
1070 */ 1151 */
1071#ifndef NO_FRILLS 1152#if ENABLE_FRILLS
1072void 1153void
1073rxvt_term::scr_backindex () 1154rxvt_term::scr_backindex ()
1074{ 1155{
1075 if (screen.cur.col > 0) 1156 if (screen.cur.col > 0)
1076 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1077 else 1158 else
1078 { 1159 {
1079 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1160 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1080 return; /* um, yeah? */ 1161 return; /* um, yeah? */
1162
1081 scr_insdel_chars (1, INSERT); 1163 scr_insdel_chars (1, INSERT);
1082 } 1164 }
1083} 1165}
1084#endif 1166#endif
1085/* ------------------------------------------------------------------------- */ 1167/* ------------------------------------------------------------------------- */
… …
1087 * Process DEC Forward Index 1169 * Process DEC Forward Index
1088 * XTERM_SEQ: ESC 9 1170 * XTERM_SEQ: ESC 9
1089 * Move cursor right in row. If we're at the right boundary, shift everything 1171 * Move cursor right in row. If we're at the right boundary, shift everything
1090 * in that row left. Clear right column. 1172 * in that row left. Clear right column.
1091 */ 1173 */
1092#ifndef NO_FRILLS 1174#if ENABLE_FRILLS
1093void 1175void
1094rxvt_term::scr_forwardindex () 1176rxvt_term::scr_forwardindex ()
1095{ 1177{
1096 int row; 1178 int row;
1097 1179
1098 if (screen.cur.col < TermWin.ncol - 1) 1180 if (screen.cur.col < TermWin.ncol - 1)
1099 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1181 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1100 else 1182 else
1101 { 1183 {
1102 row = screen.cur.row + TermWin.saveLines; 1184 row = screen.cur.row + TermWin.saveLines;
1185
1103 if (screen.tlen[row] == 0) 1186 if (screen.tlen[row] == 0)
1104 return; /* um, yeah? */ 1187 return; /* um, yeah? */
1105 else if (screen.tlen[row] == -1) 1188 else if (screen.tlen[row] == -1)
1106 screen.tlen[row] = TermWin.ncol; 1189 screen.tlen[row] = TermWin.ncol;
1190
1107 scr_gotorc (0, 0, R_RELATIVE); 1191 scr_gotorc (0, 0, R_RELATIVE);
1108 scr_insdel_chars (1, DELETE); 1192 scr_insdel_chars (1, DELETE);
1109 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1193 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1110 } 1194 }
1111} 1195}
… …
1119rxvt_term::scr_gotorc (int row, int col, int relative) 1203rxvt_term::scr_gotorc (int row, int col, int relative)
1120{ 1204{
1121 want_refresh = 1; 1205 want_refresh = 1;
1122 ZERO_SCROLLBACK (); 1206 ZERO_SCROLLBACK ();
1123 1207
1124 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));
1125
1126 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1208 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1127 MAX_IT (screen.cur.col, 0); 1209 MAX_IT (screen.cur.col, 0);
1128 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1210 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1129 1211
1130 screen.flags &= ~Screen_WrapNext; 1212 screen.flags &= ~Screen_WrapNext;
1213
1131 if (relative & R_RELATIVE) 1214 if (relative & R_RELATIVE)
1132 { 1215 {
1133 if (row > 0) 1216 if (row > 0)
1134 { 1217 {
1135 if (screen.cur.row <= screen.bscroll 1218 if (screen.cur.row <= screen.bscroll
… …
1155 MIN_IT (screen.cur.row, screen.bscroll); 1238 MIN_IT (screen.cur.row, screen.bscroll);
1156 } 1239 }
1157 else 1240 else
1158 screen.cur.row = row; 1241 screen.cur.row = row;
1159 } 1242 }
1243
1160 MAX_IT (screen.cur.row, 0); 1244 MAX_IT (screen.cur.row, 0);
1161 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1245 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1162
1163 while (screen.cur.col > 0
1164 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1165 screen.cur.col--;
1166} 1246}
1167 1247
1168/* ------------------------------------------------------------------------- */ 1248/* ------------------------------------------------------------------------- */
1169/* 1249/*
1170 * direction should be UP or DN 1250 * direction should be UP or DN
1171 */ 1251 */
1172void 1252void
1173rxvt_term::scr_index (enum page_dirn direction) 1253rxvt_term::scr_index (enum page_dirn direction)
1174{ 1254{
1175 int dirn; 1255 int dirn;
1176 1256
1177 want_refresh = 1; 1257 want_refresh = 1;
1258 ZERO_SCROLLBACK ();
1259
1178 dirn = ((direction == UP) ? 1 : -1); 1260 dirn = ((direction == UP) ? 1 : -1);
1179 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1180
1181 ZERO_SCROLLBACK ();
1182 1261
1183 screen.flags &= ~Screen_WrapNext; 1262 screen.flags &= ~Screen_WrapNext;
1263
1184 if ((screen.cur.row == screen.bscroll && direction == UP) 1264 if ((screen.cur.row == screen.bscroll && direction == UP)
1185 || (screen.cur.row == screen.tscroll && direction == DN)) 1265 || (screen.cur.row == screen.tscroll && direction == DN))
1186 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1266 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1187 else 1267 else
1188 screen.cur.row += dirn; 1268 screen.cur.row += dirn;
1269
1189 MAX_IT (screen.cur.row, 0); 1270 MAX_IT (screen.cur.row, 0);
1190 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1271 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1191 selection_check (0); 1272 selection_check (0);
1192} 1273}
1193 1274
… …
1202rxvt_term::scr_erase_line (int mode) 1283rxvt_term::scr_erase_line (int mode)
1203{ 1284{
1204 unsigned int row, col, num; 1285 unsigned int row, col, num;
1205 1286
1206 want_refresh = 1; 1287 want_refresh = 1;
1207 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1208 ZERO_SCROLLBACK (); 1288 ZERO_SCROLLBACK ();
1209 1289
1210 selection_check (1); 1290 selection_check (1);
1211
1212 screen.flags &= ~Screen_WrapNext;
1213 1291
1214 row = TermWin.saveLines + screen.cur.row; 1292 row = TermWin.saveLines + screen.cur.row;
1215 switch (mode) 1293 switch (mode)
1216 { 1294 {
1217 case 0: /* erase to end of line */ 1295 case 0: /* erase to end of line */
… …
1261 int32_t row, row_offset; 1339 int32_t row, row_offset;
1262 rend_t ren; 1340 rend_t ren;
1263 XGCValues gcvalue; 1341 XGCValues gcvalue;
1264 1342
1265 want_refresh = 1; 1343 want_refresh = 1;
1266 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1267 ZERO_SCROLLBACK (); 1344 ZERO_SCROLLBACK ();
1345
1268 row_offset = (int32_t)TermWin.saveLines; 1346 row_offset = (int32_t)TermWin.saveLines;
1269 1347
1270 switch (mode) 1348 switch (mode)
1271 { 1349 {
1272 case 0: /* erase to end of screen */ 1350 case 0: /* erase to end of screen */
… …
1288 break; 1366 break;
1289 default: 1367 default:
1290 return; 1368 return;
1291 } 1369 }
1292 1370
1293 refresh_type |= REFRESH_BOUNDS;
1294
1295 if (selection.op && current_screen == selection.screen 1371 if (selection.op && current_screen == selection.screen
1296 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1372 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1297 || (selection.end.row >= row 1373 || (selection.end.row >= row
1298 && selection.end.row <= row + num))) 1374 && selection.end.row <= row + num)))
1299 CLEAR_SELECTION (); 1375 CLEAR_SELECTION ();
… …
1310 ren = DEFAULT_RSTYLE; 1386 ren = DEFAULT_RSTYLE;
1311 CLEAR_ROWS (row, num); 1387 CLEAR_ROWS (row, num);
1312 } 1388 }
1313 else 1389 else
1314 { 1390 {
1315 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1391 ren = rstyle & (RS_fgMask | RS_bgMask);
1316 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1392 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1317 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1393 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1318 ERASE_ROWS (row, num); 1394 ERASE_ROWS (row, num);
1319 gcvalue.foreground = PixColors[Color_fg]; 1395 gcvalue.foreground = pix_colors[Color_fg];
1320 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1396 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1321 } 1397 }
1322 1398
1323 for (; num--; row++) 1399 for (; num--; row++)
1324 { 1400 {
1325 scr_blank_screen_mem (screen.text, screen.rend, 1401 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);
1326 (unsigned int) (row + row_offset), rstyle);
1327 screen.tlen[row + row_offset] = 0; 1402 screen.tlen[row + row_offset] = 0;
1328 scr_blank_line (drawn_text[row], drawn_rend[row], 1403 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1329 (unsigned int)TermWin.ncol, ren);
1330 } 1404 }
1331} 1405}
1406
1407#if ENABLE_FRILLS
1408void
1409rxvt_term::scr_erase_savelines ()
1410{
1411 want_refresh = 1;
1412 ZERO_SCROLLBACK ();
1413
1414 TermWin.nscrolled = 0;
1415}
1416#endif
1332 1417
1333/* ------------------------------------------------------------------------- */ 1418/* ------------------------------------------------------------------------- */
1334/* 1419/*
1335 * Fill the screen with `E's 1420 * Fill the screen with `E's
1336 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1421 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1337 */ 1422 */
1338void 1423void
1339rxvt_term::scr_E () 1424rxvt_term::scr_E ()
1340{ 1425{
1341 int i, j, k; 1426 int i, j, k;
1342 rend_t *r1, fs; 1427 rend_t *r1, fs;
1343 1428
1344 want_refresh = 1; 1429 want_refresh = 1;
1430 ZERO_SCROLLBACK ();
1431
1345 num_scr_allow = 0; 1432 num_scr_allow = 0;
1346 ZERO_SCROLLBACK ();
1347 selection_check (3); 1433 selection_check (3);
1348 1434
1349 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1435 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1350 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1436 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1351 { 1437 {
1352 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1438 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1353 fill_text (screen.text[k], 'E', TermWin.ncol); 1439 fill_text (screen.text[k], 'E', TermWin.ncol);
1354 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1440 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
… …
1378 if (insdel == DELETE) 1464 if (insdel == DELETE)
1379 return; 1465 return;
1380 else if (insdel == INSERT) 1466 else if (insdel == INSERT)
1381 count = end; 1467 count = end;
1382 } 1468 }
1383 screen.flags &= ~Screen_WrapNext; 1469
1470 scr_do_wrap ();
1384 1471
1385 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1472 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1386} 1473}
1387 1474
1388/* ------------------------------------------------------------------------- */ 1475/* ------------------------------------------------------------------------- */
… …
1402 ZERO_SCROLLBACK (); 1489 ZERO_SCROLLBACK ();
1403 1490
1404 if (count <= 0) 1491 if (count <= 0)
1405 return; 1492 return;
1406 1493
1494 scr_do_wrap ();
1495
1407 selection_check (1); 1496 selection_check (1);
1408 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1497 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1409 1498
1410 row = screen.cur.row + TermWin.saveLines; 1499 row = screen.cur.row + TermWin.saveLines;
1411 screen.flags &= ~Screen_WrapNext;
1412 1500
1413 stp = screen.text[row]; 1501 stp = screen.text[row];
1414 srp = screen.rend[row]; 1502 srp = screen.rend[row];
1415 slp = & (screen.tlen[row]); 1503 slp = &screen.tlen[row];
1416 1504
1417 switch (insdel) 1505 switch (insdel)
1418 { 1506 {
1419 case INSERT: 1507 case INSERT:
1420 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1508 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1421 col--)
1422 { 1509 {
1423 stp[col] = stp[col - count]; 1510 stp[col] = stp[col - count];
1424 srp[col] = srp[col - count]; 1511 srp[col] = srp[col - count];
1425 } 1512 }
1426 1513
… …
1436 if (selection.end.row != screen.cur.row 1523 if (selection.end.row != screen.cur.row
1437 || (selection.end.col + count >= TermWin.ncol)) 1524 || (selection.end.col + count >= TermWin.ncol))
1438 CLEAR_SELECTION (); 1525 CLEAR_SELECTION ();
1439 else 1526 else
1440 { /* shift selection */ 1527 { /* shift selection */
1441 selection.beg.col += count; 1528 selection.beg.col += count;
1442 selection.mark.col += count; /* XXX: yes? */ 1529 selection.mark.col += count; /* XXX: yes? */
1443 selection.end.col += count; 1530 selection.end.col += count;
1444 } 1531 }
1445 } 1532 }
1446 1533
1447 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1534 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1448 (unsigned int)count, rstyle); 1535 (unsigned int)count, rstyle);
1449 break; 1536 break;
1450 1537
1451 case ERASE: 1538 case ERASE:
1452 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1539 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1453 selection_check (1); 1540 selection_check (1);
1454 screen.cur.col -= count; 1541 screen.cur.col -= count;
1455 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1542 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1456 (unsigned int)count, rstyle); 1543 (unsigned int)count, rstyle);
1457 break; 1544 break;
1458 1545
1459 case DELETE: 1546 case DELETE:
1460 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1547 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1463 { 1550 {
1464 stp[col] = stp[col + count]; 1551 stp[col] = stp[col + count];
1465 srp[col] = srp[col + count]; 1552 srp[col] = srp[col + count];
1466 } 1553 }
1467 1554
1468 scr_blank_line (& (stp[TermWin.ncol - count]), 1555 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1469 & (srp[TermWin.ncol - count]),
1470 (unsigned int)count, tr); 1556 (unsigned int)count, tr);
1471 1557
1472 if (*slp == -1) /* break line continuation */ 1558 if (*slp == -1) /* break line continuation */
1473 *slp = TermWin.ncol; 1559 *slp = TermWin.ncol;
1474 1560
… …
1483 || selection.end.col >= TermWin.ncol) 1569 || selection.end.col >= TermWin.ncol)
1484 CLEAR_SELECTION (); 1570 CLEAR_SELECTION ();
1485 else 1571 else
1486 { 1572 {
1487 /* shift selection */ 1573 /* shift selection */
1488 selection.beg.col -= count; 1574 selection.beg.col -= count;
1489 selection.mark.col -= count; /* XXX: yes? */ 1575 selection.mark.col -= count; /* XXX: yes? */
1490 selection.end.col -= count; 1576 selection.end.col -= count;
1491 } 1577 }
1492 } 1578 }
1493 1579
1494 break; 1580 break;
1495 } 1581 }
… …
1541rxvt_term::scr_autowrap (int mode) 1627rxvt_term::scr_autowrap (int mode)
1542{ 1628{
1543 if (mode) 1629 if (mode)
1544 screen.flags |= Screen_Autowrap; 1630 screen.flags |= Screen_Autowrap;
1545 else 1631 else
1546 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1632 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1547} 1633}
1548 1634
1549/* ------------------------------------------------------------------------- */ 1635/* ------------------------------------------------------------------------- */
1550/* 1636/*
1551 * Set/unset margin origin mode 1637 * Set/unset margin origin mode
… …
1561{ 1647{
1562 if (mode) 1648 if (mode)
1563 screen.flags |= Screen_Relative; 1649 screen.flags |= Screen_Relative;
1564 else 1650 else
1565 screen.flags &= ~Screen_Relative; 1651 screen.flags &= ~Screen_Relative;
1652
1566 scr_gotorc (0, 0, 0); 1653 scr_gotorc (0, 0, 0);
1567} 1654}
1568 1655
1569/* ------------------------------------------------------------------------- */ 1656/* ------------------------------------------------------------------------- */
1570/* 1657/*
… …
1590 */ 1677 */
1591void 1678void
1592rxvt_term::scr_set_tab (int mode) 1679rxvt_term::scr_set_tab (int mode)
1593{ 1680{
1594 if (mode < 0) 1681 if (mode < 0)
1595 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1682 memset (tabs, 0, TermWin.ncol * sizeof (char));
1596 else if (screen.cur.col < TermWin.ncol) 1683 else if (screen.cur.col < TermWin.ncol)
1597 tabs[screen.cur.col] = (mode ? 1 : 0); 1684 tabs[screen.cur.col] = (mode ? 1 : 0);
1598} 1685}
1599 1686
1600/* ------------------------------------------------------------------------- */ 1687/* ------------------------------------------------------------------------- */
… …
1604 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1691 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1605 */ 1692 */
1606void 1693void
1607rxvt_term::scr_rvideo_mode (int mode) 1694rxvt_term::scr_rvideo_mode (int mode)
1608{ 1695{
1609 XGCValues gcvalue; 1696 XGCValues gcvalue;
1610 1697
1611 if (rvideo != mode) 1698 if (rvideo != mode)
1612 { 1699 {
1613 rvideo = mode; 1700 rvideo = mode;
1614 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1701 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1615#if defined(XPM_BACKGROUND) 1702#if XPM_BACKGROUND
1616 if (bgPixmap.pixmap == None) 1703 if (bgPixmap.pixmap == None)
1617#endif 1704#endif
1618#if defined(TRANSPARENT) 1705#if TRANSPARENT
1619 if (! (Options & Opt_transparent) || am_transparent == 0) 1706 if (! (options & Opt_transparent) || am_transparent == 0)
1620#endif 1707#endif
1621 XSetWindowBackground (display->display, TermWin.vt, 1708 XSetWindowBackground (display->display, TermWin.vt,
1622 PixColors[Color_bg]); 1709 pix_colors[Color_bg]);
1623 1710
1624 gcvalue.foreground = PixColors[Color_fg]; 1711 gcvalue.foreground = pix_colors[Color_fg];
1625 gcvalue.background = PixColors[Color_bg]; 1712 gcvalue.background = pix_colors[Color_bg];
1626 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1713 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1627 &gcvalue); 1714 &gcvalue);
1628 scr_clear (); 1715 scr_clear ();
1629 scr_touch (true); 1716 scr_touch (true);
1630 } 1717 }
… …
1678 * XTERM_SEQ: Invoke G2 character set: ESC N 1765 * XTERM_SEQ: Invoke G2 character set: ESC N
1679 * XTERM_SEQ: Invoke G3 character set: ESC O 1766 * XTERM_SEQ: Invoke G3 character set: ESC O
1680 */ 1767 */
1681void 1768void
1682rxvt_term::scr_charset_choose (int set) 1769rxvt_term::scr_charset_choose (int set)
1683 { 1770{
1684 screen.charset = set; 1771 screen.charset = set;
1685 set_font_style (); 1772 set_font_style ();
1686 } 1773}
1687 1774
1688/* ------------------------------------------------------------------------- */ 1775/* ------------------------------------------------------------------------- */
1689/* 1776/*
1690 * Set a font 1777 * Set a font
1691 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1778 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1694 * XTERM_SEQ: Set G3 character set: ESC + <C> 1781 * XTERM_SEQ: Set G3 character set: ESC + <C>
1695 * See set_font_style for possible values for <C> 1782 * See set_font_style for possible values for <C>
1696 */ 1783 */
1697void 1784void
1698rxvt_term::scr_charset_set (int set, unsigned int ch) 1785rxvt_term::scr_charset_set (int set, unsigned int ch)
1699 { 1786{
1700 charsets[set] = (unsigned char)ch; 1787 charsets[set] = (unsigned char)ch;
1701 set_font_style (); 1788 set_font_style ();
1702 } 1789}
1703 1790
1704 1791
1705/* ------------------------------------------------------------------------- * 1792/* ------------------------------------------------------------------------- *
1706 * MAJOR SCREEN MANIPULATION * 1793 * MAJOR SCREEN MANIPULATION *
1707 * ------------------------------------------------------------------------- */ 1794 * ------------------------------------------------------------------------- */
… …
1746 row_col_t rc[RC_COUNT]; 1833 row_col_t rc[RC_COUNT];
1747 1834
1748 if (drawn_text == NULL) /* sanity check */ 1835 if (drawn_text == NULL) /* sanity check */
1749 return; 1836 return;
1750 1837
1838#ifndef NO_SLOW_LINK_SUPPORT
1839 if (refresh_type == FAST_REFRESH && !display->is_local)
1840 {
1841 y = 0;
1842 height = TermWin.height;
1843 }
1844#endif
1845
1751#ifdef DEBUG_STRICT 1846#ifdef DEBUG_STRICT
1752 x = max (x, (int)TermWin.int_bwidth); 1847 x = max (x, 0);
1753 x = min (x, (int)TermWin.width); 1848 x = min (x, (int)TermWin.width);
1754 y = max (y, (int)TermWin.int_bwidth); 1849 y = max (y, 0);
1755 y = min (y, (int)TermWin.height); 1850 y = min (y, (int)TermWin.height);
1756#endif 1851#endif
1757 1852
1758 /* round down */ 1853 /* round down */
1759 rc[PART_BEG].col = Pixel2Col (x); 1854 rc[PART_BEG].col = Pixel2Col (x);
… …
1767 { 1862 {
1768 MIN_IT (rc[i].col, TermWin.ncol - 1); 1863 MIN_IT (rc[i].col, TermWin.ncol - 1);
1769 MIN_IT (rc[i].row, TermWin.nrow - 1); 1864 MIN_IT (rc[i].row, TermWin.nrow - 1);
1770 } 1865 }
1771 1866
1772 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));
1773
1774 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1867 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1775 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1868 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1776 1869
1777 if (refresh) 1870 if (refresh)
1778 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1871 scr_refresh (SLOW_REFRESH);
1779} 1872}
1780 1873
1781/* ------------------------------------------------------------------------- */ 1874/* ------------------------------------------------------------------------- */
1782/* 1875/*
1783 * Refresh the entire screen 1876 * Refresh the entire screen
… …
1795 */ 1888 */
1796int 1889int
1797rxvt_term::scr_move_to (int y, int len) 1890rxvt_term::scr_move_to (int y, int len)
1798{ 1891{
1799 long p = 0; 1892 long p = 0;
1800 uint16_t oldviewstart; 1893 unsigned int oldviewstart;
1801 1894
1802 oldviewstart = TermWin.view_start; 1895 oldviewstart = TermWin.view_start;
1896
1803 if (y < len) 1897 if (y < len)
1804 { 1898 {
1805 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1899 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1806 p -= (long) (TermWin.nrow - 1); 1900 p -= (long) (TermWin.nrow - 1);
1807 p = max (p, 0); 1901 p = max (p, 0);
1808 } 1902 }
1903
1809 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1904 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1810 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1811 1905
1812 return scr_changeview (oldviewstart); 1906 return scr_changeview (oldviewstart);
1813} 1907}
1814 1908
1815/* ------------------------------------------------------------------------- */ 1909/* ------------------------------------------------------------------------- */
… …
1818 * direction should be UP or DN 1912 * direction should be UP or DN
1819 */ 1913 */
1820int 1914int
1821rxvt_term::scr_page (enum page_dirn direction, int nlines) 1915rxvt_term::scr_page (enum page_dirn direction, int nlines)
1822{ 1916{
1823 int n; 1917 int n;
1824 uint16_t oldviewstart; 1918 unsigned int oldviewstart;
1825 1919
1826 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1827#ifdef DEBUG_STRICT
1828 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1829#endif
1830 oldviewstart = TermWin.view_start; 1920 oldviewstart = TermWin.view_start;
1921
1831 if (direction == UP) 1922 if (direction == UP)
1832 { 1923 {
1833 n = TermWin.view_start + nlines; 1924 n = TermWin.view_start + nlines;
1834 TermWin.view_start = min (n, TermWin.nscrolled); 1925 TermWin.view_start = min (n, TermWin.nscrolled);
1835 } 1926 }
1836 else 1927 else
1837 { 1928 {
1838 n = TermWin.view_start - nlines; 1929 n = TermWin.view_start - nlines;
1839 TermWin.view_start = max (n, 0); 1930 TermWin.view_start = max (n, 0);
1840 } 1931 }
1932
1841 return scr_changeview (oldviewstart); 1933 return scr_changeview (oldviewstart);
1842} 1934}
1843 1935
1844int 1936int
1845rxvt_term::scr_changeview (uint16_t oldviewstart) 1937rxvt_term::scr_changeview (unsigned int oldviewstart)
1846{ 1938{
1847 if (TermWin.view_start != oldviewstart) 1939 if (TermWin.view_start != oldviewstart)
1848 { 1940 {
1849 want_refresh = 1; 1941 want_refresh = 1;
1850 num_scr -= (TermWin.view_start - oldviewstart); 1942 num_scr -= (TermWin.view_start - oldviewstart);
… …
1856/* ------------------------------------------------------------------------- */ 1948/* ------------------------------------------------------------------------- */
1857void 1949void
1858rxvt_term::scr_bell () 1950rxvt_term::scr_bell ()
1859{ 1951{
1860#ifndef NO_BELL 1952#ifndef NO_BELL
1953
1861# ifndef NO_MAPALERT 1954# ifndef NO_MAPALERT
1862# ifdef MAPALERT_OPTION 1955# ifdef MAPALERT_OPTION
1863 if (Options & Opt_mapAlert) 1956 if (options & Opt_mapAlert)
1864# endif 1957# endif
1865 XMapWindow (display->display, TermWin.parent[0]); 1958 XMapWindow (display->display, TermWin.parent[0]);
1866# endif 1959# endif
1960
1867 if (Options & Opt_visualBell) 1961 if (options & Opt_visualBell)
1868 { 1962 {
1869 scr_rvideo_mode (!rvideo); /* refresh also done */ 1963 scr_rvideo_mode (!rvideo); /* refresh also done */
1964 rxvt_usleep (VISUAL_BELL_DURATION);
1870 scr_rvideo_mode (!rvideo); /* refresh also done */ 1965 scr_rvideo_mode (!rvideo); /* refresh also done */
1871 } 1966 }
1872 else 1967 else
1873 XBell (display->display, 0); 1968 XBell (display->display, 0);
1969
1874#endif 1970#endif
1875} 1971}
1876 1972
1877/* ------------------------------------------------------------------------- */ 1973/* ------------------------------------------------------------------------- */
1878/* ARGSUSED */ 1974/* ARGSUSED */
1879void 1975void
1880rxvt_term::scr_printscreen (int fullhist) 1976rxvt_term::scr_printscreen (int fullhist)
1881{ 1977{
1882#ifdef PRINTPIPE 1978#ifdef PRINTPIPE
1883 int i, r1, nrows, row_offset; 1979 int i, r1, nrows, row_offset;
1884 text_t *t; 1980 FILE *fd;
1885 FILE *fd;
1886 1981
1887 if ((fd = popen_printer ()) == NULL) 1982 if ((fd = popen_printer ()) == NULL)
1888 return; 1983 return;
1984
1889 nrows = TermWin.nrow; 1985 nrows = TermWin.nrow;
1890 row_offset = TermWin.saveLines; 1986 row_offset = TermWin.saveLines;
1987
1891 if (!fullhist) 1988 if (!fullhist)
1892 row_offset -= TermWin.view_start; 1989 row_offset -= TermWin.view_start;
1893 else 1990 else
1894 { 1991 {
1895 nrows += TermWin.nscrolled; 1992 nrows += TermWin.nscrolled;
1896 row_offset -= TermWin.nscrolled; 1993 row_offset -= TermWin.nscrolled;
1897 } 1994 }
1898 1995
1996 wctomb (0, 0);
1997
1899 for (r1 = 0; r1 < nrows; r1++) 1998 for (r1 = 0; r1 < nrows; r1++)
1900 { 1999 {
1901 t = screen.text[r1 + row_offset]; 2000 text_t *tp = screen.text[r1 + row_offset];
1902 for (i = TermWin.ncol - 1; i >= 0; i--) 2001 int len = screen.tlen[r1 + row_offset];
1903 if (!isspace (t[i])) 2002
1904 break; 2003 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1905 fprintf (fd, "%.*s\n", (i + 1), t); 2004 {
2005 char mb[MB_LEN_MAX];
2006 text_t t = *tp++;
2007 if (t == NOCHAR)
2008 continue;
2009
2010 len = wctomb (mb, t);
2011
2012 if (len <= 0)
2013 {
2014 mb[0] = ' ';
2015 len = 1;
2016 }
2017
2018 fwrite (mb, 1, len, fd);
2019 }
2020
2021 fputc ('\n', fd);
1906 } 2022 }
2023
1907 pclose_printer (fd); 2024 pclose_printer (fd);
1908#endif 2025#endif
1909} 2026}
1910 2027
1911/* ------------------------------------------------------------------------- */ 2028/* ------------------------------------------------------------------------- */
1912/* 2029/*
1913 * Refresh the screen 2030 * Refresh the screen
1914 * drawn_text/drawn_rend contain the screen information before the update. 2031 * drawn_text/drawn_rend contain the screen information before the update.
1915 * screen.text/screen.rend contain what the screen will change to. 2032 * screen.text/screen.rend contain what the screen will change to.
1916 */ 2033 */
1917
1918#define FONT_WIDTH(X, Y) \
1919 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
1920#define FONT_RBEAR(X, Y) \
1921 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
1922#define FONT_LBEAR(X, Y) \
1923 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
1924#define IS_FONT_CHAR(X, Y) \
1925 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1926
1927void 2034void
1928rxvt_term::scr_refresh (unsigned char refresh_type) 2035rxvt_term::scr_refresh (unsigned char refresh_type)
1929{ 2036{
1930 unsigned char clearfirst, /* first character writes before cell */
1931 clearlast, /* last character writes beyond cell */
1932 must_clear, /* use draw_string not draw_image_string */ 2037 unsigned char must_clear, /* use draw_string not draw_image_string */
1933 rvid, /* reverse video this position */
1934 showcursor; /* show the cursor */ 2038 showcursor; /* show the cursor */
1935 int16_t col, row, /* column/row we're processing */ 2039 int16_t col, row, /* column/row we're processing */
1936 ocrow; /* old cursor row */ 2040 ocrow; /* old cursor row */
1937 int i, /* tmp */ 2041 int i, /* tmp */
1938 row_offset; /* basic offset in screen structure */ 2042 row_offset; /* basic offset in screen structure */
1939#ifndef NO_CURSORCOLOR 2043#ifndef NO_CURSORCOLOR
1940 rend_t cc1; /* store colours at cursor position (s) */ 2044 rend_t cc1; /* store colours at cursor position (s) */
1941#endif 2045#endif
1942 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2046 rend_t *crp; // cursor rendition pointer
1943 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2047
2048 want_refresh = 0; /* screen is current */
1944 2049
1945 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2050 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1946 return; 2051 return;
1947 2052
1948 /* 2053 /*
1949 * A: set up vars 2054 * A: set up vars
1950 */ 2055 */
1951 clearfirst = clearlast = must_clear = 0; 2056 must_clear = 0;
1952
1953 refresh_count = 0; 2057 refresh_count = 0;
1954 2058
1955 row_offset = TermWin.saveLines - TermWin.view_start; 2059 row_offset = TermWin.saveLines - TermWin.view_start;
1956 2060
1957 if ((refresh_type & REFRESH_BOUNDS))
1958 {
1959 clearfirst = clearlast = 1;
1960 refresh_type &= ~REFRESH_BOUNDS;
1961 }
1962
1963#ifdef XPM_BACKGROUND 2061#if XPM_BACKGROUND
1964 must_clear |= (bgPixmap.pixmap != None); 2062 must_clear |= bgPixmap.pixmap != None;
1965#endif 2063#endif
1966#ifdef TRANSPARENT 2064#if TRANSPARENT
1967 must_clear |= ((Options & Opt_transparent) && am_transparent); 2065 must_clear |= (options & Opt_transparent) && am_transparent;
1968#endif 2066#endif
1969 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2067 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1970 2068
1971 /* 2069 /*
1972 * B: reverse any characters which are selected 2070 * B: reverse any characters which are selected
… …
1987 showcursor = 0; 2085 showcursor = 0;
1988#endif 2086#endif
1989 2087
1990 if (showcursor) 2088 if (showcursor)
1991 { 2089 {
2090 int col = screen.cur.col;
2091
2092 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2093 col--;
2094
1992 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 2095 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1993 2096
1994 if (showcursor && TermWin.focus) 2097 if (showcursor && TermWin.focus)
1995 { 2098 {
2099 if (options & Opt_cursorUnderline)
2100 *crp ^= RS_Uline;
2101 else
2102 {
1996 *srp ^= RS_RVid; 2103 *crp ^= RS_RVid;
2104
1997#ifndef NO_CURSORCOLOR 2105#ifndef NO_CURSORCOLOR
1998 cc1 = *srp & (RS_fgMask | RS_bgMask); 2106 cc1 = *crp & (RS_fgMask | RS_bgMask);
1999 if (ISSET_PIXCOLOR (Color_cursor)) 2107 if (ISSET_PIXCOLOR (Color_cursor))
2000 ccol1 = Color_cursor; 2108 ccol1 = Color_cursor;
2001 else 2109 else
2002#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2110#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2003 ccol1 = GET_FGCOLOR (rstyle); 2111 ccol1 = GET_FGCOLOR (rstyle);
2004#else 2112#else
2005 ccol1 = Color_fg; 2113 ccol1 = Color_fg;
2006#endif 2114#endif
2007 if (ISSET_PIXCOLOR (Color_cursor2)) 2115 if (ISSET_PIXCOLOR (Color_cursor2))
2008 ccol2 = Color_cursor2; 2116 ccol2 = Color_cursor2;
2009 else 2117 else
2010#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2118#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2011 ccol2 = GET_BGCOLOR (rstyle); 2119 ccol2 = GET_BGCOLOR (rstyle);
2012#else 2120#else
2013 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2014#endif 2122#endif
2015 *srp = SET_FGCOLOR (*srp, ccol1); 2123 *crp = SET_FGCOLOR (*crp, ccol1);
2016 *srp = SET_BGCOLOR (*srp, ccol2); 2124 *crp = SET_BGCOLOR (*crp, ccol2);
2017#endif 2125#endif
2126 }
2018 } 2127 }
2019 } 2128 }
2020 2129
2021 /* make sure no outline cursor is left around */ 2130 /* make sure no outline cursor is left around */
2022 setoldcursor = 0; 2131 setoldcursor = 0;
… …
2048 oldcursor.col = screen.cur.col; 2157 oldcursor.col = screen.cur.col;
2049 } 2158 }
2050 } 2159 }
2051 } 2160 }
2052 2161
2162#if ENABLE_OVERLAY
2163 scr_swap_overlay ();
2164#endif
2165
2166 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2167 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2168
2053#ifndef NO_SLOW_LINK_SUPPORT 2169#ifndef NO_SLOW_LINK_SUPPORT
2054 /* 2170 /*
2055 * D: CopyArea pass - very useful for slower links 2171 * D: CopyArea pass - very useful for slower links
2056 * This has been deliberately kept simple. 2172 * This has been deliberately kept simple.
2057 */ 2173 */
2058 i = num_scr; 2174 i = num_scr;
2175 if (!display->is_local
2059 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2176 && refresh_type == FAST_REFRESH && num_scr_allow && i
2060 && abs (i) < TermWin.nrow && !must_clear) 2177 && abs (i) < TermWin.nrow && !must_clear)
2061 { 2178 {
2062 int16_t nits; 2179 int16_t nits;
2063 int j; 2180 int j;
2064 rend_t *drp2;
2065 text_t *dtp2;
2066 int len, wlen; 2181 int len, wlen;
2067 2182
2068 j = TermWin.nrow; 2183 j = TermWin.nrow;
2069 wlen = len = -1; 2184 wlen = len = -1;
2070 row = i > 0 ? 0 : j - 1; 2185 row = i > 0 ? 0 : j - 1;
2071 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2186 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2072 { 2187 {
2073 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2188 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2074 { 2189 {
2075 stp = screen.text[row + row_offset]; 2190 text_t *stp = screen.text[row + row_offset];
2076 srp = screen.rend[row + row_offset]; 2191 rend_t *srp = screen.rend[row + row_offset];
2077 dtp = drawn_text[row]; 2192 text_t *dtp = drawn_text[row];
2078 dtp2 = drawn_text[row + i]; 2193 text_t *dtp2 = drawn_text[row + i];
2079 drp = drawn_rend[row]; 2194 rend_t *drp = drawn_rend[row];
2080 drp2 = drawn_rend[row + i]; 2195 rend_t *drp2 = drawn_rend[row + i];
2081 2196
2082 for (nits = 0, col = TermWin.ncol; col--; ) 2197 for (nits = 0, col = TermWin.ncol; col--; )
2083 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2198 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2084 nits--; 2199 nits--;
2085 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2200 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2105 { 2220 {
2106 /* also comes here at end if needed because of >= above */ 2221 /* also comes here at end if needed because of >= above */
2107 if (wlen < len) 2222 if (wlen < len)
2108 SWAP_IT (wlen, len, int); 2223 SWAP_IT (wlen, len, int);
2109 2224
2110 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2111 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2225 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2112 TermWin.gc, 0, Row2Pixel (len + i), 2226 TermWin.gc, 0, Row2Pixel (len + i),
2113 (unsigned int)TermWin_TotalWidth (), 2227 (unsigned int)TermWin_TotalWidth (),
2114 (unsigned int)Height2Pixel (wlen - len + 1), 2228 (unsigned int)Height2Pixel (wlen - len + 1),
2115 0, Row2Pixel (len)); 2229 0, Row2Pixel (len));
… …
2122 /* 2236 /*
2123 * E: main pass across every character 2237 * E: main pass across every character
2124 */ 2238 */
2125 for (row = 0; row < TermWin.nrow; row++) 2239 for (row = 0; row < TermWin.nrow; row++)
2126 { 2240 {
2127 stp = screen.text[row + row_offset]; 2241 text_t *stp = screen.text[row + row_offset];
2128 srp = screen.rend[row + row_offset]; 2242 rend_t *srp = screen.rend[row + row_offset];
2129 dtp = drawn_text[row]; 2243 text_t *dtp = drawn_text[row];
2130 drp = drawn_rend[row]; 2244 rend_t *drp = drawn_rend[row];
2131 2245
2132 /* 2246 /*
2133 * E2: OK, now the real pass 2247 * E2: OK, now the real pass
2134 */ 2248 */
2135 int ypixel = (int)Row2Pixel (row); 2249 int ypixel = (int)Row2Pixel (row);
2136 2250
2137 for (col = 0; col < TermWin.ncol; col++) 2251 for (col = 0; col < TermWin.ncol; col++)
2138 { 2252 {
2139 /* compare new text with old - if exactly the same then continue */ 2253 /* compare new text with old - if exactly the same then continue */
2140 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2254 if (stp[col] == dtp[col] /* Must match characters to skip. */
2141 && (srp[col] == drp[col] /* Either rendition the same or */ 2255 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2142 || (stp[col] == ' ' /* space w/ no background change */ 2256 || (stp[col] == ' ' /* space w/ no background change */
2143 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2257 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2144 continue; 2258 continue;
2145 2259
2146 // redraw one or more characters 2260 // redraw one or more characters
2147 2261
2148 // seek to the beginning if wide characters 2262 // seek to the beginning of wide characters
2149 while (stp[col] == NOCHAR && col > 0) 2263 while (stp[col] == NOCHAR && col > 0)
2150 --col; 2264 --col;
2151 2265
2152 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2266 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2153 text_t *text = stp + col; 2267 text_t *text = stp + col;
… …
2156 dtp[col] = stp[col]; 2270 dtp[col] = stp[col];
2157 drp[col] = rend; 2271 drp[col] = rend;
2158 2272
2159 int xpixel = Col2Pixel (col); 2273 int xpixel = Col2Pixel (col);
2160 2274
2161 // this loop looks very messy, it can probably be optimized
2162 // and cleaned a bit by you?
2163 for (i = 0; ++col < TermWin.ncol; ) 2275 for (i = 0; ++col < TermWin.ncol; )
2164 { 2276 {
2165 if (stp[col] == NOCHAR) 2277 if (stp[col] == NOCHAR)
2166 { 2278 {
2167 dtp[col] = stp[col]; 2279 dtp[col] = stp[col];
2168 drp[col] = rend; 2280 drp[col] = rend;
2169 count++; 2281 count++;
2170
2171 if (i) // only possible skip if char unchanged
2172 i++; 2282 i++;
2173 2283
2174 continue; 2284 continue;
2175 } 2285 }
2176 2286
2177 if (rend != srp[col]) 2287 if (!RS_SAME (rend, srp[col]))
2178 break; 2288 break;
2179 2289
2180 count++; 2290 count++;
2181 2291
2182 if (stp[col] != dtp[col] 2292 if (stp[col] != dtp[col]
2183 || srp[col] != drp[col]) 2293 || !RS_SAME (srp[col], drp[col]))
2184 { 2294 {
2185 if (must_clear && (i++ > (count / 2))) 2295 if (must_clear && (i++ > count / 2))
2186 break; 2296 break;
2187 2297
2188 dtp[col] = stp[col]; 2298 dtp[col] = stp[col];
2189 drp[col] = rend; 2299 drp[col] = rend;
2190 i = 0; 2300 i = 0;
2191 } 2301 }
2192 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2302 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2193 break; 2303 break;
2194 } 2304 }
2195 2305
2196 col--; /* went one too far. move back */ 2306 col--; /* went one too far. move back */
2197 count -= i; /* dump any matching trailing chars */ 2307 count -= i; /* dump any matching trailing chars */
2308
2309 // sometimes we optimize away the trailing NOCHAR's, add them back
2310 while (i && text[count] == NOCHAR)
2311 count++, i--;
2198 2312
2199 /* 2313 /*
2200 * Determine the attributes for the string 2314 * Determine the attributes for the string
2201 */ 2315 */
2202 int fid = GET_FONT (rend);
2203 int fore = GET_FGCOLOR (rend); // desired foreground 2316 int fore = GET_FGCOLOR (rend); // desired foreground
2204 int back = GET_BGCOLOR (rend); // desired background 2317 int back = GET_BGCOLOR (rend); // desired background
2205 2318
2206 rend = GET_ATTR (rend); 2319 // only do special processing if any attributes are set, which is rare
2320 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2321 {
2322#if ENABLE_STYLES
2323 // force redraw after "careful" characters to avoid pixel droppings
2324 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2325 drp[col + 1] = ~srp[col + 1];
2207 2326
2208 rvid = !!(rend & RS_RVid); 2327 // include previous careful character(s) if possible, looks nicer (best effort...)
2328 while (text > stp
2329 && srp[text - stp - 1] & RS_Careful
2330 && RS_SAME (rend, srp[text - stp - 1]))
2331 text--, count++, xpixel -= TermWin.fwidth;
2332#endif
2333
2334 bool invert = rend & RS_RVid;
2209 2335
2210#ifndef NO_BOLD_UNDERLINE_REVERSE 2336#ifndef NO_BOLD_UNDERLINE_REVERSE
2211 if (rend & RS_Bold && fore == Color_fg) 2337 if (rend & RS_Bold
2338 && fore == Color_fg)
2212 { 2339 {
2213 if (ISSET_PIXCOLOR (Color_BD)) 2340 if (ISSET_PIXCOLOR (Color_BD))
2214 fore = Color_BD; 2341 fore = Color_BD;
2342# if !ENABLE_STYLES
2215 else 2343 else
2216 rvid = !rvid; 2344 invert = !invert;
2345# endif
2346 }
2347
2348 if (rend & RS_Italic
2349 && fore == Color_fg)
2350 {
2351 if (ISSET_PIXCOLOR (Color_IT))
2352 fore = Color_IT;
2353# if !ENABLE_STYLES
2354 else
2355 invert = !invert;
2356# endif
2357 }
2358
2359 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2360 fore = Color_UL;
2361#endif
2362
2363 if (invert)
2364 {
2365 SWAP_IT (fore, back, int);
2366
2367#ifndef NO_BOLD_UNDERLINE_REVERSE
2368 if (ISSET_PIXCOLOR (Color_RV))
2369 back = Color_RV;
2370
2371 if (fore == back)
2372 {
2373 fore = Color_bg;
2374 back = Color_fg;
2375 }
2376#endif
2377 }
2378
2379#ifdef TEXT_BLINK
2380 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2381 {
2382 if (!text_blink_ev.active)
2383 {
2384 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2385 hidden_text = 0;
2386 }
2387 else if (hidden_text)
2388 fore = back;
2389 }
2390#endif
2217 } 2391 }
2218
2219 if (rend & RS_Uline)
2220 if (ISSET_PIXCOLOR (Color_UL))
2221 fore = Color_UL;
2222#endif
2223
2224 if (rvid)
2225 {
2226 SWAP_IT (fore, back, int);
2227
2228#ifndef NO_BOLD_UNDERLINE_REVERSE
2229 if (ISSET_PIXCOLOR (Color_RV)
2230# ifndef NO_CURSORCOLOR
2231 && !ISSET_PIXCOLOR (Color_cursor)
2232# endif
2233 )
2234 back = Color_RV;
2235#endif
2236 }
2237
2238#ifdef TEXT_BLINK
2239 if (rend & RS_Blink && back == Color_bg)
2240 {
2241 if (!text_blink_ev.active)
2242 {
2243 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2244 hidden_text = 0;
2245 }
2246 else if (hidden_text)
2247 fore = back;
2248 }
2249#endif
2250 2392
2251 /* 2393 /*
2252 * Actually do the drawing of the string here 2394 * Actually do the drawing of the string here
2253 */ 2395 */
2254 rxvt_font *font = (*TermWin.fontset)[fid]; 2396 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2255 2397
2256 if (back == fore) 2398 if (back == fore)
2257 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2399 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2258 TermWin.fwidth * count, TermWin.fheight, 2400 TermWin.fwidth * count, TermWin.fheight,
2259 back); 2401 back);
… …
2274 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2416 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2275 } 2417 }
2276 else 2418 else
2277 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2419 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2278 2420
2279 if ((rend & RS_Uline) && (font->descent > 1)) 2421 if (rend & RS_Uline && font->descent > 1 && fore != back)
2422 {
2423#if ENABLE_FRILLS
2424 if (ISSET_PIXCOLOR (Color_underline))
2425 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
2426 else
2427#endif
2428 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2429
2280 XDrawLine (display->display, drawBuffer, TermWin.gc, 2430 XDrawLine (display->display, drawBuffer, TermWin.gc,
2281 xpixel, ypixel + font->ascent + 1, 2431 xpixel, ypixel + font->ascent + 1,
2282 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2432 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2433 }
2283 } /* for (col....) */ 2434 } /* for (col....) */
2284 } /* for (row....) */ 2435 } /* for (row....) */
2436
2437#if ENABLE_OVERLAY
2438 scr_swap_overlay ();
2439#endif
2285 2440
2286 /* 2441 /*
2287 * G: cleanup cursor and display outline cursor if necessary 2442 * G: cleanup cursor and display outline cursor if necessary
2288 */ 2443 */
2289 if (showcursor) 2444 if (showcursor)
2290 { 2445 {
2291 if (TermWin.focus) 2446 if (TermWin.focus)
2292 { 2447 {
2293 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 2448 if (options & Opt_cursorUnderline)
2294 [screen.cur.col]); 2449 *crp ^= RS_Uline;
2450 else
2451 {
2295 *srp ^= RS_RVid; 2452 *crp ^= RS_RVid;
2296#ifndef NO_CURSORCOLOR 2453#ifndef NO_CURSORCOLOR
2297 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2454 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2298#endif 2455#endif
2456 }
2299 } 2457 }
2300 else if (oldcursor.row >= 0) 2458 else if (oldcursor.row >= 0)
2301 { 2459 {
2460 int cursorwidth = 1;
2461 int col = oldcursor.col;
2462
2463 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2464 col--;
2465
2466 while (col + cursorwidth < TermWin.ncol
2467 && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR)
2468 cursorwidth++;
2469
2302#ifndef NO_CURSORCOLOR 2470#ifndef NO_CURSORCOLOR
2303 if (ISSET_PIXCOLOR (Color_cursor)) 2471 if (ISSET_PIXCOLOR (Color_cursor))
2304 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2472 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2305#endif 2473#endif
2306 int cursorwidth = 1;
2307 while (oldcursor.col + cursorwidth < TermWin.ncol
2308 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2309 cursorwidth++;
2310 2474
2311 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2475 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2312 Col2Pixel (oldcursor.col), 2476 Col2Pixel (col),
2313 Row2Pixel (oldcursor.row), 2477 Row2Pixel (oldcursor.row),
2314 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2478 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2315 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2479 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2316 } 2480 }
2317 } 2481 }
… …
2319 /* 2483 /*
2320 * H: cleanup selection 2484 * H: cleanup selection
2321 */ 2485 */
2322 scr_reverse_selection (); 2486 scr_reverse_selection ();
2323 2487
2324 /*
2325 * I: other general cleanup
2326 */
2327 if (clearfirst && 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, 0, 0,
2333 (unsigned int)TermWin.int_bwidth,
2334 (unsigned int)TermWin_TotalHeight (), False);
2335
2336 if (clearlast && TermWin.int_bwidth)
2337 /*
2338 * clear the whole screen height, note that width == 0 is treated
2339 * specially by XClearArea
2340 */
2341 XClearArea (display->display, TermWin.vt,
2342 TermWin.width + TermWin.int_bwidth, 0,
2343 (unsigned int)TermWin.int_bwidth,
2344 (unsigned int)TermWin_TotalHeight (), False);
2345
2346 if (refresh_type & SMOOTH_REFRESH) 2488 if (refresh_type & SMOOTH_REFRESH)
2347 XSync (display->display, False); 2489 XFlush (display->display);
2348 2490
2349 num_scr = 0; 2491 num_scr = 0;
2350 num_scr_allow = 1; 2492 num_scr_allow = 1;
2351 want_refresh = 0; /* screen is current */
2352} 2493}
2353 2494
2354void 2495void
2355rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2496rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2356{ 2497{
2357 if (!rp || !tp) 2498 if (!rp || !tp)
2358 return; 2499 return;
2359 2500
2360 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2501 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2361 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2502 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2362} 2503}
2363 2504
2364void 2505void
2365rxvt_term::scr_remap_chars () 2506rxvt_term::scr_remap_chars ()
2366{ 2507{
… …
2372 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2513 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2373 scr_remap_chars (swap.text[i], swap.rend[i]); 2514 scr_remap_chars (swap.text[i], swap.rend[i]);
2374 } 2515 }
2375} 2516}
2376 2517
2518void
2519rxvt_term::scr_recolour ()
2520{
2521 if (1
2522#if TRANSPARENT
2523 && !am_transparent
2524#endif
2525#if XPM_BACKGROUND
2526 && !bgPixmap.pixmap
2527#endif
2528 )
2529 {
2530 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);
2531 XClearWindow (display->display, TermWin.parent[0]);
2532 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
2533#if HAVE_SCROLLBARS
2534 if (scrollBar.win)
2535 {
2536 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2537 scrollBar.setIdle ();
2538 scrollbar_show (0);
2539 }
2540#endif
2541 }
2542
2543 scr_clear ();
2544 scr_touch (true);
2545 want_refresh = 1;
2546}
2547
2377/* ------------------------------------------------------------------------- */ 2548/* ------------------------------------------------------------------------- */
2378void 2549void
2379rxvt_term::scr_clear (bool really) 2550rxvt_term::scr_clear (bool really)
2380{ 2551{
2381 if (!TermWin.mapped) 2552 if (!TermWin.mapped)
2382 return; 2553 return;
2383 2554
2384 num_scr_allow = 0; 2555 num_scr_allow = 0;
2385 want_refresh = 1; 2556 want_refresh = 1;
2386 2557
2387#ifdef TRANSPARENT 2558#if TRANSPARENT
2388 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2559 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2389 { 2560 {
2390 int i; 2561 int i;
2391 2562
2392 if (! (Options & Opt_transparent_all)) 2563 if (!(options & Opt_transparent_all))
2393 i = 0; 2564 i = 0;
2394 else 2565 else
2395 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2566 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2396 2567
2397 while (i--) 2568 while (i--)
… …
2413 int end_row = TermWin.saveLines - TermWin.view_start; 2584 int end_row = TermWin.saveLines - TermWin.view_start;
2414 int i = selection.beg.row + TermWin.saveLines; 2585 int i = selection.beg.row + TermWin.saveLines;
2415 int col, row = selection.end.row + TermWin.saveLines; 2586 int col, row = selection.end.row + TermWin.saveLines;
2416 rend_t *srp; 2587 rend_t *srp;
2417 2588
2418 if (i >= end_row) 2589#if ENABLE_FRILLS
2419 col = selection.beg.col; 2590 if (selection.rect)
2591 {
2592 end_row += TermWin.nrow;
2593
2594 for (; i <= row && i <= end_row; i++)
2595 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2596 srp[col] ^= RS_RVid;
2597 }
2420 else 2598 else
2599#endif
2600 {
2601 if (i >= end_row)
2602 col = selection.beg.col;
2603 else
2421 { 2604 {
2422 col = 0; 2605 col = 0;
2423 i = end_row; 2606 i = end_row;
2424 } 2607 }
2425 2608
2426 end_row += TermWin.nrow; 2609 end_row += TermWin.nrow;
2610
2427 for (; i < row && i < end_row; i++, col = 0) 2611 for (; i < row && i < end_row; i++, col = 0)
2428 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2612 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2429 srp[col] ^= RS_RVid; 2613 srp[col] ^= RS_RVid;
2430 2614
2431 if (i == row && i < end_row) 2615 if (i == row && i < end_row)
2432 for (srp = screen.rend[i]; col < selection.end.col; col++) 2616 for (srp = screen.rend[i]; col < selection.end.col; col++)
2433 srp[col] ^= RS_RVid; 2617 srp[col] ^= RS_RVid;
2618 }
2434 } 2619 }
2435} 2620}
2436 2621
2437/* ------------------------------------------------------------------------- */ 2622/* ------------------------------------------------------------------------- */
2438/* 2623/*
… …
2474 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2659 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2475 */ 2660 */
2476void 2661void
2477rxvt_term::selection_check (int check_more) 2662rxvt_term::selection_check (int check_more)
2478{ 2663{
2479 row_col_t pos; 2664 row_col_t pos;
2480 2665
2481 if (!selection.op) 2666 if (!selection.op)
2482 return; 2667 return;
2483 2668
2484 pos.row = pos.col = 0; 2669 pos.row = pos.col = 0;
… …
2506/* ------------------------------------------------------------------------- */ 2691/* ------------------------------------------------------------------------- */
2507/* 2692/*
2508 * Paste a selection direct to the command fd 2693 * Paste a selection direct to the command fd
2509 */ 2694 */
2510void 2695void
2511rxvt_term::paste (const unsigned char *data, unsigned int len) 2696rxvt_term::paste (unsigned char *data, unsigned int len)
2512{ 2697{
2513 unsigned int i, j, n;
2514 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2515
2516#if 0
2517 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2518 ZERO_SCROLLBACK (r);
2519#endif
2520
2521 /* convert normal newline chars into common keyboard Return key sequence */ 2698 /* convert normal newline chars into common keyboard Return key sequence */
2522 for (i = 0; i < len; i += PROP_SIZE) 2699 for (unsigned int i = 0; i < len; i++)
2523 {
2524 n = min (len - i, PROP_SIZE);
2525 MEMCPY (ds, data + i, n);
2526
2527 for (j = 0; j < n; j++)
2528 if (ds[j] == C0_LF) 2700 if (data[i] == C0_LF)
2529 ds[j] = C0_CR; 2701 data[i] = C0_CR;
2530 2702
2531 tt_write (ds, (int)n); 2703 tt_write (data, len);
2532 }
2533
2534 free (ds);
2535} 2704}
2536 2705
2537/* ------------------------------------------------------------------------- */ 2706/* ------------------------------------------------------------------------- */
2538/* 2707/*
2539 * Respond to a notification that a primary selection has been sent 2708 * Respond to a notification that a primary selection has been sent
2540 * EXT: SelectionNotify 2709 * EXT: SelectionNotify
2541 */ 2710 */
2542int 2711void
2543rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2712rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2544{ 2713{
2545 long nread = 0;
2546 unsigned long bytes_after;
2547 XTextProperty ct;
2548
2549 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2550
2551 if (prop == None) /* check for failed XConvertSelection */ 2714 if (prop == None) /* check for failed XConvertSelection */
2552 { 2715 {
2553 if ((selection_type & Sel_CompoundText)) 2716 if ((selection_type & Sel_CompoundText))
2554 { 2717 {
2555 int selnum = selection_type & Sel_whereMask; 2718 int selnum = selection_type & Sel_whereMask;
… …
2568 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2731 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2569 else 2732 else
2570 selection_type = 0; 2733 selection_type = 0;
2571 } 2734 }
2572 2735
2573 return 0; 2736 return;
2574 }
2575
2576 for (;;)
2577 { 2737 }
2738
2739 unsigned long bytes_after;
2740 XTextProperty ct;
2741
2742 if (XGetWindowProperty (display->display, win, prop,
2743 0, PROP_SIZE / 4,
2744 delete_prop, AnyPropertyType,
2745 &ct.encoding, &ct.format,
2746 &ct.nitems, &bytes_after,
2747 &ct.value) != Success)
2748 {
2749 ct.value = 0;
2750 goto bailout;
2751 }
2752
2753 if (ct.encoding == None)
2754 goto bailout;
2755
2756 if (bytes_after)
2757 {
2758 // fetch and append remaining data
2759 XTextProperty ct2;
2760
2578 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2761 if (XGetWindowProperty (display->display, win, prop,
2579 (long) (PROP_SIZE / 4), delete_prop, 2762 ct.nitems / 4, (bytes_after + 3) / 4,
2763 delete_prop, AnyPropertyType,
2580 AnyPropertyType, &ct.encoding, &ct.format, 2764 &ct2.encoding, &ct2.format,
2581 &ct.nitems, &bytes_after, 2765 &ct2.nitems, &bytes_after,
2582 &ct.value) != Success) 2766 &ct2.value) != Success)
2583 break; 2767 goto bailout;
2584 2768
2585 if (ct.encoding == 0) 2769 // realloc should be compatible to XFree, here, and elsewhere, too
2586 { 2770 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2587 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2771 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2588 break; 2772 ct.nitems += ct2.nitems;
2589 }
2590 2773
2774 XFree (ct2.value);
2775 }
2776
2591 if (ct.value == NULL) 2777 if (ct.value == 0)
2592 { 2778 goto bailout;
2593 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2594 continue;
2595 }
2596 2779
2780 if (ct.encoding == xa[XA_INCR])
2781 {
2782 // INCR selection, start handshake
2783 if (!delete_prop)
2784 XDeleteProperty (display->display, win, prop);
2785
2786 selection_wait = Sel_incr;
2787 incr_buf_fill = 0;
2788 incr_ev.start (NOW + 10);
2789
2790 goto bailout;
2791 }
2792
2597 if (ct.nitems == 0) 2793 if (ct.nitems == 0)
2794 {
2795 if (selection_wait == Sel_incr)
2796 {
2797 XFree (ct.value);
2798
2799 // finally complete, now paste the whole thing
2800 selection_wait = Sel_normal;
2801 ct.value = (unsigned char *)incr_buf;
2802 ct.nitems = incr_buf_fill;
2803 incr_buf = 0;
2804 incr_buf_size = 0;
2805 incr_ev.stop ();
2598 { 2806 }
2599 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2807 else
2600 2808 {
2601 if (selection_wait == Sel_normal && nread == 0 2809 if (selection_wait == Sel_normal
2602 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2810 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2603 { 2811 {
2604 /* 2812 /*
2605 * pass through again trying CUT_BUFFER0 if we've come from 2813 * pass through again trying CUT_BUFFER0 if we've come from
2606 * XConvertSelection () but nothing was presented 2814 * XConvertSelection () but nothing was presented
2607 */ 2815 */
2608 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2609 selection_paste (display->root, XA_CUT_BUFFER0, False); 2816 selection_paste (display->root, XA_CUT_BUFFER0, False);
2610 } 2817 }
2611 2818
2612 nread = -1; /* discount any previous stuff */ 2819 goto bailout;
2613 break; 2820 }
2821 }
2822 else if (selection_wait == Sel_incr)
2823 {
2824 incr_ev.start (NOW + 10);
2825
2826 while (incr_buf_fill + ct.nitems > incr_buf_size)
2614 } 2827 {
2828 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2829 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2830 }
2615 2831
2832 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2616 nread += ct.nitems; 2833 incr_buf_fill += ct.nitems;
2617 2834
2835 goto bailout;
2836 }
2837
2618 char **cl; 2838 char **cl;
2619 int cr; 2839 int cr;
2840
2841#if ENABLE_FRILLS
2842 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2843 // so recode it manually
2844 if (ct.encoding == xa[XA_UTF8_STRING])
2845 {
2846 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2847 char *s = rxvt_wcstombs (w);
2848 free (w);
2849 // TODO: strlen == only the first element will be converted. well...
2850 paste ((unsigned char *)s, strlen (s));
2851 free (s);
2852 }
2853 else
2854#endif
2620 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2855 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2621 { 2856 && cl)
2857 {
2622 for (int i = 0; i < cr; i++) 2858 for (int i = 0; i < cr; i++)
2623 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2859 paste ((unsigned char *)cl[i], strlen (cl[i]));
2624 2860
2625 XFreeStringList (cl); 2861 XFreeStringList (cl);
2626 } 2862 }
2627 else 2863 else
2628 paste (ct.value, ct.nitems); 2864 paste (ct.value, ct.nitems); // paste raw
2629 2865
2630 if (bytes_after == 0) 2866bailout:
2631 break;
2632
2633 XFree (ct.value);
2634 }
2635
2636 if (ct.value)
2637 XFree (ct.value); 2867 XFree (ct.value);
2638 2868
2639 if (selection_wait == Sel_normal) 2869 if (selection_wait == Sel_normal)
2640 selection_wait = Sel_none; 2870 selection_wait = Sel_none;
2641
2642 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2643 return (int)nread;
2644} 2871}
2645 2872
2646void 2873void
2647rxvt_term::incr_cb (time_watcher &w) 2874rxvt_term::incr_cb (time_watcher &w)
2648{ 2875{
2649 selection_wait = Sel_none; 2876 selection_wait = Sel_none;
2650 2877
2878 incr_buf_size = 0;
2879 free (incr_buf);
2880
2651 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2881 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2652} 2882}
2653 2883
2654/*
2655 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2656 */
2657void 2884void
2658rxvt_term::selection_property (Window win, Atom prop) 2885rxvt_term::selection_property (Window win, Atom prop)
2659{ 2886{
2660 int reget_time = 0; 2887 if (prop == None || selection_wait != Sel_incr)
2661
2662 if (prop == None)
2663 return; 2888 return;
2664 2889
2665 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2666 if (selection_wait == Sel_normal)
2667 {
2668 int a, afmt;
2669 Atom atype;
2670 unsigned long bytes_after, nitems;
2671 unsigned char *s = NULL;
2672
2673 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2674 xa[XA_INCR], &atype, &afmt, &nitems,
2675 &bytes_after, &s);
2676 if (s)
2677 XFree (s);
2678 if (a != Success)
2679 return;
2680
2681#ifndef __CYGWIN32__
2682 if (atype == xa[XA_INCR])
2683 { /* start an INCR transfer */
2684 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2685 XDeleteProperty (display->display, win, prop);
2686 XFlush (display->display);
2687 reget_time = 1;
2688 selection_wait = Sel_incr;
2689 }
2690#endif
2691
2692 }
2693 else if (selection_wait == Sel_incr)
2694 {
2695 reget_time = 1;
2696
2697 if (selection_paste (win, prop, True) == -1) 2890 selection_paste (win, prop, true);
2698 {
2699 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2700 selection_wait = Sel_none;
2701 incr_ev.stop ();
2702 }
2703 }
2704 if (reget_time) /* received more data so reget time */
2705 incr_ev.start (NOW + 10);
2706} 2891}
2707 2892
2708/* ------------------------------------------------------------------------- */ 2893/* ------------------------------------------------------------------------- */
2709/* 2894/*
2710 * Request the current selection: 2895 * Request the current selection:
… …
2716 * EXT: button 2 release 2901 * EXT: button 2 release
2717 */ 2902 */
2718void 2903void
2719rxvt_term::selection_request (Time tm, int x, int y) 2904rxvt_term::selection_request (Time tm, int x, int y)
2720{ 2905{
2721 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2722
2723 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2906 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2724 return; /* outside window */ 2907 return; /* outside window */
2725 2908
2726 if (selection.text) 2909 if (selection.text)
2727 { /* internal selection */ 2910 { /* internal selection */
2728 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2729 char *str = rxvt_wcstombs (selection.text, selection.len); 2911 char *str = rxvt_wcstombs (selection.text, selection.len);
2730 paste ((unsigned char *)str, strlen (str)); 2912 paste ((unsigned char *)str, strlen (str));
2731 free (str); 2913 free (str);
2732 return; 2914 return;
2733 } 2915 }
… …
2747#else 2929#else
2748 selection_type = Sel_CompoundText; 2930 selection_type = Sel_CompoundText;
2749 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2931 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2750 return; 2932 return;
2751#endif 2933#endif
2752
2753 } 2934 }
2754 } 2935 }
2755 2936
2756 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2937 selection_wait = Sel_none; /* don't loop in selection_paste () */
2757 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2758 selection_paste (display->root, XA_CUT_BUFFER0, False); 2938 selection_paste (display->root, XA_CUT_BUFFER0, false);
2759} 2939}
2760 2940
2761int 2941int
2762rxvt_term::selection_request_other (Atom target, int selnum) 2942rxvt_term::selection_request_other (Atom target, int selnum)
2763{ 2943{
2764 Atom sel; 2944 Atom sel;
2765#ifdef DEBUG_SELECT
2766 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2767#endif
2768 2945
2769 selection_type |= selnum; 2946 selection_type |= selnum;
2770 2947
2771 if (selnum == Sel_Primary) 2948 if (selnum == Sel_Primary)
2772 sel = XA_PRIMARY; 2949 sel = XA_PRIMARY;
… …
2775 else 2952 else
2776 sel = xa[XA_CLIPBOARD]; 2953 sel = xa[XA_CLIPBOARD];
2777 2954
2778 if (XGetSelectionOwner (display->display, sel) != None) 2955 if (XGetSelectionOwner (display->display, sel) != None)
2779 { 2956 {
2780 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2781 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2957 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2782 TermWin.vt, selection_request_time); 2958 TermWin.vt, selection_request_time);
2783 return 1; 2959 return 1;
2784 } 2960 }
2785 2961
… …
2792 * EXT: SelectionClear 2968 * EXT: SelectionClear
2793 */ 2969 */
2794void 2970void
2795rxvt_term::selection_clear () 2971rxvt_term::selection_clear ()
2796{ 2972{
2797 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2798
2799 want_refresh = 1; 2973 want_refresh = 1;
2800 free (selection.text); 2974 free (selection.text);
2801 selection.text = NULL; 2975 selection.text = NULL;
2802 selection.len = 0; 2976 selection.len = 0;
2803 CLEAR_SELECTION (); 2977 CLEAR_SELECTION ();
… …
2816{ 2990{
2817 int i, col, end_col, row, end_row; 2991 int i, col, end_col, row, end_row;
2818 wchar_t *new_selection_text; 2992 wchar_t *new_selection_text;
2819 text_t *t; 2993 text_t *t;
2820 2994
2821 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2822 switch (selection.op) 2995 switch (selection.op)
2823 { 2996 {
2824 case SELECTION_CONT: 2997 case SELECTION_CONT:
2825 break; 2998 break;
2826 case SELECTION_INIT: 2999 case SELECTION_INIT:
… …
2840 3013
2841 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 3014 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2842 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3015 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2843 3016
2844 col = selection.beg.col; 3017 col = selection.beg.col;
2845 MAX_IT (col, 0);
2846 row = selection.beg.row + TermWin.saveLines; 3018 row = selection.beg.row + TermWin.saveLines;
2847 end_row = selection.end.row + TermWin.saveLines; 3019 end_row = selection.end.row + TermWin.saveLines;
2848 int ofs = 0; 3020 int ofs = 0;
2849 int extra = 0; 3021 int extra = 0;
2850 3022
2851 for (; row <= end_row; row++, col = 0) 3023 for (; row <= end_row; row++, col = 0)
2852 { 3024 {
2853 t = &(screen.text[row][col]);
2854
2855 end_col = screen.tlen[row]; 3025 end_col = screen.tlen[row];
3026
3027#if ENABLE_FRILLS
3028 if (selection.rect)
3029 {
3030 col = selection.beg.col;
3031 end_col = TermWin.ncol + 1;
3032 }
3033#endif
3034
3035 MAX_IT (col, 0);
2856 3036
2857 if (end_col == -1) 3037 if (end_col == -1)
2858 end_col = TermWin.ncol; 3038 end_col = TermWin.ncol;
2859 3039
2860 if (row == end_row) 3040 if (row == end_row || selection.rect)
2861 MIN_IT (end_col, selection.end.col); 3041 MIN_IT (end_col, selection.end.col);
2862 3042
3043 t = &screen.text[row][col];
2863 for (; col < end_col; col++) 3044 for (; col < end_col; col++)
2864 { 3045 {
2865 if (*t == NOCHAR) 3046 if (*t == NOCHAR)
2866 t++; 3047 t++;
2867#if ENABLE_COMBINING 3048#if ENABLE_COMBINING
… …
2915#if 0 3096#if 0
2916 XTextProperty ct; 3097 XTextProperty ct;
2917 3098
2918 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3099 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2919 { 3100 {
2920 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3101 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2921 PropModeReplace, ct.value, ct.nitems);
2922 XFree (ct.value); 3102 XFree (ct.value);
2923 } 3103 }
2924#endif 3104#endif
2925 3105
2926 selection_time = tm; 3106 selection_time = tm;
2927 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2928} 3107}
2929 3108
2930/* ------------------------------------------------------------------------- */ 3109/* ------------------------------------------------------------------------- */
2931/* 3110/*
2932 * Mark or select text based upon number of clicks: 1, 2, or 3 3111 * Mark or select text based upon number of clicks: 1, 2, or 3
2933 * EXT: button 1 press 3112 * EXT: button 1 press
2934 */ 3113 */
2935void 3114void
2936rxvt_term::selection_click (int clicks, int x, int y) 3115rxvt_term::selection_click (int clicks, int x, int y)
2937{ 3116{
2938 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2939
2940 clicks = ((clicks - 1) % 3) + 1; 3117 clicks = ((clicks - 1) % 3) + 1;
2941 selection.clicks = clicks; /* save clicks so extend will work */ 3118 selection.clicks = clicks; /* save clicks so extend will work */
2942 3119
2943 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3120 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2944 3121
… …
2986 * We now only find out the boundary in one direction 3163 * We now only find out the boundary in one direction
2987 */ 3164 */
2988 3165
2989/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3166/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2990#define DELIMIT_TEXT(x) \ 3167#define DELIMIT_TEXT(x) \
2991 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) 3168 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2992#define DELIMIT_REND(x) 1 3169#define DELIMIT_REND(x) 1
2993 3170
2994void 3171void
2995rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3172rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2996{ 3173{
… …
3014 3191
3015 row = mark->row + TermWin.saveLines; 3192 row = mark->row + TermWin.saveLines;
3016 col = mark->col; 3193 col = mark->col;
3017 MAX_IT (col, 0); 3194 MAX_IT (col, 0);
3018 /* find the edge of a word */ 3195 /* find the edge of a word */
3019 stp = & (screen.text[row][col]); 3196 stp = &screen.text[row][col];
3020 w1 = DELIMIT_TEXT (*stp); 3197 w1 = DELIMIT_TEXT (*stp);
3021 3198
3022 srp = (&screen.rend[row][col]); 3199 srp = &screen.rend[row][col];
3023 w2 = DELIMIT_REND (*srp); 3200 w2 = DELIMIT_REND (*srp);
3024 3201
3025 for (;;) 3202 for (;;)
3026 { 3203 {
3027 for (; col != bound.col; col += dirnadd) 3204 for (; col != bound.col; col += dirnadd)
… …
3061 } 3238 }
3062 break; 3239 break;
3063 } 3240 }
3064 3241
3065Old_Word_Selection_You_Die: 3242Old_Word_Selection_You_Die:
3066 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));
3067
3068 if (dirn == DN) 3243 if (dirn == DN)
3069 col++; /* put us on one past the end */ 3244 col++; /* put us on one past the end */
3070 3245
3071 /* Poke the values back in */ 3246 /* Poke the values back in */
3072 ret->row = row - TermWin.saveLines; 3247 ret->row = row - TermWin.saveLines;
… …
3106 /* select nothing */ 3281 /* select nothing */
3107 selection.beg.row = selection.end.row = 0; 3282 selection.beg.row = selection.end.row = 0;
3108 selection.beg.col = selection.end.col = 0; 3283 selection.beg.col = selection.end.col = 0;
3109 selection.clicks = 4; 3284 selection.clicks = 4;
3110 want_refresh = 1; 3285 want_refresh = 1;
3111 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3112 return; 3286 return;
3113 } 3287 }
3114 3288
3115 if (selection.clicks == 4) 3289 if (selection.clicks == 4)
3116 selection.clicks = 1; 3290 selection.clicks = 1;
… …
3132 row_col_t pos; 3306 row_col_t pos;
3133 enum { 3307 enum {
3134 LEFT, RIGHT 3308 LEFT, RIGHT
3135 } closeto = RIGHT; 3309 } closeto = RIGHT;
3136 3310
3137 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));
3138 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));
3139
3140 want_refresh = 1; 3311 want_refresh = 1;
3312
3141 switch (selection.op) 3313 switch (selection.op)
3142 { 3314 {
3143 case SELECTION_INIT: 3315 case SELECTION_INIT:
3144 CLEAR_SELECTION (); 3316 CLEAR_SELECTION ();
3145 selection.op = SELECTION_BEGIN; 3317 selection.op = SELECTION_BEGIN;
… …
3158 selection_start_colrow (col, row); 3330 selection_start_colrow (col, row);
3159 /* FALLTHROUGH */ 3331 /* FALLTHROUGH */
3160 default: 3332 default:
3161 return; 3333 return;
3162 } 3334 }
3335
3163 if (selection.beg.col == selection.end.col 3336 if (selection.beg.col == selection.end.col
3164 && selection.beg.col != selection.mark.col 3337 && selection.beg.col != selection.mark.col
3165 && selection.beg.row == selection.end.row 3338 && selection.beg.row == selection.end.row
3166 && selection.beg.row != selection.mark.row) 3339 && selection.beg.row != selection.mark.row)
3167 { 3340 {
3168 selection.beg.col = selection.end.col = selection.mark.col; 3341 selection.beg.col = selection.end.col = selection.mark.col;
3169 selection.beg.row = selection.end.row = selection.mark.row; 3342 selection.beg.row = selection.end.row = selection.mark.row;
3170 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));
3171 } 3343 }
3172 3344
3173 pos.col = col; 3345 pos.col = col;
3174 pos.row = row; 3346 pos.row = row;
3175 3347
… …
3218 } 3390 }
3219 else 3391 else
3220 { /* button1 drag or button3 drag */ 3392 { /* button1 drag or button3 drag */
3221 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3393 if (ROWCOL_IS_AFTER (selection.mark, pos))
3222 { 3394 {
3223 if ((selection.mark.row == selection.end.row) 3395 if (selection.mark.row == selection.end.row
3224 && (selection.mark.col == selection.end.col) 3396 && selection.mark.col == selection.end.col
3397 && clickchange
3225 && clickchange && selection.clicks == 2) 3398 && selection.clicks == 2)
3226 selection.mark.col--; 3399 selection.mark.col--;
3227 3400
3228 selection.beg.row = pos.row; 3401 selection.beg.row = pos.row;
3229 selection.beg.col = pos.col; 3402 selection.beg.col = pos.col;
3230 selection.end.row = selection.mark.row; 3403 selection.end.row = selection.mark.row;
… …
3241 3414
3242 if (selection.clicks == 1) 3415 if (selection.clicks == 1)
3243 { 3416 {
3244 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3417 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3245 3418
3246 if (end_col != -1 && selection.beg.col > end_col) 3419 if (selection.beg.col > end_col
3420 && end_col != -1
3421#if ENABLE_FRILLS
3422 && !selection.rect
3423#endif
3247 { 3424 )
3248#if 1
3249 selection.beg.col = ncol; 3425 selection.beg.col = ncol;
3250#else
3251 if (selection.beg.row != selection.end.row)
3252 selection.beg.col = ncol;
3253 else
3254 selection.beg.col = selection.mark.col;
3255#endif
3256 }
3257 3426
3258 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3427 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3259 3428
3260 if (end_col != -1 && selection.end.col > end_col) 3429 if (
3430 selection.end.col > end_col
3431 && end_col != -1
3432#if ENABLE_FRILLS
3433 && !selection.rect
3434#endif
3435 )
3261 selection.end.col = ncol; 3436 selection.end.col = ncol;
3262 } 3437 }
3263 else if (selection.clicks == 2) 3438 else if (selection.clicks == 2)
3264 { 3439 {
3265 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3440 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3266 selection.end.col--; 3441 selection.end.col--;
3267 3442
3268 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3269 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3443 selection_delimit_word (UP, &selection.beg, &selection.beg);
3444 selection_delimit_word (DN, &selection.end, &selection.end);
3270 } 3445 }
3271 else if (selection.clicks == 3) 3446 else if (selection.clicks == 3)
3272 { 3447 {
3273#ifndef NO_FRILLS 3448#if ENABLE_FRILLS
3274 if ((Options & Opt_tripleclickwords)) 3449 if (options & Opt_tripleclickwords)
3275 { 3450 {
3276 int end_row; 3451 int end_row;
3277 3452
3278 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3453 selection_delimit_word (UP, &selection.beg, &selection.beg);
3279 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3454 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3280 3455
3281 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3456 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3282 { 3457 {
3283 end_col = screen.tlen[end_row + TermWin.saveLines]; 3458 end_col = screen.tlen[end_row + TermWin.saveLines];
… …
3294 else 3469 else
3295#endif 3470#endif
3296 { 3471 {
3297 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3472 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3298 selection.mark.col++; 3473 selection.mark.col++;
3474
3299 selection.beg.col = 0; 3475 selection.beg.col = 0;
3300 selection.end.col = ncol; 3476 selection.end.col = ncol;
3477
3478 // select a complete logical line
3479 while (selection.beg.row > -TermWin.saveLines
3480 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
3481 selection.beg.row--;
3482
3483 while (selection.end.row < TermWin.nrow
3484 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
3485 selection.end.row++;
3301 } 3486 }
3302 } 3487 }
3303 3488
3304 if (button3 && buttonpress) 3489 if (button3 && buttonpress)
3305 { /* mark may need to be changed */ 3490 { /* mark may need to be changed */
3306 if (closeto == LEFT) 3491 if (closeto == LEFT)
3307 { 3492 {
3308 selection.mark.row = selection.end.row; 3493 selection.mark.row = selection.end.row;
3309 selection.mark.col = selection.end.col 3494 selection.mark.col = selection.end.col - (selection.clicks == 2);
3310 - (selection.clicks == 2);
3311 } 3495 }
3312 else 3496 else
3313 { 3497 {
3314 selection.mark.row = selection.beg.row; 3498 selection.mark.row = selection.beg.row;
3315 selection.mark.col = selection.beg.col; 3499 selection.mark.col = selection.beg.col;
3316 } 3500 }
3317 } 3501 }
3318 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));
3319}
3320 3502
3321#ifndef NO_FRILLS 3503#if ENABLE_FRILLS
3504 if (selection.rect && selection.beg.col > selection.end.col)
3505 SWAP_IT (selection.beg.col, selection.end.col, int);
3506#endif
3507}
3508
3509#if ENABLE_FRILLS
3322void 3510void
3323rxvt_term::selection_remove_trailing_spaces () 3511rxvt_term::selection_remove_trailing_spaces ()
3324{ 3512{
3325 int32_t end_col, end_row; 3513 int32_t end_col, end_row;
3326 text_t *stp; 3514 text_t *stp;
3327 3515
3328 end_col = selection.end.col; 3516 end_col = selection.end.col;
3329 end_row = selection.end.row; 3517 end_row = selection.end.row;
3518
3330 for ( ; end_row >= selection.beg.row; ) 3519 for ( ; end_row >= selection.beg.row; )
3331 { 3520 {
3332 stp = screen.text[end_row + TermWin.saveLines]; 3521 stp = screen.text[end_row + TermWin.saveLines];
3522
3333 while (--end_col >= 0) 3523 while (--end_col >= 0)
3334 { 3524 {
3335 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3525 if (stp[end_col] != ' '
3526 && stp[end_col] != '\t'
3527 && stp[end_col] != NOCHAR)
3336 break; 3528 break;
3337 } 3529 }
3530
3338 if (end_col >= 0 3531 if (end_col >= 0
3339 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3532 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3340 { 3533 {
3341 selection.end.col = end_col + 1; 3534 selection.end.col = end_col + 1;
3342 selection.end.row = end_row; 3535 selection.end.row = end_row;
3343 break; 3536 break;
3344 } 3537 }
3538
3345 end_row--; 3539 end_row--;
3346 end_col = TermWin.ncol; 3540 end_col = TermWin.ncol;
3347 } 3541 }
3542
3348 if (selection.mark.row > selection.end.row) 3543 if (selection.mark.row > selection.end.row)
3349 { 3544 {
3350 selection.mark.row = selection.end.row; 3545 selection.mark.row = selection.end.row;
3351 selection.mark.col = selection.end.col; 3546 selection.mark.col = selection.end.col;
3352 } 3547 }
… …
3368 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3563 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3369} 3564}
3370 3565
3371/* ------------------------------------------------------------------------- */ 3566/* ------------------------------------------------------------------------- */
3372/* 3567/*
3373 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3374 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3375 * the X11 protocol.
3376 */
3377typedef CARD32 Atom32;
3378
3379/* ------------------------------------------------------------------------- */
3380/*
3381 * Respond to a request for our current selection 3568 * Respond to a request for our current selection
3382 * EXT: SelectionRequest 3569 * EXT: SelectionRequest
3383 */ 3570 */
3384void 3571void
3385rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3572rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3386{ 3573{
3387 XSelectionEvent ev; 3574 XSelectionEvent ev;
3388 XTextProperty ct; 3575 dDisp;
3389 XICCEncodingStyle style;
3390 Atom target;
3391 3576
3392 ev.type = SelectionNotify; 3577 ev.type = SelectionNotify;
3393 ev.property = None; 3578 ev.property = None;
3394 ev.display = rq.display; 3579 ev.display = rq.display;
3395 ev.requestor = rq.requestor; 3580 ev.requestor = rq.requestor;
… …
3397 ev.target = rq.target; 3582 ev.target = rq.target;
3398 ev.time = rq.time; 3583 ev.time = rq.time;
3399 3584
3400 if (rq.target == xa[XA_TARGETS]) 3585 if (rq.target == xa[XA_TARGETS])
3401 { 3586 {
3402 Atom32 target_list[6]; 3587 Atom target_list[6];
3403 Atom32 *target = target_list; 3588 Atom *target = target_list;
3404 3589
3405 *target++ = (Atom32) xa[XA_TARGETS]; 3590 *target++ = xa[XA_TARGETS];
3406 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3591 *target++ = xa[XA_TIMESTAMP];
3407 *target++ = (Atom32) XA_STRING; 3592 *target++ = XA_STRING;
3408 *target++ = (Atom32) xa[XA_TEXT]; 3593 *target++ = xa[XA_TEXT];
3409 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3594 *target++ = xa[XA_COMPOUND_TEXT];
3410#if X_HAVE_UTF8_STRING 3595#if X_HAVE_UTF8_STRING
3411 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3596 *target++ = xa[XA_UTF8_STRING];
3412#endif 3597#endif
3413 3598
3414 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3599 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3415 (8 * sizeof (target_list[0])), PropModeReplace, 3600 32, PropModeReplace,
3416 (unsigned char *)target_list, 3601 (unsigned char *)target_list, target - target_list);
3417 target - target_list);
3418 ev.property = rq.property; 3602 ev.property = rq.property;
3419 } 3603 }
3604#if TODO // TODO
3420 else if (rq.target == xa[XA_MULTIPLE]) 3605 else if (rq.target == xa[XA_MULTIPLE])
3421 { 3606 {
3422 /* TODO: Handle MULTIPLE */ 3607 /* TODO: Handle MULTIPLE */
3423 } 3608 }
3609#endif
3424 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3610 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3425 { 3611 {
3426 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3612 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3427 (8 * sizeof (Time)), PropModeReplace,
3428 (unsigned char *)&selection_time, 1); 3613 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3429 ev.property = rq.property; 3614 ev.property = rq.property;
3430 } 3615 }
3431 else if (rq.target == XA_STRING 3616 else if (rq.target == XA_STRING
3432 || rq.target == xa[XA_TEXT] 3617 || rq.target == xa[XA_TEXT]
3433 || rq.target == xa[XA_COMPOUND_TEXT] 3618 || rq.target == xa[XA_COMPOUND_TEXT]
3434 || rq.target == xa[XA_UTF8_STRING] 3619 || rq.target == xa[XA_UTF8_STRING]
3435 ) 3620 )
3436 { 3621 {
3622 XTextProperty ct;
3623 Atom target = rq.target;
3437 short freect = 0; 3624 short freect = 0;
3438 int selectlen; 3625 int selectlen;
3439 wchar_t *cl; 3626 wchar_t *cl;
3440 3627 enum {
3441 target = rq.target; 3628 enc_string = XStringStyle,
3629 enc_text = XStdICCTextStyle,
3630 enc_compound_text = XCompoundTextStyle,
3631#ifdef X_HAVE_UTF8_STRING
3632 enc_utf8 = XUTF8StringStyle,
3633#else
3634 enc_utf8 = -1,
3635#endif
3636 } style;
3442 3637
3443 if (target == XA_STRING) 3638 if (target == XA_STRING)
3444 // we actually don't do XA_STRING, but who cares, as i18n clients 3639 // we actually don't do XA_STRING, but who cares, as i18n clients
3445 // will ask for another format anyways. 3640 // will ask for another format anyways.
3446 style = XStringStyle; 3641 style = enc_string;
3447 else if (target == xa[XA_TEXT]) 3642 else if (target == xa[XA_TEXT])
3448 style = XStdICCTextStyle; 3643 style = enc_text;
3449 else if (target == xa[XA_COMPOUND_TEXT]) 3644 else if (target == xa[XA_COMPOUND_TEXT])
3450 style = XCompoundTextStyle; 3645 style = enc_compound_text;
3451#if X_HAVE_UTF8_STRING 3646#if ENABLE_FRILLS
3452 else if (target == xa[XA_UTF8_STRING]) 3647 else if (target == xa[XA_UTF8_STRING])
3453 style = XUTF8StringStyle; 3648 style = enc_utf8;
3454#endif 3649#endif
3455 else 3650 else
3456 { 3651 {
3457 target = xa[XA_COMPOUND_TEXT]; 3652 target = xa[XA_COMPOUND_TEXT];
3458 style = XCompoundTextStyle; 3653 style = enc_compound_text;
3459 } 3654 }
3460 3655
3461 if (selection.text) 3656 if (selection.text)
3462 { 3657 {
3463 cl = selection.text; 3658 cl = selection.text;
… …
3467 { 3662 {
3468 cl = L""; 3663 cl = L"";
3469 selectlen = 0; 3664 selectlen = 0;
3470 } 3665 }
3471 3666
3472 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3667#if ENABLE_FRILLS
3473 // manually for XUTF8StringStyle. 3668 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3669 // so recode it manually
3670 if (style == enc_utf8)
3671 {
3672 freect = 1;
3673 ct.encoding = target;
3674 ct.format = 8;
3675 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3676 ct.nitems = strlen ((char *)ct.value);
3677 }
3678 else
3679#endif
3474 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3680 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3475 freect = 1; 3681 freect = 1;
3476 else 3682 else
3477 { 3683 {
3478 /* if we failed to convert then send it raw */ 3684 /* if we failed to convert then send it raw */
3479 ct.value = (unsigned char *)cl; 3685 ct.value = (unsigned char *)cl;
3480 ct.nitems = selectlen; 3686 ct.nitems = selectlen;
3687 ct.encoding = target;
3481 } 3688 }
3482 3689
3483 XChangeProperty (display->display, rq.requestor, rq.property, 3690 XChangeProperty (disp, rq.requestor, rq.property,
3484 target, 8, PropModeReplace, 3691 ct.encoding, 8, PropModeReplace,
3485 ct.value, (int)ct.nitems); 3692 ct.value, (int)ct.nitems);
3486 ev.property = rq.property; 3693 ev.property = rq.property;
3487 3694
3488 if (freect) 3695 if (freect)
3489 XFree (ct.value); 3696 XFree (ct.value);
3490 } 3697 }
3491 3698
3492 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3699 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3493} 3700}
3494 3701
3495/* ------------------------------------------------------------------------- * 3702/* ------------------------------------------------------------------------- *
3496 * MOUSE ROUTINES * 3703 * MOUSE ROUTINES *
3497 * ------------------------------------------------------------------------- */ 3704 * ------------------------------------------------------------------------- */
… …
3509} 3716}
3510 3717
3511/* ------------------------------------------------------------------------- */ 3718/* ------------------------------------------------------------------------- */
3512#ifdef USE_XIM 3719#ifdef USE_XIM
3513void 3720void
3514rxvt_term::im_set_position (XPoint *pos) 3721rxvt_term::im_set_position (XPoint &pos)
3515{ 3722{
3516 XWindowAttributes xwa; 3723 XWindowAttributes xwa;
3517 3724
3518 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3725 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3726
3519 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3727 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3520 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3728 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3521} 3729}
3522
3523#endif 3730#endif
3731
3732#if ENABLE_OVERLAY
3733void
3734rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3735{
3736 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3737 return;
3738
3739 want_refresh = 1;
3740
3741 scr_overlay_off ();
3742
3743 if (x < 0) x = TermWin.ncol - w;
3744 if (y < 0) y = TermWin.nrow - h;
3745
3746 // make space for border
3747 w += 2; MIN_IT (w, TermWin.ncol);
3748 h += 2; MIN_IT (h, TermWin.nrow);
3749
3750 x -= 1; MAX_IT (x, 0);
3751 y -= 1; MAX_IT (y, 0);
3752
3753 MIN_IT (x, TermWin.ncol - w);
3754 MIN_IT (y, TermWin.nrow - h);
3755
3756 ov_x = x; ov_y = y;
3757 ov_w = w; ov_h = h;
3758
3759 ov_text = new text_t *[h];
3760 ov_rend = new rend_t *[h];
3761
3762 for (y = 0; y < h; y++)
3763 {
3764 text_t *tp = ov_text[y] = new text_t[w];
3765 rend_t *rp = ov_rend[y] = new rend_t[w];
3766
3767 text_t t0, t1, t2;
3768 rend_t r = OVERLAY_RSTYLE;
3769
3770 if (y == 0)
3771 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3772 else if (y < h - 1)
3773 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3774 else
3775 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3776
3777 *tp++ = t0;
3778 *rp++ = r;
3779
3780 for (x = w - 2; x > 0; --x)
3781 {
3782 *tp++ = t1;
3783 *rp++ = r;
3784 }
3785
3786 *tp = t2;
3787 *rp = r;
3788 }
3789}
3790
3791void
3792rxvt_term::scr_overlay_off ()
3793{
3794 if (!ov_text)
3795 return;
3796
3797 want_refresh = 1;
3798
3799 for (int y = 0; y < ov_h; y++)
3800 {
3801 delete [] ov_text[y];
3802 delete [] ov_rend[y];
3803 }
3804
3805 delete [] ov_text; ov_text = 0;
3806 delete [] ov_rend; ov_rend = 0;
3807}
3808
3809void
3810rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3811{
3812 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3813 return;
3814
3815 x++, y++;
3816
3817 ov_text[y][x] = text;
3818 ov_rend[y][x] = rend;
3819}
3820
3821void
3822rxvt_term::scr_overlay_set (int x, int y, const char *s)
3823{
3824 while (*s)
3825 scr_overlay_set (x++, y, *s++);
3826}
3827
3828void
3829rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3830{
3831 while (*s)
3832 {
3833 text_t t = *s++;
3834 int width = wcwidth (t);
3835
3836 while (width--)
3837 {
3838 scr_overlay_set (x++, y, t);
3839 t = NOCHAR;
3840 }
3841 }
3842}
3843
3844void
3845rxvt_term::scr_swap_overlay ()
3846{
3847 if (!ov_text)
3848 return;
3849
3850 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3851
3852 // swap screen mem with overlay
3853 for (int y = ov_h; y--; )
3854 {
3855 text_t *t1 = ov_text[y];
3856 rend_t *r1 = ov_rend[y];
3857
3858 text_t *t2 = screen.text[y + row_offset] + ov_x;
3859 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3860
3861 for (int x = ov_w; x--; )
3862 {
3863 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3864 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3865 }
3866 }
3867}
3868
3869#endif
3524/* ------------------------------------------------------------------------- */ 3870/* ------------------------------------------------------------------------- */

Diff Legend

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