ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.248 by root, Sun Jan 22 20:58:33 2006 UTC vs.
Revision 1.272 by root, Fri Aug 10 23:52:12 2007 UTC

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
… …
161{ 161{
162#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
163 scr_overlay_off (); 163 scr_overlay_off ();
164#endif 164#endif
165 165
166 rvideo_mode = false;
166 view_start = 0; 167 view_start = 0;
167 num_scr = 0; 168 num_scr = 0;
168 169
169 if (ncol == 0) 170 if (ncol == 0)
170 ncol = 80; 171 ncol = 80;
… …
237 selection.text = NULL; 238 selection.text = NULL;
238 selection.len = 0; 239 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 240 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 241 selection.screen = PRIMARY;
241 selection.clicks = 0; 242 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false;
243 } 243 }
244 else 244 else
245 { 245 {
246 /* 246 /*
247 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
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
512void 512void
513rxvt_term::scr_swap_screen () 513rxvt_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
565void 565void
… …
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
1116void 1120void
1117rxvt_term::scr_backindex () NOTHROW 1121rxvt_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
1133void 1137void
1134rxvt_term::scr_forwardindex () NOTHROW 1138rxvt_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
1357void 1361void
1358rxvt_term::scr_erase_savelines () NOTHROW 1362rxvt_term::scr_erase_savelines () NOTHROW
1359{ 1363{
1360 want_refresh = 1; 1364 want_refresh = 1;
1361 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
… …
1644 if (rvideo_state != on) 1648 if (rvideo_state != on)
1645 { 1649 {
1646 rvideo_state = on; 1650 rvideo_state = on;
1647 1651
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#ifdef HAVE_BG_PIXMAP
1650 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1651#endif 1655#endif
1652#if TRANSPARENT 1656#if ENABLE_TRANSPARENCY
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
1904#endif 1919#endif
1905} 1920}
1906 1921
1907/* ------------------------------------------------------------------------- */ 1922/* ------------------------------------------------------------------------- */
1908/* ARGSUSED */ 1923/* ARGSUSED */
… …
1966 * screen.text/screen.rend contain what the screen will change to. 1981 * screen.text/screen.rend contain what the screen will change to.
1967 */ 1982 */
1968void 1983void
1969rxvt_term::scr_refresh () NOTHROW 1984rxvt_term::scr_refresh () NOTHROW
1970{ 1985{
1971 unsigned char must_clear, /* use draw_string not draw_image_string */ 1986 unsigned char have_bg,
1972 showcursor; /* show the cursor */ 1987 showcursor; /* show the cursor */
1973 int16_t col, row, /* column/row we're processing */ 1988 int16_t col, row, /* column/row we're processing */
1974 ocrow; /* old cursor row */ 1989 ocrow; /* old cursor row */
1975 int i; /* tmp */ 1990 int i; /* tmp */
1976#ifndef NO_CURSORCOLOR 1991#ifndef NO_CURSORCOLOR
1977 rend_t cc1; /* store colours at cursor position (s) */ 1992 rend_t cc1; /* store colours at cursor position (s) */
1978#endif 1993#endif
1979 rend_t *crp; // cursor rendition pointer 1994 rend_t *crp; // cursor rendition pointer
1995 rend_t ccol1, /* Cursor colour */
1996 ccol2; /* Cursor colour2 */
1980 1997
1981 want_refresh = 0; /* screen is current */ 1998 want_refresh = 0; /* screen is current */
1982 1999
1983 if (refresh_type == NO_REFRESH || !mapped) 2000 if (refresh_type == NO_REFRESH || !mapped)
1984 return; 2001 return;
1985 2002
1986 /* 2003 /*
1987 * A: set up vars 2004 * A: set up vars
1988 */ 2005 */
1989 must_clear = 0; 2006 have_bg = 0;
1990 refresh_count = 0; 2007 refresh_count = 0;
1991 2008
1992#if XPM_BACKGROUND 2009#ifdef HAVE_BG_PIXMAP
1993 must_clear |= bgPixmap.pixmap != None; 2010 have_bg |= bgPixmap.pixmap != None;
1994#endif 2011#endif
1995#if TRANSPARENT 2012#if ENABLE_TRANSPARENCY
1996 must_clear |= OPTION (Opt_transparent) && am_transparent; 2013 have_bg |= option (Opt_transparent) && am_transparent;
1997#endif 2014#endif
1998 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2015 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1999 2016
2000 /* 2017 /*
2001 * B: reverse any characters which are selected 2018 * B: reverse any characters which are selected
… …
2005 /* 2022 /*
2006 * C: set the cursor character (s) 2023 * C: set the cursor character (s)
2007 */ 2024 */
2008 { 2025 {
2009 unsigned char setoldcursor; 2026 unsigned char setoldcursor;
2010 rend_t ccol1, /* Cursor colour */
2011 ccol2; /* Cursor colour2 */
2012 2027
2013 showcursor = (screen.flags & Screen_VisibleCursor); 2028 showcursor = (screen.flags & Screen_VisibleCursor);
2014#ifdef CURSOR_BLINK 2029#ifdef CURSOR_BLINK
2015 if (hidden_cursor) 2030 if (hidden_cursor)
2016 showcursor = 0; 2031 showcursor = 0;
… …
2023 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2038 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2024 col--; 2039 col--;
2025 2040
2026 crp = &ROW(screen.cur.row).r[col]; 2041 crp = &ROW(screen.cur.row).r[col];
2027 2042
2043#ifndef NO_CURSORCOLOR
2044 cc1 = *crp & (RS_fgMask | RS_bgMask);
2045 if (ISSET_PIXCOLOR (Color_cursor))
2046 ccol1 = Color_cursor;
2047 else
2048#endif
2049#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2050 ccol1 = fgcolor_of (rstyle);
2051#else
2052 ccol1 = Color_fg;
2053#endif
2054
2055#ifndef NO_CURSORCOLOR
2056 if (ISSET_PIXCOLOR (Color_cursor2))
2057 ccol2 = Color_cursor2;
2058 else
2059#endif
2060#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2061 ccol2 = bgcolor_of (rstyle);
2062#else
2063 ccol2 = Color_bg;
2064#endif
2065
2028 if (showcursor && focus) 2066 if (showcursor && focus)
2029 { 2067 {
2030 if (OPTION (Opt_cursorUnderline)) 2068 if (option (Opt_cursorUnderline))
2031 *crp ^= RS_Uline; 2069 *crp ^= RS_Uline;
2032 else 2070 else
2033 { 2071 {
2034 *crp ^= RS_RVid; 2072 *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); 2073 *crp = SET_FGCOLOR (*crp, ccol1);
2055 *crp = SET_BGCOLOR (*crp, ccol2); 2074 *crp = SET_BGCOLOR (*crp, ccol2);
2056#endif
2057 } 2075 }
2058 } 2076 }
2059 } 2077 }
2060 2078
2061 /* make sure no outline cursor is left around */ 2079 /* make sure no outline cursor is left around */
… …
2100 * D: CopyArea pass - very useful for slower links 2118 * D: CopyArea pass - very useful for slower links
2101 * This has been deliberately kept simple. 2119 * This has been deliberately kept simple.
2102 */ 2120 */
2103 if (!display->is_local 2121 if (!display->is_local
2104 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2122 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2105 && abs (num_scr) < nrow && !must_clear) 2123 && abs (num_scr) < nrow && !have_bg)
2106 { 2124 {
2107 int16_t nits; 2125 int16_t nits;
2126 int i = num_scr;
2108 int j; 2127 int j;
2109 int len, wlen; 2128 int len, wlen;
2110 dLocal (int, num_scr); 2129 dLocal (int, num_scr);
2111 2130
2112 j = nrow; 2131 j = nrow;
2113 wlen = len = -1; 2132 wlen = len = -1;
2114 row = i > 0 ? 0 : j - 1; 2133 row = i > 0 ? 0 : j - 1;
2134
2115 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2135 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2116 { 2136 {
2117 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2137 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2118 { 2138 {
2119 line_t s = ROW(view_start + row); 2139 line_t s = ROW(view_start + row);
… …
2140 wlen = row; 2160 wlen = row;
2141 continue; 2161 continue;
2142 } 2162 }
2143 } 2163 }
2144 2164
2145 if (len != -1) 2165 if (len >= 0)
2146 { 2166 {
2147 /* also comes here at end if needed because of >= above */ 2167 /* also comes here at end if needed because of >= above */
2148 if (wlen < len) 2168 if (wlen < len)
2149 ::swap (wlen, len); 2169 ::swap (wlen, len);
2150 2170
2171 XGCValues gcv;
2172
2173 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2151 XCopyArea (display->display, vt, vt, 2174 XCopyArea (dpy, vt, vt,
2152 gc, 0, Row2Pixel (len + i), 2175 gc, 0, Row2Pixel (len + i),
2153 (unsigned int)this->width, 2176 (unsigned int)this->width,
2154 (unsigned int)Height2Pixel (wlen - len + 1), 2177 (unsigned int)Height2Pixel (wlen - len + 1),
2155 0, Row2Pixel (len)); 2178 0, Row2Pixel (len));
2179 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2180
2156 len = -1; 2181 len = -1;
2157 } 2182 }
2158 } 2183 }
2159 } 2184 }
2160#endif 2185#endif
… …
2216 count++; 2241 count++;
2217 2242
2218 if (stp[col] != dtp[col] 2243 if (stp[col] != dtp[col]
2219 || !RS_SAME (srp[col], drp[col])) 2244 || !RS_SAME (srp[col], drp[col]))
2220 { 2245 {
2221 if (must_clear && (i++ > count / 2)) 2246 if (have_bg && (i++ > count / 2))
2222 break; 2247 break;
2223 2248
2224 dtp[col] = stp[col]; 2249 dtp[col] = stp[col];
2225 drp[col] = rend; 2250 drp[col] = rend;
2226 i = 0; 2251 i = 0;
2227 } 2252 }
2228 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2253 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2229 break; 2254 break;
2230 } 2255 }
2231 2256
2232 col--; /* went one too far. move back */ 2257 col--; /* went one too far. move back */
2233 count -= i; /* dump any matching trailing chars */ 2258 count -= i; /* dump any matching trailing chars */
… …
2243 int back = bgcolor_of (rend); // desired background 2268 int back = bgcolor_of (rend); // desired background
2244 2269
2245 // only do special processing if any attributes are set, which is unlikely 2270 // 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)) 2271 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2247 { 2272 {
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; 2273 bool invert = rend & RS_RVid;
2261 2274
2262#ifndef NO_BOLD_UNDERLINE_REVERSE 2275#ifndef NO_BOLD_UNDERLINE_REVERSE
2263 if (rend & RS_Bold 2276 if (rend & RS_Bold
2264 && fore == Color_fg) 2277 && fore == Color_fg)
… …
2280 else 2293 else
2281 invert = !invert; 2294 invert = !invert;
2282# endif 2295# endif
2283 } 2296 }
2284 2297
2285 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2298 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2286 fore = Color_UL; 2299 fore = Color_UL;
2287#endif 2300#endif
2288 2301
2289 if (invert) 2302 if (invert)
2290 { 2303 {
2304#ifdef OPTION_HC
2305 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2306 || !ISSET_PIXCOLOR (Color_HC))
2307#endif
2308 /* invert the column if no highlightColor is set or it is the
2309 * current cursor column */
2291 ::swap (fore, back); 2310 ::swap (fore, back);
2311#ifdef OPTION_HC
2312 else if (ISSET_PIXCOLOR (Color_HC))
2313 back = Color_HC;
2314#endif
2292 2315
2293#ifndef NO_BOLD_UNDERLINE_REVERSE 2316#ifndef NO_BOLD_UNDERLINE_REVERSE
2317# ifndef OPTION_HC
2294 if (ISSET_PIXCOLOR (Color_RV)) 2318 if (ISSET_PIXCOLOR (Color_RV))
2295 back = Color_RV; 2319 back = Color_RV;
2296 2320# endif
2297 if (fore == back) 2321 if (fore == back)
2298 { 2322 {
2299 fore = Color_bg; 2323 fore = Color_bg;
2300 back = Color_fg; 2324 back = Color_fg;
2301 } 2325 }
… …
2312 } 2336 }
2313 else if (hidden_text) 2337 else if (hidden_text)
2314 fore = back; 2338 fore = back;
2315 } 2339 }
2316#endif 2340#endif
2341
2342#if ENABLE_STYLES
2343 // "careful" (too wide) character handling
2344
2345 // include previous careful character(s) if possible, looks nicer (best effort...)
2346 while (text > stp
2347 && srp[text - stp - 1] & RS_Careful
2348 && RS_SAME (rend, srp[text - stp - 1]))
2349 text--, count++, xpixel -= fwidth;
2350
2351 // force redraw after "careful" characters to avoid pixel droppings
2352 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2353 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2354
2355 // force redraw before "careful" characters to avoid pixel droppings
2356 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2357 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2358#endif
2317 } 2359 }
2318 2360
2319 /* 2361 /*
2320 * Actually do the drawing of the string here 2362 * Actually do the drawing of the string here
2321 */ 2363 */
2322 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2364 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2323 2365
2324 if (back == fore)
2325 font->clear_rect (*drawable, xpixel, ypixel,
2326 fwidth * count, fheight,
2327 back);
2328 else if (back == Color_bg) 2366 if (have_bg && back == Color_bg)
2329 { 2367 {
2330 if (must_clear) 2368 // this is very ugly, maybe push it into ->draw?
2331 {
2332 CLEAR_CHARS (xpixel, ypixel, count);
2333 2369
2334 for (i = 0; i < count; i++) /* don't draw empty strings */ 2370 for (i = 0; i < count; i++) /* don't draw empty strings */
2335 if (text[i] != ' ') 2371 if (text[i] != ' ')
2336 { 2372 {
2337 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2338 break; 2374 goto did_clear;
2339 }
2340 } 2375 }
2341 else 2376
2342 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2377 CLEAR_CHARS (xpixel, ypixel, count);
2378 did_clear: ;
2343 } 2379 }
2344 else 2380 else
2345 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2381 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2346 2382
2347 if (rend & RS_Uline && font->descent > 1 && fore != back) 2383 if (rend & RS_Uline && font->descent > 1 && fore != back)
2348 { 2384 {
2349#if ENABLE_FRILLS 2385#if ENABLE_FRILLS
2350 if (ISSET_PIXCOLOR (Color_underline)) 2386 if (ISSET_PIXCOLOR (Color_underline))
2351 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2387 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2352 else 2388 else
2353#endif 2389#endif
2354 XSetForeground (display->display, gc, pix_colors[fore]); 2390 XSetForeground (dpy, gc, pix_colors[fore]);
2355 2391
2356 XDrawLine (display->display, drawBuffer, gc, 2392 XDrawLine (dpy, drawBuffer, gc,
2357 xpixel, ypixel + font->ascent + 1, 2393 xpixel, ypixel + font->ascent + 1,
2358 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2394 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2359 } 2395 }
2360 } /* for (col....) */ 2396 } /* for (col....) */
2361 } /* for (row....) */ 2397 } /* for (row....) */
… …
2370 */ 2406 */
2371 if (showcursor) 2407 if (showcursor)
2372 { 2408 {
2373 if (focus) 2409 if (focus)
2374 { 2410 {
2375 if (OPTION (Opt_cursorUnderline)) 2411 if (option (Opt_cursorUnderline))
2376 *crp ^= RS_Uline; 2412 *crp ^= RS_Uline;
2377 else 2413 else
2378 { 2414 {
2379 *crp ^= RS_RVid; 2415 *crp ^= RS_RVid;
2380#ifndef NO_CURSORCOLOR 2416#ifndef NO_CURSORCOLOR
… …
2394 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2430 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2395 cursorwidth++; 2431 cursorwidth++;
2396 2432
2397#ifndef NO_CURSORCOLOR 2433#ifndef NO_CURSORCOLOR
2398 if (ISSET_PIXCOLOR (Color_cursor)) 2434 if (ISSET_PIXCOLOR (Color_cursor))
2399 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2435 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2436 else
2400#endif 2437#endif
2438 XSetForeground (dpy, gc, pix_colors[ccol1]);
2401 2439
2402 XDrawRectangle (display->display, drawBuffer, gc, 2440 XDrawRectangle (dpy, drawBuffer, gc,
2403 Col2Pixel (col), 2441 Col2Pixel (col),
2404 Row2Pixel (oldcursor.row), 2442 Row2Pixel (oldcursor.row),
2405 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2443 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2406 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2444 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2407 } 2445 }
… …
2443 2481
2444void 2482void
2445rxvt_term::scr_recolour () NOTHROW 2483rxvt_term::scr_recolour () NOTHROW
2446{ 2484{
2447 if (1 2485 if (1
2448#if TRANSPARENT 2486#if ENABLE_TRANSPARENCY
2449 && !am_transparent 2487 && !am_transparent
2450#endif 2488#endif
2451#if XPM_BACKGROUND 2489#ifdef HAVE_BG_PIXMAP
2452 && !bgPixmap.pixmap 2490 && !bgPixmap.pixmap
2453#endif 2491#endif
2454 ) 2492 )
2455 { 2493 {
2456 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2494 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2457 XClearWindow (display->display, parent[0]); 2495 XClearWindow (dpy, parent[0]);
2458 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2496 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2459#if HAVE_SCROLLBARS 2497#if HAVE_SCROLLBARS
2460 if (scrollBar.win) 2498 if (scrollBar.win)
2461 { 2499 {
2462 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2500 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2463 scrollBar.setIdle (); 2501 scrollBar.setIdle ();
2464 scrollbar_show (0); 2502 scrollbar_show (0);
2465 } 2503 }
2466#endif 2504#endif
2467 } 2505 }
… …
2480 2518
2481 num_scr_allow = 0; 2519 num_scr_allow = 0;
2482 want_refresh = 1; 2520 want_refresh = 1;
2483 2521
2484 if (really) 2522 if (really)
2485 XClearWindow (display->display, vt); 2523 XClearWindow (dpy, vt);
2486} 2524}
2487 2525
2488void 2526void
2489rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2527rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2490{ 2528{
… …
2539{ 2577{
2540 if (selection.op 2578 if (selection.op
2541 && current_screen == selection.screen 2579 && current_screen == selection.screen
2542 && selection.end.row >= view_start) 2580 && selection.end.row >= view_start)
2543 { 2581 {
2544#if ENABLE_FRILLS 2582#if !ENABLE_MINIMAL
2545 if (selection.rect) 2583 if (selection.rect)
2546 scr_xor_rect (selection.beg.row, selection.beg.col, 2584 scr_xor_rect (selection.beg.row, selection.beg.col,
2547 selection.end.row, selection.end.col, 2585 selection.end.row, selection.end.col,
2548 RS_RVid, RS_RVid | RS_Uline); 2586 RS_RVid, RS_RVid | RS_Uline);
2549 else 2587 else
… …
2665 } 2703 }
2666 2704
2667 unsigned long bytes_after; 2705 unsigned long bytes_after;
2668 XTextProperty ct; 2706 XTextProperty ct;
2669 2707
2670 if (XGetWindowProperty (display->display, win, prop, 2708 if (XGetWindowProperty (dpy, win, prop,
2671 0, PROP_SIZE / 4, 2709 0, PROP_SIZE / 4,
2672 delete_prop, AnyPropertyType, 2710 delete_prop, AnyPropertyType,
2673 &ct.encoding, &ct.format, 2711 &ct.encoding, &ct.format,
2674 &ct.nitems, &bytes_after, 2712 &ct.nitems, &bytes_after,
2675 &ct.value) != Success) 2713 &ct.value) != Success)
… …
2684 if (bytes_after) 2722 if (bytes_after)
2685 { 2723 {
2686 // fetch and append remaining data 2724 // fetch and append remaining data
2687 XTextProperty ct2; 2725 XTextProperty ct2;
2688 2726
2689 if (XGetWindowProperty (display->display, win, prop, 2727 if (XGetWindowProperty (dpy, win, prop,
2690 ct.nitems / 4, (bytes_after + 3) / 4, 2728 ct.nitems / 4, (bytes_after + 3) / 4,
2691 delete_prop, AnyPropertyType, 2729 delete_prop, AnyPropertyType,
2692 &ct2.encoding, &ct2.format, 2730 &ct2.encoding, &ct2.format,
2693 &ct2.nitems, &bytes_after, 2731 &ct2.nitems, &bytes_after,
2694 &ct2.value) != Success) 2732 &ct2.value) != Success)
… …
2707 2745
2708 if (ct.encoding == xa[XA_INCR]) 2746 if (ct.encoding == xa[XA_INCR])
2709 { 2747 {
2710 // INCR selection, start handshake 2748 // INCR selection, start handshake
2711 if (!delete_prop) 2749 if (!delete_prop)
2712 XDeleteProperty (display->display, win, prop); 2750 XDeleteProperty (dpy, win, prop);
2713 2751
2714 selection_wait = Sel_incr; 2752 selection_wait = Sel_incr;
2715 incr_buf_fill = 0; 2753 incr_buf_fill = 0;
2716 incr_ev.start (NOW + 10); 2754 incr_ev.start (NOW + 10);
2717 2755
… …
2764 } 2802 }
2765 2803
2766 char **cl; 2804 char **cl;
2767 int cr; 2805 int cr;
2768 2806
2769#if ENABLE_FRILLS 2807#if !ENABLE_MINIMAL
2770 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2808 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2771 // so recode it manually 2809 // so recode it manually
2772 if (ct.encoding == xa[XA_UTF8_STRING]) 2810 if (ct.encoding == xa[XA_UTF8_STRING])
2773 { 2811 {
2774 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2812 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2778 paste (s, strlen (s)); 2816 paste (s, strlen (s));
2779 free (s); 2817 free (s);
2780 } 2818 }
2781 else 2819 else
2782#endif 2820#endif
2783 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2821 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2784 && cl) 2822 && cl)
2785 { 2823 {
2786 for (int i = 0; i < cr; i++) 2824 for (int i = 0; i < cr; i++)
2787 paste (cl[i], strlen (cl[i])); 2825 paste (cl[i], strlen (cl[i]));
2788 2826
… …
2870 else if (selnum == Sel_Secondary) 2908 else if (selnum == Sel_Secondary)
2871 sel = XA_SECONDARY; 2909 sel = XA_SECONDARY;
2872 else 2910 else
2873 sel = xa[XA_CLIPBOARD]; 2911 sel = xa[XA_CLIPBOARD];
2874 2912
2875 if (XGetSelectionOwner (display->display, sel) != None) 2913 if (XGetSelectionOwner (dpy, sel) != None)
2876 { 2914 {
2877 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2915 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2878 vt, selection_request_time); 2916 vt, selection_request_time);
2879 return 1; 2917 return 1;
2880 } 2918 }
2881 2919
2882 return 0; 2920 return 0;
… …
2945 2983
2946 int end_col; 2984 int end_col;
2947 2985
2948 for (; row <= selection.end.row; row++, col = 0) 2986 for (; row <= selection.end.row; row++, col = 0)
2949 { 2987 {
2950#if ENABLE_FRILLS 2988#if !ENABLE_MINIMAL
2951 if (selection.rect) 2989 if (selection.rect)
2952 { 2990 {
2953 col = selection.beg.col; 2991 col = selection.beg.col;
2954 end_col = ncol + 1; 2992 end_col = ncol + 1;
2955 } 2993 }
… …
2958 end_col = ROW(row).l; 2996 end_col = ROW(row).l;
2959 2997
2960 col = max (col, 0); 2998 col = max (col, 0);
2961 2999
2962 if (row == selection.end.row 3000 if (row == selection.end.row
2963#if ENABLE_FRILLS 3001#if !ENABLE_MINIMAL
2964 || selection.rect 3002 || selection.rect
2965#endif 3003#endif
2966 ) 3004 )
2967 min_it (end_col, selection.end.col); 3005 min_it (end_col, selection.end.col);
2968 3006
… …
2991#endif 3029#endif
2992 else 3030 else
2993 new_selection_text[ofs++] = *t++; 3031 new_selection_text[ofs++] = *t++;
2994 } 3032 }
2995 3033
2996#if ENABLE_FRILLS 3034#if !ENABLE_MINIMAL
2997 if (selection.rect) 3035 if (selection.rect)
2998 { 3036 {
2999 while (ofs 3037 while (ofs
3000 && new_selection_text[ofs - 1] != C0_LF 3038 && new_selection_text[ofs - 1] != C0_LF
3001 && unicode::is_space (new_selection_text[ofs - 1])) 3039 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3035bool 3073bool
3036rxvt_term::selection_grab (Time tm) NOTHROW 3074rxvt_term::selection_grab (Time tm) NOTHROW
3037{ 3075{
3038 selection_time = tm; 3076 selection_time = tm;
3039 3077
3040 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3078 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3041 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3079 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3042 { 3080 {
3043 display->set_selection_owner (this); 3081 display->set_selection_owner (this);
3044 return true; 3082 return true;
3045 } 3083 }
3046 else 3084 else
… …
3050 } 3088 }
3051 3089
3052#if 0 3090#if 0
3053 XTextProperty ct; 3091 XTextProperty ct;
3054 3092
3055 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3093 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3056 { 3094 {
3057 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3095 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3058 XFree (ct.value); 3096 XFree (ct.value);
3059 } 3097 }
3060#endif 3098#endif
… …
3362 3400
3363 if (selection.clicks == 1) 3401 if (selection.clicks == 1)
3364 { 3402 {
3365 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3403 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3366 && !ROW(selection.beg.row).is_longer () 3404 && !ROW(selection.beg.row).is_longer ()
3367#if ENABLE_FRILLS 3405#if !ENABLE_MINIMAL
3368 && !selection.rect 3406 && !selection.rect
3369#endif 3407#endif
3370 ) 3408 )
3371 selection.beg.col = ncol; 3409 selection.beg.col = ncol;
3372 3410
3373 if ( 3411 if (
3374 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3412 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3375 && !ROW(selection.end.row).is_longer () 3413 && !ROW(selection.end.row).is_longer ()
3376#if ENABLE_FRILLS 3414#if !ENABLE_MINIMAL
3377 && !selection.rect 3415 && !selection.rect
3378#endif 3416#endif
3379 ) 3417 )
3380 selection.end.col = ncol; 3418 selection.end.col = ncol;
3381 } 3419 }
… …
3388 selection_delimit_word (DN, &selection.end, &selection.end); 3426 selection_delimit_word (DN, &selection.end, &selection.end);
3389 } 3427 }
3390 else if (selection.clicks == 3) 3428 else if (selection.clicks == 3)
3391 { 3429 {
3392#if ENABLE_FRILLS 3430#if ENABLE_FRILLS
3393 if (OPTION (Opt_tripleclickwords)) 3431 if (option (Opt_tripleclickwords))
3394 { 3432 {
3395 selection_delimit_word (UP, &selection.beg, &selection.beg); 3433 selection_delimit_word (UP, &selection.beg, &selection.beg);
3396 3434
3397 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3435 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3398 { 3436 {
3399 if (!ROW(end_row).is_longer ()) 3437 if (!ROW(end_row).is_longer ())
3400 { 3438 {
3401 selection.end.row = end_row; 3439 selection.end.row = end_row;
3402 selection.end.col = ROW(end_row).l; 3440 selection.end.col = ROW(end_row).l;
3441# if !ENABLE_MINIMAL
3403 selection_remove_trailing_spaces (); 3442 selection_remove_trailing_spaces ();
3443# endif
3404 break; 3444 break;
3405 } 3445 }
3406 } 3446 }
3407 } 3447 }
3408 else 3448 else
… …
3437 selection.mark.row = selection.beg.row; 3477 selection.mark.row = selection.beg.row;
3438 selection.mark.col = selection.beg.col; 3478 selection.mark.col = selection.beg.col;
3439 } 3479 }
3440 } 3480 }
3441 3481
3442#if ENABLE_FRILLS 3482#if !ENABLE_MINIMAL
3443 if (selection.rect && selection.beg.col > selection.end.col) 3483 if (selection.rect && selection.beg.col > selection.end.col)
3444 ::swap (selection.beg.col, selection.end.col); 3484 ::swap (selection.beg.col, selection.end.col);
3445#endif 3485#endif
3446} 3486}
3447 3487
3448#if ENABLE_FRILLS 3488#if !ENABLE_MINIMAL
3449void 3489void
3450rxvt_term::selection_remove_trailing_spaces () NOTHROW 3490rxvt_term::selection_remove_trailing_spaces () NOTHROW
3451{ 3491{
3452 int32_t end_col, end_row; 3492 int32_t end_col, end_row;
3453 text_t *stp; 3493 text_t *stp;
… …
3508 */ 3548 */
3509void 3549void
3510rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3550rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3511{ 3551{
3512 XSelectionEvent ev; 3552 XSelectionEvent ev;
3513 dDisp;
3514 3553
3515 ev.type = SelectionNotify; 3554 ev.type = SelectionNotify;
3516 ev.property = None; 3555 ev.property = None;
3517 ev.display = rq.display; 3556 ev.display = rq.display;
3518 ev.requestor = rq.requestor; 3557 ev.requestor = rq.requestor;
… …
3532 *target++ = xa[XA_COMPOUND_TEXT]; 3571 *target++ = xa[XA_COMPOUND_TEXT];
3533#if X_HAVE_UTF8_STRING 3572#if X_HAVE_UTF8_STRING
3534 *target++ = xa[XA_UTF8_STRING]; 3573 *target++ = xa[XA_UTF8_STRING];
3535#endif 3574#endif
3536 3575
3537 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3576 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3538 32, PropModeReplace, 3577 32, PropModeReplace,
3539 (unsigned char *)target_list, target - target_list); 3578 (unsigned char *)target_list, target - target_list);
3540 ev.property = rq.property; 3579 ev.property = rq.property;
3541 } 3580 }
3542#if TODO // TODO 3581#if TODO // TODO
… …
3545 /* TODO: Handle MULTIPLE */ 3584 /* TODO: Handle MULTIPLE */
3546 } 3585 }
3547#endif 3586#endif
3548 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3587 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3549 { 3588 {
3550 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3589 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3551 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3590 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3552 ev.property = rq.property; 3591 ev.property = rq.property;
3553 } 3592 }
3554 else if (rq.target == XA_STRING 3593 else if (rq.target == XA_STRING
3555 || rq.target == xa[XA_TEXT] 3594 || rq.target == xa[XA_TEXT]
… …
3579 style = enc_string; 3618 style = enc_string;
3580 else if (target == xa[XA_TEXT]) 3619 else if (target == xa[XA_TEXT])
3581 style = enc_text; 3620 style = enc_text;
3582 else if (target == xa[XA_COMPOUND_TEXT]) 3621 else if (target == xa[XA_COMPOUND_TEXT])
3583 style = enc_compound_text; 3622 style = enc_compound_text;
3584#if ENABLE_FRILLS 3623#if !ENABLE_MINIMAL
3585 else if (target == xa[XA_UTF8_STRING]) 3624 else if (target == xa[XA_UTF8_STRING])
3586 style = enc_utf8; 3625 style = enc_utf8;
3587#endif 3626#endif
3588 else 3627 else
3589 { 3628 {
… …
3600 { 3639 {
3601 cl = L""; 3640 cl = L"";
3602 selectlen = 0; 3641 selectlen = 0;
3603 } 3642 }
3604 3643
3605#if ENABLE_FRILLS 3644#if !ENABLE_MINIMAL
3606 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3645 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3607 // so recode it manually 3646 // so recode it manually
3608 if (style == enc_utf8) 3647 if (style == enc_utf8)
3609 { 3648 {
3610 freect = 1; 3649 freect = 1;
… …
3613 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3652 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3614 ct.nitems = strlen ((char *)ct.value); 3653 ct.nitems = strlen ((char *)ct.value);
3615 } 3654 }
3616 else 3655 else
3617#endif 3656#endif
3618 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3657 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3619 freect = 1; 3658 freect = 1;
3620 else 3659 else
3621 { 3660 {
3622 /* if we failed to convert then send it raw */ 3661 /* if we failed to convert then send it raw */
3623 ct.value = (unsigned char *)cl; 3662 ct.value = (unsigned char *)cl;
3624 ct.nitems = selectlen; 3663 ct.nitems = selectlen;
3625 ct.encoding = target; 3664 ct.encoding = target;
3626 } 3665 }
3627 3666
3628 XChangeProperty (disp, rq.requestor, rq.property, 3667 XChangeProperty (dpy, rq.requestor, rq.property,
3629 ct.encoding, 8, PropModeReplace, 3668 ct.encoding, 8, PropModeReplace,
3630 ct.value, (int)ct.nitems); 3669 ct.value, (int)ct.nitems);
3631 ev.property = rq.property; 3670 ev.property = rq.property;
3632 3671
3633 if (freect) 3672 if (freect)
3634 XFree (ct.value); 3673 XFree (ct.value);
3635 } 3674 }
3636 3675
3637 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3676 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3638} 3677}
3639 3678
3640/* ------------------------------------------------------------------------- * 3679/* ------------------------------------------------------------------------- *
3641 * MOUSE ROUTINES * 3680 * MOUSE ROUTINES *
3642 * ------------------------------------------------------------------------- */ 3681 * ------------------------------------------------------------------------- */
… …
3658void 3697void
3659rxvt_term::im_set_position (XPoint &pos) NOTHROW 3698rxvt_term::im_set_position (XPoint &pos) NOTHROW
3660{ 3699{
3661 XWindowAttributes xwa; 3700 XWindowAttributes xwa;
3662 3701
3663 XGetWindowAttributes (display->display, vt, &xwa); 3702 XGetWindowAttributes (dpy, vt, &xwa);
3664 3703
3665 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3704 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3666 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3705 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3667} 3706}
3668#endif 3707#endif
… …
3764rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3803rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3765{ 3804{
3766 while (*s) 3805 while (*s)
3767 { 3806 {
3768 text_t t = *s++; 3807 text_t t = *s++;
3769 int width = wcwidth (t); 3808 int width = WCWIDTH (t);
3770 3809
3771 while (width--) 3810 while (width--)
3772 { 3811 {
3773 scr_overlay_set (x++, y, t); 3812 scr_overlay_set (x++, y, t);
3774 t = NOCHAR; 3813 t = NOCHAR;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines