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

Diff Legend

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