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

Diff Legend

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