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

Diff Legend

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