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.253 by root, Fri Jan 27 18:36:43 2006 UTC vs.
Revision 1.281 by ayin, Wed Oct 31 09:55:24 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 (xdisp, 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 (xdisp, 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 (xdisp, 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/* ------------------------------------------------------------------------- *
… …
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
… …
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;
… …
237 selection.text = NULL; 236 selection.text = NULL;
238 selection.len = 0; 237 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
241 selection.clicks = 0; 240 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false;
243 } 241 }
244 else 242 else
245 { 243 {
246 /* 244 /*
247 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
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)
… …
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;
… …
366 } 364 }
367 while (p != pend && q > 0); 365 while (p != pend && q > 0);
368 366
369 term_start = total_rows - nrow; 367 term_start = total_rows - nrow;
370 top_row = q - term_start; 368 top_row = q - term_start;
371 369
372 // make sure all terminal lines exist 370 // make sure all terminal lines exist
373 while (top_row > 0) 371 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 372 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 373 }
376 else 374 else
377 { 375 {
378 // if no scrollback exists (yet), wing, instead of wrap 376 // if no scrollback exists (yet), wing, instead of wrap
379 377
380 for (int row = min (nrow, prev_nrow); row--; ) 378 for (int row = min (nrow, prev_nrow); row--; )
381 { 379 {
382 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)];
383 line_t &qline = row_buf [row]; 381 line_t &qline = row_buf [row];
384 382
… …
407 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
408 406
409 prev_nrow = nrow; 407 prev_nrow = nrow;
410 prev_ncol = ncol; 408 prev_ncol = ncol;
411 409
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 410 tabs = (char *)rxvt_malloc (ncol);
413 411
414 for (int col = ncol; col--; ) 412 for (int col = ncol; --col; )
415 tabs [col] = col % TABSIZE == 0; 413 tabs [col] = col % TABSIZE == 0;
416 414
417 if (current_screen != PRIMARY) 415 if (current_screen != PRIMARY)
418 scr_swap_screen (); 416 scr_swap_screen ();
419 417
… …
510} 508}
511 509
512void 510void
513rxvt_term::scr_swap_screen () 511rxvt_term::scr_swap_screen ()
514{ 512{
515 if (!OPTION (Opt_secondaryScreen)) 513 if (!option (Opt_secondaryScreen))
516 return; 514 return;
517 515
518 for (int i = prev_nrow; i--; ) 516 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 517 ::swap (ROW(i), swap_buf [i]);
520 518
… …
542 selection_check (2); /* check for boundary cross */ 540 selection_check (2); /* check for boundary cross */
543 541
544 int i = current_screen; current_screen = scrn; scrn = i; 542 int i = current_screen; current_screen = scrn; scrn = i;
545 543
546#if NSCREENS 544#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 545 if (option (Opt_secondaryScreen))
548 { 546 {
549 num_scr = 0; 547 num_scr = 0;
550 548
551 scr_swap_screen (); 549 scr_swap_screen ();
552 550
… …
555 screen.flags |= Screen_VisibleCursor; 553 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 554 swap.flags |= Screen_VisibleCursor;
557 } 555 }
558 else 556 else
559#endif 557#endif
560 if (OPTION (Opt_secondaryScroll)) 558 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 559 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 560}
563 561
564// clear WrapNext indicator, solidifying position on next line 562// clear WrapNext indicator, solidifying position on next line
565void 563void
… …
624 want_refresh = 1; 622 want_refresh = 1;
625 num_scr += count; 623 num_scr += count;
626 624
627 if (count > 0 625 if (count > 0
628 && row1 == 0 626 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 627 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 628 {
631 top_row = max (top_row - count, -saveLines); 629 top_row = max (top_row - count, -saveLines);
632 630
633 // scroll everything up 'count' lines 631 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 632 term_start = (term_start + count) % total_rows;
… …
640 l.touch (); 638 l.touch ();
641 } 639 }
642 640
643 // erase newly scrolled-in lines 641 // erase newly scrolled-in lines
644 for (int i = count; i--; ) 642 for (int i = count; i--; )
643 {
644 line_t &l = ROW(nrow - 1 - i);
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 {
650 scr_blank_line (l, 0, l.l, rstyle);
651 l.l = 0;
652 l.f = 0;
653 }
654 else
645 scr_blank_screen_mem (ROW(nrow - 1 - i), rstyle); 655 scr_blank_screen_mem (l, rstyle);
656 }
646 657
647 // now copy lines below the scroll region bottom to the 658 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 659 // bottom of the screen again, so they look as if they
649 // hadn't moved. 660 // hadn't moved.
650 for (int i = nrow; --i > row2; ) 661 for (int i = nrow; --i > row2; )
… …
653 line_t &l2 = ROW(i); 664 line_t &l2 = ROW(i);
654 665
655 ::swap (l1, l2); 666 ::swap (l1, l2);
656 l2.touch (); 667 l2.touch ();
657 } 668 }
658 669
659 // move and/or clear selection, if any 670 // move and/or clear selection, if any
660 if (selection.op && current_screen == selection.screen) 671 if (selection.op && current_screen == selection.screen)
661 { 672 {
662 selection.beg.row -= count; 673 selection.beg.row -= count;
663 selection.end.row -= count; 674 selection.end.row -= count;
… …
671 selection.op = SELECTION_CLEAR; 682 selection.op = SELECTION_CLEAR;
672 } 683 }
673 } 684 }
674 685
675 // finally move the view window, if desired 686 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 687 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 688 && view_start != 0
678 && view_start != -saveLines) 689 && view_start != -saveLines)
679 scr_page (UP, count); 690 scr_page (UP, count);
680 691
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 692 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
699 { 710 {
700 /* move selected region too */ 711 /* move selected region too */
701 selection.beg.row -= count; 712 selection.beg.row -= count;
702 selection.end.row -= count; 713 selection.end.row -= count;
703 selection.mark.row -= count; 714 selection.mark.row -= count;
704 715
705 selection_check (0); 716 selection_check (0);
706 } 717 }
707 } 718 }
708 719
709 // use a simple and robust scrolling algorithm, this 720 // use a simple and robust scrolling algorithm, this
… …
821 } 832 }
822 833
823 if (screen.flags & Screen_WrapNext) 834 if (screen.flags & Screen_WrapNext)
824 { 835 {
825 scr_do_wrap (); 836 scr_do_wrap ();
826 837
827 line->l = ncol; 838 line->l = ncol;
828 line->is_longer (1); 839 line->is_longer (1);
829 840
830 row = screen.cur.row; 841 row = screen.cur.row;
831 line = &ROW(row); /* _must_ refresh */ 842 line = &ROW(row); /* _must_ refresh */
… …
1049 x = i; 1060 x = i;
1050 1061
1051 if (!--count) 1062 if (!--count)
1052 break; 1063 break;
1053 } 1064 }
1054 else 1065 else
1055 ht &= l.t[i] == ' ' 1066 ht &= l.t[i] == ' '
1056 && RS_SAME (l.r[i], base_rend); 1067 && RS_SAME (l.r[i], base_rend);
1057 1068
1058 if (count) 1069 if (count)
1059 x = ncol - 1; 1070 x = ncol - 1;
1060 1071
1061 // store horizontal tab commands as characters inside the text 1072 // store horizontal tab commands as characters inside the text
1062 // buffer so they can be selected and pasted. 1073 // buffer so they can be selected and pasted.
1063 if (ht && OPTION (Opt_pastableTabs)) 1074 if (ht && option (Opt_pastableTabs))
1064 { 1075 {
1065 base_rend = SET_FONT (base_rend, 0); 1076 base_rend = SET_FONT (base_rend, 0);
1066 1077
1067 l.touch (x); 1078 l.touch (x);
1068 1079
… …
1101 * Process DEC Back Index 1112 * Process DEC Back Index
1102 * XTERM_SEQ: ESC 6 1113 * XTERM_SEQ: ESC 6
1103 * 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
1104 * in that row right. Clear left column. 1115 * in that row right. Clear left column.
1105 */ 1116 */
1106#if ENABLE_FRILLS 1117#if !ENABLE_MINIMAL
1107void 1118void
1108rxvt_term::scr_backindex () NOTHROW 1119rxvt_term::scr_backindex () NOTHROW
1109{ 1120{
1110 if (screen.cur.col > 0) 1121 if (screen.cur.col > 0)
1111 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1118 * Process DEC Forward Index 1129 * Process DEC Forward Index
1119 * XTERM_SEQ: ESC 9 1130 * XTERM_SEQ: ESC 9
1120 * 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
1121 * in that row left. Clear right column. 1132 * in that row left. Clear right column.
1122 */ 1133 */
1123#if ENABLE_FRILLS 1134#if !ENABLE_MINIMAL
1124void 1135void
1125rxvt_term::scr_forwardindex () NOTHROW 1136rxvt_term::scr_forwardindex () NOTHROW
1126{ 1137{
1127 if (screen.cur.col < ncol - 1) 1138 if (screen.cur.col < ncol - 1)
1128 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1329 } 1340 }
1330 else 1341 else
1331 { 1342 {
1332 ren = rstyle & (RS_fgMask | RS_bgMask); 1343 ren = rstyle & (RS_fgMask | RS_bgMask);
1333 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1344 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1334 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1345 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1335 ERASE_ROWS (row, num); 1346 ERASE_ROWS (row, num);
1336 gcvalue.foreground = pix_colors[Color_fg]; 1347 gcvalue.foreground = pix_colors[Color_fg];
1337 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1348 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1338 } 1349 }
1339 1350
1340 for (; num--; row++) 1351 for (; num--; row++)
1341 { 1352 {
1342 scr_blank_screen_mem (ROW(row), rstyle); 1353 scr_blank_screen_mem (ROW(row), rstyle);
1343 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1354 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1344 } 1355 }
1345} 1356}
1346 1357
1347#if ENABLE_FRILLS 1358#if !ENABLE_MINIMAL
1348void 1359void
1349rxvt_term::scr_erase_savelines () NOTHROW 1360rxvt_term::scr_erase_savelines () NOTHROW
1350{ 1361{
1351 want_refresh = 1; 1362 want_refresh = 1;
1352 ZERO_SCROLLBACK (); 1363 ZERO_SCROLLBACK ();
… …
1610 */ 1621 */
1611void 1622void
1612rxvt_term::scr_set_tab (int mode) NOTHROW 1623rxvt_term::scr_set_tab (int mode) NOTHROW
1613{ 1624{
1614 if (mode < 0) 1625 if (mode < 0)
1615 memset (tabs, 0, ncol * sizeof (char)); 1626 memset (tabs, 0, ncol);
1616 else if (screen.cur.col < ncol) 1627 else if (screen.cur.col < ncol)
1617 tabs [screen.cur.col] = !!mode; 1628 tabs [screen.cur.col] = !!mode;
1618} 1629}
1619 1630
1620/* ------------------------------------------------------------------------- */ 1631/* ------------------------------------------------------------------------- */
… …
1635 if (rvideo_state != on) 1646 if (rvideo_state != on)
1636 { 1647 {
1637 rvideo_state = on; 1648 rvideo_state = on;
1638 1649
1639 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1650 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1640#if XPM_BACKGROUND 1651#ifdef HAVE_BG_PIXMAP
1641 if (bgPixmap.pixmap == None) 1652 if (bgPixmap.pixmap == None)
1642#endif 1653#endif
1643#if TRANSPARENT
1644 if (!OPTION (Opt_transparent) || am_transparent == 0)
1645#endif
1646 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 1654 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1647 1655
1648 XGCValues gcvalue; 1656 XGCValues gcvalue;
1649 gcvalue.foreground = pix_colors[Color_fg]; 1657 gcvalue.foreground = pix_colors[Color_fg];
1650 gcvalue.background = pix_colors[Color_bg]; 1658 gcvalue.background = pix_colors[Color_bg];
1651 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); 1659 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1652 1660
1653 scr_clear (); 1661 scr_clear ();
1654 scr_touch (true); 1662 scr_touch (true);
1655 } 1663 }
1656} 1664}
… …
1663void 1671void
1664rxvt_term::scr_report_position () NOTHROW 1672rxvt_term::scr_report_position () NOTHROW
1665{ 1673{
1666 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1674 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1667} 1675}
1668 1676
1669/* ------------------------------------------------------------------------- * 1677/* ------------------------------------------------------------------------- *
1670 * FONTS * 1678 * FONTS *
1671 * ------------------------------------------------------------------------- */ 1679 * ------------------------------------------------------------------------- */
1672 1680
1673/* 1681/*
… …
1726{ 1734{
1727 charsets[set] = (unsigned char)ch; 1735 charsets[set] = (unsigned char)ch;
1728 set_font_style (); 1736 set_font_style ();
1729} 1737}
1730 1738
1731 1739
1732/* ------------------------------------------------------------------------- * 1740/* ------------------------------------------------------------------------- *
1733 * MAJOR SCREEN MANIPULATION * 1741 * MAJOR SCREEN MANIPULATION *
1734 * ------------------------------------------------------------------------- */ 1742 * ------------------------------------------------------------------------- */
1735 1743
1736/* 1744/*
… …
1741{ 1749{
1742 bool found = false; 1750 bool found = false;
1743 1751
1744 for (int i = 0; i < nrow; i++) 1752 for (int i = 0; i < nrow; i++)
1745 { 1753 {
1746 int col = 0;
1747 rend_t *drp = drawn_buf[i].r; 1754 rend_t *drp = drawn_buf[i].r;
1748 1755
1749 for (; col < ncol; col++, drp++) 1756 for (int col = 0; col < ncol; col++, drp++)
1750 if ((*drp & mask) == value) 1757 if ((*drp & mask) == value)
1751 { 1758 {
1752 found = true; 1759 found = true;
1753 *drp = ~value; 1760 *drp = ~value;
1754 } 1761 }
… …
1794 for (i = PART_BEG; i < RC_COUNT; i++) 1801 for (i = PART_BEG; i < RC_COUNT; i++)
1795 { 1802 {
1796 min_it (rc[i].col, ncol - 1); 1803 min_it (rc[i].col, ncol - 1);
1797 min_it (rc[i].row, nrow - 1); 1804 min_it (rc[i].row, nrow - 1);
1798 } 1805 }
1799 1806// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1800 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1807 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1801 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1808 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1802 1809
1803 num_scr_allow = 0; 1810 num_scr_allow = 0;
1804 1811
… …
1874{ 1881{
1875#ifndef NO_BELL 1882#ifndef NO_BELL
1876 1883
1877# ifndef NO_MAPALERT 1884# ifndef NO_MAPALERT
1878# ifdef MAPALERT_OPTION 1885# ifdef MAPALERT_OPTION
1879 if (OPTION (Opt_mapAlert)) 1886 if (option (Opt_mapAlert))
1880# endif 1887# endif
1881 XMapWindow (xdisp, parent[0]); 1888 XMapWindow (dpy, parent[0]);
1882# endif 1889# endif
1883 1890
1891# if ENABLE_FRILLS
1892 if (option (Opt_urgentOnBell))
1893 {
1894 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1895 {
1896 h->flags |= XUrgencyHint;
1897 XSetWMHints (dpy, parent[0], h);
1898 }
1899 }
1900# endif
1901
1884 if (OPTION (Opt_visualBell)) 1902 if (option (Opt_visualBell))
1885 { 1903 {
1886 rvideo_bell = true; 1904 rvideo_bell = true;
1887 scr_rvideo_mode (rvideo_mode); 1905 scr_rvideo_mode (rvideo_mode);
1888 display->flush (); 1906 display->flush ();
1889 1907
1890 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1908 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1891 } 1909 }
1892 else 1910 else
1893 XBell (xdisp, 0); 1911 XBell (dpy, 0);
1894
1895#endif 1912#endif
1896} 1913}
1897 1914
1898/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1899/* ARGSUSED */ 1916/* ARGSUSED */
… …
1957 * screen.text/screen.rend contain what the screen will change to. 1974 * screen.text/screen.rend contain what the screen will change to.
1958 */ 1975 */
1959void 1976void
1960rxvt_term::scr_refresh () NOTHROW 1977rxvt_term::scr_refresh () NOTHROW
1961{ 1978{
1962 unsigned char must_clear, /* use draw_string not draw_image_string */ 1979 unsigned char have_bg,
1963 showcursor; /* show the cursor */ 1980 showcursor; /* show the cursor */
1964 int16_t col, row, /* column/row we're processing */ 1981 int16_t col, row, /* column/row we're processing */
1965 ocrow; /* old cursor row */ 1982 ocrow; /* old cursor row */
1966 int i; /* tmp */ 1983 int i; /* tmp */
1967#ifndef NO_CURSORCOLOR 1984#ifndef NO_CURSORCOLOR
1968 rend_t cc1; /* store colours at cursor position (s) */ 1985 rend_t cc1; /* store colours at cursor position (s) */
1969#endif 1986#endif
1970 rend_t *crp; // cursor rendition pointer 1987 rend_t *crp; // cursor rendition pointer
1988 rend_t ccol1, /* Cursor colour */
1989 ccol2; /* Cursor colour2 */
1971 1990
1972 want_refresh = 0; /* screen is current */ 1991 want_refresh = 0; /* screen is current */
1973 1992
1974 if (refresh_type == NO_REFRESH || !mapped) 1993 if (refresh_type == NO_REFRESH || !mapped)
1975 return; 1994 return;
1976 1995
1977 /* 1996 /*
1978 * A: set up vars 1997 * A: set up vars
1979 */ 1998 */
1980 must_clear = 0; 1999 have_bg = 0;
1981 refresh_count = 0; 2000 refresh_count = 0;
1982 2001
1983#if XPM_BACKGROUND 2002#ifdef HAVE_BG_PIXMAP
1984 must_clear |= bgPixmap.pixmap != None; 2003 have_bg |= bgPixmap.pixmap != None;
1985#endif
1986#if TRANSPARENT
1987 must_clear |= OPTION (Opt_transparent) && am_transparent;
1988#endif 2004#endif
1989 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1990 2006
1991 /* 2007 /*
1992 * B: reverse any characters which are selected 2008 * B: reverse any characters which are selected
… …
1996 /* 2012 /*
1997 * C: set the cursor character (s) 2013 * C: set the cursor character (s)
1998 */ 2014 */
1999 { 2015 {
2000 unsigned char setoldcursor; 2016 unsigned char setoldcursor;
2001 rend_t ccol1, /* Cursor colour */
2002 ccol2; /* Cursor colour2 */
2003 2017
2004 showcursor = (screen.flags & Screen_VisibleCursor); 2018 showcursor = (screen.flags & Screen_VisibleCursor);
2005#ifdef CURSOR_BLINK 2019#ifdef CURSOR_BLINK
2006 if (hidden_cursor) 2020 if (hidden_cursor)
2007 showcursor = 0; 2021 showcursor = 0;
… …
2014 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2028 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2015 col--; 2029 col--;
2016 2030
2017 crp = &ROW(screen.cur.row).r[col]; 2031 crp = &ROW(screen.cur.row).r[col];
2018 2032
2033#ifndef NO_CURSORCOLOR
2034 cc1 = *crp & (RS_fgMask | RS_bgMask);
2035 if (ISSET_PIXCOLOR (Color_cursor))
2036 ccol1 = Color_cursor;
2037 else
2038#endif
2039#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2040 ccol1 = fgcolor_of (rstyle);
2041#else
2042 ccol1 = Color_fg;
2043#endif
2044
2045#ifndef NO_CURSORCOLOR
2046 if (ISSET_PIXCOLOR (Color_cursor2))
2047 ccol2 = Color_cursor2;
2048 else
2049#endif
2050#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2051 ccol2 = bgcolor_of (rstyle);
2052#else
2053 ccol2 = Color_bg;
2054#endif
2055
2019 if (showcursor && focus) 2056 if (showcursor && focus)
2020 { 2057 {
2021 if (OPTION (Opt_cursorUnderline)) 2058 if (option (Opt_cursorUnderline))
2022 *crp ^= RS_Uline; 2059 *crp ^= RS_Uline;
2023 else 2060 else
2024 { 2061 {
2025 *crp ^= RS_RVid; 2062 *crp ^= RS_RVid;
2026
2027#ifndef NO_CURSORCOLOR
2028 cc1 = *crp & (RS_fgMask | RS_bgMask);
2029 if (ISSET_PIXCOLOR (Color_cursor))
2030 ccol1 = Color_cursor;
2031 else
2032#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2033 ccol1 = fgcolor_of (rstyle);
2034#else
2035 ccol1 = Color_fg;
2036#endif
2037 if (ISSET_PIXCOLOR (Color_cursor2))
2038 ccol2 = Color_cursor2;
2039 else
2040#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2041 ccol2 = bgcolor_of (rstyle);
2042#else
2043 ccol2 = Color_bg;
2044#endif
2045 *crp = SET_FGCOLOR (*crp, ccol1); 2063 *crp = SET_FGCOLOR (*crp, ccol1);
2046 *crp = SET_BGCOLOR (*crp, ccol2); 2064 *crp = SET_BGCOLOR (*crp, ccol2);
2047#endif
2048 } 2065 }
2049 } 2066 }
2050 } 2067 }
2051 2068
2052 /* make sure no outline cursor is left around */ 2069 /* make sure no outline cursor is left around */
… …
2091 * D: CopyArea pass - very useful for slower links 2108 * D: CopyArea pass - very useful for slower links
2092 * This has been deliberately kept simple. 2109 * This has been deliberately kept simple.
2093 */ 2110 */
2094 if (!display->is_local 2111 if (!display->is_local
2095 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2112 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2096 && abs (num_scr) < nrow && !must_clear) 2113 && abs (num_scr) < nrow && !have_bg)
2097 { 2114 {
2098 int16_t nits; 2115 int16_t nits;
2116 int i = num_scr;
2099 int j; 2117 int j;
2100 int len, wlen; 2118 int len, wlen;
2101 dLocal (int, num_scr); 2119 dLocal (int, num_scr);
2102 2120
2103 j = nrow; 2121 j = nrow;
2104 wlen = len = -1; 2122 wlen = len = -1;
2105 row = i > 0 ? 0 : j - 1; 2123 row = i > 0 ? 0 : j - 1;
2124
2106 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2125 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2107 { 2126 {
2108 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2127 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2109 { 2128 {
2110 line_t s = ROW(view_start + row); 2129 line_t s = ROW(view_start + row);
… …
2131 wlen = row; 2150 wlen = row;
2132 continue; 2151 continue;
2133 } 2152 }
2134 } 2153 }
2135 2154
2136 if (len != -1) 2155 if (len >= 0)
2137 { 2156 {
2138 /* also comes here at end if needed because of >= above */ 2157 /* also comes here at end if needed because of >= above */
2139 if (wlen < len) 2158 if (wlen < len)
2140 ::swap (wlen, len); 2159 ::swap (wlen, len);
2141 2160
2161 XGCValues gcv;
2162
2163 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2142 XCopyArea (xdisp, vt, vt, 2164 XCopyArea (dpy, vt, vt,
2143 gc, 0, Row2Pixel (len + i), 2165 gc, 0, Row2Pixel (len + i),
2144 (unsigned int)this->width, 2166 (unsigned int)this->width,
2145 (unsigned int)Height2Pixel (wlen - len + 1), 2167 (unsigned int)Height2Pixel (wlen - len + 1),
2146 0, Row2Pixel (len)); 2168 0, Row2Pixel (len));
2169 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2170
2147 len = -1; 2171 len = -1;
2148 } 2172 }
2149 } 2173 }
2150 } 2174 }
2151#endif 2175#endif
… …
2207 count++; 2231 count++;
2208 2232
2209 if (stp[col] != dtp[col] 2233 if (stp[col] != dtp[col]
2210 || !RS_SAME (srp[col], drp[col])) 2234 || !RS_SAME (srp[col], drp[col]))
2211 { 2235 {
2212 if (must_clear && (i++ > count / 2)) 2236 if (have_bg && (i++ > count / 2))
2213 break; 2237 break;
2214 2238
2215 dtp[col] = stp[col]; 2239 dtp[col] = stp[col];
2216 drp[col] = rend; 2240 drp[col] = rend;
2217 i = 0; 2241 i = 0;
2218 } 2242 }
2219 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2243 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2220 break; 2244 break;
2221 } 2245 }
2222 2246
2223 col--; /* went one too far. move back */ 2247 col--; /* went one too far. move back */
2224 count -= i; /* dump any matching trailing chars */ 2248 count -= i; /* dump any matching trailing chars */
… …
2234 int back = bgcolor_of (rend); // desired background 2258 int back = bgcolor_of (rend); // desired background
2235 2259
2236 // only do special processing if any attributes are set, which is unlikely 2260 // only do special processing if any attributes are set, which is unlikely
2237 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2261 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2238 { 2262 {
2239#if ENABLE_STYLES
2240 // "careful" (too wide) character handling
2241
2242 // include previous careful character(s) if possible, looks nicer (best effort...)
2243 while (text > stp
2244 && srp[text - stp - 1] & RS_Careful
2245 && RS_SAME (rend, srp[text - stp - 1]))
2246 text--, count++, xpixel -= fwidth;
2247
2248 // force redraw after "careful" characters to avoid pixel droppings
2249 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2250 drp[col + i + 1] = ~srp[col + i + 1];
2251
2252 // force redraw before "careful" characters to avoid pixel droppings
2253 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2254 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2255#endif
2256
2257 bool invert = rend & RS_RVid; 2263 bool invert = rend & RS_RVid;
2258 2264
2259#ifndef NO_BOLD_UNDERLINE_REVERSE 2265#ifndef NO_BOLD_UNDERLINE_REVERSE
2260 if (rend & RS_Bold 2266 if (rend & RS_Bold
2261 && fore == Color_fg) 2267 && fore == Color_fg)
… …
2277 else 2283 else
2278 invert = !invert; 2284 invert = !invert;
2279# endif 2285# endif
2280 } 2286 }
2281 2287
2282 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2288 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2283 fore = Color_UL; 2289 fore = Color_UL;
2284#endif 2290#endif
2285 2291
2286 if (invert) 2292 if (invert)
2287 { 2293 {
2294#ifdef OPTION_HC
2295 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2296 || !ISSET_PIXCOLOR (Color_HC))
2297#endif
2298 /* invert the column if no highlightColor is set or it is the
2299 * current cursor column */
2288 ::swap (fore, back); 2300 ::swap (fore, back);
2301#ifdef OPTION_HC
2302 else if (ISSET_PIXCOLOR (Color_HC))
2303 back = Color_HC;
2304#endif
2289 2305
2290#ifndef NO_BOLD_UNDERLINE_REVERSE 2306#ifndef NO_BOLD_UNDERLINE_REVERSE
2307# ifndef OPTION_HC
2291 if (ISSET_PIXCOLOR (Color_RV)) 2308 if (ISSET_PIXCOLOR (Color_RV))
2292 back = Color_RV; 2309 back = Color_RV;
2293 2310# endif
2294 if (fore == back) 2311 if (fore == back)
2295 { 2312 {
2296 fore = Color_bg; 2313 fore = Color_bg;
2297 back = Color_fg; 2314 back = Color_fg;
2298 } 2315 }
… …
2309 } 2326 }
2310 else if (hidden_text) 2327 else if (hidden_text)
2311 fore = back; 2328 fore = back;
2312 } 2329 }
2313#endif 2330#endif
2331
2332#if ENABLE_STYLES
2333 // "careful" (too wide) character handling
2334
2335 // include previous careful character(s) if possible, looks nicer (best effort...)
2336 while (text > stp
2337 && srp[text - stp - 1] & RS_Careful
2338 && RS_SAME (rend, srp[text - stp - 1]))
2339 text--, count++, xpixel -= fwidth;
2340
2341 // force redraw after "careful" characters to avoid pixel droppings
2342 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2343 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2344
2345 // force redraw before "careful" characters to avoid pixel droppings
2346 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2347 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2348#endif
2314 } 2349 }
2315 2350
2316 /* 2351 /*
2317 * Actually do the drawing of the string here 2352 * Actually do the drawing of the string here
2318 */ 2353 */
2319 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2354 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2320 2355
2321 if (back == fore)
2322 font->clear_rect (*drawable, xpixel, ypixel,
2323 fwidth * count, fheight,
2324 back);
2325 else if (back == Color_bg) 2356 if (have_bg && back == Color_bg)
2326 { 2357 {
2327 if (must_clear) 2358 // this is very ugly, maybe push it into ->draw?
2328 {
2329 CLEAR_CHARS (xpixel, ypixel, count);
2330 2359
2331 for (i = 0; i < count; i++) /* don't draw empty strings */ 2360 for (i = 0; i < count; i++) /* don't draw empty strings */
2332 if (text[i] != ' ') 2361 if (text[i] != ' ')
2333 { 2362 {
2334 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2363 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2335 break; 2364 goto did_clear;
2336 }
2337 } 2365 }
2338 else 2366
2339 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2367 CLEAR_CHARS (xpixel, ypixel, count);
2368 did_clear: ;
2340 } 2369 }
2341 else 2370 else
2342 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2371 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2343 2372
2344 if (rend & RS_Uline && font->descent > 1 && fore != back) 2373 if (rend & RS_Uline && font->descent > 1 && fore != back)
2345 { 2374 {
2346#if ENABLE_FRILLS 2375#if ENABLE_FRILLS
2347 if (ISSET_PIXCOLOR (Color_underline)) 2376 if (ISSET_PIXCOLOR (Color_underline))
2348 XSetForeground (xdisp, gc, pix_colors[Color_underline]); 2377 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2349 else 2378 else
2350#endif 2379#endif
2351 XSetForeground (xdisp, gc, pix_colors[fore]); 2380 XSetForeground (dpy, gc, pix_colors[fore]);
2352 2381
2353 XDrawLine (xdisp, drawBuffer, gc, 2382 XDrawLine (dpy, drawBuffer, gc,
2354 xpixel, ypixel + font->ascent + 1, 2383 xpixel, ypixel + font->ascent + 1,
2355 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2384 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2356 } 2385 }
2357 } /* for (col....) */ 2386 } /* for (col....) */
2358 } /* for (row....) */ 2387 } /* for (row....) */
… …
2367 */ 2396 */
2368 if (showcursor) 2397 if (showcursor)
2369 { 2398 {
2370 if (focus) 2399 if (focus)
2371 { 2400 {
2372 if (OPTION (Opt_cursorUnderline)) 2401 if (option (Opt_cursorUnderline))
2373 *crp ^= RS_Uline; 2402 *crp ^= RS_Uline;
2374 else 2403 else
2375 { 2404 {
2376 *crp ^= RS_RVid; 2405 *crp ^= RS_RVid;
2377#ifndef NO_CURSORCOLOR 2406#ifndef NO_CURSORCOLOR
… …
2391 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2420 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2392 cursorwidth++; 2421 cursorwidth++;
2393 2422
2394#ifndef NO_CURSORCOLOR 2423#ifndef NO_CURSORCOLOR
2395 if (ISSET_PIXCOLOR (Color_cursor)) 2424 if (ISSET_PIXCOLOR (Color_cursor))
2396 XSetForeground (xdisp, gc, pix_colors[Color_cursor]); 2425 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2426 else
2397#endif 2427#endif
2428 XSetForeground (dpy, gc, pix_colors[ccol1]);
2398 2429
2399 XDrawRectangle (xdisp, drawBuffer, gc, 2430 XDrawRectangle (dpy, drawBuffer, gc,
2400 Col2Pixel (col), 2431 Col2Pixel (col),
2401 Row2Pixel (oldcursor.row), 2432 Row2Pixel (oldcursor.row),
2402 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2433 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2403 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2434 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2404 } 2435 }
… …
2439} 2470}
2440 2471
2441void 2472void
2442rxvt_term::scr_recolour () NOTHROW 2473rxvt_term::scr_recolour () NOTHROW
2443{ 2474{
2444 if (1 2475#ifdef HAVE_BG_PIXMAP
2445#if TRANSPARENT 2476 bgPixmap.apply ();
2446 && !am_transparent 2477#else
2447#endif
2448#if XPM_BACKGROUND
2449 && !bgPixmap.pixmap
2450#endif
2451 )
2452 {
2453 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2478 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2454 XClearWindow (xdisp, parent[0]); 2479 XClearWindow (dpy, parent[0]);
2455 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2480 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2456#if HAVE_SCROLLBARS 2481# if HAVE_SCROLLBARS
2457 if (scrollBar.win) 2482 if (scrollBar.win)
2458 { 2483 {
2459 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2460 scrollBar.setIdle (); 2485 scrollBar.setIdle ();
2461 scrollbar_show (0); 2486 scrollbar_show (0);
2462 } 2487 }
2463#endif 2488# endif
2464 }
2465
2466 scr_clear (); 2489 scr_clear ();
2467 scr_touch (true); 2490 scr_touch (true);
2468 want_refresh = 1; 2491 want_refresh = 1;
2492#endif
2493
2469} 2494}
2470 2495
2471/* ------------------------------------------------------------------------- */ 2496/* ------------------------------------------------------------------------- */
2472void 2497void
2473rxvt_term::scr_clear (bool really) NOTHROW 2498rxvt_term::scr_clear (bool really) NOTHROW
… …
2477 2502
2478 num_scr_allow = 0; 2503 num_scr_allow = 0;
2479 want_refresh = 1; 2504 want_refresh = 1;
2480 2505
2481 if (really) 2506 if (really)
2482 XClearWindow (xdisp, vt); 2507 XClearWindow (dpy, vt);
2483} 2508}
2484 2509
2485void 2510void
2486rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2511rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2487{ 2512{
… …
2536{ 2561{
2537 if (selection.op 2562 if (selection.op
2538 && current_screen == selection.screen 2563 && current_screen == selection.screen
2539 && selection.end.row >= view_start) 2564 && selection.end.row >= view_start)
2540 { 2565 {
2541#if ENABLE_FRILLS 2566#if !ENABLE_MINIMAL
2542 if (selection.rect) 2567 if (selection.rect)
2543 scr_xor_rect (selection.beg.row, selection.beg.col, 2568 scr_xor_rect (selection.beg.row, selection.beg.col,
2544 selection.end.row, selection.end.col, 2569 selection.end.row, selection.end.col,
2545 RS_RVid, RS_RVid | RS_Uline); 2570 RS_RVid, RS_RVid | RS_Uline);
2546 else 2571 else
… …
2580 if (write (fd, r1, 1) <= 0) 2605 if (write (fd, r1, 1) <= 0)
2581 return; /* XXX: death, no report */ 2606 return; /* XXX: death, no report */
2582 } 2607 }
2583} 2608}
2584#endif 2609#endif
2585 2610
2586/* ------------------------------------------------------------------------- * 2611/* ------------------------------------------------------------------------- *
2587 * CHARACTER SELECTION * 2612 * CHARACTER SELECTION *
2588 * ------------------------------------------------------------------------- */ 2613 * ------------------------------------------------------------------------- */
2589void 2614void
2590rxvt_term::selection_check (int check_more) NOTHROW 2615rxvt_term::selection_check (int check_more) NOTHROW
… …
2662 } 2687 }
2663 2688
2664 unsigned long bytes_after; 2689 unsigned long bytes_after;
2665 XTextProperty ct; 2690 XTextProperty ct;
2666 2691
2667 if (XGetWindowProperty (xdisp, win, prop, 2692 if (XGetWindowProperty (dpy, win, prop,
2668 0, PROP_SIZE / 4, 2693 0, PROP_SIZE / 4,
2669 delete_prop, AnyPropertyType, 2694 delete_prop, AnyPropertyType,
2670 &ct.encoding, &ct.format, 2695 &ct.encoding, &ct.format,
2671 &ct.nitems, &bytes_after, 2696 &ct.nitems, &bytes_after,
2672 &ct.value) != Success) 2697 &ct.value) != Success)
… …
2681 if (bytes_after) 2706 if (bytes_after)
2682 { 2707 {
2683 // fetch and append remaining data 2708 // fetch and append remaining data
2684 XTextProperty ct2; 2709 XTextProperty ct2;
2685 2710
2686 if (XGetWindowProperty (xdisp, win, prop, 2711 if (XGetWindowProperty (dpy, win, prop,
2687 ct.nitems / 4, (bytes_after + 3) / 4, 2712 ct.nitems / 4, (bytes_after + 3) / 4,
2688 delete_prop, AnyPropertyType, 2713 delete_prop, AnyPropertyType,
2689 &ct2.encoding, &ct2.format, 2714 &ct2.encoding, &ct2.format,
2690 &ct2.nitems, &bytes_after, 2715 &ct2.nitems, &bytes_after,
2691 &ct2.value) != Success) 2716 &ct2.value) != Success)
… …
2704 2729
2705 if (ct.encoding == xa[XA_INCR]) 2730 if (ct.encoding == xa[XA_INCR])
2706 { 2731 {
2707 // INCR selection, start handshake 2732 // INCR selection, start handshake
2708 if (!delete_prop) 2733 if (!delete_prop)
2709 XDeleteProperty (xdisp, win, prop); 2734 XDeleteProperty (dpy, win, prop);
2710 2735
2711 selection_wait = Sel_incr; 2736 selection_wait = Sel_incr;
2712 incr_buf_fill = 0; 2737 incr_buf_fill = 0;
2713 incr_ev.start (NOW + 10); 2738 incr_ev.start (NOW + 10);
2714 2739
… …
2727 ct.nitems = incr_buf_fill; 2752 ct.nitems = incr_buf_fill;
2728 incr_buf = 0; 2753 incr_buf = 0;
2729 incr_buf_size = 0; 2754 incr_buf_size = 0;
2730 incr_ev.stop (); 2755 incr_ev.stop ();
2731 } 2756 }
2732 else 2757 else
2733 { 2758 {
2734 if (selection_wait == Sel_normal 2759 if (selection_wait == Sel_normal
2735 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2760 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2736 { 2761 {
2737 /* 2762 /*
… …
2761 } 2786 }
2762 2787
2763 char **cl; 2788 char **cl;
2764 int cr; 2789 int cr;
2765 2790
2766#if ENABLE_FRILLS 2791#if !ENABLE_MINIMAL
2767 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2792 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2768 // so recode it manually 2793 // so recode it manually
2769 if (ct.encoding == xa[XA_UTF8_STRING]) 2794 if (ct.encoding == xa[XA_UTF8_STRING])
2770 { 2795 {
2771 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2796 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2775 paste (s, strlen (s)); 2800 paste (s, strlen (s));
2776 free (s); 2801 free (s);
2777 } 2802 }
2778 else 2803 else
2779#endif 2804#endif
2780 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 2805 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2781 && cl) 2806 && cl)
2782 { 2807 {
2783 for (int i = 0; i < cr; i++) 2808 for (int i = 0; i < cr; i++)
2784 paste (cl[i], strlen (cl[i])); 2809 paste (cl[i], strlen (cl[i]));
2785 2810
… …
2815 selection_paste (win, prop, true); 2840 selection_paste (win, prop, true);
2816} 2841}
2817 2842
2818/* ------------------------------------------------------------------------- */ 2843/* ------------------------------------------------------------------------- */
2819/* 2844/*
2820 * Request the current selection: 2845 * Request the current selection:
2821 * Order: > internal selection if available 2846 * Order: > internal selection if available
2822 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2847 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2823 * > CUT_BUFFER0 2848 * > CUT_BUFFER0
2824 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2849 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2825 * will auto fallback to CUT_BUFFER0 2850 * will auto fallback to CUT_BUFFER0
… …
2867 else if (selnum == Sel_Secondary) 2892 else if (selnum == Sel_Secondary)
2868 sel = XA_SECONDARY; 2893 sel = XA_SECONDARY;
2869 else 2894 else
2870 sel = xa[XA_CLIPBOARD]; 2895 sel = xa[XA_CLIPBOARD];
2871 2896
2872 if (XGetSelectionOwner (xdisp, sel) != None) 2897 if (XGetSelectionOwner (dpy, sel) != None)
2873 { 2898 {
2874 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], 2899 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2875 vt, selection_request_time); 2900 vt, selection_request_time);
2876 return 1; 2901 return 1;
2877 } 2902 }
2878 2903
2879 return 0; 2904 return 0;
… …
2942 2967
2943 int end_col; 2968 int end_col;
2944 2969
2945 for (; row <= selection.end.row; row++, col = 0) 2970 for (; row <= selection.end.row; row++, col = 0)
2946 { 2971 {
2947#if ENABLE_FRILLS 2972#if !ENABLE_MINIMAL
2948 if (selection.rect) 2973 if (selection.rect)
2949 { 2974 {
2950 col = selection.beg.col; 2975 col = selection.beg.col;
2951 end_col = ncol + 1; 2976 end_col = ncol + 1;
2952 } 2977 }
… …
2955 end_col = ROW(row).l; 2980 end_col = ROW(row).l;
2956 2981
2957 col = max (col, 0); 2982 col = max (col, 0);
2958 2983
2959 if (row == selection.end.row 2984 if (row == selection.end.row
2960#if ENABLE_FRILLS 2985#if !ENABLE_MINIMAL
2961 || selection.rect 2986 || selection.rect
2962#endif 2987#endif
2963 ) 2988 )
2964 min_it (end_col, selection.end.col); 2989 min_it (end_col, selection.end.col);
2965 2990
… …
2988#endif 3013#endif
2989 else 3014 else
2990 new_selection_text[ofs++] = *t++; 3015 new_selection_text[ofs++] = *t++;
2991 } 3016 }
2992 3017
2993#if ENABLE_FRILLS 3018#if !ENABLE_MINIMAL
2994 if (selection.rect) 3019 if (selection.rect)
2995 { 3020 {
2996 while (ofs 3021 while (ofs
2997 && new_selection_text[ofs - 1] != C0_LF 3022 && new_selection_text[ofs - 1] != C0_LF
2998 && unicode::is_space (new_selection_text[ofs - 1])) 3023 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3032bool 3057bool
3033rxvt_term::selection_grab (Time tm) NOTHROW 3058rxvt_term::selection_grab (Time tm) NOTHROW
3034{ 3059{
3035 selection_time = tm; 3060 selection_time = tm;
3036 3061
3037 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); 3062 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3038 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) 3063 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3039 { 3064 {
3040 display->set_selection_owner (this); 3065 display->set_selection_owner (this);
3041 return true; 3066 return true;
3042 } 3067 }
3043 else 3068 else
… …
3047 } 3072 }
3048 3073
3049#if 0 3074#if 0
3050 XTextProperty ct; 3075 XTextProperty ct;
3051 3076
3052 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 3077 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3053 { 3078 {
3054 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3079 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3055 XFree (ct.value); 3080 XFree (ct.value);
3056 } 3081 }
3057#endif 3082#endif
… …
3103 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3128 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3104 3129
3105 while (selection.mark.col > 0 3130 while (selection.mark.col > 0
3106 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3131 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3107 --selection.mark.col; 3132 --selection.mark.col;
3108 3133
3109 if (selection.op) 3134 if (selection.op)
3110 { /* clear the old selection */ 3135 { /* clear the old selection */
3111 selection.beg.row = selection.end.row = selection.mark.row; 3136 selection.beg.row = selection.end.row = selection.mark.row;
3112 selection.beg.col = selection.end.col = selection.mark.col; 3137 selection.beg.col = selection.end.col = selection.mark.col;
3113 } 3138 }
… …
3359 3384
3360 if (selection.clicks == 1) 3385 if (selection.clicks == 1)
3361 { 3386 {
3362 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3387 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3363 && !ROW(selection.beg.row).is_longer () 3388 && !ROW(selection.beg.row).is_longer ()
3364#if ENABLE_FRILLS 3389#if !ENABLE_MINIMAL
3365 && !selection.rect 3390 && !selection.rect
3366#endif 3391#endif
3367 ) 3392 )
3368 selection.beg.col = ncol; 3393 selection.beg.col = ncol;
3369 3394
3370 if ( 3395 if (
3371 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3396 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3372 && !ROW(selection.end.row).is_longer () 3397 && !ROW(selection.end.row).is_longer ()
3373#if ENABLE_FRILLS 3398#if !ENABLE_MINIMAL
3374 && !selection.rect 3399 && !selection.rect
3375#endif 3400#endif
3376 ) 3401 )
3377 selection.end.col = ncol; 3402 selection.end.col = ncol;
3378 } 3403 }
… …
3385 selection_delimit_word (DN, &selection.end, &selection.end); 3410 selection_delimit_word (DN, &selection.end, &selection.end);
3386 } 3411 }
3387 else if (selection.clicks == 3) 3412 else if (selection.clicks == 3)
3388 { 3413 {
3389#if ENABLE_FRILLS 3414#if ENABLE_FRILLS
3390 if (OPTION (Opt_tripleclickwords)) 3415 if (option (Opt_tripleclickwords))
3391 { 3416 {
3392 selection_delimit_word (UP, &selection.beg, &selection.beg); 3417 selection_delimit_word (UP, &selection.beg, &selection.beg);
3393 3418
3394 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3419 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3395 { 3420 {
3396 if (!ROW(end_row).is_longer ()) 3421 if (!ROW(end_row).is_longer ())
3397 { 3422 {
3398 selection.end.row = end_row; 3423 selection.end.row = end_row;
3399 selection.end.col = ROW(end_row).l; 3424 selection.end.col = ROW(end_row).l;
3425# if !ENABLE_MINIMAL
3400 selection_remove_trailing_spaces (); 3426 selection_remove_trailing_spaces ();
3427# endif
3401 break; 3428 break;
3402 } 3429 }
3403 } 3430 }
3404 } 3431 }
3405 else 3432 else
… …
3434 selection.mark.row = selection.beg.row; 3461 selection.mark.row = selection.beg.row;
3435 selection.mark.col = selection.beg.col; 3462 selection.mark.col = selection.beg.col;
3436 } 3463 }
3437 } 3464 }
3438 3465
3439#if ENABLE_FRILLS 3466#if !ENABLE_MINIMAL
3440 if (selection.rect && selection.beg.col > selection.end.col) 3467 if (selection.rect && selection.beg.col > selection.end.col)
3441 ::swap (selection.beg.col, selection.end.col); 3468 ::swap (selection.beg.col, selection.end.col);
3442#endif 3469#endif
3443} 3470}
3444 3471
3445#if ENABLE_FRILLS 3472#if !ENABLE_MINIMAL
3446void 3473void
3447rxvt_term::selection_remove_trailing_spaces () NOTHROW 3474rxvt_term::selection_remove_trailing_spaces () NOTHROW
3448{ 3475{
3449 int32_t end_col, end_row; 3476 int32_t end_col, end_row;
3450 text_t *stp; 3477 text_t *stp;
… …
3528 *target++ = xa[XA_COMPOUND_TEXT]; 3555 *target++ = xa[XA_COMPOUND_TEXT];
3529#if X_HAVE_UTF8_STRING 3556#if X_HAVE_UTF8_STRING
3530 *target++ = xa[XA_UTF8_STRING]; 3557 *target++ = xa[XA_UTF8_STRING];
3531#endif 3558#endif
3532 3559
3533 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3560 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3534 32, PropModeReplace, 3561 32, PropModeReplace,
3535 (unsigned char *)target_list, target - target_list); 3562 (unsigned char *)target_list, target - target_list);
3536 ev.property = rq.property; 3563 ev.property = rq.property;
3537 } 3564 }
3538#if TODO // TODO 3565#if TODO // TODO
… …
3541 /* TODO: Handle MULTIPLE */ 3568 /* TODO: Handle MULTIPLE */
3542 } 3569 }
3543#endif 3570#endif
3544 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3571 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3545 { 3572 {
3546 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3573 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3547 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3574 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3548 ev.property = rq.property; 3575 ev.property = rq.property;
3549 } 3576 }
3550 else if (rq.target == XA_STRING 3577 else if (rq.target == XA_STRING
3551 || rq.target == xa[XA_TEXT] 3578 || rq.target == xa[XA_TEXT]
… …
3575 style = enc_string; 3602 style = enc_string;
3576 else if (target == xa[XA_TEXT]) 3603 else if (target == xa[XA_TEXT])
3577 style = enc_text; 3604 style = enc_text;
3578 else if (target == xa[XA_COMPOUND_TEXT]) 3605 else if (target == xa[XA_COMPOUND_TEXT])
3579 style = enc_compound_text; 3606 style = enc_compound_text;
3580#if ENABLE_FRILLS 3607#if !ENABLE_MINIMAL
3581 else if (target == xa[XA_UTF8_STRING]) 3608 else if (target == xa[XA_UTF8_STRING])
3582 style = enc_utf8; 3609 style = enc_utf8;
3583#endif 3610#endif
3584 else 3611 else
3585 { 3612 {
… …
3596 { 3623 {
3597 cl = L""; 3624 cl = L"";
3598 selectlen = 0; 3625 selectlen = 0;
3599 } 3626 }
3600 3627
3601#if ENABLE_FRILLS 3628#if !ENABLE_MINIMAL
3602 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3629 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3603 // so recode it manually 3630 // so recode it manually
3604 if (style == enc_utf8) 3631 if (style == enc_utf8)
3605 { 3632 {
3606 freect = 1; 3633 freect = 1;
… …
3609 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3636 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3610 ct.nitems = strlen ((char *)ct.value); 3637 ct.nitems = strlen ((char *)ct.value);
3611 } 3638 }
3612 else 3639 else
3613#endif 3640#endif
3614 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3641 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3615 freect = 1; 3642 freect = 1;
3616 else 3643 else
3617 { 3644 {
3618 /* if we failed to convert then send it raw */ 3645 /* if we failed to convert then send it raw */
3619 ct.value = (unsigned char *)cl; 3646 ct.value = (unsigned char *)cl;
3620 ct.nitems = selectlen; 3647 ct.nitems = selectlen;
3621 ct.encoding = target; 3648 ct.encoding = target;
3622 } 3649 }
3623 3650
3624 XChangeProperty (xdisp, rq.requestor, rq.property, 3651 XChangeProperty (dpy, rq.requestor, rq.property,
3625 ct.encoding, 8, PropModeReplace, 3652 ct.encoding, 8, PropModeReplace,
3626 ct.value, (int)ct.nitems); 3653 ct.value, (int)ct.nitems);
3627 ev.property = rq.property; 3654 ev.property = rq.property;
3628 3655
3629 if (freect) 3656 if (freect)
3630 XFree (ct.value); 3657 XFree (ct.value);
3631 } 3658 }
3632 3659
3633 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3660 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3634} 3661}
3635 3662
3636/* ------------------------------------------------------------------------- * 3663/* ------------------------------------------------------------------------- *
3637 * MOUSE ROUTINES * 3664 * MOUSE ROUTINES *
3638 * ------------------------------------------------------------------------- */ 3665 * ------------------------------------------------------------------------- */
3639 3666
3640/*
3641 * return col/row values corresponding to x/y pixel values
3642 */
3643void
3644rxvt_term::pixel_position (int *x, int *y) NOTHROW
3645{
3646 *x = Pixel2Col (*x);
3647 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3648 *y = Pixel2Row (*y);
3649 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3650}
3651
3652/* ------------------------------------------------------------------------- */ 3667/* ------------------------------------------------------------------------- */
3653#ifdef USE_XIM 3668#ifdef USE_XIM
3654void 3669void
3655rxvt_term::im_set_position (XPoint &pos) NOTHROW 3670rxvt_term::im_set_position (XPoint &pos) NOTHROW
3656{ 3671{
3657 XWindowAttributes xwa; 3672 XWindowAttributes xwa;
3658 3673
3659 XGetWindowAttributes (xdisp, vt, &xwa); 3674 XGetWindowAttributes (dpy, vt, &xwa);
3660 3675
3661 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3676 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3662 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3677 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3663} 3678}
3664#endif 3679#endif

Diff Legend

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