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.254 by root, Sat Jan 28 14:23:16 2006 UTC vs.
Revision 1.264 by root, Thu Jul 6 18:56:10 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/* ------------------------------------------------------------------------- *
… …
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 }
… …
1114 * Process DEC Back Index 1114 * Process DEC Back Index
1115 * XTERM_SEQ: ESC 6 1115 * XTERM_SEQ: ESC 6
1116 * Move cursor left in row. If we're at the left boundary, shift everything 1116 * Move cursor left in row. If we're at the left boundary, shift everything
1117 * in that row right. Clear left column. 1117 * in that row right. Clear left column.
1118 */ 1118 */
1119#if ENABLE_FRILLS 1119#if !ENABLE_MINIMAL
1120void 1120void
1121rxvt_term::scr_backindex () NOTHROW 1121rxvt_term::scr_backindex () NOTHROW
1122{ 1122{
1123 if (screen.cur.col > 0) 1123 if (screen.cur.col > 0)
1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1131 * Process DEC Forward Index 1131 * Process DEC Forward Index
1132 * XTERM_SEQ: ESC 9 1132 * XTERM_SEQ: ESC 9
1133 * Move cursor right in row. If we're at the right boundary, shift everything 1133 * Move cursor right in row. If we're at the right boundary, shift everything
1134 * in that row left. Clear right column. 1134 * in that row left. Clear right column.
1135 */ 1135 */
1136#if ENABLE_FRILLS 1136#if !ENABLE_MINIMAL
1137void 1137void
1138rxvt_term::scr_forwardindex () NOTHROW 1138rxvt_term::scr_forwardindex () NOTHROW
1139{ 1139{
1140 if (screen.cur.col < ncol - 1) 1140 if (screen.cur.col < ncol - 1)
1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
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);
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1356 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1357 } 1357 }
1358} 1358}
1359 1359
1360#if ENABLE_FRILLS 1360#if !ENABLE_MINIMAL
1361void 1361void
1362rxvt_term::scr_erase_savelines () NOTHROW 1362rxvt_term::scr_erase_savelines () NOTHROW
1363{ 1363{
1364 want_refresh = 1; 1364 want_refresh = 1;
1365 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
… …
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}
… …
1754{ 1754{
1755 bool found = false; 1755 bool found = false;
1756 1756
1757 for (int i = 0; i < nrow; i++) 1757 for (int i = 0; i < nrow; i++)
1758 { 1758 {
1759 int col = 0;
1760 rend_t *drp = drawn_buf[i].r; 1759 rend_t *drp = drawn_buf[i].r;
1761 1760
1762 for (; col < ncol; col++, drp++) 1761 for (int col = 0; col < ncol; col++, drp++)
1763 if ((*drp & mask) == value) 1762 if ((*drp & mask) == value)
1764 { 1763 {
1765 found = true; 1764 found = true;
1766 *drp = ~value; 1765 *drp = ~value;
1767 } 1766 }
… …
1889 1888
1890# ifndef NO_MAPALERT 1889# ifndef NO_MAPALERT
1891# ifdef MAPALERT_OPTION 1890# ifdef MAPALERT_OPTION
1892 if (OPTION (Opt_mapAlert)) 1891 if (OPTION (Opt_mapAlert))
1893# endif 1892# endif
1894 XMapWindow (xdisp, parent[0]); 1893 XMapWindow (dpy, parent[0]);
1895# endif 1894# endif
1896 1895
1897 if (OPTION (Opt_visualBell)) 1896 if (OPTION (Opt_visualBell))
1898 { 1897 {
1899 rvideo_bell = true; 1898 rvideo_bell = true;
… …
1901 display->flush (); 1900 display->flush ();
1902 1901
1903 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1902 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1904 } 1903 }
1905 else 1904 else
1906 XBell (xdisp, 0); 1905 XBell (dpy, 0);
1907 1906
1908#endif 1907#endif
1909} 1908}
1910 1909
1911/* ------------------------------------------------------------------------- */ 1910/* ------------------------------------------------------------------------- */
… …
1970 * screen.text/screen.rend contain what the screen will change to. 1969 * screen.text/screen.rend contain what the screen will change to.
1971 */ 1970 */
1972void 1971void
1973rxvt_term::scr_refresh () NOTHROW 1972rxvt_term::scr_refresh () NOTHROW
1974{ 1973{
1975 unsigned char must_clear, /* use draw_string not draw_image_string */ 1974 unsigned char have_bg,
1976 showcursor; /* show the cursor */ 1975 showcursor; /* show the cursor */
1977 int16_t col, row, /* column/row we're processing */ 1976 int16_t col, row, /* column/row we're processing */
1978 ocrow; /* old cursor row */ 1977 ocrow; /* old cursor row */
1979 int i; /* tmp */ 1978 int i; /* tmp */
1980#ifndef NO_CURSORCOLOR 1979#ifndef NO_CURSORCOLOR
… …
1988 return; 1987 return;
1989 1988
1990 /* 1989 /*
1991 * A: set up vars 1990 * A: set up vars
1992 */ 1991 */
1993 must_clear = 0; 1992 have_bg = 0;
1994 refresh_count = 0; 1993 refresh_count = 0;
1995 1994
1996#if XPM_BACKGROUND 1995#if XPM_BACKGROUND
1997 must_clear |= bgPixmap.pixmap != None; 1996 have_bg |= bgPixmap.pixmap != None;
1998#endif 1997#endif
1999#if TRANSPARENT 1998#if TRANSPARENT
2000 must_clear |= OPTION (Opt_transparent) && am_transparent; 1999 have_bg |= OPTION (Opt_transparent) && am_transparent;
2001#endif 2000#endif
2002 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2003 2002
2004 /* 2003 /*
2005 * B: reverse any characters which are selected 2004 * B: reverse any characters which are selected
… …
2104 * D: CopyArea pass - very useful for slower links 2103 * D: CopyArea pass - very useful for slower links
2105 * This has been deliberately kept simple. 2104 * This has been deliberately kept simple.
2106 */ 2105 */
2107 if (!display->is_local 2106 if (!display->is_local
2108 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2107 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2109 && abs (num_scr) < nrow && !must_clear) 2108 && abs (num_scr) < nrow && !have_bg)
2110 { 2109 {
2111 int16_t nits; 2110 int16_t nits;
2111 int i = num_scr;
2112 int j; 2112 int j;
2113 int len, wlen; 2113 int len, wlen;
2114 dLocal (int, num_scr); 2114 dLocal (int, num_scr);
2115 2115
2116 j = nrow; 2116 j = nrow;
2117 wlen = len = -1; 2117 wlen = len = -1;
2118 row = i > 0 ? 0 : j - 1; 2118 row = i > 0 ? 0 : j - 1;
2119
2119 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2120 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2120 { 2121 {
2121 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2122 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2122 { 2123 {
2123 line_t s = ROW(view_start + row); 2124 line_t s = ROW(view_start + row);
… …
2144 wlen = row; 2145 wlen = row;
2145 continue; 2146 continue;
2146 } 2147 }
2147 } 2148 }
2148 2149
2149 if (len != -1) 2150 if (len >= 0)
2150 { 2151 {
2151 /* also comes here at end if needed because of >= above */ 2152 /* also comes here at end if needed because of >= above */
2152 if (wlen < len) 2153 if (wlen < len)
2153 ::swap (wlen, len); 2154 ::swap (wlen, len);
2154 2155
2156 XGCValues gcv;
2157
2158 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2155 XCopyArea (xdisp, vt, vt, 2159 XCopyArea (dpy, vt, vt,
2156 gc, 0, Row2Pixel (len + i), 2160 gc, 0, Row2Pixel (len + i),
2157 (unsigned int)this->width, 2161 (unsigned int)this->width,
2158 (unsigned int)Height2Pixel (wlen - len + 1), 2162 (unsigned int)Height2Pixel (wlen - len + 1),
2159 0, Row2Pixel (len)); 2163 0, Row2Pixel (len));
2164 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2165
2160 len = -1; 2166 len = -1;
2161 } 2167 }
2162 } 2168 }
2163 } 2169 }
2164#endif 2170#endif
… …
2220 count++; 2226 count++;
2221 2227
2222 if (stp[col] != dtp[col] 2228 if (stp[col] != dtp[col]
2223 || !RS_SAME (srp[col], drp[col])) 2229 || !RS_SAME (srp[col], drp[col]))
2224 { 2230 {
2225 if (must_clear && (i++ > count / 2)) 2231 if (have_bg && (i++ > count / 2))
2226 break; 2232 break;
2227 2233
2228 dtp[col] = stp[col]; 2234 dtp[col] = stp[col];
2229 drp[col] = rend; 2235 drp[col] = rend;
2230 i = 0; 2236 i = 0;
2231 } 2237 }
2232 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2238 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2233 break; 2239 break;
2234 } 2240 }
2235 2241
2236 col--; /* went one too far. move back */ 2242 col--; /* went one too far. move back */
2237 count -= i; /* dump any matching trailing chars */ 2243 count -= i; /* dump any matching trailing chars */
… …
2247 int back = bgcolor_of (rend); // desired background 2253 int back = bgcolor_of (rend); // desired background
2248 2254
2249 // only do special processing if any attributes are set, which is unlikely 2255 // only do special processing if any attributes are set, which is unlikely
2250 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2256 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2251 { 2257 {
2252#if ENABLE_STYLES
2253 // "careful" (too wide) character handling
2254
2255 // include previous careful character(s) if possible, looks nicer (best effort...)
2256 while (text > stp
2257 && srp[text - stp - 1] & RS_Careful
2258 && RS_SAME (rend, srp[text - stp - 1]))
2259 text--, count++, xpixel -= fwidth;
2260
2261 // force redraw after "careful" characters to avoid pixel droppings
2262 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2263 drp[col + i + 1] = ~srp[col + i + 1];
2264
2265 // force redraw before "careful" characters to avoid pixel droppings
2266 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2267 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2268#endif
2269
2270 bool invert = rend & RS_RVid; 2258 bool invert = rend & RS_RVid;
2271 2259
2272#ifndef NO_BOLD_UNDERLINE_REVERSE 2260#ifndef NO_BOLD_UNDERLINE_REVERSE
2273 if (rend & RS_Bold 2261 if (rend & RS_Bold
2274 && fore == Color_fg) 2262 && fore == Color_fg)
… …
2290 else 2278 else
2291 invert = !invert; 2279 invert = !invert;
2292# endif 2280# endif
2293 } 2281 }
2294 2282
2295 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2283 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2296 fore = Color_UL; 2284 fore = Color_UL;
2297#endif 2285#endif
2298 2286
2299 if (invert) 2287 if (invert)
2300 { 2288 {
2289#ifdef OPTION_HC
2290 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2291 || !ISSET_PIXCOLOR (Color_HC))
2292#endif
2293 /* invert the column if no highlightColor is set or it is the
2294 * current cursor column */
2301 ::swap (fore, back); 2295 ::swap (fore, back);
2296#ifdef OPTION_HC
2297 else if (ISSET_PIXCOLOR (Color_HC))
2298 back = Color_HC;
2299#endif
2302 2300
2303#ifndef NO_BOLD_UNDERLINE_REVERSE 2301#ifndef NO_BOLD_UNDERLINE_REVERSE
2302# ifndef OPTION_HC
2304 if (ISSET_PIXCOLOR (Color_RV)) 2303 if (ISSET_PIXCOLOR (Color_RV))
2305 back = Color_RV; 2304 back = Color_RV;
2306 2305# endif
2307 if (fore == back) 2306 if (fore == back)
2308 { 2307 {
2309 fore = Color_bg; 2308 fore = Color_bg;
2310 back = Color_fg; 2309 back = Color_fg;
2311 } 2310 }
… …
2322 } 2321 }
2323 else if (hidden_text) 2322 else if (hidden_text)
2324 fore = back; 2323 fore = back;
2325 } 2324 }
2326#endif 2325#endif
2326
2327#if ENABLE_STYLES
2328 // "careful" (too wide) character handling
2329
2330 // include previous careful character(s) if possible, looks nicer (best effort...)
2331 while (text > stp
2332 && srp[text - stp - 1] & RS_Careful
2333 && RS_SAME (rend, srp[text - stp - 1]))
2334 text--, count++, xpixel -= fwidth;
2335
2336 // force redraw after "careful" characters to avoid pixel droppings
2337 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2338 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2339
2340 // force redraw before "careful" characters to avoid pixel droppings
2341 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2342 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2343#endif
2327 } 2344 }
2328 2345
2329 /* 2346 /*
2330 * Actually do the drawing of the string here 2347 * Actually do the drawing of the string here
2331 */ 2348 */
2332 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2349 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2333 2350
2334 if (back == fore) 2351 if (back == fore)
2335 font->clear_rect (*drawable, xpixel, ypixel, 2352 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2336 fwidth * count, fheight,
2337 back);
2338 else if (back == Color_bg) 2353 else if (back == Color_bg && have_bg)
2339 { 2354 {
2340 if (must_clear) 2355 // this is very ugly, maybe push it into ->draw?
2341 {
2342 CLEAR_CHARS (xpixel, ypixel, count);
2343 2356
2344 for (i = 0; i < count; i++) /* don't draw empty strings */ 2357 for (i = 0; i < count; i++) /* don't draw empty strings */
2345 if (text[i] != ' ') 2358 if (text[i] != ' ')
2346 { 2359 {
2347 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2360 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2348 break; 2361 goto did_clear;
2349 }
2350 } 2362 }
2351 else 2363
2352 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2364 CLEAR_CHARS (xpixel, ypixel, count);
2365 did_clear: ;
2353 } 2366 }
2354 else 2367 else
2355 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2368 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2356 2369
2357 if (rend & RS_Uline && font->descent > 1 && fore != back) 2370 if (rend & RS_Uline && font->descent > 1 && fore != back)
2358 { 2371 {
2359#if ENABLE_FRILLS 2372#if ENABLE_FRILLS
2360 if (ISSET_PIXCOLOR (Color_underline)) 2373 if (ISSET_PIXCOLOR (Color_underline))
2361 XSetForeground (xdisp, gc, pix_colors[Color_underline]); 2374 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2362 else 2375 else
2363#endif 2376#endif
2364 XSetForeground (xdisp, gc, pix_colors[fore]); 2377 XSetForeground (dpy, gc, pix_colors[fore]);
2365 2378
2366 XDrawLine (xdisp, drawBuffer, gc, 2379 XDrawLine (dpy, drawBuffer, gc,
2367 xpixel, ypixel + font->ascent + 1, 2380 xpixel, ypixel + font->ascent + 1,
2368 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2381 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2369 } 2382 }
2370 } /* for (col....) */ 2383 } /* for (col....) */
2371 } /* for (row....) */ 2384 } /* for (row....) */
… …
2404 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2417 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2405 cursorwidth++; 2418 cursorwidth++;
2406 2419
2407#ifndef NO_CURSORCOLOR 2420#ifndef NO_CURSORCOLOR
2408 if (ISSET_PIXCOLOR (Color_cursor)) 2421 if (ISSET_PIXCOLOR (Color_cursor))
2409 XSetForeground (xdisp, gc, pix_colors[Color_cursor]); 2422 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2410#endif 2423#endif
2411 2424
2412 XDrawRectangle (xdisp, drawBuffer, gc, 2425 XDrawRectangle (dpy, drawBuffer, gc,
2413 Col2Pixel (col), 2426 Col2Pixel (col),
2414 Row2Pixel (oldcursor.row), 2427 Row2Pixel (oldcursor.row),
2415 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2428 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2416 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2429 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2417 } 2430 }
… …
2461#if XPM_BACKGROUND 2474#if XPM_BACKGROUND
2462 && !bgPixmap.pixmap 2475 && !bgPixmap.pixmap
2463#endif 2476#endif
2464 ) 2477 )
2465 { 2478 {
2466 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2479 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2467 XClearWindow (xdisp, parent[0]); 2480 XClearWindow (dpy, parent[0]);
2468 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2481 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2469#if HAVE_SCROLLBARS 2482#if HAVE_SCROLLBARS
2470 if (scrollBar.win) 2483 if (scrollBar.win)
2471 { 2484 {
2472 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2485 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2473 scrollBar.setIdle (); 2486 scrollBar.setIdle ();
2474 scrollbar_show (0); 2487 scrollbar_show (0);
2475 } 2488 }
2476#endif 2489#endif
2477 } 2490 }
… …
2490 2503
2491 num_scr_allow = 0; 2504 num_scr_allow = 0;
2492 want_refresh = 1; 2505 want_refresh = 1;
2493 2506
2494 if (really) 2507 if (really)
2495 XClearWindow (xdisp, vt); 2508 XClearWindow (dpy, vt);
2496} 2509}
2497 2510
2498void 2511void
2499rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2512rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2500{ 2513{
… …
2549{ 2562{
2550 if (selection.op 2563 if (selection.op
2551 && current_screen == selection.screen 2564 && current_screen == selection.screen
2552 && selection.end.row >= view_start) 2565 && selection.end.row >= view_start)
2553 { 2566 {
2554#if ENABLE_FRILLS 2567#if !ENABLE_MINIMAL
2555 if (selection.rect) 2568 if (selection.rect)
2556 scr_xor_rect (selection.beg.row, selection.beg.col, 2569 scr_xor_rect (selection.beg.row, selection.beg.col,
2557 selection.end.row, selection.end.col, 2570 selection.end.row, selection.end.col,
2558 RS_RVid, RS_RVid | RS_Uline); 2571 RS_RVid, RS_RVid | RS_Uline);
2559 else 2572 else
… …
2675 } 2688 }
2676 2689
2677 unsigned long bytes_after; 2690 unsigned long bytes_after;
2678 XTextProperty ct; 2691 XTextProperty ct;
2679 2692
2680 if (XGetWindowProperty (xdisp, win, prop, 2693 if (XGetWindowProperty (dpy, win, prop,
2681 0, PROP_SIZE / 4, 2694 0, PROP_SIZE / 4,
2682 delete_prop, AnyPropertyType, 2695 delete_prop, AnyPropertyType,
2683 &ct.encoding, &ct.format, 2696 &ct.encoding, &ct.format,
2684 &ct.nitems, &bytes_after, 2697 &ct.nitems, &bytes_after,
2685 &ct.value) != Success) 2698 &ct.value) != Success)
… …
2694 if (bytes_after) 2707 if (bytes_after)
2695 { 2708 {
2696 // fetch and append remaining data 2709 // fetch and append remaining data
2697 XTextProperty ct2; 2710 XTextProperty ct2;
2698 2711
2699 if (XGetWindowProperty (xdisp, win, prop, 2712 if (XGetWindowProperty (dpy, win, prop,
2700 ct.nitems / 4, (bytes_after + 3) / 4, 2713 ct.nitems / 4, (bytes_after + 3) / 4,
2701 delete_prop, AnyPropertyType, 2714 delete_prop, AnyPropertyType,
2702 &ct2.encoding, &ct2.format, 2715 &ct2.encoding, &ct2.format,
2703 &ct2.nitems, &bytes_after, 2716 &ct2.nitems, &bytes_after,
2704 &ct2.value) != Success) 2717 &ct2.value) != Success)
… …
2717 2730
2718 if (ct.encoding == xa[XA_INCR]) 2731 if (ct.encoding == xa[XA_INCR])
2719 { 2732 {
2720 // INCR selection, start handshake 2733 // INCR selection, start handshake
2721 if (!delete_prop) 2734 if (!delete_prop)
2722 XDeleteProperty (xdisp, win, prop); 2735 XDeleteProperty (dpy, win, prop);
2723 2736
2724 selection_wait = Sel_incr; 2737 selection_wait = Sel_incr;
2725 incr_buf_fill = 0; 2738 incr_buf_fill = 0;
2726 incr_ev.start (NOW + 10); 2739 incr_ev.start (NOW + 10);
2727 2740
… …
2774 } 2787 }
2775 2788
2776 char **cl; 2789 char **cl;
2777 int cr; 2790 int cr;
2778 2791
2779#if ENABLE_FRILLS 2792#if !ENABLE_MINIMAL
2780 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2793 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2781 // so recode it manually 2794 // so recode it manually
2782 if (ct.encoding == xa[XA_UTF8_STRING]) 2795 if (ct.encoding == xa[XA_UTF8_STRING])
2783 { 2796 {
2784 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2797 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2788 paste (s, strlen (s)); 2801 paste (s, strlen (s));
2789 free (s); 2802 free (s);
2790 } 2803 }
2791 else 2804 else
2792#endif 2805#endif
2793 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 2806 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2794 && cl) 2807 && cl)
2795 { 2808 {
2796 for (int i = 0; i < cr; i++) 2809 for (int i = 0; i < cr; i++)
2797 paste (cl[i], strlen (cl[i])); 2810 paste (cl[i], strlen (cl[i]));
2798 2811
… …
2880 else if (selnum == Sel_Secondary) 2893 else if (selnum == Sel_Secondary)
2881 sel = XA_SECONDARY; 2894 sel = XA_SECONDARY;
2882 else 2895 else
2883 sel = xa[XA_CLIPBOARD]; 2896 sel = xa[XA_CLIPBOARD];
2884 2897
2885 if (XGetSelectionOwner (xdisp, sel) != None) 2898 if (XGetSelectionOwner (dpy, sel) != None)
2886 { 2899 {
2887 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], 2900 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2888 vt, selection_request_time); 2901 vt, selection_request_time);
2889 return 1; 2902 return 1;
2890 } 2903 }
2891 2904
2892 return 0; 2905 return 0;
… …
2955 2968
2956 int end_col; 2969 int end_col;
2957 2970
2958 for (; row <= selection.end.row; row++, col = 0) 2971 for (; row <= selection.end.row; row++, col = 0)
2959 { 2972 {
2960#if ENABLE_FRILLS 2973#if !ENABLE_MINIMAL
2961 if (selection.rect) 2974 if (selection.rect)
2962 { 2975 {
2963 col = selection.beg.col; 2976 col = selection.beg.col;
2964 end_col = ncol + 1; 2977 end_col = ncol + 1;
2965 } 2978 }
… …
2968 end_col = ROW(row).l; 2981 end_col = ROW(row).l;
2969 2982
2970 col = max (col, 0); 2983 col = max (col, 0);
2971 2984
2972 if (row == selection.end.row 2985 if (row == selection.end.row
2973#if ENABLE_FRILLS 2986#if !ENABLE_MINIMAL
2974 || selection.rect 2987 || selection.rect
2975#endif 2988#endif
2976 ) 2989 )
2977 min_it (end_col, selection.end.col); 2990 min_it (end_col, selection.end.col);
2978 2991
… …
3001#endif 3014#endif
3002 else 3015 else
3003 new_selection_text[ofs++] = *t++; 3016 new_selection_text[ofs++] = *t++;
3004 } 3017 }
3005 3018
3006#if ENABLE_FRILLS 3019#if !ENABLE_MINIMAL
3007 if (selection.rect) 3020 if (selection.rect)
3008 { 3021 {
3009 while (ofs 3022 while (ofs
3010 && new_selection_text[ofs - 1] != C0_LF 3023 && new_selection_text[ofs - 1] != C0_LF
3011 && unicode::is_space (new_selection_text[ofs - 1])) 3024 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3045bool 3058bool
3046rxvt_term::selection_grab (Time tm) NOTHROW 3059rxvt_term::selection_grab (Time tm) NOTHROW
3047{ 3060{
3048 selection_time = tm; 3061 selection_time = tm;
3049 3062
3050 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); 3063 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3051 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) 3064 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3052 { 3065 {
3053 display->set_selection_owner (this); 3066 display->set_selection_owner (this);
3054 return true; 3067 return true;
3055 } 3068 }
3056 else 3069 else
… …
3060 } 3073 }
3061 3074
3062#if 0 3075#if 0
3063 XTextProperty ct; 3076 XTextProperty ct;
3064 3077
3065 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 3078 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3066 { 3079 {
3067 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3080 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3068 XFree (ct.value); 3081 XFree (ct.value);
3069 } 3082 }
3070#endif 3083#endif
… …
3372 3385
3373 if (selection.clicks == 1) 3386 if (selection.clicks == 1)
3374 { 3387 {
3375 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3388 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3376 && !ROW(selection.beg.row).is_longer () 3389 && !ROW(selection.beg.row).is_longer ()
3377#if ENABLE_FRILLS 3390#if !ENABLE_MINIMAL
3378 && !selection.rect 3391 && !selection.rect
3379#endif 3392#endif
3380 ) 3393 )
3381 selection.beg.col = ncol; 3394 selection.beg.col = ncol;
3382 3395
3383 if ( 3396 if (
3384 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3397 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3385 && !ROW(selection.end.row).is_longer () 3398 && !ROW(selection.end.row).is_longer ()
3386#if ENABLE_FRILLS 3399#if !ENABLE_MINIMAL
3387 && !selection.rect 3400 && !selection.rect
3388#endif 3401#endif
3389 ) 3402 )
3390 selection.end.col = ncol; 3403 selection.end.col = ncol;
3391 } 3404 }
… …
3408 { 3421 {
3409 if (!ROW(end_row).is_longer ()) 3422 if (!ROW(end_row).is_longer ())
3410 { 3423 {
3411 selection.end.row = end_row; 3424 selection.end.row = end_row;
3412 selection.end.col = ROW(end_row).l; 3425 selection.end.col = ROW(end_row).l;
3426# if !ENABLE_MINIMAL
3413 selection_remove_trailing_spaces (); 3427 selection_remove_trailing_spaces ();
3428# endif
3414 break; 3429 break;
3415 } 3430 }
3416 } 3431 }
3417 } 3432 }
3418 else 3433 else
… …
3447 selection.mark.row = selection.beg.row; 3462 selection.mark.row = selection.beg.row;
3448 selection.mark.col = selection.beg.col; 3463 selection.mark.col = selection.beg.col;
3449 } 3464 }
3450 } 3465 }
3451 3466
3452#if ENABLE_FRILLS 3467#if !ENABLE_MINIMAL
3453 if (selection.rect && selection.beg.col > selection.end.col) 3468 if (selection.rect && selection.beg.col > selection.end.col)
3454 ::swap (selection.beg.col, selection.end.col); 3469 ::swap (selection.beg.col, selection.end.col);
3455#endif 3470#endif
3456} 3471}
3457 3472
3458#if ENABLE_FRILLS 3473#if !ENABLE_MINIMAL
3459void 3474void
3460rxvt_term::selection_remove_trailing_spaces () NOTHROW 3475rxvt_term::selection_remove_trailing_spaces () NOTHROW
3461{ 3476{
3462 int32_t end_col, end_row; 3477 int32_t end_col, end_row;
3463 text_t *stp; 3478 text_t *stp;
… …
3541 *target++ = xa[XA_COMPOUND_TEXT]; 3556 *target++ = xa[XA_COMPOUND_TEXT];
3542#if X_HAVE_UTF8_STRING 3557#if X_HAVE_UTF8_STRING
3543 *target++ = xa[XA_UTF8_STRING]; 3558 *target++ = xa[XA_UTF8_STRING];
3544#endif 3559#endif
3545 3560
3546 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3561 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3547 32, PropModeReplace, 3562 32, PropModeReplace,
3548 (unsigned char *)target_list, target - target_list); 3563 (unsigned char *)target_list, target - target_list);
3549 ev.property = rq.property; 3564 ev.property = rq.property;
3550 } 3565 }
3551#if TODO // TODO 3566#if TODO // TODO
… …
3554 /* TODO: Handle MULTIPLE */ 3569 /* TODO: Handle MULTIPLE */
3555 } 3570 }
3556#endif 3571#endif
3557 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3572 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3558 { 3573 {
3559 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3574 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3560 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3575 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3561 ev.property = rq.property; 3576 ev.property = rq.property;
3562 } 3577 }
3563 else if (rq.target == XA_STRING 3578 else if (rq.target == XA_STRING
3564 || rq.target == xa[XA_TEXT] 3579 || rq.target == xa[XA_TEXT]
… …
3588 style = enc_string; 3603 style = enc_string;
3589 else if (target == xa[XA_TEXT]) 3604 else if (target == xa[XA_TEXT])
3590 style = enc_text; 3605 style = enc_text;
3591 else if (target == xa[XA_COMPOUND_TEXT]) 3606 else if (target == xa[XA_COMPOUND_TEXT])
3592 style = enc_compound_text; 3607 style = enc_compound_text;
3593#if ENABLE_FRILLS 3608#if !ENABLE_MINIMAL
3594 else if (target == xa[XA_UTF8_STRING]) 3609 else if (target == xa[XA_UTF8_STRING])
3595 style = enc_utf8; 3610 style = enc_utf8;
3596#endif 3611#endif
3597 else 3612 else
3598 { 3613 {
… …
3609 { 3624 {
3610 cl = L""; 3625 cl = L"";
3611 selectlen = 0; 3626 selectlen = 0;
3612 } 3627 }
3613 3628
3614#if ENABLE_FRILLS 3629#if !ENABLE_MINIMAL
3615 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3630 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3616 // so recode it manually 3631 // so recode it manually
3617 if (style == enc_utf8) 3632 if (style == enc_utf8)
3618 { 3633 {
3619 freect = 1; 3634 freect = 1;
… …
3622 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3637 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3623 ct.nitems = strlen ((char *)ct.value); 3638 ct.nitems = strlen ((char *)ct.value);
3624 } 3639 }
3625 else 3640 else
3626#endif 3641#endif
3627 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3642 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3628 freect = 1; 3643 freect = 1;
3629 else 3644 else
3630 { 3645 {
3631 /* if we failed to convert then send it raw */ 3646 /* if we failed to convert then send it raw */
3632 ct.value = (unsigned char *)cl; 3647 ct.value = (unsigned char *)cl;
3633 ct.nitems = selectlen; 3648 ct.nitems = selectlen;
3634 ct.encoding = target; 3649 ct.encoding = target;
3635 } 3650 }
3636 3651
3637 XChangeProperty (xdisp, rq.requestor, rq.property, 3652 XChangeProperty (dpy, rq.requestor, rq.property,
3638 ct.encoding, 8, PropModeReplace, 3653 ct.encoding, 8, PropModeReplace,
3639 ct.value, (int)ct.nitems); 3654 ct.value, (int)ct.nitems);
3640 ev.property = rq.property; 3655 ev.property = rq.property;
3641 3656
3642 if (freect) 3657 if (freect)
3643 XFree (ct.value); 3658 XFree (ct.value);
3644 } 3659 }
3645 3660
3646 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3661 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3647} 3662}
3648 3663
3649/* ------------------------------------------------------------------------- * 3664/* ------------------------------------------------------------------------- *
3650 * MOUSE ROUTINES * 3665 * MOUSE ROUTINES *
3651 * ------------------------------------------------------------------------- */ 3666 * ------------------------------------------------------------------------- */
… …
3667void 3682void
3668rxvt_term::im_set_position (XPoint &pos) NOTHROW 3683rxvt_term::im_set_position (XPoint &pos) NOTHROW
3669{ 3684{
3670 XWindowAttributes xwa; 3685 XWindowAttributes xwa;
3671 3686
3672 XGetWindowAttributes (xdisp, vt, &xwa); 3687 XGetWindowAttributes (dpy, vt, &xwa);
3673 3688
3674 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3689 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3675 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3690 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3676} 3691}
3677#endif 3692#endif

Diff Legend

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