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.235 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.324 by root, Wed Nov 5 00:01:01 2008 UTC

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

Diff Legend

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