--- rxvt-unicode/src/rxvtperl.xs 2006/01/03 18:11:34 1.17 +++ rxvt-unicode/src/rxvtperl.xs 2006/01/05 21:21:49 1.26 @@ -53,6 +53,18 @@ } static SV * +wcs2sv (wchar_t *wstr, int len = -1) +{ + char *str = rxvt_wcstoutf8 (wstr, len); + + SV *sv = newSVpv (str, 0); + SvUTF8_on (sv); + free (str); + + return sv; +} + +static SV * new_ref (HV *hv, const char *klass) { return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1)); @@ -63,22 +75,32 @@ newSVptr (void *ptr, const char *klass) { HV *hv = newHV (); - hv_store (hv, "_ptr", 4, newSViv ((long)ptr), 0); + sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); } +static void +clearSVptr (SV *sv) +{ + if (SvROK (sv)) + sv = SvRV (sv); + + hv_clear ((HV *)sv); + sv_unmagic (sv, PERL_MAGIC_ext); +} + static long SvPTR (SV *sv, const char *klass) { if (!sv_derived_from (sv, klass)) croak ("object of type %s expected", klass); - IV iv = SvIV (*hv_fetch ((HV *)SvRV (sv), "_ptr", 4, 1)); + MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); - if (!iv) + if (!mg) croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); - return (long)iv; + return (long)mg->mg_ptr; } #define newSVterm(term) SvREFCNT_inc ((SV *)term->self) @@ -188,6 +210,9 @@ overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); ~overlay (); + void show (); + void hide (); + void swap (); void set (int x, int y, SV *str, SV *rend); @@ -204,15 +229,15 @@ text = new text_t *[h]; rend = new rend_t *[h]; - + for (int y = 0; y < h; y++) - { + { text_t *tp = text[y] = new text_t[w]; rend_t *rp = rend[y] = new rend_t[w]; - + text_t t0, t1, t2; rend_t r = rstyle; - + if (border == 2) { if (y == 0) @@ -221,32 +246,35 @@ t0 = 0x2551, t1 = 0x0020, t2 = 0x2551; else t0 = 0x255a, t1 = 0x2550, t2 = 0x255d; - - *tp++ = t0; + + *tp++ = t0; *rp++ = r; - + for (int x = w - 2; x-- > 0; ) { *tp++ = t1; *rp++ = r; - } + } *tp = t2; - *rp = r; + *rp = r; } else for (int x = w; x-- > 0; ) { *tp++ = 0x0020; *rp++ = r; - } - } + } + } + show (); THIS->want_refresh = 1; } overlay::~overlay () { + hide (); + for (int y = h; y--; ) { delete [] text[y]; @@ -259,6 +287,29 @@ THIS->want_refresh = 1; } +void +overlay::show () +{ + char key[33]; sprintf (key, "%32lx", (long)this); + + HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->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); + + if (ovs) + { + char key[33]; sprintf (key, "%32lx", (long)this); + + HV *hv = (HV *)SvRV (*ovs); + hv_delete (hv, key, 32, G_DISCARD); + } +} + void overlay::swap () { int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); @@ -271,12 +322,12 @@ { text_t *t1 = text [y]; rend_t *r1 = rend [y]; - + text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x; rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x; for (int x = ov_w; x--; ) - { + { text_t t = *t1; *t1++ = *t2; *t2++ = t; rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t)); } @@ -296,7 +347,7 @@ for (int col = min (wcslen (wtext), w - x - border); col--; ) this->text [y][x + col] = wtext [col]; - + free (wtext); if (rend) @@ -363,7 +414,7 @@ { if (!perl) return false; - + if (htype == HOOK_INIT) // first hook ever called { term->self = (void *)newSVptr ((void *)term, "urxvt::term"); @@ -420,6 +471,20 @@ XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 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); @@ -443,8 +508,7 @@ if (htype == HOOK_DESTROY) { - // TODO: clear magic - hv_clear ((HV *)SvRV ((SV *)term->self)); + clearSVptr ((SV *)term->self); SvREFCNT_dec ((SV *)term->self); } @@ -465,25 +529,11 @@ BOOT: { -# define set_hookname(sym) av_store (hookname, PP_CONCAT(HOOK_, sym), newSVpv (PP_STRINGIFY(sym), 0)) -# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), #name, newSViv (name)); +# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name)); AV *hookname = get_av ("urxvt::HOOKNAME", 1); - set_hookname (INIT); - set_hookname (RESET); - set_hookname (START); - set_hookname (DESTROY); - set_hookname (SEL_BEGIN); - set_hookname (SEL_EXTEND); - set_hookname (SEL_MAKE); - set_hookname (SEL_GRAB); - set_hookname (FOCUS_IN); - set_hookname (FOCUS_OUT); - set_hookname (VIEW_CHANGE); - set_hookname (SCROLL_BACK); - set_hookname (TTY_ACTIVITY); - set_hookname (REFRESH_BEGIN); - set_hookname (REFRESH_END); - set_hookname (KEYBOARD_COMMAND); +# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); +# include "hookinc.h" +# undef def export_const (DEFAULT_RSTYLE); export_const (OVERLAY_RSTYLE); @@ -612,23 +662,58 @@ wchar_t *wstr = rxvt_mbstowcs (data, len); rxvt_pop_locale (); - char *str = rxvt_wcstoutf8 (wstr); + RETVAL = wcs2sv (wstr); free (wstr); - - RETVAL = newSVpv (str, 0); - SvUTF8_on (RETVAL); - free (str); } OUTPUT: RETVAL -int -rxvt_term::nsaved () +# very portable, especially on objects as opposed to pods +#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0) + +#define TERM_OFFSET_width TERM_OFFSET(width) +#define TERM_OFFSET_height TERM_OFFSET(height) +#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) +#define TERM_OFFSET_fheight TERM_OFFSET(fheight) +#define TERM_OFFSET_fbase TERM_OFFSET(fbase) +#define TERM_OFFSET_nrow TERM_OFFSET(nrow) +#define TERM_OFFSET_ncol TERM_OFFSET(ncol) +#define TERM_OFFSET_focus TERM_OFFSET(focus) +#define TERM_OFFSET_mapped TERM_OFFSET(mapped) +#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) +#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) +#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved) + +int +rxvt_term::width () + ALIAS: + width = TERM_OFFSET_width + height = TERM_OFFSET_height + fwidth = TERM_OFFSET_fwidth + fheight = TERM_OFFSET_fheight + fbase = TERM_OFFSET_fbase + nrow = TERM_OFFSET_nrow + ncol = TERM_OFFSET_ncol + focus = TERM_OFFSET_focus + mapped = TERM_OFFSET_mapped + saveLines = TERM_OFFSET_saveLines + total_rows = TERM_OFFSET_total_rows + nsaved = TERM_OFFSET_nsaved CODE: - RETVAL = THIS->nsaved; + RETVAL = *(int *)((char *)THIS + ix); OUTPUT: RETVAL +U32 +rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle) + CODE: +{ + RETVAL = THIS->rstyle; + THIS->rstyle = new_rstyle; +} + OUTPUT: + RETVAL + int rxvt_term::view_start (int newval = -1) CODE: @@ -644,20 +729,6 @@ OUTPUT: RETVAL -int -rxvt_term::nrow () - CODE: - RETVAL = THIS->nrow; - OUTPUT: - RETVAL - -int -rxvt_term::ncol () - CODE: - RETVAL = THIS->ncol; - OUTPUT: - RETVAL - void rxvt_term::want_refresh () CODE: @@ -668,7 +739,7 @@ PPCODE: { if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) - croak ("row_number number of out range"); + XSRETURN_EMPTY; line_t &l = ROW(row_number); @@ -679,13 +750,9 @@ for (int col = 0; col ncol; col++) wstr [col] = l.t [col]; - char *str = rxvt_wcstoutf8 (wstr, THIS->ncol); - free (wstr); + XPUSHs (sv_2mortal (wcs2sv (wstr))); - SV *sv = newSVpv (str, 0); - SvUTF8_on (sv); - XPUSHs (sv_2mortal (sv)); - free (str); + delete [] wstr; } if (new_text) @@ -715,7 +782,7 @@ PPCODE: { if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) - croak ("row_number number of out range"); + XSRETURN_EMPTY; line_t &l = ROW(row_number); @@ -751,21 +818,37 @@ } int -rxvt_term::ROW_l (int row_number, int new_length = -2) +rxvt_term::ROW_l (int row_number, int new_length = -1) CODE: { if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) - croak ("row_number number of out range"); + XSRETURN_EMPTY; line_t &l = ROW(row_number); RETVAL = l.l; - if (new_length >= -1) + if (new_length >= 0) l.l = new_length; } OUTPUT: RETVAL +bool +rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1) + CODE: +{ + if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) + XSRETURN_EMPTY; + + line_t &l = ROW(row_number); + RETVAL = l.is_longer (); + + if (new_is_longer >= 0) + l.is_longer (new_is_longer); +} + OUTPUT: + RETVAL + SV * rxvt_term::special_encode (SV *str) CODE: @@ -781,11 +864,11 @@ PPCODE: { struct resval { const char *name; int value; } rslist [] = { -# define Rs_def(name) { # name, Rs_ ## name }, -# define Rs_reserve(name,count) +# define def(name) { # name, Rs_ ## name }, +# define reserve(name,count) # include "rsinc.h" -# undef Rs_def -# undef Rs_reserve +# undef def +# undef reserve }; struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); @@ -817,28 +900,31 @@ } void -rxvt_term::selection_mark (...) +rxvt_term::cur (...) PROTOTYPE: $;$$ ALIAS: - selection_beg = 1 - selection_end = 2 + screen_cur = 0 + selection_beg = 1 + selection_end = 2 + selection_mark = 3 PPCODE: { - row_col_t &sel = ix == 1 ? THIS->selection.beg - : ix == 2 ? THIS->selection.end - : THIS->selection.mark; + row_col_t &rc = ix == 0 ? THIS->screen.cur + : ix == 1 ? THIS->selection.beg + : ix == 2 ? THIS->selection.end + : THIS->selection.mark; if (GIMME_V != G_VOID) { EXTEND (SP, 2); - PUSHs (sv_2mortal (newSViv (sel.row))); - PUSHs (sv_2mortal (newSViv (sel.col))); + PUSHs (sv_2mortal (newSViv (rc.row))); + PUSHs (sv_2mortal (newSViv (rc.col))); } if (items == 3) { - sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); - sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); + rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); + rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); if (ix) THIS->want_refresh = 1; @@ -853,13 +939,7 @@ PPCODE: { if (GIMME_V != G_VOID) - { - char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len); - SV *sv = newSVpv (sel, 0); - SvUTF8_on (sv); - free (sel); - XPUSHs (sv_2mortal (sv)); - } + XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); if (newtext) { @@ -869,14 +949,35 @@ THIS->selection.len = wcslen (THIS->selection.text); } } - + +void +rxvt_term::scr_add_lines (SV *string) + 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); + + free (wstr); + delete [] ustr; +} + void rxvt_term::tt_write (SV *octets) INIT: STRLEN len; char *str = SvPVbyte (octets, len); C_ARGS: - (unsigned char *)str, len + str, len SV * rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) @@ -885,10 +986,6 @@ overlay *o = new overlay (THIS, x, y, w, h, rstyle, border); RETVAL = newSVptr ((void *)o, "urxvt::overlay"); o->self = (HV *)SvRV (RETVAL); - - HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0)); - char key[33]; sprintf (key, "%32lx", (long)o); - hv_store (hv, key, 32, newSViv ((long)o), 0); } OUTPUT: RETVAL @@ -899,19 +996,13 @@ overlay::set (int x, int y, SV *text, SV *rend = 0) void -overlay::DESTROY () - CODE: -{ - SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->THIS->self), "_overlay", 8, 0); - if (ovs) - { - HV *hv = (HV *)SvRV (*ovs); - char key[33]; sprintf (key, "%32lx", (long)THIS); - hv_delete (hv, key, 32, G_DISCARD); - } +overlay::show () - delete THIS; -} +void +overlay::hide () + +void +overlay::DESTROY () MODULE = urxvt PACKAGE = urxvt::timer