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 (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 | /* ------------------------------------------------------------------------- * |
… | |
… | |
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; |
… | |
… | |
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 | } |
… | |
… | |
684 | selection.op = SELECTION_CLEAR; |
684 | selection.op = SELECTION_CLEAR; |
685 | } |
685 | } |
686 | } |
686 | } |
687 | |
687 | |
688 | // finally move the view window, if desired |
688 | // finally move the view window, if desired |
689 | if (OPTION (Opt_scrollWithBuffer) |
689 | if (option (Opt_scrollWithBuffer) |
690 | && view_start != 0 |
690 | && view_start != 0 |
691 | && view_start != -saveLines) |
691 | && view_start != -saveLines) |
692 | scr_page (UP, count); |
692 | scr_page (UP, count); |
693 | |
693 | |
694 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
694 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
… | |
… | |
1071 | if (count) |
1071 | if (count) |
1072 | x = ncol - 1; |
1072 | x = ncol - 1; |
1073 | |
1073 | |
1074 | // store horizontal tab commands as characters inside the text |
1074 | // store horizontal tab commands as characters inside the text |
1075 | // buffer so they can be selected and pasted. |
1075 | // buffer so they can be selected and pasted. |
1076 | if (ht && OPTION (Opt_pastableTabs)) |
1076 | if (ht && option (Opt_pastableTabs)) |
1077 | { |
1077 | { |
1078 | base_rend = SET_FONT (base_rend, 0); |
1078 | base_rend = SET_FONT (base_rend, 0); |
1079 | |
1079 | |
1080 | l.touch (x); |
1080 | l.touch (x); |
1081 | |
1081 | |
… | |
… | |
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); |
… | |
… | |
1652 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1652 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1653 | #if XPM_BACKGROUND |
1653 | #if XPM_BACKGROUND |
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 | } |
… | |
… | |
1886 | { |
1886 | { |
1887 | #ifndef NO_BELL |
1887 | #ifndef NO_BELL |
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 | # if ENABLE_FRILLS |
|
|
1896 | if (option (Opt_urgentOnBell)) |
|
|
1897 | { |
|
|
1898 | XWMHints *h; |
1895 | |
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 | |
1896 | if (OPTION (Opt_visualBell)) |
1909 | if (option (Opt_visualBell)) |
1897 | { |
1910 | { |
1898 | rvideo_bell = true; |
1911 | rvideo_bell = true; |
1899 | scr_rvideo_mode (rvideo_mode); |
1912 | scr_rvideo_mode (rvideo_mode); |
1900 | display->flush (); |
1913 | display->flush (); |
1901 | |
1914 | |
1902 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1915 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1903 | } |
1916 | } |
1904 | else |
1917 | else |
1905 | XBell (xdisp, 0); |
1918 | XBell (dpy, 0); |
1906 | |
1919 | |
1907 | #endif |
1920 | #endif |
1908 | } |
1921 | } |
1909 | |
1922 | |
1910 | /* ------------------------------------------------------------------------- */ |
1923 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1969 | * screen.text/screen.rend contain what the screen will change to. |
1982 | * screen.text/screen.rend contain what the screen will change to. |
1970 | */ |
1983 | */ |
1971 | void |
1984 | void |
1972 | rxvt_term::scr_refresh () NOTHROW |
1985 | rxvt_term::scr_refresh () NOTHROW |
1973 | { |
1986 | { |
1974 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1987 | unsigned char have_bg, |
1975 | showcursor; /* show the cursor */ |
1988 | showcursor; /* show the cursor */ |
1976 | int16_t col, row, /* column/row we're processing */ |
1989 | int16_t col, row, /* column/row we're processing */ |
1977 | ocrow; /* old cursor row */ |
1990 | ocrow; /* old cursor row */ |
1978 | int i; /* tmp */ |
1991 | int i; /* tmp */ |
1979 | #ifndef NO_CURSORCOLOR |
1992 | #ifndef NO_CURSORCOLOR |
1980 | rend_t cc1; /* store colours at cursor position (s) */ |
1993 | rend_t cc1; /* store colours at cursor position (s) */ |
1981 | #endif |
1994 | #endif |
1982 | rend_t *crp; // cursor rendition pointer |
1995 | rend_t *crp; // cursor rendition pointer |
|
|
1996 | rend_t ccol1, /* Cursor colour */ |
|
|
1997 | ccol2; /* Cursor colour2 */ |
1983 | |
1998 | |
1984 | want_refresh = 0; /* screen is current */ |
1999 | want_refresh = 0; /* screen is current */ |
1985 | |
2000 | |
1986 | if (refresh_type == NO_REFRESH || !mapped) |
2001 | if (refresh_type == NO_REFRESH || !mapped) |
1987 | return; |
2002 | return; |
1988 | |
2003 | |
1989 | /* |
2004 | /* |
1990 | * A: set up vars |
2005 | * A: set up vars |
1991 | */ |
2006 | */ |
1992 | must_clear = 0; |
2007 | have_bg = 0; |
1993 | refresh_count = 0; |
2008 | refresh_count = 0; |
1994 | |
2009 | |
1995 | #if XPM_BACKGROUND |
2010 | #if XPM_BACKGROUND |
1996 | must_clear |= bgPixmap.pixmap != None; |
2011 | have_bg |= bgPixmap.pixmap != None; |
1997 | #endif |
2012 | #endif |
1998 | #if TRANSPARENT |
2013 | #if TRANSPARENT |
1999 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
2014 | have_bg |= option (Opt_transparent) && am_transparent; |
2000 | #endif |
2015 | #endif |
2001 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2016 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2002 | |
2017 | |
2003 | /* |
2018 | /* |
2004 | * B: reverse any characters which are selected |
2019 | * B: reverse any characters which are selected |
… | |
… | |
2008 | /* |
2023 | /* |
2009 | * C: set the cursor character (s) |
2024 | * C: set the cursor character (s) |
2010 | */ |
2025 | */ |
2011 | { |
2026 | { |
2012 | unsigned char setoldcursor; |
2027 | unsigned char setoldcursor; |
2013 | rend_t ccol1, /* Cursor colour */ |
|
|
2014 | ccol2; /* Cursor colour2 */ |
|
|
2015 | |
2028 | |
2016 | showcursor = (screen.flags & Screen_VisibleCursor); |
2029 | showcursor = (screen.flags & Screen_VisibleCursor); |
2017 | #ifdef CURSOR_BLINK |
2030 | #ifdef CURSOR_BLINK |
2018 | if (hidden_cursor) |
2031 | if (hidden_cursor) |
2019 | showcursor = 0; |
2032 | showcursor = 0; |
… | |
… | |
2026 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2039 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2027 | col--; |
2040 | col--; |
2028 | |
2041 | |
2029 | crp = &ROW(screen.cur.row).r[col]; |
2042 | crp = &ROW(screen.cur.row).r[col]; |
2030 | |
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 | |
2031 | if (showcursor && focus) |
2067 | if (showcursor && focus) |
2032 | { |
2068 | { |
2033 | if (OPTION (Opt_cursorUnderline)) |
2069 | if (option (Opt_cursorUnderline)) |
2034 | *crp ^= RS_Uline; |
2070 | *crp ^= RS_Uline; |
2035 | else |
2071 | else |
2036 | { |
2072 | { |
2037 | *crp ^= RS_RVid; |
2073 | *crp ^= RS_RVid; |
2038 | |
|
|
2039 | #ifndef NO_CURSORCOLOR |
|
|
2040 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2041 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2042 | ccol1 = Color_cursor; |
|
|
2043 | else |
|
|
2044 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2045 | ccol1 = fgcolor_of (rstyle); |
|
|
2046 | #else |
|
|
2047 | ccol1 = Color_fg; |
|
|
2048 | #endif |
|
|
2049 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2050 | ccol2 = Color_cursor2; |
|
|
2051 | else |
|
|
2052 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2053 | ccol2 = bgcolor_of (rstyle); |
|
|
2054 | #else |
|
|
2055 | ccol2 = Color_bg; |
|
|
2056 | #endif |
|
|
2057 | *crp = SET_FGCOLOR (*crp, ccol1); |
2074 | *crp = SET_FGCOLOR (*crp, ccol1); |
2058 | *crp = SET_BGCOLOR (*crp, ccol2); |
2075 | *crp = SET_BGCOLOR (*crp, ccol2); |
2059 | #endif |
|
|
2060 | } |
2076 | } |
2061 | } |
2077 | } |
2062 | } |
2078 | } |
2063 | |
2079 | |
2064 | /* make sure no outline cursor is left around */ |
2080 | /* make sure no outline cursor is left around */ |
… | |
… | |
2103 | * D: CopyArea pass - very useful for slower links |
2119 | * D: CopyArea pass - very useful for slower links |
2104 | * This has been deliberately kept simple. |
2120 | * This has been deliberately kept simple. |
2105 | */ |
2121 | */ |
2106 | if (!display->is_local |
2122 | if (!display->is_local |
2107 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2123 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2108 | && abs (num_scr) < nrow && !must_clear) |
2124 | && abs (num_scr) < nrow && !have_bg) |
2109 | { |
2125 | { |
2110 | int16_t nits; |
2126 | int16_t nits; |
|
|
2127 | int i = num_scr; |
2111 | int j; |
2128 | int j; |
2112 | int len, wlen; |
2129 | int len, wlen; |
2113 | dLocal (int, num_scr); |
2130 | dLocal (int, num_scr); |
2114 | |
2131 | |
2115 | j = nrow; |
2132 | j = nrow; |
2116 | wlen = len = -1; |
2133 | wlen = len = -1; |
2117 | row = i > 0 ? 0 : j - 1; |
2134 | row = i > 0 ? 0 : j - 1; |
|
|
2135 | |
2118 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2136 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2119 | { |
2137 | { |
2120 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2138 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2121 | { |
2139 | { |
2122 | line_t s = ROW(view_start + row); |
2140 | line_t s = ROW(view_start + row); |
… | |
… | |
2143 | wlen = row; |
2161 | wlen = row; |
2144 | continue; |
2162 | continue; |
2145 | } |
2163 | } |
2146 | } |
2164 | } |
2147 | |
2165 | |
2148 | if (len != -1) |
2166 | if (len >= 0) |
2149 | { |
2167 | { |
2150 | /* also comes here at end if needed because of >= above */ |
2168 | /* also comes here at end if needed because of >= above */ |
2151 | if (wlen < len) |
2169 | if (wlen < len) |
2152 | ::swap (wlen, len); |
2170 | ::swap (wlen, len); |
2153 | |
2171 | |
|
|
2172 | XGCValues gcv; |
|
|
2173 | |
|
|
2174 | gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
2154 | XCopyArea (xdisp, vt, vt, |
2175 | XCopyArea (dpy, vt, vt, |
2155 | gc, 0, Row2Pixel (len + i), |
2176 | gc, 0, Row2Pixel (len + i), |
2156 | (unsigned int)this->width, |
2177 | (unsigned int)this->width, |
2157 | (unsigned int)Height2Pixel (wlen - len + 1), |
2178 | (unsigned int)Height2Pixel (wlen - len + 1), |
2158 | 0, Row2Pixel (len)); |
2179 | 0, Row2Pixel (len)); |
|
|
2180 | gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
|
|
2181 | |
2159 | len = -1; |
2182 | len = -1; |
2160 | } |
2183 | } |
2161 | } |
2184 | } |
2162 | } |
2185 | } |
2163 | #endif |
2186 | #endif |
… | |
… | |
2219 | count++; |
2242 | count++; |
2220 | |
2243 | |
2221 | if (stp[col] != dtp[col] |
2244 | if (stp[col] != dtp[col] |
2222 | || !RS_SAME (srp[col], drp[col])) |
2245 | || !RS_SAME (srp[col], drp[col])) |
2223 | { |
2246 | { |
2224 | if (must_clear && (i++ > count / 2)) |
2247 | if (have_bg && (i++ > count / 2)) |
2225 | break; |
2248 | break; |
2226 | |
2249 | |
2227 | dtp[col] = stp[col]; |
2250 | dtp[col] = stp[col]; |
2228 | drp[col] = rend; |
2251 | drp[col] = rend; |
2229 | i = 0; |
2252 | i = 0; |
2230 | } |
2253 | } |
2231 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2254 | else if (have_bg || (stp[col] != ' ' && ++i >= 16)) |
2232 | break; |
2255 | break; |
2233 | } |
2256 | } |
2234 | |
2257 | |
2235 | col--; /* went one too far. move back */ |
2258 | col--; /* went one too far. move back */ |
2236 | count -= i; /* dump any matching trailing chars */ |
2259 | count -= i; /* dump any matching trailing chars */ |
… | |
… | |
2246 | int back = bgcolor_of (rend); // desired background |
2269 | int back = bgcolor_of (rend); // desired background |
2247 | |
2270 | |
2248 | // 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 |
2249 | 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)) |
2250 | { |
2273 | { |
2251 | #if ENABLE_STYLES |
|
|
2252 | // "careful" (too wide) character handling |
|
|
2253 | |
|
|
2254 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2255 | while (text > stp |
|
|
2256 | && srp[text - stp - 1] & RS_Careful |
|
|
2257 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
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; |
|
|
2267 | #endif |
|
|
2268 | |
|
|
2269 | bool invert = rend & RS_RVid; |
2274 | bool invert = rend & RS_RVid; |
2270 | |
2275 | |
2271 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2276 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2272 | if (rend & RS_Bold |
2277 | if (rend & RS_Bold |
2273 | && fore == Color_fg) |
2278 | && fore == Color_fg) |
… | |
… | |
2289 | else |
2294 | else |
2290 | invert = !invert; |
2295 | invert = !invert; |
2291 | # endif |
2296 | # endif |
2292 | } |
2297 | } |
2293 | |
2298 | |
2294 | if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) |
2299 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2295 | fore = Color_UL; |
2300 | fore = Color_UL; |
2296 | #endif |
2301 | #endif |
2297 | |
2302 | |
2298 | if (invert) |
2303 | if (invert) |
2299 | { |
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 */ |
2300 | ::swap (fore, back); |
2311 | ::swap (fore, back); |
|
|
2312 | #ifdef OPTION_HC |
|
|
2313 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2314 | back = Color_HC; |
|
|
2315 | #endif |
2301 | |
2316 | |
2302 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2317 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2318 | # ifndef OPTION_HC |
2303 | if (ISSET_PIXCOLOR (Color_RV)) |
2319 | if (ISSET_PIXCOLOR (Color_RV)) |
2304 | back = Color_RV; |
2320 | back = Color_RV; |
2305 | |
2321 | # endif |
2306 | if (fore == back) |
2322 | if (fore == back) |
2307 | { |
2323 | { |
2308 | fore = Color_bg; |
2324 | fore = Color_bg; |
2309 | back = Color_fg; |
2325 | back = Color_fg; |
2310 | } |
2326 | } |
… | |
… | |
2321 | } |
2337 | } |
2322 | else if (hidden_text) |
2338 | else if (hidden_text) |
2323 | fore = back; |
2339 | fore = back; |
2324 | } |
2340 | } |
2325 | #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 |
2326 | } |
2360 | } |
2327 | |
2361 | |
2328 | /* |
2362 | /* |
2329 | * Actually do the drawing of the string here |
2363 | * Actually do the drawing of the string here |
2330 | */ |
2364 | */ |
2331 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2365 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2332 | |
2366 | |
2333 | if (back == fore) |
|
|
2334 | font->clear_rect (*drawable, xpixel, ypixel, |
|
|
2335 | fwidth * count, fheight, |
|
|
2336 | back); |
|
|
2337 | else if (back == Color_bg) |
2367 | if (have_bg && back == Color_bg) |
2338 | { |
2368 | { |
2339 | if (must_clear) |
2369 | // this is very ugly, maybe push it into ->draw? |
2340 | { |
|
|
2341 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2342 | |
2370 | |
2343 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2371 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2344 | if (text[i] != ' ') |
2372 | if (text[i] != ' ') |
2345 | { |
2373 | { |
2346 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2374 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent); |
2347 | break; |
2375 | goto did_clear; |
2348 | } |
|
|
2349 | } |
2376 | } |
2350 | else |
2377 | |
2351 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2378 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2379 | did_clear: ; |
2352 | } |
2380 | } |
2353 | else |
2381 | else |
2354 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2382 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2355 | |
2383 | |
2356 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2384 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2357 | { |
2385 | { |
2358 | #if ENABLE_FRILLS |
2386 | #if ENABLE_FRILLS |
2359 | if (ISSET_PIXCOLOR (Color_underline)) |
2387 | if (ISSET_PIXCOLOR (Color_underline)) |
2360 | XSetForeground (xdisp, gc, pix_colors[Color_underline]); |
2388 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2361 | else |
2389 | else |
2362 | #endif |
2390 | #endif |
2363 | XSetForeground (xdisp, gc, pix_colors[fore]); |
2391 | XSetForeground (dpy, gc, pix_colors[fore]); |
2364 | |
2392 | |
2365 | XDrawLine (xdisp, drawBuffer, gc, |
2393 | XDrawLine (dpy, drawBuffer, gc, |
2366 | xpixel, ypixel + font->ascent + 1, |
2394 | xpixel, ypixel + font->ascent + 1, |
2367 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2395 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2368 | } |
2396 | } |
2369 | } /* for (col....) */ |
2397 | } /* for (col....) */ |
2370 | } /* for (row....) */ |
2398 | } /* for (row....) */ |
… | |
… | |
2379 | */ |
2407 | */ |
2380 | if (showcursor) |
2408 | if (showcursor) |
2381 | { |
2409 | { |
2382 | if (focus) |
2410 | if (focus) |
2383 | { |
2411 | { |
2384 | if (OPTION (Opt_cursorUnderline)) |
2412 | if (option (Opt_cursorUnderline)) |
2385 | *crp ^= RS_Uline; |
2413 | *crp ^= RS_Uline; |
2386 | else |
2414 | else |
2387 | { |
2415 | { |
2388 | *crp ^= RS_RVid; |
2416 | *crp ^= RS_RVid; |
2389 | #ifndef NO_CURSORCOLOR |
2417 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2403 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2431 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2404 | cursorwidth++; |
2432 | cursorwidth++; |
2405 | |
2433 | |
2406 | #ifndef NO_CURSORCOLOR |
2434 | #ifndef NO_CURSORCOLOR |
2407 | if (ISSET_PIXCOLOR (Color_cursor)) |
2435 | if (ISSET_PIXCOLOR (Color_cursor)) |
2408 | XSetForeground (xdisp, gc, pix_colors[Color_cursor]); |
2436 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2437 | else |
2409 | #endif |
2438 | #endif |
|
|
2439 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2410 | |
2440 | |
2411 | XDrawRectangle (xdisp, drawBuffer, gc, |
2441 | XDrawRectangle (dpy, drawBuffer, gc, |
2412 | Col2Pixel (col), |
2442 | Col2Pixel (col), |
2413 | Row2Pixel (oldcursor.row), |
2443 | Row2Pixel (oldcursor.row), |
2414 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2444 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2415 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2445 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2416 | } |
2446 | } |
… | |
… | |
2460 | #if XPM_BACKGROUND |
2490 | #if XPM_BACKGROUND |
2461 | && !bgPixmap.pixmap |
2491 | && !bgPixmap.pixmap |
2462 | #endif |
2492 | #endif |
2463 | ) |
2493 | ) |
2464 | { |
2494 | { |
2465 | XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); |
2495 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2466 | XClearWindow (xdisp, parent[0]); |
2496 | XClearWindow (dpy, parent[0]); |
2467 | XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); |
2497 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2468 | #if HAVE_SCROLLBARS |
2498 | #if HAVE_SCROLLBARS |
2469 | if (scrollBar.win) |
2499 | if (scrollBar.win) |
2470 | { |
2500 | { |
2471 | XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); |
2501 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2472 | scrollBar.setIdle (); |
2502 | scrollBar.setIdle (); |
2473 | scrollbar_show (0); |
2503 | scrollbar_show (0); |
2474 | } |
2504 | } |
2475 | #endif |
2505 | #endif |
2476 | } |
2506 | } |
… | |
… | |
2489 | |
2519 | |
2490 | num_scr_allow = 0; |
2520 | num_scr_allow = 0; |
2491 | want_refresh = 1; |
2521 | want_refresh = 1; |
2492 | |
2522 | |
2493 | if (really) |
2523 | if (really) |
2494 | XClearWindow (xdisp, vt); |
2524 | XClearWindow (dpy, vt); |
2495 | } |
2525 | } |
2496 | |
2526 | |
2497 | void |
2527 | 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 |
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 |
2499 | { |
2529 | { |
… | |
… | |
2674 | } |
2704 | } |
2675 | |
2705 | |
2676 | unsigned long bytes_after; |
2706 | unsigned long bytes_after; |
2677 | XTextProperty ct; |
2707 | XTextProperty ct; |
2678 | |
2708 | |
2679 | if (XGetWindowProperty (xdisp, win, prop, |
2709 | if (XGetWindowProperty (dpy, win, prop, |
2680 | 0, PROP_SIZE / 4, |
2710 | 0, PROP_SIZE / 4, |
2681 | delete_prop, AnyPropertyType, |
2711 | delete_prop, AnyPropertyType, |
2682 | &ct.encoding, &ct.format, |
2712 | &ct.encoding, &ct.format, |
2683 | &ct.nitems, &bytes_after, |
2713 | &ct.nitems, &bytes_after, |
2684 | &ct.value) != Success) |
2714 | &ct.value) != Success) |
… | |
… | |
2693 | if (bytes_after) |
2723 | if (bytes_after) |
2694 | { |
2724 | { |
2695 | // fetch and append remaining data |
2725 | // fetch and append remaining data |
2696 | XTextProperty ct2; |
2726 | XTextProperty ct2; |
2697 | |
2727 | |
2698 | if (XGetWindowProperty (xdisp, win, prop, |
2728 | if (XGetWindowProperty (dpy, win, prop, |
2699 | ct.nitems / 4, (bytes_after + 3) / 4, |
2729 | ct.nitems / 4, (bytes_after + 3) / 4, |
2700 | delete_prop, AnyPropertyType, |
2730 | delete_prop, AnyPropertyType, |
2701 | &ct2.encoding, &ct2.format, |
2731 | &ct2.encoding, &ct2.format, |
2702 | &ct2.nitems, &bytes_after, |
2732 | &ct2.nitems, &bytes_after, |
2703 | &ct2.value) != Success) |
2733 | &ct2.value) != Success) |
… | |
… | |
2716 | |
2746 | |
2717 | if (ct.encoding == xa[XA_INCR]) |
2747 | if (ct.encoding == xa[XA_INCR]) |
2718 | { |
2748 | { |
2719 | // INCR selection, start handshake |
2749 | // INCR selection, start handshake |
2720 | if (!delete_prop) |
2750 | if (!delete_prop) |
2721 | XDeleteProperty (xdisp, win, prop); |
2751 | XDeleteProperty (dpy, win, prop); |
2722 | |
2752 | |
2723 | selection_wait = Sel_incr; |
2753 | selection_wait = Sel_incr; |
2724 | incr_buf_fill = 0; |
2754 | incr_buf_fill = 0; |
2725 | incr_ev.start (NOW + 10); |
2755 | incr_ev.start (NOW + 10); |
2726 | |
2756 | |
… | |
… | |
2787 | paste (s, strlen (s)); |
2817 | paste (s, strlen (s)); |
2788 | free (s); |
2818 | free (s); |
2789 | } |
2819 | } |
2790 | else |
2820 | else |
2791 | #endif |
2821 | #endif |
2792 | if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 |
2822 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
2793 | && cl) |
2823 | && cl) |
2794 | { |
2824 | { |
2795 | for (int i = 0; i < cr; i++) |
2825 | for (int i = 0; i < cr; i++) |
2796 | paste (cl[i], strlen (cl[i])); |
2826 | paste (cl[i], strlen (cl[i])); |
2797 | |
2827 | |
… | |
… | |
2879 | else if (selnum == Sel_Secondary) |
2909 | else if (selnum == Sel_Secondary) |
2880 | sel = XA_SECONDARY; |
2910 | sel = XA_SECONDARY; |
2881 | else |
2911 | else |
2882 | sel = xa[XA_CLIPBOARD]; |
2912 | sel = xa[XA_CLIPBOARD]; |
2883 | |
2913 | |
2884 | if (XGetSelectionOwner (xdisp, sel) != None) |
2914 | if (XGetSelectionOwner (dpy, sel) != None) |
2885 | { |
2915 | { |
2886 | XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], |
2916 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
2887 | vt, selection_request_time); |
2917 | vt, selection_request_time); |
2888 | return 1; |
2918 | return 1; |
2889 | } |
2919 | } |
2890 | |
2920 | |
2891 | return 0; |
2921 | return 0; |
… | |
… | |
3044 | bool |
3074 | bool |
3045 | rxvt_term::selection_grab (Time tm) NOTHROW |
3075 | rxvt_term::selection_grab (Time tm) NOTHROW |
3046 | { |
3076 | { |
3047 | selection_time = tm; |
3077 | selection_time = tm; |
3048 | |
3078 | |
3049 | XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); |
3079 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3050 | if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) |
3080 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3051 | { |
3081 | { |
3052 | display->set_selection_owner (this); |
3082 | display->set_selection_owner (this); |
3053 | return true; |
3083 | return true; |
3054 | } |
3084 | } |
3055 | else |
3085 | else |
… | |
… | |
3059 | } |
3089 | } |
3060 | |
3090 | |
3061 | #if 0 |
3091 | #if 0 |
3062 | XTextProperty ct; |
3092 | XTextProperty ct; |
3063 | |
3093 | |
3064 | if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) |
3094 | if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) |
3065 | { |
3095 | { |
3066 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3096 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3067 | XFree (ct.value); |
3097 | XFree (ct.value); |
3068 | } |
3098 | } |
3069 | #endif |
3099 | #endif |
… | |
… | |
3397 | selection_delimit_word (DN, &selection.end, &selection.end); |
3427 | selection_delimit_word (DN, &selection.end, &selection.end); |
3398 | } |
3428 | } |
3399 | else if (selection.clicks == 3) |
3429 | else if (selection.clicks == 3) |
3400 | { |
3430 | { |
3401 | #if ENABLE_FRILLS |
3431 | #if ENABLE_FRILLS |
3402 | if (OPTION (Opt_tripleclickwords)) |
3432 | if (option (Opt_tripleclickwords)) |
3403 | { |
3433 | { |
3404 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3434 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3405 | |
3435 | |
3406 | 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++) |
3407 | { |
3437 | { |
… | |
… | |
3542 | *target++ = xa[XA_COMPOUND_TEXT]; |
3572 | *target++ = xa[XA_COMPOUND_TEXT]; |
3543 | #if X_HAVE_UTF8_STRING |
3573 | #if X_HAVE_UTF8_STRING |
3544 | *target++ = xa[XA_UTF8_STRING]; |
3574 | *target++ = xa[XA_UTF8_STRING]; |
3545 | #endif |
3575 | #endif |
3546 | |
3576 | |
3547 | XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, |
3577 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3548 | 32, PropModeReplace, |
3578 | 32, PropModeReplace, |
3549 | (unsigned char *)target_list, target - target_list); |
3579 | (unsigned char *)target_list, target - target_list); |
3550 | ev.property = rq.property; |
3580 | ev.property = rq.property; |
3551 | } |
3581 | } |
3552 | #if TODO // TODO |
3582 | #if TODO // TODO |
… | |
… | |
3555 | /* TODO: Handle MULTIPLE */ |
3585 | /* TODO: Handle MULTIPLE */ |
3556 | } |
3586 | } |
3557 | #endif |
3587 | #endif |
3558 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3588 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3559 | { |
3589 | { |
3560 | XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, |
3590 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3561 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3591 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3562 | ev.property = rq.property; |
3592 | ev.property = rq.property; |
3563 | } |
3593 | } |
3564 | else if (rq.target == XA_STRING |
3594 | else if (rq.target == XA_STRING |
3565 | || rq.target == xa[XA_TEXT] |
3595 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3623 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3653 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3624 | ct.nitems = strlen ((char *)ct.value); |
3654 | ct.nitems = strlen ((char *)ct.value); |
3625 | } |
3655 | } |
3626 | else |
3656 | else |
3627 | #endif |
3657 | #endif |
3628 | if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3658 | if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3629 | freect = 1; |
3659 | freect = 1; |
3630 | else |
3660 | else |
3631 | { |
3661 | { |
3632 | /* if we failed to convert then send it raw */ |
3662 | /* if we failed to convert then send it raw */ |
3633 | ct.value = (unsigned char *)cl; |
3663 | ct.value = (unsigned char *)cl; |
3634 | ct.nitems = selectlen; |
3664 | ct.nitems = selectlen; |
3635 | ct.encoding = target; |
3665 | ct.encoding = target; |
3636 | } |
3666 | } |
3637 | |
3667 | |
3638 | XChangeProperty (xdisp, rq.requestor, rq.property, |
3668 | XChangeProperty (dpy, rq.requestor, rq.property, |
3639 | ct.encoding, 8, PropModeReplace, |
3669 | ct.encoding, 8, PropModeReplace, |
3640 | ct.value, (int)ct.nitems); |
3670 | ct.value, (int)ct.nitems); |
3641 | ev.property = rq.property; |
3671 | ev.property = rq.property; |
3642 | |
3672 | |
3643 | if (freect) |
3673 | if (freect) |
3644 | XFree (ct.value); |
3674 | XFree (ct.value); |
3645 | } |
3675 | } |
3646 | |
3676 | |
3647 | XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); |
3677 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3648 | } |
3678 | } |
3649 | |
3679 | |
3650 | /* ------------------------------------------------------------------------- * |
3680 | /* ------------------------------------------------------------------------- * |
3651 | * MOUSE ROUTINES * |
3681 | * MOUSE ROUTINES * |
3652 | * ------------------------------------------------------------------------- */ |
3682 | * ------------------------------------------------------------------------- */ |
… | |
… | |
3668 | void |
3698 | void |
3669 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3699 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3670 | { |
3700 | { |
3671 | XWindowAttributes xwa; |
3701 | XWindowAttributes xwa; |
3672 | |
3702 | |
3673 | XGetWindowAttributes (xdisp, vt, &xwa); |
3703 | XGetWindowAttributes (dpy, vt, &xwa); |
3674 | |
3704 | |
3675 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3705 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3676 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3706 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3677 | } |
3707 | } |
3678 | #endif |
3708 | #endif |