… | |
… | |
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 | } |
… | |
… | |
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); |
… | |
… | |
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 j; |
2111 | int j; |
2112 | int len, wlen; |
2112 | int len, wlen; |
2113 | dLocal (int, num_scr); |
2113 | dLocal (int, num_scr); |
… | |
… | |
2149 | { |
2149 | { |
2150 | /* also comes here at end if needed because of >= above */ |
2150 | /* also comes here at end if needed because of >= above */ |
2151 | if (wlen < len) |
2151 | if (wlen < len) |
2152 | ::swap (wlen, len); |
2152 | ::swap (wlen, len); |
2153 | |
2153 | |
|
|
2154 | XGCValues gcv; |
|
|
2155 | |
|
|
2156 | gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
2154 | XCopyArea (xdisp, vt, vt, |
2157 | XCopyArea (dpy, vt, vt, |
2155 | gc, 0, Row2Pixel (len + i), |
2158 | gc, 0, Row2Pixel (len + i), |
2156 | (unsigned int)this->width, |
2159 | (unsigned int)this->width, |
2157 | (unsigned int)Height2Pixel (wlen - len + 1), |
2160 | (unsigned int)Height2Pixel (wlen - len + 1), |
2158 | 0, Row2Pixel (len)); |
2161 | 0, Row2Pixel (len)); |
|
|
2162 | gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
|
|
2163 | |
2159 | len = -1; |
2164 | len = -1; |
2160 | } |
2165 | } |
2161 | } |
2166 | } |
2162 | } |
2167 | } |
2163 | #endif |
2168 | #endif |
… | |
… | |
2219 | count++; |
2224 | count++; |
2220 | |
2225 | |
2221 | if (stp[col] != dtp[col] |
2226 | if (stp[col] != dtp[col] |
2222 | || !RS_SAME (srp[col], drp[col])) |
2227 | || !RS_SAME (srp[col], drp[col])) |
2223 | { |
2228 | { |
2224 | if (must_clear && (i++ > count / 2)) |
2229 | if (have_bg && (i++ > count / 2)) |
2225 | break; |
2230 | break; |
2226 | |
2231 | |
2227 | dtp[col] = stp[col]; |
2232 | dtp[col] = stp[col]; |
2228 | drp[col] = rend; |
2233 | drp[col] = rend; |
2229 | i = 0; |
2234 | i = 0; |
2230 | } |
2235 | } |
2231 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2236 | else if (have_bg || (stp[col] != ' ' && ++i >= 16)) |
2232 | break; |
2237 | break; |
2233 | } |
2238 | } |
2234 | |
2239 | |
2235 | col--; /* went one too far. move back */ |
2240 | col--; /* went one too far. move back */ |
2236 | count -= i; /* dump any matching trailing chars */ |
2241 | count -= i; /* dump any matching trailing chars */ |
… | |
… | |
2329 | * Actually do the drawing of the string here |
2334 | * Actually do the drawing of the string here |
2330 | */ |
2335 | */ |
2331 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2336 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2332 | |
2337 | |
2333 | if (back == fore) |
2338 | if (back == fore) |
2334 | font->clear_rect (*drawable, xpixel, ypixel, |
2339 | font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back); |
2335 | fwidth * count, fheight, |
|
|
2336 | back); |
|
|
2337 | else if (back == Color_bg) |
2340 | else if (back == Color_bg && have_bg) |
2338 | { |
2341 | { |
2339 | if (must_clear) |
2342 | // this is very ugly, maybe push it into ->draw? |
2340 | { |
|
|
2341 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2342 | |
2343 | |
2343 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2344 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2344 | if (text[i] != ' ') |
2345 | if (text[i] != ' ') |
2345 | { |
2346 | { |
2346 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2347 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2347 | break; |
2348 | goto did_clear; |
2348 | } |
|
|
2349 | } |
2349 | } |
2350 | else |
2350 | |
2351 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2351 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2352 | did_clear: ; |
2352 | } |
2353 | } |
2353 | else |
2354 | else |
2354 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2355 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2355 | |
2356 | |
2356 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2357 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2357 | { |
2358 | { |
2358 | #if ENABLE_FRILLS |
2359 | #if ENABLE_FRILLS |
2359 | if (ISSET_PIXCOLOR (Color_underline)) |
2360 | if (ISSET_PIXCOLOR (Color_underline)) |
2360 | XSetForeground (xdisp, gc, pix_colors[Color_underline]); |
2361 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2361 | else |
2362 | else |
2362 | #endif |
2363 | #endif |
2363 | XSetForeground (xdisp, gc, pix_colors[fore]); |
2364 | XSetForeground (dpy, gc, pix_colors[fore]); |
2364 | |
2365 | |
2365 | XDrawLine (xdisp, drawBuffer, gc, |
2366 | XDrawLine (dpy, drawBuffer, gc, |
2366 | xpixel, ypixel + font->ascent + 1, |
2367 | xpixel, ypixel + font->ascent + 1, |
2367 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2368 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2368 | } |
2369 | } |
2369 | } /* for (col....) */ |
2370 | } /* for (col....) */ |
2370 | } /* for (row....) */ |
2371 | } /* for (row....) */ |
… | |
… | |
2403 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2404 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2404 | cursorwidth++; |
2405 | cursorwidth++; |
2405 | |
2406 | |
2406 | #ifndef NO_CURSORCOLOR |
2407 | #ifndef NO_CURSORCOLOR |
2407 | if (ISSET_PIXCOLOR (Color_cursor)) |
2408 | if (ISSET_PIXCOLOR (Color_cursor)) |
2408 | XSetForeground (xdisp, gc, pix_colors[Color_cursor]); |
2409 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2409 | #endif |
2410 | #endif |
2410 | |
2411 | |
2411 | XDrawRectangle (xdisp, drawBuffer, gc, |
2412 | XDrawRectangle (dpy, drawBuffer, gc, |
2412 | Col2Pixel (col), |
2413 | Col2Pixel (col), |
2413 | Row2Pixel (oldcursor.row), |
2414 | Row2Pixel (oldcursor.row), |
2414 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2415 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2415 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2416 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2416 | } |
2417 | } |
… | |
… | |
2460 | #if XPM_BACKGROUND |
2461 | #if XPM_BACKGROUND |
2461 | && !bgPixmap.pixmap |
2462 | && !bgPixmap.pixmap |
2462 | #endif |
2463 | #endif |
2463 | ) |
2464 | ) |
2464 | { |
2465 | { |
2465 | XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); |
2466 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2466 | XClearWindow (xdisp, parent[0]); |
2467 | XClearWindow (dpy, parent[0]); |
2467 | XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); |
2468 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2468 | #if HAVE_SCROLLBARS |
2469 | #if HAVE_SCROLLBARS |
2469 | if (scrollBar.win) |
2470 | if (scrollBar.win) |
2470 | { |
2471 | { |
2471 | XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); |
2472 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2472 | scrollBar.setIdle (); |
2473 | scrollBar.setIdle (); |
2473 | scrollbar_show (0); |
2474 | scrollbar_show (0); |
2474 | } |
2475 | } |
2475 | #endif |
2476 | #endif |
2476 | } |
2477 | } |
… | |
… | |
2489 | |
2490 | |
2490 | num_scr_allow = 0; |
2491 | num_scr_allow = 0; |
2491 | want_refresh = 1; |
2492 | want_refresh = 1; |
2492 | |
2493 | |
2493 | if (really) |
2494 | if (really) |
2494 | XClearWindow (xdisp, vt); |
2495 | XClearWindow (dpy, vt); |
2495 | } |
2496 | } |
2496 | |
2497 | |
2497 | void |
2498 | 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 |
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 |
2499 | { |
2500 | { |
… | |
… | |
2674 | } |
2675 | } |
2675 | |
2676 | |
2676 | unsigned long bytes_after; |
2677 | unsigned long bytes_after; |
2677 | XTextProperty ct; |
2678 | XTextProperty ct; |
2678 | |
2679 | |
2679 | if (XGetWindowProperty (xdisp, win, prop, |
2680 | if (XGetWindowProperty (dpy, win, prop, |
2680 | 0, PROP_SIZE / 4, |
2681 | 0, PROP_SIZE / 4, |
2681 | delete_prop, AnyPropertyType, |
2682 | delete_prop, AnyPropertyType, |
2682 | &ct.encoding, &ct.format, |
2683 | &ct.encoding, &ct.format, |
2683 | &ct.nitems, &bytes_after, |
2684 | &ct.nitems, &bytes_after, |
2684 | &ct.value) != Success) |
2685 | &ct.value) != Success) |
… | |
… | |
2693 | if (bytes_after) |
2694 | if (bytes_after) |
2694 | { |
2695 | { |
2695 | // fetch and append remaining data |
2696 | // fetch and append remaining data |
2696 | XTextProperty ct2; |
2697 | XTextProperty ct2; |
2697 | |
2698 | |
2698 | if (XGetWindowProperty (xdisp, win, prop, |
2699 | if (XGetWindowProperty (dpy, win, prop, |
2699 | ct.nitems / 4, (bytes_after + 3) / 4, |
2700 | ct.nitems / 4, (bytes_after + 3) / 4, |
2700 | delete_prop, AnyPropertyType, |
2701 | delete_prop, AnyPropertyType, |
2701 | &ct2.encoding, &ct2.format, |
2702 | &ct2.encoding, &ct2.format, |
2702 | &ct2.nitems, &bytes_after, |
2703 | &ct2.nitems, &bytes_after, |
2703 | &ct2.value) != Success) |
2704 | &ct2.value) != Success) |
… | |
… | |
2716 | |
2717 | |
2717 | if (ct.encoding == xa[XA_INCR]) |
2718 | if (ct.encoding == xa[XA_INCR]) |
2718 | { |
2719 | { |
2719 | // INCR selection, start handshake |
2720 | // INCR selection, start handshake |
2720 | if (!delete_prop) |
2721 | if (!delete_prop) |
2721 | XDeleteProperty (xdisp, win, prop); |
2722 | XDeleteProperty (dpy, win, prop); |
2722 | |
2723 | |
2723 | selection_wait = Sel_incr; |
2724 | selection_wait = Sel_incr; |
2724 | incr_buf_fill = 0; |
2725 | incr_buf_fill = 0; |
2725 | incr_ev.start (NOW + 10); |
2726 | incr_ev.start (NOW + 10); |
2726 | |
2727 | |
… | |
… | |
2787 | paste (s, strlen (s)); |
2788 | paste (s, strlen (s)); |
2788 | free (s); |
2789 | free (s); |
2789 | } |
2790 | } |
2790 | else |
2791 | else |
2791 | #endif |
2792 | #endif |
2792 | if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 |
2793 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
2793 | && cl) |
2794 | && cl) |
2794 | { |
2795 | { |
2795 | for (int i = 0; i < cr; i++) |
2796 | for (int i = 0; i < cr; i++) |
2796 | paste (cl[i], strlen (cl[i])); |
2797 | paste (cl[i], strlen (cl[i])); |
2797 | |
2798 | |
… | |
… | |
2879 | else if (selnum == Sel_Secondary) |
2880 | else if (selnum == Sel_Secondary) |
2880 | sel = XA_SECONDARY; |
2881 | sel = XA_SECONDARY; |
2881 | else |
2882 | else |
2882 | sel = xa[XA_CLIPBOARD]; |
2883 | sel = xa[XA_CLIPBOARD]; |
2883 | |
2884 | |
2884 | if (XGetSelectionOwner (xdisp, sel) != None) |
2885 | if (XGetSelectionOwner (dpy, sel) != None) |
2885 | { |
2886 | { |
2886 | XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], |
2887 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
2887 | vt, selection_request_time); |
2888 | vt, selection_request_time); |
2888 | return 1; |
2889 | return 1; |
2889 | } |
2890 | } |
2890 | |
2891 | |
2891 | return 0; |
2892 | return 0; |
… | |
… | |
3044 | bool |
3045 | bool |
3045 | rxvt_term::selection_grab (Time tm) NOTHROW |
3046 | rxvt_term::selection_grab (Time tm) NOTHROW |
3046 | { |
3047 | { |
3047 | selection_time = tm; |
3048 | selection_time = tm; |
3048 | |
3049 | |
3049 | XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); |
3050 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3050 | if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) |
3051 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3051 | { |
3052 | { |
3052 | display->set_selection_owner (this); |
3053 | display->set_selection_owner (this); |
3053 | return true; |
3054 | return true; |
3054 | } |
3055 | } |
3055 | else |
3056 | else |
… | |
… | |
3059 | } |
3060 | } |
3060 | |
3061 | |
3061 | #if 0 |
3062 | #if 0 |
3062 | XTextProperty ct; |
3063 | XTextProperty ct; |
3063 | |
3064 | |
3064 | if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) |
3065 | if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) |
3065 | { |
3066 | { |
3066 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3067 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3067 | XFree (ct.value); |
3068 | XFree (ct.value); |
3068 | } |
3069 | } |
3069 | #endif |
3070 | #endif |
… | |
… | |
3542 | *target++ = xa[XA_COMPOUND_TEXT]; |
3543 | *target++ = xa[XA_COMPOUND_TEXT]; |
3543 | #if X_HAVE_UTF8_STRING |
3544 | #if X_HAVE_UTF8_STRING |
3544 | *target++ = xa[XA_UTF8_STRING]; |
3545 | *target++ = xa[XA_UTF8_STRING]; |
3545 | #endif |
3546 | #endif |
3546 | |
3547 | |
3547 | XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, |
3548 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3548 | 32, PropModeReplace, |
3549 | 32, PropModeReplace, |
3549 | (unsigned char *)target_list, target - target_list); |
3550 | (unsigned char *)target_list, target - target_list); |
3550 | ev.property = rq.property; |
3551 | ev.property = rq.property; |
3551 | } |
3552 | } |
3552 | #if TODO // TODO |
3553 | #if TODO // TODO |
… | |
… | |
3555 | /* TODO: Handle MULTIPLE */ |
3556 | /* TODO: Handle MULTIPLE */ |
3556 | } |
3557 | } |
3557 | #endif |
3558 | #endif |
3558 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3559 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3559 | { |
3560 | { |
3560 | XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, |
3561 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3561 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3562 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3562 | ev.property = rq.property; |
3563 | ev.property = rq.property; |
3563 | } |
3564 | } |
3564 | else if (rq.target == XA_STRING |
3565 | else if (rq.target == XA_STRING |
3565 | || rq.target == xa[XA_TEXT] |
3566 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3623 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3624 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3624 | ct.nitems = strlen ((char *)ct.value); |
3625 | ct.nitems = strlen ((char *)ct.value); |
3625 | } |
3626 | } |
3626 | else |
3627 | else |
3627 | #endif |
3628 | #endif |
3628 | if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3629 | if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3629 | freect = 1; |
3630 | freect = 1; |
3630 | else |
3631 | else |
3631 | { |
3632 | { |
3632 | /* if we failed to convert then send it raw */ |
3633 | /* if we failed to convert then send it raw */ |
3633 | ct.value = (unsigned char *)cl; |
3634 | ct.value = (unsigned char *)cl; |
3634 | ct.nitems = selectlen; |
3635 | ct.nitems = selectlen; |
3635 | ct.encoding = target; |
3636 | ct.encoding = target; |
3636 | } |
3637 | } |
3637 | |
3638 | |
3638 | XChangeProperty (xdisp, rq.requestor, rq.property, |
3639 | XChangeProperty (dpy, rq.requestor, rq.property, |
3639 | ct.encoding, 8, PropModeReplace, |
3640 | ct.encoding, 8, PropModeReplace, |
3640 | ct.value, (int)ct.nitems); |
3641 | ct.value, (int)ct.nitems); |
3641 | ev.property = rq.property; |
3642 | ev.property = rq.property; |
3642 | |
3643 | |
3643 | if (freect) |
3644 | if (freect) |
3644 | XFree (ct.value); |
3645 | XFree (ct.value); |
3645 | } |
3646 | } |
3646 | |
3647 | |
3647 | XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); |
3648 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3648 | } |
3649 | } |
3649 | |
3650 | |
3650 | /* ------------------------------------------------------------------------- * |
3651 | /* ------------------------------------------------------------------------- * |
3651 | * MOUSE ROUTINES * |
3652 | * MOUSE ROUTINES * |
3652 | * ------------------------------------------------------------------------- */ |
3653 | * ------------------------------------------------------------------------- */ |
… | |
… | |
3668 | void |
3669 | void |
3669 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3670 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3670 | { |
3671 | { |
3671 | XWindowAttributes xwa; |
3672 | XWindowAttributes xwa; |
3672 | |
3673 | |
3673 | XGetWindowAttributes (xdisp, vt, &xwa); |
3674 | XGetWindowAttributes (dpy, vt, &xwa); |
3674 | |
3675 | |
3675 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3676 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3676 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3677 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3677 | } |
3678 | } |
3678 | #endif |
3679 | #endif |