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.285 by root, Tue Dec 11 03:30:50 2007 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-2006 Marc Lehmann <pcg@goof.com>
… …
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() \
… …
93 */ 91 */
94#define drawBuffer vt 92#define drawBuffer vt
95 93
96#define CLEAR_ROWS(row, num) \ 94#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 95 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \ 96 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 97 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 98 (unsigned int)Height2Pixel (num), False)
101 99
102#define CLEAR_CHARS(x, y, num) \ 100#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 101 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 102 XClearArea (dpy, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel (num), \ 103 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 104 (unsigned int)Height2Pixel (1), False)
107 105
108#define ERASE_ROWS(row, num) \ 106#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \ 107 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \ 108 0, Row2Pixel (row), \
111 (unsigned int)width, \ 109 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 110 (unsigned int)Height2Pixel (num))
113 111
114/* ------------------------------------------------------------------------- * 112/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 113 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 114 * ------------------------------------------------------------------------- */
117 115
118/* Fill part/all of a line with blanks. */ 116/* Fill part/all of a line with blanks. */
119void 117void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const 118rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 119{
122 if (!l.t) 120 if (!l.t)
123 { 121 {
124 lalloc (l); 122 lalloc (l);
125 col = 0; 123 col = 0;
126 width = ncol; 124 width = ncol;
127 } 125 }
128 126
129 l.touch (); 127 l.touch ();
130 128
131 efs &= ~RS_baseattrMask; 129 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 130 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 131
134 text_t *et = l.t + col; 132 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 133 rend_t *er = l.r + col;
136 134
… …
142} 140}
143 141
144/* ------------------------------------------------------------------------- */ 142/* ------------------------------------------------------------------------- */
145/* Fill a full line with blanks - make sure it is allocated first */ 143/* Fill a full line with blanks - make sure it is allocated first */
146void 144void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const 145rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
148{ 146{
149 scr_blank_line (l, 0, ncol, efs); 147 scr_blank_line (l, 0, ncol, efs);
150 148
151 l.l = 0; 149 l.l = 0;
152 l.f = 0; 150 l.f = 0;
… …
161{ 159{
162#if ENABLE_OVERLAY 160#if ENABLE_OVERLAY
163 scr_overlay_off (); 161 scr_overlay_off ();
164#endif 162#endif
165 163
164 rvideo_mode = false;
166 view_start = 0; 165 view_start = 0;
167 num_scr = 0; 166 num_scr = 0;
168 167
169 if (ncol == 0) 168 if (ncol == 0)
170 ncol = 80; 169 ncol = 80;
… …
173 nrow = 24; 172 nrow = 24;
174 173
175 if (ncol == prev_ncol && nrow == prev_nrow) 174 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 175 return;
177 176
177 if (current_screen != PRIMARY)
178 scr_swap_screen ();
179
178 // we need at least two lines for wrapping to work correctly 180 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 181 while (nrow + saveLines < 2)
180 { 182 {
181 //TODO//FIXME 183 //TODO//FIXME
182 saveLines++; 184 saveLines++;
183 prev_nrow--; 185 prev_nrow--;
184 top_row--; 186 top_row--;
… …
195 if (!row_buf) 197 if (!row_buf)
196 { 198 {
197 /* 199 /*
198 * first time called so just malloc everything: don't rely on realloc 200 * first time called so just malloc everything: don't rely on realloc
199 */ 201 */
200 top_row = 0; /* no saved lines */ 202 top_row = 0;
201 term_start = 0; 203 term_start = 0;
202 204
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 207
… …
234 selection.text = NULL; 236 selection.text = NULL;
235 selection.len = 0; 237 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
238 selection.clicks = 0; 240 selection.clicks = 0;
239 CLEAR_ALL_SELECTION ();
240 rvideo = 0;
241 } 241 }
242 else 242 else
243 { 243 {
244 CLEAR_ALL_SELECTION ();
245
246 /* 244 /*
247 * add or delete rows as appropriate 245 * add or delete rows as appropriate
248 */ 246 */
249 247
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 248 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); 274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 275 }
278 276
279 line_t *old_buf = row_buf; 277 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 279
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
285 283
286 if (top_row) 284 if (top_row)
287 { 285 {
288 // re-wrap lines, this is rather ugly, possibly because I am too dumb 286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
290 288
291 row_col_t ocur = screen.cur; 289 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 290 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293 291
… …
330 int qcol = 0; 328 int qcol = 0;
331 329
332 // see below for cursor adjustment rationale 330 // see below for cursor adjustment rationale
333 if (p == ocur.row) 331 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 332 screen.cur.row = q - (total_rows - nrow);
335 333
336 // fill a single destination line 334 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 335 while (lofs < llen && qcol < ncol)
338 { 336 {
339 int prow = lofs / prev_ncol; 337 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 338 int pcol = lofs % prev_ncol;
… …
350 348
351 line_t &pline = old_buf [prow]; 349 line_t &pline = old_buf [prow];
352 350
353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 351 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
354 352
355 assert (len);
356 assert (pline.t);
357
358 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 353 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
359 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 354 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
360 355
361 lofs += len; 356 lofs += len;
362 qcol += len; 357 qcol += len;
… …
369 } 364 }
370 while (p != pend && q > 0); 365 while (p != pend && q > 0);
371 366
372 term_start = total_rows - nrow; 367 term_start = total_rows - nrow;
373 top_row = q - term_start; 368 top_row = q - term_start;
374 369
375 // make sure all terminal lines exist 370 // make sure all terminal lines exist
376 while (top_row > 0) 371 while (top_row > 0)
377 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 372 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
378 } 373 }
379 else 374 else
380 { 375 {
381 // if no scrollback exists (yet), wing, instead of wrap 376 // if no scrollback exists (yet), wing, instead of wrap
382 377
383 for (int row = min (nrow, prev_nrow); row--; ) 378 for (int row = min (nrow, prev_nrow); row--; )
384 { 379 {
385 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 380 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
386 line_t &qline = row_buf [row]; 381 line_t &qline = row_buf [row];
387 382
… …
402 delete old_ra; 397 delete old_ra;
403 398
404 clamp_it (screen.cur.row, 0, nrow - 1); 399 clamp_it (screen.cur.row, 0, nrow - 1);
405 clamp_it (screen.cur.col, 0, ncol - 1); 400 clamp_it (screen.cur.col, 0, ncol - 1);
406 401
407 if (tabs)
408 free (tabs); 402 free (tabs);
409 } 403 }
404
405 CLEAR_ALL_SELECTION ();
410 406
411 prev_nrow = nrow; 407 prev_nrow = nrow;
412 prev_ncol = ncol; 408 prev_ncol = ncol;
413 409
414 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 410 tabs = (char *)rxvt_malloc (ncol);
415 411
416 for (int col = ncol; col--; ) 412 for (int col = ncol; --col; )
417 tabs [col] = col % TABSIZE == 0; 413 tabs [col] = col % TABSIZE == 0;
418 414
415 if (current_screen != PRIMARY)
416 scr_swap_screen ();
417
419 tt_winch (); 418 tt_winch ();
420 419
421 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 420 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
422} 421}
423 422
424/* ------------------------------------------------------------------------- */ 423/* ------------------------------------------------------------------------- */
425/* 424/*
426 * Free everything. That way malloc debugging can find leakage. 425 * Free everything. That way malloc debugging can find leakage.
427 */ 426 */
428void 427void
429rxvt_term::scr_release () 428rxvt_term::scr_release () NOTHROW
430{ 429{
430 if (row_buf)
431 {
431 delete talloc; talloc = 0; 432 delete talloc; talloc = 0;
432 delete ralloc; ralloc = 0; 433 delete ralloc; ralloc = 0;
433 434
434 free (row_buf); 435 free (row_buf);
435 free (swap_buf); 436 free (swap_buf);
436 free (drawn_buf); 437 free (drawn_buf);
437 free (tabs); 438 free (tabs);
438 439
439 row_buf = 0; // signal that we freed all the arrays 440 row_buf = 0; // signal that we freed all the arrays
441 }
440} 442}
441 443
442/* ------------------------------------------------------------------------- */ 444/* ------------------------------------------------------------------------- */
443/* 445/*
444 * Hard reset 446 * Hard reset
… …
461 * Save and Restore cursor 463 * Save and Restore cursor
462 * XTERM_SEQ: Save cursor : ESC 7 464 * XTERM_SEQ: Save cursor : ESC 7
463 * XTERM_SEQ: Restore cursor: ESC 8 465 * XTERM_SEQ: Restore cursor: ESC 8
464 */ 466 */
465void 467void
466rxvt_term::scr_cursor (int mode) 468rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
467{ 469{
468 screen_t *s; 470 screen_t *s;
469 471
470#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 472#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
471 if (current_screen == SECONDARY) 473 if (current_screen == SECONDARY)
… …
503 assert (s->cur.row >= 0); 505 assert (s->cur.row >= 0);
504 assert (s->cur.col >= 0); 506 assert (s->cur.col >= 0);
505#endif 507#endif
506} 508}
507 509
510void
511rxvt_term::scr_swap_screen ()
512{
513 if (!option (Opt_secondaryScreen))
514 return;
515
516 for (int i = prev_nrow; i--; )
517 ::swap (ROW(i), swap_buf [i]);
518
519 ::swap (screen.cur, swap.cur);
520
521 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
522 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
523}
524
508/* ------------------------------------------------------------------------- */ 525/* ------------------------------------------------------------------------- */
509/* 526/*
510 * Swap between primary and secondary screens 527 * Swap between primary and secondary screens
511 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 528 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
512 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 529 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
513 */ 530 */
514int 531void
515rxvt_term::scr_change_screen (int scrn) 532rxvt_term::scr_change_screen (int scrn)
516{ 533{
534 if (scrn == current_screen)
535 return;
536
517 want_refresh = 1; 537 want_refresh = 1;
518 view_start = 0; 538 view_start = 0;
519 539
520 if (current_screen == scrn)
521 return scrn;
522
523 selection_check (2); /* check for boundary cross */ 540 selection_check (2); /* check for boundary cross */
524 541
525 int i = current_screen; current_screen = scrn; scrn = i; 542 int i = current_screen; current_screen = scrn; scrn = i;
526 543
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 544#if NSCREENS
534 if (OPTION (Opt_secondaryScreen)) 545 if (option (Opt_secondaryScreen))
535 { 546 {
536 num_scr = 0; 547 num_scr = 0;
537 548
538 for (int i = prev_nrow; i--; ) 549 scr_swap_screen ();
539 ::swap (ROW(i), swap_buf [i]);
540 550
541 ::swap (screen.charset, swap.charset); 551 ::swap (screen.charset, swap.charset);
542 ::swap (screen.flags, swap.flags); 552 ::swap (screen.flags, swap.flags);
543 screen.flags |= Screen_VisibleCursor; 553 screen.flags |= Screen_VisibleCursor;
544 swap.flags |= Screen_VisibleCursor; 554 swap.flags |= Screen_VisibleCursor;
545 } 555 }
546 else 556 else
547#endif 557#endif
548 if (OPTION (Opt_secondaryScroll)) 558 if (option (Opt_secondaryScroll))
549 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 559 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
550
551 return scrn;
552} 560}
553 561
554// clear WrapNext indicator, solidifying position on next line 562// clear WrapNext indicator, solidifying position on next line
555void 563void
556rxvt_term::scr_do_wrap () 564rxvt_term::scr_do_wrap () NOTHROW
557{ 565{
558 if (!(screen.flags & Screen_WrapNext)) 566 if (!(screen.flags & Screen_WrapNext))
559 return; 567 return;
560 568
561 screen.flags &= ~Screen_WrapNext; 569 screen.flags &= ~Screen_WrapNext;
… …
571/* ------------------------------------------------------------------------- */ 579/* ------------------------------------------------------------------------- */
572/* 580/*
573 * Change the colour for following text 581 * Change the colour for following text
574 */ 582 */
575void 583void
576rxvt_term::scr_color (unsigned int color, int fgbg) 584rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
577{ 585{
578 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 586 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
579 color = fgbg; 587 color = fgbg;
580 588
581 if (fgbg == Color_fg) 589 if (fgbg == Color_fg)
… …
587/* ------------------------------------------------------------------------- */ 595/* ------------------------------------------------------------------------- */
588/* 596/*
589 * Change the rendition style for following text 597 * Change the rendition style for following text
590 */ 598 */
591void 599void
592rxvt_term::scr_rendition (int set, int style) 600rxvt_term::scr_rendition (int set, int style) NOTHROW
593 { 601 {
594 if (set) 602 if (set)
595 rstyle |= style; 603 rstyle |= style;
596 else if (style == ~RS_None) 604 else if (style == ~RS_None)
597 rstyle = DEFAULT_RSTYLE; 605 rstyle = DEFAULT_RSTYLE;
… …
604 * Scroll text between <row1> and <row2> inclusive, by <count> lines 612 * Scroll text between <row1> and <row2> inclusive, by <count> lines
605 * count positive ==> scroll up 613 * count positive ==> scroll up
606 * count negative ==> scroll down 614 * count negative ==> scroll down
607 */ 615 */
608int 616int
609rxvt_term::scr_scroll_text (int row1, int row2, int count) 617rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
610{ 618{
611 if (count == 0 || (row1 > row2)) 619 if (count == 0 || (row1 > row2))
612 return 0; 620 return 0;
613 621
614 want_refresh = 1; 622 want_refresh = 1;
615 num_scr += count; 623 num_scr += count;
616 624
617 if (count > 0 625 if (count > 0
618 && row1 == 0 626 && row1 == 0
619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 627 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
620 { 628 {
621 top_row = max (top_row - count, -saveLines); 629 top_row = max (top_row - count, -saveLines);
622 630
623 // scroll everything up 'count' lines 631 // scroll everything up 'count' lines
624 term_start = (term_start + count) % total_rows; 632 term_start = (term_start + count) % total_rows;
… …
631 } 639 }
632 640
633 // erase newly scrolled-in lines 641 // erase newly scrolled-in lines
634 for (int i = count; i--; ) 642 for (int i = count; i--; )
635 { 643 {
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); 644 line_t &l = ROW(nrow - 1 - i);
639 645
646 // optimize if already cleared, can be significant on slow machines
647 // could be rolled into scr_blank_screen_mem
648 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
649 {
640 scr_blank_line (l, 0, l.l, rstyle); 650 scr_blank_line (l, 0, l.l, rstyle);
641
642 l.l = 0; 651 l.l = 0;
643 l.f = 0; 652 l.f = 0;
653 }
654 else
655 scr_blank_screen_mem (l, rstyle);
644 } 656 }
645 657
646 // now copy lines below the scroll region bottom to the 658 // now copy lines below the scroll region bottom to the
647 // bottom of the screen again, so they look as if they 659 // bottom of the screen again, so they look as if they
648 // hadn't moved. 660 // hadn't moved.
… …
652 line_t &l2 = ROW(i); 664 line_t &l2 = ROW(i);
653 665
654 ::swap (l1, l2); 666 ::swap (l1, l2);
655 l2.touch (); 667 l2.touch ();
656 } 668 }
657 669
658 // move and/or clear selection, if any 670 // move and/or clear selection, if any
659 if (selection.op && current_screen == selection.screen) 671 if (selection.op && current_screen == selection.screen)
660 { 672 {
661 selection.beg.row -= count; 673 selection.beg.row -= count;
662 selection.end.row -= count; 674 selection.end.row -= count;
… …
670 selection.op = SELECTION_CLEAR; 682 selection.op = SELECTION_CLEAR;
671 } 683 }
672 } 684 }
673 685
674 // finally move the view window, if desired 686 // finally move the view window, if desired
675 if (OPTION (Opt_scrollWithBuffer) 687 if (option (Opt_scrollWithBuffer)
676 && view_start != 0 688 && view_start != 0
677 && view_start != -saveLines) 689 && view_start != -saveLines)
678 scr_page (UP, count); 690 scr_page (UP, count);
679 691
680 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 692 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
698 { 710 {
699 /* move selected region too */ 711 /* move selected region too */
700 selection.beg.row -= count; 712 selection.beg.row -= count;
701 selection.end.row -= count; 713 selection.end.row -= count;
702 selection.mark.row -= count; 714 selection.mark.row -= count;
703 715
704 selection_check (0); 716 selection_check (0);
705 } 717 }
706 } 718 }
707 719
708 // use a simple and robust scrolling algorithm, this 720 // use a simple and robust scrolling algorithm, this
… …
732/* ------------------------------------------------------------------------- */ 744/* ------------------------------------------------------------------------- */
733/* 745/*
734 * Add text given in <str> of length <len> to screen struct 746 * Add text given in <str> of length <len> to screen struct
735 */ 747 */
736void 748void
737rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 749rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
738{ 750{
739 if (len <= 0) /* sanity */ 751 if (len <= 0) /* sanity */
740 return; 752 return;
741 753
742 unsigned char checksel; 754 unsigned char checksel;
… …
748 ZERO_SCROLLBACK (); 760 ZERO_SCROLLBACK ();
749 761
750 if (minlines > 0) 762 if (minlines > 0)
751 { 763 {
752 minlines += screen.cur.row - screen.bscroll; 764 minlines += screen.cur.row - screen.bscroll;
765 min_it (minlines, screen.cur.row - top_row);
753 766
754 if (minlines > 0 767 if (minlines > 0
755 && screen.tscroll == 0 768 && screen.tscroll == 0
756 && screen.bscroll == nrow - 1) 769 && screen.bscroll == nrow - 1)
757 { 770 {
… …
819 } 832 }
820 833
821 if (screen.flags & Screen_WrapNext) 834 if (screen.flags & Screen_WrapNext)
822 { 835 {
823 scr_do_wrap (); 836 scr_do_wrap ();
824 837
825 line->l = ncol; 838 line->l = ncol;
826 line->is_longer (1); 839 line->is_longer (1);
827 840
828 row = screen.cur.row; 841 row = screen.cur.row;
829 line = &ROW(row); /* _must_ refresh */ 842 line = &ROW(row); /* _must_ refresh */
… …
831 844
832 // some utf-8 decoders "decode" surrogate characters: let's fix this. 845 // some utf-8 decoders "decode" surrogate characters: let's fix this.
833 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 846 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
834 c = 0xfffd; 847 c = 0xfffd;
835 848
836 // rely on wcwidth to tell us the character width, at least for non-latin1 849 // rely on wcwidth to tell us the character width, do wcwidth before
837 // do wcwidth before further replacements, as wcwidth might return -1 850 // 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 851 // drawing characters below as they might be invalid in the current
839 // locale. 852 // locale.
840 int width = c < 0x100 ? 1 : wcwidth (c); 853 int width = WCWIDTH (c);
841 854
842 if (charsets [screen.charset] == '0') // DEC SPECIAL 855 if (charsets [screen.charset] == '0') // DEC SPECIAL
843 { 856 {
844 // vt100 special graphics and line drawing 857 // vt100 special graphics and line drawing
845 // 5f-7e standard vt100 858 // 5f-7e standard vt100
… …
996/* 1009/*
997 * Process Backspace. Move back the cursor back a position, wrap if have to 1010 * Process Backspace. Move back the cursor back a position, wrap if have to
998 * XTERM_SEQ: CTRL-H 1011 * XTERM_SEQ: CTRL-H
999 */ 1012 */
1000void 1013void
1001rxvt_term::scr_backspace () 1014rxvt_term::scr_backspace () NOTHROW
1002{ 1015{
1003 want_refresh = 1; 1016 want_refresh = 1;
1004 1017
1005 if (screen.cur.col == 0) 1018 if (screen.cur.col == 0)
1006 { 1019 {
… …
1024 * Process Horizontal Tab 1037 * Process Horizontal Tab
1025 * count: +ve = forward; -ve = backwards 1038 * count: +ve = forward; -ve = backwards
1026 * XTERM_SEQ: CTRL-I 1039 * XTERM_SEQ: CTRL-I
1027 */ 1040 */
1028void 1041void
1029rxvt_term::scr_tab (int count, bool ht) 1042rxvt_term::scr_tab (int count, bool ht) NOTHROW
1030{ 1043{
1031 int i, x; 1044 int i, x;
1032 1045
1033 want_refresh = 1; 1046 want_refresh = 1;
1034 i = x = screen.cur.col; 1047 i = x = screen.cur.col;
… …
1047 x = i; 1060 x = i;
1048 1061
1049 if (!--count) 1062 if (!--count)
1050 break; 1063 break;
1051 } 1064 }
1052 else 1065 else
1053 ht &= l.t[i] == ' ' 1066 ht &= l.t[i] == ' '
1054 && RS_SAME (l.r[i], base_rend); 1067 && RS_SAME (l.r[i], base_rend);
1055 1068
1056 if (count) 1069 if (count)
1057 x = ncol - 1; 1070 x = ncol - 1;
1058 1071
1059 // store horizontal tab commands as characters inside the text 1072 // store horizontal tab commands as characters inside the text
1060 // buffer so they can be selected and pasted. 1073 // buffer so they can be selected and pasted.
1061 if (ht && OPTION (Opt_pastableTabs)) 1074 if (ht && option (Opt_pastableTabs))
1062 { 1075 {
1063 base_rend = SET_FONT (base_rend, 0); 1076 base_rend = SET_FONT (base_rend, 0);
1064 1077
1065 l.touch (x); 1078 l.touch (x);
1066 1079
… …
1099 * Process DEC Back Index 1112 * Process DEC Back Index
1100 * XTERM_SEQ: ESC 6 1113 * XTERM_SEQ: ESC 6
1101 * Move cursor left in row. If we're at the left boundary, shift everything 1114 * Move cursor left in row. If we're at the left boundary, shift everything
1102 * in that row right. Clear left column. 1115 * in that row right. Clear left column.
1103 */ 1116 */
1104#if ENABLE_FRILLS 1117#if !ENABLE_MINIMAL
1105void 1118void
1106rxvt_term::scr_backindex () 1119rxvt_term::scr_backindex () NOTHROW
1107{ 1120{
1108 if (screen.cur.col > 0) 1121 if (screen.cur.col > 0)
1109 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1110 else 1123 else
1111 scr_insdel_chars (1, INSERT); 1124 scr_insdel_chars (1, INSERT);
… …
1116 * Process DEC Forward Index 1129 * Process DEC Forward Index
1117 * XTERM_SEQ: ESC 9 1130 * XTERM_SEQ: ESC 9
1118 * Move cursor right in row. If we're at the right boundary, shift everything 1131 * Move cursor right in row. If we're at the right boundary, shift everything
1119 * in that row left. Clear right column. 1132 * in that row left. Clear right column.
1120 */ 1133 */
1121#if ENABLE_FRILLS 1134#if !ENABLE_MINIMAL
1122void 1135void
1123rxvt_term::scr_forwardindex () 1136rxvt_term::scr_forwardindex () NOTHROW
1124{ 1137{
1125 if (screen.cur.col < ncol - 1) 1138 if (screen.cur.col < ncol - 1)
1126 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1127 else 1140 else
1128 { 1141 {
… …
1141/* ------------------------------------------------------------------------- */ 1154/* ------------------------------------------------------------------------- */
1142/* 1155/*
1143 * Goto Row/Column 1156 * Goto Row/Column
1144 */ 1157 */
1145void 1158void
1146rxvt_term::scr_gotorc (int row, int col, int relative) 1159rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1147{ 1160{
1148 want_refresh = 1; 1161 want_refresh = 1;
1149 ZERO_SCROLLBACK (); 1162 ZERO_SCROLLBACK ();
1150 1163
1151 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1164 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1173 } 1186 }
1174 } 1187 }
1175 else 1188 else
1176 { 1189 {
1177 if (screen.flags & Screen_Relative) 1190 if (screen.flags & Screen_Relative)
1191 {
1178 { /* relative origin mode */ 1192 /* relative origin mode */
1179 screen.cur.row = row + screen.tscroll; 1193 screen.cur.row = row + screen.tscroll;
1180 min_it (screen.cur.row, screen.bscroll); 1194 min_it (screen.cur.row, screen.bscroll);
1181 } 1195 }
1182 else 1196 else
1183 screen.cur.row = row; 1197 screen.cur.row = row;
… …
1189/* ------------------------------------------------------------------------- */ 1203/* ------------------------------------------------------------------------- */
1190/* 1204/*
1191 * direction should be UP or DN 1205 * direction should be UP or DN
1192 */ 1206 */
1193void 1207void
1194rxvt_term::scr_index (enum page_dirn direction) 1208rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1195{ 1209{
1196 int dirn; 1210 int dirn;
1197 1211
1198 want_refresh = 1; 1212 want_refresh = 1;
1199 ZERO_SCROLLBACK (); 1213 ZERO_SCROLLBACK ();
… …
1218 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1232 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1219 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1220 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1221 */ 1235 */
1222void 1236void
1223rxvt_term::scr_erase_line (int mode) 1237rxvt_term::scr_erase_line (int mode) NOTHROW
1224{ 1238{
1225 unsigned int col, num; 1239 unsigned int col, num;
1226 1240
1227 want_refresh = 1; 1241 want_refresh = 1;
1228 ZERO_SCROLLBACK (); 1242 ZERO_SCROLLBACK ();
… …
1272 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1286 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1273 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1287 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1274 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1288 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1275 */ 1289 */
1276void 1290void
1277rxvt_term::scr_erase_screen (int mode) 1291rxvt_term::scr_erase_screen (int mode) NOTHROW
1278{ 1292{
1279 int num; 1293 int num;
1280 int32_t row; 1294 int32_t row;
1281 rend_t ren; 1295 rend_t ren;
1282 XGCValues gcvalue; 1296 XGCValues gcvalue;
… …
1327 } 1341 }
1328 else 1342 else
1329 { 1343 {
1330 ren = rstyle & (RS_fgMask | RS_bgMask); 1344 ren = rstyle & (RS_fgMask | RS_bgMask);
1331 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1345 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1332 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1346 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1333 ERASE_ROWS (row, num); 1347 ERASE_ROWS (row, num);
1334 gcvalue.foreground = pix_colors[Color_fg]; 1348 gcvalue.foreground = pix_colors[Color_fg];
1335 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1349 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1336 } 1350 }
1337 1351
1338 for (; num--; row++) 1352 for (; num--; row++)
1339 { 1353 {
1340 scr_blank_screen_mem (ROW(row), rstyle); 1354 scr_blank_screen_mem (ROW(row), rstyle);
1341 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1355 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1342 } 1356 }
1343} 1357}
1344 1358
1345#if ENABLE_FRILLS 1359#if !ENABLE_MINIMAL
1346void 1360void
1347rxvt_term::scr_erase_savelines () 1361rxvt_term::scr_erase_savelines () NOTHROW
1348{ 1362{
1349 want_refresh = 1; 1363 want_refresh = 1;
1350 ZERO_SCROLLBACK (); 1364 ZERO_SCROLLBACK ();
1351 1365
1352 top_row = 0; 1366 top_row = 0;
… …
1357/* 1371/*
1358 * Fill the screen with `E's 1372 * Fill the screen with `E's
1359 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1373 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1360 */ 1374 */
1361void 1375void
1362rxvt_term::scr_E () 1376rxvt_term::scr_E () NOTHROW
1363{ 1377{
1364 rend_t fs; 1378 rend_t fs;
1365 1379
1366 want_refresh = 1; 1380 want_refresh = 1;
1367 ZERO_SCROLLBACK (); 1381 ZERO_SCROLLBACK ();
… …
1388/* ------------------------------------------------------------------------- */ 1402/* ------------------------------------------------------------------------- */
1389/* 1403/*
1390 * Insert/Delete <count> lines 1404 * Insert/Delete <count> lines
1391 */ 1405 */
1392void 1406void
1393rxvt_term::scr_insdel_lines (int count, int insdel) 1407rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1394{ 1408{
1395 int end; 1409 int end;
1396 1410
1397 ZERO_SCROLLBACK (); 1411 ZERO_SCROLLBACK ();
1398 1412
… …
1418/* ------------------------------------------------------------------------- */ 1432/* ------------------------------------------------------------------------- */
1419/* 1433/*
1420 * Insert/Delete <count> characters from the current position 1434 * Insert/Delete <count> characters from the current position
1421 */ 1435 */
1422void 1436void
1423rxvt_term::scr_insdel_chars (int count, int insdel) 1437rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1424{ 1438{
1425 int col, row; 1439 int col, row;
1426 rend_t tr; 1440 rend_t tr;
1427 1441
1428 want_refresh = 1; 1442 want_refresh = 1;
… …
1459 { 1473 {
1460 if (selection.end.row != screen.cur.row 1474 if (selection.end.row != screen.cur.row
1461 || (selection.end.col + count >= ncol)) 1475 || (selection.end.col + count >= ncol))
1462 CLEAR_SELECTION (); 1476 CLEAR_SELECTION ();
1463 else 1477 else
1478 {
1464 { /* shift selection */ 1479 /* shift selection */
1465 selection.beg.col += count; 1480 selection.beg.col += count;
1466 selection.mark.col += count; /* XXX: yes? */ 1481 selection.mark.col += count; /* XXX: yes? */
1467 selection.end.col += count; 1482 selection.end.col += count;
1468 } 1483 }
1469 } 1484 }
… …
1516/* 1531/*
1517 * Set the scrolling region 1532 * Set the scrolling region
1518 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1533 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1519 */ 1534 */
1520void 1535void
1521rxvt_term::scr_scroll_region (int top, int bot) 1536rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1522{ 1537{
1523 max_it (top, 0); 1538 max_it (top, 0);
1524 min_it (bot, nrow - 1); 1539 min_it (bot, nrow - 1);
1525 1540
1526 if (top > bot) 1541 if (top > bot)
… …
1536 * Make the cursor visible/invisible 1551 * Make the cursor visible/invisible
1537 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1552 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1538 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1553 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1539 */ 1554 */
1540void 1555void
1541rxvt_term::scr_cursor_visible (int mode) 1556rxvt_term::scr_cursor_visible (int mode) NOTHROW
1542{ 1557{
1543 want_refresh = 1; 1558 want_refresh = 1;
1544 1559
1545 if (mode) 1560 if (mode)
1546 screen.flags |= Screen_VisibleCursor; 1561 screen.flags |= Screen_VisibleCursor;
… …
1553 * Set/unset automatic wrapping 1568 * Set/unset automatic wrapping
1554 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1569 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1555 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1570 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1556 */ 1571 */
1557void 1572void
1558rxvt_term::scr_autowrap (int mode) 1573rxvt_term::scr_autowrap (int mode) NOTHROW
1559{ 1574{
1560 if (mode) 1575 if (mode)
1561 screen.flags |= Screen_Autowrap; 1576 screen.flags |= Screen_Autowrap;
1562 else 1577 else
1563 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1578 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1572 * and the cursor cannot be moved outside. 1587 * and the cursor cannot be moved outside.
1573 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1588 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1574 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1589 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1575 */ 1590 */
1576void 1591void
1577rxvt_term::scr_relative_origin (int mode) 1592rxvt_term::scr_relative_origin (int mode) NOTHROW
1578{ 1593{
1579 if (mode) 1594 if (mode)
1580 screen.flags |= Screen_Relative; 1595 screen.flags |= Screen_Relative;
1581 else 1596 else
1582 screen.flags &= ~Screen_Relative; 1597 screen.flags &= ~Screen_Relative;
… …
1589 * Set insert/replace mode 1604 * Set insert/replace mode
1590 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1605 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1591 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1606 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1592 */ 1607 */
1593void 1608void
1594rxvt_term::scr_insert_mode (int mode) 1609rxvt_term::scr_insert_mode (int mode) NOTHROW
1595{ 1610{
1596 if (mode) 1611 if (mode)
1597 screen.flags |= Screen_Insert; 1612 screen.flags |= Screen_Insert;
1598 else 1613 else
1599 screen.flags &= ~Screen_Insert; 1614 screen.flags &= ~Screen_Insert;
… …
1605 * XTERM_SEQ: Set tab at current column : ESC H 1620 * XTERM_SEQ: Set tab at current column : ESC H
1606 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1621 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1607 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1622 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1608 */ 1623 */
1609void 1624void
1610rxvt_term::scr_set_tab (int mode) 1625rxvt_term::scr_set_tab (int mode) NOTHROW
1611{ 1626{
1612 if (mode < 0) 1627 if (mode < 0)
1613 memset (tabs, 0, ncol * sizeof (char)); 1628 memset (tabs, 0, ncol);
1614 else if (screen.cur.col < ncol) 1629 else if (screen.cur.col < ncol)
1615 tabs [screen.cur.col] = !!mode; 1630 tabs [screen.cur.col] = !!mode;
1616} 1631}
1617 1632
1618/* ------------------------------------------------------------------------- */ 1633/* ------------------------------------------------------------------------- */
… …
1620 * Set reverse/normal video 1635 * Set reverse/normal video
1621 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1636 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1622 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1637 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1623 */ 1638 */
1624void 1639void
1625rxvt_term::scr_rvideo_mode (int mode) 1640rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1626{ 1641{
1627 XGCValues gcvalue; 1642 rvideo_mode = on;
1628 1643
1644#ifndef NO_BELL
1645 on ^= rvideo_bell;
1646#endif
1647
1629 if (rvideo != mode) 1648 if (rvideo_state != on)
1630 { 1649 {
1631 rvideo = mode; 1650 rvideo_state = on;
1651
1632 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1633#if XPM_BACKGROUND 1653#ifdef HAVE_BG_PIXMAP
1634 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1635#endif 1655#endif
1636#if TRANSPARENT 1656 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 1657
1658 XGCValues gcvalue;
1642 gcvalue.foreground = pix_colors[Color_fg]; 1659 gcvalue.foreground = pix_colors[Color_fg];
1643 gcvalue.background = pix_colors[Color_bg]; 1660 gcvalue.background = pix_colors[Color_bg];
1644 XChangeGC (display->display, gc, GCBackground | GCForeground, 1661 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1645 &gcvalue); 1662
1646 scr_clear (); 1663 scr_clear ();
1647 scr_touch (true); 1664 scr_touch (true);
1648 } 1665 }
1649} 1666}
1650 1667
… …
1652/* 1669/*
1653 * Report current cursor position 1670 * Report current cursor position
1654 * XTERM_SEQ: Report position: ESC [ 6 n 1671 * XTERM_SEQ: Report position: ESC [ 6 n
1655 */ 1672 */
1656void 1673void
1657rxvt_term::scr_report_position () 1674rxvt_term::scr_report_position () NOTHROW
1658{ 1675{
1659 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1676 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1660} 1677}
1661 1678
1662/* ------------------------------------------------------------------------- * 1679/* ------------------------------------------------------------------------- *
… …
1665 1682
1666/* 1683/*
1667 * Set font style 1684 * Set font style
1668 */ 1685 */
1669void 1686void
1670rxvt_term::set_font_style () 1687rxvt_term::set_font_style () NOTHROW
1671{ 1688{
1672#if 0 1689#if 0
1673 switch (charsets [screen.charset]) 1690 switch (charsets [screen.charset])
1674 { 1691 {
1675 case '0': /* DEC Special Character & Line Drawing Set */ 1692 case '0': /* DEC Special Character & Line Drawing Set */
… …
1697 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1714 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1698 * XTERM_SEQ: Invoke G2 character set: ESC N 1715 * XTERM_SEQ: Invoke G2 character set: ESC N
1699 * XTERM_SEQ: Invoke G3 character set: ESC O 1716 * XTERM_SEQ: Invoke G3 character set: ESC O
1700 */ 1717 */
1701void 1718void
1702rxvt_term::scr_charset_choose (int set) 1719rxvt_term::scr_charset_choose (int set) NOTHROW
1703{ 1720{
1704 screen.charset = set; 1721 screen.charset = set;
1705 set_font_style (); 1722 set_font_style ();
1706} 1723}
1707 1724
… …
1713 * XTERM_SEQ: Set G2 character set: ESC * <C> 1730 * XTERM_SEQ: Set G2 character set: ESC * <C>
1714 * XTERM_SEQ: Set G3 character set: ESC + <C> 1731 * XTERM_SEQ: Set G3 character set: ESC + <C>
1715 * See set_font_style for possible values for <C> 1732 * See set_font_style for possible values for <C>
1716 */ 1733 */
1717void 1734void
1718rxvt_term::scr_charset_set (int set, unsigned int ch) 1735rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1719{ 1736{
1720 charsets[set] = (unsigned char)ch; 1737 charsets[set] = (unsigned char)ch;
1721 set_font_style (); 1738 set_font_style ();
1722} 1739}
1723 1740
… …
1728 1745
1729/* 1746/*
1730 * refresh matching text. 1747 * refresh matching text.
1731 */ 1748 */
1732bool 1749bool
1733rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1750rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1734{ 1751{
1735 bool found = false; 1752 bool found = false;
1736 1753
1737 for (int i = 0; i < nrow; i++) 1754 for (int i = 0; i < nrow; i++)
1738 { 1755 {
1739 int col = 0;
1740 rend_t *drp = drawn_buf[i].r; 1756 rend_t *drp = drawn_buf[i].r;
1741 1757
1742 for (; col < ncol; col++, drp++) 1758 for (int col = 0; col < ncol; col++, drp++)
1743 if ((*drp & mask) == value) 1759 if ((*drp & mask) == value)
1744 { 1760 {
1745 found = true; 1761 found = true;
1746 *drp = ~value; 1762 *drp = ~value;
1747 } 1763 }
… …
1758 PART_END, 1774 PART_END,
1759 RC_COUNT 1775 RC_COUNT
1760}; 1776};
1761 1777
1762void 1778void
1763rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1779rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1764{ 1780{
1765 int i; 1781 int i;
1766 row_col_t rc[RC_COUNT]; 1782 row_col_t rc[RC_COUNT];
1767 1783
1768 if (!drawn_buf) /* sanity check */ 1784 if (!drawn_buf) /* sanity check */
… …
1787 for (i = PART_BEG; i < RC_COUNT; i++) 1803 for (i = PART_BEG; i < RC_COUNT; i++)
1788 { 1804 {
1789 min_it (rc[i].col, ncol - 1); 1805 min_it (rc[i].col, ncol - 1);
1790 min_it (rc[i].row, nrow - 1); 1806 min_it (rc[i].row, nrow - 1);
1791 } 1807 }
1792 1808// 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++) 1809 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); 1810 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1795 1811
1796 num_scr_allow = 0; 1812 num_scr_allow = 0;
1797 1813
… …
1802/* ------------------------------------------------------------------------- */ 1818/* ------------------------------------------------------------------------- */
1803/* 1819/*
1804 * Refresh the entire screen 1820 * Refresh the entire screen
1805 */ 1821 */
1806void 1822void
1807rxvt_term::scr_touch (bool refresh) 1823rxvt_term::scr_touch (bool refresh) NOTHROW
1808{ 1824{
1809 scr_expose (0, 0, width, height, refresh); 1825 scr_expose (0, 0, width, height, refresh);
1810} 1826}
1811 1827
1812/* ------------------------------------------------------------------------- */ 1828/* ------------------------------------------------------------------------- */
1813/* 1829/*
1814 * Move the display so that the line represented by scrollbar value Y is at 1830 * Move the display so that the line represented by scrollbar value Y is at
1815 * the top of the screen 1831 * the top of the screen
1816 */ 1832 */
1817void 1833void
1818rxvt_term::scr_move_to (int y, int len) 1834rxvt_term::scr_move_to (int y, int len) NOTHROW
1819{ 1835{
1820 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1836 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1821} 1837}
1822 1838
1823/* ------------------------------------------------------------------------- */ 1839/* ------------------------------------------------------------------------- */
1824/* 1840/*
1825 * Page the screen up/down nlines 1841 * Page the screen up/down nlines
1826 * direction should be UP or DN 1842 * direction should be UP or DN
1827 */ 1843 */
1828bool 1844bool
1829rxvt_term::scr_page (enum page_dirn direction, int nlines) 1845rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1830{ 1846{
1831 int new_view_start = 1847 int new_view_start =
1832 direction == UP ? view_start - nlines 1848 direction == UP ? view_start - nlines
1833 : view_start + nlines; 1849 : view_start + nlines;
1834 1850
1835 return scr_changeview (new_view_start); 1851 return scr_changeview (new_view_start);
1836} 1852}
1837 1853
1838bool 1854bool
1839rxvt_term::scr_changeview (int new_view_start) 1855rxvt_term::scr_changeview (int new_view_start) NOTHROW
1840{ 1856{
1841 clamp_it (new_view_start, top_row, 0); 1857 clamp_it (new_view_start, top_row, 0);
1842 1858
1843 if (new_view_start == view_start) 1859 if (new_view_start == view_start)
1844 return false; 1860 return false;
… …
1850 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1866 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1851 1867
1852 return true; 1868 return true;
1853} 1869}
1854 1870
1855/* ------------------------------------------------------------------------- */ 1871#ifndef NO_BELL
1856void 1872void
1873rxvt_term::bell_cb (ev::timer &w, int revents)
1874{
1875 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode);
1877}
1878#endif
1879
1880/* ------------------------------------------------------------------------- */
1881void
1857rxvt_term::scr_bell () 1882rxvt_term::scr_bell () NOTHROW
1858{ 1883{
1859#ifndef NO_BELL 1884#ifndef NO_BELL
1860 1885
1861# ifndef NO_MAPALERT 1886# ifndef NO_MAPALERT
1862# ifdef MAPALERT_OPTION 1887# ifdef MAPALERT_OPTION
1863 if (OPTION (Opt_mapAlert)) 1888 if (option (Opt_mapAlert))
1864# endif 1889# endif
1865 XMapWindow (display->display, parent[0]); 1890 XMapWindow (dpy, parent[0]);
1866# endif 1891# endif
1867 1892
1868 if (OPTION (Opt_visualBell)) 1893# if ENABLE_FRILLS
1894 if (option (Opt_urgentOnBell))
1895 {
1896 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1897 {
1898 h->flags |= XUrgencyHint;
1899 XSetWMHints (dpy, parent[0], h);
1900 }
1869 { 1901 }
1870 scr_rvideo_mode (!rvideo); /* refresh also done */ 1902# endif
1903
1904 if (option (Opt_visualBell))
1905 {
1906 rvideo_bell = true;
1907 scr_rvideo_mode (rvideo_mode);
1871 display->flush (); 1908 display->flush ();
1909
1872 rxvt_usleep (VISUAL_BELL_DURATION); 1910 bell_ev.start (VISUAL_BELL_DURATION);
1873 scr_rvideo_mode (!rvideo); /* refresh also done */
1874 } 1911 }
1875 else 1912 else
1876 XBell (display->display, 0); 1913 XBell (dpy, 0);
1877
1878#endif 1914#endif
1879} 1915}
1880 1916
1881/* ------------------------------------------------------------------------- */ 1917/* ------------------------------------------------------------------------- */
1882/* ARGSUSED */ 1918/* ARGSUSED */
1883void 1919void
1884rxvt_term::scr_printscreen (int fullhist) 1920rxvt_term::scr_printscreen (int fullhist) NOTHROW
1885{ 1921{
1886#ifdef PRINTPIPE 1922#ifdef PRINTPIPE
1887 int nrows, row_start; 1923 int nrows, row_start;
1888 FILE *fd; 1924 FILE *fd;
1889 1925
… …
1938 * Refresh the screen 1974 * Refresh the screen
1939 * drawn_text/drawn_rend contain the screen information before the update. 1975 * drawn_text/drawn_rend contain the screen information before the update.
1940 * screen.text/screen.rend contain what the screen will change to. 1976 * screen.text/screen.rend contain what the screen will change to.
1941 */ 1977 */
1942void 1978void
1943rxvt_term::scr_refresh () 1979rxvt_term::scr_refresh () NOTHROW
1944{ 1980{
1945 unsigned char must_clear, /* use draw_string not draw_image_string */ 1981 unsigned char have_bg,
1946 showcursor; /* show the cursor */ 1982 showcursor; /* show the cursor */
1947 int16_t col, row, /* column/row we're processing */ 1983 int16_t col, row, /* column/row we're processing */
1948 ocrow; /* old cursor row */ 1984 ocrow; /* old cursor row */
1949 int i; /* tmp */ 1985 int i; /* tmp */
1950#ifndef NO_CURSORCOLOR 1986#ifndef NO_CURSORCOLOR
1951 rend_t cc1; /* store colours at cursor position (s) */ 1987 rend_t cc1; /* store colours at cursor position (s) */
1952#endif 1988#endif
1953 rend_t *crp; // cursor rendition pointer 1989 rend_t *crp; // cursor rendition pointer
1990 rend_t ccol1, /* Cursor colour */
1991 ccol2; /* Cursor colour2 */
1954 1992
1955 want_refresh = 0; /* screen is current */ 1993 want_refresh = 0; /* screen is current */
1956 1994
1957 if (refresh_type == NO_REFRESH || !mapped) 1995 if (refresh_type == NO_REFRESH || !mapped)
1958 return; 1996 return;
1959 1997
1960 /* 1998 /*
1961 * A: set up vars 1999 * A: set up vars
1962 */ 2000 */
1963 must_clear = 0; 2001 have_bg = 0;
1964 refresh_count = 0; 2002 refresh_count = 0;
1965 2003
1966#if XPM_BACKGROUND 2004#ifdef HAVE_BG_PIXMAP
1967 must_clear |= bgPixmap.pixmap != None; 2005 have_bg |= bgPixmap.pixmap != None;
1968#endif
1969#if TRANSPARENT
1970 must_clear |= OPTION (Opt_transparent) && am_transparent;
1971#endif 2006#endif
1972 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2007 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1973 2008
1974 /* 2009 /*
1975 * B: reverse any characters which are selected 2010 * B: reverse any characters which are selected
… …
1979 /* 2014 /*
1980 * C: set the cursor character (s) 2015 * C: set the cursor character (s)
1981 */ 2016 */
1982 { 2017 {
1983 unsigned char setoldcursor; 2018 unsigned char setoldcursor;
1984 rend_t ccol1, /* Cursor colour */
1985 ccol2; /* Cursor colour2 */
1986 2019
1987 showcursor = (screen.flags & Screen_VisibleCursor); 2020 showcursor = (screen.flags & Screen_VisibleCursor);
1988#ifdef CURSOR_BLINK 2021#ifdef CURSOR_BLINK
1989 if (hidden_cursor) 2022 if (hidden_cursor)
1990 showcursor = 0; 2023 showcursor = 0;
… …
1997 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2030 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1998 col--; 2031 col--;
1999 2032
2000 crp = &ROW(screen.cur.row).r[col]; 2033 crp = &ROW(screen.cur.row).r[col];
2001 2034
2035#ifndef NO_CURSORCOLOR
2036 cc1 = *crp & (RS_fgMask | RS_bgMask);
2037 if (ISSET_PIXCOLOR (Color_cursor))
2038 ccol1 = Color_cursor;
2039 else
2040#endif
2041#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2042 ccol1 = fgcolor_of (rstyle);
2043#else
2044 ccol1 = Color_fg;
2045#endif
2046
2047#ifndef NO_CURSORCOLOR
2048 if (ISSET_PIXCOLOR (Color_cursor2))
2049 ccol2 = Color_cursor2;
2050 else
2051#endif
2052#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2053 ccol2 = bgcolor_of (rstyle);
2054#else
2055 ccol2 = Color_bg;
2056#endif
2057
2002 if (showcursor && focus) 2058 if (showcursor && focus)
2003 { 2059 {
2004 if (OPTION (Opt_cursorUnderline)) 2060 if (option (Opt_cursorUnderline))
2005 *crp ^= RS_Uline; 2061 *crp ^= RS_Uline;
2006 else 2062 else
2007 { 2063 {
2008 *crp ^= RS_RVid; 2064 *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); 2065 *crp = SET_FGCOLOR (*crp, ccol1);
2029 *crp = SET_BGCOLOR (*crp, ccol2); 2066 *crp = SET_BGCOLOR (*crp, ccol2);
2030#endif
2031 } 2067 }
2032 } 2068 }
2033 } 2069 }
2034 2070
2035 /* make sure no outline cursor is left around */ 2071 /* make sure no outline cursor is left around */
… …
2074 * D: CopyArea pass - very useful for slower links 2110 * D: CopyArea pass - very useful for slower links
2075 * This has been deliberately kept simple. 2111 * This has been deliberately kept simple.
2076 */ 2112 */
2077 if (!display->is_local 2113 if (!display->is_local
2078 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2114 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2079 && abs (num_scr) < nrow && !must_clear) 2115 && abs (num_scr) < nrow && !have_bg)
2080 { 2116 {
2081 int16_t nits; 2117 int16_t nits;
2118 int i = num_scr;
2082 int j; 2119 int j;
2083 int len, wlen; 2120 int len, wlen;
2084 dLocal (int, num_scr); 2121 dLocal (int, num_scr);
2085 2122
2086 j = nrow; 2123 j = nrow;
2087 wlen = len = -1; 2124 wlen = len = -1;
2088 row = i > 0 ? 0 : j - 1; 2125 row = i > 0 ? 0 : j - 1;
2126
2089 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2127 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2090 { 2128 {
2091 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2129 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2092 { 2130 {
2093 line_t s = ROW(view_start + row); 2131 line_t s = ROW(view_start + row);
… …
2114 wlen = row; 2152 wlen = row;
2115 continue; 2153 continue;
2116 } 2154 }
2117 } 2155 }
2118 2156
2119 if (len != -1) 2157 if (len >= 0)
2120 { 2158 {
2121 /* also comes here at end if needed because of >= above */ 2159 /* also comes here at end if needed because of >= above */
2122 if (wlen < len) 2160 if (wlen < len)
2123 ::swap (wlen, len); 2161 ::swap (wlen, len);
2124 2162
2163 XGCValues gcv;
2164
2165 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2125 XCopyArea (display->display, vt, vt, 2166 XCopyArea (dpy, vt, vt,
2126 gc, 0, Row2Pixel (len + i), 2167 gc, 0, Row2Pixel (len + i),
2127 (unsigned int)this->width, 2168 (unsigned int)this->width,
2128 (unsigned int)Height2Pixel (wlen - len + 1), 2169 (unsigned int)Height2Pixel (wlen - len + 1),
2129 0, Row2Pixel (len)); 2170 0, Row2Pixel (len));
2171 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2172
2130 len = -1; 2173 len = -1;
2131 } 2174 }
2132 } 2175 }
2133 } 2176 }
2134#endif 2177#endif
… …
2190 count++; 2233 count++;
2191 2234
2192 if (stp[col] != dtp[col] 2235 if (stp[col] != dtp[col]
2193 || !RS_SAME (srp[col], drp[col])) 2236 || !RS_SAME (srp[col], drp[col]))
2194 { 2237 {
2195 if (must_clear && (i++ > count / 2)) 2238 if (have_bg && (i++ > count / 2))
2196 break; 2239 break;
2197 2240
2198 dtp[col] = stp[col]; 2241 dtp[col] = stp[col];
2199 drp[col] = rend; 2242 drp[col] = rend;
2200 i = 0; 2243 i = 0;
2201 } 2244 }
2202 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2245 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2203 break; 2246 break;
2204 } 2247 }
2205 2248
2206 col--; /* went one too far. move back */ 2249 col--; /* went one too far. move back */
2207 count -= i; /* dump any matching trailing chars */ 2250 count -= i; /* dump any matching trailing chars */
… …
2217 int back = bgcolor_of (rend); // desired background 2260 int back = bgcolor_of (rend); // desired background
2218 2261
2219 // only do special processing if any attributes are set, which is unlikely 2262 // 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)) 2263 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2221 { 2264 {
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; 2265 bool invert = rend & RS_RVid;
2235 2266
2236#ifndef NO_BOLD_UNDERLINE_REVERSE 2267#ifndef NO_BOLD_UNDERLINE_REVERSE
2237 if (rend & RS_Bold 2268 if (rend & RS_Bold
2238 && fore == Color_fg) 2269 && fore == Color_fg)
… …
2254 else 2285 else
2255 invert = !invert; 2286 invert = !invert;
2256# endif 2287# endif
2257 } 2288 }
2258 2289
2259 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2260 fore = Color_UL; 2291 fore = Color_UL;
2261#endif 2292#endif
2262 2293
2263 if (invert) 2294 if (invert)
2264 { 2295 {
2296#ifdef OPTION_HC
2297 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2298 || !ISSET_PIXCOLOR (Color_HC))
2299#endif
2300 /* invert the column if no highlightColor is set or it is the
2301 * current cursor column */
2265 ::swap (fore, back); 2302 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2266 2307
2267#ifndef NO_BOLD_UNDERLINE_REVERSE 2308#ifndef NO_BOLD_UNDERLINE_REVERSE
2309# ifndef OPTION_HC
2268 if (ISSET_PIXCOLOR (Color_RV)) 2310 if (ISSET_PIXCOLOR (Color_RV))
2269 back = Color_RV; 2311 back = Color_RV;
2270 2312# endif
2271 if (fore == back) 2313 if (fore == back)
2272 { 2314 {
2273 fore = Color_bg; 2315 fore = Color_bg;
2274 back = Color_fg; 2316 back = Color_fg;
2275 } 2317 }
… …
2277 } 2319 }
2278 2320
2279#ifdef TEXT_BLINK 2321#ifdef TEXT_BLINK
2280 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2281 { 2323 {
2282 if (!text_blink_ev.active) 2324 if (!ev_is_active (&text_blink_ev))
2283 { 2325 {
2284 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2326 text_blink_ev.start (TEXT_BLINK_INTERVAL, TEXT_BLINK_INTERVAL);
2285 hidden_text = 0; 2327 hidden_text = 0;
2286 } 2328 }
2287 else if (hidden_text) 2329 else if (hidden_text)
2288 fore = back; 2330 fore = back;
2289 } 2331 }
2290#endif 2332#endif
2333
2334#if ENABLE_STYLES
2335 // "careful" (too wide) character handling
2336
2337 // include previous careful character(s) if possible, looks nicer (best effort...)
2338 while (text > stp
2339 && srp[text - stp - 1] & RS_Careful
2340 && RS_SAME (rend, srp[text - stp - 1]))
2341 text--, count++, xpixel -= fwidth;
2342
2343 // force redraw after "careful" characters to avoid pixel droppings
2344 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2345 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2346
2347 // force redraw before "careful" characters to avoid pixel droppings
2348 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2349 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2350#endif
2291 } 2351 }
2292 2352
2293 /* 2353 /*
2294 * Actually do the drawing of the string here 2354 * Actually do the drawing of the string here
2295 */ 2355 */
2296 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2297 2357
2298 if (back == fore)
2299 font->clear_rect (*drawable, xpixel, ypixel,
2300 fwidth * count, fheight,
2301 back);
2302 else if (back == Color_bg) 2358 if (have_bg && back == Color_bg)
2303 { 2359 {
2304 if (must_clear) 2360 // this is very ugly, maybe push it into ->draw?
2305 {
2306 CLEAR_CHARS (xpixel, ypixel, count);
2307 2361
2308 for (i = 0; i < count; i++) /* don't draw empty strings */ 2362 for (i = 0; i < count; i++) /* don't draw empty strings */
2309 if (text[i] != ' ') 2363 if (text[i] != ' ')
2310 { 2364 {
2311 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2365 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2312 break; 2366 goto did_clear;
2313 }
2314 } 2367 }
2315 else 2368
2316 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2369 CLEAR_CHARS (xpixel, ypixel, count);
2370 did_clear: ;
2317 } 2371 }
2318 else 2372 else
2319 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2320 2374
2321 if (rend & RS_Uline && font->descent > 1 && fore != back) 2375 if (rend & RS_Uline && font->descent > 1 && fore != back)
2322 { 2376 {
2323#if ENABLE_FRILLS 2377#if ENABLE_FRILLS
2324 if (ISSET_PIXCOLOR (Color_underline)) 2378 if (ISSET_PIXCOLOR (Color_underline))
2325 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2379 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2326 else 2380 else
2327#endif 2381#endif
2328 XSetForeground (display->display, gc, pix_colors[fore]); 2382 XSetForeground (dpy, gc, pix_colors[fore]);
2329 2383
2330 XDrawLine (display->display, drawBuffer, gc, 2384 XDrawLine (dpy, drawBuffer, gc,
2331 xpixel, ypixel + font->ascent + 1, 2385 xpixel, ypixel + font->ascent + 1,
2332 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2333 } 2387 }
2334 } /* for (col....) */ 2388 } /* for (col....) */
2335 } /* for (row....) */ 2389 } /* for (row....) */
… …
2344 */ 2398 */
2345 if (showcursor) 2399 if (showcursor)
2346 { 2400 {
2347 if (focus) 2401 if (focus)
2348 { 2402 {
2349 if (OPTION (Opt_cursorUnderline)) 2403 if (option (Opt_cursorUnderline))
2350 *crp ^= RS_Uline; 2404 *crp ^= RS_Uline;
2351 else 2405 else
2352 { 2406 {
2353 *crp ^= RS_RVid; 2407 *crp ^= RS_RVid;
2354#ifndef NO_CURSORCOLOR 2408#ifndef NO_CURSORCOLOR
… …
2368 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2422 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2369 cursorwidth++; 2423 cursorwidth++;
2370 2424
2371#ifndef NO_CURSORCOLOR 2425#ifndef NO_CURSORCOLOR
2372 if (ISSET_PIXCOLOR (Color_cursor)) 2426 if (ISSET_PIXCOLOR (Color_cursor))
2373 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2427 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2428 else
2374#endif 2429#endif
2430 XSetForeground (dpy, gc, pix_colors[ccol1]);
2375 2431
2376 XDrawRectangle (display->display, drawBuffer, gc, 2432 XDrawRectangle (dpy, drawBuffer, gc,
2377 Col2Pixel (col), 2433 Col2Pixel (col),
2378 Row2Pixel (oldcursor.row), 2434 Row2Pixel (oldcursor.row),
2379 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2435 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2380 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2381 } 2437 }
… …
2389 num_scr = 0; 2445 num_scr = 0;
2390 num_scr_allow = 1; 2446 num_scr_allow = 1;
2391} 2447}
2392 2448
2393void 2449void
2394rxvt_term::scr_remap_chars (line_t &l) 2450rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2395{ 2451{
2396 if (!l.t) 2452 if (!l.t)
2397 return; 2453 return;
2398 2454
2399 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2455 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2401 for (int i = ncol; i--; ) 2457 for (int i = ncol; i--; )
2402 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2458 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2403} 2459}
2404 2460
2405void 2461void
2406rxvt_term::scr_remap_chars () 2462rxvt_term::scr_remap_chars () NOTHROW
2407{ 2463{
2408 for (int i = total_rows; i--; ) 2464 for (int i = total_rows; i--; )
2409 scr_remap_chars (row_buf [i]); 2465 scr_remap_chars (row_buf [i]);
2410 2466
2411 for (int i = nrow; i--; ) 2467 for (int i = nrow; i--; )
… …
2414 scr_remap_chars (swap_buf [i]); 2470 scr_remap_chars (swap_buf [i]);
2415 } 2471 }
2416} 2472}
2417 2473
2418void 2474void
2419rxvt_term::scr_recolour () 2475rxvt_term::scr_recolour () NOTHROW
2420{ 2476{
2421 if (1 2477#ifdef HAVE_BG_PIXMAP
2422#if TRANSPARENT 2478 bgPixmap.apply ();
2423 && !am_transparent 2479#else
2424#endif
2425#if XPM_BACKGROUND
2426 && !bgPixmap.pixmap
2427#endif
2428 )
2429 {
2430 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2431 XClearWindow (display->display, parent[0]); 2481 XClearWindow (dpy, parent[0]);
2432 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2433#if HAVE_SCROLLBARS 2483# if HAVE_SCROLLBARS
2434 if (scrollBar.win) 2484 if (scrollBar.win)
2435 { 2485 {
2436 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2437 scrollBar.setIdle (); 2487 scrollBar.setIdle ();
2438 scrollbar_show (0); 2488 scrollbar_show (0);
2439 } 2489 }
2440#endif 2490# endif
2441 }
2442
2443 scr_clear (); 2491 scr_clear ();
2444 scr_touch (true); 2492 scr_touch (true);
2445 want_refresh = 1; 2493 want_refresh = 1;
2446} 2494#endif
2447 2495
2496}
2497
2448/* ------------------------------------------------------------------------- */ 2498/* ------------------------------------------------------------------------- */
2449void 2499void
2450rxvt_term::scr_clear (bool really) 2500rxvt_term::scr_clear (bool really) NOTHROW
2451{ 2501{
2452 if (!mapped) 2502 if (!mapped)
2453 return; 2503 return;
2454 2504
2455 num_scr_allow = 0; 2505 num_scr_allow = 0;
2456 want_refresh = 1; 2506 want_refresh = 1;
2457 2507
2458 if (really) 2508 if (really)
2459 XClearWindow (display->display, vt); 2509 XClearWindow (dpy, vt);
2460} 2510}
2461 2511
2462void 2512void
2463rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2513rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2464{ 2514{
2465 int view_end = view_start + nrow; 2515 int view_end = view_start + nrow;
2466 int row, col; 2516 int row, col;
2467 2517
2468 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2518 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2480 srp[col] ^= rstyle2; 2530 srp[col] ^= rstyle2;
2481 } 2531 }
2482} 2532}
2483 2533
2484void 2534void
2485rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2535rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2486{ 2536{
2487 int view_end = view_start + nrow; 2537 int view_end = view_start + nrow;
2488 int row, col; 2538 int row, col;
2489 2539
2490 if (beg_row >= view_start) 2540 if (beg_row >= view_start)
… …
2507 srp[col] ^= rstyle; 2557 srp[col] ^= rstyle;
2508} 2558}
2509 2559
2510/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2511void 2561void
2512rxvt_term::scr_reverse_selection () 2562rxvt_term::scr_reverse_selection () NOTHROW
2513{ 2563{
2514 if (selection.op 2564 if (selection.op
2515 && current_screen == selection.screen 2565 && current_screen == selection.screen
2516 && selection.end.row >= view_start) 2566 && selection.end.row >= view_start)
2517 { 2567 {
2518#if ENABLE_FRILLS 2568#if !ENABLE_MINIMAL
2519 if (selection.rect) 2569 if (selection.rect)
2520 scr_xor_rect (selection.beg.row, selection.beg.col, 2570 scr_xor_rect (selection.beg.row, selection.beg.col,
2521 selection.end.row, selection.end.col, 2571 selection.end.row, selection.end.col,
2522 RS_RVid, RS_RVid | RS_Uline); 2572 RS_RVid, RS_RVid | RS_Uline);
2523 else 2573 else
… …
2533 * Dump the whole scrollback and screen to the passed filedescriptor. The 2583 * Dump the whole scrollback and screen to the passed filedescriptor. The
2534 * invoking routine must close the fd. 2584 * invoking routine must close the fd.
2535 */ 2585 */
2536#if 0 2586#if 0
2537void 2587void
2538rxvt_term::scr_dump (int fd) 2588rxvt_term::scr_dump (int fd) NOTHROW
2539{ 2589{
2540 int row, wrote; 2590 int row, wrote;
2541 unsigned int width, towrite; 2591 unsigned int width, towrite;
2542 char r1[] = "\n"; 2592 char r1[] = "\n";
2543 2593
… …
2562 2612
2563/* ------------------------------------------------------------------------- * 2613/* ------------------------------------------------------------------------- *
2564 * CHARACTER SELECTION * 2614 * CHARACTER SELECTION *
2565 * ------------------------------------------------------------------------- */ 2615 * ------------------------------------------------------------------------- */
2566void 2616void
2567rxvt_term::selection_check (int check_more) 2617rxvt_term::selection_check (int check_more) NOTHROW
2568{ 2618{
2569 row_col_t pos; 2619 row_col_t pos;
2570 2620
2571 if (!selection.op) 2621 if (!selection.op)
2572 return; 2622 return;
… …
2593/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2594/* 2644/*
2595 * Paste a selection direct to the command fd 2645 * Paste a selection direct to the command fd
2596 */ 2646 */
2597void 2647void
2598rxvt_term::paste (char *data, unsigned int len) 2648rxvt_term::paste (char *data, unsigned int len) NOTHROW
2599{ 2649{
2600 /* convert normal newline chars into common keyboard Return key sequence */ 2650 /* convert normal newline chars into common keyboard Return key sequence */
2601 for (unsigned int i = 0; i < len; i++) 2651 for (unsigned int i = 0; i < len; i++)
2602 if (data[i] == C0_LF) 2652 if (data[i] == C0_LF)
2603 data[i] = C0_CR; 2653 data[i] = C0_CR;
… …
2609/* 2659/*
2610 * Respond to a notification that a primary selection has been sent 2660 * Respond to a notification that a primary selection has been sent
2611 * EXT: SelectionNotify 2661 * EXT: SelectionNotify
2612 */ 2662 */
2613void 2663void
2614rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2664rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2615{ 2665{
2616 if (prop == None) /* check for failed XConvertSelection */ 2666 if (prop == None) /* check for failed XConvertSelection */
2617 { 2667 {
2618 if ((selection_type & Sel_CompoundText)) 2668 if ((selection_type & Sel_CompoundText))
2619 { 2669 {
… …
2639 } 2689 }
2640 2690
2641 unsigned long bytes_after; 2691 unsigned long bytes_after;
2642 XTextProperty ct; 2692 XTextProperty ct;
2643 2693
2644 if (XGetWindowProperty (display->display, win, prop, 2694 if (XGetWindowProperty (dpy, win, prop,
2645 0, PROP_SIZE / 4, 2695 0, PROP_SIZE / 4,
2646 delete_prop, AnyPropertyType, 2696 delete_prop, AnyPropertyType,
2647 &ct.encoding, &ct.format, 2697 &ct.encoding, &ct.format,
2648 &ct.nitems, &bytes_after, 2698 &ct.nitems, &bytes_after,
2649 &ct.value) != Success) 2699 &ct.value) != Success)
… …
2658 if (bytes_after) 2708 if (bytes_after)
2659 { 2709 {
2660 // fetch and append remaining data 2710 // fetch and append remaining data
2661 XTextProperty ct2; 2711 XTextProperty ct2;
2662 2712
2663 if (XGetWindowProperty (display->display, win, prop, 2713 if (XGetWindowProperty (dpy, win, prop,
2664 ct.nitems / 4, (bytes_after + 3) / 4, 2714 ct.nitems / 4, (bytes_after + 3) / 4,
2665 delete_prop, AnyPropertyType, 2715 delete_prop, AnyPropertyType,
2666 &ct2.encoding, &ct2.format, 2716 &ct2.encoding, &ct2.format,
2667 &ct2.nitems, &bytes_after, 2717 &ct2.nitems, &bytes_after,
2668 &ct2.value) != Success) 2718 &ct2.value) != Success)
… …
2681 2731
2682 if (ct.encoding == xa[XA_INCR]) 2732 if (ct.encoding == xa[XA_INCR])
2683 { 2733 {
2684 // INCR selection, start handshake 2734 // INCR selection, start handshake
2685 if (!delete_prop) 2735 if (!delete_prop)
2686 XDeleteProperty (display->display, win, prop); 2736 XDeleteProperty (dpy, win, prop);
2687 2737
2688 selection_wait = Sel_incr; 2738 selection_wait = Sel_incr;
2689 incr_buf_fill = 0; 2739 incr_buf_fill = 0;
2690 incr_ev.start (NOW + 10); 2740 incr_ev.start (10);
2691 2741
2692 goto bailout; 2742 goto bailout;
2693 } 2743 }
2694 2744
2695 if (ct.nitems == 0) 2745 if (ct.nitems == 0)
… …
2704 ct.nitems = incr_buf_fill; 2754 ct.nitems = incr_buf_fill;
2705 incr_buf = 0; 2755 incr_buf = 0;
2706 incr_buf_size = 0; 2756 incr_buf_size = 0;
2707 incr_ev.stop (); 2757 incr_ev.stop ();
2708 } 2758 }
2709 else 2759 else
2710 { 2760 {
2711 if (selection_wait == Sel_normal 2761 if (selection_wait == Sel_normal
2712 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2762 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2713 { 2763 {
2714 /* 2764 /*
… …
2721 goto bailout; 2771 goto bailout;
2722 } 2772 }
2723 } 2773 }
2724 else if (selection_wait == Sel_incr) 2774 else if (selection_wait == Sel_incr)
2725 { 2775 {
2726 incr_ev.start (NOW + 10); 2776 incr_ev.start (10);
2727 2777
2728 while (incr_buf_fill + ct.nitems > incr_buf_size) 2778 while (incr_buf_fill + ct.nitems > incr_buf_size)
2729 { 2779 {
2730 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2780 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2731 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2781 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2738 } 2788 }
2739 2789
2740 char **cl; 2790 char **cl;
2741 int cr; 2791 int cr;
2742 2792
2743#if ENABLE_FRILLS 2793#if !ENABLE_MINIMAL
2744 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2794 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2745 // so recode it manually 2795 // so recode it manually
2746 if (ct.encoding == xa[XA_UTF8_STRING]) 2796 if (ct.encoding == xa[XA_UTF8_STRING])
2747 { 2797 {
2748 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2798 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2752 paste (s, strlen (s)); 2802 paste (s, strlen (s));
2753 free (s); 2803 free (s);
2754 } 2804 }
2755 else 2805 else
2756#endif 2806#endif
2757 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2807 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2758 && cl) 2808 && cl)
2759 { 2809 {
2760 for (int i = 0; i < cr; i++) 2810 for (int i = 0; i < cr; i++)
2761 paste (cl[i], strlen (cl[i])); 2811 paste (cl[i], strlen (cl[i]));
2762 2812
… …
2771 if (selection_wait == Sel_normal) 2821 if (selection_wait == Sel_normal)
2772 selection_wait = Sel_none; 2822 selection_wait = Sel_none;
2773} 2823}
2774 2824
2775void 2825void
2776rxvt_term::incr_cb (time_watcher &w) 2826rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2777{ 2827{
2778 selection_wait = Sel_none; 2828 selection_wait = Sel_none;
2779 2829
2780 incr_buf_size = 0; 2830 incr_buf_size = 0;
2781 free (incr_buf); 2831 free (incr_buf);
2782 2832
2783 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2833 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2784} 2834}
2785 2835
2786void 2836void
2787rxvt_term::selection_property (Window win, Atom prop) 2837rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2788{ 2838{
2789 if (prop == None || selection_wait != Sel_incr) 2839 if (prop == None || selection_wait != Sel_incr)
2790 return; 2840 return;
2791 2841
2792 selection_paste (win, prop, true); 2842 selection_paste (win, prop, true);
2793} 2843}
2794 2844
2795/* ------------------------------------------------------------------------- */ 2845/* ------------------------------------------------------------------------- */
2796/* 2846/*
2797 * Request the current selection: 2847 * Request the current selection:
2798 * Order: > internal selection if available 2848 * Order: > internal selection if available
2799 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2849 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2800 * > CUT_BUFFER0 2850 * > CUT_BUFFER0
2801 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2851 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2802 * will auto fallback to CUT_BUFFER0 2852 * will auto fallback to CUT_BUFFER0
2803 * EXT: button 2 release 2853 * EXT: button 2 release
2804 */ 2854 */
2805void 2855void
2806rxvt_term::selection_request (Time tm) 2856rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2807{ 2857{
2808 if (selection.text) 2858 if (selection.text && selnum == Sel_Primary)
2859 {
2809 { /* internal selection */ 2860 /* internal selection */
2810 char *str = rxvt_wcstombs (selection.text, selection.len); 2861 char *str = rxvt_wcstombs (selection.text, selection.len);
2811 paste (str, strlen (str)); 2862 paste (str, strlen (str));
2812 free (str); 2863 free (str);
2813 return; 2864 return;
2814 } 2865 }
2815 else 2866 else
2816 { 2867 {
2817 int i;
2818
2819 selection_request_time = tm; 2868 selection_request_time = tm;
2820 selection_wait = Sel_normal; 2869 selection_wait = Sel_normal;
2821 2870
2822 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2823 {
2824#if X_HAVE_UTF8_STRING 2871#if X_HAVE_UTF8_STRING
2825 selection_type = Sel_UTF8String; 2872 selection_type = Sel_UTF8String;
2826 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2873 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2827 return; 2874 return;
2828#else 2875#else
2829 selection_type = Sel_CompoundText; 2876 selection_type = Sel_CompoundText;
2830 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2877 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2831 return; 2878 return;
2832#endif 2879#endif
2833 }
2834 } 2880 }
2835 2881
2836 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2882 selection_wait = Sel_none; /* don't loop in selection_paste () */
2837 selection_paste (display->root, XA_CUT_BUFFER0, false); 2883 selection_paste (display->root, XA_CUT_BUFFER0, false);
2838} 2884}
2839 2885
2840int 2886int
2841rxvt_term::selection_request_other (Atom target, int selnum) 2887rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2842{ 2888{
2843 Atom sel; 2889 Atom sel;
2844 2890
2845 selection_type |= selnum; 2891 selection_type |= selnum;
2846 2892
… …
2849 else if (selnum == Sel_Secondary) 2895 else if (selnum == Sel_Secondary)
2850 sel = XA_SECONDARY; 2896 sel = XA_SECONDARY;
2851 else 2897 else
2852 sel = xa[XA_CLIPBOARD]; 2898 sel = xa[XA_CLIPBOARD];
2853 2899
2854 if (XGetSelectionOwner (display->display, sel) != None) 2900 if (XGetSelectionOwner (dpy, sel) != None)
2855 { 2901 {
2856 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2902 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2857 vt, selection_request_time); 2903 vt, selection_request_time);
2858 return 1; 2904 return 1;
2859 } 2905 }
2860 2906
2861 return 0; 2907 return 0;
… …
2865/* 2911/*
2866 * Clear all selected text 2912 * Clear all selected text
2867 * EXT: SelectionClear 2913 * EXT: SelectionClear
2868 */ 2914 */
2869void 2915void
2870rxvt_term::selection_clear () 2916rxvt_term::selection_clear () NOTHROW
2871{ 2917{
2872 want_refresh = 1; 2918 want_refresh = 1;
2873 free (selection.text); 2919 free (selection.text);
2874 selection.text = NULL; 2920 selection.text = NULL;
2875 selection.len = 0; 2921 selection.len = 0;
… …
2924 2970
2925 int end_col; 2971 int end_col;
2926 2972
2927 for (; row <= selection.end.row; row++, col = 0) 2973 for (; row <= selection.end.row; row++, col = 0)
2928 { 2974 {
2929#if ENABLE_FRILLS 2975#if !ENABLE_MINIMAL
2930 if (selection.rect) 2976 if (selection.rect)
2931 { 2977 {
2932 col = selection.beg.col; 2978 col = selection.beg.col;
2933 end_col = ncol + 1; 2979 end_col = ncol + 1;
2934 } 2980 }
… …
2937 end_col = ROW(row).l; 2983 end_col = ROW(row).l;
2938 2984
2939 col = max (col, 0); 2985 col = max (col, 0);
2940 2986
2941 if (row == selection.end.row 2987 if (row == selection.end.row
2942#if ENABLE_FRILLS 2988#if !ENABLE_MINIMAL
2943 || selection.rect 2989 || selection.rect
2944#endif 2990#endif
2945 ) 2991 )
2946 min_it (end_col, selection.end.col); 2992 min_it (end_col, selection.end.col);
2947 2993
… …
2970#endif 3016#endif
2971 else 3017 else
2972 new_selection_text[ofs++] = *t++; 3018 new_selection_text[ofs++] = *t++;
2973 } 3019 }
2974 3020
2975#if ENABLE_FRILLS 3021#if !ENABLE_MINIMAL
2976 if (selection.rect) 3022 if (selection.rect)
2977 { 3023 {
2978 while (ofs 3024 while (ofs
2979 && new_selection_text[ofs - 1] != C0_LF 3025 && new_selection_text[ofs - 1] != C0_LF
2980 && unicode::is_space (new_selection_text[ofs - 1])) 3026 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3010 3056
3011 selection_grab (tm); 3057 selection_grab (tm);
3012} 3058}
3013 3059
3014bool 3060bool
3015rxvt_term::selection_grab (Time tm) 3061rxvt_term::selection_grab (Time tm) NOTHROW
3016{ 3062{
3017 selection_time = tm; 3063 selection_time = tm;
3018 3064
3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3065 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3066 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3021 { 3067 {
3022 display->set_selection_owner (this); 3068 display->set_selection_owner (this);
3023 return true; 3069 return true;
3024 } 3070 }
3025 else 3071 else
… …
3029 } 3075 }
3030 3076
3031#if 0 3077#if 0
3032 XTextProperty ct; 3078 XTextProperty ct;
3033 3079
3034 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3080 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3035 { 3081 {
3036 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3082 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3037 XFree (ct.value); 3083 XFree (ct.value);
3038 } 3084 }
3039#endif 3085#endif
… …
3043/* 3089/*
3044 * Mark or select text based upon number of clicks: 1, 2, or 3 3090 * Mark or select text based upon number of clicks: 1, 2, or 3
3045 * EXT: button 1 press 3091 * EXT: button 1 press
3046 */ 3092 */
3047void 3093void
3048rxvt_term::selection_click (int clicks, int x, int y) 3094rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3049{ 3095{
3050 clicks = ((clicks - 1) % 3) + 1; 3096 clicks = ((clicks - 1) % 3) + 1;
3051 selection.clicks = clicks; /* save clicks so extend will work */ 3097 selection.clicks = clicks; /* save clicks so extend will work */
3052 3098
3053 if (clicks == 2 && !selection.rect 3099 if (clicks == 2 && !selection.rect
… …
3072/* ------------------------------------------------------------------------- */ 3118/* ------------------------------------------------------------------------- */
3073/* 3119/*
3074 * Mark a selection at the specified col/row 3120 * Mark a selection at the specified col/row
3075 */ 3121 */
3076void 3122void
3077rxvt_term::selection_start_colrow (int col, int row) 3123rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3078{ 3124{
3079 want_refresh = 1; 3125 want_refresh = 1;
3080 3126
3081 selection.mark.row = row + view_start; 3127 selection.mark.row = row + view_start;
3082 selection.mark.col = col; 3128 selection.mark.col = col;
… …
3085 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3131 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3086 3132
3087 while (selection.mark.col > 0 3133 while (selection.mark.col > 0
3088 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3134 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3089 --selection.mark.col; 3135 --selection.mark.col;
3090 3136
3091 if (selection.op) 3137 if (selection.op)
3138 {
3092 { /* clear the old selection */ 3139 /* clear the old selection */
3093 selection.beg.row = selection.end.row = selection.mark.row; 3140 selection.beg.row = selection.end.row = selection.mark.row;
3094 selection.beg.col = selection.end.col = selection.mark.col; 3141 selection.beg.col = selection.end.col = selection.mark.col;
3095 } 3142 }
3096 3143
3097 selection.op = SELECTION_INIT; 3144 selection.op = SELECTION_INIT;
… …
3108#define DELIMIT_TEXT(x) \ 3155#define DELIMIT_TEXT(x) \
3109 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3156 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3110#define DELIMIT_REND(x) 1 3157#define DELIMIT_REND(x) 1
3111 3158
3112void 3159void
3113rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3160rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3114{ 3161{
3115 int col, row, dirnadd, tcol, trow, w1, w2; 3162 int col, row, dirnadd, tcol, trow, w1, w2;
3116 row_col_t bound; 3163 row_col_t bound;
3117 text_t *stp; 3164 text_t *stp;
3118 rend_t *srp; 3165 rend_t *srp;
… …
3192 * flag == 0 ==> button 1 3239 * flag == 0 ==> button 1
3193 * flag == 1 ==> button 3 press 3240 * flag == 1 ==> button 3 press
3194 * flag == 2 ==> button 3 motion 3241 * flag == 2 ==> button 3 motion
3195 */ 3242 */
3196void 3243void
3197rxvt_term::selection_extend (int x, int y, int flag) 3244rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3198{ 3245{
3199 int col = clamp (Pixel2Col (x), 0, ncol); 3246 int col = clamp (Pixel2Col (x), 0, ncol);
3200 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3247 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3201 3248
3202 /* 3249 /*
… …
3228/* ------------------------------------------------------------------------- */ 3275/* ------------------------------------------------------------------------- */
3229/* 3276/*
3230 * Extend the selection to the specified col/row 3277 * Extend the selection to the specified col/row
3231 */ 3278 */
3232void 3279void
3233rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3280rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3234{ 3281{
3235 row_col_t pos; 3282 row_col_t pos;
3236 enum { 3283 enum {
3237 LEFT, RIGHT 3284 LEFT, RIGHT
3238 } closeto = RIGHT; 3285 } closeto = RIGHT;
… …
3286 * a point/word/line which is either the start or end of the selection 3333 * 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 3334 * and it was decided by whichever point/word/line was `fixed' at the
3288 * time of the most recent button3 press 3335 * time of the most recent button3 press
3289 */ 3336 */
3290 if (button3 && buttonpress) 3337 if (button3 && buttonpress)
3338 {
3291 { /* button3 press */ 3339 /* button3 press */
3292 /* 3340 /*
3293 * first determine which edge of the selection we are closest to 3341 * first determine which edge of the selection we are closest to
3294 */ 3342 */
3295 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3343 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3296 || (!ROWCOL_IS_AFTER (pos, selection.end) 3344 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3314 selection.mark.row = selection.beg.row; 3362 selection.mark.row = selection.beg.row;
3315 selection.mark.col = selection.beg.col; 3363 selection.mark.col = selection.beg.col;
3316 } 3364 }
3317 } 3365 }
3318 else 3366 else
3367 {
3319 { /* button1 drag or button3 drag */ 3368 /* button1 drag or button3 drag */
3320 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3369 if (ROWCOL_IS_AFTER (selection.mark, pos))
3321 { 3370 {
3322 if (selection.mark.row == selection.end.row 3371 if (selection.mark.row == selection.end.row
3323 && selection.mark.col == selection.end.col 3372 && selection.mark.col == selection.end.col
3324 && clickchange 3373 && clickchange
… …
3341 3390
3342 if (selection.clicks == 1) 3391 if (selection.clicks == 1)
3343 { 3392 {
3344 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3393 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3345 && !ROW(selection.beg.row).is_longer () 3394 && !ROW(selection.beg.row).is_longer ()
3346#if ENABLE_FRILLS 3395#if !ENABLE_MINIMAL
3347 && !selection.rect 3396 && !selection.rect
3348#endif 3397#endif
3349 ) 3398 )
3350 selection.beg.col = ncol; 3399 selection.beg.col = ncol;
3351 3400
3352 if ( 3401 if (
3353 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3402 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3354 && !ROW(selection.end.row).is_longer () 3403 && !ROW(selection.end.row).is_longer ()
3355#if ENABLE_FRILLS 3404#if !ENABLE_MINIMAL
3356 && !selection.rect 3405 && !selection.rect
3357#endif 3406#endif
3358 ) 3407 )
3359 selection.end.col = ncol; 3408 selection.end.col = ncol;
3360 } 3409 }
… …
3367 selection_delimit_word (DN, &selection.end, &selection.end); 3416 selection_delimit_word (DN, &selection.end, &selection.end);
3368 } 3417 }
3369 else if (selection.clicks == 3) 3418 else if (selection.clicks == 3)
3370 { 3419 {
3371#if ENABLE_FRILLS 3420#if ENABLE_FRILLS
3372 if (OPTION (Opt_tripleclickwords)) 3421 if (option (Opt_tripleclickwords))
3373 { 3422 {
3374 selection_delimit_word (UP, &selection.beg, &selection.beg); 3423 selection_delimit_word (UP, &selection.beg, &selection.beg);
3375 3424
3376 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3425 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3377 { 3426 {
3378 if (!ROW(end_row).is_longer ()) 3427 if (!ROW(end_row).is_longer ())
3379 { 3428 {
3380 selection.end.row = end_row; 3429 selection.end.row = end_row;
3381 selection.end.col = ROW(end_row).l; 3430 selection.end.col = ROW(end_row).l;
3431# if !ENABLE_MINIMAL
3382 selection_remove_trailing_spaces (); 3432 selection_remove_trailing_spaces ();
3433# endif
3383 break; 3434 break;
3384 } 3435 }
3385 } 3436 }
3386 } 3437 }
3387 else 3438 else
… …
3403 selection.end.row++; 3454 selection.end.row++;
3404 } 3455 }
3405 } 3456 }
3406 3457
3407 if (button3 && buttonpress) 3458 if (button3 && buttonpress)
3459 {
3408 { /* mark may need to be changed */ 3460 /* mark may need to be changed */
3409 if (closeto == LEFT) 3461 if (closeto == LEFT)
3410 { 3462 {
3411 selection.mark.row = selection.end.row; 3463 selection.mark.row = selection.end.row;
3412 selection.mark.col = selection.end.col - (selection.clicks == 2); 3464 selection.mark.col = selection.end.col - (selection.clicks == 2);
3413 } 3465 }
… …
3416 selection.mark.row = selection.beg.row; 3468 selection.mark.row = selection.beg.row;
3417 selection.mark.col = selection.beg.col; 3469 selection.mark.col = selection.beg.col;
3418 } 3470 }
3419 } 3471 }
3420 3472
3421#if ENABLE_FRILLS 3473#if !ENABLE_MINIMAL
3422 if (selection.rect && selection.beg.col > selection.end.col) 3474 if (selection.rect && selection.beg.col > selection.end.col)
3423 ::swap (selection.beg.col, selection.end.col); 3475 ::swap (selection.beg.col, selection.end.col);
3424#endif 3476#endif
3425} 3477}
3426 3478
3427#if ENABLE_FRILLS 3479#if !ENABLE_MINIMAL
3428void 3480void
3429rxvt_term::selection_remove_trailing_spaces () 3481rxvt_term::selection_remove_trailing_spaces () NOTHROW
3430{ 3482{
3431 int32_t end_col, end_row; 3483 int32_t end_col, end_row;
3432 text_t *stp; 3484 text_t *stp;
3433 3485
3434 end_col = selection.end.col; 3486 end_col = selection.end.col;
… …
3472/* 3524/*
3473 * Double click on button 3 when already selected 3525 * Double click on button 3 when already selected
3474 * EXT: button 3 double click 3526 * EXT: button 3 double click
3475 */ 3527 */
3476void 3528void
3477rxvt_term::selection_rotate (int x, int y) 3529rxvt_term::selection_rotate (int x, int y) NOTHROW
3478{ 3530{
3479 selection.clicks = selection.clicks % 3 + 1; 3531 selection.clicks = selection.clicks % 3 + 1;
3480 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3532 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3481} 3533}
3482 3534
… …
3484/* 3536/*
3485 * Respond to a request for our current selection 3537 * Respond to a request for our current selection
3486 * EXT: SelectionRequest 3538 * EXT: SelectionRequest
3487 */ 3539 */
3488void 3540void
3489rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3541rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3490{ 3542{
3491 XSelectionEvent ev; 3543 XSelectionEvent ev;
3492 dDisp;
3493 3544
3494 ev.type = SelectionNotify; 3545 ev.type = SelectionNotify;
3495 ev.property = None; 3546 ev.property = None;
3496 ev.display = rq.display; 3547 ev.display = rq.display;
3497 ev.requestor = rq.requestor; 3548 ev.requestor = rq.requestor;
… …
3511 *target++ = xa[XA_COMPOUND_TEXT]; 3562 *target++ = xa[XA_COMPOUND_TEXT];
3512#if X_HAVE_UTF8_STRING 3563#if X_HAVE_UTF8_STRING
3513 *target++ = xa[XA_UTF8_STRING]; 3564 *target++ = xa[XA_UTF8_STRING];
3514#endif 3565#endif
3515 3566
3516 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3567 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3517 32, PropModeReplace, 3568 32, PropModeReplace,
3518 (unsigned char *)target_list, target - target_list); 3569 (unsigned char *)target_list, target - target_list);
3519 ev.property = rq.property; 3570 ev.property = rq.property;
3520 } 3571 }
3521#if TODO // TODO 3572#if TODO // TODO
… …
3524 /* TODO: Handle MULTIPLE */ 3575 /* TODO: Handle MULTIPLE */
3525 } 3576 }
3526#endif 3577#endif
3527 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3578 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3528 { 3579 {
3529 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3580 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3530 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3581 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3531 ev.property = rq.property; 3582 ev.property = rq.property;
3532 } 3583 }
3533 else if (rq.target == XA_STRING 3584 else if (rq.target == XA_STRING
3534 || rq.target == xa[XA_TEXT] 3585 || rq.target == xa[XA_TEXT]
… …
3558 style = enc_string; 3609 style = enc_string;
3559 else if (target == xa[XA_TEXT]) 3610 else if (target == xa[XA_TEXT])
3560 style = enc_text; 3611 style = enc_text;
3561 else if (target == xa[XA_COMPOUND_TEXT]) 3612 else if (target == xa[XA_COMPOUND_TEXT])
3562 style = enc_compound_text; 3613 style = enc_compound_text;
3563#if ENABLE_FRILLS 3614#if !ENABLE_MINIMAL
3564 else if (target == xa[XA_UTF8_STRING]) 3615 else if (target == xa[XA_UTF8_STRING])
3565 style = enc_utf8; 3616 style = enc_utf8;
3566#endif 3617#endif
3567 else 3618 else
3568 { 3619 {
… …
3579 { 3630 {
3580 cl = L""; 3631 cl = L"";
3581 selectlen = 0; 3632 selectlen = 0;
3582 } 3633 }
3583 3634
3584#if ENABLE_FRILLS 3635#if !ENABLE_MINIMAL
3585 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3636 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3586 // so recode it manually 3637 // so recode it manually
3587 if (style == enc_utf8) 3638 if (style == enc_utf8)
3588 { 3639 {
3589 freect = 1; 3640 freect = 1;
… …
3592 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3643 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3593 ct.nitems = strlen ((char *)ct.value); 3644 ct.nitems = strlen ((char *)ct.value);
3594 } 3645 }
3595 else 3646 else
3596#endif 3647#endif
3597 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3648 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3598 freect = 1; 3649 freect = 1;
3599 else 3650 else
3600 { 3651 {
3601 /* if we failed to convert then send it raw */ 3652 /* if we failed to convert then send it raw */
3602 ct.value = (unsigned char *)cl; 3653 ct.value = (unsigned char *)cl;
3603 ct.nitems = selectlen; 3654 ct.nitems = selectlen;
3604 ct.encoding = target; 3655 ct.encoding = target;
3605 } 3656 }
3606 3657
3607 XChangeProperty (disp, rq.requestor, rq.property, 3658 XChangeProperty (dpy, rq.requestor, rq.property,
3608 ct.encoding, 8, PropModeReplace, 3659 ct.encoding, 8, PropModeReplace,
3609 ct.value, (int)ct.nitems); 3660 ct.value, (int)ct.nitems);
3610 ev.property = rq.property; 3661 ev.property = rq.property;
3611 3662
3612 if (freect) 3663 if (freect)
3613 XFree (ct.value); 3664 XFree (ct.value);
3614 } 3665 }
3615 3666
3616 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3667 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} 3668}
3634 3669
3635/* ------------------------------------------------------------------------- */ 3670/* ------------------------------------------------------------------------- */
3636#ifdef USE_XIM 3671#ifdef USE_XIM
3637void 3672void
3638rxvt_term::im_set_position (XPoint &pos) 3673rxvt_term::im_set_position (XPoint &pos) NOTHROW
3639{ 3674{
3640 XWindowAttributes xwa; 3675 XWindowAttributes xwa;
3641 3676
3642 XGetWindowAttributes (display->display, vt, &xwa); 3677 XGetWindowAttributes (dpy, vt, &xwa);
3643 3678
3644 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3679 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3645 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3680 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3646} 3681}
3647#endif 3682#endif
3648 3683
3649#if ENABLE_OVERLAY 3684#if ENABLE_OVERLAY
3650void 3685void
3651rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3686rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3652{ 3687{
3653 if (nrow < 1 || ncol < 1) 3688 if (nrow < 1 || ncol < 1)
3654 return; 3689 return;
3655 3690
3656 want_refresh = 1; 3691 want_refresh = 1;
… …
3701 *rp = r; 3736 *rp = r;
3702 } 3737 }
3703} 3738}
3704 3739
3705void 3740void
3706rxvt_term::scr_overlay_off () 3741rxvt_term::scr_overlay_off () NOTHROW
3707{ 3742{
3708 if (!ov_text) 3743 if (!ov_text)
3709 return; 3744 return;
3710 3745
3711 want_refresh = 1; 3746 want_refresh = 1;
… …
3719 delete [] ov_text; ov_text = 0; 3754 delete [] ov_text; ov_text = 0;
3720 delete [] ov_rend; ov_rend = 0; 3755 delete [] ov_rend; ov_rend = 0;
3721} 3756}
3722 3757
3723void 3758void
3724rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3759rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3725{ 3760{
3726 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3761 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3727 return; 3762 return;
3728 3763
3729 x++, y++; 3764 x++, y++;
… …
3731 ov_text[y][x] = text; 3766 ov_text[y][x] = text;
3732 ov_rend[y][x] = rend; 3767 ov_rend[y][x] = rend;
3733} 3768}
3734 3769
3735void 3770void
3736rxvt_term::scr_overlay_set (int x, int y, const char *s) 3771rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3737{ 3772{
3738 while (*s) 3773 while (*s)
3739 scr_overlay_set (x++, y, *s++); 3774 scr_overlay_set (x++, y, *s++);
3740} 3775}
3741 3776
3742void 3777void
3743rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3778rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3744{ 3779{
3745 while (*s) 3780 while (*s)
3746 { 3781 {
3747 text_t t = *s++; 3782 text_t t = *s++;
3748 int width = wcwidth (t); 3783 int width = WCWIDTH (t);
3749 3784
3750 while (width--) 3785 while (width--)
3751 { 3786 {
3752 scr_overlay_set (x++, y, t); 3787 scr_overlay_set (x++, y, t);
3753 t = NOCHAR; 3788 t = NOCHAR;
3754 } 3789 }
3755 } 3790 }
3756} 3791}
3757 3792
3758void 3793void
3759rxvt_term::scr_swap_overlay () 3794rxvt_term::scr_swap_overlay () NOTHROW
3760{ 3795{
3761 if (!ov_text) 3796 if (!ov_text)
3762 return; 3797 return;
3763 3798
3764 // swap screen mem with overlay 3799 // swap screen mem with overlay

Diff Legend

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