ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.235 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.260 by root, Sat Feb 18 15:24:39 2006 UTC

… …
93 */ 93 */
94#define drawBuffer vt 94#define drawBuffer vt
95 95
96#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \ 98 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
101 101
102#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 103 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (dpy, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
107 107
108#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \ 109 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
111 (unsigned int)width, \ 111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
113 113
114/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
117 117
118/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
119void 119void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 121{
122 if (!l.t) 122 if (!l.t)
123 { 123 {
124 lalloc (l); 124 lalloc (l);
125 col = 0; 125 col = 0;
126 width = ncol; 126 width = ncol;
127 } 127 }
128 128
129 l.touch (); 129 l.touch ();
130 130
131 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 133
134 text_t *et = l.t + col; 134 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
136 136
… …
142} 142}
143 143
144/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
145/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
146void 146void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
148{ 148{
149 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150 150
151 l.l = 0; 151 l.l = 0;
152 l.f = 0; 152 l.f = 0;
… …
173 nrow = 24; 173 nrow = 24;
174 174
175 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 176 return;
177 177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180
178 // we need at least two lines for wrapping to work correctly 181 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 182 while (nrow + saveLines < 2)
180 { 183 {
181 //TODO//FIXME 184 //TODO//FIXME
182 saveLines++; 185 saveLines++;
183 prev_nrow--; 186 prev_nrow--;
184 top_row--; 187 top_row--;
… …
195 if (!row_buf) 198 if (!row_buf)
196 { 199 {
197 /* 200 /*
198 * first time called so just malloc everything: don't rely on realloc 201 * first time called so just malloc everything: don't rely on realloc
199 */ 202 */
200 top_row = 0; /* no saved lines */ 203 top_row = 0;
201 term_start = 0; 204 term_start = 0;
202 205
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 206 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 208
… …
234 selection.text = NULL; 237 selection.text = NULL;
235 selection.len = 0; 238 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 239 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 240 selection.screen = PRIMARY;
238 selection.clicks = 0; 241 selection.clicks = 0;
239 CLEAR_ALL_SELECTION (); 242 rvideo_state = rvideo_mode = false;
240 rvideo = 0;
241 } 243 }
242 else 244 else
243 { 245 {
244 /* 246 /*
245 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
281 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
283 285
284 if (top_row) 286 if (top_row)
285 { 287 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb 288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
288 290
289 row_col_t ocur = screen.cur; 291 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 293
… …
325 qline->l = ncol; 327 qline->l = ncol;
326 qline->is_longer (1); 328 qline->is_longer (1);
327 329
328 int qcol = 0; 330 int qcol = 0;
329 331
332 // see below for cursor adjustment rationale
333 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow);
335
330 // fill a single destination line 336 // fill a single destination line
331 while (lofs < llen && qcol < ncol) 337 while (lofs < llen && qcol < ncol)
332 { 338 {
333 int prow = lofs / prev_ncol; 339 int prow = lofs / prev_ncol;
334 int pcol = lofs % prev_ncol; 340 int pcol = lofs % prev_ncol;
… …
344 350
345 line_t &pline = old_buf [prow]; 351 line_t &pline = old_buf [prow];
346 352
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 354
349 assert (len);
350 assert (pline.t);
351
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
354 357
355 lofs += len; 358 lofs += len;
356 qcol += len; 359 qcol += len;
… …
389 } 392 }
390 393
391 term_start = 0; 394 term_start = 0;
392 } 395 }
393 396
394#ifdef DEBUG_STRICT //TODO: remove
395 for (int i = top_row; i < nrow; i++)
396 assert (ROW (i).t);
397#endif
398
399 free (old_buf); 397 free (old_buf);
400 delete old_ta; 398 delete old_ta;
401 delete old_ra; 399 delete old_ra;
402 400
403 clamp_it (screen.cur.row, 0, nrow - 1); 401 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 402 clamp_it (screen.cur.col, 0, ncol - 1);
405 403
406 if (tabs)
407 free (tabs); 404 free (tabs);
408 } 405 }
406
407 CLEAR_ALL_SELECTION ();
409 408
410 prev_nrow = nrow; 409 prev_nrow = nrow;
411 prev_ncol = ncol; 410 prev_ncol = ncol;
412 411
413 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
414 413
415 for (int col = ncol; col--; ) 414 for (int col = ncol; col--; )
416 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
417 416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419
418 tt_winch (); 420 tt_winch ();
419 421
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 423}
422 424
423/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
424/* 426/*
425 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
426 */ 428 */
427void 429void
428rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
429{ 431{
432 if (row_buf)
433 {
430 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
431 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
432 436
433 free (row_buf); 437 free (row_buf);
434 free (swap_buf); 438 free (swap_buf);
435 free (drawn_buf); 439 free (drawn_buf);
436 free (tabs); 440 free (tabs);
437 441
438 row_buf = 0; // signal that we freed all the arrays 442 row_buf = 0; // signal that we freed all the arrays
443 }
439} 444}
440 445
441/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
442/* 447/*
443 * Hard reset 448 * Hard reset
… …
460 * Save and Restore cursor 465 * Save and Restore cursor
461 * XTERM_SEQ: Save cursor : ESC 7 466 * XTERM_SEQ: Save cursor : ESC 7
462 * XTERM_SEQ: Restore cursor: ESC 8 467 * XTERM_SEQ: Restore cursor: ESC 8
463 */ 468 */
464void 469void
465rxvt_term::scr_cursor (int mode) 470rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
466{ 471{
467 screen_t *s; 472 screen_t *s;
468 473
469#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
470 if (current_screen == SECONDARY) 475 if (current_screen == SECONDARY)
… …
502 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
503 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
504#endif 509#endif
505} 510}
506 511
512void
513rxvt_term::scr_swap_screen ()
514{
515 if (!OPTION (Opt_secondaryScreen))
516 return;
517
518 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]);
520
521 ::swap (screen.cur, swap.cur);
522
523 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
524 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
525}
526
507/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
508/* 528/*
509 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
510 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
511 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
512 */ 532 */
513int 533void
514rxvt_term::scr_change_screen (int scrn) 534rxvt_term::scr_change_screen (int scrn)
515{ 535{
536 if (scrn == current_screen)
537 return;
538
516 want_refresh = 1; 539 want_refresh = 1;
517 view_start = 0; 540 view_start = 0;
518 541
519 if (current_screen == scrn)
520 return scrn;
521
522 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
523 543
524 int i = current_screen; current_screen = scrn; scrn = i; 544 int i = current_screen; current_screen = scrn; scrn = i;
525
526 ::swap (screen.cur.row, swap.cur.row);
527 ::swap (screen.cur.col, swap.cur.col);
528
529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
531 545
532#if NSCREENS 546#if NSCREENS
533 if (OPTION (Opt_secondaryScreen)) 547 if (OPTION (Opt_secondaryScreen))
534 { 548 {
535 num_scr = 0; 549 num_scr = 0;
536 550
537 for (int i = prev_nrow; i--; ) 551 scr_swap_screen ();
538 ::swap (ROW(i), swap_buf [i]);
539 552
540 ::swap (screen.charset, swap.charset); 553 ::swap (screen.charset, swap.charset);
541 ::swap (screen.flags, swap.flags); 554 ::swap (screen.flags, swap.flags);
542 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
543 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
544 } 557 }
545 else 558 else
546#endif 559#endif
547 if (OPTION (Opt_secondaryScroll)) 560 if (OPTION (Opt_secondaryScroll))
548 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
549
550 return scrn;
551} 562}
552 563
553// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
554void 565void
555rxvt_term::scr_do_wrap () 566rxvt_term::scr_do_wrap () NOTHROW
556{ 567{
557 if (!(screen.flags & Screen_WrapNext)) 568 if (!(screen.flags & Screen_WrapNext))
558 return; 569 return;
559 570
560 screen.flags &= ~Screen_WrapNext; 571 screen.flags &= ~Screen_WrapNext;
… …
570/* ------------------------------------------------------------------------- */ 581/* ------------------------------------------------------------------------- */
571/* 582/*
572 * Change the colour for following text 583 * Change the colour for following text
573 */ 584 */
574void 585void
575rxvt_term::scr_color (unsigned int color, int fgbg) 586rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
576{ 587{
577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 588 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
578 color = fgbg; 589 color = fgbg;
579 590
580 if (fgbg == Color_fg) 591 if (fgbg == Color_fg)
… …
586/* ------------------------------------------------------------------------- */ 597/* ------------------------------------------------------------------------- */
587/* 598/*
588 * Change the rendition style for following text 599 * Change the rendition style for following text
589 */ 600 */
590void 601void
591rxvt_term::scr_rendition (int set, int style) 602rxvt_term::scr_rendition (int set, int style) NOTHROW
592 { 603 {
593 if (set) 604 if (set)
594 rstyle |= style; 605 rstyle |= style;
595 else if (style == ~RS_None) 606 else if (style == ~RS_None)
596 rstyle = DEFAULT_RSTYLE; 607 rstyle = DEFAULT_RSTYLE;
… …
603 * Scroll text between <row1> and <row2> inclusive, by <count> lines 614 * Scroll text between <row1> and <row2> inclusive, by <count> lines
604 * count positive ==> scroll up 615 * count positive ==> scroll up
605 * count negative ==> scroll down 616 * count negative ==> scroll down
606 */ 617 */
607int 618int
608rxvt_term::scr_scroll_text (int row1, int row2, int count) 619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
609{ 620{
610 if (count == 0 || (row1 > row2)) 621 if (count == 0 || (row1 > row2))
611 return 0; 622 return 0;
612 623
613 want_refresh = 1; 624 want_refresh = 1;
… …
620 top_row = max (top_row - count, -saveLines); 631 top_row = max (top_row - count, -saveLines);
621 632
622 // scroll everything up 'count' lines 633 // scroll everything up 'count' lines
623 term_start = (term_start + count) % total_rows; 634 term_start = (term_start + count) % total_rows;
624 635
636 // sever bottommost line
625 { 637 {
626 // severe bottommost scrolled line
627 line_t &l = ROW(row2 - count); 638 line_t &l = ROW(row2 - count);
639 l.is_longer (0);
628 l.touch (); 640 l.touch ();
629 l.is_longer (0);
630 } 641 }
631 642
632 // erase newly scorlled-in lines 643 // erase newly scrolled-in lines
633 for (int i = count; i; --i ) 644 for (int i = count; i--; )
634 { 645 {
635 // basically this is a slightly optimized scr_blank_screen_mem
636 // it is worth the effort on slower machines
637 line_t &l = ROW(nrow - i); 646 line_t &l = ROW(nrow - 1 - i);
638 647
648 // optimize if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
651 {
639 scr_blank_line (l, 0, l.l, rstyle); 652 scr_blank_line (l, 0, l.l, rstyle);
640
641 l.l = 0; 653 l.l = 0;
642 l.f = 0; 654 l.f = 0;
655 }
656 else
657 scr_blank_screen_mem (l, rstyle);
643 } 658 }
644 659
645 // now copy lines below the scroll region bottom to the 660 // now copy lines below the scroll region bottom to the
646 // bottom of the screen again, so they look as if they 661 // bottom of the screen again, so they look as if they
647 // hadn't moved. 662 // hadn't moved.
… …
731/* ------------------------------------------------------------------------- */ 746/* ------------------------------------------------------------------------- */
732/* 747/*
733 * Add text given in <str> of length <len> to screen struct 748 * Add text given in <str> of length <len> to screen struct
734 */ 749 */
735void 750void
736rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 751rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
737{ 752{
738 if (len <= 0) /* sanity */ 753 if (len <= 0) /* sanity */
739 return; 754 return;
740 755
741 unsigned char checksel; 756 unsigned char checksel;
… …
747 ZERO_SCROLLBACK (); 762 ZERO_SCROLLBACK ();
748 763
749 if (minlines > 0) 764 if (minlines > 0)
750 { 765 {
751 minlines += screen.cur.row - screen.bscroll; 766 minlines += screen.cur.row - screen.bscroll;
767 min_it (minlines, screen.cur.row - top_row);
752 768
753 if (minlines > 0 769 if (minlines > 0
754 && screen.tscroll == 0 770 && screen.tscroll == 0
755 && screen.bscroll == nrow - 1) 771 && screen.bscroll == nrow - 1)
756 { 772 {
… …
817 CLEAR_SELECTION (); 833 CLEAR_SELECTION ();
818 } 834 }
819 835
820 if (screen.flags & Screen_WrapNext) 836 if (screen.flags & Screen_WrapNext)
821 { 837 {
822 max_it (line->l, ncol);
823 line->is_longer (1);
824
825 scr_do_wrap (); 838 scr_do_wrap ();
826 839
840 line->l = ncol;
841 line->is_longer (1);
842
827 row = screen.cur.row; 843 row = screen.cur.row;
828 line = &ROW(row); /* _must_ refresh */ 844 line = &ROW(row); /* _must_ refresh */
829 } 845 }
830 846
831 // some utf-8 decoders "decode" surrogate characters: let's fix this. 847 // some utf-8 decoders "decode" surrogate characters: let's fix this.
832 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 848 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
833 c = 0xfffd; 849 c = 0xfffd;
834 850
835 // rely on wcwidth to tell us the character width, at least for non-latin1 851 // rely on wcwidth to tell us the character width, do wcwidth before
836 // do wcwidth before further replacements, as wcwidth might return -1 852 // further replacements, as wcwidth might return -1 for the line
837 // for the line drawing characters below as they might be invalid in the current 853 // drawing characters below as they might be invalid in the current
838 // locale. 854 // locale.
839 int width = c < 0x100 ? 1 : wcwidth (c); 855 int width = WCWIDTH (c);
840 856
841 if (charsets [screen.charset] == '0') // DEC SPECIAL 857 if (charsets [screen.charset] == '0') // DEC SPECIAL
842 { 858 {
843 // vt100 special graphics and line drawing 859 // vt100 special graphics and line drawing
844 // 5f-7e standard vt100 860 // 5f-7e standard vt100
… …
995/* 1011/*
996 * Process Backspace. Move back the cursor back a position, wrap if have to 1012 * Process Backspace. Move back the cursor back a position, wrap if have to
997 * XTERM_SEQ: CTRL-H 1013 * XTERM_SEQ: CTRL-H
998 */ 1014 */
999void 1015void
1000rxvt_term::scr_backspace () 1016rxvt_term::scr_backspace () NOTHROW
1001{ 1017{
1002 want_refresh = 1; 1018 want_refresh = 1;
1003 1019
1004 if (screen.cur.col == 0) 1020 if (screen.cur.col == 0)
1005 { 1021 {
… …
1023 * Process Horizontal Tab 1039 * Process Horizontal Tab
1024 * count: +ve = forward; -ve = backwards 1040 * count: +ve = forward; -ve = backwards
1025 * XTERM_SEQ: CTRL-I 1041 * XTERM_SEQ: CTRL-I
1026 */ 1042 */
1027void 1043void
1028rxvt_term::scr_tab (int count, bool ht) 1044rxvt_term::scr_tab (int count, bool ht) NOTHROW
1029{ 1045{
1030 int i, x; 1046 int i, x;
1031 1047
1032 want_refresh = 1; 1048 want_refresh = 1;
1033 i = x = screen.cur.col; 1049 i = x = screen.cur.col;
… …
1098 * Process DEC Back Index 1114 * Process DEC Back Index
1099 * XTERM_SEQ: ESC 6 1115 * XTERM_SEQ: ESC 6
1100 * Move cursor left in row. If we're at the left boundary, shift everything 1116 * Move cursor left in row. If we're at the left boundary, shift everything
1101 * in that row right. Clear left column. 1117 * in that row right. Clear left column.
1102 */ 1118 */
1103#if ENABLE_FRILLS 1119#if !ENABLE_MINIMAL
1104void 1120void
1105rxvt_term::scr_backindex () 1121rxvt_term::scr_backindex () NOTHROW
1106{ 1122{
1107 if (screen.cur.col > 0) 1123 if (screen.cur.col > 0)
1108 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1109 else 1125 else
1110 scr_insdel_chars (1, INSERT); 1126 scr_insdel_chars (1, INSERT);
… …
1115 * Process DEC Forward Index 1131 * Process DEC Forward Index
1116 * XTERM_SEQ: ESC 9 1132 * XTERM_SEQ: ESC 9
1117 * Move cursor right in row. If we're at the right boundary, shift everything 1133 * Move cursor right in row. If we're at the right boundary, shift everything
1118 * in that row left. Clear right column. 1134 * in that row left. Clear right column.
1119 */ 1135 */
1120#if ENABLE_FRILLS 1136#if !ENABLE_MINIMAL
1121void 1137void
1122rxvt_term::scr_forwardindex () 1138rxvt_term::scr_forwardindex () NOTHROW
1123{ 1139{
1124 if (screen.cur.col < ncol - 1) 1140 if (screen.cur.col < ncol - 1)
1125 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1126 else 1142 else
1127 { 1143 {
… …
1140/* ------------------------------------------------------------------------- */ 1156/* ------------------------------------------------------------------------- */
1141/* 1157/*
1142 * Goto Row/Column 1158 * Goto Row/Column
1143 */ 1159 */
1144void 1160void
1145rxvt_term::scr_gotorc (int row, int col, int relative) 1161rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1146{ 1162{
1147 want_refresh = 1; 1163 want_refresh = 1;
1148 ZERO_SCROLLBACK (); 1164 ZERO_SCROLLBACK ();
1149 1165
1150 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1166 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1188/* ------------------------------------------------------------------------- */ 1204/* ------------------------------------------------------------------------- */
1189/* 1205/*
1190 * direction should be UP or DN 1206 * direction should be UP or DN
1191 */ 1207 */
1192void 1208void
1193rxvt_term::scr_index (enum page_dirn direction) 1209rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1194{ 1210{
1195 int dirn; 1211 int dirn;
1196 1212
1197 want_refresh = 1; 1213 want_refresh = 1;
1198 ZERO_SCROLLBACK (); 1214 ZERO_SCROLLBACK ();
… …
1217 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1218 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1219 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1220 */ 1236 */
1221void 1237void
1222rxvt_term::scr_erase_line (int mode) 1238rxvt_term::scr_erase_line (int mode) NOTHROW
1223{ 1239{
1224 unsigned int col, num; 1240 unsigned int col, num;
1225 1241
1226 want_refresh = 1; 1242 want_refresh = 1;
1227 ZERO_SCROLLBACK (); 1243 ZERO_SCROLLBACK ();
… …
1271 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1287 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1272 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1288 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1273 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1289 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1274 */ 1290 */
1275void 1291void
1276rxvt_term::scr_erase_screen (int mode) 1292rxvt_term::scr_erase_screen (int mode) NOTHROW
1277{ 1293{
1278 int num; 1294 int num;
1279 int32_t row; 1295 int32_t row;
1280 rend_t ren; 1296 rend_t ren;
1281 XGCValues gcvalue; 1297 XGCValues gcvalue;
… …
1326 } 1342 }
1327 else 1343 else
1328 { 1344 {
1329 ren = rstyle & (RS_fgMask | RS_bgMask); 1345 ren = rstyle & (RS_fgMask | RS_bgMask);
1330 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1331 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1347 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1332 ERASE_ROWS (row, num); 1348 ERASE_ROWS (row, num);
1333 gcvalue.foreground = pix_colors[Color_fg]; 1349 gcvalue.foreground = pix_colors[Color_fg];
1334 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1350 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1335 } 1351 }
1336 1352
1337 for (; num--; row++) 1353 for (; num--; row++)
1338 { 1354 {
1339 scr_blank_screen_mem (ROW(row), rstyle); 1355 scr_blank_screen_mem (ROW(row), rstyle);
1340 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1356 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1341 } 1357 }
1342} 1358}
1343 1359
1344#if ENABLE_FRILLS 1360#if !ENABLE_MINIMAL
1345void 1361void
1346rxvt_term::scr_erase_savelines () 1362rxvt_term::scr_erase_savelines () NOTHROW
1347{ 1363{
1348 want_refresh = 1; 1364 want_refresh = 1;
1349 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
1350 1366
1351 top_row = 0; 1367 top_row = 0;
… …
1356/* 1372/*
1357 * Fill the screen with `E's 1373 * Fill the screen with `E's
1358 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1374 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1359 */ 1375 */
1360void 1376void
1361rxvt_term::scr_E () 1377rxvt_term::scr_E () NOTHROW
1362{ 1378{
1363 rend_t fs; 1379 rend_t fs;
1364 1380
1365 want_refresh = 1; 1381 want_refresh = 1;
1366 ZERO_SCROLLBACK (); 1382 ZERO_SCROLLBACK ();
… …
1387/* ------------------------------------------------------------------------- */ 1403/* ------------------------------------------------------------------------- */
1388/* 1404/*
1389 * Insert/Delete <count> lines 1405 * Insert/Delete <count> lines
1390 */ 1406 */
1391void 1407void
1392rxvt_term::scr_insdel_lines (int count, int insdel) 1408rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1393{ 1409{
1394 int end; 1410 int end;
1395 1411
1396 ZERO_SCROLLBACK (); 1412 ZERO_SCROLLBACK ();
1397 1413
… …
1417/* ------------------------------------------------------------------------- */ 1433/* ------------------------------------------------------------------------- */
1418/* 1434/*
1419 * Insert/Delete <count> characters from the current position 1435 * Insert/Delete <count> characters from the current position
1420 */ 1436 */
1421void 1437void
1422rxvt_term::scr_insdel_chars (int count, int insdel) 1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1423{ 1439{
1424 int col, row; 1440 int col, row;
1425 rend_t tr; 1441 rend_t tr;
1426 1442
1427 want_refresh = 1; 1443 want_refresh = 1;
… …
1515/* 1531/*
1516 * Set the scrolling region 1532 * Set the scrolling region
1517 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1533 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1518 */ 1534 */
1519void 1535void
1520rxvt_term::scr_scroll_region (int top, int bot) 1536rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1521{ 1537{
1522 max_it (top, 0); 1538 max_it (top, 0);
1523 min_it (bot, nrow - 1); 1539 min_it (bot, nrow - 1);
1524 1540
1525 if (top > bot) 1541 if (top > bot)
… …
1535 * Make the cursor visible/invisible 1551 * Make the cursor visible/invisible
1536 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1552 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1537 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1553 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1538 */ 1554 */
1539void 1555void
1540rxvt_term::scr_cursor_visible (int mode) 1556rxvt_term::scr_cursor_visible (int mode) NOTHROW
1541{ 1557{
1542 want_refresh = 1; 1558 want_refresh = 1;
1543 1559
1544 if (mode) 1560 if (mode)
1545 screen.flags |= Screen_VisibleCursor; 1561 screen.flags |= Screen_VisibleCursor;
… …
1552 * Set/unset automatic wrapping 1568 * Set/unset automatic wrapping
1553 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1569 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1554 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1570 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1555 */ 1571 */
1556void 1572void
1557rxvt_term::scr_autowrap (int mode) 1573rxvt_term::scr_autowrap (int mode) NOTHROW
1558{ 1574{
1559 if (mode) 1575 if (mode)
1560 screen.flags |= Screen_Autowrap; 1576 screen.flags |= Screen_Autowrap;
1561 else 1577 else
1562 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1578 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1571 * and the cursor cannot be moved outside. 1587 * and the cursor cannot be moved outside.
1572 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1588 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1573 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1589 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1574 */ 1590 */
1575void 1591void
1576rxvt_term::scr_relative_origin (int mode) 1592rxvt_term::scr_relative_origin (int mode) NOTHROW
1577{ 1593{
1578 if (mode) 1594 if (mode)
1579 screen.flags |= Screen_Relative; 1595 screen.flags |= Screen_Relative;
1580 else 1596 else
1581 screen.flags &= ~Screen_Relative; 1597 screen.flags &= ~Screen_Relative;
… …
1588 * Set insert/replace mode 1604 * Set insert/replace mode
1589 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1605 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1590 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1606 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1591 */ 1607 */
1592void 1608void
1593rxvt_term::scr_insert_mode (int mode) 1609rxvt_term::scr_insert_mode (int mode) NOTHROW
1594{ 1610{
1595 if (mode) 1611 if (mode)
1596 screen.flags |= Screen_Insert; 1612 screen.flags |= Screen_Insert;
1597 else 1613 else
1598 screen.flags &= ~Screen_Insert; 1614 screen.flags &= ~Screen_Insert;
… …
1604 * XTERM_SEQ: Set tab at current column : ESC H 1620 * XTERM_SEQ: Set tab at current column : ESC H
1605 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1621 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1606 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1622 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1607 */ 1623 */
1608void 1624void
1609rxvt_term::scr_set_tab (int mode) 1625rxvt_term::scr_set_tab (int mode) NOTHROW
1610{ 1626{
1611 if (mode < 0) 1627 if (mode < 0)
1612 memset (tabs, 0, ncol * sizeof (char)); 1628 memset (tabs, 0, ncol * sizeof (char));
1613 else if (screen.cur.col < ncol) 1629 else if (screen.cur.col < ncol)
1614 tabs [screen.cur.col] = !!mode; 1630 tabs [screen.cur.col] = !!mode;
… …
1619 * Set reverse/normal video 1635 * Set reverse/normal video
1620 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1636 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1621 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1637 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1622 */ 1638 */
1623void 1639void
1624rxvt_term::scr_rvideo_mode (int mode) 1640rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1625{ 1641{
1626 XGCValues gcvalue; 1642 rvideo_mode = on;
1627 1643
1644#ifndef NO_BELL
1645 on ^= rvideo_bell;
1646#endif
1647
1628 if (rvideo != mode) 1648 if (rvideo_state != on)
1629 { 1649 {
1630 rvideo = mode; 1650 rvideo_state = on;
1651
1631 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1632#if XPM_BACKGROUND 1653#if XPM_BACKGROUND
1633 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1634#endif 1655#endif
1635#if TRANSPARENT 1656#if TRANSPARENT
1636 if (! OPTION (Opt_transparent) || am_transparent == 0) 1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1637#endif 1658#endif
1638 XSetWindowBackground (display->display, vt, 1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1639 pix_colors[Color_bg]);
1640 1660
1661 XGCValues gcvalue;
1641 gcvalue.foreground = pix_colors[Color_fg]; 1662 gcvalue.foreground = pix_colors[Color_fg];
1642 gcvalue.background = pix_colors[Color_bg]; 1663 gcvalue.background = pix_colors[Color_bg];
1643 XChangeGC (display->display, gc, GCBackground | GCForeground, 1664 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1644 &gcvalue); 1665
1645 scr_clear (); 1666 scr_clear ();
1646 scr_touch (true); 1667 scr_touch (true);
1647 } 1668 }
1648} 1669}
1649 1670
… …
1651/* 1672/*
1652 * Report current cursor position 1673 * Report current cursor position
1653 * XTERM_SEQ: Report position: ESC [ 6 n 1674 * XTERM_SEQ: Report position: ESC [ 6 n
1654 */ 1675 */
1655void 1676void
1656rxvt_term::scr_report_position () 1677rxvt_term::scr_report_position () NOTHROW
1657{ 1678{
1658 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1679 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1659} 1680}
1660 1681
1661/* ------------------------------------------------------------------------- * 1682/* ------------------------------------------------------------------------- *
… …
1664 1685
1665/* 1686/*
1666 * Set font style 1687 * Set font style
1667 */ 1688 */
1668void 1689void
1669rxvt_term::set_font_style () 1690rxvt_term::set_font_style () NOTHROW
1670{ 1691{
1671#if 0 1692#if 0
1672 switch (charsets [screen.charset]) 1693 switch (charsets [screen.charset])
1673 { 1694 {
1674 case '0': /* DEC Special Character & Line Drawing Set */ 1695 case '0': /* DEC Special Character & Line Drawing Set */
… …
1696 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1717 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1697 * XTERM_SEQ: Invoke G2 character set: ESC N 1718 * XTERM_SEQ: Invoke G2 character set: ESC N
1698 * XTERM_SEQ: Invoke G3 character set: ESC O 1719 * XTERM_SEQ: Invoke G3 character set: ESC O
1699 */ 1720 */
1700void 1721void
1701rxvt_term::scr_charset_choose (int set) 1722rxvt_term::scr_charset_choose (int set) NOTHROW
1702{ 1723{
1703 screen.charset = set; 1724 screen.charset = set;
1704 set_font_style (); 1725 set_font_style ();
1705} 1726}
1706 1727
… …
1712 * XTERM_SEQ: Set G2 character set: ESC * <C> 1733 * XTERM_SEQ: Set G2 character set: ESC * <C>
1713 * XTERM_SEQ: Set G3 character set: ESC + <C> 1734 * XTERM_SEQ: Set G3 character set: ESC + <C>
1714 * See set_font_style for possible values for <C> 1735 * See set_font_style for possible values for <C>
1715 */ 1736 */
1716void 1737void
1717rxvt_term::scr_charset_set (int set, unsigned int ch) 1738rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1718{ 1739{
1719 charsets[set] = (unsigned char)ch; 1740 charsets[set] = (unsigned char)ch;
1720 set_font_style (); 1741 set_font_style ();
1721} 1742}
1722 1743
… …
1727 1748
1728/* 1749/*
1729 * refresh matching text. 1750 * refresh matching text.
1730 */ 1751 */
1731bool 1752bool
1732rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1753rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1733{ 1754{
1734 bool found = false; 1755 bool found = false;
1735 1756
1736 for (int i = 0; i < nrow; i++) 1757 for (int i = 0; i < nrow; i++)
1737 { 1758 {
1738 int col = 0;
1739 rend_t *drp = drawn_buf[i].r; 1759 rend_t *drp = drawn_buf[i].r;
1740 1760
1741 for (; col < ncol; col++, drp++) 1761 for (int col = 0; col < ncol; col++, drp++)
1742 if ((*drp & mask) == value) 1762 if ((*drp & mask) == value)
1743 { 1763 {
1744 found = true; 1764 found = true;
1745 *drp = ~value; 1765 *drp = ~value;
1746 } 1766 }
… …
1757 PART_END, 1777 PART_END,
1758 RC_COUNT 1778 RC_COUNT
1759}; 1779};
1760 1780
1761void 1781void
1762rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1782rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1763{ 1783{
1764 int i; 1784 int i;
1765 row_col_t rc[RC_COUNT]; 1785 row_col_t rc[RC_COUNT];
1766 1786
1767 if (!drawn_buf) /* sanity check */ 1787 if (!drawn_buf) /* sanity check */
… …
1801/* ------------------------------------------------------------------------- */ 1821/* ------------------------------------------------------------------------- */
1802/* 1822/*
1803 * Refresh the entire screen 1823 * Refresh the entire screen
1804 */ 1824 */
1805void 1825void
1806rxvt_term::scr_touch (bool refresh) 1826rxvt_term::scr_touch (bool refresh) NOTHROW
1807{ 1827{
1808 scr_expose (0, 0, width, height, refresh); 1828 scr_expose (0, 0, width, height, refresh);
1809} 1829}
1810 1830
1811/* ------------------------------------------------------------------------- */ 1831/* ------------------------------------------------------------------------- */
1812/* 1832/*
1813 * Move the display so that the line represented by scrollbar value Y is at 1833 * Move the display so that the line represented by scrollbar value Y is at
1814 * the top of the screen 1834 * the top of the screen
1815 */ 1835 */
1816void 1836void
1817rxvt_term::scr_move_to (int y, int len) 1837rxvt_term::scr_move_to (int y, int len) NOTHROW
1818{ 1838{
1819 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1839 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1820} 1840}
1821 1841
1822/* ------------------------------------------------------------------------- */ 1842/* ------------------------------------------------------------------------- */
1823/* 1843/*
1824 * Page the screen up/down nlines 1844 * Page the screen up/down nlines
1825 * direction should be UP or DN 1845 * direction should be UP or DN
1826 */ 1846 */
1827bool 1847bool
1828rxvt_term::scr_page (enum page_dirn direction, int nlines) 1848rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1829{ 1849{
1830 int new_view_start = 1850 int new_view_start =
1831 direction == UP ? view_start - nlines 1851 direction == UP ? view_start - nlines
1832 : view_start + nlines; 1852 : view_start + nlines;
1833 1853
1834 return scr_changeview (new_view_start); 1854 return scr_changeview (new_view_start);
1835} 1855}
1836 1856
1837bool 1857bool
1838rxvt_term::scr_changeview (int new_view_start) 1858rxvt_term::scr_changeview (int new_view_start) NOTHROW
1839{ 1859{
1840 clamp_it (new_view_start, top_row, 0); 1860 clamp_it (new_view_start, top_row, 0);
1841 1861
1842 if (new_view_start == view_start) 1862 if (new_view_start == view_start)
1843 return false; 1863 return false;
… …
1849 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1869 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1850 1870
1851 return true; 1871 return true;
1852} 1872}
1853 1873
1854/* ------------------------------------------------------------------------- */ 1874#ifndef NO_BELL
1855void 1875void
1876rxvt_term::bell_cb (time_watcher &w)
1877{
1878 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode);
1880}
1881#endif
1882
1883/* ------------------------------------------------------------------------- */
1884void
1856rxvt_term::scr_bell () 1885rxvt_term::scr_bell () NOTHROW
1857{ 1886{
1858#ifndef NO_BELL 1887#ifndef NO_BELL
1859 1888
1860# ifndef NO_MAPALERT 1889# ifndef NO_MAPALERT
1861# ifdef MAPALERT_OPTION 1890# ifdef MAPALERT_OPTION
1862 if (OPTION (Opt_mapAlert)) 1891 if (OPTION (Opt_mapAlert))
1863# endif 1892# endif
1864 XMapWindow (display->display, parent[0]); 1893 XMapWindow (dpy, parent[0]);
1865# endif 1894# endif
1866 1895
1867 if (OPTION (Opt_visualBell)) 1896 if (OPTION (Opt_visualBell))
1868 { 1897 {
1869 scr_rvideo_mode (!rvideo); /* refresh also done */ 1898 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode);
1870 display->flush (); 1900 display->flush ();
1871 rxvt_usleep (VISUAL_BELL_DURATION); 1901
1872 scr_rvideo_mode (!rvideo); /* refresh also done */ 1902 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1873 } 1903 }
1874 else 1904 else
1875 XBell (display->display, 0); 1905 XBell (dpy, 0);
1876 1906
1877#endif 1907#endif
1878} 1908}
1879 1909
1880/* ------------------------------------------------------------------------- */ 1910/* ------------------------------------------------------------------------- */
1881/* ARGSUSED */ 1911/* ARGSUSED */
1882void 1912void
1883rxvt_term::scr_printscreen (int fullhist) 1913rxvt_term::scr_printscreen (int fullhist) NOTHROW
1884{ 1914{
1885#ifdef PRINTPIPE 1915#ifdef PRINTPIPE
1886 int nrows, row_start; 1916 int nrows, row_start;
1887 FILE *fd; 1917 FILE *fd;
1888 1918
… …
1937 * Refresh the screen 1967 * Refresh the screen
1938 * drawn_text/drawn_rend contain the screen information before the update. 1968 * drawn_text/drawn_rend contain the screen information before the update.
1939 * screen.text/screen.rend contain what the screen will change to. 1969 * screen.text/screen.rend contain what the screen will change to.
1940 */ 1970 */
1941void 1971void
1942rxvt_term::scr_refresh () 1972rxvt_term::scr_refresh () NOTHROW
1943{ 1973{
1944 unsigned char must_clear, /* use draw_string not draw_image_string */ 1974 unsigned char have_bg,
1945 showcursor; /* show the cursor */ 1975 showcursor; /* show the cursor */
1946 int16_t col, row, /* column/row we're processing */ 1976 int16_t col, row, /* column/row we're processing */
1947 ocrow; /* old cursor row */ 1977 ocrow; /* old cursor row */
1948 int i; /* tmp */ 1978 int i; /* tmp */
1949#ifndef NO_CURSORCOLOR 1979#ifndef NO_CURSORCOLOR
… …
1957 return; 1987 return;
1958 1988
1959 /* 1989 /*
1960 * A: set up vars 1990 * A: set up vars
1961 */ 1991 */
1962 must_clear = 0; 1992 have_bg = 0;
1963 refresh_count = 0; 1993 refresh_count = 0;
1964 1994
1965#if XPM_BACKGROUND 1995#if XPM_BACKGROUND
1966 must_clear |= bgPixmap.pixmap != None; 1996 have_bg |= bgPixmap.pixmap != None;
1967#endif 1997#endif
1968#if TRANSPARENT 1998#if TRANSPARENT
1969 must_clear |= OPTION (Opt_transparent) && am_transparent; 1999 have_bg |= OPTION (Opt_transparent) && am_transparent;
1970#endif 2000#endif
1971 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1972 2002
1973 /* 2003 /*
1974 * B: reverse any characters which are selected 2004 * B: reverse any characters which are selected
… …
2073 * D: CopyArea pass - very useful for slower links 2103 * D: CopyArea pass - very useful for slower links
2074 * This has been deliberately kept simple. 2104 * This has been deliberately kept simple.
2075 */ 2105 */
2076 if (!display->is_local 2106 if (!display->is_local
2077 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2107 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2078 && abs (num_scr) < nrow && !must_clear) 2108 && abs (num_scr) < nrow && !have_bg)
2079 { 2109 {
2080 int16_t nits; 2110 int16_t nits;
2081 int j; 2111 int j;
2082 int len, wlen; 2112 int len, wlen;
2083 dLocal (int, num_scr); 2113 dLocal (int, num_scr);
… …
2119 { 2149 {
2120 /* also comes here at end if needed because of >= above */ 2150 /* also comes here at end if needed because of >= above */
2121 if (wlen < len) 2151 if (wlen < len)
2122 ::swap (wlen, len); 2152 ::swap (wlen, len);
2123 2153
2154 XGCValues gcv;
2155
2156 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2124 XCopyArea (display->display, vt, vt, 2157 XCopyArea (dpy, vt, vt,
2125 gc, 0, Row2Pixel (len + i), 2158 gc, 0, Row2Pixel (len + i),
2126 (unsigned int)this->width, 2159 (unsigned int)this->width,
2127 (unsigned int)Height2Pixel (wlen - len + 1), 2160 (unsigned int)Height2Pixel (wlen - len + 1),
2128 0, Row2Pixel (len)); 2161 0, Row2Pixel (len));
2162 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2163
2129 len = -1; 2164 len = -1;
2130 } 2165 }
2131 } 2166 }
2132 } 2167 }
2133#endif 2168#endif
… …
2189 count++; 2224 count++;
2190 2225
2191 if (stp[col] != dtp[col] 2226 if (stp[col] != dtp[col]
2192 || !RS_SAME (srp[col], drp[col])) 2227 || !RS_SAME (srp[col], drp[col]))
2193 { 2228 {
2194 if (must_clear && (i++ > count / 2)) 2229 if (have_bg && (i++ > count / 2))
2195 break; 2230 break;
2196 2231
2197 dtp[col] = stp[col]; 2232 dtp[col] = stp[col];
2198 drp[col] = rend; 2233 drp[col] = rend;
2199 i = 0; 2234 i = 0;
2200 } 2235 }
2201 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2236 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2202 break; 2237 break;
2203 } 2238 }
2204 2239
2205 col--; /* went one too far. move back */ 2240 col--; /* went one too far. move back */
2206 count -= i; /* dump any matching trailing chars */ 2241 count -= i; /* dump any matching trailing chars */
… …
2217 2252
2218 // only do special processing if any attributes are set, which is unlikely 2253 // only do special processing if any attributes are set, which is unlikely
2219 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2254 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2220 { 2255 {
2221#if ENABLE_STYLES 2256#if ENABLE_STYLES
2222 // force redraw after "careful" characters to avoid pixel droppings 2257 // "careful" (too wide) character handling
2223 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2224 drp[col + 1] = ~srp[col + 1];
2225 2258
2226 // include previous careful character(s) if possible, looks nicer (best effort...) 2259 // include previous careful character(s) if possible, looks nicer (best effort...)
2227 while (text > stp 2260 while (text > stp
2228 && srp[text - stp - 1] & RS_Careful 2261 && srp[text - stp - 1] & RS_Careful
2229 && RS_SAME (rend, srp[text - stp - 1])) 2262 && RS_SAME (rend, srp[text - stp - 1]))
2230 text--, count++, xpixel -= fwidth; 2263 text--, count++, xpixel -= fwidth;
2264
2265 // force redraw after "careful" characters to avoid pixel droppings
2266 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2267 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2268
2269 // force redraw before "careful" characters to avoid pixel droppings
2270 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2271 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2231#endif 2272#endif
2232 2273
2233 bool invert = rend & RS_RVid; 2274 bool invert = rend & RS_RVid;
2234 2275
2235#ifndef NO_BOLD_UNDERLINE_REVERSE 2276#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2293 * Actually do the drawing of the string here 2334 * Actually do the drawing of the string here
2294 */ 2335 */
2295 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2336 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2296 2337
2297 if (back == fore) 2338 if (back == fore)
2298 font->clear_rect (*drawable, xpixel, ypixel, 2339 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2299 fwidth * count, fheight,
2300 back);
2301 else if (back == Color_bg) 2340 else if (back == Color_bg && have_bg)
2302 { 2341 {
2303 if (must_clear) 2342 // this is very ugly, maybe push it into ->draw?
2304 {
2305 CLEAR_CHARS (xpixel, ypixel, count);
2306 2343
2307 for (i = 0; i < count; i++) /* don't draw empty strings */ 2344 for (i = 0; i < count; i++) /* don't draw empty strings */
2308 if (text[i] != ' ') 2345 if (text[i] != ' ')
2309 { 2346 {
2310 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2347 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2311 break; 2348 goto did_clear;
2312 }
2313 } 2349 }
2314 else 2350
2315 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2351 CLEAR_CHARS (xpixel, ypixel, count);
2352 did_clear: ;
2316 } 2353 }
2317 else 2354 else
2318 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2355 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2319 2356
2320 if (rend & RS_Uline && font->descent > 1 && fore != back) 2357 if (rend & RS_Uline && font->descent > 1 && fore != back)
2321 { 2358 {
2322#if ENABLE_FRILLS 2359#if ENABLE_FRILLS
2323 if (ISSET_PIXCOLOR (Color_underline)) 2360 if (ISSET_PIXCOLOR (Color_underline))
2324 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2361 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2325 else 2362 else
2326#endif 2363#endif
2327 XSetForeground (display->display, gc, pix_colors[fore]); 2364 XSetForeground (dpy, gc, pix_colors[fore]);
2328 2365
2329 XDrawLine (display->display, drawBuffer, gc, 2366 XDrawLine (dpy, drawBuffer, gc,
2330 xpixel, ypixel + font->ascent + 1, 2367 xpixel, ypixel + font->ascent + 1,
2331 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2368 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2332 } 2369 }
2333 } /* for (col....) */ 2370 } /* for (col....) */
2334 } /* for (row....) */ 2371 } /* for (row....) */
… …
2367 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2404 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2368 cursorwidth++; 2405 cursorwidth++;
2369 2406
2370#ifndef NO_CURSORCOLOR 2407#ifndef NO_CURSORCOLOR
2371 if (ISSET_PIXCOLOR (Color_cursor)) 2408 if (ISSET_PIXCOLOR (Color_cursor))
2372 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2409 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2373#endif 2410#endif
2374 2411
2375 XDrawRectangle (display->display, drawBuffer, gc, 2412 XDrawRectangle (dpy, drawBuffer, gc,
2376 Col2Pixel (col), 2413 Col2Pixel (col),
2377 Row2Pixel (oldcursor.row), 2414 Row2Pixel (oldcursor.row),
2378 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2415 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2379 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2416 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2380 } 2417 }
… …
2388 num_scr = 0; 2425 num_scr = 0;
2389 num_scr_allow = 1; 2426 num_scr_allow = 1;
2390} 2427}
2391 2428
2392void 2429void
2393rxvt_term::scr_remap_chars (line_t &l) 2430rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2394{ 2431{
2395 if (!l.t) 2432 if (!l.t)
2396 return; 2433 return;
2397 2434
2398 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2435 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2400 for (int i = ncol; i--; ) 2437 for (int i = ncol; i--; )
2401 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2438 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2402} 2439}
2403 2440
2404void 2441void
2405rxvt_term::scr_remap_chars () 2442rxvt_term::scr_remap_chars () NOTHROW
2406{ 2443{
2407 for (int i = total_rows; i--; ) 2444 for (int i = total_rows; i--; )
2408 scr_remap_chars (row_buf [i]); 2445 scr_remap_chars (row_buf [i]);
2409 2446
2410 for (int i = nrow; i--; ) 2447 for (int i = nrow; i--; )
… …
2413 scr_remap_chars (swap_buf [i]); 2450 scr_remap_chars (swap_buf [i]);
2414 } 2451 }
2415} 2452}
2416 2453
2417void 2454void
2418rxvt_term::scr_recolour () 2455rxvt_term::scr_recolour () NOTHROW
2419{ 2456{
2420 if (1 2457 if (1
2421#if TRANSPARENT 2458#if TRANSPARENT
2422 && !am_transparent 2459 && !am_transparent
2423#endif 2460#endif
2424#if XPM_BACKGROUND 2461#if XPM_BACKGROUND
2425 && !bgPixmap.pixmap 2462 && !bgPixmap.pixmap
2426#endif 2463#endif
2427 ) 2464 )
2428 { 2465 {
2429 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2466 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2430 XClearWindow (display->display, parent[0]); 2467 XClearWindow (dpy, parent[0]);
2431 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2468 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2432#if HAVE_SCROLLBARS 2469#if HAVE_SCROLLBARS
2433 if (scrollBar.win) 2470 if (scrollBar.win)
2434 { 2471 {
2435 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2472 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2436 scrollBar.setIdle (); 2473 scrollBar.setIdle ();
2437 scrollbar_show (0); 2474 scrollbar_show (0);
2438 } 2475 }
2439#endif 2476#endif
2440 } 2477 }
… …
2444 want_refresh = 1; 2481 want_refresh = 1;
2445} 2482}
2446 2483
2447/* ------------------------------------------------------------------------- */ 2484/* ------------------------------------------------------------------------- */
2448void 2485void
2449rxvt_term::scr_clear (bool really) 2486rxvt_term::scr_clear (bool really) NOTHROW
2450{ 2487{
2451 if (!mapped) 2488 if (!mapped)
2452 return; 2489 return;
2453 2490
2454 num_scr_allow = 0; 2491 num_scr_allow = 0;
2455 want_refresh = 1; 2492 want_refresh = 1;
2456 2493
2457 if (really) 2494 if (really)
2458 XClearWindow (display->display, vt); 2495 XClearWindow (dpy, vt);
2459} 2496}
2460 2497
2461void 2498void
2462rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2499rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2463{ 2500{
2464 int view_end = view_start + nrow; 2501 int view_end = view_start + nrow;
2465 int row, col; 2502 int row, col;
2466 2503
2467 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2504 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2479 srp[col] ^= rstyle2; 2516 srp[col] ^= rstyle2;
2480 } 2517 }
2481} 2518}
2482 2519
2483void 2520void
2484rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2521rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2485{ 2522{
2486 int view_end = view_start + nrow; 2523 int view_end = view_start + nrow;
2487 int row, col; 2524 int row, col;
2488 2525
2489 if (beg_row >= view_start) 2526 if (beg_row >= view_start)
… …
2506 srp[col] ^= rstyle; 2543 srp[col] ^= rstyle;
2507} 2544}
2508 2545
2509/* ------------------------------------------------------------------------- */ 2546/* ------------------------------------------------------------------------- */
2510void 2547void
2511rxvt_term::scr_reverse_selection () 2548rxvt_term::scr_reverse_selection () NOTHROW
2512{ 2549{
2513 if (selection.op 2550 if (selection.op
2514 && current_screen == selection.screen 2551 && current_screen == selection.screen
2515 && selection.end.row >= view_start) 2552 && selection.end.row >= view_start)
2516 { 2553 {
2517#if ENABLE_FRILLS 2554#if !ENABLE_MINIMAL
2518 if (selection.rect) 2555 if (selection.rect)
2519 scr_xor_rect (selection.beg.row, selection.beg.col, 2556 scr_xor_rect (selection.beg.row, selection.beg.col,
2520 selection.end.row, selection.end.col, 2557 selection.end.row, selection.end.col,
2521 RS_RVid, RS_RVid | RS_Uline); 2558 RS_RVid, RS_RVid | RS_Uline);
2522 else 2559 else
… …
2532 * Dump the whole scrollback and screen to the passed filedescriptor. The 2569 * Dump the whole scrollback and screen to the passed filedescriptor. The
2533 * invoking routine must close the fd. 2570 * invoking routine must close the fd.
2534 */ 2571 */
2535#if 0 2572#if 0
2536void 2573void
2537rxvt_term::scr_dump (int fd) 2574rxvt_term::scr_dump (int fd) NOTHROW
2538{ 2575{
2539 int row, wrote; 2576 int row, wrote;
2540 unsigned int width, towrite; 2577 unsigned int width, towrite;
2541 char r1[] = "\n"; 2578 char r1[] = "\n";
2542 2579
… …
2561 2598
2562/* ------------------------------------------------------------------------- * 2599/* ------------------------------------------------------------------------- *
2563 * CHARACTER SELECTION * 2600 * CHARACTER SELECTION *
2564 * ------------------------------------------------------------------------- */ 2601 * ------------------------------------------------------------------------- */
2565void 2602void
2566rxvt_term::selection_check (int check_more) 2603rxvt_term::selection_check (int check_more) NOTHROW
2567{ 2604{
2568 row_col_t pos; 2605 row_col_t pos;
2569 2606
2570 if (!selection.op) 2607 if (!selection.op)
2571 return; 2608 return;
… …
2592/* ------------------------------------------------------------------------- */ 2629/* ------------------------------------------------------------------------- */
2593/* 2630/*
2594 * Paste a selection direct to the command fd 2631 * Paste a selection direct to the command fd
2595 */ 2632 */
2596void 2633void
2597rxvt_term::paste (char *data, unsigned int len) 2634rxvt_term::paste (char *data, unsigned int len) NOTHROW
2598{ 2635{
2599 /* convert normal newline chars into common keyboard Return key sequence */ 2636 /* convert normal newline chars into common keyboard Return key sequence */
2600 for (unsigned int i = 0; i < len; i++) 2637 for (unsigned int i = 0; i < len; i++)
2601 if (data[i] == C0_LF) 2638 if (data[i] == C0_LF)
2602 data[i] = C0_CR; 2639 data[i] = C0_CR;
… …
2608/* 2645/*
2609 * Respond to a notification that a primary selection has been sent 2646 * Respond to a notification that a primary selection has been sent
2610 * EXT: SelectionNotify 2647 * EXT: SelectionNotify
2611 */ 2648 */
2612void 2649void
2613rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2650rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2614{ 2651{
2615 if (prop == None) /* check for failed XConvertSelection */ 2652 if (prop == None) /* check for failed XConvertSelection */
2616 { 2653 {
2617 if ((selection_type & Sel_CompoundText)) 2654 if ((selection_type & Sel_CompoundText))
2618 { 2655 {
… …
2638 } 2675 }
2639 2676
2640 unsigned long bytes_after; 2677 unsigned long bytes_after;
2641 XTextProperty ct; 2678 XTextProperty ct;
2642 2679
2643 if (XGetWindowProperty (display->display, win, prop, 2680 if (XGetWindowProperty (dpy, win, prop,
2644 0, PROP_SIZE / 4, 2681 0, PROP_SIZE / 4,
2645 delete_prop, AnyPropertyType, 2682 delete_prop, AnyPropertyType,
2646 &ct.encoding, &ct.format, 2683 &ct.encoding, &ct.format,
2647 &ct.nitems, &bytes_after, 2684 &ct.nitems, &bytes_after,
2648 &ct.value) != Success) 2685 &ct.value) != Success)
… …
2657 if (bytes_after) 2694 if (bytes_after)
2658 { 2695 {
2659 // fetch and append remaining data 2696 // fetch and append remaining data
2660 XTextProperty ct2; 2697 XTextProperty ct2;
2661 2698
2662 if (XGetWindowProperty (display->display, win, prop, 2699 if (XGetWindowProperty (dpy, win, prop,
2663 ct.nitems / 4, (bytes_after + 3) / 4, 2700 ct.nitems / 4, (bytes_after + 3) / 4,
2664 delete_prop, AnyPropertyType, 2701 delete_prop, AnyPropertyType,
2665 &ct2.encoding, &ct2.format, 2702 &ct2.encoding, &ct2.format,
2666 &ct2.nitems, &bytes_after, 2703 &ct2.nitems, &bytes_after,
2667 &ct2.value) != Success) 2704 &ct2.value) != Success)
… …
2680 2717
2681 if (ct.encoding == xa[XA_INCR]) 2718 if (ct.encoding == xa[XA_INCR])
2682 { 2719 {
2683 // INCR selection, start handshake 2720 // INCR selection, start handshake
2684 if (!delete_prop) 2721 if (!delete_prop)
2685 XDeleteProperty (display->display, win, prop); 2722 XDeleteProperty (dpy, win, prop);
2686 2723
2687 selection_wait = Sel_incr; 2724 selection_wait = Sel_incr;
2688 incr_buf_fill = 0; 2725 incr_buf_fill = 0;
2689 incr_ev.start (NOW + 10); 2726 incr_ev.start (NOW + 10);
2690 2727
… …
2737 } 2774 }
2738 2775
2739 char **cl; 2776 char **cl;
2740 int cr; 2777 int cr;
2741 2778
2742#if ENABLE_FRILLS 2779#if !ENABLE_MINIMAL
2743 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2780 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2744 // so recode it manually 2781 // so recode it manually
2745 if (ct.encoding == xa[XA_UTF8_STRING]) 2782 if (ct.encoding == xa[XA_UTF8_STRING])
2746 { 2783 {
2747 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2784 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2751 paste (s, strlen (s)); 2788 paste (s, strlen (s));
2752 free (s); 2789 free (s);
2753 } 2790 }
2754 else 2791 else
2755#endif 2792#endif
2756 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2793 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2757 && cl) 2794 && cl)
2758 { 2795 {
2759 for (int i = 0; i < cr; i++) 2796 for (int i = 0; i < cr; i++)
2760 paste (cl[i], strlen (cl[i])); 2797 paste (cl[i], strlen (cl[i]));
2761 2798
… …
2770 if (selection_wait == Sel_normal) 2807 if (selection_wait == Sel_normal)
2771 selection_wait = Sel_none; 2808 selection_wait = Sel_none;
2772} 2809}
2773 2810
2774void 2811void
2775rxvt_term::incr_cb (time_watcher &w) 2812rxvt_term::incr_cb (time_watcher &w) NOTHROW
2776{ 2813{
2777 selection_wait = Sel_none; 2814 selection_wait = Sel_none;
2778 2815
2779 incr_buf_size = 0; 2816 incr_buf_size = 0;
2780 free (incr_buf); 2817 free (incr_buf);
2781 2818
2782 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2819 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2783} 2820}
2784 2821
2785void 2822void
2786rxvt_term::selection_property (Window win, Atom prop) 2823rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2787{ 2824{
2788 if (prop == None || selection_wait != Sel_incr) 2825 if (prop == None || selection_wait != Sel_incr)
2789 return; 2826 return;
2790 2827
2791 selection_paste (win, prop, true); 2828 selection_paste (win, prop, true);
… …
2800 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2837 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2801 * will auto fallback to CUT_BUFFER0 2838 * will auto fallback to CUT_BUFFER0
2802 * EXT: button 2 release 2839 * EXT: button 2 release
2803 */ 2840 */
2804void 2841void
2805rxvt_term::selection_request (Time tm, int x, int y) 2842rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2806{ 2843{
2807 if (x < 0 || x >= width || y < 0 || y >= height) 2844 if (selection.text && selnum == Sel_Primary)
2808 return; /* outside window */
2809
2810 if (selection.text)
2811 { /* internal selection */ 2845 { /* internal selection */
2812 char *str = rxvt_wcstombs (selection.text, selection.len); 2846 char *str = rxvt_wcstombs (selection.text, selection.len);
2813 paste (str, strlen (str)); 2847 paste (str, strlen (str));
2814 free (str); 2848 free (str);
2815 return; 2849 return;
2816 } 2850 }
2817 else 2851 else
2818 { 2852 {
2819 int i;
2820
2821 selection_request_time = tm; 2853 selection_request_time = tm;
2822 selection_wait = Sel_normal; 2854 selection_wait = Sel_normal;
2823 2855
2824 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2825 {
2826#if X_HAVE_UTF8_STRING 2856#if X_HAVE_UTF8_STRING
2827 selection_type = Sel_UTF8String; 2857 selection_type = Sel_UTF8String;
2828 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2858 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2829 return; 2859 return;
2830#else 2860#else
2831 selection_type = Sel_CompoundText; 2861 selection_type = Sel_CompoundText;
2832 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2862 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2833 return; 2863 return;
2834#endif 2864#endif
2835 }
2836 } 2865 }
2837 2866
2838 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2867 selection_wait = Sel_none; /* don't loop in selection_paste () */
2839 selection_paste (display->root, XA_CUT_BUFFER0, false); 2868 selection_paste (display->root, XA_CUT_BUFFER0, false);
2840} 2869}
2841 2870
2842int 2871int
2843rxvt_term::selection_request_other (Atom target, int selnum) 2872rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2844{ 2873{
2845 Atom sel; 2874 Atom sel;
2846 2875
2847 selection_type |= selnum; 2876 selection_type |= selnum;
2848 2877
… …
2851 else if (selnum == Sel_Secondary) 2880 else if (selnum == Sel_Secondary)
2852 sel = XA_SECONDARY; 2881 sel = XA_SECONDARY;
2853 else 2882 else
2854 sel = xa[XA_CLIPBOARD]; 2883 sel = xa[XA_CLIPBOARD];
2855 2884
2856 if (XGetSelectionOwner (display->display, sel) != None) 2885 if (XGetSelectionOwner (dpy, sel) != None)
2857 { 2886 {
2858 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2887 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2859 vt, selection_request_time); 2888 vt, selection_request_time);
2860 return 1; 2889 return 1;
2861 } 2890 }
2862 2891
2863 return 0; 2892 return 0;
… …
2867/* 2896/*
2868 * Clear all selected text 2897 * Clear all selected text
2869 * EXT: SelectionClear 2898 * EXT: SelectionClear
2870 */ 2899 */
2871void 2900void
2872rxvt_term::selection_clear () 2901rxvt_term::selection_clear () NOTHROW
2873{ 2902{
2874 want_refresh = 1; 2903 want_refresh = 1;
2875 free (selection.text); 2904 free (selection.text);
2876 selection.text = NULL; 2905 selection.text = NULL;
2877 selection.len = 0; 2906 selection.len = 0;
… …
2926 2955
2927 int end_col; 2956 int end_col;
2928 2957
2929 for (; row <= selection.end.row; row++, col = 0) 2958 for (; row <= selection.end.row; row++, col = 0)
2930 { 2959 {
2931#if ENABLE_FRILLS 2960#if !ENABLE_MINIMAL
2932 if (selection.rect) 2961 if (selection.rect)
2933 { 2962 {
2934 col = selection.beg.col; 2963 col = selection.beg.col;
2935 end_col = ncol + 1; 2964 end_col = ncol + 1;
2936 } 2965 }
… …
2939 end_col = ROW(row).l; 2968 end_col = ROW(row).l;
2940 2969
2941 col = max (col, 0); 2970 col = max (col, 0);
2942 2971
2943 if (row == selection.end.row 2972 if (row == selection.end.row
2944#if ENABLE_FRILLS 2973#if !ENABLE_MINIMAL
2945 || selection.rect 2974 || selection.rect
2946#endif 2975#endif
2947 ) 2976 )
2948 min_it (end_col, selection.end.col); 2977 min_it (end_col, selection.end.col);
2949 2978
… …
2972#endif 3001#endif
2973 else 3002 else
2974 new_selection_text[ofs++] = *t++; 3003 new_selection_text[ofs++] = *t++;
2975 } 3004 }
2976 3005
2977#if ENABLE_FRILLS 3006#if !ENABLE_MINIMAL
2978 if (selection.rect) 3007 if (selection.rect)
2979 { 3008 {
2980 while (ofs 3009 while (ofs
2981 && new_selection_text[ofs - 1] != C0_LF 3010 && new_selection_text[ofs - 1] != C0_LF
2982 && unicode::is_space (new_selection_text[ofs - 1])) 3011 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3012 3041
3013 selection_grab (tm); 3042 selection_grab (tm);
3014} 3043}
3015 3044
3016bool 3045bool
3017rxvt_term::selection_grab (Time tm) 3046rxvt_term::selection_grab (Time tm) NOTHROW
3018{ 3047{
3019 selection_time = tm; 3048 selection_time = tm;
3020 3049
3021 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3050 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3022 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3051 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3023 { 3052 {
3024 display->set_selection_owner (this); 3053 display->set_selection_owner (this);
3025 return true; 3054 return true;
3026 } 3055 }
3027 else 3056 else
… …
3031 } 3060 }
3032 3061
3033#if 0 3062#if 0
3034 XTextProperty ct; 3063 XTextProperty ct;
3035 3064
3036 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3065 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3037 { 3066 {
3038 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3067 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3039 XFree (ct.value); 3068 XFree (ct.value);
3040 } 3069 }
3041#endif 3070#endif
… …
3045/* 3074/*
3046 * Mark or select text based upon number of clicks: 1, 2, or 3 3075 * Mark or select text based upon number of clicks: 1, 2, or 3
3047 * EXT: button 1 press 3076 * EXT: button 1 press
3048 */ 3077 */
3049void 3078void
3050rxvt_term::selection_click (int clicks, int x, int y) 3079rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3051{ 3080{
3052 clicks = ((clicks - 1) % 3) + 1; 3081 clicks = ((clicks - 1) % 3) + 1;
3053 selection.clicks = clicks; /* save clicks so extend will work */ 3082 selection.clicks = clicks; /* save clicks so extend will work */
3054 3083
3055 if (clicks == 2 && !selection.rect 3084 if (clicks == 2 && !selection.rect
… …
3074/* ------------------------------------------------------------------------- */ 3103/* ------------------------------------------------------------------------- */
3075/* 3104/*
3076 * Mark a selection at the specified col/row 3105 * Mark a selection at the specified col/row
3077 */ 3106 */
3078void 3107void
3079rxvt_term::selection_start_colrow (int col, int row) 3108rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3080{ 3109{
3081 want_refresh = 1; 3110 want_refresh = 1;
3082 3111
3083 selection.mark.row = row + view_start; 3112 selection.mark.row = row + view_start;
3084 selection.mark.col = col; 3113 selection.mark.col = col;
… …
3110#define DELIMIT_TEXT(x) \ 3139#define DELIMIT_TEXT(x) \
3111 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3140 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3112#define DELIMIT_REND(x) 1 3141#define DELIMIT_REND(x) 1
3113 3142
3114void 3143void
3115rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3144rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3116{ 3145{
3117 int col, row, dirnadd, tcol, trow, w1, w2; 3146 int col, row, dirnadd, tcol, trow, w1, w2;
3118 row_col_t bound; 3147 row_col_t bound;
3119 text_t *stp; 3148 text_t *stp;
3120 rend_t *srp; 3149 rend_t *srp;
… …
3194 * flag == 0 ==> button 1 3223 * flag == 0 ==> button 1
3195 * flag == 1 ==> button 3 press 3224 * flag == 1 ==> button 3 press
3196 * flag == 2 ==> button 3 motion 3225 * flag == 2 ==> button 3 motion
3197 */ 3226 */
3198void 3227void
3199rxvt_term::selection_extend (int x, int y, int flag) 3228rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3200{ 3229{
3201 int col = clamp (Pixel2Col (x), 0, ncol); 3230 int col = clamp (Pixel2Col (x), 0, ncol);
3202 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3231 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3203 3232
3204 /* 3233 /*
… …
3230/* ------------------------------------------------------------------------- */ 3259/* ------------------------------------------------------------------------- */
3231/* 3260/*
3232 * Extend the selection to the specified col/row 3261 * Extend the selection to the specified col/row
3233 */ 3262 */
3234void 3263void
3235rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3264rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3236{ 3265{
3237 row_col_t pos; 3266 row_col_t pos;
3238 enum { 3267 enum {
3239 LEFT, RIGHT 3268 LEFT, RIGHT
3240 } closeto = RIGHT; 3269 } closeto = RIGHT;
… …
3343 3372
3344 if (selection.clicks == 1) 3373 if (selection.clicks == 1)
3345 { 3374 {
3346 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3375 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3347 && !ROW(selection.beg.row).is_longer () 3376 && !ROW(selection.beg.row).is_longer ()
3348#if ENABLE_FRILLS 3377#if !ENABLE_MINIMAL
3349 && !selection.rect 3378 && !selection.rect
3350#endif 3379#endif
3351 ) 3380 )
3352 selection.beg.col = ncol; 3381 selection.beg.col = ncol;
3353 3382
3354 if ( 3383 if (
3355 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3384 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3356 && !ROW(selection.end.row).is_longer () 3385 && !ROW(selection.end.row).is_longer ()
3357#if ENABLE_FRILLS 3386#if !ENABLE_MINIMAL
3358 && !selection.rect 3387 && !selection.rect
3359#endif 3388#endif
3360 ) 3389 )
3361 selection.end.col = ncol; 3390 selection.end.col = ncol;
3362 } 3391 }
… …
3379 { 3408 {
3380 if (!ROW(end_row).is_longer ()) 3409 if (!ROW(end_row).is_longer ())
3381 { 3410 {
3382 selection.end.row = end_row; 3411 selection.end.row = end_row;
3383 selection.end.col = ROW(end_row).l; 3412 selection.end.col = ROW(end_row).l;
3413# if !ENABLE_MINIMAL
3384 selection_remove_trailing_spaces (); 3414 selection_remove_trailing_spaces ();
3415# endif
3385 break; 3416 break;
3386 } 3417 }
3387 } 3418 }
3388 } 3419 }
3389 else 3420 else
… …
3418 selection.mark.row = selection.beg.row; 3449 selection.mark.row = selection.beg.row;
3419 selection.mark.col = selection.beg.col; 3450 selection.mark.col = selection.beg.col;
3420 } 3451 }
3421 } 3452 }
3422 3453
3423#if ENABLE_FRILLS 3454#if !ENABLE_MINIMAL
3424 if (selection.rect && selection.beg.col > selection.end.col) 3455 if (selection.rect && selection.beg.col > selection.end.col)
3425 ::swap (selection.beg.col, selection.end.col); 3456 ::swap (selection.beg.col, selection.end.col);
3426#endif 3457#endif
3427} 3458}
3428 3459
3429#if ENABLE_FRILLS 3460#if !ENABLE_MINIMAL
3430void 3461void
3431rxvt_term::selection_remove_trailing_spaces () 3462rxvt_term::selection_remove_trailing_spaces () NOTHROW
3432{ 3463{
3433 int32_t end_col, end_row; 3464 int32_t end_col, end_row;
3434 text_t *stp; 3465 text_t *stp;
3435 3466
3436 end_col = selection.end.col; 3467 end_col = selection.end.col;
… …
3474/* 3505/*
3475 * Double click on button 3 when already selected 3506 * Double click on button 3 when already selected
3476 * EXT: button 3 double click 3507 * EXT: button 3 double click
3477 */ 3508 */
3478void 3509void
3479rxvt_term::selection_rotate (int x, int y) 3510rxvt_term::selection_rotate (int x, int y) NOTHROW
3480{ 3511{
3481 selection.clicks = selection.clicks % 3 + 1; 3512 selection.clicks = selection.clicks % 3 + 1;
3482 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3513 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3483} 3514}
3484 3515
… …
3486/* 3517/*
3487 * Respond to a request for our current selection 3518 * Respond to a request for our current selection
3488 * EXT: SelectionRequest 3519 * EXT: SelectionRequest
3489 */ 3520 */
3490void 3521void
3491rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3522rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3492{ 3523{
3493 XSelectionEvent ev; 3524 XSelectionEvent ev;
3494 dDisp;
3495 3525
3496 ev.type = SelectionNotify; 3526 ev.type = SelectionNotify;
3497 ev.property = None; 3527 ev.property = None;
3498 ev.display = rq.display; 3528 ev.display = rq.display;
3499 ev.requestor = rq.requestor; 3529 ev.requestor = rq.requestor;
… …
3513 *target++ = xa[XA_COMPOUND_TEXT]; 3543 *target++ = xa[XA_COMPOUND_TEXT];
3514#if X_HAVE_UTF8_STRING 3544#if X_HAVE_UTF8_STRING
3515 *target++ = xa[XA_UTF8_STRING]; 3545 *target++ = xa[XA_UTF8_STRING];
3516#endif 3546#endif
3517 3547
3518 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3548 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3519 32, PropModeReplace, 3549 32, PropModeReplace,
3520 (unsigned char *)target_list, target - target_list); 3550 (unsigned char *)target_list, target - target_list);
3521 ev.property = rq.property; 3551 ev.property = rq.property;
3522 } 3552 }
3523#if TODO // TODO 3553#if TODO // TODO
… …
3526 /* TODO: Handle MULTIPLE */ 3556 /* TODO: Handle MULTIPLE */
3527 } 3557 }
3528#endif 3558#endif
3529 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3559 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3530 { 3560 {
3531 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3561 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3532 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3562 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3533 ev.property = rq.property; 3563 ev.property = rq.property;
3534 } 3564 }
3535 else if (rq.target == XA_STRING 3565 else if (rq.target == XA_STRING
3536 || rq.target == xa[XA_TEXT] 3566 || rq.target == xa[XA_TEXT]
… …
3560 style = enc_string; 3590 style = enc_string;
3561 else if (target == xa[XA_TEXT]) 3591 else if (target == xa[XA_TEXT])
3562 style = enc_text; 3592 style = enc_text;
3563 else if (target == xa[XA_COMPOUND_TEXT]) 3593 else if (target == xa[XA_COMPOUND_TEXT])
3564 style = enc_compound_text; 3594 style = enc_compound_text;
3565#if ENABLE_FRILLS 3595#if !ENABLE_MINIMAL
3566 else if (target == xa[XA_UTF8_STRING]) 3596 else if (target == xa[XA_UTF8_STRING])
3567 style = enc_utf8; 3597 style = enc_utf8;
3568#endif 3598#endif
3569 else 3599 else
3570 { 3600 {
… …
3581 { 3611 {
3582 cl = L""; 3612 cl = L"";
3583 selectlen = 0; 3613 selectlen = 0;
3584 } 3614 }
3585 3615
3586#if ENABLE_FRILLS 3616#if !ENABLE_MINIMAL
3587 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3617 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3588 // so recode it manually 3618 // so recode it manually
3589 if (style == enc_utf8) 3619 if (style == enc_utf8)
3590 { 3620 {
3591 freect = 1; 3621 freect = 1;
… …
3594 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3624 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3595 ct.nitems = strlen ((char *)ct.value); 3625 ct.nitems = strlen ((char *)ct.value);
3596 } 3626 }
3597 else 3627 else
3598#endif 3628#endif
3599 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3629 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3600 freect = 1; 3630 freect = 1;
3601 else 3631 else
3602 { 3632 {
3603 /* if we failed to convert then send it raw */ 3633 /* if we failed to convert then send it raw */
3604 ct.value = (unsigned char *)cl; 3634 ct.value = (unsigned char *)cl;
3605 ct.nitems = selectlen; 3635 ct.nitems = selectlen;
3606 ct.encoding = target; 3636 ct.encoding = target;
3607 } 3637 }
3608 3638
3609 XChangeProperty (disp, rq.requestor, rq.property, 3639 XChangeProperty (dpy, rq.requestor, rq.property,
3610 ct.encoding, 8, PropModeReplace, 3640 ct.encoding, 8, PropModeReplace,
3611 ct.value, (int)ct.nitems); 3641 ct.value, (int)ct.nitems);
3612 ev.property = rq.property; 3642 ev.property = rq.property;
3613 3643
3614 if (freect) 3644 if (freect)
3615 XFree (ct.value); 3645 XFree (ct.value);
3616 } 3646 }
3617 3647
3618 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3648 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3619} 3649}
3620 3650
3621/* ------------------------------------------------------------------------- * 3651/* ------------------------------------------------------------------------- *
3622 * MOUSE ROUTINES * 3652 * MOUSE ROUTINES *
3623 * ------------------------------------------------------------------------- */ 3653 * ------------------------------------------------------------------------- */
3624 3654
3625/* 3655/*
3626 * return col/row values corresponding to x/y pixel values 3656 * return col/row values corresponding to x/y pixel values
3627 */ 3657 */
3628void 3658void
3629rxvt_term::pixel_position (int *x, int *y) 3659rxvt_term::pixel_position (int *x, int *y) NOTHROW
3630{ 3660{
3631 *x = Pixel2Col (*x); 3661 *x = Pixel2Col (*x);
3632 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3662 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3633 *y = Pixel2Row (*y); 3663 *y = Pixel2Row (*y);
3634 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3664 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3635} 3665}
3636 3666
3637/* ------------------------------------------------------------------------- */ 3667/* ------------------------------------------------------------------------- */
3638#ifdef USE_XIM 3668#ifdef USE_XIM
3639void 3669void
3640rxvt_term::im_set_position (XPoint &pos) 3670rxvt_term::im_set_position (XPoint &pos) NOTHROW
3641{ 3671{
3642 XWindowAttributes xwa; 3672 XWindowAttributes xwa;
3643 3673
3644 XGetWindowAttributes (display->display, vt, &xwa); 3674 XGetWindowAttributes (dpy, vt, &xwa);
3645 3675
3646 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3676 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3647 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3677 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3648} 3678}
3649#endif 3679#endif
3650 3680
3651#if ENABLE_OVERLAY 3681#if ENABLE_OVERLAY
3652void 3682void
3653rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3683rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3654{ 3684{
3655 if (nrow < 1 || ncol < 1) 3685 if (nrow < 1 || ncol < 1)
3656 return; 3686 return;
3657 3687
3658 want_refresh = 1; 3688 want_refresh = 1;
… …
3703 *rp = r; 3733 *rp = r;
3704 } 3734 }
3705} 3735}
3706 3736
3707void 3737void
3708rxvt_term::scr_overlay_off () 3738rxvt_term::scr_overlay_off () NOTHROW
3709{ 3739{
3710 if (!ov_text) 3740 if (!ov_text)
3711 return; 3741 return;
3712 3742
3713 want_refresh = 1; 3743 want_refresh = 1;
… …
3721 delete [] ov_text; ov_text = 0; 3751 delete [] ov_text; ov_text = 0;
3722 delete [] ov_rend; ov_rend = 0; 3752 delete [] ov_rend; ov_rend = 0;
3723} 3753}
3724 3754
3725void 3755void
3726rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3756rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3727{ 3757{
3728 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3758 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3729 return; 3759 return;
3730 3760
3731 x++, y++; 3761 x++, y++;
… …
3733 ov_text[y][x] = text; 3763 ov_text[y][x] = text;
3734 ov_rend[y][x] = rend; 3764 ov_rend[y][x] = rend;
3735} 3765}
3736 3766
3737void 3767void
3738rxvt_term::scr_overlay_set (int x, int y, const char *s) 3768rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3739{ 3769{
3740 while (*s) 3770 while (*s)
3741 scr_overlay_set (x++, y, *s++); 3771 scr_overlay_set (x++, y, *s++);
3742} 3772}
3743 3773
3744void 3774void
3745rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3775rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3746{ 3776{
3747 while (*s) 3777 while (*s)
3748 { 3778 {
3749 text_t t = *s++; 3779 text_t t = *s++;
3750 int width = wcwidth (t); 3780 int width = WCWIDTH (t);
3751 3781
3752 while (width--) 3782 while (width--)
3753 { 3783 {
3754 scr_overlay_set (x++, y, t); 3784 scr_overlay_set (x++, y, t);
3755 t = NOCHAR; 3785 t = NOCHAR;
3756 } 3786 }
3757 } 3787 }
3758} 3788}
3759 3789
3760void 3790void
3761rxvt_term::scr_swap_overlay () 3791rxvt_term::scr_swap_overlay () NOTHROW
3762{ 3792{
3763 if (!ov_text) 3793 if (!ov_text)
3764 return; 3794 return;
3765 3795
3766 // swap screen mem with overlay 3796 // swap screen mem with overlay

Diff Legend

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