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.253 by root, Fri Jan 27 18:36:43 2006 UTC vs.
Revision 1.261 by root, Sat Feb 18 15:44:26 2006 UTC

… …
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/* ------------------------------------------------------------------------- *
… …
126 width = ncol; 126 width = ncol;
127 } 127 }
128 128
129 l.touch (); 129 l.touch ();
130 130
131 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 133
134 text_t *et = l.t + col; 134 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
136 136
… …
640 l.touch (); 640 l.touch ();
641 } 641 }
642 642
643 // erase newly scrolled-in lines 643 // erase newly scrolled-in lines
644 for (int i = count; i--; ) 644 for (int i = count; i--; )
645 {
646 line_t &l = ROW(nrow - 1 - i);
647
648 // optimize if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
651 {
652 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0;
654 l.f = 0;
655 }
656 else
645 scr_blank_screen_mem (ROW(nrow - 1 - i), rstyle); 657 scr_blank_screen_mem (l, rstyle);
658 }
646 659
647 // now copy lines below the scroll region bottom to the 660 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 661 // bottom of the screen again, so they look as if they
649 // hadn't moved. 662 // hadn't moved.
650 for (int i = nrow; --i > row2; ) 663 for (int i = nrow; --i > row2; )
… …
1101 * Process DEC Back Index 1114 * Process DEC Back Index
1102 * XTERM_SEQ: ESC 6 1115 * XTERM_SEQ: ESC 6
1103 * 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
1104 * in that row right. Clear left column. 1117 * in that row right. Clear left column.
1105 */ 1118 */
1106#if ENABLE_FRILLS 1119#if !ENABLE_MINIMAL
1107void 1120void
1108rxvt_term::scr_backindex () NOTHROW 1121rxvt_term::scr_backindex () NOTHROW
1109{ 1122{
1110 if (screen.cur.col > 0) 1123 if (screen.cur.col > 0)
1111 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1118 * Process DEC Forward Index 1131 * Process DEC Forward Index
1119 * XTERM_SEQ: ESC 9 1132 * XTERM_SEQ: ESC 9
1120 * 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
1121 * in that row left. Clear right column. 1134 * in that row left. Clear right column.
1122 */ 1135 */
1123#if ENABLE_FRILLS 1136#if !ENABLE_MINIMAL
1124void 1137void
1125rxvt_term::scr_forwardindex () NOTHROW 1138rxvt_term::scr_forwardindex () NOTHROW
1126{ 1139{
1127 if (screen.cur.col < ncol - 1) 1140 if (screen.cur.col < ncol - 1)
1128 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1329 } 1342 }
1330 else 1343 else
1331 { 1344 {
1332 ren = rstyle & (RS_fgMask | RS_bgMask); 1345 ren = rstyle & (RS_fgMask | RS_bgMask);
1333 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1334 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1347 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1335 ERASE_ROWS (row, num); 1348 ERASE_ROWS (row, num);
1336 gcvalue.foreground = pix_colors[Color_fg]; 1349 gcvalue.foreground = pix_colors[Color_fg];
1337 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1350 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1338 } 1351 }
1339 1352
1340 for (; num--; row++) 1353 for (; num--; row++)
1341 { 1354 {
1342 scr_blank_screen_mem (ROW(row), rstyle); 1355 scr_blank_screen_mem (ROW(row), rstyle);
1343 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1356 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1344 } 1357 }
1345} 1358}
1346 1359
1347#if ENABLE_FRILLS 1360#if !ENABLE_MINIMAL
1348void 1361void
1349rxvt_term::scr_erase_savelines () NOTHROW 1362rxvt_term::scr_erase_savelines () NOTHROW
1350{ 1363{
1351 want_refresh = 1; 1364 want_refresh = 1;
1352 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
… …
1641 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1642#endif 1655#endif
1643#if TRANSPARENT 1656#if TRANSPARENT
1644 if (!OPTION (Opt_transparent) || am_transparent == 0) 1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1645#endif 1658#endif
1646 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1647 1660
1648 XGCValues gcvalue; 1661 XGCValues gcvalue;
1649 gcvalue.foreground = pix_colors[Color_fg]; 1662 gcvalue.foreground = pix_colors[Color_fg];
1650 gcvalue.background = pix_colors[Color_bg]; 1663 gcvalue.background = pix_colors[Color_bg];
1651 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); 1664 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1652 1665
1653 scr_clear (); 1666 scr_clear ();
1654 scr_touch (true); 1667 scr_touch (true);
1655 } 1668 }
1656} 1669}
… …
1741{ 1754{
1742 bool found = false; 1755 bool found = false;
1743 1756
1744 for (int i = 0; i < nrow; i++) 1757 for (int i = 0; i < nrow; i++)
1745 { 1758 {
1746 int col = 0;
1747 rend_t *drp = drawn_buf[i].r; 1759 rend_t *drp = drawn_buf[i].r;
1748 1760
1749 for (; col < ncol; col++, drp++) 1761 for (int col = 0; col < ncol; col++, drp++)
1750 if ((*drp & mask) == value) 1762 if ((*drp & mask) == value)
1751 { 1763 {
1752 found = true; 1764 found = true;
1753 *drp = ~value; 1765 *drp = ~value;
1754 } 1766 }
… …
1876 1888
1877# ifndef NO_MAPALERT 1889# ifndef NO_MAPALERT
1878# ifdef MAPALERT_OPTION 1890# ifdef MAPALERT_OPTION
1879 if (OPTION (Opt_mapAlert)) 1891 if (OPTION (Opt_mapAlert))
1880# endif 1892# endif
1881 XMapWindow (xdisp, parent[0]); 1893 XMapWindow (dpy, parent[0]);
1882# endif 1894# endif
1883 1895
1884 if (OPTION (Opt_visualBell)) 1896 if (OPTION (Opt_visualBell))
1885 { 1897 {
1886 rvideo_bell = true; 1898 rvideo_bell = true;
… …
1888 display->flush (); 1900 display->flush ();
1889 1901
1890 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1902 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1891 } 1903 }
1892 else 1904 else
1893 XBell (xdisp, 0); 1905 XBell (dpy, 0);
1894 1906
1895#endif 1907#endif
1896} 1908}
1897 1909
1898/* ------------------------------------------------------------------------- */ 1910/* ------------------------------------------------------------------------- */
… …
1957 * screen.text/screen.rend contain what the screen will change to. 1969 * screen.text/screen.rend contain what the screen will change to.
1958 */ 1970 */
1959void 1971void
1960rxvt_term::scr_refresh () NOTHROW 1972rxvt_term::scr_refresh () NOTHROW
1961{ 1973{
1962 unsigned char must_clear, /* use draw_string not draw_image_string */ 1974 unsigned char have_bg,
1963 showcursor; /* show the cursor */ 1975 showcursor; /* show the cursor */
1964 int16_t col, row, /* column/row we're processing */ 1976 int16_t col, row, /* column/row we're processing */
1965 ocrow; /* old cursor row */ 1977 ocrow; /* old cursor row */
1966 int i; /* tmp */ 1978 int i; /* tmp */
1967#ifndef NO_CURSORCOLOR 1979#ifndef NO_CURSORCOLOR
… …
1975 return; 1987 return;
1976 1988
1977 /* 1989 /*
1978 * A: set up vars 1990 * A: set up vars
1979 */ 1991 */
1980 must_clear = 0; 1992 have_bg = 0;
1981 refresh_count = 0; 1993 refresh_count = 0;
1982 1994
1983#if XPM_BACKGROUND 1995#if XPM_BACKGROUND
1984 must_clear |= bgPixmap.pixmap != None; 1996 have_bg |= bgPixmap.pixmap != None;
1985#endif 1997#endif
1986#if TRANSPARENT 1998#if TRANSPARENT
1987 must_clear |= OPTION (Opt_transparent) && am_transparent; 1999 have_bg |= OPTION (Opt_transparent) && am_transparent;
1988#endif 2000#endif
1989 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1990 2002
1991 /* 2003 /*
1992 * B: reverse any characters which are selected 2004 * B: reverse any characters which are selected
… …
2091 * D: CopyArea pass - very useful for slower links 2103 * D: CopyArea pass - very useful for slower links
2092 * This has been deliberately kept simple. 2104 * This has been deliberately kept simple.
2093 */ 2105 */
2094 if (!display->is_local 2106 if (!display->is_local
2095 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2107 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2096 && abs (num_scr) < nrow && !must_clear) 2108 && abs (num_scr) < nrow && !have_bg)
2097 { 2109 {
2098 int16_t nits; 2110 int16_t nits;
2111 int i = num_scr;
2099 int j; 2112 int j;
2100 int len, wlen; 2113 int len, wlen;
2101 dLocal (int, num_scr); 2114 dLocal (int, num_scr);
2102 2115
2103 j = nrow; 2116 j = nrow;
2104 wlen = len = -1; 2117 wlen = len = -1;
2105 row = i > 0 ? 0 : j - 1; 2118 row = i > 0 ? 0 : j - 1;
2119
2106 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2120 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2107 { 2121 {
2108 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2122 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2109 { 2123 {
2110 line_t s = ROW(view_start + row); 2124 line_t s = ROW(view_start + row);
… …
2131 wlen = row; 2145 wlen = row;
2132 continue; 2146 continue;
2133 } 2147 }
2134 } 2148 }
2135 2149
2136 if (len != -1) 2150 if (len >= 0)
2137 { 2151 {
2138 /* also comes here at end if needed because of >= above */ 2152 /* also comes here at end if needed because of >= above */
2139 if (wlen < len) 2153 if (wlen < len)
2140 ::swap (wlen, len); 2154 ::swap (wlen, len);
2141 2155
2156 XGCValues gcv;
2157
2158 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2142 XCopyArea (xdisp, vt, vt, 2159 XCopyArea (dpy, vt, vt,
2143 gc, 0, Row2Pixel (len + i), 2160 gc, 0, Row2Pixel (len + i),
2144 (unsigned int)this->width, 2161 (unsigned int)this->width,
2145 (unsigned int)Height2Pixel (wlen - len + 1), 2162 (unsigned int)Height2Pixel (wlen - len + 1),
2146 0, Row2Pixel (len)); 2163 0, Row2Pixel (len));
2164 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2165
2147 len = -1; 2166 len = -1;
2148 } 2167 }
2149 } 2168 }
2150 } 2169 }
2151#endif 2170#endif
… …
2207 count++; 2226 count++;
2208 2227
2209 if (stp[col] != dtp[col] 2228 if (stp[col] != dtp[col]
2210 || !RS_SAME (srp[col], drp[col])) 2229 || !RS_SAME (srp[col], drp[col]))
2211 { 2230 {
2212 if (must_clear && (i++ > count / 2)) 2231 if (have_bg && (i++ > count / 2))
2213 break; 2232 break;
2214 2233
2215 dtp[col] = stp[col]; 2234 dtp[col] = stp[col];
2216 drp[col] = rend; 2235 drp[col] = rend;
2217 i = 0; 2236 i = 0;
2218 } 2237 }
2219 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2238 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2220 break; 2239 break;
2221 } 2240 }
2222 2241
2223 col--; /* went one too far. move back */ 2242 col--; /* went one too far. move back */
2224 count -= i; /* dump any matching trailing chars */ 2243 count -= i; /* dump any matching trailing chars */
… …
2245 && RS_SAME (rend, srp[text - stp - 1])) 2264 && RS_SAME (rend, srp[text - stp - 1]))
2246 text--, count++, xpixel -= fwidth; 2265 text--, count++, xpixel -= fwidth;
2247 2266
2248 // force redraw after "careful" characters to avoid pixel droppings 2267 // force redraw after "careful" characters to avoid pixel droppings
2249 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) 2268 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2250 drp[col + i + 1] = ~srp[col + i + 1]; 2269 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2251 2270
2252 // force redraw before "careful" characters to avoid pixel droppings 2271 // force redraw before "careful" characters to avoid pixel droppings
2253 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) 2272 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2254 drp[text - stp - i - 1] = ~srp[text - stp - i - 1]; 2273 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2255#endif 2274#endif
2256 2275
2257 bool invert = rend & RS_RVid; 2276 bool invert = rend & RS_RVid;
2258 2277
2259#ifndef NO_BOLD_UNDERLINE_REVERSE 2278#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2317 * Actually do the drawing of the string here 2336 * Actually do the drawing of the string here
2318 */ 2337 */
2319 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2338 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2320 2339
2321 if (back == fore) 2340 if (back == fore)
2322 font->clear_rect (*drawable, xpixel, ypixel, 2341 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2323 fwidth * count, fheight,
2324 back);
2325 else if (back == Color_bg) 2342 else if (back == Color_bg && have_bg)
2326 { 2343 {
2327 if (must_clear) 2344 // this is very ugly, maybe push it into ->draw?
2328 {
2329 CLEAR_CHARS (xpixel, ypixel, count);
2330 2345
2331 for (i = 0; i < count; i++) /* don't draw empty strings */ 2346 for (i = 0; i < count; i++) /* don't draw empty strings */
2332 if (text[i] != ' ') 2347 if (text[i] != ' ')
2333 { 2348 {
2334 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2349 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2335 break; 2350 goto did_clear;
2336 }
2337 } 2351 }
2338 else 2352
2339 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2353 CLEAR_CHARS (xpixel, ypixel, count);
2354 did_clear: ;
2340 } 2355 }
2341 else 2356 else
2342 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2357 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2343 2358
2344 if (rend & RS_Uline && font->descent > 1 && fore != back) 2359 if (rend & RS_Uline && font->descent > 1 && fore != back)
2345 { 2360 {
2346#if ENABLE_FRILLS 2361#if ENABLE_FRILLS
2347 if (ISSET_PIXCOLOR (Color_underline)) 2362 if (ISSET_PIXCOLOR (Color_underline))
2348 XSetForeground (xdisp, gc, pix_colors[Color_underline]); 2363 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2349 else 2364 else
2350#endif 2365#endif
2351 XSetForeground (xdisp, gc, pix_colors[fore]); 2366 XSetForeground (dpy, gc, pix_colors[fore]);
2352 2367
2353 XDrawLine (xdisp, drawBuffer, gc, 2368 XDrawLine (dpy, drawBuffer, gc,
2354 xpixel, ypixel + font->ascent + 1, 2369 xpixel, ypixel + font->ascent + 1,
2355 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2370 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2356 } 2371 }
2357 } /* for (col....) */ 2372 } /* for (col....) */
2358 } /* for (row....) */ 2373 } /* for (row....) */
… …
2391 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2406 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2392 cursorwidth++; 2407 cursorwidth++;
2393 2408
2394#ifndef NO_CURSORCOLOR 2409#ifndef NO_CURSORCOLOR
2395 if (ISSET_PIXCOLOR (Color_cursor)) 2410 if (ISSET_PIXCOLOR (Color_cursor))
2396 XSetForeground (xdisp, gc, pix_colors[Color_cursor]); 2411 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2397#endif 2412#endif
2398 2413
2399 XDrawRectangle (xdisp, drawBuffer, gc, 2414 XDrawRectangle (dpy, drawBuffer, gc,
2400 Col2Pixel (col), 2415 Col2Pixel (col),
2401 Row2Pixel (oldcursor.row), 2416 Row2Pixel (oldcursor.row),
2402 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2417 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2403 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2418 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2404 } 2419 }
… …
2448#if XPM_BACKGROUND 2463#if XPM_BACKGROUND
2449 && !bgPixmap.pixmap 2464 && !bgPixmap.pixmap
2450#endif 2465#endif
2451 ) 2466 )
2452 { 2467 {
2453 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2468 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2454 XClearWindow (xdisp, parent[0]); 2469 XClearWindow (dpy, parent[0]);
2455 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2470 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2456#if HAVE_SCROLLBARS 2471#if HAVE_SCROLLBARS
2457 if (scrollBar.win) 2472 if (scrollBar.win)
2458 { 2473 {
2459 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2474 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2460 scrollBar.setIdle (); 2475 scrollBar.setIdle ();
2461 scrollbar_show (0); 2476 scrollbar_show (0);
2462 } 2477 }
2463#endif 2478#endif
2464 } 2479 }
… …
2477 2492
2478 num_scr_allow = 0; 2493 num_scr_allow = 0;
2479 want_refresh = 1; 2494 want_refresh = 1;
2480 2495
2481 if (really) 2496 if (really)
2482 XClearWindow (xdisp, vt); 2497 XClearWindow (dpy, vt);
2483} 2498}
2484 2499
2485void 2500void
2486rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2501rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2487{ 2502{
… …
2536{ 2551{
2537 if (selection.op 2552 if (selection.op
2538 && current_screen == selection.screen 2553 && current_screen == selection.screen
2539 && selection.end.row >= view_start) 2554 && selection.end.row >= view_start)
2540 { 2555 {
2541#if ENABLE_FRILLS 2556#if !ENABLE_MINIMAL
2542 if (selection.rect) 2557 if (selection.rect)
2543 scr_xor_rect (selection.beg.row, selection.beg.col, 2558 scr_xor_rect (selection.beg.row, selection.beg.col,
2544 selection.end.row, selection.end.col, 2559 selection.end.row, selection.end.col,
2545 RS_RVid, RS_RVid | RS_Uline); 2560 RS_RVid, RS_RVid | RS_Uline);
2546 else 2561 else
… …
2662 } 2677 }
2663 2678
2664 unsigned long bytes_after; 2679 unsigned long bytes_after;
2665 XTextProperty ct; 2680 XTextProperty ct;
2666 2681
2667 if (XGetWindowProperty (xdisp, win, prop, 2682 if (XGetWindowProperty (dpy, win, prop,
2668 0, PROP_SIZE / 4, 2683 0, PROP_SIZE / 4,
2669 delete_prop, AnyPropertyType, 2684 delete_prop, AnyPropertyType,
2670 &ct.encoding, &ct.format, 2685 &ct.encoding, &ct.format,
2671 &ct.nitems, &bytes_after, 2686 &ct.nitems, &bytes_after,
2672 &ct.value) != Success) 2687 &ct.value) != Success)
… …
2681 if (bytes_after) 2696 if (bytes_after)
2682 { 2697 {
2683 // fetch and append remaining data 2698 // fetch and append remaining data
2684 XTextProperty ct2; 2699 XTextProperty ct2;
2685 2700
2686 if (XGetWindowProperty (xdisp, win, prop, 2701 if (XGetWindowProperty (dpy, win, prop,
2687 ct.nitems / 4, (bytes_after + 3) / 4, 2702 ct.nitems / 4, (bytes_after + 3) / 4,
2688 delete_prop, AnyPropertyType, 2703 delete_prop, AnyPropertyType,
2689 &ct2.encoding, &ct2.format, 2704 &ct2.encoding, &ct2.format,
2690 &ct2.nitems, &bytes_after, 2705 &ct2.nitems, &bytes_after,
2691 &ct2.value) != Success) 2706 &ct2.value) != Success)
… …
2704 2719
2705 if (ct.encoding == xa[XA_INCR]) 2720 if (ct.encoding == xa[XA_INCR])
2706 { 2721 {
2707 // INCR selection, start handshake 2722 // INCR selection, start handshake
2708 if (!delete_prop) 2723 if (!delete_prop)
2709 XDeleteProperty (xdisp, win, prop); 2724 XDeleteProperty (dpy, win, prop);
2710 2725
2711 selection_wait = Sel_incr; 2726 selection_wait = Sel_incr;
2712 incr_buf_fill = 0; 2727 incr_buf_fill = 0;
2713 incr_ev.start (NOW + 10); 2728 incr_ev.start (NOW + 10);
2714 2729
… …
2761 } 2776 }
2762 2777
2763 char **cl; 2778 char **cl;
2764 int cr; 2779 int cr;
2765 2780
2766#if ENABLE_FRILLS 2781#if !ENABLE_MINIMAL
2767 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2782 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2768 // so recode it manually 2783 // so recode it manually
2769 if (ct.encoding == xa[XA_UTF8_STRING]) 2784 if (ct.encoding == xa[XA_UTF8_STRING])
2770 { 2785 {
2771 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2786 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2775 paste (s, strlen (s)); 2790 paste (s, strlen (s));
2776 free (s); 2791 free (s);
2777 } 2792 }
2778 else 2793 else
2779#endif 2794#endif
2780 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 2795 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2781 && cl) 2796 && cl)
2782 { 2797 {
2783 for (int i = 0; i < cr; i++) 2798 for (int i = 0; i < cr; i++)
2784 paste (cl[i], strlen (cl[i])); 2799 paste (cl[i], strlen (cl[i]));
2785 2800
… …
2867 else if (selnum == Sel_Secondary) 2882 else if (selnum == Sel_Secondary)
2868 sel = XA_SECONDARY; 2883 sel = XA_SECONDARY;
2869 else 2884 else
2870 sel = xa[XA_CLIPBOARD]; 2885 sel = xa[XA_CLIPBOARD];
2871 2886
2872 if (XGetSelectionOwner (xdisp, sel) != None) 2887 if (XGetSelectionOwner (dpy, sel) != None)
2873 { 2888 {
2874 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], 2889 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2875 vt, selection_request_time); 2890 vt, selection_request_time);
2876 return 1; 2891 return 1;
2877 } 2892 }
2878 2893
2879 return 0; 2894 return 0;
… …
2942 2957
2943 int end_col; 2958 int end_col;
2944 2959
2945 for (; row <= selection.end.row; row++, col = 0) 2960 for (; row <= selection.end.row; row++, col = 0)
2946 { 2961 {
2947#if ENABLE_FRILLS 2962#if !ENABLE_MINIMAL
2948 if (selection.rect) 2963 if (selection.rect)
2949 { 2964 {
2950 col = selection.beg.col; 2965 col = selection.beg.col;
2951 end_col = ncol + 1; 2966 end_col = ncol + 1;
2952 } 2967 }
… …
2955 end_col = ROW(row).l; 2970 end_col = ROW(row).l;
2956 2971
2957 col = max (col, 0); 2972 col = max (col, 0);
2958 2973
2959 if (row == selection.end.row 2974 if (row == selection.end.row
2960#if ENABLE_FRILLS 2975#if !ENABLE_MINIMAL
2961 || selection.rect 2976 || selection.rect
2962#endif 2977#endif
2963 ) 2978 )
2964 min_it (end_col, selection.end.col); 2979 min_it (end_col, selection.end.col);
2965 2980
… …
2988#endif 3003#endif
2989 else 3004 else
2990 new_selection_text[ofs++] = *t++; 3005 new_selection_text[ofs++] = *t++;
2991 } 3006 }
2992 3007
2993#if ENABLE_FRILLS 3008#if !ENABLE_MINIMAL
2994 if (selection.rect) 3009 if (selection.rect)
2995 { 3010 {
2996 while (ofs 3011 while (ofs
2997 && new_selection_text[ofs - 1] != C0_LF 3012 && new_selection_text[ofs - 1] != C0_LF
2998 && unicode::is_space (new_selection_text[ofs - 1])) 3013 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3032bool 3047bool
3033rxvt_term::selection_grab (Time tm) NOTHROW 3048rxvt_term::selection_grab (Time tm) NOTHROW
3034{ 3049{
3035 selection_time = tm; 3050 selection_time = tm;
3036 3051
3037 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); 3052 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3038 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) 3053 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3039 { 3054 {
3040 display->set_selection_owner (this); 3055 display->set_selection_owner (this);
3041 return true; 3056 return true;
3042 } 3057 }
3043 else 3058 else
… …
3047 } 3062 }
3048 3063
3049#if 0 3064#if 0
3050 XTextProperty ct; 3065 XTextProperty ct;
3051 3066
3052 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 3067 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3053 { 3068 {
3054 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3069 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3055 XFree (ct.value); 3070 XFree (ct.value);
3056 } 3071 }
3057#endif 3072#endif
… …
3359 3374
3360 if (selection.clicks == 1) 3375 if (selection.clicks == 1)
3361 { 3376 {
3362 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3377 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3363 && !ROW(selection.beg.row).is_longer () 3378 && !ROW(selection.beg.row).is_longer ()
3364#if ENABLE_FRILLS 3379#if !ENABLE_MINIMAL
3365 && !selection.rect 3380 && !selection.rect
3366#endif 3381#endif
3367 ) 3382 )
3368 selection.beg.col = ncol; 3383 selection.beg.col = ncol;
3369 3384
3370 if ( 3385 if (
3371 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3386 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3372 && !ROW(selection.end.row).is_longer () 3387 && !ROW(selection.end.row).is_longer ()
3373#if ENABLE_FRILLS 3388#if !ENABLE_MINIMAL
3374 && !selection.rect 3389 && !selection.rect
3375#endif 3390#endif
3376 ) 3391 )
3377 selection.end.col = ncol; 3392 selection.end.col = ncol;
3378 } 3393 }
… …
3395 { 3410 {
3396 if (!ROW(end_row).is_longer ()) 3411 if (!ROW(end_row).is_longer ())
3397 { 3412 {
3398 selection.end.row = end_row; 3413 selection.end.row = end_row;
3399 selection.end.col = ROW(end_row).l; 3414 selection.end.col = ROW(end_row).l;
3415# if !ENABLE_MINIMAL
3400 selection_remove_trailing_spaces (); 3416 selection_remove_trailing_spaces ();
3417# endif
3401 break; 3418 break;
3402 } 3419 }
3403 } 3420 }
3404 } 3421 }
3405 else 3422 else
… …
3434 selection.mark.row = selection.beg.row; 3451 selection.mark.row = selection.beg.row;
3435 selection.mark.col = selection.beg.col; 3452 selection.mark.col = selection.beg.col;
3436 } 3453 }
3437 } 3454 }
3438 3455
3439#if ENABLE_FRILLS 3456#if !ENABLE_MINIMAL
3440 if (selection.rect && selection.beg.col > selection.end.col) 3457 if (selection.rect && selection.beg.col > selection.end.col)
3441 ::swap (selection.beg.col, selection.end.col); 3458 ::swap (selection.beg.col, selection.end.col);
3442#endif 3459#endif
3443} 3460}
3444 3461
3445#if ENABLE_FRILLS 3462#if !ENABLE_MINIMAL
3446void 3463void
3447rxvt_term::selection_remove_trailing_spaces () NOTHROW 3464rxvt_term::selection_remove_trailing_spaces () NOTHROW
3448{ 3465{
3449 int32_t end_col, end_row; 3466 int32_t end_col, end_row;
3450 text_t *stp; 3467 text_t *stp;
… …
3528 *target++ = xa[XA_COMPOUND_TEXT]; 3545 *target++ = xa[XA_COMPOUND_TEXT];
3529#if X_HAVE_UTF8_STRING 3546#if X_HAVE_UTF8_STRING
3530 *target++ = xa[XA_UTF8_STRING]; 3547 *target++ = xa[XA_UTF8_STRING];
3531#endif 3548#endif
3532 3549
3533 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3550 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3534 32, PropModeReplace, 3551 32, PropModeReplace,
3535 (unsigned char *)target_list, target - target_list); 3552 (unsigned char *)target_list, target - target_list);
3536 ev.property = rq.property; 3553 ev.property = rq.property;
3537 } 3554 }
3538#if TODO // TODO 3555#if TODO // TODO
… …
3541 /* TODO: Handle MULTIPLE */ 3558 /* TODO: Handle MULTIPLE */
3542 } 3559 }
3543#endif 3560#endif
3544 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3561 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3545 { 3562 {
3546 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3563 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3547 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3564 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3548 ev.property = rq.property; 3565 ev.property = rq.property;
3549 } 3566 }
3550 else if (rq.target == XA_STRING 3567 else if (rq.target == XA_STRING
3551 || rq.target == xa[XA_TEXT] 3568 || rq.target == xa[XA_TEXT]
… …
3575 style = enc_string; 3592 style = enc_string;
3576 else if (target == xa[XA_TEXT]) 3593 else if (target == xa[XA_TEXT])
3577 style = enc_text; 3594 style = enc_text;
3578 else if (target == xa[XA_COMPOUND_TEXT]) 3595 else if (target == xa[XA_COMPOUND_TEXT])
3579 style = enc_compound_text; 3596 style = enc_compound_text;
3580#if ENABLE_FRILLS 3597#if !ENABLE_MINIMAL
3581 else if (target == xa[XA_UTF8_STRING]) 3598 else if (target == xa[XA_UTF8_STRING])
3582 style = enc_utf8; 3599 style = enc_utf8;
3583#endif 3600#endif
3584 else 3601 else
3585 { 3602 {
… …
3596 { 3613 {
3597 cl = L""; 3614 cl = L"";
3598 selectlen = 0; 3615 selectlen = 0;
3599 } 3616 }
3600 3617
3601#if ENABLE_FRILLS 3618#if !ENABLE_MINIMAL
3602 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3619 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3603 // so recode it manually 3620 // so recode it manually
3604 if (style == enc_utf8) 3621 if (style == enc_utf8)
3605 { 3622 {
3606 freect = 1; 3623 freect = 1;
… …
3609 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3626 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3610 ct.nitems = strlen ((char *)ct.value); 3627 ct.nitems = strlen ((char *)ct.value);
3611 } 3628 }
3612 else 3629 else
3613#endif 3630#endif
3614 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3631 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3615 freect = 1; 3632 freect = 1;
3616 else 3633 else
3617 { 3634 {
3618 /* if we failed to convert then send it raw */ 3635 /* if we failed to convert then send it raw */
3619 ct.value = (unsigned char *)cl; 3636 ct.value = (unsigned char *)cl;
3620 ct.nitems = selectlen; 3637 ct.nitems = selectlen;
3621 ct.encoding = target; 3638 ct.encoding = target;
3622 } 3639 }
3623 3640
3624 XChangeProperty (xdisp, rq.requestor, rq.property, 3641 XChangeProperty (dpy, rq.requestor, rq.property,
3625 ct.encoding, 8, PropModeReplace, 3642 ct.encoding, 8, PropModeReplace,
3626 ct.value, (int)ct.nitems); 3643 ct.value, (int)ct.nitems);
3627 ev.property = rq.property; 3644 ev.property = rq.property;
3628 3645
3629 if (freect) 3646 if (freect)
3630 XFree (ct.value); 3647 XFree (ct.value);
3631 } 3648 }
3632 3649
3633 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3650 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3634} 3651}
3635 3652
3636/* ------------------------------------------------------------------------- * 3653/* ------------------------------------------------------------------------- *
3637 * MOUSE ROUTINES * 3654 * MOUSE ROUTINES *
3638 * ------------------------------------------------------------------------- */ 3655 * ------------------------------------------------------------------------- */
… …
3654void 3671void
3655rxvt_term::im_set_position (XPoint &pos) NOTHROW 3672rxvt_term::im_set_position (XPoint &pos) NOTHROW
3656{ 3673{
3657 XWindowAttributes xwa; 3674 XWindowAttributes xwa;
3658 3675
3659 XGetWindowAttributes (xdisp, vt, &xwa); 3676 XGetWindowAttributes (dpy, vt, &xwa);
3660 3677
3661 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3678 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3662 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3679 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3663} 3680}
3664#endif 3681#endif

Diff Legend

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