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

Diff Legend

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