--- rxvt-unicode/src/rxvtperl.xs 2006/01/06 05:37:59 1.31 +++ rxvt-unicode/src/rxvtperl.xs 2006/01/07 19:29:17 1.36 @@ -103,7 +103,7 @@ return (long)mg->mg_ptr; } -#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) +#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) #define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") ///////////////////////////////////////////////////////////////////////////// @@ -292,14 +292,14 @@ { char key[33]; sprintf (key, "%32lx", (long)this); - HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0)); + HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)); hv_store (hv, key, 32, newSViv ((long)this), 0); } void overlay::hide () { - SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0); + SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0); if (ovs) { @@ -417,10 +417,10 @@ if (htype == HOOK_INIT) // first hook ever called { - term->self = (void *)newSVptr ((void *)term, "urxvt::term"); - hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); + term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); + hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); } - else if (!term->self) + else if (!term->perl.self) return false; // perl not initialized for this instance else if (htype == HOOK_DESTROY) { @@ -428,7 +428,7 @@ } else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) { - HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); + HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); if (HvKEYS (hv)) { @@ -467,11 +467,11 @@ XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); break; - case DT_STRING: + case DT_STR: XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); break; - case DT_STRING_LEN: + case DT_STR_LEN: { char *str = va_arg (ap, char *); int len = va_arg (ap, int); @@ -480,6 +480,15 @@ } break; + case DT_WCS_LEN: + { + wchar_t *wstr = va_arg (ap, wchar_t *); + int wlen = va_arg (ap, int); + + XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); + } + break; + case DT_XEVENT: { XEvent *xe = va_arg (ap, XEvent *); @@ -532,20 +541,6 @@ } break; - case DT_USTRING_LEN: - { - unicode_t *ustr = va_arg (ap, unicode_t *); - int ulen = va_arg (ap, int); - wchar_t *wstr = new wchar_t [ulen]; - - for (int i = ulen; i--; ) - wstr [i] = ustr [i]; - - XPUSHs (sv_2mortal (wcs2sv (wstr, ulen))); - - delete [] wstr; - } - case DT_END: { va_end (ap); @@ -569,8 +564,8 @@ if (htype == HOOK_DESTROY) { - clearSVptr ((SV *)term->self); - SvREFCNT_dec ((SV *)term->self); + clearSVptr ((SV *)term->perl.self); + SvREFCNT_dec ((SV *)term->perl.self); } return count; @@ -603,6 +598,7 @@ export_const (RS_Blink); export_const (RS_RVid); export_const (RS_Uline); + export_const (CurrentTime); sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); } @@ -632,7 +628,7 @@ croak ("exception caught while initializing new terminal instance"); } - RETVAL = term && term->self ? newSVterm (term) : &PL_sv_undef; + RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef; } OUTPUT: RETVAL @@ -712,6 +708,57 @@ void rxvt_term::destroy () +void +rxvt_term::grab_button (int button, U32 modifiers) + CODE: + XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, + ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, + GrabModeSync, GrabModeSync, None, None); + +bool +rxvt_term::grab (U32 eventtime, int sync = 0) + CODE: +{ + int mode = sync ? GrabModeSync : GrabModeAsync; + + THIS->perl.grabtime = 0; + + if (!XGrabPointer (THIS->display->display, THIS->vt, 0, + ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, + mode, mode, None, None, eventtime)) + if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) + THIS->perl.grabtime = eventtime; + else + XUngrabPointer (THIS->display->display, eventtime); + + RETVAL = !!THIS->perl.grabtime; +} + OUTPUT: + RETVAL + +void +rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime) + CODE: + XAllowEvents (THIS->display->display, AsyncBoth, eventtime); + +void +rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime) + CODE: + XAllowEvents (THIS->display->display, SyncBoth, eventtime); + +void +rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime) + CODE: + XAllowEvents (THIS->display->display, ReplayPointer, eventtime); + XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime); + +void +rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime) + CODE: + THIS->perl.grabtime = 0; + XUngrabKeyboard (THIS->display->display, eventtime); + XUngrabPointer (THIS->display->display, eventtime); + int rxvt_term::strwidth (SV *str) CODE: @@ -855,10 +902,10 @@ { wchar_t *wstr = new wchar_t [THIS->ncol]; - for (int col = 0; col ncol; col++) + for (int col = 0; col < THIS->ncol; col++) wstr [col] = l.t [col]; - XPUSHs (sv_2mortal (wcs2sv (wstr))); + XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); delete [] wstr; } @@ -958,14 +1005,79 @@ RETVAL SV * -rxvt_term::special_encode (SV *str) +rxvt_term::special_encode (SV *string) CODE: - abort ();//TODO +{ + wchar_t *wstr = sv2wcs (string); + int wlen = wcslen (wstr); + wchar_t *rstr = new wchar_t [wlen]; // cannot become longer + + rxvt_push_locale (THIS->locale); + + wchar_t *r = rstr; + for (wchar_t *s = wstr; *s; s++) + if (wcwidth (*s) == 0) + { + if (r == rstr) + croak ("leading combining character unencodable"); + + unicode_t n = rxvt_compose (r[-1], *s); + if (n == NOCHAR) + n = rxvt_composite.compose (r[-1], *s); + + r[-1] = n; + } +#if !UNICODE_3 + else if (*s >= 0x10000) + *r++ = rxvt_composite.compose (*s); +#endif + else + *r++ = *s; + + rxvt_pop_locale (); + + RETVAL = wcs2sv (rstr, r - rstr); + + delete [] rstr; +} + OUTPUT: + RETVAL SV * -rxvt_term::special_decode (SV *str) +rxvt_term::special_decode (SV *text) CODE: - abort ();//TODO +{ + wchar_t *wstr = sv2wcs (text); + int wlen = wcslen (wstr); + int dlen = 0; + + // find length + for (wchar_t *s = wstr; *s; s++) + if (*s == NOCHAR) + ; + else if (IS_COMPOSE (*s)) + dlen += rxvt_composite.expand (*s, 0); + else + dlen++; + + wchar_t *rstr = new wchar_t [dlen]; + + // decode + wchar_t *r = rstr; + for (wchar_t *s = wstr; *s; s++) + if (*s == NOCHAR) + ; + else if (IS_COMPOSE (*s)) + r += rxvt_composite.expand (*s, r); + else + *r++ = *s; + + RETVAL = wcs2sv (rstr, r - rstr); + + delete [] rstr; +} + OUTPUT: + RETVAL void rxvt_term::_resource (char *name, int index, SV *newval = 0) @@ -1040,7 +1152,7 @@ } int -rxvt_term::selection_grab (int eventtime = CurrentTime) +rxvt_term::selection_grab (U32 eventtime) void rxvt_term::selection (SV *newtext = 0) @@ -1063,20 +1175,8 @@ CODE: { wchar_t *wstr = sv2wcs (string); - int wlen = wcslen (wstr); - unicode_t *ustr = new unicode_t [wlen]; - int nlines = 0; - - for (int i = wlen; i--; ) - { - ustr [i] = wstr [i]; - nlines += ustr [i] == '\012'; - } - - THIS->scr_add_lines (ustr, nlines, wlen); - + THIS->scr_add_lines (wstr, wcslen (wstr)); free (wstr); - delete [] ustr; } void @@ -1100,7 +1200,9 @@ THIS->cmdbuf_ptr = str; THIS->cmdbuf_endp = str + len; + rxvt_push_locale (THIS->locale); THIS->cmd_parse (); + rxvt_pop_locale (); THIS->cmdbuf_ptr = old_cmdbuf_ptr; THIS->cmdbuf_endp = old_cmdbuf_endp;