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.13 by pcg, Wed Dec 24 09:22:29 2003 UTC vs.
Revision 1.20 by pcg, Fri Jan 30 15:58:07 2004 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.c 2 * File: screen.c
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * $Id: screen.C,v 1.13 2003/12/24 09:22:29 pcg Exp $
5 * 4 *
6 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
7 * 6 *
8 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
… …
447 /* then so is screen.rend[i] */ 446 /* then so is screen.rend[i] */
448 assert(screen.rend[i]); 447 assert(screen.rend[i]);
449 } 448 }
450#endif 449#endif
451 450
452 delete talloc; 451 delete talloc; talloc = 0;
453 delete ralloc; 452 delete ralloc; ralloc = 0;
454 453
455 free (screen.text); 454 free (screen.text);
456 free (screen.tlen); 455 free (screen.tlen);
457 free (screen.rend); 456 free (screen.rend);
458 free (drawn_text); 457 free (drawn_text);
… …
899 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break; 898 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break;
900 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; 899 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
901 } 900 }
902 901
903 rend_t rend = SET_FONT (R->rstyle, R->TermWin.fontset->find_font (c)); 902 rend_t rend = SET_FONT (R->rstyle, R->TermWin.fontset->find_font (c));
904
905 stp[R->screen.cur.col] = c;
906 srp[R->screen.cur.col] = rend;
907
908 if (c > 255)
909 {
910 // rely on wcwidth to tell us the character width, at least for non iso-8859-1 903 // rely on wcwidth to tell us the character width, at least for non-ascii
911 int width = wcwidth (c); 904 int width = c <= 128 ? 1 : wcwidth (c);
905
906 // width -1 characters (e.g. combining chars) are ignored currently.
907 if (width > 0)
908 do
912 909 {
913 if (width > 1) 910 stp[R->screen.cur.col] = c;
914 {
915 while (--width > 0 && R->screen.cur.col < last_col - 1)
916 {
917
918 srp[R->screen.cur.col] |= RS_wide; 911 srp[R->screen.cur.col] = rend;
919 912
913 if (R->screen.cur.col < last_col - 1)
920 R->screen.cur.col++; 914 R->screen.cur.col++;
921 stp[R->screen.cur.col] = NOCHAR; 915 else
922 srp[R->screen.cur.col] = rend;
923 } 916 {
924 }
925 }
926
927 if (R->screen.cur.col < last_col - 1)
928 R->screen.cur.col++;
929 else {
930 R->screen.tlen[row] = last_col; 917 R->screen.tlen[row] = last_col;
931 if (R->screen.flags & Screen_Autowrap) 918 if (R->screen.flags & Screen_Autowrap)
932 R->screen.flags |= Screen_WrapNext; 919 R->screen.flags |= Screen_WrapNext;
920 break;
921 }
922
923 c = NOCHAR;
933 } 924 }
925 while (--width > 0);
926 else
927 1; /* handle combining character etc. here. */
934 } 928 }
929
935 if (R->screen.tlen[row] != -1) /* XXX: think about this */ 930 if (R->screen.tlen[row] != -1) /* XXX: think about this */
936 MAX_IT(R->screen.tlen[row], R->screen.cur.col); 931 MAX_IT(R->screen.tlen[row], R->screen.cur.col);
937 932
938/* 933/*
939 * If we wrote anywhere in the selected area, kill the selection 934 * If we wrote anywhere in the selected area, kill the selection
940 * XXX: should we kill the mark too? Possibly, but maybe that 935 * XXX: should we kill the mark too? Possibly, but maybe that
941 * should be a similar check. 936 * should be a similar check.
… …
1650 rxvt_set_font_style(aR); 1645 rxvt_set_font_style(aR);
1651} 1646}
1652 1647
1653 1648
1654/* ------------------------------------------------------------------------- * 1649/* ------------------------------------------------------------------------- *
1655 * GRAPHICS COLOURS *
1656 * ------------------------------------------------------------------------- */
1657
1658#ifdef RXVT_GRAPHICS
1659/* EXTPROTO */
1660int
1661rxvt_scr_get_fgcolor(pR)
1662{
1663 return GET_FGCOLOR(R->rstyle);
1664}
1665
1666/* ------------------------------------------------------------------------- */
1667/* EXTPROTO */
1668int
1669rxvt_scr_get_bgcolor(pR)
1670{
1671 return GET_BGCOLOR(R->rstyle);
1672}
1673#endif
1674
1675/* ------------------------------------------------------------------------- *
1676 * MAJOR SCREEN MANIPULATION * 1650 * MAJOR SCREEN MANIPULATION *
1677 * ------------------------------------------------------------------------- */ 1651 * ------------------------------------------------------------------------- */
1652
1653/*
1654 * refresh matching text.
1655 */
1656bool
1657rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1658{
1659 bool found = false;
1660
1661 for (int i = 0; i < TermWin.nrow; i++)
1662 {
1663 int col = 0;
1664 rend_t *drp = drawn_rend [i];
1665
1666 for (; col < TermWin.ncol; col++, drp++)
1667 if ((*drp & mask) == value)
1668 {
1669 found = true;
1670 *drp = ~value;
1671 }
1672 }
1673
1674 return found;
1675}
1678 1676
1679/* 1677/*
1680 * Refresh an area 1678 * Refresh an area
1681 */ 1679 */
1682enum { 1680enum {
… …
1859 * Refresh the screen 1857 * Refresh the screen
1860 * R->drawn_text/R->drawn_rend contain the screen information before the update. 1858 * R->drawn_text/R->drawn_rend contain the screen information before the update.
1861 * R->screen.text/R->screen.rend contain what the screen will change to. 1859 * R->screen.text/R->screen.rend contain what the screen will change to.
1862 */ 1860 */
1863 1861
1864#if defined (NO_BRIGHTCOLOR) || defined (VERYBOLD)
1865# define MONO_BOLD(x) ((x) & (RS_Bold|RS_Blink))
1866# define MONO_BOLD_FG(x, fg) MONO_BOLD(x)
1867#else
1868# define MONO_BOLD(x) \
1869 (((x) & (RS_Bold | RS_fgMask)) == (RS_Bold | Color_fg))
1870# define MONO_BOLD_FG(x, fg) (((x) & RS_Bold) && (fg) == Color_fg)
1871#endif
1872
1873#define FONT_WIDTH(X, Y) \ 1862#define FONT_WIDTH(X, Y) \
1874 (X)->per_char[(Y) - (X)->min_char_or_byte2].width 1863 (X)->per_char[(Y) - (X)->min_char_or_byte2].width
1875#define FONT_RBEAR(X, Y) \ 1864#define FONT_RBEAR(X, Y) \
1876 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing 1865 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing
1877#define FONT_LBEAR(X, Y) \ 1866#define FONT_LBEAR(X, Y) \
… …
1883rxvt_term::scr_refresh (unsigned char refresh_type) 1872rxvt_term::scr_refresh (unsigned char refresh_type)
1884{ 1873{
1885 unsigned char clearfirst, /* first character writes before cell */ 1874 unsigned char clearfirst, /* first character writes before cell */
1886 clearlast, /* last character writes beyond cell */ 1875 clearlast, /* last character writes beyond cell */
1887 must_clear, /* use draw_string not draw_image_string */ 1876 must_clear, /* use draw_string not draw_image_string */
1888#ifndef NO_BOLDFONT
1889 bfont, /* we've changed font to bold font */
1890#endif
1891 rvid, /* reverse video this position */ 1877 rvid, /* reverse video this position */
1892 wbyte, /* we're in multibyte */
1893 showcursor; /* show the cursor */ 1878 showcursor; /* show the cursor */
1894 int fore, back; /* desired foreground/background */
1895 int16_t col, row, /* column/row we're processing */ 1879 int16_t col, row, /* column/row we're processing */
1896 ocrow; /* old cursor row */ 1880 ocrow; /* old cursor row */
1897 int cursorwidth; 1881 int cursorwidth;
1898 int i, /* tmp */ 1882 int i, /* tmp */
1899 row_offset; /* basic offset in screen structure */ 1883 row_offset; /* basic offset in screen structure */
… …
1908 return; 1892 return;
1909 1893
1910 /* 1894 /*
1911 * A: set up vars 1895 * A: set up vars
1912 */ 1896 */
1913 clearfirst = clearlast = must_clear = wbyte = 0; 1897 clearfirst = clearlast = must_clear = 0;
1914#ifndef NO_BOLDFONT
1915 bfont = 0;
1916#endif
1917
1918 if (currmaxcol < TermWin.ncol)
1919 {
1920 currmaxcol = TermWin.ncol;
1921 buffer = (char *)rxvt_realloc (buffer,
1922 sizeof(char) * (currmaxcol + 1) * MB_CUR_MAX);
1923 }
1924 1898
1925 refresh_count = 0; 1899 refresh_count = 0;
1926 1900
1927 row_offset = TermWin.saveLines - TermWin.view_start; 1901 row_offset = TermWin.saveLines - TermWin.view_start;
1928 1902
… …
1972 if (showcursor && TermWin.focus) 1946 if (showcursor && TermWin.focus)
1973 { 1947 {
1974 *srp ^= RS_RVid; 1948 *srp ^= RS_RVid;
1975#ifndef NO_CURSORCOLOR 1949#ifndef NO_CURSORCOLOR
1976 cc1 = *srp & (RS_fgMask | RS_bgMask); 1950 cc1 = *srp & (RS_fgMask | RS_bgMask);
1977 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_cursor)) 1951 if (ISSET_PIXCOLOR (this, Color_cursor))
1978 ccol1 = Color_cursor; 1952 ccol1 = Color_cursor;
1979 else 1953 else
1980#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 1954#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1981 ccol1 = GET_FGCOLOR(rstyle); 1955 ccol1 = GET_FGCOLOR(rstyle);
1982#else 1956#else
1983 ccol1 = Color_fg; 1957 ccol1 = Color_fg;
1984#endif 1958#endif
1985 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_cursor2)) 1959 if (ISSET_PIXCOLOR (this, Color_cursor2))
1986 ccol2 = Color_cursor2; 1960 ccol2 = Color_cursor2;
1987 else 1961 else
1988#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 1962#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1989 ccol2 = GET_BGCOLOR(rstyle); 1963 ccol2 = GET_BGCOLOR(rstyle);
1990#else 1964#else
… …
1992#endif 1966#endif
1993 *srp = SET_FGCOLOR(*srp, ccol1); 1967 *srp = SET_FGCOLOR(*srp, ccol1);
1994 *srp = SET_BGCOLOR(*srp, ccol2); 1968 *srp = SET_BGCOLOR(*srp, ccol2);
1995#endif 1969#endif
1996 } 1970 }
1997
1998 while (IS_WIDE (*srp))
1999 cursorwidth++, srp++;
2000 } 1971 }
2001 1972
2002 /* make sure no outline cursor is left around */ 1973 /* make sure no outline cursor is left around */
2003 setoldcursor = 0; 1974 setoldcursor = 0;
2004 if (ocrow != -1) { 1975 if (ocrow != -1) {
… …
2147 i++; 2118 i++;
2148 2119
2149 continue; 2120 continue;
2150 } 2121 }
2151 2122
2152 if (((rend ^ srp[col]) & ~RS_wide) != 0) 2123 if (rend != srp[col])
2153 break; 2124 break;
2154 2125
2155 count++; 2126 count++;
2156 2127
2157 if (stp[col] != dtp[col] 2128 if (stp[col] != dtp[col]
… …
2172 count -= i; /* dump any matching trailing chars */ 2143 count -= i; /* dump any matching trailing chars */
2173 2144
2174 /* 2145 /*
2175 * Determine the attributes for the string 2146 * Determine the attributes for the string
2176 */ 2147 */
2177 int fid = GET_FONT(rend); 2148 int fid = GET_FONT (rend);
2178 fore = GET_FGCOLOR(rend); 2149 int fore = GET_FGCOLOR (rend); // desired foreground
2179 back = GET_BGCOLOR(rend); 2150 int back = GET_BGCOLOR (rend); // desired background
2151
2180 rend = GET_ATTR(rend); 2152 rend = GET_ATTR (rend);
2181 2153
2182 rvid = (rend & RS_RVid) ? 1 : 0; 2154 rvid = !!(rend & RS_RVid);
2183#ifdef OPTION_HC 2155#ifdef TEXT_BLINK
2184 if (!rvid && (rend & RS_Blink)) 2156 if (rend & RS_Blink)
2185 { 2157 {
2186 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_HC)) 2158 if (!text_blink_ev.active)
2187 back = Color_HC;
2188 else 2159 {
2189 rvid = !rvid; /* fall back */ 2160 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2161 hidden_text = 0;
2162 }
2163 else if (hidden_text)
2164 fore = back;
2190 } 2165 }
2191#endif 2166#endif
2192 if (rvid) 2167 if (rvid)
2193 { 2168 {
2194 SWAP_IT(fore, back, int); 2169 SWAP_IT(fore, back, int);
2195 2170
2196#ifndef NO_BOLD_UNDERLINE_REVERSE 2171#ifndef NO_BOLD_UNDERLINE_REVERSE
2197 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_RV) 2172 if (ISSET_PIXCOLOR (this, Color_RV)
2198# ifndef NO_CURSORCOLOR 2173# ifndef NO_CURSORCOLOR
2199 && !ISSET_PIXCOLOR (this, Color_cursor) 2174 && !ISSET_PIXCOLOR (this, Color_cursor)
2200# endif 2175# endif
2201 ) 2176 )
2202 back = Color_RV; 2177 back = Color_RV;
2203#endif 2178#endif
2204 } 2179 }
2205#ifndef NO_BOLD_UNDERLINE_REVERSE 2180#ifndef NO_BOLD_UNDERLINE_REVERSE
2206 else if (rend & RS_Bold) 2181 else if (rend & RS_Bold)
2207 { 2182 {
2208 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_BD)) 2183 if (ISSET_PIXCOLOR (this, Color_BD))
2209 {
2210 fore = Color_BD; 2184 fore = Color_BD;
2211# ifndef VERYBOLD 2185 else if (fore == Color_fg)
2212 rend &= ~RS_Bold; /* we've taken care of it */ 2186 fore = Color_White;
2213# endif
2214 }
2215 } 2187 }
2216 else if (rend & RS_Uline) 2188 else if (rend & RS_Uline)
2217 { 2189 {
2218 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_UL)) 2190 if (ISSET_PIXCOLOR (this, Color_UL))
2219 {
2220 fore = Color_UL; 2191 fore = Color_UL;
2221 rend &= ~RS_Uline; /* we've taken care of it */
2222 }
2223 } 2192 }
2224#endif 2193#endif
2225 2194
2226 /* 2195 /*
2227 * Actually do the drawing of the string here 2196 * Actually do the drawing of the string here
… …
2268#endif 2237#endif
2269 } else if (oldcursor.row >= 0) { 2238 } else if (oldcursor.row >= 0) {
2270#ifndef NO_CURSORCOLOR 2239#ifndef NO_CURSORCOLOR
2271 unsigned long gcmask; /* Graphics Context mask */ 2240 unsigned long gcmask; /* Graphics Context mask */
2272 2241
2273 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_cursor)) 2242 if (ISSET_PIXCOLOR (this, Color_cursor))
2274 XSetForeground (Xdisplay, TermWin.gc, PixColors[Color_cursor]); 2243 XSetForeground (Xdisplay, TermWin.gc, PixColors[Color_cursor]);
2275#endif 2244#endif
2276 XDrawRectangle(Xdisplay, drawBuffer, TermWin.gc, 2245 XDrawRectangle(Xdisplay, drawBuffer, TermWin.gc,
2277 Col2Pixel(oldcursor.col), 2246 Col2Pixel(oldcursor.col),
2278 Row2Pixel(oldcursor.row), 2247 Row2Pixel(oldcursor.row),
… …
2361 i = end_row; 2330 i = end_row;
2362 } 2331 }
2363 end_row += R->TermWin.nrow; 2332 end_row += R->TermWin.nrow;
2364 for (; i < row && i < end_row; i++, col = 0) 2333 for (; i < row && i < end_row; i++, col = 0)
2365 for (srp = R->screen.rend[i]; col < R->TermWin.ncol; col++) 2334 for (srp = R->screen.rend[i]; col < R->TermWin.ncol; col++)
2366#ifndef OPTION_HC
2367 srp[col] ^= RS_RVid; 2335 srp[col] ^= RS_RVid;
2368#else
2369 srp[col] ^= RS_Blink;
2370#endif
2371 if (i == row && i < end_row) 2336 if (i == row && i < end_row)
2372 for (srp = R->screen.rend[i]; col < R->selection.end.col; col++) 2337 for (srp = R->screen.rend[i]; col < R->selection.end.col; col++)
2373#ifndef OPTION_HC
2374 srp[col] ^= RS_RVid; 2338 srp[col] ^= RS_RVid;
2375#else
2376 srp[col] ^= RS_Blink;
2377#endif
2378 } 2339 }
2379} 2340}
2380 2341
2381/* ------------------------------------------------------------------------- */ 2342/* ------------------------------------------------------------------------- */
2382/* 2343/*
… …
2488rxvt_selection_paste(pR_ Window win, Atom prop, Bool delete_prop) 2449rxvt_selection_paste(pR_ Window win, Atom prop, Bool delete_prop)
2489{ 2450{
2490 long nread = 0; 2451 long nread = 0;
2491 unsigned long bytes_after; 2452 unsigned long bytes_after;
2492 XTextProperty ct; 2453 XTextProperty ct;
2493 int dummy_count;
2494 char **cl;
2495 2454
2496 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, R->selection_wait)); 2455 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, R->selection_wait));
2497 2456
2498 if (prop == None) /* check for failed XConvertSelection */ 2457 if (prop == None) /* check for failed XConvertSelection */
2499 { 2458 {
… …
2502 int selnum = R->selection_type & Sel_whereMask; 2461 int selnum = R->selection_type & Sel_whereMask;
2503 2462
2504 R->selection_type = 0; 2463 R->selection_type = 0;
2505 if (selnum != Sel_direct) 2464 if (selnum != Sel_direct)
2506 rxvt_selection_request_other(aR_ XA_STRING, selnum); 2465 rxvt_selection_request_other(aR_ XA_STRING, selnum);
2466 }
2467
2468 if ((R->selection_type & Sel_UTF8String))
2469 {
2470 int selnum = R->selection_type & Sel_whereMask;
2471
2472 R->selection_type = Sel_CompoundText;
2473 if (selnum != Sel_direct)
2474 rxvt_selection_request_other(aR_ R->xa[XA_COMPOUND_TEXT], selnum);
2475 else
2476 R->selection_type = 0;
2507 } 2477 }
2508 2478
2509 return 0; 2479 return 0;
2510 } 2480 }
2511 2481
… …
2546 nread = -1; /* discount any previous stuff */ 2516 nread = -1; /* discount any previous stuff */
2547 break; 2517 break;
2548 } 2518 }
2549 2519
2550 nread += ct.nitems; 2520 nread += ct.nitems;
2521
2522 char **cl;
2523 int cr;
2551 if (XmbTextPropertyToTextList (R->Xdisplay, &ct, &cl, 2524 if (XmbTextPropertyToTextList (R->Xdisplay, &ct, &cl,
2552 &dummy_count) == Success && cl) 2525 &cr) >= 0 && cl)
2553 { 2526 {
2527 for (int i = 0; i < cr; i++)
2554 R->paste ((unsigned char *)cl[0], STRLEN (cl[0])); 2528 R->paste ((unsigned char *)cl[i], STRLEN (cl[i]));
2529
2555 XFreeStringList (cl); 2530 XFreeStringList (cl);
2556 } 2531 }
2557 else 2532 else
2558 R->paste (ct.value, ct.nitems); 2533 R->paste (ct.value, ct.nitems);
2559 2534
… …
2574} 2549}
2575 2550
2576void 2551void
2577rxvt_term::incr_cb (time_watcher &w) 2552rxvt_term::incr_cb (time_watcher &w)
2578{ 2553{
2579 w.stop ();
2580 selection_wait = Sel_none; 2554 selection_wait = Sel_none;
2581 2555
2582 rxvt_print_error("data loss: timeout on INCR selection paste"); 2556 rxvt_print_error ("data loss: timeout on INCR selection paste");
2583} 2557}
2584 2558
2585/* 2559/*
2586 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2560 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2587 */ 2561 */
… …
2653 int i; 2627 int i;
2654 2628
2655 R->selection_request_time = tm; 2629 R->selection_request_time = tm;
2656 R->selection_wait = Sel_normal; 2630 R->selection_wait = Sel_normal;
2657 for (i = Sel_Primary; i <= Sel_Clipboard; i++) { 2631 for (i = Sel_Primary; i <= Sel_Clipboard; i++) {
2632#if X_HAVE_UTF8_STRING
2633 R->selection_type = Sel_UTF8String;
2634 if (rxvt_selection_request_other(aR_ R->xa[XA_UTF8_STRING], i))
2635 return;
2636#else
2658 R->selection_type = Sel_CompoundText; 2637 R->selection_type = Sel_CompoundText;
2659 if (rxvt_selection_request_other(aR_ R->xa[XA_COMPOUND_TEXT], i)) 2638 if (rxvt_selection_request_other(aR_ R->xa[XA_COMPOUND_TEXT], i))
2660 return; 2639 return;
2640#endif
2661 } 2641 }
2662 } 2642 }
2663 R->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ 2643 R->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */
2664 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2644 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2665 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); 2645 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False);
… …
2797 { 2777 {
2798 free (new_selection_text); 2778 free (new_selection_text);
2799 return; 2779 return;
2800 } 2780 }
2801 2781
2802 // due to MB_MAX_CUR, selection wastage is usually high 2782 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2803 if (str - (char *)new_selection_text > 1024) 2783 if (str - (char *)new_selection_text > 1024)
2804 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1); 2784 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2805 2785
2806 R->selection.len = i; 2786 R->selection.len = i;
2787
2807 if (R->selection.text) 2788 if (R->selection.text)
2808 free (R->selection.text); 2789 free (R->selection.text);
2809 2790
2810 R->selection.text = new_selection_text; 2791 R->selection.text = new_selection_text;
2811 2792
2812 XSetSelectionOwner(R->Xdisplay, XA_PRIMARY, R->TermWin.vt, tm); 2793 XSetSelectionOwner(R->Xdisplay, XA_PRIMARY, R->TermWin.vt, tm);
2813 if (XGetSelectionOwner(R->Xdisplay, XA_PRIMARY) != R->TermWin.vt) 2794 if (XGetSelectionOwner(R->Xdisplay, XA_PRIMARY) != R->TermWin.vt)
2814 rxvt_print_error("can't get primary selection"); 2795 rxvt_print_error("can't get primary selection");
2796
2797
2798 {
2799 XTextProperty ct;
2800 char *cl = (char *)R->selection.text;
2801
2802 if (XmbTextListToTextProperty(R->Xdisplay, &cl, 1, XStringStyle, &ct) >= 0)
2803 {
2804 XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8,
2805 PropModeReplace, ct.value, ct.nitems);
2806 XFree (ct.value);
2807 }
2808 else
2815 XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, 2809 XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8,
2816 PropModeReplace, R->selection.text, (int)R->selection.len); 2810 PropModeReplace, R->selection.text, (int)R->selection.len);
2811 }
2812
2817 R->selection_time = tm; 2813 R->selection_time = tm;
2818 D_SELECT((stderr, "rxvt_selection_make(): R->selection.len=%d", R->selection.len)); 2814 D_SELECT((stderr, "rxvt_selection_make(): R->selection.len=%d", R->selection.len));
2819} 2815}
2820 2816
2821/* ------------------------------------------------------------------------- */ 2817/* ------------------------------------------------------------------------- */
… …
3273/* 3269/*
3274 * On some systems, the Atom typedef is 64 bits wide. We need to have a type 3270 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3275 * that is exactly 32 bits wide, because a format of 64 is not allowed by 3271 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3276 * the X11 protocol. 3272 * the X11 protocol.
3277 */ 3273 */
3278typedef CARD32 Atom32; 3274typedef CARD32 Atom32;
3279 3275
3280/* ------------------------------------------------------------------------- */ 3276/* ------------------------------------------------------------------------- */
3281/* 3277/*
3282 * Respond to a request for our current selection 3278 * Respond to a request for our current selection
3283 * EXT: SelectionRequest 3279 * EXT: SelectionRequest
… …
3285/* EXTPROTO */ 3281/* EXTPROTO */
3286void 3282void
3287rxvt_selection_send(pR_ const XSelectionRequestEvent *rq) 3283rxvt_selection_send(pR_ const XSelectionRequestEvent *rq)
3288{ 3284{
3289 XSelectionEvent ev; 3285 XSelectionEvent ev;
3290#ifdef USE_XIM
3291 Atom32 target_list[4];
3292#else
3293 Atom32 target_list[3];
3294#endif
3295 Atom target;
3296 XTextProperty ct; 3286 XTextProperty ct;
3297 XICCEncodingStyle style; 3287 XICCEncodingStyle style;
3298 char *cl[2], dummy[1]; 3288 Atom target;
3299 3289
3300 ev.type = SelectionNotify; 3290 ev.type = SelectionNotify;
3301 ev.property = None; 3291 ev.property = None;
3302 ev.display = rq->display; 3292 ev.display = rq->display;
3303 ev.requestor = rq->requestor; 3293 ev.requestor = rq->requestor;
3304 ev.selection = rq->selection; 3294 ev.selection = rq->selection;
3305 ev.target = rq->target; 3295 ev.target = rq->target;
3306 ev.time = rq->time; 3296 ev.time = rq->time;
3307 3297
3308 if (rq->target == R->xa[XA_TARGETS]) { 3298 if (rq->target == R->xa[XA_TARGETS]) {
3299 Atom32 target_list[5];
3300 Atom32 *target = target_list;
3301
3309 target_list[0] = (Atom32) R->xa[XA_TARGETS]; 3302 *target++ = (Atom32) R->xa[XA_TARGETS];
3310 target_list[1] = (Atom32) XA_STRING; 3303 *target++ = (Atom32) XA_STRING;
3311 target_list[2] = (Atom32) R->xa[XA_TEXT]; 3304 *target++ = (Atom32) R->xa[XA_TEXT];
3312#ifdef USE_XIM
3313 target_list[3] = (Atom32) R->xa[XA_COMPOUND_TEXT]; 3305 *target++ = (Atom32) R->xa[XA_COMPOUND_TEXT];
3306#if X_HAVE_UTF8_STRING
3307 *target++ = (Atom32) R->xa[XA_UTF8_STRING];
3314#endif 3308#endif
3315 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_ATOM, 3309 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_ATOM,
3316 (8 * sizeof(target_list[0])), PropModeReplace, 3310 (8 * sizeof(target_list[0])), PropModeReplace,
3317 (unsigned char *)target_list, 3311 (unsigned char *)target_list,
3318 (sizeof(target_list) / sizeof(target_list[0]))); 3312 target - target_list);
3319 ev.property = rq->property; 3313 ev.property = rq->property;
3320 } else if (rq->target == R->xa[XA_MULTIPLE]) { 3314 } else if (rq->target == R->xa[XA_MULTIPLE]) {
3321 /* TODO: Handle MULTIPLE */ 3315 /* TODO: Handle MULTIPLE */
3322 } else if (rq->target == R->xa[XA_TIMESTAMP] && R->selection.text) { 3316 } else if (rq->target == R->xa[XA_TIMESTAMP] && R->selection.text) {
3323 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_INTEGER, 3317 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_INTEGER,
3324 (8 * sizeof(Time)), PropModeReplace, 3318 (8 * sizeof(Time)), PropModeReplace,
3325 (unsigned char *)&R->selection_time, 1); 3319 (unsigned char *)&R->selection_time, 1);
3326 ev.property = rq->property; 3320 ev.property = rq->property;
3327 } else if (rq->target == XA_STRING 3321 } else if (rq->target == XA_STRING
3322 || rq->target == R->xa[XA_TEXT]
3328 || rq->target == R->xa[XA_COMPOUND_TEXT] 3323 || rq->target == R->xa[XA_COMPOUND_TEXT]
3329 || rq->target == R->xa[XA_TEXT]) { 3324 || rq->target == R->xa[XA_UTF8_STRING]
3330#ifdef USE_XIM 3325 ) {
3331 short freect = 0; 3326 short freect = 0;
3332#endif
3333 int selectlen; 3327 int selectlen;
3328 char *cl;
3334 3329
3335#ifdef USE_XIM 3330 target = rq->target;
3331
3336 if (rq->target != XA_STRING) { 3332 if (target == XA_STRING)
3333 // we actually don't do XA_STRING, but who cares, as i18n clients
3334 // will ask for another format anyways.
3335 style = XStringStyle;
3336 else if (target == R->xa[XA_TEXT])
3337 style = XTextStyle;
3338 else if (target == R->xa[XA_COMPOUND_TEXT])
3339 style = XCompoundTextStyle;
3340#if X_HAVE_UTF8_STRING
3341 else if (target == R->xa[XA_UTF8_STRING])
3342 style = XUTF8StringStyle;
3343#endif
3344 else
3345 {
3337 target = R->xa[XA_COMPOUND_TEXT]; 3346 target = R->xa[XA_COMPOUND_TEXT];
3338 style = (rq->target == R->xa[XA_COMPOUND_TEXT])
3339 ? XCompoundTextStyle : XStdICCTextStyle;
3340 } else
3341#endif
3342 {
3343 target = XA_STRING;
3344 style = XStringStyle; 3347 style = XCompoundTextStyle;
3345 } 3348 }
3349
3346 if (R->selection.text) { 3350 if (R->selection.text) {
3347 cl[0] = (char *)R->selection.text; 3351 cl = (char *)R->selection.text;
3348 selectlen = R->selection.len; 3352 selectlen = R->selection.len;
3349 } else { 3353 } else {
3350 cl[0] = dummy; 3354 cl = "";
3351 *dummy = '\0';
3352 selectlen = 0; 3355 selectlen = 0;
3353 } 3356 }
3354#ifdef USE_XIM 3357
3355 if (XmbTextListToTextProperty(R->Xdisplay, cl, 1, style, &ct) 3358 if (XmbTextListToTextProperty(R->Xdisplay, &cl, 1, style, &ct) >= 0)
3356 == Success) /* if we failed to convert then send it raw */
3357 freect = 1; 3359 freect = 1;
3358 else 3360 else
3359#endif
3360 { 3361 {
3362 /* if we failed to convert then send it raw */
3361 ct.value = (unsigned char *)cl[0]; 3363 ct.value = (unsigned char *)cl;
3362 ct.nitems = selectlen; 3364 ct.nitems = selectlen;
3363 } 3365 }
3366
3364 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, 3367 XChangeProperty(R->Xdisplay, rq->requestor, rq->property,
3365 target, 8, PropModeReplace, 3368 target, 8, PropModeReplace,
3366 ct.value, (int)ct.nitems); 3369 ct.value, (int)ct.nitems);
3367 ev.property = rq->property; 3370 ev.property = rq->property;
3368#ifdef USE_XIM 3371
3369 if (freect) 3372 if (freect)
3370 XFree(ct.value); 3373 XFree (ct.value);
3371#endif
3372 } 3374 }
3373 XSendEvent(R->Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev); 3375 XSendEvent(R->Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev);
3374} 3376}
3375 3377
3376/* ------------------------------------------------------------------------- * 3378/* ------------------------------------------------------------------------- *

Diff Legend

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