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.258 by root, Thu Feb 2 18:04:46 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_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/* ------------------------------------------------------------------------- */
… …
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
2150 XCopyArea (display->display, vt, vt, 2154 XCopyArea (dpy, vt, vt,
2151 gc, 0, Row2Pixel (len + i), 2155 gc, 0, Row2Pixel (len + i),
2152 (unsigned int)this->width, 2156 (unsigned int)this->width,
2153 (unsigned int)Height2Pixel (wlen - len + 1), 2157 (unsigned int)Height2Pixel (wlen - len + 1),
2154 0, Row2Pixel (len)); 2158 0, Row2Pixel (len));
2155 len = -1; 2159 len = -1;
… …
2243 2247
2244 // only do special processing if any attributes are set, which is unlikely 2248 // 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)) 2249 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2246 { 2250 {
2247#if ENABLE_STYLES 2251#if ENABLE_STYLES
2248 // force redraw after "careful" characters to avoid pixel droppings 2252 // "careful" (too wide) character handling
2249 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2250 drp[col + 1] = ~srp[col + 1];
2251 2253
2252 // include previous careful character(s) if possible, looks nicer (best effort...) 2254 // include previous careful character(s) if possible, looks nicer (best effort...)
2253 while (text > stp 2255 while (text > stp
2254 && srp[text - stp - 1] & RS_Careful 2256 && srp[text - stp - 1] & RS_Careful
2255 && RS_SAME (rend, srp[text - stp - 1])) 2257 && RS_SAME (rend, srp[text - stp - 1]))
2256 text--, count++, xpixel -= fwidth; 2258 text--, count++, xpixel -= fwidth;
2259
2260 // force redraw after "careful" characters to avoid pixel droppings
2261 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2262 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2263
2264 // force redraw before "careful" characters to avoid pixel droppings
2265 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2266 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2257#endif 2267#endif
2258 2268
2259 bool invert = rend & RS_RVid; 2269 bool invert = rend & RS_RVid;
2260 2270
2261#ifndef NO_BOLD_UNDERLINE_REVERSE 2271#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2319 * Actually do the drawing of the string here 2329 * Actually do the drawing of the string here
2320 */ 2330 */
2321 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2331 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2322 2332
2323 if (back == fore) 2333 if (back == fore)
2324 font->clear_rect (*drawable, xpixel, ypixel, 2334 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2325 fwidth * count, fheight,
2326 back);
2327 else if (back == Color_bg) 2335 else if (back == Color_bg)
2328 { 2336 {
2329 if (must_clear) 2337 if (must_clear)
2330 { 2338 {
2331 CLEAR_CHARS (xpixel, ypixel, count); 2339 CLEAR_CHARS (xpixel, ypixel, count);
… …
2345 2353
2346 if (rend & RS_Uline && font->descent > 1 && fore != back) 2354 if (rend & RS_Uline && font->descent > 1 && fore != back)
2347 { 2355 {
2348#if ENABLE_FRILLS 2356#if ENABLE_FRILLS
2349 if (ISSET_PIXCOLOR (Color_underline)) 2357 if (ISSET_PIXCOLOR (Color_underline))
2350 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2358 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2351 else 2359 else
2352#endif 2360#endif
2353 XSetForeground (display->display, gc, pix_colors[fore]); 2361 XSetForeground (dpy, gc, pix_colors[fore]);
2354 2362
2355 XDrawLine (display->display, drawBuffer, gc, 2363 XDrawLine (dpy, drawBuffer, gc,
2356 xpixel, ypixel + font->ascent + 1, 2364 xpixel, ypixel + font->ascent + 1,
2357 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2365 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2358 } 2366 }
2359 } /* for (col....) */ 2367 } /* for (col....) */
2360 } /* for (row....) */ 2368 } /* for (row....) */
… …
2393 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2401 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2394 cursorwidth++; 2402 cursorwidth++;
2395 2403
2396#ifndef NO_CURSORCOLOR 2404#ifndef NO_CURSORCOLOR
2397 if (ISSET_PIXCOLOR (Color_cursor)) 2405 if (ISSET_PIXCOLOR (Color_cursor))
2398 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2406 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2399#endif 2407#endif
2400 2408
2401 XDrawRectangle (display->display, drawBuffer, gc, 2409 XDrawRectangle (dpy, drawBuffer, gc,
2402 Col2Pixel (col), 2410 Col2Pixel (col),
2403 Row2Pixel (oldcursor.row), 2411 Row2Pixel (oldcursor.row),
2404 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2412 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2405 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2413 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2406 } 2414 }
… …
2450#if XPM_BACKGROUND 2458#if XPM_BACKGROUND
2451 && !bgPixmap.pixmap 2459 && !bgPixmap.pixmap
2452#endif 2460#endif
2453 ) 2461 )
2454 { 2462 {
2455 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2463 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2456 XClearWindow (display->display, parent[0]); 2464 XClearWindow (dpy, parent[0]);
2457 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2465 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2458#if HAVE_SCROLLBARS 2466#if HAVE_SCROLLBARS
2459 if (scrollBar.win) 2467 if (scrollBar.win)
2460 { 2468 {
2461 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2469 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2462 scrollBar.setIdle (); 2470 scrollBar.setIdle ();
2463 scrollbar_show (0); 2471 scrollbar_show (0);
2464 } 2472 }
2465#endif 2473#endif
2466 } 2474 }
… …
2479 2487
2480 num_scr_allow = 0; 2488 num_scr_allow = 0;
2481 want_refresh = 1; 2489 want_refresh = 1;
2482 2490
2483 if (really) 2491 if (really)
2484 XClearWindow (display->display, vt); 2492 XClearWindow (dpy, vt);
2485} 2493}
2486 2494
2487void 2495void
2488rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2496rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2489{ 2497{
… …
2538{ 2546{
2539 if (selection.op 2547 if (selection.op
2540 && current_screen == selection.screen 2548 && current_screen == selection.screen
2541 && selection.end.row >= view_start) 2549 && selection.end.row >= view_start)
2542 { 2550 {
2543#if ENABLE_FRILLS 2551#if !ENABLE_MINIMAL
2544 if (selection.rect) 2552 if (selection.rect)
2545 scr_xor_rect (selection.beg.row, selection.beg.col, 2553 scr_xor_rect (selection.beg.row, selection.beg.col,
2546 selection.end.row, selection.end.col, 2554 selection.end.row, selection.end.col,
2547 RS_RVid, RS_RVid | RS_Uline); 2555 RS_RVid, RS_RVid | RS_Uline);
2548 else 2556 else
… …
2664 } 2672 }
2665 2673
2666 unsigned long bytes_after; 2674 unsigned long bytes_after;
2667 XTextProperty ct; 2675 XTextProperty ct;
2668 2676
2669 if (XGetWindowProperty (display->display, win, prop, 2677 if (XGetWindowProperty (dpy, win, prop,
2670 0, PROP_SIZE / 4, 2678 0, PROP_SIZE / 4,
2671 delete_prop, AnyPropertyType, 2679 delete_prop, AnyPropertyType,
2672 &ct.encoding, &ct.format, 2680 &ct.encoding, &ct.format,
2673 &ct.nitems, &bytes_after, 2681 &ct.nitems, &bytes_after,
2674 &ct.value) != Success) 2682 &ct.value) != Success)
… …
2683 if (bytes_after) 2691 if (bytes_after)
2684 { 2692 {
2685 // fetch and append remaining data 2693 // fetch and append remaining data
2686 XTextProperty ct2; 2694 XTextProperty ct2;
2687 2695
2688 if (XGetWindowProperty (display->display, win, prop, 2696 if (XGetWindowProperty (dpy, win, prop,
2689 ct.nitems / 4, (bytes_after + 3) / 4, 2697 ct.nitems / 4, (bytes_after + 3) / 4,
2690 delete_prop, AnyPropertyType, 2698 delete_prop, AnyPropertyType,
2691 &ct2.encoding, &ct2.format, 2699 &ct2.encoding, &ct2.format,
2692 &ct2.nitems, &bytes_after, 2700 &ct2.nitems, &bytes_after,
2693 &ct2.value) != Success) 2701 &ct2.value) != Success)
… …
2706 2714
2707 if (ct.encoding == xa[XA_INCR]) 2715 if (ct.encoding == xa[XA_INCR])
2708 { 2716 {
2709 // INCR selection, start handshake 2717 // INCR selection, start handshake
2710 if (!delete_prop) 2718 if (!delete_prop)
2711 XDeleteProperty (display->display, win, prop); 2719 XDeleteProperty (dpy, win, prop);
2712 2720
2713 selection_wait = Sel_incr; 2721 selection_wait = Sel_incr;
2714 incr_buf_fill = 0; 2722 incr_buf_fill = 0;
2715 incr_ev.start (NOW + 10); 2723 incr_ev.start (NOW + 10);
2716 2724
… …
2763 } 2771 }
2764 2772
2765 char **cl; 2773 char **cl;
2766 int cr; 2774 int cr;
2767 2775
2768#if ENABLE_FRILLS 2776#if !ENABLE_MINIMAL
2769 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2777 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2770 // so recode it manually 2778 // so recode it manually
2771 if (ct.encoding == xa[XA_UTF8_STRING]) 2779 if (ct.encoding == xa[XA_UTF8_STRING])
2772 { 2780 {
2773 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2781 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2777 paste (s, strlen (s)); 2785 paste (s, strlen (s));
2778 free (s); 2786 free (s);
2779 } 2787 }
2780 else 2788 else
2781#endif 2789#endif
2782 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2790 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2783 && cl) 2791 && cl)
2784 { 2792 {
2785 for (int i = 0; i < cr; i++) 2793 for (int i = 0; i < cr; i++)
2786 paste (cl[i], strlen (cl[i])); 2794 paste (cl[i], strlen (cl[i]));
2787 2795
… …
2869 else if (selnum == Sel_Secondary) 2877 else if (selnum == Sel_Secondary)
2870 sel = XA_SECONDARY; 2878 sel = XA_SECONDARY;
2871 else 2879 else
2872 sel = xa[XA_CLIPBOARD]; 2880 sel = xa[XA_CLIPBOARD];
2873 2881
2874 if (XGetSelectionOwner (display->display, sel) != None) 2882 if (XGetSelectionOwner (dpy, sel) != None)
2875 { 2883 {
2876 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2884 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2877 vt, selection_request_time); 2885 vt, selection_request_time);
2878 return 1; 2886 return 1;
2879 } 2887 }
2880 2888
2881 return 0; 2889 return 0;
… …
2944 2952
2945 int end_col; 2953 int end_col;
2946 2954
2947 for (; row <= selection.end.row; row++, col = 0) 2955 for (; row <= selection.end.row; row++, col = 0)
2948 { 2956 {
2949#if ENABLE_FRILLS 2957#if !ENABLE_MINIMAL
2950 if (selection.rect) 2958 if (selection.rect)
2951 { 2959 {
2952 col = selection.beg.col; 2960 col = selection.beg.col;
2953 end_col = ncol + 1; 2961 end_col = ncol + 1;
2954 } 2962 }
… …
2957 end_col = ROW(row).l; 2965 end_col = ROW(row).l;
2958 2966
2959 col = max (col, 0); 2967 col = max (col, 0);
2960 2968
2961 if (row == selection.end.row 2969 if (row == selection.end.row
2962#if ENABLE_FRILLS 2970#if !ENABLE_MINIMAL
2963 || selection.rect 2971 || selection.rect
2964#endif 2972#endif
2965 ) 2973 )
2966 min_it (end_col, selection.end.col); 2974 min_it (end_col, selection.end.col);
2967 2975
… …
2990#endif 2998#endif
2991 else 2999 else
2992 new_selection_text[ofs++] = *t++; 3000 new_selection_text[ofs++] = *t++;
2993 } 3001 }
2994 3002
2995#if ENABLE_FRILLS 3003#if !ENABLE_MINIMAL
2996 if (selection.rect) 3004 if (selection.rect)
2997 { 3005 {
2998 while (ofs 3006 while (ofs
2999 && new_selection_text[ofs - 1] != C0_LF 3007 && new_selection_text[ofs - 1] != C0_LF
3000 && unicode::is_space (new_selection_text[ofs - 1])) 3008 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3034bool 3042bool
3035rxvt_term::selection_grab (Time tm) NOTHROW 3043rxvt_term::selection_grab (Time tm) NOTHROW
3036{ 3044{
3037 selection_time = tm; 3045 selection_time = tm;
3038 3046
3039 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3047 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3040 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3048 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3041 { 3049 {
3042 display->set_selection_owner (this); 3050 display->set_selection_owner (this);
3043 return true; 3051 return true;
3044 } 3052 }
3045 else 3053 else
… …
3049 } 3057 }
3050 3058
3051#if 0 3059#if 0
3052 XTextProperty ct; 3060 XTextProperty ct;
3053 3061
3054 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3062 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3055 { 3063 {
3056 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3064 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3057 XFree (ct.value); 3065 XFree (ct.value);
3058 } 3066 }
3059#endif 3067#endif
… …
3361 3369
3362 if (selection.clicks == 1) 3370 if (selection.clicks == 1)
3363 { 3371 {
3364 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3372 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3365 && !ROW(selection.beg.row).is_longer () 3373 && !ROW(selection.beg.row).is_longer ()
3366#if ENABLE_FRILLS 3374#if !ENABLE_MINIMAL
3367 && !selection.rect 3375 && !selection.rect
3368#endif 3376#endif
3369 ) 3377 )
3370 selection.beg.col = ncol; 3378 selection.beg.col = ncol;
3371 3379
3372 if ( 3380 if (
3373 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3381 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3374 && !ROW(selection.end.row).is_longer () 3382 && !ROW(selection.end.row).is_longer ()
3375#if ENABLE_FRILLS 3383#if !ENABLE_MINIMAL
3376 && !selection.rect 3384 && !selection.rect
3377#endif 3385#endif
3378 ) 3386 )
3379 selection.end.col = ncol; 3387 selection.end.col = ncol;
3380 } 3388 }
… …
3397 { 3405 {
3398 if (!ROW(end_row).is_longer ()) 3406 if (!ROW(end_row).is_longer ())
3399 { 3407 {
3400 selection.end.row = end_row; 3408 selection.end.row = end_row;
3401 selection.end.col = ROW(end_row).l; 3409 selection.end.col = ROW(end_row).l;
3410# if !ENABLE_MINIMAL
3402 selection_remove_trailing_spaces (); 3411 selection_remove_trailing_spaces ();
3412# endif
3403 break; 3413 break;
3404 } 3414 }
3405 } 3415 }
3406 } 3416 }
3407 else 3417 else
… …
3436 selection.mark.row = selection.beg.row; 3446 selection.mark.row = selection.beg.row;
3437 selection.mark.col = selection.beg.col; 3447 selection.mark.col = selection.beg.col;
3438 } 3448 }
3439 } 3449 }
3440 3450
3441#if ENABLE_FRILLS 3451#if !ENABLE_MINIMAL
3442 if (selection.rect && selection.beg.col > selection.end.col) 3452 if (selection.rect && selection.beg.col > selection.end.col)
3443 ::swap (selection.beg.col, selection.end.col); 3453 ::swap (selection.beg.col, selection.end.col);
3444#endif 3454#endif
3445} 3455}
3446 3456
3447#if ENABLE_FRILLS 3457#if !ENABLE_MINIMAL
3448void 3458void
3449rxvt_term::selection_remove_trailing_spaces () NOTHROW 3459rxvt_term::selection_remove_trailing_spaces () NOTHROW
3450{ 3460{
3451 int32_t end_col, end_row; 3461 int32_t end_col, end_row;
3452 text_t *stp; 3462 text_t *stp;
… …
3507 */ 3517 */
3508void 3518void
3509rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3519rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3510{ 3520{
3511 XSelectionEvent ev; 3521 XSelectionEvent ev;
3512 dDisp;
3513 3522
3514 ev.type = SelectionNotify; 3523 ev.type = SelectionNotify;
3515 ev.property = None; 3524 ev.property = None;
3516 ev.display = rq.display; 3525 ev.display = rq.display;
3517 ev.requestor = rq.requestor; 3526 ev.requestor = rq.requestor;
… …
3531 *target++ = xa[XA_COMPOUND_TEXT]; 3540 *target++ = xa[XA_COMPOUND_TEXT];
3532#if X_HAVE_UTF8_STRING 3541#if X_HAVE_UTF8_STRING
3533 *target++ = xa[XA_UTF8_STRING]; 3542 *target++ = xa[XA_UTF8_STRING];
3534#endif 3543#endif
3535 3544
3536 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3545 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3537 32, PropModeReplace, 3546 32, PropModeReplace,
3538 (unsigned char *)target_list, target - target_list); 3547 (unsigned char *)target_list, target - target_list);
3539 ev.property = rq.property; 3548 ev.property = rq.property;
3540 } 3549 }
3541#if TODO // TODO 3550#if TODO // TODO
… …
3544 /* TODO: Handle MULTIPLE */ 3553 /* TODO: Handle MULTIPLE */
3545 } 3554 }
3546#endif 3555#endif
3547 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3556 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3548 { 3557 {
3549 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3558 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3550 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3559 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3551 ev.property = rq.property; 3560 ev.property = rq.property;
3552 } 3561 }
3553 else if (rq.target == XA_STRING 3562 else if (rq.target == XA_STRING
3554 || rq.target == xa[XA_TEXT] 3563 || rq.target == xa[XA_TEXT]
… …
3578 style = enc_string; 3587 style = enc_string;
3579 else if (target == xa[XA_TEXT]) 3588 else if (target == xa[XA_TEXT])
3580 style = enc_text; 3589 style = enc_text;
3581 else if (target == xa[XA_COMPOUND_TEXT]) 3590 else if (target == xa[XA_COMPOUND_TEXT])
3582 style = enc_compound_text; 3591 style = enc_compound_text;
3583#if ENABLE_FRILLS 3592#if !ENABLE_MINIMAL
3584 else if (target == xa[XA_UTF8_STRING]) 3593 else if (target == xa[XA_UTF8_STRING])
3585 style = enc_utf8; 3594 style = enc_utf8;
3586#endif 3595#endif
3587 else 3596 else
3588 { 3597 {
… …
3599 { 3608 {
3600 cl = L""; 3609 cl = L"";
3601 selectlen = 0; 3610 selectlen = 0;
3602 } 3611 }
3603 3612
3604#if ENABLE_FRILLS 3613#if !ENABLE_MINIMAL
3605 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3614 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3606 // so recode it manually 3615 // so recode it manually
3607 if (style == enc_utf8) 3616 if (style == enc_utf8)
3608 { 3617 {
3609 freect = 1; 3618 freect = 1;
… …
3612 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3621 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3613 ct.nitems = strlen ((char *)ct.value); 3622 ct.nitems = strlen ((char *)ct.value);
3614 } 3623 }
3615 else 3624 else
3616#endif 3625#endif
3617 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3626 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3618 freect = 1; 3627 freect = 1;
3619 else 3628 else
3620 { 3629 {
3621 /* if we failed to convert then send it raw */ 3630 /* if we failed to convert then send it raw */
3622 ct.value = (unsigned char *)cl; 3631 ct.value = (unsigned char *)cl;
3623 ct.nitems = selectlen; 3632 ct.nitems = selectlen;
3624 ct.encoding = target; 3633 ct.encoding = target;
3625 } 3634 }
3626 3635
3627 XChangeProperty (disp, rq.requestor, rq.property, 3636 XChangeProperty (dpy, rq.requestor, rq.property,
3628 ct.encoding, 8, PropModeReplace, 3637 ct.encoding, 8, PropModeReplace,
3629 ct.value, (int)ct.nitems); 3638 ct.value, (int)ct.nitems);
3630 ev.property = rq.property; 3639 ev.property = rq.property;
3631 3640
3632 if (freect) 3641 if (freect)
3633 XFree (ct.value); 3642 XFree (ct.value);
3634 } 3643 }
3635 3644
3636 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3645 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3637} 3646}
3638 3647
3639/* ------------------------------------------------------------------------- * 3648/* ------------------------------------------------------------------------- *
3640 * MOUSE ROUTINES * 3649 * MOUSE ROUTINES *
3641 * ------------------------------------------------------------------------- */ 3650 * ------------------------------------------------------------------------- */
… …
3657void 3666void
3658rxvt_term::im_set_position (XPoint &pos) NOTHROW 3667rxvt_term::im_set_position (XPoint &pos) NOTHROW
3659{ 3668{
3660 XWindowAttributes xwa; 3669 XWindowAttributes xwa;
3661 3670
3662 XGetWindowAttributes (display->display, vt, &xwa); 3671 XGetWindowAttributes (dpy, vt, &xwa);
3663 3672
3664 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3673 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3665 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3674 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3666} 3675}
3667#endif 3676#endif
… …
3763rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3772rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3764{ 3773{
3765 while (*s) 3774 while (*s)
3766 { 3775 {
3767 text_t t = *s++; 3776 text_t t = *s++;
3768 int width = wcwidth (t); 3777 int width = WCWIDTH (t);
3769 3778
3770 while (width--) 3779 while (width--)
3771 { 3780 {
3772 scr_overlay_set (x++, y, t); 3781 scr_overlay_set (x++, y, t);
3773 t = NOCHAR; 3782 t = NOCHAR;

Diff Legend

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