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.265 by root, Tue Oct 3 11:56:48 2006 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>
… …
93 */ 93 */
94#define drawBuffer vt 94#define drawBuffer vt
95 95
96#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 97 if (mapped) \
98 XClearArea (xdisp, drawBuffer, 0, \ 98 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
101 101
102#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 103 if (mapped) \
104 XClearArea (xdisp, drawBuffer, x, y, \ 104 XClearArea (dpy, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
107 107
108#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
109 XFillRectangle (xdisp, drawBuffer, gc, \ 109 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
111 (unsigned int)width, \ 111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
113 113
114/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
… …
126 width = ncol; 126 width = ncol;
127 } 127 }
128 128
129 l.touch (); 129 l.touch ();
130 130
131 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 133
134 text_t *et = l.t + col; 134 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
136 136
… …
640 l.touch (); 640 l.touch ();
641 } 641 }
642 642
643 // erase newly scrolled-in lines 643 // erase newly scrolled-in lines
644 for (int i = count; i--; ) 644 for (int i = count; i--; )
645 {
646 line_t &l = ROW(nrow - 1 - i);
647
648 // optimize if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
651 {
652 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0;
654 l.f = 0;
655 }
656 else
645 scr_blank_screen_mem (ROW(nrow - 1 - i), rstyle); 657 scr_blank_screen_mem (l, rstyle);
658 }
646 659
647 // now copy lines below the scroll region bottom to the 660 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 661 // bottom of the screen again, so they look as if they
649 // hadn't moved. 662 // hadn't moved.
650 for (int i = nrow; --i > row2; ) 663 for (int i = nrow; --i > row2; )
… …
1101 * Process DEC Back Index 1114 * Process DEC Back Index
1102 * XTERM_SEQ: ESC 6 1115 * XTERM_SEQ: ESC 6
1103 * Move cursor left in row. If we're at the left boundary, shift everything 1116 * Move cursor left in row. If we're at the left boundary, shift everything
1104 * in that row right. Clear left column. 1117 * in that row right. Clear left column.
1105 */ 1118 */
1106#if ENABLE_FRILLS 1119#if !ENABLE_MINIMAL
1107void 1120void
1108rxvt_term::scr_backindex () NOTHROW 1121rxvt_term::scr_backindex () NOTHROW
1109{ 1122{
1110 if (screen.cur.col > 0) 1123 if (screen.cur.col > 0)
1111 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1118 * Process DEC Forward Index 1131 * Process DEC Forward Index
1119 * XTERM_SEQ: ESC 9 1132 * XTERM_SEQ: ESC 9
1120 * Move cursor right in row. If we're at the right boundary, shift everything 1133 * Move cursor right in row. If we're at the right boundary, shift everything
1121 * in that row left. Clear right column. 1134 * in that row left. Clear right column.
1122 */ 1135 */
1123#if ENABLE_FRILLS 1136#if !ENABLE_MINIMAL
1124void 1137void
1125rxvt_term::scr_forwardindex () NOTHROW 1138rxvt_term::scr_forwardindex () NOTHROW
1126{ 1139{
1127 if (screen.cur.col < ncol - 1) 1140 if (screen.cur.col < ncol - 1)
1128 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1329 } 1342 }
1330 else 1343 else
1331 { 1344 {
1332 ren = rstyle & (RS_fgMask | RS_bgMask); 1345 ren = rstyle & (RS_fgMask | RS_bgMask);
1333 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1334 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1347 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1335 ERASE_ROWS (row, num); 1348 ERASE_ROWS (row, num);
1336 gcvalue.foreground = pix_colors[Color_fg]; 1349 gcvalue.foreground = pix_colors[Color_fg];
1337 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1350 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1338 } 1351 }
1339 1352
1340 for (; num--; row++) 1353 for (; num--; row++)
1341 { 1354 {
1342 scr_blank_screen_mem (ROW(row), rstyle); 1355 scr_blank_screen_mem (ROW(row), rstyle);
1343 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1356 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1344 } 1357 }
1345} 1358}
1346 1359
1347#if ENABLE_FRILLS 1360#if !ENABLE_MINIMAL
1348void 1361void
1349rxvt_term::scr_erase_savelines () NOTHROW 1362rxvt_term::scr_erase_savelines () NOTHROW
1350{ 1363{
1351 want_refresh = 1; 1364 want_refresh = 1;
1352 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
… …
1641 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1642#endif 1655#endif
1643#if TRANSPARENT 1656#if TRANSPARENT
1644 if (!OPTION (Opt_transparent) || am_transparent == 0) 1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1645#endif 1658#endif
1646 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1647 1660
1648 XGCValues gcvalue; 1661 XGCValues gcvalue;
1649 gcvalue.foreground = pix_colors[Color_fg]; 1662 gcvalue.foreground = pix_colors[Color_fg];
1650 gcvalue.background = pix_colors[Color_bg]; 1663 gcvalue.background = pix_colors[Color_bg];
1651 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); 1664 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1652 1665
1653 scr_clear (); 1666 scr_clear ();
1654 scr_touch (true); 1667 scr_touch (true);
1655 } 1668 }
1656} 1669}
… …
1741{ 1754{
1742 bool found = false; 1755 bool found = false;
1743 1756
1744 for (int i = 0; i < nrow; i++) 1757 for (int i = 0; i < nrow; i++)
1745 { 1758 {
1746 int col = 0;
1747 rend_t *drp = drawn_buf[i].r; 1759 rend_t *drp = drawn_buf[i].r;
1748 1760
1749 for (; col < ncol; col++, drp++) 1761 for (int col = 0; col < ncol; col++, drp++)
1750 if ((*drp & mask) == value) 1762 if ((*drp & mask) == value)
1751 { 1763 {
1752 found = true; 1764 found = true;
1753 *drp = ~value; 1765 *drp = ~value;
1754 } 1766 }
… …
1876 1888
1877# ifndef NO_MAPALERT 1889# ifndef NO_MAPALERT
1878# ifdef MAPALERT_OPTION 1890# ifdef MAPALERT_OPTION
1879 if (OPTION (Opt_mapAlert)) 1891 if (OPTION (Opt_mapAlert))
1880# endif 1892# endif
1881 XMapWindow (xdisp, parent[0]); 1893 XMapWindow (dpy, parent[0]);
1882# endif 1894# endif
1883 1895
1884 if (OPTION (Opt_visualBell)) 1896 if (OPTION (Opt_visualBell))
1885 { 1897 {
1886 rvideo_bell = true; 1898 rvideo_bell = true;
… …
1888 display->flush (); 1900 display->flush ();
1889 1901
1890 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1902 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1891 } 1903 }
1892 else 1904 else
1893 XBell (xdisp, 0); 1905 XBell (dpy, 0);
1894 1906
1895#endif 1907#endif
1896} 1908}
1897 1909
1898/* ------------------------------------------------------------------------- */ 1910/* ------------------------------------------------------------------------- */
… …
1957 * screen.text/screen.rend contain what the screen will change to. 1969 * screen.text/screen.rend contain what the screen will change to.
1958 */ 1970 */
1959void 1971void
1960rxvt_term::scr_refresh () NOTHROW 1972rxvt_term::scr_refresh () NOTHROW
1961{ 1973{
1962 unsigned char must_clear, /* use draw_string not draw_image_string */ 1974 unsigned char have_bg,
1963 showcursor; /* show the cursor */ 1975 showcursor; /* show the cursor */
1964 int16_t col, row, /* column/row we're processing */ 1976 int16_t col, row, /* column/row we're processing */
1965 ocrow; /* old cursor row */ 1977 ocrow; /* old cursor row */
1966 int i; /* tmp */ 1978 int i; /* tmp */
1967#ifndef NO_CURSORCOLOR 1979#ifndef NO_CURSORCOLOR
1968 rend_t cc1; /* store colours at cursor position (s) */ 1980 rend_t cc1; /* store colours at cursor position (s) */
1969#endif 1981#endif
1970 rend_t *crp; // cursor rendition pointer 1982 rend_t *crp; // cursor rendition pointer
1983 rend_t ccol1, /* Cursor colour */
1984 ccol2; /* Cursor colour2 */
1971 1985
1972 want_refresh = 0; /* screen is current */ 1986 want_refresh = 0; /* screen is current */
1973 1987
1974 if (refresh_type == NO_REFRESH || !mapped) 1988 if (refresh_type == NO_REFRESH || !mapped)
1975 return; 1989 return;
1976 1990
1977 /* 1991 /*
1978 * A: set up vars 1992 * A: set up vars
1979 */ 1993 */
1980 must_clear = 0; 1994 have_bg = 0;
1981 refresh_count = 0; 1995 refresh_count = 0;
1982 1996
1983#if XPM_BACKGROUND 1997#if XPM_BACKGROUND
1984 must_clear |= bgPixmap.pixmap != None; 1998 have_bg |= bgPixmap.pixmap != None;
1985#endif 1999#endif
1986#if TRANSPARENT 2000#if TRANSPARENT
1987 must_clear |= OPTION (Opt_transparent) && am_transparent; 2001 have_bg |= OPTION (Opt_transparent) && am_transparent;
1988#endif 2002#endif
1989 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1990 2004
1991 /* 2005 /*
1992 * B: reverse any characters which are selected 2006 * B: reverse any characters which are selected
… …
1996 /* 2010 /*
1997 * C: set the cursor character (s) 2011 * C: set the cursor character (s)
1998 */ 2012 */
1999 { 2013 {
2000 unsigned char setoldcursor; 2014 unsigned char setoldcursor;
2001 rend_t ccol1, /* Cursor colour */
2002 ccol2; /* Cursor colour2 */
2003 2015
2004 showcursor = (screen.flags & Screen_VisibleCursor); 2016 showcursor = (screen.flags & Screen_VisibleCursor);
2005#ifdef CURSOR_BLINK 2017#ifdef CURSOR_BLINK
2006 if (hidden_cursor) 2018 if (hidden_cursor)
2007 showcursor = 0; 2019 showcursor = 0;
… …
2013 2025
2014 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2015 col--; 2027 col--;
2016 2028
2017 crp = &ROW(screen.cur.row).r[col]; 2029 crp = &ROW(screen.cur.row).r[col];
2030
2031#ifndef NO_CURSORCOLOR
2032 cc1 = *crp & (RS_fgMask | RS_bgMask);
2033 if (ISSET_PIXCOLOR (Color_cursor))
2034 ccol1 = Color_cursor;
2035 else
2036#endif
2037#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2038 ccol1 = fgcolor_of (rstyle);
2039#else
2040 ccol1 = Color_fg;
2041#endif
2042
2043#ifndef NO_CURSORCOLOR
2044 if (ISSET_PIXCOLOR (Color_cursor2))
2045 ccol2 = Color_cursor2;
2046 else
2047#endif
2048#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2049 ccol2 = bgcolor_of (rstyle);
2050#else
2051 ccol2 = Color_bg;
2052#endif
2018 2053
2019 if (showcursor && focus) 2054 if (showcursor && focus)
2020 { 2055 {
2021 if (OPTION (Opt_cursorUnderline)) 2056 if (OPTION (Opt_cursorUnderline))
2022 *crp ^= RS_Uline; 2057 *crp ^= RS_Uline;
2023 else 2058 else
2024 { 2059 {
2025 *crp ^= RS_RVid; 2060 *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); 2061 *crp = SET_FGCOLOR (*crp, ccol1);
2046 *crp = SET_BGCOLOR (*crp, ccol2); 2062 *crp = SET_BGCOLOR (*crp, ccol2);
2047#endif
2048 } 2063 }
2049 } 2064 }
2050 } 2065 }
2051 2066
2052 /* make sure no outline cursor is left around */ 2067 /* make sure no outline cursor is left around */
… …
2091 * D: CopyArea pass - very useful for slower links 2106 * D: CopyArea pass - very useful for slower links
2092 * This has been deliberately kept simple. 2107 * This has been deliberately kept simple.
2093 */ 2108 */
2094 if (!display->is_local 2109 if (!display->is_local
2095 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2110 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2096 && abs (num_scr) < nrow && !must_clear) 2111 && abs (num_scr) < nrow && !have_bg)
2097 { 2112 {
2098 int16_t nits; 2113 int16_t nits;
2114 int i = num_scr;
2099 int j; 2115 int j;
2100 int len, wlen; 2116 int len, wlen;
2101 dLocal (int, num_scr); 2117 dLocal (int, num_scr);
2102 2118
2103 j = nrow; 2119 j = nrow;
2104 wlen = len = -1; 2120 wlen = len = -1;
2105 row = i > 0 ? 0 : j - 1; 2121 row = i > 0 ? 0 : j - 1;
2122
2106 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2123 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2107 { 2124 {
2108 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2125 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2109 { 2126 {
2110 line_t s = ROW(view_start + row); 2127 line_t s = ROW(view_start + row);
… …
2131 wlen = row; 2148 wlen = row;
2132 continue; 2149 continue;
2133 } 2150 }
2134 } 2151 }
2135 2152
2136 if (len != -1) 2153 if (len >= 0)
2137 { 2154 {
2138 /* also comes here at end if needed because of >= above */ 2155 /* also comes here at end if needed because of >= above */
2139 if (wlen < len) 2156 if (wlen < len)
2140 ::swap (wlen, len); 2157 ::swap (wlen, len);
2141 2158
2159 XGCValues gcv;
2160
2161 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2142 XCopyArea (xdisp, vt, vt, 2162 XCopyArea (dpy, vt, vt,
2143 gc, 0, Row2Pixel (len + i), 2163 gc, 0, Row2Pixel (len + i),
2144 (unsigned int)this->width, 2164 (unsigned int)this->width,
2145 (unsigned int)Height2Pixel (wlen - len + 1), 2165 (unsigned int)Height2Pixel (wlen - len + 1),
2146 0, Row2Pixel (len)); 2166 0, Row2Pixel (len));
2167 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2168
2147 len = -1; 2169 len = -1;
2148 } 2170 }
2149 } 2171 }
2150 } 2172 }
2151#endif 2173#endif
… …
2207 count++; 2229 count++;
2208 2230
2209 if (stp[col] != dtp[col] 2231 if (stp[col] != dtp[col]
2210 || !RS_SAME (srp[col], drp[col])) 2232 || !RS_SAME (srp[col], drp[col]))
2211 { 2233 {
2212 if (must_clear && (i++ > count / 2)) 2234 if (have_bg && (i++ > count / 2))
2213 break; 2235 break;
2214 2236
2215 dtp[col] = stp[col]; 2237 dtp[col] = stp[col];
2216 drp[col] = rend; 2238 drp[col] = rend;
2217 i = 0; 2239 i = 0;
2218 } 2240 }
2219 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2241 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2220 break; 2242 break;
2221 } 2243 }
2222 2244
2223 col--; /* went one too far. move back */ 2245 col--; /* went one too far. move back */
2224 count -= i; /* dump any matching trailing chars */ 2246 count -= i; /* dump any matching trailing chars */
… …
2234 int back = bgcolor_of (rend); // desired background 2256 int back = bgcolor_of (rend); // desired background
2235 2257
2236 // only do special processing if any attributes are set, which is unlikely 2258 // 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)) 2259 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2238 { 2260 {
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; 2261 bool invert = rend & RS_RVid;
2258 2262
2259#ifndef NO_BOLD_UNDERLINE_REVERSE 2263#ifndef NO_BOLD_UNDERLINE_REVERSE
2260 if (rend & RS_Bold 2264 if (rend & RS_Bold
2261 && fore == Color_fg) 2265 && fore == Color_fg)
… …
2277 else 2281 else
2278 invert = !invert; 2282 invert = !invert;
2279# endif 2283# endif
2280 } 2284 }
2281 2285
2282 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2286 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2283 fore = Color_UL; 2287 fore = Color_UL;
2284#endif 2288#endif
2285 2289
2286 if (invert) 2290 if (invert)
2287 { 2291 {
2292#ifdef OPTION_HC
2293 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2294 || !ISSET_PIXCOLOR (Color_HC))
2295#endif
2296 /* invert the column if no highlightColor is set or it is the
2297 * current cursor column */
2288 ::swap (fore, back); 2298 ::swap (fore, back);
2299#ifdef OPTION_HC
2300 else if (ISSET_PIXCOLOR (Color_HC))
2301 back = Color_HC;
2302#endif
2289 2303
2290#ifndef NO_BOLD_UNDERLINE_REVERSE 2304#ifndef NO_BOLD_UNDERLINE_REVERSE
2305# ifndef OPTION_HC
2291 if (ISSET_PIXCOLOR (Color_RV)) 2306 if (ISSET_PIXCOLOR (Color_RV))
2292 back = Color_RV; 2307 back = Color_RV;
2293 2308# endif
2294 if (fore == back) 2309 if (fore == back)
2295 { 2310 {
2296 fore = Color_bg; 2311 fore = Color_bg;
2297 back = Color_fg; 2312 back = Color_fg;
2298 } 2313 }
… …
2309 } 2324 }
2310 else if (hidden_text) 2325 else if (hidden_text)
2311 fore = back; 2326 fore = back;
2312 } 2327 }
2313#endif 2328#endif
2329
2330#if ENABLE_STYLES
2331 // "careful" (too wide) character handling
2332
2333 // include previous careful character(s) if possible, looks nicer (best effort...)
2334 while (text > stp
2335 && srp[text - stp - 1] & RS_Careful
2336 && RS_SAME (rend, srp[text - stp - 1]))
2337 text--, count++, xpixel -= fwidth;
2338
2339 // force redraw after "careful" characters to avoid pixel droppings
2340 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2341 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2342
2343 // force redraw before "careful" characters to avoid pixel droppings
2344 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2345 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2346#endif
2314 } 2347 }
2315 2348
2316 /* 2349 /*
2317 * Actually do the drawing of the string here 2350 * Actually do the drawing of the string here
2318 */ 2351 */
2319 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2352 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2320 2353
2321 if (back == fore) 2354 if (back == fore)
2322 font->clear_rect (*drawable, xpixel, ypixel, 2355 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2323 fwidth * count, fheight,
2324 back);
2325 else if (back == Color_bg) 2356 else if (back == Color_bg && have_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, -1);
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....) */
… …
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 }
… …
2448#if XPM_BACKGROUND 2479#if XPM_BACKGROUND
2449 && !bgPixmap.pixmap 2480 && !bgPixmap.pixmap
2450#endif 2481#endif
2451 ) 2482 )
2452 { 2483 {
2453 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2484 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2454 XClearWindow (xdisp, parent[0]); 2485 XClearWindow (dpy, parent[0]);
2455 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2486 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2456#if HAVE_SCROLLBARS 2487#if HAVE_SCROLLBARS
2457 if (scrollBar.win) 2488 if (scrollBar.win)
2458 { 2489 {
2459 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2490 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2460 scrollBar.setIdle (); 2491 scrollBar.setIdle ();
2461 scrollbar_show (0); 2492 scrollbar_show (0);
2462 } 2493 }
2463#endif 2494#endif
2464 } 2495 }
… …
2477 2508
2478 num_scr_allow = 0; 2509 num_scr_allow = 0;
2479 want_refresh = 1; 2510 want_refresh = 1;
2480 2511
2481 if (really) 2512 if (really)
2482 XClearWindow (xdisp, vt); 2513 XClearWindow (dpy, vt);
2483} 2514}
2484 2515
2485void 2516void
2486rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2517rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2487{ 2518{
… …
2536{ 2567{
2537 if (selection.op 2568 if (selection.op
2538 && current_screen == selection.screen 2569 && current_screen == selection.screen
2539 && selection.end.row >= view_start) 2570 && selection.end.row >= view_start)
2540 { 2571 {
2541#if ENABLE_FRILLS 2572#if !ENABLE_MINIMAL
2542 if (selection.rect) 2573 if (selection.rect)
2543 scr_xor_rect (selection.beg.row, selection.beg.col, 2574 scr_xor_rect (selection.beg.row, selection.beg.col,
2544 selection.end.row, selection.end.col, 2575 selection.end.row, selection.end.col,
2545 RS_RVid, RS_RVid | RS_Uline); 2576 RS_RVid, RS_RVid | RS_Uline);
2546 else 2577 else
… …
2662 } 2693 }
2663 2694
2664 unsigned long bytes_after; 2695 unsigned long bytes_after;
2665 XTextProperty ct; 2696 XTextProperty ct;
2666 2697
2667 if (XGetWindowProperty (xdisp, win, prop, 2698 if (XGetWindowProperty (dpy, win, prop,
2668 0, PROP_SIZE / 4, 2699 0, PROP_SIZE / 4,
2669 delete_prop, AnyPropertyType, 2700 delete_prop, AnyPropertyType,
2670 &ct.encoding, &ct.format, 2701 &ct.encoding, &ct.format,
2671 &ct.nitems, &bytes_after, 2702 &ct.nitems, &bytes_after,
2672 &ct.value) != Success) 2703 &ct.value) != Success)
… …
2681 if (bytes_after) 2712 if (bytes_after)
2682 { 2713 {
2683 // fetch and append remaining data 2714 // fetch and append remaining data
2684 XTextProperty ct2; 2715 XTextProperty ct2;
2685 2716
2686 if (XGetWindowProperty (xdisp, win, prop, 2717 if (XGetWindowProperty (dpy, win, prop,
2687 ct.nitems / 4, (bytes_after + 3) / 4, 2718 ct.nitems / 4, (bytes_after + 3) / 4,
2688 delete_prop, AnyPropertyType, 2719 delete_prop, AnyPropertyType,
2689 &ct2.encoding, &ct2.format, 2720 &ct2.encoding, &ct2.format,
2690 &ct2.nitems, &bytes_after, 2721 &ct2.nitems, &bytes_after,
2691 &ct2.value) != Success) 2722 &ct2.value) != Success)
… …
2704 2735
2705 if (ct.encoding == xa[XA_INCR]) 2736 if (ct.encoding == xa[XA_INCR])
2706 { 2737 {
2707 // INCR selection, start handshake 2738 // INCR selection, start handshake
2708 if (!delete_prop) 2739 if (!delete_prop)
2709 XDeleteProperty (xdisp, win, prop); 2740 XDeleteProperty (dpy, win, prop);
2710 2741
2711 selection_wait = Sel_incr; 2742 selection_wait = Sel_incr;
2712 incr_buf_fill = 0; 2743 incr_buf_fill = 0;
2713 incr_ev.start (NOW + 10); 2744 incr_ev.start (NOW + 10);
2714 2745
… …
2761 } 2792 }
2762 2793
2763 char **cl; 2794 char **cl;
2764 int cr; 2795 int cr;
2765 2796
2766#if ENABLE_FRILLS 2797#if !ENABLE_MINIMAL
2767 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2798 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2768 // so recode it manually 2799 // so recode it manually
2769 if (ct.encoding == xa[XA_UTF8_STRING]) 2800 if (ct.encoding == xa[XA_UTF8_STRING])
2770 { 2801 {
2771 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2802 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2775 paste (s, strlen (s)); 2806 paste (s, strlen (s));
2776 free (s); 2807 free (s);
2777 } 2808 }
2778 else 2809 else
2779#endif 2810#endif
2780 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 2811 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2781 && cl) 2812 && cl)
2782 { 2813 {
2783 for (int i = 0; i < cr; i++) 2814 for (int i = 0; i < cr; i++)
2784 paste (cl[i], strlen (cl[i])); 2815 paste (cl[i], strlen (cl[i]));
2785 2816
… …
2867 else if (selnum == Sel_Secondary) 2898 else if (selnum == Sel_Secondary)
2868 sel = XA_SECONDARY; 2899 sel = XA_SECONDARY;
2869 else 2900 else
2870 sel = xa[XA_CLIPBOARD]; 2901 sel = xa[XA_CLIPBOARD];
2871 2902
2872 if (XGetSelectionOwner (xdisp, sel) != None) 2903 if (XGetSelectionOwner (dpy, sel) != None)
2873 { 2904 {
2874 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], 2905 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2875 vt, selection_request_time); 2906 vt, selection_request_time);
2876 return 1; 2907 return 1;
2877 } 2908 }
2878 2909
2879 return 0; 2910 return 0;
… …
2942 2973
2943 int end_col; 2974 int end_col;
2944 2975
2945 for (; row <= selection.end.row; row++, col = 0) 2976 for (; row <= selection.end.row; row++, col = 0)
2946 { 2977 {
2947#if ENABLE_FRILLS 2978#if !ENABLE_MINIMAL
2948 if (selection.rect) 2979 if (selection.rect)
2949 { 2980 {
2950 col = selection.beg.col; 2981 col = selection.beg.col;
2951 end_col = ncol + 1; 2982 end_col = ncol + 1;
2952 } 2983 }
… …
2955 end_col = ROW(row).l; 2986 end_col = ROW(row).l;
2956 2987
2957 col = max (col, 0); 2988 col = max (col, 0);
2958 2989
2959 if (row == selection.end.row 2990 if (row == selection.end.row
2960#if ENABLE_FRILLS 2991#if !ENABLE_MINIMAL
2961 || selection.rect 2992 || selection.rect
2962#endif 2993#endif
2963 ) 2994 )
2964 min_it (end_col, selection.end.col); 2995 min_it (end_col, selection.end.col);
2965 2996
… …
2988#endif 3019#endif
2989 else 3020 else
2990 new_selection_text[ofs++] = *t++; 3021 new_selection_text[ofs++] = *t++;
2991 } 3022 }
2992 3023
2993#if ENABLE_FRILLS 3024#if !ENABLE_MINIMAL
2994 if (selection.rect) 3025 if (selection.rect)
2995 { 3026 {
2996 while (ofs 3027 while (ofs
2997 && new_selection_text[ofs - 1] != C0_LF 3028 && new_selection_text[ofs - 1] != C0_LF
2998 && unicode::is_space (new_selection_text[ofs - 1])) 3029 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3032bool 3063bool
3033rxvt_term::selection_grab (Time tm) NOTHROW 3064rxvt_term::selection_grab (Time tm) NOTHROW
3034{ 3065{
3035 selection_time = tm; 3066 selection_time = tm;
3036 3067
3037 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); 3068 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3038 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) 3069 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3039 { 3070 {
3040 display->set_selection_owner (this); 3071 display->set_selection_owner (this);
3041 return true; 3072 return true;
3042 } 3073 }
3043 else 3074 else
… …
3047 } 3078 }
3048 3079
3049#if 0 3080#if 0
3050 XTextProperty ct; 3081 XTextProperty ct;
3051 3082
3052 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 3083 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3053 { 3084 {
3054 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3085 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3055 XFree (ct.value); 3086 XFree (ct.value);
3056 } 3087 }
3057#endif 3088#endif
… …
3359 3390
3360 if (selection.clicks == 1) 3391 if (selection.clicks == 1)
3361 { 3392 {
3362 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3393 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3363 && !ROW(selection.beg.row).is_longer () 3394 && !ROW(selection.beg.row).is_longer ()
3364#if ENABLE_FRILLS 3395#if !ENABLE_MINIMAL
3365 && !selection.rect 3396 && !selection.rect
3366#endif 3397#endif
3367 ) 3398 )
3368 selection.beg.col = ncol; 3399 selection.beg.col = ncol;
3369 3400
3370 if ( 3401 if (
3371 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3402 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3372 && !ROW(selection.end.row).is_longer () 3403 && !ROW(selection.end.row).is_longer ()
3373#if ENABLE_FRILLS 3404#if !ENABLE_MINIMAL
3374 && !selection.rect 3405 && !selection.rect
3375#endif 3406#endif
3376 ) 3407 )
3377 selection.end.col = ncol; 3408 selection.end.col = ncol;
3378 } 3409 }
… …
3395 { 3426 {
3396 if (!ROW(end_row).is_longer ()) 3427 if (!ROW(end_row).is_longer ())
3397 { 3428 {
3398 selection.end.row = end_row; 3429 selection.end.row = end_row;
3399 selection.end.col = ROW(end_row).l; 3430 selection.end.col = ROW(end_row).l;
3431# if !ENABLE_MINIMAL
3400 selection_remove_trailing_spaces (); 3432 selection_remove_trailing_spaces ();
3433# endif
3401 break; 3434 break;
3402 } 3435 }
3403 } 3436 }
3404 } 3437 }
3405 else 3438 else
… …
3434 selection.mark.row = selection.beg.row; 3467 selection.mark.row = selection.beg.row;
3435 selection.mark.col = selection.beg.col; 3468 selection.mark.col = selection.beg.col;
3436 } 3469 }
3437 } 3470 }
3438 3471
3439#if ENABLE_FRILLS 3472#if !ENABLE_MINIMAL
3440 if (selection.rect && selection.beg.col > selection.end.col) 3473 if (selection.rect && selection.beg.col > selection.end.col)
3441 ::swap (selection.beg.col, selection.end.col); 3474 ::swap (selection.beg.col, selection.end.col);
3442#endif 3475#endif
3443} 3476}
3444 3477
3445#if ENABLE_FRILLS 3478#if !ENABLE_MINIMAL
3446void 3479void
3447rxvt_term::selection_remove_trailing_spaces () NOTHROW 3480rxvt_term::selection_remove_trailing_spaces () NOTHROW
3448{ 3481{
3449 int32_t end_col, end_row; 3482 int32_t end_col, end_row;
3450 text_t *stp; 3483 text_t *stp;
… …
3528 *target++ = xa[XA_COMPOUND_TEXT]; 3561 *target++ = xa[XA_COMPOUND_TEXT];
3529#if X_HAVE_UTF8_STRING 3562#if X_HAVE_UTF8_STRING
3530 *target++ = xa[XA_UTF8_STRING]; 3563 *target++ = xa[XA_UTF8_STRING];
3531#endif 3564#endif
3532 3565
3533 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3566 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3534 32, PropModeReplace, 3567 32, PropModeReplace,
3535 (unsigned char *)target_list, target - target_list); 3568 (unsigned char *)target_list, target - target_list);
3536 ev.property = rq.property; 3569 ev.property = rq.property;
3537 } 3570 }
3538#if TODO // TODO 3571#if TODO // TODO
… …
3541 /* TODO: Handle MULTIPLE */ 3574 /* TODO: Handle MULTIPLE */
3542 } 3575 }
3543#endif 3576#endif
3544 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3577 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3545 { 3578 {
3546 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3579 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3547 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3580 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3548 ev.property = rq.property; 3581 ev.property = rq.property;
3549 } 3582 }
3550 else if (rq.target == XA_STRING 3583 else if (rq.target == XA_STRING
3551 || rq.target == xa[XA_TEXT] 3584 || rq.target == xa[XA_TEXT]
… …
3575 style = enc_string; 3608 style = enc_string;
3576 else if (target == xa[XA_TEXT]) 3609 else if (target == xa[XA_TEXT])
3577 style = enc_text; 3610 style = enc_text;
3578 else if (target == xa[XA_COMPOUND_TEXT]) 3611 else if (target == xa[XA_COMPOUND_TEXT])
3579 style = enc_compound_text; 3612 style = enc_compound_text;
3580#if ENABLE_FRILLS 3613#if !ENABLE_MINIMAL
3581 else if (target == xa[XA_UTF8_STRING]) 3614 else if (target == xa[XA_UTF8_STRING])
3582 style = enc_utf8; 3615 style = enc_utf8;
3583#endif 3616#endif
3584 else 3617 else
3585 { 3618 {
… …
3596 { 3629 {
3597 cl = L""; 3630 cl = L"";
3598 selectlen = 0; 3631 selectlen = 0;
3599 } 3632 }
3600 3633
3601#if ENABLE_FRILLS 3634#if !ENABLE_MINIMAL
3602 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3635 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3603 // so recode it manually 3636 // so recode it manually
3604 if (style == enc_utf8) 3637 if (style == enc_utf8)
3605 { 3638 {
3606 freect = 1; 3639 freect = 1;
… …
3609 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3642 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3610 ct.nitems = strlen ((char *)ct.value); 3643 ct.nitems = strlen ((char *)ct.value);
3611 } 3644 }
3612 else 3645 else
3613#endif 3646#endif
3614 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3647 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3615 freect = 1; 3648 freect = 1;
3616 else 3649 else
3617 { 3650 {
3618 /* if we failed to convert then send it raw */ 3651 /* if we failed to convert then send it raw */
3619 ct.value = (unsigned char *)cl; 3652 ct.value = (unsigned char *)cl;
3620 ct.nitems = selectlen; 3653 ct.nitems = selectlen;
3621 ct.encoding = target; 3654 ct.encoding = target;
3622 } 3655 }
3623 3656
3624 XChangeProperty (xdisp, rq.requestor, rq.property, 3657 XChangeProperty (dpy, rq.requestor, rq.property,
3625 ct.encoding, 8, PropModeReplace, 3658 ct.encoding, 8, PropModeReplace,
3626 ct.value, (int)ct.nitems); 3659 ct.value, (int)ct.nitems);
3627 ev.property = rq.property; 3660 ev.property = rq.property;
3628 3661
3629 if (freect) 3662 if (freect)
3630 XFree (ct.value); 3663 XFree (ct.value);
3631 } 3664 }
3632 3665
3633 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3666 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3634} 3667}
3635 3668
3636/* ------------------------------------------------------------------------- * 3669/* ------------------------------------------------------------------------- *
3637 * MOUSE ROUTINES * 3670 * MOUSE ROUTINES *
3638 * ------------------------------------------------------------------------- */ 3671 * ------------------------------------------------------------------------- */
… …
3654void 3687void
3655rxvt_term::im_set_position (XPoint &pos) NOTHROW 3688rxvt_term::im_set_position (XPoint &pos) NOTHROW
3656{ 3689{
3657 XWindowAttributes xwa; 3690 XWindowAttributes xwa;
3658 3691
3659 XGetWindowAttributes (xdisp, vt, &xwa); 3692 XGetWindowAttributes (dpy, vt, &xwa);
3660 3693
3661 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3694 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3662 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3695 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3663} 3696}
3664#endif 3697#endif

Diff Legend

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