… | |
… | |
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 (xdisp, 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 (xdisp, 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 (xdisp, 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_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. |
… | |
… | |
1338 | } |
1342 | } |
1339 | else |
1343 | else |
1340 | { |
1344 | { |
1341 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1345 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1342 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1346 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1343 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1347 | XChangeGC (xdisp, gc, GCForeground, &gcvalue); |
1344 | ERASE_ROWS (row, num); |
1348 | ERASE_ROWS (row, num); |
1345 | gcvalue.foreground = pix_colors[Color_fg]; |
1349 | gcvalue.foreground = pix_colors[Color_fg]; |
1346 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1350 | XChangeGC (xdisp, gc, GCForeground, &gcvalue); |
1347 | } |
1351 | } |
1348 | |
1352 | |
1349 | for (; num--; row++) |
1353 | for (; num--; row++) |
1350 | { |
1354 | { |
1351 | scr_blank_screen_mem (ROW(row), rstyle); |
1355 | scr_blank_screen_mem (ROW(row), rstyle); |
… | |
… | |
1650 | if (bgPixmap.pixmap == None) |
1654 | if (bgPixmap.pixmap == None) |
1651 | #endif |
1655 | #endif |
1652 | #if TRANSPARENT |
1656 | #if TRANSPARENT |
1653 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
1657 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
1654 | #endif |
1658 | #endif |
1655 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
1659 | XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); |
1656 | |
1660 | |
1657 | XGCValues gcvalue; |
1661 | XGCValues gcvalue; |
1658 | gcvalue.foreground = pix_colors[Color_fg]; |
1662 | gcvalue.foreground = pix_colors[Color_fg]; |
1659 | gcvalue.background = pix_colors[Color_bg]; |
1663 | gcvalue.background = pix_colors[Color_bg]; |
1660 | XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); |
1664 | XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); |
1661 | |
1665 | |
1662 | scr_clear (); |
1666 | scr_clear (); |
1663 | scr_touch (true); |
1667 | scr_touch (true); |
1664 | } |
1668 | } |
1665 | } |
1669 | } |
… | |
… | |
1750 | { |
1754 | { |
1751 | bool found = false; |
1755 | bool found = false; |
1752 | |
1756 | |
1753 | for (int i = 0; i < nrow; i++) |
1757 | for (int i = 0; i < nrow; i++) |
1754 | { |
1758 | { |
1755 | int col = 0; |
|
|
1756 | rend_t *drp = drawn_buf[i].r; |
1759 | rend_t *drp = drawn_buf[i].r; |
1757 | |
1760 | |
1758 | for (; col < ncol; col++, drp++) |
1761 | for (int col = 0; col < ncol; col++, drp++) |
1759 | if ((*drp & mask) == value) |
1762 | if ((*drp & mask) == value) |
1760 | { |
1763 | { |
1761 | found = true; |
1764 | found = true; |
1762 | *drp = ~value; |
1765 | *drp = ~value; |
1763 | } |
1766 | } |
… | |
… | |
1885 | |
1888 | |
1886 | # ifndef NO_MAPALERT |
1889 | # ifndef NO_MAPALERT |
1887 | # ifdef MAPALERT_OPTION |
1890 | # ifdef MAPALERT_OPTION |
1888 | if (OPTION (Opt_mapAlert)) |
1891 | if (OPTION (Opt_mapAlert)) |
1889 | # endif |
1892 | # endif |
1890 | XMapWindow (display->display, parent[0]); |
1893 | XMapWindow (xdisp, parent[0]); |
1891 | # endif |
1894 | # endif |
1892 | |
1895 | |
1893 | if (OPTION (Opt_visualBell)) |
1896 | if (OPTION (Opt_visualBell)) |
1894 | { |
1897 | { |
1895 | rvideo_bell = true; |
1898 | rvideo_bell = true; |
… | |
… | |
1897 | display->flush (); |
1900 | display->flush (); |
1898 | |
1901 | |
1899 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1902 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1900 | } |
1903 | } |
1901 | else |
1904 | else |
1902 | XBell (display->display, 0); |
1905 | XBell (xdisp, 0); |
1903 | |
1906 | |
1904 | #endif |
1907 | #endif |
1905 | } |
1908 | } |
1906 | |
1909 | |
1907 | /* ------------------------------------------------------------------------- */ |
1910 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
2146 | { |
2149 | { |
2147 | /* also comes here at end if needed because of >= above */ |
2150 | /* also comes here at end if needed because of >= above */ |
2148 | if (wlen < len) |
2151 | if (wlen < len) |
2149 | ::swap (wlen, len); |
2152 | ::swap (wlen, len); |
2150 | |
2153 | |
2151 | XCopyArea (display->display, vt, vt, |
2154 | XCopyArea (xdisp, vt, vt, |
2152 | gc, 0, Row2Pixel (len + i), |
2155 | gc, 0, Row2Pixel (len + i), |
2153 | (unsigned int)this->width, |
2156 | (unsigned int)this->width, |
2154 | (unsigned int)Height2Pixel (wlen - len + 1), |
2157 | (unsigned int)Height2Pixel (wlen - len + 1), |
2155 | 0, Row2Pixel (len)); |
2158 | 0, Row2Pixel (len)); |
2156 | len = -1; |
2159 | len = -1; |
… | |
… | |
2254 | && RS_SAME (rend, srp[text - stp - 1])) |
2257 | && RS_SAME (rend, srp[text - stp - 1])) |
2255 | text--, count++, xpixel -= fwidth; |
2258 | text--, count++, xpixel -= fwidth; |
2256 | |
2259 | |
2257 | // force redraw after "careful" characters to avoid pixel droppings |
2260 | // force redraw after "careful" characters to avoid pixel droppings |
2258 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
2261 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
2259 | drp[col + i + 1] = ~srp[col + i + 1]; |
2262 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
2260 | |
2263 | |
2261 | // force redraw before "careful" characters to avoid pixel droppings |
2264 | // force redraw before "careful" characters to avoid pixel droppings |
2262 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
2265 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
2263 | drp[text - stp - i - 1] = ~srp[text - stp - i - 1]; |
2266 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
2264 | #endif |
2267 | #endif |
2265 | |
2268 | |
2266 | bool invert = rend & RS_RVid; |
2269 | bool invert = rend & RS_RVid; |
2267 | |
2270 | |
2268 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2271 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
… | |
… | |
2352 | |
2355 | |
2353 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2356 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2354 | { |
2357 | { |
2355 | #if ENABLE_FRILLS |
2358 | #if ENABLE_FRILLS |
2356 | if (ISSET_PIXCOLOR (Color_underline)) |
2359 | if (ISSET_PIXCOLOR (Color_underline)) |
2357 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2360 | XSetForeground (xdisp, gc, pix_colors[Color_underline]); |
2358 | else |
2361 | else |
2359 | #endif |
2362 | #endif |
2360 | XSetForeground (display->display, gc, pix_colors[fore]); |
2363 | XSetForeground (xdisp, gc, pix_colors[fore]); |
2361 | |
2364 | |
2362 | XDrawLine (display->display, drawBuffer, gc, |
2365 | XDrawLine (xdisp, drawBuffer, gc, |
2363 | xpixel, ypixel + font->ascent + 1, |
2366 | xpixel, ypixel + font->ascent + 1, |
2364 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2367 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2365 | } |
2368 | } |
2366 | } /* for (col....) */ |
2369 | } /* for (col....) */ |
2367 | } /* for (row....) */ |
2370 | } /* for (row....) */ |
… | |
… | |
2400 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2403 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2401 | cursorwidth++; |
2404 | cursorwidth++; |
2402 | |
2405 | |
2403 | #ifndef NO_CURSORCOLOR |
2406 | #ifndef NO_CURSORCOLOR |
2404 | if (ISSET_PIXCOLOR (Color_cursor)) |
2407 | if (ISSET_PIXCOLOR (Color_cursor)) |
2405 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2408 | XSetForeground (xdisp, gc, pix_colors[Color_cursor]); |
2406 | #endif |
2409 | #endif |
2407 | |
2410 | |
2408 | XDrawRectangle (display->display, drawBuffer, gc, |
2411 | XDrawRectangle (xdisp, drawBuffer, gc, |
2409 | Col2Pixel (col), |
2412 | Col2Pixel (col), |
2410 | Row2Pixel (oldcursor.row), |
2413 | Row2Pixel (oldcursor.row), |
2411 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2414 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2412 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2415 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2413 | } |
2416 | } |
… | |
… | |
2457 | #if XPM_BACKGROUND |
2460 | #if XPM_BACKGROUND |
2458 | && !bgPixmap.pixmap |
2461 | && !bgPixmap.pixmap |
2459 | #endif |
2462 | #endif |
2460 | ) |
2463 | ) |
2461 | { |
2464 | { |
2462 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2465 | XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); |
2463 | XClearWindow (display->display, parent[0]); |
2466 | XClearWindow (xdisp, parent[0]); |
2464 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2467 | XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); |
2465 | #if HAVE_SCROLLBARS |
2468 | #if HAVE_SCROLLBARS |
2466 | if (scrollBar.win) |
2469 | if (scrollBar.win) |
2467 | { |
2470 | { |
2468 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2471 | XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); |
2469 | scrollBar.setIdle (); |
2472 | scrollBar.setIdle (); |
2470 | scrollbar_show (0); |
2473 | scrollbar_show (0); |
2471 | } |
2474 | } |
2472 | #endif |
2475 | #endif |
2473 | } |
2476 | } |
… | |
… | |
2486 | |
2489 | |
2487 | num_scr_allow = 0; |
2490 | num_scr_allow = 0; |
2488 | want_refresh = 1; |
2491 | want_refresh = 1; |
2489 | |
2492 | |
2490 | if (really) |
2493 | if (really) |
2491 | XClearWindow (display->display, vt); |
2494 | XClearWindow (xdisp, vt); |
2492 | } |
2495 | } |
2493 | |
2496 | |
2494 | void |
2497 | void |
2495 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
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 |
2496 | { |
2499 | { |
… | |
… | |
2671 | } |
2674 | } |
2672 | |
2675 | |
2673 | unsigned long bytes_after; |
2676 | unsigned long bytes_after; |
2674 | XTextProperty ct; |
2677 | XTextProperty ct; |
2675 | |
2678 | |
2676 | if (XGetWindowProperty (display->display, win, prop, |
2679 | if (XGetWindowProperty (xdisp, win, prop, |
2677 | 0, PROP_SIZE / 4, |
2680 | 0, PROP_SIZE / 4, |
2678 | delete_prop, AnyPropertyType, |
2681 | delete_prop, AnyPropertyType, |
2679 | &ct.encoding, &ct.format, |
2682 | &ct.encoding, &ct.format, |
2680 | &ct.nitems, &bytes_after, |
2683 | &ct.nitems, &bytes_after, |
2681 | &ct.value) != Success) |
2684 | &ct.value) != Success) |
… | |
… | |
2690 | if (bytes_after) |
2693 | if (bytes_after) |
2691 | { |
2694 | { |
2692 | // fetch and append remaining data |
2695 | // fetch and append remaining data |
2693 | XTextProperty ct2; |
2696 | XTextProperty ct2; |
2694 | |
2697 | |
2695 | if (XGetWindowProperty (display->display, win, prop, |
2698 | if (XGetWindowProperty (xdisp, win, prop, |
2696 | ct.nitems / 4, (bytes_after + 3) / 4, |
2699 | ct.nitems / 4, (bytes_after + 3) / 4, |
2697 | delete_prop, AnyPropertyType, |
2700 | delete_prop, AnyPropertyType, |
2698 | &ct2.encoding, &ct2.format, |
2701 | &ct2.encoding, &ct2.format, |
2699 | &ct2.nitems, &bytes_after, |
2702 | &ct2.nitems, &bytes_after, |
2700 | &ct2.value) != Success) |
2703 | &ct2.value) != Success) |
… | |
… | |
2713 | |
2716 | |
2714 | if (ct.encoding == xa[XA_INCR]) |
2717 | if (ct.encoding == xa[XA_INCR]) |
2715 | { |
2718 | { |
2716 | // INCR selection, start handshake |
2719 | // INCR selection, start handshake |
2717 | if (!delete_prop) |
2720 | if (!delete_prop) |
2718 | XDeleteProperty (display->display, win, prop); |
2721 | XDeleteProperty (xdisp, win, prop); |
2719 | |
2722 | |
2720 | selection_wait = Sel_incr; |
2723 | selection_wait = Sel_incr; |
2721 | incr_buf_fill = 0; |
2724 | incr_buf_fill = 0; |
2722 | incr_ev.start (NOW + 10); |
2725 | incr_ev.start (NOW + 10); |
2723 | |
2726 | |
… | |
… | |
2784 | paste (s, strlen (s)); |
2787 | paste (s, strlen (s)); |
2785 | free (s); |
2788 | free (s); |
2786 | } |
2789 | } |
2787 | else |
2790 | else |
2788 | #endif |
2791 | #endif |
2789 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2792 | if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 |
2790 | && cl) |
2793 | && cl) |
2791 | { |
2794 | { |
2792 | for (int i = 0; i < cr; i++) |
2795 | for (int i = 0; i < cr; i++) |
2793 | paste (cl[i], strlen (cl[i])); |
2796 | paste (cl[i], strlen (cl[i])); |
2794 | |
2797 | |
… | |
… | |
2876 | else if (selnum == Sel_Secondary) |
2879 | else if (selnum == Sel_Secondary) |
2877 | sel = XA_SECONDARY; |
2880 | sel = XA_SECONDARY; |
2878 | else |
2881 | else |
2879 | sel = xa[XA_CLIPBOARD]; |
2882 | sel = xa[XA_CLIPBOARD]; |
2880 | |
2883 | |
2881 | if (XGetSelectionOwner (display->display, sel) != None) |
2884 | if (XGetSelectionOwner (xdisp, sel) != None) |
2882 | { |
2885 | { |
2883 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2886 | XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], |
2884 | vt, selection_request_time); |
2887 | vt, selection_request_time); |
2885 | return 1; |
2888 | return 1; |
2886 | } |
2889 | } |
2887 | |
2890 | |
2888 | return 0; |
2891 | return 0; |
… | |
… | |
3041 | bool |
3044 | bool |
3042 | rxvt_term::selection_grab (Time tm) NOTHROW |
3045 | rxvt_term::selection_grab (Time tm) NOTHROW |
3043 | { |
3046 | { |
3044 | selection_time = tm; |
3047 | selection_time = tm; |
3045 | |
3048 | |
3046 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3049 | XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); |
3047 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3050 | if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) |
3048 | { |
3051 | { |
3049 | display->set_selection_owner (this); |
3052 | display->set_selection_owner (this); |
3050 | return true; |
3053 | return true; |
3051 | } |
3054 | } |
3052 | else |
3055 | else |
… | |
… | |
3056 | } |
3059 | } |
3057 | |
3060 | |
3058 | #if 0 |
3061 | #if 0 |
3059 | XTextProperty ct; |
3062 | XTextProperty ct; |
3060 | |
3063 | |
3061 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3064 | if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) |
3062 | { |
3065 | { |
3063 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3066 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3064 | XFree (ct.value); |
3067 | XFree (ct.value); |
3065 | } |
3068 | } |
3066 | #endif |
3069 | #endif |
… | |
… | |
3514 | */ |
3517 | */ |
3515 | void |
3518 | void |
3516 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3519 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3517 | { |
3520 | { |
3518 | XSelectionEvent ev; |
3521 | XSelectionEvent ev; |
3519 | dDisp; |
|
|
3520 | |
3522 | |
3521 | ev.type = SelectionNotify; |
3523 | ev.type = SelectionNotify; |
3522 | ev.property = None; |
3524 | ev.property = None; |
3523 | ev.display = rq.display; |
3525 | ev.display = rq.display; |
3524 | ev.requestor = rq.requestor; |
3526 | ev.requestor = rq.requestor; |
… | |
… | |
3538 | *target++ = xa[XA_COMPOUND_TEXT]; |
3540 | *target++ = xa[XA_COMPOUND_TEXT]; |
3539 | #if X_HAVE_UTF8_STRING |
3541 | #if X_HAVE_UTF8_STRING |
3540 | *target++ = xa[XA_UTF8_STRING]; |
3542 | *target++ = xa[XA_UTF8_STRING]; |
3541 | #endif |
3543 | #endif |
3542 | |
3544 | |
3543 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3545 | XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, |
3544 | 32, PropModeReplace, |
3546 | 32, PropModeReplace, |
3545 | (unsigned char *)target_list, target - target_list); |
3547 | (unsigned char *)target_list, target - target_list); |
3546 | ev.property = rq.property; |
3548 | ev.property = rq.property; |
3547 | } |
3549 | } |
3548 | #if TODO // TODO |
3550 | #if TODO // TODO |
… | |
… | |
3551 | /* TODO: Handle MULTIPLE */ |
3553 | /* TODO: Handle MULTIPLE */ |
3552 | } |
3554 | } |
3553 | #endif |
3555 | #endif |
3554 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3556 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3555 | { |
3557 | { |
3556 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3558 | XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, |
3557 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3559 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3558 | ev.property = rq.property; |
3560 | ev.property = rq.property; |
3559 | } |
3561 | } |
3560 | else if (rq.target == XA_STRING |
3562 | else if (rq.target == XA_STRING |
3561 | || rq.target == xa[XA_TEXT] |
3563 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3619 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3621 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3620 | ct.nitems = strlen ((char *)ct.value); |
3622 | ct.nitems = strlen ((char *)ct.value); |
3621 | } |
3623 | } |
3622 | else |
3624 | else |
3623 | #endif |
3625 | #endif |
3624 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3626 | if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3625 | freect = 1; |
3627 | freect = 1; |
3626 | else |
3628 | else |
3627 | { |
3629 | { |
3628 | /* if we failed to convert then send it raw */ |
3630 | /* if we failed to convert then send it raw */ |
3629 | ct.value = (unsigned char *)cl; |
3631 | ct.value = (unsigned char *)cl; |
3630 | ct.nitems = selectlen; |
3632 | ct.nitems = selectlen; |
3631 | ct.encoding = target; |
3633 | ct.encoding = target; |
3632 | } |
3634 | } |
3633 | |
3635 | |
3634 | XChangeProperty (disp, rq.requestor, rq.property, |
3636 | XChangeProperty (xdisp, rq.requestor, rq.property, |
3635 | ct.encoding, 8, PropModeReplace, |
3637 | ct.encoding, 8, PropModeReplace, |
3636 | ct.value, (int)ct.nitems); |
3638 | ct.value, (int)ct.nitems); |
3637 | ev.property = rq.property; |
3639 | ev.property = rq.property; |
3638 | |
3640 | |
3639 | if (freect) |
3641 | if (freect) |
3640 | XFree (ct.value); |
3642 | XFree (ct.value); |
3641 | } |
3643 | } |
3642 | |
3644 | |
3643 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3645 | XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); |
3644 | } |
3646 | } |
3645 | |
3647 | |
3646 | /* ------------------------------------------------------------------------- * |
3648 | /* ------------------------------------------------------------------------- * |
3647 | * MOUSE ROUTINES * |
3649 | * MOUSE ROUTINES * |
3648 | * ------------------------------------------------------------------------- */ |
3650 | * ------------------------------------------------------------------------- */ |
… | |
… | |
3664 | void |
3666 | void |
3665 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3667 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3666 | { |
3668 | { |
3667 | XWindowAttributes xwa; |
3669 | XWindowAttributes xwa; |
3668 | |
3670 | |
3669 | XGetWindowAttributes (display->display, vt, &xwa); |
3671 | XGetWindowAttributes (xdisp, vt, &xwa); |
3670 | |
3672 | |
3671 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3673 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3672 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3674 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3673 | } |
3675 | } |
3674 | #endif |
3676 | #endif |