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.16 by pcg, Fri Jan 16 22:11:09 2004 UTC vs.
Revision 1.19 by pcg, Thu Jan 29 23:26:01 2004 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.c 2 * File: screen.c
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * $Id: screen.C,v 1.16 2004/01/16 22:11:09 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
… …
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 // rely on wcwidth to tell us the character width, at least for non-ascii 903 // rely on wcwidth to tell us the character width, at least for non-ascii
905 int width = c <= 128 ? 1 : wcwidth (c); 904 int width = c <= 128 ? 1 : wcwidth (c);
906 905
907 // width 0 characters (e.g. combining chars) are ignored. your problem, really 906 // width -1 characters (e.g. combining chars) are ignored currently.
908 while (width-- > 0) 907 if (width > 0)
908 do
909 { 909 {
910 stp[R->screen.cur.col] = c; 910 stp[R->screen.cur.col] = c;
911 srp[R->screen.cur.col] = rend; 911 srp[R->screen.cur.col] = rend;
912 912
913 if (R->screen.cur.col < last_col - 1) 913 if (R->screen.cur.col < last_col - 1)
914 R->screen.cur.col++; 914 R->screen.cur.col++;
915 else 915 else
916 { 916 {
917 R->screen.tlen[row] = last_col; 917 R->screen.tlen[row] = last_col;
918 if (R->screen.flags & Screen_Autowrap) 918 if (R->screen.flags & Screen_Autowrap)
919 R->screen.flags |= Screen_WrapNext; 919 R->screen.flags |= Screen_WrapNext;
920 break; 920 break;
921 } 921 }
922 922
923 c = NOCHAR; 923 c = NOCHAR;
924 } 924 }
925 while (--width > 0);
926 else
927 1; /* handle combining character etc. here. */
925 } 928 }
929
926 if (R->screen.tlen[row] != -1) /* XXX: think about this */ 930 if (R->screen.tlen[row] != -1) /* XXX: think about this */
927 MAX_IT(R->screen.tlen[row], R->screen.cur.col); 931 MAX_IT(R->screen.tlen[row], R->screen.cur.col);
928 932
929/* 933/*
930 * If we wrote anywhere in the selected area, kill the selection 934 * If we wrote anywhere in the selected area, kill the selection
931 * XXX: should we kill the mark too? Possibly, but maybe that 935 * XXX: should we kill the mark too? Possibly, but maybe that
932 * should be a similar check. 936 * should be a similar check.
… …
1641 rxvt_set_font_style(aR); 1645 rxvt_set_font_style(aR);
1642} 1646}
1643 1647
1644 1648
1645/* ------------------------------------------------------------------------- * 1649/* ------------------------------------------------------------------------- *
1646 * GRAPHICS COLOURS *
1647 * ------------------------------------------------------------------------- */
1648
1649#ifdef RXVT_GRAPHICS
1650/* EXTPROTO */
1651int
1652rxvt_scr_get_fgcolor(pR)
1653{
1654 return GET_FGCOLOR(R->rstyle);
1655}
1656
1657/* ------------------------------------------------------------------------- */
1658/* EXTPROTO */
1659int
1660rxvt_scr_get_bgcolor(pR)
1661{
1662 return GET_BGCOLOR(R->rstyle);
1663}
1664#endif
1665
1666/* ------------------------------------------------------------------------- *
1667 * MAJOR SCREEN MANIPULATION * 1650 * MAJOR SCREEN MANIPULATION *
1668 * ------------------------------------------------------------------------- */ 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}
1669 1676
1670/* 1677/*
1671 * Refresh an area 1678 * Refresh an area
1672 */ 1679 */
1673enum { 1680enum {
… …
1850 * Refresh the screen 1857 * Refresh the screen
1851 * 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.
1852 * 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.
1853 */ 1860 */
1854 1861
1855#if defined (NO_BRIGHTCOLOR) || defined (VERYBOLD)
1856# define MONO_BOLD(x) ((x) & (RS_Bold|RS_Blink))
1857# define MONO_BOLD_FG(x, fg) MONO_BOLD(x)
1858#else
1859# define MONO_BOLD(x) \
1860 (((x) & (RS_Bold | RS_fgMask)) == (RS_Bold | Color_fg))
1861# define MONO_BOLD_FG(x, fg) (((x) & RS_Bold) && (fg) == Color_fg)
1862#endif
1863
1864#define FONT_WIDTH(X, Y) \ 1862#define FONT_WIDTH(X, Y) \
1865 (X)->per_char[(Y) - (X)->min_char_or_byte2].width 1863 (X)->per_char[(Y) - (X)->min_char_or_byte2].width
1866#define FONT_RBEAR(X, Y) \ 1864#define FONT_RBEAR(X, Y) \
1867 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing 1865 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing
1868#define FONT_LBEAR(X, Y) \ 1866#define FONT_LBEAR(X, Y) \
… …
1874rxvt_term::scr_refresh (unsigned char refresh_type) 1872rxvt_term::scr_refresh (unsigned char refresh_type)
1875{ 1873{
1876 unsigned char clearfirst, /* first character writes before cell */ 1874 unsigned char clearfirst, /* first character writes before cell */
1877 clearlast, /* last character writes beyond cell */ 1875 clearlast, /* last character writes beyond cell */
1878 must_clear, /* use draw_string not draw_image_string */ 1876 must_clear, /* use draw_string not draw_image_string */
1879#ifndef NO_BOLDFONT
1880 bfont, /* we've changed font to bold font */
1881#endif
1882 rvid, /* reverse video this position */ 1877 rvid, /* reverse video this position */
1883 wbyte, /* we're in multibyte */
1884 showcursor; /* show the cursor */ 1878 showcursor; /* show the cursor */
1885 int fore, back; /* desired foreground/background */
1886 int16_t col, row, /* column/row we're processing */ 1879 int16_t col, row, /* column/row we're processing */
1887 ocrow; /* old cursor row */ 1880 ocrow; /* old cursor row */
1888 int cursorwidth; 1881 int cursorwidth;
1889 int i, /* tmp */ 1882 int i, /* tmp */
1890 row_offset; /* basic offset in screen structure */ 1883 row_offset; /* basic offset in screen structure */
… …
1899 return; 1892 return;
1900 1893
1901 /* 1894 /*
1902 * A: set up vars 1895 * A: set up vars
1903 */ 1896 */
1904 clearfirst = clearlast = must_clear = wbyte = 0; 1897 clearfirst = clearlast = must_clear = 0;
1905#ifndef NO_BOLDFONT
1906 bfont = 0;
1907#endif
1908 1898
1909 if (currmaxcol < TermWin.ncol) 1899 if (currmaxcol < TermWin.ncol)
1910 { 1900 {
1911 currmaxcol = TermWin.ncol; 1901 currmaxcol = TermWin.ncol;
1912 buffer = (char *)rxvt_realloc (buffer, 1902 buffer = (char *)rxvt_realloc (buffer,
… …
1983#endif 1973#endif
1984 *srp = SET_FGCOLOR(*srp, ccol1); 1974 *srp = SET_FGCOLOR(*srp, ccol1);
1985 *srp = SET_BGCOLOR(*srp, ccol2); 1975 *srp = SET_BGCOLOR(*srp, ccol2);
1986#endif 1976#endif
1987 } 1977 }
1988
1989 while (IS_WIDE (*srp))
1990 cursorwidth++, srp++;
1991 } 1978 }
1992 1979
1993 /* make sure no outline cursor is left around */ 1980 /* make sure no outline cursor is left around */
1994 setoldcursor = 0; 1981 setoldcursor = 0;
1995 if (ocrow != -1) { 1982 if (ocrow != -1) {
… …
2138 i++; 2125 i++;
2139 2126
2140 continue; 2127 continue;
2141 } 2128 }
2142 2129
2143 if (((rend ^ srp[col]) & ~RS_wide) != 0) 2130 if (rend != srp[col])
2144 break; 2131 break;
2145 2132
2146 count++; 2133 count++;
2147 2134
2148 if (stp[col] != dtp[col] 2135 if (stp[col] != dtp[col]
… …
2163 count -= i; /* dump any matching trailing chars */ 2150 count -= i; /* dump any matching trailing chars */
2164 2151
2165 /* 2152 /*
2166 * Determine the attributes for the string 2153 * Determine the attributes for the string
2167 */ 2154 */
2168 int fid = GET_FONT(rend); 2155 int fid = GET_FONT (rend);
2169 fore = GET_FGCOLOR(rend); 2156 int fore = GET_FGCOLOR (rend); // desired foreground
2170 back = GET_BGCOLOR(rend); 2157 int back = GET_BGCOLOR (rend); // desired background
2158
2171 rend = GET_ATTR(rend); 2159 rend = GET_ATTR (rend);
2172 2160
2173 rvid = (rend & RS_RVid) ? 1 : 0; 2161 rvid = !!(rend & RS_RVid);
2162#ifdef TEXT_BLINK
2163 if (rend & RS_Blink)
2164 {
2165 if (!text_blink_ev.active)
2166 {
2167 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2168 hidden_text = 0;
2169 }
2170 else if (hidden_text)
2171 fore = back;
2172 }
2174#ifdef OPTION_HC 2173#elif OPTION_HC
2175 if (!rvid && (rend & RS_Blink)) 2174 if (!rvid && (rend & RS_Blink))
2176 { 2175 {
2177 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_HC)) 2176 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_HC))
2178 back = Color_HC; 2177 back = Color_HC;
2179 else 2178 else
… …
2194#endif 2193#endif
2195 } 2194 }
2196#ifndef NO_BOLD_UNDERLINE_REVERSE 2195#ifndef NO_BOLD_UNDERLINE_REVERSE
2197 else if (rend & RS_Bold) 2196 else if (rend & RS_Bold)
2198 { 2197 {
2198 if (Xdepth > 2)
2199 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_BD)) 2199 if (ISSET_PIXCOLOR (this, Color_BD))
2200 {
2201 fore = Color_BD; 2200 fore = Color_BD;
2202# ifndef VERYBOLD
2203 rend &= ~RS_Bold; /* we've taken care of it */
2204# endif
2205 } 2201 else
2202 fore = Color_White;
2206 } 2203 }
2207 else if (rend & RS_Uline) 2204 else if (rend & RS_Uline)
2208 { 2205 {
2209 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_UL)) 2206 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_UL))
2210 {
2211 fore = Color_UL; 2207 fore = Color_UL;
2212 rend &= ~RS_Uline; /* we've taken care of it */
2213 }
2214 } 2208 }
2215#endif 2209#endif
2216 2210
2217 /* 2211 /*
2218 * Actually do the drawing of the string here 2212 * Actually do the drawing of the string here
… …
2479rxvt_selection_paste(pR_ Window win, Atom prop, Bool delete_prop) 2473rxvt_selection_paste(pR_ Window win, Atom prop, Bool delete_prop)
2480{ 2474{
2481 long nread = 0; 2475 long nread = 0;
2482 unsigned long bytes_after; 2476 unsigned long bytes_after;
2483 XTextProperty ct; 2477 XTextProperty ct;
2484 int dummy_count;
2485 char **cl;
2486 2478
2487 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, R->selection_wait)); 2479 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, R->selection_wait));
2488 2480
2489 if (prop == None) /* check for failed XConvertSelection */ 2481 if (prop == None) /* check for failed XConvertSelection */
2490 { 2482 {
… …
2493 int selnum = R->selection_type & Sel_whereMask; 2485 int selnum = R->selection_type & Sel_whereMask;
2494 2486
2495 R->selection_type = 0; 2487 R->selection_type = 0;
2496 if (selnum != Sel_direct) 2488 if (selnum != Sel_direct)
2497 rxvt_selection_request_other(aR_ XA_STRING, selnum); 2489 rxvt_selection_request_other(aR_ XA_STRING, selnum);
2490 }
2491
2492 if ((R->selection_type & Sel_UTF8String))
2493 {
2494 int selnum = R->selection_type & Sel_whereMask;
2495
2496 R->selection_type = Sel_CompoundText;
2497 if (selnum != Sel_direct)
2498 rxvt_selection_request_other(aR_ R->xa[XA_COMPOUND_TEXT], selnum);
2499 else
2500 R->selection_type = 0;
2498 } 2501 }
2499 2502
2500 return 0; 2503 return 0;
2501 } 2504 }
2502 2505
… …
2537 nread = -1; /* discount any previous stuff */ 2540 nread = -1; /* discount any previous stuff */
2538 break; 2541 break;
2539 } 2542 }
2540 2543
2541 nread += ct.nitems; 2544 nread += ct.nitems;
2545
2546 char **cl;
2547 int cr;
2542 if (XmbTextPropertyToTextList (R->Xdisplay, &ct, &cl, 2548 if (XmbTextPropertyToTextList (R->Xdisplay, &ct, &cl,
2543 &dummy_count) == Success && cl) 2549 &cr) >= 0 && cl)
2544 { 2550 {
2551 for (int i = 0; i < cr; i++)
2545 R->paste ((unsigned char *)cl[0], STRLEN (cl[0])); 2552 R->paste ((unsigned char *)cl[i], STRLEN (cl[i]));
2553
2546 XFreeStringList (cl); 2554 XFreeStringList (cl);
2547 } 2555 }
2548 else 2556 else
2549 R->paste (ct.value, ct.nitems); 2557 R->paste (ct.value, ct.nitems);
2550 2558
… …
2643 int i; 2651 int i;
2644 2652
2645 R->selection_request_time = tm; 2653 R->selection_request_time = tm;
2646 R->selection_wait = Sel_normal; 2654 R->selection_wait = Sel_normal;
2647 for (i = Sel_Primary; i <= Sel_Clipboard; i++) { 2655 for (i = Sel_Primary; i <= Sel_Clipboard; i++) {
2656#if X_HAVE_UTF8_STRING
2657 R->selection_type = Sel_UTF8String;
2658 if (rxvt_selection_request_other(aR_ R->xa[XA_UTF8_STRING], i))
2659 return;
2660#else
2648 R->selection_type = Sel_CompoundText; 2661 R->selection_type = Sel_CompoundText;
2649 if (rxvt_selection_request_other(aR_ R->xa[XA_COMPOUND_TEXT], i)) 2662 if (rxvt_selection_request_other(aR_ R->xa[XA_COMPOUND_TEXT], i))
2650 return; 2663 return;
2664#endif
2651 } 2665 }
2652 } 2666 }
2653 R->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ 2667 R->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */
2654 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2668 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2655 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); 2669 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False);
… …
2787 { 2801 {
2788 free (new_selection_text); 2802 free (new_selection_text);
2789 return; 2803 return;
2790 } 2804 }
2791 2805
2792 // due to MB_MAX_CUR, selection wastage is usually high 2806 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2793 if (str - (char *)new_selection_text > 1024) 2807 if (str - (char *)new_selection_text > 1024)
2794 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1); 2808 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2795 2809
2796 R->selection.len = i; 2810 R->selection.len = i;
2811
2797 if (R->selection.text) 2812 if (R->selection.text)
2798 free (R->selection.text); 2813 free (R->selection.text);
2799 2814
2800 R->selection.text = new_selection_text; 2815 R->selection.text = new_selection_text;
2801 2816
2802 XSetSelectionOwner(R->Xdisplay, XA_PRIMARY, R->TermWin.vt, tm); 2817 XSetSelectionOwner(R->Xdisplay, XA_PRIMARY, R->TermWin.vt, tm);
2803 if (XGetSelectionOwner(R->Xdisplay, XA_PRIMARY) != R->TermWin.vt) 2818 if (XGetSelectionOwner(R->Xdisplay, XA_PRIMARY) != R->TermWin.vt)
2804 rxvt_print_error("can't get primary selection"); 2819 rxvt_print_error("can't get primary selection");
2820
2821
2822 {
2823 XTextProperty ct;
2824 char *cl = (char *)R->selection.text;
2825
2826 if (XmbTextListToTextProperty(R->Xdisplay, &cl, 1, XStringStyle, &ct) >= 0)
2827 {
2828 XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8,
2829 PropModeReplace, ct.value, ct.nitems);
2830 XFree (ct.value);
2831 }
2832 else
2805 XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, 2833 XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8,
2806 PropModeReplace, R->selection.text, (int)R->selection.len); 2834 PropModeReplace, R->selection.text, (int)R->selection.len);
2835 }
2836
2807 R->selection_time = tm; 2837 R->selection_time = tm;
2808 D_SELECT((stderr, "rxvt_selection_make(): R->selection.len=%d", R->selection.len)); 2838 D_SELECT((stderr, "rxvt_selection_make(): R->selection.len=%d", R->selection.len));
2809} 2839}
2810 2840
2811/* ------------------------------------------------------------------------- */ 2841/* ------------------------------------------------------------------------- */
… …
3263/* 3293/*
3264 * On some systems, the Atom typedef is 64 bits wide. We need to have a type 3294 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3265 * that is exactly 32 bits wide, because a format of 64 is not allowed by 3295 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3266 * the X11 protocol. 3296 * the X11 protocol.
3267 */ 3297 */
3268typedef CARD32 Atom32; 3298typedef CARD32 Atom32;
3269 3299
3270/* ------------------------------------------------------------------------- */ 3300/* ------------------------------------------------------------------------- */
3271/* 3301/*
3272 * Respond to a request for our current selection 3302 * Respond to a request for our current selection
3273 * EXT: SelectionRequest 3303 * EXT: SelectionRequest
… …
3275/* EXTPROTO */ 3305/* EXTPROTO */
3276void 3306void
3277rxvt_selection_send(pR_ const XSelectionRequestEvent *rq) 3307rxvt_selection_send(pR_ const XSelectionRequestEvent *rq)
3278{ 3308{
3279 XSelectionEvent ev; 3309 XSelectionEvent ev;
3280#ifdef USE_XIM
3281 Atom32 target_list[4];
3282#else
3283 Atom32 target_list[3];
3284#endif
3285 Atom target;
3286 XTextProperty ct; 3310 XTextProperty ct;
3287 XICCEncodingStyle style; 3311 XICCEncodingStyle style;
3288 char *cl[2], dummy[1]; 3312 Atom target;
3289 3313
3290 ev.type = SelectionNotify; 3314 ev.type = SelectionNotify;
3291 ev.property = None; 3315 ev.property = None;
3292 ev.display = rq->display; 3316 ev.display = rq->display;
3293 ev.requestor = rq->requestor; 3317 ev.requestor = rq->requestor;
3294 ev.selection = rq->selection; 3318 ev.selection = rq->selection;
3295 ev.target = rq->target; 3319 ev.target = rq->target;
3296 ev.time = rq->time; 3320 ev.time = rq->time;
3297 3321
3298 if (rq->target == R->xa[XA_TARGETS]) { 3322 if (rq->target == R->xa[XA_TARGETS]) {
3323 Atom32 target_list[5];
3324 Atom32 *target = target_list;
3325
3299 target_list[0] = (Atom32) R->xa[XA_TARGETS]; 3326 *target++ = (Atom32) R->xa[XA_TARGETS];
3300 target_list[1] = (Atom32) XA_STRING; 3327 *target++ = (Atom32) XA_STRING;
3301 target_list[2] = (Atom32) R->xa[XA_TEXT]; 3328 *target++ = (Atom32) R->xa[XA_TEXT];
3302#ifdef USE_XIM
3303 target_list[3] = (Atom32) R->xa[XA_COMPOUND_TEXT]; 3329 *target++ = (Atom32) R->xa[XA_COMPOUND_TEXT];
3330#if X_HAVE_UTF8_STRING
3331 *target++ = (Atom32) R->xa[XA_UTF8_STRING];
3304#endif 3332#endif
3305 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_ATOM, 3333 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_ATOM,
3306 (8 * sizeof(target_list[0])), PropModeReplace, 3334 (8 * sizeof(target_list[0])), PropModeReplace,
3307 (unsigned char *)target_list, 3335 (unsigned char *)target_list,
3308 (sizeof(target_list) / sizeof(target_list[0]))); 3336 target - target_list);
3309 ev.property = rq->property; 3337 ev.property = rq->property;
3310 } else if (rq->target == R->xa[XA_MULTIPLE]) { 3338 } else if (rq->target == R->xa[XA_MULTIPLE]) {
3311 /* TODO: Handle MULTIPLE */ 3339 /* TODO: Handle MULTIPLE */
3312 } else if (rq->target == R->xa[XA_TIMESTAMP] && R->selection.text) { 3340 } else if (rq->target == R->xa[XA_TIMESTAMP] && R->selection.text) {
3313 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_INTEGER, 3341 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_INTEGER,
3314 (8 * sizeof(Time)), PropModeReplace, 3342 (8 * sizeof(Time)), PropModeReplace,
3315 (unsigned char *)&R->selection_time, 1); 3343 (unsigned char *)&R->selection_time, 1);
3316 ev.property = rq->property; 3344 ev.property = rq->property;
3317 } else if (rq->target == XA_STRING 3345 } else if (rq->target == XA_STRING
3346 || rq->target == R->xa[XA_TEXT]
3318 || rq->target == R->xa[XA_COMPOUND_TEXT] 3347 || rq->target == R->xa[XA_COMPOUND_TEXT]
3319 || rq->target == R->xa[XA_TEXT]) { 3348 || rq->target == R->xa[XA_UTF8_STRING]
3320#ifdef USE_XIM 3349 ) {
3321 short freect = 0; 3350 short freect = 0;
3322#endif
3323 int selectlen; 3351 int selectlen;
3352 char *cl;
3324 3353
3325#ifdef USE_XIM 3354 target = rq->target;
3355
3326 if (rq->target != XA_STRING) { 3356 if (target == XA_STRING)
3357 // we actually don't do XA_STRING, but who cares, as i18n clients
3358 // will ask for another format anyways.
3359 style = XStringStyle;
3360 else if (target == R->xa[XA_TEXT])
3361 style = XTextStyle;
3362 else if (target == R->xa[XA_COMPOUND_TEXT])
3363 style = XCompoundTextStyle;
3364#if X_HAVE_UTF8_STRING
3365 else if (target == R->xa[XA_UTF8_STRING])
3366 style = XUTF8StringStyle;
3367#endif
3368 else
3369 {
3327 target = R->xa[XA_COMPOUND_TEXT]; 3370 target = R->xa[XA_COMPOUND_TEXT];
3328 style = (rq->target == R->xa[XA_COMPOUND_TEXT])
3329 ? XCompoundTextStyle : XStdICCTextStyle;
3330 } else
3331#endif
3332 {
3333 target = XA_STRING;
3334 style = XStringStyle; 3371 style = XCompoundTextStyle;
3335 } 3372 }
3373
3336 if (R->selection.text) { 3374 if (R->selection.text) {
3337 cl[0] = (char *)R->selection.text; 3375 cl = (char *)R->selection.text;
3338 selectlen = R->selection.len; 3376 selectlen = R->selection.len;
3339 } else { 3377 } else {
3340 cl[0] = dummy; 3378 cl = "";
3341 *dummy = '\0';
3342 selectlen = 0; 3379 selectlen = 0;
3343 } 3380 }
3344#ifdef USE_XIM 3381
3345 if (XmbTextListToTextProperty(R->Xdisplay, cl, 1, style, &ct) 3382 if (XmbTextListToTextProperty(R->Xdisplay, &cl, 1, style, &ct) >= 0)
3346 == Success) /* if we failed to convert then send it raw */
3347 freect = 1; 3383 freect = 1;
3348 else 3384 else
3349#endif
3350 { 3385 {
3386 /* if we failed to convert then send it raw */
3351 ct.value = (unsigned char *)cl[0]; 3387 ct.value = (unsigned char *)cl;
3352 ct.nitems = selectlen; 3388 ct.nitems = selectlen;
3353 } 3389 }
3390
3354 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, 3391 XChangeProperty(R->Xdisplay, rq->requestor, rq->property,
3355 target, 8, PropModeReplace, 3392 target, 8, PropModeReplace,
3356 ct.value, (int)ct.nitems); 3393 ct.value, (int)ct.nitems);
3357 ev.property = rq->property; 3394 ev.property = rq->property;
3358#ifdef USE_XIM 3395
3359 if (freect) 3396 if (freect)
3360 XFree(ct.value); 3397 XFree (ct.value);
3361#endif
3362 } 3398 }
3363 XSendEvent(R->Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev); 3399 XSendEvent(R->Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev);
3364} 3400}
3365 3401
3366/* ------------------------------------------------------------------------- * 3402/* ------------------------------------------------------------------------- *

Diff Legend

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