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.247 by root, Sun Jan 22 20:39:47 2006 UTC vs.
Revision 1.260 by root, Sat Feb 18 15:24:39 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 (display->display, 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 (display->display, 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 (display->display, 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
… …
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 { 645 {
646 // basically this is a slightly optimized scr_blank_screen_mem
647 // it is worth the effort on slower machines
648 line_t &l = ROW(nrow - 1 - i); 646 line_t &l = ROW(nrow - 1 - i);
649 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 {
650 scr_blank_line (l, 0, l.l, rstyle); 652 scr_blank_line (l, 0, l.l, rstyle);
651
652 l.l = 0; 653 l.l = 0;
653 l.f = 0; 654 l.f = 0;
655 }
656 else
657 scr_blank_screen_mem (l, rstyle);
654 } 658 }
655 659
656 // now copy lines below the scroll region bottom to the 660 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they 661 // bottom of the screen again, so they look as if they
658 // hadn't moved. 662 // hadn't moved.
… …
758 ZERO_SCROLLBACK (); 762 ZERO_SCROLLBACK ();
759 763
760 if (minlines > 0) 764 if (minlines > 0)
761 { 765 {
762 minlines += screen.cur.row - screen.bscroll; 766 minlines += screen.cur.row - screen.bscroll;
767 min_it (minlines, screen.cur.row - top_row);
763 768
764 if (minlines > 0 769 if (minlines > 0
765 && screen.tscroll == 0 770 && screen.tscroll == 0
766 && screen.bscroll == nrow - 1) 771 && screen.bscroll == nrow - 1)
767 { 772 {
… …
841 846
842 // some utf-8 decoders "decode" surrogate characters: let's fix this. 847 // some utf-8 decoders "decode" surrogate characters: let's fix this.
843 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 848 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
844 c = 0xfffd; 849 c = 0xfffd;
845 850
846 // rely on wcwidth to tell us the character width, at least for non-latin1 851 // rely on wcwidth to tell us the character width, do wcwidth before
847 // do wcwidth before further replacements, as wcwidth might return -1 852 // further replacements, as wcwidth might return -1 for the line
848 // for the line drawing characters below as they might be invalid in the current 853 // drawing characters below as they might be invalid in the current
849 // locale. 854 // locale.
850 int width = c < 0x100 ? 1 : wcwidth (c); 855 int width = WCWIDTH (c);
851 856
852 if (charsets [screen.charset] == '0') // DEC SPECIAL 857 if (charsets [screen.charset] == '0') // DEC SPECIAL
853 { 858 {
854 // vt100 special graphics and line drawing 859 // vt100 special graphics and line drawing
855 // 5f-7e standard vt100 860 // 5f-7e standard vt100
… …
1109 * Process DEC Back Index 1114 * Process DEC Back Index
1110 * XTERM_SEQ: ESC 6 1115 * XTERM_SEQ: ESC 6
1111 * 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
1112 * in that row right. Clear left column. 1117 * in that row right. Clear left column.
1113 */ 1118 */
1114#if ENABLE_FRILLS 1119#if !ENABLE_MINIMAL
1115void 1120void
1116rxvt_term::scr_backindex () NOTHROW 1121rxvt_term::scr_backindex () NOTHROW
1117{ 1122{
1118 if (screen.cur.col > 0) 1123 if (screen.cur.col > 0)
1119 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1126 * Process DEC Forward Index 1131 * Process DEC Forward Index
1127 * XTERM_SEQ: ESC 9 1132 * XTERM_SEQ: ESC 9
1128 * 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
1129 * in that row left. Clear right column. 1134 * in that row left. Clear right column.
1130 */ 1135 */
1131#if ENABLE_FRILLS 1136#if !ENABLE_MINIMAL
1132void 1137void
1133rxvt_term::scr_forwardindex () NOTHROW 1138rxvt_term::scr_forwardindex () NOTHROW
1134{ 1139{
1135 if (screen.cur.col < ncol - 1) 1140 if (screen.cur.col < ncol - 1)
1136 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1337 } 1342 }
1338 else 1343 else
1339 { 1344 {
1340 ren = rstyle & (RS_fgMask | RS_bgMask); 1345 ren = rstyle & (RS_fgMask | RS_bgMask);
1341 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1342 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1347 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1343 ERASE_ROWS (row, num); 1348 ERASE_ROWS (row, num);
1344 gcvalue.foreground = pix_colors[Color_fg]; 1349 gcvalue.foreground = pix_colors[Color_fg];
1345 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1350 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1346 } 1351 }
1347 1352
1348 for (; num--; row++) 1353 for (; num--; row++)
1349 { 1354 {
1350 scr_blank_screen_mem (ROW(row), rstyle); 1355 scr_blank_screen_mem (ROW(row), rstyle);
1351 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1356 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1352 } 1357 }
1353} 1358}
1354 1359
1355#if ENABLE_FRILLS 1360#if !ENABLE_MINIMAL
1356void 1361void
1357rxvt_term::scr_erase_savelines () NOTHROW 1362rxvt_term::scr_erase_savelines () NOTHROW
1358{ 1363{
1359 want_refresh = 1; 1364 want_refresh = 1;
1360 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
… …
1649 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1650#endif 1655#endif
1651#if TRANSPARENT 1656#if TRANSPARENT
1652 if (!OPTION (Opt_transparent) || am_transparent == 0) 1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1653#endif 1658#endif
1654 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1655 1660
1656 XGCValues gcvalue; 1661 XGCValues gcvalue;
1657 gcvalue.foreground = pix_colors[Color_fg]; 1662 gcvalue.foreground = pix_colors[Color_fg];
1658 gcvalue.background = pix_colors[Color_bg]; 1663 gcvalue.background = pix_colors[Color_bg];
1659 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); 1664 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1660 1665
1661 scr_clear (); 1666 scr_clear ();
1662 scr_touch (true); 1667 scr_touch (true);
1663 } 1668 }
1664} 1669}
… …
1749{ 1754{
1750 bool found = false; 1755 bool found = false;
1751 1756
1752 for (int i = 0; i < nrow; i++) 1757 for (int i = 0; i < nrow; i++)
1753 { 1758 {
1754 int col = 0;
1755 rend_t *drp = drawn_buf[i].r; 1759 rend_t *drp = drawn_buf[i].r;
1756 1760
1757 for (; col < ncol; col++, drp++) 1761 for (int col = 0; col < ncol; col++, drp++)
1758 if ((*drp & mask) == value) 1762 if ((*drp & mask) == value)
1759 { 1763 {
1760 found = true; 1764 found = true;
1761 *drp = ~value; 1765 *drp = ~value;
1762 } 1766 }
… …
1884 1888
1885# ifndef NO_MAPALERT 1889# ifndef NO_MAPALERT
1886# ifdef MAPALERT_OPTION 1890# ifdef MAPALERT_OPTION
1887 if (OPTION (Opt_mapAlert)) 1891 if (OPTION (Opt_mapAlert))
1888# endif 1892# endif
1889 XMapWindow (display->display, parent[0]); 1893 XMapWindow (dpy, parent[0]);
1890# endif 1894# endif
1891 1895
1892 if (OPTION (Opt_visualBell)) 1896 if (OPTION (Opt_visualBell))
1893 { 1897 {
1894 rvideo_bell = true; 1898 rvideo_bell = true;
… …
1896 display->flush (); 1900 display->flush ();
1897 1901
1898 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1902 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1899 } 1903 }
1900 else 1904 else
1901 XBell (display->display, 0); 1905 XBell (dpy, 0);
1902 1906
1903#endif 1907#endif
1904} 1908}
1905 1909
1906/* ------------------------------------------------------------------------- */ 1910/* ------------------------------------------------------------------------- */
… …
1965 * screen.text/screen.rend contain what the screen will change to. 1969 * screen.text/screen.rend contain what the screen will change to.
1966 */ 1970 */
1967void 1971void
1968rxvt_term::scr_refresh () NOTHROW 1972rxvt_term::scr_refresh () NOTHROW
1969{ 1973{
1970 unsigned char must_clear, /* use draw_string not draw_image_string */ 1974 unsigned char have_bg,
1971 showcursor; /* show the cursor */ 1975 showcursor; /* show the cursor */
1972 int16_t col, row, /* column/row we're processing */ 1976 int16_t col, row, /* column/row we're processing */
1973 ocrow; /* old cursor row */ 1977 ocrow; /* old cursor row */
1974 int i; /* tmp */ 1978 int i; /* tmp */
1975#ifndef NO_CURSORCOLOR 1979#ifndef NO_CURSORCOLOR
… …
1983 return; 1987 return;
1984 1988
1985 /* 1989 /*
1986 * A: set up vars 1990 * A: set up vars
1987 */ 1991 */
1988 must_clear = 0; 1992 have_bg = 0;
1989 refresh_count = 0; 1993 refresh_count = 0;
1990 1994
1991#if XPM_BACKGROUND 1995#if XPM_BACKGROUND
1992 must_clear |= bgPixmap.pixmap != None; 1996 have_bg |= bgPixmap.pixmap != None;
1993#endif 1997#endif
1994#if TRANSPARENT 1998#if TRANSPARENT
1995 must_clear |= OPTION (Opt_transparent) && am_transparent; 1999 have_bg |= OPTION (Opt_transparent) && am_transparent;
1996#endif 2000#endif
1997 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1998 2002
1999 /* 2003 /*
2000 * B: reverse any characters which are selected 2004 * B: reverse any characters which are selected
… …
2099 * D: CopyArea pass - very useful for slower links 2103 * D: CopyArea pass - very useful for slower links
2100 * This has been deliberately kept simple. 2104 * This has been deliberately kept simple.
2101 */ 2105 */
2102 if (!display->is_local 2106 if (!display->is_local
2103 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2107 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2104 && abs (num_scr) < nrow && !must_clear) 2108 && abs (num_scr) < nrow && !have_bg)
2105 { 2109 {
2106 int16_t nits; 2110 int16_t nits;
2107 int j; 2111 int j;
2108 int len, wlen; 2112 int len, wlen;
2109 dLocal (int, num_scr); 2113 dLocal (int, num_scr);
… …
2145 { 2149 {
2146 /* also comes here at end if needed because of >= above */ 2150 /* also comes here at end if needed because of >= above */
2147 if (wlen < len) 2151 if (wlen < len)
2148 ::swap (wlen, len); 2152 ::swap (wlen, len);
2149 2153
2154 XGCValues gcv;
2155
2156 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2150 XCopyArea (display->display, vt, vt, 2157 XCopyArea (dpy, vt, vt,
2151 gc, 0, Row2Pixel (len + i), 2158 gc, 0, Row2Pixel (len + i),
2152 (unsigned int)this->width, 2159 (unsigned int)this->width,
2153 (unsigned int)Height2Pixel (wlen - len + 1), 2160 (unsigned int)Height2Pixel (wlen - len + 1),
2154 0, Row2Pixel (len)); 2161 0, Row2Pixel (len));
2162 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2163
2155 len = -1; 2164 len = -1;
2156 } 2165 }
2157 } 2166 }
2158 } 2167 }
2159#endif 2168#endif
… …
2215 count++; 2224 count++;
2216 2225
2217 if (stp[col] != dtp[col] 2226 if (stp[col] != dtp[col]
2218 || !RS_SAME (srp[col], drp[col])) 2227 || !RS_SAME (srp[col], drp[col]))
2219 { 2228 {
2220 if (must_clear && (i++ > count / 2)) 2229 if (have_bg && (i++ > count / 2))
2221 break; 2230 break;
2222 2231
2223 dtp[col] = stp[col]; 2232 dtp[col] = stp[col];
2224 drp[col] = rend; 2233 drp[col] = rend;
2225 i = 0; 2234 i = 0;
2226 } 2235 }
2227 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2236 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2228 break; 2237 break;
2229 } 2238 }
2230 2239
2231 col--; /* went one too far. move back */ 2240 col--; /* went one too far. move back */
2232 count -= i; /* dump any matching trailing chars */ 2241 count -= i; /* dump any matching trailing chars */
… …
2243 2252
2244 // only do special processing if any attributes are set, which is unlikely 2253 // only do special processing if any attributes are set, which is unlikely
2245 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2254 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2246 { 2255 {
2247#if ENABLE_STYLES 2256#if ENABLE_STYLES
2248 // force redraw after "careful" characters to avoid pixel droppings 2257 // "careful" (too wide) character handling
2249 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2250 drp[col + 1] = ~srp[col + 1];
2251 2258
2252 // include previous careful character(s) if possible, looks nicer (best effort...) 2259 // include previous careful character(s) if possible, looks nicer (best effort...)
2253 while (text > stp 2260 while (text > stp
2254 && srp[text - stp - 1] & RS_Careful 2261 && srp[text - stp - 1] & RS_Careful
2255 && RS_SAME (rend, srp[text - stp - 1])) 2262 && RS_SAME (rend, srp[text - stp - 1]))
2256 text--, count++, xpixel -= fwidth; 2263 text--, count++, xpixel -= fwidth;
2264
2265 // force redraw after "careful" characters to avoid pixel droppings
2266 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2267 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2268
2269 // force redraw before "careful" characters to avoid pixel droppings
2270 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2271 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2257#endif 2272#endif
2258 2273
2259 bool invert = rend & RS_RVid; 2274 bool invert = rend & RS_RVid;
2260 2275
2261#ifndef NO_BOLD_UNDERLINE_REVERSE 2276#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2319 * Actually do the drawing of the string here 2334 * Actually do the drawing of the string here
2320 */ 2335 */
2321 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2336 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2322 2337
2323 if (back == fore) 2338 if (back == fore)
2324 font->clear_rect (*drawable, xpixel, ypixel, 2339 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2325 fwidth * count, fheight,
2326 back);
2327 else if (back == Color_bg) 2340 else if (back == Color_bg && have_bg)
2328 { 2341 {
2329 if (must_clear) 2342 // this is very ugly, maybe push it into ->draw?
2330 {
2331 CLEAR_CHARS (xpixel, ypixel, count);
2332 2343
2333 for (i = 0; i < count; i++) /* don't draw empty strings */ 2344 for (i = 0; i < count; i++) /* don't draw empty strings */
2334 if (text[i] != ' ') 2345 if (text[i] != ' ')
2335 { 2346 {
2336 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2347 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2337 break; 2348 goto did_clear;
2338 }
2339 } 2349 }
2340 else 2350
2341 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2351 CLEAR_CHARS (xpixel, ypixel, count);
2352 did_clear: ;
2342 } 2353 }
2343 else 2354 else
2344 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2355 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2345 2356
2346 if (rend & RS_Uline && font->descent > 1 && fore != back) 2357 if (rend & RS_Uline && font->descent > 1 && fore != back)
2347 { 2358 {
2348#if ENABLE_FRILLS 2359#if ENABLE_FRILLS
2349 if (ISSET_PIXCOLOR (Color_underline)) 2360 if (ISSET_PIXCOLOR (Color_underline))
2350 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2361 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2351 else 2362 else
2352#endif 2363#endif
2353 XSetForeground (display->display, gc, pix_colors[fore]); 2364 XSetForeground (dpy, gc, pix_colors[fore]);
2354 2365
2355 XDrawLine (display->display, drawBuffer, gc, 2366 XDrawLine (dpy, drawBuffer, gc,
2356 xpixel, ypixel + font->ascent + 1, 2367 xpixel, ypixel + font->ascent + 1,
2357 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2368 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2358 } 2369 }
2359 } /* for (col....) */ 2370 } /* for (col....) */
2360 } /* for (row....) */ 2371 } /* for (row....) */
… …
2393 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2404 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2394 cursorwidth++; 2405 cursorwidth++;
2395 2406
2396#ifndef NO_CURSORCOLOR 2407#ifndef NO_CURSORCOLOR
2397 if (ISSET_PIXCOLOR (Color_cursor)) 2408 if (ISSET_PIXCOLOR (Color_cursor))
2398 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2409 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2399#endif 2410#endif
2400 2411
2401 XDrawRectangle (display->display, drawBuffer, gc, 2412 XDrawRectangle (dpy, drawBuffer, gc,
2402 Col2Pixel (col), 2413 Col2Pixel (col),
2403 Row2Pixel (oldcursor.row), 2414 Row2Pixel (oldcursor.row),
2404 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2415 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2405 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2416 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2406 } 2417 }
… …
2450#if XPM_BACKGROUND 2461#if XPM_BACKGROUND
2451 && !bgPixmap.pixmap 2462 && !bgPixmap.pixmap
2452#endif 2463#endif
2453 ) 2464 )
2454 { 2465 {
2455 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2466 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2456 XClearWindow (display->display, parent[0]); 2467 XClearWindow (dpy, parent[0]);
2457 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2468 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2458#if HAVE_SCROLLBARS 2469#if HAVE_SCROLLBARS
2459 if (scrollBar.win) 2470 if (scrollBar.win)
2460 { 2471 {
2461 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2472 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2462 scrollBar.setIdle (); 2473 scrollBar.setIdle ();
2463 scrollbar_show (0); 2474 scrollbar_show (0);
2464 } 2475 }
2465#endif 2476#endif
2466 } 2477 }
… …
2479 2490
2480 num_scr_allow = 0; 2491 num_scr_allow = 0;
2481 want_refresh = 1; 2492 want_refresh = 1;
2482 2493
2483 if (really) 2494 if (really)
2484 XClearWindow (display->display, vt); 2495 XClearWindow (dpy, vt);
2485} 2496}
2486 2497
2487void 2498void
2488rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2499rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2489{ 2500{
… …
2538{ 2549{
2539 if (selection.op 2550 if (selection.op
2540 && current_screen == selection.screen 2551 && current_screen == selection.screen
2541 && selection.end.row >= view_start) 2552 && selection.end.row >= view_start)
2542 { 2553 {
2543#if ENABLE_FRILLS 2554#if !ENABLE_MINIMAL
2544 if (selection.rect) 2555 if (selection.rect)
2545 scr_xor_rect (selection.beg.row, selection.beg.col, 2556 scr_xor_rect (selection.beg.row, selection.beg.col,
2546 selection.end.row, selection.end.col, 2557 selection.end.row, selection.end.col,
2547 RS_RVid, RS_RVid | RS_Uline); 2558 RS_RVid, RS_RVid | RS_Uline);
2548 else 2559 else
… …
2664 } 2675 }
2665 2676
2666 unsigned long bytes_after; 2677 unsigned long bytes_after;
2667 XTextProperty ct; 2678 XTextProperty ct;
2668 2679
2669 if (XGetWindowProperty (display->display, win, prop, 2680 if (XGetWindowProperty (dpy, win, prop,
2670 0, PROP_SIZE / 4, 2681 0, PROP_SIZE / 4,
2671 delete_prop, AnyPropertyType, 2682 delete_prop, AnyPropertyType,
2672 &ct.encoding, &ct.format, 2683 &ct.encoding, &ct.format,
2673 &ct.nitems, &bytes_after, 2684 &ct.nitems, &bytes_after,
2674 &ct.value) != Success) 2685 &ct.value) != Success)
… …
2683 if (bytes_after) 2694 if (bytes_after)
2684 { 2695 {
2685 // fetch and append remaining data 2696 // fetch and append remaining data
2686 XTextProperty ct2; 2697 XTextProperty ct2;
2687 2698
2688 if (XGetWindowProperty (display->display, win, prop, 2699 if (XGetWindowProperty (dpy, win, prop,
2689 ct.nitems / 4, (bytes_after + 3) / 4, 2700 ct.nitems / 4, (bytes_after + 3) / 4,
2690 delete_prop, AnyPropertyType, 2701 delete_prop, AnyPropertyType,
2691 &ct2.encoding, &ct2.format, 2702 &ct2.encoding, &ct2.format,
2692 &ct2.nitems, &bytes_after, 2703 &ct2.nitems, &bytes_after,
2693 &ct2.value) != Success) 2704 &ct2.value) != Success)
… …
2706 2717
2707 if (ct.encoding == xa[XA_INCR]) 2718 if (ct.encoding == xa[XA_INCR])
2708 { 2719 {
2709 // INCR selection, start handshake 2720 // INCR selection, start handshake
2710 if (!delete_prop) 2721 if (!delete_prop)
2711 XDeleteProperty (display->display, win, prop); 2722 XDeleteProperty (dpy, win, prop);
2712 2723
2713 selection_wait = Sel_incr; 2724 selection_wait = Sel_incr;
2714 incr_buf_fill = 0; 2725 incr_buf_fill = 0;
2715 incr_ev.start (NOW + 10); 2726 incr_ev.start (NOW + 10);
2716 2727
… …
2763 } 2774 }
2764 2775
2765 char **cl; 2776 char **cl;
2766 int cr; 2777 int cr;
2767 2778
2768#if ENABLE_FRILLS 2779#if !ENABLE_MINIMAL
2769 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2780 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2770 // so recode it manually 2781 // so recode it manually
2771 if (ct.encoding == xa[XA_UTF8_STRING]) 2782 if (ct.encoding == xa[XA_UTF8_STRING])
2772 { 2783 {
2773 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2784 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2777 paste (s, strlen (s)); 2788 paste (s, strlen (s));
2778 free (s); 2789 free (s);
2779 } 2790 }
2780 else 2791 else
2781#endif 2792#endif
2782 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2793 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2783 && cl) 2794 && cl)
2784 { 2795 {
2785 for (int i = 0; i < cr; i++) 2796 for (int i = 0; i < cr; i++)
2786 paste (cl[i], strlen (cl[i])); 2797 paste (cl[i], strlen (cl[i]));
2787 2798
… …
2869 else if (selnum == Sel_Secondary) 2880 else if (selnum == Sel_Secondary)
2870 sel = XA_SECONDARY; 2881 sel = XA_SECONDARY;
2871 else 2882 else
2872 sel = xa[XA_CLIPBOARD]; 2883 sel = xa[XA_CLIPBOARD];
2873 2884
2874 if (XGetSelectionOwner (display->display, sel) != None) 2885 if (XGetSelectionOwner (dpy, sel) != None)
2875 { 2886 {
2876 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2887 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2877 vt, selection_request_time); 2888 vt, selection_request_time);
2878 return 1; 2889 return 1;
2879 } 2890 }
2880 2891
2881 return 0; 2892 return 0;
… …
2944 2955
2945 int end_col; 2956 int end_col;
2946 2957
2947 for (; row <= selection.end.row; row++, col = 0) 2958 for (; row <= selection.end.row; row++, col = 0)
2948 { 2959 {
2949#if ENABLE_FRILLS 2960#if !ENABLE_MINIMAL
2950 if (selection.rect) 2961 if (selection.rect)
2951 { 2962 {
2952 col = selection.beg.col; 2963 col = selection.beg.col;
2953 end_col = ncol + 1; 2964 end_col = ncol + 1;
2954 } 2965 }
… …
2957 end_col = ROW(row).l; 2968 end_col = ROW(row).l;
2958 2969
2959 col = max (col, 0); 2970 col = max (col, 0);
2960 2971
2961 if (row == selection.end.row 2972 if (row == selection.end.row
2962#if ENABLE_FRILLS 2973#if !ENABLE_MINIMAL
2963 || selection.rect 2974 || selection.rect
2964#endif 2975#endif
2965 ) 2976 )
2966 min_it (end_col, selection.end.col); 2977 min_it (end_col, selection.end.col);
2967 2978
… …
2990#endif 3001#endif
2991 else 3002 else
2992 new_selection_text[ofs++] = *t++; 3003 new_selection_text[ofs++] = *t++;
2993 } 3004 }
2994 3005
2995#if ENABLE_FRILLS 3006#if !ENABLE_MINIMAL
2996 if (selection.rect) 3007 if (selection.rect)
2997 { 3008 {
2998 while (ofs 3009 while (ofs
2999 && new_selection_text[ofs - 1] != C0_LF 3010 && new_selection_text[ofs - 1] != C0_LF
3000 && unicode::is_space (new_selection_text[ofs - 1])) 3011 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3034bool 3045bool
3035rxvt_term::selection_grab (Time tm) NOTHROW 3046rxvt_term::selection_grab (Time tm) NOTHROW
3036{ 3047{
3037 selection_time = tm; 3048 selection_time = tm;
3038 3049
3039 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3050 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3040 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3051 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3041 { 3052 {
3042 display->set_selection_owner (this); 3053 display->set_selection_owner (this);
3043 return true; 3054 return true;
3044 } 3055 }
3045 else 3056 else
… …
3049 } 3060 }
3050 3061
3051#if 0 3062#if 0
3052 XTextProperty ct; 3063 XTextProperty ct;
3053 3064
3054 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3065 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3055 { 3066 {
3056 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3067 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3057 XFree (ct.value); 3068 XFree (ct.value);
3058 } 3069 }
3059#endif 3070#endif
… …
3361 3372
3362 if (selection.clicks == 1) 3373 if (selection.clicks == 1)
3363 { 3374 {
3364 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3375 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3365 && !ROW(selection.beg.row).is_longer () 3376 && !ROW(selection.beg.row).is_longer ()
3366#if ENABLE_FRILLS 3377#if !ENABLE_MINIMAL
3367 && !selection.rect 3378 && !selection.rect
3368#endif 3379#endif
3369 ) 3380 )
3370 selection.beg.col = ncol; 3381 selection.beg.col = ncol;
3371 3382
3372 if ( 3383 if (
3373 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3384 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3374 && !ROW(selection.end.row).is_longer () 3385 && !ROW(selection.end.row).is_longer ()
3375#if ENABLE_FRILLS 3386#if !ENABLE_MINIMAL
3376 && !selection.rect 3387 && !selection.rect
3377#endif 3388#endif
3378 ) 3389 )
3379 selection.end.col = ncol; 3390 selection.end.col = ncol;
3380 } 3391 }
… …
3397 { 3408 {
3398 if (!ROW(end_row).is_longer ()) 3409 if (!ROW(end_row).is_longer ())
3399 { 3410 {
3400 selection.end.row = end_row; 3411 selection.end.row = end_row;
3401 selection.end.col = ROW(end_row).l; 3412 selection.end.col = ROW(end_row).l;
3413# if !ENABLE_MINIMAL
3402 selection_remove_trailing_spaces (); 3414 selection_remove_trailing_spaces ();
3415# endif
3403 break; 3416 break;
3404 } 3417 }
3405 } 3418 }
3406 } 3419 }
3407 else 3420 else
… …
3436 selection.mark.row = selection.beg.row; 3449 selection.mark.row = selection.beg.row;
3437 selection.mark.col = selection.beg.col; 3450 selection.mark.col = selection.beg.col;
3438 } 3451 }
3439 } 3452 }
3440 3453
3441#if ENABLE_FRILLS 3454#if !ENABLE_MINIMAL
3442 if (selection.rect && selection.beg.col > selection.end.col) 3455 if (selection.rect && selection.beg.col > selection.end.col)
3443 ::swap (selection.beg.col, selection.end.col); 3456 ::swap (selection.beg.col, selection.end.col);
3444#endif 3457#endif
3445} 3458}
3446 3459
3447#if ENABLE_FRILLS 3460#if !ENABLE_MINIMAL
3448void 3461void
3449rxvt_term::selection_remove_trailing_spaces () NOTHROW 3462rxvt_term::selection_remove_trailing_spaces () NOTHROW
3450{ 3463{
3451 int32_t end_col, end_row; 3464 int32_t end_col, end_row;
3452 text_t *stp; 3465 text_t *stp;
… …
3507 */ 3520 */
3508void 3521void
3509rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3522rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3510{ 3523{
3511 XSelectionEvent ev; 3524 XSelectionEvent ev;
3512 dDisp;
3513 3525
3514 ev.type = SelectionNotify; 3526 ev.type = SelectionNotify;
3515 ev.property = None; 3527 ev.property = None;
3516 ev.display = rq.display; 3528 ev.display = rq.display;
3517 ev.requestor = rq.requestor; 3529 ev.requestor = rq.requestor;
… …
3531 *target++ = xa[XA_COMPOUND_TEXT]; 3543 *target++ = xa[XA_COMPOUND_TEXT];
3532#if X_HAVE_UTF8_STRING 3544#if X_HAVE_UTF8_STRING
3533 *target++ = xa[XA_UTF8_STRING]; 3545 *target++ = xa[XA_UTF8_STRING];
3534#endif 3546#endif
3535 3547
3536 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3548 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3537 32, PropModeReplace, 3549 32, PropModeReplace,
3538 (unsigned char *)target_list, target - target_list); 3550 (unsigned char *)target_list, target - target_list);
3539 ev.property = rq.property; 3551 ev.property = rq.property;
3540 } 3552 }
3541#if TODO // TODO 3553#if TODO // TODO
… …
3544 /* TODO: Handle MULTIPLE */ 3556 /* TODO: Handle MULTIPLE */
3545 } 3557 }
3546#endif 3558#endif
3547 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3559 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3548 { 3560 {
3549 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3561 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3550 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3562 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3551 ev.property = rq.property; 3563 ev.property = rq.property;
3552 } 3564 }
3553 else if (rq.target == XA_STRING 3565 else if (rq.target == XA_STRING
3554 || rq.target == xa[XA_TEXT] 3566 || rq.target == xa[XA_TEXT]
… …
3578 style = enc_string; 3590 style = enc_string;
3579 else if (target == xa[XA_TEXT]) 3591 else if (target == xa[XA_TEXT])
3580 style = enc_text; 3592 style = enc_text;
3581 else if (target == xa[XA_COMPOUND_TEXT]) 3593 else if (target == xa[XA_COMPOUND_TEXT])
3582 style = enc_compound_text; 3594 style = enc_compound_text;
3583#if ENABLE_FRILLS 3595#if !ENABLE_MINIMAL
3584 else if (target == xa[XA_UTF8_STRING]) 3596 else if (target == xa[XA_UTF8_STRING])
3585 style = enc_utf8; 3597 style = enc_utf8;
3586#endif 3598#endif
3587 else 3599 else
3588 { 3600 {
… …
3599 { 3611 {
3600 cl = L""; 3612 cl = L"";
3601 selectlen = 0; 3613 selectlen = 0;
3602 } 3614 }
3603 3615
3604#if ENABLE_FRILLS 3616#if !ENABLE_MINIMAL
3605 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3617 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3606 // so recode it manually 3618 // so recode it manually
3607 if (style == enc_utf8) 3619 if (style == enc_utf8)
3608 { 3620 {
3609 freect = 1; 3621 freect = 1;
… …
3612 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3624 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3613 ct.nitems = strlen ((char *)ct.value); 3625 ct.nitems = strlen ((char *)ct.value);
3614 } 3626 }
3615 else 3627 else
3616#endif 3628#endif
3617 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3629 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3618 freect = 1; 3630 freect = 1;
3619 else 3631 else
3620 { 3632 {
3621 /* if we failed to convert then send it raw */ 3633 /* if we failed to convert then send it raw */
3622 ct.value = (unsigned char *)cl; 3634 ct.value = (unsigned char *)cl;
3623 ct.nitems = selectlen; 3635 ct.nitems = selectlen;
3624 ct.encoding = target; 3636 ct.encoding = target;
3625 } 3637 }
3626 3638
3627 XChangeProperty (disp, rq.requestor, rq.property, 3639 XChangeProperty (dpy, rq.requestor, rq.property,
3628 ct.encoding, 8, PropModeReplace, 3640 ct.encoding, 8, PropModeReplace,
3629 ct.value, (int)ct.nitems); 3641 ct.value, (int)ct.nitems);
3630 ev.property = rq.property; 3642 ev.property = rq.property;
3631 3643
3632 if (freect) 3644 if (freect)
3633 XFree (ct.value); 3645 XFree (ct.value);
3634 } 3646 }
3635 3647
3636 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3648 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3637} 3649}
3638 3650
3639/* ------------------------------------------------------------------------- * 3651/* ------------------------------------------------------------------------- *
3640 * MOUSE ROUTINES * 3652 * MOUSE ROUTINES *
3641 * ------------------------------------------------------------------------- */ 3653 * ------------------------------------------------------------------------- */
… …
3657void 3669void
3658rxvt_term::im_set_position (XPoint &pos) NOTHROW 3670rxvt_term::im_set_position (XPoint &pos) NOTHROW
3659{ 3671{
3660 XWindowAttributes xwa; 3672 XWindowAttributes xwa;
3661 3673
3662 XGetWindowAttributes (display->display, vt, &xwa); 3674 XGetWindowAttributes (dpy, vt, &xwa);
3663 3675
3664 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3676 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3665 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3677 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3666} 3678}
3667#endif 3679#endif
… …
3763rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3775rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3764{ 3776{
3765 while (*s) 3777 while (*s)
3766 { 3778 {
3767 text_t t = *s++; 3779 text_t t = *s++;
3768 int width = wcwidth (t); 3780 int width = WCWIDTH (t);
3769 3781
3770 while (width--) 3782 while (width--)
3771 { 3783 {
3772 scr_overlay_set (x++, y, t); 3784 scr_overlay_set (x++, y, t);
3773 t = NOCHAR; 3785 t = NOCHAR;

Diff Legend

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