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.227 by root, Sun Jan 15 05:14:12 2006 UTC vs.
Revision 1.405 by sf-exg, Tue Nov 15 20:09:13 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 (!IN_RANGE_INC (color, minCOLOR, 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)
… …
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 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
619 { 642 {
620 nsaved = min (nsaved + count, saveLines); 643 min_it (count, total_rows - (nrow - (row2 + 1)));
621 644
622 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
623 648 {
649 line_t &l = ROW(row2);
650 l.is_longer (0);
651 l.touch ();
652 }
653
624 // scroll everything up 'count' lines 654 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows; 655 term_start = (term_start + count) % total_rows;
626
627 {
628 // severe bottommost scrolled line
629 line_t &l = ROW(row2 - count);
630 l.touch ();
631 l.is_longer (0);
632 }
633
634 // erase newly scorlled-in lines
635 for (int i = count; i; --i )
636 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - i);
640
641 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0;
644 l.f = 0;
645 }
646 656
647 // now copy lines below the scroll region bottom to the 657 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 658 // bottom of the screen again, so they look as if they
649 // hadn't moved. 659 // hadn't moved.
650 for (int i = nrow; --i > row2; ) 660 for (int i = nrow; --i > row2; )
… …
653 line_t &l2 = ROW(i); 663 line_t &l2 = ROW(i);
654 664
655 ::swap (l1, l2); 665 ::swap (l1, l2);
656 l2.touch (); 666 l2.touch ();
657 } 667 }
668
669 // erase newly scrolled-in lines
670 for (int i = count; i--; )
658 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
659 // move and/or clear selection, if any 686 // move and/or clear selection, if any
660 if (selection.op && current_screen == selection.screen) 687 if (selection.op && current_screen == selection.screen
688 && selection.beg.row <= row2)
661 { 689 {
662 selection.beg.row -= count; 690 selection.beg.row -= count;
663 selection.end.row -= count; 691 selection.end.row -= count;
664 selection.mark.row -= count; 692 selection.mark.row -= count;
665 693
666 if (selection.beg.row < -nsaved 694 selection_check (0);
667 || selection.end.row < -nsaved
668 || selection.mark.row < -nsaved)
669 {
670 CLEAR_ALL_SELECTION ();
671 selection.op = SELECTION_CLEAR;
672 }
673 } 695 }
674 696
675 // finally move the view window, if desired 697 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 698 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 699 && view_start != 0
678 && view_start != saveLines) 700 && view_start != -saveLines)
679 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));
680 } 705 }
681 else 706 else
682 { 707 {
683 if (selection.op && current_screen == selection.screen) 708 if (selection.op && current_screen == selection.screen)
684 { 709 {
… …
696 { 721 {
697 /* move selected region too */ 722 /* move selected region too */
698 selection.beg.row -= count; 723 selection.beg.row -= count;
699 selection.end.row -= count; 724 selection.end.row -= count;
700 selection.mark.row -= count; 725 selection.mark.row -= count;
701 726
702 selection_check (0); 727 selection_check (0);
703 } 728 }
704 } 729 }
705 730
706 // use a simple and robust scrolling algorithm, this 731 // use a simple and robust scrolling algorithm, this
707 // part of scr_scroll_text is not time-critical. 732 // part of scr_scroll_text is not time-critical.
708 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
709 int rows = row2 - row1 + 1; 742 int rows = row2 - row1 + 1;
710 743
711 min_it (count, rows); 744 min_it (count, rows);
712 745
713 line_t *temp_buf = row_buf + total_rows; 746 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
714 747
715 for (int row = 0; row < rows; row++) 748 for (int row = 0; row < rows; row++)
716 { 749 {
717 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 750 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
718 751
… …
720 scr_blank_screen_mem (temp_buf [row], rstyle); 753 scr_blank_screen_mem (temp_buf [row], rstyle);
721 } 754 }
722 755
723 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
724 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 }
725 } 765 }
726 766
727 return count; 767 return count;
728} 768}
729 769
730/* ------------------------------------------------------------------------- */ 770/* ------------------------------------------------------------------------- */
731/* 771/*
732 * Add text given in <str> of length <len> to screen struct 772 * Add text given in <str> of length <len> to screen struct
733 */ 773 */
734void 774void
735rxvt_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
736{ 776{
737 if (len <= 0) /* sanity */ 777 if (len <= 0) /* sanity */
738 return; 778 return;
739 779
740 unsigned char checksel; 780 bool checksel;
741 unicode_t c; 781 unicode_t c;
742 int ncol = this->ncol; 782 int ncol = this->ncol;
743 const wchar_t *strend = str + len; 783 const wchar_t *strend = str + len;
744 784
745 want_refresh = 1; 785 want_refresh = 1;
746 ZERO_SCROLLBACK (); 786 ZERO_SCROLLBACK ();
747 787
748 if (minlines > 0) 788 if (minlines > 0)
749 { 789 {
750 minlines += screen.cur.row - screen.bscroll; 790 minlines += screen.cur.row - screen.bscroll;
791 min_it (minlines, screen.cur.row - top_row);
751 792
752 if (minlines > 0 793 if (minlines > 0
753 && screen.tscroll == 0 794 && screen.tscroll == 0
754 && screen.bscroll == nrow - 1) 795 && screen.bscroll == nrow - 1)
755 { 796 {
… …
757 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 798 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
758 screen.cur.row -= minlines; 799 screen.cur.row -= minlines;
759 } 800 }
760 } 801 }
761 802
762#ifdef DEBUG_STRICT
763 assert (screen.cur.col < ncol); 803 assert (screen.cur.col < ncol);
764 assert (screen.cur.row < nrow 804 assert (screen.cur.row < nrow
765 && screen.cur.row >= -nsaved); 805 && screen.cur.row >= top_row);
766#endif
767 int row = screen.cur.row; 806 int row = screen.cur.row;
768 807
769 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 808 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
770 809
771 line_t *line = &ROW(row); 810 line_t *line = &ROW(row);
772 811
773 while (str < strend) 812 while (str < strend)
774 { 813 {
775 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 814 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
776 815
777 if (c < 0x20) 816 if (ecb_unlikely (c < 0x20))
778 if (c == C0_LF) 817 if (c == C0_LF)
779 { 818 {
780 max_it (line->l, screen.cur.col); 819 max_it (line->l, screen.cur.col);
781 820
782 screen.flags &= ~Screen_WrapNext; 821 screen.flags &= ~Screen_WrapNext;
… …
801 { 840 {
802 scr_tab (1, true); 841 scr_tab (1, true);
803 continue; 842 continue;
804 } 843 }
805 844
845 if (ecb_unlikely (
806 if (checksel /* see if we're writing within selection */ 846 checksel /* see if we're writing within selection */
807 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 847 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
808 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 848 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
849 ))
809 { 850 {
810 checksel = 0; 851 checksel = 0;
811 /* 852 /*
812 * If we wrote anywhere in the selected area, kill the selection 853 * If we wrote anywhere in the selected area, kill the selection
813 * XXX: should we kill the mark too? Possibly, but maybe that 854 * XXX: should we kill the mark too? Possibly, but maybe that
814 * should be a similar check. 855 * should be a similar check.
815 */ 856 */
816 CLEAR_SELECTION (); 857 CLEAR_SELECTION ();
817 } 858 }
818 859
819 if (screen.flags & Screen_WrapNext) 860 if (ecb_unlikely (screen.flags & Screen_WrapNext))
820 { 861 {
862 scr_do_wrap ();
863
821 max_it (line->l, ncol); 864 line->l = ncol;
822 line->is_longer (1); 865 line->is_longer (1);
823 866
824 scr_do_wrap ();
825
826 row = screen.cur.row; 867 row = screen.cur.row;
827 line = &ROW(row); /* _must_ refresh */ 868 line = &ROW(row); /* _must_ refresh */
828 } 869 }
829 870
830 // some utf-8 decoders "decode" surrogate characters: let's fix this. 871 // some utf-8 decoders "decode" surrogate characters: let's fix this.
831 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 872 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
832 c = 0xfffd; 873 c = 0xfffd;
833 874
834 // 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
835 // do wcwidth before further replacements, as wcwidth might return -1 876 // further replacements, as wcwidth might return -1 for the line
836 // 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
837 // locale. 878 // locale.
838 int width = c < 0x100 ? 1 : wcwidth (c); 879 int width = WCWIDTH (c);
839 880
840 if (charsets [screen.charset] == '0') // DEC SPECIAL 881 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
841 { 882 {
842 // vt100 special graphics and line drawing 883 // vt100 special graphics and line drawing
843 // 5f-7e standard vt100 884 // 5f-7e standard vt100
844 // 40-5e rxvt extension for extra curses acs chars 885 // 40-5e rxvt extension for extra curses acs chars
845 static uint16_t vt100_0[62] = { // 41 .. 7e 886 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
858 c = vt100_0[c - 0x41]; 899 c = vt100_0[c - 0x41];
859 width = 1; // vt100 line drawing characters are always single-width 900 width = 1; // vt100 line drawing characters are always single-width
860 } 901 }
861 } 902 }
862 903
863 if (screen.flags & Screen_Insert) 904 if (ecb_unlikely (screen.flags & Screen_Insert))
864 scr_insdel_chars (width, INSERT); 905 scr_insdel_chars (width, INSERT);
865 906
866 if (width != 0) 907 if (width != 0)
867 { 908 {
868#if !UNICODE_3 909#if !UNICODE_3
… …
873# else 914# else
874 c = 0xfffd; 915 c = 0xfffd;
875# endif 916# endif
876#endif 917#endif
877 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
878 // 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.
879 if (line->t[screen.cur.col] == NOCHAR 939 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
880 || (screen.cur.col < ncol - 1 940 scr_kill_char (*line, screen.cur.col);
881 && line->t[screen.cur.col + 1] == NOCHAR))
882 {
883 int col = screen.cur.col;
884
885 // find begin
886 while (col > 0 && line->t[col] == NOCHAR)
887 col--;
888
889 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
890
891 // found begin, nuke
892 do {
893 line->t[col] = ' ';
894 line->r[col] = rend;
895 col++;
896 } while (col < ncol && line->t[col] == NOCHAR);
897 }
898
899 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
900
901 // if the character doesn't fit into the remaining columns...
902 if (screen.cur.col > ncol - width && ncol >= width)
903 {
904 // ...output spaces
905 c = ' ';
906 // and try the same character next loop iteration
907 --str;
908 }
909 941
910 line->touch (); 942 line->touch ();
911 943
912 do 944 do
913 { 945 {
914 line->t[screen.cur.col] = c; 946 line->t[screen.cur.col] = c;
915 line->r[screen.cur.col] = rend; 947 line->r[screen.cur.col] = rend;
916 948
917 if (screen.cur.col < ncol - 1) 949 if (ecb_likely (screen.cur.col < ncol - 1))
918 screen.cur.col++; 950 screen.cur.col++;
919 else 951 else
920 { 952 {
921 line->l = ncol; 953 line->l = ncol;
922 if (screen.flags & Screen_Autowrap) 954 if (screen.flags & Screen_Autowrap)
923 screen.flags |= Screen_WrapNext; 955 screen.flags |= Screen_WrapNext;
924 break; 956
957 goto end_of_line;
925 } 958 }
926 959
927 c = NOCHAR; 960 c = NOCHAR;
928 } 961 }
929 while (--width > 0); 962 while (ecb_unlikely (--width > 0));
930 963
931 // pad with spaces when overwriting wide character with smaller one 964 // pad with spaces when overwriting wide character with smaller one
932 if (!width) 965 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
933 { 966 {
934 line->touch (); 967 line->t[c] = ' ';
968 line->r[c] = rend;
969 }
935 970
936 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)
937 { 988 {
938 line->t[c] = ' ';
939 line->r[c] = rend; 989 linep = line;
990 tp = line->t + screen.cur.col - 1;
991 rp = line->r + screen.cur.col - 1;
940 } 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));
941 } 1015 }
942 } 1016 }
943 else // width == 0
944 {
945#if ENABLE_COMBINING
946 // handle combining characters
947 // we just tag the accent on the previous on-screen character.
948 // this is arguably not correct, but also arguably not wrong.
949 // we don't handle double-width characters nicely yet.
950 line_t *linep;
951 text_t *tp;
952 rend_t *rp;
953
954 if (screen.cur.col > 0)
955 {
956 linep = line;
957 tp = line->t + screen.cur.col - 1;
958 rp = line->r + screen.cur.col - 1;
959 }
960 else if (screen.cur.row > 0
961 && ROW(screen.cur.row - 1).is_longer ())
962 {
963 linep = &ROW(screen.cur.row - 1);
964 tp = line->t + ncol - 1;
965 rp = line->r + ncol - 1;
966 }
967 else
968 continue;
969
970 linep->touch ();
971
972 while (*tp == NOCHAR && tp > linep->t)
973 tp--, rp--;
974
975 // first try to find a precomposed character
976 unicode_t n = rxvt_compose (*tp, c);
977 if (n == NOCHAR)
978 n = rxvt_composite.compose (*tp, c);
979
980 *tp = n;
981 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
982#endif 1017#endif
983 }
984 } 1018 }
985 1019
986 max_it (line->l, screen.cur.col); 1020 max_it (line->l, screen.cur.col);
987 1021
988#ifdef DEBUG_STRICT
989 assert (screen.cur.row >= 0); 1022 assert (screen.cur.row >= 0);
990#endif
991} 1023}
992 1024
993/* ------------------------------------------------------------------------- */ 1025/* ------------------------------------------------------------------------- */
994/* 1026/*
995 * 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
996 * XTERM_SEQ: CTRL-H 1028 * XTERM_SEQ: CTRL-H
997 */ 1029 */
998void 1030void
999rxvt_term::scr_backspace () 1031rxvt_term::scr_backspace () NOTHROW
1000{ 1032{
1001 want_refresh = 1;
1002
1003 if (screen.cur.col == 0) 1033 if (screen.cur.col == 0)
1004 { 1034 {
1005 if (screen.cur.row > 0) 1035 if (screen.cur.row > 0)
1006 { 1036 {
1007#ifdef TERMCAP_HAS_BW 1037#ifdef TERMCAP_HAS_BW
1008 screen.cur.col = ncol - 1; 1038 screen.cur.col = ncol - 1;
1009 screen.cur.row--; 1039 --screen.cur.row;
1010 return; 1040
1041 want_refresh = 1;
1011#endif 1042#endif
1012 } 1043 }
1013 } 1044 }
1014 else if (!(screen.flags & Screen_WrapNext)) 1045 else if (screen.flags & Screen_WrapNext)
1046 screen.flags &= ~Screen_WrapNext;
1047 else
1015 scr_gotorc (0, -1, RELATIVE); 1048 scr_gotorc (0, -1, RELATIVE);
1016
1017 screen.flags &= ~Screen_WrapNext;
1018} 1049}
1019 1050
1020/* ------------------------------------------------------------------------- */ 1051/* ------------------------------------------------------------------------- */
1021/* 1052/*
1022 * Process Horizontal Tab 1053 * Process Horizontal Tab
1023 * count: +ve = forward; -ve = backwards 1054 * count: +ve = forward; -ve = backwards
1024 * XTERM_SEQ: CTRL-I 1055 * XTERM_SEQ: CTRL-I
1025 */ 1056 */
1026void 1057void
1027rxvt_term::scr_tab (int count, bool ht) 1058rxvt_term::scr_tab (int count, bool ht) NOTHROW
1028{ 1059{
1029 int i, x; 1060 int i, x;
1030 1061
1031 want_refresh = 1; 1062 want_refresh = 1;
1032 i = x = screen.cur.col; 1063 i = x = screen.cur.col;
… …
1045 x = i; 1076 x = i;
1046 1077
1047 if (!--count) 1078 if (!--count)
1048 break; 1079 break;
1049 } 1080 }
1050 else 1081 else
1051 ht &= l.t[i] == ' ' 1082 ht &= l.t[i] == ' '
1052 && RS_SAME (l.r[i], base_rend); 1083 && RS_SAME (l.r[i], base_rend);
1053 1084
1054 if (count) 1085 if (count)
1055 x = ncol - 1; 1086 x = ncol - 1;
1056 1087
1057 // store horizontal tab commands as characters inside the text 1088 // store horizontal tab commands as characters inside the text
1058 // buffer so they can be selected and pasted. 1089 // buffer so they can be selected and pasted.
1059 if (ht && OPTION (Opt_pastableTabs)) 1090 if (ht && option (Opt_pastableTabs))
1060 { 1091 {
1061 base_rend = SET_FONT (base_rend, 0); 1092 base_rend = SET_FONT (base_rend, 0);
1062 1093
1063 l.touch (x); 1094 l.touch (x);
1064 1095
… …
1097 * Process DEC Back Index 1128 * Process DEC Back Index
1098 * XTERM_SEQ: ESC 6 1129 * XTERM_SEQ: ESC 6
1099 * 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
1100 * in that row right. Clear left column. 1131 * in that row right. Clear left column.
1101 */ 1132 */
1102#if ENABLE_FRILLS 1133#if !ENABLE_MINIMAL
1103void 1134void
1104rxvt_term::scr_backindex () 1135rxvt_term::scr_backindex () NOTHROW
1105{ 1136{
1106 if (screen.cur.col > 0) 1137 if (screen.cur.col > 0)
1107 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1138 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1108 else 1139 else
1109 scr_insdel_chars (1, INSERT); 1140 scr_insdel_chars (1, INSERT);
… …
1114 * Process DEC Forward Index 1145 * Process DEC Forward Index
1115 * XTERM_SEQ: ESC 9 1146 * XTERM_SEQ: ESC 9
1116 * 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
1117 * in that row left. Clear right column. 1148 * in that row left. Clear right column.
1118 */ 1149 */
1119#if ENABLE_FRILLS 1150#if !ENABLE_MINIMAL
1120void 1151void
1121rxvt_term::scr_forwardindex () 1152rxvt_term::scr_forwardindex () NOTHROW
1122{ 1153{
1123 if (screen.cur.col < ncol - 1) 1154 if (screen.cur.col < ncol - 1)
1124 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1155 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1125 else 1156 else
1126 { 1157 {
… …
1139/* ------------------------------------------------------------------------- */ 1170/* ------------------------------------------------------------------------- */
1140/* 1171/*
1141 * Goto Row/Column 1172 * Goto Row/Column
1142 */ 1173 */
1143void 1174void
1144rxvt_term::scr_gotorc (int row, int col, int relative) 1175rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1145{ 1176{
1146 want_refresh = 1; 1177 want_refresh = 1;
1147 ZERO_SCROLLBACK (); 1178 ZERO_SCROLLBACK ();
1148 1179
1149 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1180 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1171 } 1202 }
1172 } 1203 }
1173 else 1204 else
1174 { 1205 {
1175 if (screen.flags & Screen_Relative) 1206 if (screen.flags & Screen_Relative)
1207 {
1176 { /* relative origin mode */ 1208 /* relative origin mode */
1177 screen.cur.row = row + screen.tscroll; 1209 screen.cur.row = row + screen.tscroll;
1178 min_it (screen.cur.row, screen.bscroll); 1210 min_it (screen.cur.row, screen.bscroll);
1179 } 1211 }
1180 else 1212 else
1181 screen.cur.row = row; 1213 screen.cur.row = row;
… …
1187/* ------------------------------------------------------------------------- */ 1219/* ------------------------------------------------------------------------- */
1188/* 1220/*
1189 * direction should be UP or DN 1221 * direction should be UP or DN
1190 */ 1222 */
1191void 1223void
1192rxvt_term::scr_index (enum page_dirn direction) 1224rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1193{ 1225{
1194 int dirn; 1226 int dirn;
1195 1227
1196 want_refresh = 1; 1228 want_refresh = 1;
1197 ZERO_SCROLLBACK (); 1229 ZERO_SCROLLBACK ();
… …
1214/* 1246/*
1215 * Erase part or whole of a line 1247 * Erase part or whole of a line
1216 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1248 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1217 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1249 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1218 * 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
1219 */ 1252 */
1220void 1253void
1221rxvt_term::scr_erase_line (int mode) 1254rxvt_term::scr_erase_line (int mode) NOTHROW
1222{ 1255{
1223 unsigned int col, num; 1256 unsigned int col, num;
1224 1257
1225 want_refresh = 1; 1258 want_refresh = 1;
1226 ZERO_SCROLLBACK (); 1259 ZERO_SCROLLBACK ();
… …
1232 line.touch (); 1265 line.touch ();
1233 line.is_longer (0); 1266 line.is_longer (0);
1234 1267
1235 switch (mode) 1268 switch (mode)
1236 { 1269 {
1270 case 3:
1271 if (screen.flags & Screen_WrapNext)
1272 return;
1273
1274 /* fall through */
1275
1237 case 0: /* erase to end of line */ 1276 case 0: /* erase to end of line */
1238 col = screen.cur.col; 1277 col = screen.cur.col;
1239 num = ncol - col; 1278 num = ncol - col;
1240 min_it (line.l, col); 1279 min_it (line.l, col);
1280
1241 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1281 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1242 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1282 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1243 CLEAR_SELECTION (); 1283 CLEAR_SELECTION ();
1244 break; 1284 break;
1285
1245 case 1: /* erase to beginning of line */ 1286 case 1: /* erase to beginning of line */
1246 col = 0; 1287 col = 0;
1247 num = screen.cur.col + 1; 1288 num = screen.cur.col + 1;
1289
1248 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1290 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1249 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1291 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1250 CLEAR_SELECTION (); 1292 CLEAR_SELECTION ();
1251 break; 1293 break;
1294
1252 case 2: /* erase whole line */ 1295 case 2: /* erase whole line */
1253 col = 0; 1296 col = 0;
1254 num = ncol; 1297 num = ncol;
1255 line.l = 0; 1298 line.l = 0;
1256 if (selection.beg.row <= screen.cur.row 1299 if (selection.beg.row <= screen.cur.row
… …
1270 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1313 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1271 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1314 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1272 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1315 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1273 */ 1316 */
1274void 1317void
1275rxvt_term::scr_erase_screen (int mode) 1318rxvt_term::scr_erase_screen (int mode) NOTHROW
1276{ 1319{
1277 int num; 1320 int num;
1278 int32_t row; 1321 int32_t row;
1279 rend_t ren; 1322 rend_t ren;
1280 XGCValues gcvalue; 1323 XGCValues gcvalue;
… …
1314 if (row >= nrow) /* Out Of Bounds */ 1357 if (row >= nrow) /* Out Of Bounds */
1315 return; 1358 return;
1316 1359
1317 min_it (num, nrow - row); 1360 min_it (num, nrow - row);
1318 1361
1319 if (rstyle & (RS_RVid | RS_Uline)) 1362 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1320 ren = (rend_t) ~RS_None; 1363 ren = (rend_t) ~RS_None;
1321 else if (GET_BASEBG (rstyle) == Color_bg) 1364 else if (GET_BASEBG (rstyle) == Color_bg)
1322 { 1365 {
1323 ren = DEFAULT_RSTYLE; 1366 ren = DEFAULT_RSTYLE;
1324 CLEAR_ROWS (row, num); 1367
1368 if (mapped)
1369 XClearArea (dpy, vt, 0,
1370 Row2Pixel (row - view_start), (unsigned int)width,
1371 (unsigned int)Height2Pixel (num), False);
1325 } 1372 }
1326 else 1373 else
1327 { 1374 {
1328 ren = rstyle & (RS_fgMask | RS_bgMask); 1375 ren = rstyle & (RS_fgMask | RS_bgMask);
1376
1377 if (mapped)
1378 {
1329 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1379 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1330 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1380 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1331 ERASE_ROWS (row, num); 1381 XFillRectangle (dpy, vt, gc,
1382 0, Row2Pixel (row - view_start),
1383 (unsigned int)width,
1384 (unsigned int)Height2Pixel (num));
1332 gcvalue.foreground = pix_colors[Color_fg]; 1385 gcvalue.foreground = pix_colors[Color_fg];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1386 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1387 }
1334 } 1388 }
1335 1389
1336 for (; num--; row++) 1390 for (; num--; row++)
1337 { 1391 {
1338 scr_blank_screen_mem (ROW(row), rstyle); 1392 scr_blank_screen_mem (ROW(row), rstyle);
1393
1394 if (row - view_start < nrow)
1339 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1395 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1340 } 1396 }
1341} 1397}
1342 1398
1343#if ENABLE_FRILLS 1399#if !ENABLE_MINIMAL
1344void 1400void
1345rxvt_term::scr_erase_savelines () 1401rxvt_term::scr_erase_savelines () NOTHROW
1346{ 1402{
1347 want_refresh = 1; 1403 want_refresh = 1;
1348 ZERO_SCROLLBACK (); 1404 ZERO_SCROLLBACK ();
1349 1405
1350 nsaved = 0; 1406 top_row = 0;
1351} 1407}
1352#endif 1408#endif
1353 1409
1354/* ------------------------------------------------------------------------- */ 1410/* ------------------------------------------------------------------------- */
1355/* 1411/*
1356 * Fill the screen with `E's 1412 * Fill the screen with `E's
1357 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1413 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1358 */ 1414 */
1359void 1415void
1360rxvt_term::scr_E () 1416rxvt_term::scr_E () NOTHROW
1361{ 1417{
1362 rend_t fs; 1418 rend_t fs;
1363 1419
1364 want_refresh = 1; 1420 want_refresh = 1;
1365 ZERO_SCROLLBACK (); 1421 ZERO_SCROLLBACK ();
… …
1386/* ------------------------------------------------------------------------- */ 1442/* ------------------------------------------------------------------------- */
1387/* 1443/*
1388 * Insert/Delete <count> lines 1444 * Insert/Delete <count> lines
1389 */ 1445 */
1390void 1446void
1391rxvt_term::scr_insdel_lines (int count, int insdel) 1447rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1392{ 1448{
1393 int end; 1449 int end;
1394 1450
1395 ZERO_SCROLLBACK (); 1451 ZERO_SCROLLBACK ();
1396 1452
… …
1416/* ------------------------------------------------------------------------- */ 1472/* ------------------------------------------------------------------------- */
1417/* 1473/*
1418 * Insert/Delete <count> characters from the current position 1474 * Insert/Delete <count> characters from the current position
1419 */ 1475 */
1420void 1476void
1421rxvt_term::scr_insdel_chars (int count, int insdel) 1477rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1422{ 1478{
1423 int col, row;
1424 rend_t tr;
1425
1426 want_refresh = 1; 1479 want_refresh = 1;
1427 ZERO_SCROLLBACK (); 1480 ZERO_SCROLLBACK ();
1428 1481
1429 if (count <= 0) 1482 if (count <= 0)
1430 return; 1483 return;
… …
1432 scr_do_wrap (); 1485 scr_do_wrap ();
1433 1486
1434 selection_check (1); 1487 selection_check (1);
1435 min_it (count, ncol - screen.cur.col); 1488 min_it (count, ncol - screen.cur.col);
1436 1489
1437 row = screen.cur.row; 1490 int row = screen.cur.row;
1438 1491
1439 line_t *line = &ROW(row); 1492 line_t *line = &ROW(row);
1440 1493
1441 line->touch (); 1494 line->touch ();
1442 line->is_longer (0); 1495 line->is_longer (0);
1443 1496
1497 // nuke wide spanning the start
1498 if (line->t[screen.cur.col] == NOCHAR)
1499 scr_kill_char (*line, screen.cur.col);
1500
1444 switch (insdel) 1501 switch (insdel)
1445 { 1502 {
1446 case INSERT: 1503 case INSERT:
1447 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1504 line->l = min (line->l + count, ncol);
1505
1506 if (line->t[screen.cur.col] == NOCHAR)
1507 scr_kill_char (*line, screen.cur.col);
1508
1509 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1448 { 1510 {
1449 line->t[col] = line->t[col - count]; 1511 line->t[col] = line->t[col - count];
1450 line->r[col] = line->r[col - count]; 1512 line->r[col] = line->r[col - count];
1451 } 1513 }
1452
1453 line->l = min (line->l + count, ncol);
1454 1514
1455 if (selection.op && current_screen == selection.screen 1515 if (selection.op && current_screen == selection.screen
1456 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1516 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1457 { 1517 {
1458 if (selection.end.row != screen.cur.row 1518 if (selection.end.row != screen.cur.row
1459 || (selection.end.col + count >= ncol)) 1519 || (selection.end.col + count >= ncol))
1460 CLEAR_SELECTION (); 1520 CLEAR_SELECTION ();
1461 else 1521 else
1522 {
1462 { /* shift selection */ 1523 /* shift selection */
1463 selection.beg.col += count; 1524 selection.beg.col += count;
1464 selection.mark.col += count; /* XXX: yes? */ 1525 selection.mark.col += count; /* XXX: yes? */
1465 selection.end.col += count; 1526 selection.end.col += count;
1466 } 1527 }
1467 } 1528 }
… …
1472 case ERASE: 1533 case ERASE:
1473 screen.cur.col += count; /* don't worry if > ncol */ 1534 screen.cur.col += count; /* don't worry if > ncol */
1474 selection_check (1); 1535 selection_check (1);
1475 screen.cur.col -= count; 1536 screen.cur.col -= count;
1476 1537
1477 line->l = max (line->l - count, 0); 1538 // nuke wide char after the end
1539 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1540 scr_kill_char (*line, screen.cur.col + count);
1541
1478 scr_blank_line (*line, screen.cur.col, count, rstyle); 1542 scr_blank_line (*line, screen.cur.col, count, rstyle);
1479 break; 1543 break;
1480 1544
1481 case DELETE: 1545 case DELETE:
1482 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1546 line->l = max (line->l - count, 0);
1483 1547
1548 // nuke wide char spanning the end
1549 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1550 scr_kill_char (*line, screen.cur.col + count);
1551
1484 for (col = screen.cur.col; (col + count) < ncol; col++) 1552 for (int col = screen.cur.col; (col + count) < ncol; col++)
1485 { 1553 {
1486 line->t[col] = line->t[col + count]; 1554 line->t[col] = line->t[col + count];
1487 line->r[col] = line->r[col + count]; 1555 line->r[col] = line->r[col + count];
1488 } 1556 }
1489 1557
1490 line->l = max (line->l - count, 0);
1491 scr_blank_line (*line, ncol - count, count, tr); 1558 scr_blank_line (*line, ncol - count, count, rstyle);
1492 1559
1493 if (selection.op && current_screen == selection.screen 1560 if (selection.op && current_screen == selection.screen
1494 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1561 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1495 { 1562 {
1496 if (selection.end.row != screen.cur.row 1563 if (selection.end.row != screen.cur.row
… …
1514/* 1581/*
1515 * Set the scrolling region 1582 * Set the scrolling region
1516 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1583 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1517 */ 1584 */
1518void 1585void
1519rxvt_term::scr_scroll_region (int top, int bot) 1586rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1520{ 1587{
1521 max_it (top, 0); 1588 max_it (top, 0);
1522 min_it (bot, nrow - 1); 1589 min_it (bot, nrow - 1);
1523 1590
1524 if (top > bot) 1591 if (top > bot)
… …
1534 * Make the cursor visible/invisible 1601 * Make the cursor visible/invisible
1535 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1602 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1536 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1603 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1537 */ 1604 */
1538void 1605void
1539rxvt_term::scr_cursor_visible (int mode) 1606rxvt_term::scr_cursor_visible (int mode) NOTHROW
1540{ 1607{
1541 want_refresh = 1; 1608 want_refresh = 1;
1542 1609
1543 if (mode) 1610 if (mode)
1544 screen.flags |= Screen_VisibleCursor; 1611 screen.flags |= Screen_VisibleCursor;
… …
1551 * Set/unset automatic wrapping 1618 * Set/unset automatic wrapping
1552 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1619 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1553 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1620 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1554 */ 1621 */
1555void 1622void
1556rxvt_term::scr_autowrap (int mode) 1623rxvt_term::scr_autowrap (int mode) NOTHROW
1557{ 1624{
1558 if (mode) 1625 if (mode)
1559 screen.flags |= Screen_Autowrap; 1626 screen.flags |= Screen_Autowrap;
1560 else 1627 else
1561 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1628 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1570 * and the cursor cannot be moved outside. 1637 * and the cursor cannot be moved outside.
1571 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1638 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1572 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1639 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1573 */ 1640 */
1574void 1641void
1575rxvt_term::scr_relative_origin (int mode) 1642rxvt_term::scr_relative_origin (int mode) NOTHROW
1576{ 1643{
1577 if (mode) 1644 if (mode)
1578 screen.flags |= Screen_Relative; 1645 screen.flags |= Screen_Relative;
1579 else 1646 else
1580 screen.flags &= ~Screen_Relative; 1647 screen.flags &= ~Screen_Relative;
… …
1587 * Set insert/replace mode 1654 * Set insert/replace mode
1588 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1655 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1589 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1656 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1590 */ 1657 */
1591void 1658void
1592rxvt_term::scr_insert_mode (int mode) 1659rxvt_term::scr_insert_mode (int mode) NOTHROW
1593{ 1660{
1594 if (mode) 1661 if (mode)
1595 screen.flags |= Screen_Insert; 1662 screen.flags |= Screen_Insert;
1596 else 1663 else
1597 screen.flags &= ~Screen_Insert; 1664 screen.flags &= ~Screen_Insert;
… …
1603 * XTERM_SEQ: Set tab at current column : ESC H 1670 * XTERM_SEQ: Set tab at current column : ESC H
1604 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1671 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1605 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1672 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1606 */ 1673 */
1607void 1674void
1608rxvt_term::scr_set_tab (int mode) 1675rxvt_term::scr_set_tab (int mode) NOTHROW
1609{ 1676{
1610 if (mode < 0) 1677 if (mode < 0)
1611 memset (tabs, 0, ncol * sizeof (char)); 1678 memset (tabs, 0, ncol);
1612 else if (screen.cur.col < ncol) 1679 else if (screen.cur.col < ncol)
1613 tabs [screen.cur.col] = !!mode; 1680 tabs [screen.cur.col] = !!mode;
1614} 1681}
1615 1682
1616/* ------------------------------------------------------------------------- */ 1683/* ------------------------------------------------------------------------- */
… …
1618 * Set reverse/normal video 1685 * Set reverse/normal video
1619 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1686 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1620 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1687 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1621 */ 1688 */
1622void 1689void
1623rxvt_term::scr_rvideo_mode (int mode) 1690rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1624{ 1691{
1625 XGCValues gcvalue; 1692 rvideo_mode = on;
1626 1693
1694#ifndef NO_BELL
1695 on ^= rvideo_bell;
1696#endif
1697
1627 if (rvideo != mode) 1698 if (rvideo_state != on)
1628 { 1699 {
1629 rvideo = mode; 1700 rvideo_state = on;
1701
1630 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1702 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1631#if XPM_BACKGROUND 1703#ifdef HAVE_BG_PIXMAP
1632 if (bgPixmap.pixmap == None) 1704 if (bg_pixmap == None)
1633#endif 1705#endif
1634#if TRANSPARENT 1706 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1635 if (! OPTION (Opt_transparent) || am_transparent == 0)
1636#endif
1637 XSetWindowBackground (display->display, vt,
1638 pix_colors[Color_bg]);
1639 1707
1708 XGCValues gcvalue;
1640 gcvalue.foreground = pix_colors[Color_fg]; 1709 gcvalue.foreground = pix_colors[Color_fg];
1641 gcvalue.background = pix_colors[Color_bg]; 1710 gcvalue.background = pix_colors[Color_bg];
1642 XChangeGC (display->display, gc, GCBackground | GCForeground, 1711 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1643 &gcvalue); 1712
1644 scr_clear (); 1713 scr_clear ();
1645 scr_touch (true); 1714 scr_touch (true);
1646 } 1715 }
1647} 1716}
1648 1717
… …
1650/* 1719/*
1651 * Report current cursor position 1720 * Report current cursor position
1652 * XTERM_SEQ: Report position: ESC [ 6 n 1721 * XTERM_SEQ: Report position: ESC [ 6 n
1653 */ 1722 */
1654void 1723void
1655rxvt_term::scr_report_position () 1724rxvt_term::scr_report_position () NOTHROW
1656{ 1725{
1657 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1726 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1658} 1727}
1659 1728
1660/* ------------------------------------------------------------------------- * 1729/* ------------------------------------------------------------------------- *
… …
1663 1732
1664/* 1733/*
1665 * Set font style 1734 * Set font style
1666 */ 1735 */
1667void 1736void
1668rxvt_term::set_font_style () 1737rxvt_term::set_font_style () NOTHROW
1669{ 1738{
1670#if 0 1739#if 0
1671 switch (charsets [screen.charset]) 1740 switch (charsets [screen.charset])
1672 { 1741 {
1673 case '0': /* DEC Special Character & Line Drawing Set */ 1742 case '0': /* DEC Special Character & Line Drawing Set */
… …
1695 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1764 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1696 * XTERM_SEQ: Invoke G2 character set: ESC N 1765 * XTERM_SEQ: Invoke G2 character set: ESC N
1697 * XTERM_SEQ: Invoke G3 character set: ESC O 1766 * XTERM_SEQ: Invoke G3 character set: ESC O
1698 */ 1767 */
1699void 1768void
1700rxvt_term::scr_charset_choose (int set) 1769rxvt_term::scr_charset_choose (int set) NOTHROW
1701{ 1770{
1702 screen.charset = set; 1771 screen.charset = set;
1703 set_font_style (); 1772 set_font_style ();
1704} 1773}
1705 1774
… …
1711 * XTERM_SEQ: Set G2 character set: ESC * <C> 1780 * XTERM_SEQ: Set G2 character set: ESC * <C>
1712 * XTERM_SEQ: Set G3 character set: ESC + <C> 1781 * XTERM_SEQ: Set G3 character set: ESC + <C>
1713 * See set_font_style for possible values for <C> 1782 * See set_font_style for possible values for <C>
1714 */ 1783 */
1715void 1784void
1716rxvt_term::scr_charset_set (int set, unsigned int ch) 1785rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1717{ 1786{
1718 charsets[set] = (unsigned char)ch; 1787 charsets[set] = (unsigned char)ch;
1719 set_font_style (); 1788 set_font_style ();
1720} 1789}
1721 1790
… …
1726 1795
1727/* 1796/*
1728 * refresh matching text. 1797 * refresh matching text.
1729 */ 1798 */
1730bool 1799bool
1731rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1800rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1732{ 1801{
1733 bool found = false; 1802 bool found = false;
1734 1803
1735 for (int i = 0; i < nrow; i++) 1804 for (int i = 0; i < nrow; i++)
1736 { 1805 {
1737 int col = 0;
1738 rend_t *drp = drawn_buf[i].r; 1806 rend_t *drp = drawn_buf[i].r;
1739 1807
1740 for (; col < ncol; col++, drp++) 1808 for (int col = 0; col < ncol; col++, drp++)
1741 if ((*drp & mask) == value) 1809 if ((*drp & mask) == value)
1742 { 1810 {
1743 found = true; 1811 found = true;
1744 *drp = ~value; 1812 *drp = ~value;
1745 } 1813 }
… …
1756 PART_END, 1824 PART_END,
1757 RC_COUNT 1825 RC_COUNT
1758}; 1826};
1759 1827
1760void 1828void
1761rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1829rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1762{ 1830{
1763 int i; 1831 int i;
1764 row_col_t rc[RC_COUNT]; 1832 row_col_t rc[RC_COUNT];
1765 1833
1766 if (!drawn_buf) /* sanity check */ 1834 if (!drawn_buf) /* sanity check */
… …
1789 } 1857 }
1790 1858
1791 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1859 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1792 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1860 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1793 1861
1862 num_scr_allow = 0;
1863
1794 if (refresh) 1864 if (refresh)
1795 scr_refresh (SLOW_REFRESH); 1865 scr_refresh ();
1796} 1866}
1797 1867
1798/* ------------------------------------------------------------------------- */ 1868/* ------------------------------------------------------------------------- */
1799/* 1869/*
1800 * Refresh the entire screen 1870 * Refresh the entire screen
1801 */ 1871 */
1802void 1872void
1803rxvt_term::scr_touch (bool refresh) 1873rxvt_term::scr_touch (bool refresh) NOTHROW
1804{ 1874{
1805 scr_expose (0, 0, width, height, refresh); 1875 scr_expose (0, 0, width, height, refresh);
1806} 1876}
1807 1877
1808/* ------------------------------------------------------------------------- */ 1878/* ------------------------------------------------------------------------- */
1809/* 1879/*
1810 * Move the display so that the line represented by scrollbar value Y is at 1880 * Move the display so that the line represented by scrollbar value Y is at
1811 * the top of the screen 1881 * the top of the screen
1812 */ 1882 */
1813int 1883void
1814rxvt_term::scr_move_to (int y, int len) 1884rxvt_term::scr_move_to (int y, int len) NOTHROW
1815{ 1885{
1816 long p = 0; 1886 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1817 unsigned int oldviewstart;
1818
1819 oldviewstart = view_start;
1820
1821 if (y < len)
1822 {
1823 p = (nrow + nsaved) * (len - y) / len;
1824 p -= (long) (nrow - 1);
1825 p = max (p, 0);
1826 }
1827
1828 view_start = (unsigned int)min (p, nsaved);
1829
1830 return scr_changeview (oldviewstart);
1831} 1887}
1832 1888
1833/* ------------------------------------------------------------------------- */ 1889/* ------------------------------------------------------------------------- */
1834/* 1890/*
1835 * Page the screen up/down nlines 1891 * Page the screen up/down nlines
1836 * direction should be UP or DN 1892 * direction should be UP or DN
1837 */ 1893 */
1838int 1894bool
1839rxvt_term::scr_page (enum page_dirn direction, int nlines) 1895rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1840{ 1896{
1841 int n; 1897 int new_view_start =
1842 unsigned int oldviewstart;
1843
1844 oldviewstart = view_start;
1845
1846 if (direction == UP)
1847 {
1848 n = view_start + nlines;
1849 view_start = min (n, nsaved);
1850 }
1851 else
1852 {
1853 n = view_start - nlines; 1898 direction == UP ? view_start - nlines
1854 view_start = max (n, 0); 1899 : view_start + nlines;
1855 }
1856 1900
1857 return scr_changeview (oldviewstart); 1901 return scr_changeview (new_view_start);
1858} 1902}
1859 1903
1860int 1904bool
1861rxvt_term::scr_changeview (unsigned int oldviewstart) 1905rxvt_term::scr_changeview (int new_view_start) NOTHROW
1862{ 1906{
1907 clamp_it (new_view_start, top_row, 0);
1908
1863 if (view_start != oldviewstart) 1909 if (new_view_start == view_start)
1864 { 1910 return false;
1911
1912 num_scr += new_view_start - view_start;
1913 view_start = new_view_start;
1914 want_refresh = 1;
1915
1865 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1916 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1866 1917
1867 want_refresh = 1; 1918 return true;
1868 num_scr -= (view_start - oldviewstart);
1869 }
1870
1871 return (int)view_start - (int)oldviewstart;
1872} 1919}
1873 1920
1874/* ------------------------------------------------------------------------- */ 1921#ifndef NO_BELL
1875void 1922void
1923rxvt_term::bell_cb (ev::timer &w, int revents)
1924{
1925 rvideo_bell = false;
1926 scr_rvideo_mode (rvideo_mode);
1927 refresh_check ();
1928}
1929#endif
1930
1931/* ------------------------------------------------------------------------- */
1932void
1876rxvt_term::scr_bell () 1933rxvt_term::scr_bell () NOTHROW
1877{ 1934{
1878#ifndef NO_BELL 1935#ifndef NO_BELL
1879 1936
1880# ifndef NO_MAPALERT 1937# ifndef NO_MAPALERT
1881# ifdef MAPALERT_OPTION 1938# ifdef MAPALERT_OPTION
1882 if (OPTION (Opt_mapAlert)) 1939 if (option (Opt_mapAlert))
1883# endif 1940# endif
1884 XMapWindow (display->display, parent[0]); 1941 XMapWindow (dpy, parent);
1885# endif 1942# endif
1886 1943
1944# if ENABLE_FRILLS
1945 if (option (Opt_urgentOnBell))
1946 set_urgency (1);
1947# endif
1948
1887 if (OPTION (Opt_visualBell)) 1949 if (option (Opt_visualBell))
1888 { 1950 {
1889 scr_rvideo_mode (!rvideo); /* refresh also done */ 1951 rvideo_bell = true;
1952 scr_rvideo_mode (rvideo_mode);
1890 display->flush (); 1953 flush ();
1954
1891 rxvt_usleep (VISUAL_BELL_DURATION); 1955 bell_ev.start (VISUAL_BELL_DURATION);
1892 scr_rvideo_mode (!rvideo); /* refresh also done */
1893 } 1956 }
1894 else 1957 else
1895 XBell (display->display, 0); 1958 XBell (dpy, 0);
1896 1959 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1897#endif 1960#endif
1898} 1961}
1899 1962
1900/* ------------------------------------------------------------------------- */ 1963/* ------------------------------------------------------------------------- */
1901/* ARGSUSED */
1902void 1964void
1903rxvt_term::scr_printscreen (int fullhist) 1965rxvt_term::scr_printscreen (int fullhist) NOTHROW
1904{ 1966{
1905#ifdef PRINTPIPE 1967#ifdef PRINTPIPE
1906 int nrows, row_start; 1968 int nrows, row_start;
1907 FILE *fd; 1969 FILE *fd = popen_printer ();
1908 1970
1909 if ((fd = popen_printer ()) == NULL) 1971 if (!fd)
1910 return; 1972 return;
1911 1973
1912 if (fullhist) 1974 if (fullhist)
1913 { 1975 {
1914 nrows = nrow + nsaved; 1976 nrows = nrow - top_row;
1915 row_start = -nsaved; 1977 row_start = top_row;
1916 } 1978 }
1917 else 1979 else
1918 { 1980 {
1919 nrows = nrow; 1981 nrows = nrow;
1920 row_start = -view_start; 1982 row_start = view_start;
1921 } 1983 }
1922 1984
1923 wctomb (0, 0); 1985 wctomb (0, 0);
1924 1986
1925 for (int r1 = 0; r1 < nrows; r1++) 1987 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1926 { 1988 {
1927 text_t *tp = ROW(r1).t; 1989 text_t *tp = ROW(r1).t;
1928 int len = ROW(r1).l; 1990 int len = ROW(r1).l;
1929 1991
1930 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1992 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1957 * Refresh the screen 2019 * Refresh the screen
1958 * drawn_text/drawn_rend contain the screen information before the update. 2020 * drawn_text/drawn_rend contain the screen information before the update.
1959 * screen.text/screen.rend contain what the screen will change to. 2021 * screen.text/screen.rend contain what the screen will change to.
1960 */ 2022 */
1961void 2023void
1962rxvt_term::scr_refresh (unsigned char refresh_type) 2024rxvt_term::scr_refresh () NOTHROW
1963{ 2025{
1964 unsigned char must_clear, /* use draw_string not draw_image_string */
1965 showcursor; /* show the cursor */
1966 int16_t col, row, /* column/row we're processing */ 2026 int16_t col, row, /* column/row we're processing */
1967 ocrow; /* old cursor row */ 2027 ocrow; /* old cursor row */
1968 int i; /* tmp */ 2028 int i; /* tmp */
1969#ifndef NO_CURSORCOLOR 2029#ifndef NO_CURSORCOLOR
1970 rend_t cc1; /* store colours at cursor position (s) */ 2030 rend_t cc1; /* store colours at cursor position (s) */
1971#endif 2031#endif
1972 rend_t *crp; // cursor rendition pointer 2032 rend_t *crp; // cursor rendition pointer
2033 rend_t ccol1, /* Cursor colour */
2034 ccol2; /* Cursor colour2 */
1973 2035
1974 want_refresh = 0; /* screen is current */ 2036 want_refresh = 0; /* screen is current */
1975 2037
1976 if (refresh_type == NO_REFRESH || !mapped) 2038 if (refresh_type == NO_REFRESH || !mapped)
1977 return; 2039 return;
1978 2040
1979 /* 2041 /*
1980 * A: set up vars 2042 * A: set up vars
1981 */ 2043 */
1982 must_clear = 0;
1983 refresh_count = 0; 2044 refresh_count = 0;
1984 2045
1985#if XPM_BACKGROUND 2046 unsigned int old_screen_flags = screen.flags;
1986 must_clear |= bgPixmap.pixmap != None; 2047 bool have_bg = 0;
1987#endif 2048#ifdef HAVE_BG_PIXMAP
1988#if TRANSPARENT 2049 have_bg = bg_pixmap != None;
1989 must_clear |= OPTION (Opt_transparent) && am_transparent;
1990#endif 2050#endif
1991 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2051 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1992 2052
1993 /* 2053 /*
1994 * B: reverse any characters which are selected 2054 * B: reverse any characters which are selected
1995 */ 2055 */
1996 scr_reverse_selection (); 2056 scr_reverse_selection ();
1997 2057
2058 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2059#if ENABLE_OVERLAY
2060 scr_swap_overlay ();
2061#endif
2062
2063 bool showcursor = screen.flags & Screen_VisibleCursor;
2064
1998 /* 2065 /*
1999 * C: set the cursor character (s) 2066 * C: set the cursor character (s)
2000 */ 2067 */
2001 { 2068 {
2002 unsigned char setoldcursor; 2069 bool setoldcursor;
2003 rend_t ccol1, /* Cursor colour */
2004 ccol2; /* Cursor colour2 */
2005 2070
2006 showcursor = (screen.flags & Screen_VisibleCursor);
2007#ifdef CURSOR_BLINK 2071#ifdef CURSOR_BLINK
2008 if (hidden_cursor) 2072 if (hidden_cursor)
2009 showcursor = 0; 2073 showcursor = 0;
2010#endif 2074#endif
2011 2075
… …
2016 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2080 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2017 col--; 2081 col--;
2018 2082
2019 crp = &ROW(screen.cur.row).r[col]; 2083 crp = &ROW(screen.cur.row).r[col];
2020 2084
2021 if (showcursor && focus) 2085#ifndef NO_CURSORCOLOR
2086 cc1 = *crp & (RS_fgMask | RS_bgMask);
2087 if (ISSET_PIXCOLOR (Color_cursor))
2088 ccol1 = Color_cursor;
2089 else
2090#endif
2091#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2092 ccol1 = fgcolor_of (rstyle);
2093#else
2094 ccol1 = Color_fg;
2095#endif
2096
2097#ifndef NO_CURSORCOLOR
2098 if (ISSET_PIXCOLOR (Color_cursor2))
2099 ccol2 = Color_cursor2;
2100 else
2101#endif
2102#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2103 ccol2 = bgcolor_of (rstyle);
2104#else
2105 ccol2 = Color_bg;
2106#endif
2107
2108 if (focus)
2022 { 2109 {
2023 if (OPTION (Opt_cursorUnderline)) 2110 if (option (Opt_cursorUnderline))
2024 *crp ^= RS_Uline; 2111 *crp ^= RS_Uline;
2025 else 2112 else
2026 { 2113 {
2027 *crp ^= RS_RVid; 2114 *crp ^= RS_RVid;
2028
2029#ifndef NO_CURSORCOLOR
2030 cc1 = *crp & (RS_fgMask | RS_bgMask);
2031 if (ISSET_PIXCOLOR (Color_cursor))
2032 ccol1 = Color_cursor;
2033 else
2034#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2035 ccol1 = fgcolor_of (rstyle);
2036#else
2037 ccol1 = Color_fg;
2038#endif
2039 if (ISSET_PIXCOLOR (Color_cursor2))
2040 ccol2 = Color_cursor2;
2041 else
2042#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2043 ccol2 = bgcolor_of (rstyle);
2044#else
2045 ccol2 = Color_bg;
2046#endif
2047 *crp = SET_FGCOLOR (*crp, ccol1); 2115 *crp = SET_FGCOLOR (*crp, ccol1);
2048 *crp = SET_BGCOLOR (*crp, ccol2); 2116 *crp = SET_BGCOLOR (*crp, ccol2);
2049#endif
2050 } 2117 }
2051 } 2118 }
2052 } 2119 }
2053 2120
2054 /* make sure no outline cursor is left around */ 2121 /* make sure no outline cursor is left around */
2055 setoldcursor = 0; 2122 setoldcursor = 0;
2056 if (ocrow != -1) 2123 if (ocrow != -1)
2057 { 2124 {
2058 if (screen.cur.row + view_start != ocrow 2125 if (screen.cur.row - view_start != ocrow
2059 || screen.cur.col != oldcursor.col) 2126 || screen.cur.col != oldcursor.col)
2060 { 2127 {
2061 if (ocrow < nrow 2128 if (ocrow < nrow
2062 && oldcursor.col < ncol) 2129 && oldcursor.col < ncol)
2063 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2130 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2071 else if (!focus) 2138 else if (!focus)
2072 setoldcursor = 1; 2139 setoldcursor = 1;
2073 2140
2074 if (setoldcursor) 2141 if (setoldcursor)
2075 { 2142 {
2076 if (screen.cur.row + view_start >= nrow) 2143 if (screen.cur.row - view_start >= nrow)
2077 oldcursor.row = -1; 2144 oldcursor.row = -1;
2078 else 2145 else
2079 { 2146 {
2080 oldcursor.row = screen.cur.row + view_start; 2147 oldcursor.row = screen.cur.row - view_start;
2081 oldcursor.col = screen.cur.col; 2148 oldcursor.col = screen.cur.col;
2082 } 2149 }
2083 } 2150 }
2084 } 2151 }
2085
2086 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2087#if ENABLE_OVERLAY
2088 scr_swap_overlay ();
2089#endif
2090 2152
2091#ifndef NO_SLOW_LINK_SUPPORT 2153#ifndef NO_SLOW_LINK_SUPPORT
2092 /* 2154 /*
2093 * D: CopyArea pass - very useful for slower links 2155 * D: CopyArea pass - very useful for slower links
2094 * This has been deliberately kept simple. 2156 * This has been deliberately kept simple.
2095 */ 2157 */
2096 i = num_scr;
2097 if (!display->is_local 2158 if (!display->is_local
2098 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2159 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2099 && abs (num_scr) < nrow && !must_clear) 2160 && abs (num_scr) < nrow && !have_bg)
2100 { 2161 {
2101 int16_t nits; 2162 int16_t nits;
2163 int i = num_scr;
2102 int j; 2164 int j;
2103 int len, wlen; 2165 int len, wlen;
2166 dLocal (int, num_scr);
2104 2167
2105 j = nrow; 2168 j = nrow;
2106 wlen = len = -1; 2169 wlen = len = -1;
2107 row = i > 0 ? 0 : j - 1; 2170 row = i > 0 ? 0 : j - 1;
2171
2108 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2172 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2109 { 2173 {
2110 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2174 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2111 { 2175 {
2112 line_t s = ROW(row - view_start); 2176 line_t s = ROW(view_start + row);
2113 line_t d = drawn_buf[row]; 2177 line_t d = drawn_buf[row];
2114 line_t d2 = drawn_buf[row + i]; 2178 line_t d2 = drawn_buf[row + i];
2115 2179
2116 for (nits = 0, col = ncol; col--; ) 2180 for (nits = 0, col = ncol; col--; )
2117 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2181 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2133 wlen = row; 2197 wlen = row;
2134 continue; 2198 continue;
2135 } 2199 }
2136 } 2200 }
2137 2201
2138 if (len != -1) 2202 if (len >= 0)
2139 { 2203 {
2140 /* also comes here at end if needed because of >= above */ 2204 /* also comes here at end if needed because of >= above */
2141 if (wlen < len) 2205 if (wlen < len)
2142 ::swap (wlen, len); 2206 ::swap (wlen, len);
2143 2207
2208 XGCValues gcv;
2209
2210 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2144 XCopyArea (display->display, vt, vt, 2211 XCopyArea (dpy, vt, vt,
2145 gc, 0, Row2Pixel (len + i), 2212 gc, 0, Row2Pixel (len + i),
2146 (unsigned int)this->width, 2213 (unsigned int)this->width,
2147 (unsigned int)Height2Pixel (wlen - len + 1), 2214 (unsigned int)Height2Pixel (wlen - len + 1),
2148 0, Row2Pixel (len)); 2215 0, Row2Pixel (len));
2216 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2217
2149 len = -1; 2218 len = -1;
2150 } 2219 }
2151 } 2220 }
2152 } 2221 }
2153#endif 2222#endif
… …
2155 /* 2224 /*
2156 * E: main pass across every character 2225 * E: main pass across every character
2157 */ 2226 */
2158 for (row = 0; row < nrow; row++) 2227 for (row = 0; row < nrow; row++)
2159 { 2228 {
2160 text_t *stp = ROW(row - view_start).t; 2229 text_t *stp = ROW(view_start + row).t;
2161 rend_t *srp = ROW(row - view_start).r; 2230 rend_t *srp = ROW(view_start + row).r;
2162 text_t *dtp = drawn_buf[row].t; 2231 text_t *dtp = drawn_buf[row].t;
2163 rend_t *drp = drawn_buf[row].r; 2232 rend_t *drp = drawn_buf[row].r;
2164 2233
2165 /* 2234 /*
2166 * E2: OK, now the real pass 2235 * E2: OK, now the real pass
… …
2177 continue; 2246 continue;
2178 2247
2179 // redraw one or more characters 2248 // redraw one or more characters
2180 2249
2181 // seek to the beginning of wide characters 2250 // seek to the beginning of wide characters
2182 while (stp[col] == NOCHAR && col > 0) 2251 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2183 --col; 2252 --col;
2184 2253
2185 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2254 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2186 text_t *text = stp + col; 2255 text_t *text = stp + col;
2187 int count = 1; 2256 int count = 1;
2188 2257
2189 dtp[col] = stp[col]; 2258 dtp[col] = stp[col];
2190 drp[col] = rend; 2259 drp[col] = rend;
… …
2194 for (i = 0; ++col < ncol; ) 2263 for (i = 0; ++col < ncol; )
2195 { 2264 {
2196 if (stp[col] == NOCHAR) 2265 if (stp[col] == NOCHAR)
2197 { 2266 {
2198 dtp[col] = stp[col]; 2267 dtp[col] = stp[col];
2199 drp[col] = rend; 2268 drp[col] = srp[col];
2269
2200 count++; 2270 count++;
2201 i++; 2271 i++;
2202 2272
2203 continue; 2273 continue;
2204 } 2274 }
… …
2209 count++; 2279 count++;
2210 2280
2211 if (stp[col] != dtp[col] 2281 if (stp[col] != dtp[col]
2212 || !RS_SAME (srp[col], drp[col])) 2282 || !RS_SAME (srp[col], drp[col]))
2213 { 2283 {
2214 if (must_clear && (i++ > count / 2)) 2284 if (have_bg && (i++ > count / 2))
2215 break; 2285 break;
2216 2286
2217 dtp[col] = stp[col]; 2287 dtp[col] = stp[col];
2218 drp[col] = rend; 2288 drp[col] = rend;
2219 i = 0; 2289 i = 0;
2220 } 2290 }
2221 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2291 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2222 break; 2292 break;
2223 } 2293 }
2224 2294
2225 col--; /* went one too far. move back */ 2295 col--; /* went one too far. move back */
2226 count -= i; /* dump any matching trailing chars */ 2296 count -= i; /* dump any matching trailing chars */
2227 2297
2228 // sometimes we optimize away the trailing NOCHAR's, add them back 2298 // sometimes we optimize away the trailing NOCHAR's, add them back
2229 while (i && text[count] == NOCHAR) 2299 while (ecb_unlikely (i && text[count] == NOCHAR))
2230 count++, i--; 2300 count++, i--;
2231 2301
2232 /* 2302 /*
2233 * Determine the attributes for the string 2303 * Determine the attributes for the string
2234 */ 2304 */
2235 int fore = fgcolor_of (rend); // desired foreground 2305 int fore = fgcolor_of (rend); // desired foreground
2236 int back = bgcolor_of (rend); // desired background 2306 int back = bgcolor_of (rend); // desired background
2237 2307
2238 // only do special processing if any attributes are set, which is unlikely 2308 // only do special processing if any attributes are set, which is unlikely
2239 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2309 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2240 { 2310 {
2241#if ENABLE_STYLES
2242 // force redraw after "careful" characters to avoid pixel droppings
2243 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2244 drp[col + 1] = ~srp[col + 1];
2245
2246 // include previous careful character(s) if possible, looks nicer (best effort...)
2247 while (text > stp
2248 && srp[text - stp - 1] & RS_Careful
2249 && RS_SAME (rend, srp[text - stp - 1]))
2250 text--, count++, xpixel -= fwidth;
2251#endif
2252
2253 bool invert = rend & RS_RVid; 2311 bool invert = rend & RS_RVid;
2254 2312
2255#ifndef NO_BOLD_UNDERLINE_REVERSE 2313#ifndef NO_BOLD_UNDERLINE_REVERSE
2256 if (rend & RS_Bold
2257 && fore == Color_fg) 2314 if (rend & RS_Bold && fore == Color_fg)
2258 { 2315 {
2259 if (ISSET_PIXCOLOR (Color_BD)) 2316 if (ISSET_PIXCOLOR (Color_BD))
2260 fore = Color_BD; 2317 fore = Color_BD;
2261# if !ENABLE_STYLES 2318# if !ENABLE_STYLES
2262 else 2319 else
2263 invert = !invert; 2320 invert = !invert;
2264# endif 2321# endif
2265 } 2322 }
2266 2323
2267 if (rend & RS_Italic 2324 if (rend & RS_Italic && fore == Color_fg)
2268 && fore == Color_fg)
2269 { 2325 {
2270 if (ISSET_PIXCOLOR (Color_IT)) 2326 if (ISSET_PIXCOLOR (Color_IT))
2271 fore = Color_IT; 2327 fore = Color_IT;
2272# if !ENABLE_STYLES 2328# if !ENABLE_STYLES
2273 else 2329 else
2274 invert = !invert; 2330 invert = !invert;
2275# endif 2331# endif
2276 } 2332 }
2277 2333
2278 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2334 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2279 fore = Color_UL; 2335 fore = Color_UL;
2336#endif
2337
2338#ifdef OPTION_HC
2339 if (rend & RS_Sel)
2340 {
2341 /* invert the column if no highlightColor is set or it is the
2342 * current cursor column */
2343 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2344 && ISSET_PIXCOLOR (Color_HC))
2345 {
2346 if (ISSET_PIXCOLOR (Color_HTC))
2347 fore = Color_HTC;
2348 // if invert is 0 reverse video is set so we use bg color as fg color
2349 else if (!invert)
2350 fore = back;
2351
2352 back = Color_HC;
2353 invert = 0;
2354 }
2355 }
2280#endif 2356#endif
2281 2357
2282 if (invert) 2358 if (invert)
2283 { 2359 {
2284 ::swap (fore, back); 2360 ::swap (fore, back);
2285 2361
2286#ifndef NO_BOLD_UNDERLINE_REVERSE 2362#ifndef NO_BOLD_UNDERLINE_REVERSE
2287 if (ISSET_PIXCOLOR (Color_RV))
2288 back = Color_RV;
2289
2290 if (fore == back) 2363 if (fore == back)
2291 { 2364 {
2292 fore = Color_bg; 2365 fore = Color_bg;
2293 back = Color_fg; 2366 back = Color_fg;
2294 } 2367 }
… …
2296 } 2369 }
2297 2370
2298#ifdef TEXT_BLINK 2371#ifdef TEXT_BLINK
2299 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2372 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2300 { 2373 {
2301 if (!text_blink_ev.active) 2374 if (!text_blink_ev.is_active ())
2302 { 2375 {
2303 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2376 text_blink_ev.again ();
2304 hidden_text = 0; 2377 hidden_text = 0;
2305 } 2378 }
2306 else if (hidden_text) 2379 else if (hidden_text)
2307 fore = back; 2380 fore = back;
2308 } 2381 }
2309#endif 2382#endif
2383
2384#if ENABLE_STYLES
2385 // "careful" (too wide) character handling
2386
2387 // include previous careful character(s) if possible, looks nicer (best effort...)
2388 while (text > stp
2389 && srp[text - stp - 1] & RS_Careful
2390 && RS_SAME (rend, srp[text - stp - 1]))
2391 text--, count++, xpixel -= fwidth;
2392
2393 // force redraw after "careful" characters to avoid pixel droppings
2394 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2395 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2396
2397 // force redraw before "careful" characters to avoid pixel droppings
2398 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2399 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2400#endif
2310 } 2401 }
2311 2402
2312 /* 2403 /*
2313 * Actually do the drawing of the string here 2404 * Actually do the drawing of the string here
2314 */ 2405 */
2315 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2406 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2316 2407
2317 if (back == fore) 2408 if (ecb_likely (have_bg && back == Color_bg))
2318 font->clear_rect (*drawable, xpixel, ypixel,
2319 fwidth * count, fheight,
2320 back);
2321 else if (back == Color_bg)
2322 { 2409 {
2323 if (must_clear) 2410 // this is very ugly, maybe push it into ->draw?
2324 {
2325 CLEAR_CHARS (xpixel, ypixel, count);
2326 2411
2327 for (i = 0; i < count; i++) /* don't draw empty strings */ 2412 for (i = 0; i < count; i++) /* don't draw empty strings */
2328 if (text[i] != ' ') 2413 if (text[i] != ' ')
2329 { 2414 {
2330 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2415 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2331 break; 2416 goto did_clear;
2332 }
2333 } 2417 }
2334 else 2418
2335 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2419 CLEAR_CHARS (xpixel, ypixel, count);
2420 did_clear: ;
2336 } 2421 }
2337 else 2422 else
2338 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2423 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2339 2424
2340 if (rend & RS_Uline && font->descent > 1 && fore != back) 2425 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2341 { 2426 {
2342#if ENABLE_FRILLS 2427#if ENABLE_FRILLS
2343 if (ISSET_PIXCOLOR (Color_underline)) 2428 if (ISSET_PIXCOLOR (Color_underline))
2344 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2429 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2345 else 2430 else
2346#endif 2431#endif
2347 XSetForeground (display->display, gc, pix_colors[fore]); 2432 XSetForeground (dpy, gc, pix_colors[fore]);
2348 2433
2349 XDrawLine (display->display, drawBuffer, gc, 2434 XDrawLine (dpy, vt, gc,
2350 xpixel, ypixel + font->ascent + 1, 2435 xpixel, ypixel + font->ascent + 1,
2351 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2436 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2352 } 2437 }
2353 } /* for (col....) */ 2438 } /* for (col....) */
2354 } /* for (row....) */ 2439 } /* for (row....) */
2355 2440
2356#if ENABLE_OVERLAY
2357 scr_swap_overlay ();
2358#endif
2359 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2360
2361 /* 2441 /*
2362 * G: cleanup cursor and display outline cursor if necessary 2442 * G: cleanup cursor and display outline cursor if necessary
2363 */ 2443 */
2364 if (showcursor) 2444 if (showcursor)
2365 { 2445 {
2366 if (focus) 2446 if (focus)
2367 { 2447 {
2368 if (OPTION (Opt_cursorUnderline)) 2448 if (option (Opt_cursorUnderline))
2369 *crp ^= RS_Uline; 2449 *crp ^= RS_Uline;
2370 else 2450 else
2371 { 2451 {
2372 *crp ^= RS_RVid; 2452 *crp ^= RS_RVid;
2373#ifndef NO_CURSORCOLOR 2453#ifndef NO_CURSORCOLOR
… …
2387 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2467 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2388 cursorwidth++; 2468 cursorwidth++;
2389 2469
2390#ifndef NO_CURSORCOLOR 2470#ifndef NO_CURSORCOLOR
2391 if (ISSET_PIXCOLOR (Color_cursor)) 2471 if (ISSET_PIXCOLOR (Color_cursor))
2392 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2472 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2473 else
2393#endif 2474#endif
2475 XSetForeground (dpy, gc, pix_colors[ccol1]);
2394 2476
2395 XDrawRectangle (display->display, drawBuffer, gc, 2477 XDrawRectangle (dpy, vt, gc,
2396 Col2Pixel (col), 2478 Col2Pixel (col),
2397 Row2Pixel (oldcursor.row), 2479 Row2Pixel (oldcursor.row),
2398 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2480 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2399 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2481 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2400 } 2482 }
2401 } 2483 }
2402 2484
2403 /* 2485 /*
2404 * H: cleanup selection 2486 * H: cleanup selection
2405 */ 2487 */
2488#if ENABLE_OVERLAY
2489 scr_swap_overlay ();
2490#endif
2491 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2492
2406 scr_reverse_selection (); 2493 scr_reverse_selection ();
2407 2494
2495 screen.flags = old_screen_flags;
2408 num_scr = 0; 2496 num_scr = 0;
2409 num_scr_allow = 1; 2497 num_scr_allow = 1;
2410} 2498}
2411 2499
2412void 2500void
2413rxvt_term::scr_remap_chars (line_t &l) 2501rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2414{ 2502{
2415 if (!l.t) 2503 if (!l.t)
2416 return; 2504 return;
2417 2505
2418 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2506 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2420 for (int i = ncol; i--; ) 2508 for (int i = ncol; i--; )
2421 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2509 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2422} 2510}
2423 2511
2424void 2512void
2425rxvt_term::scr_remap_chars () 2513rxvt_term::scr_remap_chars () NOTHROW
2426{ 2514{
2427 for (int i = total_rows; i--; ) 2515 for (int i = total_rows; i--; )
2428 scr_remap_chars (row_buf [i]); 2516 scr_remap_chars (row_buf [i]);
2429 2517
2430 for (int i = nrow; i--; ) 2518 for (int i = nrow; i--; )
… …
2433 scr_remap_chars (swap_buf [i]); 2521 scr_remap_chars (swap_buf [i]);
2434 } 2522 }
2435} 2523}
2436 2524
2437void 2525void
2438rxvt_term::scr_recolour () 2526rxvt_term::scr_recolour (bool refresh) NOTHROW
2439{ 2527{
2440 if (1 2528 bool transparent = false;
2441#if TRANSPARENT 2529
2442 && !am_transparent 2530#ifdef HAVE_BG_PIXMAP
2531 if (bg_pixmap != None)
2532 {
2533# ifdef ENABLE_TRANSPARENCY
2534 if (bg_flags & BG_IS_TRANSPARENT)
2535 {
2536 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2537 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2538
2539 transparent = true;
2540 }
2541 else
2443#endif 2542# endif
2444#if XPM_BACKGROUND
2445 && !bgPixmap.pixmap
2446#endif
2447 ) 2543 {
2544 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2545 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2546 }
2448 { 2547 }
2548 else
2549#endif
2550 {
2449 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2551 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2450 XClearWindow (display->display, parent[0]);
2451 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2552 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2452#if HAVE_SCROLLBARS 2553 }
2554
2555 XClearWindow (dpy, parent);
2556
2453 if (scrollBar.win) 2557 if (scrollBar.win)
2454 { 2558 {
2559 if (transparent)
2560 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2561 else
2455 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2562 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2456 scrollBar.setIdle (); 2563 scrollBar.state = SB_STATE_IDLE;
2457 scrollbar_show (0); 2564 scrollBar.show (0);
2458 } 2565 }
2459#endif 2566
2567 if (refresh)
2460 } 2568 {
2461
2462 scr_clear (); 2569 scr_clear ();
2463 scr_touch (true); 2570 scr_touch (true);
2571 }
2464 want_refresh = 1; 2572 want_refresh = 1;
2465} 2573}
2466 2574
2467/* ------------------------------------------------------------------------- */ 2575/* ------------------------------------------------------------------------- */
2468void 2576void
2469rxvt_term::scr_clear (bool really) 2577rxvt_term::scr_clear (bool really) NOTHROW
2470{ 2578{
2471 if (!mapped) 2579 if (!mapped)
2472 return; 2580 return;
2473 2581
2474 num_scr_allow = 0; 2582 num_scr_allow = 0;
2475 want_refresh = 1; 2583 want_refresh = 1;
2476 2584
2477 if (really) 2585 if (really)
2478 XClearWindow (display->display, vt); 2586 XClearWindow (dpy, vt);
2479} 2587}
2480 2588
2481void 2589void
2482rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2590rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2483{ 2591{
2484 int view_end = -view_start + nrow; 2592 int view_end = view_start + nrow;
2485 int row, col; 2593 int row, col;
2486 2594
2487 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++) 2595 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2488 { 2596 {
2489 text_t *stp = ROW(row).t; 2597 text_t *stp = ROW(row).t;
2490 rend_t *srp = ROW(row).r; 2598 rend_t *srp = ROW(row).r;
2491 2599
2492 for (col = beg_col; col < end_col; col++) 2600 for (col = beg_col; col < end_col; col++)
… …
2499 srp[col] ^= rstyle2; 2607 srp[col] ^= rstyle2;
2500 } 2608 }
2501} 2609}
2502 2610
2503void 2611void
2504rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2612rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2505{ 2613{
2506 int view_end = -view_start + nrow; 2614 int view_end = view_start + nrow;
2507 int row, col; 2615 int row, col;
2508 2616
2509 if (beg_row >= -view_start) 2617 if (beg_row >= view_start)
2510 { 2618 {
2511 col = beg_col; 2619 col = beg_col;
2512 row = beg_row; 2620 row = beg_row;
2513 } 2621 }
2514 else 2622 else
2515 { 2623 {
2516 col = 0; 2624 col = 0;
2517 row = -view_start; 2625 row = view_start;
2518 } 2626 }
2519 2627
2520 for (; row < min (end_row, view_end); row++, col = 0) 2628 for (; row < min (end_row, view_end); row++, col = 0)
2521 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2629 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2522 srp[col] ^= rstyle; 2630 srp[col] ^= rstyle;
… …
2526 srp[col] ^= rstyle; 2634 srp[col] ^= rstyle;
2527} 2635}
2528 2636
2529/* ------------------------------------------------------------------------- */ 2637/* ------------------------------------------------------------------------- */
2530void 2638void
2531rxvt_term::scr_reverse_selection () 2639rxvt_term::scr_reverse_selection () NOTHROW
2532{ 2640{
2533 if (selection.op 2641 if (selection.op
2534 && current_screen == selection.screen 2642 && current_screen == selection.screen
2535 && selection.end.row >= -view_start) 2643 && selection.end.row >= view_start)
2536 { 2644 {
2537#if ENABLE_FRILLS 2645#if !ENABLE_MINIMAL
2538 if (selection.rect) 2646 if (selection.rect)
2539 scr_xor_rect (selection.beg.row, selection.beg.col, 2647 scr_xor_rect (selection.beg.row, selection.beg.col,
2540 selection.end.row, selection.end.col, 2648 selection.end.row, selection.end.col,
2541 RS_RVid, RS_RVid | RS_Uline); 2649 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2542 else 2650 else
2543#endif 2651#endif
2544 scr_xor_span (selection.beg.row, selection.beg.col, 2652 scr_xor_span (selection.beg.row, selection.beg.col,
2545 selection.end.row, selection.end.col, 2653 selection.end.row, selection.end.col,
2546 RS_RVid); 2654 RS_Sel | RS_RVid);
2547 } 2655 }
2548} 2656}
2549 2657
2550/* ------------------------------------------------------------------------- */ 2658/* ------------------------------------------------------------------------- */
2551/* 2659/*
2552 * Dump the whole scrollback and screen to the passed filedescriptor. The 2660 * Dump the whole scrollback and screen to the passed filedescriptor. The
2553 * invoking routine must close the fd. 2661 * invoking routine must close the fd.
2554 */ 2662 */
2555#if 0 2663#if 0
2556void 2664void
2557rxvt_term::scr_dump (int fd) 2665rxvt_term::scr_dump (int fd) NOTHROW
2558{ 2666{
2559 int row, wrote; 2667 int row, wrote;
2560 unsigned int width, towrite; 2668 unsigned int width, towrite;
2561 char r1[] = "\n"; 2669 const char r1[] = "\n";
2562 2670
2563 for (row = saveLines - nsaved; 2671 for (row = saveLines + top_row;
2564 row < saveLines + nrow - 1; row++) 2672 row < saveLines + nrow - 1; row++)
2565 { 2673 {
2566 width = row_buf[row].l >= 0 ? row_buf[row].l 2674 width = row_buf[row].l >= 0 ? row_buf[row].l
2567 : ncol; 2675 : ncol;
2568 for (towrite = width; towrite; towrite -= wrote) 2676 for (towrite = width; towrite; towrite -= wrote)
… …
2581 2689
2582/* ------------------------------------------------------------------------- * 2690/* ------------------------------------------------------------------------- *
2583 * CHARACTER SELECTION * 2691 * CHARACTER SELECTION *
2584 * ------------------------------------------------------------------------- */ 2692 * ------------------------------------------------------------------------- */
2585void 2693void
2586rxvt_term::selection_check (int check_more) 2694rxvt_term::selection_check (int check_more) NOTHROW
2587{ 2695{
2588 row_col_t pos;
2589
2590 if (!selection.op) 2696 if (!selection.op)
2591 return; 2697 return;
2592 2698
2699 row_col_t pos;
2593 pos.row = pos.col = 0; 2700 pos.row = pos.col = 0;
2701
2594 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2702 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2595 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2703 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2596 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2704 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2597 || (check_more == 1 2705 || (check_more == 1
2598 && current_screen == selection.screen 2706 && current_screen == selection.screen
2599 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2707 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2600 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2708 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2601 || (check_more == 2 2709 || (check_more == 2
2602 && ROWCOL_IS_BEFORE (selection.beg, pos) 2710 && ROWCOL_IS_BEFORE (selection.beg, pos)
2603 && ROWCOL_IS_AFTER (selection.end, pos)) 2711 && ROWCOL_IS_AFTER (selection.end, pos))
2604 || (check_more == 3 2712 || (check_more == 3
2605 && ROWCOL_IS_AFTER (selection.end, pos)) 2713 && ROWCOL_IS_AFTER (selection.end, pos)))
2606 || (check_more == 4 /* screen width change */
2607 && (selection.beg.row != selection.end.row
2608 || selection.end.col > ncol)))
2609 CLEAR_SELECTION (); 2714 CLEAR_ALL_SELECTION ();
2610} 2715}
2611 2716
2612/* ------------------------------------------------------------------------- */ 2717/* ------------------------------------------------------------------------- */
2613/* 2718/*
2614 * Paste a selection direct to the command fd 2719 * Paste a selection direct to the command fd
2615 */ 2720 */
2616void 2721void
2617rxvt_term::paste (char *data, unsigned int len) 2722rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2618{ 2723{
2619 /* convert normal newline chars into common keyboard Return key sequence */ 2724 /* convert normal newline chars into common keyboard Return key sequence */
2620 for (unsigned int i = 0; i < len; i++) 2725 for (unsigned int i = 0; i < len; i++)
2621 if (data[i] == C0_LF) 2726 if (data[i] == C0_LF)
2622 data[i] = C0_CR; 2727 data[i] = C0_CR;
2623 2728
2729 if (priv_modes & PrivMode_BracketPaste)
2730 tt_printf ("\e[200~");
2731
2624 tt_write (data, len); 2732 tt_write (data, len);
2625}
2626 2733
2627/* ------------------------------------------------------------------------- */ 2734 if (priv_modes & PrivMode_BracketPaste)
2628/* 2735 tt_printf ("\e[201~");
2629 * Respond to a notification that a primary selection has been sent
2630 * EXT: SelectionNotify
2631 */
2632void
2633rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2634{
2635 if (prop == None) /* check for failed XConvertSelection */
2636 {
2637 if ((selection_type & Sel_CompoundText))
2638 {
2639 int selnum = selection_type & Sel_whereMask;
2640
2641 selection_type = 0;
2642 if (selnum != Sel_direct)
2643 selection_request_other (XA_STRING, selnum);
2644 }
2645
2646 if ((selection_type & Sel_UTF8String))
2647 {
2648 int selnum = selection_type & Sel_whereMask;
2649
2650 selection_type = Sel_CompoundText;
2651 if (selnum != Sel_direct)
2652 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2653 else
2654 selection_type = 0;
2655 }
2656
2657 return;
2658 }
2659
2660 unsigned long bytes_after;
2661 XTextProperty ct;
2662
2663 if (XGetWindowProperty (display->display, win, prop,
2664 0, PROP_SIZE / 4,
2665 delete_prop, AnyPropertyType,
2666 &ct.encoding, &ct.format,
2667 &ct.nitems, &bytes_after,
2668 &ct.value) != Success)
2669 {
2670 ct.value = 0;
2671 goto bailout;
2672 }
2673
2674 if (ct.encoding == None)
2675 goto bailout;
2676
2677 if (bytes_after)
2678 {
2679 // fetch and append remaining data
2680 XTextProperty ct2;
2681
2682 if (XGetWindowProperty (display->display, win, prop,
2683 ct.nitems / 4, (bytes_after + 3) / 4,
2684 delete_prop, AnyPropertyType,
2685 &ct2.encoding, &ct2.format,
2686 &ct2.nitems, &bytes_after,
2687 &ct2.value) != Success)
2688 goto bailout;
2689
2690 // realloc should be compatible to XFree, here, and elsewhere, too
2691 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2692 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2693 ct.nitems += ct2.nitems;
2694
2695 XFree (ct2.value);
2696 }
2697
2698 if (ct.value == 0)
2699 goto bailout;
2700
2701 if (ct.encoding == xa[XA_INCR])
2702 {
2703 // INCR selection, start handshake
2704 if (!delete_prop)
2705 XDeleteProperty (display->display, win, prop);
2706
2707 selection_wait = Sel_incr;
2708 incr_buf_fill = 0;
2709 incr_ev.start (NOW + 10);
2710
2711 goto bailout;
2712 }
2713
2714 if (ct.nitems == 0)
2715 {
2716 if (selection_wait == Sel_incr)
2717 {
2718 XFree (ct.value);
2719
2720 // finally complete, now paste the whole thing
2721 selection_wait = Sel_normal;
2722 ct.value = (unsigned char *)incr_buf;
2723 ct.nitems = incr_buf_fill;
2724 incr_buf = 0;
2725 incr_buf_size = 0;
2726 incr_ev.stop ();
2727 }
2728 else
2729 {
2730 if (selection_wait == Sel_normal
2731 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2732 {
2733 /*
2734 * pass through again trying CUT_BUFFER0 if we've come from
2735 * XConvertSelection () but nothing was presented
2736 */
2737 selection_paste (display->root, XA_CUT_BUFFER0, False);
2738 }
2739
2740 goto bailout;
2741 }
2742 }
2743 else if (selection_wait == Sel_incr)
2744 {
2745 incr_ev.start (NOW + 10);
2746
2747 while (incr_buf_fill + ct.nitems > incr_buf_size)
2748 {
2749 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2750 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2751 }
2752
2753 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2754 incr_buf_fill += ct.nitems;
2755
2756 goto bailout;
2757 }
2758
2759 char **cl;
2760 int cr;
2761
2762#if ENABLE_FRILLS
2763 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2764 // so recode it manually
2765 if (ct.encoding == xa[XA_UTF8_STRING])
2766 {
2767 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2768 char *s = rxvt_wcstombs (w);
2769 free (w);
2770 // TODO: strlen == only the first element will be converted. well...
2771 paste (s, strlen (s));
2772 free (s);
2773 }
2774 else
2775#endif
2776 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2777 && cl)
2778 {
2779 for (int i = 0; i < cr; i++)
2780 paste (cl[i], strlen (cl[i]));
2781
2782 XFreeStringList (cl);
2783 }
2784 else
2785 paste ((char *)ct.value, ct.nitems); // paste raw
2786
2787bailout:
2788 XFree (ct.value);
2789
2790 if (selection_wait == Sel_normal)
2791 selection_wait = Sel_none;
2792} 2736}
2793 2737
2794void 2738void
2795rxvt_term::incr_cb (time_watcher &w) 2739rxvt_term::paste (char *data, unsigned int len) NOTHROW
2796{ 2740{
2797 selection_wait = Sel_none; 2741 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2798
2799 incr_buf_size = 0;
2800 free (incr_buf);
2801
2802 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2803}
2804
2805void
2806rxvt_term::selection_property (Window win, Atom prop)
2807{
2808 if (prop == None || selection_wait != Sel_incr)
2809 return; 2742 return;
2810 2743
2811 selection_paste (win, prop, true); 2744 tt_paste (data, len);
2812} 2745}
2813 2746
2814/* ------------------------------------------------------------------------- */ 2747/* ------------------------------------------------------------------------- */
2815/* 2748/*
2816 * Request the current selection: 2749 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2817 * Order: > internal selection if available 2750 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2818 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2751 * as fallback
2819 * > CUT_BUFFER0
2820 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2821 * will auto fallback to CUT_BUFFER0
2822 * EXT: button 2 release 2752 * EXT: button 2 release
2823 */ 2753 */
2824void 2754void
2825rxvt_term::selection_request (Time tm, int x, int y) 2755rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2826{ 2756{
2827 if (x < 0 || x >= width || y < 0 || y >= height)
2828 return; /* outside window */
2829
2830 if (selection.text) 2757 if (!selection_req)
2831 { /* internal selection */
2832 char *str = rxvt_wcstombs (selection.text, selection.len);
2833 paste (str, strlen (str));
2834 free (str);
2835 return;
2836 } 2758 {
2837 else 2759 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2760 selection_req->run ();
2838 { 2761 }
2839 int i;
2840
2841 selection_request_time = tm;
2842 selection_wait = Sel_normal;
2843
2844 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2845 {
2846#if X_HAVE_UTF8_STRING
2847 selection_type = Sel_UTF8String;
2848 if (selection_request_other (xa[XA_UTF8_STRING], i))
2849 return;
2850#else
2851 selection_type = Sel_CompoundText;
2852 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2853 return;
2854#endif
2855 }
2856 }
2857
2858 selection_wait = Sel_none; /* don't loop in selection_paste () */
2859 selection_paste (display->root, XA_CUT_BUFFER0, false);
2860}
2861
2862int
2863rxvt_term::selection_request_other (Atom target, int selnum)
2864{
2865 Atom sel;
2866
2867 selection_type |= selnum;
2868
2869 if (selnum == Sel_Primary)
2870 sel = XA_PRIMARY;
2871 else if (selnum == Sel_Secondary)
2872 sel = XA_SECONDARY;
2873 else
2874 sel = xa[XA_CLIPBOARD];
2875
2876 if (XGetSelectionOwner (display->display, sel) != None)
2877 {
2878 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2879 vt, selection_request_time);
2880 return 1;
2881 }
2882
2883 return 0;
2884} 2762}
2885 2763
2886/* ------------------------------------------------------------------------- */ 2764/* ------------------------------------------------------------------------- */
2887/* 2765/*
2888 * Clear all selected text 2766 * Clear all selected text
2889 * EXT: SelectionClear 2767 * EXT: SelectionClear
2890 */ 2768 */
2891void 2769void
2892rxvt_term::selection_clear () 2770rxvt_term::selection_clear (bool clipboard) NOTHROW
2893{ 2771{
2772 if (!clipboard)
2773 {
2894 want_refresh = 1; 2774 want_refresh = 1;
2895 free (selection.text); 2775 free (selection.text);
2896 selection.text = NULL; 2776 selection.text = NULL;
2897 selection.len = 0; 2777 selection.len = 0;
2898 CLEAR_SELECTION (); 2778 CLEAR_SELECTION ();
2899 2779
2900 if (display->selection_owner == this) 2780 if (display->selection_owner == this)
2901 display->selection_owner = 0; 2781 display->selection_owner = 0;
2782 }
2783 else
2784 {
2785 free (selection.clip_text);
2786 selection.clip_text = NULL;
2787 selection.clip_len = 0;
2788
2789 if (display->clipboard_owner == this)
2790 display->clipboard_owner = 0;
2791 }
2902} 2792}
2903 2793
2904/* ------------------------------------------------------------------------- */ 2794/* ------------------------------------------------------------------------- */
2905/* 2795/*
2906 * Copy a selection into the cut buffer 2796 * Copy a selection into the cut buffer
2907 * EXT: button 1 or 3 release 2797 * EXT: button 1 or 3 release
2908 */ 2798 */
2909void 2799void
2910rxvt_term::selection_make (Time tm) 2800rxvt_term::selection_make (Time tm)
2911{ 2801{
2912 int i; 2802 int size;
2913 wchar_t *new_selection_text; 2803 wchar_t *new_selection_text;
2914 text_t *t; 2804 text_t *t;
2915 2805
2916 switch (selection.op) 2806 switch (selection.op)
2917 { 2807 {
… …
2933 return; /* nothing selected, go away */ 2823 return; /* nothing selected, go away */
2934 2824
2935 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2825 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2936 return; 2826 return;
2937 2827
2938 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2828 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2939 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2829 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2940 2830
2941 int ofs = 0; 2831 int ofs = 0;
2942 int extra = 0; 2832 int extra = 0;
2943 2833
2944 int col = selection.beg.col; 2834 int col = selection.beg.col;
… …
2946 2836
2947 int end_col; 2837 int end_col;
2948 2838
2949 for (; row <= selection.end.row; row++, col = 0) 2839 for (; row <= selection.end.row; row++, col = 0)
2950 { 2840 {
2951#if ENABLE_FRILLS 2841#if !ENABLE_MINIMAL
2952 if (selection.rect) 2842 if (selection.rect)
2953 { 2843 {
2954 col = selection.beg.col; 2844 col = selection.beg.col;
2955 end_col = ncol + 1; 2845 end_col = selection.end.col;
2956 } 2846 }
2957 else 2847 else
2958#endif 2848#endif
2959 end_col = ROW(row).l; 2849 end_col = ROW(row).l;
2960 2850
2961 col = max (col, 0); 2851 col = max (col, 0);
2962 2852
2963 if (row == selection.end.row 2853 if (row == selection.end.row)
2964#if ENABLE_FRILLS
2965 || selection.rect
2966#endif
2967 )
2968 min_it (end_col, selection.end.col); 2854 min_it (end_col, selection.end.col);
2969 2855
2970 t = ROW(row).t + col; 2856 t = ROW(row).t + col;
2971 2857
2972 for (; col < end_col; col++) 2858 for (; col < end_col; col++)
… …
2980 2866
2981 extra -= (len - 1); 2867 extra -= (len - 1);
2982 2868
2983 if (extra < 0) 2869 if (extra < 0)
2984 { 2870 {
2985 extra += i; 2871 extra += size;
2986 i += i; 2872 size += size;
2987 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2873 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
2988 } 2874 }
2989 2875
2990 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2876 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2991 } 2877 }
2992#endif 2878#endif
2993 else 2879 else
2994 new_selection_text[ofs++] = *t++; 2880 new_selection_text[ofs++] = *t++;
2995 } 2881 }
2996 2882
2997#if ENABLE_FRILLS 2883#if !ENABLE_MINIMAL
2998 if (selection.rect) 2884 if (selection.rect)
2999 { 2885 {
3000 while (ofs 2886 while (ofs
3001 && new_selection_text[ofs - 1] != C0_LF 2887 && new_selection_text[ofs - 1] != C0_LF
3002 && unicode::is_space (new_selection_text[ofs - 1])) 2888 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3004 2890
3005 new_selection_text[ofs++] = C0_LF; 2891 new_selection_text[ofs++] = C0_LF;
3006 } 2892 }
3007 else 2893 else
3008#endif 2894#endif
3009 if (!ROW(row).is_longer () && row != selection.end.row) 2895 if (!ROW(row).is_longer ()
2896 && (row != selection.end.row || end_col != selection.end.col)
2897 && (row != selection.beg.row || selection.beg.col < ncol))
3010 new_selection_text[ofs++] = C0_LF; 2898 new_selection_text[ofs++] = C0_LF;
3011 } 2899 }
3012
3013 if (end_col != selection.end.col)
3014 new_selection_text[ofs++] = C0_LF;
3015 2900
3016 new_selection_text[ofs] = 0; 2901 new_selection_text[ofs] = 0;
3017 2902
3018 if (ofs == 0) 2903 if (ofs == 0)
3019 { 2904 {
… …
3032 2917
3033 selection_grab (tm); 2918 selection_grab (tm);
3034} 2919}
3035 2920
3036bool 2921bool
3037rxvt_term::selection_grab (Time tm) 2922rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3038{ 2923{
2924 Atom sel;
2925
2926 if (!clipboard)
2927 {
3039 selection_time = tm; 2928 selection_time = tm;
3040 2929 sel = XA_PRIMARY;
3041 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3042 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3043 { 2930 }
2931 else
2932 {
2933 clipboard_time = tm;
2934 sel = xa[XA_CLIPBOARD];
2935 }
2936
2937 XSetSelectionOwner (dpy, sel, vt, tm);
2938 if (XGetSelectionOwner (dpy, sel) == vt)
2939 {
3044 display->set_selection_owner (this); 2940 display->set_selection_owner (this, clipboard);
3045 return true; 2941 return true;
3046 } 2942 }
3047 else 2943 else
3048 { 2944 {
3049 selection_clear (); 2945 selection_clear (clipboard);
3050 return false; 2946 return false;
3051 } 2947 }
3052 2948
3053#if 0 2949#if 0
3054 XTextProperty ct; 2950 XTextProperty ct;
3055 2951
3056 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 2952 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3057 { 2953 {
3058 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 2954 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3059 XFree (ct.value); 2955 XFree (ct.value);
3060 } 2956 }
3061#endif 2957#endif
… …
3065/* 2961/*
3066 * Mark or select text based upon number of clicks: 1, 2, or 3 2962 * Mark or select text based upon number of clicks: 1, 2, or 3
3067 * EXT: button 1 press 2963 * EXT: button 1 press
3068 */ 2964 */
3069void 2965void
3070rxvt_term::selection_click (int clicks, int x, int y) 2966rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3071{ 2967{
3072 clicks = ((clicks - 1) % 3) + 1; 2968 clicks = ((clicks - 1) % 3) + 1;
3073 selection.clicks = clicks; /* save clicks so extend will work */ 2969 selection.clicks = clicks; /* save clicks so extend will work */
3074 2970
3075 if (clicks == 2 && !selection.rect 2971 if (clicks == 2 && !selection.rect
… …
3083 2979
3084 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 2980 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3085 2981
3086 if (clicks == 2 || clicks == 3) 2982 if (clicks == 2 || clicks == 3)
3087 selection_extend_colrow (selection.mark.col, 2983 selection_extend_colrow (selection.mark.col,
3088 selection.mark.row + view_start, 2984 selection.mark.row - view_start,
3089 0, /* button 3 */ 2985 0, /* button 3 */
3090 1, /* button press */ 2986 1, /* button press */
3091 0); /* click change */ 2987 0); /* click change */
3092} 2988}
3093 2989
3094/* ------------------------------------------------------------------------- */ 2990/* ------------------------------------------------------------------------- */
3095/* 2991/*
3096 * Mark a selection at the specified col/row 2992 * Mark a selection at the specified col/row
3097 */ 2993 */
3098void 2994void
3099rxvt_term::selection_start_colrow (int col, int row) 2995rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3100{ 2996{
3101 want_refresh = 1; 2997 want_refresh = 1;
3102 2998
3103 selection.mark.row = row - view_start; 2999 selection.mark.row = row + view_start;
3104 selection.mark.col = col; 3000 selection.mark.col = col;
3105 3001
3106 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3002 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3107 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3003 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3108 3004
3109 while (selection.mark.col > 0 3005 while (selection.mark.col > 0
3110 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3006 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3111 --selection.mark.col; 3007 --selection.mark.col;
3112 3008
3113 if (selection.op) 3009 if (selection.op)
3010 {
3114 { /* clear the old selection */ 3011 /* clear the old selection */
3115 selection.beg.row = selection.end.row = selection.mark.row; 3012 selection.beg.row = selection.end.row = selection.mark.row;
3116 selection.beg.col = selection.end.col = selection.mark.col; 3013 selection.beg.col = selection.end.col = selection.mark.col;
3117 } 3014 }
3118 3015
3119 selection.op = SELECTION_INIT; 3016 selection.op = SELECTION_INIT;
… …
3130#define DELIMIT_TEXT(x) \ 3027#define DELIMIT_TEXT(x) \
3131 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3028 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3132#define DELIMIT_REND(x) 1 3029#define DELIMIT_REND(x) 1
3133 3030
3134void 3031void
3135rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3032rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3136{ 3033{
3137 int col, row, dirnadd, tcol, trow, w1, w2; 3034 int col, row, dirnadd, tcol, trow, w1, w2;
3138 row_col_t bound; 3035 row_col_t bound;
3139 text_t *stp; 3036 text_t *stp;
3140 rend_t *srp; 3037 rend_t *srp;
3141 3038
3142 if (dirn == UP) 3039 if (dirn == UP)
3143 { 3040 {
3144 bound.row = - nsaved - 1; 3041 bound.row = top_row - 1;
3145 bound.col = 0; 3042 bound.col = 0;
3146 dirnadd = -1; 3043 dirnadd = -1;
3147 } 3044 }
3148 else 3045 else
3149 { 3046 {
… …
3214 * flag == 0 ==> button 1 3111 * flag == 0 ==> button 1
3215 * flag == 1 ==> button 3 press 3112 * flag == 1 ==> button 3 press
3216 * flag == 2 ==> button 3 motion 3113 * flag == 2 ==> button 3 motion
3217 */ 3114 */
3218void 3115void
3219rxvt_term::selection_extend (int x, int y, int flag) 3116rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3220{ 3117{
3221 int col = clamp (Pixel2Col (x), 0, ncol); 3118 int col = clamp (Pixel2Col (x), 0, ncol);
3222 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3119 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3223 3120
3224 /* 3121 /*
… …
3227 * select nothing. Otherwise, if we're to the right of the mark, you have to 3124 * select nothing. Otherwise, if we're to the right of the mark, you have to
3228 * be _past_ a character for it to be selected. 3125 * be _past_ a character for it to be selected.
3229 */ 3126 */
3230 if (((selection.clicks % 3) == 1) && !flag 3127 if (((selection.clicks % 3) == 1) && !flag
3231 && (col == selection.mark.col 3128 && (col == selection.mark.col
3232 && (row == selection.mark.row + view_start))) 3129 && (row == selection.mark.row - view_start)))
3233 { 3130 {
3234 /* select nothing */ 3131 /* select nothing */
3235 selection.beg.row = selection.end.row = 0; 3132 selection.beg.row = selection.end.row = 0;
3236 selection.beg.col = selection.end.col = 0; 3133 selection.beg.col = selection.end.col = 0;
3237 selection.clicks = 4; 3134 selection.clicks = 4;
… …
3250/* ------------------------------------------------------------------------- */ 3147/* ------------------------------------------------------------------------- */
3251/* 3148/*
3252 * Extend the selection to the specified col/row 3149 * Extend the selection to the specified col/row
3253 */ 3150 */
3254void 3151void
3255rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3152rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3256{ 3153{
3257 row_col_t pos; 3154 row_col_t pos;
3258 enum { 3155 enum {
3259 LEFT, RIGHT 3156 LEFT, RIGHT
3260 } closeto = RIGHT; 3157 } closeto = RIGHT;
… …
3292 selection.beg.col = selection.end.col = selection.mark.col; 3189 selection.beg.col = selection.end.col = selection.mark.col;
3293 selection.beg.row = selection.end.row = selection.mark.row; 3190 selection.beg.row = selection.end.row = selection.mark.row;
3294 } 3191 }
3295 3192
3296 pos.col = col; 3193 pos.col = col;
3297 pos.row = row - view_start; 3194 pos.row = view_start + row;
3298 3195
3299 /* 3196 /*
3300 * This is mainly xterm style selection with a couple of differences, mainly 3197 * This is mainly xterm style selection with a couple of differences, mainly
3301 * in the way button3 drag extension works. 3198 * in the way button3 drag extension works.
3302 * We're either doing: button1 drag; button3 press; or button3 drag 3199 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3308 * a point/word/line which is either the start or end of the selection 3205 * a point/word/line which is either the start or end of the selection
3309 * and it was decided by whichever point/word/line was `fixed' at the 3206 * and it was decided by whichever point/word/line was `fixed' at the
3310 * time of the most recent button3 press 3207 * time of the most recent button3 press
3311 */ 3208 */
3312 if (button3 && buttonpress) 3209 if (button3 && buttonpress)
3210 {
3313 { /* button3 press */ 3211 /* button3 press */
3314 /* 3212 /*
3315 * first determine which edge of the selection we are closest to 3213 * first determine which edge of the selection we are closest to
3316 */ 3214 */
3317 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3215 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3318 || (!ROWCOL_IS_AFTER (pos, selection.end) 3216 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3336 selection.mark.row = selection.beg.row; 3234 selection.mark.row = selection.beg.row;
3337 selection.mark.col = selection.beg.col; 3235 selection.mark.col = selection.beg.col;
3338 } 3236 }
3339 } 3237 }
3340 else 3238 else
3239 {
3341 { /* button1 drag or button3 drag */ 3240 /* button1 drag or button3 drag */
3342 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3241 if (ROWCOL_IS_AFTER (selection.mark, pos))
3343 { 3242 {
3344 if (selection.mark.row == selection.end.row 3243 if (selection.mark.row == selection.end.row
3345 && selection.mark.col == selection.end.col 3244 && selection.mark.col == selection.end.col
3346 && clickchange 3245 && clickchange
… …
3363 3262
3364 if (selection.clicks == 1) 3263 if (selection.clicks == 1)
3365 { 3264 {
3366 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3265 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3367 && !ROW(selection.beg.row).is_longer () 3266 && !ROW(selection.beg.row).is_longer ()
3368#if ENABLE_FRILLS 3267#if !ENABLE_MINIMAL
3369 && !selection.rect 3268 && !selection.rect
3370#endif 3269#endif
3371 ) 3270 )
3372 selection.beg.col = ncol; 3271 selection.beg.col = ncol;
3373 3272
3374 if ( 3273 if (
3375 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3274 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3376 && !ROW(selection.end.row).is_longer () 3275 && !ROW(selection.end.row).is_longer ()
3377#if ENABLE_FRILLS 3276#if !ENABLE_MINIMAL
3378 && !selection.rect 3277 && !selection.rect
3379#endif 3278#endif
3380 ) 3279 )
3381 selection.end.col = ncol; 3280 selection.end.col = ncol;
3382 } 3281 }
… …
3389 selection_delimit_word (DN, &selection.end, &selection.end); 3288 selection_delimit_word (DN, &selection.end, &selection.end);
3390 } 3289 }
3391 else if (selection.clicks == 3) 3290 else if (selection.clicks == 3)
3392 { 3291 {
3393#if ENABLE_FRILLS 3292#if ENABLE_FRILLS
3394 if (OPTION (Opt_tripleclickwords)) 3293 if (option (Opt_tripleclickwords))
3395 { 3294 {
3396 selection_delimit_word (UP, &selection.beg, &selection.beg); 3295 selection_delimit_word (UP, &selection.beg, &selection.beg);
3397 3296
3398 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3297 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3399 { 3298 {
3400 if (!ROW(end_row).is_longer ()) 3299 if (!ROW(end_row).is_longer ())
3401 { 3300 {
3402 selection.end.row = end_row; 3301 selection.end.row = end_row;
3403 selection.end.col = ROW(end_row).l; 3302 selection.end.col = ROW(end_row).l;
3303# if !ENABLE_MINIMAL
3404 selection_remove_trailing_spaces (); 3304 selection_remove_trailing_spaces ();
3305# endif
3405 break; 3306 break;
3406 } 3307 }
3407 } 3308 }
3408 } 3309 }
3409 else 3310 else
… …
3425 selection.end.row++; 3326 selection.end.row++;
3426 } 3327 }
3427 } 3328 }
3428 3329
3429 if (button3 && buttonpress) 3330 if (button3 && buttonpress)
3331 {
3430 { /* mark may need to be changed */ 3332 /* mark may need to be changed */
3431 if (closeto == LEFT) 3333 if (closeto == LEFT)
3432 { 3334 {
3433 selection.mark.row = selection.end.row; 3335 selection.mark.row = selection.end.row;
3434 selection.mark.col = selection.end.col - (selection.clicks == 2); 3336 selection.mark.col = selection.end.col - (selection.clicks == 2);
3435 } 3337 }
… …
3438 selection.mark.row = selection.beg.row; 3340 selection.mark.row = selection.beg.row;
3439 selection.mark.col = selection.beg.col; 3341 selection.mark.col = selection.beg.col;
3440 } 3342 }
3441 } 3343 }
3442 3344
3443#if ENABLE_FRILLS 3345#if !ENABLE_MINIMAL
3444 if (selection.rect && selection.beg.col > selection.end.col) 3346 if (selection.rect && selection.beg.col > selection.end.col)
3445 ::swap (selection.beg.col, selection.end.col); 3347 ::swap (selection.beg.col, selection.end.col);
3446#endif 3348#endif
3447} 3349}
3448 3350
3449#if ENABLE_FRILLS 3351#if !ENABLE_MINIMAL
3450void 3352void
3451rxvt_term::selection_remove_trailing_spaces () 3353rxvt_term::selection_remove_trailing_spaces () NOTHROW
3452{ 3354{
3453 int32_t end_col, end_row; 3355 int32_t end_col, end_row;
3454 text_t *stp; 3356 text_t *stp;
3455 3357
3456 end_col = selection.end.col; 3358 end_col = selection.end.col;
… …
3494/* 3396/*
3495 * Double click on button 3 when already selected 3397 * Double click on button 3 when already selected
3496 * EXT: button 3 double click 3398 * EXT: button 3 double click
3497 */ 3399 */
3498void 3400void
3499rxvt_term::selection_rotate (int x, int y) 3401rxvt_term::selection_rotate (int x, int y) NOTHROW
3500{ 3402{
3501 selection.clicks = selection.clicks % 3 + 1; 3403 selection.clicks = selection.clicks % 3 + 1;
3502 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3404 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3503} 3405}
3504 3406
… …
3506/* 3408/*
3507 * Respond to a request for our current selection 3409 * Respond to a request for our current selection
3508 * EXT: SelectionRequest 3410 * EXT: SelectionRequest
3509 */ 3411 */
3510void 3412void
3511rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3413rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3512{ 3414{
3415 Atom property = rq.property == None ? rq.target : rq.property;
3513 XSelectionEvent ev; 3416 XSelectionEvent ev;
3514 dDisp;
3515 3417
3516 ev.type = SelectionNotify; 3418 ev.type = SelectionNotify;
3517 ev.property = None; 3419 ev.property = None;
3518 ev.display = rq.display; 3420 ev.display = rq.display;
3519 ev.requestor = rq.requestor; 3421 ev.requestor = rq.requestor;
… …
3533 *target++ = xa[XA_COMPOUND_TEXT]; 3435 *target++ = xa[XA_COMPOUND_TEXT];
3534#if X_HAVE_UTF8_STRING 3436#if X_HAVE_UTF8_STRING
3535 *target++ = xa[XA_UTF8_STRING]; 3437 *target++ = xa[XA_UTF8_STRING];
3536#endif 3438#endif
3537 3439
3538 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3440 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3539 32, PropModeReplace, 3441 32, PropModeReplace,
3540 (unsigned char *)target_list, target - target_list); 3442 (unsigned char *)target_list, target - target_list);
3541 ev.property = rq.property; 3443 ev.property = property;
3542 } 3444 }
3543#if TODO // TODO 3445#if TODO // TODO
3544 else if (rq.target == xa[XA_MULTIPLE]) 3446 else if (rq.target == xa[XA_MULTIPLE])
3545 { 3447 {
3546 /* TODO: Handle MULTIPLE */ 3448 /* TODO: Handle MULTIPLE */
3547 } 3449 }
3548#endif 3450#endif
3549 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3451 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3550 { 3452 {
3551 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3453 XChangeProperty (dpy, rq.requestor, property, rq.target,
3552 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3454 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3553 ev.property = rq.property; 3455 ev.property = property;
3456 }
3457 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3458 {
3459 XChangeProperty (dpy, rq.requestor, property, rq.target,
3460 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3461 ev.property = property;
3554 } 3462 }
3555 else if (rq.target == XA_STRING 3463 else if (rq.target == XA_STRING
3556 || rq.target == xa[XA_TEXT] 3464 || rq.target == xa[XA_TEXT]
3557 || rq.target == xa[XA_COMPOUND_TEXT] 3465 || rq.target == xa[XA_COMPOUND_TEXT]
3558 || rq.target == xa[XA_UTF8_STRING] 3466 || rq.target == xa[XA_UTF8_STRING]
… …
3580 style = enc_string; 3488 style = enc_string;
3581 else if (target == xa[XA_TEXT]) 3489 else if (target == xa[XA_TEXT])
3582 style = enc_text; 3490 style = enc_text;
3583 else if (target == xa[XA_COMPOUND_TEXT]) 3491 else if (target == xa[XA_COMPOUND_TEXT])
3584 style = enc_compound_text; 3492 style = enc_compound_text;
3585#if ENABLE_FRILLS 3493#if !ENABLE_MINIMAL
3586 else if (target == xa[XA_UTF8_STRING]) 3494 else if (target == xa[XA_UTF8_STRING])
3587 style = enc_utf8; 3495 style = enc_utf8;
3588#endif 3496#endif
3589 else 3497 else
3590 { 3498 {
3591 target = xa[XA_COMPOUND_TEXT]; 3499 target = xa[XA_COMPOUND_TEXT];
3592 style = enc_compound_text; 3500 style = enc_compound_text;
3593 } 3501 }
3594 3502
3595 if (selection.text) 3503 if (rq.selection == XA_PRIMARY && selection.text)
3596 { 3504 {
3597 cl = selection.text; 3505 cl = selection.text;
3598 selectlen = selection.len; 3506 selectlen = selection.len;
3599 } 3507 }
3508 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3509 {
3510 cl = selection.clip_text;
3511 selectlen = selection.clip_len;
3512 }
3600 else 3513 else
3601 { 3514 {
3602 cl = L""; 3515 cl = L"";
3603 selectlen = 0; 3516 selectlen = 0;
3604 } 3517 }
3605 3518
3606#if ENABLE_FRILLS 3519#if !ENABLE_MINIMAL
3607 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3520 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3608 // so recode it manually 3521 // so recode it manually
3609 if (style == enc_utf8) 3522 if (style == enc_utf8)
3610 { 3523 {
3611 freect = 1; 3524 freect = 1;
… …
3614 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3527 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3615 ct.nitems = strlen ((char *)ct.value); 3528 ct.nitems = strlen ((char *)ct.value);
3616 } 3529 }
3617 else 3530 else
3618#endif 3531#endif
3619 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3532 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3620 freect = 1; 3533 freect = 1;
3621 else 3534 else
3622 { 3535 {
3623 /* if we failed to convert then send it raw */ 3536 /* if we failed to convert then send it raw */
3624 ct.value = (unsigned char *)cl; 3537 ct.value = (unsigned char *)cl;
3625 ct.nitems = selectlen; 3538 ct.nitems = selectlen;
3626 ct.encoding = target; 3539 ct.encoding = target;
3627 } 3540 }
3628 3541
3629 XChangeProperty (disp, rq.requestor, rq.property, 3542 XChangeProperty (dpy, rq.requestor, property,
3630 ct.encoding, 8, PropModeReplace, 3543 ct.encoding, 8, PropModeReplace,
3631 ct.value, (int)ct.nitems); 3544 ct.value, (int)ct.nitems);
3632 ev.property = rq.property; 3545 ev.property = property;
3633 3546
3634 if (freect) 3547 if (freect)
3635 XFree (ct.value); 3548 XFree (ct.value);
3636 } 3549 }
3637 3550
3638 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3551 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3639}
3640
3641/* ------------------------------------------------------------------------- *
3642 * MOUSE ROUTINES *
3643 * ------------------------------------------------------------------------- */
3644
3645/*
3646 * return col/row values corresponding to x/y pixel values
3647 */
3648void
3649rxvt_term::pixel_position (int *x, int *y)
3650{
3651 *x = Pixel2Col (*x);
3652 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3653 *y = Pixel2Row (*y);
3654 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3655} 3552}
3656 3553
3657/* ------------------------------------------------------------------------- */ 3554/* ------------------------------------------------------------------------- */
3658#ifdef USE_XIM 3555#ifdef USE_XIM
3659void 3556void
3660rxvt_term::im_set_position (XPoint &pos) 3557rxvt_term::im_set_position (XPoint &pos) NOTHROW
3661{ 3558{
3662 XWindowAttributes xwa; 3559 XWindowAttributes xwa;
3663 3560
3664 XGetWindowAttributes (display->display, vt, &xwa); 3561 XGetWindowAttributes (dpy, vt, &xwa);
3665 3562
3666 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3563 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3667 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3564 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3668} 3565}
3669#endif 3566#endif
3670 3567
3671#if ENABLE_OVERLAY 3568#if ENABLE_OVERLAY
3672void 3569void
3673rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3570rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3674{ 3571{
3675 if (nrow < 1 || ncol < 1) 3572 if (nrow < 1 || ncol < 1)
3676 return; 3573 return;
3677 3574
3678 want_refresh = 1; 3575 want_refresh = 1;
… …
3687 h += 2; min_it (h, nrow); 3584 h += 2; min_it (h, nrow);
3688 3585
3689 x -= 1; clamp_it (x, 0, ncol - w); 3586 x -= 1; clamp_it (x, 0, ncol - w);
3690 y -= 1; clamp_it (y, 0, nrow - h); 3587 y -= 1; clamp_it (y, 0, nrow - h);
3691 3588
3692 ov_x = x; ov_y = y; 3589 ov.x = x; ov.y = y;
3693 ov_w = w; ov_h = h; 3590 ov.w = w; ov.h = h;
3694 3591
3695 ov_text = new text_t *[h]; 3592 ov.text = new text_t *[h];
3696 ov_rend = new rend_t *[h]; 3593 ov.rend = new rend_t *[h];
3697 3594
3698 for (y = 0; y < h; y++) 3595 for (y = 0; y < h; y++)
3699 { 3596 {
3700 text_t *tp = ov_text[y] = new text_t[w]; 3597 text_t *tp = ov.text[y] = new text_t[w];
3701 rend_t *rp = ov_rend[y] = new rend_t[w]; 3598 rend_t *rp = ov.rend[y] = new rend_t[w];
3702 3599
3703 text_t t0, t1, t2; 3600 text_t t0, t1, t2;
3704 rend_t r = OVERLAY_RSTYLE; 3601 rend_t r = OVERLAY_RSTYLE;
3705 3602
3706 if (y == 0) 3603 if (y == 0)
… …
3723 *rp = r; 3620 *rp = r;
3724 } 3621 }
3725} 3622}
3726 3623
3727void 3624void
3728rxvt_term::scr_overlay_off () 3625rxvt_term::scr_overlay_off () NOTHROW
3729{ 3626{
3730 if (!ov_text) 3627 if (!ov.text)
3731 return; 3628 return;
3732 3629
3733 want_refresh = 1; 3630 want_refresh = 1;
3734 3631
3735 for (int y = 0; y < ov_h; y++) 3632 for (int y = 0; y < ov.h; y++)
3736 { 3633 {
3737 delete [] ov_text[y]; 3634 delete [] ov.text[y];
3738 delete [] ov_rend[y]; 3635 delete [] ov.rend[y];
3739 } 3636 }
3740 3637
3741 delete [] ov_text; ov_text = 0; 3638 delete [] ov.text; ov.text = 0;
3742 delete [] ov_rend; ov_rend = 0; 3639 delete [] ov.rend; ov.rend = 0;
3743} 3640}
3744 3641
3745void 3642void
3746rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3643rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3747{ 3644{
3748 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3645 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3749 return; 3646 return;
3750 3647
3751 x++, y++; 3648 x++, y++;
3752 3649
3753 ov_text[y][x] = text; 3650 ov.text[y][x] = text;
3754 ov_rend[y][x] = rend; 3651 ov.rend[y][x] = rend;
3755} 3652}
3756 3653
3757void 3654void
3758rxvt_term::scr_overlay_set (int x, int y, const char *s) 3655rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3759{ 3656{
3760 while (*s) 3657 while (*s)
3761 scr_overlay_set (x++, y, *s++); 3658 scr_overlay_set (x++, y, *s++);
3762} 3659}
3763 3660
3764void 3661void
3765rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3662rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3766{ 3663{
3767 while (*s) 3664 while (*s)
3768 { 3665 {
3769 text_t t = *s++; 3666 text_t t = *s++;
3770 int width = wcwidth (t); 3667 int width = WCWIDTH (t);
3771 3668
3772 while (width--) 3669 while (width--)
3773 { 3670 {
3774 scr_overlay_set (x++, y, t); 3671 scr_overlay_set (x++, y, t);
3775 t = NOCHAR; 3672 t = NOCHAR;
3776 } 3673 }
3777 } 3674 }
3778} 3675}
3779 3676
3780void 3677void
3781rxvt_term::scr_swap_overlay () 3678rxvt_term::scr_swap_overlay () NOTHROW
3782{ 3679{
3783 if (!ov_text) 3680 if (!ov.text)
3784 return; 3681 return;
3785 3682
3683 // hide cursor if it is within the overlay area
3684 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3685 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3686 screen.flags &= ~Screen_VisibleCursor;
3687
3786 // swap screen mem with overlay 3688 // swap screen mem with overlay
3787 for (int y = ov_h; y--; ) 3689 for (int y = ov.h; y--; )
3788 { 3690 {
3789 text_t *t1 = ov_text[y]; 3691 text_t *t1 = ov.text[y];
3790 rend_t *r1 = ov_rend[y]; 3692 rend_t *r1 = ov.rend[y];
3791 3693
3792 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3694 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3793 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3695 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3794 3696
3795 for (int x = ov_w; x--; ) 3697 for (int x = ov.w; x--; )
3796 { 3698 {
3797 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3699 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3798 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3700 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3799 } 3701 }
3800 } 3702 }

Diff Legend

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