--- rxvt-unicode/src/rxvtperl.xs 2006/01/03 04:45:03 1.14 +++ rxvt-unicode/src/rxvtperl.xs 2006/01/22 20:39:47 1.90 @@ -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,20 +28,32 @@ #include "../config.h" +#include #include -#include "rxvt.h" +#include "unistd.h" + #include "iom.h" +#include "rxvt.h" +#include "keyboard.h" #include "rxvtutil.h" #include "rxvtperl.h" #include "perlxsi.c" +#ifdef HAVE_SCROLLBARS +# 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 #define ROW(n) THIS->row_buf [LINENO (n)] +typedef int CHAINED UNUSED; + ///////////////////////////////////////////////////////////////////////////// static wchar_t * @@ -53,6 +65,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,36 +87,48 @@ 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") ///////////////////////////////////////////////////////////////////////////// +#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher") + struct perl_watcher { SV *cbsv; HV *self; perl_watcher () - : cbsv (newSV (0)) + : cbsv (0) { } @@ -103,7 +139,8 @@ void cb (SV *cb) { - sv_setsv (cbsv, cb); + SvREFCNT_dec (cbsv); + cbsv = newSVsv (cb); } void invoke (const char *type, SV *self, int arg = -1); @@ -137,9 +174,9 @@ } #define newSVtimer(timer) new_ref (timer->self, "urxvt::timer") -#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer") +#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR (sv, "urxvt::timer") -struct timer : time_watcher, perl_watcher +struct timer : perl_watcher, time_watcher { tstamp interval; @@ -158,9 +195,9 @@ }; #define newSViow(iow) new_ref (iow->self, "urxvt::iow") -#define SvIOW(sv) (iow *)SvPTR (sv, "urxvt::iow") +#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR (sv, "urxvt::iow") -struct iow : io_watcher, perl_watcher +struct iow : perl_watcher, io_watcher { iow () : io_watcher (this, &iow::execute) @@ -173,12 +210,45 @@ } }; +#define newSViw(iw) new_ref (iw->self, "urxvt::iw") +#define SvIW(sv) (iw *)(perl_watcher *)SvPTR (sv, "urxvt::iw") + +struct iw : perl_watcher, idle_watcher +{ + iw () + : idle_watcher (this, &iw::execute) + { + } + + void execute (idle_watcher &w) + { + invoke ("urxvt::iw", newSViw (this)); + } +}; + +#define newSVpw(pw) new_ref (pw->self, "urxvt::pw") +#define SvPW(sv) (pw *)(perl_watcher *)SvPTR (sv, "urxvt::pw") + +struct pw : perl_watcher, child_watcher +{ + pw () + : child_watcher (this, &pw::execute) + { + } + + void execute (child_watcher &w, int status) + { + invoke ("urxvt::pw", newSVpw (this), status); + } +}; + ///////////////////////////////////////////////////////////////////////////// #define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") struct overlay { HV *self; + bool visible; rxvt_term *THIS; int x, y, w, h; int border; @@ -188,13 +258,16 @@ 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); }; 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) +: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), visible(false) { if (border == 2) { @@ -204,15 +277,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 +294,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 +335,43 @@ THIS->want_refresh = 1; } +void +overlay::show () +{ + if (visible) + return; + + visible = true; + + AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)); + av_push (av, newSViv ((long)this)); +} + +void +overlay::hide () +{ + if (!visible) + return; + + visible = false; + + AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)); + + int i; + + for (i = AvFILL (av); i >= 0; i--) + if (SvIV (*av_fetch (av, i, 1)) == (long)this) + { + av_delete (av, i, G_DISCARD); + break; + } + + for (; i < AvFILL (av); i++) + av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0))); + + av_pop (av); +} + void overlay::swap () { int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); @@ -271,12 +384,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; + + 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 +409,7 @@ for (int col = min (wcslen (wtext), w - x - border); col--; ) this->text [y][x + col] = wtext [col]; - + free (wtext); if (rend) @@ -306,7 +419,7 @@ AV *av = (AV *)SvRV (rend); - for (int col = min (av_len (av) + 1, w - x - border); col--; ) + for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); } @@ -320,10 +433,6 @@ static PerlInterpreter *perl; -rxvt_perl_interp::rxvt_perl_interp () -{ -} - rxvt_perl_interp::~rxvt_perl_interp () { if (perl) @@ -334,13 +443,24 @@ } void -rxvt_perl_interp::init () +rxvt_perl_interp::init (rxvt_term *term) { if (!perl) { + rxvt_push_locale (""); // perl init destroys current locale + + perl_environ = rxvt_environ; + swap (perl_environ, environ); + char *argv[] = { "", - "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", + "-e" + "BEGIN {" + " urxvt->bootstrap;" + " unshift @INC, '" LIBDIR "';" + "}" + "" + "use urxvt;" }; perl = perl_alloc (); @@ -355,104 +475,254 @@ perl_free (perl); perl = 0; } + + swap (perl_environ, environ); + + rxvt_pop_locale (); } -} -bool -rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) -{ - if (!perl) - return false; - - if (htype == HOOK_INIT) // first hook ever called + if (perl) { - term->self = (void *)newSVptr ((void *)term, "urxvt::term"); - hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); + // runs outside of perls ENV + term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); + hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0); } - else if (htype == HOOK_DESTROY) +} + +static void +ungrab (rxvt_term *THIS) +{ + if (THIS->perl.grabtime) { - // handled later + XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); + XUngrabPointer (THIS->display->display, THIS->perl.grabtime); + THIS->perl.grabtime = 0; } - 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); +bool +rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) +{ + if (!perl || !term->perl.self) + return false; - while (HE *he = hv_iternext (hv)) - ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); - } + // pre-handling of some events + if (htype == HOOK_REFRESH_END) + { + AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); + + for (int i = 0; i <= AvFILL (av); i++) + ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); } - else if (!should_invoke [htype]) - return false; - dSP; - va_list ap; + swap (perl_environ, environ); - va_start (ap, htype); + bool event_consumed; - ENTER; - SAVETMPS; + if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always + || term->perl.should_invoke [htype]) + try + { + dSP; + va_list ap; - PUSHMARK (SP); + va_start (ap, htype); - XPUSHs (sv_2mortal (newSVterm (term))); - XPUSHs (sv_2mortal (newSViv (htype))); + ENTER; + SAVETMPS; - for (;;) { - data_type dt = (data_type)va_arg (ap, int); + PUSHMARK (SP); - switch (dt) - { - case DT_INT: - XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); - break; - - case DT_LONG: - XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); - break; - - case DT_STRING: - XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); - break; + XPUSHs (sv_2mortal (newSVterm (term))); + XPUSHs (sv_2mortal (newSViv (htype))); - case DT_END: - { - va_end (ap); + for (;;) { + data_type dt = (data_type)va_arg (ap, int); - PUTBACK; - int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL); - SPAGAIN; + switch (dt) + { + case DT_INT: + XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); + break; + + case DT_LONG: + XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); + break; + + case DT_STR: + XPUSHs (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 (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 (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) +# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (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: + setuv (window, xe->xmotion.window); + setuv (root, xe->xmotion.root); + setuv (subwindow, xe->xmotion.subwindow); + setuv (time, xe->xmotion.time); + setiv (x, xe->xmotion.x); + setiv (y, xe->xmotion.y); + setiv (row, xe->xmotion.y / term->fheight + term->view_start); + setiv (col, xe->xmotion.x / term->fwidth); + setiv (x_root, xe->xmotion.x_root); + setiv (y_root, xe->xmotion.y_root); + setuv (state, xe->xmotion.state); + + switch (xe->type) + { + case KeyPress: + case KeyRelease: + setuv (keycode, xe->xkey.keycode); + break; + + case ButtonPress: + case ButtonRelease: + setuv (button, xe->xbutton.button); + break; + + case MotionNotify: + setiv (is_hint, xe->xmotion.is_hint); + break; + } + + break; + + case MapNotify: + case UnmapNotify: + case ConfigureNotify: + setuv (event, xe->xconfigure.event); + setuv (window, xe->xconfigure.window); + + switch (xe->type) + { + case ConfigureNotify: + setiv (x, xe->xconfigure.x); + setiv (y, xe->xconfigure.y); + setiv (width, xe->xconfigure.width); + setiv (height, xe->xconfigure.height); + setuv (above, xe->xconfigure.above); + break; + } + + break; + + case PropertyNotify: + setuv (window, xe->xproperty.window); + setuv (atom, xe->xproperty.atom); + setuv (time, xe->xproperty.time); + setiv (state, xe->xproperty.state); + break; + + case ClientMessage: + setuv (window, xe->xclient.window); + setuv (message_type, xe->xclient.message_type); + setuv (format, xe->xclient.format); + setuv (l0, xe->xclient.data.l[0]); + setuv (l1, xe->xclient.data.l[1]); + setuv (l2, xe->xclient.data.l[2]); + setuv (l3, xe->xclient.data.l[3]); + setuv (l4, xe->xclient.data.l[4]); + break; + } + + XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); + } + break; + + case DT_END: + goto call; + + default: + rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); + } + } - if (count) - { - SV *status = POPs; - count = SvTRUE (status); - } + call: + va_end (ap); - PUTBACK; - FREETMPS; - LEAVE; + PUTBACK; + int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL); + SPAGAIN; - if (SvTRUE (ERRSV)) - rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); + if (count) + { + SV *status = POPs; + count = SvTRUE (status); + } - if (htype == HOOK_DESTROY) - { - // TODO: clear magic - hv_clear ((HV *)SvRV ((SV *)term->self)); - SvREFCNT_dec ((SV *)term->self); - } + PUTBACK; + FREETMPS; + LEAVE; - return count; + if (SvTRUE (ERRSV)) + { + rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); + ungrab (term); // better lose the grab than the session } - default: - rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); + event_consumed = !!count; } - } + catch (...) + { + swap (perl_environ, environ); + throw; + } + else + event_consumed = false; + + // post-handling of some events + if (htype == HOOK_REFRESH_BEGIN) + { + AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); + + for (int i = AvFILL (av); i >= 0; i--) + ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); + } + else if (htype == HOOK_DESTROY) + { + clearSVptr ((SV *)term->perl.self); + SvREFCNT_dec ((SV *)term->perl.self); + } + + swap (perl_environ, environ); + + return event_consumed; } ///////////////////////////////////////////////////////////////////////////// @@ -463,43 +733,125 @@ 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 (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); - - 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); + struct { + const char *name; + IV iv; + } *civ, const_iv[] = { +# define const_iv(name) { # name, (IV)name } + const_iv (DEFAULT_RSTYLE), + const_iv (OVERLAY_RSTYLE), + const_iv (RS_Bold), + const_iv (RS_Italic), + const_iv (RS_Blink), + const_iv (RS_RVid), + const_iv (RS_Uline), + + const_iv (CurrentTime), + const_iv (ShiftMask), + const_iv (LockMask), + const_iv (ControlMask), + const_iv (Mod1Mask), + const_iv (Mod2Mask), + const_iv (Mod3Mask), + const_iv (Mod4Mask), + const_iv (Mod5Mask), + const_iv (Button1Mask), + const_iv (Button2Mask), + const_iv (Button3Mask), + const_iv (Button4Mask), + const_iv (Button5Mask), + const_iv (AnyModifier), + + const_iv (EVENT_NONE), + const_iv (EVENT_READ), + const_iv (EVENT_WRITE), + + const_iv (NoEventMask), + const_iv (KeyPressMask), + const_iv (KeyReleaseMask), + const_iv (ButtonPressMask), + const_iv (ButtonReleaseMask), + const_iv (EnterWindowMask), + const_iv (LeaveWindowMask), + const_iv (PointerMotionMask), + const_iv (PointerMotionHintMask), + const_iv (Button1MotionMask), + const_iv (Button2MotionMask), + const_iv (Button3MotionMask), + const_iv (Button4MotionMask), + const_iv (Button5MotionMask), + const_iv (ButtonMotionMask), + const_iv (KeymapStateMask), + const_iv (ExposureMask), + const_iv (VisibilityChangeMask), + const_iv (StructureNotifyMask), + const_iv (ResizeRedirectMask), + const_iv (SubstructureNotifyMask), + const_iv (SubstructureRedirectMask), + const_iv (FocusChangeMask), + const_iv (PropertyChangeMask), + const_iv (ColormapChangeMask), + const_iv (OwnerGrabButtonMask), + + const_iv (KeyPress), + const_iv (KeyRelease), + const_iv (ButtonPress), + const_iv (ButtonRelease), + const_iv (MotionNotify), + const_iv (EnterNotify), + const_iv (LeaveNotify), + const_iv (FocusIn), + const_iv (FocusOut), + const_iv (KeymapNotify), + const_iv (Expose), + const_iv (GraphicsExpose), + const_iv (NoExpose), + const_iv (VisibilityNotify), + const_iv (CreateNotify), + const_iv (DestroyNotify), + const_iv (UnmapNotify), + const_iv (MapNotify), + const_iv (MapRequest), + const_iv (ReparentNotify), + const_iv (ConfigureNotify), + const_iv (ConfigureRequest), + const_iv (GravityNotify), + const_iv (ResizeRequest), + const_iv (CirculateNotify), + const_iv (CirculateRequest), + const_iv (PropertyNotify), + const_iv (SelectionClear), + const_iv (SelectionRequest), + const_iv (SelectionNotify), + const_iv (ColormapNotify), + const_iv (ClientMessage), + const_iv (MappingNotify), + }; + + for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); + civ-- > const_iv; ) + newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); } void -set_should_invoke (int htype, int value) - CODE: - rxvt_perl.should_invoke [htype] = value; - -void warn (const char *msg) CODE: rxvt_warn ("%s", msg); @@ -509,6 +861,9 @@ CODE: rxvt_fatal ("%s", msg); +void +_exit (int status) + NV NOW () CODE: @@ -566,6 +921,107 @@ 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; + + stringvec *argv = new stringvec; + stringvec *envv = new stringvec; + + for (int i = 1; i < items; i++) + argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); + + AV *env = (AV *)SvRV (ST (0)); + for (int i = AvFILL (env) + 1; i--; ) + envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); + + envv->push_back (0); + + bool success; + + try + { + success = term->init (argv, envv); + } + 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::set_should_invoke (int htype, int inc) + CODE: + THIS->perl.should_invoke [htype] += inc; + +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 (Time 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: @@ -610,63 +1066,181 @@ 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 +#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_int_bwidth TERM_OFFSET(int_bwidth) +#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) +#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) +#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) +#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) +#define TERM_OFFSET_top_row TERM_OFFSET(top_row) + 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 + int_bwidth = TERM_OFFSET_int_bwidth + ext_bwidth = TERM_OFFSET_ext_bwidth + lineSpace = TERM_OFFSET_lineSpace + saveLines = TERM_OFFSET_saveLines + total_rows = TERM_OFFSET_total_rows + top_row = TERM_OFFSET_top_row 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 + current_screen = 3 + hidden_cursor = 4 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; + case 3: RETVAL = THIS->current_screen; break; + case 4: RETVAL = THIS->hidden_cursor; 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->nrow; - OUTPUT: + RETVAL = THIS->pty_ev.events; + if (events != EVENT_UNDEF) + THIS->pty_ev.set (events); + OUTPUT: RETVAL int -rxvt_term::ncol () +rxvt_term::pty_fd () + CODE: + RETVAL = THIS->pty->pty; + OUTPUT: + RETVAL + +Window +rxvt_term::parent () CODE: - RETVAL = THIS->ncol; + RETVAL = THIS->parent [0]; + OUTPUT: + RETVAL + +Window +rxvt_term::vt () + CODE: + RETVAL = THIS->vt; OUTPUT: RETVAL void +rxvt_term::vt_emask_add (U32 emask) + CODE: + THIS->vt_emask_perl |= emask; + THIS->vt_select_input (); + +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) + PROTOTYPE: $;$ + CODE: +{ + RETVAL = THIS->view_start; + + if (newval <= 0) + THIS->scr_changeview (max (newval, THIS->top_row)); +} + OUTPUT: + RETVAL + +void +rxvt_term::focus_in () + +void +rxvt_term::focus_out () + +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"); + if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow)) + XSRETURN_EMPTY; line_t &l = ROW(row_number); @@ -674,25 +1248,21 @@ { 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 (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)) + if (start_col < 0 || start_col + len > THIS->ncol) { free (wstr); croak ("new_text extends beyond horizontal margins"); @@ -700,7 +1270,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])); } @@ -709,11 +1279,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"); + if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow)) + XSRETURN_EMPTY; line_t &l = ROW(row_number); @@ -734,14 +1304,14 @@ croak ("new_rend must be arrayref"); AV *av = (AV *)SvRV (new_rend); - int len = av_len (av) + 1; + int len = min (AvFILL (av) + 1 - start_ofs, max_len); - if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) + if (start_col < 0 || start_col + len > THIS->ncol) 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])); } @@ -749,41 +1319,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"); + if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow)) + 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->top_row, 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 = 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) 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]); @@ -814,50 +1465,133 @@ } } +const char * +rxvt_term::x_resource (const char *name) + +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; + + if (THIS->check_ev.is_active ()) // avoid doing this before START + 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 = SvIV (ST (1)); + rc.col = SvIV (ST (2)); + + if (ix == 2) + { + if (rc.col == 0) + { + // col == 0 means end of previous line + rc.row--; + rc.col = THIS->ncol; + } + else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow) + && rc.col > ROW(rc.row).l) + { + // col >= length means while line and add newline + rc.col = THIS->ncol; + } + } + + clamp_it (rc.col, 0, THIS->ncol); + clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); if (ix) THIS->want_refresh = 1; } } +char +rxvt_term::cur_charset () + CODE: + RETVAL = THIS->charsets [THIS->screen.charset]; + OUTPUT: + RETVAL + +#void +#rxvt_term::selection_clear () + +void +rxvt_term::selection_make (Time eventtime, bool rect = false) + CODE: + THIS->selection.op = SELECTION_CONT; + THIS->selection.rect = rect; + THIS->selection_make (eventtime); + int -rxvt_term::selection_grab (int eventtime) +rxvt_term::selection_grab (Time 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 + ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) + : &PL_sv_undef); if (newtext) { @@ -867,14 +1601,56 @@ 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_change_screen (int screen) + +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) @@ -883,34 +1659,181 @@ 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 +############################################################################# +# Various X Utility Functions +############################################################################# void -overlay::set (int x, int y, SV *text, SV *rend = 0) +rxvt_term::XListProperties (Window window) + PPCODE: +{ + int count; + Atom *props = XListProperties (THIS->display->display, window, &count); + + EXTEND (SP, count); + while (count--) + PUSHs (newSVuv ((U32)props [count])); + + XFree (props); +} void -overlay::DESTROY () - CODE: +rxvt_term::XGetWindowProperty (Window window, Atom property) + PPCODE: { - SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->THIS->self), "_overlay", 8, 0); - if (ovs) + Atom type; + int format; + unsigned long nitems; + unsigned long bytes_after; + unsigned char *prop; + + XGetWindowProperty (THIS->display->display, window, property, + 0, 1<<24, 0, AnyPropertyType, + &type, &format, &nitems, &bytes_after, &prop); + + if (type != None) { - HV *hv = (HV *)SvRV (*ovs); - char key[33]; sprintf (key, "%32lx", (long)THIS); - hv_delete (hv, key, 32, G_DISCARD); + int elemsize = format == 16 ? sizeof (short) + : format == 32 ? sizeof (long) + : 1; + + EXTEND (SP, 3); + PUSHs (newSVuv ((U32)type)); + PUSHs (newSViv (format)); + PUSHs (newSVpvn ((char *)prop, nitems * elemsize)); + XFree (prop); } +} + +void +rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) + CODE: +{ + STRLEN len; + char *data_ = SvPVbyte (data, len); + + int elemsize = format == 16 ? sizeof (short) + : format == 32 ? sizeof (long) + : 1; + + XChangeProperty (THIS->display->display, window, property, + type, format, PropModeReplace, + (unsigned char *)data_, len / elemsize); + XSync (THIS->display->display, 0); +} + +Atom +XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) + C_ARGS: term->display->display, atom_name, only_if_exists + +char * +XGetAtomName (rxvt_term *term, Atom atom) + C_ARGS: term->display->display, atom + CLEANUP: + XFree (RETVAL); + +void +XDeleteProperty (rxvt_term *term, Window window, Atom property) + C_ARGS: term->display->display, window, property + +Window +rxvt_term::DefaultRootWindow () + CODE: + RETVAL = THIS->display->root; + OUTPUT: + RETVAL - delete THIS; +#if 0 + +Window +XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) + C_ARGS: term->display->display, (Window)parent, + x, y, width, height, 0, + term->pix_colors_focused[Color_border], + term->pix_colors_focused[Color_border] + +#endif + +void +XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) + C_ARGS: term->display->display, window, parent, x, y + +void +XMapWindow (rxvt_term *term, Window window) + C_ARGS: term->display->display, window + +void +XUnmapWindow (rxvt_term *term, Window window) + C_ARGS: term->display->display, window + +void +XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) + C_ARGS: term->display->display, window, x, y, width, height + +void +rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0) + CODE: +{ + XWindowAttributes attr; + XGetWindowAttributes (THIS->display->display, window, &attr); + XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events); } +void +rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) + PPCODE: +{ + int dx, dy; + Window child; + + if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child)) + { + EXTEND (SP, 3); + PUSHs (newSViv (dx)); + PUSHs (newSViv (dy)); + PUSHs (newSVuv (child)); + } +} + +############################################################################# +# urxvt::overlay +############################################################################# + +MODULE = urxvt PACKAGE = urxvt::overlay + +void +overlay::set (int x, int y, SV *text, SV *rend = 0) + +void +overlay::show () + +void +overlay::hide () + +void +overlay::DESTROY () + +############################################################################# +# urxvt::watcher +############################################################################# + +MODULE = urxvt PACKAGE = urxvt::watcher + +CHAINED +perl_watcher::cb (SV *cb) + CODE: + THIS->cb (cb); + OUTPUT: + RETVAL + +############################################################################# +# urxvt::timer +############################################################################# + MODULE = urxvt PACKAGE = urxvt::timer SV * @@ -918,19 +1841,11 @@ CODE: timer *w = new timer; w->start (NOW); - RETVAL = newSVptr ((void *)w, "urxvt::timer"); + RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer"); w->self = (HV *)SvRV (RETVAL); OUTPUT: RETVAL -timer * -timer::cb (SV *cb) - CODE: - THIS->cb (cb); - RETVAL = THIS; - OUTPUT: - RETVAL - NV timer::at () CODE: @@ -938,93 +1853,152 @@ OUTPUT: RETVAL -timer * +CHAINED timer::interval (NV interval) CODE: THIS->interval = interval; - RETVAL = THIS; OUTPUT: RETVAL -timer * +CHAINED timer::set (NV tstamp) CODE: THIS->set (tstamp); - RETVAL = THIS; OUTPUT: RETVAL -timer * +CHAINED timer::start (NV tstamp = THIS->at) - CODE: + CODE: THIS->start (tstamp); - RETVAL = THIS; OUTPUT: RETVAL -timer * +CHAINED +timer::after (NV delay) + CODE: + THIS->start (NOW + delay); + OUTPUT: + RETVAL + +CHAINED timer::stop () CODE: THIS->stop (); - RETVAL = THIS; OUTPUT: RETVAL void timer::DESTROY () +############################################################################# +# urxvt::iow +############################################################################# + MODULE = urxvt PACKAGE = urxvt::iow SV * iow::new () CODE: iow *w = new iow; - RETVAL = newSVptr ((void *)w, "urxvt::iow"); + RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow"); w->self = (HV *)SvRV (RETVAL); OUTPUT: RETVAL -iow * -iow::cb (SV *cb) - CODE: - THIS->cb (cb); - RETVAL = THIS; - OUTPUT: - RETVAL - -iow * +CHAINED iow::fd (int fd) CODE: THIS->fd = fd; - RETVAL = THIS; OUTPUT: RETVAL -iow * +CHAINED iow::events (short events) CODE: THIS->events = events; - RETVAL = THIS; OUTPUT: RETVAL -iow * +CHAINED iow::start () - CODE: + CODE: THIS->start (); - RETVAL = THIS; OUTPUT: RETVAL -iow * +CHAINED iow::stop () CODE: THIS->stop (); - RETVAL = THIS; OUTPUT: RETVAL void iow::DESTROY () +############################################################################# +# urxvt::iw +############################################################################# + +MODULE = urxvt PACKAGE = urxvt::iw + +SV * +iw::new () + CODE: + iw *w = new iw; + RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw"); + w->self = (HV *)SvRV (RETVAL); + OUTPUT: + RETVAL + +CHAINED +iw::start () + CODE: + THIS->start (); + OUTPUT: + RETVAL + +CHAINED +iw::stop () + CODE: + THIS->stop (); + OUTPUT: + RETVAL + +void +iw::DESTROY () + +############################################################################# +# urxvt::pw +############################################################################# + +MODULE = urxvt PACKAGE = urxvt::pw + +SV * +pw::new () + CODE: + pw *w = new pw; + RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw"); + w->self = (HV *)SvRV (RETVAL); + OUTPUT: + RETVAL + +CHAINED +pw::start (int pid) + CODE: + THIS->start (pid); + OUTPUT: + RETVAL + +CHAINED +pw::stop () + CODE: + THIS->stop (); + OUTPUT: + RETVAL + +void +pw::DESTROY () +