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.136 by root, Tue Sep 7 21:05:41 2004 UTC vs.
Revision 1.147 by root, Sun Dec 12 15:13:37 2004 UTC

… …
566 return scrn; 566 return scrn;
567 567
568 selection_check (2); /* check for boundary cross */ 568 selection_check (2); /* check for boundary cross */
569 569
570 SWAP_IT (current_screen, scrn, int); 570 SWAP_IT (current_screen, scrn, int);
571
572 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
573 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
574# ifdef DEBUG_STRICT
575 assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow);
576 assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol);
577# else /* drive with your eyes closed */
578 MAX_IT (screen.cur.row, 0);
579 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
580 MAX_IT (screen.cur.col, 0);
581 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
582# endif
583
571#if NSCREENS 584#if NSCREENS
572 if (options & Opt_secondaryScreen) 585 if (options & Opt_secondaryScreen)
573 { 586 {
574 num_scr = 0; 587 num_scr = 0;
575 offset = TermWin.saveLines; 588 offset = TermWin.saveLines;
589
576 for (i = prev_nrow; i--;) 590 for (i = prev_nrow; i--;)
577 { 591 {
578 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 592 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
579 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 593 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
580 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 594 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
581 } 595 }
582 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 596
583 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
584# ifdef DEBUG_STRICT
585 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
586 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
587# else /* drive with your eyes closed */
588 MAX_IT (screen.cur.row, 0);
589 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
590 MAX_IT (screen.cur.col, 0);
591 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
592# endif
593 SWAP_IT (screen.charset, swap.charset, int16_t); 597 SWAP_IT (screen.charset, swap.charset, int16_t);
594 SWAP_IT (screen.flags, swap.flags, int); 598 SWAP_IT (screen.flags, swap.flags, int);
595 screen.flags |= Screen_VisibleCursor; 599 screen.flags |= Screen_VisibleCursor;
596 swap.flags |= Screen_VisibleCursor; 600 swap.flags |= Screen_VisibleCursor;
597 } 601 }
598 else 602 else
599#endif 603#endif
600 if (options & Opt_secondaryScroll) 604 if (options & Opt_secondaryScroll)
601 //if (current_screen == PRIMARY) 605 //if (current_screen == PRIMARY)
602 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 606 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
607
603 return scrn; 608 return scrn;
604} 609}
605 610
606// clear WrapNext indicator, solidifying position on next line 611// clear WrapNext indicator, solidifying position on next line
607void 612void
… …
878 883
879 stp = screen.text[row]; /* _must_ refresh */ 884 stp = screen.text[row]; /* _must_ refresh */
880 srp = screen.rend[row]; /* _must_ refresh */ 885 srp = screen.rend[row]; /* _must_ refresh */
881 } 886 }
882 887
883 if (screen.flags & Screen_Insert)
884 scr_insdel_chars (1, INSERT);
885
886 // rely on wcwidth to tell us the character width, at least for non-latin1 888 // rely on wcwidth to tell us the character width, at least for non-latin1
887 // do wcwidth before further replacements, as wcwidth says that line-drawing 889 // do wcwidth before further replacements, as wcwidth says that line-drawing
888 // characters have width -1 (DOH!) on GNU/Linux sometimes. 890 // characters have width -1 (DOH!) on GNU/Linux sometimes.
889 int width = c < 0x100 ? 1 : wcwidth (c); 891 int width = c < 0x100 ? 1 : wcwidth (c);
890 892
891 if (charsets[screen.charset] == '0') // DEC SPECIAL 893 if (charsets[screen.charset] == '0') // DEC SPECIAL
892 { 894 {
893 // vt100 special graphics and line drawing 895 // vt100 special graphics and line drawing
894 // 5f-7e standard vt100 896 // 5f-7e standard vt100
895 // 40-5e rxvt extension for extra curses acs chars 897 // 40-5e rxvt extension for extra curses acs chars
896 static uint16_t vt100_0[63] = { // 5f .. 7e 898 static uint16_t vt100_0[63] = { // 40 .. 7e
897 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! 899 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
898 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
899 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 901 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 902 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
901 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 903 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
… …
909 c = vt100_0[c - 0x40]; 911 c = vt100_0[c - 0x40];
910 width = 1; 912 width = 1;
911 } 913 }
912 } 914 }
913 915
916 if (screen.flags & Screen_Insert)
917 scr_insdel_chars (width, INSERT);
918
914 if (width != 0) 919 if (width != 0)
915 { 920 {
916 // some utf-8 decoders decode surrogate characters. 921 // some utf-8 decoders decode surrogate characters.
917 if (0xd800 <= c && c <= 0xdfff) 922 if (0xd800 <= c && c <= 0xdfff)
918 c = 0xfffd; 923 c = 0xfffd;
… …
968 c = NOCHAR; 973 c = NOCHAR;
969 } 974 }
970 while (--width > 0); 975 while (--width > 0);
971 976
972 // pad with spaces when overwriting wide character with smaller one 977 // pad with spaces when overwriting wide character with smaller one
978 if (!width)
973 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 979 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
974 { 980 {
975 stp[c] = ' '; 981 stp[c] = ' ';
976 srp[c] = rend; 982 srp[c] = rend;
977 } 983 }
978 } 984 }
979 else if (width == 0) 985 else if (width == 0)
980 { 986 {
981#if ENABLE_COMBINING 987#if ENABLE_COMBINING
982 // handle combining characters 988 // handle combining characters
… …
1095 if (count) 1101 if (count)
1096 x = TermWin.ncol - 1; 1102 x = TermWin.ncol - 1;
1097 1103
1098 // store horizontal tab commands as characters inside the text 1104 // store horizontal tab commands as characters inside the text
1099 // buffer so they can be selected and pasted. 1105 // buffer so they can be selected and pasted.
1100 if (ht) 1106 if (ht && options & Opt_pastableTabs)
1101 { 1107 {
1102 base_rend = SET_FONT (base_rend, 0); 1108 base_rend = SET_FONT (base_rend, 0);
1103 1109
1104 if (screen.tlen[row] != -1) /* XXX: think about this */ 1110 if (screen.tlen[row] != -1) /* XXX: think about this */
1105 MAX_IT (screen.tlen[row], x); 1111 MAX_IT (screen.tlen[row], x);
… …
1378 ren = DEFAULT_RSTYLE; 1384 ren = DEFAULT_RSTYLE;
1379 CLEAR_ROWS (row, num); 1385 CLEAR_ROWS (row, num);
1380 } 1386 }
1381 else 1387 else
1382 { 1388 {
1383 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1389 ren = rstyle & (RS_fgMask | RS_bgMask);
1384 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1390 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1385 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1391 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1386 ERASE_ROWS (row, num); 1392 ERASE_ROWS (row, num);
1387 gcvalue.foreground = pix_colors[Color_fg]; 1393 gcvalue.foreground = pix_colors[Color_fg];
1388 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1394 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1389 } 1395 }
1390 1396
1391 for (; num--; row++) 1397 for (; num--; row++)
1392 { 1398 {
1393 scr_blank_screen_mem (screen.text, screen.rend, 1399 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);
1394 (unsigned int) (row + row_offset), rstyle);
1395 screen.tlen[row + row_offset] = 0; 1400 screen.tlen[row + row_offset] = 0;
1396 scr_blank_line (drawn_text[row], drawn_rend[row], 1401 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1397 (unsigned int)TermWin.ncol, ren);
1398 } 1402 }
1399} 1403}
1400 1404
1401/* ------------------------------------------------------------------------- */ 1405/* ------------------------------------------------------------------------- */
1402/* 1406/*
… …
2241 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2245 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2242 continue; 2246 continue;
2243 2247
2244 // redraw one or more characters 2248 // redraw one or more characters
2245 2249
2246 // seek to the beginning if wide characters 2250 // seek to the beginning of wide characters
2247 while (stp[col] == NOCHAR && col > 0) 2251 while (stp[col] == NOCHAR && col > 0)
2248 --col; 2252 --col;
2249 2253
2250 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2254 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2251 text_t *text = stp + col; 2255 text_t *text = stp + col;
… …
2395 } 2399 }
2396 else 2400 else
2397 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2398 2402
2399 if (rend & RS_Uline && font->descent > 1 && fore != back) 2403 if (rend & RS_Uline && font->descent > 1 && fore != back)
2404 {
2405 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2400 XDrawLine (display->display, drawBuffer, TermWin.gc, 2406 XDrawLine (display->display, drawBuffer, TermWin.gc,
2401 xpixel, ypixel + font->ascent + 1, 2407 xpixel, ypixel + font->ascent + 1,
2402 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2408 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2409 }
2403 } /* for (col....) */ 2410 } /* for (col....) */
2404 } /* for (row....) */ 2411 } /* for (row....) */
2405 2412
2406#if ENABLE_OVERLAY 2413#if ENABLE_OVERLAY
2407 scr_swap_overlay (); 2414 scr_swap_overlay ();
… …
2751 2758
2752 nread += ct.nitems; 2759 nread += ct.nitems;
2753 2760
2754 char **cl; 2761 char **cl;
2755 int cr; 2762 int cr;
2763
2764#if ENABLE_FRILLS
2765 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2766 // so recode it manually
2767 if (ct.encoding == xa[XA_UTF8_STRING])
2768 {
2769 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2770 char *s = rxvt_wcstombs (w);
2771
2772 // TODO: strlen == only the first element will be converted. well...
2773 paste ((unsigned char *)s, strlen (s));
2774
2775 free (s);
2776 free (w);
2777 }
2778 else
2779#endif
2756 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2780 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2757 { 2781 {
2758 for (int i = 0; i < cr; i++) 2782 for (int i = 0; i < cr; i++)
2759 paste ((unsigned char *)cl[i], strlen (cl[i])); 2783 paste ((unsigned char *)cl[i], strlen (cl[i]));
2760 2784
… …
2843#else 2867#else
2844 selection_type = Sel_CompoundText; 2868 selection_type = Sel_CompoundText;
2845 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2869 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2846 return; 2870 return;
2847#endif 2871#endif
2848
2849 } 2872 }
2850 } 2873 }
2851 2874
2852 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2875 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2853 selection_paste (display->root, XA_CUT_BUFFER0, False); 2876 selection_paste (display->root, XA_CUT_BUFFER0, False);
… …
3014#if 0 3037#if 0
3015 XTextProperty ct; 3038 XTextProperty ct;
3016 3039
3017 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3040 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3018 { 3041 {
3019 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3042 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3020 PropModeReplace, ct.value, ct.nitems);
3021 XFree (ct.value); 3043 XFree (ct.value);
3022 } 3044 }
3023#endif 3045#endif
3024 3046
3025 selection_time = tm; 3047 selection_time = tm;
… …
3367#if ENABLE_FRILLS 3389#if ENABLE_FRILLS
3368 if ((options & Opt_tripleclickwords)) 3390 if ((options & Opt_tripleclickwords))
3369 { 3391 {
3370 int end_row; 3392 int end_row;
3371 3393
3372 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3394 selection_delimit_word (UP, &selection.beg, &selection.beg);
3373 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3395 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3374 3396
3375 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3397 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3376 { 3398 {
3377 end_col = screen.tlen[end_row + TermWin.saveLines]; 3399 end_col = screen.tlen[end_row + TermWin.saveLines];
… …
3473 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3495 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3474} 3496}
3475 3497
3476/* ------------------------------------------------------------------------- */ 3498/* ------------------------------------------------------------------------- */
3477/* 3499/*
3478 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3479 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3480 * the X11 protocol.
3481 */
3482typedef CARD32 Atom32;
3483
3484/* ------------------------------------------------------------------------- */
3485/*
3486 * Respond to a request for our current selection 3500 * Respond to a request for our current selection
3487 * EXT: SelectionRequest 3501 * EXT: SelectionRequest
3488 */ 3502 */
3489void 3503void
3490rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3504rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3491{ 3505{
3492 XSelectionEvent ev; 3506 XSelectionEvent ev;
3493 XTextProperty ct;
3494 XICCEncodingStyle style;
3495 Atom target;
3496 3507
3497 ev.type = SelectionNotify; 3508 ev.type = SelectionNotify;
3498 ev.property = None; 3509 ev.property = None;
3499 ev.display = rq.display; 3510 ev.display = rq.display;
3500 ev.requestor = rq.requestor; 3511 ev.requestor = rq.requestor;
… …
3502 ev.target = rq.target; 3513 ev.target = rq.target;
3503 ev.time = rq.time; 3514 ev.time = rq.time;
3504 3515
3505 if (rq.target == xa[XA_TARGETS]) 3516 if (rq.target == xa[XA_TARGETS])
3506 { 3517 {
3507 Atom32 target_list[6]; 3518 Atom target_list[6];
3508 Atom32 *target = target_list; 3519 Atom *target = target_list;
3509 3520
3510 *target++ = (Atom32) xa[XA_TARGETS]; 3521 *target++ = xa[XA_TARGETS];
3511 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3522 *target++ = xa[XA_TIMESTAMP];
3512 *target++ = (Atom32) XA_STRING; 3523 *target++ = XA_STRING;
3513 *target++ = (Atom32) xa[XA_TEXT]; 3524 *target++ = xa[XA_TEXT];
3514 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3525 *target++ = xa[XA_COMPOUND_TEXT];
3515#if X_HAVE_UTF8_STRING 3526#if X_HAVE_UTF8_STRING
3516 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3527 *target++ = xa[XA_UTF8_STRING];
3517#endif 3528#endif
3518 3529
3519 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3530 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3520 (8 * sizeof (target_list[0])), PropModeReplace, 3531 32, PropModeReplace,
3521 (unsigned char *)target_list, 3532 (unsigned char *)target_list, target - target_list);
3522 target - target_list);
3523 ev.property = rq.property; 3533 ev.property = rq.property;
3524 } 3534 }
3525#if TODO // TODO 3535#if TODO // TODO
3526 else if (rq.target == xa[XA_MULTIPLE]) 3536 else if (rq.target == xa[XA_MULTIPLE])
3527 { 3537 {
3528 /* TODO: Handle MULTIPLE */ 3538 /* TODO: Handle MULTIPLE */
3529 } 3539 }
3530#endif 3540#endif
3531 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3541 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3532 { 3542 {
3533 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3543 XChangeProperty (display->display, rq.requestor, rq.property, rq.target,
3534 (8 * sizeof (Time)), PropModeReplace,
3535 (unsigned char *)&selection_time, 1); 3544 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3536 ev.property = rq.property; 3545 ev.property = rq.property;
3537 } 3546 }
3538 else if (rq.target == XA_STRING 3547 else if (rq.target == XA_STRING
3539 || rq.target == xa[XA_TEXT] 3548 || rq.target == xa[XA_TEXT]
3540 || rq.target == xa[XA_COMPOUND_TEXT] 3549 || rq.target == xa[XA_COMPOUND_TEXT]
3541 || rq.target == xa[XA_UTF8_STRING] 3550 || rq.target == xa[XA_UTF8_STRING]
3542 ) 3551 )
3543 { 3552 {
3553 XTextProperty ct;
3554 Atom target = rq.target;
3544 short freect = 0; 3555 short freect = 0;
3545 int selectlen; 3556 int selectlen;
3546 wchar_t *cl; 3557 wchar_t *cl;
3547 3558 enum {
3548 target = rq.target; 3559 enc_string = XStringStyle,
3560 enc_text = XStdICCTextStyle,
3561 enc_compound_text = XCompoundTextStyle,
3562#ifdef X_HAVE_UTF8_STRING
3563 enc_utf8 = XUTF8StringStyle,
3564#else
3565 enc_utf8 = -1,
3566#endif
3567 } style;
3549 3568
3550 if (target == XA_STRING) 3569 if (target == XA_STRING)
3551 // we actually don't do XA_STRING, but who cares, as i18n clients 3570 // we actually don't do XA_STRING, but who cares, as i18n clients
3552 // will ask for another format anyways. 3571 // will ask for another format anyways.
3553 style = XStringStyle; 3572 style = enc_string;
3554 else if (target == xa[XA_TEXT]) 3573 else if (target == xa[XA_TEXT])
3555 style = XStdICCTextStyle; 3574 style = enc_text;
3556 else if (target == xa[XA_COMPOUND_TEXT]) 3575 else if (target == xa[XA_COMPOUND_TEXT])
3557 style = XCompoundTextStyle; 3576 style = enc_compound_text;
3558#if X_HAVE_UTF8_STRING 3577#if ENABLE_FRILLS
3559 else if (target == xa[XA_UTF8_STRING]) 3578 else if (target == xa[XA_UTF8_STRING])
3560 style = XUTF8StringStyle; 3579 style = enc_utf8;
3561#endif 3580#endif
3562 else 3581 else
3563 { 3582 {
3564 target = xa[XA_COMPOUND_TEXT]; 3583 target = xa[XA_COMPOUND_TEXT];
3565 style = XCompoundTextStyle; 3584 style = enc_compound_text;
3566 } 3585 }
3567 3586
3568 if (selection.text) 3587 if (selection.text)
3569 { 3588 {
3570 cl = selection.text; 3589 cl = selection.text;
… …
3574 { 3593 {
3575 cl = L""; 3594 cl = L"";
3576 selectlen = 0; 3595 selectlen = 0;
3577 } 3596 }
3578 3597
3579 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3598#if ENABLE_FRILLS
3580 // manually for XUTF8StringStyle. 3599 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3600 // so recode it manually
3601 if (style == enc_utf8)
3602 {
3603 freect = 1;
3604 ct.encoding = target;
3605 ct.format = 8;
3606 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3607 ct.nitems = strlen ((char *)ct.value);
3608 }
3609 else
3610#endif
3581 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3611 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3582 freect = 1; 3612 freect = 1;
3583 else 3613 else
3584 { 3614 {
3585 /* if we failed to convert then send it raw */ 3615 /* if we failed to convert then send it raw */
3586 ct.value = (unsigned char *)cl; 3616 ct.value = (unsigned char *)cl;
3587 ct.nitems = selectlen; 3617 ct.nitems = selectlen;
3618 ct.encoding = target;
3588 } 3619 }
3589 3620
3590 XChangeProperty (display->display, rq.requestor, rq.property, 3621 XChangeProperty (display->display, rq.requestor, rq.property,
3591 target, 8, PropModeReplace, 3622 ct.encoding, 8, PropModeReplace,
3592 ct.value, (int)ct.nitems); 3623 ct.value, (int)ct.nitems);
3593 ev.property = rq.property; 3624 ev.property = rq.property;
3594 3625
3595 if (freect) 3626 if (freect)
3596 XFree (ct.value); 3627 XFree (ct.value);

Diff Legend

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