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.223 by root, Wed Jan 11 18:54:30 2006 UTC vs.
Revision 1.352 by root, Fri Oct 15 20:52:15 2010 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
36 34
35static inline void
37inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
38{ 37{
39 while (len--) 38 while (len--)
40 *start++ = value; 39 *start++ = value;
41} 40}
42 41
… …
47 46
48/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 50#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 51 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 52 view_start = 0
54#define CLEAR_SELECTION() \ 53#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 54 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 55 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 56#define CLEAR_ALL_SELECTION() \
… …
85 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)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 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)
88 87
89/* 88/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 90 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 91#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 92 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 93 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 94 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 95 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 96
114/* ------------------------------------------------------------------------- * 97/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 98 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 99 * ------------------------------------------------------------------------- */
117 100
118/* Fill part/all of a line with blanks. */ 101/* Fill part/all of a line with blanks. */
119void 102void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 103rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 104{
122 if (!l.t) 105 if (!l.t)
123 { 106 {
124 lalloc (l); 107 lalloc (l);
125 col = 0; 108 col = 0;
126 width = ncol; 109 width = ncol;
127 } 110 }
128 111
129 l.touch (); 112 l.touch ();
130 113
131 efs &= ~RS_baseattrMask; 114 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 115 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 116
134 text_t *et = l.t + col; 117 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 118 rend_t *er = l.r + col;
136 119
… …
142} 125}
143 126
144/* ------------------------------------------------------------------------- */ 127/* ------------------------------------------------------------------------- */
145/* Fill a full line with blanks - make sure it is allocated first */ 128/* Fill a full line with blanks - make sure it is allocated first */
146void 129void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 130rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
148{ 131{
149 scr_blank_line (l, 0, ncol, efs); 132 scr_blank_line (l, 0, ncol, efs);
150 133
151 l.l = 0; 134 l.l = 0;
152 l.f = 0; 135 l.f = 0;
136}
137
138// nuke a single wide character at the given column
139void
140rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
141{
142 // find begin
143 while (col > 0 && l.t[col] == NOCHAR)
144 col--;
145
146 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148
149 l.touch ();
150
151 // found start, nuke
152 do {
153 l.t[col] = ' ';
154 l.r[col] = rend;
155 col++;
156 } while (col < ncol && l.t[col] == NOCHAR);
153} 157}
154 158
155/* ------------------------------------------------------------------------- * 159/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 160 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 161 * ------------------------------------------------------------------------- */
158 162
159void 163void
160rxvt_term::scr_reset () 164rxvt_term::scr_reset ()
161{ 165{
162#if ENABLE_OVERLAY
163 scr_overlay_off ();
164#endif
165
166 view_start = 0; 166 view_start = 0;
167 num_scr = 0; 167 num_scr = 0;
168 168
169 if (ncol == 0) 169 if (ncol == 0)
170 ncol = 80; 170 ncol = 80;
… …
174 174
175 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 176 return;
177 177
178 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 179 while (nrow + saveLines < 2)
180 { 180 {
181 //TODO//FIXME 181 //TODO//FIXME
182 saveLines++; 182 saveLines++;
183 prev_nrow--; 183 prev_nrow--;
184 nsaved++; 184 top_row--;
185 } 185 }
186 186
187 want_refresh = 1; 187 want_refresh = 1;
188 188
189 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
… …
195 if (!row_buf) 195 if (!row_buf)
196 { 196 {
197 /* 197 /*
198 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
199 */ 199 */
200 nsaved = 0; /* no saved lines */ 200 top_row = 0;
201 term_start = 0; 201 term_start = 0;
202 202
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 205
… …
234 selection.text = NULL; 234 selection.text = NULL;
235 selection.len = 0; 235 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
238 selection.clicks = 0; 238 selection.clicks = 0;
239 CLEAR_ALL_SELECTION (); 239 selection.clip_text = NULL;
240 rvideo = 0; 240 selection.clip_len = 0;
241 } 241 }
242 else 242 else
243 { 243 {
244 /* 244 /*
245 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 } 275 }
276 276
277 line_t *old_buf = row_buf; 277 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 279
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start - nsaved , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
283 283
284 if (nsaved) 284 if (top_row)
285 { 285 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb 286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
288 // TODO: maybe optimise when width didn't change
288 289
289 row_col_t ocur = screen.cur; 290 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 291 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 292
292 do 293 do
293 { 294 {
294 p = MOD (p - 1, prev_total_rows); 295 p = MOD (p - 1, prev_total_rows);
295#ifdef DEBUG_STRICT
296 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
297#endif
298 int plines = 1; 297 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l; 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
300 299
301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
302 { 301 {
… …
325 qline->l = ncol; 324 qline->l = ncol;
326 qline->is_longer (1); 325 qline->is_longer (1);
327 326
328 int qcol = 0; 327 int qcol = 0;
329 328
329 // see below for cursor adjustment rationale
330 if (p == ocur.row)
331 screen.cur.row = q - (total_rows - nrow);
332
330 // fill a single destination line 333 // fill a single destination line
331 while (lofs < llen && qcol < ncol) 334 while (lofs < llen && qcol < ncol)
332 { 335 {
333 int prow = lofs / prev_ncol; 336 int prow = lofs / prev_ncol;
334 int pcol = lofs % prev_ncol; 337 int pcol = lofs % prev_ncol;
… …
344 347
345 line_t &pline = old_buf [prow]; 348 line_t &pline = old_buf [prow];
346 349
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 351
349 assert (len);
350 assert (pline.t);
351
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
354 354
355 lofs += len; 355 lofs += len;
356 qcol += len; 356 qcol += len;
… …
362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
363 } 363 }
364 while (p != pend && q > 0); 364 while (p != pend && q > 0);
365 365
366 term_start = total_rows - nrow; 366 term_start = total_rows - nrow;
367 nsaved = term_start - q; 367 top_row = q - term_start;
368 368
369 // make sure all terminal lines exist 369 // make sure all terminal lines exist
370 while (nsaved < 0) 370 while (top_row > 0)
371 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 371 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
372 } 372 }
373 else 373 else
374 { 374 {
375 // if no scrollback exists (yet), wing, instead of wrap 375 // if no scrollback exists (yet), wing, instead of wrap
376 376
377 for (int row = min (nrow, prev_nrow); row--; ) 377 for (int row = min (nrow, prev_nrow); row--; )
378 { 378 {
379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row]; 380 line_t &qline = row_buf [row];
381 381
… …
389 } 389 }
390 390
391 term_start = 0; 391 term_start = 0;
392 } 392 }
393 393
394#ifdef DEBUG_STRICT //TODO: remove
395 for (int i = -nsaved; i < nrow; i++)
396 assert (ROW (i).t);
397#endif
398
399 free (old_buf); 394 free (old_buf);
400 delete old_ta; 395 delete old_ta;
401 delete old_ra; 396 delete old_ra;
402 397
403 clamp_it (screen.cur.row, 0, nrow - 1); 398 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 399 clamp_it (screen.cur.col, 0, ncol - 1);
400 }
405 401
406 if (tabs)
407 free (tabs); 402 free (tabs);
408 } 403 tabs = (char *)rxvt_malloc (ncol);
404
405 for (int col = ncol; --col; )
406 tabs [col] = col % TABSIZE == 0;
407
408 CLEAR_ALL_SELECTION ();
409 409
410 prev_nrow = nrow; 410 prev_nrow = nrow;
411 prev_ncol = ncol; 411 prev_ncol = ncol;
412 412
413 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
414
415 for (int col = ncol; col--; )
416 tabs [col] = col % TABSIZE == 0;
417
418 tt_winch (); 413 tt_winch ();
419 414
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 415 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 416}
422 417
423/* ------------------------------------------------------------------------- */ 418/* ------------------------------------------------------------------------- */
424/* 419/*
425 * Free everything. That way malloc debugging can find leakage. 420 * Free everything. That way malloc debugging can find leakage.
426 */ 421 */
427void 422void
428rxvt_term::scr_release () 423rxvt_term::scr_release () NOTHROW
429{ 424{
425 if (row_buf)
426 {
430 delete talloc; talloc = 0; 427 delete talloc; talloc = 0;
431 delete ralloc; ralloc = 0; 428 delete ralloc; ralloc = 0;
432 429
433 free (row_buf); 430 free (row_buf);
434 free (swap_buf); 431 free (swap_buf);
435 free (drawn_buf); 432 free (drawn_buf);
436 free (tabs);
437
438 row_buf = 0; // signal that we freed all the arrays 433 row_buf = 0; // signal that we freed all the arrays above
439}
440 434
435 free (tabs);
436 tabs = 0;
437 }
438}
439
441/* ------------------------------------------------------------------------- */ 440/* ------------------------------------------------------------------------- */
442/* 441/*
443 * Hard reset 442 * Hard/Soft reset
444 */ 443 */
445void 444void
446rxvt_term::scr_poweron () 445rxvt_term::scr_poweron ()
447{ 446{
448 scr_release (); 447 scr_release ();
449 prev_nrow = prev_ncol = 0; 448 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false;
450 scr_soft_reset ();
450 scr_reset (); 451 scr_reset ();
451 452
452 scr_clear (true); 453 scr_clear (true);
453 scr_refresh (SLOW_REFRESH); 454 scr_refresh ();
455}
456
457void
458rxvt_term::scr_soft_reset ()
459{
460 /* only affects modes, nothing drastic such as clearing the screen */
461#if ENABLE_OVERLAY
462 scr_overlay_off ();
463#endif
464
465 if (current_screen != PRIMARY)
466 scr_swap_screen ();
467
468 scr_scroll_region (0, MAX_ROWS - 1);
469 scr_rendition (0, ~RS_None);
470 scr_insert_mode (0);
454} 471}
455 472
456/* ------------------------------------------------------------------------- * 473/* ------------------------------------------------------------------------- *
457 * PROCESS SCREEN COMMANDS * 474 * PROCESS SCREEN COMMANDS *
458 * ------------------------------------------------------------------------- */ 475 * ------------------------------------------------------------------------- */
… …
460 * Save and Restore cursor 477 * Save and Restore cursor
461 * XTERM_SEQ: Save cursor : ESC 7 478 * XTERM_SEQ: Save cursor : ESC 7
462 * XTERM_SEQ: Restore cursor: ESC 8 479 * XTERM_SEQ: Restore cursor: ESC 8
463 */ 480 */
464void 481void
465rxvt_term::scr_cursor (int mode) 482rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
466{ 483{
467 screen_t *s; 484 screen_t *s;
468 485
469#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 486#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
470 if (current_screen == SECONDARY) 487 if (current_screen == SECONDARY)
… …
496 } 513 }
497 514
498 /* boundary check in case screen size changed between SAVE and RESTORE */ 515 /* boundary check in case screen size changed between SAVE and RESTORE */
499 min_it (s->cur.row, nrow - 1); 516 min_it (s->cur.row, nrow - 1);
500 min_it (s->cur.col, ncol - 1); 517 min_it (s->cur.col, ncol - 1);
501#ifdef DEBUG_STRICT
502 assert (s->cur.row >= 0); 518 assert (s->cur.row >= 0);
503 assert (s->cur.col >= 0); 519 assert (s->cur.col >= 0);
504#endif 520}
521
522void
523rxvt_term::scr_swap_screen ()
524{
525 if (!option (Opt_secondaryScreen))
526 return;
527
528 for (int i = prev_nrow; i--; )
529 ::swap (ROW(i), swap_buf [i]);
530
531 ::swap (screen.cur, swap.cur);
532
533 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
534 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
505} 535}
506 536
507/* ------------------------------------------------------------------------- */ 537/* ------------------------------------------------------------------------- */
508/* 538/*
509 * Swap between primary and secondary screens 539 * Swap between primary and secondary screens
510 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 540 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
511 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 541 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
512 */ 542 */
513int 543void
514rxvt_term::scr_change_screen (int scrn) 544rxvt_term::scr_change_screen (int scrn)
515{ 545{
546 if (scrn == current_screen)
547 return;
548
516 want_refresh = 1; 549 want_refresh = 1;
517 view_start = 0; 550 view_start = 0;
518 551
519 if (current_screen == scrn)
520 return scrn;
521
522 selection_check (2); /* check for boundary cross */ 552 selection_check (2); /* check for boundary cross */
523 553
524 int i = current_screen; current_screen = scrn; scrn = i; 554 current_screen = scrn;
525
526 ::swap (screen.cur.row, swap.cur.row);
527 ::swap (screen.cur.col, swap.cur.col);
528
529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
531 555
532#if NSCREENS 556#if NSCREENS
533 if (OPTION (Opt_secondaryScreen)) 557 if (option (Opt_secondaryScreen))
534 { 558 {
535 num_scr = 0; 559 num_scr = 0;
536 560
537 for (int i = prev_nrow; i--; ) 561 scr_swap_screen ();
538 ::swap (ROW(i), swap_buf [i]);
539 562
540 ::swap (screen.charset, swap.charset); 563 ::swap (screen.charset, swap.charset);
541 ::swap (screen.flags, swap.flags); 564 ::swap (screen.flags, swap.flags);
542 screen.flags |= Screen_VisibleCursor; 565 screen.flags |= Screen_VisibleCursor;
543 swap.flags |= Screen_VisibleCursor; 566 swap.flags |= Screen_VisibleCursor;
544 } 567 }
545 else 568 else
546#endif 569#endif
547 if (OPTION (Opt_secondaryScroll)) 570 if (option (Opt_secondaryScroll))
548 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 571 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
549
550 return scrn;
551} 572}
552 573
553// clear WrapNext indicator, solidifying position on next line 574// clear WrapNext indicator, solidifying position on next line
554void 575void
555rxvt_term::scr_do_wrap () 576rxvt_term::scr_do_wrap () NOTHROW
556{ 577{
557 if (!(screen.flags & Screen_WrapNext)) 578 if (!(screen.flags & Screen_WrapNext))
558 return; 579 return;
559 580
560 screen.flags &= ~Screen_WrapNext; 581 screen.flags &= ~Screen_WrapNext;
… …
570/* ------------------------------------------------------------------------- */ 591/* ------------------------------------------------------------------------- */
571/* 592/*
572 * Change the colour for following text 593 * Change the colour for following text
573 */ 594 */
574void 595void
575rxvt_term::scr_color (unsigned int color, int fgbg) 596rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
576{ 597{
577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 598 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
578 color = fgbg; 599 color = fgbg;
579 600
580 if (fgbg == Color_fg) 601 if (fgbg == Color_fg)
… …
586/* ------------------------------------------------------------------------- */ 607/* ------------------------------------------------------------------------- */
587/* 608/*
588 * Change the rendition style for following text 609 * Change the rendition style for following text
589 */ 610 */
590void 611void
591rxvt_term::scr_rendition (int set, int style) 612rxvt_term::scr_rendition (int set, int style) NOTHROW
592 { 613{
593 if (set) 614 if (set)
594 rstyle |= style; 615 rstyle |= style;
595 else if (style == ~RS_None) 616 else if (style == ~RS_None)
596 rstyle = DEFAULT_RSTYLE; 617 rstyle = DEFAULT_RSTYLE;
597 else 618 else
598 rstyle &= ~style; 619 rstyle &= ~style;
599 } 620}
600 621
601/* ------------------------------------------------------------------------- */ 622/* ------------------------------------------------------------------------- */
602/* 623/*
603 * Scroll text between <row1> and <row2> inclusive, by <count> lines 624 * Scroll text between <row1> and <row2> inclusive, by <count> lines
604 * count positive ==> scroll up 625 * count positive ==> scroll up
605 * count negative ==> scroll down 626 * count negative ==> scroll down
606 */ 627 */
607int 628int
608rxvt_term::scr_scroll_text (int row1, int row2, int count) 629rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
609{ 630{
610 if (count == 0 || (row1 > row2)) 631 if (count == 0 || (row1 > row2))
611 return 0; 632 return 0;
612 633
613 want_refresh = 1; 634 want_refresh = 1;
614 num_scr += count; 635 num_scr += count;
615 636
616 if (count > 0 637 if (count > 0
617 && row1 == 0 638 && row1 == 0
618 && row2 == nrow - 1
619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 639 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
620 { 640 {
621 nsaved = min (nsaved + count, saveLines); 641 top_row = max (top_row - count, -saveLines);
622 642
623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 643 // scroll everything up 'count' lines
624
625 term_start = (term_start + count) % total_rows; 644 term_start = (term_start + count) % total_rows;
626 645
646 // sever bottommost line
647 {
648 line_t &l = ROW(row2 - count);
649 l.is_longer (0);
650 l.touch ();
651 }
652
653 // erase newly scrolled-in lines
654 for (int i = count; i--; )
655 {
656 line_t &l = ROW(nrow - 1 - i);
657
658 // optimize if already cleared, can be significant on slow machines
659 // could be rolled into scr_blank_screen_mem
660 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
661 {
662 scr_blank_line (l, 0, l.l, rstyle);
663 l.l = 0;
664 l.f = 0;
665 }
666 else
667 scr_blank_screen_mem (l, rstyle);
668 }
669
670 // now copy lines below the scroll region bottom to the
671 // bottom of the screen again, so they look as if they
672 // hadn't moved.
673 for (int i = nrow; --i > row2; )
674 {
675 line_t &l1 = ROW(i - count);
676 line_t &l2 = ROW(i);
677
678 ::swap (l1, l2);
679 l2.touch ();
680 }
681
682 // move and/or clear selection, if any
627 if (selection.op && current_screen == selection.screen) 683 if (selection.op && current_screen == selection.screen)
628 { 684 {
629 selection.beg.row -= count; 685 selection.beg.row -= count;
630 selection.end.row -= count; 686 selection.end.row -= count;
631 selection.mark.row -= count; 687 selection.mark.row -= count;
632 688
633 if (selection.beg.row < -nsaved 689 if (selection.beg.row < top_row
634 || selection.end.row < -nsaved 690 || selection.end.row < top_row
635 || selection.mark.row < -nsaved) 691 || selection.mark.row < top_row)
636 { 692 {
637 CLEAR_ALL_SELECTION (); 693 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR; 694 selection.op = SELECTION_CLEAR;
639 } 695 }
640 } 696 }
641 697
642 for (int i = count; i--; ) 698 // finally move the view window, if desired
643 {
644 // basically thi is a slightly optimized scr_blank_screen_mem
645 // it is worth the effort on slower machines
646 line_t &l = ROW(row2 - i);
647
648 scr_blank_line (l, 0, l.l, rstyle);
649
650 l.l = 0;
651 l.f = 0;
652 }
653
654 if (OPTION (Opt_scrollWithBuffer) 699 if (option (Opt_scrollWithBuffer)
655 && view_start != 0 700 && view_start != 0
656 && view_start != saveLines) 701 && view_start != -saveLines)
657 scr_page (UP, count); 702 scr_page (UP, count);
703
704 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
705 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
658 } 706 }
659 else 707 else
660 { 708 {
661 if (selection.op && current_screen == selection.screen) 709 if (selection.op && current_screen == selection.screen)
662 { 710 {
… …
674 { 722 {
675 /* move selected region too */ 723 /* move selected region too */
676 selection.beg.row -= count; 724 selection.beg.row -= count;
677 selection.end.row -= count; 725 selection.end.row -= count;
678 selection.mark.row -= count; 726 selection.mark.row -= count;
679 727
680 selection_check (0); 728 selection_check (0);
681 } 729 }
682 } 730 }
683 731
684 // use a simple and robust scrolling algorithm, this 732 // use a simple and robust scrolling algorithm, this
… …
708/* ------------------------------------------------------------------------- */ 756/* ------------------------------------------------------------------------- */
709/* 757/*
710 * Add text given in <str> of length <len> to screen struct 758 * Add text given in <str> of length <len> to screen struct
711 */ 759 */
712void 760void
713rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 761rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
714{ 762{
715 if (len <= 0) /* sanity */ 763 if (len <= 0) /* sanity */
716 return; 764 return;
717 765
718 unsigned char checksel; 766 unsigned char checksel;
… …
724 ZERO_SCROLLBACK (); 772 ZERO_SCROLLBACK ();
725 773
726 if (minlines > 0) 774 if (minlines > 0)
727 { 775 {
728 minlines += screen.cur.row - screen.bscroll; 776 minlines += screen.cur.row - screen.bscroll;
777 min_it (minlines, screen.cur.row - top_row);
729 778
730 if (minlines > 0 779 if (minlines > 0
731 && screen.tscroll == 0 780 && screen.tscroll == 0
732 && screen.bscroll == nrow - 1) 781 && screen.bscroll == nrow - 1)
733 { 782 {
… …
735 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
736 screen.cur.row -= minlines; 785 screen.cur.row -= minlines;
737 } 786 }
738 } 787 }
739 788
740#ifdef DEBUG_STRICT
741 assert (screen.cur.col < ncol); 789 assert (screen.cur.col < ncol);
742 assert (screen.cur.row < nrow 790 assert (screen.cur.row < nrow
743 && screen.cur.row >= -nsaved); 791 && screen.cur.row >= top_row);
744#endif
745 int row = screen.cur.row; 792 int row = screen.cur.row;
746 793
747 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 794 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
748 795
749 line_t *line = &ROW(row); 796 line_t *line = &ROW(row);
750 797
751 while (str < strend) 798 while (str < strend)
752 { 799 {
753 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 800 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
754 801
755 if (c < 0x20) 802 if (expect_false (c < 0x20))
756 if (c == C0_LF) 803 if (c == C0_LF)
757 { 804 {
758 max_it (line->l, screen.cur.col); 805 max_it (line->l, screen.cur.col);
759 806
760 screen.flags &= ~Screen_WrapNext; 807 screen.flags &= ~Screen_WrapNext;
… …
779 { 826 {
780 scr_tab (1, true); 827 scr_tab (1, true);
781 continue; 828 continue;
782 } 829 }
783 830
831 if (expect_false (
784 if (checksel /* see if we're writing within selection */ 832 checksel /* see if we're writing within selection */
785 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 833 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
786 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 834 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
835 ))
787 { 836 {
788 checksel = 0; 837 checksel = 0;
789 /* 838 /*
790 * If we wrote anywhere in the selected area, kill the selection 839 * If we wrote anywhere in the selected area, kill the selection
791 * XXX: should we kill the mark too? Possibly, but maybe that 840 * XXX: should we kill the mark too? Possibly, but maybe that
792 * should be a similar check. 841 * should be a similar check.
793 */ 842 */
794 CLEAR_SELECTION (); 843 CLEAR_SELECTION ();
795 } 844 }
796 845
797 if (screen.flags & Screen_WrapNext) 846 if (expect_false (screen.flags & Screen_WrapNext))
798 { 847 {
848 scr_do_wrap ();
849
799 max_it (line->l, ncol); 850 line->l = ncol;
800 line->is_longer (1); 851 line->is_longer (1);
801 852
802 scr_do_wrap ();
803
804 row = screen.cur.row; 853 row = screen.cur.row;
805 line = &ROW(row); /* _must_ refresh */ 854 line = &ROW(row); /* _must_ refresh */
806 } 855 }
807 856
808 // some utf-8 decoders "decode" surrogate characters: let's fix this. 857 // some utf-8 decoders "decode" surrogate characters: let's fix this.
809 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 858 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
810 c = 0xfffd; 859 c = 0xfffd;
811 860
812 // rely on wcwidth to tell us the character width, at least for non-latin1 861 // rely on wcwidth to tell us the character width, do wcwidth before
813 // do wcwidth before further replacements, as wcwidth might return -1 862 // further replacements, as wcwidth might return -1 for the line
814 // for the line drawing characters below as they might be invalid in the current 863 // drawing characters below as they might be invalid in the current
815 // locale. 864 // locale.
816 int width = c < 0x100 ? 1 : wcwidth (c); 865 int width = WCWIDTH (c);
817 866
818 if (charsets [screen.charset] == '0') // DEC SPECIAL 867 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
819 { 868 {
820 // vt100 special graphics and line drawing 869 // vt100 special graphics and line drawing
821 // 5f-7e standard vt100 870 // 5f-7e standard vt100
822 // 40-5e rxvt extension for extra curses acs chars 871 // 40-5e rxvt extension for extra curses acs chars
823 static uint16_t vt100_0[62] = { // 41 .. 7e 872 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
836 c = vt100_0[c - 0x41]; 885 c = vt100_0[c - 0x41];
837 width = 1; // vt100 line drawing characters are always single-width 886 width = 1; // vt100 line drawing characters are always single-width
838 } 887 }
839 } 888 }
840 889
841 if (screen.flags & Screen_Insert) 890 if (expect_false (screen.flags & Screen_Insert))
842 scr_insdel_chars (width, INSERT); 891 scr_insdel_chars (width, INSERT);
843 892
844 if (width != 0) 893 if (width != 0)
845 { 894 {
846#if !UNICODE_3 895#if !UNICODE_3
… …
851# else 900# else
852 c = 0xfffd; 901 c = 0xfffd;
853# endif 902# endif
854#endif 903#endif
855 904
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906
907 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
909 {
910 if (screen.flags & Screen_Autowrap)
911 {
912 // ... artificially enlargen the previous one
913 c = NOCHAR;
914 // and try the same character next loop iteration
915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
919 }
920
856 // nuke the character at this position, if required 921 // nuke the character at this position, if required
922 if (expect_false (
857 if (line->t[screen.cur.col] == NOCHAR 923 line->t[screen.cur.col] == NOCHAR
858 || (screen.cur.col < ncol - 1 924 || (screen.cur.col < ncol - 1
859 && line->t[screen.cur.col + 1] == NOCHAR)) 925 && line->t[screen.cur.col + 1] == NOCHAR)
860 { 926 ))
861 int col = screen.cur.col; 927 scr_kill_char (*line, screen.cur.col);
862
863 // find begin
864 while (col > 0 && line->t[col] == NOCHAR)
865 col--;
866
867 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
868
869 // found begin, nuke
870 do {
871 line->t[col] = ' ';
872 line->r[col] = rend;
873 col++;
874 } while (col < ncol && line->t[col] == NOCHAR);
875 }
876
877 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
878
879 // if the character doesn't fit into the remaining columns...
880 if (screen.cur.col > ncol - width && ncol >= width)
881 {
882 // ...output spaces
883 c = ' ';
884 // and try the same character next loop iteration
885 --str;
886 }
887 928
888 line->touch (); 929 line->touch ();
889 930
890 do 931 do
891 { 932 {
892 line->t[screen.cur.col] = c; 933 line->t[screen.cur.col] = c;
893 line->r[screen.cur.col] = rend; 934 line->r[screen.cur.col] = rend;
894 935
895 if (screen.cur.col < ncol - 1) 936 if (expect_true (screen.cur.col < ncol - 1))
896 screen.cur.col++; 937 screen.cur.col++;
897 else 938 else
898 { 939 {
899 line->l = ncol; 940 line->l = ncol;
900 if (screen.flags & Screen_Autowrap) 941 if (screen.flags & Screen_Autowrap)
901 screen.flags |= Screen_WrapNext; 942 screen.flags |= Screen_WrapNext;
902 break; 943
944 goto end_of_line;
903 } 945 }
904 946
905 c = NOCHAR; 947 c = NOCHAR;
906 } 948 }
907 while (--width > 0); 949 while (expect_false (--width > 0));
908 950
909 // pad with spaces when overwriting wide character with smaller one 951 // pad with spaces when overwriting wide character with smaller one
910 if (!width) 952 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
911 { 953 {
912 line->touch (); 954 line->t[c] = ' ';
955 line->r[c] = rend;
956 }
913 957
914 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 958end_of_line:
959 ;
960 }
961#if ENABLE_COMBINING
962 else // width == 0
963 {
964 if (c != 0xfeff) // ignore BOM
965 {
966 // handle combining characters
967 // we just tag the accent on the previous on-screen character.
968 // this is arguably not correct, but also arguably not wrong.
969 // we don't handle double-width characters nicely yet.
970 line_t *linep;
971 text_t *tp;
972 rend_t *rp;
973
974 if (screen.cur.col > 0)
915 { 975 {
916 line->t[c] = ' ';
917 line->r[c] = rend; 976 linep = line;
977 tp = line->t + screen.cur.col - 1;
978 rp = line->r + screen.cur.col - 1;
918 } 979 }
980 else if (screen.cur.row > 0
981 && ROW(screen.cur.row - 1).is_longer ())
982 {
983 linep = &ROW(screen.cur.row - 1);
984 tp = line->t + ncol - 1;
985 rp = line->r + ncol - 1;
986 }
987 else
988 continue;
989
990 linep->touch ();
991
992 while (*tp == NOCHAR && tp > linep->t)
993 tp--, rp--;
994
995 // first try to find a precomposed character
996 unicode_t n = rxvt_compose (*tp, c);
997 if (n == NOCHAR)
998 n = rxvt_composite.compose (*tp, c);
999
1000 *tp = n;
1001 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
919 } 1002 }
920 } 1003 }
921 else // width == 0
922 {
923#if ENABLE_COMBINING
924 // handle combining characters
925 // we just tag the accent on the previous on-screen character.
926 // this is arguably not correct, but also arguably not wrong.
927 // we don't handle double-width characters nicely yet.
928 line_t *linep;
929 text_t *tp;
930 rend_t *rp;
931
932 if (screen.cur.col > 0)
933 {
934 linep = line;
935 tp = line->t + screen.cur.col - 1;
936 rp = line->r + screen.cur.col - 1;
937 }
938 else if (screen.cur.row > 0
939 && ROW(screen.cur.row - 1).is_longer ())
940 {
941 linep = &ROW(screen.cur.row - 1);
942 tp = line->t + ncol - 1;
943 rp = line->r + ncol - 1;
944 }
945 else
946 continue;
947
948 linep->touch ();
949
950 while (*tp == NOCHAR && tp > linep->t)
951 tp--, rp--;
952
953 // first try to find a precomposed character
954 unicode_t n = rxvt_compose (*tp, c);
955 if (n == NOCHAR)
956 n = rxvt_composite.compose (*tp, c);
957
958 *tp = n;
959 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
960#endif 1004#endif
961 }
962 } 1005 }
963 1006
964 max_it (line->l, screen.cur.col); 1007 max_it (line->l, screen.cur.col);
965 1008
966#ifdef DEBUG_STRICT
967 assert (screen.cur.row >= 0); 1009 assert (screen.cur.row >= 0);
968#endif
969} 1010}
970 1011
971/* ------------------------------------------------------------------------- */ 1012/* ------------------------------------------------------------------------- */
972/* 1013/*
973 * Process Backspace. Move back the cursor back a position, wrap if have to 1014 * Process Backspace. Move back the cursor back a position, wrap if have to
974 * XTERM_SEQ: CTRL-H 1015 * XTERM_SEQ: CTRL-H
975 */ 1016 */
976void 1017void
977rxvt_term::scr_backspace () 1018rxvt_term::scr_backspace () NOTHROW
978{ 1019{
979 want_refresh = 1;
980
981 if (screen.cur.col == 0) 1020 if (screen.cur.col == 0)
982 { 1021 {
983 if (screen.cur.row > 0) 1022 if (screen.cur.row > 0)
984 { 1023 {
985#ifdef TERMCAP_HAS_BW 1024#ifdef TERMCAP_HAS_BW
986 screen.cur.col = ncol - 1; 1025 screen.cur.col = ncol - 1;
987 screen.cur.row--; 1026 --screen.cur.row;
988 return; 1027
1028 want_refresh = 1;
989#endif 1029#endif
990 } 1030 }
991 } 1031 }
992 else if (!(screen.flags & Screen_WrapNext)) 1032 else if (screen.flags & Screen_WrapNext)
1033 screen.flags &= ~Screen_WrapNext;
1034 else
993 scr_gotorc (0, -1, RELATIVE); 1035 scr_gotorc (0, -1, RELATIVE);
994
995 screen.flags &= ~Screen_WrapNext;
996} 1036}
997 1037
998/* ------------------------------------------------------------------------- */ 1038/* ------------------------------------------------------------------------- */
999/* 1039/*
1000 * Process Horizontal Tab 1040 * Process Horizontal Tab
1001 * count: +ve = forward; -ve = backwards 1041 * count: +ve = forward; -ve = backwards
1002 * XTERM_SEQ: CTRL-I 1042 * XTERM_SEQ: CTRL-I
1003 */ 1043 */
1004void 1044void
1005rxvt_term::scr_tab (int count, bool ht) 1045rxvt_term::scr_tab (int count, bool ht) NOTHROW
1006{ 1046{
1007 int i, x; 1047 int i, x;
1008 1048
1009 want_refresh = 1; 1049 want_refresh = 1;
1010 i = x = screen.cur.col; 1050 i = x = screen.cur.col;
… …
1023 x = i; 1063 x = i;
1024 1064
1025 if (!--count) 1065 if (!--count)
1026 break; 1066 break;
1027 } 1067 }
1028 else 1068 else
1029 ht &= l.t[i] == ' ' 1069 ht &= l.t[i] == ' '
1030 && RS_SAME (l.r[i], base_rend); 1070 && RS_SAME (l.r[i], base_rend);
1031 1071
1032 if (count) 1072 if (count)
1033 x = ncol - 1; 1073 x = ncol - 1;
1034 1074
1035 // store horizontal tab commands as characters inside the text 1075 // store horizontal tab commands as characters inside the text
1036 // buffer so they can be selected and pasted. 1076 // buffer so they can be selected and pasted.
1037 if (ht && OPTION (Opt_pastableTabs)) 1077 if (ht && option (Opt_pastableTabs))
1038 { 1078 {
1039 base_rend = SET_FONT (base_rend, 0); 1079 base_rend = SET_FONT (base_rend, 0);
1040 1080
1041 l.touch (x); 1081 l.touch (x);
1042 1082
… …
1075 * Process DEC Back Index 1115 * Process DEC Back Index
1076 * XTERM_SEQ: ESC 6 1116 * XTERM_SEQ: ESC 6
1077 * Move cursor left in row. If we're at the left boundary, shift everything 1117 * Move cursor left in row. If we're at the left boundary, shift everything
1078 * in that row right. Clear left column. 1118 * in that row right. Clear left column.
1079 */ 1119 */
1080#if ENABLE_FRILLS 1120#if !ENABLE_MINIMAL
1081void 1121void
1082rxvt_term::scr_backindex () 1122rxvt_term::scr_backindex () NOTHROW
1083{ 1123{
1084 if (screen.cur.col > 0) 1124 if (screen.cur.col > 0)
1085 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1125 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1086 else 1126 else
1087 scr_insdel_chars (1, INSERT); 1127 scr_insdel_chars (1, INSERT);
… …
1092 * Process DEC Forward Index 1132 * Process DEC Forward Index
1093 * XTERM_SEQ: ESC 9 1133 * XTERM_SEQ: ESC 9
1094 * Move cursor right in row. If we're at the right boundary, shift everything 1134 * Move cursor right in row. If we're at the right boundary, shift everything
1095 * in that row left. Clear right column. 1135 * in that row left. Clear right column.
1096 */ 1136 */
1097#if ENABLE_FRILLS 1137#if !ENABLE_MINIMAL
1098void 1138void
1099rxvt_term::scr_forwardindex () 1139rxvt_term::scr_forwardindex () NOTHROW
1100{ 1140{
1101 if (screen.cur.col < ncol - 1) 1141 if (screen.cur.col < ncol - 1)
1102 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1142 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1103 else 1143 else
1104 { 1144 {
… …
1117/* ------------------------------------------------------------------------- */ 1157/* ------------------------------------------------------------------------- */
1118/* 1158/*
1119 * Goto Row/Column 1159 * Goto Row/Column
1120 */ 1160 */
1121void 1161void
1122rxvt_term::scr_gotorc (int row, int col, int relative) 1162rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1123{ 1163{
1124 want_refresh = 1; 1164 want_refresh = 1;
1125 ZERO_SCROLLBACK (); 1165 ZERO_SCROLLBACK ();
1126 1166
1127 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1167 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1149 } 1189 }
1150 } 1190 }
1151 else 1191 else
1152 { 1192 {
1153 if (screen.flags & Screen_Relative) 1193 if (screen.flags & Screen_Relative)
1194 {
1154 { /* relative origin mode */ 1195 /* relative origin mode */
1155 screen.cur.row = row + screen.tscroll; 1196 screen.cur.row = row + screen.tscroll;
1156 min_it (screen.cur.row, screen.bscroll); 1197 min_it (screen.cur.row, screen.bscroll);
1157 } 1198 }
1158 else 1199 else
1159 screen.cur.row = row; 1200 screen.cur.row = row;
… …
1165/* ------------------------------------------------------------------------- */ 1206/* ------------------------------------------------------------------------- */
1166/* 1207/*
1167 * direction should be UP or DN 1208 * direction should be UP or DN
1168 */ 1209 */
1169void 1210void
1170rxvt_term::scr_index (enum page_dirn direction) 1211rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1171{ 1212{
1172 int dirn; 1213 int dirn;
1173 1214
1174 want_refresh = 1; 1215 want_refresh = 1;
1175 ZERO_SCROLLBACK (); 1216 ZERO_SCROLLBACK ();
… …
1192/* 1233/*
1193 * Erase part or whole of a line 1234 * Erase part or whole of a line
1194 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1235 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1195 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1236 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1196 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1237 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1238 * extension: clear to right unless wrapped: ESC [ 3 K
1197 */ 1239 */
1198void 1240void
1199rxvt_term::scr_erase_line (int mode) 1241rxvt_term::scr_erase_line (int mode) NOTHROW
1200{ 1242{
1201 unsigned int col, num; 1243 unsigned int col, num;
1202 1244
1203 want_refresh = 1; 1245 want_refresh = 1;
1204 ZERO_SCROLLBACK (); 1246 ZERO_SCROLLBACK ();
… …
1210 line.touch (); 1252 line.touch ();
1211 line.is_longer (0); 1253 line.is_longer (0);
1212 1254
1213 switch (mode) 1255 switch (mode)
1214 { 1256 {
1257 case 3:
1258 if (screen.flags & Screen_WrapNext)
1259 return;
1260
1261 /* fall through */
1262
1215 case 0: /* erase to end of line */ 1263 case 0: /* erase to end of line */
1216 col = screen.cur.col; 1264 col = screen.cur.col;
1217 num = ncol - col; 1265 num = ncol - col;
1218 min_it (line.l, col); 1266 min_it (line.l, col);
1267
1219 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1268 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1220 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1269 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1221 CLEAR_SELECTION (); 1270 CLEAR_SELECTION ();
1222 break; 1271 break;
1272
1223 case 1: /* erase to beginning of line */ 1273 case 1: /* erase to beginning of line */
1224 col = 0; 1274 col = 0;
1225 num = screen.cur.col + 1; 1275 num = screen.cur.col + 1;
1276
1226 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1277 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1227 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1278 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1228 CLEAR_SELECTION (); 1279 CLEAR_SELECTION ();
1229 break; 1280 break;
1281
1230 case 2: /* erase whole line */ 1282 case 2: /* erase whole line */
1231 col = 0; 1283 col = 0;
1232 num = ncol; 1284 num = ncol;
1233 line.l = 0; 1285 line.l = 0;
1234 if (selection.beg.row <= screen.cur.row 1286 if (selection.beg.row <= screen.cur.row
… …
1248 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1300 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1249 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1301 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1250 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1302 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1251 */ 1303 */
1252void 1304void
1253rxvt_term::scr_erase_screen (int mode) 1305rxvt_term::scr_erase_screen (int mode) NOTHROW
1254{ 1306{
1255 int num; 1307 int num;
1256 int32_t row; 1308 int32_t row;
1257 rend_t ren; 1309 rend_t ren;
1258 XGCValues gcvalue; 1310 XGCValues gcvalue;
… …
1292 if (row >= nrow) /* Out Of Bounds */ 1344 if (row >= nrow) /* Out Of Bounds */
1293 return; 1345 return;
1294 1346
1295 min_it (num, nrow - row); 1347 min_it (num, nrow - row);
1296 1348
1297 if (rstyle & (RS_RVid | RS_Uline)) 1349 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1298 ren = (rend_t) ~RS_None; 1350 ren = (rend_t) ~RS_None;
1299 else if (GET_BASEBG (rstyle) == Color_bg) 1351 else if (GET_BASEBG (rstyle) == Color_bg)
1300 { 1352 {
1301 ren = DEFAULT_RSTYLE; 1353 ren = DEFAULT_RSTYLE;
1302 CLEAR_ROWS (row, num); 1354
1355 if (mapped)
1356 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width,
1358 (unsigned int)Height2Pixel (num), False);
1303 } 1359 }
1304 else 1360 else
1305 { 1361 {
1306 ren = rstyle & (RS_fgMask | RS_bgMask); 1362 ren = rstyle & (RS_fgMask | RS_bgMask);
1363
1364 if (mapped)
1365 {
1307 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1308 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1309 ERASE_ROWS (row, num); 1368 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start),
1370 (unsigned int)width,
1371 (unsigned int)Height2Pixel (num));
1310 gcvalue.foreground = pix_colors[Color_fg]; 1372 gcvalue.foreground = pix_colors[Color_fg];
1311 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1373 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 }
1312 } 1375 }
1313 1376
1314 for (; num--; row++) 1377 for (; num--; row++)
1315 { 1378 {
1316 scr_blank_screen_mem (ROW(row), rstyle); 1379 scr_blank_screen_mem (ROW(row), rstyle);
1380
1381 if (row - view_start < nrow)
1317 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1382 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1318 } 1383 }
1319} 1384}
1320 1385
1321#if ENABLE_FRILLS 1386#if !ENABLE_MINIMAL
1322void 1387void
1323rxvt_term::scr_erase_savelines () 1388rxvt_term::scr_erase_savelines () NOTHROW
1324{ 1389{
1325 want_refresh = 1; 1390 want_refresh = 1;
1326 ZERO_SCROLLBACK (); 1391 ZERO_SCROLLBACK ();
1327 1392
1328 nsaved = 0; 1393 top_row = 0;
1329} 1394}
1330#endif 1395#endif
1331 1396
1332/* ------------------------------------------------------------------------- */ 1397/* ------------------------------------------------------------------------- */
1333/* 1398/*
1334 * Fill the screen with `E's 1399 * Fill the screen with `E's
1335 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1400 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1336 */ 1401 */
1337void 1402void
1338rxvt_term::scr_E () 1403rxvt_term::scr_E () NOTHROW
1339{ 1404{
1340 rend_t fs; 1405 rend_t fs;
1341 1406
1342 want_refresh = 1; 1407 want_refresh = 1;
1343 ZERO_SCROLLBACK (); 1408 ZERO_SCROLLBACK ();
… …
1364/* ------------------------------------------------------------------------- */ 1429/* ------------------------------------------------------------------------- */
1365/* 1430/*
1366 * Insert/Delete <count> lines 1431 * Insert/Delete <count> lines
1367 */ 1432 */
1368void 1433void
1369rxvt_term::scr_insdel_lines (int count, int insdel) 1434rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1370{ 1435{
1371 int end; 1436 int end;
1372 1437
1373 ZERO_SCROLLBACK (); 1438 ZERO_SCROLLBACK ();
1374 1439
… …
1394/* ------------------------------------------------------------------------- */ 1459/* ------------------------------------------------------------------------- */
1395/* 1460/*
1396 * Insert/Delete <count> characters from the current position 1461 * Insert/Delete <count> characters from the current position
1397 */ 1462 */
1398void 1463void
1399rxvt_term::scr_insdel_chars (int count, int insdel) 1464rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1400{ 1465{
1401 int col, row;
1402 rend_t tr;
1403
1404 want_refresh = 1; 1466 want_refresh = 1;
1405 ZERO_SCROLLBACK (); 1467 ZERO_SCROLLBACK ();
1406 1468
1407 if (count <= 0) 1469 if (count <= 0)
1408 return; 1470 return;
… …
1410 scr_do_wrap (); 1472 scr_do_wrap ();
1411 1473
1412 selection_check (1); 1474 selection_check (1);
1413 min_it (count, ncol - screen.cur.col); 1475 min_it (count, ncol - screen.cur.col);
1414 1476
1415 row = screen.cur.row; 1477 int row = screen.cur.row;
1416 1478
1417 line_t *line = &ROW(row); 1479 line_t *line = &ROW(row);
1418 1480
1419 line->touch (); 1481 line->touch ();
1420 line->is_longer (0); 1482 line->is_longer (0);
1421 1483
1484 // nuke wide spanning the start
1485 if (line->t[screen.cur.col] == NOCHAR)
1486 scr_kill_char (*line, screen.cur.col);
1487
1422 switch (insdel) 1488 switch (insdel)
1423 { 1489 {
1424 case INSERT: 1490 case INSERT:
1425 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1491 line->l = min (line->l + count, ncol);
1492
1493 if (line->t[screen.cur.col] == NOCHAR)
1494 scr_kill_char (*line, screen.cur.col);
1495
1496 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1426 { 1497 {
1427 line->t[col] = line->t[col - count]; 1498 line->t[col] = line->t[col - count];
1428 line->r[col] = line->r[col - count]; 1499 line->r[col] = line->r[col - count];
1429 } 1500 }
1430
1431 line->l = min (line->l + count, ncol);
1432 1501
1433 if (selection.op && current_screen == selection.screen 1502 if (selection.op && current_screen == selection.screen
1434 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1503 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1435 { 1504 {
1436 if (selection.end.row != screen.cur.row 1505 if (selection.end.row != screen.cur.row
1437 || (selection.end.col + count >= ncol)) 1506 || (selection.end.col + count >= ncol))
1438 CLEAR_SELECTION (); 1507 CLEAR_SELECTION ();
1439 else 1508 else
1509 {
1440 { /* shift selection */ 1510 /* shift selection */
1441 selection.beg.col += count; 1511 selection.beg.col += count;
1442 selection.mark.col += count; /* XXX: yes? */ 1512 selection.mark.col += count; /* XXX: yes? */
1443 selection.end.col += count; 1513 selection.end.col += count;
1444 } 1514 }
1445 } 1515 }
… …
1450 case ERASE: 1520 case ERASE:
1451 screen.cur.col += count; /* don't worry if > ncol */ 1521 screen.cur.col += count; /* don't worry if > ncol */
1452 selection_check (1); 1522 selection_check (1);
1453 screen.cur.col -= count; 1523 screen.cur.col -= count;
1454 1524
1455 line->l = max (line->l - count, 0); 1525 // nuke wide char after the end
1526 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1527 scr_kill_char (*line, screen.cur.col + count);
1528
1456 scr_blank_line (*line, screen.cur.col, count, rstyle); 1529 scr_blank_line (*line, screen.cur.col, count, rstyle);
1457 break; 1530 break;
1458 1531
1459 case DELETE: 1532 case DELETE:
1460 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1533 line->l = max (line->l - count, 0);
1461 1534
1535 // nuke wide char spanning the end
1536 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1537 scr_kill_char (*line, screen.cur.col + count);
1538
1462 for (col = screen.cur.col; (col + count) < ncol; col++) 1539 for (int col = screen.cur.col; (col + count) < ncol; col++)
1463 { 1540 {
1464 line->t[col] = line->t[col + count]; 1541 line->t[col] = line->t[col + count];
1465 line->r[col] = line->r[col + count]; 1542 line->r[col] = line->r[col + count];
1466 } 1543 }
1467 1544
1468 line->l = max (line->l - count, 0);
1469 scr_blank_line (*line, ncol - count, count, tr); 1545 scr_blank_line (*line, ncol - count, count, rstyle);
1470 1546
1471 if (selection.op && current_screen == selection.screen 1547 if (selection.op && current_screen == selection.screen
1472 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1548 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1473 { 1549 {
1474 if (selection.end.row != screen.cur.row 1550 if (selection.end.row != screen.cur.row
… …
1492/* 1568/*
1493 * Set the scrolling region 1569 * Set the scrolling region
1494 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1570 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1495 */ 1571 */
1496void 1572void
1497rxvt_term::scr_scroll_region (int top, int bot) 1573rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1498{ 1574{
1499 max_it (top, 0); 1575 max_it (top, 0);
1500 min_it (bot, nrow - 1); 1576 min_it (bot, nrow - 1);
1501 1577
1502 if (top > bot) 1578 if (top > bot)
… …
1512 * Make the cursor visible/invisible 1588 * Make the cursor visible/invisible
1513 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1589 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1514 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1590 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1515 */ 1591 */
1516void 1592void
1517rxvt_term::scr_cursor_visible (int mode) 1593rxvt_term::scr_cursor_visible (int mode) NOTHROW
1518{ 1594{
1519 want_refresh = 1; 1595 want_refresh = 1;
1520 1596
1521 if (mode) 1597 if (mode)
1522 screen.flags |= Screen_VisibleCursor; 1598 screen.flags |= Screen_VisibleCursor;
… …
1529 * Set/unset automatic wrapping 1605 * Set/unset automatic wrapping
1530 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1606 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1531 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1607 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1532 */ 1608 */
1533void 1609void
1534rxvt_term::scr_autowrap (int mode) 1610rxvt_term::scr_autowrap (int mode) NOTHROW
1535{ 1611{
1536 if (mode) 1612 if (mode)
1537 screen.flags |= Screen_Autowrap; 1613 screen.flags |= Screen_Autowrap;
1538 else 1614 else
1539 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1615 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1548 * and the cursor cannot be moved outside. 1624 * and the cursor cannot be moved outside.
1549 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1625 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1550 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1626 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1551 */ 1627 */
1552void 1628void
1553rxvt_term::scr_relative_origin (int mode) 1629rxvt_term::scr_relative_origin (int mode) NOTHROW
1554{ 1630{
1555 if (mode) 1631 if (mode)
1556 screen.flags |= Screen_Relative; 1632 screen.flags |= Screen_Relative;
1557 else 1633 else
1558 screen.flags &= ~Screen_Relative; 1634 screen.flags &= ~Screen_Relative;
… …
1565 * Set insert/replace mode 1641 * Set insert/replace mode
1566 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1642 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1567 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1643 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1568 */ 1644 */
1569void 1645void
1570rxvt_term::scr_insert_mode (int mode) 1646rxvt_term::scr_insert_mode (int mode) NOTHROW
1571{ 1647{
1572 if (mode) 1648 if (mode)
1573 screen.flags |= Screen_Insert; 1649 screen.flags |= Screen_Insert;
1574 else 1650 else
1575 screen.flags &= ~Screen_Insert; 1651 screen.flags &= ~Screen_Insert;
… …
1581 * XTERM_SEQ: Set tab at current column : ESC H 1657 * XTERM_SEQ: Set tab at current column : ESC H
1582 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1658 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1583 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1659 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1584 */ 1660 */
1585void 1661void
1586rxvt_term::scr_set_tab (int mode) 1662rxvt_term::scr_set_tab (int mode) NOTHROW
1587{ 1663{
1588 if (mode < 0) 1664 if (mode < 0)
1589 memset (tabs, 0, ncol * sizeof (char)); 1665 memset (tabs, 0, ncol);
1590 else if (screen.cur.col < ncol) 1666 else if (screen.cur.col < ncol)
1591 tabs [screen.cur.col] = !!mode; 1667 tabs [screen.cur.col] = !!mode;
1592} 1668}
1593 1669
1594/* ------------------------------------------------------------------------- */ 1670/* ------------------------------------------------------------------------- */
… …
1596 * Set reverse/normal video 1672 * Set reverse/normal video
1597 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1673 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1598 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1674 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1599 */ 1675 */
1600void 1676void
1601rxvt_term::scr_rvideo_mode (int mode) 1677rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1602{ 1678{
1603 XGCValues gcvalue; 1679 rvideo_mode = on;
1604 1680
1681#ifndef NO_BELL
1682 on ^= rvideo_bell;
1683#endif
1684
1605 if (rvideo != mode) 1685 if (rvideo_state != on)
1606 { 1686 {
1607 rvideo = mode; 1687 rvideo_state = on;
1688
1608 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1609#if XPM_BACKGROUND 1690#ifdef HAVE_BG_PIXMAP
1610 if (bgPixmap.pixmap == None) 1691 if (bgPixmap.pixmap == None)
1611#endif 1692#endif
1612#if TRANSPARENT 1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1613 if (! OPTION (Opt_transparent) || am_transparent == 0)
1614#endif
1615 XSetWindowBackground (display->display, vt,
1616 pix_colors[Color_bg]);
1617 1694
1695 XGCValues gcvalue;
1618 gcvalue.foreground = pix_colors[Color_fg]; 1696 gcvalue.foreground = pix_colors[Color_fg];
1619 gcvalue.background = pix_colors[Color_bg]; 1697 gcvalue.background = pix_colors[Color_bg];
1620 XChangeGC (display->display, gc, GCBackground | GCForeground, 1698 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1621 &gcvalue); 1699
1622 scr_clear (); 1700 scr_clear ();
1623 scr_touch (true); 1701 scr_touch (true);
1624 } 1702 }
1625} 1703}
1626 1704
… …
1628/* 1706/*
1629 * Report current cursor position 1707 * Report current cursor position
1630 * XTERM_SEQ: Report position: ESC [ 6 n 1708 * XTERM_SEQ: Report position: ESC [ 6 n
1631 */ 1709 */
1632void 1710void
1633rxvt_term::scr_report_position () 1711rxvt_term::scr_report_position () NOTHROW
1634{ 1712{
1635 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1713 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1636} 1714}
1637 1715
1638/* ------------------------------------------------------------------------- * 1716/* ------------------------------------------------------------------------- *
… …
1641 1719
1642/* 1720/*
1643 * Set font style 1721 * Set font style
1644 */ 1722 */
1645void 1723void
1646rxvt_term::set_font_style () 1724rxvt_term::set_font_style () NOTHROW
1647{ 1725{
1648#if 0 1726#if 0
1649 switch (charsets [screen.charset]) 1727 switch (charsets [screen.charset])
1650 { 1728 {
1651 case '0': /* DEC Special Character & Line Drawing Set */ 1729 case '0': /* DEC Special Character & Line Drawing Set */
… …
1673 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1751 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1674 * XTERM_SEQ: Invoke G2 character set: ESC N 1752 * XTERM_SEQ: Invoke G2 character set: ESC N
1675 * XTERM_SEQ: Invoke G3 character set: ESC O 1753 * XTERM_SEQ: Invoke G3 character set: ESC O
1676 */ 1754 */
1677void 1755void
1678rxvt_term::scr_charset_choose (int set) 1756rxvt_term::scr_charset_choose (int set) NOTHROW
1679{ 1757{
1680 screen.charset = set; 1758 screen.charset = set;
1681 set_font_style (); 1759 set_font_style ();
1682} 1760}
1683 1761
… …
1689 * XTERM_SEQ: Set G2 character set: ESC * <C> 1767 * XTERM_SEQ: Set G2 character set: ESC * <C>
1690 * XTERM_SEQ: Set G3 character set: ESC + <C> 1768 * XTERM_SEQ: Set G3 character set: ESC + <C>
1691 * See set_font_style for possible values for <C> 1769 * See set_font_style for possible values for <C>
1692 */ 1770 */
1693void 1771void
1694rxvt_term::scr_charset_set (int set, unsigned int ch) 1772rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1695{ 1773{
1696 charsets[set] = (unsigned char)ch; 1774 charsets[set] = (unsigned char)ch;
1697 set_font_style (); 1775 set_font_style ();
1698} 1776}
1699 1777
… …
1704 1782
1705/* 1783/*
1706 * refresh matching text. 1784 * refresh matching text.
1707 */ 1785 */
1708bool 1786bool
1709rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1787rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1710{ 1788{
1711 bool found = false; 1789 bool found = false;
1712 1790
1713 for (int i = 0; i < nrow; i++) 1791 for (int i = 0; i < nrow; i++)
1714 { 1792 {
1715 int col = 0;
1716 rend_t *drp = drawn_buf[i].r; 1793 rend_t *drp = drawn_buf[i].r;
1717 1794
1718 for (; col < ncol; col++, drp++) 1795 for (int col = 0; col < ncol; col++, drp++)
1719 if ((*drp & mask) == value) 1796 if ((*drp & mask) == value)
1720 { 1797 {
1721 found = true; 1798 found = true;
1722 *drp = ~value; 1799 *drp = ~value;
1723 } 1800 }
… …
1734 PART_END, 1811 PART_END,
1735 RC_COUNT 1812 RC_COUNT
1736}; 1813};
1737 1814
1738void 1815void
1739rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1816rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1740{ 1817{
1741 int i; 1818 int i;
1742 row_col_t rc[RC_COUNT]; 1819 row_col_t rc[RC_COUNT];
1743 1820
1744 if (!drawn_buf) /* sanity check */ 1821 if (!drawn_buf) /* sanity check */
… …
1767 } 1844 }
1768 1845
1769 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1770 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1847 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1771 1848
1849 num_scr_allow = 0;
1850
1772 if (refresh) 1851 if (refresh)
1773 scr_refresh (SLOW_REFRESH); 1852 scr_refresh ();
1774} 1853}
1775 1854
1776/* ------------------------------------------------------------------------- */ 1855/* ------------------------------------------------------------------------- */
1777/* 1856/*
1778 * Refresh the entire screen 1857 * Refresh the entire screen
1779 */ 1858 */
1780void 1859void
1781rxvt_term::scr_touch (bool refresh) 1860rxvt_term::scr_touch (bool refresh) NOTHROW
1782{ 1861{
1783 scr_expose (0, 0, width, height, refresh); 1862 scr_expose (0, 0, width, height, refresh);
1784} 1863}
1785 1864
1786/* ------------------------------------------------------------------------- */ 1865/* ------------------------------------------------------------------------- */
1787/* 1866/*
1788 * Move the display so that the line represented by scrollbar value Y is at 1867 * Move the display so that the line represented by scrollbar value Y is at
1789 * the top of the screen 1868 * the top of the screen
1790 */ 1869 */
1791int 1870void
1792rxvt_term::scr_move_to (int y, int len) 1871rxvt_term::scr_move_to (int y, int len) NOTHROW
1793{ 1872{
1794 long p = 0; 1873 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1795 unsigned int oldviewstart;
1796
1797 oldviewstart = view_start;
1798
1799 if (y < len)
1800 {
1801 p = (nrow + nsaved) * (len - y) / len;
1802 p -= (long) (nrow - 1);
1803 p = max (p, 0);
1804 }
1805
1806 view_start = (unsigned int)min (p, nsaved);
1807
1808 return scr_changeview (oldviewstart);
1809} 1874}
1810 1875
1811/* ------------------------------------------------------------------------- */ 1876/* ------------------------------------------------------------------------- */
1812/* 1877/*
1813 * Page the screen up/down nlines 1878 * Page the screen up/down nlines
1814 * direction should be UP or DN 1879 * direction should be UP or DN
1815 */ 1880 */
1816int 1881bool
1817rxvt_term::scr_page (enum page_dirn direction, int nlines) 1882rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1818{ 1883{
1819 int n; 1884 int new_view_start =
1820 unsigned int oldviewstart;
1821
1822 oldviewstart = view_start;
1823
1824 if (direction == UP)
1825 {
1826 n = view_start + nlines;
1827 view_start = min (n, nsaved);
1828 }
1829 else
1830 {
1831 n = view_start - nlines; 1885 direction == UP ? view_start - nlines
1832 view_start = max (n, 0); 1886 : view_start + nlines;
1833 }
1834 1887
1835 return scr_changeview (oldviewstart); 1888 return scr_changeview (new_view_start);
1836} 1889}
1837 1890
1838int 1891bool
1839rxvt_term::scr_changeview (unsigned int oldviewstart) 1892rxvt_term::scr_changeview (int new_view_start) NOTHROW
1840{ 1893{
1894 clamp_it (new_view_start, top_row, 0);
1895
1841 if (view_start != oldviewstart) 1896 if (new_view_start == view_start)
1842 { 1897 return false;
1898
1899 num_scr += new_view_start - view_start;
1900 view_start = new_view_start;
1901 want_refresh = 1;
1902
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1903 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844 1904
1845 want_refresh = 1; 1905 return true;
1846 num_scr -= (view_start - oldviewstart);
1847 }
1848
1849 return (int)view_start - (int)oldviewstart;
1850} 1906}
1851 1907
1852/* ------------------------------------------------------------------------- */ 1908#ifndef NO_BELL
1853void 1909void
1910rxvt_term::bell_cb (ev::timer &w, int revents)
1911{
1912 rvideo_bell = false;
1913 scr_rvideo_mode (rvideo_mode);
1914 refresh_check ();
1915}
1916#endif
1917
1918/* ------------------------------------------------------------------------- */
1919void
1854rxvt_term::scr_bell () 1920rxvt_term::scr_bell () NOTHROW
1855{ 1921{
1856#ifndef NO_BELL 1922#ifndef NO_BELL
1857 1923
1858# ifndef NO_MAPALERT 1924# ifndef NO_MAPALERT
1859# ifdef MAPALERT_OPTION 1925# ifdef MAPALERT_OPTION
1860 if (OPTION (Opt_mapAlert)) 1926 if (option (Opt_mapAlert))
1861# endif 1927# endif
1862 XMapWindow (display->display, parent[0]); 1928 XMapWindow (dpy, parent[0]);
1863# endif 1929# endif
1864 1930
1931# if ENABLE_FRILLS
1932 if (option (Opt_urgentOnBell))
1933 set_urgency (1);
1934# endif
1935
1865 if (OPTION (Opt_visualBell)) 1936 if (option (Opt_visualBell))
1866 { 1937 {
1867 scr_rvideo_mode (!rvideo); /* refresh also done */ 1938 rvideo_bell = true;
1939 scr_rvideo_mode (rvideo_mode);
1868 display->flush (); 1940 flush ();
1941
1869 rxvt_usleep (VISUAL_BELL_DURATION); 1942 bell_ev.start (VISUAL_BELL_DURATION);
1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1871 } 1943 }
1872 else 1944 else
1873 XBell (display->display, 0); 1945 XBell (dpy, 0);
1874 1946 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1875#endif 1947#endif
1876} 1948}
1877 1949
1878/* ------------------------------------------------------------------------- */ 1950/* ------------------------------------------------------------------------- */
1879/* ARGSUSED */ 1951/* ARGSUSED */
1880void 1952void
1881rxvt_term::scr_printscreen (int fullhist) 1953rxvt_term::scr_printscreen (int fullhist) NOTHROW
1882{ 1954{
1883#ifdef PRINTPIPE 1955#ifdef PRINTPIPE
1884 int nrows, row_start; 1956 int nrows, row_start;
1885 FILE *fd; 1957 FILE *fd = popen_printer ();
1886 1958
1887 if ((fd = popen_printer ()) == NULL) 1959 if (!fd)
1888 return; 1960 return;
1889 1961
1890 if (fullhist) 1962 if (fullhist)
1891 { 1963 {
1892 nrows = nrow + nsaved; 1964 nrows = nrow - top_row;
1893 row_start = -nsaved; 1965 row_start = top_row;
1894 } 1966 }
1895 else 1967 else
1896 { 1968 {
1897 nrows = nrow; 1969 nrows = nrow;
1898 row_start = -view_start; 1970 row_start = view_start;
1899 } 1971 }
1900 1972
1901 wctomb (0, 0); 1973 wctomb (0, 0);
1902 1974
1903 for (int r1 = 0; r1 < nrows; r1++) 1975 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1904 { 1976 {
1905 text_t *tp = ROW(r1).t; 1977 text_t *tp = ROW(r1).t;
1906 int len = ROW(r1).l; 1978 int len = ROW(r1).l;
1907 1979
1908 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1980 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1935 * Refresh the screen 2007 * Refresh the screen
1936 * drawn_text/drawn_rend contain the screen information before the update. 2008 * drawn_text/drawn_rend contain the screen information before the update.
1937 * screen.text/screen.rend contain what the screen will change to. 2009 * screen.text/screen.rend contain what the screen will change to.
1938 */ 2010 */
1939void 2011void
1940rxvt_term::scr_refresh (unsigned char refresh_type) 2012rxvt_term::scr_refresh () NOTHROW
1941{ 2013{
1942 unsigned char must_clear, /* use draw_string not draw_image_string */
1943 showcursor; /* show the cursor */
1944 int16_t col, row, /* column/row we're processing */ 2014 int16_t col, row, /* column/row we're processing */
1945 ocrow; /* old cursor row */ 2015 ocrow; /* old cursor row */
1946 int i; /* tmp */ 2016 int i; /* tmp */
1947#ifndef NO_CURSORCOLOR 2017#ifndef NO_CURSORCOLOR
1948 rend_t cc1; /* store colours at cursor position (s) */ 2018 rend_t cc1; /* store colours at cursor position (s) */
1949#endif 2019#endif
1950 rend_t *crp; // cursor rendition pointer 2020 rend_t *crp; // cursor rendition pointer
2021 rend_t ccol1, /* Cursor colour */
2022 ccol2; /* Cursor colour2 */
1951 2023
1952 want_refresh = 0; /* screen is current */ 2024 want_refresh = 0; /* screen is current */
1953 2025
1954 if (refresh_type == NO_REFRESH || !mapped) 2026 if (refresh_type == NO_REFRESH || !mapped)
1955 return; 2027 return;
1956 2028
1957 /* 2029 /*
1958 * A: set up vars 2030 * A: set up vars
1959 */ 2031 */
1960 must_clear = 0;
1961 refresh_count = 0; 2032 refresh_count = 0;
1962 2033
1963#if XPM_BACKGROUND 2034 unsigned int old_screen_flags = screen.flags;
2035 char have_bg = 0;
2036#ifdef HAVE_BG_PIXMAP
1964 must_clear |= bgPixmap.pixmap != None; 2037 have_bg = bgPixmap.pixmap != None;
1965#endif
1966#if TRANSPARENT
1967 must_clear |= OPTION (Opt_transparent) && am_transparent;
1968#endif 2038#endif
1969 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1970 2040
1971 /* 2041 /*
1972 * B: reverse any characters which are selected 2042 * B: reverse any characters which are selected
1973 */ 2043 */
1974 scr_reverse_selection (); 2044 scr_reverse_selection ();
2045
2046 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2047#if ENABLE_OVERLAY
2048 scr_swap_overlay ();
2049#endif
2050
2051 char showcursor = screen.flags & Screen_VisibleCursor;
1975 2052
1976 /* 2053 /*
1977 * C: set the cursor character (s) 2054 * C: set the cursor character (s)
1978 */ 2055 */
1979 { 2056 {
1980 unsigned char setoldcursor; 2057 unsigned char setoldcursor;
1981 rend_t ccol1, /* Cursor colour */
1982 ccol2; /* Cursor colour2 */
1983 2058
1984 showcursor = (screen.flags & Screen_VisibleCursor);
1985#ifdef CURSOR_BLINK 2059#ifdef CURSOR_BLINK
1986 if (hidden_cursor) 2060 if (hidden_cursor)
1987 showcursor = 0; 2061 showcursor = 0;
1988#endif 2062#endif
1989 2063
… …
1994 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2068 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1995 col--; 2069 col--;
1996 2070
1997 crp = &ROW(screen.cur.row).r[col]; 2071 crp = &ROW(screen.cur.row).r[col];
1998 2072
1999 if (showcursor && focus) 2073#ifndef NO_CURSORCOLOR
2074 cc1 = *crp & (RS_fgMask | RS_bgMask);
2075 if (ISSET_PIXCOLOR (Color_cursor))
2076 ccol1 = Color_cursor;
2077 else
2078#endif
2079#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2080 ccol1 = fgcolor_of (rstyle);
2081#else
2082 ccol1 = Color_fg;
2083#endif
2084
2085#ifndef NO_CURSORCOLOR
2086 if (ISSET_PIXCOLOR (Color_cursor2))
2087 ccol2 = Color_cursor2;
2088 else
2089#endif
2090#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2091 ccol2 = bgcolor_of (rstyle);
2092#else
2093 ccol2 = Color_bg;
2094#endif
2095
2096 if (focus)
2000 { 2097 {
2001 if (OPTION (Opt_cursorUnderline)) 2098 if (option (Opt_cursorUnderline))
2002 *crp ^= RS_Uline; 2099 *crp ^= RS_Uline;
2003 else 2100 else
2004 { 2101 {
2005 *crp ^= RS_RVid; 2102 *crp ^= RS_RVid;
2006
2007#ifndef NO_CURSORCOLOR
2008 cc1 = *crp & (RS_fgMask | RS_bgMask);
2009 if (ISSET_PIXCOLOR (Color_cursor))
2010 ccol1 = Color_cursor;
2011 else
2012#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2013 ccol1 = fgcolor_of (rstyle);
2014#else
2015 ccol1 = Color_fg;
2016#endif
2017 if (ISSET_PIXCOLOR (Color_cursor2))
2018 ccol2 = Color_cursor2;
2019 else
2020#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2021 ccol2 = bgcolor_of (rstyle);
2022#else
2023 ccol2 = Color_bg;
2024#endif
2025 *crp = SET_FGCOLOR (*crp, ccol1); 2103 *crp = SET_FGCOLOR (*crp, ccol1);
2026 *crp = SET_BGCOLOR (*crp, ccol2); 2104 *crp = SET_BGCOLOR (*crp, ccol2);
2027#endif
2028 } 2105 }
2029 } 2106 }
2030 } 2107 }
2031 2108
2032 /* make sure no outline cursor is left around */ 2109 /* make sure no outline cursor is left around */
2033 setoldcursor = 0; 2110 setoldcursor = 0;
2034 if (ocrow != -1) 2111 if (ocrow != -1)
2035 { 2112 {
2036 if (screen.cur.row + view_start != ocrow 2113 if (screen.cur.row - view_start != ocrow
2037 || screen.cur.col != oldcursor.col) 2114 || screen.cur.col != oldcursor.col)
2038 { 2115 {
2039 if (ocrow < nrow 2116 if (ocrow < nrow
2040 && oldcursor.col < ncol) 2117 && oldcursor.col < ncol)
2041 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2118 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2049 else if (!focus) 2126 else if (!focus)
2050 setoldcursor = 1; 2127 setoldcursor = 1;
2051 2128
2052 if (setoldcursor) 2129 if (setoldcursor)
2053 { 2130 {
2054 if (screen.cur.row + view_start >= nrow) 2131 if (screen.cur.row - view_start >= nrow)
2055 oldcursor.row = -1; 2132 oldcursor.row = -1;
2056 else 2133 else
2057 { 2134 {
2058 oldcursor.row = screen.cur.row + view_start; 2135 oldcursor.row = screen.cur.row - view_start;
2059 oldcursor.col = screen.cur.col; 2136 oldcursor.col = screen.cur.col;
2060 } 2137 }
2061 } 2138 }
2062 } 2139 }
2063
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2065#if ENABLE_OVERLAY
2066 scr_swap_overlay ();
2067#endif
2068 2140
2069#ifndef NO_SLOW_LINK_SUPPORT 2141#ifndef NO_SLOW_LINK_SUPPORT
2070 /* 2142 /*
2071 * D: CopyArea pass - very useful for slower links 2143 * D: CopyArea pass - very useful for slower links
2072 * This has been deliberately kept simple. 2144 * This has been deliberately kept simple.
2073 */ 2145 */
2074 i = num_scr;
2075 if (!display->is_local 2146 if (!display->is_local
2076 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2147 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2077 && abs (num_scr) < nrow && !must_clear) 2148 && abs (num_scr) < nrow && !have_bg)
2078 { 2149 {
2079 int16_t nits; 2150 int16_t nits;
2151 int i = num_scr;
2080 int j; 2152 int j;
2081 int len, wlen; 2153 int len, wlen;
2154 dLocal (int, num_scr);
2082 2155
2083 j = nrow; 2156 j = nrow;
2084 wlen = len = -1; 2157 wlen = len = -1;
2085 row = i > 0 ? 0 : j - 1; 2158 row = i > 0 ? 0 : j - 1;
2159
2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2160 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2087 { 2161 {
2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2162 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2089 { 2163 {
2090 line_t s = ROW(row - view_start); 2164 line_t s = ROW(view_start + row);
2091 line_t d = drawn_buf[row]; 2165 line_t d = drawn_buf[row];
2092 line_t d2 = drawn_buf[row + i]; 2166 line_t d2 = drawn_buf[row + i];
2093 2167
2094 for (nits = 0, col = ncol; col--; ) 2168 for (nits = 0, col = ncol; col--; )
2095 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2169 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2111 wlen = row; 2185 wlen = row;
2112 continue; 2186 continue;
2113 } 2187 }
2114 } 2188 }
2115 2189
2116 if (len != -1) 2190 if (len >= 0)
2117 { 2191 {
2118 /* also comes here at end if needed because of >= above */ 2192 /* also comes here at end if needed because of >= above */
2119 if (wlen < len) 2193 if (wlen < len)
2120 ::swap (wlen, len); 2194 ::swap (wlen, len);
2121 2195
2196 XGCValues gcv;
2197
2198 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2122 XCopyArea (display->display, vt, vt, 2199 XCopyArea (dpy, vt, vt,
2123 gc, 0, Row2Pixel (len + i), 2200 gc, 0, Row2Pixel (len + i),
2124 (unsigned int)this->width, 2201 (unsigned int)this->width,
2125 (unsigned int)Height2Pixel (wlen - len + 1), 2202 (unsigned int)Height2Pixel (wlen - len + 1),
2126 0, Row2Pixel (len)); 2203 0, Row2Pixel (len));
2204 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2205
2127 len = -1; 2206 len = -1;
2128 } 2207 }
2129 } 2208 }
2130 } 2209 }
2131#endif 2210#endif
… …
2133 /* 2212 /*
2134 * E: main pass across every character 2213 * E: main pass across every character
2135 */ 2214 */
2136 for (row = 0; row < nrow; row++) 2215 for (row = 0; row < nrow; row++)
2137 { 2216 {
2138 text_t *stp = ROW(row - view_start).t; 2217 text_t *stp = ROW(view_start + row).t;
2139 rend_t *srp = ROW(row - view_start).r; 2218 rend_t *srp = ROW(view_start + row).r;
2140 text_t *dtp = drawn_buf[row].t; 2219 text_t *dtp = drawn_buf[row].t;
2141 rend_t *drp = drawn_buf[row].r; 2220 rend_t *drp = drawn_buf[row].r;
2142 2221
2143 /* 2222 /*
2144 * E2: OK, now the real pass 2223 * E2: OK, now the real pass
… …
2155 continue; 2234 continue;
2156 2235
2157 // redraw one or more characters 2236 // redraw one or more characters
2158 2237
2159 // seek to the beginning of wide characters 2238 // seek to the beginning of wide characters
2160 while (stp[col] == NOCHAR && col > 0) 2239 while (expect_false (stp[col] == NOCHAR && col > 0))
2161 --col; 2240 --col;
2162 2241
2163 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2242 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2164 text_t *text = stp + col; 2243 text_t *text = stp + col;
2165 int count = 1; 2244 int count = 1;
2166 2245
2167 dtp[col] = stp[col]; 2246 dtp[col] = stp[col];
2168 drp[col] = rend; 2247 drp[col] = rend;
… …
2172 for (i = 0; ++col < ncol; ) 2251 for (i = 0; ++col < ncol; )
2173 { 2252 {
2174 if (stp[col] == NOCHAR) 2253 if (stp[col] == NOCHAR)
2175 { 2254 {
2176 dtp[col] = stp[col]; 2255 dtp[col] = stp[col];
2177 drp[col] = rend; 2256 drp[col] = srp[col];
2257
2178 count++; 2258 count++;
2179 i++; 2259 i++;
2180 2260
2181 continue; 2261 continue;
2182 } 2262 }
… …
2187 count++; 2267 count++;
2188 2268
2189 if (stp[col] != dtp[col] 2269 if (stp[col] != dtp[col]
2190 || !RS_SAME (srp[col], drp[col])) 2270 || !RS_SAME (srp[col], drp[col]))
2191 { 2271 {
2192 if (must_clear && (i++ > count / 2)) 2272 if (have_bg && (i++ > count / 2))
2193 break; 2273 break;
2194 2274
2195 dtp[col] = stp[col]; 2275 dtp[col] = stp[col];
2196 drp[col] = rend; 2276 drp[col] = rend;
2197 i = 0; 2277 i = 0;
2198 } 2278 }
2199 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2279 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2200 break; 2280 break;
2201 } 2281 }
2202 2282
2203 col--; /* went one too far. move back */ 2283 col--; /* went one too far. move back */
2204 count -= i; /* dump any matching trailing chars */ 2284 count -= i; /* dump any matching trailing chars */
2205 2285
2206 // sometimes we optimize away the trailing NOCHAR's, add them back 2286 // sometimes we optimize away the trailing NOCHAR's, add them back
2207 while (i && text[count] == NOCHAR) 2287 while (expect_false (i && text[count] == NOCHAR))
2208 count++, i--; 2288 count++, i--;
2209 2289
2210 /* 2290 /*
2211 * Determine the attributes for the string 2291 * Determine the attributes for the string
2212 */ 2292 */
2213 int fore = fgcolor_of (rend); // desired foreground 2293 int fore = fgcolor_of (rend); // desired foreground
2214 int back = bgcolor_of (rend); // desired background 2294 int back = bgcolor_of (rend); // desired background
2215 2295
2216 // only do special processing if any attributes are set, which is unlikely 2296 // only do special processing if any attributes are set, which is unlikely
2217 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2297 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2218 { 2298 {
2219#if ENABLE_STYLES
2220 // force redraw after "careful" characters to avoid pixel droppings
2221 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2222 drp[col + 1] = ~srp[col + 1];
2223
2224 // include previous careful character(s) if possible, looks nicer (best effort...)
2225 while (text > stp
2226 && srp[text - stp - 1] & RS_Careful
2227 && RS_SAME (rend, srp[text - stp - 1]))
2228 text--, count++, xpixel -= fwidth;
2229#endif
2230
2231 bool invert = rend & RS_RVid; 2299 bool invert = rend & RS_RVid;
2232 2300
2233#ifndef NO_BOLD_UNDERLINE_REVERSE 2301#ifndef NO_BOLD_UNDERLINE_REVERSE
2234 if (rend & RS_Bold
2235 && fore == Color_fg) 2302 if (rend & RS_Bold && fore == Color_fg)
2236 { 2303 {
2237 if (ISSET_PIXCOLOR (Color_BD)) 2304 if (ISSET_PIXCOLOR (Color_BD))
2238 fore = Color_BD; 2305 fore = Color_BD;
2239# if !ENABLE_STYLES 2306# if !ENABLE_STYLES
2240 else 2307 else
2241 invert = !invert; 2308 invert = !invert;
2242# endif 2309# endif
2243 } 2310 }
2244 2311
2245 if (rend & RS_Italic 2312 if (rend & RS_Italic && fore == Color_fg)
2246 && fore == Color_fg)
2247 { 2313 {
2248 if (ISSET_PIXCOLOR (Color_IT)) 2314 if (ISSET_PIXCOLOR (Color_IT))
2249 fore = Color_IT; 2315 fore = Color_IT;
2250# if !ENABLE_STYLES 2316# if !ENABLE_STYLES
2251 else 2317 else
2252 invert = !invert; 2318 invert = !invert;
2253# endif 2319# endif
2254 } 2320 }
2255 2321
2256 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2322 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2257 fore = Color_UL; 2323 fore = Color_UL;
2324#endif
2325
2326#ifdef OPTION_HC
2327 if (rend & RS_Sel)
2328 {
2329 /* invert the column if no highlightColor is set or it is the
2330 * current cursor column */
2331 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2332 && ISSET_PIXCOLOR (Color_HC))
2333 {
2334 if (ISSET_PIXCOLOR (Color_HTC))
2335 fore = Color_HTC;
2336 // if invert is 0 reverse video is set so we use bg color as fg color
2337 else if (!invert)
2338 fore = back;
2339
2340 back = Color_HC;
2341 invert = 0;
2342 }
2343 }
2258#endif 2344#endif
2259 2345
2260 if (invert) 2346 if (invert)
2261 { 2347 {
2262 ::swap (fore, back); 2348 ::swap (fore, back);
2263 2349
2264#ifndef NO_BOLD_UNDERLINE_REVERSE 2350#ifndef NO_BOLD_UNDERLINE_REVERSE
2265 if (ISSET_PIXCOLOR (Color_RV))
2266 back = Color_RV;
2267
2268 if (fore == back) 2351 if (fore == back)
2269 { 2352 {
2270 fore = Color_bg; 2353 fore = Color_bg;
2271 back = Color_fg; 2354 back = Color_fg;
2272 } 2355 }
… …
2274 } 2357 }
2275 2358
2276#ifdef TEXT_BLINK 2359#ifdef TEXT_BLINK
2277 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2360 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2278 { 2361 {
2279 if (!text_blink_ev.active) 2362 if (!text_blink_ev.is_active ())
2280 { 2363 {
2281 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2364 text_blink_ev.again ();
2282 hidden_text = 0; 2365 hidden_text = 0;
2283 } 2366 }
2284 else if (hidden_text) 2367 else if (hidden_text)
2285 fore = back; 2368 fore = back;
2286 } 2369 }
2287#endif 2370#endif
2371
2372#if ENABLE_STYLES
2373 // "careful" (too wide) character handling
2374
2375 // include previous careful character(s) if possible, looks nicer (best effort...)
2376 while (text > stp
2377 && srp[text - stp - 1] & RS_Careful
2378 && RS_SAME (rend, srp[text - stp - 1]))
2379 text--, count++, xpixel -= fwidth;
2380
2381 // force redraw after "careful" characters to avoid pixel droppings
2382 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2383 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2384
2385 // force redraw before "careful" characters to avoid pixel droppings
2386 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2387 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2388#endif
2288 } 2389 }
2289 2390
2290 /* 2391 /*
2291 * Actually do the drawing of the string here 2392 * Actually do the drawing of the string here
2292 */ 2393 */
2293 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2394 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2294 2395
2295 if (back == fore) 2396 if (expect_true (have_bg && back == Color_bg))
2296 font->clear_rect (*drawable, xpixel, ypixel,
2297 fwidth * count, fheight,
2298 back);
2299 else if (back == Color_bg)
2300 { 2397 {
2301 if (must_clear) 2398 // this is very ugly, maybe push it into ->draw?
2302 {
2303 CLEAR_CHARS (xpixel, ypixel, count);
2304 2399
2305 for (i = 0; i < count; i++) /* don't draw empty strings */ 2400 for (i = 0; i < count; i++) /* don't draw empty strings */
2306 if (text[i] != ' ') 2401 if (text[i] != ' ')
2307 { 2402 {
2308 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2403 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2309 break; 2404 goto did_clear;
2310 }
2311 } 2405 }
2312 else 2406
2313 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2407 CLEAR_CHARS (xpixel, ypixel, count);
2408 did_clear: ;
2314 } 2409 }
2315 else 2410 else
2316 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2411 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2317 2412
2318 if (rend & RS_Uline && font->descent > 1 && fore != back) 2413 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2319 { 2414 {
2320#if ENABLE_FRILLS 2415#if ENABLE_FRILLS
2321 if (ISSET_PIXCOLOR (Color_underline)) 2416 if (ISSET_PIXCOLOR (Color_underline))
2322 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2417 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2323 else 2418 else
2324#endif 2419#endif
2325 XSetForeground (display->display, gc, pix_colors[fore]); 2420 XSetForeground (dpy, gc, pix_colors[fore]);
2326 2421
2327 XDrawLine (display->display, drawBuffer, gc, 2422 XDrawLine (dpy, vt, gc,
2328 xpixel, ypixel + font->ascent + 1, 2423 xpixel, ypixel + font->ascent + 1,
2329 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2424 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2330 } 2425 }
2331 } /* for (col....) */ 2426 } /* for (col....) */
2332 } /* for (row....) */ 2427 } /* for (row....) */
2333 2428
2334#if ENABLE_OVERLAY
2335 scr_swap_overlay ();
2336#endif
2337 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2338
2339 /* 2429 /*
2340 * G: cleanup cursor and display outline cursor if necessary 2430 * G: cleanup cursor and display outline cursor if necessary
2341 */ 2431 */
2342 if (showcursor) 2432 if (showcursor)
2343 { 2433 {
2344 if (focus) 2434 if (focus)
2345 { 2435 {
2346 if (OPTION (Opt_cursorUnderline)) 2436 if (option (Opt_cursorUnderline))
2347 *crp ^= RS_Uline; 2437 *crp ^= RS_Uline;
2348 else 2438 else
2349 { 2439 {
2350 *crp ^= RS_RVid; 2440 *crp ^= RS_RVid;
2351#ifndef NO_CURSORCOLOR 2441#ifndef NO_CURSORCOLOR
… …
2365 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2455 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2366 cursorwidth++; 2456 cursorwidth++;
2367 2457
2368#ifndef NO_CURSORCOLOR 2458#ifndef NO_CURSORCOLOR
2369 if (ISSET_PIXCOLOR (Color_cursor)) 2459 if (ISSET_PIXCOLOR (Color_cursor))
2370 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2460 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2461 else
2371#endif 2462#endif
2463 XSetForeground (dpy, gc, pix_colors[ccol1]);
2372 2464
2373 XDrawRectangle (display->display, drawBuffer, gc, 2465 XDrawRectangle (dpy, vt, gc,
2374 Col2Pixel (col), 2466 Col2Pixel (col),
2375 Row2Pixel (oldcursor.row), 2467 Row2Pixel (oldcursor.row),
2376 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2468 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2377 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2469 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2378 } 2470 }
2379 } 2471 }
2380 2472
2381 /* 2473 /*
2382 * H: cleanup selection 2474 * H: cleanup selection
2383 */ 2475 */
2476#if ENABLE_OVERLAY
2477 scr_swap_overlay ();
2478#endif
2479 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2480
2384 scr_reverse_selection (); 2481 scr_reverse_selection ();
2385 2482
2483 screen.flags = old_screen_flags;
2386 num_scr = 0; 2484 num_scr = 0;
2387 num_scr_allow = 1; 2485 num_scr_allow = 1;
2388} 2486}
2389 2487
2390void 2488void
2391rxvt_term::scr_remap_chars (line_t &l) 2489rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2392{ 2490{
2393 if (!l.t) 2491 if (!l.t)
2394 return; 2492 return;
2395 2493
2396 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2494 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2398 for (int i = ncol; i--; ) 2496 for (int i = ncol; i--; )
2399 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2497 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2400} 2498}
2401 2499
2402void 2500void
2403rxvt_term::scr_remap_chars () 2501rxvt_term::scr_remap_chars () NOTHROW
2404{ 2502{
2405 for (int i = total_rows; i--; ) 2503 for (int i = total_rows; i--; )
2406 scr_remap_chars (row_buf [i]); 2504 scr_remap_chars (row_buf [i]);
2407 2505
2408 for (int i = nrow; i--; ) 2506 for (int i = nrow; i--; )
… …
2411 scr_remap_chars (swap_buf [i]); 2509 scr_remap_chars (swap_buf [i]);
2412 } 2510 }
2413} 2511}
2414 2512
2415void 2513void
2416rxvt_term::scr_recolour () 2514rxvt_term::scr_recolour () NOTHROW
2417{ 2515{
2418 if (1 2516#ifdef HAVE_BG_PIXMAP
2419#if TRANSPARENT 2517 bgPixmap.apply ();
2420 && !am_transparent 2518#else
2421#endif 2519
2422#if XPM_BACKGROUND
2423 && !bgPixmap.pixmap
2424#endif
2425 )
2426 {
2427 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2520 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2428 XClearWindow (display->display, parent[0]); 2521 XClearWindow (dpy, parent[0]);
2429 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2522 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2430#if HAVE_SCROLLBARS 2523
2431 if (scrollBar.win) 2524 if (scrollBar.win)
2432 { 2525 {
2433 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2526 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2434 scrollBar.setIdle (); 2527 scrollBar.state = STATE_IDLE;
2435 scrollbar_show (0); 2528 scrollBar.show (0);
2436 }
2437#endif
2438 } 2529 }
2439 2530
2531#endif
2532
2533 /* bgPixmap.apply () does not do the following : */
2440 scr_clear (); 2534 scr_clear ();
2441 scr_touch (true); 2535 scr_touch (true);
2442 want_refresh = 1; 2536 want_refresh = 1;
2443} 2537}
2444 2538
2445/* ------------------------------------------------------------------------- */ 2539/* ------------------------------------------------------------------------- */
2446void 2540void
2447rxvt_term::scr_clear (bool really) 2541rxvt_term::scr_clear (bool really) NOTHROW
2448{ 2542{
2449 if (!mapped) 2543 if (!mapped)
2450 return; 2544 return;
2451 2545
2452 num_scr_allow = 0; 2546 num_scr_allow = 0;
2453 want_refresh = 1; 2547 want_refresh = 1;
2454 2548
2455 if (really) 2549 if (really)
2456 XClearWindow (display->display, vt); 2550 XClearWindow (dpy, vt);
2457} 2551}
2458 2552
2459void 2553void
2460rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2554rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2461{ 2555{
2462 int view_end = -view_start + nrow; 2556 int view_end = view_start + nrow;
2463 int row, col; 2557 int row, col;
2464 2558
2465 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++) 2559 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2466 { 2560 {
2467 text_t *stp = ROW(row).t; 2561 text_t *stp = ROW(row).t;
2468 rend_t *srp = ROW(row).r; 2562 rend_t *srp = ROW(row).r;
2469 2563
2470 for (col = beg_col; col < end_col; col++) 2564 for (col = beg_col; col < end_col; col++)
… …
2477 srp[col] ^= rstyle2; 2571 srp[col] ^= rstyle2;
2478 } 2572 }
2479} 2573}
2480 2574
2481void 2575void
2482rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2576rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2483{ 2577{
2484 int view_end = -view_start + nrow; 2578 int view_end = view_start + nrow;
2485 int row, col; 2579 int row, col;
2486 2580
2487 if (beg_row >= -view_start) 2581 if (beg_row >= view_start)
2488 { 2582 {
2489 col = beg_col; 2583 col = beg_col;
2490 row = beg_row; 2584 row = beg_row;
2491 } 2585 }
2492 else 2586 else
2493 { 2587 {
2494 col = 0; 2588 col = 0;
2495 row = -view_start; 2589 row = view_start;
2496 } 2590 }
2497 2591
2498 for (; row < min (end_row, view_end); row++, col = 0) 2592 for (; row < min (end_row, view_end); row++, col = 0)
2499 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2593 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2500 srp[col] ^= rstyle; 2594 srp[col] ^= rstyle;
… …
2504 srp[col] ^= rstyle; 2598 srp[col] ^= rstyle;
2505} 2599}
2506 2600
2507/* ------------------------------------------------------------------------- */ 2601/* ------------------------------------------------------------------------- */
2508void 2602void
2509rxvt_term::scr_reverse_selection () 2603rxvt_term::scr_reverse_selection () NOTHROW
2510{ 2604{
2511 if (selection.op 2605 if (selection.op
2512 && current_screen == selection.screen 2606 && current_screen == selection.screen
2513 && selection.end.row >= -view_start) 2607 && selection.end.row >= view_start)
2514 { 2608 {
2515#if ENABLE_FRILLS 2609#if !ENABLE_MINIMAL
2516 if (selection.rect) 2610 if (selection.rect)
2517 scr_xor_rect (selection.beg.row, selection.beg.col, 2611 scr_xor_rect (selection.beg.row, selection.beg.col,
2518 selection.end.row, selection.end.col, 2612 selection.end.row, selection.end.col,
2519 RS_RVid, RS_RVid | RS_Uline); 2613 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2520 else 2614 else
2521#endif 2615#endif
2522 scr_xor_span (selection.beg.row, selection.beg.col, 2616 scr_xor_span (selection.beg.row, selection.beg.col,
2523 selection.end.row, selection.end.col, 2617 selection.end.row, selection.end.col,
2524 RS_RVid); 2618 RS_Sel | RS_RVid);
2525 } 2619 }
2526} 2620}
2527 2621
2528/* ------------------------------------------------------------------------- */ 2622/* ------------------------------------------------------------------------- */
2529/* 2623/*
2530 * Dump the whole scrollback and screen to the passed filedescriptor. The 2624 * Dump the whole scrollback and screen to the passed filedescriptor. The
2531 * invoking routine must close the fd. 2625 * invoking routine must close the fd.
2532 */ 2626 */
2533#if 0 2627#if 0
2534void 2628void
2535rxvt_term::scr_dump (int fd) 2629rxvt_term::scr_dump (int fd) NOTHROW
2536{ 2630{
2537 int row, wrote; 2631 int row, wrote;
2538 unsigned int width, towrite; 2632 unsigned int width, towrite;
2539 char r1[] = "\n"; 2633 char r1[] = "\n";
2540 2634
2541 for (row = saveLines - nsaved; 2635 for (row = saveLines + top_row;
2542 row < saveLines + nrow - 1; row++) 2636 row < saveLines + nrow - 1; row++)
2543 { 2637 {
2544 width = row_buf[row].l >= 0 ? row_buf[row].l 2638 width = row_buf[row].l >= 0 ? row_buf[row].l
2545 : ncol; 2639 : ncol;
2546 for (towrite = width; towrite; towrite -= wrote) 2640 for (towrite = width; towrite; towrite -= wrote)
… …
2559 2653
2560/* ------------------------------------------------------------------------- * 2654/* ------------------------------------------------------------------------- *
2561 * CHARACTER SELECTION * 2655 * CHARACTER SELECTION *
2562 * ------------------------------------------------------------------------- */ 2656 * ------------------------------------------------------------------------- */
2563void 2657void
2564rxvt_term::selection_check (int check_more) 2658rxvt_term::selection_check (int check_more) NOTHROW
2565{ 2659{
2566 row_col_t pos; 2660 row_col_t pos;
2567 2661
2568 if (!selection.op) 2662 if (!selection.op)
2569 return; 2663 return;
2570 2664
2571 pos.row = pos.col = 0; 2665 pos.row = pos.col = 0;
2572 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2666 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2573 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2667 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2574 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2668 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2575 || (check_more == 1 2669 || (check_more == 1
2576 && current_screen == selection.screen 2670 && current_screen == selection.screen
2577 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2671 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2578 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2672 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2579 || (check_more == 2 2673 || (check_more == 2
… …
2590/* ------------------------------------------------------------------------- */ 2684/* ------------------------------------------------------------------------- */
2591/* 2685/*
2592 * Paste a selection direct to the command fd 2686 * Paste a selection direct to the command fd
2593 */ 2687 */
2594void 2688void
2595rxvt_term::paste (char *data, unsigned int len) 2689rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2596{ 2690{
2597 /* convert normal newline chars into common keyboard Return key sequence */ 2691 /* convert normal newline chars into common keyboard Return key sequence */
2598 for (unsigned int i = 0; i < len; i++) 2692 for (unsigned int i = 0; i < len; i++)
2599 if (data[i] == C0_LF) 2693 if (data[i] == C0_LF)
2600 data[i] = C0_CR; 2694 data[i] = C0_CR;
2601 2695
2696 if (priv_modes & PrivMode_BracketPaste)
2697 tt_printf ("\e[200~");
2698
2602 tt_write (data, len); 2699 tt_write (data, len);
2700
2701 if (priv_modes & PrivMode_BracketPaste)
2702 tt_printf ("\e[201~");
2703}
2704
2705void
2706rxvt_term::paste (char *data, unsigned int len) NOTHROW
2707{
2708 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2709 return;
2710
2711 tt_paste (data, len);
2603} 2712}
2604 2713
2605/* ------------------------------------------------------------------------- */ 2714/* ------------------------------------------------------------------------- */
2606/* 2715/*
2607 * Respond to a notification that a primary selection has been sent 2716 * Respond to a notification that a primary selection has been sent
2608 * EXT: SelectionNotify 2717 * EXT: SelectionNotify
2609 */ 2718 */
2610void 2719void
2611rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2720rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2612{ 2721{
2613 if (prop == None) /* check for failed XConvertSelection */ 2722 if (prop == None) /* check for failed XConvertSelection */
2614 { 2723 {
2615 if ((selection_type & Sel_CompoundText)) 2724 if ((selection_type & Sel_CompoundText))
2616 { 2725 {
… …
2636 } 2745 }
2637 2746
2638 unsigned long bytes_after; 2747 unsigned long bytes_after;
2639 XTextProperty ct; 2748 XTextProperty ct;
2640 2749
2641 if (XGetWindowProperty (display->display, win, prop, 2750 if (XGetWindowProperty (dpy, win, prop,
2642 0, PROP_SIZE / 4, 2751 0, PROP_SIZE / 4,
2643 delete_prop, AnyPropertyType, 2752 delete_prop, AnyPropertyType,
2644 &ct.encoding, &ct.format, 2753 &ct.encoding, &ct.format,
2645 &ct.nitems, &bytes_after, 2754 &ct.nitems, &bytes_after,
2646 &ct.value) != Success) 2755 &ct.value) != Success)
… …
2655 if (bytes_after) 2764 if (bytes_after)
2656 { 2765 {
2657 // fetch and append remaining data 2766 // fetch and append remaining data
2658 XTextProperty ct2; 2767 XTextProperty ct2;
2659 2768
2660 if (XGetWindowProperty (display->display, win, prop, 2769 if (XGetWindowProperty (dpy, win, prop,
2661 ct.nitems / 4, (bytes_after + 3) / 4, 2770 ct.nitems / 4, (bytes_after + 3) / 4,
2662 delete_prop, AnyPropertyType, 2771 delete_prop, AnyPropertyType,
2663 &ct2.encoding, &ct2.format, 2772 &ct2.encoding, &ct2.format,
2664 &ct2.nitems, &bytes_after, 2773 &ct2.nitems, &bytes_after,
2665 &ct2.value) != Success) 2774 &ct2.value) != Success)
… …
2678 2787
2679 if (ct.encoding == xa[XA_INCR]) 2788 if (ct.encoding == xa[XA_INCR])
2680 { 2789 {
2681 // INCR selection, start handshake 2790 // INCR selection, start handshake
2682 if (!delete_prop) 2791 if (!delete_prop)
2683 XDeleteProperty (display->display, win, prop); 2792 XDeleteProperty (dpy, win, prop);
2684 2793
2685 selection_wait = Sel_incr; 2794 selection_wait = Sel_incr;
2686 incr_buf_fill = 0; 2795 incr_buf_fill = 0;
2687 incr_ev.start (NOW + 10); 2796 incr_ev.start (10);
2688 2797
2689 goto bailout; 2798 goto bailout;
2690 } 2799 }
2691 2800
2692 if (ct.nitems == 0) 2801 if (ct.nitems == 0)
… …
2701 ct.nitems = incr_buf_fill; 2810 ct.nitems = incr_buf_fill;
2702 incr_buf = 0; 2811 incr_buf = 0;
2703 incr_buf_size = 0; 2812 incr_buf_size = 0;
2704 incr_ev.stop (); 2813 incr_ev.stop ();
2705 } 2814 }
2706 else 2815 else
2707 { 2816 {
2708 if (selection_wait == Sel_normal 2817 if (selection_wait == Sel_normal
2709 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2818 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2710 { 2819 {
2711 /* 2820 /*
… …
2718 goto bailout; 2827 goto bailout;
2719 } 2828 }
2720 } 2829 }
2721 else if (selection_wait == Sel_incr) 2830 else if (selection_wait == Sel_incr)
2722 { 2831 {
2723 incr_ev.start (NOW + 10); 2832 incr_ev.start (10);
2724 2833
2725 while (incr_buf_fill + ct.nitems > incr_buf_size) 2834 while (incr_buf_fill + ct.nitems > incr_buf_size)
2726 { 2835 {
2727 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2836 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2728 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2837 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2735 } 2844 }
2736 2845
2737 char **cl; 2846 char **cl;
2738 int cr; 2847 int cr;
2739 2848
2740#if ENABLE_FRILLS 2849#if !ENABLE_MINIMAL
2741 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2850 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2742 // so recode it manually 2851 // so recode it manually
2743 if (ct.encoding == xa[XA_UTF8_STRING]) 2852 if (ct.encoding == xa[XA_UTF8_STRING])
2744 { 2853 {
2745 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2854 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2749 paste (s, strlen (s)); 2858 paste (s, strlen (s));
2750 free (s); 2859 free (s);
2751 } 2860 }
2752 else 2861 else
2753#endif 2862#endif
2754 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2863 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2755 && cl) 2864 && cl)
2756 { 2865 {
2757 for (int i = 0; i < cr; i++) 2866 for (int i = 0; i < cr; i++)
2758 paste (cl[i], strlen (cl[i])); 2867 paste (cl[i], strlen (cl[i]));
2759 2868
… …
2768 if (selection_wait == Sel_normal) 2877 if (selection_wait == Sel_normal)
2769 selection_wait = Sel_none; 2878 selection_wait = Sel_none;
2770} 2879}
2771 2880
2772void 2881void
2773rxvt_term::incr_cb (time_watcher &w) 2882rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2774{ 2883{
2775 selection_wait = Sel_none; 2884 selection_wait = Sel_none;
2776 2885
2777 incr_buf_size = 0; 2886 incr_buf_size = 0;
2778 free (incr_buf); 2887 free (incr_buf);
2779 2888
2780 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2889 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2781} 2890}
2782 2891
2783void 2892void
2784rxvt_term::selection_property (Window win, Atom prop) 2893rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2785{ 2894{
2786 if (prop == None || selection_wait != Sel_incr) 2895 if (prop == None || selection_wait != Sel_incr)
2787 return; 2896 return;
2788 2897
2789 selection_paste (win, prop, true); 2898 selection_paste (win, prop, true);
2790} 2899}
2791 2900
2792/* ------------------------------------------------------------------------- */ 2901/* ------------------------------------------------------------------------- */
2793/* 2902/*
2794 * Request the current selection: 2903 * Request the current selection:
2795 * Order: > internal selection if available 2904 * Order: > internal selection if available
2796 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2905 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2797 * > CUT_BUFFER0 2906 * > CUT_BUFFER0
2798 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2907 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2799 * will auto fallback to CUT_BUFFER0 2908 * will auto fallback to CUT_BUFFER0
2800 * EXT: button 2 release 2909 * EXT: button 2 release
2801 */ 2910 */
2802void 2911void
2803rxvt_term::selection_request (Time tm, int x, int y) 2912rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2804{ 2913{
2805 if (x < 0 || x >= width || y < 0 || y >= height) 2914 if (selection.text && selnum == Sel_Primary)
2806 return; /* outside window */ 2915 {
2807
2808 if (selection.text)
2809 { /* internal selection */ 2916 /* internal selection */
2810 char *str = rxvt_wcstombs (selection.text, selection.len); 2917 char *str = rxvt_wcstombs (selection.text, selection.len);
2811 paste (str, strlen (str)); 2918 paste (str, strlen (str));
2812 free (str); 2919 free (str);
2813 return; 2920 return;
2814 } 2921 }
2815 else 2922 else
2816 { 2923 {
2817 int i;
2818
2819 selection_request_time = tm; 2924 selection_request_time = tm;
2820 selection_wait = Sel_normal; 2925 selection_wait = Sel_normal;
2821 2926
2822 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2823 {
2824#if X_HAVE_UTF8_STRING 2927#if X_HAVE_UTF8_STRING
2825 selection_type = Sel_UTF8String; 2928 selection_type = Sel_UTF8String;
2826 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2929 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2827 return; 2930 return;
2828#else 2931#else
2829 selection_type = Sel_CompoundText; 2932 selection_type = Sel_CompoundText;
2830 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2933 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2831 return; 2934 return;
2832#endif 2935#endif
2833 }
2834 } 2936 }
2835 2937
2836 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2938 selection_wait = Sel_none; /* don't loop in selection_paste () */
2837 selection_paste (display->root, XA_CUT_BUFFER0, false); 2939 selection_paste (display->root, XA_CUT_BUFFER0, false);
2838} 2940}
2839 2941
2840int 2942int
2841rxvt_term::selection_request_other (Atom target, int selnum) 2943rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2842{ 2944{
2843 Atom sel; 2945 Atom sel;
2844 2946
2845 selection_type |= selnum; 2947 selection_type |= selnum;
2846 2948
… …
2849 else if (selnum == Sel_Secondary) 2951 else if (selnum == Sel_Secondary)
2850 sel = XA_SECONDARY; 2952 sel = XA_SECONDARY;
2851 else 2953 else
2852 sel = xa[XA_CLIPBOARD]; 2954 sel = xa[XA_CLIPBOARD];
2853 2955
2854 if (XGetSelectionOwner (display->display, sel) != None) 2956 if (XGetSelectionOwner (dpy, sel) != None)
2855 { 2957 {
2856 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2958 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2857 vt, selection_request_time); 2959 vt, selection_request_time);
2858 return 1; 2960 return 1;
2859 } 2961 }
2860 2962
2861 return 0; 2963 return 0;
… …
2865/* 2967/*
2866 * Clear all selected text 2968 * Clear all selected text
2867 * EXT: SelectionClear 2969 * EXT: SelectionClear
2868 */ 2970 */
2869void 2971void
2870rxvt_term::selection_clear () 2972rxvt_term::selection_clear (bool clipboard) NOTHROW
2871{ 2973{
2974 if (!clipboard)
2975 {
2872 want_refresh = 1; 2976 want_refresh = 1;
2873 free (selection.text); 2977 free (selection.text);
2874 selection.text = NULL; 2978 selection.text = NULL;
2875 selection.len = 0; 2979 selection.len = 0;
2876 CLEAR_SELECTION (); 2980 CLEAR_SELECTION ();
2877 2981
2878 if (display->selection_owner == this) 2982 if (display->selection_owner == this)
2879 display->selection_owner = 0; 2983 display->selection_owner = 0;
2984 }
2985 else
2986 {
2987 free (selection.clip_text);
2988 selection.clip_text = NULL;
2989 selection.clip_len = 0;
2990
2991 if (display->clipboard_owner == this)
2992 display->clipboard_owner = 0;
2993 }
2880} 2994}
2881 2995
2882/* ------------------------------------------------------------------------- */ 2996/* ------------------------------------------------------------------------- */
2883/* 2997/*
2884 * Copy a selection into the cut buffer 2998 * Copy a selection into the cut buffer
… …
2924 3038
2925 int end_col; 3039 int end_col;
2926 3040
2927 for (; row <= selection.end.row; row++, col = 0) 3041 for (; row <= selection.end.row; row++, col = 0)
2928 { 3042 {
2929#if ENABLE_FRILLS 3043#if !ENABLE_MINIMAL
2930 if (selection.rect) 3044 if (selection.rect)
2931 { 3045 {
2932 col = selection.beg.col; 3046 col = selection.beg.col;
2933 end_col = ncol + 1; 3047 end_col = ncol + 1;
2934 } 3048 }
… …
2937 end_col = ROW(row).l; 3051 end_col = ROW(row).l;
2938 3052
2939 col = max (col, 0); 3053 col = max (col, 0);
2940 3054
2941 if (row == selection.end.row 3055 if (row == selection.end.row
2942#if ENABLE_FRILLS 3056#if !ENABLE_MINIMAL
2943 || selection.rect 3057 || selection.rect
2944#endif 3058#endif
2945 ) 3059 )
2946 min_it (end_col, selection.end.col); 3060 min_it (end_col, selection.end.col);
2947 3061
… …
2970#endif 3084#endif
2971 else 3085 else
2972 new_selection_text[ofs++] = *t++; 3086 new_selection_text[ofs++] = *t++;
2973 } 3087 }
2974 3088
2975#if ENABLE_FRILLS 3089#if !ENABLE_MINIMAL
2976 if (selection.rect) 3090 if (selection.rect)
2977 { 3091 {
2978 while (ofs 3092 while (ofs
2979 && new_selection_text[ofs - 1] != C0_LF 3093 && new_selection_text[ofs - 1] != C0_LF
2980 && unicode::is_space (new_selection_text[ofs - 1])) 3094 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3010 3124
3011 selection_grab (tm); 3125 selection_grab (tm);
3012} 3126}
3013 3127
3014bool 3128bool
3015rxvt_term::selection_grab (Time tm) 3129rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3016{ 3130{
3131 Atom sel;
3132
3133 if (!clipboard)
3134 {
3017 selection_time = tm; 3135 selection_time = tm;
3018 3136 sel = XA_PRIMARY;
3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3021 { 3137 }
3138 else
3139 {
3140 clipboard_time = tm;
3141 sel = xa[XA_CLIPBOARD];
3142 }
3143
3144 XSetSelectionOwner (dpy, sel, vt, tm);
3145 if (XGetSelectionOwner (dpy, sel) == vt)
3146 {
3022 display->set_selection_owner (this); 3147 display->set_selection_owner (this, clipboard);
3023 return true; 3148 return true;
3024 } 3149 }
3025 else 3150 else
3151 {
3152 selection_clear (clipboard);
3026 return false; 3153 return false;
3154 }
3027 3155
3028#if 0 3156#if 0
3029 XTextProperty ct; 3157 XTextProperty ct;
3030 3158
3031 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3159 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3032 { 3160 {
3033 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3161 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3034 XFree (ct.value); 3162 XFree (ct.value);
3035 } 3163 }
3036#endif 3164#endif
… …
3040/* 3168/*
3041 * Mark or select text based upon number of clicks: 1, 2, or 3 3169 * Mark or select text based upon number of clicks: 1, 2, or 3
3042 * EXT: button 1 press 3170 * EXT: button 1 press
3043 */ 3171 */
3044void 3172void
3045rxvt_term::selection_click (int clicks, int x, int y) 3173rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3046{ 3174{
3047 clicks = ((clicks - 1) % 3) + 1; 3175 clicks = ((clicks - 1) % 3) + 1;
3048 selection.clicks = clicks; /* save clicks so extend will work */ 3176 selection.clicks = clicks; /* save clicks so extend will work */
3049 3177
3178 if (clicks == 2 && !selection.rect
3179 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3180 {
3181 MEvent.clicks = 1; // what a mess
3182 selection.screen = current_screen;
3183 selection.op = SELECTION_CONT;
3184 return;
3185 }
3186
3050 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3187 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3051 3188
3052 if (clicks == 2 || clicks == 3) 3189 if (clicks == 2 || clicks == 3)
3053 selection_extend_colrow (selection.mark.col, 3190 selection_extend_colrow (selection.mark.col,
3054 selection.mark.row + view_start, 3191 selection.mark.row - view_start,
3055 0, /* button 3 */ 3192 0, /* button 3 */
3056 1, /* button press */ 3193 1, /* button press */
3057 0); /* click change */ 3194 0); /* click change */
3058} 3195}
3059 3196
3060/* ------------------------------------------------------------------------- */ 3197/* ------------------------------------------------------------------------- */
3061/* 3198/*
3062 * Mark a selection at the specified col/row 3199 * Mark a selection at the specified col/row
3063 */ 3200 */
3064void 3201void
3065rxvt_term::selection_start_colrow (int col, int row) 3202rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3066{ 3203{
3067 want_refresh = 1; 3204 want_refresh = 1;
3068 3205
3069 selection.mark.row = row - view_start; 3206 selection.mark.row = row + view_start;
3070 selection.mark.col = col; 3207 selection.mark.col = col;
3071 3208
3072 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3209 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3073 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3210 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3074 3211
3075 while (selection.mark.col > 0 3212 while (selection.mark.col > 0
3076 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3213 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3077 --selection.mark.col; 3214 --selection.mark.col;
3078 3215
3079 if (selection.op) 3216 if (selection.op)
3217 {
3080 { /* clear the old selection */ 3218 /* clear the old selection */
3081 selection.beg.row = selection.end.row = selection.mark.row; 3219 selection.beg.row = selection.end.row = selection.mark.row;
3082 selection.beg.col = selection.end.col = selection.mark.col; 3220 selection.beg.col = selection.end.col = selection.mark.col;
3083 } 3221 }
3084 3222
3085 selection.op = SELECTION_INIT; 3223 selection.op = SELECTION_INIT;
… …
3096#define DELIMIT_TEXT(x) \ 3234#define DELIMIT_TEXT(x) \
3097 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3235 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3098#define DELIMIT_REND(x) 1 3236#define DELIMIT_REND(x) 1
3099 3237
3100void 3238void
3101rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3239rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3102{ 3240{
3103 int col, row, dirnadd, tcol, trow, w1, w2; 3241 int col, row, dirnadd, tcol, trow, w1, w2;
3104 row_col_t bound; 3242 row_col_t bound;
3105 text_t *stp; 3243 text_t *stp;
3106 rend_t *srp; 3244 rend_t *srp;
3107 3245
3108 if (dirn == UP) 3246 if (dirn == UP)
3109 { 3247 {
3110 bound.row = - nsaved - 1; 3248 bound.row = top_row - 1;
3111 bound.col = 0; 3249 bound.col = 0;
3112 dirnadd = -1; 3250 dirnadd = -1;
3113 } 3251 }
3114 else 3252 else
3115 { 3253 {
… …
3180 * flag == 0 ==> button 1 3318 * flag == 0 ==> button 1
3181 * flag == 1 ==> button 3 press 3319 * flag == 1 ==> button 3 press
3182 * flag == 2 ==> button 3 motion 3320 * flag == 2 ==> button 3 motion
3183 */ 3321 */
3184void 3322void
3185rxvt_term::selection_extend (int x, int y, int flag) 3323rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3186{ 3324{
3187 int col = clamp (Pixel2Col (x), 0, ncol); 3325 int col = clamp (Pixel2Col (x), 0, ncol);
3188 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3326 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3189 3327
3190 /* 3328 /*
… …
3193 * select nothing. Otherwise, if we're to the right of the mark, you have to 3331 * select nothing. Otherwise, if we're to the right of the mark, you have to
3194 * be _past_ a character for it to be selected. 3332 * be _past_ a character for it to be selected.
3195 */ 3333 */
3196 if (((selection.clicks % 3) == 1) && !flag 3334 if (((selection.clicks % 3) == 1) && !flag
3197 && (col == selection.mark.col 3335 && (col == selection.mark.col
3198 && (row == selection.mark.row + view_start))) 3336 && (row == selection.mark.row - view_start)))
3199 { 3337 {
3200 /* select nothing */ 3338 /* select nothing */
3201 selection.beg.row = selection.end.row = 0; 3339 selection.beg.row = selection.end.row = 0;
3202 selection.beg.col = selection.end.col = 0; 3340 selection.beg.col = selection.end.col = 0;
3203 selection.clicks = 4; 3341 selection.clicks = 4;
… …
3216/* ------------------------------------------------------------------------- */ 3354/* ------------------------------------------------------------------------- */
3217/* 3355/*
3218 * Extend the selection to the specified col/row 3356 * Extend the selection to the specified col/row
3219 */ 3357 */
3220void 3358void
3221rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3359rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3222{ 3360{
3223 row_col_t pos; 3361 row_col_t pos;
3224 enum { 3362 enum {
3225 LEFT, RIGHT 3363 LEFT, RIGHT
3226 } closeto = RIGHT; 3364 } closeto = RIGHT;
… …
3258 selection.beg.col = selection.end.col = selection.mark.col; 3396 selection.beg.col = selection.end.col = selection.mark.col;
3259 selection.beg.row = selection.end.row = selection.mark.row; 3397 selection.beg.row = selection.end.row = selection.mark.row;
3260 } 3398 }
3261 3399
3262 pos.col = col; 3400 pos.col = col;
3263 pos.row = row - view_start; 3401 pos.row = view_start + row;
3264 3402
3265 /* 3403 /*
3266 * This is mainly xterm style selection with a couple of differences, mainly 3404 * This is mainly xterm style selection with a couple of differences, mainly
3267 * in the way button3 drag extension works. 3405 * in the way button3 drag extension works.
3268 * We're either doing: button1 drag; button3 press; or button3 drag 3406 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3274 * a point/word/line which is either the start or end of the selection 3412 * a point/word/line which is either the start or end of the selection
3275 * and it was decided by whichever point/word/line was `fixed' at the 3413 * and it was decided by whichever point/word/line was `fixed' at the
3276 * time of the most recent button3 press 3414 * time of the most recent button3 press
3277 */ 3415 */
3278 if (button3 && buttonpress) 3416 if (button3 && buttonpress)
3417 {
3279 { /* button3 press */ 3418 /* button3 press */
3280 /* 3419 /*
3281 * first determine which edge of the selection we are closest to 3420 * first determine which edge of the selection we are closest to
3282 */ 3421 */
3283 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3422 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3284 || (!ROWCOL_IS_AFTER (pos, selection.end) 3423 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3302 selection.mark.row = selection.beg.row; 3441 selection.mark.row = selection.beg.row;
3303 selection.mark.col = selection.beg.col; 3442 selection.mark.col = selection.beg.col;
3304 } 3443 }
3305 } 3444 }
3306 else 3445 else
3446 {
3307 { /* button1 drag or button3 drag */ 3447 /* button1 drag or button3 drag */
3308 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3448 if (ROWCOL_IS_AFTER (selection.mark, pos))
3309 { 3449 {
3310 if (selection.mark.row == selection.end.row 3450 if (selection.mark.row == selection.end.row
3311 && selection.mark.col == selection.end.col 3451 && selection.mark.col == selection.end.col
3312 && clickchange 3452 && clickchange
… …
3329 3469
3330 if (selection.clicks == 1) 3470 if (selection.clicks == 1)
3331 { 3471 {
3332 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3472 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3333 && !ROW(selection.beg.row).is_longer () 3473 && !ROW(selection.beg.row).is_longer ()
3334#if ENABLE_FRILLS 3474#if !ENABLE_MINIMAL
3335 && !selection.rect 3475 && !selection.rect
3336#endif 3476#endif
3337 ) 3477 )
3338 selection.beg.col = ncol; 3478 selection.beg.col = ncol;
3339 3479
3340 if ( 3480 if (
3341 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3481 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3342 && !ROW(selection.end.row).is_longer () 3482 && !ROW(selection.end.row).is_longer ()
3343#if ENABLE_FRILLS 3483#if !ENABLE_MINIMAL
3344 && !selection.rect 3484 && !selection.rect
3345#endif 3485#endif
3346 ) 3486 )
3347 selection.end.col = ncol; 3487 selection.end.col = ncol;
3348 } 3488 }
3349 else if (selection.clicks == 2) 3489 else if (selection.clicks == 2)
3350 { 3490 {
3351 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3491 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3352 selection.end.col--; 3492 selection.end.col--;
3353 3493
3354 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3355 {
3356 selection_delimit_word (UP, &selection.beg, &selection.beg); 3494 selection_delimit_word (UP, &selection.beg, &selection.beg);
3357 selection_delimit_word (DN, &selection.end, &selection.end); 3495 selection_delimit_word (DN, &selection.end, &selection.end);
3358 }
3359 } 3496 }
3360 else if (selection.clicks == 3) 3497 else if (selection.clicks == 3)
3361 { 3498 {
3362#if ENABLE_FRILLS 3499#if ENABLE_FRILLS
3363 if (OPTION (Opt_tripleclickwords)) 3500 if (option (Opt_tripleclickwords))
3364 { 3501 {
3365 selection_delimit_word (UP, &selection.beg, &selection.beg); 3502 selection_delimit_word (UP, &selection.beg, &selection.beg);
3366 3503
3367 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3504 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3368 { 3505 {
3369 if (!ROW(end_row).is_longer ()) 3506 if (!ROW(end_row).is_longer ())
3370 { 3507 {
3371 selection.end.row = end_row; 3508 selection.end.row = end_row;
3372 selection.end.col = ROW(end_row).l; 3509 selection.end.col = ROW(end_row).l;
3510# if !ENABLE_MINIMAL
3373 selection_remove_trailing_spaces (); 3511 selection_remove_trailing_spaces ();
3512# endif
3374 break; 3513 break;
3375 } 3514 }
3376 } 3515 }
3377 } 3516 }
3378 else 3517 else
… …
3394 selection.end.row++; 3533 selection.end.row++;
3395 } 3534 }
3396 } 3535 }
3397 3536
3398 if (button3 && buttonpress) 3537 if (button3 && buttonpress)
3538 {
3399 { /* mark may need to be changed */ 3539 /* mark may need to be changed */
3400 if (closeto == LEFT) 3540 if (closeto == LEFT)
3401 { 3541 {
3402 selection.mark.row = selection.end.row; 3542 selection.mark.row = selection.end.row;
3403 selection.mark.col = selection.end.col - (selection.clicks == 2); 3543 selection.mark.col = selection.end.col - (selection.clicks == 2);
3404 } 3544 }
… …
3407 selection.mark.row = selection.beg.row; 3547 selection.mark.row = selection.beg.row;
3408 selection.mark.col = selection.beg.col; 3548 selection.mark.col = selection.beg.col;
3409 } 3549 }
3410 } 3550 }
3411 3551
3412#if ENABLE_FRILLS 3552#if !ENABLE_MINIMAL
3413 if (selection.rect && selection.beg.col > selection.end.col) 3553 if (selection.rect && selection.beg.col > selection.end.col)
3414 ::swap (selection.beg.col, selection.end.col); 3554 ::swap (selection.beg.col, selection.end.col);
3415#endif 3555#endif
3416} 3556}
3417 3557
3418#if ENABLE_FRILLS 3558#if !ENABLE_MINIMAL
3419void 3559void
3420rxvt_term::selection_remove_trailing_spaces () 3560rxvt_term::selection_remove_trailing_spaces () NOTHROW
3421{ 3561{
3422 int32_t end_col, end_row; 3562 int32_t end_col, end_row;
3423 text_t *stp; 3563 text_t *stp;
3424 3564
3425 end_col = selection.end.col; 3565 end_col = selection.end.col;
… …
3463/* 3603/*
3464 * Double click on button 3 when already selected 3604 * Double click on button 3 when already selected
3465 * EXT: button 3 double click 3605 * EXT: button 3 double click
3466 */ 3606 */
3467void 3607void
3468rxvt_term::selection_rotate (int x, int y) 3608rxvt_term::selection_rotate (int x, int y) NOTHROW
3469{ 3609{
3470 selection.clicks = selection.clicks % 3 + 1; 3610 selection.clicks = selection.clicks % 3 + 1;
3471 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3611 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3472} 3612}
3473 3613
… …
3475/* 3615/*
3476 * Respond to a request for our current selection 3616 * Respond to a request for our current selection
3477 * EXT: SelectionRequest 3617 * EXT: SelectionRequest
3478 */ 3618 */
3479void 3619void
3480rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3620rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3481{ 3621{
3482 XSelectionEvent ev; 3622 XSelectionEvent ev;
3483 dDisp;
3484 3623
3485 ev.type = SelectionNotify; 3624 ev.type = SelectionNotify;
3486 ev.property = None; 3625 ev.property = None;
3487 ev.display = rq.display; 3626 ev.display = rq.display;
3488 ev.requestor = rq.requestor; 3627 ev.requestor = rq.requestor;
… …
3502 *target++ = xa[XA_COMPOUND_TEXT]; 3641 *target++ = xa[XA_COMPOUND_TEXT];
3503#if X_HAVE_UTF8_STRING 3642#if X_HAVE_UTF8_STRING
3504 *target++ = xa[XA_UTF8_STRING]; 3643 *target++ = xa[XA_UTF8_STRING];
3505#endif 3644#endif
3506 3645
3507 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3646 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3508 32, PropModeReplace, 3647 32, PropModeReplace,
3509 (unsigned char *)target_list, target - target_list); 3648 (unsigned char *)target_list, target - target_list);
3510 ev.property = rq.property; 3649 ev.property = rq.property;
3511 } 3650 }
3512#if TODO // TODO 3651#if TODO // TODO
3513 else if (rq.target == xa[XA_MULTIPLE]) 3652 else if (rq.target == xa[XA_MULTIPLE])
3514 { 3653 {
3515 /* TODO: Handle MULTIPLE */ 3654 /* TODO: Handle MULTIPLE */
3516 } 3655 }
3517#endif 3656#endif
3518 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3657 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3519 { 3658 {
3520 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3659 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3521 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3660 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3661 ev.property = rq.property;
3662 }
3663 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3664 {
3665 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3666 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3522 ev.property = rq.property; 3667 ev.property = rq.property;
3523 } 3668 }
3524 else if (rq.target == XA_STRING 3669 else if (rq.target == XA_STRING
3525 || rq.target == xa[XA_TEXT] 3670 || rq.target == xa[XA_TEXT]
3526 || rq.target == xa[XA_COMPOUND_TEXT] 3671 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3549 style = enc_string; 3694 style = enc_string;
3550 else if (target == xa[XA_TEXT]) 3695 else if (target == xa[XA_TEXT])
3551 style = enc_text; 3696 style = enc_text;
3552 else if (target == xa[XA_COMPOUND_TEXT]) 3697 else if (target == xa[XA_COMPOUND_TEXT])
3553 style = enc_compound_text; 3698 style = enc_compound_text;
3554#if ENABLE_FRILLS 3699#if !ENABLE_MINIMAL
3555 else if (target == xa[XA_UTF8_STRING]) 3700 else if (target == xa[XA_UTF8_STRING])
3556 style = enc_utf8; 3701 style = enc_utf8;
3557#endif 3702#endif
3558 else 3703 else
3559 { 3704 {
3560 target = xa[XA_COMPOUND_TEXT]; 3705 target = xa[XA_COMPOUND_TEXT];
3561 style = enc_compound_text; 3706 style = enc_compound_text;
3562 } 3707 }
3563 3708
3564 if (selection.text) 3709 if (rq.selection == XA_PRIMARY && selection.text)
3565 { 3710 {
3566 cl = selection.text; 3711 cl = selection.text;
3567 selectlen = selection.len; 3712 selectlen = selection.len;
3568 } 3713 }
3714 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3715 {
3716 cl = selection.clip_text;
3717 selectlen = selection.clip_len;
3718 }
3569 else 3719 else
3570 { 3720 {
3571 cl = L""; 3721 cl = L"";
3572 selectlen = 0; 3722 selectlen = 0;
3573 } 3723 }
3574 3724
3575#if ENABLE_FRILLS 3725#if !ENABLE_MINIMAL
3576 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3726 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3577 // so recode it manually 3727 // so recode it manually
3578 if (style == enc_utf8) 3728 if (style == enc_utf8)
3579 { 3729 {
3580 freect = 1; 3730 freect = 1;
… …
3583 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3733 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3584 ct.nitems = strlen ((char *)ct.value); 3734 ct.nitems = strlen ((char *)ct.value);
3585 } 3735 }
3586 else 3736 else
3587#endif 3737#endif
3588 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3738 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3589 freect = 1; 3739 freect = 1;
3590 else 3740 else
3591 { 3741 {
3592 /* if we failed to convert then send it raw */ 3742 /* if we failed to convert then send it raw */
3593 ct.value = (unsigned char *)cl; 3743 ct.value = (unsigned char *)cl;
3594 ct.nitems = selectlen; 3744 ct.nitems = selectlen;
3595 ct.encoding = target; 3745 ct.encoding = target;
3596 } 3746 }
3597 3747
3598 XChangeProperty (disp, rq.requestor, rq.property, 3748 XChangeProperty (dpy, rq.requestor, rq.property,
3599 ct.encoding, 8, PropModeReplace, 3749 ct.encoding, 8, PropModeReplace,
3600 ct.value, (int)ct.nitems); 3750 ct.value, (int)ct.nitems);
3601 ev.property = rq.property; 3751 ev.property = rq.property;
3602 3752
3603 if (freect) 3753 if (freect)
3604 XFree (ct.value); 3754 XFree (ct.value);
3605 } 3755 }
3606 3756
3607 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3757 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3608}
3609
3610/* ------------------------------------------------------------------------- *
3611 * MOUSE ROUTINES *
3612 * ------------------------------------------------------------------------- */
3613
3614/*
3615 * return col/row values corresponding to x/y pixel values
3616 */
3617void
3618rxvt_term::pixel_position (int *x, int *y)
3619{
3620 *x = Pixel2Col (*x);
3621 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3622 *y = Pixel2Row (*y);
3623 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3624} 3758}
3625 3759
3626/* ------------------------------------------------------------------------- */ 3760/* ------------------------------------------------------------------------- */
3627#ifdef USE_XIM 3761#ifdef USE_XIM
3628void 3762void
3629rxvt_term::im_set_position (XPoint &pos) 3763rxvt_term::im_set_position (XPoint &pos) NOTHROW
3630{ 3764{
3631 XWindowAttributes xwa; 3765 XWindowAttributes xwa;
3632 3766
3633 XGetWindowAttributes (display->display, vt, &xwa); 3767 XGetWindowAttributes (dpy, vt, &xwa);
3634 3768
3635 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3769 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3636 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3770 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3637} 3771}
3638#endif 3772#endif
3639 3773
3640#if ENABLE_OVERLAY 3774#if ENABLE_OVERLAY
3641void 3775void
3642rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3776rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3643{ 3777{
3644 if (nrow < 1 || ncol < 1) 3778 if (nrow < 1 || ncol < 1)
3645 return; 3779 return;
3646 3780
3647 want_refresh = 1; 3781 want_refresh = 1;
… …
3656 h += 2; min_it (h, nrow); 3790 h += 2; min_it (h, nrow);
3657 3791
3658 x -= 1; clamp_it (x, 0, ncol - w); 3792 x -= 1; clamp_it (x, 0, ncol - w);
3659 y -= 1; clamp_it (y, 0, nrow - h); 3793 y -= 1; clamp_it (y, 0, nrow - h);
3660 3794
3661 ov_x = x; ov_y = y; 3795 ov.x = x; ov.y = y;
3662 ov_w = w; ov_h = h; 3796 ov.w = w; ov.h = h;
3663 3797
3664 ov_text = new text_t *[h]; 3798 ov.text = new text_t *[h];
3665 ov_rend = new rend_t *[h]; 3799 ov.rend = new rend_t *[h];
3666 3800
3667 for (y = 0; y < h; y++) 3801 for (y = 0; y < h; y++)
3668 { 3802 {
3669 text_t *tp = ov_text[y] = new text_t[w]; 3803 text_t *tp = ov.text[y] = new text_t[w];
3670 rend_t *rp = ov_rend[y] = new rend_t[w]; 3804 rend_t *rp = ov.rend[y] = new rend_t[w];
3671 3805
3672 text_t t0, t1, t2; 3806 text_t t0, t1, t2;
3673 rend_t r = OVERLAY_RSTYLE; 3807 rend_t r = OVERLAY_RSTYLE;
3674 3808
3675 if (y == 0) 3809 if (y == 0)
… …
3692 *rp = r; 3826 *rp = r;
3693 } 3827 }
3694} 3828}
3695 3829
3696void 3830void
3697rxvt_term::scr_overlay_off () 3831rxvt_term::scr_overlay_off () NOTHROW
3698{ 3832{
3699 if (!ov_text) 3833 if (!ov.text)
3700 return; 3834 return;
3701 3835
3702 want_refresh = 1; 3836 want_refresh = 1;
3703 3837
3704 for (int y = 0; y < ov_h; y++) 3838 for (int y = 0; y < ov.h; y++)
3705 { 3839 {
3706 delete [] ov_text[y]; 3840 delete [] ov.text[y];
3707 delete [] ov_rend[y]; 3841 delete [] ov.rend[y];
3708 } 3842 }
3709 3843
3710 delete [] ov_text; ov_text = 0; 3844 delete [] ov.text; ov.text = 0;
3711 delete [] ov_rend; ov_rend = 0; 3845 delete [] ov.rend; ov.rend = 0;
3712} 3846}
3713 3847
3714void 3848void
3715rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3849rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3716{ 3850{
3717 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3851 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3718 return; 3852 return;
3719 3853
3720 x++, y++; 3854 x++, y++;
3721 3855
3722 ov_text[y][x] = text; 3856 ov.text[y][x] = text;
3723 ov_rend[y][x] = rend; 3857 ov.rend[y][x] = rend;
3724} 3858}
3725 3859
3726void 3860void
3727rxvt_term::scr_overlay_set (int x, int y, const char *s) 3861rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3728{ 3862{
3729 while (*s) 3863 while (*s)
3730 scr_overlay_set (x++, y, *s++); 3864 scr_overlay_set (x++, y, *s++);
3731} 3865}
3732 3866
3733void 3867void
3734rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3868rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3735{ 3869{
3736 while (*s) 3870 while (*s)
3737 { 3871 {
3738 text_t t = *s++; 3872 text_t t = *s++;
3739 int width = wcwidth (t); 3873 int width = WCWIDTH (t);
3740 3874
3741 while (width--) 3875 while (width--)
3742 { 3876 {
3743 scr_overlay_set (x++, y, t); 3877 scr_overlay_set (x++, y, t);
3744 t = NOCHAR; 3878 t = NOCHAR;
3745 } 3879 }
3746 } 3880 }
3747} 3881}
3748 3882
3749void 3883void
3750rxvt_term::scr_swap_overlay () 3884rxvt_term::scr_swap_overlay () NOTHROW
3751{ 3885{
3752 if (!ov_text) 3886 if (!ov.text)
3753 return; 3887 return;
3754 3888
3889 // hide cursor if it is within the overlay area
3890 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3891 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3892 screen.flags &= ~Screen_VisibleCursor;
3893
3755 // swap screen mem with overlay 3894 // swap screen mem with overlay
3756 for (int y = ov_h; y--; ) 3895 for (int y = ov.h; y--; )
3757 { 3896 {
3758 text_t *t1 = ov_text[y]; 3897 text_t *t1 = ov.text[y];
3759 rend_t *r1 = ov_rend[y]; 3898 rend_t *r1 = ov.rend[y];
3760 3899
3761 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3900 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3762 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3901 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3763 3902
3764 for (int x = ov_w; x--; ) 3903 for (int x = ov.w; x--; )
3765 { 3904 {
3766 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3905 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3767 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3906 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3768 } 3907 }
3769 } 3908 }

Diff Legend

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