… | |
… | |
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 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
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 | XCopyArea (xdisp, vt, vt, |
2154 | XCopyArea (dpy, vt, vt, |
2155 | gc, 0, Row2Pixel (len + i), |
2155 | gc, 0, Row2Pixel (len + i), |
2156 | (unsigned int)this->width, |
2156 | (unsigned int)this->width, |
2157 | (unsigned int)Height2Pixel (wlen - len + 1), |
2157 | (unsigned int)Height2Pixel (wlen - len + 1), |
2158 | 0, Row2Pixel (len)); |
2158 | 0, Row2Pixel (len)); |
2159 | len = -1; |
2159 | len = -1; |
… | |
… | |
2329 | * Actually do the drawing of the string here |
2329 | * Actually do the drawing of the string here |
2330 | */ |
2330 | */ |
2331 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2331 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2332 | |
2332 | |
2333 | if (back == fore) |
2333 | if (back == fore) |
2334 | font->clear_rect (*drawable, xpixel, ypixel, |
2334 | font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back); |
2335 | fwidth * count, fheight, |
|
|
2336 | back); |
|
|
2337 | else if (back == Color_bg) |
2335 | else if (back == Color_bg) |
2338 | { |
2336 | { |
2339 | if (must_clear) |
2337 | if (must_clear) |
2340 | { |
2338 | { |
2341 | CLEAR_CHARS (xpixel, ypixel, count); |
2339 | CLEAR_CHARS (xpixel, ypixel, count); |
… | |
… | |
2355 | |
2353 | |
2356 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2354 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2357 | { |
2355 | { |
2358 | #if ENABLE_FRILLS |
2356 | #if ENABLE_FRILLS |
2359 | if (ISSET_PIXCOLOR (Color_underline)) |
2357 | if (ISSET_PIXCOLOR (Color_underline)) |
2360 | XSetForeground (xdisp, gc, pix_colors[Color_underline]); |
2358 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2361 | else |
2359 | else |
2362 | #endif |
2360 | #endif |
2363 | XSetForeground (xdisp, gc, pix_colors[fore]); |
2361 | XSetForeground (dpy, gc, pix_colors[fore]); |
2364 | |
2362 | |
2365 | XDrawLine (xdisp, drawBuffer, gc, |
2363 | XDrawLine (dpy, drawBuffer, gc, |
2366 | xpixel, ypixel + font->ascent + 1, |
2364 | xpixel, ypixel + font->ascent + 1, |
2367 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2365 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2368 | } |
2366 | } |
2369 | } /* for (col....) */ |
2367 | } /* for (col....) */ |
2370 | } /* for (row....) */ |
2368 | } /* for (row....) */ |
… | |
… | |
2403 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2401 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2404 | cursorwidth++; |
2402 | cursorwidth++; |
2405 | |
2403 | |
2406 | #ifndef NO_CURSORCOLOR |
2404 | #ifndef NO_CURSORCOLOR |
2407 | if (ISSET_PIXCOLOR (Color_cursor)) |
2405 | if (ISSET_PIXCOLOR (Color_cursor)) |
2408 | XSetForeground (xdisp, gc, pix_colors[Color_cursor]); |
2406 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2409 | #endif |
2407 | #endif |
2410 | |
2408 | |
2411 | XDrawRectangle (xdisp, drawBuffer, gc, |
2409 | XDrawRectangle (dpy, drawBuffer, gc, |
2412 | Col2Pixel (col), |
2410 | Col2Pixel (col), |
2413 | Row2Pixel (oldcursor.row), |
2411 | Row2Pixel (oldcursor.row), |
2414 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2412 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2415 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2413 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2416 | } |
2414 | } |
… | |
… | |
2460 | #if XPM_BACKGROUND |
2458 | #if XPM_BACKGROUND |
2461 | && !bgPixmap.pixmap |
2459 | && !bgPixmap.pixmap |
2462 | #endif |
2460 | #endif |
2463 | ) |
2461 | ) |
2464 | { |
2462 | { |
2465 | XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); |
2463 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2466 | XClearWindow (xdisp, parent[0]); |
2464 | XClearWindow (dpy, parent[0]); |
2467 | XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); |
2465 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2468 | #if HAVE_SCROLLBARS |
2466 | #if HAVE_SCROLLBARS |
2469 | if (scrollBar.win) |
2467 | if (scrollBar.win) |
2470 | { |
2468 | { |
2471 | XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); |
2469 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2472 | scrollBar.setIdle (); |
2470 | scrollBar.setIdle (); |
2473 | scrollbar_show (0); |
2471 | scrollbar_show (0); |
2474 | } |
2472 | } |
2475 | #endif |
2473 | #endif |
2476 | } |
2474 | } |
… | |
… | |
2489 | |
2487 | |
2490 | num_scr_allow = 0; |
2488 | num_scr_allow = 0; |
2491 | want_refresh = 1; |
2489 | want_refresh = 1; |
2492 | |
2490 | |
2493 | if (really) |
2491 | if (really) |
2494 | XClearWindow (xdisp, vt); |
2492 | XClearWindow (dpy, vt); |
2495 | } |
2493 | } |
2496 | |
2494 | |
2497 | void |
2495 | 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 |
2496 | 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 | { |
2497 | { |
… | |
… | |
2548 | { |
2546 | { |
2549 | if (selection.op |
2547 | if (selection.op |
2550 | && current_screen == selection.screen |
2548 | && current_screen == selection.screen |
2551 | && selection.end.row >= view_start) |
2549 | && selection.end.row >= view_start) |
2552 | { |
2550 | { |
2553 | #if ENABLE_FRILLS |
2551 | #if !ENABLE_MINIMAL |
2554 | if (selection.rect) |
2552 | if (selection.rect) |
2555 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2553 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2556 | selection.end.row, selection.end.col, |
2554 | selection.end.row, selection.end.col, |
2557 | RS_RVid, RS_RVid | RS_Uline); |
2555 | RS_RVid, RS_RVid | RS_Uline); |
2558 | else |
2556 | else |
… | |
… | |
2674 | } |
2672 | } |
2675 | |
2673 | |
2676 | unsigned long bytes_after; |
2674 | unsigned long bytes_after; |
2677 | XTextProperty ct; |
2675 | XTextProperty ct; |
2678 | |
2676 | |
2679 | if (XGetWindowProperty (xdisp, win, prop, |
2677 | if (XGetWindowProperty (dpy, win, prop, |
2680 | 0, PROP_SIZE / 4, |
2678 | 0, PROP_SIZE / 4, |
2681 | delete_prop, AnyPropertyType, |
2679 | delete_prop, AnyPropertyType, |
2682 | &ct.encoding, &ct.format, |
2680 | &ct.encoding, &ct.format, |
2683 | &ct.nitems, &bytes_after, |
2681 | &ct.nitems, &bytes_after, |
2684 | &ct.value) != Success) |
2682 | &ct.value) != Success) |
… | |
… | |
2693 | if (bytes_after) |
2691 | if (bytes_after) |
2694 | { |
2692 | { |
2695 | // fetch and append remaining data |
2693 | // fetch and append remaining data |
2696 | XTextProperty ct2; |
2694 | XTextProperty ct2; |
2697 | |
2695 | |
2698 | if (XGetWindowProperty (xdisp, win, prop, |
2696 | if (XGetWindowProperty (dpy, win, prop, |
2699 | ct.nitems / 4, (bytes_after + 3) / 4, |
2697 | ct.nitems / 4, (bytes_after + 3) / 4, |
2700 | delete_prop, AnyPropertyType, |
2698 | delete_prop, AnyPropertyType, |
2701 | &ct2.encoding, &ct2.format, |
2699 | &ct2.encoding, &ct2.format, |
2702 | &ct2.nitems, &bytes_after, |
2700 | &ct2.nitems, &bytes_after, |
2703 | &ct2.value) != Success) |
2701 | &ct2.value) != Success) |
… | |
… | |
2716 | |
2714 | |
2717 | if (ct.encoding == xa[XA_INCR]) |
2715 | if (ct.encoding == xa[XA_INCR]) |
2718 | { |
2716 | { |
2719 | // INCR selection, start handshake |
2717 | // INCR selection, start handshake |
2720 | if (!delete_prop) |
2718 | if (!delete_prop) |
2721 | XDeleteProperty (xdisp, win, prop); |
2719 | XDeleteProperty (dpy, win, prop); |
2722 | |
2720 | |
2723 | selection_wait = Sel_incr; |
2721 | selection_wait = Sel_incr; |
2724 | incr_buf_fill = 0; |
2722 | incr_buf_fill = 0; |
2725 | incr_ev.start (NOW + 10); |
2723 | incr_ev.start (NOW + 10); |
2726 | |
2724 | |
… | |
… | |
2773 | } |
2771 | } |
2774 | |
2772 | |
2775 | char **cl; |
2773 | char **cl; |
2776 | int cr; |
2774 | int cr; |
2777 | |
2775 | |
2778 | #if ENABLE_FRILLS |
2776 | #if !ENABLE_MINIMAL |
2779 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2777 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2780 | // so recode it manually |
2778 | // so recode it manually |
2781 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2779 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2782 | { |
2780 | { |
2783 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2781 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
… | |
… | |
2787 | paste (s, strlen (s)); |
2785 | paste (s, strlen (s)); |
2788 | free (s); |
2786 | free (s); |
2789 | } |
2787 | } |
2790 | else |
2788 | else |
2791 | #endif |
2789 | #endif |
2792 | if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 |
2790 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
2793 | && cl) |
2791 | && cl) |
2794 | { |
2792 | { |
2795 | for (int i = 0; i < cr; i++) |
2793 | for (int i = 0; i < cr; i++) |
2796 | paste (cl[i], strlen (cl[i])); |
2794 | paste (cl[i], strlen (cl[i])); |
2797 | |
2795 | |
… | |
… | |
2879 | else if (selnum == Sel_Secondary) |
2877 | else if (selnum == Sel_Secondary) |
2880 | sel = XA_SECONDARY; |
2878 | sel = XA_SECONDARY; |
2881 | else |
2879 | else |
2882 | sel = xa[XA_CLIPBOARD]; |
2880 | sel = xa[XA_CLIPBOARD]; |
2883 | |
2881 | |
2884 | if (XGetSelectionOwner (xdisp, sel) != None) |
2882 | if (XGetSelectionOwner (dpy, sel) != None) |
2885 | { |
2883 | { |
2886 | XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], |
2884 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
2887 | vt, selection_request_time); |
2885 | vt, selection_request_time); |
2888 | return 1; |
2886 | return 1; |
2889 | } |
2887 | } |
2890 | |
2888 | |
2891 | return 0; |
2889 | return 0; |
… | |
… | |
2954 | |
2952 | |
2955 | int end_col; |
2953 | int end_col; |
2956 | |
2954 | |
2957 | for (; row <= selection.end.row; row++, col = 0) |
2955 | for (; row <= selection.end.row; row++, col = 0) |
2958 | { |
2956 | { |
2959 | #if ENABLE_FRILLS |
2957 | #if !ENABLE_MINIMAL |
2960 | if (selection.rect) |
2958 | if (selection.rect) |
2961 | { |
2959 | { |
2962 | col = selection.beg.col; |
2960 | col = selection.beg.col; |
2963 | end_col = ncol + 1; |
2961 | end_col = ncol + 1; |
2964 | } |
2962 | } |
… | |
… | |
2967 | end_col = ROW(row).l; |
2965 | end_col = ROW(row).l; |
2968 | |
2966 | |
2969 | col = max (col, 0); |
2967 | col = max (col, 0); |
2970 | |
2968 | |
2971 | if (row == selection.end.row |
2969 | if (row == selection.end.row |
2972 | #if ENABLE_FRILLS |
2970 | #if !ENABLE_MINIMAL |
2973 | || selection.rect |
2971 | || selection.rect |
2974 | #endif |
2972 | #endif |
2975 | ) |
2973 | ) |
2976 | min_it (end_col, selection.end.col); |
2974 | min_it (end_col, selection.end.col); |
2977 | |
2975 | |
… | |
… | |
3000 | #endif |
2998 | #endif |
3001 | else |
2999 | else |
3002 | new_selection_text[ofs++] = *t++; |
3000 | new_selection_text[ofs++] = *t++; |
3003 | } |
3001 | } |
3004 | |
3002 | |
3005 | #if ENABLE_FRILLS |
3003 | #if !ENABLE_MINIMAL |
3006 | if (selection.rect) |
3004 | if (selection.rect) |
3007 | { |
3005 | { |
3008 | while (ofs |
3006 | while (ofs |
3009 | && new_selection_text[ofs - 1] != C0_LF |
3007 | && new_selection_text[ofs - 1] != C0_LF |
3010 | && unicode::is_space (new_selection_text[ofs - 1])) |
3008 | && unicode::is_space (new_selection_text[ofs - 1])) |
… | |
… | |
3044 | bool |
3042 | bool |
3045 | rxvt_term::selection_grab (Time tm) NOTHROW |
3043 | rxvt_term::selection_grab (Time tm) NOTHROW |
3046 | { |
3044 | { |
3047 | selection_time = tm; |
3045 | selection_time = tm; |
3048 | |
3046 | |
3049 | XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); |
3047 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3050 | if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) |
3048 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3051 | { |
3049 | { |
3052 | display->set_selection_owner (this); |
3050 | display->set_selection_owner (this); |
3053 | return true; |
3051 | return true; |
3054 | } |
3052 | } |
3055 | else |
3053 | else |
… | |
… | |
3059 | } |
3057 | } |
3060 | |
3058 | |
3061 | #if 0 |
3059 | #if 0 |
3062 | XTextProperty ct; |
3060 | XTextProperty ct; |
3063 | |
3061 | |
3064 | if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) |
3062 | if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) |
3065 | { |
3063 | { |
3066 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3064 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3067 | XFree (ct.value); |
3065 | XFree (ct.value); |
3068 | } |
3066 | } |
3069 | #endif |
3067 | #endif |
… | |
… | |
3371 | |
3369 | |
3372 | if (selection.clicks == 1) |
3370 | if (selection.clicks == 1) |
3373 | { |
3371 | { |
3374 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3372 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3375 | && !ROW(selection.beg.row).is_longer () |
3373 | && !ROW(selection.beg.row).is_longer () |
3376 | #if ENABLE_FRILLS |
3374 | #if !ENABLE_MINIMAL |
3377 | && !selection.rect |
3375 | && !selection.rect |
3378 | #endif |
3376 | #endif |
3379 | ) |
3377 | ) |
3380 | selection.beg.col = ncol; |
3378 | selection.beg.col = ncol; |
3381 | |
3379 | |
3382 | if ( |
3380 | if ( |
3383 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3381 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3384 | && !ROW(selection.end.row).is_longer () |
3382 | && !ROW(selection.end.row).is_longer () |
3385 | #if ENABLE_FRILLS |
3383 | #if !ENABLE_MINIMAL |
3386 | && !selection.rect |
3384 | && !selection.rect |
3387 | #endif |
3385 | #endif |
3388 | ) |
3386 | ) |
3389 | selection.end.col = ncol; |
3387 | selection.end.col = ncol; |
3390 | } |
3388 | } |
… | |
… | |
3407 | { |
3405 | { |
3408 | if (!ROW(end_row).is_longer ()) |
3406 | if (!ROW(end_row).is_longer ()) |
3409 | { |
3407 | { |
3410 | selection.end.row = end_row; |
3408 | selection.end.row = end_row; |
3411 | selection.end.col = ROW(end_row).l; |
3409 | selection.end.col = ROW(end_row).l; |
|
|
3410 | # if !ENABLE_MINIMAL |
3412 | selection_remove_trailing_spaces (); |
3411 | selection_remove_trailing_spaces (); |
|
|
3412 | # endif |
3413 | break; |
3413 | break; |
3414 | } |
3414 | } |
3415 | } |
3415 | } |
3416 | } |
3416 | } |
3417 | else |
3417 | else |
… | |
… | |
3446 | selection.mark.row = selection.beg.row; |
3446 | selection.mark.row = selection.beg.row; |
3447 | selection.mark.col = selection.beg.col; |
3447 | selection.mark.col = selection.beg.col; |
3448 | } |
3448 | } |
3449 | } |
3449 | } |
3450 | |
3450 | |
3451 | #if ENABLE_FRILLS |
3451 | #if !ENABLE_MINIMAL |
3452 | if (selection.rect && selection.beg.col > selection.end.col) |
3452 | if (selection.rect && selection.beg.col > selection.end.col) |
3453 | ::swap (selection.beg.col, selection.end.col); |
3453 | ::swap (selection.beg.col, selection.end.col); |
3454 | #endif |
3454 | #endif |
3455 | } |
3455 | } |
3456 | |
3456 | |
3457 | #if ENABLE_FRILLS |
3457 | #if !ENABLE_MINIMAL |
3458 | void |
3458 | void |
3459 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3459 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3460 | { |
3460 | { |
3461 | int32_t end_col, end_row; |
3461 | int32_t end_col, end_row; |
3462 | text_t *stp; |
3462 | text_t *stp; |
… | |
… | |
3540 | *target++ = xa[XA_COMPOUND_TEXT]; |
3540 | *target++ = xa[XA_COMPOUND_TEXT]; |
3541 | #if X_HAVE_UTF8_STRING |
3541 | #if X_HAVE_UTF8_STRING |
3542 | *target++ = xa[XA_UTF8_STRING]; |
3542 | *target++ = xa[XA_UTF8_STRING]; |
3543 | #endif |
3543 | #endif |
3544 | |
3544 | |
3545 | XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, |
3545 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3546 | 32, PropModeReplace, |
3546 | 32, PropModeReplace, |
3547 | (unsigned char *)target_list, target - target_list); |
3547 | (unsigned char *)target_list, target - target_list); |
3548 | ev.property = rq.property; |
3548 | ev.property = rq.property; |
3549 | } |
3549 | } |
3550 | #if TODO // TODO |
3550 | #if TODO // TODO |
… | |
… | |
3553 | /* TODO: Handle MULTIPLE */ |
3553 | /* TODO: Handle MULTIPLE */ |
3554 | } |
3554 | } |
3555 | #endif |
3555 | #endif |
3556 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3556 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3557 | { |
3557 | { |
3558 | XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, |
3558 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3559 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3559 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3560 | ev.property = rq.property; |
3560 | ev.property = rq.property; |
3561 | } |
3561 | } |
3562 | else if (rq.target == XA_STRING |
3562 | else if (rq.target == XA_STRING |
3563 | || rq.target == xa[XA_TEXT] |
3563 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3587 | style = enc_string; |
3587 | style = enc_string; |
3588 | else if (target == xa[XA_TEXT]) |
3588 | else if (target == xa[XA_TEXT]) |
3589 | style = enc_text; |
3589 | style = enc_text; |
3590 | else if (target == xa[XA_COMPOUND_TEXT]) |
3590 | else if (target == xa[XA_COMPOUND_TEXT]) |
3591 | style = enc_compound_text; |
3591 | style = enc_compound_text; |
3592 | #if ENABLE_FRILLS |
3592 | #if !ENABLE_MINIMAL |
3593 | else if (target == xa[XA_UTF8_STRING]) |
3593 | else if (target == xa[XA_UTF8_STRING]) |
3594 | style = enc_utf8; |
3594 | style = enc_utf8; |
3595 | #endif |
3595 | #endif |
3596 | else |
3596 | else |
3597 | { |
3597 | { |
… | |
… | |
3608 | { |
3608 | { |
3609 | cl = L""; |
3609 | cl = L""; |
3610 | selectlen = 0; |
3610 | selectlen = 0; |
3611 | } |
3611 | } |
3612 | |
3612 | |
3613 | #if ENABLE_FRILLS |
3613 | #if !ENABLE_MINIMAL |
3614 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3614 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3615 | // so recode it manually |
3615 | // so recode it manually |
3616 | if (style == enc_utf8) |
3616 | if (style == enc_utf8) |
3617 | { |
3617 | { |
3618 | freect = 1; |
3618 | freect = 1; |
… | |
… | |
3621 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3621 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3622 | ct.nitems = strlen ((char *)ct.value); |
3622 | ct.nitems = strlen ((char *)ct.value); |
3623 | } |
3623 | } |
3624 | else |
3624 | else |
3625 | #endif |
3625 | #endif |
3626 | if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3626 | if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3627 | freect = 1; |
3627 | freect = 1; |
3628 | else |
3628 | else |
3629 | { |
3629 | { |
3630 | /* if we failed to convert then send it raw */ |
3630 | /* if we failed to convert then send it raw */ |
3631 | ct.value = (unsigned char *)cl; |
3631 | ct.value = (unsigned char *)cl; |
3632 | ct.nitems = selectlen; |
3632 | ct.nitems = selectlen; |
3633 | ct.encoding = target; |
3633 | ct.encoding = target; |
3634 | } |
3634 | } |
3635 | |
3635 | |
3636 | XChangeProperty (xdisp, rq.requestor, rq.property, |
3636 | XChangeProperty (dpy, rq.requestor, rq.property, |
3637 | ct.encoding, 8, PropModeReplace, |
3637 | ct.encoding, 8, PropModeReplace, |
3638 | ct.value, (int)ct.nitems); |
3638 | ct.value, (int)ct.nitems); |
3639 | ev.property = rq.property; |
3639 | ev.property = rq.property; |
3640 | |
3640 | |
3641 | if (freect) |
3641 | if (freect) |
3642 | XFree (ct.value); |
3642 | XFree (ct.value); |
3643 | } |
3643 | } |
3644 | |
3644 | |
3645 | XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); |
3645 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3646 | } |
3646 | } |
3647 | |
3647 | |
3648 | /* ------------------------------------------------------------------------- * |
3648 | /* ------------------------------------------------------------------------- * |
3649 | * MOUSE ROUTINES * |
3649 | * MOUSE ROUTINES * |
3650 | * ------------------------------------------------------------------------- */ |
3650 | * ------------------------------------------------------------------------- */ |
… | |
… | |
3666 | void |
3666 | void |
3667 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3667 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3668 | { |
3668 | { |
3669 | XWindowAttributes xwa; |
3669 | XWindowAttributes xwa; |
3670 | |
3670 | |
3671 | XGetWindowAttributes (xdisp, vt, &xwa); |
3671 | XGetWindowAttributes (dpy, vt, &xwa); |
3672 | |
3672 | |
3673 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3673 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3674 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3674 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3675 | } |
3675 | } |
3676 | #endif |
3676 | #endif |