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.12 by pcg, Thu Dec 18 14:11:47 2003 UTC vs.
Revision 1.18 by pcg, Wed Jan 28 23:40:50 2004 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.c 2 * File: screen.c
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * $Id: screen.C,v 1.12 2003/12/18 14:11:47 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
… …
289 else if (nrow > prev_nrow) 288 else if (nrow > prev_nrow)
290 { 289 {
291 /* add rows */ 290 /* add rows */
292 scr_reset_realloc (); /* realloc _first_ */ 291 scr_reset_realloc (); /* realloc _first_ */
293 292
294 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 293 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
295 294
296 k = min (TermWin.nscrolled, nrow - prev_nrow); 295 k = min (TermWin.nscrolled, nrow - prev_nrow);
297 296
298 for (p = prev_total_rows; p < total_rows; p++) 297 for (p = prev_total_rows; p < total_rows; p++)
299 { 298 {
… …
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 * ------------------------------------------------------------------------- */
1678 1652
1679/* 1653/*
1680 * Refresh an area 1654 * Refresh an area
… …
1859 * Refresh the screen 1833 * Refresh the screen
1860 * R->drawn_text/R->drawn_rend contain the screen information before the update. 1834 * 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. 1835 * R->screen.text/R->screen.rend contain what the screen will change to.
1862 */ 1836 */
1863 1837
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) \ 1838#define FONT_WIDTH(X, Y) \
1874 (X)->per_char[(Y) - (X)->min_char_or_byte2].width 1839 (X)->per_char[(Y) - (X)->min_char_or_byte2].width
1875#define FONT_RBEAR(X, Y) \ 1840#define FONT_RBEAR(X, Y) \
1876 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing 1841 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing
1877#define FONT_LBEAR(X, Y) \ 1842#define FONT_LBEAR(X, Y) \
… …
1883rxvt_term::scr_refresh (unsigned char refresh_type) 1848rxvt_term::scr_refresh (unsigned char refresh_type)
1884{ 1849{
1885 unsigned char clearfirst, /* first character writes before cell */ 1850 unsigned char clearfirst, /* first character writes before cell */
1886 clearlast, /* last character writes beyond cell */ 1851 clearlast, /* last character writes beyond cell */
1887 must_clear, /* use draw_string not draw_image_string */ 1852 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 */ 1853 rvid, /* reverse video this position */
1892 wbyte, /* we're in multibyte */
1893 showcursor; /* show the cursor */ 1854 showcursor; /* show the cursor */
1894 int fore, back; /* desired foreground/background */
1895 int16_t col, row, /* column/row we're processing */ 1855 int16_t col, row, /* column/row we're processing */
1896 ocrow; /* old cursor row */ 1856 ocrow; /* old cursor row */
1897 int cursorwidth; 1857 int cursorwidth;
1898 int i, /* tmp */ 1858 int i, /* tmp */
1899 row_offset; /* basic offset in screen structure */ 1859 row_offset; /* basic offset in screen structure */
… …
1908 return; 1868 return;
1909 1869
1910 /* 1870 /*
1911 * A: set up vars 1871 * A: set up vars
1912 */ 1872 */
1913 clearfirst = clearlast = must_clear = wbyte = 0; 1873 clearfirst = clearlast = must_clear = 0;
1914#ifndef NO_BOLDFONT
1915 bfont = 0;
1916#endif
1917 1874
1918 if (currmaxcol < TermWin.ncol) 1875 if (currmaxcol < TermWin.ncol)
1919 { 1876 {
1920 currmaxcol = TermWin.ncol; 1877 currmaxcol = TermWin.ncol;
1921 buffer = (char *)rxvt_realloc (buffer, 1878 buffer = (char *)rxvt_realloc (buffer,
… …
1992#endif 1949#endif
1993 *srp = SET_FGCOLOR(*srp, ccol1); 1950 *srp = SET_FGCOLOR(*srp, ccol1);
1994 *srp = SET_BGCOLOR(*srp, ccol2); 1951 *srp = SET_BGCOLOR(*srp, ccol2);
1995#endif 1952#endif
1996 } 1953 }
1997
1998 while (IS_WIDE (*srp))
1999 cursorwidth++, srp++;
2000 } 1954 }
2001 1955
2002 /* make sure no outline cursor is left around */ 1956 /* make sure no outline cursor is left around */
2003 setoldcursor = 0; 1957 setoldcursor = 0;
2004 if (ocrow != -1) { 1958 if (ocrow != -1) {
… …
2147 i++; 2101 i++;
2148 2102
2149 continue; 2103 continue;
2150 } 2104 }
2151 2105
2152 if (((rend ^ srp[col]) & ~RS_wide) != 0) 2106 if (rend != srp[col])
2153 break; 2107 break;
2154 2108
2155 count++; 2109 count++;
2156 2110
2157 if (stp[col] != dtp[col] 2111 if (stp[col] != dtp[col]
… …
2172 count -= i; /* dump any matching trailing chars */ 2126 count -= i; /* dump any matching trailing chars */
2173 2127
2174 /* 2128 /*
2175 * Determine the attributes for the string 2129 * Determine the attributes for the string
2176 */ 2130 */
2177 int fid = GET_FONT(rend); 2131 int fid = GET_FONT (rend);
2178 fore = GET_FGCOLOR(rend); 2132 int fore = GET_FGCOLOR (rend); // desired foreground
2179 back = GET_BGCOLOR(rend); 2133 int back = GET_BGCOLOR (rend); // desired background
2134
2180 rend = GET_ATTR(rend); 2135 rend = GET_ATTR (rend);
2181 2136
2182 rvid = (rend & RS_RVid) ? 1 : 0; 2137 rvid = !!(rend & RS_RVid);
2183#ifdef OPTION_HC 2138#ifdef OPTION_HC
2184 if (!rvid && (rend & RS_Blink)) 2139 if (!rvid && (rend & RS_Blink))
2185 { 2140 {
2186 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_HC)) 2141 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_HC))
2187 back = Color_HC; 2142 back = Color_HC;
… …
2204 } 2159 }
2205#ifndef NO_BOLD_UNDERLINE_REVERSE 2160#ifndef NO_BOLD_UNDERLINE_REVERSE
2206 else if (rend & RS_Bold) 2161 else if (rend & RS_Bold)
2207 { 2162 {
2208 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_BD)) 2163 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_BD))
2209 {
2210 fore = Color_BD; 2164 fore = Color_BD;
2211# ifndef VERYBOLD
2212 rend &= ~RS_Bold; /* we've taken care of it */
2213# endif
2214 }
2215 } 2165 }
2216 else if (rend & RS_Uline) 2166 else if (rend & RS_Uline)
2217 { 2167 {
2218 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_UL)) 2168 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_UL))
2219 {
2220 fore = Color_UL; 2169 fore = Color_UL;
2221 rend &= ~RS_Uline; /* we've taken care of it */
2222 }
2223 } 2170 }
2224#endif 2171#endif
2225 2172
2226 /* 2173 /*
2227 * Actually do the drawing of the string here 2174 * Actually do the drawing of the string here
… …
2488rxvt_selection_paste(pR_ Window win, Atom prop, Bool delete_prop) 2435rxvt_selection_paste(pR_ Window win, Atom prop, Bool delete_prop)
2489{ 2436{
2490 long nread = 0; 2437 long nread = 0;
2491 unsigned long bytes_after; 2438 unsigned long bytes_after;
2492 XTextProperty ct; 2439 XTextProperty ct;
2493 int dummy_count;
2494 char **cl;
2495 2440
2496 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, R->selection_wait)); 2441 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, R->selection_wait));
2497 2442
2498 if (prop == None) /* check for failed XConvertSelection */ 2443 if (prop == None) /* check for failed XConvertSelection */
2499 { 2444 {
… …
2502 int selnum = R->selection_type & Sel_whereMask; 2447 int selnum = R->selection_type & Sel_whereMask;
2503 2448
2504 R->selection_type = 0; 2449 R->selection_type = 0;
2505 if (selnum != Sel_direct) 2450 if (selnum != Sel_direct)
2506 rxvt_selection_request_other(aR_ XA_STRING, selnum); 2451 rxvt_selection_request_other(aR_ XA_STRING, selnum);
2452 }
2453
2454 if ((R->selection_type & Sel_UTF8String))
2455 {
2456 int selnum = R->selection_type & Sel_whereMask;
2457
2458 R->selection_type = Sel_CompoundText;
2459 if (selnum != Sel_direct)
2460 rxvt_selection_request_other(aR_ R->xa[XA_COMPOUND_TEXT], selnum);
2461 else
2462 R->selection_type = 0;
2507 } 2463 }
2508 2464
2509 return 0; 2465 return 0;
2510 } 2466 }
2511 2467
… …
2546 nread = -1; /* discount any previous stuff */ 2502 nread = -1; /* discount any previous stuff */
2547 break; 2503 break;
2548 } 2504 }
2549 2505
2550 nread += ct.nitems; 2506 nread += ct.nitems;
2507
2508 char **cl;
2509 int cr;
2551 if (XmbTextPropertyToTextList (R->Xdisplay, &ct, &cl, 2510 if (XmbTextPropertyToTextList (R->Xdisplay, &ct, &cl,
2552 &dummy_count) == Success && cl) 2511 &cr) >= 0 && cl)
2553 { 2512 {
2513 for (int i = 0; i < cr; i++)
2554 R->paste ((unsigned char *)cl[0], STRLEN (cl[0])); 2514 R->paste ((unsigned char *)cl[i], STRLEN (cl[i]));
2515
2555 XFreeStringList (cl); 2516 XFreeStringList (cl);
2556 } 2517 }
2557 else 2518 else
2558 R->paste (ct.value, ct.nitems); 2519 R->paste (ct.value, ct.nitems);
2559 2520
… …
2574} 2535}
2575 2536
2576void 2537void
2577rxvt_term::incr_cb (time_watcher &w) 2538rxvt_term::incr_cb (time_watcher &w)
2578{ 2539{
2579 w.stop ();
2580 selection_wait = Sel_none; 2540 selection_wait = Sel_none;
2581 2541
2582 rxvt_print_error("data loss: timeout on INCR selection paste"); 2542 rxvt_print_error ("data loss: timeout on INCR selection paste");
2583} 2543}
2584 2544
2585/* 2545/*
2586 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2546 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2587 */ 2547 */
… …
2653 int i; 2613 int i;
2654 2614
2655 R->selection_request_time = tm; 2615 R->selection_request_time = tm;
2656 R->selection_wait = Sel_normal; 2616 R->selection_wait = Sel_normal;
2657 for (i = Sel_Primary; i <= Sel_Clipboard; i++) { 2617 for (i = Sel_Primary; i <= Sel_Clipboard; i++) {
2618#if X_HAVE_UTF8_STRING
2619 R->selection_type = Sel_UTF8String;
2620 if (rxvt_selection_request_other(aR_ R->xa[XA_UTF8_STRING], i))
2621 return;
2622#else
2658 R->selection_type = Sel_CompoundText; 2623 R->selection_type = Sel_CompoundText;
2659 if (rxvt_selection_request_other(aR_ R->xa[XA_COMPOUND_TEXT], i)) 2624 if (rxvt_selection_request_other(aR_ R->xa[XA_COMPOUND_TEXT], i))
2660 return; 2625 return;
2626#endif
2661 } 2627 }
2662 } 2628 }
2663 R->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ 2629 R->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */
2664 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2630 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2665 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); 2631 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False);
… …
2797 { 2763 {
2798 free (new_selection_text); 2764 free (new_selection_text);
2799 return; 2765 return;
2800 } 2766 }
2801 2767
2802 // due to MB_MAX_CUR, selection wastage is usually high 2768 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2803 if (str - (char *)new_selection_text > 1024) 2769 if (str - (char *)new_selection_text > 1024)
2804 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1); 2770 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2805 2771
2806 R->selection.len = i; 2772 R->selection.len = i;
2773
2807 if (R->selection.text) 2774 if (R->selection.text)
2808 free (R->selection.text); 2775 free (R->selection.text);
2809 2776
2810 R->selection.text = new_selection_text; 2777 R->selection.text = new_selection_text;
2811 2778
2812 XSetSelectionOwner(R->Xdisplay, XA_PRIMARY, R->TermWin.vt, tm); 2779 XSetSelectionOwner(R->Xdisplay, XA_PRIMARY, R->TermWin.vt, tm);
2813 if (XGetSelectionOwner(R->Xdisplay, XA_PRIMARY) != R->TermWin.vt) 2780 if (XGetSelectionOwner(R->Xdisplay, XA_PRIMARY) != R->TermWin.vt)
2814 rxvt_print_error("can't get primary selection"); 2781 rxvt_print_error("can't get primary selection");
2782
2783
2784 {
2785 XTextProperty ct;
2786 char *cl = (char *)R->selection.text;
2787
2788 if (XmbTextListToTextProperty(R->Xdisplay, &cl, 1, XStringStyle, &ct) >= 0)
2789 {
2790 XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8,
2791 PropModeReplace, ct.value, ct.nitems);
2792 XFree (ct.value);
2793 }
2794 else
2815 XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, 2795 XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8,
2816 PropModeReplace, R->selection.text, (int)R->selection.len); 2796 PropModeReplace, R->selection.text, (int)R->selection.len);
2797 }
2798
2817 R->selection_time = tm; 2799 R->selection_time = tm;
2818 D_SELECT((stderr, "rxvt_selection_make(): R->selection.len=%d", R->selection.len)); 2800 D_SELECT((stderr, "rxvt_selection_make(): R->selection.len=%d", R->selection.len));
2819} 2801}
2820 2802
2821/* ------------------------------------------------------------------------- */ 2803/* ------------------------------------------------------------------------- */
… …
3273/* 3255/*
3274 * On some systems, the Atom typedef is 64 bits wide. We need to have a type 3256 * 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 3257 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3276 * the X11 protocol. 3258 * the X11 protocol.
3277 */ 3259 */
3278typedef CARD32 Atom32; 3260typedef CARD32 Atom32;
3279 3261
3280/* ------------------------------------------------------------------------- */ 3262/* ------------------------------------------------------------------------- */
3281/* 3263/*
3282 * Respond to a request for our current selection 3264 * Respond to a request for our current selection
3283 * EXT: SelectionRequest 3265 * EXT: SelectionRequest
… …
3285/* EXTPROTO */ 3267/* EXTPROTO */
3286void 3268void
3287rxvt_selection_send(pR_ const XSelectionRequestEvent *rq) 3269rxvt_selection_send(pR_ const XSelectionRequestEvent *rq)
3288{ 3270{
3289 XSelectionEvent ev; 3271 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; 3272 XTextProperty ct;
3297 XICCEncodingStyle style; 3273 XICCEncodingStyle style;
3298 char *cl[2], dummy[1]; 3274 Atom target;
3299 3275
3300 ev.type = SelectionNotify; 3276 ev.type = SelectionNotify;
3301 ev.property = None; 3277 ev.property = None;
3302 ev.display = rq->display; 3278 ev.display = rq->display;
3303 ev.requestor = rq->requestor; 3279 ev.requestor = rq->requestor;
3304 ev.selection = rq->selection; 3280 ev.selection = rq->selection;
3305 ev.target = rq->target; 3281 ev.target = rq->target;
3306 ev.time = rq->time; 3282 ev.time = rq->time;
3307 3283
3308 if (rq->target == R->xa[XA_TARGETS]) { 3284 if (rq->target == R->xa[XA_TARGETS]) {
3285 Atom32 target_list[5];
3286 Atom32 *target = target_list;
3287
3309 target_list[0] = (Atom32) R->xa[XA_TARGETS]; 3288 *target++ = (Atom32) R->xa[XA_TARGETS];
3310 target_list[1] = (Atom32) XA_STRING; 3289 *target++ = (Atom32) XA_STRING;
3311 target_list[2] = (Atom32) R->xa[XA_TEXT]; 3290 *target++ = (Atom32) R->xa[XA_TEXT];
3312#ifdef USE_XIM
3313 target_list[3] = (Atom32) R->xa[XA_COMPOUND_TEXT]; 3291 *target++ = (Atom32) R->xa[XA_COMPOUND_TEXT];
3292#if X_HAVE_UTF8_STRING
3293 *target++ = (Atom32) R->xa[XA_UTF8_STRING];
3314#endif 3294#endif
3315 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_ATOM, 3295 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_ATOM,
3316 (8 * sizeof(target_list[0])), PropModeReplace, 3296 (8 * sizeof(target_list[0])), PropModeReplace,
3317 (unsigned char *)target_list, 3297 (unsigned char *)target_list,
3318 (sizeof(target_list) / sizeof(target_list[0]))); 3298 target - target_list);
3319 ev.property = rq->property; 3299 ev.property = rq->property;
3320 } else if (rq->target == R->xa[XA_MULTIPLE]) { 3300 } else if (rq->target == R->xa[XA_MULTIPLE]) {
3321 /* TODO: Handle MULTIPLE */ 3301 /* TODO: Handle MULTIPLE */
3322 } else if (rq->target == R->xa[XA_TIMESTAMP] && R->selection.text) { 3302 } else if (rq->target == R->xa[XA_TIMESTAMP] && R->selection.text) {
3323 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_INTEGER, 3303 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_INTEGER,
3324 (8 * sizeof(Time)), PropModeReplace, 3304 (8 * sizeof(Time)), PropModeReplace,
3325 (unsigned char *)&R->selection_time, 1); 3305 (unsigned char *)&R->selection_time, 1);
3326 ev.property = rq->property; 3306 ev.property = rq->property;
3327 } else if (rq->target == XA_STRING 3307 } else if (rq->target == XA_STRING
3308 || rq->target == R->xa[XA_TEXT]
3328 || rq->target == R->xa[XA_COMPOUND_TEXT] 3309 || rq->target == R->xa[XA_COMPOUND_TEXT]
3329 || rq->target == R->xa[XA_TEXT]) { 3310 || rq->target == R->xa[XA_UTF8_STRING]
3330#ifdef USE_XIM 3311 ) {
3331 short freect = 0; 3312 short freect = 0;
3332#endif
3333 int selectlen; 3313 int selectlen;
3314 char *cl;
3334 3315
3335#ifdef USE_XIM 3316 target = rq->target;
3317
3336 if (rq->target != XA_STRING) { 3318 if (target == XA_STRING)
3319 // we actually don't do XA_STRING, but who cares, as i18n clients
3320 // will ask for another format anyways.
3321 style = XStringStyle;
3322 else if (target == R->xa[XA_TEXT])
3323 style = XTextStyle;
3324 else if (target == R->xa[XA_COMPOUND_TEXT])
3325 style = XCompoundTextStyle;
3326#if X_HAVE_UTF8_STRING
3327 else if (target == R->xa[XA_UTF8_STRING])
3328 style = XUTF8StringStyle;
3329#endif
3330 else
3331 {
3337 target = R->xa[XA_COMPOUND_TEXT]; 3332 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; 3333 style = XCompoundTextStyle;
3345 } 3334 }
3335
3346 if (R->selection.text) { 3336 if (R->selection.text) {
3347 cl[0] = (char *)R->selection.text; 3337 cl = (char *)R->selection.text;
3348 selectlen = R->selection.len; 3338 selectlen = R->selection.len;
3349 } else { 3339 } else {
3350 cl[0] = dummy; 3340 cl = "";
3351 *dummy = '\0';
3352 selectlen = 0; 3341 selectlen = 0;
3353 } 3342 }
3354#ifdef USE_XIM 3343
3355 if (XmbTextListToTextProperty(R->Xdisplay, cl, 1, style, &ct) 3344 if (XmbTextListToTextProperty(R->Xdisplay, &cl, 1, style, &ct) >= 0)
3356 == Success) /* if we failed to convert then send it raw */
3357 freect = 1; 3345 freect = 1;
3358 else 3346 else
3359#endif
3360 { 3347 {
3348 /* if we failed to convert then send it raw */
3361 ct.value = (unsigned char *)cl[0]; 3349 ct.value = (unsigned char *)cl;
3362 ct.nitems = selectlen; 3350 ct.nitems = selectlen;
3363 } 3351 }
3352
3364 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, 3353 XChangeProperty(R->Xdisplay, rq->requestor, rq->property,
3365 target, 8, PropModeReplace, 3354 target, 8, PropModeReplace,
3366 ct.value, (int)ct.nitems); 3355 ct.value, (int)ct.nitems);
3367 ev.property = rq->property; 3356 ev.property = rq->property;
3368#ifdef USE_XIM 3357
3369 if (freect) 3358 if (freect)
3370 XFree(ct.value); 3359 XFree (ct.value);
3371#endif
3372 } 3360 }
3373 XSendEvent(R->Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev); 3361 XSendEvent(R->Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev);
3374} 3362}
3375 3363
3376/* ------------------------------------------------------------------------- * 3364/* ------------------------------------------------------------------------- *

Diff Legend

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