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

Diff Legend

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