--- rxvt-unicode/src/rxvtperl.xs 2006/01/05 01:04:10 1.25 +++ rxvt-unicode/src/rxvtperl.xs 2006/01/06 03:40:19 1.29 @@ -471,6 +471,65 @@ XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); break; + case DT_STRING_LEN: + { + char *str = va_arg (ap, char *); + int len = va_arg (ap, int); + + XPUSHs (sv_2mortal (newSVpvn (str, len))); + } + break; + + case DT_XEVENT: + { + XEvent *xe = va_arg (ap, XEvent *); + HV *hv = newHV (); + +# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) +# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) +# undef set + + setiv (type, xe->type); + setiv (send_event, xe->xany.send_event); + setiv (serial, xe->xany.serial); + + switch (xe->type) + { + case KeyPress: + case KeyRelease: + case ButtonPress: + case ButtonRelease: + case MotionNotify: + setiv (time, xe->xmotion.time); + setiv (x, xe->xmotion.x); + setiv (y, xe->xmotion.y); + setiv (x_root, xe->xmotion.x_root); + setiv (y_root, xe->xmotion.y_root); + setiv (state, xe->xmotion.state); + break; + } + + switch (xe->type) + { + case KeyPress: + case KeyRelease: + setiv (keycode, xe->xkey.keycode); + break; + + case ButtonPress: + case ButtonRelease: + setiv (button, xe->xbutton.button); + break; + + case MotionNotify: + setiv (is_hint, xe->xmotion.is_hint); + break; + } + + XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); + } + break; + case DT_USTRING_LEN: { unicode_t *ustr = va_arg (ap, unicode_t *); @@ -546,6 +605,36 @@ sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); } +SV * +new (...) + CODE: +{ + stringvec *argv = new stringvec; + bool success; + + for (int i = 0; i < items ;i++) + argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); + + rxvt_term *term = new rxvt_term; + + term->argv = argv; + + try + { + if (!term->init (argv->size (), argv->begin ())) + term = 0; + } + catch (const class rxvt_failure_exception &e) + { + term->destroy (); + croak ("exception caught while initializing new terminal instance"); + } + + RETVAL = term && term->self ? newSVterm (term) : &PL_sv_undef; +} + OUTPUT: + RETVAL + void set_should_invoke (int htype, int value) CODE: @@ -618,6 +707,9 @@ MODULE = urxvt PACKAGE = urxvt::term +void +rxvt_term::destroy () + int rxvt_term::strwidth (SV *str) CODE: @@ -735,7 +827,7 @@ THIS->want_refresh = 1; void -rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) +rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) PPCODE: { if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) @@ -759,7 +851,7 @@ { wchar_t *wstr = sv2wcs (new_text); - int len = wcslen (wstr); + int len = min (wcslen (wstr) - start_ofs, max_len); if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) { @@ -769,7 +861,7 @@ for (int col = start_col; col < start_col + len; col++) { - l.t [col] = wstr [col - start_col]; + l.t [col] = wstr [start_ofs + col - start_col]; l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col])); } @@ -778,7 +870,7 @@ } void -rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) +rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) PPCODE: { if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) @@ -803,14 +895,14 @@ croak ("new_rend must be arrayref"); AV *av = (AV *)SvRV (new_rend); - int len = av_len (av) + 1; + int len = min (av_len (av) + 1 - start_ofs, max_len); 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; + rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); } @@ -818,30 +910,33 @@ } 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)) XSRETURN_EMPTY; line_t &l = ROW(row_number); - RETVAL = l.l < 0 ? THIS->ncol : l.l; + 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) +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.l < 0; + RETVAL = l.is_longer (); + + if (new_is_longer >= 0) + l.is_longer (new_is_longer); } OUTPUT: RETVAL @@ -976,6 +1071,25 @@ C_ARGS: str, len +void +rxvt_term::cmd_parse (SV *octets) + CODE: +{ + STRLEN len; + char *str = SvPVbyte (octets, len); + + char *old_cmdbuf_ptr = THIS->cmdbuf_ptr; + char *old_cmdbuf_endp = THIS->cmdbuf_endp; + + THIS->cmdbuf_ptr = str; + THIS->cmdbuf_endp = str + len; + + THIS->cmd_parse (); + + THIS->cmdbuf_ptr = old_cmdbuf_ptr; + THIS->cmdbuf_endp = old_cmdbuf_endp; +} + SV * rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) CODE: