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.160 by root, Mon Feb 21 19:30:58 2005 UTC

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

Diff Legend

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