1 | /*--------------------------------*-C-*--------------------------------------* |
1 | /*---------------------------------------------------------------------------* |
2 | * File: screen.C |
2 | * File: screen.C |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
… | |
… | |
93 | */ |
93 | */ |
94 | #define drawBuffer vt |
94 | #define drawBuffer vt |
95 | |
95 | |
96 | #define CLEAR_ROWS(row, num) \ |
96 | #define CLEAR_ROWS(row, num) \ |
97 | if (mapped) \ |
97 | if (mapped) \ |
98 | XClearArea (xdisp, drawBuffer, 0, \ |
98 | XClearArea (dpy, drawBuffer, 0, \ |
99 | Row2Pixel (row), (unsigned int)width, \ |
99 | Row2Pixel (row), (unsigned int)width, \ |
100 | (unsigned int)Height2Pixel (num), False) |
100 | (unsigned int)Height2Pixel (num), False) |
101 | |
101 | |
102 | #define CLEAR_CHARS(x, y, num) \ |
102 | #define CLEAR_CHARS(x, y, num) \ |
103 | if (mapped) \ |
103 | if (mapped) \ |
104 | XClearArea (xdisp, drawBuffer, x, y, \ |
104 | XClearArea (dpy, drawBuffer, x, y, \ |
105 | (unsigned int)Width2Pixel (num), \ |
105 | (unsigned int)Width2Pixel (num), \ |
106 | (unsigned int)Height2Pixel (1), False) |
106 | (unsigned int)Height2Pixel (1), False) |
107 | |
107 | |
108 | #define ERASE_ROWS(row, num) \ |
108 | #define ERASE_ROWS(row, num) \ |
109 | XFillRectangle (xdisp, drawBuffer, gc, \ |
109 | XFillRectangle (dpy, drawBuffer, gc, \ |
110 | 0, Row2Pixel (row), \ |
110 | 0, Row2Pixel (row), \ |
111 | (unsigned int)width, \ |
111 | (unsigned int)width, \ |
112 | (unsigned int)Height2Pixel (num)) |
112 | (unsigned int)Height2Pixel (num)) |
113 | |
113 | |
114 | /* ------------------------------------------------------------------------- * |
114 | /* ------------------------------------------------------------------------- * |
… | |
… | |
645 | { |
645 | { |
646 | line_t &l = ROW(nrow - 1 - i); |
646 | line_t &l = ROW(nrow - 1 - i); |
647 | |
647 | |
648 | // optimize if already cleared, can be significant on slow machines |
648 | // optimize if already cleared, can be significant on slow machines |
649 | // could be rolled into scr_blank_screen_mem |
649 | // could be rolled into scr_blank_screen_mem |
650 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask)) |
650 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
651 | { |
651 | { |
652 | scr_blank_line (l, 0, l.l, rstyle); |
652 | scr_blank_line (l, 0, l.l, rstyle); |
653 | l.l = 0; |
653 | l.l = 0; |
654 | l.f = 0; |
654 | l.f = 0; |
655 | } |
655 | } |
… | |
… | |
1114 | * Process DEC Back Index |
1114 | * Process DEC Back Index |
1115 | * XTERM_SEQ: ESC 6 |
1115 | * XTERM_SEQ: ESC 6 |
1116 | * 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 |
1117 | * in that row right. Clear left column. |
1117 | * in that row right. Clear left column. |
1118 | */ |
1118 | */ |
1119 | #if ENABLE_FRILLS |
1119 | #if !ENABLE_MINIMAL |
1120 | void |
1120 | void |
1121 | rxvt_term::scr_backindex () NOTHROW |
1121 | rxvt_term::scr_backindex () NOTHROW |
1122 | { |
1122 | { |
1123 | if (screen.cur.col > 0) |
1123 | if (screen.cur.col > 0) |
1124 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1124 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1131 | * Process DEC Forward Index |
1131 | * Process DEC Forward Index |
1132 | * XTERM_SEQ: ESC 9 |
1132 | * XTERM_SEQ: ESC 9 |
1133 | * 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 |
1134 | * in that row left. Clear right column. |
1134 | * in that row left. Clear right column. |
1135 | */ |
1135 | */ |
1136 | #if ENABLE_FRILLS |
1136 | #if !ENABLE_MINIMAL |
1137 | void |
1137 | void |
1138 | rxvt_term::scr_forwardindex () NOTHROW |
1138 | rxvt_term::scr_forwardindex () NOTHROW |
1139 | { |
1139 | { |
1140 | if (screen.cur.col < ncol - 1) |
1140 | if (screen.cur.col < ncol - 1) |
1141 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1141 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1342 | } |
1342 | } |
1343 | else |
1343 | else |
1344 | { |
1344 | { |
1345 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1345 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1346 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1346 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1347 | XChangeGC (xdisp, gc, GCForeground, &gcvalue); |
1347 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1348 | ERASE_ROWS (row, num); |
1348 | ERASE_ROWS (row, num); |
1349 | gcvalue.foreground = pix_colors[Color_fg]; |
1349 | gcvalue.foreground = pix_colors[Color_fg]; |
1350 | XChangeGC (xdisp, gc, GCForeground, &gcvalue); |
1350 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1351 | } |
1351 | } |
1352 | |
1352 | |
1353 | for (; num--; row++) |
1353 | for (; num--; row++) |
1354 | { |
1354 | { |
1355 | scr_blank_screen_mem (ROW(row), rstyle); |
1355 | scr_blank_screen_mem (ROW(row), rstyle); |
1356 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1356 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1357 | } |
1357 | } |
1358 | } |
1358 | } |
1359 | |
1359 | |
1360 | #if ENABLE_FRILLS |
1360 | #if !ENABLE_MINIMAL |
1361 | void |
1361 | void |
1362 | rxvt_term::scr_erase_savelines () NOTHROW |
1362 | rxvt_term::scr_erase_savelines () NOTHROW |
1363 | { |
1363 | { |
1364 | want_refresh = 1; |
1364 | want_refresh = 1; |
1365 | ZERO_SCROLLBACK (); |
1365 | ZERO_SCROLLBACK (); |
… | |
… | |
1654 | if (bgPixmap.pixmap == None) |
1654 | if (bgPixmap.pixmap == None) |
1655 | #endif |
1655 | #endif |
1656 | #if TRANSPARENT |
1656 | #if TRANSPARENT |
1657 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
1657 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
1658 | #endif |
1658 | #endif |
1659 | XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); |
1659 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1660 | |
1660 | |
1661 | XGCValues gcvalue; |
1661 | XGCValues gcvalue; |
1662 | gcvalue.foreground = pix_colors[Color_fg]; |
1662 | gcvalue.foreground = pix_colors[Color_fg]; |
1663 | gcvalue.background = pix_colors[Color_bg]; |
1663 | gcvalue.background = pix_colors[Color_bg]; |
1664 | XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); |
1664 | XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue); |
1665 | |
1665 | |
1666 | scr_clear (); |
1666 | scr_clear (); |
1667 | scr_touch (true); |
1667 | scr_touch (true); |
1668 | } |
1668 | } |
1669 | } |
1669 | } |
… | |
… | |
1888 | |
1888 | |
1889 | # ifndef NO_MAPALERT |
1889 | # ifndef NO_MAPALERT |
1890 | # ifdef MAPALERT_OPTION |
1890 | # ifdef MAPALERT_OPTION |
1891 | if (OPTION (Opt_mapAlert)) |
1891 | if (OPTION (Opt_mapAlert)) |
1892 | # endif |
1892 | # endif |
1893 | XMapWindow (xdisp, parent[0]); |
1893 | XMapWindow (dpy, parent[0]); |
1894 | # endif |
1894 | # endif |
1895 | |
1895 | |
1896 | if (OPTION (Opt_visualBell)) |
1896 | if (OPTION (Opt_visualBell)) |
1897 | { |
1897 | { |
1898 | rvideo_bell = true; |
1898 | rvideo_bell = true; |
… | |
… | |
1900 | display->flush (); |
1900 | display->flush (); |
1901 | |
1901 | |
1902 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1902 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1903 | } |
1903 | } |
1904 | else |
1904 | else |
1905 | XBell (xdisp, 0); |
1905 | XBell (dpy, 0); |
1906 | |
1906 | |
1907 | #endif |
1907 | #endif |
1908 | } |
1908 | } |
1909 | |
1909 | |
1910 | /* ------------------------------------------------------------------------- */ |
1910 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1969 | * screen.text/screen.rend contain what the screen will change to. |
1969 | * screen.text/screen.rend contain what the screen will change to. |
1970 | */ |
1970 | */ |
1971 | void |
1971 | void |
1972 | rxvt_term::scr_refresh () NOTHROW |
1972 | rxvt_term::scr_refresh () NOTHROW |
1973 | { |
1973 | { |
1974 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1974 | unsigned char have_bg, |
1975 | showcursor; /* show the cursor */ |
1975 | showcursor; /* show the cursor */ |
1976 | int16_t col, row, /* column/row we're processing */ |
1976 | int16_t col, row, /* column/row we're processing */ |
1977 | ocrow; /* old cursor row */ |
1977 | ocrow; /* old cursor row */ |
1978 | int i; /* tmp */ |
1978 | int i; /* tmp */ |
1979 | #ifndef NO_CURSORCOLOR |
1979 | #ifndef NO_CURSORCOLOR |
… | |
… | |
1987 | return; |
1987 | return; |
1988 | |
1988 | |
1989 | /* |
1989 | /* |
1990 | * A: set up vars |
1990 | * A: set up vars |
1991 | */ |
1991 | */ |
1992 | must_clear = 0; |
1992 | have_bg = 0; |
1993 | refresh_count = 0; |
1993 | refresh_count = 0; |
1994 | |
1994 | |
1995 | #if XPM_BACKGROUND |
1995 | #if XPM_BACKGROUND |
1996 | must_clear |= bgPixmap.pixmap != None; |
1996 | have_bg |= bgPixmap.pixmap != None; |
1997 | #endif |
1997 | #endif |
1998 | #if TRANSPARENT |
1998 | #if TRANSPARENT |
1999 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
1999 | have_bg |= OPTION (Opt_transparent) && am_transparent; |
2000 | #endif |
2000 | #endif |
2001 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2001 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2002 | |
2002 | |
2003 | /* |
2003 | /* |
2004 | * B: reverse any characters which are selected |
2004 | * B: reverse any characters which are selected |
… | |
… | |
2103 | * D: CopyArea pass - very useful for slower links |
2103 | * D: CopyArea pass - very useful for slower links |
2104 | * This has been deliberately kept simple. |
2104 | * This has been deliberately kept simple. |
2105 | */ |
2105 | */ |
2106 | if (!display->is_local |
2106 | if (!display->is_local |
2107 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2107 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2108 | && abs (num_scr) < nrow && !must_clear) |
2108 | && abs (num_scr) < nrow && !have_bg) |
2109 | { |
2109 | { |
2110 | int16_t nits; |
2110 | int16_t nits; |
|
|
2111 | int i = num_scr; |
2111 | int j; |
2112 | int j; |
2112 | int len, wlen; |
2113 | int len, wlen; |
2113 | dLocal (int, num_scr); |
2114 | dLocal (int, num_scr); |
2114 | |
2115 | |
2115 | j = nrow; |
2116 | j = nrow; |
2116 | wlen = len = -1; |
2117 | wlen = len = -1; |
2117 | row = i > 0 ? 0 : j - 1; |
2118 | row = i > 0 ? 0 : j - 1; |
|
|
2119 | |
2118 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2120 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2119 | { |
2121 | { |
2120 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2122 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2121 | { |
2123 | { |
2122 | line_t s = ROW(view_start + row); |
2124 | line_t s = ROW(view_start + row); |
… | |
… | |
2143 | wlen = row; |
2145 | wlen = row; |
2144 | continue; |
2146 | continue; |
2145 | } |
2147 | } |
2146 | } |
2148 | } |
2147 | |
2149 | |
2148 | if (len != -1) |
2150 | if (len >= 0) |
2149 | { |
2151 | { |
2150 | /* also comes here at end if needed because of >= above */ |
2152 | /* also comes here at end if needed because of >= above */ |
2151 | if (wlen < len) |
2153 | if (wlen < len) |
2152 | ::swap (wlen, len); |
2154 | ::swap (wlen, len); |
2153 | |
2155 | |
|
|
2156 | XGCValues gcv; |
|
|
2157 | |
|
|
2158 | gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
2154 | XCopyArea (xdisp, vt, vt, |
2159 | XCopyArea (dpy, vt, vt, |
2155 | gc, 0, Row2Pixel (len + i), |
2160 | gc, 0, Row2Pixel (len + i), |
2156 | (unsigned int)this->width, |
2161 | (unsigned int)this->width, |
2157 | (unsigned int)Height2Pixel (wlen - len + 1), |
2162 | (unsigned int)Height2Pixel (wlen - len + 1), |
2158 | 0, Row2Pixel (len)); |
2163 | 0, Row2Pixel (len)); |
|
|
2164 | gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
|
|
2165 | |
2159 | len = -1; |
2166 | len = -1; |
2160 | } |
2167 | } |
2161 | } |
2168 | } |
2162 | } |
2169 | } |
2163 | #endif |
2170 | #endif |
… | |
… | |
2219 | count++; |
2226 | count++; |
2220 | |
2227 | |
2221 | if (stp[col] != dtp[col] |
2228 | if (stp[col] != dtp[col] |
2222 | || !RS_SAME (srp[col], drp[col])) |
2229 | || !RS_SAME (srp[col], drp[col])) |
2223 | { |
2230 | { |
2224 | if (must_clear && (i++ > count / 2)) |
2231 | if (have_bg && (i++ > count / 2)) |
2225 | break; |
2232 | break; |
2226 | |
2233 | |
2227 | dtp[col] = stp[col]; |
2234 | dtp[col] = stp[col]; |
2228 | drp[col] = rend; |
2235 | drp[col] = rend; |
2229 | i = 0; |
2236 | i = 0; |
2230 | } |
2237 | } |
2231 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2238 | else if (have_bg || (stp[col] != ' ' && ++i >= 16)) |
2232 | break; |
2239 | break; |
2233 | } |
2240 | } |
2234 | |
2241 | |
2235 | col--; /* went one too far. move back */ |
2242 | col--; /* went one too far. move back */ |
2236 | count -= i; /* dump any matching trailing chars */ |
2243 | count -= i; /* dump any matching trailing chars */ |
… | |
… | |
2246 | int back = bgcolor_of (rend); // desired background |
2253 | int back = bgcolor_of (rend); // desired background |
2247 | |
2254 | |
2248 | // 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 |
2249 | 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)) |
2250 | { |
2257 | { |
2251 | #if ENABLE_STYLES |
|
|
2252 | // "careful" (too wide) character handling |
|
|
2253 | |
|
|
2254 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2255 | while (text > stp |
|
|
2256 | && srp[text - stp - 1] & RS_Careful |
|
|
2257 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2258 | text--, count++, xpixel -= fwidth; |
|
|
2259 | |
|
|
2260 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2261 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2262 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2263 | |
|
|
2264 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2265 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2266 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2267 | #endif |
|
|
2268 | |
|
|
2269 | bool invert = rend & RS_RVid; |
2258 | bool invert = rend & RS_RVid; |
2270 | |
2259 | |
2271 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2260 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2272 | if (rend & RS_Bold |
2261 | if (rend & RS_Bold |
2273 | && fore == Color_fg) |
2262 | && fore == Color_fg) |
… | |
… | |
2289 | else |
2278 | else |
2290 | invert = !invert; |
2279 | invert = !invert; |
2291 | # endif |
2280 | # endif |
2292 | } |
2281 | } |
2293 | |
2282 | |
2294 | if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) |
2283 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2295 | fore = Color_UL; |
2284 | fore = Color_UL; |
2296 | #endif |
2285 | #endif |
2297 | |
2286 | |
2298 | if (invert) |
2287 | if (invert) |
2299 | { |
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 */ |
2300 | ::swap (fore, back); |
2295 | ::swap (fore, back); |
|
|
2296 | #ifdef OPTION_HC |
|
|
2297 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2298 | back = Color_HC; |
|
|
2299 | #endif |
2301 | |
2300 | |
2302 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2301 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2302 | # ifndef OPTION_HC |
2303 | if (ISSET_PIXCOLOR (Color_RV)) |
2303 | if (ISSET_PIXCOLOR (Color_RV)) |
2304 | back = Color_RV; |
2304 | back = Color_RV; |
2305 | |
2305 | # endif |
2306 | if (fore == back) |
2306 | if (fore == back) |
2307 | { |
2307 | { |
2308 | fore = Color_bg; |
2308 | fore = Color_bg; |
2309 | back = Color_fg; |
2309 | back = Color_fg; |
2310 | } |
2310 | } |
… | |
… | |
2321 | } |
2321 | } |
2322 | else if (hidden_text) |
2322 | else if (hidden_text) |
2323 | fore = back; |
2323 | fore = back; |
2324 | } |
2324 | } |
2325 | #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 |
2326 | } |
2344 | } |
2327 | |
2345 | |
2328 | /* |
2346 | /* |
2329 | * Actually do the drawing of the string here |
2347 | * Actually do the drawing of the string here |
2330 | */ |
2348 | */ |
2331 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2349 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2332 | |
2350 | |
2333 | if (back == fore) |
2351 | if (back == fore) |
2334 | font->clear_rect (*drawable, xpixel, ypixel, |
2352 | font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back); |
2335 | fwidth * count, fheight, |
|
|
2336 | back); |
|
|
2337 | else if (back == Color_bg) |
2353 | else if (back == Color_bg && have_bg) |
2338 | { |
2354 | { |
2339 | if (must_clear) |
2355 | // this is very ugly, maybe push it into ->draw? |
2340 | { |
|
|
2341 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2342 | |
2356 | |
2343 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2357 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2344 | if (text[i] != ' ') |
2358 | if (text[i] != ' ') |
2345 | { |
2359 | { |
2346 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2360 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2347 | break; |
2361 | goto did_clear; |
2348 | } |
|
|
2349 | } |
2362 | } |
2350 | else |
2363 | |
2351 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2364 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2365 | did_clear: ; |
2352 | } |
2366 | } |
2353 | else |
2367 | else |
2354 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2368 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2355 | |
2369 | |
2356 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2370 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2357 | { |
2371 | { |
2358 | #if ENABLE_FRILLS |
2372 | #if ENABLE_FRILLS |
2359 | if (ISSET_PIXCOLOR (Color_underline)) |
2373 | if (ISSET_PIXCOLOR (Color_underline)) |
2360 | XSetForeground (xdisp, gc, pix_colors[Color_underline]); |
2374 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2361 | else |
2375 | else |
2362 | #endif |
2376 | #endif |
2363 | XSetForeground (xdisp, gc, pix_colors[fore]); |
2377 | XSetForeground (dpy, gc, pix_colors[fore]); |
2364 | |
2378 | |
2365 | XDrawLine (xdisp, drawBuffer, gc, |
2379 | XDrawLine (dpy, drawBuffer, gc, |
2366 | xpixel, ypixel + font->ascent + 1, |
2380 | xpixel, ypixel + font->ascent + 1, |
2367 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2381 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2368 | } |
2382 | } |
2369 | } /* for (col....) */ |
2383 | } /* for (col....) */ |
2370 | } /* for (row....) */ |
2384 | } /* for (row....) */ |
… | |
… | |
2403 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2417 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2404 | cursorwidth++; |
2418 | cursorwidth++; |
2405 | |
2419 | |
2406 | #ifndef NO_CURSORCOLOR |
2420 | #ifndef NO_CURSORCOLOR |
2407 | if (ISSET_PIXCOLOR (Color_cursor)) |
2421 | if (ISSET_PIXCOLOR (Color_cursor)) |
2408 | XSetForeground (xdisp, gc, pix_colors[Color_cursor]); |
2422 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2409 | #endif |
2423 | #endif |
2410 | |
2424 | |
2411 | XDrawRectangle (xdisp, drawBuffer, gc, |
2425 | XDrawRectangle (dpy, drawBuffer, gc, |
2412 | Col2Pixel (col), |
2426 | Col2Pixel (col), |
2413 | Row2Pixel (oldcursor.row), |
2427 | Row2Pixel (oldcursor.row), |
2414 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2428 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2415 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2429 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2416 | } |
2430 | } |
… | |
… | |
2460 | #if XPM_BACKGROUND |
2474 | #if XPM_BACKGROUND |
2461 | && !bgPixmap.pixmap |
2475 | && !bgPixmap.pixmap |
2462 | #endif |
2476 | #endif |
2463 | ) |
2477 | ) |
2464 | { |
2478 | { |
2465 | XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); |
2479 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2466 | XClearWindow (xdisp, parent[0]); |
2480 | XClearWindow (dpy, parent[0]); |
2467 | XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); |
2481 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2468 | #if HAVE_SCROLLBARS |
2482 | #if HAVE_SCROLLBARS |
2469 | if (scrollBar.win) |
2483 | if (scrollBar.win) |
2470 | { |
2484 | { |
2471 | XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); |
2485 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2472 | scrollBar.setIdle (); |
2486 | scrollBar.setIdle (); |
2473 | scrollbar_show (0); |
2487 | scrollbar_show (0); |
2474 | } |
2488 | } |
2475 | #endif |
2489 | #endif |
2476 | } |
2490 | } |
… | |
… | |
2489 | |
2503 | |
2490 | num_scr_allow = 0; |
2504 | num_scr_allow = 0; |
2491 | want_refresh = 1; |
2505 | want_refresh = 1; |
2492 | |
2506 | |
2493 | if (really) |
2507 | if (really) |
2494 | XClearWindow (xdisp, vt); |
2508 | XClearWindow (dpy, vt); |
2495 | } |
2509 | } |
2496 | |
2510 | |
2497 | void |
2511 | void |
2498 | 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 |
2499 | { |
2513 | { |
… | |
… | |
2548 | { |
2562 | { |
2549 | if (selection.op |
2563 | if (selection.op |
2550 | && current_screen == selection.screen |
2564 | && current_screen == selection.screen |
2551 | && selection.end.row >= view_start) |
2565 | && selection.end.row >= view_start) |
2552 | { |
2566 | { |
2553 | #if ENABLE_FRILLS |
2567 | #if !ENABLE_MINIMAL |
2554 | if (selection.rect) |
2568 | if (selection.rect) |
2555 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2569 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2556 | selection.end.row, selection.end.col, |
2570 | selection.end.row, selection.end.col, |
2557 | RS_RVid, RS_RVid | RS_Uline); |
2571 | RS_RVid, RS_RVid | RS_Uline); |
2558 | else |
2572 | else |
… | |
… | |
2674 | } |
2688 | } |
2675 | |
2689 | |
2676 | unsigned long bytes_after; |
2690 | unsigned long bytes_after; |
2677 | XTextProperty ct; |
2691 | XTextProperty ct; |
2678 | |
2692 | |
2679 | if (XGetWindowProperty (xdisp, win, prop, |
2693 | if (XGetWindowProperty (dpy, win, prop, |
2680 | 0, PROP_SIZE / 4, |
2694 | 0, PROP_SIZE / 4, |
2681 | delete_prop, AnyPropertyType, |
2695 | delete_prop, AnyPropertyType, |
2682 | &ct.encoding, &ct.format, |
2696 | &ct.encoding, &ct.format, |
2683 | &ct.nitems, &bytes_after, |
2697 | &ct.nitems, &bytes_after, |
2684 | &ct.value) != Success) |
2698 | &ct.value) != Success) |
… | |
… | |
2693 | if (bytes_after) |
2707 | if (bytes_after) |
2694 | { |
2708 | { |
2695 | // fetch and append remaining data |
2709 | // fetch and append remaining data |
2696 | XTextProperty ct2; |
2710 | XTextProperty ct2; |
2697 | |
2711 | |
2698 | if (XGetWindowProperty (xdisp, win, prop, |
2712 | if (XGetWindowProperty (dpy, win, prop, |
2699 | ct.nitems / 4, (bytes_after + 3) / 4, |
2713 | ct.nitems / 4, (bytes_after + 3) / 4, |
2700 | delete_prop, AnyPropertyType, |
2714 | delete_prop, AnyPropertyType, |
2701 | &ct2.encoding, &ct2.format, |
2715 | &ct2.encoding, &ct2.format, |
2702 | &ct2.nitems, &bytes_after, |
2716 | &ct2.nitems, &bytes_after, |
2703 | &ct2.value) != Success) |
2717 | &ct2.value) != Success) |
… | |
… | |
2716 | |
2730 | |
2717 | if (ct.encoding == xa[XA_INCR]) |
2731 | if (ct.encoding == xa[XA_INCR]) |
2718 | { |
2732 | { |
2719 | // INCR selection, start handshake |
2733 | // INCR selection, start handshake |
2720 | if (!delete_prop) |
2734 | if (!delete_prop) |
2721 | XDeleteProperty (xdisp, win, prop); |
2735 | XDeleteProperty (dpy, win, prop); |
2722 | |
2736 | |
2723 | selection_wait = Sel_incr; |
2737 | selection_wait = Sel_incr; |
2724 | incr_buf_fill = 0; |
2738 | incr_buf_fill = 0; |
2725 | incr_ev.start (NOW + 10); |
2739 | incr_ev.start (NOW + 10); |
2726 | |
2740 | |
… | |
… | |
2773 | } |
2787 | } |
2774 | |
2788 | |
2775 | char **cl; |
2789 | char **cl; |
2776 | int cr; |
2790 | int cr; |
2777 | |
2791 | |
2778 | #if ENABLE_FRILLS |
2792 | #if !ENABLE_MINIMAL |
2779 | // 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 |
2780 | // so recode it manually |
2794 | // so recode it manually |
2781 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2795 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2782 | { |
2796 | { |
2783 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2797 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
… | |
… | |
2787 | paste (s, strlen (s)); |
2801 | paste (s, strlen (s)); |
2788 | free (s); |
2802 | free (s); |
2789 | } |
2803 | } |
2790 | else |
2804 | else |
2791 | #endif |
2805 | #endif |
2792 | if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 |
2806 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
2793 | && cl) |
2807 | && cl) |
2794 | { |
2808 | { |
2795 | for (int i = 0; i < cr; i++) |
2809 | for (int i = 0; i < cr; i++) |
2796 | paste (cl[i], strlen (cl[i])); |
2810 | paste (cl[i], strlen (cl[i])); |
2797 | |
2811 | |
… | |
… | |
2879 | else if (selnum == Sel_Secondary) |
2893 | else if (selnum == Sel_Secondary) |
2880 | sel = XA_SECONDARY; |
2894 | sel = XA_SECONDARY; |
2881 | else |
2895 | else |
2882 | sel = xa[XA_CLIPBOARD]; |
2896 | sel = xa[XA_CLIPBOARD]; |
2883 | |
2897 | |
2884 | if (XGetSelectionOwner (xdisp, sel) != None) |
2898 | if (XGetSelectionOwner (dpy, sel) != None) |
2885 | { |
2899 | { |
2886 | XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], |
2900 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
2887 | vt, selection_request_time); |
2901 | vt, selection_request_time); |
2888 | return 1; |
2902 | return 1; |
2889 | } |
2903 | } |
2890 | |
2904 | |
2891 | return 0; |
2905 | return 0; |
… | |
… | |
2954 | |
2968 | |
2955 | int end_col; |
2969 | int end_col; |
2956 | |
2970 | |
2957 | for (; row <= selection.end.row; row++, col = 0) |
2971 | for (; row <= selection.end.row; row++, col = 0) |
2958 | { |
2972 | { |
2959 | #if ENABLE_FRILLS |
2973 | #if !ENABLE_MINIMAL |
2960 | if (selection.rect) |
2974 | if (selection.rect) |
2961 | { |
2975 | { |
2962 | col = selection.beg.col; |
2976 | col = selection.beg.col; |
2963 | end_col = ncol + 1; |
2977 | end_col = ncol + 1; |
2964 | } |
2978 | } |
… | |
… | |
2967 | end_col = ROW(row).l; |
2981 | end_col = ROW(row).l; |
2968 | |
2982 | |
2969 | col = max (col, 0); |
2983 | col = max (col, 0); |
2970 | |
2984 | |
2971 | if (row == selection.end.row |
2985 | if (row == selection.end.row |
2972 | #if ENABLE_FRILLS |
2986 | #if !ENABLE_MINIMAL |
2973 | || selection.rect |
2987 | || selection.rect |
2974 | #endif |
2988 | #endif |
2975 | ) |
2989 | ) |
2976 | min_it (end_col, selection.end.col); |
2990 | min_it (end_col, selection.end.col); |
2977 | |
2991 | |
… | |
… | |
3000 | #endif |
3014 | #endif |
3001 | else |
3015 | else |
3002 | new_selection_text[ofs++] = *t++; |
3016 | new_selection_text[ofs++] = *t++; |
3003 | } |
3017 | } |
3004 | |
3018 | |
3005 | #if ENABLE_FRILLS |
3019 | #if !ENABLE_MINIMAL |
3006 | if (selection.rect) |
3020 | if (selection.rect) |
3007 | { |
3021 | { |
3008 | while (ofs |
3022 | while (ofs |
3009 | && new_selection_text[ofs - 1] != C0_LF |
3023 | && new_selection_text[ofs - 1] != C0_LF |
3010 | && unicode::is_space (new_selection_text[ofs - 1])) |
3024 | && unicode::is_space (new_selection_text[ofs - 1])) |
… | |
… | |
3044 | bool |
3058 | bool |
3045 | rxvt_term::selection_grab (Time tm) NOTHROW |
3059 | rxvt_term::selection_grab (Time tm) NOTHROW |
3046 | { |
3060 | { |
3047 | selection_time = tm; |
3061 | selection_time = tm; |
3048 | |
3062 | |
3049 | XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); |
3063 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3050 | if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) |
3064 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3051 | { |
3065 | { |
3052 | display->set_selection_owner (this); |
3066 | display->set_selection_owner (this); |
3053 | return true; |
3067 | return true; |
3054 | } |
3068 | } |
3055 | else |
3069 | else |
… | |
… | |
3059 | } |
3073 | } |
3060 | |
3074 | |
3061 | #if 0 |
3075 | #if 0 |
3062 | XTextProperty ct; |
3076 | XTextProperty ct; |
3063 | |
3077 | |
3064 | if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) |
3078 | if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) |
3065 | { |
3079 | { |
3066 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3080 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3067 | XFree (ct.value); |
3081 | XFree (ct.value); |
3068 | } |
3082 | } |
3069 | #endif |
3083 | #endif |
… | |
… | |
3371 | |
3385 | |
3372 | if (selection.clicks == 1) |
3386 | if (selection.clicks == 1) |
3373 | { |
3387 | { |
3374 | 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 |
3375 | && !ROW(selection.beg.row).is_longer () |
3389 | && !ROW(selection.beg.row).is_longer () |
3376 | #if ENABLE_FRILLS |
3390 | #if !ENABLE_MINIMAL |
3377 | && !selection.rect |
3391 | && !selection.rect |
3378 | #endif |
3392 | #endif |
3379 | ) |
3393 | ) |
3380 | selection.beg.col = ncol; |
3394 | selection.beg.col = ncol; |
3381 | |
3395 | |
3382 | if ( |
3396 | if ( |
3383 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3397 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3384 | && !ROW(selection.end.row).is_longer () |
3398 | && !ROW(selection.end.row).is_longer () |
3385 | #if ENABLE_FRILLS |
3399 | #if !ENABLE_MINIMAL |
3386 | && !selection.rect |
3400 | && !selection.rect |
3387 | #endif |
3401 | #endif |
3388 | ) |
3402 | ) |
3389 | selection.end.col = ncol; |
3403 | selection.end.col = ncol; |
3390 | } |
3404 | } |
… | |
… | |
3407 | { |
3421 | { |
3408 | if (!ROW(end_row).is_longer ()) |
3422 | if (!ROW(end_row).is_longer ()) |
3409 | { |
3423 | { |
3410 | selection.end.row = end_row; |
3424 | selection.end.row = end_row; |
3411 | selection.end.col = ROW(end_row).l; |
3425 | selection.end.col = ROW(end_row).l; |
|
|
3426 | # if !ENABLE_MINIMAL |
3412 | selection_remove_trailing_spaces (); |
3427 | selection_remove_trailing_spaces (); |
|
|
3428 | # endif |
3413 | break; |
3429 | break; |
3414 | } |
3430 | } |
3415 | } |
3431 | } |
3416 | } |
3432 | } |
3417 | else |
3433 | else |
… | |
… | |
3446 | selection.mark.row = selection.beg.row; |
3462 | selection.mark.row = selection.beg.row; |
3447 | selection.mark.col = selection.beg.col; |
3463 | selection.mark.col = selection.beg.col; |
3448 | } |
3464 | } |
3449 | } |
3465 | } |
3450 | |
3466 | |
3451 | #if ENABLE_FRILLS |
3467 | #if !ENABLE_MINIMAL |
3452 | if (selection.rect && selection.beg.col > selection.end.col) |
3468 | if (selection.rect && selection.beg.col > selection.end.col) |
3453 | ::swap (selection.beg.col, selection.end.col); |
3469 | ::swap (selection.beg.col, selection.end.col); |
3454 | #endif |
3470 | #endif |
3455 | } |
3471 | } |
3456 | |
3472 | |
3457 | #if ENABLE_FRILLS |
3473 | #if !ENABLE_MINIMAL |
3458 | void |
3474 | void |
3459 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3475 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3460 | { |
3476 | { |
3461 | int32_t end_col, end_row; |
3477 | int32_t end_col, end_row; |
3462 | text_t *stp; |
3478 | text_t *stp; |
… | |
… | |
3540 | *target++ = xa[XA_COMPOUND_TEXT]; |
3556 | *target++ = xa[XA_COMPOUND_TEXT]; |
3541 | #if X_HAVE_UTF8_STRING |
3557 | #if X_HAVE_UTF8_STRING |
3542 | *target++ = xa[XA_UTF8_STRING]; |
3558 | *target++ = xa[XA_UTF8_STRING]; |
3543 | #endif |
3559 | #endif |
3544 | |
3560 | |
3545 | XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, |
3561 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3546 | 32, PropModeReplace, |
3562 | 32, PropModeReplace, |
3547 | (unsigned char *)target_list, target - target_list); |
3563 | (unsigned char *)target_list, target - target_list); |
3548 | ev.property = rq.property; |
3564 | ev.property = rq.property; |
3549 | } |
3565 | } |
3550 | #if TODO // TODO |
3566 | #if TODO // TODO |
… | |
… | |
3553 | /* TODO: Handle MULTIPLE */ |
3569 | /* TODO: Handle MULTIPLE */ |
3554 | } |
3570 | } |
3555 | #endif |
3571 | #endif |
3556 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3572 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3557 | { |
3573 | { |
3558 | XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, |
3574 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3559 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3575 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3560 | ev.property = rq.property; |
3576 | ev.property = rq.property; |
3561 | } |
3577 | } |
3562 | else if (rq.target == XA_STRING |
3578 | else if (rq.target == XA_STRING |
3563 | || rq.target == xa[XA_TEXT] |
3579 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3587 | style = enc_string; |
3603 | style = enc_string; |
3588 | else if (target == xa[XA_TEXT]) |
3604 | else if (target == xa[XA_TEXT]) |
3589 | style = enc_text; |
3605 | style = enc_text; |
3590 | else if (target == xa[XA_COMPOUND_TEXT]) |
3606 | else if (target == xa[XA_COMPOUND_TEXT]) |
3591 | style = enc_compound_text; |
3607 | style = enc_compound_text; |
3592 | #if ENABLE_FRILLS |
3608 | #if !ENABLE_MINIMAL |
3593 | else if (target == xa[XA_UTF8_STRING]) |
3609 | else if (target == xa[XA_UTF8_STRING]) |
3594 | style = enc_utf8; |
3610 | style = enc_utf8; |
3595 | #endif |
3611 | #endif |
3596 | else |
3612 | else |
3597 | { |
3613 | { |
… | |
… | |
3608 | { |
3624 | { |
3609 | cl = L""; |
3625 | cl = L""; |
3610 | selectlen = 0; |
3626 | selectlen = 0; |
3611 | } |
3627 | } |
3612 | |
3628 | |
3613 | #if ENABLE_FRILLS |
3629 | #if !ENABLE_MINIMAL |
3614 | // 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 |
3615 | // so recode it manually |
3631 | // so recode it manually |
3616 | if (style == enc_utf8) |
3632 | if (style == enc_utf8) |
3617 | { |
3633 | { |
3618 | freect = 1; |
3634 | freect = 1; |
… | |
… | |
3621 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3637 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3622 | ct.nitems = strlen ((char *)ct.value); |
3638 | ct.nitems = strlen ((char *)ct.value); |
3623 | } |
3639 | } |
3624 | else |
3640 | else |
3625 | #endif |
3641 | #endif |
3626 | if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3642 | if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3627 | freect = 1; |
3643 | freect = 1; |
3628 | else |
3644 | else |
3629 | { |
3645 | { |
3630 | /* if we failed to convert then send it raw */ |
3646 | /* if we failed to convert then send it raw */ |
3631 | ct.value = (unsigned char *)cl; |
3647 | ct.value = (unsigned char *)cl; |
3632 | ct.nitems = selectlen; |
3648 | ct.nitems = selectlen; |
3633 | ct.encoding = target; |
3649 | ct.encoding = target; |
3634 | } |
3650 | } |
3635 | |
3651 | |
3636 | XChangeProperty (xdisp, rq.requestor, rq.property, |
3652 | XChangeProperty (dpy, rq.requestor, rq.property, |
3637 | ct.encoding, 8, PropModeReplace, |
3653 | ct.encoding, 8, PropModeReplace, |
3638 | ct.value, (int)ct.nitems); |
3654 | ct.value, (int)ct.nitems); |
3639 | ev.property = rq.property; |
3655 | ev.property = rq.property; |
3640 | |
3656 | |
3641 | if (freect) |
3657 | if (freect) |
3642 | XFree (ct.value); |
3658 | XFree (ct.value); |
3643 | } |
3659 | } |
3644 | |
3660 | |
3645 | XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); |
3661 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3646 | } |
3662 | } |
3647 | |
3663 | |
3648 | /* ------------------------------------------------------------------------- * |
3664 | /* ------------------------------------------------------------------------- * |
3649 | * MOUSE ROUTINES * |
3665 | * MOUSE ROUTINES * |
3650 | * ------------------------------------------------------------------------- */ |
3666 | * ------------------------------------------------------------------------- */ |
… | |
… | |
3666 | void |
3682 | void |
3667 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3683 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3668 | { |
3684 | { |
3669 | XWindowAttributes xwa; |
3685 | XWindowAttributes xwa; |
3670 | |
3686 | |
3671 | XGetWindowAttributes (xdisp, vt, &xwa); |
3687 | XGetWindowAttributes (dpy, vt, &xwa); |
3672 | |
3688 | |
3673 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3689 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3674 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3690 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3675 | } |
3691 | } |
3676 | #endif |
3692 | #endif |