--- rxvt-unicode/src/rxvtperl.xs 2006/01/02 22:23:26 1.7 +++ rxvt-unicode/src/rxvtperl.xs 2006/01/03 18:11:34 1.17 @@ -37,6 +37,11 @@ #include "perlxsi.c" +#undef LINENO +#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) +#undef ROW +#define ROW(n) THIS->row_buf [LINENO (n)] + ///////////////////////////////////////////////////////////////////////////// static wchar_t * @@ -136,6 +141,8 @@ struct timer : time_watcher, perl_watcher { + tstamp interval; + timer () : time_watcher (this, &timer::execute) { @@ -143,6 +150,9 @@ void execute (time_watcher &w) { + if (interval) + start (at + interval); + invoke ("urxvt::timer", newSVtimer (this)); } }; @@ -165,6 +175,147 @@ ///////////////////////////////////////////////////////////////////////////// +#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") + +struct overlay { + HV *self; + rxvt_term *THIS; + int x, y, w, h; + int border; + text_t **text; + rend_t **rend; + + overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); + ~overlay (); + + void swap (); + + void set (int x, int y, SV *str, SV *rend); +}; + +overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) +: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2) +{ + if (border == 2) + { + w += 2; + h += 2; + } + + 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) + t0 = 0x2554, t1 = 0x2550, t2 = 0x2557; + else if (y < h - 1) + t0 = 0x2551, t1 = 0x0020, t2 = 0x2551; + else + t0 = 0x255a, t1 = 0x2550, t2 = 0x255d; + + *tp++ = t0; + *rp++ = r; + + for (int x = w - 2; x-- > 0; ) + { + *tp++ = t1; + *rp++ = r; + } + + *tp = t2; + *rp = r; + } + else + for (int x = w; x-- > 0; ) + { + *tp++ = 0x0020; + *rp++ = r; + } + } + + THIS->want_refresh = 1; +} + +overlay::~overlay () +{ + for (int y = h; y--; ) + { + delete [] text[y]; + delete [] rend[y]; + } + + delete [] text; + delete [] rend; + + THIS->want_refresh = 1; +} + +void overlay::swap () +{ + int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); + int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h)); + + int ov_w = min (w, THIS->ncol - ov_x); + int ov_h = min (h, THIS->nrow - ov_y); + + for (int y = ov_h; y--; ) + { + 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)); + } + } + +} + +void overlay::set (int x, int y, SV *text, SV *rend) +{ + x += border; + y += border; + + if (!IN_RANGE_EXC (y, 0, h - border)) + return; + + wchar_t *wtext = sv2wcs (text); + + for (int col = min (wcslen (wtext), w - x - border); col--; ) + this->text [y][x + col] = wtext [col]; + + free (wtext); + + if (rend) + { + if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV) + croak ("rend must be arrayref"); + + AV *av = (AV *)SvRV (rend); + + for (int col = min (av_len (av) + 1, w - x - border); col--; ) + this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); + } + + THIS->want_refresh = 1; +} + + +///////////////////////////////////////////////////////////////////////////// + struct rxvt_perl_interp rxvt_perl; static PerlInterpreter *perl; @@ -210,12 +361,34 @@ bool rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) { - if (!perl - || (!should_invoke [htype] && htype != HOOK_INIT && htype != HOOK_DESTROY)) + if (!perl) return false; if (htype == HOOK_INIT) // first hook ever called - term->self = (void *)newSVptr ((void *)term, "urxvt::term"); + { + term->self = (void *)newSVptr ((void *)term, "urxvt::term"); + hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); + } + else if (!term->self) + return false; // perl not initialized for this instance + else if (htype == HOOK_DESTROY) + { + // handled later + } + else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) + { + HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); + + if (HvKEYS (hv)) + { + hv_iterinit (hv); + + while (HE *he = hv_iternext (hv)) + ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); + } + } + else if (!should_invoke [htype]) + return false; dSP; va_list ap; @@ -293,6 +466,7 @@ 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)); AV *hookname = get_av ("urxvt::HOOKNAME", 1); set_hookname (INIT); set_hookname (RESET); @@ -311,6 +485,14 @@ set_hookname (REFRESH_END); set_hookname (KEYBOARD_COMMAND); + export_const (DEFAULT_RSTYLE); + export_const (OVERLAY_RSTYLE); + export_const (RS_Bold); + export_const (RS_Italic); + export_const (RS_Blink); + export_const (RS_RVid); + export_const (RS_Uline); + sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); } @@ -336,6 +518,54 @@ OUTPUT: RETVAL +int +GET_BASEFG (int rend) + CODE: + RETVAL = GET_BASEFG (rend); + OUTPUT: + RETVAL + +int +GET_BASEBG (int rend) + CODE: + RETVAL = GET_BASEBG (rend); + OUTPUT: + RETVAL + +int +SET_FGCOLOR (int rend, int new_color) + CODE: + RETVAL = SET_FGCOLOR (rend, new_color); + OUTPUT: + RETVAL + +int +SET_BGCOLOR (int rend, int new_color) + CODE: + RETVAL = SET_BGCOLOR (rend, new_color); + OUTPUT: + RETVAL + +int +GET_CUSTOM (int rend) + CODE: + RETVAL = (rend && RS_customMask) >> RS_customShift; + OUTPUT: + RETVAL + +int +SET_CUSTOM (int rend, int new_value) + CODE: +{ + if (!IN_RANGE_EXC (new_value, 0, RS_customCount)) + croak ("custom value out of range, must be 0..%d", RS_customCount - 1); + + RETVAL = (rend & ~RS_customMask) + | ((new_value << RS_customShift) & RS_customMask); +} + OUTPUT: + RETVAL + MODULE = urxvt PACKAGE = urxvt::term int @@ -414,6 +644,138 @@ 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: + THIS->want_refresh = 1; + +void +rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) + PPCODE: +{ + if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) + croak ("row_number number of out range"); + + line_t &l = ROW(row_number); + + if (GIMME_V != G_VOID) + { + wchar_t *wstr = new wchar_t [THIS->ncol]; + + for (int col = 0; col ncol; col++) + wstr [col] = l.t [col]; + + char *str = rxvt_wcstoutf8 (wstr, THIS->ncol); + free (wstr); + + SV *sv = newSVpv (str, 0); + SvUTF8_on (sv); + XPUSHs (sv_2mortal (sv)); + free (str); + } + + if (new_text) + { + wchar_t *wstr = sv2wcs (new_text); + + int len = wcslen (wstr); + + if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) + { + free (wstr); + croak ("new_text extends beyond horizontal margins"); + } + + for (int col = start_col; col < start_col + len; col++) + { + l.t [col] = wstr [col - start_col]; + l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col])); + } + + free (wstr); + } +} + +void +rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) + PPCODE: +{ + if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) + croak ("row_number number of out range"); + + line_t &l = ROW(row_number); + + if (GIMME_V != G_VOID) + { + AV *av = newAV (); + + av_extend (av, THIS->ncol - 1); + for (int col = 0; col < THIS->ncol; col++) + av_store (av, col, newSViv (l.r [col])); + + XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); + } + + if (new_rend) + { + if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) + croak ("new_rend must be arrayref"); + + AV *av = (AV *)SvRV (new_rend); + int len = av_len (av) + 1; + + if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) + croak ("new_rend array extends beyond horizontal margins"); + + for (int col = start_col; col < start_col + len; col++) + { + rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; + + l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); + } + } +} + +int +rxvt_term::ROW_l (int row_number, int new_length = -2) + CODE: +{ + if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) + croak ("row_number number of out range"); + + line_t &l = ROW(row_number); + RETVAL = l.l; + + if (new_length >= -1) + l.l = new_length; +} + OUTPUT: + RETVAL + +SV * +rxvt_term::special_encode (SV *str) + CODE: + abort ();//TODO + +SV * +rxvt_term::special_decode (SV *str) + CODE: + abort ();//TODO + void rxvt_term::_resource (char *name, int index, SV *newval = 0) PPCODE: @@ -484,7 +846,7 @@ } int -rxvt_term::selection_grab (int eventtime) +rxvt_term::selection_grab (int eventtime = CurrentTime) void rxvt_term::selection (SV *newtext = 0) @@ -509,32 +871,47 @@ } void -rxvt_term::scr_overlay_new (int x, int y, int w, int h) +rxvt_term::tt_write (SV *octets) + INIT: + STRLEN len; + char *str = SvPVbyte (octets, len); + C_ARGS: + (unsigned char *)str, len -void -rxvt_term::scr_overlay_off () +SV * +rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) + CODE: +{ + 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 + +MODULE = urxvt PACKAGE = urxvt::overlay void -rxvt_term::scr_overlay_set_char (int x, int y, U32 text, U32 rend = OVERLAY_RSTYLE) - CODE: - THIS->scr_overlay_set (x, y, text, rend); +overlay::set (int x, int y, SV *text, SV *rend = 0) void -rxvt_term::scr_overlay_set (int x, int y, SV *text) +overlay::DESTROY () CODE: { - wchar_t *wtext = sv2wcs (text); - THIS->scr_overlay_set (x, y, wtext); - free (wtext); -} + 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); + } -void -rxvt_term::tt_write (SV *octets) - INIT: - STRLEN len; - char *str = SvPVbyte (octets, len); - C_ARGS: - (unsigned char *)str, len + delete THIS; +} MODULE = urxvt PACKAGE = urxvt::timer @@ -542,6 +919,7 @@ timer::new () CODE: timer *w = new timer; + w->start (NOW); RETVAL = newSVptr ((void *)w, "urxvt::timer"); w->self = (HV *)SvRV (RETVAL); OUTPUT: @@ -562,6 +940,14 @@ OUTPUT: RETVAL +timer * +timer::interval (NV interval) + CODE: + THIS->interval = interval; + RETVAL = THIS; + OUTPUT: + RETVAL + timer * timer::set (NV tstamp) CODE: