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.256 by root, Mon Jan 30 20:12:37 2006 UTC vs.
Revision 1.274 by sasha, Mon Aug 13 22:41:34 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
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif
1659 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 1654 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1655
1661 XGCValues gcvalue; 1656 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1657 gcvalue.foreground = pix_colors[Color_fg];
1663 gcvalue.background = pix_colors[Color_bg]; 1658 gcvalue.background = pix_colors[Color_bg];
1664 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); 1659 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1665 1660
1666 scr_clear (); 1661 scr_clear ();
1667 scr_touch (true); 1662 scr_touch (true);
1668 } 1663 }
1669} 1664}
… …
1886{ 1881{
1887#ifndef NO_BELL 1882#ifndef NO_BELL
1888 1883
1889# ifndef NO_MAPALERT 1884# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1885# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1886 if (option (Opt_mapAlert))
1892# endif 1887# endif
1893 XMapWindow (xdisp, parent[0]); 1888 XMapWindow (dpy, parent[0]);
1894# endif 1889# endif
1890# if ENABLE_FRILLS
1891 if (option (Opt_urgentOnBell))
1892 {
1893 XWMHints *h;
1895 1894
1895 h = XGetWMHints(dpy, parent[0]);
1896 if (h != NULL)
1897 {
1898 h->flags |= XUrgencyHint;
1899 XSetWMHints(dpy, parent[0], h);
1900 }
1901 }
1902# endif
1903
1896 if (OPTION (Opt_visualBell)) 1904 if (option (Opt_visualBell))
1897 { 1905 {
1898 rvideo_bell = true; 1906 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1907 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1908 display->flush ();
1901 1909
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1910 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1903 } 1911 }
1904 else 1912 else
1905 XBell (xdisp, 0); 1913 XBell (dpy, 0);
1906
1907#endif 1914#endif
1908} 1915}
1909 1916
1910/* ------------------------------------------------------------------------- */ 1917/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */ 1918/* ARGSUSED */
… …
1969 * screen.text/screen.rend contain what the screen will change to. 1976 * screen.text/screen.rend contain what the screen will change to.
1970 */ 1977 */
1971void 1978void
1972rxvt_term::scr_refresh () NOTHROW 1979rxvt_term::scr_refresh () NOTHROW
1973{ 1980{
1974 unsigned char must_clear, /* use draw_string not draw_image_string */ 1981 unsigned char have_bg,
1975 showcursor; /* show the cursor */ 1982 showcursor; /* show the cursor */
1976 int16_t col, row, /* column/row we're processing */ 1983 int16_t col, row, /* column/row we're processing */
1977 ocrow; /* old cursor row */ 1984 ocrow; /* old cursor row */
1978 int i; /* tmp */ 1985 int i; /* tmp */
1979#ifndef NO_CURSORCOLOR 1986#ifndef NO_CURSORCOLOR
1980 rend_t cc1; /* store colours at cursor position (s) */ 1987 rend_t cc1; /* store colours at cursor position (s) */
1981#endif 1988#endif
1982 rend_t *crp; // cursor rendition pointer 1989 rend_t *crp; // cursor rendition pointer
1990 rend_t ccol1, /* Cursor colour */
1991 ccol2; /* Cursor colour2 */
1983 1992
1984 want_refresh = 0; /* screen is current */ 1993 want_refresh = 0; /* screen is current */
1985 1994
1986 if (refresh_type == NO_REFRESH || !mapped) 1995 if (refresh_type == NO_REFRESH || !mapped)
1987 return; 1996 return;
1988 1997
1989 /* 1998 /*
1990 * A: set up vars 1999 * A: set up vars
1991 */ 2000 */
1992 must_clear = 0; 2001 have_bg = 0;
1993 refresh_count = 0; 2002 refresh_count = 0;
1994 2003
1995#if XPM_BACKGROUND 2004#ifdef HAVE_BG_PIXMAP
1996 must_clear |= bgPixmap.pixmap != None; 2005 have_bg |= bgPixmap.pixmap != None;
1997#endif
1998#if TRANSPARENT
1999 must_clear |= OPTION (Opt_transparent) && am_transparent;
2000#endif 2006#endif
2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2007 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2002 2008
2003 /* 2009 /*
2004 * B: reverse any characters which are selected 2010 * B: reverse any characters which are selected
… …
2008 /* 2014 /*
2009 * C: set the cursor character (s) 2015 * C: set the cursor character (s)
2010 */ 2016 */
2011 { 2017 {
2012 unsigned char setoldcursor; 2018 unsigned char setoldcursor;
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
2015 2019
2016 showcursor = (screen.flags & Screen_VisibleCursor); 2020 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2021#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2022 if (hidden_cursor)
2019 showcursor = 0; 2023 showcursor = 0;
… …
2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2030 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2027 col--; 2031 col--;
2028 2032
2029 crp = &ROW(screen.cur.row).r[col]; 2033 crp = &ROW(screen.cur.row).r[col];
2030 2034
2035#ifndef NO_CURSORCOLOR
2036 cc1 = *crp & (RS_fgMask | RS_bgMask);
2037 if (ISSET_PIXCOLOR (Color_cursor))
2038 ccol1 = Color_cursor;
2039 else
2040#endif
2041#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2042 ccol1 = fgcolor_of (rstyle);
2043#else
2044 ccol1 = Color_fg;
2045#endif
2046
2047#ifndef NO_CURSORCOLOR
2048 if (ISSET_PIXCOLOR (Color_cursor2))
2049 ccol2 = Color_cursor2;
2050 else
2051#endif
2052#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2053 ccol2 = bgcolor_of (rstyle);
2054#else
2055 ccol2 = Color_bg;
2056#endif
2057
2031 if (showcursor && focus) 2058 if (showcursor && focus)
2032 { 2059 {
2033 if (OPTION (Opt_cursorUnderline)) 2060 if (option (Opt_cursorUnderline))
2034 *crp ^= RS_Uline; 2061 *crp ^= RS_Uline;
2035 else 2062 else
2036 { 2063 {
2037 *crp ^= RS_RVid; 2064 *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); 2065 *crp = SET_FGCOLOR (*crp, ccol1);
2058 *crp = SET_BGCOLOR (*crp, ccol2); 2066 *crp = SET_BGCOLOR (*crp, ccol2);
2059#endif
2060 } 2067 }
2061 } 2068 }
2062 } 2069 }
2063 2070
2064 /* make sure no outline cursor is left around */ 2071 /* make sure no outline cursor is left around */
… …
2103 * D: CopyArea pass - very useful for slower links 2110 * D: CopyArea pass - very useful for slower links
2104 * This has been deliberately kept simple. 2111 * This has been deliberately kept simple.
2105 */ 2112 */
2106 if (!display->is_local 2113 if (!display->is_local
2107 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2114 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2108 && abs (num_scr) < nrow && !must_clear) 2115 && abs (num_scr) < nrow && !have_bg)
2109 { 2116 {
2110 int16_t nits; 2117 int16_t nits;
2118 int i = num_scr;
2111 int j; 2119 int j;
2112 int len, wlen; 2120 int len, wlen;
2113 dLocal (int, num_scr); 2121 dLocal (int, num_scr);
2114 2122
2115 j = nrow; 2123 j = nrow;
2116 wlen = len = -1; 2124 wlen = len = -1;
2117 row = i > 0 ? 0 : j - 1; 2125 row = i > 0 ? 0 : j - 1;
2126
2118 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2127 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2119 { 2128 {
2120 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2129 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2121 { 2130 {
2122 line_t s = ROW(view_start + row); 2131 line_t s = ROW(view_start + row);
… …
2143 wlen = row; 2152 wlen = row;
2144 continue; 2153 continue;
2145 } 2154 }
2146 } 2155 }
2147 2156
2148 if (len != -1) 2157 if (len >= 0)
2149 { 2158 {
2150 /* also comes here at end if needed because of >= above */ 2159 /* also comes here at end if needed because of >= above */
2151 if (wlen < len) 2160 if (wlen < len)
2152 ::swap (wlen, len); 2161 ::swap (wlen, len);
2153 2162
2163 XGCValues gcv;
2164
2165 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2154 XCopyArea (xdisp, vt, vt, 2166 XCopyArea (dpy, vt, vt,
2155 gc, 0, Row2Pixel (len + i), 2167 gc, 0, Row2Pixel (len + i),
2156 (unsigned int)this->width, 2168 (unsigned int)this->width,
2157 (unsigned int)Height2Pixel (wlen - len + 1), 2169 (unsigned int)Height2Pixel (wlen - len + 1),
2158 0, Row2Pixel (len)); 2170 0, Row2Pixel (len));
2171 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2172
2159 len = -1; 2173 len = -1;
2160 } 2174 }
2161 } 2175 }
2162 } 2176 }
2163#endif 2177#endif
… …
2219 count++; 2233 count++;
2220 2234
2221 if (stp[col] != dtp[col] 2235 if (stp[col] != dtp[col]
2222 || !RS_SAME (srp[col], drp[col])) 2236 || !RS_SAME (srp[col], drp[col]))
2223 { 2237 {
2224 if (must_clear && (i++ > count / 2)) 2238 if (have_bg && (i++ > count / 2))
2225 break; 2239 break;
2226 2240
2227 dtp[col] = stp[col]; 2241 dtp[col] = stp[col];
2228 drp[col] = rend; 2242 drp[col] = rend;
2229 i = 0; 2243 i = 0;
2230 } 2244 }
2231 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2245 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2232 break; 2246 break;
2233 } 2247 }
2234 2248
2235 col--; /* went one too far. move back */ 2249 col--; /* went one too far. move back */
2236 count -= i; /* dump any matching trailing chars */ 2250 count -= i; /* dump any matching trailing chars */
… …
2246 int back = bgcolor_of (rend); // desired background 2260 int back = bgcolor_of (rend); // desired background
2247 2261
2248 // only do special processing if any attributes are set, which is unlikely 2262 // 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)) 2263 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2250 { 2264 {
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; 2265 bool invert = rend & RS_RVid;
2270 2266
2271#ifndef NO_BOLD_UNDERLINE_REVERSE 2267#ifndef NO_BOLD_UNDERLINE_REVERSE
2272 if (rend & RS_Bold 2268 if (rend & RS_Bold
2273 && fore == Color_fg) 2269 && fore == Color_fg)
… …
2289 else 2285 else
2290 invert = !invert; 2286 invert = !invert;
2291# endif 2287# endif
2292 } 2288 }
2293 2289
2294 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2295 fore = Color_UL; 2291 fore = Color_UL;
2296#endif 2292#endif
2297 2293
2298 if (invert) 2294 if (invert)
2299 { 2295 {
2296#ifdef OPTION_HC
2297 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2298 || !ISSET_PIXCOLOR (Color_HC))
2299#endif
2300 /* invert the column if no highlightColor is set or it is the
2301 * current cursor column */
2300 ::swap (fore, back); 2302 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2301 2307
2302#ifndef NO_BOLD_UNDERLINE_REVERSE 2308#ifndef NO_BOLD_UNDERLINE_REVERSE
2309# ifndef OPTION_HC
2303 if (ISSET_PIXCOLOR (Color_RV)) 2310 if (ISSET_PIXCOLOR (Color_RV))
2304 back = Color_RV; 2311 back = Color_RV;
2305 2312# endif
2306 if (fore == back) 2313 if (fore == back)
2307 { 2314 {
2308 fore = Color_bg; 2315 fore = Color_bg;
2309 back = Color_fg; 2316 back = Color_fg;
2310 } 2317 }
… …
2321 } 2328 }
2322 else if (hidden_text) 2329 else if (hidden_text)
2323 fore = back; 2330 fore = back;
2324 } 2331 }
2325#endif 2332#endif
2333
2334#if ENABLE_STYLES
2335 // "careful" (too wide) character handling
2336
2337 // include previous careful character(s) if possible, looks nicer (best effort...)
2338 while (text > stp
2339 && srp[text - stp - 1] & RS_Careful
2340 && RS_SAME (rend, srp[text - stp - 1]))
2341 text--, count++, xpixel -= fwidth;
2342
2343 // force redraw after "careful" characters to avoid pixel droppings
2344 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2345 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2346
2347 // force redraw before "careful" characters to avoid pixel droppings
2348 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2349 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2350#endif
2326 } 2351 }
2327 2352
2328 /* 2353 /*
2329 * Actually do the drawing of the string here 2354 * Actually do the drawing of the string here
2330 */ 2355 */
2331 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2332 2357
2333 if (back == fore)
2334 font->clear_rect (*drawable, xpixel, ypixel,
2335 fwidth * count, fheight,
2336 back);
2337 else if (back == Color_bg) 2358 if (have_bg && back == Color_bg)
2338 { 2359 {
2339 if (must_clear) 2360 // this is very ugly, maybe push it into ->draw?
2340 {
2341 CLEAR_CHARS (xpixel, ypixel, count);
2342 2361
2343 for (i = 0; i < count; i++) /* don't draw empty strings */ 2362 for (i = 0; i < count; i++) /* don't draw empty strings */
2344 if (text[i] != ' ') 2363 if (text[i] != ' ')
2345 { 2364 {
2346 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2365 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2347 break; 2366 goto did_clear;
2348 }
2349 } 2367 }
2350 else 2368
2351 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2369 CLEAR_CHARS (xpixel, ypixel, count);
2370 did_clear: ;
2352 } 2371 }
2353 else 2372 else
2354 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2355 2374
2356 if (rend & RS_Uline && font->descent > 1 && fore != back) 2375 if (rend & RS_Uline && font->descent > 1 && fore != back)
2357 { 2376 {
2358#if ENABLE_FRILLS 2377#if ENABLE_FRILLS
2359 if (ISSET_PIXCOLOR (Color_underline)) 2378 if (ISSET_PIXCOLOR (Color_underline))
2360 XSetForeground (xdisp, gc, pix_colors[Color_underline]); 2379 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2361 else 2380 else
2362#endif 2381#endif
2363 XSetForeground (xdisp, gc, pix_colors[fore]); 2382 XSetForeground (dpy, gc, pix_colors[fore]);
2364 2383
2365 XDrawLine (xdisp, drawBuffer, gc, 2384 XDrawLine (dpy, drawBuffer, gc,
2366 xpixel, ypixel + font->ascent + 1, 2385 xpixel, ypixel + font->ascent + 1,
2367 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2368 } 2387 }
2369 } /* for (col....) */ 2388 } /* for (col....) */
2370 } /* for (row....) */ 2389 } /* for (row....) */
… …
2379 */ 2398 */
2380 if (showcursor) 2399 if (showcursor)
2381 { 2400 {
2382 if (focus) 2401 if (focus)
2383 { 2402 {
2384 if (OPTION (Opt_cursorUnderline)) 2403 if (option (Opt_cursorUnderline))
2385 *crp ^= RS_Uline; 2404 *crp ^= RS_Uline;
2386 else 2405 else
2387 { 2406 {
2388 *crp ^= RS_RVid; 2407 *crp ^= RS_RVid;
2389#ifndef NO_CURSORCOLOR 2408#ifndef NO_CURSORCOLOR
… …
2403 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2422 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2404 cursorwidth++; 2423 cursorwidth++;
2405 2424
2406#ifndef NO_CURSORCOLOR 2425#ifndef NO_CURSORCOLOR
2407 if (ISSET_PIXCOLOR (Color_cursor)) 2426 if (ISSET_PIXCOLOR (Color_cursor))
2408 XSetForeground (xdisp, gc, pix_colors[Color_cursor]); 2427 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2428 else
2409#endif 2429#endif
2430 XSetForeground (dpy, gc, pix_colors[ccol1]);
2410 2431
2411 XDrawRectangle (xdisp, drawBuffer, gc, 2432 XDrawRectangle (dpy, drawBuffer, gc,
2412 Col2Pixel (col), 2433 Col2Pixel (col),
2413 Row2Pixel (oldcursor.row), 2434 Row2Pixel (oldcursor.row),
2414 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2435 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2415 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2416 } 2437 }
… …
2451} 2472}
2452 2473
2453void 2474void
2454rxvt_term::scr_recolour () NOTHROW 2475rxvt_term::scr_recolour () NOTHROW
2455{ 2476{
2456 if (1 2477#ifdef HAVE_BG_PIXMAP
2457#if TRANSPARENT 2478 bgPixmap.apply ();
2458 && !am_transparent 2479#else
2459#endif
2460#if XPM_BACKGROUND
2461 && !bgPixmap.pixmap
2462#endif
2463 )
2464 {
2465 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2466 XClearWindow (xdisp, parent[0]); 2481 XClearWindow (dpy, parent[0]);
2467 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2468#if HAVE_SCROLLBARS 2483# if HAVE_SCROLLBARS
2469 if (scrollBar.win) 2484 if (scrollBar.win)
2470 { 2485 {
2471 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2472 scrollBar.setIdle (); 2487 scrollBar.setIdle ();
2473 scrollbar_show (0); 2488 scrollbar_show (0);
2474 } 2489 }
2475#endif 2490# endif
2476 } 2491#endif
2477 2492
2478 scr_clear (); 2493 scr_clear ();
2479 scr_touch (true); 2494 scr_touch (true);
2480 want_refresh = 1; 2495 want_refresh = 1;
2481} 2496}
2482 2497
… …
2489 2504
2490 num_scr_allow = 0; 2505 num_scr_allow = 0;
2491 want_refresh = 1; 2506 want_refresh = 1;
2492 2507
2493 if (really) 2508 if (really)
2494 XClearWindow (xdisp, vt); 2509 XClearWindow (dpy, vt);
2495} 2510}
2496 2511
2497void 2512void
2498rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2513rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2499{ 2514{
… …
2674 } 2689 }
2675 2690
2676 unsigned long bytes_after; 2691 unsigned long bytes_after;
2677 XTextProperty ct; 2692 XTextProperty ct;
2678 2693
2679 if (XGetWindowProperty (xdisp, win, prop, 2694 if (XGetWindowProperty (dpy, win, prop,
2680 0, PROP_SIZE / 4, 2695 0, PROP_SIZE / 4,
2681 delete_prop, AnyPropertyType, 2696 delete_prop, AnyPropertyType,
2682 &ct.encoding, &ct.format, 2697 &ct.encoding, &ct.format,
2683 &ct.nitems, &bytes_after, 2698 &ct.nitems, &bytes_after,
2684 &ct.value) != Success) 2699 &ct.value) != Success)
… …
2693 if (bytes_after) 2708 if (bytes_after)
2694 { 2709 {
2695 // fetch and append remaining data 2710 // fetch and append remaining data
2696 XTextProperty ct2; 2711 XTextProperty ct2;
2697 2712
2698 if (XGetWindowProperty (xdisp, win, prop, 2713 if (XGetWindowProperty (dpy, win, prop,
2699 ct.nitems / 4, (bytes_after + 3) / 4, 2714 ct.nitems / 4, (bytes_after + 3) / 4,
2700 delete_prop, AnyPropertyType, 2715 delete_prop, AnyPropertyType,
2701 &ct2.encoding, &ct2.format, 2716 &ct2.encoding, &ct2.format,
2702 &ct2.nitems, &bytes_after, 2717 &ct2.nitems, &bytes_after,
2703 &ct2.value) != Success) 2718 &ct2.value) != Success)
… …
2716 2731
2717 if (ct.encoding == xa[XA_INCR]) 2732 if (ct.encoding == xa[XA_INCR])
2718 { 2733 {
2719 // INCR selection, start handshake 2734 // INCR selection, start handshake
2720 if (!delete_prop) 2735 if (!delete_prop)
2721 XDeleteProperty (xdisp, win, prop); 2736 XDeleteProperty (dpy, win, prop);
2722 2737
2723 selection_wait = Sel_incr; 2738 selection_wait = Sel_incr;
2724 incr_buf_fill = 0; 2739 incr_buf_fill = 0;
2725 incr_ev.start (NOW + 10); 2740 incr_ev.start (NOW + 10);
2726 2741
… …
2787 paste (s, strlen (s)); 2802 paste (s, strlen (s));
2788 free (s); 2803 free (s);
2789 } 2804 }
2790 else 2805 else
2791#endif 2806#endif
2792 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 2807 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2793 && cl) 2808 && cl)
2794 { 2809 {
2795 for (int i = 0; i < cr; i++) 2810 for (int i = 0; i < cr; i++)
2796 paste (cl[i], strlen (cl[i])); 2811 paste (cl[i], strlen (cl[i]));
2797 2812
… …
2879 else if (selnum == Sel_Secondary) 2894 else if (selnum == Sel_Secondary)
2880 sel = XA_SECONDARY; 2895 sel = XA_SECONDARY;
2881 else 2896 else
2882 sel = xa[XA_CLIPBOARD]; 2897 sel = xa[XA_CLIPBOARD];
2883 2898
2884 if (XGetSelectionOwner (xdisp, sel) != None) 2899 if (XGetSelectionOwner (dpy, sel) != None)
2885 { 2900 {
2886 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], 2901 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2887 vt, selection_request_time); 2902 vt, selection_request_time);
2888 return 1; 2903 return 1;
2889 } 2904 }
2890 2905
2891 return 0; 2906 return 0;
… …
3044bool 3059bool
3045rxvt_term::selection_grab (Time tm) NOTHROW 3060rxvt_term::selection_grab (Time tm) NOTHROW
3046{ 3061{
3047 selection_time = tm; 3062 selection_time = tm;
3048 3063
3049 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); 3064 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3050 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) 3065 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3051 { 3066 {
3052 display->set_selection_owner (this); 3067 display->set_selection_owner (this);
3053 return true; 3068 return true;
3054 } 3069 }
3055 else 3070 else
… …
3059 } 3074 }
3060 3075
3061#if 0 3076#if 0
3062 XTextProperty ct; 3077 XTextProperty ct;
3063 3078
3064 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 3079 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3065 { 3080 {
3066 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3081 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3067 XFree (ct.value); 3082 XFree (ct.value);
3068 } 3083 }
3069#endif 3084#endif
… …
3397 selection_delimit_word (DN, &selection.end, &selection.end); 3412 selection_delimit_word (DN, &selection.end, &selection.end);
3398 } 3413 }
3399 else if (selection.clicks == 3) 3414 else if (selection.clicks == 3)
3400 { 3415 {
3401#if ENABLE_FRILLS 3416#if ENABLE_FRILLS
3402 if (OPTION (Opt_tripleclickwords)) 3417 if (option (Opt_tripleclickwords))
3403 { 3418 {
3404 selection_delimit_word (UP, &selection.beg, &selection.beg); 3419 selection_delimit_word (UP, &selection.beg, &selection.beg);
3405 3420
3406 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3421 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3407 { 3422 {
… …
3542 *target++ = xa[XA_COMPOUND_TEXT]; 3557 *target++ = xa[XA_COMPOUND_TEXT];
3543#if X_HAVE_UTF8_STRING 3558#if X_HAVE_UTF8_STRING
3544 *target++ = xa[XA_UTF8_STRING]; 3559 *target++ = xa[XA_UTF8_STRING];
3545#endif 3560#endif
3546 3561
3547 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3562 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3548 32, PropModeReplace, 3563 32, PropModeReplace,
3549 (unsigned char *)target_list, target - target_list); 3564 (unsigned char *)target_list, target - target_list);
3550 ev.property = rq.property; 3565 ev.property = rq.property;
3551 } 3566 }
3552#if TODO // TODO 3567#if TODO // TODO
… …
3555 /* TODO: Handle MULTIPLE */ 3570 /* TODO: Handle MULTIPLE */
3556 } 3571 }
3557#endif 3572#endif
3558 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3573 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3559 { 3574 {
3560 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3575 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3561 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3576 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3562 ev.property = rq.property; 3577 ev.property = rq.property;
3563 } 3578 }
3564 else if (rq.target == XA_STRING 3579 else if (rq.target == XA_STRING
3565 || rq.target == xa[XA_TEXT] 3580 || rq.target == xa[XA_TEXT]
… …
3623 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3638 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3624 ct.nitems = strlen ((char *)ct.value); 3639 ct.nitems = strlen ((char *)ct.value);
3625 } 3640 }
3626 else 3641 else
3627#endif 3642#endif
3628 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3643 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3629 freect = 1; 3644 freect = 1;
3630 else 3645 else
3631 { 3646 {
3632 /* if we failed to convert then send it raw */ 3647 /* if we failed to convert then send it raw */
3633 ct.value = (unsigned char *)cl; 3648 ct.value = (unsigned char *)cl;
3634 ct.nitems = selectlen; 3649 ct.nitems = selectlen;
3635 ct.encoding = target; 3650 ct.encoding = target;
3636 } 3651 }
3637 3652
3638 XChangeProperty (xdisp, rq.requestor, rq.property, 3653 XChangeProperty (dpy, rq.requestor, rq.property,
3639 ct.encoding, 8, PropModeReplace, 3654 ct.encoding, 8, PropModeReplace,
3640 ct.value, (int)ct.nitems); 3655 ct.value, (int)ct.nitems);
3641 ev.property = rq.property; 3656 ev.property = rq.property;
3642 3657
3643 if (freect) 3658 if (freect)
3644 XFree (ct.value); 3659 XFree (ct.value);
3645 } 3660 }
3646 3661
3647 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3662 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3648} 3663}
3649 3664
3650/* ------------------------------------------------------------------------- * 3665/* ------------------------------------------------------------------------- *
3651 * MOUSE ROUTINES * 3666 * MOUSE ROUTINES *
3652 * ------------------------------------------------------------------------- */ 3667 * ------------------------------------------------------------------------- */
… …
3668void 3683void
3669rxvt_term::im_set_position (XPoint &pos) NOTHROW 3684rxvt_term::im_set_position (XPoint &pos) NOTHROW
3670{ 3685{
3671 XWindowAttributes xwa; 3686 XWindowAttributes xwa;
3672 3687
3673 XGetWindowAttributes (xdisp, vt, &xwa); 3688 XGetWindowAttributes (dpy, vt, &xwa);
3674 3689
3675 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3690 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3676 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3691 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3677} 3692}
3678#endif 3693#endif

Diff Legend

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