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.143 by root, Sat Dec 4 04:06:03 2004 UTC vs.
Revision 1.147 by root, Sun Dec 12 15:13:37 2004 UTC

… …
973 c = NOCHAR; 973 c = NOCHAR;
974 } 974 }
975 while (--width > 0); 975 while (--width > 0);
976 976
977 // pad with spaces when overwriting wide character with smaller one 977 // pad with spaces when overwriting wide character with smaller one
978 if (!width)
978 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++)
979 { 980 {
980 stp[c] = ' '; 981 stp[c] = ' ';
981 srp[c] = rend; 982 srp[c] = rend;
982 } 983 }
983 } 984 }
984 else if (width == 0) 985 else if (width == 0)
985 { 986 {
986#if ENABLE_COMBINING 987#if ENABLE_COMBINING
987 // handle combining characters 988 // handle combining characters
… …
2398 } 2399 }
2399 else 2400 else
2400 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2401 2402
2402 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]);
2403 XDrawLine (display->display, drawBuffer, TermWin.gc, 2406 XDrawLine (display->display, drawBuffer, TermWin.gc,
2404 xpixel, ypixel + font->ascent + 1, 2407 xpixel, ypixel + font->ascent + 1,
2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2408 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2409 }
2406 } /* for (col....) */ 2410 } /* for (col....) */
2407 } /* for (row....) */ 2411 } /* for (row....) */
2408 2412
2409#if ENABLE_OVERLAY 2413#if ENABLE_OVERLAY
2410 scr_swap_overlay (); 2414 scr_swap_overlay ();
… …
2754 2758
2755 nread += ct.nitems; 2759 nread += ct.nitems;
2756 2760
2757 char **cl; 2761 char **cl;
2758 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
2759 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2780 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2760 { 2781 {
2761 for (int i = 0; i < cr; i++) 2782 for (int i = 0; i < cr; i++)
2762 paste ((unsigned char *)cl[i], strlen (cl[i])); 2783 paste ((unsigned char *)cl[i], strlen (cl[i]));
2763 2784
… …
2846#else 2867#else
2847 selection_type = Sel_CompoundText; 2868 selection_type = Sel_CompoundText;
2848 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2869 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2849 return; 2870 return;
2850#endif 2871#endif
2851
2852 } 2872 }
2853 } 2873 }
2854 2874
2855 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2875 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2856 selection_paste (display->root, XA_CUT_BUFFER0, False); 2876 selection_paste (display->root, XA_CUT_BUFFER0, False);
… …
3017#if 0 3037#if 0
3018 XTextProperty ct; 3038 XTextProperty ct;
3019 3039
3020 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3040 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3021 { 3041 {
3022 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3042 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3023 PropModeReplace, ct.value, ct.nitems);
3024 XFree (ct.value); 3043 XFree (ct.value);
3025 } 3044 }
3026#endif 3045#endif
3027 3046
3028 selection_time = tm; 3047 selection_time = tm;
… …
3483 */ 3502 */
3484void 3503void
3485rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3504rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3486{ 3505{
3487 XSelectionEvent ev; 3506 XSelectionEvent ev;
3488 XTextProperty ct;
3489 XICCEncodingStyle style;
3490 Atom target;
3491 3507
3492 ev.type = SelectionNotify; 3508 ev.type = SelectionNotify;
3493 ev.property = None; 3509 ev.property = None;
3494 ev.display = rq.display; 3510 ev.display = rq.display;
3495 ev.requestor = rq.requestor; 3511 ev.requestor = rq.requestor;
… …
3532 || rq.target == xa[XA_TEXT] 3548 || rq.target == xa[XA_TEXT]
3533 || rq.target == xa[XA_COMPOUND_TEXT] 3549 || rq.target == xa[XA_COMPOUND_TEXT]
3534 || rq.target == xa[XA_UTF8_STRING] 3550 || rq.target == xa[XA_UTF8_STRING]
3535 ) 3551 )
3536 { 3552 {
3553 XTextProperty ct;
3554 Atom target = rq.target;
3537 short freect = 0; 3555 short freect = 0;
3538 int selectlen; 3556 int selectlen;
3539 wchar_t *cl; 3557 wchar_t *cl;
3540 3558 enum {
3541 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;
3542 3568
3543 if (target == XA_STRING) 3569 if (target == XA_STRING)
3544 // 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
3545 // will ask for another format anyways. 3571 // will ask for another format anyways.
3546 style = XStringStyle; 3572 style = enc_string;
3547 else if (target == xa[XA_TEXT]) 3573 else if (target == xa[XA_TEXT])
3548 style = XStdICCTextStyle; 3574 style = enc_text;
3549 else if (target == xa[XA_COMPOUND_TEXT]) 3575 else if (target == xa[XA_COMPOUND_TEXT])
3550 style = XCompoundTextStyle; 3576 style = enc_compound_text;
3551#if X_HAVE_UTF8_STRING 3577#if ENABLE_FRILLS
3552 else if (target == xa[XA_UTF8_STRING]) 3578 else if (target == xa[XA_UTF8_STRING])
3553 style = XUTF8StringStyle; 3579 style = enc_utf8;
3554#endif 3580#endif
3555 else 3581 else
3556 { 3582 {
3557 target = xa[XA_COMPOUND_TEXT]; 3583 target = xa[XA_COMPOUND_TEXT];
3558 style = XCompoundTextStyle; 3584 style = enc_compound_text;
3559 } 3585 }
3560 3586
3561 if (selection.text) 3587 if (selection.text)
3562 { 3588 {
3563 cl = selection.text; 3589 cl = selection.text;
… …
3567 { 3593 {
3568 cl = L""; 3594 cl = L"";
3569 selectlen = 0; 3595 selectlen = 0;
3570 } 3596 }
3571 3597
3572 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3598#if ENABLE_FRILLS
3573 // 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
3574 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3611 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3575 freect = 1; 3612 freect = 1;
3576 else 3613 else
3577 { 3614 {
3578 /* if we failed to convert then send it raw */ 3615 /* if we failed to convert then send it raw */
3579 ct.value = (unsigned char *)cl; 3616 ct.value = (unsigned char *)cl;
3580 ct.nitems = selectlen; 3617 ct.nitems = selectlen;
3618 ct.encoding = target;
3581 } 3619 }
3582 3620
3583 XChangeProperty (display->display, rq.requestor, rq.property, 3621 XChangeProperty (display->display, rq.requestor, rq.property,
3584 target, 8, PropModeReplace, 3622 ct.encoding, 8, PropModeReplace,
3585 ct.value, (int)ct.nitems); 3623 ct.value, (int)ct.nitems);
3586 ev.property = rq.property; 3624 ev.property = rq.property;
3587 3625
3588 if (freect) 3626 if (freect)
3589 XFree (ct.value); 3627 XFree (ct.value);

Diff Legend

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