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.266 by root, Mon Oct 9 23:12:45 2006 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>
… …
93 */ 93 */
94#define drawBuffer vt 94#define drawBuffer vt
95 95
96#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 97 if (mapped) \
98 XClearArea (xdisp, drawBuffer, 0, \ 98 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
101 101
102#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 103 if (mapped) \
104 XClearArea (xdisp, drawBuffer, x, y, \ 104 XClearArea (dpy, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
107 107
108#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
109 XFillRectangle (xdisp, drawBuffer, gc, \ 109 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
111 (unsigned int)width, \ 111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
113 113
114/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
… …
409 prev_nrow = nrow; 409 prev_nrow = nrow;
410 prev_ncol = ncol; 410 prev_ncol = ncol;
411 411
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
413 413
414 for (int col = ncol; col--; ) 414 for (int col = ncol; --col; )
415 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
416 416
417 if (current_screen != PRIMARY) 417 if (current_screen != PRIMARY)
418 scr_swap_screen (); 418 scr_swap_screen ();
419 419
… …
645 { 645 {
646 line_t &l = ROW(nrow - 1 - i); 646 line_t &l = ROW(nrow - 1 - i);
647 647
648 // optimize if already cleared, can be significant on slow machines 648 // optimize if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem 649 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask)) 650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
651 { 651 {
652 scr_blank_line (l, 0, l.l, rstyle); 652 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0; 653 l.l = 0;
654 l.f = 0; 654 l.f = 0;
655 } 655 }
… …
1342 } 1342 }
1343 else 1343 else
1344 { 1344 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1345 ren = rstyle & (RS_fgMask | RS_bgMask);
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1347 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1348 ERASE_ROWS (row, num);
1349 gcvalue.foreground = pix_colors[Color_fg]; 1349 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1350 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1351 } 1351 }
1352 1352
1353 for (; num--; row++) 1353 for (; num--; row++)
1354 { 1354 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1355 scr_blank_screen_mem (ROW(row), rstyle);
… …
1654 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1655#endif 1655#endif
1656#if TRANSPARENT 1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0) 1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif 1658#endif
1659 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1660
1661 XGCValues gcvalue; 1661 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1662 gcvalue.foreground = pix_colors[Color_fg];
1663 gcvalue.background = pix_colors[Color_bg]; 1663 gcvalue.background = pix_colors[Color_bg];
1664 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); 1664 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1665 1665
1666 scr_clear (); 1666 scr_clear ();
1667 scr_touch (true); 1667 scr_touch (true);
1668 } 1668 }
1669} 1669}
… …
1888 1888
1889# ifndef NO_MAPALERT 1889# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1890# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1891 if (OPTION (Opt_mapAlert))
1892# endif 1892# endif
1893 XMapWindow (xdisp, parent[0]); 1893 XMapWindow (dpy, parent[0]);
1894# endif 1894# endif
1895 1895
1896 if (OPTION (Opt_visualBell)) 1896 if (OPTION (Opt_visualBell))
1897 { 1897 {
1898 rvideo_bell = true; 1898 rvideo_bell = true;
… …
1900 display->flush (); 1900 display->flush ();
1901 1901
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1902 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1903 } 1903 }
1904 else 1904 else
1905 XBell (xdisp, 0); 1905 XBell (dpy, 0);
1906 1906
1907#endif 1907#endif
1908} 1908}
1909 1909
1910/* ------------------------------------------------------------------------- */ 1910/* ------------------------------------------------------------------------- */
… …
1969 * screen.text/screen.rend contain what the screen will change to. 1969 * screen.text/screen.rend contain what the screen will change to.
1970 */ 1970 */
1971void 1971void
1972rxvt_term::scr_refresh () NOTHROW 1972rxvt_term::scr_refresh () NOTHROW
1973{ 1973{
1974 unsigned char must_clear, /* use draw_string not draw_image_string */ 1974 unsigned char have_bg,
1975 showcursor; /* show the cursor */ 1975 showcursor; /* show the cursor */
1976 int16_t col, row, /* column/row we're processing */ 1976 int16_t col, row, /* column/row we're processing */
1977 ocrow; /* old cursor row */ 1977 ocrow; /* old cursor row */
1978 int i; /* tmp */ 1978 int i; /* tmp */
1979#ifndef NO_CURSORCOLOR 1979#ifndef NO_CURSORCOLOR
1980 rend_t cc1; /* store colours at cursor position (s) */ 1980 rend_t cc1; /* store colours at cursor position (s) */
1981#endif 1981#endif
1982 rend_t *crp; // cursor rendition pointer 1982 rend_t *crp; // cursor rendition pointer
1983 rend_t ccol1, /* Cursor colour */
1984 ccol2; /* Cursor colour2 */
1983 1985
1984 want_refresh = 0; /* screen is current */ 1986 want_refresh = 0; /* screen is current */
1985 1987
1986 if (refresh_type == NO_REFRESH || !mapped) 1988 if (refresh_type == NO_REFRESH || !mapped)
1987 return; 1989 return;
1988 1990
1989 /* 1991 /*
1990 * A: set up vars 1992 * A: set up vars
1991 */ 1993 */
1992 must_clear = 0; 1994 have_bg = 0;
1993 refresh_count = 0; 1995 refresh_count = 0;
1994 1996
1995#if XPM_BACKGROUND 1997#if XPM_BACKGROUND
1996 must_clear |= bgPixmap.pixmap != None; 1998 have_bg |= bgPixmap.pixmap != None;
1997#endif 1999#endif
1998#if TRANSPARENT 2000#if TRANSPARENT
1999 must_clear |= OPTION (Opt_transparent) && am_transparent; 2001 have_bg |= OPTION (Opt_transparent) && am_transparent;
2000#endif 2002#endif
2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2002 2004
2003 /* 2005 /*
2004 * B: reverse any characters which are selected 2006 * B: reverse any characters which are selected
… …
2008 /* 2010 /*
2009 * C: set the cursor character (s) 2011 * C: set the cursor character (s)
2010 */ 2012 */
2011 { 2013 {
2012 unsigned char setoldcursor; 2014 unsigned char setoldcursor;
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
2015 2015
2016 showcursor = (screen.flags & Screen_VisibleCursor); 2016 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2017#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2018 if (hidden_cursor)
2019 showcursor = 0; 2019 showcursor = 0;
… …
2025 2025
2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2027 col--; 2027 col--;
2028 2028
2029 crp = &ROW(screen.cur.row).r[col]; 2029 crp = &ROW(screen.cur.row).r[col];
2030
2031#ifndef NO_CURSORCOLOR
2032 cc1 = *crp & (RS_fgMask | RS_bgMask);
2033 if (ISSET_PIXCOLOR (Color_cursor))
2034 ccol1 = Color_cursor;
2035 else
2036#endif
2037#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2038 ccol1 = fgcolor_of (rstyle);
2039#else
2040 ccol1 = Color_fg;
2041#endif
2042
2043#ifndef NO_CURSORCOLOR
2044 if (ISSET_PIXCOLOR (Color_cursor2))
2045 ccol2 = Color_cursor2;
2046 else
2047#endif
2048#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2049 ccol2 = bgcolor_of (rstyle);
2050#else
2051 ccol2 = Color_bg;
2052#endif
2030 2053
2031 if (showcursor && focus) 2054 if (showcursor && focus)
2032 { 2055 {
2033 if (OPTION (Opt_cursorUnderline)) 2056 if (OPTION (Opt_cursorUnderline))
2034 *crp ^= RS_Uline; 2057 *crp ^= RS_Uline;
2035 else 2058 else
2036 { 2059 {
2037 *crp ^= RS_RVid; 2060 *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); 2061 *crp = SET_FGCOLOR (*crp, ccol1);
2058 *crp = SET_BGCOLOR (*crp, ccol2); 2062 *crp = SET_BGCOLOR (*crp, ccol2);
2059#endif
2060 } 2063 }
2061 } 2064 }
2062 } 2065 }
2063 2066
2064 /* make sure no outline cursor is left around */ 2067 /* make sure no outline cursor is left around */
… …
2103 * D: CopyArea pass - very useful for slower links 2106 * D: CopyArea pass - very useful for slower links
2104 * This has been deliberately kept simple. 2107 * This has been deliberately kept simple.
2105 */ 2108 */
2106 if (!display->is_local 2109 if (!display->is_local
2107 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2110 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2108 && abs (num_scr) < nrow && !must_clear) 2111 && abs (num_scr) < nrow && !have_bg)
2109 { 2112 {
2110 int16_t nits; 2113 int16_t nits;
2114 int i = num_scr;
2111 int j; 2115 int j;
2112 int len, wlen; 2116 int len, wlen;
2113 dLocal (int, num_scr); 2117 dLocal (int, num_scr);
2114 2118
2115 j = nrow; 2119 j = nrow;
2116 wlen = len = -1; 2120 wlen = len = -1;
2117 row = i > 0 ? 0 : j - 1; 2121 row = i > 0 ? 0 : j - 1;
2122
2118 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2123 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2119 { 2124 {
2120 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2125 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2121 { 2126 {
2122 line_t s = ROW(view_start + row); 2127 line_t s = ROW(view_start + row);
… …
2143 wlen = row; 2148 wlen = row;
2144 continue; 2149 continue;
2145 } 2150 }
2146 } 2151 }
2147 2152
2148 if (len != -1) 2153 if (len >= 0)
2149 { 2154 {
2150 /* also comes here at end if needed because of >= above */ 2155 /* also comes here at end if needed because of >= above */
2151 if (wlen < len) 2156 if (wlen < len)
2152 ::swap (wlen, len); 2157 ::swap (wlen, len);
2153 2158
2159 XGCValues gcv;
2160
2161 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2154 XCopyArea (xdisp, vt, vt, 2162 XCopyArea (dpy, vt, vt,
2155 gc, 0, Row2Pixel (len + i), 2163 gc, 0, Row2Pixel (len + i),
2156 (unsigned int)this->width, 2164 (unsigned int)this->width,
2157 (unsigned int)Height2Pixel (wlen - len + 1), 2165 (unsigned int)Height2Pixel (wlen - len + 1),
2158 0, Row2Pixel (len)); 2166 0, Row2Pixel (len));
2167 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2168
2159 len = -1; 2169 len = -1;
2160 } 2170 }
2161 } 2171 }
2162 } 2172 }
2163#endif 2173#endif
… …
2219 count++; 2229 count++;
2220 2230
2221 if (stp[col] != dtp[col] 2231 if (stp[col] != dtp[col]
2222 || !RS_SAME (srp[col], drp[col])) 2232 || !RS_SAME (srp[col], drp[col]))
2223 { 2233 {
2224 if (must_clear && (i++ > count / 2)) 2234 if (have_bg && (i++ > count / 2))
2225 break; 2235 break;
2226 2236
2227 dtp[col] = stp[col]; 2237 dtp[col] = stp[col];
2228 drp[col] = rend; 2238 drp[col] = rend;
2229 i = 0; 2239 i = 0;
2230 } 2240 }
2231 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2241 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2232 break; 2242 break;
2233 } 2243 }
2234 2244
2235 col--; /* went one too far. move back */ 2245 col--; /* went one too far. move back */
2236 count -= i; /* dump any matching trailing chars */ 2246 count -= i; /* dump any matching trailing chars */
… …
2246 int back = bgcolor_of (rend); // desired background 2256 int back = bgcolor_of (rend); // desired background
2247 2257
2248 // only do special processing if any attributes are set, which is unlikely 2258 // 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)) 2259 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2250 { 2260 {
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; 2261 bool invert = rend & RS_RVid;
2270 2262
2271#ifndef NO_BOLD_UNDERLINE_REVERSE 2263#ifndef NO_BOLD_UNDERLINE_REVERSE
2272 if (rend & RS_Bold 2264 if (rend & RS_Bold
2273 && fore == Color_fg) 2265 && fore == Color_fg)
… …
2289 else 2281 else
2290 invert = !invert; 2282 invert = !invert;
2291# endif 2283# endif
2292 } 2284 }
2293 2285
2294 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2286 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2295 fore = Color_UL; 2287 fore = Color_UL;
2296#endif 2288#endif
2297 2289
2298 if (invert) 2290 if (invert)
2299 { 2291 {
2292#ifdef OPTION_HC
2293 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2294 || !ISSET_PIXCOLOR (Color_HC))
2295#endif
2296 /* invert the column if no highlightColor is set or it is the
2297 * current cursor column */
2300 ::swap (fore, back); 2298 ::swap (fore, back);
2299#ifdef OPTION_HC
2300 else if (ISSET_PIXCOLOR (Color_HC))
2301 back = Color_HC;
2302#endif
2301 2303
2302#ifndef NO_BOLD_UNDERLINE_REVERSE 2304#ifndef NO_BOLD_UNDERLINE_REVERSE
2305# ifndef OPTION_HC
2303 if (ISSET_PIXCOLOR (Color_RV)) 2306 if (ISSET_PIXCOLOR (Color_RV))
2304 back = Color_RV; 2307 back = Color_RV;
2305 2308# endif
2306 if (fore == back) 2309 if (fore == back)
2307 { 2310 {
2308 fore = Color_bg; 2311 fore = Color_bg;
2309 back = Color_fg; 2312 back = Color_fg;
2310 } 2313 }
… …
2321 } 2324 }
2322 else if (hidden_text) 2325 else if (hidden_text)
2323 fore = back; 2326 fore = back;
2324 } 2327 }
2325#endif 2328#endif
2329
2330#if ENABLE_STYLES
2331 // "careful" (too wide) character handling
2332
2333 // include previous careful character(s) if possible, looks nicer (best effort...)
2334 while (text > stp
2335 && srp[text - stp - 1] & RS_Careful
2336 && RS_SAME (rend, srp[text - stp - 1]))
2337 text--, count++, xpixel -= fwidth;
2338
2339 // force redraw after "careful" characters to avoid pixel droppings
2340 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2341 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2342
2343 // force redraw before "careful" characters to avoid pixel droppings
2344 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2345 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2346#endif
2326 } 2347 }
2327 2348
2328 /* 2349 /*
2329 * Actually do the drawing of the string here 2350 * Actually do the drawing of the string here
2330 */ 2351 */
2331 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2352 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2332 2353
2333 if (back == fore)
2334 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2335 else if (back == Color_bg) 2354 if (back == Color_bg && have_bg)
2336 { 2355 {
2337 if (must_clear) 2356 // this is very ugly, maybe push it into ->draw?
2338 {
2339 CLEAR_CHARS (xpixel, ypixel, count);
2340 2357
2341 for (i = 0; i < count; i++) /* don't draw empty strings */ 2358 for (i = 0; i < count; i++) /* don't draw empty strings */
2342 if (text[i] != ' ') 2359 if (text[i] != ' ')
2343 { 2360 {
2344 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2361 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2345 break; 2362 goto did_clear;
2346 }
2347 } 2363 }
2348 else 2364
2349 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2365 CLEAR_CHARS (xpixel, ypixel, count);
2366 did_clear: ;
2350 } 2367 }
2351 else 2368 else
2352 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2369 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2353 2370
2354 if (rend & RS_Uline && font->descent > 1 && fore != back) 2371 if (rend & RS_Uline && font->descent > 1 && fore != back)
2355 { 2372 {
2356#if ENABLE_FRILLS 2373#if ENABLE_FRILLS
2357 if (ISSET_PIXCOLOR (Color_underline)) 2374 if (ISSET_PIXCOLOR (Color_underline))
2358 XSetForeground (xdisp, gc, pix_colors[Color_underline]); 2375 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2359 else 2376 else
2360#endif 2377#endif
2361 XSetForeground (xdisp, gc, pix_colors[fore]); 2378 XSetForeground (dpy, gc, pix_colors[fore]);
2362 2379
2363 XDrawLine (xdisp, drawBuffer, gc, 2380 XDrawLine (dpy, drawBuffer, gc,
2364 xpixel, ypixel + font->ascent + 1, 2381 xpixel, ypixel + font->ascent + 1,
2365 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2382 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2366 } 2383 }
2367 } /* for (col....) */ 2384 } /* for (col....) */
2368 } /* for (row....) */ 2385 } /* for (row....) */
… …
2401 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2418 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2402 cursorwidth++; 2419 cursorwidth++;
2403 2420
2404#ifndef NO_CURSORCOLOR 2421#ifndef NO_CURSORCOLOR
2405 if (ISSET_PIXCOLOR (Color_cursor)) 2422 if (ISSET_PIXCOLOR (Color_cursor))
2406 XSetForeground (xdisp, gc, pix_colors[Color_cursor]); 2423 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2424 else
2407#endif 2425#endif
2426 XSetForeground (dpy, gc, pix_colors[ccol1]);
2408 2427
2409 XDrawRectangle (xdisp, drawBuffer, gc, 2428 XDrawRectangle (dpy, drawBuffer, gc,
2410 Col2Pixel (col), 2429 Col2Pixel (col),
2411 Row2Pixel (oldcursor.row), 2430 Row2Pixel (oldcursor.row),
2412 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2431 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2413 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2432 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2414 } 2433 }
… …
2458#if XPM_BACKGROUND 2477#if XPM_BACKGROUND
2459 && !bgPixmap.pixmap 2478 && !bgPixmap.pixmap
2460#endif 2479#endif
2461 ) 2480 )
2462 { 2481 {
2463 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2482 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2464 XClearWindow (xdisp, parent[0]); 2483 XClearWindow (dpy, parent[0]);
2465 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2484 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2466#if HAVE_SCROLLBARS 2485#if HAVE_SCROLLBARS
2467 if (scrollBar.win) 2486 if (scrollBar.win)
2468 { 2487 {
2469 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2488 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2470 scrollBar.setIdle (); 2489 scrollBar.setIdle ();
2471 scrollbar_show (0); 2490 scrollbar_show (0);
2472 } 2491 }
2473#endif 2492#endif
2474 } 2493 }
… …
2487 2506
2488 num_scr_allow = 0; 2507 num_scr_allow = 0;
2489 want_refresh = 1; 2508 want_refresh = 1;
2490 2509
2491 if (really) 2510 if (really)
2492 XClearWindow (xdisp, vt); 2511 XClearWindow (dpy, vt);
2493} 2512}
2494 2513
2495void 2514void
2496rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2515rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2497{ 2516{
… …
2672 } 2691 }
2673 2692
2674 unsigned long bytes_after; 2693 unsigned long bytes_after;
2675 XTextProperty ct; 2694 XTextProperty ct;
2676 2695
2677 if (XGetWindowProperty (xdisp, win, prop, 2696 if (XGetWindowProperty (dpy, win, prop,
2678 0, PROP_SIZE / 4, 2697 0, PROP_SIZE / 4,
2679 delete_prop, AnyPropertyType, 2698 delete_prop, AnyPropertyType,
2680 &ct.encoding, &ct.format, 2699 &ct.encoding, &ct.format,
2681 &ct.nitems, &bytes_after, 2700 &ct.nitems, &bytes_after,
2682 &ct.value) != Success) 2701 &ct.value) != Success)
… …
2691 if (bytes_after) 2710 if (bytes_after)
2692 { 2711 {
2693 // fetch and append remaining data 2712 // fetch and append remaining data
2694 XTextProperty ct2; 2713 XTextProperty ct2;
2695 2714
2696 if (XGetWindowProperty (xdisp, win, prop, 2715 if (XGetWindowProperty (dpy, win, prop,
2697 ct.nitems / 4, (bytes_after + 3) / 4, 2716 ct.nitems / 4, (bytes_after + 3) / 4,
2698 delete_prop, AnyPropertyType, 2717 delete_prop, AnyPropertyType,
2699 &ct2.encoding, &ct2.format, 2718 &ct2.encoding, &ct2.format,
2700 &ct2.nitems, &bytes_after, 2719 &ct2.nitems, &bytes_after,
2701 &ct2.value) != Success) 2720 &ct2.value) != Success)
… …
2714 2733
2715 if (ct.encoding == xa[XA_INCR]) 2734 if (ct.encoding == xa[XA_INCR])
2716 { 2735 {
2717 // INCR selection, start handshake 2736 // INCR selection, start handshake
2718 if (!delete_prop) 2737 if (!delete_prop)
2719 XDeleteProperty (xdisp, win, prop); 2738 XDeleteProperty (dpy, win, prop);
2720 2739
2721 selection_wait = Sel_incr; 2740 selection_wait = Sel_incr;
2722 incr_buf_fill = 0; 2741 incr_buf_fill = 0;
2723 incr_ev.start (NOW + 10); 2742 incr_ev.start (NOW + 10);
2724 2743
… …
2785 paste (s, strlen (s)); 2804 paste (s, strlen (s));
2786 free (s); 2805 free (s);
2787 } 2806 }
2788 else 2807 else
2789#endif 2808#endif
2790 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 2809 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2791 && cl) 2810 && cl)
2792 { 2811 {
2793 for (int i = 0; i < cr; i++) 2812 for (int i = 0; i < cr; i++)
2794 paste (cl[i], strlen (cl[i])); 2813 paste (cl[i], strlen (cl[i]));
2795 2814
… …
2877 else if (selnum == Sel_Secondary) 2896 else if (selnum == Sel_Secondary)
2878 sel = XA_SECONDARY; 2897 sel = XA_SECONDARY;
2879 else 2898 else
2880 sel = xa[XA_CLIPBOARD]; 2899 sel = xa[XA_CLIPBOARD];
2881 2900
2882 if (XGetSelectionOwner (xdisp, sel) != None) 2901 if (XGetSelectionOwner (dpy, sel) != None)
2883 { 2902 {
2884 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], 2903 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2885 vt, selection_request_time); 2904 vt, selection_request_time);
2886 return 1; 2905 return 1;
2887 } 2906 }
2888 2907
2889 return 0; 2908 return 0;
… …
3042bool 3061bool
3043rxvt_term::selection_grab (Time tm) NOTHROW 3062rxvt_term::selection_grab (Time tm) NOTHROW
3044{ 3063{
3045 selection_time = tm; 3064 selection_time = tm;
3046 3065
3047 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); 3066 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3048 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) 3067 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3049 { 3068 {
3050 display->set_selection_owner (this); 3069 display->set_selection_owner (this);
3051 return true; 3070 return true;
3052 } 3071 }
3053 else 3072 else
… …
3057 } 3076 }
3058 3077
3059#if 0 3078#if 0
3060 XTextProperty ct; 3079 XTextProperty ct;
3061 3080
3062 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 3081 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3063 { 3082 {
3064 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3083 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3065 XFree (ct.value); 3084 XFree (ct.value);
3066 } 3085 }
3067#endif 3086#endif
… …
3540 *target++ = xa[XA_COMPOUND_TEXT]; 3559 *target++ = xa[XA_COMPOUND_TEXT];
3541#if X_HAVE_UTF8_STRING 3560#if X_HAVE_UTF8_STRING
3542 *target++ = xa[XA_UTF8_STRING]; 3561 *target++ = xa[XA_UTF8_STRING];
3543#endif 3562#endif
3544 3563
3545 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3564 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3546 32, PropModeReplace, 3565 32, PropModeReplace,
3547 (unsigned char *)target_list, target - target_list); 3566 (unsigned char *)target_list, target - target_list);
3548 ev.property = rq.property; 3567 ev.property = rq.property;
3549 } 3568 }
3550#if TODO // TODO 3569#if TODO // TODO
… …
3553 /* TODO: Handle MULTIPLE */ 3572 /* TODO: Handle MULTIPLE */
3554 } 3573 }
3555#endif 3574#endif
3556 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3575 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3557 { 3576 {
3558 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3577 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3559 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3578 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3560 ev.property = rq.property; 3579 ev.property = rq.property;
3561 } 3580 }
3562 else if (rq.target == XA_STRING 3581 else if (rq.target == XA_STRING
3563 || rq.target == xa[XA_TEXT] 3582 || rq.target == xa[XA_TEXT]
… …
3621 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3640 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3622 ct.nitems = strlen ((char *)ct.value); 3641 ct.nitems = strlen ((char *)ct.value);
3623 } 3642 }
3624 else 3643 else
3625#endif 3644#endif
3626 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3645 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3627 freect = 1; 3646 freect = 1;
3628 else 3647 else
3629 { 3648 {
3630 /* if we failed to convert then send it raw */ 3649 /* if we failed to convert then send it raw */
3631 ct.value = (unsigned char *)cl; 3650 ct.value = (unsigned char *)cl;
3632 ct.nitems = selectlen; 3651 ct.nitems = selectlen;
3633 ct.encoding = target; 3652 ct.encoding = target;
3634 } 3653 }
3635 3654
3636 XChangeProperty (xdisp, rq.requestor, rq.property, 3655 XChangeProperty (dpy, rq.requestor, rq.property,
3637 ct.encoding, 8, PropModeReplace, 3656 ct.encoding, 8, PropModeReplace,
3638 ct.value, (int)ct.nitems); 3657 ct.value, (int)ct.nitems);
3639 ev.property = rq.property; 3658 ev.property = rq.property;
3640 3659
3641 if (freect) 3660 if (freect)
3642 XFree (ct.value); 3661 XFree (ct.value);
3643 } 3662 }
3644 3663
3645 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3664 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3646} 3665}
3647 3666
3648/* ------------------------------------------------------------------------- * 3667/* ------------------------------------------------------------------------- *
3649 * MOUSE ROUTINES * 3668 * MOUSE ROUTINES *
3650 * ------------------------------------------------------------------------- */ 3669 * ------------------------------------------------------------------------- */
… …
3666void 3685void
3667rxvt_term::im_set_position (XPoint &pos) NOTHROW 3686rxvt_term::im_set_position (XPoint &pos) NOTHROW
3668{ 3687{
3669 XWindowAttributes xwa; 3688 XWindowAttributes xwa;
3670 3689
3671 XGetWindowAttributes (xdisp, vt, &xwa); 3690 XGetWindowAttributes (dpy, vt, &xwa);
3672 3691
3673 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3692 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3674 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3693 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3675} 3694}
3676#endif 3695#endif

Diff Legend

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