1 | /*--------------------------------*-C-*--------------------------------------* |
1 | /*---------------------------------------------------------------------------* |
2 | * File: screen.C |
2 | * File: screen.C |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
… | |
… | |
47 | |
47 | |
48 | /* ------------------------------------------------------------------------- * |
48 | /* ------------------------------------------------------------------------- * |
49 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
50 | * ------------------------------------------------------------------------- */ |
50 | * ------------------------------------------------------------------------- */ |
51 | #define ZERO_SCROLLBACK() \ |
51 | #define ZERO_SCROLLBACK() \ |
52 | if (OPTION (Opt_scrollTtyOutput)) \ |
52 | if (option (Opt_scrollTtyOutput)) \ |
53 | view_start = 0 |
53 | view_start = 0 |
54 | #define CLEAR_SELECTION() \ |
54 | #define CLEAR_SELECTION() \ |
55 | selection.beg.row = selection.beg.col \ |
55 | selection.beg.row = selection.beg.col \ |
56 | = selection.end.row = selection.end.col = 0 |
56 | = selection.end.row = selection.end.col = 0 |
57 | #define CLEAR_ALL_SELECTION() \ |
57 | #define CLEAR_ALL_SELECTION() \ |
… | |
… | |
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 (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 (display->display, 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 (display->display, 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 | /* ------------------------------------------------------------------------- * |
… | |
… | |
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 | |
… | |
… | |
409 | prev_nrow = nrow; |
409 | prev_nrow = nrow; |
410 | prev_ncol = ncol; |
410 | prev_ncol = ncol; |
411 | |
411 | |
412 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
412 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
413 | |
413 | |
414 | for (int col = ncol; col--; ) |
414 | for (int col = ncol; --col; ) |
415 | tabs [col] = col % TABSIZE == 0; |
415 | tabs [col] = col % TABSIZE == 0; |
416 | |
416 | |
417 | if (current_screen != PRIMARY) |
417 | if (current_screen != PRIMARY) |
418 | scr_swap_screen (); |
418 | scr_swap_screen (); |
419 | |
419 | |
… | |
… | |
510 | } |
510 | } |
511 | |
511 | |
512 | void |
512 | void |
513 | rxvt_term::scr_swap_screen () |
513 | rxvt_term::scr_swap_screen () |
514 | { |
514 | { |
515 | if (!OPTION (Opt_secondaryScreen)) |
515 | if (!option (Opt_secondaryScreen)) |
516 | return; |
516 | return; |
517 | |
517 | |
518 | for (int i = prev_nrow; i--; ) |
518 | for (int i = prev_nrow; i--; ) |
519 | ::swap (ROW(i), swap_buf [i]); |
519 | ::swap (ROW(i), swap_buf [i]); |
520 | |
520 | |
… | |
… | |
542 | selection_check (2); /* check for boundary cross */ |
542 | selection_check (2); /* check for boundary cross */ |
543 | |
543 | |
544 | int i = current_screen; current_screen = scrn; scrn = i; |
544 | int i = current_screen; current_screen = scrn; scrn = i; |
545 | |
545 | |
546 | #if NSCREENS |
546 | #if NSCREENS |
547 | if (OPTION (Opt_secondaryScreen)) |
547 | if (option (Opt_secondaryScreen)) |
548 | { |
548 | { |
549 | num_scr = 0; |
549 | num_scr = 0; |
550 | |
550 | |
551 | scr_swap_screen (); |
551 | scr_swap_screen (); |
552 | |
552 | |
… | |
… | |
555 | screen.flags |= Screen_VisibleCursor; |
555 | screen.flags |= Screen_VisibleCursor; |
556 | swap.flags |= Screen_VisibleCursor; |
556 | swap.flags |= Screen_VisibleCursor; |
557 | } |
557 | } |
558 | else |
558 | else |
559 | #endif |
559 | #endif |
560 | if (OPTION (Opt_secondaryScroll)) |
560 | if (option (Opt_secondaryScroll)) |
561 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
561 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
562 | } |
562 | } |
563 | |
563 | |
564 | // clear WrapNext indicator, solidifying position on next line |
564 | // clear WrapNext indicator, solidifying position on next line |
565 | void |
565 | void |
… | |
… | |
624 | want_refresh = 1; |
624 | want_refresh = 1; |
625 | num_scr += count; |
625 | num_scr += count; |
626 | |
626 | |
627 | if (count > 0 |
627 | if (count > 0 |
628 | && row1 == 0 |
628 | && row1 == 0 |
629 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
629 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
630 | { |
630 | { |
631 | top_row = max (top_row - count, -saveLines); |
631 | top_row = max (top_row - count, -saveLines); |
632 | |
632 | |
633 | // scroll everything up 'count' lines |
633 | // scroll everything up 'count' lines |
634 | term_start = (term_start + count) % total_rows; |
634 | term_start = (term_start + count) % total_rows; |
… | |
… | |
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_fgMask | 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. |
… | |
… | |
680 | selection.op = SELECTION_CLEAR; |
684 | selection.op = SELECTION_CLEAR; |
681 | } |
685 | } |
682 | } |
686 | } |
683 | |
687 | |
684 | // finally move the view window, if desired |
688 | // finally move the view window, if desired |
685 | if (OPTION (Opt_scrollWithBuffer) |
689 | if (option (Opt_scrollWithBuffer) |
686 | && view_start != 0 |
690 | && view_start != 0 |
687 | && view_start != -saveLines) |
691 | && view_start != -saveLines) |
688 | scr_page (UP, count); |
692 | scr_page (UP, count); |
689 | |
693 | |
690 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
694 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
… | |
… | |
842 | |
846 | |
843 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
847 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
844 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
848 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
845 | c = 0xfffd; |
849 | c = 0xfffd; |
846 | |
850 | |
847 | // 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 |
848 | // do wcwidth before further replacements, as wcwidth might return -1 |
852 | // further replacements, as wcwidth might return -1 for the line |
849 | // 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 |
850 | // locale. |
854 | // locale. |
851 | int width = c < 0x100 ? 1 : wcwidth (c); |
855 | int width = WCWIDTH (c); |
852 | |
856 | |
853 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
857 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
854 | { |
858 | { |
855 | // vt100 special graphics and line drawing |
859 | // vt100 special graphics and line drawing |
856 | // 5f-7e standard vt100 |
860 | // 5f-7e standard vt100 |
… | |
… | |
1067 | if (count) |
1071 | if (count) |
1068 | x = ncol - 1; |
1072 | x = ncol - 1; |
1069 | |
1073 | |
1070 | // store horizontal tab commands as characters inside the text |
1074 | // store horizontal tab commands as characters inside the text |
1071 | // buffer so they can be selected and pasted. |
1075 | // buffer so they can be selected and pasted. |
1072 | if (ht && OPTION (Opt_pastableTabs)) |
1076 | if (ht && option (Opt_pastableTabs)) |
1073 | { |
1077 | { |
1074 | base_rend = SET_FONT (base_rend, 0); |
1078 | base_rend = SET_FONT (base_rend, 0); |
1075 | |
1079 | |
1076 | l.touch (x); |
1080 | l.touch (x); |
1077 | |
1081 | |
… | |
… | |
1110 | * Process DEC Back Index |
1114 | * Process DEC Back Index |
1111 | * XTERM_SEQ: ESC 6 |
1115 | * XTERM_SEQ: ESC 6 |
1112 | * 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 |
1113 | * in that row right. Clear left column. |
1117 | * in that row right. Clear left column. |
1114 | */ |
1118 | */ |
1115 | #if ENABLE_FRILLS |
1119 | #if !ENABLE_MINIMAL |
1116 | void |
1120 | void |
1117 | rxvt_term::scr_backindex () NOTHROW |
1121 | rxvt_term::scr_backindex () NOTHROW |
1118 | { |
1122 | { |
1119 | if (screen.cur.col > 0) |
1123 | if (screen.cur.col > 0) |
1120 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1124 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1127 | * Process DEC Forward Index |
1131 | * Process DEC Forward Index |
1128 | * XTERM_SEQ: ESC 9 |
1132 | * XTERM_SEQ: ESC 9 |
1129 | * 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 |
1130 | * in that row left. Clear right column. |
1134 | * in that row left. Clear right column. |
1131 | */ |
1135 | */ |
1132 | #if ENABLE_FRILLS |
1136 | #if !ENABLE_MINIMAL |
1133 | void |
1137 | void |
1134 | rxvt_term::scr_forwardindex () NOTHROW |
1138 | rxvt_term::scr_forwardindex () NOTHROW |
1135 | { |
1139 | { |
1136 | if (screen.cur.col < ncol - 1) |
1140 | if (screen.cur.col < ncol - 1) |
1137 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1141 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
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 (dpy, 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 (dpy, 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); |
1352 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1356 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1353 | } |
1357 | } |
1354 | } |
1358 | } |
1355 | |
1359 | |
1356 | #if ENABLE_FRILLS |
1360 | #if !ENABLE_MINIMAL |
1357 | void |
1361 | void |
1358 | rxvt_term::scr_erase_savelines () NOTHROW |
1362 | rxvt_term::scr_erase_savelines () NOTHROW |
1359 | { |
1363 | { |
1360 | want_refresh = 1; |
1364 | want_refresh = 1; |
1361 | ZERO_SCROLLBACK (); |
1365 | ZERO_SCROLLBACK (); |
… | |
… | |
1648 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1652 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1649 | #if XPM_BACKGROUND |
1653 | #if XPM_BACKGROUND |
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 (dpy, 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 (dpy, 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 | } |
… | |
… | |
1883 | { |
1886 | { |
1884 | #ifndef NO_BELL |
1887 | #ifndef NO_BELL |
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 (dpy, parent[0]); |
1891 | # endif |
1894 | # endif |
|
|
1895 | # if ENABLE_FRILLS |
|
|
1896 | if (option (Opt_urgentOnBell)) |
|
|
1897 | { |
|
|
1898 | XWMHints *h; |
1892 | |
1899 | |
|
|
1900 | h = XGetWMHints(dpy, parent[0]); |
|
|
1901 | if (h != NULL) |
|
|
1902 | { |
|
|
1903 | h->flags |= XUrgencyHint; |
|
|
1904 | XSetWMHints(dpy, parent[0], h); |
|
|
1905 | } |
|
|
1906 | } |
|
|
1907 | # endif |
|
|
1908 | |
1893 | if (OPTION (Opt_visualBell)) |
1909 | if (option (Opt_visualBell)) |
1894 | { |
1910 | { |
1895 | rvideo_bell = true; |
1911 | rvideo_bell = true; |
1896 | scr_rvideo_mode (rvideo_mode); |
1912 | scr_rvideo_mode (rvideo_mode); |
1897 | display->flush (); |
1913 | display->flush (); |
1898 | |
1914 | |
1899 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1915 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1900 | } |
1916 | } |
1901 | else |
1917 | else |
1902 | XBell (display->display, 0); |
1918 | XBell (dpy, 0); |
1903 | |
1919 | |
1904 | #endif |
1920 | #endif |
1905 | } |
1921 | } |
1906 | |
1922 | |
1907 | /* ------------------------------------------------------------------------- */ |
1923 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1966 | * screen.text/screen.rend contain what the screen will change to. |
1982 | * screen.text/screen.rend contain what the screen will change to. |
1967 | */ |
1983 | */ |
1968 | void |
1984 | void |
1969 | rxvt_term::scr_refresh () NOTHROW |
1985 | rxvt_term::scr_refresh () NOTHROW |
1970 | { |
1986 | { |
1971 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1987 | unsigned char have_bg, |
1972 | showcursor; /* show the cursor */ |
1988 | showcursor; /* show the cursor */ |
1973 | int16_t col, row, /* column/row we're processing */ |
1989 | int16_t col, row, /* column/row we're processing */ |
1974 | ocrow; /* old cursor row */ |
1990 | ocrow; /* old cursor row */ |
1975 | int i; /* tmp */ |
1991 | int i; /* tmp */ |
1976 | #ifndef NO_CURSORCOLOR |
1992 | #ifndef NO_CURSORCOLOR |
1977 | rend_t cc1; /* store colours at cursor position (s) */ |
1993 | rend_t cc1; /* store colours at cursor position (s) */ |
1978 | #endif |
1994 | #endif |
1979 | rend_t *crp; // cursor rendition pointer |
1995 | rend_t *crp; // cursor rendition pointer |
|
|
1996 | rend_t ccol1, /* Cursor colour */ |
|
|
1997 | ccol2; /* Cursor colour2 */ |
1980 | |
1998 | |
1981 | want_refresh = 0; /* screen is current */ |
1999 | want_refresh = 0; /* screen is current */ |
1982 | |
2000 | |
1983 | if (refresh_type == NO_REFRESH || !mapped) |
2001 | if (refresh_type == NO_REFRESH || !mapped) |
1984 | return; |
2002 | return; |
1985 | |
2003 | |
1986 | /* |
2004 | /* |
1987 | * A: set up vars |
2005 | * A: set up vars |
1988 | */ |
2006 | */ |
1989 | must_clear = 0; |
2007 | have_bg = 0; |
1990 | refresh_count = 0; |
2008 | refresh_count = 0; |
1991 | |
2009 | |
1992 | #if XPM_BACKGROUND |
2010 | #if XPM_BACKGROUND |
1993 | must_clear |= bgPixmap.pixmap != None; |
2011 | have_bg |= bgPixmap.pixmap != None; |
1994 | #endif |
2012 | #endif |
1995 | #if TRANSPARENT |
2013 | #if TRANSPARENT |
1996 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
2014 | have_bg |= option (Opt_transparent) && am_transparent; |
1997 | #endif |
2015 | #endif |
1998 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2016 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1999 | |
2017 | |
2000 | /* |
2018 | /* |
2001 | * B: reverse any characters which are selected |
2019 | * B: reverse any characters which are selected |
… | |
… | |
2005 | /* |
2023 | /* |
2006 | * C: set the cursor character (s) |
2024 | * C: set the cursor character (s) |
2007 | */ |
2025 | */ |
2008 | { |
2026 | { |
2009 | unsigned char setoldcursor; |
2027 | unsigned char setoldcursor; |
2010 | rend_t ccol1, /* Cursor colour */ |
|
|
2011 | ccol2; /* Cursor colour2 */ |
|
|
2012 | |
2028 | |
2013 | showcursor = (screen.flags & Screen_VisibleCursor); |
2029 | showcursor = (screen.flags & Screen_VisibleCursor); |
2014 | #ifdef CURSOR_BLINK |
2030 | #ifdef CURSOR_BLINK |
2015 | if (hidden_cursor) |
2031 | if (hidden_cursor) |
2016 | showcursor = 0; |
2032 | showcursor = 0; |
… | |
… | |
2023 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2039 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2024 | col--; |
2040 | col--; |
2025 | |
2041 | |
2026 | crp = &ROW(screen.cur.row).r[col]; |
2042 | crp = &ROW(screen.cur.row).r[col]; |
2027 | |
2043 | |
|
|
2044 | #ifndef NO_CURSORCOLOR |
|
|
2045 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2046 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2047 | ccol1 = Color_cursor; |
|
|
2048 | else |
|
|
2049 | #endif |
|
|
2050 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2051 | ccol1 = fgcolor_of (rstyle); |
|
|
2052 | #else |
|
|
2053 | ccol1 = Color_fg; |
|
|
2054 | #endif |
|
|
2055 | |
|
|
2056 | #ifndef NO_CURSORCOLOR |
|
|
2057 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2058 | ccol2 = Color_cursor2; |
|
|
2059 | else |
|
|
2060 | #endif |
|
|
2061 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2062 | ccol2 = bgcolor_of (rstyle); |
|
|
2063 | #else |
|
|
2064 | ccol2 = Color_bg; |
|
|
2065 | #endif |
|
|
2066 | |
2028 | if (showcursor && focus) |
2067 | if (showcursor && focus) |
2029 | { |
2068 | { |
2030 | if (OPTION (Opt_cursorUnderline)) |
2069 | if (option (Opt_cursorUnderline)) |
2031 | *crp ^= RS_Uline; |
2070 | *crp ^= RS_Uline; |
2032 | else |
2071 | else |
2033 | { |
2072 | { |
2034 | *crp ^= RS_RVid; |
2073 | *crp ^= RS_RVid; |
2035 | |
|
|
2036 | #ifndef NO_CURSORCOLOR |
|
|
2037 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2038 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2039 | ccol1 = Color_cursor; |
|
|
2040 | else |
|
|
2041 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2042 | ccol1 = fgcolor_of (rstyle); |
|
|
2043 | #else |
|
|
2044 | ccol1 = Color_fg; |
|
|
2045 | #endif |
|
|
2046 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2047 | ccol2 = Color_cursor2; |
|
|
2048 | else |
|
|
2049 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2050 | ccol2 = bgcolor_of (rstyle); |
|
|
2051 | #else |
|
|
2052 | ccol2 = Color_bg; |
|
|
2053 | #endif |
|
|
2054 | *crp = SET_FGCOLOR (*crp, ccol1); |
2074 | *crp = SET_FGCOLOR (*crp, ccol1); |
2055 | *crp = SET_BGCOLOR (*crp, ccol2); |
2075 | *crp = SET_BGCOLOR (*crp, ccol2); |
2056 | #endif |
|
|
2057 | } |
2076 | } |
2058 | } |
2077 | } |
2059 | } |
2078 | } |
2060 | |
2079 | |
2061 | /* make sure no outline cursor is left around */ |
2080 | /* make sure no outline cursor is left around */ |
… | |
… | |
2100 | * D: CopyArea pass - very useful for slower links |
2119 | * D: CopyArea pass - very useful for slower links |
2101 | * This has been deliberately kept simple. |
2120 | * This has been deliberately kept simple. |
2102 | */ |
2121 | */ |
2103 | if (!display->is_local |
2122 | if (!display->is_local |
2104 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2123 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2105 | && abs (num_scr) < nrow && !must_clear) |
2124 | && abs (num_scr) < nrow && !have_bg) |
2106 | { |
2125 | { |
2107 | int16_t nits; |
2126 | int16_t nits; |
|
|
2127 | int i = num_scr; |
2108 | int j; |
2128 | int j; |
2109 | int len, wlen; |
2129 | int len, wlen; |
2110 | dLocal (int, num_scr); |
2130 | dLocal (int, num_scr); |
2111 | |
2131 | |
2112 | j = nrow; |
2132 | j = nrow; |
2113 | wlen = len = -1; |
2133 | wlen = len = -1; |
2114 | row = i > 0 ? 0 : j - 1; |
2134 | row = i > 0 ? 0 : j - 1; |
|
|
2135 | |
2115 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2136 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2116 | { |
2137 | { |
2117 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2138 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2118 | { |
2139 | { |
2119 | line_t s = ROW(view_start + row); |
2140 | line_t s = ROW(view_start + row); |
… | |
… | |
2140 | wlen = row; |
2161 | wlen = row; |
2141 | continue; |
2162 | continue; |
2142 | } |
2163 | } |
2143 | } |
2164 | } |
2144 | |
2165 | |
2145 | if (len != -1) |
2166 | if (len >= 0) |
2146 | { |
2167 | { |
2147 | /* also comes here at end if needed because of >= above */ |
2168 | /* also comes here at end if needed because of >= above */ |
2148 | if (wlen < len) |
2169 | if (wlen < len) |
2149 | ::swap (wlen, len); |
2170 | ::swap (wlen, len); |
2150 | |
2171 | |
|
|
2172 | XGCValues gcv; |
|
|
2173 | |
|
|
2174 | gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
2151 | XCopyArea (display->display, vt, vt, |
2175 | XCopyArea (dpy, vt, vt, |
2152 | gc, 0, Row2Pixel (len + i), |
2176 | gc, 0, Row2Pixel (len + i), |
2153 | (unsigned int)this->width, |
2177 | (unsigned int)this->width, |
2154 | (unsigned int)Height2Pixel (wlen - len + 1), |
2178 | (unsigned int)Height2Pixel (wlen - len + 1), |
2155 | 0, Row2Pixel (len)); |
2179 | 0, Row2Pixel (len)); |
|
|
2180 | gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
|
|
2181 | |
2156 | len = -1; |
2182 | len = -1; |
2157 | } |
2183 | } |
2158 | } |
2184 | } |
2159 | } |
2185 | } |
2160 | #endif |
2186 | #endif |
… | |
… | |
2216 | count++; |
2242 | count++; |
2217 | |
2243 | |
2218 | if (stp[col] != dtp[col] |
2244 | if (stp[col] != dtp[col] |
2219 | || !RS_SAME (srp[col], drp[col])) |
2245 | || !RS_SAME (srp[col], drp[col])) |
2220 | { |
2246 | { |
2221 | if (must_clear && (i++ > count / 2)) |
2247 | if (have_bg && (i++ > count / 2)) |
2222 | break; |
2248 | break; |
2223 | |
2249 | |
2224 | dtp[col] = stp[col]; |
2250 | dtp[col] = stp[col]; |
2225 | drp[col] = rend; |
2251 | drp[col] = rend; |
2226 | i = 0; |
2252 | i = 0; |
2227 | } |
2253 | } |
2228 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2254 | else if (have_bg || (stp[col] != ' ' && ++i >= 16)) |
2229 | break; |
2255 | break; |
2230 | } |
2256 | } |
2231 | |
2257 | |
2232 | col--; /* went one too far. move back */ |
2258 | col--; /* went one too far. move back */ |
2233 | count -= i; /* dump any matching trailing chars */ |
2259 | count -= i; /* dump any matching trailing chars */ |
… | |
… | |
2243 | int back = bgcolor_of (rend); // desired background |
2269 | int back = bgcolor_of (rend); // desired background |
2244 | |
2270 | |
2245 | // only do special processing if any attributes are set, which is unlikely |
2271 | // only do special processing if any attributes are set, which is unlikely |
2246 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2272 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2247 | { |
2273 | { |
2248 | #if ENABLE_STYLES |
|
|
2249 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2250 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2251 | drp[col + 1] = ~srp[col + 1]; |
|
|
2252 | |
|
|
2253 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2254 | while (text > stp |
|
|
2255 | && srp[text - stp - 1] & RS_Careful |
|
|
2256 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2257 | text--, count++, xpixel -= fwidth; |
|
|
2258 | #endif |
|
|
2259 | |
|
|
2260 | bool invert = rend & RS_RVid; |
2274 | bool invert = rend & RS_RVid; |
2261 | |
2275 | |
2262 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2276 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2263 | if (rend & RS_Bold |
2277 | if (rend & RS_Bold |
2264 | && fore == Color_fg) |
2278 | && fore == Color_fg) |
… | |
… | |
2280 | else |
2294 | else |
2281 | invert = !invert; |
2295 | invert = !invert; |
2282 | # endif |
2296 | # endif |
2283 | } |
2297 | } |
2284 | |
2298 | |
2285 | if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) |
2299 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2286 | fore = Color_UL; |
2300 | fore = Color_UL; |
2287 | #endif |
2301 | #endif |
2288 | |
2302 | |
2289 | if (invert) |
2303 | if (invert) |
2290 | { |
2304 | { |
|
|
2305 | #ifdef OPTION_HC |
|
|
2306 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2307 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2308 | #endif |
|
|
2309 | /* invert the column if no highlightColor is set or it is the |
|
|
2310 | * current cursor column */ |
2291 | ::swap (fore, back); |
2311 | ::swap (fore, back); |
|
|
2312 | #ifdef OPTION_HC |
|
|
2313 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2314 | back = Color_HC; |
|
|
2315 | #endif |
2292 | |
2316 | |
2293 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2317 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2318 | # ifndef OPTION_HC |
2294 | if (ISSET_PIXCOLOR (Color_RV)) |
2319 | if (ISSET_PIXCOLOR (Color_RV)) |
2295 | back = Color_RV; |
2320 | back = Color_RV; |
2296 | |
2321 | # endif |
2297 | if (fore == back) |
2322 | if (fore == back) |
2298 | { |
2323 | { |
2299 | fore = Color_bg; |
2324 | fore = Color_bg; |
2300 | back = Color_fg; |
2325 | back = Color_fg; |
2301 | } |
2326 | } |
… | |
… | |
2312 | } |
2337 | } |
2313 | else if (hidden_text) |
2338 | else if (hidden_text) |
2314 | fore = back; |
2339 | fore = back; |
2315 | } |
2340 | } |
2316 | #endif |
2341 | #endif |
|
|
2342 | |
|
|
2343 | #if ENABLE_STYLES |
|
|
2344 | // "careful" (too wide) character handling |
|
|
2345 | |
|
|
2346 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2347 | while (text > stp |
|
|
2348 | && srp[text - stp - 1] & RS_Careful |
|
|
2349 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2350 | text--, count++, xpixel -= fwidth; |
|
|
2351 | |
|
|
2352 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2353 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2354 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2355 | |
|
|
2356 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2357 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2358 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2359 | #endif |
2317 | } |
2360 | } |
2318 | |
2361 | |
2319 | /* |
2362 | /* |
2320 | * Actually do the drawing of the string here |
2363 | * Actually do the drawing of the string here |
2321 | */ |
2364 | */ |
2322 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2365 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2323 | |
2366 | |
2324 | if (back == fore) |
|
|
2325 | font->clear_rect (*drawable, xpixel, ypixel, |
|
|
2326 | fwidth * count, fheight, |
|
|
2327 | back); |
|
|
2328 | else if (back == Color_bg) |
2367 | if (have_bg && back == Color_bg) |
2329 | { |
2368 | { |
2330 | if (must_clear) |
2369 | // this is very ugly, maybe push it into ->draw? |
2331 | { |
|
|
2332 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2333 | |
2370 | |
2334 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2371 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2335 | if (text[i] != ' ') |
2372 | if (text[i] != ' ') |
2336 | { |
2373 | { |
2337 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2374 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent); |
2338 | break; |
2375 | goto did_clear; |
2339 | } |
|
|
2340 | } |
2376 | } |
2341 | else |
2377 | |
2342 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2378 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2379 | did_clear: ; |
2343 | } |
2380 | } |
2344 | else |
2381 | else |
2345 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2382 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2346 | |
2383 | |
2347 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2384 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2348 | { |
2385 | { |
2349 | #if ENABLE_FRILLS |
2386 | #if ENABLE_FRILLS |
2350 | if (ISSET_PIXCOLOR (Color_underline)) |
2387 | if (ISSET_PIXCOLOR (Color_underline)) |
2351 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2388 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2352 | else |
2389 | else |
2353 | #endif |
2390 | #endif |
2354 | XSetForeground (display->display, gc, pix_colors[fore]); |
2391 | XSetForeground (dpy, gc, pix_colors[fore]); |
2355 | |
2392 | |
2356 | XDrawLine (display->display, drawBuffer, gc, |
2393 | XDrawLine (dpy, drawBuffer, gc, |
2357 | xpixel, ypixel + font->ascent + 1, |
2394 | xpixel, ypixel + font->ascent + 1, |
2358 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2395 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2359 | } |
2396 | } |
2360 | } /* for (col....) */ |
2397 | } /* for (col....) */ |
2361 | } /* for (row....) */ |
2398 | } /* for (row....) */ |
… | |
… | |
2370 | */ |
2407 | */ |
2371 | if (showcursor) |
2408 | if (showcursor) |
2372 | { |
2409 | { |
2373 | if (focus) |
2410 | if (focus) |
2374 | { |
2411 | { |
2375 | if (OPTION (Opt_cursorUnderline)) |
2412 | if (option (Opt_cursorUnderline)) |
2376 | *crp ^= RS_Uline; |
2413 | *crp ^= RS_Uline; |
2377 | else |
2414 | else |
2378 | { |
2415 | { |
2379 | *crp ^= RS_RVid; |
2416 | *crp ^= RS_RVid; |
2380 | #ifndef NO_CURSORCOLOR |
2417 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2394 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2431 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2395 | cursorwidth++; |
2432 | cursorwidth++; |
2396 | |
2433 | |
2397 | #ifndef NO_CURSORCOLOR |
2434 | #ifndef NO_CURSORCOLOR |
2398 | if (ISSET_PIXCOLOR (Color_cursor)) |
2435 | if (ISSET_PIXCOLOR (Color_cursor)) |
2399 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2436 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2437 | else |
2400 | #endif |
2438 | #endif |
|
|
2439 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2401 | |
2440 | |
2402 | XDrawRectangle (display->display, drawBuffer, gc, |
2441 | XDrawRectangle (dpy, drawBuffer, gc, |
2403 | Col2Pixel (col), |
2442 | Col2Pixel (col), |
2404 | Row2Pixel (oldcursor.row), |
2443 | Row2Pixel (oldcursor.row), |
2405 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2444 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2406 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2445 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2407 | } |
2446 | } |
… | |
… | |
2451 | #if XPM_BACKGROUND |
2490 | #if XPM_BACKGROUND |
2452 | && !bgPixmap.pixmap |
2491 | && !bgPixmap.pixmap |
2453 | #endif |
2492 | #endif |
2454 | ) |
2493 | ) |
2455 | { |
2494 | { |
2456 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2495 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2457 | XClearWindow (display->display, parent[0]); |
2496 | XClearWindow (dpy, parent[0]); |
2458 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2497 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2459 | #if HAVE_SCROLLBARS |
2498 | #if HAVE_SCROLLBARS |
2460 | if (scrollBar.win) |
2499 | if (scrollBar.win) |
2461 | { |
2500 | { |
2462 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2501 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2463 | scrollBar.setIdle (); |
2502 | scrollBar.setIdle (); |
2464 | scrollbar_show (0); |
2503 | scrollbar_show (0); |
2465 | } |
2504 | } |
2466 | #endif |
2505 | #endif |
2467 | } |
2506 | } |
… | |
… | |
2480 | |
2519 | |
2481 | num_scr_allow = 0; |
2520 | num_scr_allow = 0; |
2482 | want_refresh = 1; |
2521 | want_refresh = 1; |
2483 | |
2522 | |
2484 | if (really) |
2523 | if (really) |
2485 | XClearWindow (display->display, vt); |
2524 | XClearWindow (dpy, vt); |
2486 | } |
2525 | } |
2487 | |
2526 | |
2488 | void |
2527 | void |
2489 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2528 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2490 | { |
2529 | { |
… | |
… | |
2539 | { |
2578 | { |
2540 | if (selection.op |
2579 | if (selection.op |
2541 | && current_screen == selection.screen |
2580 | && current_screen == selection.screen |
2542 | && selection.end.row >= view_start) |
2581 | && selection.end.row >= view_start) |
2543 | { |
2582 | { |
2544 | #if ENABLE_FRILLS |
2583 | #if !ENABLE_MINIMAL |
2545 | if (selection.rect) |
2584 | if (selection.rect) |
2546 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2585 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2547 | selection.end.row, selection.end.col, |
2586 | selection.end.row, selection.end.col, |
2548 | RS_RVid, RS_RVid | RS_Uline); |
2587 | RS_RVid, RS_RVid | RS_Uline); |
2549 | else |
2588 | else |
… | |
… | |
2665 | } |
2704 | } |
2666 | |
2705 | |
2667 | unsigned long bytes_after; |
2706 | unsigned long bytes_after; |
2668 | XTextProperty ct; |
2707 | XTextProperty ct; |
2669 | |
2708 | |
2670 | if (XGetWindowProperty (display->display, win, prop, |
2709 | if (XGetWindowProperty (dpy, win, prop, |
2671 | 0, PROP_SIZE / 4, |
2710 | 0, PROP_SIZE / 4, |
2672 | delete_prop, AnyPropertyType, |
2711 | delete_prop, AnyPropertyType, |
2673 | &ct.encoding, &ct.format, |
2712 | &ct.encoding, &ct.format, |
2674 | &ct.nitems, &bytes_after, |
2713 | &ct.nitems, &bytes_after, |
2675 | &ct.value) != Success) |
2714 | &ct.value) != Success) |
… | |
… | |
2684 | if (bytes_after) |
2723 | if (bytes_after) |
2685 | { |
2724 | { |
2686 | // fetch and append remaining data |
2725 | // fetch and append remaining data |
2687 | XTextProperty ct2; |
2726 | XTextProperty ct2; |
2688 | |
2727 | |
2689 | if (XGetWindowProperty (display->display, win, prop, |
2728 | if (XGetWindowProperty (dpy, win, prop, |
2690 | ct.nitems / 4, (bytes_after + 3) / 4, |
2729 | ct.nitems / 4, (bytes_after + 3) / 4, |
2691 | delete_prop, AnyPropertyType, |
2730 | delete_prop, AnyPropertyType, |
2692 | &ct2.encoding, &ct2.format, |
2731 | &ct2.encoding, &ct2.format, |
2693 | &ct2.nitems, &bytes_after, |
2732 | &ct2.nitems, &bytes_after, |
2694 | &ct2.value) != Success) |
2733 | &ct2.value) != Success) |
… | |
… | |
2707 | |
2746 | |
2708 | if (ct.encoding == xa[XA_INCR]) |
2747 | if (ct.encoding == xa[XA_INCR]) |
2709 | { |
2748 | { |
2710 | // INCR selection, start handshake |
2749 | // INCR selection, start handshake |
2711 | if (!delete_prop) |
2750 | if (!delete_prop) |
2712 | XDeleteProperty (display->display, win, prop); |
2751 | XDeleteProperty (dpy, win, prop); |
2713 | |
2752 | |
2714 | selection_wait = Sel_incr; |
2753 | selection_wait = Sel_incr; |
2715 | incr_buf_fill = 0; |
2754 | incr_buf_fill = 0; |
2716 | incr_ev.start (NOW + 10); |
2755 | incr_ev.start (NOW + 10); |
2717 | |
2756 | |
… | |
… | |
2764 | } |
2803 | } |
2765 | |
2804 | |
2766 | char **cl; |
2805 | char **cl; |
2767 | int cr; |
2806 | int cr; |
2768 | |
2807 | |
2769 | #if ENABLE_FRILLS |
2808 | #if !ENABLE_MINIMAL |
2770 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2809 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2771 | // so recode it manually |
2810 | // so recode it manually |
2772 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2811 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2773 | { |
2812 | { |
2774 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2813 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
… | |
… | |
2778 | paste (s, strlen (s)); |
2817 | paste (s, strlen (s)); |
2779 | free (s); |
2818 | free (s); |
2780 | } |
2819 | } |
2781 | else |
2820 | else |
2782 | #endif |
2821 | #endif |
2783 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2822 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
2784 | && cl) |
2823 | && cl) |
2785 | { |
2824 | { |
2786 | for (int i = 0; i < cr; i++) |
2825 | for (int i = 0; i < cr; i++) |
2787 | paste (cl[i], strlen (cl[i])); |
2826 | paste (cl[i], strlen (cl[i])); |
2788 | |
2827 | |
… | |
… | |
2870 | else if (selnum == Sel_Secondary) |
2909 | else if (selnum == Sel_Secondary) |
2871 | sel = XA_SECONDARY; |
2910 | sel = XA_SECONDARY; |
2872 | else |
2911 | else |
2873 | sel = xa[XA_CLIPBOARD]; |
2912 | sel = xa[XA_CLIPBOARD]; |
2874 | |
2913 | |
2875 | if (XGetSelectionOwner (display->display, sel) != None) |
2914 | if (XGetSelectionOwner (dpy, sel) != None) |
2876 | { |
2915 | { |
2877 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2916 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
2878 | vt, selection_request_time); |
2917 | vt, selection_request_time); |
2879 | return 1; |
2918 | return 1; |
2880 | } |
2919 | } |
2881 | |
2920 | |
2882 | return 0; |
2921 | return 0; |
… | |
… | |
2945 | |
2984 | |
2946 | int end_col; |
2985 | int end_col; |
2947 | |
2986 | |
2948 | for (; row <= selection.end.row; row++, col = 0) |
2987 | for (; row <= selection.end.row; row++, col = 0) |
2949 | { |
2988 | { |
2950 | #if ENABLE_FRILLS |
2989 | #if !ENABLE_MINIMAL |
2951 | if (selection.rect) |
2990 | if (selection.rect) |
2952 | { |
2991 | { |
2953 | col = selection.beg.col; |
2992 | col = selection.beg.col; |
2954 | end_col = ncol + 1; |
2993 | end_col = ncol + 1; |
2955 | } |
2994 | } |
… | |
… | |
2958 | end_col = ROW(row).l; |
2997 | end_col = ROW(row).l; |
2959 | |
2998 | |
2960 | col = max (col, 0); |
2999 | col = max (col, 0); |
2961 | |
3000 | |
2962 | if (row == selection.end.row |
3001 | if (row == selection.end.row |
2963 | #if ENABLE_FRILLS |
3002 | #if !ENABLE_MINIMAL |
2964 | || selection.rect |
3003 | || selection.rect |
2965 | #endif |
3004 | #endif |
2966 | ) |
3005 | ) |
2967 | min_it (end_col, selection.end.col); |
3006 | min_it (end_col, selection.end.col); |
2968 | |
3007 | |
… | |
… | |
2991 | #endif |
3030 | #endif |
2992 | else |
3031 | else |
2993 | new_selection_text[ofs++] = *t++; |
3032 | new_selection_text[ofs++] = *t++; |
2994 | } |
3033 | } |
2995 | |
3034 | |
2996 | #if ENABLE_FRILLS |
3035 | #if !ENABLE_MINIMAL |
2997 | if (selection.rect) |
3036 | if (selection.rect) |
2998 | { |
3037 | { |
2999 | while (ofs |
3038 | while (ofs |
3000 | && new_selection_text[ofs - 1] != C0_LF |
3039 | && new_selection_text[ofs - 1] != C0_LF |
3001 | && unicode::is_space (new_selection_text[ofs - 1])) |
3040 | && unicode::is_space (new_selection_text[ofs - 1])) |
… | |
… | |
3035 | bool |
3074 | bool |
3036 | rxvt_term::selection_grab (Time tm) NOTHROW |
3075 | rxvt_term::selection_grab (Time tm) NOTHROW |
3037 | { |
3076 | { |
3038 | selection_time = tm; |
3077 | selection_time = tm; |
3039 | |
3078 | |
3040 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3079 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3041 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3080 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3042 | { |
3081 | { |
3043 | display->set_selection_owner (this); |
3082 | display->set_selection_owner (this); |
3044 | return true; |
3083 | return true; |
3045 | } |
3084 | } |
3046 | else |
3085 | else |
… | |
… | |
3050 | } |
3089 | } |
3051 | |
3090 | |
3052 | #if 0 |
3091 | #if 0 |
3053 | XTextProperty ct; |
3092 | XTextProperty ct; |
3054 | |
3093 | |
3055 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3094 | if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) |
3056 | { |
3095 | { |
3057 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3096 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3058 | XFree (ct.value); |
3097 | XFree (ct.value); |
3059 | } |
3098 | } |
3060 | #endif |
3099 | #endif |
… | |
… | |
3362 | |
3401 | |
3363 | if (selection.clicks == 1) |
3402 | if (selection.clicks == 1) |
3364 | { |
3403 | { |
3365 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3404 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3366 | && !ROW(selection.beg.row).is_longer () |
3405 | && !ROW(selection.beg.row).is_longer () |
3367 | #if ENABLE_FRILLS |
3406 | #if !ENABLE_MINIMAL |
3368 | && !selection.rect |
3407 | && !selection.rect |
3369 | #endif |
3408 | #endif |
3370 | ) |
3409 | ) |
3371 | selection.beg.col = ncol; |
3410 | selection.beg.col = ncol; |
3372 | |
3411 | |
3373 | if ( |
3412 | if ( |
3374 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3413 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3375 | && !ROW(selection.end.row).is_longer () |
3414 | && !ROW(selection.end.row).is_longer () |
3376 | #if ENABLE_FRILLS |
3415 | #if !ENABLE_MINIMAL |
3377 | && !selection.rect |
3416 | && !selection.rect |
3378 | #endif |
3417 | #endif |
3379 | ) |
3418 | ) |
3380 | selection.end.col = ncol; |
3419 | selection.end.col = ncol; |
3381 | } |
3420 | } |
… | |
… | |
3388 | selection_delimit_word (DN, &selection.end, &selection.end); |
3427 | selection_delimit_word (DN, &selection.end, &selection.end); |
3389 | } |
3428 | } |
3390 | else if (selection.clicks == 3) |
3429 | else if (selection.clicks == 3) |
3391 | { |
3430 | { |
3392 | #if ENABLE_FRILLS |
3431 | #if ENABLE_FRILLS |
3393 | if (OPTION (Opt_tripleclickwords)) |
3432 | if (option (Opt_tripleclickwords)) |
3394 | { |
3433 | { |
3395 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3434 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3396 | |
3435 | |
3397 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3436 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3398 | { |
3437 | { |
3399 | if (!ROW(end_row).is_longer ()) |
3438 | if (!ROW(end_row).is_longer ()) |
3400 | { |
3439 | { |
3401 | selection.end.row = end_row; |
3440 | selection.end.row = end_row; |
3402 | selection.end.col = ROW(end_row).l; |
3441 | selection.end.col = ROW(end_row).l; |
|
|
3442 | # if !ENABLE_MINIMAL |
3403 | selection_remove_trailing_spaces (); |
3443 | selection_remove_trailing_spaces (); |
|
|
3444 | # endif |
3404 | break; |
3445 | break; |
3405 | } |
3446 | } |
3406 | } |
3447 | } |
3407 | } |
3448 | } |
3408 | else |
3449 | else |
… | |
… | |
3437 | selection.mark.row = selection.beg.row; |
3478 | selection.mark.row = selection.beg.row; |
3438 | selection.mark.col = selection.beg.col; |
3479 | selection.mark.col = selection.beg.col; |
3439 | } |
3480 | } |
3440 | } |
3481 | } |
3441 | |
3482 | |
3442 | #if ENABLE_FRILLS |
3483 | #if !ENABLE_MINIMAL |
3443 | if (selection.rect && selection.beg.col > selection.end.col) |
3484 | if (selection.rect && selection.beg.col > selection.end.col) |
3444 | ::swap (selection.beg.col, selection.end.col); |
3485 | ::swap (selection.beg.col, selection.end.col); |
3445 | #endif |
3486 | #endif |
3446 | } |
3487 | } |
3447 | |
3488 | |
3448 | #if ENABLE_FRILLS |
3489 | #if !ENABLE_MINIMAL |
3449 | void |
3490 | void |
3450 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3491 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3451 | { |
3492 | { |
3452 | int32_t end_col, end_row; |
3493 | int32_t end_col, end_row; |
3453 | text_t *stp; |
3494 | text_t *stp; |
… | |
… | |
3508 | */ |
3549 | */ |
3509 | void |
3550 | void |
3510 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3551 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3511 | { |
3552 | { |
3512 | XSelectionEvent ev; |
3553 | XSelectionEvent ev; |
3513 | dDisp; |
|
|
3514 | |
3554 | |
3515 | ev.type = SelectionNotify; |
3555 | ev.type = SelectionNotify; |
3516 | ev.property = None; |
3556 | ev.property = None; |
3517 | ev.display = rq.display; |
3557 | ev.display = rq.display; |
3518 | ev.requestor = rq.requestor; |
3558 | ev.requestor = rq.requestor; |
… | |
… | |
3532 | *target++ = xa[XA_COMPOUND_TEXT]; |
3572 | *target++ = xa[XA_COMPOUND_TEXT]; |
3533 | #if X_HAVE_UTF8_STRING |
3573 | #if X_HAVE_UTF8_STRING |
3534 | *target++ = xa[XA_UTF8_STRING]; |
3574 | *target++ = xa[XA_UTF8_STRING]; |
3535 | #endif |
3575 | #endif |
3536 | |
3576 | |
3537 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3577 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3538 | 32, PropModeReplace, |
3578 | 32, PropModeReplace, |
3539 | (unsigned char *)target_list, target - target_list); |
3579 | (unsigned char *)target_list, target - target_list); |
3540 | ev.property = rq.property; |
3580 | ev.property = rq.property; |
3541 | } |
3581 | } |
3542 | #if TODO // TODO |
3582 | #if TODO // TODO |
… | |
… | |
3545 | /* TODO: Handle MULTIPLE */ |
3585 | /* TODO: Handle MULTIPLE */ |
3546 | } |
3586 | } |
3547 | #endif |
3587 | #endif |
3548 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3588 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3549 | { |
3589 | { |
3550 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3590 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3551 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3591 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3552 | ev.property = rq.property; |
3592 | ev.property = rq.property; |
3553 | } |
3593 | } |
3554 | else if (rq.target == XA_STRING |
3594 | else if (rq.target == XA_STRING |
3555 | || rq.target == xa[XA_TEXT] |
3595 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3579 | style = enc_string; |
3619 | style = enc_string; |
3580 | else if (target == xa[XA_TEXT]) |
3620 | else if (target == xa[XA_TEXT]) |
3581 | style = enc_text; |
3621 | style = enc_text; |
3582 | else if (target == xa[XA_COMPOUND_TEXT]) |
3622 | else if (target == xa[XA_COMPOUND_TEXT]) |
3583 | style = enc_compound_text; |
3623 | style = enc_compound_text; |
3584 | #if ENABLE_FRILLS |
3624 | #if !ENABLE_MINIMAL |
3585 | else if (target == xa[XA_UTF8_STRING]) |
3625 | else if (target == xa[XA_UTF8_STRING]) |
3586 | style = enc_utf8; |
3626 | style = enc_utf8; |
3587 | #endif |
3627 | #endif |
3588 | else |
3628 | else |
3589 | { |
3629 | { |
… | |
… | |
3600 | { |
3640 | { |
3601 | cl = L""; |
3641 | cl = L""; |
3602 | selectlen = 0; |
3642 | selectlen = 0; |
3603 | } |
3643 | } |
3604 | |
3644 | |
3605 | #if ENABLE_FRILLS |
3645 | #if !ENABLE_MINIMAL |
3606 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3646 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3607 | // so recode it manually |
3647 | // so recode it manually |
3608 | if (style == enc_utf8) |
3648 | if (style == enc_utf8) |
3609 | { |
3649 | { |
3610 | freect = 1; |
3650 | freect = 1; |
… | |
… | |
3613 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3653 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3614 | ct.nitems = strlen ((char *)ct.value); |
3654 | ct.nitems = strlen ((char *)ct.value); |
3615 | } |
3655 | } |
3616 | else |
3656 | else |
3617 | #endif |
3657 | #endif |
3618 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3658 | if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3619 | freect = 1; |
3659 | freect = 1; |
3620 | else |
3660 | else |
3621 | { |
3661 | { |
3622 | /* if we failed to convert then send it raw */ |
3662 | /* if we failed to convert then send it raw */ |
3623 | ct.value = (unsigned char *)cl; |
3663 | ct.value = (unsigned char *)cl; |
3624 | ct.nitems = selectlen; |
3664 | ct.nitems = selectlen; |
3625 | ct.encoding = target; |
3665 | ct.encoding = target; |
3626 | } |
3666 | } |
3627 | |
3667 | |
3628 | XChangeProperty (disp, rq.requestor, rq.property, |
3668 | XChangeProperty (dpy, rq.requestor, rq.property, |
3629 | ct.encoding, 8, PropModeReplace, |
3669 | ct.encoding, 8, PropModeReplace, |
3630 | ct.value, (int)ct.nitems); |
3670 | ct.value, (int)ct.nitems); |
3631 | ev.property = rq.property; |
3671 | ev.property = rq.property; |
3632 | |
3672 | |
3633 | if (freect) |
3673 | if (freect) |
3634 | XFree (ct.value); |
3674 | XFree (ct.value); |
3635 | } |
3675 | } |
3636 | |
3676 | |
3637 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3677 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3638 | } |
3678 | } |
3639 | |
3679 | |
3640 | /* ------------------------------------------------------------------------- * |
3680 | /* ------------------------------------------------------------------------- * |
3641 | * MOUSE ROUTINES * |
3681 | * MOUSE ROUTINES * |
3642 | * ------------------------------------------------------------------------- */ |
3682 | * ------------------------------------------------------------------------- */ |
… | |
… | |
3658 | void |
3698 | void |
3659 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3699 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3660 | { |
3700 | { |
3661 | XWindowAttributes xwa; |
3701 | XWindowAttributes xwa; |
3662 | |
3702 | |
3663 | XGetWindowAttributes (display->display, vt, &xwa); |
3703 | XGetWindowAttributes (dpy, vt, &xwa); |
3664 | |
3704 | |
3665 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3705 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3666 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3706 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3667 | } |
3707 | } |
3668 | #endif |
3708 | #endif |
… | |
… | |
3764 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3804 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3765 | { |
3805 | { |
3766 | while (*s) |
3806 | while (*s) |
3767 | { |
3807 | { |
3768 | text_t t = *s++; |
3808 | text_t t = *s++; |
3769 | int width = wcwidth (t); |
3809 | int width = WCWIDTH (t); |
3770 | |
3810 | |
3771 | while (width--) |
3811 | while (width--) |
3772 | { |
3812 | { |
3773 | scr_overlay_set (x++, y, t); |
3813 | scr_overlay_set (x++, y, t); |
3774 | t = NOCHAR; |
3814 | t = NOCHAR; |