--- rxvt-unicode/src/rxvtperl.xs 2006/01/03 17:34:44 1.16 +++ rxvt-unicode/src/rxvtperl.xs 2006/01/11 02:13:56 1.55 @@ -3,7 +3,7 @@ *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. - * Copyright (c) 2005-2005 Marc Lehmann + * Copyright (c) 2005-2006 Marc Lehmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,15 +28,23 @@ #include "../config.h" +#include #include -#include "rxvt.h" #include "iom.h" +#include "rxvt.h" +#include "keyboard.h" #include "rxvtutil.h" #include "rxvtperl.h" #include "perlxsi.c" +#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) +# define GRAB_CURSOR THIS->leftptr_cursor +#else +# define GRAB_CURSOR None +#endif + #undef LINENO #define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) #undef ROW @@ -44,6 +52,22 @@ ///////////////////////////////////////////////////////////////////////////// +static SV * +taint (SV *sv) +{ + SvTAINT (sv); + return sv; +} + +static SV * +taint_if (SV *sv, SV *src) +{ + if (SvTAINTED (src)) + SvTAINT (sv); + + return sv; +} + static wchar_t * sv2wcs (SV *sv) { @@ -53,6 +77,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,25 +99,35 @@ 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) +#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) #define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") ///////////////////////////////////////////////////////////////////////////// @@ -188,6 +234,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 +253,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 +270,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 +311,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->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->perl.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 +346,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 +371,7 @@ for (int col = min (wcslen (wtext), w - x - border); col--; ) this->text [y][x + col] = wtext [col]; - + free (wtext); if (rend) @@ -340,13 +415,14 @@ { char *argv[] = { "", + "-T", "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", }; perl = perl_alloc (); perl_construct (perl); - if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) + if (perl_parse (perl, xs_init, 3, argv, (char **)NULL) || perl_run (perl)) { rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); @@ -358,35 +434,53 @@ } } +static void +ungrab (rxvt_term *THIS) +{ + if (THIS->perl.grabtime) + { + XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); + XUngrabPointer (THIS->display->display, THIS->perl.grabtime); + THIS->perl.grabtime = 0; + } +} + bool rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) { if (!perl) return false; - + 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->perl.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) + else { - HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); - - if (HvKEYS (hv)) + if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) { - hv_iterinit (hv); + HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); + + if (HvKEYS (hv)) + { + hv_iterinit (hv); + + while (HE *he = hv_iternext (hv)) + ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); + } - while (HE *he = hv_iternext (hv)) - ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); } + + if (!should_invoke [htype]) + return false; } - else if (!should_invoke [htype]) - return false; dSP; va_list ap; @@ -414,8 +508,78 @@ XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); break; - case DT_STRING: - XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); + case DT_STR: + XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0)))); + break; + + case DT_STR_LEN: + { + char *str = va_arg (ap, char *); + int len = va_arg (ap, int); + + XPUSHs (taint (sv_2mortal (newSVpvn (str, len)))); + } + break; + + case DT_WCS_LEN: + { + wchar_t *wstr = va_arg (ap, wchar_t *); + int wlen = va_arg (ap, int); + + XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen)))); + } + 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 (row, xe->xmotion.y / term->fheight); + setiv (col, xe->xmotion.x / term->fwidth); + 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_END: @@ -437,13 +601,15 @@ LEAVE; if (SvTRUE (ERRSV)) - rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); + { + rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); + ungrab (term); // better lose the grab than the session + } if (htype == HOOK_DESTROY) { - // TODO: clear magic - hv_clear ((HV *)SvRV ((SV *)term->self)); - SvREFCNT_dec ((SV *)term->self); + clearSVptr ((SV *)term->perl.self); + SvREFCNT_dec ((SV *)term->perl.self); } return count; @@ -463,38 +629,52 @@ 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); - set_hookname (START); - set_hookname (DESTROY); - set_hookname (SEL_BEGIN); - set_hookname (SEL_EXTEND); - set_hookname (SEL_MAKE); - set_hookname (SEL_GRAB); - set_hookname (SEL_CLICK); - 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); - set_hookname (MOUSE_CLICK); - set_hookname (MOUSE_MOVE); - - 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_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1)); + sv_setsv (get_sv ("urxvt::RESNAME", 1), newSVpvn (RESNAME, sizeof (RESNAME) - 1)); + sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1)); + sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1)); - sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); + AV *hookname = get_av ("urxvt::HOOKNAME", 1); +# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); +# include "hookinc.h" +# undef def + + HV *option = get_hv ("urxvt::OPTION", 1); +# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0); +# define nodef(name) +# include "optinc.h" +# undef nodef +# undef def + + HV *stash = gv_stashpv ("urxvt", 1); +# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name)); + export_const_iv (DEFAULT_RSTYLE); + export_const_iv (OVERLAY_RSTYLE); + export_const_iv (RS_Bold); + export_const_iv (RS_Italic); + export_const_iv (RS_Blink); + export_const_iv (RS_RVid); + export_const_iv (RS_Uline); + + export_const_iv (CurrentTime); + export_const_iv (ShiftMask); + export_const_iv (LockMask); + export_const_iv (ControlMask); + export_const_iv (Mod1Mask); + export_const_iv (Mod2Mask); + export_const_iv (Mod3Mask); + export_const_iv (Mod4Mask); + export_const_iv (Mod5Mask); + export_const_iv (Button1Mask); + export_const_iv (Button2Mask); + export_const_iv (Button3Mask); + export_const_iv (Button4Mask); + export_const_iv (Button5Mask); + export_const_iv (AnyModifier); + + export_const_iv (EVENT_NONE); + export_const_iv (EVENT_READ); + export_const_iv (EVENT_WRITE); } void @@ -512,6 +692,21 @@ CODE: rxvt_fatal ("%s", msg); +SV * +untaint (SV *sv) + CODE: + RETVAL = newSVsv (sv); + SvTAINTED_off (RETVAL); + OUTPUT: + RETVAL + +bool +safe () + CODE: + RETVAL = !rxvt_tainted (); + OUTPUT: + RETVAL + NV NOW () CODE: @@ -569,6 +764,102 @@ MODULE = urxvt PACKAGE = urxvt::term +SV * +_new (...) + CODE: +{ + if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV) + croak ("first argument to urxvt::term->_new must be arrayref"); + + rxvt_term *term = new rxvt_term; + + term->argv = new stringvec; + term->envv = new stringvec; + + for (int i = 1; i < items; i++) + term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); + + AV *envv = (AV *)SvRV (ST (0)); + for (int i = av_len (envv) + 1; i--; ) + term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); + + term->envv->push_back (0); + + bool success; + + try + { + success = term->init (term->argv->size (), term->argv->begin ()); + } + catch (const class rxvt_failure_exception &e) + { + success = false; + } + + if (!success) + { + term->destroy (); + croak ("error while initializing new terminal instance"); + } + + RETVAL = term && term->perl.self + ? newSVterm (term) : &PL_sv_undef; +} + OUTPUT: + RETVAL + +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, GRAB_CURSOR); + +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, GRAB_CURSOR, 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 () + CODE: + XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); + +void +rxvt_term::allow_events_sync () + CODE: + XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); + +void +rxvt_term::allow_events_replay () + CODE: + XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); + XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); + +void +rxvt_term::ungrab () + CODE: + ungrab (THIS); + int rxvt_term::strwidth (SV *str) CODE: @@ -596,7 +887,7 @@ free (wstr); - RETVAL = newSVpv (mbstr, 0); + RETVAL = taint_if (newSVpv (mbstr, 0), str); free (mbstr); } OUTPUT: @@ -613,63 +904,156 @@ wchar_t *wstr = rxvt_mbstowcs (data, len); rxvt_pop_locale (); - char *str = rxvt_wcstoutf8 (wstr); + RETVAL = taint_if (wcs2sv (wstr), octets); free (wstr); - - RETVAL = newSVpv (str, 0); - SvUTF8_on (RETVAL); - free (str); } OUTPUT: RETVAL +#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) + +#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::nsaved () +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 -int -rxvt_term::view_start (int newval = -1) +unsigned int +rxvt_term::ModLevel3Mask () + ALIAS: + ModLevel3Mask = 0 + ModMetaMask = 1 + ModNumLockMask = 2 CODE: -{ - RETVAL = THIS->view_start; + switch (ix) + { + case 0: RETVAL = THIS->ModLevel3Mask; break; + case 1: RETVAL = THIS->ModMetaMask; break; + case 2: RETVAL = THIS->ModNumLockMask; break; + } + OUTPUT: + RETVAL - if (newval >= 0) +char * +rxvt_term::display_id () + ALIAS: + display_id = 0 + locale = 1 + CODE: + switch (ix) { - THIS->view_start = min (newval, THIS->nsaved); - THIS->scr_changeview (RETVAL); + case 0: RETVAL = THIS->display->id; break; + case 1: RETVAL = THIS->locale; break; } + OUTPUT: + RETVAL + +SV * +rxvt_term::_env () + CODE: +{ + if (THIS->envv) + { + AV *av = newAV (); + + for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) + if (*i) + av_push (av, newSVpv (*i, 0)); + + RETVAL = newRV_noinc ((SV *)av); + } + else + RETVAL = &PL_sv_undef; } OUTPUT: - RETVAL + RETVAL int -rxvt_term::nrow () +rxvt_term::pty_ev_events (int events = EVENT_UNDEF) + CODE: + RETVAL = THIS->pty_ev.events; + if (events != EVENT_UNDEF) + THIS->pty_ev.set (events); + OUTPUT: + RETVAL + +U32 +rxvt_term::parent () CODE: - RETVAL = THIS->nrow; + RETVAL = (U32)THIS->parent [0]; OUTPUT: RETVAL -int -rxvt_term::ncol () +U32 +rxvt_term::vt () CODE: - RETVAL = THIS->ncol; + RETVAL = (U32)THIS->vt; 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: +{ + RETVAL = THIS->view_start; + + if (newval >= 0) + { + THIS->view_start = min (newval, THIS->nsaved); + THIS->scr_changeview (RETVAL); + } +} + 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) +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)) - croak ("row_number number of out range"); + XSRETURN_EMPTY; line_t &l = ROW(row_number); @@ -677,23 +1061,19 @@ { 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]; - char *str = rxvt_wcstoutf8 (wstr, THIS->ncol); - free (wstr); + XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol)))); - SV *sv = newSVpv (str, 0); - SvUTF8_on (sv); - XPUSHs (sv_2mortal (sv)); - free (str); + delete [] wstr; } if (new_text) { 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)) { @@ -703,7 +1083,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])); } @@ -712,11 +1092,11 @@ } 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)) - croak ("row_number number of out range"); + XSRETURN_EMPTY; line_t &l = ROW(row_number); @@ -737,14 +1117,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])); } @@ -752,41 +1132,122 @@ } 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) +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 = taint_if (wcs2sv (rstr, r - rstr), string); + + 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 = taint_if (wcs2sv (rstr, r - rstr), text); + + delete [] rstr; +} + OUTPUT: + RETVAL void rxvt_term::_resource (char *name, int index, SV *newval = 0) 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]); @@ -802,7 +1263,7 @@ croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); if (GIMME_V != G_VOID) - XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); + XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef); if (newval) { @@ -817,50 +1278,105 @@ } } +const char * +rxvt_term::x_resource (const char *name) + CLEANUP: + SvTAINTED_on (ST (0)); + +bool +rxvt_term::option (U32 optval, int set = -1) + CODE: +{ + RETVAL = THIS->options & optval; + + if (set >= 0) + { + if (set) + THIS->options |= optval; + else + THIS->options &= ~optval; + + switch (optval) + { + case Opt_skipBuiltinGlyphs: + THIS->set_fonts (); + THIS->scr_remap_chars (); + THIS->scr_touch (true); + THIS->want_refresh = 1; + break; + + case Opt_cursorUnderline: + THIS->want_refresh = 1; + break; + +# case Opt_scrollBar_floating: +# case Opt_scrollBar_right: +# THIS->resize_all_windows (THIS->width, THIS->height, 1); +# break; + } + } +} + OUTPUT: + RETVAL + +bool +rxvt_term::parse_keysym (char *keysym, char *str) + CODE: + RETVAL = 0 < THIS->parse_keysym (keysym, str); + THIS->keyboard->register_done (); + OUTPUT: + RETVAL + void -rxvt_term::selection_mark (...) +rxvt_term::screen_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; } } +char +rxvt_term::cur_charset () + CODE: + RETVAL = THIS->charsets [THIS->screen.charset]; + OUTPUT: + RETVAL + int -rxvt_term::selection_grab (int eventtime = CurrentTime) +rxvt_term::selection_grab (U32 eventtime) void rxvt_term::selection (SV *newtext = 0) 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 (THIS->selection.text + ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))) + : &PL_sv_undef); if (newtext) { @@ -870,14 +1386,53 @@ THIS->selection.len = wcslen (THIS->selection.text); } } - + +void +rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline) + +void +rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) + +void +rxvt_term::scr_bell () + +void +rxvt_term::scr_add_lines (SV *string) + CODE: +{ + wchar_t *wstr = sv2wcs (string); + THIS->scr_add_lines (wstr, wcslen (wstr)); + free (wstr); +} + void rxvt_term::tt_write (SV *octets) INIT: STRLEN len; char *str = SvPVbyte (octets, len); C_ARGS: - (unsigned char *)str, len + 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; + + rxvt_push_locale (THIS->locale); + THIS->cmd_parse (); + rxvt_pop_locale (); + + 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) @@ -886,10 +1441,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 @@ -900,19 +1451,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