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.257 by root, Tue Jan 31 00:25:16 2006 UTC vs.
Revision 1.273 by ayin, Mon Aug 13 07:18:58 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>
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35inline void fill_text (text_t *start, text_t value, int len)
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
93 */ 91 */
94#define drawBuffer vt 92#define drawBuffer vt
95 93
96#define CLEAR_ROWS(row, num) \ 94#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 95 if (mapped) \
98 XClearArea (xdisp, drawBuffer, 0, \ 96 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 97 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 98 (unsigned int)Height2Pixel (num), False)
101 99
102#define CLEAR_CHARS(x, y, num) \ 100#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 101 if (mapped) \
104 XClearArea (xdisp, drawBuffer, x, y, \ 102 XClearArea (dpy, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel (num), \ 103 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 104 (unsigned int)Height2Pixel (1), False)
107 105
108#define ERASE_ROWS(row, num) \ 106#define ERASE_ROWS(row, num) \
109 XFillRectangle (xdisp, drawBuffer, gc, \ 107 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \ 108 0, Row2Pixel (row), \
111 (unsigned int)width, \ 109 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 110 (unsigned int)Height2Pixel (num))
113 111
114/* ------------------------------------------------------------------------- * 112/* ------------------------------------------------------------------------- *
… …
161{ 159{
162#if ENABLE_OVERLAY 160#if ENABLE_OVERLAY
163 scr_overlay_off (); 161 scr_overlay_off ();
164#endif 162#endif
165 163
164 rvideo_mode = false;
166 view_start = 0; 165 view_start = 0;
167 num_scr = 0; 166 num_scr = 0;
168 167
169 if (ncol == 0) 168 if (ncol == 0)
170 ncol = 80; 169 ncol = 80;
… …
237 selection.text = NULL; 236 selection.text = NULL;
238 selection.len = 0; 237 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
241 selection.clicks = 0; 240 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false;
243 } 241 }
244 else 242 else
245 { 243 {
246 /* 244 /*
247 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
409 prev_nrow = nrow; 407 prev_nrow = nrow;
410 prev_ncol = ncol; 408 prev_ncol = ncol;
411 409
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 410 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
413 411
414 for (int col = ncol; col--; ) 412 for (int col = ncol; --col; )
415 tabs [col] = col % TABSIZE == 0; 413 tabs [col] = col % TABSIZE == 0;
416 414
417 if (current_screen != PRIMARY) 415 if (current_screen != PRIMARY)
418 scr_swap_screen (); 416 scr_swap_screen ();
419 417
… …
510} 508}
511 509
512void 510void
513rxvt_term::scr_swap_screen () 511rxvt_term::scr_swap_screen ()
514{ 512{
515 if (!OPTION (Opt_secondaryScreen)) 513 if (!option (Opt_secondaryScreen))
516 return; 514 return;
517 515
518 for (int i = prev_nrow; i--; ) 516 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 517 ::swap (ROW(i), swap_buf [i]);
520 518
… …
542 selection_check (2); /* check for boundary cross */ 540 selection_check (2); /* check for boundary cross */
543 541
544 int i = current_screen; current_screen = scrn; scrn = i; 542 int i = current_screen; current_screen = scrn; scrn = i;
545 543
546#if NSCREENS 544#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 545 if (option (Opt_secondaryScreen))
548 { 546 {
549 num_scr = 0; 547 num_scr = 0;
550 548
551 scr_swap_screen (); 549 scr_swap_screen ();
552 550
… …
555 screen.flags |= Screen_VisibleCursor; 553 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 554 swap.flags |= Screen_VisibleCursor;
557 } 555 }
558 else 556 else
559#endif 557#endif
560 if (OPTION (Opt_secondaryScroll)) 558 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 559 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 560}
563 561
564// clear WrapNext indicator, solidifying position on next line 562// clear WrapNext indicator, solidifying position on next line
565void 563void
… …
624 want_refresh = 1; 622 want_refresh = 1;
625 num_scr += count; 623 num_scr += count;
626 624
627 if (count > 0 625 if (count > 0
628 && row1 == 0 626 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 627 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 628 {
631 top_row = max (top_row - count, -saveLines); 629 top_row = max (top_row - count, -saveLines);
632 630
633 // scroll everything up 'count' lines 631 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 632 term_start = (term_start + count) % total_rows;
… …
645 { 643 {
646 line_t &l = ROW(nrow - 1 - i); 644 line_t &l = ROW(nrow - 1 - i);
647 645
648 // optimize if already cleared, can be significant on slow machines 646 // optimize if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem 647 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask)) 648 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
651 { 649 {
652 scr_blank_line (l, 0, l.l, rstyle); 650 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0; 651 l.l = 0;
654 l.f = 0; 652 l.f = 0;
655 } 653 }
… …
684 selection.op = SELECTION_CLEAR; 682 selection.op = SELECTION_CLEAR;
685 } 683 }
686 } 684 }
687 685
688 // finally move the view window, if desired 686 // finally move the view window, if desired
689 if (OPTION (Opt_scrollWithBuffer) 687 if (option (Opt_scrollWithBuffer)
690 && view_start != 0 688 && view_start != 0
691 && view_start != -saveLines) 689 && view_start != -saveLines)
692 scr_page (UP, count); 690 scr_page (UP, count);
693 691
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 692 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
1071 if (count) 1069 if (count)
1072 x = ncol - 1; 1070 x = ncol - 1;
1073 1071
1074 // store horizontal tab commands as characters inside the text 1072 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1073 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1074 if (ht && option (Opt_pastableTabs))
1077 { 1075 {
1078 base_rend = SET_FONT (base_rend, 0); 1076 base_rend = SET_FONT (base_rend, 0);
1079 1077
1080 l.touch (x); 1078 l.touch (x);
1081 1079
… …
1342 } 1340 }
1343 else 1341 else
1344 { 1342 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1343 ren = rstyle & (RS_fgMask | RS_bgMask);
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1344 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1345 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1346 ERASE_ROWS (row, num);
1349 gcvalue.foreground = pix_colors[Color_fg]; 1347 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1348 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1351 } 1349 }
1352 1350
1353 for (; num--; row++) 1351 for (; num--; row++)
1354 { 1352 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1353 scr_blank_screen_mem (ROW(row), rstyle);
… …
1648 if (rvideo_state != on) 1646 if (rvideo_state != on)
1649 { 1647 {
1650 rvideo_state = on; 1648 rvideo_state = on;
1651 1649
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1650 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1651#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1652 if (bgPixmap.pixmap == None)
1655#endif 1653#endif
1656#if TRANSPARENT 1654#if ENABLE_TRANSPARENCY
1657 if (!OPTION (Opt_transparent) || am_transparent == 0) 1655 if (!option (Opt_transparent) || am_transparent == 0)
1658#endif 1656#endif
1659 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 1657 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1658
1661 XGCValues gcvalue; 1659 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1660 gcvalue.foreground = pix_colors[Color_fg];
1663 gcvalue.background = pix_colors[Color_bg]; 1661 gcvalue.background = pix_colors[Color_bg];
1664 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); 1662 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1665 1663
1666 scr_clear (); 1664 scr_clear ();
1667 scr_touch (true); 1665 scr_touch (true);
1668 } 1666 }
1669} 1667}
… …
1886{ 1884{
1887#ifndef NO_BELL 1885#ifndef NO_BELL
1888 1886
1889# ifndef NO_MAPALERT 1887# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1888# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1889 if (option (Opt_mapAlert))
1892# endif 1890# endif
1893 XMapWindow (xdisp, parent[0]); 1891 XMapWindow (dpy, parent[0]);
1894# endif 1892# endif
1893# if ENABLE_FRILLS
1894 if (option (Opt_urgentOnBell))
1895 {
1896 XWMHints *h;
1895 1897
1898 h = XGetWMHints(dpy, parent[0]);
1899 if (h != NULL)
1900 {
1901 h->flags |= XUrgencyHint;
1902 XSetWMHints(dpy, parent[0], h);
1903 }
1904 }
1905# endif
1906
1896 if (OPTION (Opt_visualBell)) 1907 if (option (Opt_visualBell))
1897 { 1908 {
1898 rvideo_bell = true; 1909 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1910 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1911 display->flush ();
1901 1912
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1913 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1903 } 1914 }
1904 else 1915 else
1905 XBell (xdisp, 0); 1916 XBell (dpy, 0);
1906
1907#endif 1917#endif
1908} 1918}
1909 1919
1910/* ------------------------------------------------------------------------- */ 1920/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */ 1921/* ARGSUSED */
… …
1969 * screen.text/screen.rend contain what the screen will change to. 1979 * screen.text/screen.rend contain what the screen will change to.
1970 */ 1980 */
1971void 1981void
1972rxvt_term::scr_refresh () NOTHROW 1982rxvt_term::scr_refresh () NOTHROW
1973{ 1983{
1974 unsigned char must_clear, /* use draw_string not draw_image_string */ 1984 unsigned char have_bg,
1975 showcursor; /* show the cursor */ 1985 showcursor; /* show the cursor */
1976 int16_t col, row, /* column/row we're processing */ 1986 int16_t col, row, /* column/row we're processing */
1977 ocrow; /* old cursor row */ 1987 ocrow; /* old cursor row */
1978 int i; /* tmp */ 1988 int i; /* tmp */
1979#ifndef NO_CURSORCOLOR 1989#ifndef NO_CURSORCOLOR
1980 rend_t cc1; /* store colours at cursor position (s) */ 1990 rend_t cc1; /* store colours at cursor position (s) */
1981#endif 1991#endif
1982 rend_t *crp; // cursor rendition pointer 1992 rend_t *crp; // cursor rendition pointer
1993 rend_t ccol1, /* Cursor colour */
1994 ccol2; /* Cursor colour2 */
1983 1995
1984 want_refresh = 0; /* screen is current */ 1996 want_refresh = 0; /* screen is current */
1985 1997
1986 if (refresh_type == NO_REFRESH || !mapped) 1998 if (refresh_type == NO_REFRESH || !mapped)
1987 return; 1999 return;
1988 2000
1989 /* 2001 /*
1990 * A: set up vars 2002 * A: set up vars
1991 */ 2003 */
1992 must_clear = 0; 2004 have_bg = 0;
1993 refresh_count = 0; 2005 refresh_count = 0;
1994 2006
1995#if XPM_BACKGROUND 2007#ifdef HAVE_BG_PIXMAP
1996 must_clear |= bgPixmap.pixmap != None; 2008 have_bg |= bgPixmap.pixmap != None;
1997#endif 2009#endif
1998#if TRANSPARENT 2010#if ENABLE_TRANSPARENCY
1999 must_clear |= OPTION (Opt_transparent) && am_transparent; 2011 have_bg |= option (Opt_transparent) && am_transparent;
2000#endif 2012#endif
2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2013 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2002 2014
2003 /* 2015 /*
2004 * B: reverse any characters which are selected 2016 * B: reverse any characters which are selected
… …
2008 /* 2020 /*
2009 * C: set the cursor character (s) 2021 * C: set the cursor character (s)
2010 */ 2022 */
2011 { 2023 {
2012 unsigned char setoldcursor; 2024 unsigned char setoldcursor;
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
2015 2025
2016 showcursor = (screen.flags & Screen_VisibleCursor); 2026 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2027#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2028 if (hidden_cursor)
2019 showcursor = 0; 2029 showcursor = 0;
… …
2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2036 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2027 col--; 2037 col--;
2028 2038
2029 crp = &ROW(screen.cur.row).r[col]; 2039 crp = &ROW(screen.cur.row).r[col];
2030 2040
2041#ifndef NO_CURSORCOLOR
2042 cc1 = *crp & (RS_fgMask | RS_bgMask);
2043 if (ISSET_PIXCOLOR (Color_cursor))
2044 ccol1 = Color_cursor;
2045 else
2046#endif
2047#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2048 ccol1 = fgcolor_of (rstyle);
2049#else
2050 ccol1 = Color_fg;
2051#endif
2052
2053#ifndef NO_CURSORCOLOR
2054 if (ISSET_PIXCOLOR (Color_cursor2))
2055 ccol2 = Color_cursor2;
2056 else
2057#endif
2058#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2059 ccol2 = bgcolor_of (rstyle);
2060#else
2061 ccol2 = Color_bg;
2062#endif
2063
2031 if (showcursor && focus) 2064 if (showcursor && focus)
2032 { 2065 {
2033 if (OPTION (Opt_cursorUnderline)) 2066 if (option (Opt_cursorUnderline))
2034 *crp ^= RS_Uline; 2067 *crp ^= RS_Uline;
2035 else 2068 else
2036 { 2069 {
2037 *crp ^= RS_RVid; 2070 *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); 2071 *crp = SET_FGCOLOR (*crp, ccol1);
2058 *crp = SET_BGCOLOR (*crp, ccol2); 2072 *crp = SET_BGCOLOR (*crp, ccol2);
2059#endif
2060 } 2073 }
2061 } 2074 }
2062 } 2075 }
2063 2076
2064 /* make sure no outline cursor is left around */ 2077 /* make sure no outline cursor is left around */
… …
2103 * D: CopyArea pass - very useful for slower links 2116 * D: CopyArea pass - very useful for slower links
2104 * This has been deliberately kept simple. 2117 * This has been deliberately kept simple.
2105 */ 2118 */
2106 if (!display->is_local 2119 if (!display->is_local
2107 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2120 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2108 && abs (num_scr) < nrow && !must_clear) 2121 && abs (num_scr) < nrow && !have_bg)
2109 { 2122 {
2110 int16_t nits; 2123 int16_t nits;
2124 int i = num_scr;
2111 int j; 2125 int j;
2112 int len, wlen; 2126 int len, wlen;
2113 dLocal (int, num_scr); 2127 dLocal (int, num_scr);
2114 2128
2115 j = nrow; 2129 j = nrow;
2116 wlen = len = -1; 2130 wlen = len = -1;
2117 row = i > 0 ? 0 : j - 1; 2131 row = i > 0 ? 0 : j - 1;
2132
2118 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2133 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2119 { 2134 {
2120 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2135 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2121 { 2136 {
2122 line_t s = ROW(view_start + row); 2137 line_t s = ROW(view_start + row);
… …
2143 wlen = row; 2158 wlen = row;
2144 continue; 2159 continue;
2145 } 2160 }
2146 } 2161 }
2147 2162
2148 if (len != -1) 2163 if (len >= 0)
2149 { 2164 {
2150 /* also comes here at end if needed because of >= above */ 2165 /* also comes here at end if needed because of >= above */
2151 if (wlen < len) 2166 if (wlen < len)
2152 ::swap (wlen, len); 2167 ::swap (wlen, len);
2153 2168
2169 XGCValues gcv;
2170
2171 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2154 XCopyArea (xdisp, vt, vt, 2172 XCopyArea (dpy, vt, vt,
2155 gc, 0, Row2Pixel (len + i), 2173 gc, 0, Row2Pixel (len + i),
2156 (unsigned int)this->width, 2174 (unsigned int)this->width,
2157 (unsigned int)Height2Pixel (wlen - len + 1), 2175 (unsigned int)Height2Pixel (wlen - len + 1),
2158 0, Row2Pixel (len)); 2176 0, Row2Pixel (len));
2177 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2178
2159 len = -1; 2179 len = -1;
2160 } 2180 }
2161 } 2181 }
2162 } 2182 }
2163#endif 2183#endif
… …
2219 count++; 2239 count++;
2220 2240
2221 if (stp[col] != dtp[col] 2241 if (stp[col] != dtp[col]
2222 || !RS_SAME (srp[col], drp[col])) 2242 || !RS_SAME (srp[col], drp[col]))
2223 { 2243 {
2224 if (must_clear && (i++ > count / 2)) 2244 if (have_bg && (i++ > count / 2))
2225 break; 2245 break;
2226 2246
2227 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2228 drp[col] = rend; 2248 drp[col] = rend;
2229 i = 0; 2249 i = 0;
2230 } 2250 }
2231 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2251 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2232 break; 2252 break;
2233 } 2253 }
2234 2254
2235 col--; /* went one too far. move back */ 2255 col--; /* went one too far. move back */
2236 count -= i; /* dump any matching trailing chars */ 2256 count -= i; /* dump any matching trailing chars */
… …
2246 int back = bgcolor_of (rend); // desired background 2266 int back = bgcolor_of (rend); // desired background
2247 2267
2248 // only do special processing if any attributes are set, which is unlikely 2268 // 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)) 2269 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2250 { 2270 {
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; 2271 bool invert = rend & RS_RVid;
2270 2272
2271#ifndef NO_BOLD_UNDERLINE_REVERSE 2273#ifndef NO_BOLD_UNDERLINE_REVERSE
2272 if (rend & RS_Bold 2274 if (rend & RS_Bold
2273 && fore == Color_fg) 2275 && fore == Color_fg)
… …
2289 else 2291 else
2290 invert = !invert; 2292 invert = !invert;
2291# endif 2293# endif
2292 } 2294 }
2293 2295
2294 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2296 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2295 fore = Color_UL; 2297 fore = Color_UL;
2296#endif 2298#endif
2297 2299
2298 if (invert) 2300 if (invert)
2299 { 2301 {
2302#ifdef OPTION_HC
2303 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2304 || !ISSET_PIXCOLOR (Color_HC))
2305#endif
2306 /* invert the column if no highlightColor is set or it is the
2307 * current cursor column */
2300 ::swap (fore, back); 2308 ::swap (fore, back);
2309#ifdef OPTION_HC
2310 else if (ISSET_PIXCOLOR (Color_HC))
2311 back = Color_HC;
2312#endif
2301 2313
2302#ifndef NO_BOLD_UNDERLINE_REVERSE 2314#ifndef NO_BOLD_UNDERLINE_REVERSE
2315# ifndef OPTION_HC
2303 if (ISSET_PIXCOLOR (Color_RV)) 2316 if (ISSET_PIXCOLOR (Color_RV))
2304 back = Color_RV; 2317 back = Color_RV;
2305 2318# endif
2306 if (fore == back) 2319 if (fore == back)
2307 { 2320 {
2308 fore = Color_bg; 2321 fore = Color_bg;
2309 back = Color_fg; 2322 back = Color_fg;
2310 } 2323 }
… …
2321 } 2334 }
2322 else if (hidden_text) 2335 else if (hidden_text)
2323 fore = back; 2336 fore = back;
2324 } 2337 }
2325#endif 2338#endif
2339
2340#if ENABLE_STYLES
2341 // "careful" (too wide) character handling
2342
2343 // include previous careful character(s) if possible, looks nicer (best effort...)
2344 while (text > stp
2345 && srp[text - stp - 1] & RS_Careful
2346 && RS_SAME (rend, srp[text - stp - 1]))
2347 text--, count++, xpixel -= fwidth;
2348
2349 // force redraw after "careful" characters to avoid pixel droppings
2350 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2351 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2352
2353 // force redraw before "careful" characters to avoid pixel droppings
2354 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2355 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2356#endif
2326 } 2357 }
2327 2358
2328 /* 2359 /*
2329 * Actually do the drawing of the string here 2360 * Actually do the drawing of the string here
2330 */ 2361 */
2331 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2362 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2332 2363
2333 if (back == fore)
2334 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2335 else if (back == Color_bg) 2364 if (have_bg && back == Color_bg)
2336 { 2365 {
2337 if (must_clear) 2366 // this is very ugly, maybe push it into ->draw?
2338 {
2339 CLEAR_CHARS (xpixel, ypixel, count);
2340 2367
2341 for (i = 0; i < count; i++) /* don't draw empty strings */ 2368 for (i = 0; i < count; i++) /* don't draw empty strings */
2342 if (text[i] != ' ') 2369 if (text[i] != ' ')
2343 { 2370 {
2344 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2371 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2345 break; 2372 goto did_clear;
2346 }
2347 } 2373 }
2348 else 2374
2349 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2375 CLEAR_CHARS (xpixel, ypixel, count);
2376 did_clear: ;
2350 } 2377 }
2351 else 2378 else
2352 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2379 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2353 2380
2354 if (rend & RS_Uline && font->descent > 1 && fore != back) 2381 if (rend & RS_Uline && font->descent > 1 && fore != back)
2355 { 2382 {
2356#if ENABLE_FRILLS 2383#if ENABLE_FRILLS
2357 if (ISSET_PIXCOLOR (Color_underline)) 2384 if (ISSET_PIXCOLOR (Color_underline))
2358 XSetForeground (xdisp, gc, pix_colors[Color_underline]); 2385 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2359 else 2386 else
2360#endif 2387#endif
2361 XSetForeground (xdisp, gc, pix_colors[fore]); 2388 XSetForeground (dpy, gc, pix_colors[fore]);
2362 2389
2363 XDrawLine (xdisp, drawBuffer, gc, 2390 XDrawLine (dpy, drawBuffer, gc,
2364 xpixel, ypixel + font->ascent + 1, 2391 xpixel, ypixel + font->ascent + 1,
2365 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2392 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2366 } 2393 }
2367 } /* for (col....) */ 2394 } /* for (col....) */
2368 } /* for (row....) */ 2395 } /* for (row....) */
… …
2377 */ 2404 */
2378 if (showcursor) 2405 if (showcursor)
2379 { 2406 {
2380 if (focus) 2407 if (focus)
2381 { 2408 {
2382 if (OPTION (Opt_cursorUnderline)) 2409 if (option (Opt_cursorUnderline))
2383 *crp ^= RS_Uline; 2410 *crp ^= RS_Uline;
2384 else 2411 else
2385 { 2412 {
2386 *crp ^= RS_RVid; 2413 *crp ^= RS_RVid;
2387#ifndef NO_CURSORCOLOR 2414#ifndef NO_CURSORCOLOR
… …
2401 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2428 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2402 cursorwidth++; 2429 cursorwidth++;
2403 2430
2404#ifndef NO_CURSORCOLOR 2431#ifndef NO_CURSORCOLOR
2405 if (ISSET_PIXCOLOR (Color_cursor)) 2432 if (ISSET_PIXCOLOR (Color_cursor))
2406 XSetForeground (xdisp, gc, pix_colors[Color_cursor]); 2433 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2434 else
2407#endif 2435#endif
2436 XSetForeground (dpy, gc, pix_colors[ccol1]);
2408 2437
2409 XDrawRectangle (xdisp, drawBuffer, gc, 2438 XDrawRectangle (dpy, drawBuffer, gc,
2410 Col2Pixel (col), 2439 Col2Pixel (col),
2411 Row2Pixel (oldcursor.row), 2440 Row2Pixel (oldcursor.row),
2412 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2441 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2413 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2442 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2414 } 2443 }
… …
2450 2479
2451void 2480void
2452rxvt_term::scr_recolour () NOTHROW 2481rxvt_term::scr_recolour () NOTHROW
2453{ 2482{
2454 if (1 2483 if (1
2455#if TRANSPARENT 2484#if ENABLE_TRANSPARENCY
2456 && !am_transparent 2485 && !am_transparent
2457#endif 2486#endif
2458#if XPM_BACKGROUND 2487#ifdef HAVE_BG_PIXMAP
2459 && !bgPixmap.pixmap 2488 && !bgPixmap.pixmap
2460#endif 2489#endif
2461 ) 2490 )
2462 { 2491 {
2463 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2492 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2464 XClearWindow (xdisp, parent[0]); 2493 XClearWindow (dpy, parent[0]);
2465 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2494 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2466#if HAVE_SCROLLBARS 2495#if HAVE_SCROLLBARS
2467 if (scrollBar.win) 2496 if (scrollBar.win)
2468 { 2497 {
2469 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2498 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2470 scrollBar.setIdle (); 2499 scrollBar.setIdle ();
2471 scrollbar_show (0); 2500 scrollbar_show (0);
2472 } 2501 }
2473#endif 2502#endif
2474 } 2503 }
… …
2487 2516
2488 num_scr_allow = 0; 2517 num_scr_allow = 0;
2489 want_refresh = 1; 2518 want_refresh = 1;
2490 2519
2491 if (really) 2520 if (really)
2492 XClearWindow (xdisp, vt); 2521 XClearWindow (dpy, vt);
2493} 2522}
2494 2523
2495void 2524void
2496rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2525rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2497{ 2526{
… …
2672 } 2701 }
2673 2702
2674 unsigned long bytes_after; 2703 unsigned long bytes_after;
2675 XTextProperty ct; 2704 XTextProperty ct;
2676 2705
2677 if (XGetWindowProperty (xdisp, win, prop, 2706 if (XGetWindowProperty (dpy, win, prop,
2678 0, PROP_SIZE / 4, 2707 0, PROP_SIZE / 4,
2679 delete_prop, AnyPropertyType, 2708 delete_prop, AnyPropertyType,
2680 &ct.encoding, &ct.format, 2709 &ct.encoding, &ct.format,
2681 &ct.nitems, &bytes_after, 2710 &ct.nitems, &bytes_after,
2682 &ct.value) != Success) 2711 &ct.value) != Success)
… …
2691 if (bytes_after) 2720 if (bytes_after)
2692 { 2721 {
2693 // fetch and append remaining data 2722 // fetch and append remaining data
2694 XTextProperty ct2; 2723 XTextProperty ct2;
2695 2724
2696 if (XGetWindowProperty (xdisp, win, prop, 2725 if (XGetWindowProperty (dpy, win, prop,
2697 ct.nitems / 4, (bytes_after + 3) / 4, 2726 ct.nitems / 4, (bytes_after + 3) / 4,
2698 delete_prop, AnyPropertyType, 2727 delete_prop, AnyPropertyType,
2699 &ct2.encoding, &ct2.format, 2728 &ct2.encoding, &ct2.format,
2700 &ct2.nitems, &bytes_after, 2729 &ct2.nitems, &bytes_after,
2701 &ct2.value) != Success) 2730 &ct2.value) != Success)
… …
2714 2743
2715 if (ct.encoding == xa[XA_INCR]) 2744 if (ct.encoding == xa[XA_INCR])
2716 { 2745 {
2717 // INCR selection, start handshake 2746 // INCR selection, start handshake
2718 if (!delete_prop) 2747 if (!delete_prop)
2719 XDeleteProperty (xdisp, win, prop); 2748 XDeleteProperty (dpy, win, prop);
2720 2749
2721 selection_wait = Sel_incr; 2750 selection_wait = Sel_incr;
2722 incr_buf_fill = 0; 2751 incr_buf_fill = 0;
2723 incr_ev.start (NOW + 10); 2752 incr_ev.start (NOW + 10);
2724 2753
… …
2785 paste (s, strlen (s)); 2814 paste (s, strlen (s));
2786 free (s); 2815 free (s);
2787 } 2816 }
2788 else 2817 else
2789#endif 2818#endif
2790 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 2819 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2791 && cl) 2820 && cl)
2792 { 2821 {
2793 for (int i = 0; i < cr; i++) 2822 for (int i = 0; i < cr; i++)
2794 paste (cl[i], strlen (cl[i])); 2823 paste (cl[i], strlen (cl[i]));
2795 2824
… …
2877 else if (selnum == Sel_Secondary) 2906 else if (selnum == Sel_Secondary)
2878 sel = XA_SECONDARY; 2907 sel = XA_SECONDARY;
2879 else 2908 else
2880 sel = xa[XA_CLIPBOARD]; 2909 sel = xa[XA_CLIPBOARD];
2881 2910
2882 if (XGetSelectionOwner (xdisp, sel) != None) 2911 if (XGetSelectionOwner (dpy, sel) != None)
2883 { 2912 {
2884 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], 2913 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2885 vt, selection_request_time); 2914 vt, selection_request_time);
2886 return 1; 2915 return 1;
2887 } 2916 }
2888 2917
2889 return 0; 2918 return 0;
… …
3042bool 3071bool
3043rxvt_term::selection_grab (Time tm) NOTHROW 3072rxvt_term::selection_grab (Time tm) NOTHROW
3044{ 3073{
3045 selection_time = tm; 3074 selection_time = tm;
3046 3075
3047 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); 3076 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3048 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) 3077 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3049 { 3078 {
3050 display->set_selection_owner (this); 3079 display->set_selection_owner (this);
3051 return true; 3080 return true;
3052 } 3081 }
3053 else 3082 else
… …
3057 } 3086 }
3058 3087
3059#if 0 3088#if 0
3060 XTextProperty ct; 3089 XTextProperty ct;
3061 3090
3062 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 3091 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3063 { 3092 {
3064 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3093 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3065 XFree (ct.value); 3094 XFree (ct.value);
3066 } 3095 }
3067#endif 3096#endif
… …
3395 selection_delimit_word (DN, &selection.end, &selection.end); 3424 selection_delimit_word (DN, &selection.end, &selection.end);
3396 } 3425 }
3397 else if (selection.clicks == 3) 3426 else if (selection.clicks == 3)
3398 { 3427 {
3399#if ENABLE_FRILLS 3428#if ENABLE_FRILLS
3400 if (OPTION (Opt_tripleclickwords)) 3429 if (option (Opt_tripleclickwords))
3401 { 3430 {
3402 selection_delimit_word (UP, &selection.beg, &selection.beg); 3431 selection_delimit_word (UP, &selection.beg, &selection.beg);
3403 3432
3404 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3433 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3405 { 3434 {
… …
3540 *target++ = xa[XA_COMPOUND_TEXT]; 3569 *target++ = xa[XA_COMPOUND_TEXT];
3541#if X_HAVE_UTF8_STRING 3570#if X_HAVE_UTF8_STRING
3542 *target++ = xa[XA_UTF8_STRING]; 3571 *target++ = xa[XA_UTF8_STRING];
3543#endif 3572#endif
3544 3573
3545 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3574 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3546 32, PropModeReplace, 3575 32, PropModeReplace,
3547 (unsigned char *)target_list, target - target_list); 3576 (unsigned char *)target_list, target - target_list);
3548 ev.property = rq.property; 3577 ev.property = rq.property;
3549 } 3578 }
3550#if TODO // TODO 3579#if TODO // TODO
… …
3553 /* TODO: Handle MULTIPLE */ 3582 /* TODO: Handle MULTIPLE */
3554 } 3583 }
3555#endif 3584#endif
3556 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3585 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3557 { 3586 {
3558 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3587 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3559 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3588 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3560 ev.property = rq.property; 3589 ev.property = rq.property;
3561 } 3590 }
3562 else if (rq.target == XA_STRING 3591 else if (rq.target == XA_STRING
3563 || rq.target == xa[XA_TEXT] 3592 || rq.target == xa[XA_TEXT]
… …
3621 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3650 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3622 ct.nitems = strlen ((char *)ct.value); 3651 ct.nitems = strlen ((char *)ct.value);
3623 } 3652 }
3624 else 3653 else
3625#endif 3654#endif
3626 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3655 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3627 freect = 1; 3656 freect = 1;
3628 else 3657 else
3629 { 3658 {
3630 /* if we failed to convert then send it raw */ 3659 /* if we failed to convert then send it raw */
3631 ct.value = (unsigned char *)cl; 3660 ct.value = (unsigned char *)cl;
3632 ct.nitems = selectlen; 3661 ct.nitems = selectlen;
3633 ct.encoding = target; 3662 ct.encoding = target;
3634 } 3663 }
3635 3664
3636 XChangeProperty (xdisp, rq.requestor, rq.property, 3665 XChangeProperty (dpy, rq.requestor, rq.property,
3637 ct.encoding, 8, PropModeReplace, 3666 ct.encoding, 8, PropModeReplace,
3638 ct.value, (int)ct.nitems); 3667 ct.value, (int)ct.nitems);
3639 ev.property = rq.property; 3668 ev.property = rq.property;
3640 3669
3641 if (freect) 3670 if (freect)
3642 XFree (ct.value); 3671 XFree (ct.value);
3643 } 3672 }
3644 3673
3645 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3674 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3646} 3675}
3647 3676
3648/* ------------------------------------------------------------------------- * 3677/* ------------------------------------------------------------------------- *
3649 * MOUSE ROUTINES * 3678 * MOUSE ROUTINES *
3650 * ------------------------------------------------------------------------- */ 3679 * ------------------------------------------------------------------------- */
… …
3666void 3695void
3667rxvt_term::im_set_position (XPoint &pos) NOTHROW 3696rxvt_term::im_set_position (XPoint &pos) NOTHROW
3668{ 3697{
3669 XWindowAttributes xwa; 3698 XWindowAttributes xwa;
3670 3699
3671 XGetWindowAttributes (xdisp, vt, &xwa); 3700 XGetWindowAttributes (dpy, vt, &xwa);
3672 3701
3673 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3702 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3674 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3703 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3675} 3704}
3676#endif 3705#endif

Diff Legend

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