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.275 by sasha, Wed Aug 15 22:41:52 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) 35inline void fill_text (text_t *start, text_t value, int len)
… …
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
… …
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 * sizeof (char));
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; )
… …
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))
… …
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 ();
… …
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}
… …
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
1890# if ENABLE_FRILLS
1891 if (option (Opt_urgentOnBell))
1892 {
1893 XWMHints *h;
1883 1894
1895 h = XGetWMHints(dpy, parent[0]);
1896 if (h != NULL)
1897 {
1898 h->flags |= XUrgencyHint;
1899 XSetWMHints(dpy, parent[0], h);
1900 }
1901 }
1902# endif
1903
1884 if (OPTION (Opt_visualBell)) 1904 if (option (Opt_visualBell))
1885 { 1905 {
1886 rvideo_bell = true; 1906 rvideo_bell = true;
1887 scr_rvideo_mode (rvideo_mode); 1907 scr_rvideo_mode (rvideo_mode);
1888 display->flush (); 1908 display->flush ();
1889 1909
1890 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1910 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1891 } 1911 }
1892 else 1912 else
1893 XBell (xdisp, 0); 1913 XBell (dpy, 0);
1894
1895#endif 1914#endif
1896} 1915}
1897 1916
1898/* ------------------------------------------------------------------------- */ 1917/* ------------------------------------------------------------------------- */
1899/* ARGSUSED */ 1918/* ARGSUSED */
… …
1957 * screen.text/screen.rend contain what the screen will change to. 1976 * screen.text/screen.rend contain what the screen will change to.
1958 */ 1977 */
1959void 1978void
1960rxvt_term::scr_refresh () NOTHROW 1979rxvt_term::scr_refresh () NOTHROW
1961{ 1980{
1962 unsigned char must_clear, /* use draw_string not draw_image_string */ 1981 unsigned char have_bg,
1963 showcursor; /* show the cursor */ 1982 showcursor; /* show the cursor */
1964 int16_t col, row, /* column/row we're processing */ 1983 int16_t col, row, /* column/row we're processing */
1965 ocrow; /* old cursor row */ 1984 ocrow; /* old cursor row */
1966 int i; /* tmp */ 1985 int i; /* tmp */
1967#ifndef NO_CURSORCOLOR 1986#ifndef NO_CURSORCOLOR
1968 rend_t cc1; /* store colours at cursor position (s) */ 1987 rend_t cc1; /* store colours at cursor position (s) */
1969#endif 1988#endif
1970 rend_t *crp; // cursor rendition pointer 1989 rend_t *crp; // cursor rendition pointer
1990 rend_t ccol1, /* Cursor colour */
1991 ccol2; /* Cursor colour2 */
1971 1992
1972 want_refresh = 0; /* screen is current */ 1993 want_refresh = 0; /* screen is current */
1973 1994
1974 if (refresh_type == NO_REFRESH || !mapped) 1995 if (refresh_type == NO_REFRESH || !mapped)
1975 return; 1996 return;
1976 1997
1977 /* 1998 /*
1978 * A: set up vars 1999 * A: set up vars
1979 */ 2000 */
1980 must_clear = 0; 2001 have_bg = 0;
1981 refresh_count = 0; 2002 refresh_count = 0;
1982 2003
1983#if XPM_BACKGROUND 2004#ifdef HAVE_BG_PIXMAP
1984 must_clear |= bgPixmap.pixmap != None; 2005 have_bg |= bgPixmap.pixmap != None;
1985#endif
1986#if TRANSPARENT
1987 must_clear |= OPTION (Opt_transparent) && am_transparent;
1988#endif 2006#endif
1989 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2007 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1990 2008
1991 /* 2009 /*
1992 * B: reverse any characters which are selected 2010 * B: reverse any characters which are selected
… …
1996 /* 2014 /*
1997 * C: set the cursor character (s) 2015 * C: set the cursor character (s)
1998 */ 2016 */
1999 { 2017 {
2000 unsigned char setoldcursor; 2018 unsigned char setoldcursor;
2001 rend_t ccol1, /* Cursor colour */
2002 ccol2; /* Cursor colour2 */
2003 2019
2004 showcursor = (screen.flags & Screen_VisibleCursor); 2020 showcursor = (screen.flags & Screen_VisibleCursor);
2005#ifdef CURSOR_BLINK 2021#ifdef CURSOR_BLINK
2006 if (hidden_cursor) 2022 if (hidden_cursor)
2007 showcursor = 0; 2023 showcursor = 0;
… …
2014 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2030 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2015 col--; 2031 col--;
2016 2032
2017 crp = &ROW(screen.cur.row).r[col]; 2033 crp = &ROW(screen.cur.row).r[col];
2018 2034
2035#ifndef NO_CURSORCOLOR
2036 cc1 = *crp & (RS_fgMask | RS_bgMask);
2037 if (ISSET_PIXCOLOR (Color_cursor))
2038 ccol1 = Color_cursor;
2039 else
2040#endif
2041#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2042 ccol1 = fgcolor_of (rstyle);
2043#else
2044 ccol1 = Color_fg;
2045#endif
2046
2047#ifndef NO_CURSORCOLOR
2048 if (ISSET_PIXCOLOR (Color_cursor2))
2049 ccol2 = Color_cursor2;
2050 else
2051#endif
2052#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2053 ccol2 = bgcolor_of (rstyle);
2054#else
2055 ccol2 = Color_bg;
2056#endif
2057
2019 if (showcursor && focus) 2058 if (showcursor && focus)
2020 { 2059 {
2021 if (OPTION (Opt_cursorUnderline)) 2060 if (option (Opt_cursorUnderline))
2022 *crp ^= RS_Uline; 2061 *crp ^= RS_Uline;
2023 else 2062 else
2024 { 2063 {
2025 *crp ^= RS_RVid; 2064 *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); 2065 *crp = SET_FGCOLOR (*crp, ccol1);
2046 *crp = SET_BGCOLOR (*crp, ccol2); 2066 *crp = SET_BGCOLOR (*crp, ccol2);
2047#endif
2048 } 2067 }
2049 } 2068 }
2050 } 2069 }
2051 2070
2052 /* make sure no outline cursor is left around */ 2071 /* make sure no outline cursor is left around */
… …
2091 * D: CopyArea pass - very useful for slower links 2110 * D: CopyArea pass - very useful for slower links
2092 * This has been deliberately kept simple. 2111 * This has been deliberately kept simple.
2093 */ 2112 */
2094 if (!display->is_local 2113 if (!display->is_local
2095 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2114 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2096 && abs (num_scr) < nrow && !must_clear) 2115 && abs (num_scr) < nrow && !have_bg)
2097 { 2116 {
2098 int16_t nits; 2117 int16_t nits;
2118 int i = num_scr;
2099 int j; 2119 int j;
2100 int len, wlen; 2120 int len, wlen;
2101 dLocal (int, num_scr); 2121 dLocal (int, num_scr);
2102 2122
2103 j = nrow; 2123 j = nrow;
2104 wlen = len = -1; 2124 wlen = len = -1;
2105 row = i > 0 ? 0 : j - 1; 2125 row = i > 0 ? 0 : j - 1;
2126
2106 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2127 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2107 { 2128 {
2108 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2129 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2109 { 2130 {
2110 line_t s = ROW(view_start + row); 2131 line_t s = ROW(view_start + row);
… …
2131 wlen = row; 2152 wlen = row;
2132 continue; 2153 continue;
2133 } 2154 }
2134 } 2155 }
2135 2156
2136 if (len != -1) 2157 if (len >= 0)
2137 { 2158 {
2138 /* also comes here at end if needed because of >= above */ 2159 /* also comes here at end if needed because of >= above */
2139 if (wlen < len) 2160 if (wlen < len)
2140 ::swap (wlen, len); 2161 ::swap (wlen, len);
2141 2162
2163 XGCValues gcv;
2164
2165 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2142 XCopyArea (xdisp, vt, vt, 2166 XCopyArea (dpy, vt, vt,
2143 gc, 0, Row2Pixel (len + i), 2167 gc, 0, Row2Pixel (len + i),
2144 (unsigned int)this->width, 2168 (unsigned int)this->width,
2145 (unsigned int)Height2Pixel (wlen - len + 1), 2169 (unsigned int)Height2Pixel (wlen - len + 1),
2146 0, Row2Pixel (len)); 2170 0, Row2Pixel (len));
2171 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2172
2147 len = -1; 2173 len = -1;
2148 } 2174 }
2149 } 2175 }
2150 } 2176 }
2151#endif 2177#endif
… …
2207 count++; 2233 count++;
2208 2234
2209 if (stp[col] != dtp[col] 2235 if (stp[col] != dtp[col]
2210 || !RS_SAME (srp[col], drp[col])) 2236 || !RS_SAME (srp[col], drp[col]))
2211 { 2237 {
2212 if (must_clear && (i++ > count / 2)) 2238 if (have_bg && (i++ > count / 2))
2213 break; 2239 break;
2214 2240
2215 dtp[col] = stp[col]; 2241 dtp[col] = stp[col];
2216 drp[col] = rend; 2242 drp[col] = rend;
2217 i = 0; 2243 i = 0;
2218 } 2244 }
2219 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2245 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2220 break; 2246 break;
2221 } 2247 }
2222 2248
2223 col--; /* went one too far. move back */ 2249 col--; /* went one too far. move back */
2224 count -= i; /* dump any matching trailing chars */ 2250 count -= i; /* dump any matching trailing chars */
… …
2234 int back = bgcolor_of (rend); // desired background 2260 int back = bgcolor_of (rend); // desired background
2235 2261
2236 // only do special processing if any attributes are set, which is unlikely 2262 // only do special processing if any attributes are set, which is unlikely
2237 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2263 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2238 { 2264 {
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; 2265 bool invert = rend & RS_RVid;
2258 2266
2259#ifndef NO_BOLD_UNDERLINE_REVERSE 2267#ifndef NO_BOLD_UNDERLINE_REVERSE
2260 if (rend & RS_Bold 2268 if (rend & RS_Bold
2261 && fore == Color_fg) 2269 && fore == Color_fg)
… …
2277 else 2285 else
2278 invert = !invert; 2286 invert = !invert;
2279# endif 2287# endif
2280 } 2288 }
2281 2289
2282 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2283 fore = Color_UL; 2291 fore = Color_UL;
2284#endif 2292#endif
2285 2293
2286 if (invert) 2294 if (invert)
2287 { 2295 {
2296#ifdef OPTION_HC
2297 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2298 || !ISSET_PIXCOLOR (Color_HC))
2299#endif
2300 /* invert the column if no highlightColor is set or it is the
2301 * current cursor column */
2288 ::swap (fore, back); 2302 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2289 2307
2290#ifndef NO_BOLD_UNDERLINE_REVERSE 2308#ifndef NO_BOLD_UNDERLINE_REVERSE
2309# ifndef OPTION_HC
2291 if (ISSET_PIXCOLOR (Color_RV)) 2310 if (ISSET_PIXCOLOR (Color_RV))
2292 back = Color_RV; 2311 back = Color_RV;
2293 2312# endif
2294 if (fore == back) 2313 if (fore == back)
2295 { 2314 {
2296 fore = Color_bg; 2315 fore = Color_bg;
2297 back = Color_fg; 2316 back = Color_fg;
2298 } 2317 }
… …
2309 } 2328 }
2310 else if (hidden_text) 2329 else if (hidden_text)
2311 fore = back; 2330 fore = back;
2312 } 2331 }
2313#endif 2332#endif
2333
2334#if ENABLE_STYLES
2335 // "careful" (too wide) character handling
2336
2337 // include previous careful character(s) if possible, looks nicer (best effort...)
2338 while (text > stp
2339 && srp[text - stp - 1] & RS_Careful
2340 && RS_SAME (rend, srp[text - stp - 1]))
2341 text--, count++, xpixel -= fwidth;
2342
2343 // force redraw after "careful" characters to avoid pixel droppings
2344 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2345 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2346
2347 // force redraw before "careful" characters to avoid pixel droppings
2348 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2349 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2350#endif
2314 } 2351 }
2315 2352
2316 /* 2353 /*
2317 * Actually do the drawing of the string here 2354 * Actually do the drawing of the string here
2318 */ 2355 */
2319 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2320 2357
2321 if (back == fore)
2322 font->clear_rect (*drawable, xpixel, ypixel,
2323 fwidth * count, fheight,
2324 back);
2325 else if (back == Color_bg) 2358 if (have_bg && back == Color_bg)
2326 { 2359 {
2327 if (must_clear) 2360 // this is very ugly, maybe push it into ->draw?
2328 {
2329 CLEAR_CHARS (xpixel, ypixel, count);
2330 2361
2331 for (i = 0; i < count; i++) /* don't draw empty strings */ 2362 for (i = 0; i < count; i++) /* don't draw empty strings */
2332 if (text[i] != ' ') 2363 if (text[i] != ' ')
2333 { 2364 {
2334 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2365 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2335 break; 2366 goto did_clear;
2336 }
2337 } 2367 }
2338 else 2368
2339 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2369 CLEAR_CHARS (xpixel, ypixel, count);
2370 did_clear: ;
2340 } 2371 }
2341 else 2372 else
2342 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2343 2374
2344 if (rend & RS_Uline && font->descent > 1 && fore != back) 2375 if (rend & RS_Uline && font->descent > 1 && fore != back)
2345 { 2376 {
2346#if ENABLE_FRILLS 2377#if ENABLE_FRILLS
2347 if (ISSET_PIXCOLOR (Color_underline)) 2378 if (ISSET_PIXCOLOR (Color_underline))
2348 XSetForeground (xdisp, gc, pix_colors[Color_underline]); 2379 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2349 else 2380 else
2350#endif 2381#endif
2351 XSetForeground (xdisp, gc, pix_colors[fore]); 2382 XSetForeground (dpy, gc, pix_colors[fore]);
2352 2383
2353 XDrawLine (xdisp, drawBuffer, gc, 2384 XDrawLine (dpy, drawBuffer, gc,
2354 xpixel, ypixel + font->ascent + 1, 2385 xpixel, ypixel + font->ascent + 1,
2355 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2356 } 2387 }
2357 } /* for (col....) */ 2388 } /* for (col....) */
2358 } /* for (row....) */ 2389 } /* for (row....) */
… …
2367 */ 2398 */
2368 if (showcursor) 2399 if (showcursor)
2369 { 2400 {
2370 if (focus) 2401 if (focus)
2371 { 2402 {
2372 if (OPTION (Opt_cursorUnderline)) 2403 if (option (Opt_cursorUnderline))
2373 *crp ^= RS_Uline; 2404 *crp ^= RS_Uline;
2374 else 2405 else
2375 { 2406 {
2376 *crp ^= RS_RVid; 2407 *crp ^= RS_RVid;
2377#ifndef NO_CURSORCOLOR 2408#ifndef NO_CURSORCOLOR
… …
2391 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2422 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2392 cursorwidth++; 2423 cursorwidth++;
2393 2424
2394#ifndef NO_CURSORCOLOR 2425#ifndef NO_CURSORCOLOR
2395 if (ISSET_PIXCOLOR (Color_cursor)) 2426 if (ISSET_PIXCOLOR (Color_cursor))
2396 XSetForeground (xdisp, gc, pix_colors[Color_cursor]); 2427 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2428 else
2397#endif 2429#endif
2430 XSetForeground (dpy, gc, pix_colors[ccol1]);
2398 2431
2399 XDrawRectangle (xdisp, drawBuffer, gc, 2432 XDrawRectangle (dpy, drawBuffer, gc,
2400 Col2Pixel (col), 2433 Col2Pixel (col),
2401 Row2Pixel (oldcursor.row), 2434 Row2Pixel (oldcursor.row),
2402 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2435 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2403 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2404 } 2437 }
… …
2439} 2472}
2440 2473
2441void 2474void
2442rxvt_term::scr_recolour () NOTHROW 2475rxvt_term::scr_recolour () NOTHROW
2443{ 2476{
2444 if (1 2477#ifdef HAVE_BG_PIXMAP
2445#if TRANSPARENT 2478 bgPixmap.apply ();
2446 && !am_transparent 2479#else
2447#endif
2448#if XPM_BACKGROUND
2449 && !bgPixmap.pixmap
2450#endif
2451 )
2452 {
2453 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2454 XClearWindow (xdisp, parent[0]); 2481 XClearWindow (dpy, parent[0]);
2455 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2456#if HAVE_SCROLLBARS 2483# if HAVE_SCROLLBARS
2457 if (scrollBar.win) 2484 if (scrollBar.win)
2458 { 2485 {
2459 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2460 scrollBar.setIdle (); 2487 scrollBar.setIdle ();
2461 scrollbar_show (0); 2488 scrollbar_show (0);
2462 } 2489 }
2463#endif 2490# endif
2464 } 2491#endif
2465 2492
2466 scr_clear (); 2493 scr_clear ();
2467 scr_touch (true); 2494 scr_touch (true);
2468 want_refresh = 1; 2495 want_refresh = 1;
2469} 2496}
2470 2497
… …
2477 2504
2478 num_scr_allow = 0; 2505 num_scr_allow = 0;
2479 want_refresh = 1; 2506 want_refresh = 1;
2480 2507
2481 if (really) 2508 if (really)
2482 XClearWindow (xdisp, vt); 2509 XClearWindow (dpy, vt);
2483} 2510}
2484 2511
2485void 2512void
2486rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2513rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2487{ 2514{
… …
2536{ 2563{
2537 if (selection.op 2564 if (selection.op
2538 && current_screen == selection.screen 2565 && current_screen == selection.screen
2539 && selection.end.row >= view_start) 2566 && selection.end.row >= view_start)
2540 { 2567 {
2541#if ENABLE_FRILLS 2568#if !ENABLE_MINIMAL
2542 if (selection.rect) 2569 if (selection.rect)
2543 scr_xor_rect (selection.beg.row, selection.beg.col, 2570 scr_xor_rect (selection.beg.row, selection.beg.col,
2544 selection.end.row, selection.end.col, 2571 selection.end.row, selection.end.col,
2545 RS_RVid, RS_RVid | RS_Uline); 2572 RS_RVid, RS_RVid | RS_Uline);
2546 else 2573 else
… …
2662 } 2689 }
2663 2690
2664 unsigned long bytes_after; 2691 unsigned long bytes_after;
2665 XTextProperty ct; 2692 XTextProperty ct;
2666 2693
2667 if (XGetWindowProperty (xdisp, win, prop, 2694 if (XGetWindowProperty (dpy, win, prop,
2668 0, PROP_SIZE / 4, 2695 0, PROP_SIZE / 4,
2669 delete_prop, AnyPropertyType, 2696 delete_prop, AnyPropertyType,
2670 &ct.encoding, &ct.format, 2697 &ct.encoding, &ct.format,
2671 &ct.nitems, &bytes_after, 2698 &ct.nitems, &bytes_after,
2672 &ct.value) != Success) 2699 &ct.value) != Success)
… …
2681 if (bytes_after) 2708 if (bytes_after)
2682 { 2709 {
2683 // fetch and append remaining data 2710 // fetch and append remaining data
2684 XTextProperty ct2; 2711 XTextProperty ct2;
2685 2712
2686 if (XGetWindowProperty (xdisp, win, prop, 2713 if (XGetWindowProperty (dpy, win, prop,
2687 ct.nitems / 4, (bytes_after + 3) / 4, 2714 ct.nitems / 4, (bytes_after + 3) / 4,
2688 delete_prop, AnyPropertyType, 2715 delete_prop, AnyPropertyType,
2689 &ct2.encoding, &ct2.format, 2716 &ct2.encoding, &ct2.format,
2690 &ct2.nitems, &bytes_after, 2717 &ct2.nitems, &bytes_after,
2691 &ct2.value) != Success) 2718 &ct2.value) != Success)
… …
2704 2731
2705 if (ct.encoding == xa[XA_INCR]) 2732 if (ct.encoding == xa[XA_INCR])
2706 { 2733 {
2707 // INCR selection, start handshake 2734 // INCR selection, start handshake
2708 if (!delete_prop) 2735 if (!delete_prop)
2709 XDeleteProperty (xdisp, win, prop); 2736 XDeleteProperty (dpy, win, prop);
2710 2737
2711 selection_wait = Sel_incr; 2738 selection_wait = Sel_incr;
2712 incr_buf_fill = 0; 2739 incr_buf_fill = 0;
2713 incr_ev.start (NOW + 10); 2740 incr_ev.start (NOW + 10);
2714 2741
… …
2761 } 2788 }
2762 2789
2763 char **cl; 2790 char **cl;
2764 int cr; 2791 int cr;
2765 2792
2766#if ENABLE_FRILLS 2793#if !ENABLE_MINIMAL
2767 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2794 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2768 // so recode it manually 2795 // so recode it manually
2769 if (ct.encoding == xa[XA_UTF8_STRING]) 2796 if (ct.encoding == xa[XA_UTF8_STRING])
2770 { 2797 {
2771 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2798 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2775 paste (s, strlen (s)); 2802 paste (s, strlen (s));
2776 free (s); 2803 free (s);
2777 } 2804 }
2778 else 2805 else
2779#endif 2806#endif
2780 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 2807 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2781 && cl) 2808 && cl)
2782 { 2809 {
2783 for (int i = 0; i < cr; i++) 2810 for (int i = 0; i < cr; i++)
2784 paste (cl[i], strlen (cl[i])); 2811 paste (cl[i], strlen (cl[i]));
2785 2812
… …
2867 else if (selnum == Sel_Secondary) 2894 else if (selnum == Sel_Secondary)
2868 sel = XA_SECONDARY; 2895 sel = XA_SECONDARY;
2869 else 2896 else
2870 sel = xa[XA_CLIPBOARD]; 2897 sel = xa[XA_CLIPBOARD];
2871 2898
2872 if (XGetSelectionOwner (xdisp, sel) != None) 2899 if (XGetSelectionOwner (dpy, sel) != None)
2873 { 2900 {
2874 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], 2901 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2875 vt, selection_request_time); 2902 vt, selection_request_time);
2876 return 1; 2903 return 1;
2877 } 2904 }
2878 2905
2879 return 0; 2906 return 0;
… …
2942 2969
2943 int end_col; 2970 int end_col;
2944 2971
2945 for (; row <= selection.end.row; row++, col = 0) 2972 for (; row <= selection.end.row; row++, col = 0)
2946 { 2973 {
2947#if ENABLE_FRILLS 2974#if !ENABLE_MINIMAL
2948 if (selection.rect) 2975 if (selection.rect)
2949 { 2976 {
2950 col = selection.beg.col; 2977 col = selection.beg.col;
2951 end_col = ncol + 1; 2978 end_col = ncol + 1;
2952 } 2979 }
… …
2955 end_col = ROW(row).l; 2982 end_col = ROW(row).l;
2956 2983
2957 col = max (col, 0); 2984 col = max (col, 0);
2958 2985
2959 if (row == selection.end.row 2986 if (row == selection.end.row
2960#if ENABLE_FRILLS 2987#if !ENABLE_MINIMAL
2961 || selection.rect 2988 || selection.rect
2962#endif 2989#endif
2963 ) 2990 )
2964 min_it (end_col, selection.end.col); 2991 min_it (end_col, selection.end.col);
2965 2992
… …
2988#endif 3015#endif
2989 else 3016 else
2990 new_selection_text[ofs++] = *t++; 3017 new_selection_text[ofs++] = *t++;
2991 } 3018 }
2992 3019
2993#if ENABLE_FRILLS 3020#if !ENABLE_MINIMAL
2994 if (selection.rect) 3021 if (selection.rect)
2995 { 3022 {
2996 while (ofs 3023 while (ofs
2997 && new_selection_text[ofs - 1] != C0_LF 3024 && new_selection_text[ofs - 1] != C0_LF
2998 && unicode::is_space (new_selection_text[ofs - 1])) 3025 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3032bool 3059bool
3033rxvt_term::selection_grab (Time tm) NOTHROW 3060rxvt_term::selection_grab (Time tm) NOTHROW
3034{ 3061{
3035 selection_time = tm; 3062 selection_time = tm;
3036 3063
3037 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); 3064 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3038 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) 3065 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3039 { 3066 {
3040 display->set_selection_owner (this); 3067 display->set_selection_owner (this);
3041 return true; 3068 return true;
3042 } 3069 }
3043 else 3070 else
… …
3047 } 3074 }
3048 3075
3049#if 0 3076#if 0
3050 XTextProperty ct; 3077 XTextProperty ct;
3051 3078
3052 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 3079 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3053 { 3080 {
3054 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3081 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3055 XFree (ct.value); 3082 XFree (ct.value);
3056 } 3083 }
3057#endif 3084#endif
… …
3359 3386
3360 if (selection.clicks == 1) 3387 if (selection.clicks == 1)
3361 { 3388 {
3362 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3389 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3363 && !ROW(selection.beg.row).is_longer () 3390 && !ROW(selection.beg.row).is_longer ()
3364#if ENABLE_FRILLS 3391#if !ENABLE_MINIMAL
3365 && !selection.rect 3392 && !selection.rect
3366#endif 3393#endif
3367 ) 3394 )
3368 selection.beg.col = ncol; 3395 selection.beg.col = ncol;
3369 3396
3370 if ( 3397 if (
3371 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3398 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3372 && !ROW(selection.end.row).is_longer () 3399 && !ROW(selection.end.row).is_longer ()
3373#if ENABLE_FRILLS 3400#if !ENABLE_MINIMAL
3374 && !selection.rect 3401 && !selection.rect
3375#endif 3402#endif
3376 ) 3403 )
3377 selection.end.col = ncol; 3404 selection.end.col = ncol;
3378 } 3405 }
… …
3385 selection_delimit_word (DN, &selection.end, &selection.end); 3412 selection_delimit_word (DN, &selection.end, &selection.end);
3386 } 3413 }
3387 else if (selection.clicks == 3) 3414 else if (selection.clicks == 3)
3388 { 3415 {
3389#if ENABLE_FRILLS 3416#if ENABLE_FRILLS
3390 if (OPTION (Opt_tripleclickwords)) 3417 if (option (Opt_tripleclickwords))
3391 { 3418 {
3392 selection_delimit_word (UP, &selection.beg, &selection.beg); 3419 selection_delimit_word (UP, &selection.beg, &selection.beg);
3393 3420
3394 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3421 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3395 { 3422 {
3396 if (!ROW(end_row).is_longer ()) 3423 if (!ROW(end_row).is_longer ())
3397 { 3424 {
3398 selection.end.row = end_row; 3425 selection.end.row = end_row;
3399 selection.end.col = ROW(end_row).l; 3426 selection.end.col = ROW(end_row).l;
3427# if !ENABLE_MINIMAL
3400 selection_remove_trailing_spaces (); 3428 selection_remove_trailing_spaces ();
3429# endif
3401 break; 3430 break;
3402 } 3431 }
3403 } 3432 }
3404 } 3433 }
3405 else 3434 else
… …
3434 selection.mark.row = selection.beg.row; 3463 selection.mark.row = selection.beg.row;
3435 selection.mark.col = selection.beg.col; 3464 selection.mark.col = selection.beg.col;
3436 } 3465 }
3437 } 3466 }
3438 3467
3439#if ENABLE_FRILLS 3468#if !ENABLE_MINIMAL
3440 if (selection.rect && selection.beg.col > selection.end.col) 3469 if (selection.rect && selection.beg.col > selection.end.col)
3441 ::swap (selection.beg.col, selection.end.col); 3470 ::swap (selection.beg.col, selection.end.col);
3442#endif 3471#endif
3443} 3472}
3444 3473
3445#if ENABLE_FRILLS 3474#if !ENABLE_MINIMAL
3446void 3475void
3447rxvt_term::selection_remove_trailing_spaces () NOTHROW 3476rxvt_term::selection_remove_trailing_spaces () NOTHROW
3448{ 3477{
3449 int32_t end_col, end_row; 3478 int32_t end_col, end_row;
3450 text_t *stp; 3479 text_t *stp;
… …
3528 *target++ = xa[XA_COMPOUND_TEXT]; 3557 *target++ = xa[XA_COMPOUND_TEXT];
3529#if X_HAVE_UTF8_STRING 3558#if X_HAVE_UTF8_STRING
3530 *target++ = xa[XA_UTF8_STRING]; 3559 *target++ = xa[XA_UTF8_STRING];
3531#endif 3560#endif
3532 3561
3533 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3562 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3534 32, PropModeReplace, 3563 32, PropModeReplace,
3535 (unsigned char *)target_list, target - target_list); 3564 (unsigned char *)target_list, target - target_list);
3536 ev.property = rq.property; 3565 ev.property = rq.property;
3537 } 3566 }
3538#if TODO // TODO 3567#if TODO // TODO
… …
3541 /* TODO: Handle MULTIPLE */ 3570 /* TODO: Handle MULTIPLE */
3542 } 3571 }
3543#endif 3572#endif
3544 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3573 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3545 { 3574 {
3546 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3575 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3547 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3576 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3548 ev.property = rq.property; 3577 ev.property = rq.property;
3549 } 3578 }
3550 else if (rq.target == XA_STRING 3579 else if (rq.target == XA_STRING
3551 || rq.target == xa[XA_TEXT] 3580 || rq.target == xa[XA_TEXT]
… …
3575 style = enc_string; 3604 style = enc_string;
3576 else if (target == xa[XA_TEXT]) 3605 else if (target == xa[XA_TEXT])
3577 style = enc_text; 3606 style = enc_text;
3578 else if (target == xa[XA_COMPOUND_TEXT]) 3607 else if (target == xa[XA_COMPOUND_TEXT])
3579 style = enc_compound_text; 3608 style = enc_compound_text;
3580#if ENABLE_FRILLS 3609#if !ENABLE_MINIMAL
3581 else if (target == xa[XA_UTF8_STRING]) 3610 else if (target == xa[XA_UTF8_STRING])
3582 style = enc_utf8; 3611 style = enc_utf8;
3583#endif 3612#endif
3584 else 3613 else
3585 { 3614 {
… …
3596 { 3625 {
3597 cl = L""; 3626 cl = L"";
3598 selectlen = 0; 3627 selectlen = 0;
3599 } 3628 }
3600 3629
3601#if ENABLE_FRILLS 3630#if !ENABLE_MINIMAL
3602 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3631 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3603 // so recode it manually 3632 // so recode it manually
3604 if (style == enc_utf8) 3633 if (style == enc_utf8)
3605 { 3634 {
3606 freect = 1; 3635 freect = 1;
… …
3609 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3638 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3610 ct.nitems = strlen ((char *)ct.value); 3639 ct.nitems = strlen ((char *)ct.value);
3611 } 3640 }
3612 else 3641 else
3613#endif 3642#endif
3614 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3643 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3615 freect = 1; 3644 freect = 1;
3616 else 3645 else
3617 { 3646 {
3618 /* if we failed to convert then send it raw */ 3647 /* if we failed to convert then send it raw */
3619 ct.value = (unsigned char *)cl; 3648 ct.value = (unsigned char *)cl;
3620 ct.nitems = selectlen; 3649 ct.nitems = selectlen;
3621 ct.encoding = target; 3650 ct.encoding = target;
3622 } 3651 }
3623 3652
3624 XChangeProperty (xdisp, rq.requestor, rq.property, 3653 XChangeProperty (dpy, rq.requestor, rq.property,
3625 ct.encoding, 8, PropModeReplace, 3654 ct.encoding, 8, PropModeReplace,
3626 ct.value, (int)ct.nitems); 3655 ct.value, (int)ct.nitems);
3627 ev.property = rq.property; 3656 ev.property = rq.property;
3628 3657
3629 if (freect) 3658 if (freect)
3630 XFree (ct.value); 3659 XFree (ct.value);
3631 } 3660 }
3632 3661
3633 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3662 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3634} 3663}
3635 3664
3636/* ------------------------------------------------------------------------- * 3665/* ------------------------------------------------------------------------- *
3637 * MOUSE ROUTINES * 3666 * MOUSE ROUTINES *
3638 * ------------------------------------------------------------------------- */ 3667 * ------------------------------------------------------------------------- */
… …
3654void 3683void
3655rxvt_term::im_set_position (XPoint &pos) NOTHROW 3684rxvt_term::im_set_position (XPoint &pos) NOTHROW
3656{ 3685{
3657 XWindowAttributes xwa; 3686 XWindowAttributes xwa;
3658 3687
3659 XGetWindowAttributes (xdisp, vt, &xwa); 3688 XGetWindowAttributes (dpy, vt, &xwa);
3660 3689
3661 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3690 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3662 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3691 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3663} 3692}
3664#endif 3693#endif

Diff Legend

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