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 (display->display, drawBuffer, 0, \ |
98 | XClearArea (dpy, drawBuffer, 0, \ |
99 | Row2Pixel (row), (unsigned int)width, \ |
99 | Row2Pixel (row), (unsigned int)width, \ |
100 | (unsigned int)Height2Pixel (num), False) |
100 | (unsigned int)Height2Pixel (num), False) |
101 | |
101 | |
102 | #define CLEAR_CHARS(x, y, num) \ |
102 | #define CLEAR_CHARS(x, y, num) \ |
103 | if (mapped) \ |
103 | if (mapped) \ |
104 | XClearArea (display->display, drawBuffer, x, y, \ |
104 | XClearArea (dpy, drawBuffer, x, y, \ |
105 | (unsigned int)Width2Pixel (num), \ |
105 | (unsigned int)Width2Pixel (num), \ |
106 | (unsigned int)Height2Pixel (1), False) |
106 | (unsigned int)Height2Pixel (1), False) |
107 | |
107 | |
108 | #define ERASE_ROWS(row, num) \ |
108 | #define ERASE_ROWS(row, num) \ |
109 | XFillRectangle (display->display, drawBuffer, gc, \ |
109 | XFillRectangle (dpy, drawBuffer, gc, \ |
110 | 0, Row2Pixel (row), \ |
110 | 0, Row2Pixel (row), \ |
111 | (unsigned int)width, \ |
111 | (unsigned int)width, \ |
112 | (unsigned int)Height2Pixel (num)) |
112 | (unsigned int)Height2Pixel (num)) |
113 | |
113 | |
114 | /* ------------------------------------------------------------------------- * |
114 | /* ------------------------------------------------------------------------- * |
… | |
… | |
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 | |
… | |
… | |
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 | { |
645 | { |
646 | // basically this is a slightly optimized scr_blank_screen_mem |
|
|
647 | // it is worth the effort on slower machines |
|
|
648 | line_t &l = ROW(nrow - 1 - i); |
646 | line_t &l = ROW(nrow - 1 - i); |
649 | |
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 | { |
650 | scr_blank_line (l, 0, l.l, rstyle); |
652 | scr_blank_line (l, 0, l.l, rstyle); |
651 | |
|
|
652 | l.l = 0; |
653 | l.l = 0; |
653 | l.f = 0; |
654 | l.f = 0; |
|
|
655 | } |
|
|
656 | else |
|
|
657 | scr_blank_screen_mem (l, rstyle); |
654 | } |
658 | } |
655 | |
659 | |
656 | // now copy lines below the scroll region bottom to the |
660 | // now copy lines below the scroll region bottom to the |
657 | // bottom of the screen again, so they look as if they |
661 | // bottom of the screen again, so they look as if they |
658 | // hadn't moved. |
662 | // hadn't moved. |
… | |
… | |
1110 | * Process DEC Back Index |
1114 | * Process DEC Back Index |
1111 | * XTERM_SEQ: ESC 6 |
1115 | * XTERM_SEQ: ESC 6 |
1112 | * 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 |
1113 | * in that row right. Clear left column. |
1117 | * in that row right. Clear left column. |
1114 | */ |
1118 | */ |
1115 | #if ENABLE_FRILLS |
1119 | #if !ENABLE_MINIMAL |
1116 | void |
1120 | void |
1117 | rxvt_term::scr_backindex () NOTHROW |
1121 | rxvt_term::scr_backindex () NOTHROW |
1118 | { |
1122 | { |
1119 | if (screen.cur.col > 0) |
1123 | if (screen.cur.col > 0) |
1120 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1124 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1127 | * Process DEC Forward Index |
1131 | * Process DEC Forward Index |
1128 | * XTERM_SEQ: ESC 9 |
1132 | * XTERM_SEQ: ESC 9 |
1129 | * 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 |
1130 | * in that row left. Clear right column. |
1134 | * in that row left. Clear right column. |
1131 | */ |
1135 | */ |
1132 | #if ENABLE_FRILLS |
1136 | #if !ENABLE_MINIMAL |
1133 | void |
1137 | void |
1134 | rxvt_term::scr_forwardindex () NOTHROW |
1138 | rxvt_term::scr_forwardindex () NOTHROW |
1135 | { |
1139 | { |
1136 | if (screen.cur.col < ncol - 1) |
1140 | if (screen.cur.col < ncol - 1) |
1137 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1141 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1338 | } |
1342 | } |
1339 | else |
1343 | else |
1340 | { |
1344 | { |
1341 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1345 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1342 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1346 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1343 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1347 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1344 | ERASE_ROWS (row, num); |
1348 | ERASE_ROWS (row, num); |
1345 | gcvalue.foreground = pix_colors[Color_fg]; |
1349 | gcvalue.foreground = pix_colors[Color_fg]; |
1346 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1350 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1347 | } |
1351 | } |
1348 | |
1352 | |
1349 | for (; num--; row++) |
1353 | for (; num--; row++) |
1350 | { |
1354 | { |
1351 | scr_blank_screen_mem (ROW(row), rstyle); |
1355 | scr_blank_screen_mem (ROW(row), rstyle); |
1352 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1356 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1353 | } |
1357 | } |
1354 | } |
1358 | } |
1355 | |
1359 | |
1356 | #if ENABLE_FRILLS |
1360 | #if !ENABLE_MINIMAL |
1357 | void |
1361 | void |
1358 | rxvt_term::scr_erase_savelines () NOTHROW |
1362 | rxvt_term::scr_erase_savelines () NOTHROW |
1359 | { |
1363 | { |
1360 | want_refresh = 1; |
1364 | want_refresh = 1; |
1361 | ZERO_SCROLLBACK (); |
1365 | ZERO_SCROLLBACK (); |
… | |
… | |
1650 | if (bgPixmap.pixmap == None) |
1654 | if (bgPixmap.pixmap == None) |
1651 | #endif |
1655 | #endif |
1652 | #if TRANSPARENT |
1656 | #if TRANSPARENT |
1653 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
1657 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
1654 | #endif |
1658 | #endif |
1655 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
1659 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1656 | |
1660 | |
1657 | XGCValues gcvalue; |
1661 | XGCValues gcvalue; |
1658 | gcvalue.foreground = pix_colors[Color_fg]; |
1662 | gcvalue.foreground = pix_colors[Color_fg]; |
1659 | gcvalue.background = pix_colors[Color_bg]; |
1663 | gcvalue.background = pix_colors[Color_bg]; |
1660 | XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); |
1664 | XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue); |
1661 | |
1665 | |
1662 | scr_clear (); |
1666 | scr_clear (); |
1663 | scr_touch (true); |
1667 | scr_touch (true); |
1664 | } |
1668 | } |
1665 | } |
1669 | } |
… | |
… | |
1750 | { |
1754 | { |
1751 | bool found = false; |
1755 | bool found = false; |
1752 | |
1756 | |
1753 | for (int i = 0; i < nrow; i++) |
1757 | for (int i = 0; i < nrow; i++) |
1754 | { |
1758 | { |
1755 | int col = 0; |
|
|
1756 | rend_t *drp = drawn_buf[i].r; |
1759 | rend_t *drp = drawn_buf[i].r; |
1757 | |
1760 | |
1758 | for (; col < ncol; col++, drp++) |
1761 | for (int col = 0; col < ncol; col++, drp++) |
1759 | if ((*drp & mask) == value) |
1762 | if ((*drp & mask) == value) |
1760 | { |
1763 | { |
1761 | found = true; |
1764 | found = true; |
1762 | *drp = ~value; |
1765 | *drp = ~value; |
1763 | } |
1766 | } |
… | |
… | |
1885 | |
1888 | |
1886 | # ifndef NO_MAPALERT |
1889 | # ifndef NO_MAPALERT |
1887 | # ifdef MAPALERT_OPTION |
1890 | # ifdef MAPALERT_OPTION |
1888 | if (OPTION (Opt_mapAlert)) |
1891 | if (OPTION (Opt_mapAlert)) |
1889 | # endif |
1892 | # endif |
1890 | XMapWindow (display->display, parent[0]); |
1893 | XMapWindow (dpy, parent[0]); |
1891 | # endif |
1894 | # endif |
1892 | |
1895 | |
1893 | if (OPTION (Opt_visualBell)) |
1896 | if (OPTION (Opt_visualBell)) |
1894 | { |
1897 | { |
1895 | rvideo_bell = true; |
1898 | rvideo_bell = true; |
… | |
… | |
1897 | display->flush (); |
1900 | display->flush (); |
1898 | |
1901 | |
1899 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1902 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1900 | } |
1903 | } |
1901 | else |
1904 | else |
1902 | XBell (display->display, 0); |
1905 | XBell (dpy, 0); |
1903 | |
1906 | |
1904 | #endif |
1907 | #endif |
1905 | } |
1908 | } |
1906 | |
1909 | |
1907 | /* ------------------------------------------------------------------------- */ |
1910 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1966 | * screen.text/screen.rend contain what the screen will change to. |
1969 | * screen.text/screen.rend contain what the screen will change to. |
1967 | */ |
1970 | */ |
1968 | void |
1971 | void |
1969 | rxvt_term::scr_refresh () NOTHROW |
1972 | rxvt_term::scr_refresh () NOTHROW |
1970 | { |
1973 | { |
1971 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1974 | unsigned char have_bg, |
1972 | showcursor; /* show the cursor */ |
1975 | showcursor; /* show the cursor */ |
1973 | int16_t col, row, /* column/row we're processing */ |
1976 | int16_t col, row, /* column/row we're processing */ |
1974 | ocrow; /* old cursor row */ |
1977 | ocrow; /* old cursor row */ |
1975 | int i; /* tmp */ |
1978 | int i; /* tmp */ |
1976 | #ifndef NO_CURSORCOLOR |
1979 | #ifndef NO_CURSORCOLOR |
… | |
… | |
1984 | return; |
1987 | return; |
1985 | |
1988 | |
1986 | /* |
1989 | /* |
1987 | * A: set up vars |
1990 | * A: set up vars |
1988 | */ |
1991 | */ |
1989 | must_clear = 0; |
1992 | have_bg = 0; |
1990 | refresh_count = 0; |
1993 | refresh_count = 0; |
1991 | |
1994 | |
1992 | #if XPM_BACKGROUND |
1995 | #if XPM_BACKGROUND |
1993 | must_clear |= bgPixmap.pixmap != None; |
1996 | have_bg |= bgPixmap.pixmap != None; |
1994 | #endif |
1997 | #endif |
1995 | #if TRANSPARENT |
1998 | #if TRANSPARENT |
1996 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
1999 | have_bg |= OPTION (Opt_transparent) && am_transparent; |
1997 | #endif |
2000 | #endif |
1998 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2001 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1999 | |
2002 | |
2000 | /* |
2003 | /* |
2001 | * B: reverse any characters which are selected |
2004 | * B: reverse any characters which are selected |
… | |
… | |
2100 | * D: CopyArea pass - very useful for slower links |
2103 | * D: CopyArea pass - very useful for slower links |
2101 | * This has been deliberately kept simple. |
2104 | * This has been deliberately kept simple. |
2102 | */ |
2105 | */ |
2103 | if (!display->is_local |
2106 | if (!display->is_local |
2104 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2107 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2105 | && abs (num_scr) < nrow && !must_clear) |
2108 | && abs (num_scr) < nrow && !have_bg) |
2106 | { |
2109 | { |
2107 | int16_t nits; |
2110 | int16_t nits; |
|
|
2111 | int i = num_scr; |
2108 | int j; |
2112 | int j; |
2109 | int len, wlen; |
2113 | int len, wlen; |
2110 | dLocal (int, num_scr); |
2114 | dLocal (int, num_scr); |
2111 | |
2115 | |
2112 | j = nrow; |
2116 | j = nrow; |
2113 | wlen = len = -1; |
2117 | wlen = len = -1; |
2114 | row = i > 0 ? 0 : j - 1; |
2118 | row = i > 0 ? 0 : j - 1; |
|
|
2119 | |
2115 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2120 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2116 | { |
2121 | { |
2117 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2122 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2118 | { |
2123 | { |
2119 | line_t s = ROW(view_start + row); |
2124 | line_t s = ROW(view_start + row); |
… | |
… | |
2140 | wlen = row; |
2145 | wlen = row; |
2141 | continue; |
2146 | continue; |
2142 | } |
2147 | } |
2143 | } |
2148 | } |
2144 | |
2149 | |
2145 | if (len != -1) |
2150 | if (len >= 0) |
2146 | { |
2151 | { |
2147 | /* also comes here at end if needed because of >= above */ |
2152 | /* also comes here at end if needed because of >= above */ |
2148 | if (wlen < len) |
2153 | if (wlen < len) |
2149 | ::swap (wlen, len); |
2154 | ::swap (wlen, len); |
2150 | |
2155 | |
|
|
2156 | XGCValues gcv; |
|
|
2157 | |
|
|
2158 | gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
2151 | XCopyArea (display->display, vt, vt, |
2159 | XCopyArea (dpy, vt, vt, |
2152 | gc, 0, Row2Pixel (len + i), |
2160 | gc, 0, Row2Pixel (len + i), |
2153 | (unsigned int)this->width, |
2161 | (unsigned int)this->width, |
2154 | (unsigned int)Height2Pixel (wlen - len + 1), |
2162 | (unsigned int)Height2Pixel (wlen - len + 1), |
2155 | 0, Row2Pixel (len)); |
2163 | 0, Row2Pixel (len)); |
|
|
2164 | gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
|
|
2165 | |
2156 | len = -1; |
2166 | len = -1; |
2157 | } |
2167 | } |
2158 | } |
2168 | } |
2159 | } |
2169 | } |
2160 | #endif |
2170 | #endif |
… | |
… | |
2216 | count++; |
2226 | count++; |
2217 | |
2227 | |
2218 | if (stp[col] != dtp[col] |
2228 | if (stp[col] != dtp[col] |
2219 | || !RS_SAME (srp[col], drp[col])) |
2229 | || !RS_SAME (srp[col], drp[col])) |
2220 | { |
2230 | { |
2221 | if (must_clear && (i++ > count / 2)) |
2231 | if (have_bg && (i++ > count / 2)) |
2222 | break; |
2232 | break; |
2223 | |
2233 | |
2224 | dtp[col] = stp[col]; |
2234 | dtp[col] = stp[col]; |
2225 | drp[col] = rend; |
2235 | drp[col] = rend; |
2226 | i = 0; |
2236 | i = 0; |
2227 | } |
2237 | } |
2228 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2238 | else if (have_bg || (stp[col] != ' ' && ++i >= 16)) |
2229 | break; |
2239 | break; |
2230 | } |
2240 | } |
2231 | |
2241 | |
2232 | col--; /* went one too far. move back */ |
2242 | col--; /* went one too far. move back */ |
2233 | count -= i; /* dump any matching trailing chars */ |
2243 | count -= i; /* dump any matching trailing chars */ |
… | |
… | |
2254 | && RS_SAME (rend, srp[text - stp - 1])) |
2264 | && RS_SAME (rend, srp[text - stp - 1])) |
2255 | text--, count++, xpixel -= fwidth; |
2265 | text--, count++, xpixel -= fwidth; |
2256 | |
2266 | |
2257 | // force redraw after "careful" characters to avoid pixel droppings |
2267 | // force redraw after "careful" characters to avoid pixel droppings |
2258 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
2268 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
2259 | drp[col + i + 1] = ~srp[col + i + 1]; |
2269 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
2260 | |
2270 | |
2261 | // force redraw before "careful" characters to avoid pixel droppings |
2271 | // force redraw before "careful" characters to avoid pixel droppings |
2262 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
2272 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
2263 | drp[text - stp - i - 1] = ~srp[text - stp - i - 1]; |
2273 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
2264 | #endif |
2274 | #endif |
2265 | |
2275 | |
2266 | bool invert = rend & RS_RVid; |
2276 | bool invert = rend & RS_RVid; |
2267 | |
2277 | |
2268 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2278 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
… | |
… | |
2326 | * Actually do the drawing of the string here |
2336 | * Actually do the drawing of the string here |
2327 | */ |
2337 | */ |
2328 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2338 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2329 | |
2339 | |
2330 | if (back == fore) |
2340 | if (back == fore) |
2331 | font->clear_rect (*drawable, xpixel, ypixel, |
2341 | font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back); |
2332 | fwidth * count, fheight, |
|
|
2333 | back); |
|
|
2334 | else if (back == Color_bg) |
2342 | else if (back == Color_bg && have_bg) |
2335 | { |
2343 | { |
2336 | if (must_clear) |
2344 | // this is very ugly, maybe push it into ->draw? |
2337 | { |
|
|
2338 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2339 | |
2345 | |
2340 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2346 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2341 | if (text[i] != ' ') |
2347 | if (text[i] != ' ') |
2342 | { |
2348 | { |
2343 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2349 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2344 | break; |
2350 | goto did_clear; |
2345 | } |
|
|
2346 | } |
2351 | } |
2347 | else |
2352 | |
2348 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2353 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2354 | did_clear: ; |
2349 | } |
2355 | } |
2350 | else |
2356 | else |
2351 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2357 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2352 | |
2358 | |
2353 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2359 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2354 | { |
2360 | { |
2355 | #if ENABLE_FRILLS |
2361 | #if ENABLE_FRILLS |
2356 | if (ISSET_PIXCOLOR (Color_underline)) |
2362 | if (ISSET_PIXCOLOR (Color_underline)) |
2357 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2363 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2358 | else |
2364 | else |
2359 | #endif |
2365 | #endif |
2360 | XSetForeground (display->display, gc, pix_colors[fore]); |
2366 | XSetForeground (dpy, gc, pix_colors[fore]); |
2361 | |
2367 | |
2362 | XDrawLine (display->display, drawBuffer, gc, |
2368 | XDrawLine (dpy, drawBuffer, gc, |
2363 | xpixel, ypixel + font->ascent + 1, |
2369 | xpixel, ypixel + font->ascent + 1, |
2364 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2370 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2365 | } |
2371 | } |
2366 | } /* for (col....) */ |
2372 | } /* for (col....) */ |
2367 | } /* for (row....) */ |
2373 | } /* for (row....) */ |
… | |
… | |
2400 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2406 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2401 | cursorwidth++; |
2407 | cursorwidth++; |
2402 | |
2408 | |
2403 | #ifndef NO_CURSORCOLOR |
2409 | #ifndef NO_CURSORCOLOR |
2404 | if (ISSET_PIXCOLOR (Color_cursor)) |
2410 | if (ISSET_PIXCOLOR (Color_cursor)) |
2405 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2411 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2406 | #endif |
2412 | #endif |
2407 | |
2413 | |
2408 | XDrawRectangle (display->display, drawBuffer, gc, |
2414 | XDrawRectangle (dpy, drawBuffer, gc, |
2409 | Col2Pixel (col), |
2415 | Col2Pixel (col), |
2410 | Row2Pixel (oldcursor.row), |
2416 | Row2Pixel (oldcursor.row), |
2411 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2417 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2412 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2418 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2413 | } |
2419 | } |
… | |
… | |
2457 | #if XPM_BACKGROUND |
2463 | #if XPM_BACKGROUND |
2458 | && !bgPixmap.pixmap |
2464 | && !bgPixmap.pixmap |
2459 | #endif |
2465 | #endif |
2460 | ) |
2466 | ) |
2461 | { |
2467 | { |
2462 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2468 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2463 | XClearWindow (display->display, parent[0]); |
2469 | XClearWindow (dpy, parent[0]); |
2464 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2470 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2465 | #if HAVE_SCROLLBARS |
2471 | #if HAVE_SCROLLBARS |
2466 | if (scrollBar.win) |
2472 | if (scrollBar.win) |
2467 | { |
2473 | { |
2468 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2474 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2469 | scrollBar.setIdle (); |
2475 | scrollBar.setIdle (); |
2470 | scrollbar_show (0); |
2476 | scrollbar_show (0); |
2471 | } |
2477 | } |
2472 | #endif |
2478 | #endif |
2473 | } |
2479 | } |
… | |
… | |
2486 | |
2492 | |
2487 | num_scr_allow = 0; |
2493 | num_scr_allow = 0; |
2488 | want_refresh = 1; |
2494 | want_refresh = 1; |
2489 | |
2495 | |
2490 | if (really) |
2496 | if (really) |
2491 | XClearWindow (display->display, vt); |
2497 | XClearWindow (dpy, vt); |
2492 | } |
2498 | } |
2493 | |
2499 | |
2494 | void |
2500 | void |
2495 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2501 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2496 | { |
2502 | { |
… | |
… | |
2545 | { |
2551 | { |
2546 | if (selection.op |
2552 | if (selection.op |
2547 | && current_screen == selection.screen |
2553 | && current_screen == selection.screen |
2548 | && selection.end.row >= view_start) |
2554 | && selection.end.row >= view_start) |
2549 | { |
2555 | { |
2550 | #if ENABLE_FRILLS |
2556 | #if !ENABLE_MINIMAL |
2551 | if (selection.rect) |
2557 | if (selection.rect) |
2552 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2558 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2553 | selection.end.row, selection.end.col, |
2559 | selection.end.row, selection.end.col, |
2554 | RS_RVid, RS_RVid | RS_Uline); |
2560 | RS_RVid, RS_RVid | RS_Uline); |
2555 | else |
2561 | else |
… | |
… | |
2671 | } |
2677 | } |
2672 | |
2678 | |
2673 | unsigned long bytes_after; |
2679 | unsigned long bytes_after; |
2674 | XTextProperty ct; |
2680 | XTextProperty ct; |
2675 | |
2681 | |
2676 | if (XGetWindowProperty (display->display, win, prop, |
2682 | if (XGetWindowProperty (dpy, win, prop, |
2677 | 0, PROP_SIZE / 4, |
2683 | 0, PROP_SIZE / 4, |
2678 | delete_prop, AnyPropertyType, |
2684 | delete_prop, AnyPropertyType, |
2679 | &ct.encoding, &ct.format, |
2685 | &ct.encoding, &ct.format, |
2680 | &ct.nitems, &bytes_after, |
2686 | &ct.nitems, &bytes_after, |
2681 | &ct.value) != Success) |
2687 | &ct.value) != Success) |
… | |
… | |
2690 | if (bytes_after) |
2696 | if (bytes_after) |
2691 | { |
2697 | { |
2692 | // fetch and append remaining data |
2698 | // fetch and append remaining data |
2693 | XTextProperty ct2; |
2699 | XTextProperty ct2; |
2694 | |
2700 | |
2695 | if (XGetWindowProperty (display->display, win, prop, |
2701 | if (XGetWindowProperty (dpy, win, prop, |
2696 | ct.nitems / 4, (bytes_after + 3) / 4, |
2702 | ct.nitems / 4, (bytes_after + 3) / 4, |
2697 | delete_prop, AnyPropertyType, |
2703 | delete_prop, AnyPropertyType, |
2698 | &ct2.encoding, &ct2.format, |
2704 | &ct2.encoding, &ct2.format, |
2699 | &ct2.nitems, &bytes_after, |
2705 | &ct2.nitems, &bytes_after, |
2700 | &ct2.value) != Success) |
2706 | &ct2.value) != Success) |
… | |
… | |
2713 | |
2719 | |
2714 | if (ct.encoding == xa[XA_INCR]) |
2720 | if (ct.encoding == xa[XA_INCR]) |
2715 | { |
2721 | { |
2716 | // INCR selection, start handshake |
2722 | // INCR selection, start handshake |
2717 | if (!delete_prop) |
2723 | if (!delete_prop) |
2718 | XDeleteProperty (display->display, win, prop); |
2724 | XDeleteProperty (dpy, win, prop); |
2719 | |
2725 | |
2720 | selection_wait = Sel_incr; |
2726 | selection_wait = Sel_incr; |
2721 | incr_buf_fill = 0; |
2727 | incr_buf_fill = 0; |
2722 | incr_ev.start (NOW + 10); |
2728 | incr_ev.start (NOW + 10); |
2723 | |
2729 | |
… | |
… | |
2770 | } |
2776 | } |
2771 | |
2777 | |
2772 | char **cl; |
2778 | char **cl; |
2773 | int cr; |
2779 | int cr; |
2774 | |
2780 | |
2775 | #if ENABLE_FRILLS |
2781 | #if !ENABLE_MINIMAL |
2776 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2782 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2777 | // so recode it manually |
2783 | // so recode it manually |
2778 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2784 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2779 | { |
2785 | { |
2780 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2786 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
… | |
… | |
2784 | paste (s, strlen (s)); |
2790 | paste (s, strlen (s)); |
2785 | free (s); |
2791 | free (s); |
2786 | } |
2792 | } |
2787 | else |
2793 | else |
2788 | #endif |
2794 | #endif |
2789 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2795 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
2790 | && cl) |
2796 | && cl) |
2791 | { |
2797 | { |
2792 | for (int i = 0; i < cr; i++) |
2798 | for (int i = 0; i < cr; i++) |
2793 | paste (cl[i], strlen (cl[i])); |
2799 | paste (cl[i], strlen (cl[i])); |
2794 | |
2800 | |
… | |
… | |
2876 | else if (selnum == Sel_Secondary) |
2882 | else if (selnum == Sel_Secondary) |
2877 | sel = XA_SECONDARY; |
2883 | sel = XA_SECONDARY; |
2878 | else |
2884 | else |
2879 | sel = xa[XA_CLIPBOARD]; |
2885 | sel = xa[XA_CLIPBOARD]; |
2880 | |
2886 | |
2881 | if (XGetSelectionOwner (display->display, sel) != None) |
2887 | if (XGetSelectionOwner (dpy, sel) != None) |
2882 | { |
2888 | { |
2883 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2889 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
2884 | vt, selection_request_time); |
2890 | vt, selection_request_time); |
2885 | return 1; |
2891 | return 1; |
2886 | } |
2892 | } |
2887 | |
2893 | |
2888 | return 0; |
2894 | return 0; |
… | |
… | |
2951 | |
2957 | |
2952 | int end_col; |
2958 | int end_col; |
2953 | |
2959 | |
2954 | for (; row <= selection.end.row; row++, col = 0) |
2960 | for (; row <= selection.end.row; row++, col = 0) |
2955 | { |
2961 | { |
2956 | #if ENABLE_FRILLS |
2962 | #if !ENABLE_MINIMAL |
2957 | if (selection.rect) |
2963 | if (selection.rect) |
2958 | { |
2964 | { |
2959 | col = selection.beg.col; |
2965 | col = selection.beg.col; |
2960 | end_col = ncol + 1; |
2966 | end_col = ncol + 1; |
2961 | } |
2967 | } |
… | |
… | |
2964 | end_col = ROW(row).l; |
2970 | end_col = ROW(row).l; |
2965 | |
2971 | |
2966 | col = max (col, 0); |
2972 | col = max (col, 0); |
2967 | |
2973 | |
2968 | if (row == selection.end.row |
2974 | if (row == selection.end.row |
2969 | #if ENABLE_FRILLS |
2975 | #if !ENABLE_MINIMAL |
2970 | || selection.rect |
2976 | || selection.rect |
2971 | #endif |
2977 | #endif |
2972 | ) |
2978 | ) |
2973 | min_it (end_col, selection.end.col); |
2979 | min_it (end_col, selection.end.col); |
2974 | |
2980 | |
… | |
… | |
2997 | #endif |
3003 | #endif |
2998 | else |
3004 | else |
2999 | new_selection_text[ofs++] = *t++; |
3005 | new_selection_text[ofs++] = *t++; |
3000 | } |
3006 | } |
3001 | |
3007 | |
3002 | #if ENABLE_FRILLS |
3008 | #if !ENABLE_MINIMAL |
3003 | if (selection.rect) |
3009 | if (selection.rect) |
3004 | { |
3010 | { |
3005 | while (ofs |
3011 | while (ofs |
3006 | && new_selection_text[ofs - 1] != C0_LF |
3012 | && new_selection_text[ofs - 1] != C0_LF |
3007 | && unicode::is_space (new_selection_text[ofs - 1])) |
3013 | && unicode::is_space (new_selection_text[ofs - 1])) |
… | |
… | |
3041 | bool |
3047 | bool |
3042 | rxvt_term::selection_grab (Time tm) NOTHROW |
3048 | rxvt_term::selection_grab (Time tm) NOTHROW |
3043 | { |
3049 | { |
3044 | selection_time = tm; |
3050 | selection_time = tm; |
3045 | |
3051 | |
3046 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3052 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3047 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3053 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3048 | { |
3054 | { |
3049 | display->set_selection_owner (this); |
3055 | display->set_selection_owner (this); |
3050 | return true; |
3056 | return true; |
3051 | } |
3057 | } |
3052 | else |
3058 | else |
… | |
… | |
3056 | } |
3062 | } |
3057 | |
3063 | |
3058 | #if 0 |
3064 | #if 0 |
3059 | XTextProperty ct; |
3065 | XTextProperty ct; |
3060 | |
3066 | |
3061 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3067 | if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) |
3062 | { |
3068 | { |
3063 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3069 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3064 | XFree (ct.value); |
3070 | XFree (ct.value); |
3065 | } |
3071 | } |
3066 | #endif |
3072 | #endif |
… | |
… | |
3368 | |
3374 | |
3369 | if (selection.clicks == 1) |
3375 | if (selection.clicks == 1) |
3370 | { |
3376 | { |
3371 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3377 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3372 | && !ROW(selection.beg.row).is_longer () |
3378 | && !ROW(selection.beg.row).is_longer () |
3373 | #if ENABLE_FRILLS |
3379 | #if !ENABLE_MINIMAL |
3374 | && !selection.rect |
3380 | && !selection.rect |
3375 | #endif |
3381 | #endif |
3376 | ) |
3382 | ) |
3377 | selection.beg.col = ncol; |
3383 | selection.beg.col = ncol; |
3378 | |
3384 | |
3379 | if ( |
3385 | if ( |
3380 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3386 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3381 | && !ROW(selection.end.row).is_longer () |
3387 | && !ROW(selection.end.row).is_longer () |
3382 | #if ENABLE_FRILLS |
3388 | #if !ENABLE_MINIMAL |
3383 | && !selection.rect |
3389 | && !selection.rect |
3384 | #endif |
3390 | #endif |
3385 | ) |
3391 | ) |
3386 | selection.end.col = ncol; |
3392 | selection.end.col = ncol; |
3387 | } |
3393 | } |
… | |
… | |
3404 | { |
3410 | { |
3405 | if (!ROW(end_row).is_longer ()) |
3411 | if (!ROW(end_row).is_longer ()) |
3406 | { |
3412 | { |
3407 | selection.end.row = end_row; |
3413 | selection.end.row = end_row; |
3408 | selection.end.col = ROW(end_row).l; |
3414 | selection.end.col = ROW(end_row).l; |
|
|
3415 | # if !ENABLE_MINIMAL |
3409 | selection_remove_trailing_spaces (); |
3416 | selection_remove_trailing_spaces (); |
|
|
3417 | # endif |
3410 | break; |
3418 | break; |
3411 | } |
3419 | } |
3412 | } |
3420 | } |
3413 | } |
3421 | } |
3414 | else |
3422 | else |
… | |
… | |
3443 | selection.mark.row = selection.beg.row; |
3451 | selection.mark.row = selection.beg.row; |
3444 | selection.mark.col = selection.beg.col; |
3452 | selection.mark.col = selection.beg.col; |
3445 | } |
3453 | } |
3446 | } |
3454 | } |
3447 | |
3455 | |
3448 | #if ENABLE_FRILLS |
3456 | #if !ENABLE_MINIMAL |
3449 | if (selection.rect && selection.beg.col > selection.end.col) |
3457 | if (selection.rect && selection.beg.col > selection.end.col) |
3450 | ::swap (selection.beg.col, selection.end.col); |
3458 | ::swap (selection.beg.col, selection.end.col); |
3451 | #endif |
3459 | #endif |
3452 | } |
3460 | } |
3453 | |
3461 | |
3454 | #if ENABLE_FRILLS |
3462 | #if !ENABLE_MINIMAL |
3455 | void |
3463 | void |
3456 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3464 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3457 | { |
3465 | { |
3458 | int32_t end_col, end_row; |
3466 | int32_t end_col, end_row; |
3459 | text_t *stp; |
3467 | text_t *stp; |
… | |
… | |
3537 | *target++ = xa[XA_COMPOUND_TEXT]; |
3545 | *target++ = xa[XA_COMPOUND_TEXT]; |
3538 | #if X_HAVE_UTF8_STRING |
3546 | #if X_HAVE_UTF8_STRING |
3539 | *target++ = xa[XA_UTF8_STRING]; |
3547 | *target++ = xa[XA_UTF8_STRING]; |
3540 | #endif |
3548 | #endif |
3541 | |
3549 | |
3542 | XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, |
3550 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3543 | 32, PropModeReplace, |
3551 | 32, PropModeReplace, |
3544 | (unsigned char *)target_list, target - target_list); |
3552 | (unsigned char *)target_list, target - target_list); |
3545 | ev.property = rq.property; |
3553 | ev.property = rq.property; |
3546 | } |
3554 | } |
3547 | #if TODO // TODO |
3555 | #if TODO // TODO |
… | |
… | |
3550 | /* TODO: Handle MULTIPLE */ |
3558 | /* TODO: Handle MULTIPLE */ |
3551 | } |
3559 | } |
3552 | #endif |
3560 | #endif |
3553 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3561 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3554 | { |
3562 | { |
3555 | XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, |
3563 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3556 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3564 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3557 | ev.property = rq.property; |
3565 | ev.property = rq.property; |
3558 | } |
3566 | } |
3559 | else if (rq.target == XA_STRING |
3567 | else if (rq.target == XA_STRING |
3560 | || rq.target == xa[XA_TEXT] |
3568 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3584 | style = enc_string; |
3592 | style = enc_string; |
3585 | else if (target == xa[XA_TEXT]) |
3593 | else if (target == xa[XA_TEXT]) |
3586 | style = enc_text; |
3594 | style = enc_text; |
3587 | else if (target == xa[XA_COMPOUND_TEXT]) |
3595 | else if (target == xa[XA_COMPOUND_TEXT]) |
3588 | style = enc_compound_text; |
3596 | style = enc_compound_text; |
3589 | #if ENABLE_FRILLS |
3597 | #if !ENABLE_MINIMAL |
3590 | else if (target == xa[XA_UTF8_STRING]) |
3598 | else if (target == xa[XA_UTF8_STRING]) |
3591 | style = enc_utf8; |
3599 | style = enc_utf8; |
3592 | #endif |
3600 | #endif |
3593 | else |
3601 | else |
3594 | { |
3602 | { |
… | |
… | |
3605 | { |
3613 | { |
3606 | cl = L""; |
3614 | cl = L""; |
3607 | selectlen = 0; |
3615 | selectlen = 0; |
3608 | } |
3616 | } |
3609 | |
3617 | |
3610 | #if ENABLE_FRILLS |
3618 | #if !ENABLE_MINIMAL |
3611 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3619 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3612 | // so recode it manually |
3620 | // so recode it manually |
3613 | if (style == enc_utf8) |
3621 | if (style == enc_utf8) |
3614 | { |
3622 | { |
3615 | freect = 1; |
3623 | freect = 1; |
… | |
… | |
3618 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3626 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3619 | ct.nitems = strlen ((char *)ct.value); |
3627 | ct.nitems = strlen ((char *)ct.value); |
3620 | } |
3628 | } |
3621 | else |
3629 | else |
3622 | #endif |
3630 | #endif |
3623 | if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3631 | if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3624 | freect = 1; |
3632 | freect = 1; |
3625 | else |
3633 | else |
3626 | { |
3634 | { |
3627 | /* if we failed to convert then send it raw */ |
3635 | /* if we failed to convert then send it raw */ |
3628 | ct.value = (unsigned char *)cl; |
3636 | ct.value = (unsigned char *)cl; |
3629 | ct.nitems = selectlen; |
3637 | ct.nitems = selectlen; |
3630 | ct.encoding = target; |
3638 | ct.encoding = target; |
3631 | } |
3639 | } |
3632 | |
3640 | |
3633 | XChangeProperty (xdisp, rq.requestor, rq.property, |
3641 | XChangeProperty (dpy, rq.requestor, rq.property, |
3634 | ct.encoding, 8, PropModeReplace, |
3642 | ct.encoding, 8, PropModeReplace, |
3635 | ct.value, (int)ct.nitems); |
3643 | ct.value, (int)ct.nitems); |
3636 | ev.property = rq.property; |
3644 | ev.property = rq.property; |
3637 | |
3645 | |
3638 | if (freect) |
3646 | if (freect) |
3639 | XFree (ct.value); |
3647 | XFree (ct.value); |
3640 | } |
3648 | } |
3641 | |
3649 | |
3642 | XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); |
3650 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3643 | } |
3651 | } |
3644 | |
3652 | |
3645 | /* ------------------------------------------------------------------------- * |
3653 | /* ------------------------------------------------------------------------- * |
3646 | * MOUSE ROUTINES * |
3654 | * MOUSE ROUTINES * |
3647 | * ------------------------------------------------------------------------- */ |
3655 | * ------------------------------------------------------------------------- */ |
… | |
… | |
3663 | void |
3671 | void |
3664 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3672 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3665 | { |
3673 | { |
3666 | XWindowAttributes xwa; |
3674 | XWindowAttributes xwa; |
3667 | |
3675 | |
3668 | XGetWindowAttributes (display->display, vt, &xwa); |
3676 | XGetWindowAttributes (dpy, vt, &xwa); |
3669 | |
3677 | |
3670 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3678 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3671 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3679 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3672 | } |
3680 | } |
3673 | #endif |
3681 | #endif |