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.250 by root, Wed Jan 25 13:24:45 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.
… …
1110 * Process DEC Back Index 1114 * Process DEC Back Index
1111 * XTERM_SEQ: ESC 6 1115 * XTERM_SEQ: ESC 6
1112 * 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
1113 * in that row right. Clear left column. 1117 * in that row right. Clear left column.
1114 */ 1118 */
1115#if ENABLE_FRILLS 1119#if !ENABLE_MINIMAL
1116void 1120void
1117rxvt_term::scr_backindex () NOTHROW 1121rxvt_term::scr_backindex () NOTHROW
1118{ 1122{
1119 if (screen.cur.col > 0) 1123 if (screen.cur.col > 0)
1120 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1127 * Process DEC Forward Index 1131 * Process DEC Forward Index
1128 * XTERM_SEQ: ESC 9 1132 * XTERM_SEQ: ESC 9
1129 * 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
1130 * in that row left. Clear right column. 1134 * in that row left. Clear right column.
1131 */ 1135 */
1132#if ENABLE_FRILLS 1136#if !ENABLE_MINIMAL
1133void 1137void
1134rxvt_term::scr_forwardindex () NOTHROW 1138rxvt_term::scr_forwardindex () NOTHROW
1135{ 1139{
1136 if (screen.cur.col < ncol - 1) 1140 if (screen.cur.col < ncol - 1)
1137 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1338 } 1342 }
1339 else 1343 else
1340 { 1344 {
1341 ren = rstyle & (RS_fgMask | RS_bgMask); 1345 ren = rstyle & (RS_fgMask | RS_bgMask);
1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1343 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1347 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1344 ERASE_ROWS (row, num); 1348 ERASE_ROWS (row, num);
1345 gcvalue.foreground = pix_colors[Color_fg]; 1349 gcvalue.foreground = pix_colors[Color_fg];
1346 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1350 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1347 } 1351 }
1348 1352
1349 for (; num--; row++) 1353 for (; num--; row++)
1350 { 1354 {
1351 scr_blank_screen_mem (ROW(row), rstyle); 1355 scr_blank_screen_mem (ROW(row), rstyle);
1352 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1356 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1353 } 1357 }
1354} 1358}
1355 1359
1356#if ENABLE_FRILLS 1360#if !ENABLE_MINIMAL
1357void 1361void
1358rxvt_term::scr_erase_savelines () NOTHROW 1362rxvt_term::scr_erase_savelines () NOTHROW
1359{ 1363{
1360 want_refresh = 1; 1364 want_refresh = 1;
1361 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
… …
1650 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1651#endif 1655#endif
1652#if TRANSPARENT 1656#if TRANSPARENT
1653 if (!OPTION (Opt_transparent) || am_transparent == 0) 1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1654#endif 1658#endif
1655 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1656 1660
1657 XGCValues gcvalue; 1661 XGCValues gcvalue;
1658 gcvalue.foreground = pix_colors[Color_fg]; 1662 gcvalue.foreground = pix_colors[Color_fg];
1659 gcvalue.background = pix_colors[Color_bg]; 1663 gcvalue.background = pix_colors[Color_bg];
1660 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); 1664 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1661 1665
1662 scr_clear (); 1666 scr_clear ();
1663 scr_touch (true); 1667 scr_touch (true);
1664 } 1668 }
1665} 1669}
… …
1750{ 1754{
1751 bool found = false; 1755 bool found = false;
1752 1756
1753 for (int i = 0; i < nrow; i++) 1757 for (int i = 0; i < nrow; i++)
1754 { 1758 {
1755 int col = 0;
1756 rend_t *drp = drawn_buf[i].r; 1759 rend_t *drp = drawn_buf[i].r;
1757 1760
1758 for (; col < ncol; col++, drp++) 1761 for (int col = 0; col < ncol; col++, drp++)
1759 if ((*drp & mask) == value) 1762 if ((*drp & mask) == value)
1760 { 1763 {
1761 found = true; 1764 found = true;
1762 *drp = ~value; 1765 *drp = ~value;
1763 } 1766 }
… …
1885 1888
1886# ifndef NO_MAPALERT 1889# ifndef NO_MAPALERT
1887# ifdef MAPALERT_OPTION 1890# ifdef MAPALERT_OPTION
1888 if (OPTION (Opt_mapAlert)) 1891 if (OPTION (Opt_mapAlert))
1889# endif 1892# endif
1890 XMapWindow (display->display, parent[0]); 1893 XMapWindow (dpy, parent[0]);
1891# endif 1894# endif
1892 1895
1893 if (OPTION (Opt_visualBell)) 1896 if (OPTION (Opt_visualBell))
1894 { 1897 {
1895 rvideo_bell = true; 1898 rvideo_bell = true;
… …
1897 display->flush (); 1900 display->flush ();
1898 1901
1899 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1902 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1900 } 1903 }
1901 else 1904 else
1902 XBell (display->display, 0); 1905 XBell (dpy, 0);
1903 1906
1904#endif 1907#endif
1905} 1908}
1906 1909
1907/* ------------------------------------------------------------------------- */ 1910/* ------------------------------------------------------------------------- */
… …
1966 * screen.text/screen.rend contain what the screen will change to. 1969 * screen.text/screen.rend contain what the screen will change to.
1967 */ 1970 */
1968void 1971void
1969rxvt_term::scr_refresh () NOTHROW 1972rxvt_term::scr_refresh () NOTHROW
1970{ 1973{
1971 unsigned char must_clear, /* use draw_string not draw_image_string */ 1974 unsigned char have_bg,
1972 showcursor; /* show the cursor */ 1975 showcursor; /* show the cursor */
1973 int16_t col, row, /* column/row we're processing */ 1976 int16_t col, row, /* column/row we're processing */
1974 ocrow; /* old cursor row */ 1977 ocrow; /* old cursor row */
1975 int i; /* tmp */ 1978 int i; /* tmp */
1976#ifndef NO_CURSORCOLOR 1979#ifndef NO_CURSORCOLOR
… …
1984 return; 1987 return;
1985 1988
1986 /* 1989 /*
1987 * A: set up vars 1990 * A: set up vars
1988 */ 1991 */
1989 must_clear = 0; 1992 have_bg = 0;
1990 refresh_count = 0; 1993 refresh_count = 0;
1991 1994
1992#if XPM_BACKGROUND 1995#if XPM_BACKGROUND
1993 must_clear |= bgPixmap.pixmap != None; 1996 have_bg |= bgPixmap.pixmap != None;
1994#endif 1997#endif
1995#if TRANSPARENT 1998#if TRANSPARENT
1996 must_clear |= OPTION (Opt_transparent) && am_transparent; 1999 have_bg |= OPTION (Opt_transparent) && am_transparent;
1997#endif 2000#endif
1998 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1999 2002
2000 /* 2003 /*
2001 * B: reverse any characters which are selected 2004 * B: reverse any characters which are selected
… …
2100 * D: CopyArea pass - very useful for slower links 2103 * D: CopyArea pass - very useful for slower links
2101 * This has been deliberately kept simple. 2104 * This has been deliberately kept simple.
2102 */ 2105 */
2103 if (!display->is_local 2106 if (!display->is_local
2104 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2107 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2105 && abs (num_scr) < nrow && !must_clear) 2108 && abs (num_scr) < nrow && !have_bg)
2106 { 2109 {
2107 int16_t nits; 2110 int16_t nits;
2108 int j; 2111 int j;
2109 int len, wlen; 2112 int len, wlen;
2110 dLocal (int, num_scr); 2113 dLocal (int, num_scr);
… …
2146 { 2149 {
2147 /* also comes here at end if needed because of >= above */ 2150 /* also comes here at end if needed because of >= above */
2148 if (wlen < len) 2151 if (wlen < len)
2149 ::swap (wlen, len); 2152 ::swap (wlen, len);
2150 2153
2154 XGCValues gcv;
2155
2156 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2151 XCopyArea (display->display, vt, vt, 2157 XCopyArea (dpy, vt, vt,
2152 gc, 0, Row2Pixel (len + i), 2158 gc, 0, Row2Pixel (len + i),
2153 (unsigned int)this->width, 2159 (unsigned int)this->width,
2154 (unsigned int)Height2Pixel (wlen - len + 1), 2160 (unsigned int)Height2Pixel (wlen - len + 1),
2155 0, Row2Pixel (len)); 2161 0, Row2Pixel (len));
2162 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2163
2156 len = -1; 2164 len = -1;
2157 } 2165 }
2158 } 2166 }
2159 } 2167 }
2160#endif 2168#endif
… …
2216 count++; 2224 count++;
2217 2225
2218 if (stp[col] != dtp[col] 2226 if (stp[col] != dtp[col]
2219 || !RS_SAME (srp[col], drp[col])) 2227 || !RS_SAME (srp[col], drp[col]))
2220 { 2228 {
2221 if (must_clear && (i++ > count / 2)) 2229 if (have_bg && (i++ > count / 2))
2222 break; 2230 break;
2223 2231
2224 dtp[col] = stp[col]; 2232 dtp[col] = stp[col];
2225 drp[col] = rend; 2233 drp[col] = rend;
2226 i = 0; 2234 i = 0;
2227 } 2235 }
2228 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2236 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2229 break; 2237 break;
2230 } 2238 }
2231 2239
2232 col--; /* went one too far. move back */ 2240 col--; /* went one too far. move back */
2233 count -= i; /* dump any matching trailing chars */ 2241 count -= i; /* dump any matching trailing chars */
… …
2254 && RS_SAME (rend, srp[text - stp - 1])) 2262 && RS_SAME (rend, srp[text - stp - 1]))
2255 text--, count++, xpixel -= fwidth; 2263 text--, count++, xpixel -= fwidth;
2256 2264
2257 // force redraw after "careful" characters to avoid pixel droppings 2265 // force redraw after "careful" characters to avoid pixel droppings
2258 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) 2266 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2259 drp[col + i + 1] = ~srp[col + i + 1]; 2267 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2260 2268
2261 // force redraw before "careful" characters to avoid pixel droppings 2269 // force redraw before "careful" characters to avoid pixel droppings
2262 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) 2270 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2263 drp[text - stp - i - 1] = ~srp[text - stp - i - 1]; 2271 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2264#endif 2272#endif
2265 2273
2266 bool invert = rend & RS_RVid; 2274 bool invert = rend & RS_RVid;
2267 2275
2268#ifndef NO_BOLD_UNDERLINE_REVERSE 2276#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2326 * Actually do the drawing of the string here 2334 * Actually do the drawing of the string here
2327 */ 2335 */
2328 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2336 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2329 2337
2330 if (back == fore) 2338 if (back == fore)
2331 font->clear_rect (*drawable, xpixel, ypixel, 2339 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2332 fwidth * count, fheight,
2333 back);
2334 else if (back == Color_bg) 2340 else if (back == Color_bg && have_bg)
2335 { 2341 {
2336 if (must_clear) 2342 // this is very ugly, maybe push it into ->draw?
2337 {
2338 CLEAR_CHARS (xpixel, ypixel, count);
2339 2343
2340 for (i = 0; i < count; i++) /* don't draw empty strings */ 2344 for (i = 0; i < count; i++) /* don't draw empty strings */
2341 if (text[i] != ' ') 2345 if (text[i] != ' ')
2342 { 2346 {
2343 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2347 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2344 break; 2348 goto did_clear;
2345 }
2346 } 2349 }
2347 else 2350
2348 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2351 CLEAR_CHARS (xpixel, ypixel, count);
2352 did_clear: ;
2349 } 2353 }
2350 else 2354 else
2351 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2355 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2352 2356
2353 if (rend & RS_Uline && font->descent > 1 && fore != back) 2357 if (rend & RS_Uline && font->descent > 1 && fore != back)
2354 { 2358 {
2355#if ENABLE_FRILLS 2359#if ENABLE_FRILLS
2356 if (ISSET_PIXCOLOR (Color_underline)) 2360 if (ISSET_PIXCOLOR (Color_underline))
2357 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2361 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2358 else 2362 else
2359#endif 2363#endif
2360 XSetForeground (display->display, gc, pix_colors[fore]); 2364 XSetForeground (dpy, gc, pix_colors[fore]);
2361 2365
2362 XDrawLine (display->display, drawBuffer, gc, 2366 XDrawLine (dpy, drawBuffer, gc,
2363 xpixel, ypixel + font->ascent + 1, 2367 xpixel, ypixel + font->ascent + 1,
2364 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2368 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2365 } 2369 }
2366 } /* for (col....) */ 2370 } /* for (col....) */
2367 } /* for (row....) */ 2371 } /* for (row....) */
… …
2400 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2404 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2401 cursorwidth++; 2405 cursorwidth++;
2402 2406
2403#ifndef NO_CURSORCOLOR 2407#ifndef NO_CURSORCOLOR
2404 if (ISSET_PIXCOLOR (Color_cursor)) 2408 if (ISSET_PIXCOLOR (Color_cursor))
2405 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2409 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2406#endif 2410#endif
2407 2411
2408 XDrawRectangle (display->display, drawBuffer, gc, 2412 XDrawRectangle (dpy, drawBuffer, gc,
2409 Col2Pixel (col), 2413 Col2Pixel (col),
2410 Row2Pixel (oldcursor.row), 2414 Row2Pixel (oldcursor.row),
2411 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2415 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2412 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2416 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2413 } 2417 }
… …
2457#if XPM_BACKGROUND 2461#if XPM_BACKGROUND
2458 && !bgPixmap.pixmap 2462 && !bgPixmap.pixmap
2459#endif 2463#endif
2460 ) 2464 )
2461 { 2465 {
2462 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2466 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2463 XClearWindow (display->display, parent[0]); 2467 XClearWindow (dpy, parent[0]);
2464 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2468 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2465#if HAVE_SCROLLBARS 2469#if HAVE_SCROLLBARS
2466 if (scrollBar.win) 2470 if (scrollBar.win)
2467 { 2471 {
2468 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2472 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2469 scrollBar.setIdle (); 2473 scrollBar.setIdle ();
2470 scrollbar_show (0); 2474 scrollbar_show (0);
2471 } 2475 }
2472#endif 2476#endif
2473 } 2477 }
… …
2486 2490
2487 num_scr_allow = 0; 2491 num_scr_allow = 0;
2488 want_refresh = 1; 2492 want_refresh = 1;
2489 2493
2490 if (really) 2494 if (really)
2491 XClearWindow (display->display, vt); 2495 XClearWindow (dpy, vt);
2492} 2496}
2493 2497
2494void 2498void
2495rxvt_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
2496{ 2500{
… …
2545{ 2549{
2546 if (selection.op 2550 if (selection.op
2547 && current_screen == selection.screen 2551 && current_screen == selection.screen
2548 && selection.end.row >= view_start) 2552 && selection.end.row >= view_start)
2549 { 2553 {
2550#if ENABLE_FRILLS 2554#if !ENABLE_MINIMAL
2551 if (selection.rect) 2555 if (selection.rect)
2552 scr_xor_rect (selection.beg.row, selection.beg.col, 2556 scr_xor_rect (selection.beg.row, selection.beg.col,
2553 selection.end.row, selection.end.col, 2557 selection.end.row, selection.end.col,
2554 RS_RVid, RS_RVid | RS_Uline); 2558 RS_RVid, RS_RVid | RS_Uline);
2555 else 2559 else
… …
2671 } 2675 }
2672 2676
2673 unsigned long bytes_after; 2677 unsigned long bytes_after;
2674 XTextProperty ct; 2678 XTextProperty ct;
2675 2679
2676 if (XGetWindowProperty (display->display, win, prop, 2680 if (XGetWindowProperty (dpy, win, prop,
2677 0, PROP_SIZE / 4, 2681 0, PROP_SIZE / 4,
2678 delete_prop, AnyPropertyType, 2682 delete_prop, AnyPropertyType,
2679 &ct.encoding, &ct.format, 2683 &ct.encoding, &ct.format,
2680 &ct.nitems, &bytes_after, 2684 &ct.nitems, &bytes_after,
2681 &ct.value) != Success) 2685 &ct.value) != Success)
… …
2690 if (bytes_after) 2694 if (bytes_after)
2691 { 2695 {
2692 // fetch and append remaining data 2696 // fetch and append remaining data
2693 XTextProperty ct2; 2697 XTextProperty ct2;
2694 2698
2695 if (XGetWindowProperty (display->display, win, prop, 2699 if (XGetWindowProperty (dpy, win, prop,
2696 ct.nitems / 4, (bytes_after + 3) / 4, 2700 ct.nitems / 4, (bytes_after + 3) / 4,
2697 delete_prop, AnyPropertyType, 2701 delete_prop, AnyPropertyType,
2698 &ct2.encoding, &ct2.format, 2702 &ct2.encoding, &ct2.format,
2699 &ct2.nitems, &bytes_after, 2703 &ct2.nitems, &bytes_after,
2700 &ct2.value) != Success) 2704 &ct2.value) != Success)
… …
2713 2717
2714 if (ct.encoding == xa[XA_INCR]) 2718 if (ct.encoding == xa[XA_INCR])
2715 { 2719 {
2716 // INCR selection, start handshake 2720 // INCR selection, start handshake
2717 if (!delete_prop) 2721 if (!delete_prop)
2718 XDeleteProperty (display->display, win, prop); 2722 XDeleteProperty (dpy, win, prop);
2719 2723
2720 selection_wait = Sel_incr; 2724 selection_wait = Sel_incr;
2721 incr_buf_fill = 0; 2725 incr_buf_fill = 0;
2722 incr_ev.start (NOW + 10); 2726 incr_ev.start (NOW + 10);
2723 2727
… …
2770 } 2774 }
2771 2775
2772 char **cl; 2776 char **cl;
2773 int cr; 2777 int cr;
2774 2778
2775#if ENABLE_FRILLS 2779#if !ENABLE_MINIMAL
2776 // 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
2777 // so recode it manually 2781 // so recode it manually
2778 if (ct.encoding == xa[XA_UTF8_STRING]) 2782 if (ct.encoding == xa[XA_UTF8_STRING])
2779 { 2783 {
2780 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2784 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2784 paste (s, strlen (s)); 2788 paste (s, strlen (s));
2785 free (s); 2789 free (s);
2786 } 2790 }
2787 else 2791 else
2788#endif 2792#endif
2789 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2793 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2790 && cl) 2794 && cl)
2791 { 2795 {
2792 for (int i = 0; i < cr; i++) 2796 for (int i = 0; i < cr; i++)
2793 paste (cl[i], strlen (cl[i])); 2797 paste (cl[i], strlen (cl[i]));
2794 2798
… …
2876 else if (selnum == Sel_Secondary) 2880 else if (selnum == Sel_Secondary)
2877 sel = XA_SECONDARY; 2881 sel = XA_SECONDARY;
2878 else 2882 else
2879 sel = xa[XA_CLIPBOARD]; 2883 sel = xa[XA_CLIPBOARD];
2880 2884
2881 if (XGetSelectionOwner (display->display, sel) != None) 2885 if (XGetSelectionOwner (dpy, sel) != None)
2882 { 2886 {
2883 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2887 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2884 vt, selection_request_time); 2888 vt, selection_request_time);
2885 return 1; 2889 return 1;
2886 } 2890 }
2887 2891
2888 return 0; 2892 return 0;
… …
2951 2955
2952 int end_col; 2956 int end_col;
2953 2957
2954 for (; row <= selection.end.row; row++, col = 0) 2958 for (; row <= selection.end.row; row++, col = 0)
2955 { 2959 {
2956#if ENABLE_FRILLS 2960#if !ENABLE_MINIMAL
2957 if (selection.rect) 2961 if (selection.rect)
2958 { 2962 {
2959 col = selection.beg.col; 2963 col = selection.beg.col;
2960 end_col = ncol + 1; 2964 end_col = ncol + 1;
2961 } 2965 }
… …
2964 end_col = ROW(row).l; 2968 end_col = ROW(row).l;
2965 2969
2966 col = max (col, 0); 2970 col = max (col, 0);
2967 2971
2968 if (row == selection.end.row 2972 if (row == selection.end.row
2969#if ENABLE_FRILLS 2973#if !ENABLE_MINIMAL
2970 || selection.rect 2974 || selection.rect
2971#endif 2975#endif
2972 ) 2976 )
2973 min_it (end_col, selection.end.col); 2977 min_it (end_col, selection.end.col);
2974 2978
… …
2997#endif 3001#endif
2998 else 3002 else
2999 new_selection_text[ofs++] = *t++; 3003 new_selection_text[ofs++] = *t++;
3000 } 3004 }
3001 3005
3002#if ENABLE_FRILLS 3006#if !ENABLE_MINIMAL
3003 if (selection.rect) 3007 if (selection.rect)
3004 { 3008 {
3005 while (ofs 3009 while (ofs
3006 && new_selection_text[ofs - 1] != C0_LF 3010 && new_selection_text[ofs - 1] != C0_LF
3007 && unicode::is_space (new_selection_text[ofs - 1])) 3011 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3041bool 3045bool
3042rxvt_term::selection_grab (Time tm) NOTHROW 3046rxvt_term::selection_grab (Time tm) NOTHROW
3043{ 3047{
3044 selection_time = tm; 3048 selection_time = tm;
3045 3049
3046 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3050 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3047 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3051 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3048 { 3052 {
3049 display->set_selection_owner (this); 3053 display->set_selection_owner (this);
3050 return true; 3054 return true;
3051 } 3055 }
3052 else 3056 else
… …
3056 } 3060 }
3057 3061
3058#if 0 3062#if 0
3059 XTextProperty ct; 3063 XTextProperty ct;
3060 3064
3061 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3065 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3062 { 3066 {
3063 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3067 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3064 XFree (ct.value); 3068 XFree (ct.value);
3065 } 3069 }
3066#endif 3070#endif
… …
3368 3372
3369 if (selection.clicks == 1) 3373 if (selection.clicks == 1)
3370 { 3374 {
3371 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
3372 && !ROW(selection.beg.row).is_longer () 3376 && !ROW(selection.beg.row).is_longer ()
3373#if ENABLE_FRILLS 3377#if !ENABLE_MINIMAL
3374 && !selection.rect 3378 && !selection.rect
3375#endif 3379#endif
3376 ) 3380 )
3377 selection.beg.col = ncol; 3381 selection.beg.col = ncol;
3378 3382
3379 if ( 3383 if (
3380 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3384 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3381 && !ROW(selection.end.row).is_longer () 3385 && !ROW(selection.end.row).is_longer ()
3382#if ENABLE_FRILLS 3386#if !ENABLE_MINIMAL
3383 && !selection.rect 3387 && !selection.rect
3384#endif 3388#endif
3385 ) 3389 )
3386 selection.end.col = ncol; 3390 selection.end.col = ncol;
3387 } 3391 }
… …
3404 { 3408 {
3405 if (!ROW(end_row).is_longer ()) 3409 if (!ROW(end_row).is_longer ())
3406 { 3410 {
3407 selection.end.row = end_row; 3411 selection.end.row = end_row;
3408 selection.end.col = ROW(end_row).l; 3412 selection.end.col = ROW(end_row).l;
3413# if !ENABLE_MINIMAL
3409 selection_remove_trailing_spaces (); 3414 selection_remove_trailing_spaces ();
3415# endif
3410 break; 3416 break;
3411 } 3417 }
3412 } 3418 }
3413 } 3419 }
3414 else 3420 else
… …
3443 selection.mark.row = selection.beg.row; 3449 selection.mark.row = selection.beg.row;
3444 selection.mark.col = selection.beg.col; 3450 selection.mark.col = selection.beg.col;
3445 } 3451 }
3446 } 3452 }
3447 3453
3448#if ENABLE_FRILLS 3454#if !ENABLE_MINIMAL
3449 if (selection.rect && selection.beg.col > selection.end.col) 3455 if (selection.rect && selection.beg.col > selection.end.col)
3450 ::swap (selection.beg.col, selection.end.col); 3456 ::swap (selection.beg.col, selection.end.col);
3451#endif 3457#endif
3452} 3458}
3453 3459
3454#if ENABLE_FRILLS 3460#if !ENABLE_MINIMAL
3455void 3461void
3456rxvt_term::selection_remove_trailing_spaces () NOTHROW 3462rxvt_term::selection_remove_trailing_spaces () NOTHROW
3457{ 3463{
3458 int32_t end_col, end_row; 3464 int32_t end_col, end_row;
3459 text_t *stp; 3465 text_t *stp;
… …
3514 */ 3520 */
3515void 3521void
3516rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3522rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3517{ 3523{
3518 XSelectionEvent ev; 3524 XSelectionEvent ev;
3519 dDisp;
3520 3525
3521 ev.type = SelectionNotify; 3526 ev.type = SelectionNotify;
3522 ev.property = None; 3527 ev.property = None;
3523 ev.display = rq.display; 3528 ev.display = rq.display;
3524 ev.requestor = rq.requestor; 3529 ev.requestor = rq.requestor;
… …
3538 *target++ = xa[XA_COMPOUND_TEXT]; 3543 *target++ = xa[XA_COMPOUND_TEXT];
3539#if X_HAVE_UTF8_STRING 3544#if X_HAVE_UTF8_STRING
3540 *target++ = xa[XA_UTF8_STRING]; 3545 *target++ = xa[XA_UTF8_STRING];
3541#endif 3546#endif
3542 3547
3543 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3548 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3544 32, PropModeReplace, 3549 32, PropModeReplace,
3545 (unsigned char *)target_list, target - target_list); 3550 (unsigned char *)target_list, target - target_list);
3546 ev.property = rq.property; 3551 ev.property = rq.property;
3547 } 3552 }
3548#if TODO // TODO 3553#if TODO // TODO
… …
3551 /* TODO: Handle MULTIPLE */ 3556 /* TODO: Handle MULTIPLE */
3552 } 3557 }
3553#endif 3558#endif
3554 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3559 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3555 { 3560 {
3556 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3561 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3557 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3562 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3558 ev.property = rq.property; 3563 ev.property = rq.property;
3559 } 3564 }
3560 else if (rq.target == XA_STRING 3565 else if (rq.target == XA_STRING
3561 || rq.target == xa[XA_TEXT] 3566 || rq.target == xa[XA_TEXT]
… …
3585 style = enc_string; 3590 style = enc_string;
3586 else if (target == xa[XA_TEXT]) 3591 else if (target == xa[XA_TEXT])
3587 style = enc_text; 3592 style = enc_text;
3588 else if (target == xa[XA_COMPOUND_TEXT]) 3593 else if (target == xa[XA_COMPOUND_TEXT])
3589 style = enc_compound_text; 3594 style = enc_compound_text;
3590#if ENABLE_FRILLS 3595#if !ENABLE_MINIMAL
3591 else if (target == xa[XA_UTF8_STRING]) 3596 else if (target == xa[XA_UTF8_STRING])
3592 style = enc_utf8; 3597 style = enc_utf8;
3593#endif 3598#endif
3594 else 3599 else
3595 { 3600 {
… …
3606 { 3611 {
3607 cl = L""; 3612 cl = L"";
3608 selectlen = 0; 3613 selectlen = 0;
3609 } 3614 }
3610 3615
3611#if ENABLE_FRILLS 3616#if !ENABLE_MINIMAL
3612 // 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
3613 // so recode it manually 3618 // so recode it manually
3614 if (style == enc_utf8) 3619 if (style == enc_utf8)
3615 { 3620 {
3616 freect = 1; 3621 freect = 1;
… …
3619 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3624 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3620 ct.nitems = strlen ((char *)ct.value); 3625 ct.nitems = strlen ((char *)ct.value);
3621 } 3626 }
3622 else 3627 else
3623#endif 3628#endif
3624 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3629 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3625 freect = 1; 3630 freect = 1;
3626 else 3631 else
3627 { 3632 {
3628 /* if we failed to convert then send it raw */ 3633 /* if we failed to convert then send it raw */
3629 ct.value = (unsigned char *)cl; 3634 ct.value = (unsigned char *)cl;
3630 ct.nitems = selectlen; 3635 ct.nitems = selectlen;
3631 ct.encoding = target; 3636 ct.encoding = target;
3632 } 3637 }
3633 3638
3634 XChangeProperty (disp, rq.requestor, rq.property, 3639 XChangeProperty (dpy, rq.requestor, rq.property,
3635 ct.encoding, 8, PropModeReplace, 3640 ct.encoding, 8, PropModeReplace,
3636 ct.value, (int)ct.nitems); 3641 ct.value, (int)ct.nitems);
3637 ev.property = rq.property; 3642 ev.property = rq.property;
3638 3643
3639 if (freect) 3644 if (freect)
3640 XFree (ct.value); 3645 XFree (ct.value);
3641 } 3646 }
3642 3647
3643 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3648 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3644} 3649}
3645 3650
3646/* ------------------------------------------------------------------------- * 3651/* ------------------------------------------------------------------------- *
3647 * MOUSE ROUTINES * 3652 * MOUSE ROUTINES *
3648 * ------------------------------------------------------------------------- */ 3653 * ------------------------------------------------------------------------- */
… …
3664void 3669void
3665rxvt_term::im_set_position (XPoint &pos) NOTHROW 3670rxvt_term::im_set_position (XPoint &pos) NOTHROW
3666{ 3671{
3667 XWindowAttributes xwa; 3672 XWindowAttributes xwa;
3668 3673
3669 XGetWindowAttributes (display->display, vt, &xwa); 3674 XGetWindowAttributes (dpy, vt, &xwa);
3670 3675
3671 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3676 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3672 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3677 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3673} 3678}
3674#endif 3679#endif

Diff Legend

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