… | |
… | |
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 | /* ------------------------------------------------------------------------- * |
… | |
… | |
758 | ZERO_SCROLLBACK (); |
758 | ZERO_SCROLLBACK (); |
759 | |
759 | |
760 | if (minlines > 0) |
760 | if (minlines > 0) |
761 | { |
761 | { |
762 | minlines += screen.cur.row - screen.bscroll; |
762 | minlines += screen.cur.row - screen.bscroll; |
|
|
763 | min_it (minlines, screen.cur.row - top_row); |
763 | |
764 | |
764 | if (minlines > 0 |
765 | if (minlines > 0 |
765 | && screen.tscroll == 0 |
766 | && screen.tscroll == 0 |
766 | && screen.bscroll == nrow - 1) |
767 | && screen.bscroll == nrow - 1) |
767 | { |
768 | { |
… | |
… | |
841 | |
842 | |
842 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
843 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
843 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
844 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
844 | c = 0xfffd; |
845 | c = 0xfffd; |
845 | |
846 | |
846 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
847 | // rely on wcwidth to tell us the character width, do wcwidth before |
847 | // do wcwidth before further replacements, as wcwidth might return -1 |
848 | // 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 |
849 | // drawing characters below as they might be invalid in the current |
849 | // locale. |
850 | // locale. |
850 | int width = c < 0x100 ? 1 : wcwidth (c); |
851 | int width = WCWIDTH (c); |
851 | |
852 | |
852 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
853 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
853 | { |
854 | { |
854 | // vt100 special graphics and line drawing |
855 | // vt100 special graphics and line drawing |
855 | // 5f-7e standard vt100 |
856 | // 5f-7e standard vt100 |
… | |
… | |
1337 | } |
1338 | } |
1338 | else |
1339 | else |
1339 | { |
1340 | { |
1340 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1341 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1341 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1342 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1342 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1343 | XChangeGC (xdisp, gc, GCForeground, &gcvalue); |
1343 | ERASE_ROWS (row, num); |
1344 | ERASE_ROWS (row, num); |
1344 | gcvalue.foreground = pix_colors[Color_fg]; |
1345 | gcvalue.foreground = pix_colors[Color_fg]; |
1345 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1346 | XChangeGC (xdisp, gc, GCForeground, &gcvalue); |
1346 | } |
1347 | } |
1347 | |
1348 | |
1348 | for (; num--; row++) |
1349 | for (; num--; row++) |
1349 | { |
1350 | { |
1350 | scr_blank_screen_mem (ROW(row), rstyle); |
1351 | scr_blank_screen_mem (ROW(row), rstyle); |
… | |
… | |
1649 | if (bgPixmap.pixmap == None) |
1650 | if (bgPixmap.pixmap == None) |
1650 | #endif |
1651 | #endif |
1651 | #if TRANSPARENT |
1652 | #if TRANSPARENT |
1652 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
1653 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
1653 | #endif |
1654 | #endif |
1654 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
1655 | XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); |
1655 | |
1656 | |
1656 | XGCValues gcvalue; |
1657 | XGCValues gcvalue; |
1657 | gcvalue.foreground = pix_colors[Color_fg]; |
1658 | gcvalue.foreground = pix_colors[Color_fg]; |
1658 | gcvalue.background = pix_colors[Color_bg]; |
1659 | gcvalue.background = pix_colors[Color_bg]; |
1659 | XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); |
1660 | XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); |
1660 | |
1661 | |
1661 | scr_clear (); |
1662 | scr_clear (); |
1662 | scr_touch (true); |
1663 | scr_touch (true); |
1663 | } |
1664 | } |
1664 | } |
1665 | } |
… | |
… | |
1884 | |
1885 | |
1885 | # ifndef NO_MAPALERT |
1886 | # ifndef NO_MAPALERT |
1886 | # ifdef MAPALERT_OPTION |
1887 | # ifdef MAPALERT_OPTION |
1887 | if (OPTION (Opt_mapAlert)) |
1888 | if (OPTION (Opt_mapAlert)) |
1888 | # endif |
1889 | # endif |
1889 | XMapWindow (display->display, parent[0]); |
1890 | XMapWindow (xdisp, parent[0]); |
1890 | # endif |
1891 | # endif |
1891 | |
1892 | |
1892 | if (OPTION (Opt_visualBell)) |
1893 | if (OPTION (Opt_visualBell)) |
1893 | { |
1894 | { |
1894 | rvideo_bell = true; |
1895 | rvideo_bell = true; |
… | |
… | |
1896 | display->flush (); |
1897 | display->flush (); |
1897 | |
1898 | |
1898 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1899 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1899 | } |
1900 | } |
1900 | else |
1901 | else |
1901 | XBell (display->display, 0); |
1902 | XBell (xdisp, 0); |
1902 | |
1903 | |
1903 | #endif |
1904 | #endif |
1904 | } |
1905 | } |
1905 | |
1906 | |
1906 | /* ------------------------------------------------------------------------- */ |
1907 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
2145 | { |
2146 | { |
2146 | /* also comes here at end if needed because of >= above */ |
2147 | /* also comes here at end if needed because of >= above */ |
2147 | if (wlen < len) |
2148 | if (wlen < len) |
2148 | ::swap (wlen, len); |
2149 | ::swap (wlen, len); |
2149 | |
2150 | |
2150 | XCopyArea (display->display, vt, vt, |
2151 | XCopyArea (xdisp, vt, vt, |
2151 | gc, 0, Row2Pixel (len + i), |
2152 | gc, 0, Row2Pixel (len + i), |
2152 | (unsigned int)this->width, |
2153 | (unsigned int)this->width, |
2153 | (unsigned int)Height2Pixel (wlen - len + 1), |
2154 | (unsigned int)Height2Pixel (wlen - len + 1), |
2154 | 0, Row2Pixel (len)); |
2155 | 0, Row2Pixel (len)); |
2155 | len = -1; |
2156 | len = -1; |
… | |
… | |
2243 | |
2244 | |
2244 | // only do special processing if any attributes are set, which is unlikely |
2245 | // 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)) |
2246 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2246 | { |
2247 | { |
2247 | #if ENABLE_STYLES |
2248 | #if ENABLE_STYLES |
2248 | // force redraw after "careful" characters to avoid pixel droppings |
2249 | // "careful" (too wide) character handling |
2249 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2250 | drp[col + 1] = ~srp[col + 1]; |
|
|
2251 | |
2250 | |
2252 | // include previous careful character(s) if possible, looks nicer (best effort...) |
2251 | // include previous careful character(s) if possible, looks nicer (best effort...) |
2253 | while (text > stp |
2252 | while (text > stp |
2254 | && srp[text - stp - 1] & RS_Careful |
2253 | && srp[text - stp - 1] & RS_Careful |
2255 | && RS_SAME (rend, srp[text - stp - 1])) |
2254 | && RS_SAME (rend, srp[text - stp - 1])) |
2256 | text--, count++, xpixel -= fwidth; |
2255 | text--, count++, xpixel -= fwidth; |
|
|
2256 | |
|
|
2257 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2258 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2259 | drp[col + i + 1] = ~srp[col + i + 1]; |
|
|
2260 | |
|
|
2261 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2262 | 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]; |
2257 | #endif |
2264 | #endif |
2258 | |
2265 | |
2259 | bool invert = rend & RS_RVid; |
2266 | bool invert = rend & RS_RVid; |
2260 | |
2267 | |
2261 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2268 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
… | |
… | |
2345 | |
2352 | |
2346 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2353 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2347 | { |
2354 | { |
2348 | #if ENABLE_FRILLS |
2355 | #if ENABLE_FRILLS |
2349 | if (ISSET_PIXCOLOR (Color_underline)) |
2356 | if (ISSET_PIXCOLOR (Color_underline)) |
2350 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2357 | XSetForeground (xdisp, gc, pix_colors[Color_underline]); |
2351 | else |
2358 | else |
2352 | #endif |
2359 | #endif |
2353 | XSetForeground (display->display, gc, pix_colors[fore]); |
2360 | XSetForeground (xdisp, gc, pix_colors[fore]); |
2354 | |
2361 | |
2355 | XDrawLine (display->display, drawBuffer, gc, |
2362 | XDrawLine (xdisp, drawBuffer, gc, |
2356 | xpixel, ypixel + font->ascent + 1, |
2363 | xpixel, ypixel + font->ascent + 1, |
2357 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2364 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2358 | } |
2365 | } |
2359 | } /* for (col....) */ |
2366 | } /* for (col....) */ |
2360 | } /* for (row....) */ |
2367 | } /* for (row....) */ |
… | |
… | |
2393 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2400 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2394 | cursorwidth++; |
2401 | cursorwidth++; |
2395 | |
2402 | |
2396 | #ifndef NO_CURSORCOLOR |
2403 | #ifndef NO_CURSORCOLOR |
2397 | if (ISSET_PIXCOLOR (Color_cursor)) |
2404 | if (ISSET_PIXCOLOR (Color_cursor)) |
2398 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2405 | XSetForeground (xdisp, gc, pix_colors[Color_cursor]); |
2399 | #endif |
2406 | #endif |
2400 | |
2407 | |
2401 | XDrawRectangle (display->display, drawBuffer, gc, |
2408 | XDrawRectangle (xdisp, drawBuffer, gc, |
2402 | Col2Pixel (col), |
2409 | Col2Pixel (col), |
2403 | Row2Pixel (oldcursor.row), |
2410 | Row2Pixel (oldcursor.row), |
2404 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2411 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2405 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2412 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2406 | } |
2413 | } |
… | |
… | |
2450 | #if XPM_BACKGROUND |
2457 | #if XPM_BACKGROUND |
2451 | && !bgPixmap.pixmap |
2458 | && !bgPixmap.pixmap |
2452 | #endif |
2459 | #endif |
2453 | ) |
2460 | ) |
2454 | { |
2461 | { |
2455 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2462 | XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); |
2456 | XClearWindow (display->display, parent[0]); |
2463 | XClearWindow (xdisp, parent[0]); |
2457 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2464 | XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); |
2458 | #if HAVE_SCROLLBARS |
2465 | #if HAVE_SCROLLBARS |
2459 | if (scrollBar.win) |
2466 | if (scrollBar.win) |
2460 | { |
2467 | { |
2461 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2468 | XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); |
2462 | scrollBar.setIdle (); |
2469 | scrollBar.setIdle (); |
2463 | scrollbar_show (0); |
2470 | scrollbar_show (0); |
2464 | } |
2471 | } |
2465 | #endif |
2472 | #endif |
2466 | } |
2473 | } |
… | |
… | |
2479 | |
2486 | |
2480 | num_scr_allow = 0; |
2487 | num_scr_allow = 0; |
2481 | want_refresh = 1; |
2488 | want_refresh = 1; |
2482 | |
2489 | |
2483 | if (really) |
2490 | if (really) |
2484 | XClearWindow (display->display, vt); |
2491 | XClearWindow (xdisp, vt); |
2485 | } |
2492 | } |
2486 | |
2493 | |
2487 | void |
2494 | 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 |
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 |
2489 | { |
2496 | { |
… | |
… | |
2664 | } |
2671 | } |
2665 | |
2672 | |
2666 | unsigned long bytes_after; |
2673 | unsigned long bytes_after; |
2667 | XTextProperty ct; |
2674 | XTextProperty ct; |
2668 | |
2675 | |
2669 | if (XGetWindowProperty (display->display, win, prop, |
2676 | if (XGetWindowProperty (xdisp, win, prop, |
2670 | 0, PROP_SIZE / 4, |
2677 | 0, PROP_SIZE / 4, |
2671 | delete_prop, AnyPropertyType, |
2678 | delete_prop, AnyPropertyType, |
2672 | &ct.encoding, &ct.format, |
2679 | &ct.encoding, &ct.format, |
2673 | &ct.nitems, &bytes_after, |
2680 | &ct.nitems, &bytes_after, |
2674 | &ct.value) != Success) |
2681 | &ct.value) != Success) |
… | |
… | |
2683 | if (bytes_after) |
2690 | if (bytes_after) |
2684 | { |
2691 | { |
2685 | // fetch and append remaining data |
2692 | // fetch and append remaining data |
2686 | XTextProperty ct2; |
2693 | XTextProperty ct2; |
2687 | |
2694 | |
2688 | if (XGetWindowProperty (display->display, win, prop, |
2695 | if (XGetWindowProperty (xdisp, win, prop, |
2689 | ct.nitems / 4, (bytes_after + 3) / 4, |
2696 | ct.nitems / 4, (bytes_after + 3) / 4, |
2690 | delete_prop, AnyPropertyType, |
2697 | delete_prop, AnyPropertyType, |
2691 | &ct2.encoding, &ct2.format, |
2698 | &ct2.encoding, &ct2.format, |
2692 | &ct2.nitems, &bytes_after, |
2699 | &ct2.nitems, &bytes_after, |
2693 | &ct2.value) != Success) |
2700 | &ct2.value) != Success) |
… | |
… | |
2706 | |
2713 | |
2707 | if (ct.encoding == xa[XA_INCR]) |
2714 | if (ct.encoding == xa[XA_INCR]) |
2708 | { |
2715 | { |
2709 | // INCR selection, start handshake |
2716 | // INCR selection, start handshake |
2710 | if (!delete_prop) |
2717 | if (!delete_prop) |
2711 | XDeleteProperty (display->display, win, prop); |
2718 | XDeleteProperty (xdisp, win, prop); |
2712 | |
2719 | |
2713 | selection_wait = Sel_incr; |
2720 | selection_wait = Sel_incr; |
2714 | incr_buf_fill = 0; |
2721 | incr_buf_fill = 0; |
2715 | incr_ev.start (NOW + 10); |
2722 | incr_ev.start (NOW + 10); |
2716 | |
2723 | |
… | |
… | |
2777 | paste (s, strlen (s)); |
2784 | paste (s, strlen (s)); |
2778 | free (s); |
2785 | free (s); |
2779 | } |
2786 | } |
2780 | else |
2787 | else |
2781 | #endif |
2788 | #endif |
2782 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2789 | if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 |
2783 | && cl) |
2790 | && cl) |
2784 | { |
2791 | { |
2785 | for (int i = 0; i < cr; i++) |
2792 | for (int i = 0; i < cr; i++) |
2786 | paste (cl[i], strlen (cl[i])); |
2793 | paste (cl[i], strlen (cl[i])); |
2787 | |
2794 | |
… | |
… | |
2869 | else if (selnum == Sel_Secondary) |
2876 | else if (selnum == Sel_Secondary) |
2870 | sel = XA_SECONDARY; |
2877 | sel = XA_SECONDARY; |
2871 | else |
2878 | else |
2872 | sel = xa[XA_CLIPBOARD]; |
2879 | sel = xa[XA_CLIPBOARD]; |
2873 | |
2880 | |
2874 | if (XGetSelectionOwner (display->display, sel) != None) |
2881 | if (XGetSelectionOwner (xdisp, sel) != None) |
2875 | { |
2882 | { |
2876 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2883 | XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], |
2877 | vt, selection_request_time); |
2884 | vt, selection_request_time); |
2878 | return 1; |
2885 | return 1; |
2879 | } |
2886 | } |
2880 | |
2887 | |
2881 | return 0; |
2888 | return 0; |
… | |
… | |
3034 | bool |
3041 | bool |
3035 | rxvt_term::selection_grab (Time tm) NOTHROW |
3042 | rxvt_term::selection_grab (Time tm) NOTHROW |
3036 | { |
3043 | { |
3037 | selection_time = tm; |
3044 | selection_time = tm; |
3038 | |
3045 | |
3039 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3046 | XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); |
3040 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3047 | if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) |
3041 | { |
3048 | { |
3042 | display->set_selection_owner (this); |
3049 | display->set_selection_owner (this); |
3043 | return true; |
3050 | return true; |
3044 | } |
3051 | } |
3045 | else |
3052 | else |
… | |
… | |
3049 | } |
3056 | } |
3050 | |
3057 | |
3051 | #if 0 |
3058 | #if 0 |
3052 | XTextProperty ct; |
3059 | XTextProperty ct; |
3053 | |
3060 | |
3054 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3061 | if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) |
3055 | { |
3062 | { |
3056 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3063 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3057 | XFree (ct.value); |
3064 | XFree (ct.value); |
3058 | } |
3065 | } |
3059 | #endif |
3066 | #endif |
… | |
… | |
3507 | */ |
3514 | */ |
3508 | void |
3515 | void |
3509 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3516 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3510 | { |
3517 | { |
3511 | XSelectionEvent ev; |
3518 | XSelectionEvent ev; |
3512 | dDisp; |
|
|
3513 | |
3519 | |
3514 | ev.type = SelectionNotify; |
3520 | ev.type = SelectionNotify; |
3515 | ev.property = None; |
3521 | ev.property = None; |
3516 | ev.display = rq.display; |
3522 | ev.display = rq.display; |
3517 | ev.requestor = rq.requestor; |
3523 | ev.requestor = rq.requestor; |
… | |
… | |
3531 | *target++ = xa[XA_COMPOUND_TEXT]; |
3537 | *target++ = xa[XA_COMPOUND_TEXT]; |
3532 | #if X_HAVE_UTF8_STRING |
3538 | #if X_HAVE_UTF8_STRING |
3533 | *target++ = xa[XA_UTF8_STRING]; |
3539 | *target++ = xa[XA_UTF8_STRING]; |
3534 | #endif |
3540 | #endif |
3535 | |
3541 | |
3536 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3542 | XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, |
3537 | 32, PropModeReplace, |
3543 | 32, PropModeReplace, |
3538 | (unsigned char *)target_list, target - target_list); |
3544 | (unsigned char *)target_list, target - target_list); |
3539 | ev.property = rq.property; |
3545 | ev.property = rq.property; |
3540 | } |
3546 | } |
3541 | #if TODO // TODO |
3547 | #if TODO // TODO |
… | |
… | |
3544 | /* TODO: Handle MULTIPLE */ |
3550 | /* TODO: Handle MULTIPLE */ |
3545 | } |
3551 | } |
3546 | #endif |
3552 | #endif |
3547 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3553 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3548 | { |
3554 | { |
3549 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3555 | XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, |
3550 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3556 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3551 | ev.property = rq.property; |
3557 | ev.property = rq.property; |
3552 | } |
3558 | } |
3553 | else if (rq.target == XA_STRING |
3559 | else if (rq.target == XA_STRING |
3554 | || rq.target == xa[XA_TEXT] |
3560 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3612 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3618 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3613 | ct.nitems = strlen ((char *)ct.value); |
3619 | ct.nitems = strlen ((char *)ct.value); |
3614 | } |
3620 | } |
3615 | else |
3621 | else |
3616 | #endif |
3622 | #endif |
3617 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3623 | if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3618 | freect = 1; |
3624 | freect = 1; |
3619 | else |
3625 | else |
3620 | { |
3626 | { |
3621 | /* if we failed to convert then send it raw */ |
3627 | /* if we failed to convert then send it raw */ |
3622 | ct.value = (unsigned char *)cl; |
3628 | ct.value = (unsigned char *)cl; |
3623 | ct.nitems = selectlen; |
3629 | ct.nitems = selectlen; |
3624 | ct.encoding = target; |
3630 | ct.encoding = target; |
3625 | } |
3631 | } |
3626 | |
3632 | |
3627 | XChangeProperty (disp, rq.requestor, rq.property, |
3633 | XChangeProperty (xdisp, rq.requestor, rq.property, |
3628 | ct.encoding, 8, PropModeReplace, |
3634 | ct.encoding, 8, PropModeReplace, |
3629 | ct.value, (int)ct.nitems); |
3635 | ct.value, (int)ct.nitems); |
3630 | ev.property = rq.property; |
3636 | ev.property = rq.property; |
3631 | |
3637 | |
3632 | if (freect) |
3638 | if (freect) |
3633 | XFree (ct.value); |
3639 | XFree (ct.value); |
3634 | } |
3640 | } |
3635 | |
3641 | |
3636 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3642 | XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); |
3637 | } |
3643 | } |
3638 | |
3644 | |
3639 | /* ------------------------------------------------------------------------- * |
3645 | /* ------------------------------------------------------------------------- * |
3640 | * MOUSE ROUTINES * |
3646 | * MOUSE ROUTINES * |
3641 | * ------------------------------------------------------------------------- */ |
3647 | * ------------------------------------------------------------------------- */ |
… | |
… | |
3657 | void |
3663 | void |
3658 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3664 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3659 | { |
3665 | { |
3660 | XWindowAttributes xwa; |
3666 | XWindowAttributes xwa; |
3661 | |
3667 | |
3662 | XGetWindowAttributes (display->display, vt, &xwa); |
3668 | XGetWindowAttributes (xdisp, vt, &xwa); |
3663 | |
3669 | |
3664 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3670 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3665 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3671 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3666 | } |
3672 | } |
3667 | #endif |
3673 | #endif |
… | |
… | |
3763 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3769 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3764 | { |
3770 | { |
3765 | while (*s) |
3771 | while (*s) |
3766 | { |
3772 | { |
3767 | text_t t = *s++; |
3773 | text_t t = *s++; |
3768 | int width = wcwidth (t); |
3774 | int width = WCWIDTH (t); |
3769 | |
3775 | |
3770 | while (width--) |
3776 | while (width--) |
3771 | { |
3777 | { |
3772 | scr_overlay_set (x++, y, t); |
3778 | scr_overlay_set (x++, y, t); |
3773 | t = NOCHAR; |
3779 | t = NOCHAR; |