… | |
… | |
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. |
… | |
… | |
842 | |
846 | |
843 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
847 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
844 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
848 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
845 | c = 0xfffd; |
849 | c = 0xfffd; |
846 | |
850 | |
847 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
851 | // rely on wcwidth to tell us the character width, do wcwidth before |
848 | // do wcwidth before further replacements, as wcwidth might return -1 |
852 | // further replacements, as wcwidth might return -1 for the line |
849 | // for the line drawing characters below as they might be invalid in the current |
853 | // drawing characters below as they might be invalid in the current |
850 | // locale. |
854 | // locale. |
851 | int width = c < 0x100 ? 1 : wcwidth (c); |
855 | int width = WCWIDTH (c); |
852 | |
856 | |
853 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
857 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
854 | { |
858 | { |
855 | // vt100 special graphics and line drawing |
859 | // vt100 special graphics and line drawing |
856 | // 5f-7e standard vt100 |
860 | // 5f-7e standard vt100 |
… | |
… | |
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; |
2108 | int j; |
2111 | int j; |
2109 | int len, wlen; |
2112 | int len, wlen; |
2110 | dLocal (int, num_scr); |
2113 | dLocal (int, num_scr); |
… | |
… | |
2146 | { |
2149 | { |
2147 | /* also comes here at end if needed because of >= above */ |
2150 | /* also comes here at end if needed because of >= above */ |
2148 | if (wlen < len) |
2151 | if (wlen < len) |
2149 | ::swap (wlen, len); |
2152 | ::swap (wlen, len); |
2150 | |
2153 | |
|
|
2154 | XGCValues gcv; |
|
|
2155 | |
|
|
2156 | gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
2151 | XCopyArea (display->display, vt, vt, |
2157 | XCopyArea (dpy, vt, vt, |
2152 | gc, 0, Row2Pixel (len + i), |
2158 | gc, 0, Row2Pixel (len + i), |
2153 | (unsigned int)this->width, |
2159 | (unsigned int)this->width, |
2154 | (unsigned int)Height2Pixel (wlen - len + 1), |
2160 | (unsigned int)Height2Pixel (wlen - len + 1), |
2155 | 0, Row2Pixel (len)); |
2161 | 0, Row2Pixel (len)); |
|
|
2162 | gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
|
|
2163 | |
2156 | len = -1; |
2164 | len = -1; |
2157 | } |
2165 | } |
2158 | } |
2166 | } |
2159 | } |
2167 | } |
2160 | #endif |
2168 | #endif |
… | |
… | |
2216 | count++; |
2224 | count++; |
2217 | |
2225 | |
2218 | if (stp[col] != dtp[col] |
2226 | if (stp[col] != dtp[col] |
2219 | || !RS_SAME (srp[col], drp[col])) |
2227 | || !RS_SAME (srp[col], drp[col])) |
2220 | { |
2228 | { |
2221 | if (must_clear && (i++ > count / 2)) |
2229 | if (have_bg && (i++ > count / 2)) |
2222 | break; |
2230 | break; |
2223 | |
2231 | |
2224 | dtp[col] = stp[col]; |
2232 | dtp[col] = stp[col]; |
2225 | drp[col] = rend; |
2233 | drp[col] = rend; |
2226 | i = 0; |
2234 | i = 0; |
2227 | } |
2235 | } |
2228 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2236 | else if (have_bg || (stp[col] != ' ' && ++i >= 16)) |
2229 | break; |
2237 | break; |
2230 | } |
2238 | } |
2231 | |
2239 | |
2232 | col--; /* went one too far. move back */ |
2240 | col--; /* went one too far. move back */ |
2233 | count -= i; /* dump any matching trailing chars */ |
2241 | count -= i; /* dump any matching trailing chars */ |
… | |
… | |
2244 | |
2252 | |
2245 | // only do special processing if any attributes are set, which is unlikely |
2253 | // only do special processing if any attributes are set, which is unlikely |
2246 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2254 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2247 | { |
2255 | { |
2248 | #if ENABLE_STYLES |
2256 | #if ENABLE_STYLES |
2249 | // force redraw after "careful" characters to avoid pixel droppings |
2257 | // "careful" (too wide) character handling |
2250 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2251 | drp[col + 1] = ~srp[col + 1]; |
|
|
2252 | |
2258 | |
2253 | // include previous careful character(s) if possible, looks nicer (best effort...) |
2259 | // include previous careful character(s) if possible, looks nicer (best effort...) |
2254 | while (text > stp |
2260 | while (text > stp |
2255 | && srp[text - stp - 1] & RS_Careful |
2261 | && srp[text - stp - 1] & RS_Careful |
2256 | && RS_SAME (rend, srp[text - stp - 1])) |
2262 | && RS_SAME (rend, srp[text - stp - 1])) |
2257 | text--, count++, xpixel -= fwidth; |
2263 | text--, count++, xpixel -= fwidth; |
|
|
2264 | |
|
|
2265 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2266 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2267 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2268 | |
|
|
2269 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2270 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2271 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
2258 | #endif |
2272 | #endif |
2259 | |
2273 | |
2260 | bool invert = rend & RS_RVid; |
2274 | bool invert = rend & RS_RVid; |
2261 | |
2275 | |
2262 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2276 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
… | |
… | |
2320 | * Actually do the drawing of the string here |
2334 | * Actually do the drawing of the string here |
2321 | */ |
2335 | */ |
2322 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2336 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2323 | |
2337 | |
2324 | if (back == fore) |
2338 | if (back == fore) |
2325 | font->clear_rect (*drawable, xpixel, ypixel, |
2339 | font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back); |
2326 | fwidth * count, fheight, |
|
|
2327 | back); |
|
|
2328 | else if (back == Color_bg) |
2340 | else if (back == Color_bg && have_bg) |
2329 | { |
2341 | { |
2330 | if (must_clear) |
2342 | // this is very ugly, maybe push it into ->draw? |
2331 | { |
|
|
2332 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2333 | |
2343 | |
2334 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2344 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2335 | if (text[i] != ' ') |
2345 | if (text[i] != ' ') |
2336 | { |
2346 | { |
2337 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2347 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2338 | break; |
2348 | goto did_clear; |
2339 | } |
|
|
2340 | } |
2349 | } |
2341 | else |
2350 | |
2342 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2351 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2352 | did_clear: ; |
2343 | } |
2353 | } |
2344 | else |
2354 | else |
2345 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2355 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2346 | |
2356 | |
2347 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2357 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2348 | { |
2358 | { |
2349 | #if ENABLE_FRILLS |
2359 | #if ENABLE_FRILLS |
2350 | if (ISSET_PIXCOLOR (Color_underline)) |
2360 | if (ISSET_PIXCOLOR (Color_underline)) |
2351 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2361 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2352 | else |
2362 | else |
2353 | #endif |
2363 | #endif |
2354 | XSetForeground (display->display, gc, pix_colors[fore]); |
2364 | XSetForeground (dpy, gc, pix_colors[fore]); |
2355 | |
2365 | |
2356 | XDrawLine (display->display, drawBuffer, gc, |
2366 | XDrawLine (dpy, drawBuffer, gc, |
2357 | xpixel, ypixel + font->ascent + 1, |
2367 | xpixel, ypixel + font->ascent + 1, |
2358 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2368 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2359 | } |
2369 | } |
2360 | } /* for (col....) */ |
2370 | } /* for (col....) */ |
2361 | } /* for (row....) */ |
2371 | } /* for (row....) */ |
… | |
… | |
2394 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2404 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2395 | cursorwidth++; |
2405 | cursorwidth++; |
2396 | |
2406 | |
2397 | #ifndef NO_CURSORCOLOR |
2407 | #ifndef NO_CURSORCOLOR |
2398 | if (ISSET_PIXCOLOR (Color_cursor)) |
2408 | if (ISSET_PIXCOLOR (Color_cursor)) |
2399 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2409 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2400 | #endif |
2410 | #endif |
2401 | |
2411 | |
2402 | XDrawRectangle (display->display, drawBuffer, gc, |
2412 | XDrawRectangle (dpy, drawBuffer, gc, |
2403 | Col2Pixel (col), |
2413 | Col2Pixel (col), |
2404 | Row2Pixel (oldcursor.row), |
2414 | Row2Pixel (oldcursor.row), |
2405 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2415 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2406 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2416 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2407 | } |
2417 | } |
… | |
… | |
2451 | #if XPM_BACKGROUND |
2461 | #if XPM_BACKGROUND |
2452 | && !bgPixmap.pixmap |
2462 | && !bgPixmap.pixmap |
2453 | #endif |
2463 | #endif |
2454 | ) |
2464 | ) |
2455 | { |
2465 | { |
2456 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2466 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2457 | XClearWindow (display->display, parent[0]); |
2467 | XClearWindow (dpy, parent[0]); |
2458 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2468 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2459 | #if HAVE_SCROLLBARS |
2469 | #if HAVE_SCROLLBARS |
2460 | if (scrollBar.win) |
2470 | if (scrollBar.win) |
2461 | { |
2471 | { |
2462 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2472 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2463 | scrollBar.setIdle (); |
2473 | scrollBar.setIdle (); |
2464 | scrollbar_show (0); |
2474 | scrollbar_show (0); |
2465 | } |
2475 | } |
2466 | #endif |
2476 | #endif |
2467 | } |
2477 | } |
… | |
… | |
2480 | |
2490 | |
2481 | num_scr_allow = 0; |
2491 | num_scr_allow = 0; |
2482 | want_refresh = 1; |
2492 | want_refresh = 1; |
2483 | |
2493 | |
2484 | if (really) |
2494 | if (really) |
2485 | XClearWindow (display->display, vt); |
2495 | XClearWindow (dpy, vt); |
2486 | } |
2496 | } |
2487 | |
2497 | |
2488 | void |
2498 | void |
2489 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2499 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2490 | { |
2500 | { |
… | |
… | |
2539 | { |
2549 | { |
2540 | if (selection.op |
2550 | if (selection.op |
2541 | && current_screen == selection.screen |
2551 | && current_screen == selection.screen |
2542 | && selection.end.row >= view_start) |
2552 | && selection.end.row >= view_start) |
2543 | { |
2553 | { |
2544 | #if ENABLE_FRILLS |
2554 | #if !ENABLE_MINIMAL |
2545 | if (selection.rect) |
2555 | if (selection.rect) |
2546 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2556 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2547 | selection.end.row, selection.end.col, |
2557 | selection.end.row, selection.end.col, |
2548 | RS_RVid, RS_RVid | RS_Uline); |
2558 | RS_RVid, RS_RVid | RS_Uline); |
2549 | else |
2559 | else |
… | |
… | |
2665 | } |
2675 | } |
2666 | |
2676 | |
2667 | unsigned long bytes_after; |
2677 | unsigned long bytes_after; |
2668 | XTextProperty ct; |
2678 | XTextProperty ct; |
2669 | |
2679 | |
2670 | if (XGetWindowProperty (display->display, win, prop, |
2680 | if (XGetWindowProperty (dpy, win, prop, |
2671 | 0, PROP_SIZE / 4, |
2681 | 0, PROP_SIZE / 4, |
2672 | delete_prop, AnyPropertyType, |
2682 | delete_prop, AnyPropertyType, |
2673 | &ct.encoding, &ct.format, |
2683 | &ct.encoding, &ct.format, |
2674 | &ct.nitems, &bytes_after, |
2684 | &ct.nitems, &bytes_after, |
2675 | &ct.value) != Success) |
2685 | &ct.value) != Success) |
… | |
… | |
2684 | if (bytes_after) |
2694 | if (bytes_after) |
2685 | { |
2695 | { |
2686 | // fetch and append remaining data |
2696 | // fetch and append remaining data |
2687 | XTextProperty ct2; |
2697 | XTextProperty ct2; |
2688 | |
2698 | |
2689 | if (XGetWindowProperty (display->display, win, prop, |
2699 | if (XGetWindowProperty (dpy, win, prop, |
2690 | ct.nitems / 4, (bytes_after + 3) / 4, |
2700 | ct.nitems / 4, (bytes_after + 3) / 4, |
2691 | delete_prop, AnyPropertyType, |
2701 | delete_prop, AnyPropertyType, |
2692 | &ct2.encoding, &ct2.format, |
2702 | &ct2.encoding, &ct2.format, |
2693 | &ct2.nitems, &bytes_after, |
2703 | &ct2.nitems, &bytes_after, |
2694 | &ct2.value) != Success) |
2704 | &ct2.value) != Success) |
… | |
… | |
2707 | |
2717 | |
2708 | if (ct.encoding == xa[XA_INCR]) |
2718 | if (ct.encoding == xa[XA_INCR]) |
2709 | { |
2719 | { |
2710 | // INCR selection, start handshake |
2720 | // INCR selection, start handshake |
2711 | if (!delete_prop) |
2721 | if (!delete_prop) |
2712 | XDeleteProperty (display->display, win, prop); |
2722 | XDeleteProperty (dpy, win, prop); |
2713 | |
2723 | |
2714 | selection_wait = Sel_incr; |
2724 | selection_wait = Sel_incr; |
2715 | incr_buf_fill = 0; |
2725 | incr_buf_fill = 0; |
2716 | incr_ev.start (NOW + 10); |
2726 | incr_ev.start (NOW + 10); |
2717 | |
2727 | |
… | |
… | |
2764 | } |
2774 | } |
2765 | |
2775 | |
2766 | char **cl; |
2776 | char **cl; |
2767 | int cr; |
2777 | int cr; |
2768 | |
2778 | |
2769 | #if ENABLE_FRILLS |
2779 | #if !ENABLE_MINIMAL |
2770 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2780 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2771 | // so recode it manually |
2781 | // so recode it manually |
2772 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2782 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2773 | { |
2783 | { |
2774 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2784 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
… | |
… | |
2778 | paste (s, strlen (s)); |
2788 | paste (s, strlen (s)); |
2779 | free (s); |
2789 | free (s); |
2780 | } |
2790 | } |
2781 | else |
2791 | else |
2782 | #endif |
2792 | #endif |
2783 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2793 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
2784 | && cl) |
2794 | && cl) |
2785 | { |
2795 | { |
2786 | for (int i = 0; i < cr; i++) |
2796 | for (int i = 0; i < cr; i++) |
2787 | paste (cl[i], strlen (cl[i])); |
2797 | paste (cl[i], strlen (cl[i])); |
2788 | |
2798 | |
… | |
… | |
2870 | else if (selnum == Sel_Secondary) |
2880 | else if (selnum == Sel_Secondary) |
2871 | sel = XA_SECONDARY; |
2881 | sel = XA_SECONDARY; |
2872 | else |
2882 | else |
2873 | sel = xa[XA_CLIPBOARD]; |
2883 | sel = xa[XA_CLIPBOARD]; |
2874 | |
2884 | |
2875 | if (XGetSelectionOwner (display->display, sel) != None) |
2885 | if (XGetSelectionOwner (dpy, sel) != None) |
2876 | { |
2886 | { |
2877 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2887 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
2878 | vt, selection_request_time); |
2888 | vt, selection_request_time); |
2879 | return 1; |
2889 | return 1; |
2880 | } |
2890 | } |
2881 | |
2891 | |
2882 | return 0; |
2892 | return 0; |
… | |
… | |
2945 | |
2955 | |
2946 | int end_col; |
2956 | int end_col; |
2947 | |
2957 | |
2948 | for (; row <= selection.end.row; row++, col = 0) |
2958 | for (; row <= selection.end.row; row++, col = 0) |
2949 | { |
2959 | { |
2950 | #if ENABLE_FRILLS |
2960 | #if !ENABLE_MINIMAL |
2951 | if (selection.rect) |
2961 | if (selection.rect) |
2952 | { |
2962 | { |
2953 | col = selection.beg.col; |
2963 | col = selection.beg.col; |
2954 | end_col = ncol + 1; |
2964 | end_col = ncol + 1; |
2955 | } |
2965 | } |
… | |
… | |
2958 | end_col = ROW(row).l; |
2968 | end_col = ROW(row).l; |
2959 | |
2969 | |
2960 | col = max (col, 0); |
2970 | col = max (col, 0); |
2961 | |
2971 | |
2962 | if (row == selection.end.row |
2972 | if (row == selection.end.row |
2963 | #if ENABLE_FRILLS |
2973 | #if !ENABLE_MINIMAL |
2964 | || selection.rect |
2974 | || selection.rect |
2965 | #endif |
2975 | #endif |
2966 | ) |
2976 | ) |
2967 | min_it (end_col, selection.end.col); |
2977 | min_it (end_col, selection.end.col); |
2968 | |
2978 | |
… | |
… | |
2991 | #endif |
3001 | #endif |
2992 | else |
3002 | else |
2993 | new_selection_text[ofs++] = *t++; |
3003 | new_selection_text[ofs++] = *t++; |
2994 | } |
3004 | } |
2995 | |
3005 | |
2996 | #if ENABLE_FRILLS |
3006 | #if !ENABLE_MINIMAL |
2997 | if (selection.rect) |
3007 | if (selection.rect) |
2998 | { |
3008 | { |
2999 | while (ofs |
3009 | while (ofs |
3000 | && new_selection_text[ofs - 1] != C0_LF |
3010 | && new_selection_text[ofs - 1] != C0_LF |
3001 | && unicode::is_space (new_selection_text[ofs - 1])) |
3011 | && unicode::is_space (new_selection_text[ofs - 1])) |
… | |
… | |
3035 | bool |
3045 | bool |
3036 | rxvt_term::selection_grab (Time tm) NOTHROW |
3046 | rxvt_term::selection_grab (Time tm) NOTHROW |
3037 | { |
3047 | { |
3038 | selection_time = tm; |
3048 | selection_time = tm; |
3039 | |
3049 | |
3040 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3050 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3041 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3051 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3042 | { |
3052 | { |
3043 | display->set_selection_owner (this); |
3053 | display->set_selection_owner (this); |
3044 | return true; |
3054 | return true; |
3045 | } |
3055 | } |
3046 | else |
3056 | else |
… | |
… | |
3050 | } |
3060 | } |
3051 | |
3061 | |
3052 | #if 0 |
3062 | #if 0 |
3053 | XTextProperty ct; |
3063 | XTextProperty ct; |
3054 | |
3064 | |
3055 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3065 | if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) |
3056 | { |
3066 | { |
3057 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3067 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3058 | XFree (ct.value); |
3068 | XFree (ct.value); |
3059 | } |
3069 | } |
3060 | #endif |
3070 | #endif |
… | |
… | |
3362 | |
3372 | |
3363 | if (selection.clicks == 1) |
3373 | if (selection.clicks == 1) |
3364 | { |
3374 | { |
3365 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3375 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3366 | && !ROW(selection.beg.row).is_longer () |
3376 | && !ROW(selection.beg.row).is_longer () |
3367 | #if ENABLE_FRILLS |
3377 | #if !ENABLE_MINIMAL |
3368 | && !selection.rect |
3378 | && !selection.rect |
3369 | #endif |
3379 | #endif |
3370 | ) |
3380 | ) |
3371 | selection.beg.col = ncol; |
3381 | selection.beg.col = ncol; |
3372 | |
3382 | |
3373 | if ( |
3383 | if ( |
3374 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3384 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3375 | && !ROW(selection.end.row).is_longer () |
3385 | && !ROW(selection.end.row).is_longer () |
3376 | #if ENABLE_FRILLS |
3386 | #if !ENABLE_MINIMAL |
3377 | && !selection.rect |
3387 | && !selection.rect |
3378 | #endif |
3388 | #endif |
3379 | ) |
3389 | ) |
3380 | selection.end.col = ncol; |
3390 | selection.end.col = ncol; |
3381 | } |
3391 | } |
… | |
… | |
3398 | { |
3408 | { |
3399 | if (!ROW(end_row).is_longer ()) |
3409 | if (!ROW(end_row).is_longer ()) |
3400 | { |
3410 | { |
3401 | selection.end.row = end_row; |
3411 | selection.end.row = end_row; |
3402 | selection.end.col = ROW(end_row).l; |
3412 | selection.end.col = ROW(end_row).l; |
|
|
3413 | # if !ENABLE_MINIMAL |
3403 | selection_remove_trailing_spaces (); |
3414 | selection_remove_trailing_spaces (); |
|
|
3415 | # endif |
3404 | break; |
3416 | break; |
3405 | } |
3417 | } |
3406 | } |
3418 | } |
3407 | } |
3419 | } |
3408 | else |
3420 | else |
… | |
… | |
3437 | selection.mark.row = selection.beg.row; |
3449 | selection.mark.row = selection.beg.row; |
3438 | selection.mark.col = selection.beg.col; |
3450 | selection.mark.col = selection.beg.col; |
3439 | } |
3451 | } |
3440 | } |
3452 | } |
3441 | |
3453 | |
3442 | #if ENABLE_FRILLS |
3454 | #if !ENABLE_MINIMAL |
3443 | if (selection.rect && selection.beg.col > selection.end.col) |
3455 | if (selection.rect && selection.beg.col > selection.end.col) |
3444 | ::swap (selection.beg.col, selection.end.col); |
3456 | ::swap (selection.beg.col, selection.end.col); |
3445 | #endif |
3457 | #endif |
3446 | } |
3458 | } |
3447 | |
3459 | |
3448 | #if ENABLE_FRILLS |
3460 | #if !ENABLE_MINIMAL |
3449 | void |
3461 | void |
3450 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3462 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3451 | { |
3463 | { |
3452 | int32_t end_col, end_row; |
3464 | int32_t end_col, end_row; |
3453 | text_t *stp; |
3465 | text_t *stp; |
… | |
… | |
3508 | */ |
3520 | */ |
3509 | void |
3521 | void |
3510 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3522 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3511 | { |
3523 | { |
3512 | XSelectionEvent ev; |
3524 | XSelectionEvent ev; |
3513 | dDisp; |
|
|
3514 | |
3525 | |
3515 | ev.type = SelectionNotify; |
3526 | ev.type = SelectionNotify; |
3516 | ev.property = None; |
3527 | ev.property = None; |
3517 | ev.display = rq.display; |
3528 | ev.display = rq.display; |
3518 | ev.requestor = rq.requestor; |
3529 | ev.requestor = rq.requestor; |
… | |
… | |
3532 | *target++ = xa[XA_COMPOUND_TEXT]; |
3543 | *target++ = xa[XA_COMPOUND_TEXT]; |
3533 | #if X_HAVE_UTF8_STRING |
3544 | #if X_HAVE_UTF8_STRING |
3534 | *target++ = xa[XA_UTF8_STRING]; |
3545 | *target++ = xa[XA_UTF8_STRING]; |
3535 | #endif |
3546 | #endif |
3536 | |
3547 | |
3537 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3548 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3538 | 32, PropModeReplace, |
3549 | 32, PropModeReplace, |
3539 | (unsigned char *)target_list, target - target_list); |
3550 | (unsigned char *)target_list, target - target_list); |
3540 | ev.property = rq.property; |
3551 | ev.property = rq.property; |
3541 | } |
3552 | } |
3542 | #if TODO // TODO |
3553 | #if TODO // TODO |
… | |
… | |
3545 | /* TODO: Handle MULTIPLE */ |
3556 | /* TODO: Handle MULTIPLE */ |
3546 | } |
3557 | } |
3547 | #endif |
3558 | #endif |
3548 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3559 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3549 | { |
3560 | { |
3550 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3561 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3551 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3562 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3552 | ev.property = rq.property; |
3563 | ev.property = rq.property; |
3553 | } |
3564 | } |
3554 | else if (rq.target == XA_STRING |
3565 | else if (rq.target == XA_STRING |
3555 | || rq.target == xa[XA_TEXT] |
3566 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3579 | style = enc_string; |
3590 | style = enc_string; |
3580 | else if (target == xa[XA_TEXT]) |
3591 | else if (target == xa[XA_TEXT]) |
3581 | style = enc_text; |
3592 | style = enc_text; |
3582 | else if (target == xa[XA_COMPOUND_TEXT]) |
3593 | else if (target == xa[XA_COMPOUND_TEXT]) |
3583 | style = enc_compound_text; |
3594 | style = enc_compound_text; |
3584 | #if ENABLE_FRILLS |
3595 | #if !ENABLE_MINIMAL |
3585 | else if (target == xa[XA_UTF8_STRING]) |
3596 | else if (target == xa[XA_UTF8_STRING]) |
3586 | style = enc_utf8; |
3597 | style = enc_utf8; |
3587 | #endif |
3598 | #endif |
3588 | else |
3599 | else |
3589 | { |
3600 | { |
… | |
… | |
3600 | { |
3611 | { |
3601 | cl = L""; |
3612 | cl = L""; |
3602 | selectlen = 0; |
3613 | selectlen = 0; |
3603 | } |
3614 | } |
3604 | |
3615 | |
3605 | #if ENABLE_FRILLS |
3616 | #if !ENABLE_MINIMAL |
3606 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3617 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3607 | // so recode it manually |
3618 | // so recode it manually |
3608 | if (style == enc_utf8) |
3619 | if (style == enc_utf8) |
3609 | { |
3620 | { |
3610 | freect = 1; |
3621 | freect = 1; |
… | |
… | |
3613 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3624 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3614 | ct.nitems = strlen ((char *)ct.value); |
3625 | ct.nitems = strlen ((char *)ct.value); |
3615 | } |
3626 | } |
3616 | else |
3627 | else |
3617 | #endif |
3628 | #endif |
3618 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3629 | if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3619 | freect = 1; |
3630 | freect = 1; |
3620 | else |
3631 | else |
3621 | { |
3632 | { |
3622 | /* if we failed to convert then send it raw */ |
3633 | /* if we failed to convert then send it raw */ |
3623 | ct.value = (unsigned char *)cl; |
3634 | ct.value = (unsigned char *)cl; |
3624 | ct.nitems = selectlen; |
3635 | ct.nitems = selectlen; |
3625 | ct.encoding = target; |
3636 | ct.encoding = target; |
3626 | } |
3637 | } |
3627 | |
3638 | |
3628 | XChangeProperty (disp, rq.requestor, rq.property, |
3639 | XChangeProperty (dpy, rq.requestor, rq.property, |
3629 | ct.encoding, 8, PropModeReplace, |
3640 | ct.encoding, 8, PropModeReplace, |
3630 | ct.value, (int)ct.nitems); |
3641 | ct.value, (int)ct.nitems); |
3631 | ev.property = rq.property; |
3642 | ev.property = rq.property; |
3632 | |
3643 | |
3633 | if (freect) |
3644 | if (freect) |
3634 | XFree (ct.value); |
3645 | XFree (ct.value); |
3635 | } |
3646 | } |
3636 | |
3647 | |
3637 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3648 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3638 | } |
3649 | } |
3639 | |
3650 | |
3640 | /* ------------------------------------------------------------------------- * |
3651 | /* ------------------------------------------------------------------------- * |
3641 | * MOUSE ROUTINES * |
3652 | * MOUSE ROUTINES * |
3642 | * ------------------------------------------------------------------------- */ |
3653 | * ------------------------------------------------------------------------- */ |
… | |
… | |
3658 | void |
3669 | void |
3659 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3670 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3660 | { |
3671 | { |
3661 | XWindowAttributes xwa; |
3672 | XWindowAttributes xwa; |
3662 | |
3673 | |
3663 | XGetWindowAttributes (display->display, vt, &xwa); |
3674 | XGetWindowAttributes (dpy, vt, &xwa); |
3664 | |
3675 | |
3665 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3676 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3666 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3677 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3667 | } |
3678 | } |
3668 | #endif |
3679 | #endif |
… | |
… | |
3764 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3775 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3765 | { |
3776 | { |
3766 | while (*s) |
3777 | while (*s) |
3767 | { |
3778 | { |
3768 | text_t t = *s++; |
3779 | text_t t = *s++; |
3769 | int width = wcwidth (t); |
3780 | int width = WCWIDTH (t); |
3770 | |
3781 | |
3771 | while (width--) |
3782 | while (width--) |
3772 | { |
3783 | { |
3773 | scr_overlay_set (x++, y, t); |
3784 | scr_overlay_set (x++, y, t); |
3774 | t = NOCHAR; |
3785 | t = NOCHAR; |