… | |
… | |
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. |
… | |
… | |
758 | ZERO_SCROLLBACK (); |
762 | ZERO_SCROLLBACK (); |
759 | |
763 | |
760 | if (minlines > 0) |
764 | if (minlines > 0) |
761 | { |
765 | { |
762 | minlines += screen.cur.row - screen.bscroll; |
766 | minlines += screen.cur.row - screen.bscroll; |
|
|
767 | min_it (minlines, screen.cur.row - top_row); |
763 | |
768 | |
764 | if (minlines > 0 |
769 | if (minlines > 0 |
765 | && screen.tscroll == 0 |
770 | && screen.tscroll == 0 |
766 | && screen.bscroll == nrow - 1) |
771 | && screen.bscroll == nrow - 1) |
767 | { |
772 | { |
… | |
… | |
841 | |
846 | |
842 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
847 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
843 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
848 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
844 | c = 0xfffd; |
849 | c = 0xfffd; |
845 | |
850 | |
846 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
851 | // rely on wcwidth to tell us the character width, do wcwidth before |
847 | // do wcwidth before further replacements, as wcwidth might return -1 |
852 | // 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 |
853 | // drawing characters below as they might be invalid in the current |
849 | // locale. |
854 | // locale. |
850 | int width = c < 0x100 ? 1 : wcwidth (c); |
855 | int width = WCWIDTH (c); |
851 | |
856 | |
852 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
857 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
853 | { |
858 | { |
854 | // vt100 special graphics and line drawing |
859 | // vt100 special graphics and line drawing |
855 | // 5f-7e standard vt100 |
860 | // 5f-7e standard vt100 |
… | |
… | |
1109 | * Process DEC Back Index |
1114 | * Process DEC Back Index |
1110 | * XTERM_SEQ: ESC 6 |
1115 | * XTERM_SEQ: ESC 6 |
1111 | * 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 |
1112 | * in that row right. Clear left column. |
1117 | * in that row right. Clear left column. |
1113 | */ |
1118 | */ |
1114 | #if ENABLE_FRILLS |
1119 | #if !ENABLE_MINIMAL |
1115 | void |
1120 | void |
1116 | rxvt_term::scr_backindex () NOTHROW |
1121 | rxvt_term::scr_backindex () NOTHROW |
1117 | { |
1122 | { |
1118 | if (screen.cur.col > 0) |
1123 | if (screen.cur.col > 0) |
1119 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1124 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1126 | * Process DEC Forward Index |
1131 | * Process DEC Forward Index |
1127 | * XTERM_SEQ: ESC 9 |
1132 | * XTERM_SEQ: ESC 9 |
1128 | * 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 |
1129 | * in that row left. Clear right column. |
1134 | * in that row left. Clear right column. |
1130 | */ |
1135 | */ |
1131 | #if ENABLE_FRILLS |
1136 | #if !ENABLE_MINIMAL |
1132 | void |
1137 | void |
1133 | rxvt_term::scr_forwardindex () NOTHROW |
1138 | rxvt_term::scr_forwardindex () NOTHROW |
1134 | { |
1139 | { |
1135 | if (screen.cur.col < ncol - 1) |
1140 | if (screen.cur.col < ncol - 1) |
1136 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1141 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1337 | } |
1342 | } |
1338 | else |
1343 | else |
1339 | { |
1344 | { |
1340 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1345 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1341 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1346 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1342 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1347 | XChangeGC (xdisp, gc, GCForeground, &gcvalue); |
1343 | ERASE_ROWS (row, num); |
1348 | ERASE_ROWS (row, num); |
1344 | gcvalue.foreground = pix_colors[Color_fg]; |
1349 | gcvalue.foreground = pix_colors[Color_fg]; |
1345 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1350 | XChangeGC (xdisp, gc, GCForeground, &gcvalue); |
1346 | } |
1351 | } |
1347 | |
1352 | |
1348 | for (; num--; row++) |
1353 | for (; num--; row++) |
1349 | { |
1354 | { |
1350 | scr_blank_screen_mem (ROW(row), rstyle); |
1355 | scr_blank_screen_mem (ROW(row), rstyle); |
1351 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1356 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1352 | } |
1357 | } |
1353 | } |
1358 | } |
1354 | |
1359 | |
1355 | #if ENABLE_FRILLS |
1360 | #if !ENABLE_MINIMAL |
1356 | void |
1361 | void |
1357 | rxvt_term::scr_erase_savelines () NOTHROW |
1362 | rxvt_term::scr_erase_savelines () NOTHROW |
1358 | { |
1363 | { |
1359 | want_refresh = 1; |
1364 | want_refresh = 1; |
1360 | ZERO_SCROLLBACK (); |
1365 | ZERO_SCROLLBACK (); |
… | |
… | |
1649 | if (bgPixmap.pixmap == None) |
1654 | if (bgPixmap.pixmap == None) |
1650 | #endif |
1655 | #endif |
1651 | #if TRANSPARENT |
1656 | #if TRANSPARENT |
1652 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
1657 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
1653 | #endif |
1658 | #endif |
1654 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
1659 | XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); |
1655 | |
1660 | |
1656 | XGCValues gcvalue; |
1661 | XGCValues gcvalue; |
1657 | gcvalue.foreground = pix_colors[Color_fg]; |
1662 | gcvalue.foreground = pix_colors[Color_fg]; |
1658 | gcvalue.background = pix_colors[Color_bg]; |
1663 | gcvalue.background = pix_colors[Color_bg]; |
1659 | XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); |
1664 | XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); |
1660 | |
1665 | |
1661 | scr_clear (); |
1666 | scr_clear (); |
1662 | scr_touch (true); |
1667 | scr_touch (true); |
1663 | } |
1668 | } |
1664 | } |
1669 | } |
… | |
… | |
1749 | { |
1754 | { |
1750 | bool found = false; |
1755 | bool found = false; |
1751 | |
1756 | |
1752 | for (int i = 0; i < nrow; i++) |
1757 | for (int i = 0; i < nrow; i++) |
1753 | { |
1758 | { |
1754 | int col = 0; |
|
|
1755 | rend_t *drp = drawn_buf[i].r; |
1759 | rend_t *drp = drawn_buf[i].r; |
1756 | |
1760 | |
1757 | for (; col < ncol; col++, drp++) |
1761 | for (int col = 0; col < ncol; col++, drp++) |
1758 | if ((*drp & mask) == value) |
1762 | if ((*drp & mask) == value) |
1759 | { |
1763 | { |
1760 | found = true; |
1764 | found = true; |
1761 | *drp = ~value; |
1765 | *drp = ~value; |
1762 | } |
1766 | } |
… | |
… | |
1884 | |
1888 | |
1885 | # ifndef NO_MAPALERT |
1889 | # ifndef NO_MAPALERT |
1886 | # ifdef MAPALERT_OPTION |
1890 | # ifdef MAPALERT_OPTION |
1887 | if (OPTION (Opt_mapAlert)) |
1891 | if (OPTION (Opt_mapAlert)) |
1888 | # endif |
1892 | # endif |
1889 | XMapWindow (display->display, parent[0]); |
1893 | XMapWindow (xdisp, parent[0]); |
1890 | # endif |
1894 | # endif |
1891 | |
1895 | |
1892 | if (OPTION (Opt_visualBell)) |
1896 | if (OPTION (Opt_visualBell)) |
1893 | { |
1897 | { |
1894 | rvideo_bell = true; |
1898 | rvideo_bell = true; |
… | |
… | |
1896 | display->flush (); |
1900 | display->flush (); |
1897 | |
1901 | |
1898 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1902 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1899 | } |
1903 | } |
1900 | else |
1904 | else |
1901 | XBell (display->display, 0); |
1905 | XBell (xdisp, 0); |
1902 | |
1906 | |
1903 | #endif |
1907 | #endif |
1904 | } |
1908 | } |
1905 | |
1909 | |
1906 | /* ------------------------------------------------------------------------- */ |
1910 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
2145 | { |
2149 | { |
2146 | /* also comes here at end if needed because of >= above */ |
2150 | /* also comes here at end if needed because of >= above */ |
2147 | if (wlen < len) |
2151 | if (wlen < len) |
2148 | ::swap (wlen, len); |
2152 | ::swap (wlen, len); |
2149 | |
2153 | |
2150 | XCopyArea (display->display, vt, vt, |
2154 | XCopyArea (xdisp, vt, vt, |
2151 | gc, 0, Row2Pixel (len + i), |
2155 | gc, 0, Row2Pixel (len + i), |
2152 | (unsigned int)this->width, |
2156 | (unsigned int)this->width, |
2153 | (unsigned int)Height2Pixel (wlen - len + 1), |
2157 | (unsigned int)Height2Pixel (wlen - len + 1), |
2154 | 0, Row2Pixel (len)); |
2158 | 0, Row2Pixel (len)); |
2155 | len = -1; |
2159 | len = -1; |
… | |
… | |
2243 | |
2247 | |
2244 | // only do special processing if any attributes are set, which is unlikely |
2248 | // 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)) |
2249 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2246 | { |
2250 | { |
2247 | #if ENABLE_STYLES |
2251 | #if ENABLE_STYLES |
2248 | // force redraw after "careful" characters to avoid pixel droppings |
2252 | // "careful" (too wide) character handling |
2249 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2250 | drp[col + 1] = ~srp[col + 1]; |
|
|
2251 | |
2253 | |
2252 | // include previous careful character(s) if possible, looks nicer (best effort...) |
2254 | // include previous careful character(s) if possible, looks nicer (best effort...) |
2253 | while (text > stp |
2255 | while (text > stp |
2254 | && srp[text - stp - 1] & RS_Careful |
2256 | && srp[text - stp - 1] & RS_Careful |
2255 | && RS_SAME (rend, srp[text - stp - 1])) |
2257 | && RS_SAME (rend, srp[text - stp - 1])) |
2256 | text--, count++, xpixel -= fwidth; |
2258 | text--, count++, xpixel -= fwidth; |
|
|
2259 | |
|
|
2260 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2261 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2262 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2263 | |
|
|
2264 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2265 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2266 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
2257 | #endif |
2267 | #endif |
2258 | |
2268 | |
2259 | bool invert = rend & RS_RVid; |
2269 | bool invert = rend & RS_RVid; |
2260 | |
2270 | |
2261 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2271 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
… | |
… | |
2345 | |
2355 | |
2346 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2356 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2347 | { |
2357 | { |
2348 | #if ENABLE_FRILLS |
2358 | #if ENABLE_FRILLS |
2349 | if (ISSET_PIXCOLOR (Color_underline)) |
2359 | if (ISSET_PIXCOLOR (Color_underline)) |
2350 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2360 | XSetForeground (xdisp, gc, pix_colors[Color_underline]); |
2351 | else |
2361 | else |
2352 | #endif |
2362 | #endif |
2353 | XSetForeground (display->display, gc, pix_colors[fore]); |
2363 | XSetForeground (xdisp, gc, pix_colors[fore]); |
2354 | |
2364 | |
2355 | XDrawLine (display->display, drawBuffer, gc, |
2365 | XDrawLine (xdisp, drawBuffer, gc, |
2356 | xpixel, ypixel + font->ascent + 1, |
2366 | xpixel, ypixel + font->ascent + 1, |
2357 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2367 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2358 | } |
2368 | } |
2359 | } /* for (col....) */ |
2369 | } /* for (col....) */ |
2360 | } /* for (row....) */ |
2370 | } /* for (row....) */ |
… | |
… | |
2393 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2403 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2394 | cursorwidth++; |
2404 | cursorwidth++; |
2395 | |
2405 | |
2396 | #ifndef NO_CURSORCOLOR |
2406 | #ifndef NO_CURSORCOLOR |
2397 | if (ISSET_PIXCOLOR (Color_cursor)) |
2407 | if (ISSET_PIXCOLOR (Color_cursor)) |
2398 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2408 | XSetForeground (xdisp, gc, pix_colors[Color_cursor]); |
2399 | #endif |
2409 | #endif |
2400 | |
2410 | |
2401 | XDrawRectangle (display->display, drawBuffer, gc, |
2411 | XDrawRectangle (xdisp, drawBuffer, gc, |
2402 | Col2Pixel (col), |
2412 | Col2Pixel (col), |
2403 | Row2Pixel (oldcursor.row), |
2413 | Row2Pixel (oldcursor.row), |
2404 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2414 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2405 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2415 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2406 | } |
2416 | } |
… | |
… | |
2450 | #if XPM_BACKGROUND |
2460 | #if XPM_BACKGROUND |
2451 | && !bgPixmap.pixmap |
2461 | && !bgPixmap.pixmap |
2452 | #endif |
2462 | #endif |
2453 | ) |
2463 | ) |
2454 | { |
2464 | { |
2455 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2465 | XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); |
2456 | XClearWindow (display->display, parent[0]); |
2466 | XClearWindow (xdisp, parent[0]); |
2457 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2467 | XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); |
2458 | #if HAVE_SCROLLBARS |
2468 | #if HAVE_SCROLLBARS |
2459 | if (scrollBar.win) |
2469 | if (scrollBar.win) |
2460 | { |
2470 | { |
2461 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2471 | XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); |
2462 | scrollBar.setIdle (); |
2472 | scrollBar.setIdle (); |
2463 | scrollbar_show (0); |
2473 | scrollbar_show (0); |
2464 | } |
2474 | } |
2465 | #endif |
2475 | #endif |
2466 | } |
2476 | } |
… | |
… | |
2479 | |
2489 | |
2480 | num_scr_allow = 0; |
2490 | num_scr_allow = 0; |
2481 | want_refresh = 1; |
2491 | want_refresh = 1; |
2482 | |
2492 | |
2483 | if (really) |
2493 | if (really) |
2484 | XClearWindow (display->display, vt); |
2494 | XClearWindow (xdisp, vt); |
2485 | } |
2495 | } |
2486 | |
2496 | |
2487 | void |
2497 | 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 |
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 |
2489 | { |
2499 | { |
… | |
… | |
2538 | { |
2548 | { |
2539 | if (selection.op |
2549 | if (selection.op |
2540 | && current_screen == selection.screen |
2550 | && current_screen == selection.screen |
2541 | && selection.end.row >= view_start) |
2551 | && selection.end.row >= view_start) |
2542 | { |
2552 | { |
2543 | #if ENABLE_FRILLS |
2553 | #if !ENABLE_MINIMAL |
2544 | if (selection.rect) |
2554 | if (selection.rect) |
2545 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2555 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2546 | selection.end.row, selection.end.col, |
2556 | selection.end.row, selection.end.col, |
2547 | RS_RVid, RS_RVid | RS_Uline); |
2557 | RS_RVid, RS_RVid | RS_Uline); |
2548 | else |
2558 | else |
… | |
… | |
2664 | } |
2674 | } |
2665 | |
2675 | |
2666 | unsigned long bytes_after; |
2676 | unsigned long bytes_after; |
2667 | XTextProperty ct; |
2677 | XTextProperty ct; |
2668 | |
2678 | |
2669 | if (XGetWindowProperty (display->display, win, prop, |
2679 | if (XGetWindowProperty (xdisp, win, prop, |
2670 | 0, PROP_SIZE / 4, |
2680 | 0, PROP_SIZE / 4, |
2671 | delete_prop, AnyPropertyType, |
2681 | delete_prop, AnyPropertyType, |
2672 | &ct.encoding, &ct.format, |
2682 | &ct.encoding, &ct.format, |
2673 | &ct.nitems, &bytes_after, |
2683 | &ct.nitems, &bytes_after, |
2674 | &ct.value) != Success) |
2684 | &ct.value) != Success) |
… | |
… | |
2683 | if (bytes_after) |
2693 | if (bytes_after) |
2684 | { |
2694 | { |
2685 | // fetch and append remaining data |
2695 | // fetch and append remaining data |
2686 | XTextProperty ct2; |
2696 | XTextProperty ct2; |
2687 | |
2697 | |
2688 | if (XGetWindowProperty (display->display, win, prop, |
2698 | if (XGetWindowProperty (xdisp, win, prop, |
2689 | ct.nitems / 4, (bytes_after + 3) / 4, |
2699 | ct.nitems / 4, (bytes_after + 3) / 4, |
2690 | delete_prop, AnyPropertyType, |
2700 | delete_prop, AnyPropertyType, |
2691 | &ct2.encoding, &ct2.format, |
2701 | &ct2.encoding, &ct2.format, |
2692 | &ct2.nitems, &bytes_after, |
2702 | &ct2.nitems, &bytes_after, |
2693 | &ct2.value) != Success) |
2703 | &ct2.value) != Success) |
… | |
… | |
2706 | |
2716 | |
2707 | if (ct.encoding == xa[XA_INCR]) |
2717 | if (ct.encoding == xa[XA_INCR]) |
2708 | { |
2718 | { |
2709 | // INCR selection, start handshake |
2719 | // INCR selection, start handshake |
2710 | if (!delete_prop) |
2720 | if (!delete_prop) |
2711 | XDeleteProperty (display->display, win, prop); |
2721 | XDeleteProperty (xdisp, win, prop); |
2712 | |
2722 | |
2713 | selection_wait = Sel_incr; |
2723 | selection_wait = Sel_incr; |
2714 | incr_buf_fill = 0; |
2724 | incr_buf_fill = 0; |
2715 | incr_ev.start (NOW + 10); |
2725 | incr_ev.start (NOW + 10); |
2716 | |
2726 | |
… | |
… | |
2763 | } |
2773 | } |
2764 | |
2774 | |
2765 | char **cl; |
2775 | char **cl; |
2766 | int cr; |
2776 | int cr; |
2767 | |
2777 | |
2768 | #if ENABLE_FRILLS |
2778 | #if !ENABLE_MINIMAL |
2769 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2779 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2770 | // so recode it manually |
2780 | // so recode it manually |
2771 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2781 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2772 | { |
2782 | { |
2773 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2783 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
… | |
… | |
2777 | paste (s, strlen (s)); |
2787 | paste (s, strlen (s)); |
2778 | free (s); |
2788 | free (s); |
2779 | } |
2789 | } |
2780 | else |
2790 | else |
2781 | #endif |
2791 | #endif |
2782 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2792 | if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 |
2783 | && cl) |
2793 | && cl) |
2784 | { |
2794 | { |
2785 | for (int i = 0; i < cr; i++) |
2795 | for (int i = 0; i < cr; i++) |
2786 | paste (cl[i], strlen (cl[i])); |
2796 | paste (cl[i], strlen (cl[i])); |
2787 | |
2797 | |
… | |
… | |
2869 | else if (selnum == Sel_Secondary) |
2879 | else if (selnum == Sel_Secondary) |
2870 | sel = XA_SECONDARY; |
2880 | sel = XA_SECONDARY; |
2871 | else |
2881 | else |
2872 | sel = xa[XA_CLIPBOARD]; |
2882 | sel = xa[XA_CLIPBOARD]; |
2873 | |
2883 | |
2874 | if (XGetSelectionOwner (display->display, sel) != None) |
2884 | if (XGetSelectionOwner (xdisp, sel) != None) |
2875 | { |
2885 | { |
2876 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2886 | XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], |
2877 | vt, selection_request_time); |
2887 | vt, selection_request_time); |
2878 | return 1; |
2888 | return 1; |
2879 | } |
2889 | } |
2880 | |
2890 | |
2881 | return 0; |
2891 | return 0; |
… | |
… | |
2944 | |
2954 | |
2945 | int end_col; |
2955 | int end_col; |
2946 | |
2956 | |
2947 | for (; row <= selection.end.row; row++, col = 0) |
2957 | for (; row <= selection.end.row; row++, col = 0) |
2948 | { |
2958 | { |
2949 | #if ENABLE_FRILLS |
2959 | #if !ENABLE_MINIMAL |
2950 | if (selection.rect) |
2960 | if (selection.rect) |
2951 | { |
2961 | { |
2952 | col = selection.beg.col; |
2962 | col = selection.beg.col; |
2953 | end_col = ncol + 1; |
2963 | end_col = ncol + 1; |
2954 | } |
2964 | } |
… | |
… | |
2957 | end_col = ROW(row).l; |
2967 | end_col = ROW(row).l; |
2958 | |
2968 | |
2959 | col = max (col, 0); |
2969 | col = max (col, 0); |
2960 | |
2970 | |
2961 | if (row == selection.end.row |
2971 | if (row == selection.end.row |
2962 | #if ENABLE_FRILLS |
2972 | #if !ENABLE_MINIMAL |
2963 | || selection.rect |
2973 | || selection.rect |
2964 | #endif |
2974 | #endif |
2965 | ) |
2975 | ) |
2966 | min_it (end_col, selection.end.col); |
2976 | min_it (end_col, selection.end.col); |
2967 | |
2977 | |
… | |
… | |
2990 | #endif |
3000 | #endif |
2991 | else |
3001 | else |
2992 | new_selection_text[ofs++] = *t++; |
3002 | new_selection_text[ofs++] = *t++; |
2993 | } |
3003 | } |
2994 | |
3004 | |
2995 | #if ENABLE_FRILLS |
3005 | #if !ENABLE_MINIMAL |
2996 | if (selection.rect) |
3006 | if (selection.rect) |
2997 | { |
3007 | { |
2998 | while (ofs |
3008 | while (ofs |
2999 | && new_selection_text[ofs - 1] != C0_LF |
3009 | && new_selection_text[ofs - 1] != C0_LF |
3000 | && unicode::is_space (new_selection_text[ofs - 1])) |
3010 | && unicode::is_space (new_selection_text[ofs - 1])) |
… | |
… | |
3034 | bool |
3044 | bool |
3035 | rxvt_term::selection_grab (Time tm) NOTHROW |
3045 | rxvt_term::selection_grab (Time tm) NOTHROW |
3036 | { |
3046 | { |
3037 | selection_time = tm; |
3047 | selection_time = tm; |
3038 | |
3048 | |
3039 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3049 | XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); |
3040 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3050 | if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) |
3041 | { |
3051 | { |
3042 | display->set_selection_owner (this); |
3052 | display->set_selection_owner (this); |
3043 | return true; |
3053 | return true; |
3044 | } |
3054 | } |
3045 | else |
3055 | else |
… | |
… | |
3049 | } |
3059 | } |
3050 | |
3060 | |
3051 | #if 0 |
3061 | #if 0 |
3052 | XTextProperty ct; |
3062 | XTextProperty ct; |
3053 | |
3063 | |
3054 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3064 | if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) |
3055 | { |
3065 | { |
3056 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3066 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3057 | XFree (ct.value); |
3067 | XFree (ct.value); |
3058 | } |
3068 | } |
3059 | #endif |
3069 | #endif |
… | |
… | |
3361 | |
3371 | |
3362 | if (selection.clicks == 1) |
3372 | if (selection.clicks == 1) |
3363 | { |
3373 | { |
3364 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3374 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3365 | && !ROW(selection.beg.row).is_longer () |
3375 | && !ROW(selection.beg.row).is_longer () |
3366 | #if ENABLE_FRILLS |
3376 | #if !ENABLE_MINIMAL |
3367 | && !selection.rect |
3377 | && !selection.rect |
3368 | #endif |
3378 | #endif |
3369 | ) |
3379 | ) |
3370 | selection.beg.col = ncol; |
3380 | selection.beg.col = ncol; |
3371 | |
3381 | |
3372 | if ( |
3382 | if ( |
3373 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3383 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3374 | && !ROW(selection.end.row).is_longer () |
3384 | && !ROW(selection.end.row).is_longer () |
3375 | #if ENABLE_FRILLS |
3385 | #if !ENABLE_MINIMAL |
3376 | && !selection.rect |
3386 | && !selection.rect |
3377 | #endif |
3387 | #endif |
3378 | ) |
3388 | ) |
3379 | selection.end.col = ncol; |
3389 | selection.end.col = ncol; |
3380 | } |
3390 | } |
… | |
… | |
3397 | { |
3407 | { |
3398 | if (!ROW(end_row).is_longer ()) |
3408 | if (!ROW(end_row).is_longer ()) |
3399 | { |
3409 | { |
3400 | selection.end.row = end_row; |
3410 | selection.end.row = end_row; |
3401 | selection.end.col = ROW(end_row).l; |
3411 | selection.end.col = ROW(end_row).l; |
|
|
3412 | # if !ENABLE_MINIMAL |
3402 | selection_remove_trailing_spaces (); |
3413 | selection_remove_trailing_spaces (); |
|
|
3414 | # endif |
3403 | break; |
3415 | break; |
3404 | } |
3416 | } |
3405 | } |
3417 | } |
3406 | } |
3418 | } |
3407 | else |
3419 | else |
… | |
… | |
3436 | selection.mark.row = selection.beg.row; |
3448 | selection.mark.row = selection.beg.row; |
3437 | selection.mark.col = selection.beg.col; |
3449 | selection.mark.col = selection.beg.col; |
3438 | } |
3450 | } |
3439 | } |
3451 | } |
3440 | |
3452 | |
3441 | #if ENABLE_FRILLS |
3453 | #if !ENABLE_MINIMAL |
3442 | if (selection.rect && selection.beg.col > selection.end.col) |
3454 | if (selection.rect && selection.beg.col > selection.end.col) |
3443 | ::swap (selection.beg.col, selection.end.col); |
3455 | ::swap (selection.beg.col, selection.end.col); |
3444 | #endif |
3456 | #endif |
3445 | } |
3457 | } |
3446 | |
3458 | |
3447 | #if ENABLE_FRILLS |
3459 | #if !ENABLE_MINIMAL |
3448 | void |
3460 | void |
3449 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3461 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3450 | { |
3462 | { |
3451 | int32_t end_col, end_row; |
3463 | int32_t end_col, end_row; |
3452 | text_t *stp; |
3464 | text_t *stp; |
… | |
… | |
3507 | */ |
3519 | */ |
3508 | void |
3520 | void |
3509 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3521 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3510 | { |
3522 | { |
3511 | XSelectionEvent ev; |
3523 | XSelectionEvent ev; |
3512 | dDisp; |
|
|
3513 | |
3524 | |
3514 | ev.type = SelectionNotify; |
3525 | ev.type = SelectionNotify; |
3515 | ev.property = None; |
3526 | ev.property = None; |
3516 | ev.display = rq.display; |
3527 | ev.display = rq.display; |
3517 | ev.requestor = rq.requestor; |
3528 | ev.requestor = rq.requestor; |
… | |
… | |
3531 | *target++ = xa[XA_COMPOUND_TEXT]; |
3542 | *target++ = xa[XA_COMPOUND_TEXT]; |
3532 | #if X_HAVE_UTF8_STRING |
3543 | #if X_HAVE_UTF8_STRING |
3533 | *target++ = xa[XA_UTF8_STRING]; |
3544 | *target++ = xa[XA_UTF8_STRING]; |
3534 | #endif |
3545 | #endif |
3535 | |
3546 | |
3536 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3547 | XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, |
3537 | 32, PropModeReplace, |
3548 | 32, PropModeReplace, |
3538 | (unsigned char *)target_list, target - target_list); |
3549 | (unsigned char *)target_list, target - target_list); |
3539 | ev.property = rq.property; |
3550 | ev.property = rq.property; |
3540 | } |
3551 | } |
3541 | #if TODO // TODO |
3552 | #if TODO // TODO |
… | |
… | |
3544 | /* TODO: Handle MULTIPLE */ |
3555 | /* TODO: Handle MULTIPLE */ |
3545 | } |
3556 | } |
3546 | #endif |
3557 | #endif |
3547 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3558 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3548 | { |
3559 | { |
3549 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3560 | XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, |
3550 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3561 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3551 | ev.property = rq.property; |
3562 | ev.property = rq.property; |
3552 | } |
3563 | } |
3553 | else if (rq.target == XA_STRING |
3564 | else if (rq.target == XA_STRING |
3554 | || rq.target == xa[XA_TEXT] |
3565 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3578 | style = enc_string; |
3589 | style = enc_string; |
3579 | else if (target == xa[XA_TEXT]) |
3590 | else if (target == xa[XA_TEXT]) |
3580 | style = enc_text; |
3591 | style = enc_text; |
3581 | else if (target == xa[XA_COMPOUND_TEXT]) |
3592 | else if (target == xa[XA_COMPOUND_TEXT]) |
3582 | style = enc_compound_text; |
3593 | style = enc_compound_text; |
3583 | #if ENABLE_FRILLS |
3594 | #if !ENABLE_MINIMAL |
3584 | else if (target == xa[XA_UTF8_STRING]) |
3595 | else if (target == xa[XA_UTF8_STRING]) |
3585 | style = enc_utf8; |
3596 | style = enc_utf8; |
3586 | #endif |
3597 | #endif |
3587 | else |
3598 | else |
3588 | { |
3599 | { |
… | |
… | |
3599 | { |
3610 | { |
3600 | cl = L""; |
3611 | cl = L""; |
3601 | selectlen = 0; |
3612 | selectlen = 0; |
3602 | } |
3613 | } |
3603 | |
3614 | |
3604 | #if ENABLE_FRILLS |
3615 | #if !ENABLE_MINIMAL |
3605 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3616 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3606 | // so recode it manually |
3617 | // so recode it manually |
3607 | if (style == enc_utf8) |
3618 | if (style == enc_utf8) |
3608 | { |
3619 | { |
3609 | freect = 1; |
3620 | freect = 1; |
… | |
… | |
3612 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3623 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3613 | ct.nitems = strlen ((char *)ct.value); |
3624 | ct.nitems = strlen ((char *)ct.value); |
3614 | } |
3625 | } |
3615 | else |
3626 | else |
3616 | #endif |
3627 | #endif |
3617 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3628 | if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3618 | freect = 1; |
3629 | freect = 1; |
3619 | else |
3630 | else |
3620 | { |
3631 | { |
3621 | /* if we failed to convert then send it raw */ |
3632 | /* if we failed to convert then send it raw */ |
3622 | ct.value = (unsigned char *)cl; |
3633 | ct.value = (unsigned char *)cl; |
3623 | ct.nitems = selectlen; |
3634 | ct.nitems = selectlen; |
3624 | ct.encoding = target; |
3635 | ct.encoding = target; |
3625 | } |
3636 | } |
3626 | |
3637 | |
3627 | XChangeProperty (disp, rq.requestor, rq.property, |
3638 | XChangeProperty (xdisp, rq.requestor, rq.property, |
3628 | ct.encoding, 8, PropModeReplace, |
3639 | ct.encoding, 8, PropModeReplace, |
3629 | ct.value, (int)ct.nitems); |
3640 | ct.value, (int)ct.nitems); |
3630 | ev.property = rq.property; |
3641 | ev.property = rq.property; |
3631 | |
3642 | |
3632 | if (freect) |
3643 | if (freect) |
3633 | XFree (ct.value); |
3644 | XFree (ct.value); |
3634 | } |
3645 | } |
3635 | |
3646 | |
3636 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3647 | XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); |
3637 | } |
3648 | } |
3638 | |
3649 | |
3639 | /* ------------------------------------------------------------------------- * |
3650 | /* ------------------------------------------------------------------------- * |
3640 | * MOUSE ROUTINES * |
3651 | * MOUSE ROUTINES * |
3641 | * ------------------------------------------------------------------------- */ |
3652 | * ------------------------------------------------------------------------- */ |
… | |
… | |
3657 | void |
3668 | void |
3658 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3669 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3659 | { |
3670 | { |
3660 | XWindowAttributes xwa; |
3671 | XWindowAttributes xwa; |
3661 | |
3672 | |
3662 | XGetWindowAttributes (display->display, vt, &xwa); |
3673 | XGetWindowAttributes (xdisp, vt, &xwa); |
3663 | |
3674 | |
3664 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3675 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3665 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3676 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3666 | } |
3677 | } |
3667 | #endif |
3678 | #endif |
… | |
… | |
3763 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3774 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3764 | { |
3775 | { |
3765 | while (*s) |
3776 | while (*s) |
3766 | { |
3777 | { |
3767 | text_t t = *s++; |
3778 | text_t t = *s++; |
3768 | int width = wcwidth (t); |
3779 | int width = WCWIDTH (t); |
3769 | |
3780 | |
3770 | while (width--) |
3781 | while (width--) |
3771 | { |
3782 | { |
3772 | scr_overlay_set (x++, y, t); |
3783 | scr_overlay_set (x++, y, t); |
3773 | t = NOCHAR; |
3784 | t = NOCHAR; |