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. |
… | |
… | |
758 | ZERO_SCROLLBACK (); |
762 | ZERO_SCROLLBACK (); |
759 | |
763 | |
760 | if (minlines > 0) |
764 | if (minlines > 0) |
761 | { |
765 | { |
762 | minlines += screen.cur.row - screen.bscroll; |
766 | minlines += screen.cur.row - screen.bscroll; |
|
|
767 | min_it (minlines, screen.cur.row - top_row); |
763 | |
768 | |
764 | if (minlines > 0 |
769 | if (minlines > 0 |
765 | && screen.tscroll == 0 |
770 | && screen.tscroll == 0 |
766 | && screen.bscroll == nrow - 1) |
771 | && screen.bscroll == nrow - 1) |
767 | { |
772 | { |
… | |
… | |
841 | |
846 | |
842 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
847 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
843 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
848 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
844 | c = 0xfffd; |
849 | c = 0xfffd; |
845 | |
850 | |
846 | // 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 |
847 | // do wcwidth before further replacements, as wcwidth might return -1 |
852 | // further replacements, as wcwidth might return -1 for the line |
848 | // 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 |
849 | // locale. |
854 | // locale. |
850 | int width = c < 0x100 ? 1 : wcwidth (c); |
855 | int width = WCWIDTH (c); |
851 | |
856 | |
852 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
857 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
853 | { |
858 | { |
854 | // vt100 special graphics and line drawing |
859 | // vt100 special graphics and line drawing |
855 | // 5f-7e standard vt100 |
860 | // 5f-7e standard vt100 |
… | |
… | |
1109 | * Process DEC Back Index |
1114 | * Process DEC Back Index |
1110 | * XTERM_SEQ: ESC 6 |
1115 | * XTERM_SEQ: ESC 6 |
1111 | * 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 |
1112 | * in that row right. Clear left column. |
1117 | * in that row right. Clear left column. |
1113 | */ |
1118 | */ |
1114 | #if ENABLE_FRILLS |
1119 | #if !ENABLE_MINIMAL |
1115 | void |
1120 | void |
1116 | rxvt_term::scr_backindex () NOTHROW |
1121 | rxvt_term::scr_backindex () NOTHROW |
1117 | { |
1122 | { |
1118 | if (screen.cur.col > 0) |
1123 | if (screen.cur.col > 0) |
1119 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1124 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1126 | * Process DEC Forward Index |
1131 | * Process DEC Forward Index |
1127 | * XTERM_SEQ: ESC 9 |
1132 | * XTERM_SEQ: ESC 9 |
1128 | * 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 |
1129 | * in that row left. Clear right column. |
1134 | * in that row left. Clear right column. |
1130 | */ |
1135 | */ |
1131 | #if ENABLE_FRILLS |
1136 | #if !ENABLE_MINIMAL |
1132 | void |
1137 | void |
1133 | rxvt_term::scr_forwardindex () NOTHROW |
1138 | rxvt_term::scr_forwardindex () NOTHROW |
1134 | { |
1139 | { |
1135 | if (screen.cur.col < ncol - 1) |
1140 | if (screen.cur.col < ncol - 1) |
1136 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1141 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1337 | } |
1342 | } |
1338 | else |
1343 | else |
1339 | { |
1344 | { |
1340 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1345 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1341 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1346 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1342 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1347 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1343 | ERASE_ROWS (row, num); |
1348 | ERASE_ROWS (row, num); |
1344 | gcvalue.foreground = pix_colors[Color_fg]; |
1349 | gcvalue.foreground = pix_colors[Color_fg]; |
1345 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1350 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1346 | } |
1351 | } |
1347 | |
1352 | |
1348 | for (; num--; row++) |
1353 | for (; num--; row++) |
1349 | { |
1354 | { |
1350 | scr_blank_screen_mem (ROW(row), rstyle); |
1355 | scr_blank_screen_mem (ROW(row), rstyle); |
1351 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1356 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1352 | } |
1357 | } |
1353 | } |
1358 | } |
1354 | |
1359 | |
1355 | #if ENABLE_FRILLS |
1360 | #if !ENABLE_MINIMAL |
1356 | void |
1361 | void |
1357 | rxvt_term::scr_erase_savelines () NOTHROW |
1362 | rxvt_term::scr_erase_savelines () NOTHROW |
1358 | { |
1363 | { |
1359 | want_refresh = 1; |
1364 | want_refresh = 1; |
1360 | ZERO_SCROLLBACK (); |
1365 | ZERO_SCROLLBACK (); |
… | |
… | |
1649 | if (bgPixmap.pixmap == None) |
1654 | if (bgPixmap.pixmap == None) |
1650 | #endif |
1655 | #endif |
1651 | #if TRANSPARENT |
1656 | #if TRANSPARENT |
1652 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
1657 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
1653 | #endif |
1658 | #endif |
1654 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
1659 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1655 | |
1660 | |
1656 | XGCValues gcvalue; |
1661 | XGCValues gcvalue; |
1657 | gcvalue.foreground = pix_colors[Color_fg]; |
1662 | gcvalue.foreground = pix_colors[Color_fg]; |
1658 | gcvalue.background = pix_colors[Color_bg]; |
1663 | gcvalue.background = pix_colors[Color_bg]; |
1659 | XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); |
1664 | XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue); |
1660 | |
1665 | |
1661 | scr_clear (); |
1666 | scr_clear (); |
1662 | scr_touch (true); |
1667 | scr_touch (true); |
1663 | } |
1668 | } |
1664 | } |
1669 | } |
… | |
… | |
1749 | { |
1754 | { |
1750 | bool found = false; |
1755 | bool found = false; |
1751 | |
1756 | |
1752 | for (int i = 0; i < nrow; i++) |
1757 | for (int i = 0; i < nrow; i++) |
1753 | { |
1758 | { |
1754 | int col = 0; |
|
|
1755 | rend_t *drp = drawn_buf[i].r; |
1759 | rend_t *drp = drawn_buf[i].r; |
1756 | |
1760 | |
1757 | for (; col < ncol; col++, drp++) |
1761 | for (int col = 0; col < ncol; col++, drp++) |
1758 | if ((*drp & mask) == value) |
1762 | if ((*drp & mask) == value) |
1759 | { |
1763 | { |
1760 | found = true; |
1764 | found = true; |
1761 | *drp = ~value; |
1765 | *drp = ~value; |
1762 | } |
1766 | } |
… | |
… | |
1884 | |
1888 | |
1885 | # ifndef NO_MAPALERT |
1889 | # ifndef NO_MAPALERT |
1886 | # ifdef MAPALERT_OPTION |
1890 | # ifdef MAPALERT_OPTION |
1887 | if (OPTION (Opt_mapAlert)) |
1891 | if (OPTION (Opt_mapAlert)) |
1888 | # endif |
1892 | # endif |
1889 | XMapWindow (display->display, parent[0]); |
1893 | XMapWindow (dpy, parent[0]); |
1890 | # endif |
1894 | # endif |
1891 | |
1895 | |
1892 | if (OPTION (Opt_visualBell)) |
1896 | if (OPTION (Opt_visualBell)) |
1893 | { |
1897 | { |
1894 | rvideo_bell = true; |
1898 | rvideo_bell = true; |
… | |
… | |
1896 | display->flush (); |
1900 | display->flush (); |
1897 | |
1901 | |
1898 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1902 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1899 | } |
1903 | } |
1900 | else |
1904 | else |
1901 | XBell (display->display, 0); |
1905 | XBell (dpy, 0); |
1902 | |
1906 | |
1903 | #endif |
1907 | #endif |
1904 | } |
1908 | } |
1905 | |
1909 | |
1906 | /* ------------------------------------------------------------------------- */ |
1910 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1965 | * screen.text/screen.rend contain what the screen will change to. |
1969 | * screen.text/screen.rend contain what the screen will change to. |
1966 | */ |
1970 | */ |
1967 | void |
1971 | void |
1968 | rxvt_term::scr_refresh () NOTHROW |
1972 | rxvt_term::scr_refresh () NOTHROW |
1969 | { |
1973 | { |
1970 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1974 | unsigned char have_bg, |
1971 | showcursor; /* show the cursor */ |
1975 | showcursor; /* show the cursor */ |
1972 | int16_t col, row, /* column/row we're processing */ |
1976 | int16_t col, row, /* column/row we're processing */ |
1973 | ocrow; /* old cursor row */ |
1977 | ocrow; /* old cursor row */ |
1974 | int i; /* tmp */ |
1978 | int i; /* tmp */ |
1975 | #ifndef NO_CURSORCOLOR |
1979 | #ifndef NO_CURSORCOLOR |
… | |
… | |
1983 | return; |
1987 | return; |
1984 | |
1988 | |
1985 | /* |
1989 | /* |
1986 | * A: set up vars |
1990 | * A: set up vars |
1987 | */ |
1991 | */ |
1988 | must_clear = 0; |
1992 | have_bg = 0; |
1989 | refresh_count = 0; |
1993 | refresh_count = 0; |
1990 | |
1994 | |
1991 | #if XPM_BACKGROUND |
1995 | #if XPM_BACKGROUND |
1992 | must_clear |= bgPixmap.pixmap != None; |
1996 | have_bg |= bgPixmap.pixmap != None; |
1993 | #endif |
1997 | #endif |
1994 | #if TRANSPARENT |
1998 | #if TRANSPARENT |
1995 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
1999 | have_bg |= OPTION (Opt_transparent) && am_transparent; |
1996 | #endif |
2000 | #endif |
1997 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2001 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1998 | |
2002 | |
1999 | /* |
2003 | /* |
2000 | * B: reverse any characters which are selected |
2004 | * B: reverse any characters which are selected |
… | |
… | |
2099 | * D: CopyArea pass - very useful for slower links |
2103 | * D: CopyArea pass - very useful for slower links |
2100 | * This has been deliberately kept simple. |
2104 | * This has been deliberately kept simple. |
2101 | */ |
2105 | */ |
2102 | if (!display->is_local |
2106 | if (!display->is_local |
2103 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2107 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2104 | && abs (num_scr) < nrow && !must_clear) |
2108 | && abs (num_scr) < nrow && !have_bg) |
2105 | { |
2109 | { |
2106 | int16_t nits; |
2110 | int16_t nits; |
|
|
2111 | int i = num_scr; |
2107 | int j; |
2112 | int j; |
2108 | int len, wlen; |
2113 | int len, wlen; |
2109 | dLocal (int, num_scr); |
2114 | dLocal (int, num_scr); |
2110 | |
2115 | |
2111 | j = nrow; |
2116 | j = nrow; |
2112 | wlen = len = -1; |
2117 | wlen = len = -1; |
2113 | row = i > 0 ? 0 : j - 1; |
2118 | row = i > 0 ? 0 : j - 1; |
|
|
2119 | |
2114 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2120 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2115 | { |
2121 | { |
2116 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2122 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2117 | { |
2123 | { |
2118 | line_t s = ROW(view_start + row); |
2124 | line_t s = ROW(view_start + row); |
… | |
… | |
2139 | wlen = row; |
2145 | wlen = row; |
2140 | continue; |
2146 | continue; |
2141 | } |
2147 | } |
2142 | } |
2148 | } |
2143 | |
2149 | |
2144 | if (len != -1) |
2150 | if (len >= 0) |
2145 | { |
2151 | { |
2146 | /* also comes here at end if needed because of >= above */ |
2152 | /* also comes here at end if needed because of >= above */ |
2147 | if (wlen < len) |
2153 | if (wlen < len) |
2148 | ::swap (wlen, len); |
2154 | ::swap (wlen, len); |
2149 | |
2155 | |
|
|
2156 | XGCValues gcv; |
|
|
2157 | |
|
|
2158 | gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
2150 | XCopyArea (display->display, vt, vt, |
2159 | XCopyArea (dpy, vt, vt, |
2151 | gc, 0, Row2Pixel (len + i), |
2160 | gc, 0, Row2Pixel (len + i), |
2152 | (unsigned int)this->width, |
2161 | (unsigned int)this->width, |
2153 | (unsigned int)Height2Pixel (wlen - len + 1), |
2162 | (unsigned int)Height2Pixel (wlen - len + 1), |
2154 | 0, Row2Pixel (len)); |
2163 | 0, Row2Pixel (len)); |
|
|
2164 | gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
|
|
2165 | |
2155 | len = -1; |
2166 | len = -1; |
2156 | } |
2167 | } |
2157 | } |
2168 | } |
2158 | } |
2169 | } |
2159 | #endif |
2170 | #endif |
… | |
… | |
2215 | count++; |
2226 | count++; |
2216 | |
2227 | |
2217 | if (stp[col] != dtp[col] |
2228 | if (stp[col] != dtp[col] |
2218 | || !RS_SAME (srp[col], drp[col])) |
2229 | || !RS_SAME (srp[col], drp[col])) |
2219 | { |
2230 | { |
2220 | if (must_clear && (i++ > count / 2)) |
2231 | if (have_bg && (i++ > count / 2)) |
2221 | break; |
2232 | break; |
2222 | |
2233 | |
2223 | dtp[col] = stp[col]; |
2234 | dtp[col] = stp[col]; |
2224 | drp[col] = rend; |
2235 | drp[col] = rend; |
2225 | i = 0; |
2236 | i = 0; |
2226 | } |
2237 | } |
2227 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2238 | else if (have_bg || (stp[col] != ' ' && ++i >= 16)) |
2228 | break; |
2239 | break; |
2229 | } |
2240 | } |
2230 | |
2241 | |
2231 | col--; /* went one too far. move back */ |
2242 | col--; /* went one too far. move back */ |
2232 | count -= i; /* dump any matching trailing chars */ |
2243 | count -= i; /* dump any matching trailing chars */ |
… | |
… | |
2242 | int back = bgcolor_of (rend); // desired background |
2253 | int back = bgcolor_of (rend); // desired background |
2243 | |
2254 | |
2244 | // only do special processing if any attributes are set, which is unlikely |
2255 | // only do special processing if any attributes are set, which is unlikely |
2245 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2256 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2246 | { |
2257 | { |
2247 | #if ENABLE_STYLES |
|
|
2248 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2249 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2250 | drp[col + 1] = ~srp[col + 1]; |
|
|
2251 | |
|
|
2252 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2253 | while (text > stp |
|
|
2254 | && srp[text - stp - 1] & RS_Careful |
|
|
2255 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2256 | text--, count++, xpixel -= fwidth; |
|
|
2257 | #endif |
|
|
2258 | |
|
|
2259 | bool invert = rend & RS_RVid; |
2258 | bool invert = rend & RS_RVid; |
2260 | |
2259 | |
2261 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2260 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2262 | if (rend & RS_Bold |
2261 | if (rend & RS_Bold |
2263 | && fore == Color_fg) |
2262 | && fore == Color_fg) |
… | |
… | |
2279 | else |
2278 | else |
2280 | invert = !invert; |
2279 | invert = !invert; |
2281 | # endif |
2280 | # endif |
2282 | } |
2281 | } |
2283 | |
2282 | |
2284 | if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) |
2283 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2285 | fore = Color_UL; |
2284 | fore = Color_UL; |
2286 | #endif |
2285 | #endif |
2287 | |
2286 | |
2288 | if (invert) |
2287 | if (invert) |
2289 | { |
2288 | { |
|
|
2289 | #ifdef OPTION_HC |
|
|
2290 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2291 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2292 | #endif |
|
|
2293 | /* invert the column if no highlightColor is set or it is the |
|
|
2294 | * current cursor column */ |
2290 | ::swap (fore, back); |
2295 | ::swap (fore, back); |
|
|
2296 | #ifdef OPTION_HC |
|
|
2297 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2298 | back = Color_HC; |
|
|
2299 | #endif |
2291 | |
2300 | |
2292 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2301 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2302 | # ifndef OPTION_HC |
2293 | if (ISSET_PIXCOLOR (Color_RV)) |
2303 | if (ISSET_PIXCOLOR (Color_RV)) |
2294 | back = Color_RV; |
2304 | back = Color_RV; |
2295 | |
2305 | # endif |
2296 | if (fore == back) |
2306 | if (fore == back) |
2297 | { |
2307 | { |
2298 | fore = Color_bg; |
2308 | fore = Color_bg; |
2299 | back = Color_fg; |
2309 | back = Color_fg; |
2300 | } |
2310 | } |
… | |
… | |
2311 | } |
2321 | } |
2312 | else if (hidden_text) |
2322 | else if (hidden_text) |
2313 | fore = back; |
2323 | fore = back; |
2314 | } |
2324 | } |
2315 | #endif |
2325 | #endif |
|
|
2326 | |
|
|
2327 | #if ENABLE_STYLES |
|
|
2328 | // "careful" (too wide) character handling |
|
|
2329 | |
|
|
2330 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2331 | while (text > stp |
|
|
2332 | && srp[text - stp - 1] & RS_Careful |
|
|
2333 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2334 | text--, count++, xpixel -= fwidth; |
|
|
2335 | |
|
|
2336 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2337 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2338 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2339 | |
|
|
2340 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2341 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2342 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2343 | #endif |
2316 | } |
2344 | } |
2317 | |
2345 | |
2318 | /* |
2346 | /* |
2319 | * Actually do the drawing of the string here |
2347 | * Actually do the drawing of the string here |
2320 | */ |
2348 | */ |
2321 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2349 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2322 | |
2350 | |
2323 | if (back == fore) |
2351 | if (back == fore) |
2324 | font->clear_rect (*drawable, xpixel, ypixel, |
2352 | font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back); |
2325 | fwidth * count, fheight, |
|
|
2326 | back); |
|
|
2327 | else if (back == Color_bg) |
2353 | else if (back == Color_bg && have_bg) |
2328 | { |
2354 | { |
2329 | if (must_clear) |
2355 | // this is very ugly, maybe push it into ->draw? |
2330 | { |
|
|
2331 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2332 | |
2356 | |
2333 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2357 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2334 | if (text[i] != ' ') |
2358 | if (text[i] != ' ') |
2335 | { |
2359 | { |
2336 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2360 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2337 | break; |
2361 | goto did_clear; |
2338 | } |
|
|
2339 | } |
2362 | } |
2340 | else |
2363 | |
2341 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2364 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2365 | did_clear: ; |
2342 | } |
2366 | } |
2343 | else |
2367 | else |
2344 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2368 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2345 | |
2369 | |
2346 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2370 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2347 | { |
2371 | { |
2348 | #if ENABLE_FRILLS |
2372 | #if ENABLE_FRILLS |
2349 | if (ISSET_PIXCOLOR (Color_underline)) |
2373 | if (ISSET_PIXCOLOR (Color_underline)) |
2350 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2374 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2351 | else |
2375 | else |
2352 | #endif |
2376 | #endif |
2353 | XSetForeground (display->display, gc, pix_colors[fore]); |
2377 | XSetForeground (dpy, gc, pix_colors[fore]); |
2354 | |
2378 | |
2355 | XDrawLine (display->display, drawBuffer, gc, |
2379 | XDrawLine (dpy, drawBuffer, gc, |
2356 | xpixel, ypixel + font->ascent + 1, |
2380 | xpixel, ypixel + font->ascent + 1, |
2357 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2381 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2358 | } |
2382 | } |
2359 | } /* for (col....) */ |
2383 | } /* for (col....) */ |
2360 | } /* for (row....) */ |
2384 | } /* for (row....) */ |
… | |
… | |
2393 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2417 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2394 | cursorwidth++; |
2418 | cursorwidth++; |
2395 | |
2419 | |
2396 | #ifndef NO_CURSORCOLOR |
2420 | #ifndef NO_CURSORCOLOR |
2397 | if (ISSET_PIXCOLOR (Color_cursor)) |
2421 | if (ISSET_PIXCOLOR (Color_cursor)) |
2398 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2422 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2399 | #endif |
2423 | #endif |
2400 | |
2424 | |
2401 | XDrawRectangle (display->display, drawBuffer, gc, |
2425 | XDrawRectangle (dpy, drawBuffer, gc, |
2402 | Col2Pixel (col), |
2426 | Col2Pixel (col), |
2403 | Row2Pixel (oldcursor.row), |
2427 | Row2Pixel (oldcursor.row), |
2404 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2428 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2405 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2429 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2406 | } |
2430 | } |
… | |
… | |
2450 | #if XPM_BACKGROUND |
2474 | #if XPM_BACKGROUND |
2451 | && !bgPixmap.pixmap |
2475 | && !bgPixmap.pixmap |
2452 | #endif |
2476 | #endif |
2453 | ) |
2477 | ) |
2454 | { |
2478 | { |
2455 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2479 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2456 | XClearWindow (display->display, parent[0]); |
2480 | XClearWindow (dpy, parent[0]); |
2457 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2481 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2458 | #if HAVE_SCROLLBARS |
2482 | #if HAVE_SCROLLBARS |
2459 | if (scrollBar.win) |
2483 | if (scrollBar.win) |
2460 | { |
2484 | { |
2461 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2485 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2462 | scrollBar.setIdle (); |
2486 | scrollBar.setIdle (); |
2463 | scrollbar_show (0); |
2487 | scrollbar_show (0); |
2464 | } |
2488 | } |
2465 | #endif |
2489 | #endif |
2466 | } |
2490 | } |
… | |
… | |
2479 | |
2503 | |
2480 | num_scr_allow = 0; |
2504 | num_scr_allow = 0; |
2481 | want_refresh = 1; |
2505 | want_refresh = 1; |
2482 | |
2506 | |
2483 | if (really) |
2507 | if (really) |
2484 | XClearWindow (display->display, vt); |
2508 | XClearWindow (dpy, vt); |
2485 | } |
2509 | } |
2486 | |
2510 | |
2487 | void |
2511 | void |
2488 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2512 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2489 | { |
2513 | { |
… | |
… | |
2538 | { |
2562 | { |
2539 | if (selection.op |
2563 | if (selection.op |
2540 | && current_screen == selection.screen |
2564 | && current_screen == selection.screen |
2541 | && selection.end.row >= view_start) |
2565 | && selection.end.row >= view_start) |
2542 | { |
2566 | { |
2543 | #if ENABLE_FRILLS |
2567 | #if !ENABLE_MINIMAL |
2544 | if (selection.rect) |
2568 | if (selection.rect) |
2545 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2569 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2546 | selection.end.row, selection.end.col, |
2570 | selection.end.row, selection.end.col, |
2547 | RS_RVid, RS_RVid | RS_Uline); |
2571 | RS_RVid, RS_RVid | RS_Uline); |
2548 | else |
2572 | else |
… | |
… | |
2664 | } |
2688 | } |
2665 | |
2689 | |
2666 | unsigned long bytes_after; |
2690 | unsigned long bytes_after; |
2667 | XTextProperty ct; |
2691 | XTextProperty ct; |
2668 | |
2692 | |
2669 | if (XGetWindowProperty (display->display, win, prop, |
2693 | if (XGetWindowProperty (dpy, win, prop, |
2670 | 0, PROP_SIZE / 4, |
2694 | 0, PROP_SIZE / 4, |
2671 | delete_prop, AnyPropertyType, |
2695 | delete_prop, AnyPropertyType, |
2672 | &ct.encoding, &ct.format, |
2696 | &ct.encoding, &ct.format, |
2673 | &ct.nitems, &bytes_after, |
2697 | &ct.nitems, &bytes_after, |
2674 | &ct.value) != Success) |
2698 | &ct.value) != Success) |
… | |
… | |
2683 | if (bytes_after) |
2707 | if (bytes_after) |
2684 | { |
2708 | { |
2685 | // fetch and append remaining data |
2709 | // fetch and append remaining data |
2686 | XTextProperty ct2; |
2710 | XTextProperty ct2; |
2687 | |
2711 | |
2688 | if (XGetWindowProperty (display->display, win, prop, |
2712 | if (XGetWindowProperty (dpy, win, prop, |
2689 | ct.nitems / 4, (bytes_after + 3) / 4, |
2713 | ct.nitems / 4, (bytes_after + 3) / 4, |
2690 | delete_prop, AnyPropertyType, |
2714 | delete_prop, AnyPropertyType, |
2691 | &ct2.encoding, &ct2.format, |
2715 | &ct2.encoding, &ct2.format, |
2692 | &ct2.nitems, &bytes_after, |
2716 | &ct2.nitems, &bytes_after, |
2693 | &ct2.value) != Success) |
2717 | &ct2.value) != Success) |
… | |
… | |
2706 | |
2730 | |
2707 | if (ct.encoding == xa[XA_INCR]) |
2731 | if (ct.encoding == xa[XA_INCR]) |
2708 | { |
2732 | { |
2709 | // INCR selection, start handshake |
2733 | // INCR selection, start handshake |
2710 | if (!delete_prop) |
2734 | if (!delete_prop) |
2711 | XDeleteProperty (display->display, win, prop); |
2735 | XDeleteProperty (dpy, win, prop); |
2712 | |
2736 | |
2713 | selection_wait = Sel_incr; |
2737 | selection_wait = Sel_incr; |
2714 | incr_buf_fill = 0; |
2738 | incr_buf_fill = 0; |
2715 | incr_ev.start (NOW + 10); |
2739 | incr_ev.start (NOW + 10); |
2716 | |
2740 | |
… | |
… | |
2763 | } |
2787 | } |
2764 | |
2788 | |
2765 | char **cl; |
2789 | char **cl; |
2766 | int cr; |
2790 | int cr; |
2767 | |
2791 | |
2768 | #if ENABLE_FRILLS |
2792 | #if !ENABLE_MINIMAL |
2769 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2793 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2770 | // so recode it manually |
2794 | // so recode it manually |
2771 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2795 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2772 | { |
2796 | { |
2773 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2797 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
… | |
… | |
2777 | paste (s, strlen (s)); |
2801 | paste (s, strlen (s)); |
2778 | free (s); |
2802 | free (s); |
2779 | } |
2803 | } |
2780 | else |
2804 | else |
2781 | #endif |
2805 | #endif |
2782 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2806 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
2783 | && cl) |
2807 | && cl) |
2784 | { |
2808 | { |
2785 | for (int i = 0; i < cr; i++) |
2809 | for (int i = 0; i < cr; i++) |
2786 | paste (cl[i], strlen (cl[i])); |
2810 | paste (cl[i], strlen (cl[i])); |
2787 | |
2811 | |
… | |
… | |
2869 | else if (selnum == Sel_Secondary) |
2893 | else if (selnum == Sel_Secondary) |
2870 | sel = XA_SECONDARY; |
2894 | sel = XA_SECONDARY; |
2871 | else |
2895 | else |
2872 | sel = xa[XA_CLIPBOARD]; |
2896 | sel = xa[XA_CLIPBOARD]; |
2873 | |
2897 | |
2874 | if (XGetSelectionOwner (display->display, sel) != None) |
2898 | if (XGetSelectionOwner (dpy, sel) != None) |
2875 | { |
2899 | { |
2876 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2900 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
2877 | vt, selection_request_time); |
2901 | vt, selection_request_time); |
2878 | return 1; |
2902 | return 1; |
2879 | } |
2903 | } |
2880 | |
2904 | |
2881 | return 0; |
2905 | return 0; |
… | |
… | |
2944 | |
2968 | |
2945 | int end_col; |
2969 | int end_col; |
2946 | |
2970 | |
2947 | for (; row <= selection.end.row; row++, col = 0) |
2971 | for (; row <= selection.end.row; row++, col = 0) |
2948 | { |
2972 | { |
2949 | #if ENABLE_FRILLS |
2973 | #if !ENABLE_MINIMAL |
2950 | if (selection.rect) |
2974 | if (selection.rect) |
2951 | { |
2975 | { |
2952 | col = selection.beg.col; |
2976 | col = selection.beg.col; |
2953 | end_col = ncol + 1; |
2977 | end_col = ncol + 1; |
2954 | } |
2978 | } |
… | |
… | |
2957 | end_col = ROW(row).l; |
2981 | end_col = ROW(row).l; |
2958 | |
2982 | |
2959 | col = max (col, 0); |
2983 | col = max (col, 0); |
2960 | |
2984 | |
2961 | if (row == selection.end.row |
2985 | if (row == selection.end.row |
2962 | #if ENABLE_FRILLS |
2986 | #if !ENABLE_MINIMAL |
2963 | || selection.rect |
2987 | || selection.rect |
2964 | #endif |
2988 | #endif |
2965 | ) |
2989 | ) |
2966 | min_it (end_col, selection.end.col); |
2990 | min_it (end_col, selection.end.col); |
2967 | |
2991 | |
… | |
… | |
2990 | #endif |
3014 | #endif |
2991 | else |
3015 | else |
2992 | new_selection_text[ofs++] = *t++; |
3016 | new_selection_text[ofs++] = *t++; |
2993 | } |
3017 | } |
2994 | |
3018 | |
2995 | #if ENABLE_FRILLS |
3019 | #if !ENABLE_MINIMAL |
2996 | if (selection.rect) |
3020 | if (selection.rect) |
2997 | { |
3021 | { |
2998 | while (ofs |
3022 | while (ofs |
2999 | && new_selection_text[ofs - 1] != C0_LF |
3023 | && new_selection_text[ofs - 1] != C0_LF |
3000 | && unicode::is_space (new_selection_text[ofs - 1])) |
3024 | && unicode::is_space (new_selection_text[ofs - 1])) |
… | |
… | |
3034 | bool |
3058 | bool |
3035 | rxvt_term::selection_grab (Time tm) NOTHROW |
3059 | rxvt_term::selection_grab (Time tm) NOTHROW |
3036 | { |
3060 | { |
3037 | selection_time = tm; |
3061 | selection_time = tm; |
3038 | |
3062 | |
3039 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3063 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3040 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3064 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3041 | { |
3065 | { |
3042 | display->set_selection_owner (this); |
3066 | display->set_selection_owner (this); |
3043 | return true; |
3067 | return true; |
3044 | } |
3068 | } |
3045 | else |
3069 | else |
… | |
… | |
3049 | } |
3073 | } |
3050 | |
3074 | |
3051 | #if 0 |
3075 | #if 0 |
3052 | XTextProperty ct; |
3076 | XTextProperty ct; |
3053 | |
3077 | |
3054 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3078 | if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) |
3055 | { |
3079 | { |
3056 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3080 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3057 | XFree (ct.value); |
3081 | XFree (ct.value); |
3058 | } |
3082 | } |
3059 | #endif |
3083 | #endif |
… | |
… | |
3361 | |
3385 | |
3362 | if (selection.clicks == 1) |
3386 | if (selection.clicks == 1) |
3363 | { |
3387 | { |
3364 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3388 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3365 | && !ROW(selection.beg.row).is_longer () |
3389 | && !ROW(selection.beg.row).is_longer () |
3366 | #if ENABLE_FRILLS |
3390 | #if !ENABLE_MINIMAL |
3367 | && !selection.rect |
3391 | && !selection.rect |
3368 | #endif |
3392 | #endif |
3369 | ) |
3393 | ) |
3370 | selection.beg.col = ncol; |
3394 | selection.beg.col = ncol; |
3371 | |
3395 | |
3372 | if ( |
3396 | if ( |
3373 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3397 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3374 | && !ROW(selection.end.row).is_longer () |
3398 | && !ROW(selection.end.row).is_longer () |
3375 | #if ENABLE_FRILLS |
3399 | #if !ENABLE_MINIMAL |
3376 | && !selection.rect |
3400 | && !selection.rect |
3377 | #endif |
3401 | #endif |
3378 | ) |
3402 | ) |
3379 | selection.end.col = ncol; |
3403 | selection.end.col = ncol; |
3380 | } |
3404 | } |
… | |
… | |
3397 | { |
3421 | { |
3398 | if (!ROW(end_row).is_longer ()) |
3422 | if (!ROW(end_row).is_longer ()) |
3399 | { |
3423 | { |
3400 | selection.end.row = end_row; |
3424 | selection.end.row = end_row; |
3401 | selection.end.col = ROW(end_row).l; |
3425 | selection.end.col = ROW(end_row).l; |
|
|
3426 | # if !ENABLE_MINIMAL |
3402 | selection_remove_trailing_spaces (); |
3427 | selection_remove_trailing_spaces (); |
|
|
3428 | # endif |
3403 | break; |
3429 | break; |
3404 | } |
3430 | } |
3405 | } |
3431 | } |
3406 | } |
3432 | } |
3407 | else |
3433 | else |
… | |
… | |
3436 | selection.mark.row = selection.beg.row; |
3462 | selection.mark.row = selection.beg.row; |
3437 | selection.mark.col = selection.beg.col; |
3463 | selection.mark.col = selection.beg.col; |
3438 | } |
3464 | } |
3439 | } |
3465 | } |
3440 | |
3466 | |
3441 | #if ENABLE_FRILLS |
3467 | #if !ENABLE_MINIMAL |
3442 | if (selection.rect && selection.beg.col > selection.end.col) |
3468 | if (selection.rect && selection.beg.col > selection.end.col) |
3443 | ::swap (selection.beg.col, selection.end.col); |
3469 | ::swap (selection.beg.col, selection.end.col); |
3444 | #endif |
3470 | #endif |
3445 | } |
3471 | } |
3446 | |
3472 | |
3447 | #if ENABLE_FRILLS |
3473 | #if !ENABLE_MINIMAL |
3448 | void |
3474 | void |
3449 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3475 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3450 | { |
3476 | { |
3451 | int32_t end_col, end_row; |
3477 | int32_t end_col, end_row; |
3452 | text_t *stp; |
3478 | text_t *stp; |
… | |
… | |
3507 | */ |
3533 | */ |
3508 | void |
3534 | void |
3509 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3535 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3510 | { |
3536 | { |
3511 | XSelectionEvent ev; |
3537 | XSelectionEvent ev; |
3512 | dDisp; |
|
|
3513 | |
3538 | |
3514 | ev.type = SelectionNotify; |
3539 | ev.type = SelectionNotify; |
3515 | ev.property = None; |
3540 | ev.property = None; |
3516 | ev.display = rq.display; |
3541 | ev.display = rq.display; |
3517 | ev.requestor = rq.requestor; |
3542 | ev.requestor = rq.requestor; |
… | |
… | |
3531 | *target++ = xa[XA_COMPOUND_TEXT]; |
3556 | *target++ = xa[XA_COMPOUND_TEXT]; |
3532 | #if X_HAVE_UTF8_STRING |
3557 | #if X_HAVE_UTF8_STRING |
3533 | *target++ = xa[XA_UTF8_STRING]; |
3558 | *target++ = xa[XA_UTF8_STRING]; |
3534 | #endif |
3559 | #endif |
3535 | |
3560 | |
3536 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3561 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3537 | 32, PropModeReplace, |
3562 | 32, PropModeReplace, |
3538 | (unsigned char *)target_list, target - target_list); |
3563 | (unsigned char *)target_list, target - target_list); |
3539 | ev.property = rq.property; |
3564 | ev.property = rq.property; |
3540 | } |
3565 | } |
3541 | #if TODO // TODO |
3566 | #if TODO // TODO |
… | |
… | |
3544 | /* TODO: Handle MULTIPLE */ |
3569 | /* TODO: Handle MULTIPLE */ |
3545 | } |
3570 | } |
3546 | #endif |
3571 | #endif |
3547 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3572 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3548 | { |
3573 | { |
3549 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3574 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3550 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3575 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3551 | ev.property = rq.property; |
3576 | ev.property = rq.property; |
3552 | } |
3577 | } |
3553 | else if (rq.target == XA_STRING |
3578 | else if (rq.target == XA_STRING |
3554 | || rq.target == xa[XA_TEXT] |
3579 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3578 | style = enc_string; |
3603 | style = enc_string; |
3579 | else if (target == xa[XA_TEXT]) |
3604 | else if (target == xa[XA_TEXT]) |
3580 | style = enc_text; |
3605 | style = enc_text; |
3581 | else if (target == xa[XA_COMPOUND_TEXT]) |
3606 | else if (target == xa[XA_COMPOUND_TEXT]) |
3582 | style = enc_compound_text; |
3607 | style = enc_compound_text; |
3583 | #if ENABLE_FRILLS |
3608 | #if !ENABLE_MINIMAL |
3584 | else if (target == xa[XA_UTF8_STRING]) |
3609 | else if (target == xa[XA_UTF8_STRING]) |
3585 | style = enc_utf8; |
3610 | style = enc_utf8; |
3586 | #endif |
3611 | #endif |
3587 | else |
3612 | else |
3588 | { |
3613 | { |
… | |
… | |
3599 | { |
3624 | { |
3600 | cl = L""; |
3625 | cl = L""; |
3601 | selectlen = 0; |
3626 | selectlen = 0; |
3602 | } |
3627 | } |
3603 | |
3628 | |
3604 | #if ENABLE_FRILLS |
3629 | #if !ENABLE_MINIMAL |
3605 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3630 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3606 | // so recode it manually |
3631 | // so recode it manually |
3607 | if (style == enc_utf8) |
3632 | if (style == enc_utf8) |
3608 | { |
3633 | { |
3609 | freect = 1; |
3634 | freect = 1; |
… | |
… | |
3612 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3637 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3613 | ct.nitems = strlen ((char *)ct.value); |
3638 | ct.nitems = strlen ((char *)ct.value); |
3614 | } |
3639 | } |
3615 | else |
3640 | else |
3616 | #endif |
3641 | #endif |
3617 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3642 | if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3618 | freect = 1; |
3643 | freect = 1; |
3619 | else |
3644 | else |
3620 | { |
3645 | { |
3621 | /* if we failed to convert then send it raw */ |
3646 | /* if we failed to convert then send it raw */ |
3622 | ct.value = (unsigned char *)cl; |
3647 | ct.value = (unsigned char *)cl; |
3623 | ct.nitems = selectlen; |
3648 | ct.nitems = selectlen; |
3624 | ct.encoding = target; |
3649 | ct.encoding = target; |
3625 | } |
3650 | } |
3626 | |
3651 | |
3627 | XChangeProperty (disp, rq.requestor, rq.property, |
3652 | XChangeProperty (dpy, rq.requestor, rq.property, |
3628 | ct.encoding, 8, PropModeReplace, |
3653 | ct.encoding, 8, PropModeReplace, |
3629 | ct.value, (int)ct.nitems); |
3654 | ct.value, (int)ct.nitems); |
3630 | ev.property = rq.property; |
3655 | ev.property = rq.property; |
3631 | |
3656 | |
3632 | if (freect) |
3657 | if (freect) |
3633 | XFree (ct.value); |
3658 | XFree (ct.value); |
3634 | } |
3659 | } |
3635 | |
3660 | |
3636 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3661 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3637 | } |
3662 | } |
3638 | |
3663 | |
3639 | /* ------------------------------------------------------------------------- * |
3664 | /* ------------------------------------------------------------------------- * |
3640 | * MOUSE ROUTINES * |
3665 | * MOUSE ROUTINES * |
3641 | * ------------------------------------------------------------------------- */ |
3666 | * ------------------------------------------------------------------------- */ |
… | |
… | |
3657 | void |
3682 | void |
3658 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3683 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3659 | { |
3684 | { |
3660 | XWindowAttributes xwa; |
3685 | XWindowAttributes xwa; |
3661 | |
3686 | |
3662 | XGetWindowAttributes (display->display, vt, &xwa); |
3687 | XGetWindowAttributes (dpy, vt, &xwa); |
3663 | |
3688 | |
3664 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3689 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3665 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3690 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3666 | } |
3691 | } |
3667 | #endif |
3692 | #endif |
… | |
… | |
3763 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3788 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3764 | { |
3789 | { |
3765 | while (*s) |
3790 | while (*s) |
3766 | { |
3791 | { |
3767 | text_t t = *s++; |
3792 | text_t t = *s++; |
3768 | int width = wcwidth (t); |
3793 | int width = WCWIDTH (t); |
3769 | |
3794 | |
3770 | while (width--) |
3795 | while (width--) |
3771 | { |
3796 | { |
3772 | scr_overlay_set (x++, y, t); |
3797 | scr_overlay_set (x++, y, t); |
3773 | t = NOCHAR; |
3798 | t = NOCHAR; |